reledmac (4oct16)

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

1 files changed, 23 insertions, 20 deletions

diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index cdaef71ac5f..08f67c5869a 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
@@ -32,11 +32,10 @@
 
 
 
-
 %%
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2016/10/02 v2.16.0 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2016/10/04 v2.16.1 typesetting critical editions]%
 \RequirePackage{xkeyval}
 \newif\ifparledgroup
 \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -3239,7 +3238,7 @@
   \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{%
     \global\advance\footnote@reading by \@ne%
     \get@thisfootnote%
-    \get@fnmark{\thisfootnote}%
+    \get@fnmark{\thisfootnote}{\thisc@footnote}%
     \ifcsdef{footnotereading\the\footnote@reading=typeset}%
       {\setcounter{\@mpfn}{\csuse{footnotereading\the\footnote@reading=typeset}}}%
       {\setcounter{\@mpfn}{\footnote@reading}}%
@@ -3253,8 +3252,10 @@
 \newcommand{\get@thisfootnote}{%
     \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{%
       \protected@xdef\thisfootnote{\the\footnote@reading}%
+      \protected@xdef\thisc@footnote{\the\footnote@reading}%
     }{%
-      \protected@xdef\thisfootnote{\the\c@footnote}%
+      \protected@xdef\thisc@footnote{\the\c@footnote}%
+      \protected@xdef\thisfootnote{\thefootnote}%
     }%
 }%
 
@@ -3266,7 +3267,7 @@
           \ifdefined\Hy@footnote@currentHref%
             \noexpand\def\noexpand\Hy@footnote@currentHref{\Hy@footnote@currentHref}%
           \fi%
-          \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}%
+          \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}{\thisc@footnote}%
         }%
                          \to\inserts@listR
        \global\advance\insert@countR \@ne%
@@ -3275,7 +3276,7 @@
           \ifdefined\Hy@footnote@currentHref%
             \noexpand\def\noexpand\Hy@footnote@currentHref{\Hy@footnote@currentHref}%
           \fi%
-          \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}%
+          \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}{\thisc@footnote}%
        }%
                          \to\inserts@list
       \global\advance\insert@count \@ne%
@@ -3283,13 +3284,13 @@
   \ignorespaces%
 }%
 
-\newcommand{\get@fnmark}[1]{%
+\newcommand{\get@fnmark}[2]{%
   \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}%
     {%
       \stepcounter{footnote@typeset}%
       \setcounter{footnote}{\c@footnote@typeset}%
         \immediate\write\@mainaux{%
-          \csgdef{footnotereading#1=typeset}{\the\c@footnote@typeset}%
+          \csgdef{footnotereading#2=typeset}{\the\c@footnote@typeset}%
          }%
       \def\@thefnmark{\thefootnote}%
     }%
@@ -3298,8 +3299,8 @@
     }%
 }%
 
-\newcommand{\vl@dbfnote}[2]{%
-  \get@fnmark{#2}%
+\newcommand{\vl@dbfnote}[3]{%
+  \get@fnmark{#2}{#3}%
   \@footnotetext{#1}%
 }%
 \newcommand*{\prebodyfootmark}{%
@@ -3348,7 +3349,7 @@
 
 \newcommand*{\mpnormalvfootnoteX}[2]{%
   \get@thisfootnoteX{#1}%
-  \get@fnmarkX{#1}{\thisfootnote}%
+  \get@fnmarkX{#1}{\thisfootnote}{\thisc@footnote}%
   \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}%
   \global\setbox\@nameuse{mpfootins#1}\vbox{%
     \unvbox\@nameuse{mpfootins#1}
@@ -3444,7 +3445,7 @@
         \noexpand\led@set@index@fornote{#1}%
         \noexpand\prepare@edindex@fornote{\l@d@nums}%
         \unexpanded{\def\this@footnoteX@reading}{\the\csname footnote#1@reading\endcsname}%
-        \noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}%
+        \noexpand\vbfnoteX{#1}{#2}{\thisfootnote}{\thisc@footnote}%
         \noexpand\led@reinit@index@fornote%
         \unexpanded{\advance\@edindex@fornote@\m@ne}%
       }%
@@ -3461,7 +3462,7 @@
         \noexpand\led@set@index@fornote{#1}%
         \noexpand\prepare@edindex@fornote{\l@d@nums}%
         \unexpanded{\def\this@footnoteX@reading}{\the\csname footnote#1@reading\endcsname}%
-        \noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}%
+        \noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}{\thisc@footnote}%
         \noexpand\led@reinit@index@fornote%
         \unexpanded{\advance\@edindex@fornote@\m@ne}%
       }%
@@ -3473,23 +3474,25 @@
 \newcommand{\get@thisfootnoteX}[1]{%
     \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{%
       \protected@xdef\thisfootnote{\the\csname footnote#1@reading\endcsname}%
+      \protected@xdef\thisc@footnote{\the\csname footnote#1@reading\endcsname}%
     }{%
-      \protected@xdef\thisfootnote{\the\csname c@footnote#1\endcsname}%
+      \protected@xdef\thisfootnote{\csname thefootnote#1\endcsname}%
+      \protected@xdef\thisc@footnote{\the\csname c@footnote#1\endcsname}%
     }%
 }%
-\newcommand{\vbfnoteX}[3]{%
-  \get@fnmarkX{#1}{#3}%
+\newcommand{\vbfnoteX}[4]{%
+  \get@fnmarkX{#1}{#3}{#4}%
   \@nameuse{regvfootnote#1}{#1}{#2}%
 }%
 
-\newcommand{\get@fnmarkX}[2]{%
+\newcommand{\get@fnmarkX}[3]{%
   \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}%
     {%
       \stepcounter{footnote#1@typeset}%
       \setcounter{footnote#1}{\value{footnote#1@typeset}}%
       \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}%
         \immediate\write\@mainaux{%
-          \csgdef{footnote#1reading#2=typeset}{\the\csname c@footnote#1@typeset\endcsname}%
+          \csgdef{footnote#1reading#3=typeset}{\the\csname c@footnote#1@typeset\endcsname}%
          }%
     }%
     {%
@@ -3502,7 +3505,7 @@
   \else
     \def\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}%
     \get@thisfootnoteX{#1}%
-    \get@fnmarkX{#1}{\expandonce\thisfootnote}%
+    \get@fnmarkX{#1}{\expandonce\thisfootnote}{\expandonce\thisc@footnote}%
     \@nameuse{regvfootnote#1}{#1}{#2}%
   \fi}
 
@@ -3772,7 +3775,7 @@
   \egroup}
 \newcommand*{\mppara@vfootnoteX}[2]{%
   \get@thisfootnoteX{#1}%
-  \get@fnmarkX{#1}{\thisfootnote}%
+  \get@fnmarkX{#1}{\thisfootnote}{\thisc@footnote}%
   \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}%
   \global\setbox\@nameuse{mpfootins#1}\vbox{%
     \unvbox\@nameuse{mpfootins#1}