summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-12-18 23:29:47 +0000
committerKarl Berry <karl@freefriends.org>2012-12-18 23:29:47 +0000
commit1ce66d6e8b999e7573362e1fb1a2510c94f961f4 (patch)
tree9db89ab307159d7d84cdcd9ecf172d5f8d80e288
parent0606e50adff8bf95e5d9306925a6e0f3085c17d2 (diff)
eledmac (18dec12)
git-svn-id: svn://tug.org/texlive/trunk@28570 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/eledmac.pdfbin850319 -> 850744 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/eledpar.pdfbin471563 -> 471563 bytes
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledmac.dtx19
-rw-r--r--Master/texmf-dist/tex/latex/eledmac/eledmac.sty12
4 files changed, 20 insertions, 11 deletions
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
index 76ec3bcc764..8a076485511 100644
--- a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
index af0754b4761..c0e6bc8df1c 100644
--- a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
+++ b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index 176a2a66bf0..a166e7ded57 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{8205}
+% \CheckSum{8213}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -171,6 +171,7 @@
% \changes{v1.0}{2012/09/15}{Some compatibility break with eledmac. Change of name: eledmac.}
% \changes{v1.1}{2012/09/25}{New package option: parapparatus.}
% \changes{v1.4.2}{2012/12/12}{Debug with some special classes.}
+% \changes{v1.4.3}{2012/12/18}{Spurious space after familiar footnotes.}
% \hyphenation{man-u-script man-u-scripts}
%
% \newcommand{\Lpack}[1]{\textsf{#1}}
@@ -1236,6 +1237,10 @@
% \DescribeMacro{\afternumberinfootnote}
% With \cs{afternumberinfootnote}\oarg{s}\marg{l} you can add some space after the line number in a footnote. If the line number is not printed, the space is not either. The default value is 0.5~em.
%
+%\DescribeMacro{\nonbreakableafternumber}.
+% \changes{v1.4.3}{2012/12/18}{Add \cs{nonbreakableafternumber}.}
+% By default, the space defined by \cs{afternumberinfootnote} is breakeable. With \cs{afternumberinfootnote}\oarg{s} it becomes non breakable. Use \cs{afternumberinfootnote}\oarg{s}\oarg{false} to cancel it (\verb|<s>| can be empty if you want to disable it for every series).
+%
% \DescribeMacro{\beforesymlinenum}
% With \cs{beforesymlinenum}\oarg{s}\marg{l} you can add some space before the line symbol in a footnote. The default value is value set by \cs{beforenumberinfootnote}.
%
@@ -2651,7 +2656,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2012/12/11 v1.4.2 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2012/12/18 v1.4.3 LaTeX port of EDMAC]
% \end{macrocode}
%
% In general there is the following modifications to the original
@@ -7813,7 +7818,7 @@
% \begin{macrocode}
\newcommand{\l@dbfnote}[1]{%
\ifnumberedpar@
- \gdef\@tag{#1}
+ \gdef\@tag{#1}%
\xright@appenditem{\noexpand\vl@dbfnote{{\csexpandonce{@tag}}}{\@thefnmark}}%
\to\inserts@list
\global\advance\insert@count \@ne
@@ -8465,6 +8470,7 @@
\newtoggle{nonumberinfootnote@#1}%
\csgdef{beforenumberinfootnote@#1}{0pt}%
\csgdef{afternumberinfootnote@#1}{0.5em}%
+ \newtoggle{nonbreakableafternumber@#1}%
\csgdef{beforesymlinenum@#1}{\csuse{beforenumberinfootnote@#1}}%
\csgdef{aftersymlinenum@#1}{\csuse{afternumberinfootnote@#1}}%
\csgdef{inplaceofnumber@#1}{1em}%
@@ -8760,6 +8766,7 @@
\newhooktoggle@series{nonumberinfootnote}
\newhooktoggle@series{pstartinfootnote}
\newhooktoggle@series{onlypstartinfootnote}
+\newhooktoggle@series{nonbreakableafternumber}
% \end{macrocode}
% \end{macro}
% \subsubsection{Old commands, kept for backward compatibility}
@@ -8871,7 +8878,7 @@
\iftoggle{onlypstartinfootnote@#2}{}{\printlines#1|}%
\hfill}%
}%
- \hspace{\csuse{afternumberinfootnote@#2}}%
+ \iftoggle{nonbreakableafternumber@#2}{\nobreak}{}\hspace{\csuse{afternumberinfootnote@#2}}%
}%
}%
{%
@@ -8885,7 +8892,7 @@
\iftoggle{onlypstartinfootnote@#2}{}{\printlines#1|}%
\hfill}%
}%
- \hspace{\csuse{afternumberinfootnote@#2}}%
+ \iftoggle{nonbreakableafternumber@#2}{\nobreak}{}\hspace{\csuse{afternumberinfootnote@#2}}%
}%
}%
{%
@@ -8900,7 +8907,7 @@
\iftoggle{onlypstartinfootnote@#2}{}{\printlines#1|}%
\hfill}%
}%
- \hspace{\csuse{afternumberinfootnote@#2}}%
+ \iftoggle{nonbreakableafternumber@#2}{\nobreak}{}\hspace{\csuse{afternumberinfootnote@#2}}%
}%
\csxdef{prevline#2}{\lineinfo@}%
}%
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index c372fc09be4..2bbd72a8ce5 100644
--- a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
+++ b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2012/12/11 v1.4.2 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2012/12/18 v1.4.3 LaTeX port of EDMAC]
\newif\ifledfinal
\newif\ifparapparatus@
\newif\ifnoquotation@
@@ -1807,7 +1807,7 @@
\fi}
\newcommand{\l@dbfnote}[1]{%
\ifnumberedpar@
- \gdef\@tag{#1}
+ \gdef\@tag{#1}%
\xright@appenditem{\noexpand\vl@dbfnote{{\csexpandonce{@tag}}}{\@thefnmark}}%
\to\inserts@list
\global\advance\insert@count \@ne
@@ -2166,6 +2166,7 @@
\newtoggle{nonumberinfootnote@#1}%
\csgdef{beforenumberinfootnote@#1}{0pt}%
\csgdef{afternumberinfootnote@#1}{0.5em}%
+ \newtoggle{nonbreakableafternumber@#1}%
\csgdef{beforesymlinenum@#1}{\csuse{beforenumberinfootnote@#1}}%
\csgdef{aftersymlinenum@#1}{\csuse{afternumberinfootnote@#1}}%
\csgdef{inplaceofnumber@#1}{1em}%
@@ -2370,6 +2371,7 @@
\newhooktoggle@series{nonumberinfootnote}
\newhooktoggle@series{pstartinfootnote}
\newhooktoggle@series{onlypstartinfootnote}
+\newhooktoggle@series{nonbreakableafternumber}
\newcommand*{\notenumfont}{\normalfont}
\newcommand*{\notefontsetup}{\footnotesize}
\newif\ifledplinenum
@@ -2431,7 +2433,7 @@
\iftoggle{onlypstartinfootnote@#2}{}{\printlines#1|}%
\hfill}%
}%
- \hspace{\csuse{afternumberinfootnote@#2}}%
+ \iftoggle{nonbreakableafternumber@#2}{\nobreak}{}\hspace{\csuse{afternumberinfootnote@#2}}%
}%
}%
{%
@@ -2445,7 +2447,7 @@
\iftoggle{onlypstartinfootnote@#2}{}{\printlines#1|}%
\hfill}%
}%
- \hspace{\csuse{afternumberinfootnote@#2}}%
+ \iftoggle{nonbreakableafternumber@#2}{\nobreak}{}\hspace{\csuse{afternumberinfootnote@#2}}%
}%
}%
{%
@@ -2460,7 +2462,7 @@
\iftoggle{onlypstartinfootnote@#2}{}{\printlines#1|}%
\hfill}%
}%
- \hspace{\csuse{afternumberinfootnote@#2}}%
+ \iftoggle{nonbreakableafternumber@#2}{\nobreak}{}\hspace{\csuse{afternumberinfootnote@#2}}%
}%
\csxdef{prevline#2}{\lineinfo@}%
}%