From f4a0b10b29cbb9f66a51c23b44d36967a7248997 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 6 Feb 2014 23:21:32 +0000 Subject: eledmac (6feb14) git-svn-id: svn://tug.org/texlive/trunk@32884 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/eledmac/eledmac.pdf | Bin 891779 -> 894923 bytes Master/texmf-dist/doc/latex/eledmac/eledpar.pdf | Bin 494766 -> 494695 bytes Master/texmf-dist/source/latex/eledmac/eledmac.dtx | 63 ++++++++++++++++++--- Master/texmf-dist/tex/latex/eledmac/eledmac.sty | 31 +++++++--- 4 files changed, 78 insertions(+), 16 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf index 5a5e077c656..bdf758407f5 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf and b/Master/texmf-dist/doc/latex/eledmac/eledmac.pdf differ diff --git a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf index c6a3b4be72f..4e464509f64 100644 Binary files a/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf and b/Master/texmf-dist/doc/latex/eledmac/eledpar.pdf differ 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} diff --git a/Master/texmf-dist/tex/latex/eledmac/eledmac.sty b/Master/texmf-dist/tex/latex/eledmac/eledmac.sty index d3ed9f4c98f..a32d61be3e9 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}[2014/01/31 v1.8.2 LaTeX port of EDMAC] +\ProvidesPackage{eledmac}[2014/02/05 v1.9.0 LaTeX port of EDMAC] \newif\ifledfinal \newif\ifparapparatus@ \newif\ifnoquotation@ @@ -780,8 +780,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}% {% @@ -2275,6 +2275,10 @@ \csuse{notefontsizeX@#1} \noindent\unhbox0\par}} +\def\@fnpos{familiar-critical} +\def\@mpfnpos{critical-familiar} +\newcommand{\fnpos}[1]{\xdef\@fnpos{#1}} +\newcommand{\mpfnpos}[1]{\xdef\@mpfnpos{#1}} \newcommand*{\doxtrafeeti}{% \setbox\@outputbox \vbox{% @@ -2759,8 +2763,14 @@ } \newcommand*{\l@ddoxtrafeet}{% - \doxtrafeeti - \doxtrafeetii} + \IfStrEq{familiar-critical}{\@fnpos} + {\doxtrafeeti\doxtrafeetii}% + {% + \IfStrEq{critical-familiar}{\@fnpos}% + {\doxtrafeetii\doxtrafeeti}% + {\doxtrafeeti\doxtrafeetii}% + }% + }% \newcommand*{\doxtrafeetii}{% \setbox\@outputbox \vbox{% @@ -3090,8 +3100,15 @@ \fi% \fi} \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}% +}% +}% \newcommand*{\l@dedbeginmini}{% \def\do##1{\csletcs{v##1footnote}{mpv##1footnote}}% \dolistloop{\@series}% -- cgit v1.2.3