summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/eledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-10-01 21:34:52 +0000
committerKarl Berry <karl@freefriends.org>2014-10-01 21:34:52 +0000
commit682917ec16bf57e55520b48e211ada183761b87c (patch)
treedca22b3308469e38487fb5ef22d6df6d8370ab47 /Master/texmf-dist/source/latex/eledmac
parent55531f5313424d6577d110034bd4743cafc045ff (diff)
eledmac (1oct14)
git-svn-id: svn://tug.org/texlive/trunk@35294 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/eledmac')
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledmac.dtx28
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledpar.dtx8
2 files changed, 23 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index 27ee63af1d9..40ea7f38aaf 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{10307}
+% \CheckSum{10314}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -208,7 +208,8 @@
% \changes{v1.12.3}{2014/08/15}{Debug \cs{eledxxx} with some paper size}
% \changes{v1.12.4}{2014/08/25}{Debug spurious page breaks before \cs{chapter} (bug added by 1.12.0)}
% \changes{v1.13.1}{2014/09/25}{Debug quotation environment inside of a \cs{pstart} when preceded by a sectioning command.}
-% \changes{v1.13.1}{2014/09/25}{Combing back of page and line breaking penalties's management, deleted by error in v0.17.}
+% \changes{v1.13.1}{2014/09/25}{Coming back of page and line breaking penalties's management, deleted by error in v0.17.}
+% \changes{v1.13.2}{2014/09/30}{Fix bug with normal footnotes, added by v1.13.0.}
% \hyphenation{man-u-script man-u-scripts}
%
%
@@ -2854,7 +2855,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2014/09/25 v1.13.1 LaTeX port of EDMAC]%
+\ProvidesPackage{eledmac}[2014/09/30 v1.13.2 LaTeX port of EDMAC]%
% \end{macrocode}
%
% Generally, these are the modifications to the original.
@@ -3331,6 +3332,9 @@
%
% \begin{macro}{\ifnumberingR}
% \begin{macro}{\ifl@dpairing}
+% \begin{macro}{\ifl@dpaging}
+% \begin{macro}{\l@dpagingtrue}
+% \begin{macro}{\l@dpagingfalse}
% \begin{macro}{\l@dpairingtrue}
% \begin{macro}{\l@dpairingfalse}
% \begin{macro}{\ifpst@rtedL}
@@ -3347,9 +3351,12 @@
% and \cs{ifpst@rted} for/from eledpar}
% \changes{v0.12}{2005/10/01}{Added \cs{ifledRcol} and \cs{ifnumberingR} for/from \Lpack{eledpar}}
% \changes{v1.12.0}{2014/08/05}{Add \cs{ifledRcol@} for \Lpack{eledpar}}
+% \changes{v1.13.2}{2014/09/31}{Add \cs{ifl@dpaging} for \Lpack{eledpar}}
% \begin{macrocode}
\newif\ifl@dpairing
\l@dpairingfalse
+\newif\ifl@dpaging%
+ \l@dpagingfalse%
\newif\ifpst@rtedL
\pst@rtedLfalse
\newcount\l@dnumpstartsL
@@ -3374,6 +3381,9 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
% \begin{macro}{\beginnumbering}
% \begin{macro}{\initnumbering@reg}
% \cs{beginnumbering} begins a section of numbered text.
@@ -6905,9 +6915,9 @@
\csuse{bhookXnote@#1}
\csuse{Xnotefontsize@#1}
\footsplitskips
- \ifl@dpairing%
- \csuse{setwidthliketwocolumns@\columns@position}%
- \fi%
+ \ifl@dpairing\ifl@dpaging\else%
+ \setXnoteswidthliketwocolumns@{#1}%
+ \fi\fi%
\setXnotespositionliketwocolumns@{#1}%
\spaceskip=\z@skip \xspaceskip=\z@skip
\csname #1footfmt\endcsname #2[#1]\egroup}
@@ -8370,9 +8380,9 @@
\csuse{bhooknoteX@#1}
\csuse{notefontsizeX@#1}
\footsplitskips
- \ifl@dpairing%
- \csuse{setwidthliketwocolumns@\columns@position}%
- \fi%
+ \ifl@dpairing\ifl@dpaging\else%
+ \setnotesXwidthliketwocolumns@{#1}%
+ \fi\fi%
\setnotesXpositionliketwocolumns@{#1}%
\spaceskip=\z@skip \xspaceskip=\z@skip
\csuse{\csuse{footnote@dir}}\if@RTL\else\noindent\leavevmode\fi\@nameuse{footfmt#1}{#1}{#2}\egroup}
diff --git a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx
index 59a3a2395d8..bee320a1c89 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{4749}
+% \CheckSum{4747}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -868,7 +868,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledpar}[2014/09/16 v1.9.0 eledmac extension for parallel texts]%
+\ProvidesPackage{eledpar}[2014/09/30 v1.9.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.
@@ -907,12 +907,12 @@
% \cs{ifl@dpairing} is set TRUE if we are processing parallel texts and
% \cs{ifl@dpaging} is also set TRUE if we are doing parallel pages.
% \cs{ifledRcol} is set TRUE if we are doing the right hand text.
-% \cs{ifl@dpairing} is defined in \Lpack{eledmac}.
+% They are defined in \Lpack{eledmac}.
% \changes{v0.3}{2005/02/24}{Moved \cs{ifl@dpairing} to eledmac}
% \changes{v0.9}{2005/10/01}{Moved \cs{iflledRcol} and \cs{ifnumberingR} to eledmac}
+% \changes{v1.9.1}{2014/09/30}{Moved \cs{ifl@dpaging} to eledmac}
% \begin{macrocode}
\l@dpairingfalse
-\newif\ifl@dpaging
\l@dpagingfalse
\ledRcolfalse
% \end{macrocode}