summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/eledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-01-16 23:22:59 +0000
committerKarl Berry <karl@freefriends.org>2015-01-16 23:22:59 +0000
commit99552c8035c88f114240fe666033aa77db869b39 (patch)
tree3bdacb1c28b6f207b0ef686317b788192204ffa7 /Master/texmf-dist/source/latex/eledmac
parent8b5dea01ab72973a3e09ee9926efede385f68319 (diff)
eledmac (16jan15)
git-svn-id: svn://tug.org/texlive/trunk@36073 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/eledmac')
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledmac.dtx32
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledpar.dtx23
2 files changed, 18 insertions, 37 deletions
diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index cca484a1657..5afe089056c 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{10615}
+% \CheckSum{10594}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -1206,7 +1206,7 @@
%
% \DescribeMacro{\sameword} To use this tool, you have to mark every occurrence of the potentially ambiguous term with the \cs{sameword} command:
% \begin{verbatim}
-% lupus \sameword{aut} canis \edtext{\sameword{aut}{\Afootnote{et}}} felix
+% lupus \sameword{aut} canis \edtext{\sameword{aut}}{\Afootnote{et}} felix
% \end{verbatim}
% In this example, \verb+aut+ will be followed, in the critical note, by the exponant \verb+2+ if it is printed in the same line as the first \verb+aut+, but it won't if it is printed in a different line. The number is printed only after the second run.
%
@@ -2894,7 +2894,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2015/01/12 v1.15.0 LaTeX port of EDMAC]%
+\ProvidesPackage{eledmac}[2015/01/16 v1.15.1 LaTeX port of EDMAC]%
% \end{macrocode}
%
% Generally, these are the modifications to the original.
@@ -4999,7 +4999,7 @@
% \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.}
+% \changes{v1.15.1}{2015/01/16}{Revert modification of 1.5.2 which makes bug with numbering. Leave vertical mode to solve spurious space before minipage.}
% \begin{macrocode}
\iffirst@linenum@out@
\immediate\closeout\linenum@out%
@@ -5009,20 +5009,13 @@
% \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, except if we are in a minipage and this minipage is not a ledgroup.
+% don't open or close the files immediately.
% \begin{macrocode}
\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%
+ \leavevmode%
\fi%
+ \closeout\linenum@out%
+ \openout\linenum@out=#1\relax%
\fi}
% \end{macrocode}
@@ -11449,15 +11442,14 @@
%
%
% \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}{%
- \resetprevpage@num\@ledgrouptrue\def\@mpfn{mpfootnote}\def\thempfn{\thempfootnote}\c@mpfootnote\z@
+ \resetprevpage@num%
+ \def\@mpfn{mpfootnote}\def\thempfn{\thempfootnote}\c@mpfootnote\z@%
\let\@footnotetext\@mpfootnotetext
\l@dfeetbeginmini%
}{%
@@ -11467,11 +11459,9 @@
\l@dunboxmpfoot
\fi
\l@dfeetendmini%
- \@ledgroupfalse%
}
% \end{macrocode}
-% \end{macro}
% \end{environment}
%
% \begin{environment}{ledgroupsized}
@@ -11514,7 +11504,6 @@
% \end{macrocode}
% Set up the footnoting.
% \begin{macrocode}
- \@ledgrouptrue%
\def\@mpfn{mpfootnote}\def\thempfn{\thempfootnote}\c@mpfootnote\z@
\let\@footnotetext\@mpfootnotetext
\l@dfeetbeginmini%
@@ -11525,7 +11514,6 @@
\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 e69406fd3f4..6a02faea231 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{4817}
+% \CheckSum{4802}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -872,7 +872,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2015/01/12 v1.10.0 eledmac extension for parallel texts]%
+\ProvidesPackage{eledpar}[2015/01/16 v1.10.1 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.
@@ -2076,7 +2076,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.}
+% \changes{v1.10.1}{2015/01/16}{Revert modification of 1.4.2 which makes bug with numbering. Leave vertical mode to solve spurious space before minipage.}
% \begin{macrocode}
\newcommand*{\line@list@stuffR}[1]{%
\read@linelist{#1}%
@@ -2085,18 +2085,11 @@
\global\first@linenum@out@Rfalse
\immediate\openout\linenum@outR=#1
\else
- \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
+ \if@minipage%
+ \leavevmode%
+ \fi%
+ \closeout\linenum@outR%
+ \openout\linenum@outR=#1%
\fi}
% \end{macrocode}