diff options
author | Karl Berry <karl@freefriends.org> | 2020-11-29 21:45:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-11-29 21:45:41 +0000 |
commit | 0600aa7f883f98956cb74d106dc5405613f514e2 (patch) | |
tree | 01b1ab96510d68e57f19fd5879ff2a0f309a32e9 /Master/texmf-dist/tex/latex/reledmac | |
parent | 7ba43cd7687f0c63850391b88945e432d8958a84 (diff) |
reledmac (29nov20)
git-svn-id: svn://tug.org/texlive/trunk@57034 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 | 288 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 65 |
2 files changed, 253 insertions, 100 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index d53c46769c7..e76658445a8 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -32,10 +32,12 @@ + + %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2020/11/19 v2.34.7 typesetting critical editions]% +\ProvidesPackage{reledmac}[2020/11/29 v2.35.0 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -374,7 +376,7 @@ \ifledfinal \newcommand*{\showlemma}[1]{#1} \else - \newcommand*{\showlemma}[1]{\underline{#1}} + \newcommand*{\showlemma}[1]{\textbf{#1}}% \fi \let\linenumberlist=\empty @@ -756,11 +758,13 @@ \textdir TLT% \fi% \numlabfont% - \ifdefstring{\Xlinenumannotationposition@side}{before}{% - \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% - \csuse{annot@\the\absline@num @\the\section@num}% - }% - }{}% + \unless\iflinenumannotationotherside% + \ifdefstring{\Xlinenumannotationposition@side}{before}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@num @\the\section@num}% + }% + }{}% + \fi% \linenumrep{\line@num}% \ifsublines@ \ifnum\subline@num>0\relax @@ -769,21 +773,37 @@ \sublinenumrep{\subline@num}% \fi \fi% - \ifdefstring{\Xlinenumannotationposition@side}{after}{% - \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% - \csuse{annot@\the\absline@num @\the\section@num}% - }% - }{}% + \unless\iflinenumannotationotherside% + \ifdefstring{\Xlinenumannotationposition@side}{after}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@num @\the\section@num}% + }% + }{}% + \fi% \egroup% }% \newcommand*{\leftlinenum}{% - \ledlinenum - \kern\linenumsep} + \ledlinenum% + \kern\linenumsep% +}% \newcommand*{\rightlinenum}{% - \kern\linenumsep - \ledlinenum} + \kern\linenumsep% + \ledlinenum% +}% +\newcommand*{\leftlinenumannotation}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@num @\the\section@num}% + }% + \kern\linenumsep% +}% +\newcommand*{\rightlinenumannotation}{% + \kern\linenumsep% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@num @\the\section@num}% + }% +}% \newcount\line@num \newcount\subline@num \newif\ifsublines@ @@ -2367,11 +2387,22 @@ \write\linenum@out{\string\@annot[#1]}% \fi% }% + +\newcommand{\resetlinenumannotation}[0]{% + \leavevmode%In case it begins with a \pstart, ensure the \@resetannot is written after \@nl + \ifledRcol% + \write\linenum@outR{\string\@resetannot}% + \else% + \write\linenum@out{\string\@resetannot}% + \fi% +}% + \def\Xlinenumannotationposition@side{after}% \def\Xwraplinenumannotation@ref{\textsuperscript}% \def\Xwraplinenumannotation@side{\textsuperscript}% \newtoggle{Xnoidenticallinenumannotation@ref}% \newtoggle{Xnoidenticallinenumannotation@side}% +\newif\iflinenumannotationotherside% \newcommand{\@annot}[1]{% \store@annot@to@absline{#1}% \def\current@annot{#1}% @@ -2397,6 +2428,9 @@ \let\current@annot\empty% \fi }% +\newcommand{\@resetannot}{% + \let\current@annot\empty% +}% \def\parse@annot#1|#2|{% \gdef\annot@start{#1}% \gdef\annot@end{#2}% @@ -2450,8 +2484,14 @@ \if@twocolumn \if@firstcolumn \gdef\l@dld@ta{\llap{{\leftlinenum}}}% + \iflinenumannotationotherside% + \gdef\l@drd@ta{\rlap{{\rightlinenumannotation}}}% + \fi% \else \gdef\l@drd@ta{\rlap{{\rightlinenum}}}% + \iflinenumannotationotherside% + \gdef\l@dld@ta{\llap{{\leftlinenumannotation}}}% + \fi% \fi \else \ifboolexpr{bool {l@dprintingcolumns} and test {\ifnumgreater{\line@margin@columns}{\m@ne}}}% @@ -2476,8 +2516,14 @@ {% \ifodd\@l@dtempcntb% \gdef\l@drd@ta{\rlap{{\rightlinenum}}}% + \iflinenumannotationotherside% + \gdef\l@dld@ta{\llap{{\leftlinenumannotation}}}% + \fi% \else% \gdef\l@dld@ta{\llap{{\leftlinenum}}}% + \iflinenumannotationotherside% + \gdef\l@drd@ta{\rlap{{\rightlinenumannotation}}}% + \fi% \fi% }% \fi @@ -3616,6 +3662,7 @@ \newif\ifl@d@Xmorethantwolines% \let\@annot@start@print\relax% \let\@annot@end@print\relax% +\newif\ifl@d@Xlinenumber% \newcommand*{\l@dparsefootspec}[3]{\l@dp@rsefootspec#1|} \def\l@dp@rsefootspec#1|#2|#3|#4|#5|#6|#7|{% \gdef\l@dparsedstartpage{#1}% @@ -3638,6 +3685,16 @@ \l@d@pnumfalse% \l@d@dashfalse% \l@d@elinfalse% + \l@d@Xlinenumbertrue% + \ifboolexpr{togl{Xnolinenumber@\@currentseries}% + or (% + togl{Xnolinenumberifannotation@\@currentseries}% + and not test{\ifdefvoid{\annot@start}}% + and not test{\ifdefvoid{\annot@end}}% + )% + }{% + \l@d@Xlinenumberfalse% + }{}% \ifbypage@ \ifnum#4=#1 \else \l@d@pnumtrue @@ -3646,7 +3703,10 @@ \fi \ifboolexpr{% bool{l@d@pnum}% - or not test{\ifnumequal{#2}{#5}}% + or (% + not test{\ifnumequal{#2}{#5}}% + and bool{l@d@Xlinenumber}% + )% }{% \l@d@elintrue% \l@d@dashtrue% @@ -3738,9 +3798,12 @@ \iftoggle{Xnoidenticallinenumannotation@\@currentseries}{% \ifx\annot@start\annot@end% \let\@annot@end@print\relax% - \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number + \ifboolexpr{%Do not print the dash if we do not print the line number + test {\ifdefempty{\linenumrep}}% + or not bool {l@d@Xlinenumber}% + }{% \l@d@dashfalse% - \fi% + }{}% \fi% }{}% \iftoggle{Xlinenumannotationonlyfirst@\@currentseries}{% @@ -3760,9 +3823,12 @@ \l@wrapcs@ifnotemptybox{Xwraplinenumannotation@\@currentseries}{\csuse{Xsymlinenumannotation@\@currentseries}}% }% \let\@annot@end@print\relax% - \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number + \ifboolexpr{%Do not print the dash if we do not print the line number + test {\ifdefempty{\linenumrep}}% + or not bool {l@d@Xlinenumber}% + }{% \l@d@dashfalse% - \fi% + }{}% }{}% \global\cslet{prevannot@start@\@currentseries}{\annot@start}% \global\cslet{prevannot@end@\@currentseries}{\annot@end}% @@ -3799,16 +3865,20 @@ {}% \ifl@d@pnum% \wrap@edcrossref{\@this@crossref@start}{#1}% - \csuse{Xpagelinesep@\@currentseries}% + \ifl@d@Xlinenumber% + \csuse{Xpagelinesep@\@currentseries}% + \fi% + \fi% + \ifl@d@Xlinenumber% + \wrap@edcrossref{\@this@crossref@start}{% + \linenumrep{#2}% + \iftoggle{Xlineflag@\@currentseries}{#8}{}% + }% + \ifl@d@ssub% + \csuse{Xsublinesep@\@currentseries}% + \wrap@edcrossref{\@this@crossref@start}{\sublinenumrep{#3}}% + \fi% \fi% - \wrap@edcrossref{\@this@crossref@start}{% - \linenumrep{#2}% - \iftoggle{Xlineflag@\@currentseries}{#8}{}% - }% - \ifl@d@ssub% - \csuse{Xsublinesep@\@currentseries}% - \wrap@edcrossref{\@this@crossref@start}{\sublinenumrep{#3}}% - \fi \ifcsstring{Xlinenumannotationposition@\@currentseries}{after}% {\@annot@start@print}% {}% @@ -3817,10 +3887,12 @@ {\bgroup}% {\hbox to \csuse{Xboxendlinenum@\@currentseries}\bgroup}% \ifl@d@Xtwolines% - \ifl@d@Xmorethantwolines% - \csuse{Xmorethantwolines@\@currentseries}% - \else% - \csuse{Xtwolines@\@currentseries}% + \ifl@d@Xlinenumber% + \ifl@d@Xmorethantwolines% + \csuse{Xmorethantwolines@\@currentseries}% + \else% + \csuse{Xtwolines@\@currentseries}% + \fi% \fi% \else% \ifl@d@dash% @@ -3837,17 +3909,19 @@ \wrap@edcrossref{\@this@crossref@end}{#4}% \csuse{Xpagelinesep@\@currentseries}% \fi% - \ifl@d@elin% - \wrap@edcrossref{\@this@crossref@end}{% - \linenumrep{#5}% - \iftoggle{Xlineflag@\@currentseries}{#8}{}% - }% - \fi% - \ifl@d@esl% - \ifl@d@elin% - \csuse{Xsublinesep@\@currentseries}% - \fi% - \wrap@edcrossref{\@this@crossref@end}{\sublinenumrep{#6}}% + \ifl@d@Xlinenumber% + \ifl@d@elin% + \wrap@edcrossref{\@this@crossref@end}{% + \linenumrep{#5}% + \iftoggle{Xlineflag@\@currentseries}{#8}{}% + }% + \fi% + \ifl@d@esl% + \ifl@d@elin% + \csuse{Xsublinesep@\@currentseries}% + \fi% + \wrap@edcrossref{\@this@crossref@end}{\sublinenumrep{#6}}% + \fi% \fi% \ifcsstring{Xlinenumannotationposition@\@currentseries}{after}% {\@annot@end@print}% @@ -4966,12 +5040,23 @@ \endgroup% }% }% +\newif\ifl@d@Xendlinenumber% \newcommand*{\setprintendlines}[6]{% \let\@annot@start@print\relax% \let\@annot@end@print\relax% \l@d@pnumfalse% \l@d@dashfalse% \l@d@elinfalse% + \l@d@Xendlinenumbertrue% + \ifboolexpr{togl{Xendnolinenumber@\@currentseries}% + or (% + togl{Xendnolinenumberifannotation@\@currentseries}% + and not test{\ifdefvoid{\annot@start}}% + and not test{\ifdefvoid{\annot@end}}% + )% + }{% + \l@d@Xendlinenumberfalse% + }{}% \ifnum#4=#1 \else \l@d@pnumtrue \l@d@dashtrue @@ -4979,6 +5064,7 @@ \ifboolexpr{% bool{l@d@pnum}% or not test{\ifnumequal{#2}{#5}}% + and bool{l@d@Xendlinenumber}% }{% \l@d@elintrue% \l@d@dashtrue% @@ -5073,9 +5159,12 @@ \iftoggle{Xendnoidenticallinenumannotation@\@currentseries}{% \ifx\annot@start\annot@end% \let\@annot@end@print\relax% - \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number + \ifboolexpr{%Do not print the dash if we do not print the line number + test{\ifdefempty{\linenumrep}}% + or not bool {l@d@Xendlinenumber}% + }{% \l@d@dashfalse% - \fi% + }{}% \fi% }{}% \iftoggle{Xendlinenumannotationonlyfirst@\@currentseries}{% @@ -5095,9 +5184,12 @@ \l@wrapcs@ifnotemptybox{Xendwraplinenumannotation@\@currentseries}{\csuse{Xendsymlinenumannotation@\@currentseries}}% }% \let\@annot@end@print\relax% - \ifx\linenumrep\@gobble%Don't print the dash if we're not printing the line number + \ifboolexpr{%Do not print the dash if do not print the line number + test{\ifdefempty{\linenumrep}}% + or not bool {l@d@Xendlinenumber}% + }{% \l@d@dashfalse% - \fi% + }{}% }{}% \global\cslet{prevannot@start@\@currentseries}{\annot@start}% \global\cslet{prevannot@end@\@currentseries}{\annot@end}% @@ -5143,24 +5235,28 @@ \ifcsstring{Xendlinenumannotationposition@\@currentseries}{before}% {\@annot@start@print}% {}% - \wrap@edcrossref{\@this@crossref@start}{% - \ifledRcol@% - \linenumrepR{#2}% - \else% - \linenumrep{#2}% - \fi% - }% - \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% - \ifl@d@ssub% - \csuse{Xendsublinesep@\@currentseries}% + \ifl@d@Xendlinenumber% \wrap@edcrossref{\@this@crossref@start}{% \ifledRcol@% - \sublinenumrepR{#3}% + \linenumrepR{#2}% \else% - \sublinenumrep{#3}% + \linenumrep{#2}% \fi% }% \fi% + \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% + \ifl@d@Xendlinenumber% + \ifl@d@ssub% + \csuse{Xendsublinesep@\@currentseries}% + \wrap@edcrossref{\@this@crossref@start}{% + \ifledRcol@% + \sublinenumrepR{#3}% + \else% + \sublinenumrep{#3}% + \fi% + }% + \fi% + \fi% \ifcsstring{Xendlinenumannotationposition@\@currentseries}{after}% {\@annot@start@print}% {}% @@ -5169,10 +5265,12 @@ {\bgroup}% {\hbox to \csuse{Xendboxendlinenum@\@currentseries}\bgroup}% \ifl@d@Xtwolines% - \ifl@d@Xmorethantwolines% - \csuse{Xendmorethantwolines@\@currentseries}% - \else% - \csuse{Xendtwolines@\@currentseries}% + \ifl@d@Xendlinenumber% + \ifl@d@Xmorethantwolines% + \csuse{Xendmorethantwolines@\@currentseries}% + \else% + \csuse{Xendtwolines@\@currentseries}% + \fi% \fi% \else% \ifl@d@dash% @@ -5196,28 +5294,30 @@ \ifcsstring{Xendlinenumannotationposition@\@currentseries}{before}% {\@annot@end@print}% {}% - \ifl@d@elin% - \ifl@d@pnum\csuse{Xendlineprefixsingle@\@currentseries}\fi% - \wrap@edcrossref{\@this@crossref@end}{% - \ifledRcol@% - \linenumrepR{#5}% - \else% - \linenumrep{#5}% - \fi% - }% - \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% - \fi% - \ifl@d@esl% + \ifl@d@Xendlinenumber% \ifl@d@elin% - \csuse{Xendsublinesep@\@currentseries}% + \ifl@d@pnum\csuse{Xendlineprefixsingle@\@currentseries}\fi% + \wrap@edcrossref{\@this@crossref@end}{% + \ifledRcol@% + \linenumrepR{#5}% + \else% + \linenumrep{#5}% + \fi% + }% + \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% \fi% - \wrap@edcrossref{\@this@crossref@end}{% - \ifledRcol@% - \sublinenumrepR{#6}% - \else% - \sublinenumrep{#6}% + \ifl@d@esl% + \ifl@d@elin% + \csuse{Xendsublinesep@\@currentseries}% \fi% - }% + \wrap@edcrossref{\@this@crossref@end}{% + \ifledRcol@% + \sublinenumrepR{#6}% + \else% + \sublinenumrep{#6}% + \fi% + }% + \fi% \fi% \ifcsstring{Xendlinenumannotationposition@\@currentseries}{after}% {\@annot@end@print}% @@ -5305,6 +5405,8 @@ \csgdef{Xsymlinenumannotation@#1}{}% \newtoggle{Xnonumber@#1}% + \newtoggle{Xnolinenumber@#1}% + \newtoggle{Xnolinenumberifannotation@#1}% \csgdef{Xbeforenumber@#1}{0pt}% \csgdef{Xtxtbeforenumber@#1}{}% \csgdef{Xafternumber@#1}{0.5em}% @@ -5617,6 +5719,8 @@ \csgdef{Xendinplaceofnumber@#1}{0pt}% \newtoggle{Xendnonumber@#1}% + \newtoggle{Xendnolinenumber@#1}% + \newtoggle{Xendnolinenumberifannotation@#1}% \csgdef{Xendhangindent@#1}{0pt}% @@ -5813,6 +5917,8 @@ \newhooktoggle@series{Xgroupbyline}% \newhooktoggle@series{Xgroupbylineseparetwolines}% \newhooktoggle@series{Xnonumber} + \newhooktoggle@series{Xnolinenumber}% + \newhooktoggle@series{Xnolinenumberifannotation}% \newhooktoggle@series{Xpstart} \newhooktoggle@series{Xpstartonlyfirst}% @@ -5925,6 +6031,8 @@ \newhookcommand@series{Xendinplaceofnumber}% \newhooktoggle@series{Xendnonumber}% + \newhooktoggle@series{Xendnolinenumber}% + \newhooktoggle@series{Xendnolinenumberifannotation}% \newhooktoggle@series{Xendnumberonlyfirstinline}% \newhooktoggle@series{Xendnumberonlyfirstintwolines}% @@ -6614,6 +6722,10 @@ \newtoggle{Xlinenumannotationonlyfirst@SEref}%Never changed, just for the test in \setprintlines \newtoggle{Xlinenumannotationonlyfirst@appref}%Idem +\newtoggle{Xnolinenumber@SEref}%Idem +\newtoggle{Xnolinenumber@appref}%Idem +\newtoggle{Xnolinenumberifannotation@SEref}%Idem +\newtoggle{Xnolinenumberifannotation@appref}%Idem \def\Xlinenumannotationposition@appref{after}% \def\Xlinenumannotationposition@SEref{after}% @@ -6672,6 +6784,12 @@ \newtoggle{Xendnoidenticallinenumannotation@apprefwithpage}% \newtoggle{Xendnoidenticallinenumannotation@SErefwithpage}% +\newtoggle{Xendnolinenumber@SErefwithpage}%Never changed, only for test in \setprintendlines +\newtoggle{Xendnolinenumber@apprefwithpage}%Idem +\newtoggle{Xendnolinenumberifannotation@SErefwithpage}%Idem +\newtoggle{Xendnolinenumberifannotation@apprefwithpage}%Idem + + \newtoggle{Xendlinenumannotationonlyfirst@SEref}%Never changed, just for the test in \setprintendlines \newtoggle{Xendlinenumannotationonlyfirst@SErefwithpage}%Idem \newtoggle{Xendlinenumannotationonlyfirst@appref}%Idem @@ -8336,7 +8454,7 @@ \newif\if@edtabular% \newcommand{\l@dcollect@body}[1]{% \ifvmode\else% - \\%Ensure that we don't have spurious indentation at the very first line, caused by some text before. + \\%Ensure that we do not have spurious indentation at the very first line, caused by some text before. \fi% \l@denvbody{\expandafter#1\expandafter{\the\l@denvbody}}% \edef\processl@denvbody{\the\l@denvbody\noexpand\end{\@currenvir}}% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index b8fba280020..3b1dff67a6d 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/11/08 v2.24.3 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2020/11/29 v2.25.0 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -504,31 +504,50 @@ \newif\iflinenumberLevenifblank \newif\iflinenumberRevenifblank \newcommand*{\leftlinenumR}{% - \l@dlinenumR - \kern\linenumsep} + \l@dlinenumR% + \kern\linenumsep% +}% \newcommand*{\rightlinenumR}{% - \kern\linenumsep - \l@dlinenumR} + \kern\linenumsep% + \l@dlinenumR% +}% + \newcommand*{\l@dlinenumR}{% \numlabfont% - \ifdefstring{\Xlinenumannotationposition@side}{before}{% - \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% - \csuse{annotR@\the\absline@numR @\the\section@numR}% - }% - }{}% + \unless\iflinenumannotationotherside% + \ifdefstring{\Xlinenumannotationposition@side}{before}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annotR@\the\absline@numR @\the\section@numR}% + }% + }{}% + \fi% \linenumrepR{\line@numR}\@Rlineflag% \ifsublines@R \ifnum\subline@numR>\z@ \unskip\fullstop\sublinenumrepR{\subline@numR}% \fi \fi% - \ifdefstring{\Xlinenumannotationposition@side}{after}{% - \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% - \csuse{annotR@\the\absline@numR @\the\section@numR}% - }% - }{}% + \unless\iflinenumannotationotherside% + \ifdefstring{\Xlinenumannotationposition@side}{after}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annotR@\the\absline@numR @\the\section@numR}% + }% + }{}% + \fi% }% +\newcommand*{\leftlinenumannotationR}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@numR @\the\section@numR}% + }% + \kern\linenumsep% +}% +\newcommand*{\rightlinenumannotationR}{% + \kern\linenumsep% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annot@\the\absline@numR @\the\section@numR}% + }% +}% \newcount\line@numR \newcount\subline@numR \newcount\absline@numR @@ -862,12 +881,14 @@ \xright@appenditem{\the\c@pstartL}\to\list@pstartL@pc% \global\cslet{numberpstart@L\the\l@dnumpstartsL}{\ifnumberpstart}% \global\cslet{numberline@L\the\l@dnumpstartsL}{\ifnumberline}% + \global\cslet{linenumannotationotherside@L\the\l@dnumpstartsL}{\iflinenumannotationotherside}% }% \def\dump@pstartR@pc{% \xright@appenditem{\the\c@pstartR}\to\list@pstartR@pc% \global\cslet{numberpstart@R\the\l@dnumpstartsR}{\ifnumberpstart}% \global\cslet{numberline@R\the\l@dnumpstartsR}{\ifnumberline}% + \global\cslet{linenumannotationotherside@R\the\l@dnumpstartsR}{\iflinenumannotationotherside}% }% \def\restore@pstartL@pc{% @@ -1248,6 +1269,7 @@ \newcommand*{\do@lineL}{% \letcs{\ifnumberpstart}{numberpstart@L\the\l@dpscL}% \letcs{\ifnumberline}{numberline@L\the\l@dpscL}% + \letcs{\iflinenumannotationotherside}{linenumannotationotherside@L\the\l@dpscL}% \advance\countLline \@ne% \ifvbox\namebox{l@dLcolrawbox\the\l@dpscL}% {\vbadness=10000% @@ -1388,6 +1410,7 @@ \let\sublinenumrep\sublinenumrepR% \letcs{\ifnumberpstart}{numberpstart@R\the\l@dpscR}% \letcs{\ifnumberline}{numberline@R\the\l@dpscR}% + \letcs{\iflinenumannotationotherside}{linenumannotationotherside@R\the\l@dpscR}% \ledRcol@true% \advance\countRline \@ne% \ifvbox\namebox{l@dRcolrawbox\the\l@dpscR}% @@ -1734,8 +1757,14 @@ \if@twocolumn \if@firstcolumn \gdef\l@dld@ta{\llap{{\leftlinenumR}}}% + \iflinenumannotationotherside% + \gdef\l@drd@ta{\rlap{{\rightlinenumannotationR}}}% + \fi% \else \gdef\l@drd@ta{\rlap{{\rightlinenumR}}}% + \iflinenumannotationotherside% + \gdef\l@dld@ta{\llap{{\leftlinenumannotationR}}}% + \fi% \fi \else \ifboolexpr{bool {l@dprintingcolumns} and test {\ifnumgreater{\line@margin@columnsR}{\m@ne}}}% @@ -1760,8 +1789,14 @@ {% \ifodd\@l@dtempcntb% \gdef\l@drd@ta{\rlap{{\rightlinenumR}}}% + \iflinenumannotationotherside% + \gdef\l@dld@ta{\llap{{\leftlinenumannotationR}}}% + \fi% \else% \gdef\l@dld@ta{\llap{{\leftlinenumR}}}% + \iflinenumannotationotherside% + \gdef\l@drd@ta{\rlap{{\rightlinenumannotationR}}}% + \fi% \fi% }% \fi |