summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/eledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-02-05 22:41:18 +0000
committerKarl Berry <karl@freefriends.org>2015-02-05 22:41:18 +0000
commit48e44460b063dda6ad50564fe6eabfd8c731528c (patch)
treecbf7a1c59451eb4f7a9a8ddba4d68fd8f603cd26 /Master/texmf-dist/source/latex/eledmac
parent71cbc711cc4c0f472525220a98d6ddc5badee648 (diff)
eledmac (5feb15)
git-svn-id: svn://tug.org/texlive/trunk@36219 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/eledmac')
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledmac.dtx27
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledpar.dtx2
2 files changed, 18 insertions, 11 deletions
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