summaryrefslogtreecommitdiff
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
parent55531f5313424d6577d110034bd4743cafc045ff (diff)
eledmac (1oct14)
git-svn-id: svn://tug.org/texlive/trunk@35294 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/Makefile8
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/eledmac.pdfbin970688 -> 970902 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/eledpar.pdfbin515188 -> 515215 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdfbin21174 -> 21173 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdfbin16307 -> 16308 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdfbin19896 -> 19896 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.pdfbin31486 -> 31493 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdfbin12221 -> 12221 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdfbin17126 -> 17123 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.pdfbin18782 -> 18784 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.pdfbin24868 -> 24866 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.pdfbin17150 -> 17150 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.pdfbin22221 -> 22222 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.pdfbin29009 -> 29008 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.pdfbin31612 -> 31610 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.pdfbin22787 -> 22785 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdfbin20119 -> 20299 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.pdfbin20766 -> 20763 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdfbin20925 -> 20932 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.pdfbin16237 -> 16240 bytes
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledmac.dtx28
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledpar.dtx8
-rw-r--r--Master/texmf-dist/tex/latex/eledmac/eledmac.sty16
-rw-r--r--Master/texmf-dist/tex/latex/eledmac/eledpar.sty3
24 files changed, 37 insertions, 26 deletions
diff --git a/Master/texmf-dist/doc/latex/eledmac/Makefile b/Master/texmf-dist/doc/latex/eledmac/Makefile
index 9081baf5dd8..cdec9019ca8 100644
--- a/Master/texmf-dist/doc/latex/eledmac/Makefile
+++ b/Master/texmf-dist/doc/latex/eledmac/Makefile
@@ -36,11 +36,11 @@ dist: $(PACKAGE) examples
mkdir eledmac/examples
$(MAKE) -C examples clean
$(MAKE) -C examples all
- cp examples/*pdf eledmac/examples
- cp examples/*tex eledmac/examples
- cp examples/makefile eledmac/examples
+ ln examples/*pdf eledmac/examples
+ ln examples/*tex eledmac/examples
+ ln examples/makefile eledmac/examples
- cp $(PACKAGE) eledmac
+ ln $(PACKAGE) eledmac
@$(RM) ../eledmac.zip
zip -r ../eledmac.zip eledmac
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
index a5407dd0261..0b604800fb6 100644
--- a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
index fd4961990a7..33a326cbed1 100644
--- a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf
index 287e56f2287..5845aec3914 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf
index 1153ebe38fc..f4f834b4e99 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf
index 6cbafbb7aec..96a1960dad4 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.pdf
index 55c1c58d075..a9f5dbbaf2a 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf
index d48b1d8bd94..88b239f192b 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf
index 31db7a9e6db..ab1cc0b4800 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.pdf
index 13a0f5ef04c..c5d66aed7b8 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.pdf
index 51a475538dd..caa0292f73e 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.pdf
index 1b7d165485d..d374d006cf8 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.pdf
index ddb63f217b6..f9881d46a9c 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.pdf
index c116fe13e37..2b33f717614 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.pdf
index b37deb4eac5..bd602c5aef9 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.pdf
index 2b2778a043e..9e04263e119 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf
index 4e04d0e41be..81d9590e21a 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.pdf
index 4d62aadcf00..a22d48c147d 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf
index c74b7bdf52c..8dd9c5251e7 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.pdf
index 71510ad4f0a..42d6a94e151 100644
--- a/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.pdf
Binary files differ
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}
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index 97d00045bcf..0f1d584babf 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}[2014/09/25 v1.13.1 LaTeX port of EDMAC]%
+\ProvidesPackage{eledmac}[2014/09/30 v1.13.2 LaTeX port of EDMAC]%
\newif\ifledfinal
\newif\ifparapparatus@
\newif\ifnoquotation@
@@ -193,6 +193,8 @@
\newif\ifnumbering
\newif\ifl@dpairing
\l@dpairingfalse
+\newif\ifl@dpaging%
+ \l@dpagingfalse%
\newif\ifpst@rtedL
\pst@rtedLfalse
\newcount\l@dnumpstartsL
@@ -1455,9 +1457,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}
@@ -2033,9 +2035,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/tex/latex/eledmac/eledpar.sty b/Master/texmf-dist/tex/latex/eledmac/eledpar.sty
index 63ee57c58e7..cc019b78841 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}[2014/09/16 v1.9.0 eledmac extension for parallel texts]%
+\ProvidesPackage{eledpar}[2014/09/30 v1.9.1 eledmac extension for parallel texts]%
\newif\ifshiftedpstarts
\let\shiftedversestrue\shiftedpstartstrue
@@ -34,7 +34,6 @@
\DeclareOption{widthliketwocolumns}{\widthliketwocolumnstrue}%
\ProcessOptions%
\l@dpairingfalse
-\newif\ifl@dpaging
\l@dpagingfalse
\ledRcolfalse
\newdimen\Lcolwidth