diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac/reledpar.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 79 |
1 files changed, 70 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 02d69fc1c6e..2776d151060 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/06/16 v2.11.0 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/07/01 v2.12.0 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -120,8 +120,11 @@ \newcommand{\led@error@fail@patch@@outputpage}{% \reledpar@error{Fail to patch \string\@outputpage\space command.}{\@ehc}% }% +\newcommand{\led@error@edtext@later@now}{% + \reledpar@error{You call \the\edtext@later\space \string\edtextlater\space commands, but \the\edtext@now\space \string\edtextnow\space commands}{\@ehc}% (did I follow your intent correctly here?) +}% \newcommand*{\led@warn@ChangeSyncOption}[1]{% - \reledpar@warning{You have changed synchronization's options since last run. We have not read line-list file #1. Please run LaTeX again.}% + \reledpar@warning{You have changed synchronization's options since the last run. We have not read line-list file #1. Please run LaTeX again.}% }% \newcommand{\led@warn@setting@in@rightside}[1]{% \reledpar@warning{You use #1 inside rightside environment.\MessageBreak% @@ -304,7 +307,7 @@ \Xpstart% \fi% \else - \def@tempb{section} + \def\@tempb{section} \ifx\@tempa\@tempb \global\bypage@Rfalse% \global\bypstart@Rfalse% @@ -577,9 +580,13 @@ \the\endpage@num|\the\endline@num|% \ifsublines@ \the\endsubline@num \else 0\fi}\to\line@listR \expandafter\list@create\expandafter{\csname sw@list@edtext@tmp@\the\@edtext@level\endcsname}% + \@ref@reg@parseR{#2}% + \global\advance\@edtext@level by -1% +} +\newcommand{\@ref@reg@parseR}[1]{% \providebool{lemmacommand@\the\@edtext@level}% \boolfalse{lemmacommand@\the\@edtext@level}% - #2 + #1% \ifnum\@edtext@level>0% \def\create@this@edtext@level{\expandafter\list@create\expandafter{\csname sw@list@edtextR@\the\@edtext@level\endcsname}}% \ifcsundef{sw@list@edtextR@\the\@edtext@level}{\create@this@edtext@level}{}% @@ -588,8 +595,8 @@ \xright@appenditem{\expandonce\@tmpp}\to\@tmp% \global\cslet{sw@list@edtextR@\the\@edtext@level}{\@tmp}% \fi% - \global\advance\@edtext@level by -1% -} +}% + \renewcommand*{\@pend}[1]{% \ifbypstart@\global\line@num=0\fi% \xright@appenditem{#1}\to\linesinpar@listL} @@ -749,7 +756,7 @@ \l@dpairingfalse } -\newcommand{\AtBeginPairs}[1]{\xdef\at@begin@pairs{#1}}% +\newcommand{\AtBeginPairs}[1]{\gdef\at@begin@pairs{#1}}% \def\at@begin@pairs{}% \newenvironment{pages}{% @@ -1634,6 +1641,55 @@ }% \dolistloop{\@series}% }% +\newcount\edtext@now% +\newcount\edtext@later% +\newcommand{\edtextlater}[2]{%#1 lemma, #2 critical notes + \global\advance\edtext@later by \@ne% + \advance\@edtext@level by \@ne% + \ifcsvoid{sw@list@edtext@\the\@edtext@level}% + {\global\let\sw@inthisedtext\empty}% + {\expandafter\gl@p\csname sw@list@edtext@\the\@edtext@level\endcsname\to\sw@inthisedtext}% + \csxdef{edtext@later@\the\edtext@later}{% + \noexpand\edtext{% + }% + {% + \unexpanded{% + \lemma{\no@expands #1}% + \xxref{start:edtext:later:\the\edtext@later}{end:edtext:later:\the\edtext@later}% + }% + \noexpand\linenum{||||||\edfont@info}% + \unexpanded{\def\sw@inthisedtext}{\expandonce{\sw@inthisedtext}}% + \ifledRcol% + \unexpanded{\appto\@beforeinsertofthisedtext{\ledRcol@true}}% + \else% + \unexpanded{\appto\@beforeinsertofthisedtext{\ledRcol@false}}% + \fi% + \unexpanded{#2}% + }% + }% + \edlabel{start:edtext:later:\the\edtext@later}% + \flag@start@later% + \bgroup% + \def\lemma##1{% + \ifledRcol% + \write\linenum@outR{\string\@lemma}% + \else% + \write\linenum@out{\string\@lemma}% + \fi% + }% + \renewcommand{\do}[1]{\expandafter\renewcommandx\csname ##1footnote\endcsname[2][1,usedefault]{}}% + \dolistloop{\@series}% + #2% + \egroup% + \showlemma{#1}% + \edlabel{end:edtext:later:\the\edtext@later}% + \flag@end@later% + \advance\@edtext@level by -\@ne% +}% +\newcommand{\edtextnow}[0]{% + \global\advance\edtext@now by \@ne + \csuse{edtext@later@\the\edtext@now}% +}% \list@create{\labelref@listR} \def\l@dmake@labelsR#1|#2|#3|#4|#5{% @@ -1701,7 +1757,6 @@ \fi% } - \newif\ifinserthangingsymbolR \newcommand{\inserthangingsymbolL}{% \ifinserthangingsymbol% @@ -2375,7 +2430,13 @@ \global\instanzaLfalse% \global\instanzaRfalse% \global\l@dprintingpagesfalse% - \finish@Pages@notes%Needed to prevent final notes overlap line number + \ifnum\edtext@later=\edtext@now% + \else% + \led@error@edtext@later@now% + \fi% + \global\edtext@later=\z@% + \global\edtext@now=\z@% + \finish@Pages@notes% \ignorespaces\fi} \newcommand{\finish@Pages@notes}{% |