summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-10-10 20:55:30 +0000
committerKarl Berry <karl@freefriends.org>2020-10-10 20:55:30 +0000
commita249d34fc3b03471afa964515782242a210d35f0 (patch)
tree3f43e326366a3850eeff24b394a29c174ebe1cf6 /Master/texmf-dist/source/latex
parentbaac74277162f8458b5e9af7ebfee02ec998917c (diff)
reledmac (10oct20)
git-svn-id: svn://tug.org/texlive/trunk@56624 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledmac.dtx39
1 files changed, 28 insertions, 11 deletions
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
index 2ce385c8e25..90a5e2558bb 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
@@ -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@error{Failed to patch the \string\addtocounter\space command}{\@ehc}%
}%
% \end{macrocode}
+% \begin{macrocode}
+\newcommand{\led@error@fail@patch@stepcounter}{%
+ \reledmac@error{Failed to patch the \string\stepcounter\space command}{\@ehc}%
+}%
+% \end{macrocode}
% \end{macro}
% \begin{macro}{\led@warn@edinde@outsidenumbering}
% \begin{macrocode}
@@ -16265,16 +16271,27 @@
{}%
{\led@error@fail@patch@@outputpage}%
}%
-\apptocmd{\setcounter}{%
- \IfStrEq{#1}{page}{\set@this@c@page}{}%
- }%
- {}%
- {\led@error@fail@patch@setcounter}%
-\apptocmd{\addtocounter}{%
- \IfStrEq{#1}{page}{\set@this@c@page}{}%
- }%
- {}%
- {\led@error@fail@patch@addtocounter}%
+\catcode`\#=12%
+\AtBeginDocument{%
+ \apptocmd{\setcounter}{%
+ \IfStrEq{#1}{page}{\set@this@c@page}{}%
+ }%
+ {}%
+ {\led@error@fail@patch@setcounter}%
+ \apptocmd{\addtocounter}{%
+ \IfStrEq{#1}{page}{\set@this@c@page}{}%
+ }%
+ {}%
+ {\led@error@fail@patch@addtocounter}%
+ \@ifpackageloaded{calc}{%
+ \apptocmd{\stepcounter}{%Because calc.sty does not use addtocounter in stepcounter
+ \IfStrEq{#1}{page}{\set@this@c@page}{}%
+ }%
+ {}%
+ {\led@error@fail@patch@steptocounter}%
+ }{}%
+}%
+\catcode`\#=6%
% \end{macrocode}
% \end{macro}
%