ledmac (5apr12)

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

2 files changed, 41 insertions, 3 deletions

diff --git a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty
index 8ddf7c31b27..3a9c19cc5fb 100644
--- a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty
+++ b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty
@@ -23,7 +23,7 @@
 %%   This work consists of the files listed in the README file.
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledmac}[2011/11/18 v0.13.1 LaTeX port of EDMAC]
+\ProvidesPackage{ledmac}[2012/04/04 v0.14 LaTeX port of EDMAC]
 
 \newif\ifledfinal
 \DeclareOption{final}{\ledfinaltrue}
@@ -1703,11 +1703,30 @@
     \xdef\label@refs{\zz@@@}%
   \else
     \gl@p\labelref@list\to\label@refs
+  \ifvmode
+   \advancelabel@refs
+  \fi
   \fi
   \protected@write\@auxout{}%
     {\string\l@dmake@labels\space\thepage|\label@refs|{#1}}%
   \@esphack}
 
+\newcommand{\advancelabel@refs}{%
+\newcount\line%
+\ledmac@warning{\label@refs}
+\line=\expandafter\labelrefsparseline\label@refs%
+\advance\line by 1%
+\ifsublines@%
+\newcount\subline%
+\subline=\labelrefsparsesubline\label@refs%
+\advance\subline by 1%
+\def\label@refs{\the\line|\the\subline}%
+\else%
+\def\label@refs{\the\line|0}%
+\fi%
+}
+\def\labelrefsparseline#1|#2{#1}
+\def\labelrefsparsesubline#1|#2{#2}
 \newcommand*{\l@dmake@labels}{}
 \def\l@dmake@labels#1|#2|#3|#4{%
   \expandafter\ifx\csname the@label#4\endcsname \relax\else
diff --git a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty
index 7bcfa8019b6..4b93ec2e423 100644
--- a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty
+++ b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty
@@ -24,7 +24,7 @@
 %% 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledpar}[2011/11/18 v0.9.3 ledmac extension for parallel texts]
+\ProvidesPackage{ledpar}[2012/04/04 v0.10 ledmac extension for parallel texts]
 
 \newif\ifshiftedverses
 \shiftedversesfalse
@@ -1325,6 +1325,19 @@
   \else
     \mpvEfootnote{E}{{0|0|0|0|0|0|0}{}{#1}}%
   \fi\ignorespaces}
+\renewcommand*{\l@dedendmini}{%
+  \ifl@dpairing
+    \ifledRcol
+      \flush@notesR
+    \else
+      \flush@notes
+    \fi
+  \fi
+  \ifvoid\mpAfootins\else\mpAfootgroup{A}\fi%
+  \ifvoid\mpBfootins\else\mpBfootgroup{B}\fi%
+  \ifvoid\mpCfootins\else\mpCfootgroup{C}\fi%
+  \ifvoid\mpDfootins\else\mpDfootgroup{D}\fi%
+  \ifvoid\mpEfootins\else\mpEfootgroup{E}\fi}
 \def\printlinesR#1|#2|#3|#4|#5|#6|#7|{\begingroup
   \setprintlines{#1}{#2}{#3}{#4}{#5}{#6}%
   \ifl@d@pnum #1\fullstop\fi
@@ -1348,6 +1361,9 @@
     \else
       \gl@p\labelref@listR\to\label@refs
     \fi
+    \ifvmode
+     \advancelabel@refs
+    \fi
     \protected@write\@auxout{}%
       {\string\l@dmake@labelsR\space\thepage|\label@refs|{#1}}%
   \else
@@ -1357,9 +1373,12 @@
     \else
       \gl@p\labelref@list\to\label@refs
     \fi
-  \fi
+    \ifvmode
+     \advancelabel@refs
+    \fi
   \protected@write\@auxout{}%
     {\string\l@dmake@labels\space\thepage|\label@refs|{#1}}%
+  \fi
   \@esphack}
 
 \def\l@dmake@labelsR#1|#2|#3|#4{%