eledmac (11jul13)

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

6 files changed, 20 insertions, 12 deletions

diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
index 275f5c6b629..10393660ac1 100644
--- a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
index 849bc800587..69b5c4fcc47 100644
--- a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index 0053faba7cf..7729c61ce78 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
@@ -51,7 +51,7 @@
 %
 % \fi
 %
-% \CheckSum{8215}
+% \CheckSum{8217}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -2666,7 +2666,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2013/07/03 v1.4.8 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2013/07/10 v1.4.9 LaTeX port of EDMAC]
 %    \end{macrocode}
 %
 %    In general there is the following modifications to the original
@@ -8005,10 +8005,12 @@
 %
 % \begin{macro}{\normalbfnoteX}
 % \changes{v0.7}{2005/02/18}{Removed extraneous space from \cs{normalbfnoteX}}
+% \changes{v1.4.9}{2013/07/10}{Allow to redefine \cs{thefootnoteX} with \c{alph} when some packages are loaded.}
 %    \begin{macrocode}
 \newcommand{\normalbfnoteX}[2]{%
   \ifnumberedpar@
-    \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\@nameuse{thefootnote#1}}}%
+    \protected@csxdef{thisfootnote}{\csuse{thefootnote#1}}%
+    \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\csexpandonce{thisfootnote}}}%
                        \to\inserts@list
     \global\advance\insert@count \@ne
   \fi\ignorespaces}
diff --git a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
index b6b2d47be6e..b52573ee7a2 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
@@ -51,7 +51,7 @@
 %
 % \fi
 %
-% \CheckSum{3954}
+% \CheckSum{3958}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -719,7 +719,7 @@
 %    \begin{macrocode}
 %<*code>
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2013/07/03 v1.3.4 eledmac extension for parallel texts]
+\ProvidesPackage{eledpar}[2013/07/10 v1.3.5 eledmac extension for parallel texts]
 
 %    \end{macrocode}
 %  With the option `shiftedpstarts' a long pstart one the left side (or in the right side) don't make a blank on the corresponding pstart, but the blank is put on the bottom of the page. Consequently, the pstarts on the parallel pages are shifted, but the shifted stop at every end of pages.
@@ -3413,15 +3413,18 @@
 %
 % \begin{macro}{\normalbfnoteX}
 % \changes{v0.3}{2005/02/04}{Removed extraneous spaces from \cs{normalbfnoteX}}
+% \changes{v1.3.5}{2013/07/10}{Allow to redefine \cs{thefootnoteX} with \c{alph} when some packages are loaded.}
 %    \begin{macrocode}
 \renewcommand{\normalbfnoteX}[2]{%
   \ifnumberedpar@
     \ifledRcol%
-      \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\@nameuse{thefootnote#1}}}%
+      \protected@csxdef{thisfootnote}{\csuse{thefootnote#1}}%
+      \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\csexpandonce{thisfootnote}}}%
                          \to\inserts@listR
        \global\advance\insert@countR \@ne%
     \else%
-      \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\@nameuse{thefootnote#1}}}%
+      \protected@csxdef{thisfootnote}{\csuse{thefootnote#1}}%
+      \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\csexpandonce{thisfootnote}}}%
                          \to\inserts@list
       \global\advance\insert@count \@ne%
     \fi
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index 6efcc9dcee6..fa13d48314c 100644
--- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
+++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
@@ -24,7 +24,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2013/07/03 v1.4.8 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2013/07/10 v1.4.9 LaTeX port of EDMAC]
 \newif\ifledfinal
 \newif\ifparapparatus@
 \newif\ifnoquotation@
@@ -1888,7 +1888,8 @@
 
 \newcommand{\normalbfnoteX}[2]{%
   \ifnumberedpar@
-    \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\@nameuse{thefootnote#1}}}%
+    \protected@csxdef{thisfootnote}{\csuse{thefootnote#1}}%
+    \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\csexpandonce{thisfootnote}}}%
                        \to\inserts@list
     \global\advance\insert@count \@ne
   \fi\ignorespaces}
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
index e46be8b5eae..4ceb2e8c41a 100644
--- a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
+++ b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
@@ -24,7 +24,7 @@
 %% 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2013/07/03 v1.3.4 eledmac extension for parallel texts]
+\ProvidesPackage{eledpar}[2013/07/10 v1.3.5 eledmac extension for parallel texts]
 
 \newif\ifshiftedpstarts
 \let\shiftedversestrue\shiftedpstartstrue
@@ -1477,11 +1477,13 @@
 \renewcommand{\normalbfnoteX}[2]{%
   \ifnumberedpar@
     \ifledRcol%
-      \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\@nameuse{thefootnote#1}}}%
+      \protected@csxdef{thisfootnote}{\csuse{thefootnote#1}}%
+      \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\csexpandonce{thisfootnote}}}%
                          \to\inserts@listR
        \global\advance\insert@countR \@ne%
     \else%
-      \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\@nameuse{thefootnote#1}}}%
+      \protected@csxdef{thisfootnote}{\csuse{thefootnote#1}}%
+      \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\csexpandonce{thisfootnote}}}%
                          \to\inserts@list
       \global\advance\insert@count \@ne%
     \fi