reledmac (10oct20)

git-svn-id: svn://tug.org/texlive/trunk@56624 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 25 insertions, 11 deletions

diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index f7dc429b7ad..ba27064c00a 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
@@ -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@error@fail@patch@addtocounter}{%
   \reledmac@error{Failed to patch the \string\addtocounter\space command}{\@ehc}%
 }%
+\newcommand{\led@error@fail@patch@stepcounter}{%
+  \reledmac@error{Failed to patch the \string\stepcounter\space command}{\@ehc}%
+}%
 \newcommand{\led@warn@edinde@outsidenumbering}{%
   \reledmac@warning{\string\edindex\space called outside of \string\beginnumbering\space ...\space \string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
 }%
@@ -6270,16 +6273,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%
 \newcounter{par@page}%
 \setcounter{par@page}{1}%
 \list@create{\labelref@list}