texlive[45201] Master/texmf-dist: reledmac (1sep17)
commits+karl at tug.org
commits+karl at tug.org
Sat Sep 2 23:44:34 CEST 2017
Revision: 45201
http://tug.org/svn/texlive?view=revision&revision=45201
Author: karl
Date: 2017-09-02 23:44:34 +0200 (Sat, 02 Sep 2017)
Log Message:
-----------
reledmac (1sep17)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.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.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-continuous-numbering.tex
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/examples/makefile
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-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-continuous-numbering.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex 2017-09-02 21:44:13 UTC (rev 45200)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex 2017-09-02 21:44:34 UTC (rev 45201)
@@ -104,6 +104,88 @@
\pstart
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio.
\pend
+\endnumbering
+
+\section{Section A}
+
+\beginnumbering
+\pstart
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio.
+\pend
\pausenumbering
-\end{document}
+\begin{pairs}
+\begin{Leftside}
+\resumenumbering
+\pstart
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio.
+\pend
+\pausenumbering
+\end{Leftside}
+
+\begin{Rightside}
+\beginnumbering
+\pstart
+\edtext{Lorem}{\Afootnote{Lorim}} ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat.
+\pend
+\endnumbering
+\end{Rightside}
+\end{pairs}
+\Columns
+
+\resumenumbering
+\pstart
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio.
+\pend
+\endnumbering
+
+\section{Section B}
+
+\begin{pairs}
+\begin{Leftside}
+\beginnumbering
+\pstart
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat.
+\pend
+\pausenumbering
+\end{Leftside}
+
+\begin{Rightside}
+\beginnumbering
+\pstart
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio.
+\pend
+\endnumbering
+\end{Rightside}
+\end{pairs}
+\Columns
+
+\resumenumbering
+\pstart
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio.
+\pend
+
+\endnumbering
+
+\section{Section C}
+
+\begin{pairs}
+\begin{Leftside}
+\beginnumbering
+\pstart
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat.
+\pend
+\endnumbering
+\end{Leftside}
+
+\begin{Rightside}
+\beginnumbering
+\pstart
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vestibulum feugiat dolor vitae urna laoreet dapibus. Ut pulvinar nisl ultrices ex viverra, ac imperdiet sem gravida. Pellentesque malesuada augue a interdum placerat. Aenean tincidunt euismod viverra. Maecenas consectetur ligula nisi, in dignissim nulla tempus et. Aenean non scelerisque odio. Phasellus cursus bibendum turpis quis finibus. Aliquam porttitor arcu sit amet consectetur varius. Suspendisse dapibus, enim quis laoreet feugiat, diam ex fringilla metus, non ullamcorper eros ante sed justo. Sed eget congue enim. Morbi dictum magna sed dictum condimentum. In mattis, velit ac facilisis eleifend, nisl orci ornare nisi, at dignissim ante purus eu lacus. Pellentesque et diam odio.
+\pend
+\endnumbering
+\end{Rightside}
+\end{pairs}
+\Columns
+
+\end{document}
\ No newline at end of file
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/examples/makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/makefile 2017-09-02 21:44:13 UTC (rev 45200)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/makefile 2017-09-02 21:44:34 UTC (rev 45201)
@@ -8,7 +8,8 @@
PDF:$(OBJ)
-%.test: %.pdf
+%.test: %.pdf
+ latexmk $*.tex
python3 check-example.py --filename=$<
%.pdf: %.tex
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-09-02 21:44:13 UTC (rev 45200)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2017-09-02 21:44:34 UTC (rev 45201)
@@ -295,7 +295,7 @@
% \changes{v1.23.0}{2015/05/18}{Compatibility between nofamiliar/nocriticals option and minipage/ledgroup.}
% \changes{v1.23.0}{2015/05/18}{Fix error of \protect\cs{iftrue} not closed.}
% \changes{v1.23.0}{2015/05/18}{Allow use of \protect\cs{sameword} with inputenc managing of UTF-8.}
-% \changes{v1.23.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}…\protect\cs{endnumbering} without \protect\cs{pstart}.}
+% \changes{v1.23.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering} without \protect\cs{pstart}.}
% \changes{v1.23.0}{2015/05/18}{New tools to ensure the line-list file uses the right version of commands when upgrading the eledmac version.}
% \changes{v1.23.0}{2015/05/18}{Fix a bug with \protect\cs{skipnumbering} called immediately after a \protect\cs{pstart}.}
% \changes{v1.23.0}{2015/05/18}{Fix spurious space with \protect\cs{skipnumbering} (bug added on v1.21.0).}
@@ -449,8 +449,8 @@
% \changes{v2.16.5}{2016/10/20}{Fix potential spurious spaces in endnotes.}
% \changes{v2.16.6}{2016/11/14}{Take into account \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.}
% \changes{v2.16.6}{2016/11/14}{Fix a bug with the line number style in \protect\cs{doennotes} when referring to right side line in parallel typesetting.}
-% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{numberpstarttrue} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}.}
-% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}.}
+% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{numberpstarttrue} when using multiple \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering}.}
+% \changes{v2.16.7}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering}.}
% \changes{v2.16.8}{2016/12/16}{Fix a bug with \protect\cs{edindex} in footnotes in parallel typesetting.}
% \changes{v2.17.0}{2016/12/23}{Add \protect\cs{edglsadd} command.}
% \changes{v2.17.0}{2016/12/23}{Add \protect\cs{setmsdataposition} setting.}
@@ -488,6 +488,7 @@
% \changes{v2.24.0}{2017/08/17}{Fix a bug with \protect\cs{edlabel} at the beginning of a \protect\cs{pstart}.}
% \changes{v2.24.0}{2017/08/17}{Add \protect\cs{swnoexpands} macro to avoid problems with not fully expandable macro inside \protect\cs{sameword}.}
% \changes{v2.24.0}{2017/08/17}{Fix spurious space with \protect\cs{labelpstarttrue}}
+% \changes{v2.24.1}{2017/08/31}{Compatibility with \protect\parpackage 2.20.2}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -1828,7 +1829,7 @@
% […]
% amet\stopmsdata{} \msdata{ABCD}sic transit […]
% \end{verbatim}
-% Which means that the part of text containing \enquote{Lorem ipsum dolor … amet} is witnessed by manuscripts A, B and C, while the part of text starting by \enquote{sic transit} is witnessed by manuscripts A, B, C and D.
+% Which means that the part of text containing \enquote{Lorem ipsum dolor […] amet} is witnessed by manuscripts A, B and C, while the part of text starting by \enquote{sic transit} is witnessed by manuscripts A, B, C and D.
%
% \cs{stopmsdata} is also automatically inserted by \cs{msdata}.
%
@@ -4060,7 +4061,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2017/08/17 v2.24.0 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2017/08/31 v2.24.1 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -4322,7 +4323,7 @@
% \begin{macro}{\led at err@edtextoutsidepstart}
% \begin{macrocode}
\newcommand*{\led at err@edtextoutsidepstart}{%
- \reledmac at error{\string\edtext\space outside numbered paragraph (\pstart…\pend)}{\@ehc}}%
+ \reledmac at error{\string\edtext\space outside numbered paragraph (\pstart\space …\space\pend)}{\@ehc}}%
% \end{macrocode}
% \end{macro}
% \begin{macro}{\led at mess@NotesChanged}
@@ -4420,7 +4421,7 @@
\newcommand*{\led at err@PstartNotNumbered}{%
\reledmac at error{\string\pstart\space must be used within a
numbered section %
- (\string\beginnumbering…\string\endnumbering)}{\@ehc}}%
+ (\string\beginnumbering\space …\space\string\endnumbering)}{\@ehc}}%
\newcommand*{\led at err@PstartInPstart}{%
\reledmac at error{\string\pstart\space encountered while another
\string\pstart\space was in effect}{\@ehc}}
@@ -4568,7 +4569,7 @@
% \begin{macro}{\led at err@toendnotes at outsidenumbering}
% \begin{macrocode}
\newcommand{\led at err@toendnotes at outsidenumbering}{%
- \reledmac at error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering…\string\endnumbering)}{\@ehc}%
+ \reledmac at error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering\space …\space\string\endnumbering)}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
@@ -4639,7 +4640,7 @@
% \begin{macro}{\led at warn@edinde at outsidenumbering}
% \begin{macrocode}
\newcommand{\led at warn@edinde at outsidenumbering}{%
- \reledmac at warning{\string\edindex\space called outside of \string\beginnumbering…\string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
+ \reledmac at warning{\string\edindex\space called outside of \string\beginnumbering\space …\space \string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
}%
% \end{macrocode}
% \end{macro}
@@ -4739,7 +4740,7 @@
% In preparation for the \parpackage package, these are related to
% the `right' text of parallel texts (when \protect\cs{ifl at dpairing} is TRUE).
-% They are explained in the \protect\package{eledpar}
+% They are explained in the \protect\parpackage
% manual.
% \changes{v0.7.0}{2005/02/24}{Added \protect\cs{l at dnumpstartsL}, \protect\cs{ifl at dpairing}
% and \protect\cs{ifpst at rted} for/from eledpar}
@@ -4776,6 +4777,12 @@
% \begin{macrocode}
\newif\ifnumberingR
% \end{macrocode}
+% \begin{macro}{\ifafterendnumberingR}
+% The \cs{ifafterendnumberingR} boolean is set to TRUE at \cs{endnumberingR} and to FALSE at next \cs{beginnumberingR} or real \cs{beginnumbering} (not \cs{resumenumbering}). It is mainly used for the \option{continuousnumberingwithcolumns}, to avoid incrementing right column line counters after a \cs{endnumberingR}.
+% \begin{macrocode}
+\newif\ifafterendnumberingR%
+% \end{macrocode}
+% \end{macro}
% The \cs{ifXnote@} macro is set to true when we are typesetting a critical footnote.
% \begin{macrocode}
\newif\ifXnote@%
@@ -4876,10 +4883,22 @@
\endnumbering
\fi
\global\numberingtrue
+ \global\afterendnumberingRfalse%
\global\advance\section at num \@ne
\initnumbering at reg
\message{Section \the\section at num }%
\line at list@stuff{\jobname.\extensionchars\the\section at num}%
+ \ifcontinuousnumberingwithcolumns%
+ \unless\ifafterendnumberingR%
+ \unless\ifl at dpairing%
+ \ledRcoltrue%
+ \global\advance\section at numR \@ne%
+ \message{Section \the\section at numR R (continuoousnumbering)}%
+ \line at list@stuffR{\jobname.\extensionchars\the\section at numR R}%
+ \ledRcolfalse%
+ \fi%
+ \fi%
+ \fi%
\l at dend@stuff
\setcounter{pstart}{1}
\ifl at dpairing
@@ -5028,6 +5047,17 @@
\led at mess@SectionContinued{\the\section at num}%
\set at continuousnumberingforL%
\line at list@stuff{\jobname.\extensionchars\the\section at num}%
+ \ifcontinuousnumberingwithcolumns%
+ \unless\ifafterendnumberingR%
+ \unless\ifl at dpairing%
+ \ledRcoltrue%
+ \global\advance\section at numR \@ne%
+ \message{Section \the\section at numR R (continuoousnumbering)}%
+ \line at list@stuffR{\jobname.\extensionchars\the\section at numR R}%
+ \ledRcolfalse%
+ \fi%
+ \fi%
+ \fi%
\l at dend@stuff
\ifl at dpairing\else%
\begingroup%
@@ -5050,20 +5080,10 @@
% \end{macro}
% \end{macro}
% \begin{macro}{\set at continuousnumberingforL}
-% \cs{set at continuousnumberingforl} sets the left line numbers and pstart counters at a \cs{beginnumbering} or a \cs{resumenumbering} in order to have continuous numbering with single column text.
+% \cs{set at continuousnumberingforl} sets pstart counters at a \cs{beginnumbering} or a \cs{resumenumbering} in order to have continuous numbering with single column text.
% \begin{macrocode}
\newcommand{\set at continuousnumberingforL}{%
\ifcontinuousnumberingwithcolumns%
- \ifdefined\line at numR%
- \ifnum\line at numR>\line at num%
- \global\appto\next at line@list at stuff{%
- \expandafter\setlinenum\expandafter{\the\line at numR}%
- }%
- \fi%
- \ifnum\last at page@numR>\last at page@num%
- \global\last at page@num=\last at page@numR%
- \fi%
- \fi%
\ifl at dpairing%
\unless\ifl at dpaging%
\global\c at pstartL=\c at pstart%
@@ -6198,7 +6218,16 @@
\csnumgdef{@lastline at forpageR@\the\page at numR}{\the\line at numR}%
\ifbypage at R
\ifx\l at dchset@num\relax%Not resetting if preceded by a \setlinenum
- \line at numR \z@ \subline at numR \z@%
+ \ifboolexpr{%
+ bool{resumenumberingR at start}%
+ and test {\ifnumequal{\last at page@numR}{-10000}}%
+ }%
+ {}%
+ {%
+ \line at numR \z@%
+ \subline at numR \z@%
+ \global\csdef{reset at lineR\the\numexpr\absline at numR+1\relax @\the\section at numR}{}%
+ }%
\fi%
\fi
\global\page at numR=#1%
@@ -6213,6 +6242,7 @@
\ifbypage@
\ifx\l at dchset@num\relax%Not resetting if preceded by a \setlinenum
\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%
@@ -6853,6 +6883,11 @@
{\global\toggletrue{notfirstrun@#1}}%
{\global\togglefalse{notfirstrun@#1}}%
% \end{macrocode}
+% A internal hook (not used yet).
+% \begin{macrocode}
+ \next at line@list at stuff%
+ \global\let\next at line@list at stuff\relax%
+% \end{macrocode}
% Use the commands of the previous section to interpret the
% line-list file from the last run.
% \begin{macrocode}
@@ -6891,8 +6926,6 @@
\write\linenum at out{\string\@par at sync@option{\@par at this@sync at option}}%
\fi%
\fi%
- \next at line@list at stuff%
- \global\let\next at line@list at stuff\relax%
}%
% \end{macrocode}
@@ -8329,7 +8362,7 @@
}%
% \end{macrocode}
% Restore standard \enquote{nobreak} and \enquote{autopar} settings.
-% Normally, \cs{if at nobreak} is true only immediately after a sectioning command (see latex.ltx file). As a \cs{pstart}…\cs{pend} structure can't contain any sectioning command, we set \cs{if at nobreak} to false.
+% Normally, \cs{if at nobreak} is true only immediately after a sectioning command (see latex.ltx file). As a \cs{pstart}\ …\ \cs{pend} structure can't contain any sectioning command, we set \cs{if at nobreak} to false.
% \begin{macrocode}
\@nobreakfalse%
\ifautopar%
@@ -8567,29 +8600,41 @@
% \end{macrocode}
% Boxes the line, writes information about new line in the numbered file.
% \begin{macrocode}
- {\ledllfill\hb at xt@ \wd\one at line{\new at line%
+ {\ledllfill\hb at xt@ \wd\one at line{%
+ \new at line%
% \end{macrocode}
-% If we use \LuaLaTeX\, then restore the direction.
+% If we use the \option{continuousnumberingwithcolumns}, we increase right line number.
% \begin{macrocode}
- \ifluatex%
- \textdir\l at luatextextdir@L%
+ \ifcontinuousnumberingwithcolumns%
+ \unless\ifafterendnumberingR%
+ \new at lineR%
+ \xappto\next at line@list at stuffR{%
+ \unexpanded{\global\line at numR=}\the\line at num%
+ }%
+ \fi%
\fi%
% \end{macrocode}
+% If we use \LuaLaTeX\, then restore the direction.
+% \begin{macrocode}
+ \ifluatex%
+ \textdir\l at luatextextdir@L%
+ \fi%
+% \end{macrocode}
% Insert, if needed, the hanging symbol.
% \begin{macrocode}
- \inserthangingsymbol%
+ \inserthangingsymbol%
% \end{macrocode}
% And so, print the line.
% \begin{macrocode}
- \l at dunhbox@line{\one at line}}%
+ \l at dunhbox@line{\one at line}}%
% \end{macrocode}
% Right line number
% \begin{macrocode}
- \ledrlfill\l at drd@ta%
+ \ledrlfill\l at drd@ta%
% \end{macrocode}
% Print right notes.
% \begin{macrocode}
- \l at drsn@te
+ \l at drsn@te%
}}%
% \end{macrocode}
% And reinsert penalties (for page breaking)...
@@ -8836,21 +8881,18 @@
\global\resumenumbering at startfalse%
\fi%
\fi%
- \unless\ifresumenumbering at start%
- \global\@firstlineofpagetrue%
- \fi%
- \ifbypage@
- \ifcsdef{l at dchset@num@\the\absline at num}%
- {%
- \global\csundef{l at dchset@num@\the\absline at num}%
- }%
- {%
- \unless\ifresumenumbering at start%
- \global\line at num=\z@ \global\subline at num=\z@%
- \resetprevline@%
- \fi%
- }%
- \fi
+ \ifboolexpr{%
+ bool{resumenumbering at start}%
+ and test {\ifdimgreater{\pagedepth}{\z@}}%
+ }%
+ {}%
+ {\global\@firstlineofpagetrue}%
+ \ifcsdef{reset at line\the\absline at num @\the\section at num}%
+ {%
+ \global\line at num=\z@ \global\subline at num=\z@%
+ \resetprevline@%
+ }%
+ {}%
\global\resumenumbering at startfalse%
\add at msdata@firstlineofpage%
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2017-09-02 21:44:13 UTC (rev 45200)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2017-09-02 21:44:34 UTC (rev 45201)
@@ -225,7 +225,7 @@
% \changes{v1.15.0}{2015/04/13}{Fix vertical spurious space before right \protect\cs{eledchapter} (bug added in v1.13.0).}
% \changes{v1.15.0}{2015/04/13}{Prevent vertical space when using \protect\cs{AtEveryPstart} or \protect\cs{AtEveryPend} with a command which prints nothing}
% \changes{v1.16.0}{2015/05/18}{Fix a bug with nofamiliar / nocritical option of eledmac.}
-% \changes{v1.16.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}…\protect\cs{endnumbering} without \protect\cs{pstart}.}
+% \changes{v1.16.0}{2015/05/18}{Error message when using \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering} without \protect\cs{pstart}.}
% \changes{v1.16.0}{2015/05/18}{Error message when starting a Leftside/a Rightside while the previous one has not been yet typeset.}
% \changes{v1.16.0}{2015/05/18}{Error message when calling \protect\cs{Pages} inside `pages' environment and \protect\cs{Columns} inside `pairs' environment.}
% \changes{v1.16.0}{2015/05/18}{New package option sameparallelpagenumber to have the same page number for both left and right side.}
@@ -293,7 +293,7 @@
% \changes{v2.14.4}{2016/11/14}{Take into account \protect\cs{linenumberstyle} when using \protect\cs{edlineref}.}
% \changes{v2.15.0}{2016/12/12}{Add \protect\option{movecolumnspositiononrightpage} option.}
% \changes{v2.15.0}{2016/12/12}{New macro \protect\cs{sidenotemarginR}, fix default value to right.}
-% \changes{v.2.15.0}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}}
+% \changes{v.2.15.0}{2016/12/12}{Fix a bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering}}
% \changes{v2.15.0}{2016/12/12}{Fix a bug about space before sectioning commands after a pairs environment (bug added in v.~2.14.4).}
% \changes{v2.15.0}{2016/12/12}{Fix a bug with page break when using \protect\cs{columns} (bug added in v.~2.14.1).}
% \changes{v2.16.0}{2016/12/23}{Compatibility with \protect\cs{setmsdataposition}}
@@ -317,11 +317,11 @@
% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\cs{continuousnumberingwithcolumns} when using multiple series of continued numbering text. Now, the line number are correctly reset at each \protect\cs{beginnumbering}.}
% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} and inner / outer notes and line numbering.}
% \changes{v2.20.0}{2017/08/17}{Add \protect\cs{linenumOnlyPagesForColumns} and \protect\cs{linenumOnlyPagesForColumnsR} to tell to print the line numbers associated with a column only on some specific pages (for example, only on right pages).}
-% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} when a \protect\cs{beginnumbering} is called after an other \protect\cs{beginnumbering}…\protect\cs{endnumbering}.}
+% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{continuousnumberingwithcolumns} when a \protect\cs{beginnumbering} is called after an other \protect\cs{beginnumbering}\ …\ \protect\cs{endnumbering}.}
% \changes{v2.20.0}{2017/08/17}{Fix a bug with \protect\option{widthliketwocolumns} when manually setting \protect\cs{beforecolumnseparator} and \protect\cs{aftercolumnseparator}.}
% \changes{v2.20.0}{2017/08/17}{Fix compatibility between \protect\option{continuousnumberingwithcolumns} and \protect\cs{numberpstartfalse}.}
-% \changes{v2.20.1}{2017/08/23}{Fix bug with \protect\cs{continuousnumberingwithcolumns} when left column and right column have not the same size.}
-
+% \changes{v2.20.1}{2017/08/23}{Fix bug with \protect\option{continuousnumberingwithcolumns} when left column and right column have not the same size.}
+% \changes{v2.20.2}{2017/08/31}{Fix bugs with \protect\option{continuousnumberingwithcolumns} when going to a new page}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -602,17 +602,47 @@
% In most cases, you should use \protect\cs{widthliketwocolumns} in combination with \protect\cs{Xnoteswidthliketwocolumns} and \protect\cs{notesXwidthliketwocolumns} to align the critical/familiar footnotes with the two colums.
% See \macpackage's handbook for more details.
%
-% \label{continuousnumberingwithcolumns}If you want to have continuous line numbers between multiple columns and single columns, use the \option{continuousnumberingwithcolumns} option when loading \macpackage or \parpackage.
-% You will need to use \cs{pausenumbering}\ldots\cs{resumenumbering} instead of \cs{endnumbering}\ldots{endnumbering} (see \reff{reledmac-pause}).
-%
-% The first time you start \textbf{a left column or a single column}, use \cs{beginnumbering}, then use \cs{resumenumbering}. When you stop a left or a single column, use \cs{pausenumbering}, except the last time, where you must use \cs{endnumbering}.
-%
-% The first time you start \textbf{a right column}, use \cs{beginnumbering}, then use \cs{resumenumbering}. When you stop a right column, use \cs{pausenumbering}, except the last time, where you must use \cs{endnumbering}.
-%
% \subsubsection{Schemas of column typesetting}
% Domenico Cufalo wrote a schema of the parallel column typesetting parameters, with explanations.
% You can read the file \href{run:doc-more/page-typesetting-columns.pdf}{doc-more/page-typesetting-columns.pdf}.
%
+% \subsubsection{Continuous numbering between single and double column texts}
+% \label{continuousnumberingwithcolumns}If you want to have continuous line
+% numbers between multiple columns and single columns, use the
+% \option{continuousnumberingwithcolumns} option when loading \macpackage
+% or \parpackage.
+% You will need to use \cs{pausenumbering}~…\
+% \cs{resumenumbering} in addition to \cs{beginnumbering}~…\
+% \cs{endnumbering} (see \reff{reledmac-pause}).
+%
+% The best way to understand the behaviour of \cs{pausenumbering} and
+% \cs{resumenumbering} is to think of the left-column text as a continuation of
+% single-column text (or, vice versa, to think of single-column text as
+% left-column text), and of the right-column as independent text, which needs to be
+% synchronised with the left one manually. The numbering commands in a
+% right column are interconnected with each other, and not with the respective
+% left-column commands.
+%
+% This means that you must switch between single-column and left-column
+% text using \cs{beginnumbering}~…\ \cs{pausenumbering}~…\
+% \cs{resumenumbering}~…\ \cs{pausenumbering}~…\
+% \cs{resumenumbering}~…\ \cs{endnumbering}.
+%
+% On the other side, the first right column must always begin with
+% \cs{beginnumbering}, no matter if the corresponding left-column started
+% with \cs{resumenumbering} or not; this is because numbering in the right
+% column has not been started yet. Then, for consecutive chunks of
+% right-column text you should use \cs{pausenumbering}~…\
+% \cs{resumenumbering}. The important thing to remember is that you have
+% to use \cs{endnumbering} in a right column before every
+% \cs{endnumbering} in single-column text or in parallel with
+% \cs{endnumbering} in a left-column text (the latter is the case when a
+% document or a section ends in a two-columns mode). Without this, you will
+% get wrong numbering when a right column reappears next time.
+%
+% The file
+% \file{examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex}
+% covers all these cases.
% \subsection{Note about \cs{AtEveryPstart*} and \cs{AtEveryPend*}}
% The content of \cs{AtEveryPstart} / \cs{AtEveryPend} (without star) is added before every \cs{pstart} / after every \cs{pend}, respecting the left / right side.
%
@@ -1047,9 +1077,9 @@
% \DescribeMacro{\linenummarginColumns}
% \DescribeMacro{\linenummarginColumnsR}
% \DescribeMacro{\linenummarginColumns*}
-% Suppose you typeset parallel texts both in parallel pages and in parallel columns.
-% In this case, your setting of line margin in parallel pages could be different from your setting of line margin in parallel columns.
-% For example, you could want to have line numbers on the right when your are in parallel pages, but when you are in parallel columns, to have them on the left for the left column and on the right for the right column.
+% Suppose you typeset texts both in parallel pages (or in normal typesetting) and in parallel columns.
+% In this case, your setting of line margin in parallel pages (or in normal typesetting) could be different from your setting of line margin in parallel columns.
+% For example, you could want to have line numbers on the right when your are in parallel pages (or in normal typesetting), but when you are in parallel columns, to have them on the left for the left column and on the right for the right column.
%
% In this case, you can use \cs{linenummarginColumns}, which overrides the default setting for the left column, \cs{linenummarginColumnsR} which overrides the default setting for the right column, and \cs{linenummarginColumns*}, which overrides the default for both left and right columns.
%
@@ -1336,7 +1366,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2017/08/23 v2.20.1 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2017/08/31 v2.20.2 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -1658,7 +1688,7 @@
% \begin{macro}{\led at error@missing at numbering}
% \begin{macrocode}
\newcommand{\led at error@missing at numbering}[1]{%
- \reledpar at error{Missing \string\pstart…\string\pend\space inside `#1` environment}{\@ehc}%
+ \reledpar at error{Missing \string\pstart\space …\space\string\pend\space inside `#1` environment}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
@@ -1774,6 +1804,7 @@
\global\l at dnumpstartsR \z@
\global\pst at rtedRfalse
\global\numberingRtrue
+ \global\afterendnumberingRfalse%
\global\advance\section at numR \@ne
\global\absline at numR \z@
\gdef\normal at page@breakR{}
@@ -1790,6 +1821,9 @@
\global\let\@msdata at list\relax%
\global\csundef{@msdata@\add at msd@cR @dataR}%
\ifcontinuousnumberingwithcolumns%
+ \ifnumbering%
+ \global\resumenumberingR at starttrue%
+ \fi%
\ifnumberpstart%
\addtocounter{pstartR}{1}%
\fi%
@@ -1797,7 +1831,6 @@
\setcounter{pstartR}{1}%
\fi%
\message{Section \the\section at numR R }%
- \set at continuousnumberingforR%
\line at list@stuffR{\jobname.\extensionchars\the\section at numR R}%
\l at dend@stuff
\begingroup
@@ -1829,6 +1862,7 @@
\def\endnumberingR{%
\ifnumberingR
\global\numberingRfalse
+ \global\afterendnumberingRtrue%
\normal at pars
\ifnum\l at dnumpstartsR=0%
\led at err@NumberingWithoutPstart%
@@ -1918,7 +1952,10 @@
\else%
\global\pausenumbering at page@numR=\next at page@numR%
\fi%
- \endnumberingR\global\numberingRtrue}
+ \endnumberingR%
+ \global\numberingRtrue%
+ \global\afterendnumberingRfalse%
+}%
\newif\ifresumenumberingR at start%
\newcommand*{\resumenumberingR}{%
\ifnumberingR
@@ -1926,7 +1963,6 @@
\global\advance\section at numR \@ne
\global\resumenumberingR at starttrue%
\led at mess@SectionContinued{\the\section at numR R}%
- \set at continuousnumberingforR%
\line at list@stuffR{\jobname.\extensionchars\the\section at numR R}%
\l at dend@stuff
\begingroup%
@@ -2029,23 +2065,6 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\set at continuousnumberingforR}
-% \cs{set at continuousnumberingforR} set the right line number and the pstart counters at a \cs{beginnumberingR} or a \cs{resumenumberingR} in order to have continuous numbering with single column text.
-% \begin{macrocode}
-\newcommand{\set at continuousnumberingforR}{%
- \ifcontinuousnumberingwithcolumns%
- \ifnum\line at numR<\line at num%
- \global\appto\next at line@list at stuffR{%
- \expandafter\setlinenum\expandafter{\the\line at num}%
- }%
- \fi%
- \ifnum\last at page@num>\last at page@numR%
- \global\last at page@numR=\last at page@num%
- \fi%
- \fi%
-}
-% \end{macrocode}
-% \end{macro}
% \begin{macro}{\lineation*}
% \changes{v1.8.2}{2014/08/15}{Add \protect\cs{lineation*}}
% \protect\cs{lineation*} change the lineation system for both sides.
@@ -2908,6 +2927,8 @@
\IfFileExists{\l at auxdir#1}%
{\global\toggletrue{notfirstrun@#1}}%
{\global\togglefalse{notfirstrun@#1}}%
+ \next at line@list at stuffR%
+ \global\let\next at line@list at stuffR\relax%
\read at linelist{#1}%
\iffirst at linenum@out at R
\global\first at linenum@out at Rfalse
@@ -2923,8 +2944,6 @@
\closeout\linenum at outR%
\openout\linenum at outR=\l at auxdir#1%
\fi%
- \next at line@list at stuffR%
- \global\let\next at line@list at stuffR\relax%
}%
% \end{macrocode}
@@ -3913,21 +3932,23 @@
\global\advance\@donetotallinesL\@ne%
\else%
\iflinenumberLevenifblank
- \new at lineL%
- \l at demptyd@ta%
- \getline at numL%
- \affixline at num%
\setbox\l at dleftbox \hb at xt@ \Lcolwidth{%
+ \new at lineL%
+ \l at demptyd@ta%
+ \getline at numL%
+ \affixline at num%
\l at dld@ta%
\hspace*{\Lcolwidth}%
\ledrlfill\l at drd@ta%
}%
\else%
- \ifcontinuousnumberingwithcolumns%
- \new at lineL%
- \getline at numL%
- \fi%
- \setbox\l at dleftbox \hb at xt@ \Lcolwidth{\hspace*{\Lcolwidth}}%
+ \setbox\l at dleftbox \hb at xt@ \Lcolwidth{%
+ \ifcontinuousnumberingwithcolumns%
+ \new at lineL%
+ \getline at numL%
+ \fi%
+ \hspace*{\Lcolwidth}%
+ }%
\fi%
\global\advance\@donetotallinesL\@ne%
\fi%
@@ -4101,10 +4122,10 @@
\global\advance\@donetotallinesR\@ne%
\else%
\iflinenumberRevenifblank%
- \new at lineR
- \l at demptyd@ta%
- \getline at numR%
\setbox\l at drightbox \hb at xt@ \Rcolwidth{%
+ \new at lineR%
+ \l at demptyd@ta%
+ \getline at numR%
\affixline at numR%
\l at dld@ta%
\hspace*{\Rcolwidth}%
@@ -4111,11 +4132,13 @@
\ledrlfill\l at drd@ta%
}%
\else%
- \ifcontinuousnumberingwithcolumns%
- \new at lineR%
- \getline at numR%
- \fi%
- \setbox\l at drightbox \hb at xt@ \Rcolwidth{\hspace*{\Rcolwidth}}%
+ \setbox\l at drightbox \hb at xt@ \Rcolwidth{%
+ \ifcontinuousnumberingwithcolumns%
+ \new at lineR%
+ \getline at numR%
+ \fi%
+ \hspace*{\Rcolwidth}%
+ }%
\fi%
\global\advance\@donetotallinesR\@ne%
\fi%
@@ -4329,22 +4352,18 @@
\@l at dtempcntb=\absline at numR
\ifnum\@l at dtempcntb<\next at actionlineR\else
\ifnum\next at actionR>-1001\relax
- \unless\ifresumenumberingR at start%
- \@firstlineofpageRtrue%
- \fi%
+ \ifboolexpr{%
+ bool{resumenumberingR at start}%
+ and test {\ifdimgreater{\pagedepth}{\z@}}%
+ }%
+ {}%
+ {\@firstlineofpageRtrue}%
\global\page at numR=\next at actionR
- \ifbypage at R
- \ifcsdef{l at dchset@num at R\the\absline at numR}%
- {%
- \global\csundef{l at dchset@num at R\the\absline at numR}%
- }%
- {%
- \unless\ifresumenumberingR at start%
- \global\line at numR \z@%
- \global\subline at numR \z@%
- \fi%
- }%
- \fi
+ \ifcsdef{reset at lineR\the\absline at numR @\the\section at numR}%
+ {%
+ \global\line at numR=\z@ \global\subline at numR=\z@%
+ }%
+ {}%
\global\resumenumberingR at startfalse%
\add at msdata@firstlineofpage%
\else
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2017-09-02 21:44:13 UTC (rev 45200)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2017-09-02 21:44:34 UTC (rev 45201)
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2017/08/17 v2.24.0 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2017/08/31 v2.24.1 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default at series{#1}}
@@ -160,7 +160,7 @@
\newcommand*{\led at err@NumberingShouldHaveStarted}{%
\reledmac at error{Numbering should already have been started}{\@ehc}}
\newcommand*{\led at err@edtextoutsidepstart}{%
- \reledmac at error{\string\edtext\space outside numbered paragraph (\pstart…\pend)}{\@ehc}}%
+ \reledmac at error{\string\edtext\space outside numbered paragraph (\pstart\space …\space\pend)}{\@ehc}}%
\newcommand*{\led at mess@NotesChanged}{%
\typeout{reledmac reminder: }%
\typeout{ The number of the footnotes in this section
@@ -199,7 +199,7 @@
\newcommand*{\led at err@PstartNotNumbered}{%
\reledmac at error{\string\pstart\space must be used within a
numbered section %
- (\string\beginnumbering…\string\endnumbering)}{\@ehc}}%
+ (\string\beginnumbering\space …\space\string\endnumbering)}{\@ehc}}%
\newcommand*{\led at err@PstartInPstart}{%
\reledmac at error{\string\pstart\space encountered while another
\string\pstart\space was in effect}{\@ehc}}
@@ -277,7 +277,7 @@
\newcommand*{\led at err@ReverseColumns}{%
\reledmac at error{Start column is greater than end column}{\@ehc}}
\newcommand{\led at err@toendnotes at outsidenumbering}{%
- \reledmac at error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering…\string\endnumbering)}{\@ehc}%
+ \reledmac at error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering\space …\space\string\endnumbering)}{\@ehc}%
}%
\newcommand{\led at err@EdtextWithoutFootnote}{%
\reledmac at error{edtext without Xfootnote. Check syntaxis}{\@ehc}%
@@ -307,7 +307,7 @@
\reledmac at error{Failed to patch the \string\makeindex\space command}{\@ehc}%
}%
\newcommand{\led at warn@edinde at outsidenumbering}{%
- \reledmac at warning{\string\edindex\space called outside of \string\beginnumbering…\string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
+ \reledmac at warning{\string\edindex\space called outside of \string\beginnumbering\space …\space \string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
}%
\newcommand{\led at warning@hsizeX at deprecated}{%
\reledmac at warning{\string\hsizeX\space command deprecated, use \string\widthX\space instead.}%
@@ -343,6 +343,7 @@
\newif\ifledRcol
\newif\ifledRcol@
\newif\ifnumberingR
+\newif\ifafterendnumberingR%
\newif\ifXnote@%
\providebool{indtl at innote}%
\providebool{indtl at notenumber}%
@@ -357,10 +358,22 @@
\endnumbering
\fi
\global\numberingtrue
+ \global\afterendnumberingRfalse%
\global\advance\section at num \@ne
\initnumbering at reg
\message{Section \the\section at num }%
\line at list@stuff{\jobname.\extensionchars\the\section at num}%
+ \ifcontinuousnumberingwithcolumns%
+ \unless\ifafterendnumberingR%
+ \unless\ifl at dpairing%
+ \ledRcoltrue%
+ \global\advance\section at numR \@ne%
+ \message{Section \the\section at numR R (continuoousnumbering)}%
+ \line at list@stuffR{\jobname.\extensionchars\the\section at numR R}%
+ \ledRcolfalse%
+ \fi%
+ \fi%
+ \fi%
\l at dend@stuff
\setcounter{pstart}{1}
\ifl at dpairing
@@ -463,6 +476,17 @@
\led at mess@SectionContinued{\the\section at num}%
\set at continuousnumberingforL%
\line at list@stuff{\jobname.\extensionchars\the\section at num}%
+ \ifcontinuousnumberingwithcolumns%
+ \unless\ifafterendnumberingR%
+ \unless\ifl at dpairing%
+ \ledRcoltrue%
+ \global\advance\section at numR \@ne%
+ \message{Section \the\section at numR R (continuoousnumbering)}%
+ \line at list@stuffR{\jobname.\extensionchars\the\section at numR R}%
+ \ledRcolfalse%
+ \fi%
+ \fi%
+ \fi%
\l at dend@stuff
\ifl at dpairing\else%
\begingroup%
@@ -480,16 +504,6 @@
\newcommand{\set at continuousnumberingforL}{%
\ifcontinuousnumberingwithcolumns%
- \ifdefined\line at numR%
- \ifnum\line at numR>\line at num%
- \global\appto\next at line@list at stuff{%
- \expandafter\setlinenum\expandafter{\the\line at numR}%
- }%
- \fi%
- \ifnum\last at page@numR>\last at page@num%
- \global\last at page@num=\last at page@numR%
- \fi%
- \fi%
\ifl at dpairing%
\unless\ifl at dpaging%
\global\c at pstartL=\c at pstart%
@@ -871,7 +885,16 @@
\csnumgdef{@lastline at forpageR@\the\page at numR}{\the\line at numR}%
\ifbypage at R
\ifx\l at dchset@num\relax%Not resetting if preceded by a \setlinenum
- \line at numR \z@ \subline at numR \z@%
+ \ifboolexpr{%
+ bool{resumenumberingR at start}%
+ and test {\ifnumequal{\last at page@numR}{-10000}}%
+ }%
+ {}%
+ {%
+ \line at numR \z@%
+ \subline at numR \z@%
+ \global\csdef{reset at lineR\the\numexpr\absline at numR+1\relax @\the\section at numR}{}%
+ }%
\fi%
\fi
\global\page at numR=#1%
@@ -886,6 +909,7 @@
\ifbypage@
\ifx\l at dchset@num\relax%Not resetting if preceded by a \setlinenum
\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%
@@ -1236,6 +1260,8 @@
\IfFileExists{\l at auxdir#1}%
{\global\toggletrue{notfirstrun@#1}}%
{\global\togglefalse{notfirstrun@#1}}%
+ \next at line@list at stuff%
+ \global\let\next at line@list at stuff\relax%
\read at linelist{#1}%
\iffirst at linenum@out@
\global\first at linenum@out at false%
@@ -1255,8 +1281,6 @@
\write\linenum at out{\string\@par at sync@option{\@par at this@sync at option}}%
\fi%
\fi%
- \next at line@list at stuff%
- \global\let\next at line@list at stuff\relax%
}%
\newcommand*{\new at line}{%
@@ -1942,14 +1966,23 @@
}%
\affixside at note%
\l at dlsn@te
- {\ledllfill\hb at xt@ \wd\one at line{\new at line%
- \ifluatex%
- \textdir\l at luatextextdir@L%
+ {\ledllfill\hb at xt@ \wd\one at line{%
+ \new at line%
+ \ifcontinuousnumberingwithcolumns%
+ \unless\ifafterendnumberingR%
+ \new at lineR%
+ \xappto\next at line@list at stuffR{%
+ \unexpanded{\global\line at numR=}\the\line at num%
+ }%
+ \fi%
\fi%
- \inserthangingsymbol%
- \l at dunhbox@line{\one at line}}%
- \ledrlfill\l at drd@ta%
- \l at drsn@te
+ \ifluatex%
+ \textdir\l at luatextextdir@L%
+ \fi%
+ \inserthangingsymbol%
+ \l at dunhbox@line{\one at line}}%
+ \ledrlfill\l at drd@ta%
+ \l at drsn@te%
}}%
\add at penalties%
}
@@ -2062,21 +2095,18 @@
\global\resumenumbering at startfalse%
\fi%
\fi%
- \unless\ifresumenumbering at start%
- \global\@firstlineofpagetrue%
- \fi%
- \ifbypage@
- \ifcsdef{l at dchset@num@\the\absline at num}%
- {%
- \global\csundef{l at dchset@num@\the\absline at num}%
- }%
- {%
- \unless\ifresumenumbering at start%
- \global\line at num=\z@ \global\subline at num=\z@%
- \resetprevline@%
- \fi%
- }%
- \fi
+ \ifboolexpr{%
+ bool{resumenumbering at start}%
+ and test {\ifdimgreater{\pagedepth}{\z@}}%
+ }%
+ {}%
+ {\global\@firstlineofpagetrue}%
+ \ifcsdef{reset at line\the\absline at num @\the\section at num}%
+ {%
+ \global\line at num=\z@ \global\subline at num=\z@%
+ \resetprevline@%
+ }%
+ {}%
\global\resumenumbering at startfalse%
\add at msdata@firstlineofpage%
\else
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2017-09-02 21:44:13 UTC (rev 45200)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2017-09-02 21:44:34 UTC (rev 45201)
@@ -27,9 +27,8 @@
-
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2017/08/23 v2.20.1 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2017/08/31 v2.20.2 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -149,7 +148,7 @@
Use instead #1R or #1* in your preamble.}%
}
\newcommand{\led at error@missing at numbering}[1]{%
- \reledpar at error{Missing \string\pstart…\string\pend\space inside `#1` environment}{\@ehc}%
+ \reledpar at error{Missing \string\pstart\space …\space\string\pend\space inside `#1` environment}{\@ehc}%
}%
\providecommand*{\newnamebox}[1]{%
\expandafter\newbox\csname #1\endcsname}
@@ -193,6 +192,7 @@
\global\l at dnumpstartsR \z@
\global\pst at rtedRfalse
\global\numberingRtrue
+ \global\afterendnumberingRfalse%
\global\advance\section at numR \@ne
\global\absline at numR \z@
\gdef\normal at page@breakR{}
@@ -209,6 +209,9 @@
\global\let\@msdata at list\relax%
\global\csundef{@msdata@\add at msd@cR @dataR}%
\ifcontinuousnumberingwithcolumns%
+ \ifnumbering%
+ \global\resumenumberingR at starttrue%
+ \fi%
\ifnumberpstart%
\addtocounter{pstartR}{1}%
\fi%
@@ -216,7 +219,6 @@
\setcounter{pstartR}{1}%
\fi%
\message{Section \the\section at numR R }%
- \set at continuousnumberingforR%
\line at list@stuffR{\jobname.\extensionchars\the\section at numR R}%
\l at dend@stuff
\begingroup
@@ -235,6 +237,7 @@
\def\endnumberingR{%
\ifnumberingR
\global\numberingRfalse
+ \global\afterendnumberingRtrue%
\normal at pars
\ifnum\l at dnumpstartsR=0%
\led at err@NumberingWithoutPstart%
@@ -300,7 +303,10 @@
\else%
\global\pausenumbering at page@numR=\next at page@numR%
\fi%
- \endnumberingR\global\numberingRtrue}
+ \endnumberingR%
+ \global\numberingRtrue%
+ \global\afterendnumberingRfalse%
+}%
\newif\ifresumenumberingR at start%
\newcommand*{\resumenumberingR}{%
\ifnumberingR
@@ -308,7 +314,6 @@
\global\advance\section at numR \@ne
\global\resumenumberingR at starttrue%
\led at mess@SectionContinued{\the\section at numR R}%
- \set at continuousnumberingforR%
\line at list@stuffR{\jobname.\extensionchars\the\section at numR R}%
\l at dend@stuff
\begingroup%
@@ -372,18 +377,6 @@
\fi
\fi
\fi}}
-\newcommand{\set at continuousnumberingforR}{%
- \ifcontinuousnumberingwithcolumns%
- \ifnum\line at numR<\line at num%
- \global\appto\next at line@list at stuffR{%
- \expandafter\setlinenum\expandafter{\the\line at num}%
- }%
- \fi%
- \ifnum\last at page@num>\last at page@numR%
- \global\last at page@numR=\last at page@num%
- \fi%
- \fi%
-}
\WithSuffix\newcommand\lineation*[1]{%
\lineation{#1}%
\lineationR{#1}%
@@ -734,6 +727,8 @@
\IfFileExists{\l at auxdir#1}%
{\global\toggletrue{notfirstrun@#1}}%
{\global\togglefalse{notfirstrun@#1}}%
+ \next at line@list at stuffR%
+ \global\let\next at line@list at stuffR\relax%
\read at linelist{#1}%
\iffirst at linenum@out at R
\global\first at linenum@out at Rfalse
@@ -749,8 +744,6 @@
\closeout\linenum at outR%
\openout\linenum at outR=\l at auxdir#1%
\fi%
- \next at line@list at stuffR%
- \global\let\next at line@list at stuffR\relax%
}%
\newcommand*{\new at lineL}{%
@@ -1232,21 +1225,23 @@
\global\advance\@donetotallinesL\@ne%
\else%
\iflinenumberLevenifblank
- \new at lineL%
- \l at demptyd@ta%
- \getline at numL%
- \affixline at num%
\setbox\l at dleftbox \hb at xt@ \Lcolwidth{%
+ \new at lineL%
+ \l at demptyd@ta%
+ \getline at numL%
+ \affixline at num%
\l at dld@ta%
\hspace*{\Lcolwidth}%
\ledrlfill\l at drd@ta%
}%
\else%
- \ifcontinuousnumberingwithcolumns%
- \new at lineL%
- \getline at numL%
- \fi%
- \setbox\l at dleftbox \hb at xt@ \Lcolwidth{\hspace*{\Lcolwidth}}%
+ \setbox\l at dleftbox \hb at xt@ \Lcolwidth{%
+ \ifcontinuousnumberingwithcolumns%
+ \new at lineL%
+ \getline at numL%
+ \fi%
+ \hspace*{\Lcolwidth}%
+ }%
\fi%
\global\advance\@donetotallinesL\@ne%
\fi%
@@ -1366,10 +1361,10 @@
\global\advance\@donetotallinesR\@ne%
\else%
\iflinenumberRevenifblank%
- \new at lineR
- \l at demptyd@ta%
- \getline at numR%
\setbox\l at drightbox \hb at xt@ \Rcolwidth{%
+ \new at lineR%
+ \l at demptyd@ta%
+ \getline at numR%
\affixline at numR%
\l at dld@ta%
\hspace*{\Rcolwidth}%
@@ -1376,11 +1371,13 @@
\ledrlfill\l at drd@ta%
}%
\else%
- \ifcontinuousnumberingwithcolumns%
- \new at lineR%
- \getline at numR%
- \fi%
- \setbox\l at drightbox \hb at xt@ \Rcolwidth{\hspace*{\Rcolwidth}}%
+ \setbox\l at drightbox \hb at xt@ \Rcolwidth{%
+ \ifcontinuousnumberingwithcolumns%
+ \new at lineR%
+ \getline at numR%
+ \fi%
+ \hspace*{\Rcolwidth}%
+ }%
\fi%
\global\advance\@donetotallinesR\@ne%
\fi%
@@ -1541,22 +1538,18 @@
\@l at dtempcntb=\absline at numR
\ifnum\@l at dtempcntb<\next at actionlineR\else
\ifnum\next at actionR>-1001\relax
- \unless\ifresumenumberingR at start%
- \@firstlineofpageRtrue%
- \fi%
+ \ifboolexpr{%
+ bool{resumenumberingR at start}%
+ and test {\ifdimgreater{\pagedepth}{\z@}}%
+ }%
+ {}%
+ {\@firstlineofpageRtrue}%
\global\page at numR=\next at actionR
- \ifbypage at R
- \ifcsdef{l at dchset@num at R\the\absline at numR}%
- {%
- \global\csundef{l at dchset@num at R\the\absline at numR}%
- }%
- {%
- \unless\ifresumenumberingR at start%
- \global\line at numR \z@%
- \global\subline at numR \z@%
- \fi%
- }%
- \fi
+ \ifcsdef{reset at lineR\the\absline at numR @\the\section at numR}%
+ {%
+ \global\line at numR=\z@ \global\subline at numR=\z@%
+ }%
+ {}%
\global\resumenumberingR at startfalse%
\add at msdata@firstlineofpage%
\else
More information about the tex-live-commits
mailing list