diff options
author | Karl Berry <karl@freefriends.org> | 2017-11-12 22:22:03 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-11-12 22:22:03 +0000 |
commit | 61ef516740ec5cbb3e2cbc5b5c37821a46ac0e11 (patch) | |
tree | ca9366b868a48f69ca48cf84bb8f4e23993b8303 /Master/texmf-dist/tex/latex/reledmac/reledpar.sty | |
parent | 36b0711314bd0cca39ee7297df4ac8a6dc40eca4 (diff) |
reledmac (12nov17)
git-svn-id: svn://tug.org/texlive/trunk@45760 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 | 39 |
1 files changed, 28 insertions, 11 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 0e7a22478e9..95e68061d36 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}[2017/08/31 v2.20.2 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2017/11/11 v2.21.0 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -503,12 +503,24 @@ \kern\linenumsep \l@dlinenumR} \newcommand*{\l@dlinenumR}{% - \numlabfont\linenumrepR{\line@numR}\@Rlineflag% + \numlabfont% + \ifdefstring{\Xlinenumannotationposition@side}{before}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annotR@\the\absline@numR @\the\section@numR}% + }% + }{}% + \linenumrepR{\line@numR}\@Rlineflag% \ifsublines@R \ifnum\subline@numR>\z@ \unskip\fullstop\sublinenumrepR{\subline@numR}% \fi - \fi} + \fi% + \ifdefstring{\Xlinenumannotationposition@side}{after}{% + \l@wrap@ifnotemptybox{\Xwraplinenumannotation@side}{% + \csuse{annotR@\the\absline@numR @\the\section@numR}% + }% + }{}% +}% \newcount\line@numR \newcount\subline@numR @@ -519,7 +531,7 @@ \list@create{\insertlines@listR} \list@create{\actionlines@listR} \list@create{\actions@listR} - +\list@create{\annot@listR}% \newcount\page@numR \list@create{\linesinpar@listL} @@ -547,6 +559,7 @@ }% \newcommand{\@nl@regR}{% \ifx\l@dchset@num\relax \else + \reset@current@annot% \advance\absline@numR \@ne \csgdef{l@dchset@num@R\the\absline@numR}{}%To remember this line have been marked by a \setlinenum \set@line@action @@ -657,16 +670,20 @@ \let\@lab=\relax \let\@lemma=\relax \let\@sw\@gobblethree% + \let\store@annot@to@absline\@gobble% #2 \global\endpage@num=\page@numR \global\endline@num=\line@numR \global\endsubline@num=\subline@numR + \global\let\endcurrent@annot=\current@annot% \endgroup \xright@appenditem% {\the\page@numR|\the\line@numR|% \ifsublines@R \the\subline@numR \else 0\fi|% \the\endpage@num|\the\endline@num|% \ifsublines@R \the\endsubline@num \else 0\fi}\to\line@listR + \xright@appenditem% + {\current@annot|\endcurrent@annot}\to\annot@list% \expandafter\list@create\expandafter{\csname sw@list@edtext@tmp@\the\@edtext@level\endcsname}% \@ref@reg@parseR{#2}% \global\advance\@edtext@level by -1% @@ -1941,18 +1958,18 @@ }% \list@create{\labelref@listR} -\def\l@dmake@labelsR#1|#2|#3|#4|#5|#6{% - \expandafter\ifx\csname the@label\csuse{XR@prefix}#6\endcsname% +\def\l@dmake@labelsR#1|#2|#3|#4|#5|#6|#7{% + \expandafter\ifx\csname the@label\csuse{XR@prefix}#7\endcsname% \relax% \else% - \led@warn@DuplicateLabel{\csuse{XR@prefix}#6}% + \led@warn@DuplicateLabel{\csuse{XR@prefix}#7}% \fi% - \expandafter\gdef\csname the@label\csuse{XR@prefix}#6\endcsname{#1|#2|#3|#4|#5|\@Rlineflag}% - \global\providetoggle{label@#6@ledRcol}%False is the default value of this toggle, which tell us if a label is linked to a right or a left side - \global\toggletrue{label@#6@ledRcol}% + \csgdef{the@label\csuse{XR@prefix}#7}{#1|#2|#3|#4|#5|#6|\@Rlineflag}% + \global\providetoggle{label@#7@ledRcol}%False is the default value of this toggle, which tells us whether a label is linked to the right or left side + \global\toggletrue{label@#7@ledRcol}% \ignorespaces} \AtBeginDocument{% - \def\l@dmake@labelsR#1|#2|#3|#4|#5|#6{}% + \def\l@dmake@labelsR#1|#2|#3|#4|#5|#6|#7{}% } \WithSuffix\newcommand\sidenotemargin*[1]{% |