reledmac (17jul17)

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

2 files changed, 68 insertions, 49 deletions

diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index 3b9ec62d8d3..90b7a28245a 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
@@ -1211,13 +1211,14 @@
   \first@linenum@out@true
 \newcommand{\this@line@list@version}{6}%
 \newcommand*{\line@list@stuff}[1]{%
+  \global\newtoggle{notfirstrun@#1}%
   \read@linelist{#1}%
-
   \iffirst@linenum@out@
      \immediate\closeout\linenum@out%
      \global\first@linenum@out@false%
      \immediate\openout\linenum@out=\l@auxdir#1\relax%
      \immediate\write\linenum@out{\string\line@list@version{\this@line@list@version}}%
+     \immediate\write\linenum@out{\string\global\string\toggletrue{notfirstrun@#1}}%
      \ifl@dpaging%
        \immediate\write\linenum@out{\string\@par@sync@option{\@par@this@sync@option}}%
      \fi%
@@ -1228,6 +1229,7 @@
      \closeout\linenum@out%
      \openout\linenum@out=\l@auxdir#1\relax%
      \write\linenum@out{\string\line@list@version{\this@line@list@version}}%
+     \protected@write\linenum@out{}{\string\global\string\toggletrue{notfirstrun@#1}}%
      \ifl@dpaging%
        \write\linenum@out{\string\@par@sync@option{\@par@this@sync@option}}%
      \fi%
@@ -2299,12 +2301,15 @@
     \fi}
 
 \newcommand*{\flush@notes}{%
-  \@xloop
-    \ifx\inserts@list\empty \else
-      \gl@p\inserts@list\to\@insert
-      \@insert
-      \global\let\@insert=\undefined
-  \repeat}
+  \iftoggle{notfirstrun@\jobname.\extensionchars\the\section@num}{%
+    \@xloop%
+      \ifx\inserts@list\empty \else%
+        \gl@p\inserts@list\to\@insert%
+        \@insert%
+        \global\let\@insert=\undefined%
+    \repeat%
+  }{}%
+}%
 
 \def\@xloop#1\repeat{%
   \def\body{#1\expandafter\body\fi}%
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index 007908d4171..8c478361bbf 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -701,12 +701,14 @@
 \newif\iffirst@linenum@out@R
   \first@linenum@out@Rtrue
 \newcommand*{\line@list@stuffR}[1]{%
+  \global\newtoggle{notfirstrun@#1}%
   \read@linelist{#1}%
   \iffirst@linenum@out@R
      \immediate\closeout\linenum@outR
      \global\first@linenum@out@Rfalse
      \immediate\openout\linenum@outR=\l@auxdir#1%
      \immediate\write\linenum@outR{\string\line@list@version{\this@line@list@version}}%
+     \immediate\write\linenum@outR{\string\global\string\toggletrue{notfirstrun@#1}}%
      \ifl@dpaging%
        \immediate\write\linenum@outR{\string\@par@sync@option{\@par@this@sync@option}}%
      \fi%
@@ -716,6 +718,7 @@
      \fi%
      \closeout\linenum@outR%
      \openout\linenum@outR=\l@auxdir#1%
+     \protected@write\linenum@outR{}{\string\global\string\toggletrue{notfirstrun@#1}}%
   \fi}
 
 \newcommand*{\new@lineL}{%
@@ -1734,12 +1737,15 @@
 \newcommand*{\add@penaltiesR}{}
 
 \newcommand*{\flush@notesR}{%
-  \@xloop
-    \ifx\inserts@listR\empty \else
-      \gl@p\inserts@listR\to\@insertR
-      \@insertR
-      \global\let\@insertR=\undefined
-  \repeat}
+  \iftoggle{notfirstrun@\jobname.\extensionchars\the\section@numR R}{%
+    \@xloop%
+      \ifx\inserts@listR\empty \else%
+        \gl@p\inserts@listR\to\@insertR%
+        \@insertR%
+        \global\let\@insertR=\undefined%
+    \repeat%
+   }{}%
+}%
 
 
 \newcommand\print@Xnotes@forpages[1]{%
@@ -2345,16 +2351,16 @@
     \IfStrEq{\led@pb@setting}{before}{
     \numdef{\next@absline}{\the\absline@num+1}%
     \numdef{\next@abslineR}{\the\absline@numR+1}%
-  \xifinlistcs{\next@absline}{l@prev@pb}{\@pbtrue}{}%
-  \xifinlistcs{\next@abslineR}{l@prev@pbR}{\@pbtrue}{}
-  \xifinlistcs{\next@absline}{l@prev@nopb}{\@nopbtrue}{}%
-  \xifinlistcs{\next@abslineR}{l@prev@nopbR}{\@nopbtrue}{}
+  \xifinlist{\next@absline}{\l@prev@pb}{\@pbtrue}{}%
+  \xifinlist{\next@abslineR}{\l@prev@pbR}{\@pbtrue}{}
+  \xifinlist{\next@absline}{\l@prev@nopb}{\@nopbtrue}{}%
+  \xifinlist{\next@abslineR}{\l@prev@nopbR}{\@nopbtrue}{}
   }{}
     \IfStrEq{\led@pb@setting}{after}{
-  \xifinlistcs{\the\absline@num}{l@prev@pb}{\@pbtrue}{}%
-  \xifinlistcs{\the\absline@numR}{l@prev@pbR}{\@pbtrue}{}
-  \xifinlistcs{\the\absline@num}{l@prev@nopb}{\@nopbtrue}{}%
-  \xifinlistcs{\the\absline@numR}{l@prev@nopbR}{\@nopbtrue}{}
+  \xifinlist{\the\absline@num}{\l@prev@pb}{\@pbtrue}{}%
+  \xifinlist{\the\absline@numR}{\l@prev@pbR}{\@pbtrue}{}
+  \xifinlist{\the\absline@num}{\l@prev@nopb}{\@nopbtrue}{}%
+  \xifinlist{\the\absline@numR}{\l@prev@nopbR}{\@nopbtrue}{}
   }{}
 \if@nopb\nopagebreak[4]\enlargethispage{\baselineskip}\fi
 \if@pb\pagebreak[4]\fi
@@ -2879,48 +2885,56 @@
 
 \newcommand{\checkpbL}{
    \IfStrEq{\led@pb@setting}{after}{
-     \xifinlistcs{\the\absline@num}{l@prev@pb}{\l@dpagefulltrue\l@dsamepagefalse}{}
-     \xifinlistcs{\the\absline@num}{l@prev@nopb}{\l@dpagefullfalse\l@dsamepagetrue}{}
+     \xifinlist{\the\absline@num}{\l@prev@pb}{\l@dpagefulltrue\l@dsamepagefalse}{}
+     \xifinlist{\the\absline@num}{\l@prev@nopb}{\l@dpagefullfalse\l@dsamepagetrue}{}
    }{}
    \IfStrEq{\led@pb@setting}{before}{
      \numdef{\next@absline}{\the\absline@num+1}
-     \xifinlistcs{\next@absline}{l@prev@pb}{\l@dpagefulltrue\l@dsamepagefalse}{}
-     \xifinlistcs{\next@absline}{l@prev@nopb}{\l@dpagefullfalse\l@dsamepagetrue}{}
+     \xifinlist{\next@absline}{\l@prev@pb}{\l@dpagefulltrue\l@dsamepagefalse}{}
+     \xifinlist{\next@absline}{\l@prev@nopb}{\l@dpagefullfalse\l@dsamepagetrue}{}
    }{}
 }
 
 \newcommand{\checkpbR}{
    \IfStrEq{\led@pb@setting}{after}{
-     \xifinlistcs{\the\absline@numR}{l@prev@pbR}{\l@dpagefulltrue\l@dsamepagefalse}{}
-     \xifinlistcs{\the\absline@numR}{l@prev@nopbR}{\l@dpagefullfalse\l@dsamepagetrue}{}
+     \xifinlist{\the\absline@numR}{\l@prev@pbR}{\l@dpagefulltrue\l@dsamepagefalse}{}
+     \xifinlist{\the\absline@numR}{\l@prev@nopbR}{\l@dpagefullfalse\l@dsamepagetrue}{}
      }{}
    \IfStrEq{\led@pb@setting}{before}{
      \numdef{\next@abslineR}{\the\absline@numR+1}
-     \xifinlistcs{\next@abslineR}{l@prev@pbR}{\l@dpagefulltrue\l@dsamepagefalse}{}
-     \xifinlistcs{\next@abslineR}{l@prev@nopbR}{\l@dpagefullfalse\l@dsamepagetrue}{}
+     \xifinlist{\next@abslineR}{\l@prev@pbR}{\l@dpagefulltrue\l@dsamepagefalse}{}
+     \xifinlist{\next@abslineR}{\l@prev@nopbR}{\l@dpagefullfalse\l@dsamepagetrue}{}
    }{}
 }
-\newcommand{\checkverseL}{
-\ifinstanzaL
-  \iflednopbinverse
-    \ifinserthangingsymbol
-      \numgdef{\prev@abslineverse}{\the\absline@num-1}
-      \IfStrEq{\led@pb@setting}{after}{\lednopbnum{\prev@abslineverse}}{}
-      \IfStrEq{\led@pb@setting}{before}{\ifnum\numpagelinesL<3\ledpbnum{\prev@abslineverse}\fi}{}
-    \fi
-  \fi
-\fi
+\newcommand{\checkverseL}{%
+\ifinstanzaL%
+  \iflednopbinverse%
+    \ifinserthangingsymbol%
+      \numgdef{\prev@abslineverse}{\the\absline@num-1}%
+      \IfStrEq{\led@pb@setting}{after}{\lednopbnum{\prev@abslineverse}}{}%
+      \IfStrEq{\led@pb@setting}{before}{%
+        \ifnum\numpagelinesL<3%
+          \ledpbnum{\prev@abslineverse}%
+        \fi%
+      }{}%
+    \fi%
+  \fi%
+\fi%
 }
-\newcommand{\checkverseR}{
-\ifinstanzaR
-  \iflednopbinverse
-    \ifinserthangingsymbolR
-      \numgdef{\prev@abslineverse}{\the\absline@numR-1}
-      \IfStrEq{\led@pb@setting}{after}{\lednopbnumR{\prev@abslineverse}}{}
-      \IfStrEq{\led@pb@setting}{before}{\ifnum\numpagelinesR<3\ledpbnumR{\prev@abslineverse}\fi}{}
-    \fi
-  \fi
-\fi
+\newcommand{\checkverseR}{%
+\ifinstanzaR%
+  \iflednopbinverse%
+    \ifinserthangingsymbolR%
+      \numgdef{\prev@abslineverse}{\the\absline@numR-1}%
+      \IfStrEq{\led@pb@setting}{after}{\lednopbnumR{\prev@abslineverse}}{}%
+      \IfStrEq{\led@pb@setting}{before}{%
+        \ifnum\numpagelinesR<3%
+          \ledpbnumR{\prev@abslineverse}%
+        \fi%
+      }{}%
+    \fi%
+  \fi%
+\fi%
 }
 \newdimen\ledthegoal
 \ifshiftedpstarts