diff options
author | Karl Berry <karl@freefriends.org> | 2020-08-19 21:37:24 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-08-19 21:37:24 +0000 |
commit | 90532b85c4696e210a3c2c9753868ab286d9713a (patch) | |
tree | 00e65706ad258deb3bb6c10536135cca9fc7fa3c /Master/texmf-dist/tex/latex/reledmac | |
parent | 492eb1f967b7d8fb3e5b2159a8166d4893340de7 (diff) |
reledmac (19aug20)
git-svn-id: svn://tug.org/texlive/trunk@56134 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac')
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 41 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 36 |
2 files changed, 54 insertions, 23 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index bbbd72929ad..ae2a67ba432 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2020/07/06 v2.34.2 typesetting critical editions]% +\ProvidesPackage{reledmac}[2020/08/19 v2.34.3 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -1510,12 +1510,16 @@ \newcommand*{\setlinenum}[1]{% - \ifnum#1<\z@ - \led@warn@BadSetlinenum - \else - \ifledRcol \write\linenum@outR{\string\l@d@set[#1]} - \else \write\linenum@out{\string\l@d@set[#1]} \fi - \fi} + \ifnum#1<\z@% + \led@warn@BadSetlinenum% + \else% + \ifledRcol% + \write\linenum@outR{\string\l@d@set[#1]}% + \else% + \write\linenum@out{\string\l@d@set[#1]}% + \fi% + \fi% +}% \newcommand*{\startlock}{% @@ -2009,8 +2013,10 @@ \fi% \ifbypstart@% \begingroup% - \let\leavevmode\relax% - \setlinenum{0}% + \unless\ifinstanza% + \let\leavevmode\relax% + \setlinenum{0}% + \fi% \endgroup% \resetprevline@% \fi% @@ -4575,10 +4581,17 @@ {}% \global\csname prevpage#1@numR\endcsname=\page@numR% \else% - \ifnumequal{\csuse{prevpage#1@num}}{\page@num}% - {\csuse{parafootsepX@#1}}% - {}% - \global\csname prevpage#1@num\endcsname=\page@num% + \ifnumbering% + \ifnumequal{\csuse{prevpage#1@num}}{\page@num}% + {\csuse{parafootsepX@#1}}% + {}% + \global\csname prevpage#1@num\endcsname=\page@num% + \else% + \ifnumequal{\csuse{prevpage#1@num}}{\c@page}% + {\csuse{parafootsepX@#1}}% + {}% + \global\csname prevpage#1@num\endcsname=\c@page% + \fi% \fi% } \newcommand{\wrapped@footfootmarkX}[1]{% @@ -7819,7 +7832,7 @@ \parindent@beforestanza=\parindent}%Keep in memory the standard \parindent \global\stanza@count\@ne\stanza@modulo\@ne \noexpand\ifnum\expandafter\noexpand\csname sza@0@\endcsname=\z@% - \let\noexpand\stanza@hang\relax% + \def\noexpand\stanza@hang{\unexpanded{\leavevmode\null}}% \let\noexpand\endlock\relax% \noexpand\else% \interlinepenalty% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 586af075dbd..25ae14d2533 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -28,7 +28,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2020/05/31 v2.24.0 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2020/08/19 v2.24.1 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -712,11 +712,21 @@ }% \renewcommand*{\@pend}[1]{% - \ifbypstart@\global\line@num=0\fi% - \xright@appenditem{#1}\to\linesinpar@listL} + \ifbypstart@% + \unless\ifinstanza% + \global\line@num=0% + \fi% + \fi% + \xright@appenditem{#1}\to\linesinpar@listL% +}% \renewcommand*{\@pendR}[1]{% - \ifbypstart@R\global\line@numR=0\fi - \xright@appenditem{#1}\to\linesinpar@listR} + \ifbypstart@R% + \unless\ifinstanzaR% + \global\line@numR=0% + \fi% + \fi% + \xright@appenditem{#1}\to\linesinpar@listR% +}% \newcommand{\@pstart}[3]{% \ifcsdef{minpage@pstart@#1}% @@ -2147,6 +2157,7 @@ \fi% \catcode`\&\active \global\stanza@count\@ne\stanza@modulo\@ne + \@advancestanzanumber% \newdimen\parindent@beforestanza% \parindent@beforestanza=\parindent%Keep in memory the standard \parindent \ifnum\usenamecount{sza@0@}=\z@ @@ -2171,6 +2182,7 @@ {\pstart[][\at@every@stanza]\at@start@every@stanza}% {\pstart[#1][#2]\at@start@every@stanza}% \@astanza@line + \@insertstanzanumber% \let\par\relax\ignorespaces%No paragraph in verses }{% \global\undef\parindent@beforestanza% @@ -2419,12 +2431,16 @@ \@writelinesinparR \check@pstarts \ifbypstart@% - \write\linenum@out{\string\@set[1]} - \resetprevline@ + \unless\ifinstanza% + \write\linenum@out{\string\@set[1]}% + \resetprevline@% + \fi% \fi \ifbypstart@R - \write\linenum@outR{\string\@set[1]} - \resetprevline@ + \unless\ifinstanza% + \write\linenum@outR{\string\@set[1]}% + \resetprevline@% + \fi% \fi \Columns@print@after@pend% \repeat @@ -3296,8 +3312,10 @@ \ifnum\l@dnumpstartsR>\l@dpscR \writtenlinesRfalse \ifbypstart@R + \unless\ifinstanzaR% \global\line@numR=0% \resetprevline@% + \fi% \fi \csuse{after@pendR@\the\l@dpscR}% \global\csundef{after@pendR@\the\l@dpscR}% |