texlive[57487] Master/texmf-dist: reledmac (21jan21)
commits+karl at tug.org
commits+karl at tug.org
Thu Jan 21 23:16:18 CET 2021
Revision: 57487
http://tug.org/svn/texlive?view=revision&revision=57487
Author: karl
Date: 2021-01-21 23:16:18 +0100 (Thu, 21 Jan 2021)
Log Message:
-----------
reledmac (21jan21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.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-antilabe.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-subdivision-number-in-header.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-criticalendnotes.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-antilabe.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-subdivision-number-in-header.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 2021-01-21 22:15:47 UTC (rev 57486)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2021-01-21 22:16:18 UTC (rev 57487)
@@ -571,6 +571,8 @@
% \changes{v2.35.0}{2020/11/29}{Add \protect\cs{linenumannotationothersidetrue}.}
% \changes{v2.35.0}{2020/11/29}{Add new hooks: \protect\cs{Xnolinenumber}, \protect\cs{Xendnolinenumber}, \protect\cs{Xnolinenumberifannotation}, \protect\cs{Xendnolinenumberifannotation}.}
% \changes{v2.35.1}{2020/12/20}{Fix a bug when printing ending page number in endnotes and using the \protect\package{hyperref} package.}
+% \changes{v2.36.0}{2020/01/21}{Fix bug with sublineation on right side of parallel typesetting.}
+% \changes{v2.36.0}{2020/01/21}{Add \protect\cs{Xnonote} and \protect\cs{nonoteX}.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -2255,7 +2257,6 @@
% \label{displayoptions}
% \subsection{Introduction}
% \changes{v1.0.0}{2012/09/15}{New generic commands to customize footnote display.}
-% \subsection{Introduction}
% Some commands can be used to change the way the footnotes are displayed.\footnote{In the code of \macpackage, these commands are called \enquote{hooks}.}
% All can have an optional argument \oarg{s}, which is the letter of the series\,---\,or
% a list of letters separated by comma\,---\,depending on which option is applied.
@@ -2320,6 +2321,14 @@
% change the \protect\cs{hsize} within the document, call
% the arrangement macro again afterwards to take account of the new
% value.
+% \subsection{Disabling footnote}
+% \DescribeMacro{Xnonote}\DescribeMacro{nonoteX}
+% Some time, you may want to export your edition without notes, but don't want to modify globally your code.
+%
+% \cs{Xnonote}\oarg{s} allow to disable critical notes for the series \meta{s}.
+%
+% \cs{nonoteX}\oarg{s} is the same for familiar notes.
+%
% \subsection{Control number printing}
% \subsubsection{Print line number only at first time}
% \DescribeMacro{\Xnumberonlyfirstinline}\label{Xnumberonlyfirstinline}
@@ -4450,7 +4459,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2020/12/20 v2.35.1 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2021/01/21 v2.36.0 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -6176,11 +6185,12 @@
% \end{macro}
%
% \begin{macro}{\ifsublines@}
+% \begin{macro}{\ifsublines at R}
% \begin{macro}{\sublines at true}
% \begin{macro}{\sublines at false}
% We maintain an associated flag, \protect\cs{ifsublines@},
% to tell us whether we're within
-% a sub-line range or not.
+% a sub-line range or not (and the equivalent for right side: \cs{ifsublines at R})
%
% You may wonder why we do not just use the value of \protect\cs{subline at num}
% to determine this---treating anything greater than $0$ as an
@@ -6195,10 +6205,12 @@
% interrupted by several stage directions.
% \begin{macrocode}
\newif\ifsublines@
+\newif\ifsublines at R%
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
%
% \begin{macro}{\absline at num}
% The count \protect\cs{absline at num} stores the
@@ -6852,16 +6864,28 @@
% do not really take effect until the next line of text. Instead
% they set a flag that notifies \protect\cs{@nl} of the necessary action.
% \begin{macrocode}
-\newcommand*{\sub at on}{\ifsublines@
+\newcommand*{\sub at on}{%
+ \ifboolexpr{%
+ bool{sublines@}%
+ or%
+ (bool{sublines at R} and bool{ledRcol})%
+ }{%
\let\sub at change=\relax
- \else
+ }{%
\def\sub at change{1}%
- \fi}
-\newcommand*{\sub at off}{\ifsublines@
+ }%
+}%
+\newcommand*{\sub at off}{%
+ \ifboolexpr{%
+ bool{sublines@}%
+ or%
+ (bool{sublines at R} and bool{ledRcol})%
+ }{%
\def\sub at change{-1}%
- \else
+ }{%
\let\sub at change=\relax
- \fi}
+ }%
+}%
% \end{macrocode}
% \end{macro}
@@ -6916,7 +6940,7 @@
\newcommand*{\@set}[1]{%
\ifledRcol
- \ifsublines@
+ \ifsublines at R%
\subline at numR=#1\relax
\else
\line at numR=#1\relax
@@ -6985,7 +7009,7 @@
\newcommand*{\set at line@action}{%
\ifledRcol
\xright at appenditem{\the\absline at numR}\to\actionlines at listR
- \ifsublines@
+ \ifsublines at R%
\@l at dtempcnta=-\subline at numR
\else
\@l at dtempcnta=-\line at numR
@@ -7014,7 +7038,7 @@
\newcommand*{\sub at action}{%
\ifledRcol
\xright at appenditem{\the\absline at numR}\to\actionlines at listR
- \ifsublines@
+ \ifsublines at R%
\xright at appenditem{-1001}\to\actions at listR
\else
\xright at appenditem{-1002}\to\actions at listR
@@ -7706,19 +7730,36 @@
% \begin{macrocode}
-\newcommand*{\startsub}{\dimen0\lastskip
- \ifdim\dimen0>0pt \unskip \fi
- \ifledRcol \write\linenum at outR{\string\sub at on}%
- \else \write\linenum at out{\string\sub at on}%
- \fi
- \ifdim\dimen0>0pt \hskip\dimen0 \fi}
-\def\endsub{\dimen0\lastskip
- \ifdim\dimen0>0pt \unskip \fi
- \ifledRcol \write\linenum at outR{\string\sub at off}%
- \else \write\linenum at out{\string\sub at off}%
- \fi
- \ifdim\dimen0>0pt \hskip\dimen0 \fi}
+\newcommand*{\startsub}{%
+ \dimen0\lastskip%
+ \ifdim\dimen0>0pt%
+ \unskip%
+ \fi%
+ \ifledRcol%
+ \write\linenum at outR{\string\sub at on}%
+ \else%
+ \write\linenum at out{\string\sub at on}%
+ \fi%
+ \ifdim\dimen0>0pt%
+ \hskip\dimen0%
+ \fi%
+}%
+\def\endsub{%
+ \dimen0\lastskip%
+ \ifdim\dimen0>0pt%
+ \unskip%
+ \fi%
+ \ifledRcol%
+ \write\linenum at outR{\string\sub at off}%
+ \else%
+ \write\linenum at out{\string\sub at off}%
+ \fi%
+ \ifdim\dimen0>0pt%
+ \hskip\dimen0%
+ \fi%
+}%
+
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -10463,7 +10504,7 @@
% \end{macrocode}
% \end{macro}
% \begin{macro}{\set at txtbeforenotesX}
-% The \cs{set at txtbeforenotesX} does the same for the \cs{textbeforenotesX}.
+% The \cs{set at txtbeforenotesX} does the same for the \cs{txtbeforenotesX}.
% \begin{macrocode}
\newcommand{\set at txtbeforenotesX}{%
\unless\ifnofamiliar@%
@@ -14980,6 +15021,8 @@
\csgdef{Xsymlinenum@#1}{}%
\csgdef{Xsymlinenumannotation@#1}{}%
+ \newtoggle{Xnonote@#1}%
+
\newtoggle{Xnonumber@#1}%
\newtoggle{Xnolinenumber@#1}%
\newtoggle{Xnolinenumberifannotation@#1}%
@@ -15029,6 +15072,7 @@
% \changes{v1.23.0}{2015/04/29}{Prevent spurious spaces when \protect\cs{Afootnote} and similar commands are followed by spaces (bug added on 1.0.0!).}
% \begin{macrocode}
\global\notbool{parapparatus@}{\expandafter\newcommand\expandafter *}{\expandafter\newcommand}\csname #1footnote\endcsname[2][]{%
+ \nottoggle{Xnonote@#1}{%
\if at edtext@secondarg@%
\ifledRcol%
\ifcsstring{Xonlyside@#1}{L}{\led at error@note at called@onrightside{#1footnote}}{}%
@@ -15125,6 +15169,7 @@
\else%
\led at err@FootnoteNotInSecondArgEdtext{#1}%
\fi%
+ }{\@noneed at Footnotetrue}% End of \nottoggle{Xnonote@#1}{%
\ignorespaces%
}
% \end{macrocode}
@@ -15174,6 +15219,7 @@
\csgdef{widthX@#1}{\hsize}%
\expandafter\csgdef{innotemarkX@#1}##1{\ledinnotemark{##1}}%
\csgdef{txtbeforenotesX@#1}{}%
+ \newtoggle{nonoteX@#1}%
\newtoggle{txtbeforesnotesX@#1 at typeset}%Not directly used by user, but internal
\newtoggle{txtbeforenotesonlyonceX@#1}%
% End of for familiar footnotes.
@@ -15191,6 +15237,7 @@
% \begin{macrocode}
\global\expandafter\newcommand\csname footnote#1\endcsname[2][]{%
+ \nottoggle{nonoteX@#1}{%
\begingroup%
\prepare at prenotesX{#1}%
\newcommand{\content}{##2}%
@@ -15247,6 +15294,7 @@
{\let\index\orig@@index}%
{}%
\endgroup%
+ }{}%End of the notoggleX@#1
}
% \end{macrocode}
% Then define the counters.
@@ -15758,6 +15806,8 @@
\newhooktoggle at series{Xstanzaonlyfirst}%
\newhookcommand at series{Xstanzaseparator}%
+ \newhooktoggle at series{Xnonote}%
+
\newhooktoggle at series{Xonlypstart}
\newhooktoggle at series{Xnonbreakableafternumber}
\newhooktoggle at series{Xlemmadisablefontselection}
@@ -15828,7 +15878,7 @@
\newhooktoggle at series{txtbeforenotesonlyonceX}%
\newhookcommand at series@reload{widthX}{familiar}%
\newhookcommand at series{innotemarkX}[][1]%
-
+ \newhooktoggle at series{nonoteX}%
\ifundef{\hsizeX}%
{%
\newcommandx{\hsizeX}[2][1,usedefault]{%
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2021-01-21 22:15:47 UTC (rev 57486)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2021-01-21 22:16:18 UTC (rev 57487)
@@ -348,6 +348,7 @@
% \changes{v2.24.2}{2020/09/16}{Fix some bugs with lineation by page, when a numbered section starts at the very beginning of page.}
% \changes{v2.24.3}{2020/11/08}{Fix bug with hanging verse in parallel typesetting.}
% \changes{v2.25.0}{2020/11/29}{Add compatibility with \protect\cs{linenumannotationothersidetrue} of \protect\macpackage.}.
+% \changes{v2.25.1}{2021/01/21}{\protect\cs{ifsublines at R} migrated to \protect\macpackage}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -1404,7 +1405,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2020/11/29 v2.25.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2021/01/21 v2.25.1 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -2462,7 +2463,6 @@
% \begin{macro}{\line at numR}
% \begin{macro}{\subline at numR}
% \begin{macro}{\absline at numR}
-% \begin{macro}{\ifsublines at R}
% The count \protect\cs{line at numR} stores the line number that is used in
% the right text's marginal line numbering and in notes.
% The count \protect\cs{subline at numR} stores
@@ -2472,18 +2472,15 @@
% of the right text section: that is, the number we have actually printed,
% no matter what numbers we attached to them.
%
-% The boolean \cs{ifsublines at R} is set to true when we start subline on rightside.
% \begin{macrocode}
\newcount\line at numR
\newcount\subline at numR
\newcount\absline at numR
-\newif\ifsublines at R%
% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
-% \end{macro}
%
% \begin{macro}{\line at listR}
% \begin{macro}{\insertlines at listR}
@@ -4512,7 +4509,7 @@
\global\resumenumberingR at startfalse%
\add at msdata@firstlineofpage%
\else
- \ifnum\next at actionR<-4999\relax % 9/05 added relax here
+ \ifnum\next at actionR<-4999\relax%
\@l at dtempcnta=-\next at actionR
\advance\@l at dtempcnta by -5001\relax
\ifsublines at R
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2021-01-21 22:15:47 UTC (rev 57486)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2021-01-21 22:16:18 UTC (rev 57487)
@@ -37,7 +37,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2020/12/20 v2.35.1 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2021/01/21 v2.36.0 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\newif\ifsameparallelpagenumber%
@@ -807,6 +807,7 @@
\newcount\line at num
\newcount\subline at num
\newif\ifsublines@
+\newif\ifsublines at R%
\newcount\absline at num
\newcount\@lock
\newcount\sub at lock
@@ -1024,16 +1025,28 @@
\newcommand*{\@lopL}[1]{}
\newcommand*{\@lopR}[1]{}
-\newcommand*{\sub at on}{\ifsublines@
+\newcommand*{\sub at on}{%
+ \ifboolexpr{%
+ bool{sublines@}%
+ or%
+ (bool{sublines at R} and bool{ledRcol})%
+ }{%
\let\sub at change=\relax
- \else
+ }{%
\def\sub at change{1}%
- \fi}
-\newcommand*{\sub at off}{\ifsublines@
+ }%
+}%
+\newcommand*{\sub at off}{%
+ \ifboolexpr{%
+ bool{sublines@}%
+ or%
+ (bool{sublines at R} and bool{ledRcol})%
+ }{%
\def\sub at change{-1}%
- \else
+ }{%
\let\sub at change=\relax
- \fi}
+ }%
+}%
\newcommand*{\@adv}[1]{%
@@ -1071,7 +1084,7 @@
\newcommand*{\@set}[1]{%
\ifledRcol
- \ifsublines@
+ \ifsublines at R%
\subline at numR=#1\relax
\else
\line at numR=#1\relax
@@ -1113,7 +1126,7 @@
\newcommand*{\set at line@action}{%
\ifledRcol
\xright at appenditem{\the\absline at numR}\to\actionlines at listR
- \ifsublines@
+ \ifsublines at R%
\@l at dtempcnta=-\subline at numR
\else
\@l at dtempcnta=-\line at numR
@@ -1134,7 +1147,7 @@
\newcommand*{\sub at action}{%
\ifledRcol
\xright at appenditem{\the\absline at numR}\to\actionlines at listR
- \ifsublines@
+ \ifsublines at R%
\xright at appenditem{-1001}\to\actions at listR
\else
\xright at appenditem{-1002}\to\actions at listR
@@ -1504,19 +1517,36 @@
\fi%
}
-\newcommand*{\startsub}{\dimen0\lastskip
- \ifdim\dimen0>0pt \unskip \fi
- \ifledRcol \write\linenum at outR{\string\sub at on}%
- \else \write\linenum at out{\string\sub at on}%
- \fi
- \ifdim\dimen0>0pt \hskip\dimen0 \fi}
-\def\endsub{\dimen0\lastskip
- \ifdim\dimen0>0pt \unskip \fi
- \ifledRcol \write\linenum at outR{\string\sub at off}%
- \else \write\linenum at out{\string\sub at off}%
- \fi
- \ifdim\dimen0>0pt \hskip\dimen0 \fi}
+\newcommand*{\startsub}{%
+ \dimen0\lastskip%
+ \ifdim\dimen0>0pt%
+ \unskip%
+ \fi%
+ \ifledRcol%
+ \write\linenum at outR{\string\sub at on}%
+ \else%
+ \write\linenum at out{\string\sub at on}%
+ \fi%
+ \ifdim\dimen0>0pt%
+ \hskip\dimen0%
+ \fi%
+}%
+\def\endsub{%
+ \dimen0\lastskip%
+ \ifdim\dimen0>0pt%
+ \unskip%
+ \fi%
+ \ifledRcol%
+ \write\linenum at outR{\string\sub at off}%
+ \else%
+ \write\linenum at out{\string\sub at off}%
+ \fi%
+ \ifdim\dimen0>0pt%
+ \hskip\dimen0%
+ \fi%
+}%
+
\newcommand*{\advanceline}[1]{\leavevmode%
\ifledRcol \write\linenum at outR{\string\@adv[#1]}%
\else \write\linenum at out{\string\@adv[#1]}%
@@ -5404,6 +5434,8 @@
\csgdef{Xsymlinenum@#1}{}%
\csgdef{Xsymlinenumannotation@#1}{}%
+ \newtoggle{Xnonote@#1}%
+
\newtoggle{Xnonumber@#1}%
\newtoggle{Xnolinenumber@#1}%
\newtoggle{Xnolinenumberifannotation@#1}%
@@ -5443,6 +5475,7 @@
\expandafter\newinsert\csname mp#1footins\endcsname%
\fi%
\global\notbool{parapparatus@}{\expandafter\newcommand\expandafter *}{\expandafter\newcommand}\csname #1footnote\endcsname[2][]{%
+ \nottoggle{Xnonote@#1}{%
\if at edtext@secondarg@%
\ifledRcol%
\ifcsstring{Xonlyside@#1}{L}{\led at error@note at called@onrightside{#1footnote}}{}%
@@ -5539,6 +5572,7 @@
\else%
\led at err@FootnoteNotInSecondArgEdtext{#1}%
\fi%
+ }{\@noneed at Footnotetrue}% End of \nottoggle{Xnonote@#1}{%
\ignorespaces%
}
\expandafter\newcount\csname #1prevpage at num\endcsname%
@@ -5568,6 +5602,7 @@
\csgdef{widthX@#1}{\hsize}%
\expandafter\csgdef{innotemarkX@#1}##1{\ledinnotemark{##1}}%
\csgdef{txtbeforenotesX@#1}{}%
+ \newtoggle{nonoteX@#1}%
\newtoggle{txtbeforesnotesX@#1 at typeset}%Not directly used by user, but internal
\newtoggle{txtbeforenotesonlyonceX@#1}%
\expandafter\newinsert\csname footins#1\endcsname%
@@ -5576,6 +5611,7 @@
\fi%
\global\expandafter\newcommand\csname footnote#1\endcsname[2][]{%
+ \nottoggle{nonoteX@#1}{%
\begingroup%
\prepare at prenotesX{#1}%
\newcommand{\content}{##2}%
@@ -5618,6 +5654,7 @@
{\let\index\orig@@index}%
{}%
\endgroup%
+ }{}%End of the notoggleX@#1
}
\newcounter{footnote#1}
\global\expandafter\renewcommand\csname thefootnote#1\endcsname{\arabic{footnote#1}}
@@ -5929,6 +5966,8 @@
\newhooktoggle at series{Xstanzaonlyfirst}%
\newhookcommand at series{Xstanzaseparator}%
+ \newhooktoggle at series{Xnonote}%
+
\newhooktoggle at series{Xonlypstart}
\newhooktoggle at series{Xnonbreakableafternumber}
\newhooktoggle at series{Xlemmadisablefontselection}
@@ -5992,7 +6031,7 @@
\newhooktoggle at series{txtbeforenotesonlyonceX}%
\newhookcommand at series@reload{widthX}{familiar}%
\newhookcommand at series{innotemarkX}[][1]%
-
+ \newhooktoggle at series{nonoteX}%
\ifundef{\hsizeX}%
{%
\newcommandx{\hsizeX}[2][1,usedefault]{%
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2021-01-21 22:15:47 UTC (rev 57486)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2021-01-21 22:16:18 UTC (rev 57487)
@@ -28,7 +28,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2020/11/29 v2.25.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2021/01/21 v2.25.1 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -551,7 +551,6 @@
\newcount\line at numR
\newcount\subline at numR
\newcount\absline at numR
-\newif\ifsublines at R%
\list at create{\line at listR}
\list at create{\insertlines at listR}
@@ -1644,7 +1643,7 @@
\global\resumenumberingR at startfalse%
\add at msdata@firstlineofpage%
\else
- \ifnum\next at actionR<-4999\relax % 9/05 added relax here
+ \ifnum\next at actionR<-4999\relax%
\@l at dtempcnta=-\next at actionR
\advance\@l at dtempcnta by -5001\relax
\ifsublines at R
More information about the tex-live-commits
mailing list.