eledmac (21aug13)

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

6 files changed, 76 insertions, 23 deletions

diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
index c8cb0bcce56..f5e79058293 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 4615aaad29f..1e43b8532b2 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 976417e4355..3dbda7d61d2 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{8413}
+% \CheckSum{8437}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -2686,7 +2686,7 @@
 %    \begin{macrocode}
 %<*code>
 \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]
 %    \end{macrocode}
 %
 %    Generally, these are the modifications to the original.
@@ -4740,19 +4740,30 @@
 % \changes{v0.2.2}{2003/11/09}{Added initial write of page number in 
 %                           \cs{line@list@stuff}}
 % \changes{v0.7}{2005/02/25}{Deleted \cs{page@start} from \cs{line@list@stuff}}
+% \changes{v1.5.2}{2013/08/25}{Open / close immediatly the line-list file when in minipage, except if the minipage is a ledgroup.}
 %    \begin{macrocode}
   \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
 %    \end{macrocode}
 % If we get here, then this is
 % not the first line-list we've seen, so we
-% don't open or close the files immediately.
+% don't open or close the files immediately, except if we are in a minipage and this minipage is not a ledgroup.
 %    \begin{macrocode}
-     \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}
 
 %    \end{macrocode}
@@ -10296,14 +10307,17 @@
 %    \end{macrocode}
 % \end{macro}
 %
+%
 % \begin{environment}{ledgroup}
+% \begin{macro}{\if@ledgroup}
 % This environment puts footnotes at the end, even if that happens to
 % be in the middle of a page, or crossing a page boundary. It is a sort
 % of unboxed, fixed width minipage.
 % \changes{v0.4}{2004/02/29}{Added ledgroup environment}
 %    \begin{macrocode}
+\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%
 }{%
@@ -10313,9 +10327,11 @@
     \l@dunboxmpfoot
   \fi
   \l@dfeetendmini%
+  \@ledgroupfalse%
 }
 
 %    \end{macrocode}
+% \end{macro}
 % \end{environment}
 %
 % \begin{environment}{ledgroupsized}
@@ -10358,6 +10374,7 @@
 %    \end{macrocode}
 % Set up the footnoting.
 %    \begin{macrocode}
+  \@ledgrouptrue%
   \def\@mpfn{mpfootnote}\def\thempfn{\thempfootnote}\c@mpfootnote\z@
   \let\@footnotetext\@mpfootnotetext
   \l@dfeetbeginmini%
@@ -10368,6 +10385,7 @@
     \l@dunboxmpfoot
   \fi
   \l@dfeetendmini%
+  \@ledgroupfalse%
 }
 
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
index 7b0549f374b..91f4b656b5c 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{3987}
+% \CheckSum{4005}
 %
 % \makeatletter
 % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -719,7 +719,7 @@
 %    \begin{macrocode}
 %<*code>
 \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]
 
 %    \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.
@@ -1882,6 +1882,7 @@
 % macro. It is called by \cs{beginnumberingR} and performs
 % all the line-list operations needed at the start of a section.
 % Its argument is the name of the line-list file.
+% \changes{v1.4.2}{2013/08/25}{Open / close immediatly the line-list file when in minipage, except if the minipage is a ledgroup.}
 %    \begin{macrocode}
 \newcommand*{\line@list@stuffR}[1]{%
   \read@linelist{#1}%
@@ -1890,8 +1891,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}
 
 %    \end{macrocode}
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}{%