eledmac (15apr14)

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

2 files changed, 22 insertions, 14 deletions

diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index a55ffe84fb3..798b4a57a49 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}[2014/04/09 v1.10.4 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2014/04/14 v1.10.5 LaTeX port of EDMAC]
 \newif\ifledfinal
 \newif\ifparapparatus@
 \newif\ifnoquotation@
@@ -321,6 +321,7 @@
      \led@mess@SectionContinued{\the\section@num}%
      \line@list@stuff{\jobname.\extensionchars\the\section@num}%
      \l@dend@stuff
+     \begingroup
   \else
     \led@err@NumberingShouldHaveStarted
     \endnumbering
@@ -2949,12 +2950,19 @@
   \or #4%
   \fi}
 \newcommand*{\xxref}[2]{%
-  {\expandafter\ifx\csname the@label#1\endcsname
-   \relax \expandafter\let\csname the@label#1\endcsname\zz@@@\fi
-   \expandafter\ifx\csname the@label#2\endcsname \relax
-   \expandafter\let\csname the@label#2\endcsname\zz@@@\fi
-   \linenum{\csname the@label#1\endcsname|%
-    \csname the@label#2\endcsname}}}
+  {%
+   \expandafter\ifx\csname the@label#1\endcsname \relax%
+     \expandafter\let\csname the@@label#1\endcsname\zz@@@%
+    \else%
+      \expandafter\def\csname the@@label#1\endcsname{\l@dgetref@num{1}{#1}|\l@dgetref@num{2}{#1}|\l@dgetref@num{3}{#1}}%
+   \fi%
+   \expandafter\ifx\csname the@label#2\endcsname \relax%
+     \expandafter\let\csname the@@label#2\endcsname\zz@@@%
+   \else%
+      \expandafter\def\csname the@@label#2\endcsname{\l@dgetref@num{1}{#2}|\l@dgetref@num{2}{#2}|\l@dgetref@num{3}{#2}}%
+   \fi%
+   \linenum{\csname the@@label#1\endcsname|%
+    \csname the@@label#2\endcsname}}}
 
 \newcommand*{\edmakelabel}[2]{\expandafter\xdef\csname the@label#1\endcsname{#2}}
 
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
index d8b6334c180..60b80af8ceb 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/12/13 v1.6.0 eledmac extension for parallel texts]
+\ProvidesPackage{eledpar}[2014/04/14 v1.7.0 eledmac extension for parallel texts]
 
 \newif\ifshiftedpstarts
 \let\shiftedversestrue\shiftedpstartstrue
@@ -1379,7 +1379,7 @@
         \advancelabel@refs
     \fi
     \protected@write\@auxout{}%
-      {\string\l@dmake@labelsR\space\thepage|\label@refs|{#1}}%
+      {\string\l@dmake@labelsR\space\thepage|\label@refs|\the\c@pstartR|{#1}}%
   \else
     \write\linenum@out{\string\@lab}%
     \ifx\labelref@list\empty
@@ -1391,18 +1391,18 @@
         \advancelabel@refs
     \fi
   \protected@write\@auxout{}%
-    {\string\l@dmake@labels\space\thepage|\label@refs|{#1}}%
+    {\string\l@dmake@labels\space\thepage|\label@refs|\the\c@pstart|{#1}}%
   \fi
   \@esphack}
 
-\def\l@dmake@labelsR#1|#2|#3|#4{%
-  \expandafter\ifx\csname the@label#4\endcsname \relax\else
+\def\l@dmake@labelsR#1|#2|#3|#4|#5{%
+  \expandafter\ifx\csname the@label#5\endcsname \relax\else
     \led@warn@DuplicateLabel{#4}%
   \fi
-  \expandafter\gdef\csname the@label#4\endcsname{#1|#2\Rlineflag|#3}%
+  \expandafter\gdef\csname the@label#5\endcsname{#1|#2\Rlineflag|#3|#4}%
   \ignorespaces}
 \AtBeginDocument{%
-  \def\l@dmake@labelsR#1|#2|#3|#4{}%
+  \def\l@dmake@labelsR#1|#2|#3|#4|#5{}%
 }
 
 \renewcommand*{\@lab}{%