From 01d6be75dbb4b3d42fd1076315469a432172627b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 15 Dec 2014 22:38:38 +0000 Subject: eledmac (15dec14) git-svn-id: svn://tug.org/texlive/trunk@35833 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/eledmac/README | 2 + Master/texmf-dist/doc/latex/eledmac/eledmac.pdf | Bin 974720 -> 975651 bytes Master/texmf-dist/doc/latex/eledmac/eledpar.pdf | Bin 515645 -> 515579 bytes .../latex/eledmac/examples/columns-alignment.pdf | Bin 21171 -> 21171 bytes .../latex/eledmac/examples/cross-referencing.pdf | Bin 16305 -> 16308 bytes .../doc/latex/eledmac/examples/indexing.pdf | Bin 19899 -> 19894 bytes .../eledmac/examples/line-numbers-in-header.pdf | Bin 31493 -> 31482 bytes .../latex/eledmac/examples/minimal-parallels.pdf | Bin 12220 -> 12220 bytes .../doc/latex/eledmac/examples/minimal-verses.pdf | Bin 17123 -> 17126 bytes .../examples/mixing-columns-and-not-columns.pdf | Bin 18783 -> 18785 bytes .../examples/parallel-column-two-languages.pdf | Bin 24784 -> 24711 bytes .../examples/sections-not-in-line-numbering.pdf | Bin 17150 -> 17149 bytes .../sections-parallel-not-in-line-numbering.pdf | Bin 22220 -> 22214 bytes ...ons-with-critical-notes-in-parallel-columns.pdf | Bin 29189 -> 29103 bytes ...tions-with-critical-notes-in-parallel-pages.pdf | Bin 31781 -> 31715 bytes .../examples/sections-with-critical-notes.pdf | Bin 22790 -> 22786 bytes .../doc/latex/eledmac/examples/side-notes.pdf | Bin 20303 -> 20216 bytes .../examples/spaces-around-footnote-rule.pdf | Bin 20934 -> 20844 bytes .../doc/latex/eledmac/examples/tabular.pdf | Bin 20847 -> 20775 bytes .../examples/text-between-verses-in-parallel.pdf | Bin 16241 -> 16236 bytes Master/texmf-dist/source/latex/eledmac/eledmac.dtx | 108 ++++++++++++++------- Master/texmf-dist/tex/latex/eledmac/eledmac.sty | 100 +++++++++++++------ 22 files changed, 144 insertions(+), 66 deletions(-) (limited to 'Master/texmf-dist') 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf and b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf and b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/line-numbers-in-header.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/mixing-columns-and-not-columns.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/parallel-column-two-languages.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/sections-not-in-line-numbering.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/sections-parallel-not-in-line-numbering.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-columns.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes-in-parallel-pages.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/sections-with-critical-notes.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/spaces-around-footnote-rule.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf 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 Binary files a/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.pdf and b/Master/texmf-dist/doc/latex/eledmac/examples/text-between-verses-in-parallel.pdf 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% -- cgit v1.2.3