summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/eledmac.pdfbin850740 -> 852315 bytes
-rw-r--r--Master/texmf-dist/doc/latex/eledmac/eledpar.pdfbin471390 -> 471390 bytes
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledmac.dtx40
-rw-r--r--Master/texmf-dist/tex/latex/eledmac/eledmac.sty15
4 files changed, 39 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf
index 341a9745110..962eed4d7b2 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 392677b85b4..053435d7cb9 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 f35e660474c..c58c57b2c37 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{8213}
+% \CheckSum{8225}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -172,6 +172,7 @@
% \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.}
+% \changes{v1.4.4}{2013/02/18}{Label inside familiar footnotes.}
% \hyphenation{man-u-script man-u-scripts}
%
% \newcommand{\Lpack}[1]{\textsf{#1}}
@@ -1882,7 +1883,7 @@
% If you have two or more sidenotes for the same line, they are separated by a comma.
% But if you want to change this separator, you can redefine the macro \cs{sidenotesep}.
% \section{Familiar footnotes} \label{sec:desc:familiar}
-%
+%
%
% The \Lpack{footmisc} package~\cite{FOOTMISC} by Robin
% Fairbairns\index{Fairbairns, Robin} has an option whereby
@@ -2242,9 +2243,9 @@
% produces a vertical dotted instead of a solid line.
%
%
-% \section{sectioning commands}
+% \section{Sectioning commands}
% \changes{v1.1}{2012/09/25}{sectioning commands}
-% The standard sectioning command (\section{chapter}, \cs{section} etc.) can be used inside a numbered text.
+% The standard sectioning command (\cs{chapter}, \cs{section} etc.) can be used inside a numbered text.
% But the line which contains it won't be numbered, and you can't add critical notes inside.
%
% However, eledmac provides the following commands :
@@ -2277,8 +2278,8 @@
% ...
% \end{Rightside}
% \end{verbatim}
-% \subsection{Quotation environments}
-% The verb+quotation+ and /verb+quote+ environment can be used so that same definition/note appears both inside and outside a numbered section.
+% \section{Quotation environments}
+% The \verb+quotation+ and \verb+quote+ environment can be used so that same definition/note appears both inside and outside a numbered section.
% The typographical consequences will resemble the outside numbered sections, based on the styles of the \emph{book} class.
% However, if you use a package that redefines these environments, these redefinitions won't be available inside the numbering section.
% You must open the quotation environments inside a \cs{start}-\cs{pend} block, not outside.
@@ -2655,7 +2656,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2012/12/18 v1.4.3 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2013/02/18 v1.4.4 LaTeX port of EDMAC]
% \end{macrocode}
%
% In general there is the following modifications to the original
@@ -4083,8 +4084,7 @@
%
% \begin{macrocode}
\get@linelistfile{#1}%
- \endgroup
-
+ \endgroup
% \end{macrocode}
%
% When the reading is done, we're all through with the
@@ -7702,7 +7702,7 @@
%
% % \section{Familiar footnotes}
%
-%
+% \subsection{Generality}
% The original \edmac{} provided the five series of critical footnotes,
% and LaTeX provides a single numbered footnote. The \Eledmac{} package
% uses the \edmac{} mechanism to provide a few series of numbered footnotes.
@@ -7920,6 +7920,9 @@
% prepended by the marker.
% \begin{macrocode}
\newcommand*{\normalfootfmtX}[2]{%
+ \protected@edef\@currentlabel{%
+ \@nameuse{@thefnmark#1}%
+ }%
\ledsetnormalparstuff
\hangindent=\csuse{hangindentX@#1}%
{{\csuse{notenumfontX@#1}\@nameuse{footfootmark#1}}\strut%\enspace
@@ -8059,7 +8062,7 @@
% \end{macrocode}
% \end{macro}
%
-% \subsubsection{Two column footnotes}
+% \subsection{Two columns footnotes}
%
% The following macros set footnotes in two columns. It is assumed
% that the length of each footnote is less than the column width.
@@ -8112,6 +8115,9 @@
% \cs{twocolfootfmtX}\marg{series}
% \begin{macrocode}
\newcommand*{\twocolfootfmtX}[2]{%
+ \protected@edef\@currentlabel{%
+ \@nameuse{@thefnmark#1}%
+ }%
\normal@pars
\hangindent=\csuse{hangindentX@#1}%
\hsize \csuse{hsizetwocolX@#1}
@@ -8146,7 +8152,7 @@
% \end{macro}
% \end{macro}
%
-% \subsubsection{Three column footnotes}
+% \subsection{Three columns footnotes}
%
% The following macros set footnotes in three columns. It is assumed
% that the length of each footnote is less than the column width.
@@ -8199,6 +8205,9 @@
% \cs{threecolfootfmtX}\marg{series}
% \begin{macrocode}
\newcommand*{\threecolfootfmtX}[2]{%
+ \protected@edef\@currentlabel{%
+ \@nameuse{@thefnmark#1}%
+ }%
\hangindent=\csuse{hangindentX@#1}%
\normal@pars
\hsize \csuse{hsizethreecolX@#1}
@@ -8233,7 +8242,7 @@
% \end{macro}
% \end{macro}
%
-% \subsubsection{Paragraphed footnotes}
+% \subsection{Paragraphed footnotes}
%
% The following macros set footnotes as one paragraph.
%
@@ -8332,6 +8341,9 @@
% \cs{parafootfmtX}\marg{series}
% \begin{macrocode}
\newcommand*{\parafootfmtX}[2]{%
+ \protected@edef\@currentlabel{%
+ \@nameuse{@thefnmark#1}%
+ }%
\insertparafootsep{#1}%
\ledsetnormalparstuff
{\csuse{notenumfontX@#1}\csuse{notenumfontX@#1}\@nameuse{footfootmark#1}\strut%\enspace
@@ -8365,7 +8377,7 @@
% \end{macro}
%
%
-% \subsection{Other series footnotes}
+% \subsection{Footnotes' output}
%
%
diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty
index 2bbd72a8ce5..5cbbc5894b6 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/18 v1.4.3 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2013/02/18 v1.4.4 LaTeX port of EDMAC]
\newif\ifledfinal
\newif\ifparapparatus@
\newif\ifnoquotation@
@@ -488,7 +488,6 @@
\list@clearing@reg
\get@linelistfile{#1}%
\endgroup
-
\global\page@num=\m@ne
\ifx\actionlines@list\empty
\gdef\next@actionline{1000000}%
@@ -1852,6 +1851,9 @@
\@nameuse{footfmt#1}{#1}{#2}\color@endgroup}}
\newcommand*{\normalfootfmtX}[2]{%
+ \protected@edef\@currentlabel{%
+ \@nameuse{@thefnmark#1}%
+ }%
\ledsetnormalparstuff
\hangindent=\csuse{hangindentX@#1}%
{{\csuse{notenumfontX@#1}\@nameuse{footfootmark#1}}\strut%\enspace
@@ -1947,6 +1949,9 @@
\@nameuse{footfmt#1}{#1}{#2}\egroup}
\newcommand*{\twocolfootfmtX}[2]{%
+ \protected@edef\@currentlabel{%
+ \@nameuse{@thefnmark#1}%
+ }%
\normal@pars
\hangindent=\csuse{hangindentX@#1}%
\hsize \csuse{hsizetwocolX@#1}
@@ -1994,6 +1999,9 @@
\@nameuse{footfmt#1}{#1}{#2}\egroup}
\newcommand*{\threecolfootfmtX}[2]{%
+ \protected@edef\@currentlabel{%
+ \@nameuse{@thefnmark#1}%
+ }%
\hangindent=\csuse{hangindentX@#1}%
\normal@pars
\hsize \csuse{hsizethreecolX@#1}
@@ -2082,6 +2090,9 @@
\penalty0}}
\newcommand*{\parafootfmtX}[2]{%
+ \protected@edef\@currentlabel{%
+ \@nameuse{@thefnmark#1}%
+ }%
\insertparafootsep{#1}%
\ledsetnormalparstuff
{\csuse{notenumfontX@#1}\csuse{notenumfontX@#1}\@nameuse{footfootmark#1}\strut%\enspace