reledmac (28feb18)

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

2 files changed, 39 insertions, 17 deletions

diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index c9aa1e66add..1e6b2346737 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/01/28 v2.26.5 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2018/02/28 v2.26.6 typesetting critical editions]%
 \RequirePackage{xkeyval}
 \newif\ifparledgroup
 \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -421,6 +421,7 @@
   \global\sub@lock \z@
   \global\sublines@false
   \global\let\next@page@num=\relax
+  \global\let\this@section@next@page@num=\relax%
   \global\let\sub@change=\relax
   \global\last@page@num=-10000%
   \ifdefined\line@numR%
@@ -441,6 +442,9 @@
     \ifnum\l@dnumpstartsL=0%
       \led@err@NumberingWithoutPstart%
     \fi%
+    \global\page@num=\this@section@page@num%
+    \global\last@page@num=\this@section@last@page@num%
+    \global\let\next@page@num\this@section@next@page@num%
     \ifl@dpairing
       \global\pst@rtedLfalse
     \else
@@ -468,10 +472,10 @@
 }
 \newcount\pausenumbering@page@num%
 \newcommand{\pausenumbering}{%
-  \ifx\next@page@num\relax%
+  \ifx\this@section@next@page@num\relax%
     \global\pausenumbering@page@num=0%
   \else%
-    \global\pausenumbering@page@num=\next@page@num%
+    \global\pausenumbering@page@num=\this@section@next@page@num%
   \fi%
   \ifautopar\global\autopar@pausetrue\fi%
   \endnumbering\global\numberingtrue}
@@ -754,6 +758,7 @@
 \newcount\endpage@num
 \newcount\endline@num
 \newcount\endsubline@num
+\newcount\this@section@page@num%
 \newif\ifnoteschanged@
 \newcommand*{\resetprevline@}{%
     \def\do##1{\global\csundef{prevline##1}}%
@@ -842,7 +847,7 @@
 }%
 
 \newcommand*{\@nl}[2]{%
-  \fix@page{#1}%
+  \@page{#1}%
   \ifledRcol%
     \@nl@regR%
   \else%
@@ -898,7 +903,10 @@
 \newcount\last@page@num
   \last@page@num=-10000
 
-\newcommand*{\fix@page}[1]{%
+\newcount\this@section@last@page@num%
+  \this@section@last@page@num=-10000%
+
+\newcommand*{\@page}[1]{%
   \ifledRcol
     \ifnum #1=\last@page@numR
     \else
@@ -918,9 +926,12 @@
           }%
         \fi%
       \fi
-      \global\page@numR=#1%
-      \global\last@page@numR=#1%
-      \global\def\next@page@numR{#1}%
+      \page@numR=#1%
+      \this@section@page@numR=#1%
+      \last@page@numR=#1%
+      \this@section@last@page@numR=#1%
+      \def\next@page@numR{#1}%
+      \gdef\this@section@next@page@numR{#1}%
     \fi
   \else
     \ifnum #1=\last@page@num
@@ -929,13 +940,17 @@
       \csnumgdef{@lastline@forpage@\the\page@num}{\the\line@num}%
       \ifbypage@
         \ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum
-          \line@num \z@ \subline@num \z@%
+          \line@num \z@%
+          \subline@num \z@%
           \global\csdef{reset@line\the\numexpr\absline@num+1\relax @\the\section@num}{}%
         \fi%
       \fi
-      \global\page@num=#1%
-      \global\last@page@num=#1%
-      \global\def\next@page@num{#1}%
+      \page@num=#1%
+      \global\this@section@page@num=#1%
+      \last@page@num=#1%
+      \global\this@section@last@page@num=#1%
+      \def\next@page@num{#1}%
+      \gdef\this@section@next@page@num{#1}%
       \listxadd{\normal@page@break}{\the\absline@num}
     \fi
   \fi}
@@ -2170,7 +2185,8 @@
          {\global\@firstlineofpagetrue}%
        \ifcsdef{reset@line\the\absline@num @\the\section@num}%
          {%
-         \global\line@num=\z@ \global\subline@num=\z@%
+         \global\line@num=\z@%
+         \global\subline@num=\z@%
          \resetprevline@%
          }%
          {}%
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index c9e83f816ff..e4fabf2e8cf 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -28,7 +28,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2018/01/28 v2.21.4 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2018/02/28 v2.21.5 reledmac extension for parallel texts]%
 
 \RequirePackage{xspace}%
 \RequirePackage{xkeyval}
@@ -203,6 +203,7 @@
   \global\sub@lockR \z@
   \global\sublines@Rfalse
   \global\let\next@page@numR\relax
+  \global\let\this@section@next@page@numR\relax%
   \global\let\sub@change\relax
   \global\last@page@numR=-10000%
   \global\stopmsdata@inserted@true%
@@ -242,6 +243,9 @@
     \ifnum\l@dnumpstartsR=0%
       \led@err@NumberingWithoutPstart%
     \fi%
+    \global\page@numR=\this@section@page@numR%
+    \global\last@page@numR=\this@section@last@page@numR%
+    \global\let\next@page@numR\this@section@next@page@numR%
     \ifl@dpairing
       \global\pst@rtedRfalse
     \else
@@ -298,10 +302,10 @@
 }%
 \newcount\pausenumbering@page@numR%
 \newcommand*{\pausenumberingR}{%
-  \ifx\next@page@numR\relax%
+  \ifx\this@section@next@page@numR\relax%
     \global\pausenumbering@page@numR=0%
   \else%
-    \global\pausenumbering@page@numR=\next@page@numR%
+    \global\pausenumbering@page@numR=\this@section@next@page@numR%
   \fi%
   \endnumberingR%
   \global\numberingRtrue%
@@ -533,7 +537,7 @@
 \list@create{\actions@listR}
 \list@create{\annot@listR}%
 \newcount\page@numR
-
+\newcount\this@section@page@numR%
 \list@create{\linesinpar@listL}
 \list@create{\linesinpar@listR}
 \list@create{\maxlinesinpar@list}
@@ -605,6 +609,8 @@
 
 \newcount\last@page@numR
   \last@page@numR=-10000
+\newcount\this@section@last@page@numR%
+  \this@section@last@page@numR=-10000%