From 97f18bfe9c66155c1ff382e11586679d9ac4d36b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 21 Oct 2014 22:45:52 +0000 Subject: eledmac (21oct14) git-svn-id: svn://tug.org/texlive/trunk@35416 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/eledmac/eledmac.pdf | Bin 970916 -> 970975 bytes Master/texmf-dist/doc/latex/eledmac/eledpar.pdf | Bin 515211 -> 515215 bytes .../latex/eledmac/examples/columns-alignment.pdf | Bin 21171 -> 21170 bytes .../latex/eledmac/examples/cross-referencing.pdf | Bin 16304 -> 16310 bytes .../doc/latex/eledmac/examples/indexing.pdf | Bin 19897 -> 19897 bytes .../eledmac/examples/line-numbers-in-header.pdf | Bin 31538 -> 31548 bytes .../latex/eledmac/examples/minimal-parallels.pdf | Bin 12222 -> 12221 bytes .../doc/latex/eledmac/examples/minimal-verses.pdf | Bin 17125 -> 17126 bytes .../examples/mixing-columns-and-not-columns.pdf | Bin 18785 -> 18786 bytes .../examples/parallel-column-two-languages.pdf | Bin 24628 -> 24632 bytes .../examples/sections-not-in-line-numbering.pdf | Bin 17148 -> 17148 bytes .../sections-parallel-not-in-line-numbering.pdf | Bin 22221 -> 22223 bytes ...ons-with-critical-notes-in-parallel-columns.pdf | Bin 29125 -> 29131 bytes ...tions-with-critical-notes-in-parallel-pages.pdf | Bin 31731 -> 31727 bytes .../examples/sections-with-critical-notes.pdf | Bin 22787 -> 22794 bytes .../doc/latex/eledmac/examples/side-notes.pdf | Bin 20228 -> 20230 bytes .../examples/spaces-around-footnote-rule.pdf | Bin 20874 -> 20873 bytes .../doc/latex/eledmac/examples/tabular.pdf | Bin 20795 -> 20793 bytes .../examples/text-between-verses-in-parallel.pdf | Bin 16238 -> 16240 bytes Master/texmf-dist/source/latex/eledmac/eledmac.dtx | 10 ++++++---- Master/texmf-dist/tex/latex/eledmac/eledmac.sty | 4 +++- 21 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf index aaf7fae1dc6..49658b09b09 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 1230b1e934a..854d2afd094 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 7127e891b88..6411394545e 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 6a10a807050..368c12d4dd9 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 15eb99a3075..cd394c227af 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 f932b592737..485c93a3c58 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 511f4f43c51..a082b24cb26 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 c71bf9f948c..4be905124a1 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 67c0aa7cab4..9cdba1b449c 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 560b0bdeded..4722757d461 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 4d5347af454..1062c95a8c0 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 258cb7f05f2..9c946e5f4db 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 4599f6c2908..2914b76e814 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 95ebc6aed0f..1f6b36d9224 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 16df6438ce9..b277919424d 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 5430de775da..05c8c82ec00 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 e8b8e2ba84f..4d2420eee5b 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 b8ea3ae288f..8cf8c554ded 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 57db08d9c6d..cfa1fecc183 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 5ea117fb5f2..6aee357726f 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{10316} +% \CheckSum{10319} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -211,6 +211,7 @@ % \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.} % \changes{v1.13.3}{2014/10/04}{Fix extra spaces with paragraphed footnotes, added by v1.13.0.} +% \changes{v1.13.4}{2014/10/20}{Fix bug with index when memoir class is used without hyperref} % \hyphenation{man-u-script man-u-scripts} % % @@ -2857,7 +2858,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2014/10/04 v1.13.3 LaTeX port of EDMAC]% +\ProvidesPackage{eledmac}[2014/10/20 v1.13.4 LaTeX port of EDMAC]% % \end{macrocode} % % Generally, these are the modifications to the original. @@ -11602,8 +11603,9 @@ % \end{macro} % \begin{macro}{\l@d@@wrindexhyp} % If the \Lpack{hyperref} package is not loaded, it doesn't make sense -% to clutter up the index with hyperreffing things. +% to clutter up the index with hyperreffing things. Not that memoir class have yet a not standard behavior. % \begin{macrocode} +\ifl@dmemoir\else% \AtBeginDocument{\@ifpackageloaded{hyperref}{}{% \def\l@d@@wrindexhyp#1||\\{% \ifshowindexmark\@showidx{#1}\fi @@ -11619,7 +11621,7 @@ \fi% \endgroup \@esphack}}} - +\fi% % \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 daa8a1e8b87..ae2eee74105 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/04 v1.13.3 LaTeX port of EDMAC]% +\ProvidesPackage{eledmac}[2014/10/20 v1.13.4 LaTeX port of EDMAC]% \newif\ifledfinal \newif\ifparapparatus@ \newif\ifnoquotation@ @@ -3745,6 +3745,7 @@ \gdef\@index@txt{#1}% \gdef\@edindex@hyperref{}}% } +\ifl@dmemoir\else% \AtBeginDocument{\@ifpackageloaded{hyperref}{}{% \def\l@d@@wrindexhyp#1||\\{% \ifshowindexmark\@showidx{#1}\fi @@ -3760,6 +3761,7 @@ \fi% \endgroup \@esphack}}} +\fi% \newtoks\@emptytoks -- cgit v1.2.3