summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/eledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-02-06 23:21:32 +0000
committerKarl Berry <karl@freefriends.org>2014-02-06 23:21:32 +0000
commitf4a0b10b29cbb9f66a51c23b44d36967a7248997 (patch)
treeb4a27b7e4047b36994a62dc7ad89ca7214894bc0 /Master/texmf-dist/source/latex/eledmac
parentae325decb4680e2b5926cf27246bb47fee52e62d (diff)
eledmac (6feb14)
git-svn-id: svn://tug.org/texlive/trunk@32884 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/eledmac')
-rw-r--r--Master/texmf-dist/source/latex/eledmac/eledmac.dtx63
1 files changed, 54 insertions, 9 deletions
diff --git a/Master/texmf-dist/source/latex/eledmac/eledmac.dtx b/Master/texmf-dist/source/latex/eledmac/eledmac.dtx
index ba7bcbd3234..9329e0c54fa 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{8881}
+% \CheckSum{8909}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -179,6 +179,7 @@
% \changes{v1.6.1}{2013/10/27}{Corrects a false hanging verse when a verse is exactly the length of a line.}
% \changes{v1.8.0}{2013/12/13}{Compatibility with parledgroup option of eledpar package.}
% \changes{v1.8.2}{2014/01/31}{Debug compatibility problem with hebrew option of babel package.}
+% \changes{v1.8.3}{2014/02/03}{Fixes spurious spaces add by v1.7.0.}
% \hyphenation{man-u-script man-u-scripts}
%
% \newcommand{\Lpack}[1]{\textsf{#1}}
@@ -2006,6 +2007,19 @@
%
% Additional footnote series can be easily defined: you just have to use \cs{newseries}, defined above (see \ref{newseries} p.\pageref{newseries}).
%
+% \subsection{Position of the familiar footnotes}
+% \DescribeMacro{\fnpos}\DescribeMacro{\mpfnpos}
+% There is a historical incoherence in \Lpack{(e)ledmac}. The familiar footnotes are
+% before the critical footnotes in a normal page, but after in a minipage or in a ledgroup.
+% However, it is possible to change the relative position of both types of footnotes.
+% If you want to have familiar footnotes after critical in a normal page, use:
+% \begin{verbatim}
+% \fnpos{critical-familiar}
+% \end{verbatim}
+% In other way, if you want in a minipage or in a ledgroup to have critical footnotes after familiar, use:
+% \begin{verbatim}
+% \mpfnpos{familiar-critical}
+% \end{verbatim}
% \section{Indexing}
%
% \DescribeMacro{\edindex}
@@ -2753,7 +2767,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{eledmac}[2014/01/31 v1.8.2 LaTeX port of EDMAC]
+\ProvidesPackage{eledmac}[2014/02/05 v1.9.0 LaTeX port of EDMAC]
% \end{macrocode}
%
% Generally, these are the modifications to the original.
@@ -4878,8 +4892,8 @@
{\write\linenum@out{\string\@l[\the\c@page][\thepage]}}}%
{}%
\IfStrEq{\led@pb@setting}{before}%
- {%
-\numdef{\next@absline}{\the\absline@num+1}
+ {%
+\numdef{\next@absline}{\the\absline@num+1}%
\xifinlistcs{\next@absline}{l@prev@nopb}%
{\xifinlistcs{\the\absline@num}{normal@page@break}%
{%
@@ -8663,6 +8677,22 @@
% \end{macro}
%
%
+% \subsection{Footnotes' order}
+% \begin{macro}{\fnpos}
+% \begin{macro}{\mpfnpos}
+% \begin{macro}{\@fnpos}
+% \begin{macro}{\@mpfnpos}
+% The \cs{fnpos} and \cs{mpfnpos} just put their arguments in \cs{@fnpos} and \cs{@mpfnpos}, which will be used later in the output routine.
+% \begin{macrocode}
+\def\@fnpos{familiar-critical}
+\def\@mpfnpos{critical-familiar}
+\newcommand{\fnpos}[1]{\xdef\@fnpos{#1}}
+\newcommand{\mpfnpos}[1]{\xdef\@mpfnpos{#1}}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
% \subsection{Footnotes' output}
%
@@ -9604,14 +9634,21 @@
% \begin{macro}{\doxtrafeet}
% \cs{doxtrafeet} is the code extending \cs{@makecol} to cater for
% the extra \Eledmac{} feet. We have two classes of extra footnotes.
-% We order the footnote inserts so that the regular footnotes are first,
+% By default, we order the footnote inserts so that the regular footnotes are first,
% then class 1\index{class 1 feet} (familiar footnotes) and finally
% class 2\index{class 2 feet} (critical footnotes).
% \changes{v0.2.1}{2003/09/13}{Renamed \cs{doxtrafeet} to \cs{l@ddoxtrafeet}}
+% \changes{v1.9.0}{2014/02/05}{Add \cs{fnpos} to choice the order of footnotes.}
% \begin{macrocode}
\newcommand*{\l@ddoxtrafeet}{%
- \doxtrafeeti
- \doxtrafeetii}
+ \IfStrEq{familiar-critical}{\@fnpos}
+ {\doxtrafeeti\doxtrafeetii}%
+ {%
+ \IfStrEq{critical-familiar}{\@fnpos}%
+ {\doxtrafeetii\doxtrafeeti}%
+ {\doxtrafeeti\doxtrafeetii}%
+ }%
+ }%
% \end{macrocode}
% \end{macro}
@@ -10422,14 +10459,22 @@
%
% \begin{macro}{\l@dfeetbeginmini}
% \begin{macro}{\l@dfeetendmini}
+% \changes{v1.9.0}{2014/02/05}{Add \cs{mpfnpos} to choice the order of footnotes in minipage / ledgroup.}
% These will be the hooks in \verb?\@iiiminpage? and \verb?\endminipage?
% They can be extended to handle other things if necessary.
% \changes{v0.4}{2004/02/29}{Added \cs{l@dfeetbeginmini}, \cs{l@dfeetendmini}
% and all their supporting code}
% \begin{macrocode}
\newcommand*{\l@dfeetbeginmini}{\l@dedbeginmini\l@dfambeginmini}
-\newcommand*{\l@dfeetendmini}{\l@dedendmini\l@dfamendmini}
-
+\newcommand*{\l@dfeetendmini}{%
+ \IfStrEq{critical-familiar}{\@mpfnpos}%
+ {\l@dedendmini\l@dfamendmini}%
+ {%
+ \IfStrEq{familiar-critical}{\@mpfnpos}%
+ {\l@dfamendmini\l@dedendmini}%
+ {\l@dedendmini\l@dfamendmini}%
+ }%
+ }%
% \end{macrocode}
% \end{macro}
% \end{macro}