summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-12-15 22:38:38 +0000
committerKarl Berry <karl@freefriends.org>2014-12-15 22:38:38 +0000
commit01d6be75dbb4b3d42fd1076315469a432172627b (patch)
tree9e9a1a6d85cdb26f54e3c00e0cbb6dddb55484de /Master
parentf8c09c21ae1b44cc18cf916eef238a765c766ea0 (diff)
eledmac (15dec14)
git-svn-id: svn://tug.org/texlive/trunk@35833 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/README2
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/eledmac.pdfbin974720 -> 975651 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/eledpar.pdfbin515645 -> 515579 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdfbin21171 -> 21171 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdfbin16305 -> 16308 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdfbin19899 -> 19894 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.pdfbin31493 -> 31482 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdfbin12220 -> 12220 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdfbin17123 -> 17126 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.pdfbin18783 -> 18785 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.pdfbin24784 -> 24711 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.pdfbin17150 -> 17149 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.pdfbin22220 -> 22214 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.pdfbin29189 -> 29103 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.pdfbin31781 -> 31715 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.pdfbin22790 -> 22786 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdfbin20303 -> 20216 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.pdfbin20934 -> 20844 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdfbin20847 -> 20775 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.pdfbin16241 -> 16236 bytes
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledmac.dtx108
-rw-r--r--Master/texmf-dist/tex/latex/eledmac/eledmac.sty100
22 files changed, 144 insertions, 66 deletions
diff --git a/Master/texmf-dist/doc/latex/eledmac/README b/Master/texmf-dist/doc/latex/eledmac/README
index 500c5f11a18..fa8cb6f4851 100644
--- a/Master/texmf-dist/doc/latex/eledmac/README
+++ b/Master/texmf-dist/doc/latex/eledmac/README
@@ -112,7 +112,9 @@ please follow these rules:
- Go to [the project page](https://github.com/maieul/ledmac/).
- Choose the correct branch in the "branch" menu.
- Click on the cloud, in the right side.
+
- Run the `.ins` files with pdflatex, to obtain the `.sty` files.
- Put the `.sty` files with your test files (in the same folder).
- Make your report.
+
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
index 5b99486a916..e913239c2a8 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 68abaf807d5..952911bf3e5 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 420ca5baaa3..e7b72da09fd 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 26ef959fa9e..4fd33d9425d 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 7a01a46fe62..d4b6ee6815d 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 dfcb24f9514..307e762cbcd 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 3e5a1dee7b3..849f3625323 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 4285b0208af..cebb89830d1 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 1abd4c5d7eb..38b3e7bbd32 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 80ca6fec09e..770d73b8e8b 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 f90b650c979..989cbac56b7 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 ef06d0be3ce..5bf1202f129 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 77dde178f98..552051b4662 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 5dde3ccdcd7..b41b7165e18 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 01de64f0487..4d2e21f59fc 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 c9e87acd15c..0c1dfe9aa4e 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 e6b0b6649e2..05867f86258 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 a84d1b2c36d..4c46a9d1773 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 bf18884c2b4..9653cc564d1 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 65e3e13b41e..8e13d3a0f20 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{10302}
+% \CheckSum{10321}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -2858,7 +2858,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2014/10/27 v1.14.0 LaTeX port of EDMAC]%
+\ProvidesPackage{eledmac}[2014/12/15 v1.14.1 LaTeX port of EDMAC]%
% \end{macrocode}
%
% Generally, these are the modifications to the original.
@@ -13909,22 +13909,6 @@
{}
{}
-\patchcmd{\@sect}
- {#8}
- {#8%
- \print@rightmargin@eledsection%
- }
- {}
- {}
-
-\patchcmd{\@sect}
- {\hskip #3\relax}
- {\hskip #3\relax%
- \print@leftmargin@eledsection%
- }
- {}
- {}
-
\pretocmd{\@ssect}
{\let\old@edtext=\edtext%
\let\edtext=\dummy@edtext@showlemma%
@@ -13936,23 +13920,79 @@
{\let\edtext=\old@edtext}
{}
{}
+
+% \end{macrocode}
+% \changes{v1.14.1}{2014/12/15}{Debug sectioning commands when using both \Lpack{handout} and \Lpack{hyperref} package.}
+% \Lpack{hyperref} redefines also \cs{@sect}. That's why, when manipulating arguments, we patch \cs{@sect} and similar only if \Lpack{hyperref} is not used. If used, we patch the \cs{NR} commands.
+% \begin{macrocode}
+\@ifpackageloaded{nameref}{
-\patchcmd{\@ssect}
- {#5}
- {#5%
- \print@rightmargin@eledsection%
- }
- {}
- {}
-
-\patchcmd{\@ssect}
- {\hskip #1}
- {\hskip #1%
- \print@leftmargin@eledsection%
- }
- {}
- {}
-}%
+ \patchcmd{\NR@sect}
+ {#8}
+ {#8%
+ \print@rightmargin@eledsection%
+ }
+ {}
+ {}
+
+ \patchcmd{\NR@sect}
+ {\hskip #3\relax}
+ {\hskip #3\relax%
+ \print@leftmargin@eledsection%
+ }
+ {}
+ {}
+
+ \patchcmd{\NR@ssect}
+ {#5}
+ {#5%
+ \print@rightmargin@eledsection%
+ }
+ {}
+ {}
+
+ \patchcmd{\NR@ssect}
+ {\hskip #1}
+ {\hskip #1%
+ \print@leftmargin@eledsection%
+ }
+ {}
+ {}
+ }%
+ {
+ \patchcmd{\@sect}
+ {#8}
+ {#8%
+ \print@rightmargin@eledsection%
+ }
+ {}
+ {}
+
+ \patchcmd{\@sect}
+ {\hskip #3\relax}
+ {\hskip #3\relax%
+ \print@leftmargin@eledsection%
+ }
+ {}
+ {}
+
+ \patchcmd{\@ssect}
+ {#5}
+ {#5%
+ \print@rightmargin@eledsection%
+ }
+ {}
+ {}
+
+ \patchcmd{\@ssect}
+ {\hskip #1}
+ {\hskip #1%
+ \print@leftmargin@eledsection%
+ }
+ {}
+ {}
+ }%
+}
\catcode`\#=6 %Space NEEDS by \catcode
% \end{macrocode}
% \end{macro}
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index 395b386bda8..ba15db55358 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/10/27 v1.14.0 LaTeX port of EDMAC]%
+\ProvidesPackage{eledmac}[2014/12/15 v1.14.1 LaTeX port of EDMAC]%
\newif\ifledfinal
\newif\ifparapparatus@
\newif\ifnoquotation@
@@ -4847,22 +4847,6 @@
{}
{}
-\patchcmd{\@sect}
- {#8}
- {#8%
- \print@rightmargin@eledsection%
- }
- {}
- {}
-
-\patchcmd{\@sect}
- {\hskip #3\relax}
- {\hskip #3\relax%
- \print@leftmargin@eledsection%
- }
- {}
- {}
-
\pretocmd{\@ssect}
{\let\old@edtext=\edtext%
\let\edtext=\dummy@edtext@showlemma%
@@ -4875,22 +4859,74 @@
{}
{}
-\patchcmd{\@ssect}
- {#5}
- {#5%
- \print@rightmargin@eledsection%
- }
- {}
- {}
+\@ifpackageloaded{nameref}{
-\patchcmd{\@ssect}
- {\hskip #1}
- {\hskip #1%
- \print@leftmargin@eledsection%
- }
- {}
- {}
-}%
+ \patchcmd{\NR@sect}
+ {#8}
+ {#8%
+ \print@rightmargin@eledsection%
+ }
+ {}
+ {}
+
+ \patchcmd{\NR@sect}
+ {\hskip #3\relax}
+ {\hskip #3\relax%
+ \print@leftmargin@eledsection%
+ }
+ {}
+ {}
+
+ \patchcmd{\NR@ssect}
+ {#5}
+ {#5%
+ \print@rightmargin@eledsection%
+ }
+ {}
+ {}
+
+ \patchcmd{\NR@ssect}
+ {\hskip #1}
+ {\hskip #1%
+ \print@leftmargin@eledsection%
+ }
+ {}
+ {}
+ }%
+ {
+ \patchcmd{\@sect}
+ {#8}
+ {#8%
+ \print@rightmargin@eledsection%
+ }
+ {}
+ {}
+
+ \patchcmd{\@sect}
+ {\hskip #3\relax}
+ {\hskip #3\relax%
+ \print@leftmargin@eledsection%
+ }
+ {}
+ {}
+
+ \patchcmd{\@ssect}
+ {#5}
+ {#5%
+ \print@rightmargin@eledsection%
+ }
+ {}
+ {}
+
+ \patchcmd{\@ssect}
+ {\hskip #1}
+ {\hskip #1%
+ \print@leftmargin@eledsection%
+ }
+ {}
+ {}
+ }%
+}
\catcode`\#=6 %Space NEEDS by \catcode
\newwrite\eled@sectioning@out
\newif\if@noeled@sec%