summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/eledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-04-30 20:39:54 +0000
committerKarl Berry <karl@freefriends.org>2015-04-30 20:39:54 +0000
commit25e26e9a00325030747f024cb884bd6d58f4469b (patch)
treec83488d3c36ddc98f9e8ebc6aa3288ed77b99c3e /Master/texmf-dist/source/latex/eledmac
parentac2e59d335498d52fb93fae8eb1b443d194f6327 (diff)
eledmac (30apr15)
git-svn-id: svn://tug.org/texlive/trunk@37131 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/eledmac')
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledmac.dtx26
1 files changed, 16 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index 48a02d57583..8e32d29da58 100644
--- a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
+++ b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
@@ -52,7 +52,7 @@
% \fi
%
% \newcommand{\reff}[1]{\ref{#1} p.~\pageref{#1}}
-% \CheckSum{11661}
+% \CheckSum{11649}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -244,8 +244,8 @@
% \changes{v1.22.0}{2015/04/25}{When using hyperref package, internal links in index or with \cs{edlineref} are now targeted to the top and not longer to the bottom of the lines they refer to.}
% \changes{v1.22.0}{2015/04/25}{Provides support for xindy.}
% \changes{v1.22.0}{2015/04/25}{Adds hyperlink for references to notes in indices.}
-% \changes{v1.22.0}{2015/04/25}{Fix bug (added on v1.19.2) with \cs{symlinenum} hook when the argument is a not full expandable macro, like \cs{textbardbl}.}
% \changes{v1.22.0}{2015/04/25}{Fix conflict between noend package option and edtabularx environments}
+% \changes{v1.22.1}{2015/04/29}{Fix bug (added on v1.22.0) with \cs{inplaceofnumber} hook.}
% \hyphenation{man-u-script man-u-scripts}
%
%
@@ -1432,7 +1432,7 @@
%
%
% \DescribeMacro{\symlinenum}
-% For setting a particular symbol in place of the line number, you can use \cs{symlinenum}\oarg{s}\marg{symbol} in combination with \cs{numberonlyfirstinline}\oarg{s}. From the second lemma of the same line, the symbol will be used instead of the line number.
+% For setting a particular symbol in place of the line number, you can use \cs{symlinenum}\oarg{s}\marg{symbol} in combination with \cs{numberonlyfirstinline}\oarg{s}. From the second lemma of the same line, the symbol will be used instead of the line number. Note that any command called in \meta{symbol} must be robust. Use \cs{robustify} to robustify a not robust command.
%
% \DescribeMacro{\nonumberinfootnote}
% You can use \cs{nonumberinfootnote}\oarg{s} if you don't want to have the line number in a footnote. To cancel it, use \cs{nonumberinfootnote}\oarg{s}\verb+[false]+.
@@ -1639,7 +1639,8 @@
% You can add some space after a note by using \cs{afternote}\oarg{s}\marg{l}. The default value is \verb|1em plus.4em minus.4em|.
%
% \DescribeMacro{\parafootsep}
-% For paragraphed footnotes (see below), you can choose the separator between each note by using \cs{parafootsep}\oarg{s}\marg{text}. A common separator is the double pipe (\verb+$||$+), which you can set by using \cs{parafootsep}\verb+{$\parallel$}+.
+% For paragraphed footnotes (see below), you can choose the separator between each note by using \cs{parafootsep}\oarg{s}\marg{text}. A common separator is the double pipe (\verb+$||$+), which you can set by using \cs{parafootsep}\verb+{$\parallel$}+.
+% Note that if the symbol defined by \cs{symlinenum} must be used at the begin of a notes, the \cs{parafootsep} is not used before this note.
%
% \changes{v1.12.0}{2014/08/05}{New options for ragged-paragraph notes}
% \DescribeMacro{\Xragged}
@@ -3102,7 +3103,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2015/04/25 v1.22.0 LaTeX port of EDMAC]%
+\ProvidesPackage{eledmac}[2015/04/29 v1.22.1 LaTeX port of EDMAC]%
% \end{macrocode}
%
% Generally, these are the modifications to the original.
@@ -8730,13 +8731,14 @@
%The command \cs{insertparafootsep}\marg{series} must be called at the beginning of \cs{parafootftm} (and like commands).
% \begin{macro}{\prevpage@num}
% \changes{v1.8.0}{2013/12/13}{Correct \cs{parafootsep} when using with ledgroup.}
+% \changes{v1.22.1}{2015/04/29}{Correct double symbol when using both \cs{parafootsep} and \cs{symlinenum}.}
% \begin{macro}{\insertparafootsep}
% \begin{macrocode}
\newcommand{\insertparafootsep}[1]{%
\ifnumequal{\csuse{prevpage#1@num}}{\page@num}%
{\ifcsdef{prevline#1}% Be sur \prevline#1 exists.
{\ifnumequal{\csuse{prevline#1}}{\line@num}%
- {\ifcsempty{symplinenum}{\csuse{parafootsep@#1}}{}}%
+ {\IfStrEq{\csuse{symlinenum@#1}}{\csuse{parafootsep@#1}}{}}%
{\csuse{parafootsep@#1}}%
}%
{\csuse{parafootsep@#1}}%
@@ -11063,6 +11065,13 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \begin{macro}{\textbardbl}
+% \changes{v1.22.1}{2015/04/29}{Robustify \cs{textbardbl}}
+% We need to robustify \cs{textbardbl} in order to allow it use in \cs{IfStrEq} when using as \cs{symlinenum}.
+% \begin{macrocode}
+% \robustify{\textbardbl}
+% \end{macrocode}
+% \end{macro}
% \subsection{Hooks for a particular footnote}
% \begin{macro}{\fulllines@}
%\cs{fulllines@} toggle is used to print the fulllines references, and not the abbreviated form defined by \cs{twolines} and \cs{morethantwolines}.
@@ -11149,10 +11158,7 @@
{%Be sure the \prevline exists.
\ifcsequal{prevline#2}{lineinfo@}%Try it
{%
- \expandafter\ifstrempty\expandafter{\csuse{symlinenum@#2}}%This test use a complex construction with two expand after and not simple test. The following tests are not working:
- %1) single `\ifstrempty{\csuse{symlinenum@#2}}` won't work because it will test `\csuse{symlinenum@#2}` and not the expansion of `\csuse{symlinenum@#2}`. So in never case will be empty.
- %2) `\IfStrEq{\csuse{symlinenum@#2}}{}` is problematic for full expansion of \csuse{symlinenum@#2} when the first level of expansion is \textbardbl.
- %3) `\ifcsempty{symlinenum@#2}` won't work if user doesn't use `\symlinenum{}`, because the default definition of `\symlinenum@#2` is `\symplinenum` and we need to keep this definition in order to avoid breaking backward compatibility with ledmac (see http://tex.stackexchange.com/a/232734/7712 for an example of problem with `\ifcsempty{symlinenum@#2}`
+ \IfStrEq{\csuse{symlinenum@#2}}{}%
{%
\hspace{\csuse{inplaceofnumber@#2}}%
}%