diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac/reledmac.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 53666177709..37620b969f7 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}[2018/05/02 v2.26.9 typesetting critical editions]% +\ProvidesPackage{reledmac}[2018/05/05 v2.26.10 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -163,6 +163,14 @@ \reledmac@error{Numbering should already have been started}{\@ehc}} \newcommand*{\led@err@edtextoutsidepstart}{% \reledmac@error{\string\edtext\space outside numbered paragraph (\pstart\space …\space\pend)}{\@ehc}}% + +\newcommand{\led@err@PstartInEdtext}[1]{% + \reledmac@error{\string\pstart\space in \string\edtext\space #1 argument}{\@ehc}% +}% + +\newcommand{\led@err@PendInEdtext}[1]{% + \reledmac@error{\string\pend\space in \string\edtext\space #1 argument}{\@ehc}% +}% \newcommand*{\led@mess@NotesChanged}{% \typeout{reledmac reminder: }% \typeout{ The number of the footnotes in this section @@ -1536,23 +1544,24 @@ \renewcommand{\theedtext}{edtxt@\arabic{edtext}}% \newcommand{\edtext}[2]{\leavevmode% \ifnumberedpar@% + \@check@edtext@args{#1}{#2}% \global\advance\@edtext@level by 1% \stepcounter{edtext}% \csxdef{thisedtext@\the\@edtext@level}{\theedtext}% \global\@lemmacommand@false% \begingroup% - \ifledRcol% - \ifcsvoid{sw@list@edtextR@\the\@edtext@level}% - {\global\let\sw@inthisedtext\empty}% - {\expandafter\gl@p\csname sw@list@edtextR@\the\@edtext@level\endcsname\to\sw@inthisedtext}% - \else% - \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}% - \fi% + \ifledRcol% + \ifcsvoid{sw@list@edtextR@\the\@edtext@level}% + {\global\let\sw@inthisedtext\empty}% + {\expandafter\gl@p\csname sw@list@edtextR@\the\@edtext@level\endcsname\to\sw@inthisedtext}% + \else% + \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}% + \fi% \global\renewcommand{\@tag}{% \no@expands #1% - }% + }% \set@line% \ifledRcol \global\insert@countR \z@% \else \global\insert@count \z@ \fi% @@ -1600,6 +1609,15 @@ \fi% }% +\newcommand{\@check@edtext@args}[2]{% + \begingroup% + \noexpandarg% + \IfSubStr{#1}{\pstart}{\led@err@PstartInEdtext{first}}{}% + \IfSubStr{#1}{\pend}{\led@err@PendInEdtext{first}}{}% + \IfSubStr{#2}{\pstart}{\led@err@PstartInEdtext{second}}{}% + \IfSubStr{#2}{\pend}{\led@err@PendInEdtext{second}}{}% + \endgroup% +}% \let\@beforeinsertofthisedtext\relax \newif\ifnumberline \numberlinetrue @@ -5853,14 +5871,7 @@ }% \newcommand{\par@patch@pagenumbering}{% - \ifboolexpr{% - bool{sameparallelpagenumber}% - or bool{prevpgnotnumbered}% - }% - {% - \setcounter{par@page}{1}% - }% - {}% + \setcounter{par@page}{1}% \par@patch@thepage% }% |