From b23c4beb8524e95bcf6c111696cc20f4080530ef Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 14 Nov 2016 22:35:23 +0000 Subject: reledmac (14nov16) git-svn-id: svn://tug.org/texlive/trunk@42509 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 56 ++++++++++++++++++++--- Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 4 +- 2 files changed, 52 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 0d11821017e..e5ba24f9641 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}[2016/10/20 v2.16.5 typesetting critical editions]% +\ProvidesPackage{reledmac}[2016/11/14 v2.16.6 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -4310,11 +4310,23 @@ \else% \csuse{Xendlineprefixsingle@\@currentseries}% \fi% - \wrap@edcrossref{\@this@crossref@start}{\linenumrep{#2}}% + \wrap@edcrossref{\@this@crossref@start}{% + \ifledRcol@% + \linenumrepR{#2}% + \else% + \linenumrep{#2}% + \fi% + }% \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% \ifl@d@ssub% \csuse{Xendsublinesep@\@currentseries}% - \wrap@edcrossref{\@this@crossref@start}{\sublinenumrep{#3}}% + \wrap@edcrossref{\@this@crossref@start}{% + \ifledRcol@% + \sublinenumrepR{#3}% + \else% + \sublinenumrep{#3}% + \fi% + }% \fi% \egroup% \ifdimequal{\csuse{Xendboxendlinenum@\@currentseries}}{0pt}% @@ -4347,14 +4359,26 @@ \fi% \ifl@d@elin% \ifl@d@pnum\csuse{Xendlineprefixsingle@\@currentseries}\fi% - \wrap@edcrossref{\@this@crossref@end}{\linenumrep{#5}}% + \wrap@edcrossref{\@this@crossref@end}{% + \ifledRcol@% + \linenumrepR{#5}% + \else% + \linenumrep{#5}% + \fi% + }% \iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}% \fi% \ifl@d@esl% \ifl@d@elin% \csuse{Xendsublinesep@\@currentseries}% \fi% - \wrap@edcrossref{\@this@crossref@end}{\sublinenumrep{#6}}% + \wrap@edcrossref{\@this@crossref@end}{% + \ifledRcol@% + \sublinenumrepR{#6}% + \else% + \sublinenumrep{#6}% + \fi% + }% \fi% \fi% \ifdimequal{\csuse{Xendboxendlinenum@\@currentseries}}{0pt}% @@ -5287,6 +5311,7 @@ \expandafter\ifx\csname the@label\csuse{XR@prefix}#5\endcsname \relax\else \led@warn@DuplicateLabel{\csuse{XR@prefix}#5}% \fi + \global\providetoggle{label@#5@ledRcol}%False is the default value of this toggle, which tell us if a label is linked to a right or a left side \expandafter\gdef\csname the@label\csuse{XR@prefix}#5\endcsname{#1|#2|#3|#4|\relax}% \ignorespaces} @@ -5355,10 +5380,27 @@ \newcommand*{\edpageref}[1]{\l@dref@undefined{#1}\wrap@edcrossref{#1}{\l@dgetref@num{1}{#1}}} \newcommand*{\xpageref}[1]{\l@dgetref@num{1}{#1}} -\newcommand*{\edlineref}[1]{\l@dref@undefined{#1}\wrap@edcrossref{#1}{\l@dgetref@num{2}{#1}\xflagref{#1}}}% +\newcommand*{\edlineref}[1]{% + \l@dref@undefined{#1}% + \wrap@edcrossref{#1}{% + \providetoggle{label@#1@ledRcol}%Required for the first run, when the label has not been yet parsed on the .aux file + \iftoggle{label@#1@ledRcol}% + {\linenumrepR{\l@dgetref@num{2}{#1}}}% + {\linenumrep{\l@dgetref@num{2}{#1}}}% + \xflagref{#1}% + }% +}% \newcommand*{\xlineref}[1]{\l@dgetref@num{2}{#1}}% -\newcommand*{\sublineref}[1]{\l@dref@undefined{#1}\wrap@edcrossref{#1}{\l@dgetref@num{3}{#1}}} +\newcommand*{\sublineref}[1]{% + \l@dref@undefined{#1}% + \wrap@edcrossref{#1}{% + \providetoggle{label@#1@ledRcol}%Required for the first run, when the label has not been yet parsed on the .aux file + \iftoggle{label@#1@ledRcol}% + {\sublinenumrepR{\l@dgetref@num{3}{#1}}}% + {\sublinenumrep{\l@dgetref@num{3}{#1}}}% + }% +}% \newcommand*{\xsublineref}[1]{\l@dgetref@num{3}{#1}} \newcommand*{\pstartref}[1]{\l@dref@undefined{#1}\wrap@edcrossref{#1}{\l@dgetref@num{4}{#1}}} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index b535c9c755e..3752de8a762 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2016/11/04 v2.14.3 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/11/14 v2.14.4 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -1754,6 +1754,8 @@ \led@warn@DuplicateLabel{\csuse{XR@prefix}#5}% \fi \expandafter\gdef\csname the@label\csuse{XR@prefix}#5\endcsname{#1|#2|#3|#4|\@Rlineflag}% + \global\providetoggle{label@#5@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@#5@ledRcol}% \ignorespaces} \AtBeginDocument{% \def\l@dmake@labelsR#1|#2|#3|#4|#5{}% -- cgit v1.2.3