diff options
24 files changed, 24 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf Binary files differindex cb98a17c4bb..f27e896bb2e 100644 --- a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf Binary files differindex 5bbe450958d..b1dc5e2c5ea 100644 --- a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf Binary files differindex 53c74264e88..a6a2f9ec698 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/columns-alignment.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf Binary files differindex 51d6674facc..7c9341e500e 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/cross-referencing.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf Binary files differindex f43f85553bf..a5ce5981500 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/indexing.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/lemma-disambiguation.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/lemma-disambiguation.pdf Binary files differindex 4ccf1681390..199855b2636 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/lemma-disambiguation.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/lemma-disambiguation.pdf 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 Binary files differindex 95aeecd9ba1..17086938351 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 diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf Binary files differindex b381ae6aaa0..96e9f053125 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-parallels.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf Binary files differindex 925d89e291f..d395f1fd999 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/minimal-verses.pdf 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 Binary files differindex 07db2789b72..58731af127d 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 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 Binary files differindex 6b6b1e1134e..1ce4d13ca16 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 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 Binary files differindex 822942de81b..198cf836454 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 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 Binary files differindex e6c469f0b7e..2d775e67be1 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 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 Binary files differindex f0cc670fb9d..f24317fe459 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 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 Binary files differindex 9ceb6d057ba..1e4837d4fb6 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 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 Binary files differindex 3dd07654705..d5d6c02e488 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 diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/separator-between-paragraphs.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/separator-between-paragraphs.pdf Binary files differindex c31d8038b51..ad78f5d5a72 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/separator-between-paragraphs.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/separator-between-paragraphs.pdf diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf Binary files differindex b2e24fbc255..aedd3e47525 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/side-notes.pdf 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 Binary files differindex 815ac099563..68ea5124973 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 diff --git a/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf b/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf Binary files differindex b46bb9adf85..563281b4b6d 100644 --- a/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf +++ b/Master/texmf-dist/doc/latex/eledmac/examples/tabular.pdf 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 Binary files differindex b46579c9091..36fe8fc6cdd 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 diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx index 38d1b81abc3..718f89ee2db 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{10642} +% \CheckSum{10648} % % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters @@ -1907,18 +1907,19 @@ % and `other'.} % % \DescribeMacro{\edpageref} -% \DescribeMacro{\lineref} +% \DescribeMacro{\edlineref} % \DescribeMacro{\sublineref} % \DescribeMacro{\pstartref} % Elsewhere in the text, either before or after the \cs{edlabel}, % you can refer to its location via \cs{edpageref}\marg{lab}, or -% \cs{lineref}\marg{lab}, \cs{sublineref}\marg{lab}, or \cs{pstartref}\marg{lab}. These commands +% \cs{edlineref}\marg{lab}\footnote{Previously, the \cs{edlineref} command was \cs{lineref}. But some packages also define \cs{lineref}. That is why you should use \cs{edlineref} insteaf of \cs{lineref}. \Lpack{eledmac} defines \cs{lineref} as equal to \cs{edlineref}, except if one package has also defined a \cs{lineref} command.}, \cs{sublineref}\marg{lab}, or \cs{pstartref}\marg{lab}. These commands % will produce, respectively, the page, line, sub-line and pstart on which % the \cs{edlabel}\marg{lab} command occurred. % +% % An \cs{edlabel} command may appear in the main text, or in the % first argument of \cs{edtext}, but not in the apparatus itself. But -% \cs{edpageref}, \cs{lineref}, \cs{sublineref}, \cs{pstartref} commands can also be used in +% \cs{edpageref}, \cs{edlineref}, \cs{sublineref}, \cs{pstartref} commands can also be used in % the apparatus to refer to \cs{edlabel}s in the text. % % The \cs{edlabel} command works by writing macros to \LaTeX @@ -2904,7 +2905,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{eledmac}[2015/01/23 v1.16.0 LaTeX port of EDMAC]% +\ProvidesPackage{eledmac}[2015/02/05 v1.16.1 LaTeX port of EDMAC]% % \end{macrocode} % % Generally, these are the modifications to the original. @@ -10596,7 +10597,7 @@ % The reference macros warn you if a reference is made to an % undefined label. If \verb"foo" has been used as a label before, % the \verb"\edlabel{foo}" command will issue a complaint; subsequent -% \cs{edpageref} and \cs{lineref} commands will refer to the +% \cs{edpageref} and \cs{edlineref} commands will refer to the % latest occurrence of \verb"\label{foo}". % % \begin{macro}{\labelref@list} @@ -10782,16 +10783,22 @@ % \end{macro} % \end{macro} % +% \begin{macro}{\edlineref} % \begin{macro}{\lineref} +% \changes{v1.16.1}{2015/02/05}{\cs{lineref} is not defined if defined by some other package, like lineno. Eledmac provides \cs{edlineref} instead.} % \begin{macro}{\xlineref} % If the specified label exists, \cs{lineref} gives its line number. % \begin{macrocode} -\newcommand*{\lineref}[1]{\l@dref@undefined{#1}\wrap@edcrossref{#1}{\l@dgetref@num{2}{#1}}} -\newcommand*{\xlineref}[1]{\l@dgetref@num{2}{#1}} +\newcommand*{\edlineref}[1]{\l@dref@undefined{#1}\wrap@edcrossref{#1}{\l@dgetref@num{2}{#1}}}% +\AtBeginDocument{% + \ifdef\lineref{}{\let\lineref\edlineref}% +}% +\newcommand*{\xlineref}[1]{\l@dgetref@num{2}{#1}}% % \end{macrocode} % \end{macro} % \end{macro} +% \end{macro} % % \begin{macro}{\sublineref} % \begin{macro}{\xsublineref} @@ -14778,11 +14785,11 @@ % \end{thebibliography} % % \Finale -% \section*{} +% \phantomsection % \addcontentsline{toc}{section}{Index} % \PrintIndex % -% \section*{} +% \phantomsection % \addcontentsline{toc}{section}{Change History} % \PrintChanges % \endinput diff --git a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx index 1eadf6c5af8..026be610994 100644 --- a/Master/texmf-dist/source/latex/eledmac/eledpar.dtx +++ b/Master/texmf-dist/source/latex/eledmac/eledpar.dtx @@ -5589,7 +5589,7 @@ % \addcontentsline{toc}{section}{Index} % \PrintIndex % -% \section*{} +% \phantomsection % \addcontentsline{toc}{section}{Change History} % \PrintChanges % \endinput diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty index 4f1bb0783f5..300ef344fd5 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}[2015/01/23 v1.16.0 LaTeX port of EDMAC]% +\ProvidesPackage{eledmac}[2015/02/05 v1.16.1 LaTeX port of EDMAC]% \newif\ifledfinal \newif\ifparapparatus@ \newif\ifnoquotation@ @@ -3282,8 +3282,11 @@ \newcommand*{\edpageref}[1]{\l@dref@undefined{#1}\wrap@edcrossref{#1}{\l@dgetref@num{1}{#1}}} \newcommand*{\xpageref}[1]{\l@dgetref@num{1}{#1}} -\newcommand*{\lineref}[1]{\l@dref@undefined{#1}\wrap@edcrossref{#1}{\l@dgetref@num{2}{#1}}} -\newcommand*{\xlineref}[1]{\l@dgetref@num{2}{#1}} +\newcommand*{\edlineref}[1]{\l@dref@undefined{#1}\wrap@edcrossref{#1}{\l@dgetref@num{2}{#1}}}% +\AtBeginDocument{% + \ifdef\lineref{}{\let\lineref\edlineref}% +}% +\newcommand*{\xlineref}[1]{\l@dgetref@num{2}{#1}}% \newcommand*{\sublineref}[1]{\l@dref@undefined{#1}\wrap@edcrossref{#1}{\l@dgetref@num{3}{#1}}} \newcommand*{\xsublineref}[1]{\l@dgetref@num{3}{#1}} |