texlive[46387] Master/texmf-dist: reledmac (19jan18)
commits+karl at tug.org
commits+karl at tug.org
Fri Jan 19 22:58:25 CET 2018
Revision: 46387
http://tug.org/svn/texlive?view=revision&revision=46387
Author: karl
Date: 2018-01-19 22:58:25 +0100 (Fri, 19 Jan 2018)
Log Message:
-----------
reledmac (19jan18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/migration.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/migration.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2018-01-19 21:58:00 UTC (rev 46386)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2018-01-19 21:58:25 UTC (rev 46387)
@@ -499,6 +499,7 @@
% \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}}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -897,12 +898,10 @@
% \subsubsection{Automatically producing \protect\cs{pstart} \ldots{} \protect\cs{pend}}
% \DescribeMacro{\autopar}\label{autopar}
% You can use \protect\cs{autopar} to avoid the nuisance of this paragraph markup
-% and still have every paragraph automatically numbered. The scope of the
-% \protect\cs{autopar} command needs to be limited by keeping it within a group, as
-% follows:
+% and still have every paragraph automatically numbered. The
+% \protect\cs{autopar} command needs to be called inside a \cs{beginnumbering}\ldots\cs{endnumbering} structure, as follows:
% \egstart
% \begin{verbatim}
-% \begingroup
% \beginnumbering
% \autopar
%
@@ -912,7 +911,6 @@
% text.
%
% \endnumbering
-% \endgroup
% \end{verbatim}
% \egend
%
@@ -4179,7 +4177,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2018/01/06 v2.26.3 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2018/01/18 v2.26.4 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -8458,15 +8456,20 @@
\global\@afterindenttrue%
\fi%
\fi%
- \ifautopar\else%
- \ifnumberpstart%
- \ifinstanza\else%
- \ifsidepstartnum\else%
- \thepstart%
+ \ifboolexpr{%
+ bool{autopar}%
+ and bool{by at autopar}%
+ }%
+ {}%
+ {%
+ \ifnumberpstart%
+ \ifinstanza\else%
+ \ifsidepstartnum\else%
+ \thepstart%
+ \fi%
\fi%
- \fi%
\fi%
- \fi%
+ }%
\numberedpar at true%
\iflabelpstart%
\protected at edef\@currentlabel{\p at pstart\thepstart}%
@@ -8473,6 +8476,7 @@
\fi%
\l at dzeropenalties%
\@at at start@every at pstart%
+ \global\by at autoparfalse%
\ignorespaces%because not automatically ignored if an optional argument is used (classical TeX behavior for space after commands)
}
% \end{macrocode}
@@ -8656,9 +8660,12 @@
% that has been added for this paragraph. Then we start again with
% \protect\cs{pstart}, restoring the indentation that we saved, and
% locally change \protect\cs{par} so that it will do our \protect\cs{pend} for us.
+%
+% The boolean \cs{ifautopar} is set to TRUE while \cs{autopar} is enabled, and the \cs{ifby at autopar} is set to TRUE at each \cs{pstart} automatically called by \cs{autopar} feature. A manually \cs{pstart} will have a \cs{ifby at autopar} set to false.
+%
% \begin{macrocode}
\newif\ifautopar
-\autoparfalse
+\newif\ifby at autopar%
\newcommand*{\autopar}{
\ifledRcol
\ifnumberingR \else
@@ -8674,7 +8681,13 @@
\autopartrue
\everypar{\setbox0=\lastbox
\endgraf \vskip-\parskip
- \pstart \noindent \kern\wd0 \ifnumberpstart\ifinstanza\else\thepstart\fi\fi
+ \global\by at autopartrue%
+ \pstart \noindent \kern\wd0%
+ \ifnumberpstart%
+ \ifinstanza\else%
+ \thepstart%
+ \fi%
+ \fi%
\let\par=\pend}%
\ignorespaces}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2018-01-19 21:58:00 UTC (rev 46386)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2018-01-19 21:58:25 UTC (rev 46387)
@@ -325,6 +325,7 @@
% \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}}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -1370,7 +1371,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2018/01/08 v2.21.2 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2018/01/18 v2.21.3 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -3586,14 +3587,19 @@
% that you set when the group for the \protect\cs{vbox} ends.
% \begin{macrocode}
\l at dzeropenalties%
- \ifautopar\else%
+ \ifboolexpr{%
+ bool{autopar}%
+ and bool{by at autopar}%
+ }%
+ {}%
+ {%
\ifnumberpstart%
\ifsidepstartnum%
\else%
- \thepstartL%
- \fi%
- \fi%
+ \thepstartL%
\fi%
+ \fi%
+ }%m
\@at at start@every at pstart%
\hsize=\Lcolwidth%
\numberedpar at true%
@@ -3629,11 +3635,13 @@
}%
\at at every@pstart at call%
% \end{macrocode}
+% Let \cs{by at autopar} to FALSE.
+% \begin{macrocode}
+ \global\by at autoparfalse%
+% \end{macrocode}
% Gobble following space (automatically done if there is no optional argument)
% \begin{macrocode}
\ignorespaces%
-% \end{macrocode}
-% \begin{macrocode}
}
% \end{macrocode}
% The same for right side.
@@ -3672,13 +3680,18 @@
\fi%
\global\setnamebox{l at dRcolrawbox\the\l at dnumpstartsR}=\vbox\bgroup%
\l at dzeropenalties%
- \ifautopar\else%
+ \ifboolexpr{%
+ bool{autopar}%
+ and bool{by at autopar}%
+ }%
+ {}%
+ {%
\ifnumberpstart%
\ifsidepstartnum\else%
\thepstartR%
- \fi%
\fi%
- \fi%
+ \fi%
+ }%
\@at at start@every at pstart%
\hsize=\Rcolwidth%
\numberedpar at true%
@@ -3710,6 +3723,7 @@
}%
}%
\at at every@pstart at call%
+ \global\by at autoparfalse%
\ignorespaces%
}
% \end{macrocode}
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2018-01-19 21:58:00 UTC (rev 46386)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2018-01-19 21:58:25 UTC (rev 46387)
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2018/01/06 v2.26.3 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2018/01/18 v2.26.4 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default at series{#1}}
@@ -1858,15 +1858,20 @@
\global\@afterindenttrue%
\fi%
\fi%
- \ifautopar\else%
- \ifnumberpstart%
- \ifinstanza\else%
- \ifsidepstartnum\else%
- \thepstart%
+ \ifboolexpr{%
+ bool{autopar}%
+ and bool{by at autopar}%
+ }%
+ {}%
+ {%
+ \ifnumberpstart%
+ \ifinstanza\else%
+ \ifsidepstartnum\else%
+ \thepstart%
+ \fi%
\fi%
- \fi%
\fi%
- \fi%
+ }%
\numberedpar at true%
\iflabelpstart%
\protected at edef\@currentlabel{\p at pstart\thepstart}%
@@ -1873,6 +1878,7 @@
\fi%
\l at dzeropenalties%
\@at at start@every at pstart%
+ \global\by at autoparfalse%
\ignorespaces%because not automatically ignored if an optional argument is used (classical TeX behavior for space after commands)
}
\newcommandx*{\pend}[2][1,2,usedefault]{\ifnumbering \else%
@@ -1953,7 +1959,7 @@
\postdisplaypenalty \z@ \widowpenalty \z@}
\newif\ifautopar
-\autoparfalse
+\newif\ifby at autopar%
\newcommand*{\autopar}{
\ifledRcol
\ifnumberingR \else
@@ -1969,7 +1975,13 @@
\autopartrue
\everypar{\setbox0=\lastbox
\endgraf \vskip-\parskip
- \pstart \noindent \kern\wd0 \ifnumberpstart\ifinstanza\else\thepstart\fi\fi
+ \global\by at autopartrue%
+ \pstart \noindent \kern\wd0%
+ \ifnumberpstart%
+ \ifinstanza\else%
+ \thepstart%
+ \fi%
+ \fi%
\let\par=\pend}%
\ignorespaces}
\newcommand*{\normal at pars}{\everypar{}\let\par\endgraf}
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2018-01-19 21:58:00 UTC (rev 46386)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2018-01-19 21:58:25 UTC (rev 46387)
@@ -28,7 +28,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2018/01/08 v2.21.2 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2018/01/18 v2.21.3 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -984,14 +984,19 @@
\fi%
\global\setnamebox{l at dLcolrawbox\the\l at dnumpstartsL}=\vbox\bgroup%
\l at dzeropenalties%
- \ifautopar\else%
+ \ifboolexpr{%
+ bool{autopar}%
+ and bool{by at autopar}%
+ }%
+ {}%
+ {%
\ifnumberpstart%
\ifsidepstartnum%
\else%
- \thepstartL%
- \fi%
- \fi%
+ \thepstartL%
\fi%
+ \fi%
+ }%m
\@at at start@every at pstart%
\hsize=\Lcolwidth%
\numberedpar at true%
@@ -1023,6 +1028,7 @@
}%
}%
\at at every@pstart at call%
+ \global\by at autoparfalse%
\ignorespaces%
}
\newcommandx*{\pstartR}[2][1,2,usedefault]{%
@@ -1058,13 +1064,18 @@
\fi%
\global\setnamebox{l at dRcolrawbox\the\l at dnumpstartsR}=\vbox\bgroup%
\l at dzeropenalties%
- \ifautopar\else%
+ \ifboolexpr{%
+ bool{autopar}%
+ and bool{by at autopar}%
+ }%
+ {}%
+ {%
\ifnumberpstart%
\ifsidepstartnum\else%
\thepstartR%
- \fi%
\fi%
- \fi%
+ \fi%
+ }%
\@at at start@every at pstart%
\hsize=\Rcolwidth%
\numberedpar at true%
@@ -1096,6 +1107,7 @@
}%
}%
\at at every@pstart at call%
+ \global\by at autoparfalse%
\ignorespaces%
}
\newcommandx*{\pendL}[2][1,2,usedefault]{%
More information about the tex-live-commits
mailing list