texlive[44833] Master/texmf-dist: reledmac (17jul17)
commits+karl at tug.org
commits+karl at tug.org
Mon Jul 17 23:28:44 CEST 2017
Revision: 44833
http://tug.org/svn/texlive?view=revision&revision=44833
Author: karl
Date: 2017-07-17 23:28:44 +0200 (Mon, 17 Jul 2017)
Log Message:
-----------
reledmac (17jul17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/migration.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/migration.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2017-07-17 21:28:18 UTC (rev 44832)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2017-07-17 21:28:44 UTC (rev 44833)
@@ -481,6 +481,7 @@
% \changes{v2.22.0}{2017/06/08}{Add \protect\cs{txtbeforenotesonlyonceX} and \protect\cs{Xtxtbeforenotesonlyonce} hooks.}
% \changes{v2.22.1}{2017/07/07}{Compatibility with new version of \protect\reledpar.}
% \changes{v2.22.1}{2017/07/07}{Fix bug with some commands inside \protect\cs{sameword}.}
+% \changes{v2.22.2}{2017/07/17}{Do not print footnotes at the first run.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -6774,8 +6775,11 @@
% \begin{macrocode}
\newcommand*{\line at list@stuff}[1]{%
% \end{macrocode}
-%
-% First, use the commands of the previous section to interpret the
+% First, define a toggle set to true when we are not in the first run.
+ \global\newtoggle{notfirstrun@#1}%
+% \begin{macrocode}
+% \end{macrocode}
+% Use the commands of the previous section to interpret the
% line-list file from the last run.
% \begin{macrocode}
\read at linelist{#1}%
@@ -6788,7 +6792,6 @@
% \protect\cs{line at list@stuff}}
% \changes{v0.7.0}{2005/02/25}{Deleted \protect\cs{page at start} from \protect\cs{line at list@stuff}}
% \changes{v1.15.1}{2015/01/16}{Revert modification of 1.5.2 which makes bug with numbering. Leave vertical mode to solve spurious space before minipage.}
-
% \begin{macrocode}
\iffirst at linenum@out@
\immediate\closeout\linenum at out%
@@ -6795,6 +6798,7 @@
\global\first at linenum@out at false%
\immediate\openout\linenum at out=\l at auxdir#1\relax%
\immediate\write\linenum at out{\string\line at list@version{\this at line@list at version}}%
+ \immediate\write\linenum at out{\string\global\string\toggletrue{notfirstrun@#1}}%
\ifl at dpaging%
\immediate\write\linenum at out{\string\@par at sync@option{\@par at this@sync at option}}%
\fi%
@@ -6810,6 +6814,7 @@
\closeout\linenum at out%
\openout\linenum at out=\l at auxdir#1\relax%
\write\linenum at out{\string\line at list@version{\this at line@list at version}}%
+ \protected at write\linenum at out{}{\string\global\string\toggletrue{notfirstrun@#1}}%
\ifl at dpaging%
\write\linenum at out{\string\@par at sync@option{\@par at this@sync at option}}%
\fi%
@@ -9305,15 +9310,22 @@
% of the paragraph. We can hope that is not
% too far from the proper location, to which they will move on the next
% run.
+% First the first run, we don't flush the notes,
+% as that means all the notes will be added at the end of numbered section,
+% and so, very far of the expected position
% \begin{macrocode}
\newcommand*{\flush at notes}{%
- \@xloop
- \ifx\inserts at list\empty \else
- \gl at p\inserts at list\to\@insert
- \@insert
- \global\let\@insert=\undefined
- \repeat}
+ \iftoggle{notfirstrun@\jobname.\extensionchars\the\section at num}{%
+ \@xloop%
+ \ifx\inserts at list\empty \else%
+ \gl at p\inserts at list\to\@insert%
+ \@insert%
+ \global\let\@insert=\undefined%
+ \repeat%
+ }{}%
+}%
+
% \end{macrocode}
% \end{macro}
%
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2017-07-17 21:28:18 UTC (rev 44832)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2017-07-17 21:28:44 UTC (rev 44833)
@@ -307,6 +307,8 @@
% \changes{v2.19.0}{2017/06/08}{Compatibility with v2.22.0 of \protect\reledmac.}
% \changes{v2.19.1}{2017/06/15}{Fix bug with \protect\cs{edtext} in sectioning command with shiftedpstarts mode.}
% \changes{v2.19.2}{2017/07/07}{\protect\option{continuousnumberingwithcolumns} works also for pstart number.}
+% \changes{v2.19.3}{2017/07/17}{Fix a bug with \protect\option{nopbinverse} when using consecutive \protect\cs{Pages}.}
+% \changes{v2.19.3}{2017/07/17}{Do not print footnotes at the first run.}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -2804,6 +2806,7 @@
% \changes{v1.10.1}{2015/01/16}{Revert modification of 1.4.2, which makes bugs with numbering. Leave vertical mode to solve spurious space before minipage.}
% \begin{macrocode}
\newcommand*{\line at list@stuffR}[1]{%
+ \global\newtoggle{notfirstrun@#1}%
\read at linelist{#1}%
\iffirst at linenum@out at R
\immediate\closeout\linenum at outR
@@ -2810,6 +2813,7 @@
\global\first at linenum@out at Rfalse
\immediate\openout\linenum at outR=\l at auxdir#1%
\immediate\write\linenum at outR{\string\line at list@version{\this at line@list at version}}%
+ \immediate\write\linenum at outR{\string\global\string\toggletrue{notfirstrun@#1}}%
\ifl at dpaging%
\immediate\write\linenum at outR{\string\@par at sync@option{\@par at this@sync at option}}%
\fi%
@@ -2819,6 +2823,7 @@
\fi%
\closeout\linenum at outR%
\openout\linenum at outR=\l at auxdir#1%
+ \protected at write\linenum at outR{}{\string\global\string\toggletrue{notfirstrun@#1}}%
\fi}
% \end{macrocode}
@@ -4581,13 +4586,17 @@
% and sent on to the vertical list.
% \begin{macrocode}
\newcommand*{\flush at notesR}{%
- \@xloop
- \ifx\inserts at listR\empty \else
- \gl at p\inserts at listR\to\@insertR
- \@insertR
- \global\let\@insertR=\undefined
- \repeat}
+ \iftoggle{notfirstrun@\jobname.\extensionchars\the\section at numR R}{%
+ \@xloop%
+ \ifx\inserts at listR\empty \else%
+ \gl at p\inserts at listR\to\@insertR%
+ \@insertR%
+ \global\let\@insertR=\undefined%
+ \repeat%
+ }{}%
+}%
+
% \end{macrocode}
% \end{macro}
%
@@ -5715,16 +5724,16 @@
\IfStrEq{\led at pb@setting}{before}{
\numdef{\next at absline}{\the\absline at num+1}%
\numdef{\next at abslineR}{\the\absline at numR+1}%
- \xifinlistcs{\next at absline}{l at prev@pb}{\@pbtrue}{}%
- \xifinlistcs{\next at abslineR}{l at prev@pbR}{\@pbtrue}{}
- \xifinlistcs{\next at absline}{l at prev@nopb}{\@nopbtrue}{}%
- \xifinlistcs{\next at abslineR}{l at prev@nopbR}{\@nopbtrue}{}
+ \xifinlist{\next at absline}{\l at prev@pb}{\@pbtrue}{}%
+ \xifinlist{\next at abslineR}{\l at prev@pbR}{\@pbtrue}{}
+ \xifinlist{\next at absline}{\l at prev@nopb}{\@nopbtrue}{}%
+ \xifinlist{\next at abslineR}{\l at prev@nopbR}{\@nopbtrue}{}
}{}
\IfStrEq{\led at pb@setting}{after}{
- \xifinlistcs{\the\absline at num}{l at prev@pb}{\@pbtrue}{}%
- \xifinlistcs{\the\absline at numR}{l at prev@pbR}{\@pbtrue}{}
- \xifinlistcs{\the\absline at num}{l at prev@nopb}{\@nopbtrue}{}%
- \xifinlistcs{\the\absline at numR}{l at prev@nopbR}{\@nopbtrue}{}
+ \xifinlist{\the\absline at num}{\l at prev@pb}{\@pbtrue}{}%
+ \xifinlist{\the\absline at numR}{\l at prev@pbR}{\@pbtrue}{}
+ \xifinlist{\the\absline at num}{\l at prev@nopb}{\@nopbtrue}{}%
+ \xifinlist{\the\absline at numR}{\l at prev@nopbR}{\@nopbtrue}{}
}{}
\if at nopb\nopagebreak[4]\enlargethispage{\baselineskip}\fi
\if at pb\pagebreak[4]\fi
@@ -6639,25 +6648,25 @@
% \begin{macrocode}
\newcommand{\checkpbL}{
\IfStrEq{\led at pb@setting}{after}{
- \xifinlistcs{\the\absline at num}{l at prev@pb}{\l at dpagefulltrue\l at dsamepagefalse}{}
- \xifinlistcs{\the\absline at num}{l at prev@nopb}{\l at dpagefullfalse\l at dsamepagetrue}{}
+ \xifinlist{\the\absline at num}{\l at prev@pb}{\l at dpagefulltrue\l at dsamepagefalse}{}
+ \xifinlist{\the\absline at num}{\l at prev@nopb}{\l at dpagefullfalse\l at dsamepagetrue}{}
}{}
\IfStrEq{\led at pb@setting}{before}{
\numdef{\next at absline}{\the\absline at num+1}
- \xifinlistcs{\next at absline}{l at prev@pb}{\l at dpagefulltrue\l at dsamepagefalse}{}
- \xifinlistcs{\next at absline}{l at prev@nopb}{\l at dpagefullfalse\l at dsamepagetrue}{}
+ \xifinlist{\next at absline}{\l at prev@pb}{\l at dpagefulltrue\l at dsamepagefalse}{}
+ \xifinlist{\next at absline}{\l at prev@nopb}{\l at dpagefullfalse\l at dsamepagetrue}{}
}{}
}
\newcommand{\checkpbR}{
\IfStrEq{\led at pb@setting}{after}{
- \xifinlistcs{\the\absline at numR}{l at prev@pbR}{\l at dpagefulltrue\l at dsamepagefalse}{}
- \xifinlistcs{\the\absline at numR}{l at prev@nopbR}{\l at dpagefullfalse\l at dsamepagetrue}{}
+ \xifinlist{\the\absline at numR}{\l at prev@pbR}{\l at dpagefulltrue\l at dsamepagefalse}{}
+ \xifinlist{\the\absline at numR}{\l at prev@nopbR}{\l at dpagefullfalse\l at dsamepagetrue}{}
}{}
\IfStrEq{\led at pb@setting}{before}{
\numdef{\next at abslineR}{\the\absline at numR+1}
- \xifinlistcs{\next at abslineR}{l at prev@pbR}{\l at dpagefulltrue\l at dsamepagefalse}{}
- \xifinlistcs{\next at abslineR}{l at prev@nopbR}{\l at dpagefullfalse\l at dsamepagetrue}{}
+ \xifinlist{\next at abslineR}{\l at prev@pbR}{\l at dpagefulltrue\l at dsamepagefalse}{}
+ \xifinlist{\next at abslineR}{\l at prev@nopbR}{\l at dpagefullfalse\l at dsamepagetrue}{}
}{}
}
% \end{macrocode}
@@ -6668,27 +6677,35 @@
% \protect\cs{checkverseL} and \protect\cs{checkverseR} are called after each line is printed.
% They prevent page break inside line of verse.
% \begin{macrocode}
-\newcommand{\checkverseL}{
-\ifinstanzaL
- \iflednopbinverse
- \ifinserthangingsymbol
- \numgdef{\prev at abslineverse}{\the\absline at num-1}
- \IfStrEq{\led at pb@setting}{after}{\lednopbnum{\prev at abslineverse}}{}
- \IfStrEq{\led at pb@setting}{before}{\ifnum\numpagelinesL<3\ledpbnum{\prev at abslineverse}\fi}{}
- \fi
- \fi
-\fi
+\newcommand{\checkverseL}{%
+\ifinstanzaL%
+ \iflednopbinverse%
+ \ifinserthangingsymbol%
+ \numgdef{\prev at abslineverse}{\the\absline at num-1}%
+ \IfStrEq{\led at pb@setting}{after}{\lednopbnum{\prev at abslineverse}}{}%
+ \IfStrEq{\led at pb@setting}{before}{%
+ \ifnum\numpagelinesL<3%
+ \ledpbnum{\prev at abslineverse}%
+ \fi%
+ }{}%
+ \fi%
+ \fi%
+\fi%
}
-\newcommand{\checkverseR}{
-\ifinstanzaR
- \iflednopbinverse
- \ifinserthangingsymbolR
- \numgdef{\prev at abslineverse}{\the\absline at numR-1}
- \IfStrEq{\led at pb@setting}{after}{\lednopbnumR{\prev at abslineverse}}{}
- \IfStrEq{\led at pb@setting}{before}{\ifnum\numpagelinesR<3\ledpbnumR{\prev at abslineverse}\fi}{}
- \fi
- \fi
-\fi
+\newcommand{\checkverseR}{%
+\ifinstanzaR%
+ \iflednopbinverse%
+ \ifinserthangingsymbolR%
+ \numgdef{\prev at abslineverse}{\the\absline at numR-1}%
+ \IfStrEq{\led at pb@setting}{after}{\lednopbnumR{\prev at abslineverse}}{}%
+ \IfStrEq{\led at pb@setting}{before}{%
+ \ifnum\numpagelinesR<3%
+ \ledpbnumR{\prev at abslineverse}%
+ \fi%
+ }{}%
+ \fi%
+ \fi%
+\fi%
}
% \end{macrocode}
% \end{macro}
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2017-07-17 21:28:18 UTC (rev 44832)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2017-07-17 21:28:44 UTC (rev 44833)
@@ -1211,13 +1211,14 @@
\first at linenum@out at true
\newcommand{\this at line@list at version}{6}%
\newcommand*{\line at list@stuff}[1]{%
+ \global\newtoggle{notfirstrun@#1}%
\read at linelist{#1}%
-
\iffirst at linenum@out@
\immediate\closeout\linenum at out%
\global\first at linenum@out at false%
\immediate\openout\linenum at out=\l at auxdir#1\relax%
\immediate\write\linenum at out{\string\line at list@version{\this at line@list at version}}%
+ \immediate\write\linenum at out{\string\global\string\toggletrue{notfirstrun@#1}}%
\ifl at dpaging%
\immediate\write\linenum at out{\string\@par at sync@option{\@par at this@sync at option}}%
\fi%
@@ -1228,6 +1229,7 @@
\closeout\linenum at out%
\openout\linenum at out=\l at auxdir#1\relax%
\write\linenum at out{\string\line at list@version{\this at line@list at version}}%
+ \protected at write\linenum at out{}{\string\global\string\toggletrue{notfirstrun@#1}}%
\ifl at dpaging%
\write\linenum at out{\string\@par at sync@option{\@par at this@sync at option}}%
\fi%
@@ -2299,12 +2301,15 @@
\fi}
\newcommand*{\flush at notes}{%
- \@xloop
- \ifx\inserts at list\empty \else
- \gl at p\inserts at list\to\@insert
- \@insert
- \global\let\@insert=\undefined
- \repeat}
+ \iftoggle{notfirstrun@\jobname.\extensionchars\the\section at num}{%
+ \@xloop%
+ \ifx\inserts at list\empty \else%
+ \gl at p\inserts at list\to\@insert%
+ \@insert%
+ \global\let\@insert=\undefined%
+ \repeat%
+ }{}%
+}%
\def\@xloop#1\repeat{%
\def\body{#1\expandafter\body\fi}%
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2017-07-17 21:28:18 UTC (rev 44832)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2017-07-17 21:28:44 UTC (rev 44833)
@@ -701,6 +701,7 @@
\newif\iffirst at linenum@out at R
\first at linenum@out at Rtrue
\newcommand*{\line at list@stuffR}[1]{%
+ \global\newtoggle{notfirstrun@#1}%
\read at linelist{#1}%
\iffirst at linenum@out at R
\immediate\closeout\linenum at outR
@@ -707,6 +708,7 @@
\global\first at linenum@out at Rfalse
\immediate\openout\linenum at outR=\l at auxdir#1%
\immediate\write\linenum at outR{\string\line at list@version{\this at line@list at version}}%
+ \immediate\write\linenum at outR{\string\global\string\toggletrue{notfirstrun@#1}}%
\ifl at dpaging%
\immediate\write\linenum at outR{\string\@par at sync@option{\@par at this@sync at option}}%
\fi%
@@ -716,6 +718,7 @@
\fi%
\closeout\linenum at outR%
\openout\linenum at outR=\l at auxdir#1%
+ \protected at write\linenum at outR{}{\string\global\string\toggletrue{notfirstrun@#1}}%
\fi}
\newcommand*{\new at lineL}{%
@@ -1734,12 +1737,15 @@
\newcommand*{\add at penaltiesR}{}
\newcommand*{\flush at notesR}{%
- \@xloop
- \ifx\inserts at listR\empty \else
- \gl at p\inserts at listR\to\@insertR
- \@insertR
- \global\let\@insertR=\undefined
- \repeat}
+ \iftoggle{notfirstrun@\jobname.\extensionchars\the\section at numR R}{%
+ \@xloop%
+ \ifx\inserts at listR\empty \else%
+ \gl at p\inserts at listR\to\@insertR%
+ \@insertR%
+ \global\let\@insertR=\undefined%
+ \repeat%
+ }{}%
+}%
\newcommand\print at Xnotes@forpages[1]{%
@@ -2345,16 +2351,16 @@
\IfStrEq{\led at pb@setting}{before}{
\numdef{\next at absline}{\the\absline at num+1}%
\numdef{\next at abslineR}{\the\absline at numR+1}%
- \xifinlistcs{\next at absline}{l at prev@pb}{\@pbtrue}{}%
- \xifinlistcs{\next at abslineR}{l at prev@pbR}{\@pbtrue}{}
- \xifinlistcs{\next at absline}{l at prev@nopb}{\@nopbtrue}{}%
- \xifinlistcs{\next at abslineR}{l at prev@nopbR}{\@nopbtrue}{}
+ \xifinlist{\next at absline}{\l at prev@pb}{\@pbtrue}{}%
+ \xifinlist{\next at abslineR}{\l at prev@pbR}{\@pbtrue}{}
+ \xifinlist{\next at absline}{\l at prev@nopb}{\@nopbtrue}{}%
+ \xifinlist{\next at abslineR}{\l at prev@nopbR}{\@nopbtrue}{}
}{}
\IfStrEq{\led at pb@setting}{after}{
- \xifinlistcs{\the\absline at num}{l at prev@pb}{\@pbtrue}{}%
- \xifinlistcs{\the\absline at numR}{l at prev@pbR}{\@pbtrue}{}
- \xifinlistcs{\the\absline at num}{l at prev@nopb}{\@nopbtrue}{}%
- \xifinlistcs{\the\absline at numR}{l at prev@nopbR}{\@nopbtrue}{}
+ \xifinlist{\the\absline at num}{\l at prev@pb}{\@pbtrue}{}%
+ \xifinlist{\the\absline at numR}{\l at prev@pbR}{\@pbtrue}{}
+ \xifinlist{\the\absline at num}{\l at prev@nopb}{\@nopbtrue}{}%
+ \xifinlist{\the\absline at numR}{\l at prev@nopbR}{\@nopbtrue}{}
}{}
\if at nopb\nopagebreak[4]\enlargethispage{\baselineskip}\fi
\if at pb\pagebreak[4]\fi
@@ -2879,48 +2885,56 @@
\newcommand{\checkpbL}{
\IfStrEq{\led at pb@setting}{after}{
- \xifinlistcs{\the\absline at num}{l at prev@pb}{\l at dpagefulltrue\l at dsamepagefalse}{}
- \xifinlistcs{\the\absline at num}{l at prev@nopb}{\l at dpagefullfalse\l at dsamepagetrue}{}
+ \xifinlist{\the\absline at num}{\l at prev@pb}{\l at dpagefulltrue\l at dsamepagefalse}{}
+ \xifinlist{\the\absline at num}{\l at prev@nopb}{\l at dpagefullfalse\l at dsamepagetrue}{}
}{}
\IfStrEq{\led at pb@setting}{before}{
\numdef{\next at absline}{\the\absline at num+1}
- \xifinlistcs{\next at absline}{l at prev@pb}{\l at dpagefulltrue\l at dsamepagefalse}{}
- \xifinlistcs{\next at absline}{l at prev@nopb}{\l at dpagefullfalse\l at dsamepagetrue}{}
+ \xifinlist{\next at absline}{\l at prev@pb}{\l at dpagefulltrue\l at dsamepagefalse}{}
+ \xifinlist{\next at absline}{\l at prev@nopb}{\l at dpagefullfalse\l at dsamepagetrue}{}
}{}
}
\newcommand{\checkpbR}{
\IfStrEq{\led at pb@setting}{after}{
- \xifinlistcs{\the\absline at numR}{l at prev@pbR}{\l at dpagefulltrue\l at dsamepagefalse}{}
- \xifinlistcs{\the\absline at numR}{l at prev@nopbR}{\l at dpagefullfalse\l at dsamepagetrue}{}
+ \xifinlist{\the\absline at numR}{\l at prev@pbR}{\l at dpagefulltrue\l at dsamepagefalse}{}
+ \xifinlist{\the\absline at numR}{\l at prev@nopbR}{\l at dpagefullfalse\l at dsamepagetrue}{}
}{}
\IfStrEq{\led at pb@setting}{before}{
\numdef{\next at abslineR}{\the\absline at numR+1}
- \xifinlistcs{\next at abslineR}{l at prev@pbR}{\l at dpagefulltrue\l at dsamepagefalse}{}
- \xifinlistcs{\next at abslineR}{l at prev@nopbR}{\l at dpagefullfalse\l at dsamepagetrue}{}
+ \xifinlist{\next at abslineR}{\l at prev@pbR}{\l at dpagefulltrue\l at dsamepagefalse}{}
+ \xifinlist{\next at abslineR}{\l at prev@nopbR}{\l at dpagefullfalse\l at dsamepagetrue}{}
}{}
}
-\newcommand{\checkverseL}{
-\ifinstanzaL
- \iflednopbinverse
- \ifinserthangingsymbol
- \numgdef{\prev at abslineverse}{\the\absline at num-1}
- \IfStrEq{\led at pb@setting}{after}{\lednopbnum{\prev at abslineverse}}{}
- \IfStrEq{\led at pb@setting}{before}{\ifnum\numpagelinesL<3\ledpbnum{\prev at abslineverse}\fi}{}
- \fi
- \fi
-\fi
+\newcommand{\checkverseL}{%
+\ifinstanzaL%
+ \iflednopbinverse%
+ \ifinserthangingsymbol%
+ \numgdef{\prev at abslineverse}{\the\absline at num-1}%
+ \IfStrEq{\led at pb@setting}{after}{\lednopbnum{\prev at abslineverse}}{}%
+ \IfStrEq{\led at pb@setting}{before}{%
+ \ifnum\numpagelinesL<3%
+ \ledpbnum{\prev at abslineverse}%
+ \fi%
+ }{}%
+ \fi%
+ \fi%
+\fi%
}
-\newcommand{\checkverseR}{
-\ifinstanzaR
- \iflednopbinverse
- \ifinserthangingsymbolR
- \numgdef{\prev at abslineverse}{\the\absline at numR-1}
- \IfStrEq{\led at pb@setting}{after}{\lednopbnumR{\prev at abslineverse}}{}
- \IfStrEq{\led at pb@setting}{before}{\ifnum\numpagelinesR<3\ledpbnumR{\prev at abslineverse}\fi}{}
- \fi
- \fi
-\fi
+\newcommand{\checkverseR}{%
+\ifinstanzaR%
+ \iflednopbinverse%
+ \ifinserthangingsymbolR%
+ \numgdef{\prev at abslineverse}{\the\absline at numR-1}%
+ \IfStrEq{\led at pb@setting}{after}{\lednopbnumR{\prev at abslineverse}}{}%
+ \IfStrEq{\led at pb@setting}{before}{%
+ \ifnum\numpagelinesR<3%
+ \ledpbnumR{\prev at abslineverse}%
+ \fi%
+ }{}%
+ \fi%
+ \fi%
+\fi%
}
\newdimen\ledthegoal
\ifshiftedpstarts
More information about the tex-live-commits
mailing list