summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-11-29 21:45:41 +0000
committerKarl Berry <karl@freefriends.org>2020-11-29 21:45:41 +0000
commit0600aa7f883f98956cb74d106dc5405613f514e2 (patch)
tree01b1ab96510d68e57f19fd5879ff2a0f309a32e9 /Master/texmf-dist/tex/latex/reledmac/reledpar.sty
parent7ba43cd7687f0c63850391b88945e432d8958a84 (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/reledpar.sty')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty65
1 files changed, 50 insertions, 15 deletions
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