texlive[46483] Master/texmf-dist: reledmac (28jan18)
commits+karl at tug.org
commits+karl at tug.org
Tue Jan 30 01:29:34 CET 2018
Revision: 46483
http://tug.org/svn/texlive?view=revision&revision=46483
Author: karl
Date: 2018-01-30 01:29:33 +0100 (Tue, 30 Jan 2018)
Log Message:
-----------
reledmac (28jan18)
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-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/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-continuous-numbering.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex 2018-01-30 00:29:08 UTC (rev 46482)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex 2018-01-30 00:29:33 UTC (rev 46483)
@@ -188,4 +188,4 @@
\end{pairs}
\Columns
-\end{document}
\ No newline at end of file
+\end{document}
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-01-30 00:29:08 UTC (rev 46482)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2018-01-30 00:29:33 UTC (rev 46483)
@@ -499,7 +499,11 @@
% \changes{v2.26.2}{2017/12/22}{Fix bug with \protect\cs{Xgroupbyline} and \protect\cs{Xparafootsep}.}
% \changes{v2.26.2}{2017/11/22}{Fix bug with \protect\cs{linenumberannotation} in parallel typesetting}
% \changes{v2.26.3}{2018/01/06}{Fix bug added by v2.26.0 with notes in parallel typesetting}
-% \changes{v2.26.4}{2018/01/18}{Fix bug when using \protect\cs{numberpstarttrue} and alterning between manual \protect\cs{pstart} and automatic produced by \protect\cs{autopar}}
+% \changes{v2.26.4}{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.26.5}{2018/01/18}{Fix bug with using \protect\cs{eledsection} and related when alternate normal typesetting and parallel typesetting}
+% \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}}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -4177,7 +4181,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2018/01/18 v2.26.4 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2018/01/28 v2.26.5 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -8366,6 +8370,23 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\pstarts at typeset@L}
+% \begin{macro}{\pstarts at read@L}
+% The \cs{pstarts at typeset@L} counts the number of LEFT \cs{pstart} typeset.
+% A left \cs{pstart} can be a \cs{pstart} typeset in normal mode, or \cs{pstart} typset in left column or page in parallel mode (with{\parpackage}).
+% In the first case, its value is increased at every \cs{pstart} command.
+% In the second case, its value is increased in \cs{Columns} or \cs{Pages} when we prepare to typeset a left \cs{pstart}.
+% The \cs{pstarts at readL} counts the number of LEFT \cs{pstart} read.
+% A left \cs{pstart} can be a \cs{pstart} typeset in normal mode, or \cs{pstart} typset in left column or page in parallel mode (with{\parpackage}).
+% In the first case, its value is increased at every \cs{pstart} command.
+% In the second case, its value is increased at every \cs{pstarL}.
+%
+% \begin{macrocode}
+\newcount\pstarts at typeset@L%
+\newcount\pstarts at read@L%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
% \begin{macro}{\pstart}
% \begin{macro}{\AtEveryPstart}
% \begin{macro}{\AtStartEveryPstart}
@@ -8449,6 +8470,8 @@
\global\let\next at insert=\empty%
\begingroup\normal at pars%
\global\advance \l at dnumpstartsL\@ne
+ \global\advance \pstarts at typeset@L\@ne%
+ \global\advance \pstarts at read@L\@ne%
\global\setbox\raw at text=\vbox\bgroup%
\if at nobreak%
\if at afterindent\else%
@@ -8722,6 +8745,8 @@
% do all the processing for a single line of text.
% \changes{v1.6.1}{2013/10/27}{Move the call to \protect\cs{inserthangingsymbol} to allow use \protect\cs{hfill} inside.}
% \changes{v1.12.2}{2014/08/07}{Fix a bug with critical notes at the tops of pages (added by v12.0.0)}
+% The \cs{l at dunhbox@line} macro only \cs{unhbox} one lines, but some package as \cs{microtype} can override it for custom needs.
+%
% \begin{macrocode}
\newcommand*{\l at dunhbox@line}[1]{\unhbox #1}
\newcommand*{\do at line}{%
@@ -8750,7 +8775,7 @@
% Depending weither a sectioning command is called at this pstart or not
% we print sectioning command or normal line,
% \begin{macrocode}
- \xifinlist{\the\l at dnumpstartsL}{\eled at sections@@}%
+ \xifinlist{\the\pstarts at typeset@L}{\eled at sections@@}%
{\print at eledsection}%
{\print at line}%
\IfStrEq{\led at pb@setting}{after}{\led at check@pb\led at check@nopb}{}
@@ -8818,14 +8843,7 @@
% \end{macrocode}
% If we use the \option{continuousnumberingwithcolumns}, we increase right line number.
% \begin{macrocode}
- \ifcontinuousnumberingwithcolumns%
- \unless\ifafterendnumberingR%
- \new at lineR%
- \xappto\next at line@list at stuffR{%
- \unexpanded{\global\line at numR=}\the\line at num%
- }%
- \fi%
- \fi%
+ \continuousnumberingwithcolumns at sync@linenumber at singletext%
% \end{macrocode}
% If we use \LuaLaTeX\, then restore the direction.
% \begin{macrocode}
@@ -8878,12 +8896,12 @@
\insert at msdata%
}%
\affixside at note%
- \numdef{\temp@}{\l at dnumpstartsL-1}%
+ \numdef{\temp@}{\pstarts at typeset@L-1}%
\xifinlist{\temp@}{\eled at sections@@}{\@nobreaktrue}{\@nobreakfalse}%
\@eled at sectioningtrue%
- \csuse{eled at sectioning@\the\l at dnumpstartsL}%
+ \csuse{eled at sectioning@\the\pstarts at typeset@L}%
\@eled at sectioningfalse%
- \global\csundef{eled at sectioning@\the\l at dnumpstartsL}%
+ \global\csundef{eled at sectioning@\the\pstarts at typeset@L}%
\if at RTL%
\hspace{-3\paperwidth}%
{\hbox{\l at dunhbox@line{\one at line}} \new at line}%
@@ -8892,6 +8910,7 @@
{\new at line \hbox{\l at dunhbox@line{\one at line}}}%
\fi%
\vskip-\baselineskip%
+ \continuousnumberingwithcolumns at sync@linenumber at singletext%
}
% \end{macrocode}
% \end{macro}
@@ -9207,6 +9226,30 @@
% \end{macrocode}
% \end{macro}
+% \subsection{Continuous line numbering between parallel typesetting and normal typesetting}
+% \begin{macro}{\continuousnumberingwithcolumns at sync@linenumber at singletext}
+% The \option{continuousnumberingwithcolumns}
+% option allows to alternate between single text and two parallels texts, keeping same line numbers when switching from one layout to the other one.
+% The lines counter for the text in a single column and for the text in the text in the left column in parallel typesetting is the same.
+% But the lines counter for the text in the same column is the not the same.
+%
+% When typesetting single column text, if the option is enabled, we need to \enquote{simulate} typesetting right line, in order to keep the two counters synchronized.
+% That is the aim of the \\
+% \cs{continuousnumberingwithcolumns at sync@linenumber at singletext}\\
+% macro.
+% \begin{macrocode}
+\newcommand{\continuousnumberingwithcolumns at sync@linenumber at singletext}{%
+ \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}
+% \end{macro}
% \section{Line number annotation}
% The \cs{linenumannotation} allows users to add manual annotations to line numbers, for example to refer to line numbers from an older edition.
%
@@ -19881,7 +19924,7 @@
% \begin{itemize}
% \item The section level.
% \item The section title.
-% \item The side (when \protect\package{eledpar} is used).
+% \item The side (when \parpackage\ is used).
% \item The pstart where the command is called.
% \item If we have starred version or not.
% \end{itemize}
@@ -20240,7 +20283,7 @@
}%
\else%
\immediate\write\eled at sectioning@out{%
- \string\eled at chapter{#1}{\unexpanded{#2}}{\the\l at dnumpstartsL}{}{}
+ \string\eled at chapter{#1}{\unexpanded{#2}}{\the\pstarts at read@L}{}{}%
}%
\fi%
}
@@ -20255,7 +20298,7 @@
}%
\else%
\immediate\write\eled at sectioning@out{%
- \string\eled at section{#1}{\unexpanded{#2}}{\the\l at dnumpstartsL}{}{}
+ \string\eled at section{#1}{\unexpanded{#2}}{\the\pstarts at read@L}{}{}%
}%
\fi%
}
@@ -20270,7 +20313,7 @@
}%
\else%
\immediate\write\eled at sectioning@out{%
- \string\eled at subsection{#1}{\unexpanded{#2}}{\the\l at dnumpstartsL}{}{}
+ \string\eled at subsection{#1}{\unexpanded{#2}}{\the\pstarts at read@L}{}{}%
}%
\fi%
}
@@ -20284,7 +20327,7 @@
}%
\else%
\immediate\write\eled at sectioning@out{%
- \string\eled at subsubsection{#1}{\unexpanded{#2}}{\the\l at dnumpstartsL}{}{}
+ \string\eled at subsubsection{#1}{\unexpanded{#2}}{\the\pstarts at read@L}{}{}%
}%
\fi%
}
@@ -20300,7 +20343,7 @@
}%
\else%
\immediate\write\eled at sectioning@out{%
- \string\eled at chapter{#1}{\unexpanded{#2}}{\the\l at dnumpstartsL}{*}{}
+ \string\eled at chapter{#1}{\unexpanded{#2}}{\the\pstarts at read@L}{*}{}%
}%
\fi%
}
@@ -20315,7 +20358,7 @@
}%
\else%
\immediate\write\eled at sectioning@out{%
- \string\eled at section{#1}{\unexpanded{#2}}{\the\l at dnumpstartsL}{*}{}
+ \string\eled at section{#1}{\unexpanded{#2}}{\the\pstarts at read@L}{*}{}%
}%
\fi%
}
@@ -20330,7 +20373,7 @@
}%
\else%
\immediate\write\eled at sectioning@out{%
- \string\eled at subsection{#1}{\unexpanded{#2}}{\the\l at dnumpstartsL}{*}{}
+ \string\eled at subsection{#1}{\unexpanded{#2}}{\the\pstarts at read@L}{*}{}%
}%
\fi%
}
@@ -20345,7 +20388,7 @@
}%
\else%
\immediate\write\eled at sectioning@out{%
- \string\eled at subsubsection{#1}{\unexpanded{#2}}{\the\l at dnumpstartsL}{*}{}
+ \string\eled at subsubsection{#1}{\unexpanded{#2}}{\the\pstarts at read@L}{*}{}%
}%
\fi%
}
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2018-01-30 00:29:08 UTC (rev 46482)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2018-01-30 00:29:33 UTC (rev 46483)
@@ -325,7 +325,8 @@
% \changes{v2.21.0}{2017/11/11}{Add compatibility with new features of \protect\reledmac 2.26.0}
% \changes{v2.21.1}{2017/11/22}{Fix bug with \protect\cs{linenumberannotation}}
% \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 produced by \protect\cs{autopar}}
+% \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}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -1371,7 +1372,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2018/01/18 v2.21.3 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2018/01/28 v2.21.4 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -3575,6 +3576,7 @@
% forthcoming text.
% \begin{macrocode}
\global\advance\l at dnumpstartsL \@ne%
+ \global\advance\pstarts at read@L \@ne%
\ifnum\l at dnumpstartsL>\l at dc@maxchunks%
\led at err@TooManyPstarts%
\global\l at dnumpstartsL=\l at dc@maxchunks%
@@ -3957,7 +3959,7 @@
\else%
\affixline at num%
\fi%
- \xifinlist{\the\l at dpscL}{\eled at sections@@}%
+ \xifinlist{\the\pstarts at typeset@L}{\eled at sections@@}%
{\unless\ifshiftedpstarts%
\add at apparatusL%
\fi%
@@ -4025,7 +4027,7 @@
\addtocounter{pstartL}{-1}%
\ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{}
\ifdefstring{\@eledsectmark}{L}{}{\ledsectnomark}
- \numdef{\temp@}{\l at dpscL-1}%
+ \numdef{\temp@}{\pstarts at typeset@L-1}%
\xifinlist{\temp@}{\eled at sections@@}{\@nobreaktrue}{\@nobreakfalse}%
\@eled at sectioningtrue%
\bgroup%
@@ -4035,10 +4037,10 @@
\bodydir\l at luatexbodydir@L%
\ifdefstring{\l at luatextextdir@L}{TRT}{\@RTLtrue}{}%
\fi%
- \csuse{eled at sectioning@\the\l at dpscL}%
+ \csuse{eled at sectioning@\the\pstarts at typeset@L}%
\egroup%
\@eled at sectioningfalse%
- \global\csundef{eled at sectioning@\the\l at dpscL}%
+ \global\csundef{eled at sectioning@\the\pstarts at typeset@L}%
\if at RTL%
\hspace{-3\paperwidth}%
{\hbox{\l at dunhbox@line{\one at line}} \new at line}%
@@ -5556,9 +5558,9 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\l at pscL}
-% \begin{macro}{\l at pscR}
-% A couple of scratch counts for use in left and right texts, respectively.
+% \begin{macro}{\l at dpscL}
+% \begin{macro}{\l at dpscR}
+% A couple of scratch counts to count left and right \cs{pstart}, respectively.
% \begin{macrocode}
\newcount\l at dpscL
\newcount\l at dpscR
@@ -5778,12 +5780,14 @@
\global\pstartnumtrue
\global\pstartnumRtrue
% \end{macrocode}
-% Increment \protect\cs{l at dpscL} and \protect\cs{l at dpscR} which here count
+% Increase \protect\cs{l at dpscL} and \protect\cs{l at dpscR} which here count
% the numbers of left and right chunks.
+% Increase \cs{pstarts at typeset@L}, which counts the number of \cs{pstart} typeset both in not parallel mode and in the left side of parallel mode.
% Also restore the value of the public pstart counters.
% \begin{macrocode}
\global\advance\l at dpscL \@ne
\global\advance\l at dpscR \@ne
+ \global\advance\pstarts at typeset@L\@ne%
\restore at pstartL@pc%
\restore at pstartR@pc%
% \end{macrocode}
@@ -5806,12 +5810,12 @@
% \begin{macrocode}
\l at duselanguage{\theledlanguageL}%
\do at lineL
- \xifinlist{\the\l at dpscL}{\eled at sections@@}
+ \xifinlist{\the\pstarts at typeset@L}{\eled at sections@@}%
{%
\ifdefstring{\@eledsectmark}{L}%
- {\csuse{eled at sectmark@\the\l at dpscL}%
+ {\csuse{eled at sectmark@\the\pstarts at typeset@L}%
}{}%
- \global\csundef{eled at sectmark@\the\l at dpscL}%
+ \global\csundef{eled at sectmark@\the\pstarts at typeset@L}%
\savebox{\@eledsectionL}{\parbox[t][][t]{\Lcolwidth}{\vbox{}\print at eledsectionL}}%\vbox{}-> prevent alignment troubles with RTL language
}%
{}%
@@ -6381,7 +6385,8 @@
% \end{macrocode}
% Loop over the number of chunks, incrementing the chunk counts
% (\protect\cs{l at dpscL}
-% and \protect\cs{l at dpscR} are chunk (box) counts.)
+% and \protect\cs{l at dpscR} are chunk (box) counts).
+%
% \begin{macrocode}
\global\advance\l at dpscL \@ne%
\global\advance\l at dpscR \@ne%
@@ -6420,6 +6425,7 @@
% \begin{macrocode}
\global\advance\l at dpscL \@ne%
\global\advance\l at dpscR \@ne%
+ \global\advance\pstarts at typeset@L\@ne%
\restore at pstartL@pc%
\restore at pstartR@pc%
% \end{macrocode}
@@ -6455,7 +6461,7 @@
\csuse{before at pstartL@\the\l at dpscL}%
\global\csundef{before at pstartL@\the\l at dpscL}%
\do at lineL%
- \xifinlist{\the\l at dpscL}{\eled at sections@@}
+ \xifinlist{\the\pstarts at typeset@L}{\eled at sections@@}%
{\print at eledsectionL}%
{}%
\advance\numpagelinesL \@ne%
@@ -6473,7 +6479,7 @@
\parledgroup at correction@notespacing{L}%
\hb at xt@ \hsize{\ledstrutL\unhbox\l at dleftbox}%
\else%
- \xifinlist{\the\l at dpscL}{\eled at sections@@}%
+ \xifinlist{\the\pstarts at typeset@L}{\eled at sections@@}%
{\add at apparatusL}%
{}%
\unless\ifadvancedshiftedpstarts%
@@ -7174,6 +7180,7 @@
% Go to the next pstart
% \begin{macrocode}
\global\advance\l at dpscL \@ne
+ \global\advance\pstarts at typeset@L\@ne%
\global\pstartnumtrue%
\restore at pstartL@pc%
% \end{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2018-01-30 00:29:08 UTC (rev 46482)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2018-01-30 00:29:33 UTC (rev 46483)
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2018/01/18 v2.26.4 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2018/01/28 v2.26.5 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default at series{#1}}
@@ -1792,6 +1792,8 @@
\newcount\num at lines
\newbox\one at line
\newcount\par at line
+\newcount\pstarts at typeset@L%
+\newcount\pstarts at read@L%
\newcommand{\AtStartEveryPstart}[1]{%
\ifstrempty{#1}%
@@ -1851,6 +1853,8 @@
\global\let\next at insert=\empty%
\begingroup\normal at pars%
\global\advance \l at dnumpstartsL\@ne
+ \global\advance \pstarts at typeset@L\@ne%
+ \global\advance \pstarts at read@L\@ne%
\global\setbox\raw at text=\vbox\bgroup%
\if at nobreak%
\if at afterindent\else%
@@ -2009,7 +2013,7 @@
\else%
\affixline at num%
\fi%
- \xifinlist{\the\l at dnumpstartsL}{\eled at sections@@}%
+ \xifinlist{\the\pstarts at typeset@L}{\eled at sections@@}%
{\print at eledsection}%
{\print at line}%
\IfStrEq{\led at pb@setting}{after}{\led at check@pb\led at check@nopb}{}
@@ -2037,14 +2041,7 @@
\l at dlsn@te
{\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%
+ \continuousnumberingwithcolumns at sync@linenumber at singletext%
\ifluatex%
\textdir\l at luatextextdir@L%
\fi%
@@ -2071,12 +2068,12 @@
\insert at msdata%
}%
\affixside at note%
- \numdef{\temp@}{\l at dnumpstartsL-1}%
+ \numdef{\temp@}{\pstarts at typeset@L-1}%
\xifinlist{\temp@}{\eled at sections@@}{\@nobreaktrue}{\@nobreakfalse}%
\@eled at sectioningtrue%
- \csuse{eled at sectioning@\the\l at dnumpstartsL}%
+ \csuse{eled at sectioning@\the\pstarts at typeset@L}%
\@eled at sectioningfalse%
- \global\csundef{eled at sectioning@\the\l at dnumpstartsL}%
+ \global\csundef{eled at sectioning@\the\pstarts at typeset@L}%
\if at RTL%
\hspace{-3\paperwidth}%
{\hbox{\l at dunhbox@line{\one at line}} \new at line}%
@@ -2085,6 +2082,7 @@
{\new at line \hbox{\l at dunhbox@line{\one at line}}}%
\fi%
\vskip-\baselineskip%
+ \continuousnumberingwithcolumns at sync@linenumber at singletext%
}
\newcommand*{\do at linehook}{}
\newcommand*{\do at insidelinehook}{}
@@ -2237,6 +2235,16 @@
\led at warn@BadAction
\fi}
+\newcommand{\continuousnumberingwithcolumns at sync@linenumber at singletext}{%
+ \ifcontinuousnumberingwithcolumns%
+ \unless\ifafterendnumberingR%
+ \new at lineR%
+ \xappto\next at line@list at stuffR{%
+ \unexpanded{\global\line at numR=}\the\line at num%
+ }%
+ \fi%
+ \fi%
+}%
\newcommand{\linenumannotation}[1]{%
\leavevmode%In case it begins with a \pstart, ensure the \@annot is written after \@nl
\ifledRcol%
@@ -8645,7 +8653,7 @@
}%
\else%
\immediate\write\eled at sectioning@out{%
- \string\eled at chapter{#1}{\unexpanded{#2}}{\the\l at dnumpstartsL}{}{}
+ \string\eled at chapter{#1}{\unexpanded{#2}}{\the\pstarts at read@L}{}{}%
}%
\fi%
}
@@ -8660,7 +8668,7 @@
}%
\else%
\immediate\write\eled at sectioning@out{%
- \string\eled at section{#1}{\unexpanded{#2}}{\the\l at dnumpstartsL}{}{}
+ \string\eled at section{#1}{\unexpanded{#2}}{\the\pstarts at read@L}{}{}%
}%
\fi%
}
@@ -8675,7 +8683,7 @@
}%
\else%
\immediate\write\eled at sectioning@out{%
- \string\eled at subsection{#1}{\unexpanded{#2}}{\the\l at dnumpstartsL}{}{}
+ \string\eled at subsection{#1}{\unexpanded{#2}}{\the\pstarts at read@L}{}{}%
}%
\fi%
}
@@ -8689,7 +8697,7 @@
}%
\else%
\immediate\write\eled at sectioning@out{%
- \string\eled at subsubsection{#1}{\unexpanded{#2}}{\the\l at dnumpstartsL}{}{}
+ \string\eled at subsubsection{#1}{\unexpanded{#2}}{\the\pstarts at read@L}{}{}%
}%
\fi%
}
@@ -8704,7 +8712,7 @@
}%
\else%
\immediate\write\eled at sectioning@out{%
- \string\eled at chapter{#1}{\unexpanded{#2}}{\the\l at dnumpstartsL}{*}{}
+ \string\eled at chapter{#1}{\unexpanded{#2}}{\the\pstarts at read@L}{*}{}%
}%
\fi%
}
@@ -8719,7 +8727,7 @@
}%
\else%
\immediate\write\eled at sectioning@out{%
- \string\eled at section{#1}{\unexpanded{#2}}{\the\l at dnumpstartsL}{*}{}
+ \string\eled at section{#1}{\unexpanded{#2}}{\the\pstarts at read@L}{*}{}%
}%
\fi%
}
@@ -8734,7 +8742,7 @@
}%
\else%
\immediate\write\eled at sectioning@out{%
- \string\eled at subsection{#1}{\unexpanded{#2}}{\the\l at dnumpstartsL}{*}{}
+ \string\eled at subsection{#1}{\unexpanded{#2}}{\the\pstarts at read@L}{*}{}%
}%
\fi%
}
@@ -8749,7 +8757,7 @@
}%
\else%
\immediate\write\eled at sectioning@out{%
- \string\eled at subsubsection{#1}{\unexpanded{#2}}{\the\l at dnumpstartsL}{*}{}
+ \string\eled at subsubsection{#1}{\unexpanded{#2}}{\the\pstarts at read@L}{*}{}%
}%
\fi%
}
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2018-01-30 00:29:08 UTC (rev 46482)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2018-01-30 00:29:33 UTC (rev 46483)
@@ -28,7 +28,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2018/01/18 v2.21.3 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2018/01/28 v2.21.4 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -978,6 +978,7 @@
\fi%
\begingroup\everypar{}%
\global\advance\l at dnumpstartsL \@ne%
+ \global\advance\pstarts at read@L \@ne%
\ifnum\l at dnumpstartsL>\l at dc@maxchunks%
\led at err@TooManyPstarts%
\global\l at dnumpstartsL=\l at dc@maxchunks%
@@ -1242,7 +1243,7 @@
\else%
\affixline at num%
\fi%
- \xifinlist{\the\l at dpscL}{\eled at sections@@}%
+ \xifinlist{\the\pstarts at typeset@L}{\eled at sections@@}%
{\unless\ifshiftedpstarts%
\add at apparatusL%
\fi%
@@ -1295,7 +1296,7 @@
\addtocounter{pstartL}{-1}%
\ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{}
\ifdefstring{\@eledsectmark}{L}{}{\ledsectnomark}
- \numdef{\temp@}{\l at dpscL-1}%
+ \numdef{\temp@}{\pstarts at typeset@L-1}%
\xifinlist{\temp@}{\eled at sections@@}{\@nobreaktrue}{\@nobreakfalse}%
\@eled at sectioningtrue%
\bgroup%
@@ -1305,10 +1306,10 @@
\bodydir\l at luatexbodydir@L%
\ifdefstring{\l at luatextextdir@L}{TRT}{\@RTLtrue}{}%
\fi%
- \csuse{eled at sectioning@\the\l at dpscL}%
+ \csuse{eled at sectioning@\the\pstarts at typeset@L}%
\egroup%
\@eled at sectioningfalse%
- \global\csundef{eled at sectioning@\the\l at dpscL}%
+ \global\csundef{eled at sectioning@\the\pstarts at typeset@L}%
\if at RTL%
\hspace{-3\paperwidth}%
{\hbox{\l at dunhbox@line{\one at line}} \new at line}%
@@ -2330,6 +2331,7 @@
\global\pstartnumRtrue
\global\advance\l at dpscL \@ne
\global\advance\l at dpscR \@ne
+ \global\advance\pstarts at typeset@L\@ne%
\restore at pstartL@pc%
\restore at pstartR@pc%
\Columns at print@before at pstart%
@@ -2337,12 +2339,12 @@
{ \loop\ifaraw at text
\l at duselanguage{\theledlanguageL}%
\do at lineL
- \xifinlist{\the\l at dpscL}{\eled at sections@@}
+ \xifinlist{\the\pstarts at typeset@L}{\eled at sections@@}%
{%
\ifdefstring{\@eledsectmark}{L}%
- {\csuse{eled at sectmark@\the\l at dpscL}%
+ {\csuse{eled at sectmark@\the\pstarts at typeset@L}%
}{}%
- \global\csundef{eled at sectmark@\the\l at dpscL}%
+ \global\csundef{eled at sectmark@\the\pstarts at typeset@L}%
\savebox{\@eledsectionL}{\parbox[t][][t]{\Lcolwidth}{\vbox{}\print at eledsectionL}}%\vbox{}-> prevent alignment troubles with RTL language
}%
{}%
@@ -2735,6 +2737,7 @@
\if at pstarts%
\global\advance\l at dpscL \@ne%
\global\advance\l at dpscR \@ne%
+ \global\advance\pstarts at typeset@L\@ne%
\restore at pstartL@pc%
\restore at pstartR@pc%
\global\@donereallinesL=\z@%
@@ -2750,7 +2753,7 @@
\csuse{before at pstartL@\the\l at dpscL}%
\global\csundef{before at pstartL@\the\l at dpscL}%
\do at lineL%
- \xifinlist{\the\l at dpscL}{\eled at sections@@}
+ \xifinlist{\the\pstarts at typeset@L}{\eled at sections@@}%
{\print at eledsectionL}%
{}%
\advance\numpagelinesL \@ne%
@@ -2759,7 +2762,7 @@
\parledgroup at correction@notespacing{L}%
\hb at xt@ \hsize{\ledstrutL\unhbox\l at dleftbox}%
\else%
- \xifinlist{\the\l at dpscL}{\eled at sections@@}%
+ \xifinlist{\the\pstarts at typeset@L}{\eled at sections@@}%
{\add at apparatusL}%
{}%
\unless\ifadvancedshiftedpstarts%
@@ -3180,6 +3183,7 @@
{\usenamecount{l at dmaxlinesinpar\the\l at dpscL}}%
\global\@donetotallinesL \z@
\global\advance\l at dpscL \@ne
+ \global\advance\pstarts at typeset@L\@ne%
\global\pstartnumtrue%
\restore at pstartL@pc%
\parledgroup at notes@endL
More information about the tex-live-commits
mailing list