eledmac (21aug13)

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

2 files changed, 34 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index 534aebd96fc..75d012f109d 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/08/16 v1.5.1 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2013/08/21 v1.5.2 LaTeX port of EDMAC]
 \newif\ifledfinal
 \newif\ifparapparatus@
 \newif\ifnoquotation@
@@ -736,12 +736,22 @@
 \newcommand*{\line@list@stuff}[1]{%
   \read@linelist{#1}%
   \iffirst@linenum@out@
-     \immediate\closeout\linenum@out
-     \global\first@linenum@out@false
-     \immediate\openout\linenum@out=#1\relax
+     \immediate\closeout\linenum@out%
+     \global\first@linenum@out@false%
+     \immediate\openout\linenum@out=#1\relax%
   \else
-     \closeout\linenum@out
-     \openout\linenum@out=#1\relax
+     \if@minipage%
+       \if@ledgroup%
+         \closeout\linenum@out%
+         \openout\linenum@out=#1\relax%
+       \else%
+         \immediate\closeout\linenum@out%
+         \immediate\openout\linenum@out=#1\relax%
+       \fi
+     \else%
+       \closeout\linenum@out%
+       \openout\linenum@out=#1\relax%
+     \fi%
   \fi}
 
 \newcommand*{\new@line}{\write\linenum@out{\string\@l[\the\c@page][\thepage]}}
@@ -2991,8 +3001,9 @@
     \footnoterule
     \unvbox\@mpfootins}
 
+\newif\if@ledgroup
 \newenvironment{ledgroup}{%
-  \def\@mpfn{mpfootnote}\def\thempfn{\thempfootnote}\c@mpfootnote\z@
+  \@ledgrouptrue\def\@mpfn{mpfootnote}\def\thempfn{\thempfootnote}\c@mpfootnote\z@
   \let\@footnotetext\@mpfootnotetext
   \l@dfeetbeginmini%
 }{%
@@ -3002,6 +3013,7 @@
     \l@dunboxmpfoot
   \fi
   \l@dfeetendmini%
+  \@ledgroupfalse%
 }
 
 \newenvironment{ledgroupsized}[2][l]{%
@@ -3019,6 +3031,7 @@
       \let\ledrlfill\relax
     \fi
   \fi
+  \@ledgrouptrue%
   \def\@mpfn{mpfootnote}\def\thempfn{\thempfootnote}\c@mpfootnote\z@
   \let\@footnotetext\@mpfootnotetext
   \l@dfeetbeginmini%
@@ -3029,6 +3042,7 @@
     \l@dunboxmpfoot
   \fi
   \l@dfeetendmini%
+  \@ledgroupfalse%
 }
 
 \newcommand{\pagelinesep}{-}
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
index a421a04722e..cec6bed0d9b 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/08/16 v1.4.1 eledmac extension for parallel texts]
+\ProvidesPackage{eledpar}[2013/08/21 v1.4.2 eledmac extension for parallel texts]
 
 \newif\ifshiftedpstarts
 \let\shiftedversestrue\shiftedpstartstrue
@@ -606,8 +606,18 @@
      \global\first@linenum@out@Rfalse
      \immediate\openout\linenum@outR=#1
   \else
-     \closeout\linenum@outR
-     \openout\linenum@outR=#1
+    \if@minipage%
+      \if@ledgroup%
+        \closeout\linenum@outR
+        \openout\linenum@outR=#1
+      \else
+        \immediate\closeout\linenum@outR
+        \immediate\openout\linenum@outR=#1\relax
+      \fi
+    \else
+       \closeout\linenum@outR%
+       \openout\linenum@outR=#1\relax%
+    \fi
   \fi}
 
 \newcommand*{\new@lineR}{%