diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac/reledmac.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 68 |
1 files changed, 50 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 6e316833d48..4c220410475 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/06/28 v2.13.3 typeset critical editions]% +\ProvidesPackage{reledmac}[2016/07/01 v2.14.0 typeset critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -494,14 +494,14 @@ \else \def\@tempb{section} \ifx\@tempa\@tempb - \global\bypage@false - \global\bypstart@false - \unless\ifnocritical@% - \Xpstart[][false]% - \fi% - \else + \global\bypage@false + \global\bypstart@false + \unless\ifnocritical@% + \Xpstart[][false]% + \fi% + \else \led@warn@BadLineation - \fi + \fi \fi \fi \fi}} @@ -1150,10 +1150,14 @@ \ifsublines@ \the\subline@num \else 0\fi|% \the\endpage@num|\the\endline@num|% \ifsublines@ \the\endsubline@num \else 0\fi}\to\line@list + \@ref@reg@parse{#2}% + \global\advance\@edtext@level by -1% +} +\newcommand{\@ref@reg@parse}[1]{% \expandafter\list@create\expandafter{\csname sw@list@edtext@tmp@\the\@edtext@level\endcsname}% \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@edtext@\the\@edtext@level\endcsname}}% \ifcsundef{sw@list@edtext@\the\@edtext@level}{\create@this@edtext@level}{}% @@ -1162,9 +1166,17 @@ \xright@appenditem{\expandonce\@tmpp}\to\@tmp% \global\cslet{sw@list@edtext@\the\@edtext@level}{\@tmp}% \fi% - \global\advance\@edtext@level by -1% } +\newcommand{\@ref@later}[1]{% + \global\advance\@edtext@level by \@ne% + \ifledRcol% + \@ref@reg@parseR{#1}% + \else% + \@ref@reg@parse{#1}% + \fi% + \global\advance\@edtext@level by -\@ne% +}% \newwrite\linenum@out \newif\iffirst@linenum@out@ \first@linenum@out@true @@ -1240,6 +1252,27 @@ \fi% \fi}% +\newcommand*{\flag@end}{% + \ifledRcol% + \write\linenum@outR{]}% + \else% + \write\linenum@out{]}% + \fi}% + +\newcommand*{\flag@start@later}{% + \ifledRcol% + \write\linenum@outR{\string\@ref@later[}% + \else% + \write\linenum@out{\string\@ref@later[}% + \fi% +}% +\newcommand{\flag@end@later}{% + \ifledRcol% + \write\linenum@outR{]}% + \else% + \write\linenum@out{]}% + \fi% +} \newcommand*{\startsub}{\dimen0\lastskip \ifdim\dimen0>0pt \unskip \fi @@ -1388,18 +1421,13 @@ \global\@noneed@Footnotefalse% \global\advance\@edtext@level by -1% \global\@lemmacommand@false% + \global\let\@beforeinsertofthisedtext\relax% \else% \showlemma{#1} (\textbf{\textsc{Edtext outside numbered paragraph}})\led@err@edtextoutsidepstart% \fi% }% -\newcommand*{\flag@end}{% - \ifledRcol% - \write\linenum@outR{]}% - \else% - \write\linenum@out{]}% - \fi}% - +\let\@beforeinsertofthisedtext\relax \newif\ifnumberline \numberlinetrue \newcommand*{\set@line}{% @@ -4232,6 +4260,7 @@ \noexpand\setcounter{stanzaR}{\the\c@stanzaR}%Save stanzaR counter for footnote \unexpanded{\def\@this@crossref@start}{\theedtext:start}% \unexpanded{\def\@this@crossref@end}{\theedtext:end}% + \expandonce{\@beforeinsertofthisedtext}% Internal for now, no reason to make it public \noexpand\csuse{v#1footnote}{#1}% {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}% \noexpand\Xnote@false% @@ -4264,12 +4293,13 @@ \noexpand\Xnote@true% \noexpand\prepare@Xprenotes{#1}% \noexpand\prepare@edindex@fornote{\l@d@nums}% - \unexpanded{\def\sw@list@inedtext}{\expandafter\unexpanded\expandafter{\sw@inthisedtext}}%The value of the \sw@inthisedtext of current edtext will be pushed to \sw@list@inedtext when the notes are expanded. + \unexpanded{\def\sw@list@inedtext}{\expandafter\unexpanded\expandafter{\sw@inthisedtext}}%The value of the \sw@inthisedtext of current edtext will be pushed to \sw@list@inedtext when the notes are expanded. \ifl@dpairing% \noexpand\setcounter{stanzaL}{\the\c@stanzaL}%Save stanzaR counter for footnote \fi% \unexpanded{\def\@this@crossref@start}{\theedtext:start}% \unexpanded{\def\@this@crossref@end}{\theedtext:end}% + \expandonce{\@beforeinsertofthisedtext}%Internal for now, no reason to make it public \noexpand\csuse{v#1footnote}% {#1}% {{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}% @@ -5105,6 +5135,8 @@ \fi% \letcs{\@tempa}{the@@label#1}% \letcs{\@tempb}{the@@label#2}% + \global\appto\@beforeinsertofthisedtext{\def\@this@crossref@start{#1}}% + \global\appto\@beforeinsertofthisedtext{\def\@this@crossref@end{#2}}% \linenum{\@tempa|% \@tempb}}}% |