diff options
author | Karl Berry <karl@freefriends.org> | 2016-11-14 22:35:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-11-14 22:35:23 +0000 |
commit | b23c4beb8524e95bcf6c111696cc20f4080530ef (patch) | |
tree | aaa46470e7e06a5621b4c60542b755c5777ff567 /Master/texmf-dist/source/latex | |
parent | 6f7aba4754b869114613ae13851112752e5d514b (diff) |
reledmac (14nov16)
git-svn-id: svn://tug.org/texlive/trunk@42509 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r-- | Master/texmf-dist/source/latex/reledmac/reledmac.dtx | 58 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/reledmac/reledpar.dtx | 9 |
2 files changed, 57 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index dda3b19fcec..d47496b7602 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -447,6 +447,8 @@ % \changes{v2.16.3}{2016/10/12}{Fix bug with \protect\cs{SEref} (bug added in v2.7.0).} % \changes{v2.16.4}{2016/10/16}{Fix bug with vertical space before sectioning command in optional argument of \protect\cs{pstart} (bug added in v2.15.3).} % \changes{v2.16.5}{2016/10/20}{Fix potential spurious spaces in endnotes.} +% \changes{v2.16.6}{2016/11/14}{Take account of \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.} +% \changes{v2.16.6}{2016/11/14}{Fix bug with the line number style in \protect\cs{doennotes} when referring to right side line in parallel typesetting.} % \title{\Macpackage \\ % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} @@ -3842,7 +3844,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/10/20 v2.16.5 typesetting critical editions]% +\ProvidesPackage{reledmac}[2016/11/14 v2.16.6 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -12794,11 +12796,23 @@ % \end{macrocode} % The print the start line, following, if required, by the side flag and the start sub line. % \begin{macrocode} - \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% % \end{macrocode} % Close the box. @@ -12846,14 +12860,26 @@ % \begin{macrocode} \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% % \end{macrocode} @@ -14371,6 +14397,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} @@ -14537,7 +14564,16 @@ % \changes{v2.5.0}{2015/11/13}{\protect\cs{xlineref} does not include anymore the side flag. Use \protect\cs{xflagref} to get it. Not that \protect\cs{edlineref} still contains the flag.} % If the specified label exists, \protect\cs{lineref} gives its line number. % \begin{macrocode} -\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}}% % \end{macrocode} @@ -14548,7 +14584,15 @@ % \begin{macro}{\xsublineref} % If the specified label exists, \protect\cs{sublineref} gives its sub-line number. % \begin{macrocode} -\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}} % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index 3e9b274b4fa..bf7b1e101d9 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -289,6 +289,7 @@ % \changes{v2.14.1}{2016/10/16}{Fix bug when using \protect\cs{markboth} on \protect\cs{doinsidelineLhook} and \protect\cs{doinsidelineRhook}.} % \changes{v2.14.2}{2016/10/31}{Fix spurious space with \protect\cs{edtextlater}.} % \changes{v2.14.3}{2016/11/04}{Fix bug in \protect\cs{edtextnow}.} +% \changes{v2.14.4}{2016/11/14}{Take account of \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1084,8 +1085,8 @@ % To use \env{astanza}, simply replace \cs{stanza} by \cs{begin}\arg{astanza} and % add \cs{end}\arg{astanza} after the ending \expandafter\cs\expandafter{\&}. % -% The difference between \env{astanza} and \cs{stanza} is, that the letter syncs -% verse by verse, while the enviornment syncs stanza by stanza. +% The difference between \env{astanza} and \cs{stanza} is, that the latter syncs +% verse by verse, while the environment syncs stanza by stanza. % % If you get an error message along the lines of `Missing number, % treated as zero \protect\cs{sza@0@}' it is because you have forgotten to use @@ -1233,7 +1234,7 @@ % \begin{macrocode} %<*code> \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]% % \end{macrocode} % \subsection{Package's requirement} @@ -4675,6 +4676,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{}% |