texlive[56624] Master/texmf-dist: reledmac (10oct20)
commits+karl at tug.org
commits+karl at tug.org
Sat Oct 10 22:55:31 CEST 2020
Revision: 56624
http://tug.org/svn/texlive?view=revision&revision=56624
Author: karl
Date: 2020-10-10 22:55:30 +0200 (Sat, 10 Oct 2020)
Log Message:
-----------
reledmac (10oct20)
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/tex/latex/reledmac/reledmac.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 2020-10-10 20:54:57 UTC (rev 56623)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2020-10-10 20:55:30 UTC (rev 56624)
@@ -566,6 +566,7 @@
% \changes{v2.34.4}{2020/09/16}{Fix some bugs with lineation by page, when a numbered section starts at the very beginning of page.}
% \changes{v2.34.4}{2020/09/16}{Fix bugs with \protect\cs{parafootsepX} outside of numbered section.}
% \changes{v2.34.5}{2020/09/23}{Fix incompatibility between \protect\cs{apprefwithpage} / \protect\cs{SErefwithpage} and line number annotation mechanism.}
+% \changes{v2.34.6}{2020/09/23}{Fix incompatibility with \protect\package{calc} package (add with v.2.34.4}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -4406,7 +4407,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2020/09/23 v2.34.5 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2020/10/10 v2.34.6 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -5042,6 +5043,11 @@
\reledmac at error{Failed to patch the \string\addtocounter\space command}{\@ehc}%
}%
% \end{macrocode}
+% \begin{macrocode}
+\newcommand{\led at error@fail at patch@stepcounter}{%
+ \reledmac at error{Failed to patch the \string\stepcounter\space command}{\@ehc}%
+}%
+% \end{macrocode}
% \end{macro}
% \begin{macro}{\led at warn@edinde at outsidenumbering}
% \begin{macrocode}
@@ -16265,16 +16271,27 @@
{}%
{\led at error@fail at patch@@outputpage}%
}%
-\apptocmd{\setcounter}{%
- \IfStrEq{#1}{page}{\set at this@c at page}{}%
- }%
- {}%
- {\led at error@fail at patch@setcounter}%
-\apptocmd{\addtocounter}{%
- \IfStrEq{#1}{page}{\set at this@c at page}{}%
- }%
- {}%
- {\led at error@fail at patch@addtocounter}%
+\catcode`\#=12%
+\AtBeginDocument{%
+ \apptocmd{\setcounter}{%
+ \IfStrEq{#1}{page}{\set at this@c at page}{}%
+ }%
+ {}%
+ {\led at error@fail at patch@setcounter}%
+ \apptocmd{\addtocounter}{%
+ \IfStrEq{#1}{page}{\set at this@c at page}{}%
+ }%
+ {}%
+ {\led at error@fail at patch@addtocounter}%
+ \@ifpackageloaded{calc}{%
+ \apptocmd{\stepcounter}{%Because calc.sty does not use addtocounter in stepcounter
+ \IfStrEq{#1}{page}{\set at this@c at page}{}%
+ }%
+ {}%
+ {\led at error@fail at patch@steptocounter}%
+ }{}%
+}%
+\catcode`\#=6%
% \end{macrocode}
% \end{macro}
%
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2020-10-10 20:54:57 UTC (rev 56623)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2020-10-10 20:55:30 UTC (rev 56624)
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2020/09/23 v2.34.5 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2020/10/10 v2.34.6 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\newif\ifsameparallelpagenumber%
@@ -341,6 +341,9 @@
\newcommand{\led at error@fail at patch@addtocounter}{%
\reledmac at error{Failed to patch the \string\addtocounter\space command}{\@ehc}%
}%
+\newcommand{\led at error@fail at patch@stepcounter}{%
+ \reledmac at error{Failed to patch the \string\stepcounter\space command}{\@ehc}%
+}%
\newcommand{\led at warn@edinde at outsidenumbering}{%
\reledmac at warning{\string\edindex\space called outside of \string\beginnumbering\space ...\space \string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
}%
@@ -6270,16 +6273,27 @@
{}%
{\led at error@fail at patch@@outputpage}%
}%
-\apptocmd{\setcounter}{%
- \IfStrEq{#1}{page}{\set at this@c at page}{}%
- }%
- {}%
- {\led at error@fail at patch@setcounter}%
-\apptocmd{\addtocounter}{%
- \IfStrEq{#1}{page}{\set at this@c at page}{}%
- }%
- {}%
- {\led at error@fail at patch@addtocounter}%
+\catcode`\#=12%
+\AtBeginDocument{%
+ \apptocmd{\setcounter}{%
+ \IfStrEq{#1}{page}{\set at this@c at page}{}%
+ }%
+ {}%
+ {\led at error@fail at patch@setcounter}%
+ \apptocmd{\addtocounter}{%
+ \IfStrEq{#1}{page}{\set at this@c at page}{}%
+ }%
+ {}%
+ {\led at error@fail at patch@addtocounter}%
+ \@ifpackageloaded{calc}{%
+ \apptocmd{\stepcounter}{%Because calc.sty does not use addtocounter in stepcounter
+ \IfStrEq{#1}{page}{\set at this@c at page}{}%
+ }%
+ {}%
+ {\led at error@fail at patch@steptocounter}%
+ }{}%
+}%
+\catcode`\#=6%
\newcounter{par at page}%
\setcounter{par at page}{1}%
\list at create{\labelref at list}
More information about the tex-live-commits
mailing list.