eledmac (12mar15)

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

2 files changed, 25 insertions, 15 deletions

diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index 4d7566977bd..d8669f70833 100644
--- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
+++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
@@ -25,7 +25,7 @@
 
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2015/03/06 v1.19.0 LaTeX port of EDMAC]%
+\ProvidesPackage{eledmac}[2015/03/12 v1.19.1 LaTeX port of EDMAC]%
 \newif\ifledfinal
 \newif\ifparapparatus@
 \newif\ifnoquotation@
@@ -2608,11 +2608,8 @@
     \unvbox\@outputbox%
     \def\do##1{%
     \ifvoid\csuse{footins##1}\else%
-        \ifdefined\correct@footinsX@box%
-           \correct@footinsX@box{##1}%
-        \fi%
         \print@notesX{##1}%
-     \fi%
+    \fi%
     }%
     \dolistloop{\@series}}%
   }%
@@ -3161,9 +3158,6 @@
 \newcommand*{\@opxtrafeetii}{%
   \def\do##1{%
     \ifvoid\csuse{##1footins}\else%
-        \ifdefined\correct@Xfootins@box%
-           \correct@Xfootins@box{##1}%
-        \fi%
         \print@Xnotes{##1}%
      \fi%
     }%
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
index bb531abde26..38f18761f1c 100644
--- a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
+++ b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
@@ -23,7 +23,7 @@
 %%   This work consists of the files listed in the README file.
 %% 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2015/03/06 v1.13.0 eledmac extension for parallel texts]%
+\ProvidesPackage{eledpar}[2015/03/12 v1.13.1 eledmac extension for parallel texts]%
 
 \RequirePackage{xspace}%
 \newif\ifshiftedpstarts
@@ -1496,13 +1496,14 @@
        (test {\ifcsstring{onlyXside@#1}{R}} and test{\ifnumodd{\c@page}}))%
        }%
       {%
+         \correct@Xfootins@box{#1}%
          \csuse{#1footstart}{#1}%
          \csuse{#1footgroup}{#1}%
          \global\count\csuse{#1footins}=0%
          \global\skip\csuse{#1footins}=0pt%
-          \csuse{Xnotefontsize@#1}%
-          \global\advance\dimen\csuse{#1footins} by -\baselineskip%
-       \global\boolfalse{keepforXside@#1}%
+         \csuse{Xnotefontsize@#1}%
+         \global\advance\dimen\csuse{#1footins} by -\baselineskip%
+         \global\boolfalse{keepforXside@#1}%
        }%
        {%
          \global\booltrue{keepforXside@#1}%
@@ -1521,7 +1522,7 @@
       \splittopskip=0pt%
       \global\setbox\csuse{#1footins}=\vbox{%
         \vsplit\csuse{#1footins} to \dimexpr\ht\csuse{#1footins}-1pt\relax%
-        \vskip \dimexpr-0.5\baselineskip-\lineskip-0.5pt\relax%
+        \vskip \dimexpr-0.5\baselineskip-0.5\lineskip-0.5pt\relax%
         \unvbox\csuse{#1footins}%
       }%
   }{}%
@@ -1538,6 +1539,7 @@
        (test {\ifcsstring{onlysideX@#1}{R}} and test{\ifnumodd{\c@page}}))%
        }%
       {%
+         \correct@footinsX@box{#1}%
          \csuse{footstart#1}{#1}%
          \csuse{footgroup#1}{#1}%
          \global\count\csuse{footins#1}=0%
@@ -1563,7 +1565,7 @@
       \splittopskip=0pt%
       \global\setbox\csuse{footins#1}=\vbox{%
         \vsplit\csuse{footins#1} to \dimexpr\ht\csuse{footins#1}-1pt\relax%
-        \vskip \dimexpr-0.5\baselineskip-\lineskip-0.5pt\relax%
+        \vskip \dimexpr-0.5\baselineskip-0.5\lineskip-0.5pt\relax%
         \unvbox\csuse{footins#1}%
       }%
   }{}%
@@ -2272,9 +2274,23 @@
     \global\instanzaLfalse
     \global\instanzaRfalse
  \l@dprintingpagesfalse%
- \newpage\null%Needed to prevent final notes overlap line number
+ \finish@Pages@notes%Needed to prevent final notes overlap line number
   \ignorespaces}
 
+\newcommand{\finish@Pages@notes}{%
+  \def\do##1{%
+    \ifvoid\csuse{##1footins}%
+      \ifvoid\csuse{footins##1}\else%
+        \newpage\null%
+        \listbreak%
+      \fi%
+    \else%
+      \newpage\null%
+      \listbreak%
+    \fi%
+  }%
+  \dolistloop{\@series}%
+}%
 \newcommand*{\ledstrutL}{\strut}
 \newcommand*{\ledstrutR}{\strut}