reledmac (5may18)

git-svn-id: svn://tug.org/texlive/trunk@47622 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 46 insertions, 21 deletions

diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
index a0d7c036ace..d6cb63df18a 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
@@ -510,6 +510,8 @@
 % \changes{v2.26.9}{2018/05/02}{Fix bug with critical footnotes line number when alternating between \protect\cs{numberlinefalse} and \protect\cs{numberlinetrue}.}
 % \changes{v2.26.9}{2018/05/02}{Fix bug with page number in footnote after \protect\cs{mainmatter} (bug introduced in v2.26.7)}
 % \changes{v2.26.9}{2018/05/02}{Workaround with a bug of \protect\LaTeX 2018/04/01 patch level 3 to generate the .sty file from a .ins file}
+% \changes{v2.26.10}{2018/05/05}{Really fix bug with page number in footnote after \protect\cs{mainmatter} (bug introduced in v2.26.7)}
+% \changes{v2.26.10}{2018/05/05}{Add error message when insertion a \protect\cs{pstart} or \protect\cs{pend} inside \protect\cs{edtext} arguments}
 %      Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
 % has version number \fileversion, last revised \filedate.}}
 %
@@ -4188,7 +4190,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2018/05/02 v2.26.9 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2018/05/05 v2.26.10 typesetting critical editions]%
 %    \end{macrocode}
 %
 % \subsection{Package options}
@@ -4453,11 +4455,23 @@
 % \end{macro}
 %
 % \begin{macro}{\led@err@edtextoutsidepstart}
+% \begin{macro}{\led@err@PstartInEdtext}
+% \begin{macro}{\led@err@PendInEdtext}
 %    \begin{macrocode}
 \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}%
+}%
 %    \end{macrocode}
 % \end{macro}
+% \end{macro}
+% \end{macro}
 % \begin{macro}{\led@mess@NotesChanged}
 %    \begin{macrocode}
 \newcommand*{\led@mess@NotesChanged}{%
@@ -7729,7 +7743,11 @@
 %    \begin{macrocode}
   \ifnumberedpar@%
 %    \end{macrocode}
-% we increment the \cs{@edtext@level} \TeX\ counter to know in which level of \protect\cs{edtext} we are.
+% Check the content of the arguments, to be certain there is no forbidden command inside.
+%    \begin{macrocode}%
+      \@check@edtext@args{#1}{#2}%
+%    \end{macrocode}
+% We increment the \cs{@edtext@level} \TeX\ counter to know in which level of \protect\cs{edtext} we are.
 %    \begin{macrocode}
       \global\advance\@edtext@level by 1%
 %    \end{macrocode}
@@ -7749,15 +7767,15 @@
 %    \end{macrocode}
 % We get the next series of samewords data in the list of samewords data for the current edtext level. We push them inside \protect\cs{sw@inthisedtext}.
 %    \begin{macrocode}
-      \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%
 %    \end{macrocode}
 % \begin{macro}{\@tag}
 % \label{@tag}Our normal lemma is just argument \verb"#1"; but that argument could have
@@ -7774,7 +7792,7 @@
 %    \begin{macrocode}
         \global\renewcommand{\@tag}{%
           \no@expands #1%
-          }%
+        }%
 %    \end{macrocode}
 % \end{macro}
 % \begin{macro}{\l@d@nums}
@@ -7890,8 +7908,22 @@
 
 %    \end{macrocode}
 % \end{macro}
-%
+% \begin{macro}{\@check@edtext@args}
+% A macro which just checks the arguments of the \cs{edtext} and let know
+% if there is some probleme, like, for example, \cs{pstart} inside.
+%    \begin{macrocode}
+\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%
+}%
 % 
+%    \end{macrocode}
+% \end{macro}
 % \begin{macro}{\@beforeinsertofthisedtext}
 % \cs{@beforeinsertofthisedtext} is an internal macro. \macpackage\ or \parpackage can add in this macro any content required to be executed before doing any \cs{insert} related to a \cs{edtext}.
 % Its content is \cs{let} equal to \cs{relax} at the end of every \cs{edtext}.
@@ -15482,14 +15514,7 @@
 }%
 
 \newcommand{\par@patch@pagenumbering}{%
-  \ifboolexpr{%
-    bool{sameparallelpagenumber}%
-    or bool{prevpgnotnumbered}%
-    }%
-    {%
-    \setcounter{par@page}{1}%
-    }%
-    {}%
+  \setcounter{par@page}{1}%
   \par@patch@thepage%
 }%