texlive[46767] Master/texmf-dist: reledmac (28feb18)
commits+karl at tug.org
commits+karl at tug.org
Thu Mar 1 00:46:16 CET 2018
Revision: 46767
http://tug.org/svn/texlive?view=revision&revision=46767
Author: karl
Date: 2018-03-01 00:46:15 +0100 (Thu, 01 Mar 2018)
Log Message:
-----------
reledmac (28feb18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf
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-doublenumbering.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/doc-more/page-typesetting-columns.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf
===================================================================
(Binary files differ)
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-doublenumbering.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 2018-02-28 23:45:45 UTC (rev 46766)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2018-02-28 23:46:15 UTC (rev 46767)
@@ -504,6 +504,7 @@
% \changes{v2.26.5}{2018/01/28}{Check that users have a enough recent version of \protect\package{xparse}}
% \changes{v2.26.5}{2018/01/18}{Fix bug when using \protect\cs{eledsection} with the \protect\option{continuousnumberingwithcolumns} of \protect\parpackage}
% \changes{v2.26.5}{2018/01/28}{Fix bug with \protect\option{continuousnumberingwithcolumns}}
+% \changes{v2.26.6}{2018/02/28}{Fix bug with \protect\cs{lineation} by page and nexted \protect\cs{edtext} between two pages (added in v.~2.24.0)}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -3439,6 +3440,8 @@
% Note that the file \verb+.idx+ will contain the right reference only after the third run, because of the internal indexing mechanism of \protect\macpackage.
% That means you must first run (Xe/Lua)\LaTeX three times, then run \verb+makeindex+, and then finally run (Xe/Lua)\LaTeX\ again, in order to get an index with the right page numbers.
%
+% Also note that using \cs{edtext} in familiar footnotes refers to the line where the footnotes are called
+% \subsection{Use with \package{imakeidx} or \package{indextools}}
% If the \protect\package{imakeidx} or \protect\package{indextools} package is used then the macro takes an optional
% argument, which is the name of a raw index file. For example
% |\edindex[line]{item}| will use |line.idx| as the raw file instead of
@@ -3453,7 +3456,6 @@
% \item Declare the index with the macro \cs{makeindex} of \package{imakeidx} and \package{indextools}.
% \end{enumerate}
%
-% Also note that using \cs{edtext} in familiar footnotes refers to the line where the footnotes are called
% \subsection{Referring to critical notes}
% If you want to refer to a word inside an
% \protect\cs{edtext}\marg{lemma}\marg{app} command, \protect\cs{edindex} should be defined inside
@@ -4181,7 +4183,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2018/01/28 v2.26.5 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2018/02/28 v2.26.6 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -5089,6 +5091,7 @@
\global\sub at lock \z@
\global\sublines at false
\global\let\next at page@num=\relax
+ \global\let\this at section@next at page@num=\relax%
\global\let\sub at change=\relax
\global\last at page@num=-10000%
\ifdefined\line at numR%
@@ -5122,6 +5125,13 @@
\ifnum\l at dnumpstartsL=0%
\led at err@NumberingWithoutPstart%
\fi%
+% \end{macrocode}
+% For the continuousnumberingwithcolumn options, we need to store some value globally, for the next \cs{endnumbering}.
+% We didn't modify this counter globally, because that creates problem for nested \cs{edtext}.
+% \begin{macrocode}
+ \global\page at num=\this at section@page at num%
+ \global\last at page@num=\this at section@last at page@num%
+ \global\let\next at page@num\this at section@next at page@num%
\ifl at dpairing
\global\pst at rtedLfalse
\else
@@ -5159,14 +5169,14 @@
% show that numbering continues across the gap.\footnote{Peter Wilson's thanks
% to Wayne Sullivan,\index{Sullivan, Wayne} who suggested the idea
% behind these macros.}
-% The \cs{pausenumbering at page@num} counter stores the \cs{next at page@num} when the \cs{pause at numbering} is called.
+% The \cs{pausenumbering at page@num} counter stores the \cs{this at section@next at page@num} when the \cs{pause at numbering} is called.
% \begin{macrocode}
\newcount\pausenumbering at page@num%
\newcommand{\pausenumbering}{%
- \ifx\next at page@num\relax%
+ \ifx\this at section@next at page@num\relax%
\global\pausenumbering at page@num=0%
\else%
- \global\pausenumbering at page@num=\next at page@num%
+ \global\pausenumbering at page@num=\this at section@next at page@num%
\fi%
\ifautopar\global\autopar at pausetrue\fi%
\endnumbering\global\numberingtrue}
@@ -6006,7 +6016,12 @@
% \end{macro}
% \end{macro}
% \end{macro}
-%
+% \begin{macro}{\this at section@page at num}
+% The \cs{this at section@page at num} stores the page number of the on which a numbering section finish.
+% \begin{macrocode}
+\newcount\this at section@page at num%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\ifnoteschanged@}
% \begin{macro}{\noteschanged at true}
% \begin{macro}{\noteschanged at false}
@@ -6273,7 +6288,7 @@
% these to the macro. It is now: \\
% \protect\cs{@nl}\marg{page counter number}\marg{printed page number} \\
% We do not (yet) use the printed number (i.e., the \protect\cs{thepage}) but
-% it may come in handy later. The macro \protect\cs{fix at page} checks if a new
+% it may come in handy later. The macro \cs{@page} checks if a new
% page has started.
%
% Exactly what \protect\cs{@nl} does depends
@@ -6283,12 +6298,11 @@
% \changes{v0.3.0}{2004/02/14}{Added a bunch of code to \protect\cs{@nl} for handling
% \protect\cs{setlinenum}}
% \changes{v0.6.0}{2004/11/16}{Extended \protect\cs{@nl} to include the page number}
-% \changes{v0.6.0}{2004/11/16}{Added \protect\cs{fix at page} to \protect\cs{@nl}}
% \changes{v0.7.0}{2005/02/22}{Added \protect\cs{@nl at reg}}
% \begin{macrocode}
\newcommand*{\@nl}[2]{%
- \fix at page{#1}%
+ \@page{#1}%
\ifledRcol%
\@nl at regR%
\else%
@@ -6361,15 +6375,18 @@
%
%
% \begin{macro}{\last at page@num}
-% \begin{macro}{\fix at page}
-% \protect\cs{fix at page} basically replaces \protect\cs{@page}. It determines whether or not
+% \begin{macro}{\this at section@last at page@num}
+% \begin{macro}{\@page}
+% \protect\cs{@page} determines whether or not
% a new page has been started, based on the page values held by \protect\cs{@nl}.
-% \changes{v0.6.0}{2004/11/16}{Added \protect\cs{last at page@num} and \protect\cs{fix at page}}
% \begin{macrocode}
\newcount\last at page@num
\last at page@num=-10000
+
+\newcount\this at section@last at page@num%
+ \this at section@last at page@num=-10000%
-\newcommand*{\fix at page}[1]{%
+\newcommand*{\@page}[1]{%
\ifledRcol
\ifnum #1=\last at page@numR
\else
@@ -6389,9 +6406,12 @@
}%
\fi%
\fi
- \global\page at numR=#1%
- \global\last at page@numR=#1%
- \global\def\next at page@numR{#1}%
+ \page at numR=#1%
+ \this at section@page at numR=#1%
+ \last at page@numR=#1%
+ \this at section@last at page@numR=#1%
+ \def\next at page@numR{#1}%
+ \gdef\this at section@next at page@numR{#1}%
\fi
\else
\ifnum #1=\last at page@num
@@ -6400,13 +6420,22 @@
\csnumgdef{@lastline at forpage@\the\page at num}{\the\line at num}%
\ifbypage@
\ifx\l at dchset@num\relax%Not resetting if preceded by a \setlinenum
- \line at num \z@ \subline at num \z@%
+ \line at num \z@%
+ \subline at num \z@%
\global\csdef{reset at line\the\numexpr\absline at num+1\relax @\the\section at num}{}%
\fi%
\fi
- \global\page at num=#1%
- \global\last at page@num=#1%
- \global\def\next at page@num{#1}%
+ \page at num=#1%
+ \global\this at section@page at num=#1%
+ \last at page@num=#1%
+ \global\this at section@last at page@num=#1%
+ \def\next at page@num{#1}%
+% \end{macrocode}
+% And we set a flag that tells \cs{@nl} that a new page number is
+% to be set, because other associated actions shouldn't occur until the
+% next line-start occurs.
+% \begin{macrocode}
+ \gdef\this at section@next at page@num{#1}%
\listxadd{\normal at page@break}{\the\absline at num}
\fi
\fi}
@@ -6413,6 +6442,7 @@
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\@pend}
% \begin{macro}{\@pendR}
@@ -9121,7 +9151,8 @@
{\global\@firstlineofpagetrue}%
\ifcsdef{reset at line\the\absline at num @\the\section at num}%
{%
- \global\line at num=\z@ \global\subline at num=\z@%
+ \global\line at num=\z@%
+ \global\subline at num=\z@%
\resetprevline@%
}%
{}%
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2018-02-28 23:45:45 UTC (rev 46766)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2018-02-28 23:46:15 UTC (rev 46767)
@@ -327,6 +327,7 @@
% \changes{v2.21.2}{2018/01/08}{Fix bug with \protect\cs{Xpstart} and \protect\cs{edtextlater}}
% \changes{v2.21.3}{2018/01/18}{Fix bug when using \protect\cs{numberpstarttrue} and alterning between manual \protect\cs{pstart} and automatic \protect\cs{pstart} produced by \protect\cs{autopar}}
% \changes{v2.21.4}{2018/01/18}{Fix bug with using \protect\cs{eledsection} and related when alternate normal typesetting and parallel typesetting}
+% \changes{v2.21.5}{2018/01/18}{Compatibility with reledmac v.~2.26.6}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -1372,7 +1373,7 @@
% \begin{macrocode}
%<*code>
\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]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -1821,6 +1822,7 @@
\global\sub at lockR \z@
\global\sublines at Rfalse
\global\let\next at page@numR\relax
+ \global\let\this at section@next at page@numR\relax%
\global\let\sub at change\relax
\global\last at page@numR=-10000%
\global\stopmsdata at inserted@true%
@@ -1873,6 +1875,9 @@
\ifnum\l at dnumpstartsR=0%
\led at err@NumberingWithoutPstart%
\fi%
+ \global\page at numR=\this at section@page at numR%
+ \global\last at page@numR=\this at section@last at page@numR%
+ \global\let\next at page@numR\this at section@next at page@numR%
\ifl at dpairing
\global\pst at rtedRfalse
\else
@@ -1953,10 +1958,10 @@
% \begin{macrocode}
\newcount\pausenumbering at page@numR%
\newcommand*{\pausenumberingR}{%
- \ifx\next at page@numR\relax%
+ \ifx\this at section@next at page@numR\relax%
\global\pausenumbering at page@numR=0%
\else%
- \global\pausenumbering at page@numR=\next at page@numR%
+ \global\pausenumbering at page@numR=\this at section@next at page@numR%
\fi%
\endnumberingR%
\global\numberingRtrue%
@@ -2446,12 +2451,14 @@
% \end{macro}
%
% \begin{macro}{\page at numR}
-% The right text page number.
+% \begin{macro}{\this at section@page at numR}
+% The right text page numbers.
% \begin{macrocode}
\newcount\page at numR
-
+\newcount\this at section@page at numR%
% \end{macrocode}
% \end{macro}
+% \end{macro}
% \subsubsection{Specific to \parpackage}
% \begin{macro}{\linesinpar at listL}
% \begin{macro}{\linesinpar at listR}
@@ -2582,18 +2589,24 @@
% \end{macro}
% \end{macro}
% \begin{macro}{\last at page@numR}
+% \begin{macro}{\this at section@last at page@numR}
% \begin{macro}{\fix at page}
% \protect\cs{last at page@numR} store the page number of the last right page.
-% It is modified by \protect\cs{fix at page}, defined by \reledmac.
+% \protect\cs{this at section@last at page@numR} store the page number of the last right page of the current section. Is value is modified globally, contrary to \cs{last at page@numR}.
+% Both are modified by \protect\cs{fix at page}, defined by \reledmac.
+%
% \changes{v2.0.0}{2105/06/28}{\protect\cs{fix at page} is defined only once in \reledmac}
%
% \begin{macrocode}
\newcount\last at page@numR
\last at page@numR=-10000
+\newcount\this at section@last at page@numR%
+ \this at section@last at page@numR=-10000%
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
%
%
% \begin{macro}{\@adv}
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2018-02-28 23:45:45 UTC (rev 46766)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2018-02-28 23:46:15 UTC (rev 46767)
@@ -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 at series{#1}}
@@ -421,6 +421,7 @@
\global\sub at lock \z@
\global\sublines at false
\global\let\next at page@num=\relax
+ \global\let\this at section@next at page@num=\relax%
\global\let\sub at change=\relax
\global\last at page@num=-10000%
\ifdefined\line at numR%
@@ -441,6 +442,9 @@
\ifnum\l at dnumpstartsL=0%
\led at err@NumberingWithoutPstart%
\fi%
+ \global\page at num=\this at section@page at num%
+ \global\last at page@num=\this at section@last at page@num%
+ \global\let\next at page@num\this at section@next at page@num%
\ifl at dpairing
\global\pst at rtedLfalse
\else
@@ -468,10 +472,10 @@
}
\newcount\pausenumbering at page@num%
\newcommand{\pausenumbering}{%
- \ifx\next at page@num\relax%
+ \ifx\this at section@next at page@num\relax%
\global\pausenumbering at page@num=0%
\else%
- \global\pausenumbering at page@num=\next at page@num%
+ \global\pausenumbering at page@num=\this at section@next at page@num%
\fi%
\ifautopar\global\autopar at pausetrue\fi%
\endnumbering\global\numberingtrue}
@@ -754,6 +758,7 @@
\newcount\endpage at num
\newcount\endline at num
\newcount\endsubline at num
+\newcount\this at section@page at num%
\newif\ifnoteschanged@
\newcommand*{\resetprevline@}{%
\def\do##1{\global\csundef{prevline##1}}%
@@ -842,7 +847,7 @@
}%
\newcommand*{\@nl}[2]{%
- \fix at page{#1}%
+ \@page{#1}%
\ifledRcol%
\@nl at regR%
\else%
@@ -898,7 +903,10 @@
\newcount\last at page@num
\last at page@num=-10000
-\newcommand*{\fix at page}[1]{%
+\newcount\this at section@last at page@num%
+ \this at section@last at page@num=-10000%
+
+\newcommand*{\@page}[1]{%
\ifledRcol
\ifnum #1=\last at page@numR
\else
@@ -918,9 +926,12 @@
}%
\fi%
\fi
- \global\page at numR=#1%
- \global\last at page@numR=#1%
- \global\def\next at page@numR{#1}%
+ \page at numR=#1%
+ \this at section@page at numR=#1%
+ \last at page@numR=#1%
+ \this at section@last at page@numR=#1%
+ \def\next at page@numR{#1}%
+ \gdef\this at section@next at page@numR{#1}%
\fi
\else
\ifnum #1=\last at page@num
@@ -929,13 +940,17 @@
\csnumgdef{@lastline at forpage@\the\page at num}{\the\line at num}%
\ifbypage@
\ifx\l at dchset@num\relax%Not resetting if preceded by a \setlinenum
- \line at num \z@ \subline at num \z@%
+ \line at num \z@%
+ \subline at num \z@%
\global\csdef{reset at line\the\numexpr\absline at num+1\relax @\the\section at num}{}%
\fi%
\fi
- \global\page at num=#1%
- \global\last at page@num=#1%
- \global\def\next at page@num{#1}%
+ \page at num=#1%
+ \global\this at section@page at num=#1%
+ \last at page@num=#1%
+ \global\this at section@last at page@num=#1%
+ \def\next at page@num{#1}%
+ \gdef\this at section@next at page@num{#1}%
\listxadd{\normal at page@break}{\the\absline at num}
\fi
\fi}
@@ -2170,7 +2185,8 @@
{\global\@firstlineofpagetrue}%
\ifcsdef{reset at line\the\absline at num @\the\section at num}%
{%
- \global\line at num=\z@ \global\subline at num=\z@%
+ \global\line at num=\z@%
+ \global\subline at num=\z@%
\resetprevline@%
}%
{}%
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2018-02-28 23:45:45 UTC (rev 46766)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2018-02-28 23:46:15 UTC (rev 46767)
@@ -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 at lockR \z@
\global\sublines at Rfalse
\global\let\next at page@numR\relax
+ \global\let\this at section@next at page@numR\relax%
\global\let\sub at change\relax
\global\last at page@numR=-10000%
\global\stopmsdata at inserted@true%
@@ -242,6 +243,9 @@
\ifnum\l at dnumpstartsR=0%
\led at err@NumberingWithoutPstart%
\fi%
+ \global\page at numR=\this at section@page at numR%
+ \global\last at page@numR=\this at section@last at page@numR%
+ \global\let\next at page@numR\this at section@next at page@numR%
\ifl at dpairing
\global\pst at rtedRfalse
\else
@@ -298,10 +302,10 @@
}%
\newcount\pausenumbering at page@numR%
\newcommand*{\pausenumberingR}{%
- \ifx\next at page@numR\relax%
+ \ifx\this at section@next at page@numR\relax%
\global\pausenumbering at page@numR=0%
\else%
- \global\pausenumbering at page@numR=\next at page@numR%
+ \global\pausenumbering at page@numR=\this at section@next at page@numR%
\fi%
\endnumberingR%
\global\numberingRtrue%
@@ -533,7 +537,7 @@
\list at create{\actions at listR}
\list at create{\annot at listR}%
\newcount\page at numR
-
+\newcount\this at section@page at numR%
\list at create{\linesinpar at listL}
\list at create{\linesinpar at listR}
\list at create{\maxlinesinpar at list}
@@ -605,6 +609,8 @@
\newcount\last at page@numR
\last at page@numR=-10000
+\newcount\this at section@last at page@numR%
+ \this at section@last at page@numR=-10000%
More information about the tex-live-commits
mailing list