diff options
author | Karl Berry <karl@freefriends.org> | 2020-03-08 21:48:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-03-08 21:48:18 +0000 |
commit | 5c9876514ae068b20d15aca507a156dcccabe7f8 (patch) | |
tree | 846549290bb49abec3210154eaa17743e949f40c /Master/texmf-dist/tex/latex/reledmac/reledpar.sty | |
parent | 8853974591602003b6ea3948c580bcd7ad2b8784 (diff) |
reledmac (8mar20)
git-svn-id: svn://tug.org/texlive/trunk@54180 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac/reledpar.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 37 |
1 files changed, 32 insertions, 5 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 103fa4b31ab..1b947c1305f 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}[2019/11/04 v2.22.4 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2020/03/08 v2.23.0 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -768,13 +768,15 @@ }% \newcommand*{\new@lineL}{% + \set@this@c@page% \ifnumberline% - \write\linenum@out{\string\@nl[\the\c@par@page][\thepage]}% + \write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}% \fi% }% \newcommand*{\new@lineR}{% + \set@this@c@page% \ifnumberline% - \write\linenum@outR{\string\@nl[\the\c@par@page][\thepar@page]}% + \write\linenum@outR{\string\@nl[\the\@this@c@page][\thepage]}% \fi% }% @@ -904,6 +906,8 @@ \newif\ifinstanzaL \newif\ifinstanzaR + \newif\ifinastanzaL% + \newif\ifinastanzaR% \newenvironment{Leftside}{% \expandafter\ifvoid\csname l@dLcolrawbox1\endcsname\else% \led@err@Leftside@PreviousNotPrinted% @@ -927,6 +931,8 @@ \newcommand*{\Rightsidehook}{} \newcommand*{\Rightsidehookend}{} +\newcommand*{\Rightpagehook}{}% +\newcommand*{\Leftpagehook}{}% \newenvironment{Rightside}{% \expandafter\ifvoid\csname l@dRcolrawbox1\endcsname\else% \led@err@Rightside@PreviousNotPrinted% @@ -1308,6 +1314,7 @@ \l@drsn@te}}% \def\print@eledsectionL{%% + \disable@edindex% \addtocounter{pstartL}{-1}% \ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{} \ifdefstring{\@eledsectmark}{L}{}{\ledsectnomark} @@ -1333,6 +1340,7 @@ {\new@line \hbox{\l@dunhbox@line{\one@line}}}% \fi% \vskip\eledsection@correcting@skip% + \restore@edindex% } \newcommand{\add@apparatusL}{% @@ -1451,6 +1459,7 @@ } \def\print@eledsectionR{% + \disable@edindex% \addtocounter{pstartR}{-1}% \set@sectcountR% \ifdefstring{\@eledsectnotoc}{R}{\ledsectnotoc}{}% @@ -1476,7 +1485,8 @@ \hspace{3\paperwidth}% {\new@lineR \hbox{\l@dunhbox@line{\one@lineR}}}% \fi% - \vskip\eledsection@correcting@skip + \vskip\eledsection@correcting@skip% + \restore@edindex% } \newcommand{\add@apparatusR}{% \if@firstlineofpageR% @@ -2105,6 +2115,9 @@ \noexpand\csname sza@0@\endcsname}\stanzaindentbase% \@hangingsymbol% \fi% + \ifinastanzaL% + \@hangingsymbol% + \fi% \fi% }% \newcommand{\inserthangingsymbolR}{% @@ -2114,6 +2127,9 @@ \noexpand\csname sza@0@\endcsname}\stanzaindentbase% \@hangingsymbol% \fi% + \ifinastanzaR% + \@hangingsymbol% + \fi% \fi% }% @@ -2121,6 +2137,11 @@ \catcode`\&=\active \newenvironmentx{astanza}[2][1,2,usedefault]{% + \ifledRcol% + \global\inastanzaRtrue% + \else% + \global\inastanzaLtrue% + \fi% \catcode`\&\active \global\stanza@count\@ne\stanza@modulo\@ne \newdimen\parindent@beforestanza% @@ -2225,7 +2246,9 @@ } { \let\old@otherlanguage\otherlanguage% \renewcommand{\otherlanguage}[2][]{% - \xpg@set@group@aux% + \ifdefined\xpg@set@group@aux% + \xpg@set@group@aux% + \fi% \selectlanguage[#1]{#2}% \ifledRcol \gdef\theledlanguageR{#2}% \else \gdef\theledlanguageL{#2}% @@ -2780,6 +2803,7 @@ \checkraw@text% { \loop\ifaraw@text% \checkpageL% + \Leftpagehook% \l@duselanguage{\theledlanguageL}% { \loop\ifl@dsamepage% \ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{}% @@ -2839,6 +2863,7 @@ \parledgroup@correction@notespacing@init% \clearl@dleftpage }% \checkpageR% + \Rightpagehook% \l@duselanguage{\theledlanguageR}% { \loop\ifl@dsamepage% \set@sectcountR% @@ -2916,6 +2941,8 @@ \global\l@dnumpstartsR=\z@% \global\instanzaLfalse% \global\instanzaRfalse% + \global\inastanzaLfalse% + \global\inastanzaRfalse% \global\l@dprintingpagesfalse% \ifnum\edtext@later=\edtext@now% \else% |