diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/ledmac/ledpar.sty')
| -rw-r--r-- | Master/texmf-dist/tex/latex/ledmac/ledpar.sty | 205 |
1 files changed, 80 insertions, 125 deletions
diff --git a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty index 28f2fbd5cf6..99593aaa215 100644 --- a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty +++ b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty @@ -6,9 +6,9 @@ %% %% ledpar.dtx (with options: `code') %% -%% Author: Author: Peter Wilson ; Herries Press herries dot press at earthlink dot net ; Maïeul Rouquette maieul at maieul dot net +%% Author: Author: Peter Wilson Maïeul Rouquette maieul at maieul dot net (Herries Press) herries dot press at earthlink dot net %% Copyright 2004, 2005 Peter R. Wilson -%% 2011- Maïeul Rouquette +%% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either %% version 1.3 of this license or (at your option) any @@ -18,13 +18,13 @@ %% and version 1.3 or later is part of all distributions of %% LaTeX version 2003/06/01 or later. %% -%% This work has the LPPL maintenance status "maintained". +%% This work has the LPPL maintenance status "unmaintained". %% %% This work consists of the files listed in the README file. %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{ledpar}[2012/09/08 v0.13.2 ledmac extension for parallel texts] +\ProvidesPackage{ledpar}[2012/08/14 v0.14 ledmac extension for parallel texts] \newif\ifshiftedverses \shiftedversesfalse @@ -571,7 +571,7 @@ \xright@appenditem{#1}\to\linesinpar@listL} \providecommand*{\@pendR}[1]{} \renewcommand*{\@pendR}[1]{% - \ifbypstart@R\global\line@numR=0\fi + \ifbypstart@R\global\line@numR=0\fi% \xright@appenditem{#1}\to\linesinpar@listR} \providecommand*{\@lopL}[1]{} @@ -664,7 +664,8 @@ \long\def\critext#1#2/{\leavevmode \begingroup - \renewcommand{\@tag}{\no@expands #1}% + \no@expands + \xdef\@tag{#1}% \set@line \ifledRcol \global\insert@countR \z@ \else \global\insert@count \z@ \fi @@ -680,7 +681,8 @@ \flag@end} \renewcommand{\edtext}[2]{\leavevmode \begingroup - \renewcommand{\@tag}{\no@expands #1}% + \no@expands + \xdef\@tag{#1}% \set@line \ifledRcol \global\insert@countR \z@ \else \global\insert@count \z@ \fi @@ -1275,172 +1277,142 @@ \global\let\@insertR=\undefined \repeat} -\renewcommand*{\Afootnote}[2][]{% -\newcommand{\content}{#2}% +\renewcommand*{\Afootnote}[1]{% \ifnumberedpar@ - \ifledRcol% - \footnoteoptions@[R]{#1}{true}% + \ifledRcol \xright@appenditem{\noexpand\vAfootnote{A}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR - \footnoteoptions@[R]{#1}{false}% - \global\advance\insert@countR \@ne% - \else% - \footnoteoptions@{#1}{true}% + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR + \global\advance\insert@countR \@ne + \else \xright@appenditem{\noexpand\vAfootnote{A}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list - \global\advance\insert@count \@ne% - \footnoteoptions@{#1}{false}% + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list + \global\advance\insert@count \@ne \fi \else \vAfootnote{A}{{0|0|0|0|0|0|0}{}{#1}}% \fi\ignorespaces} -\renewcommand*{\Bfootnote}[2][]{% -\newcommand{\content}{#2}% +\renewcommand*{\Bfootnote}[1]{% \ifnumberedpar@ - \ifledRcol% - \footnoteoptions@[R]{#1}{true}% + \ifledRcol \xright@appenditem{\noexpand\vBfootnote{B}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR - \footnoteoptions@[R]{#1}{false}% - \global\advance\insert@countR \@ne% - \else% - \footnoteoptions@{#1}{true}% + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR + \global\advance\insert@countR \@ne + \else \xright@appenditem{\noexpand\vBfootnote{B}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list - \global\advance\insert@count \@ne% - \footnoteoptions@{#1}{false}% + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list + \global\advance\insert@count \@ne \fi \else \vBfootnote{B}{{0|0|0|0|0|0|0}{}{#1}}% \fi\ignorespaces} -\renewcommand*{\Cfootnote}[2][]{% -\newcommand{\content}{#2}% +\renewcommand*{\Cfootnote}[1]{% \ifnumberedpar@ - \ifledRcol% - \footnoteoptions@[R]{#1}{true}% + \ifledRcol \xright@appenditem{\noexpand\vCfootnote{C}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR - \footnoteoptions@[R]{#1}{false}% - \global\advance\insert@countR \@ne% - \else% - \footnoteoptions@{#1}{true}% + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR + \global\advance\insert@countR \@ne + \else \xright@appenditem{\noexpand\vCfootnote{C}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list - \global\advance\insert@count \@ne% - \footnoteoptions@{#1}{false}% + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list + \global\advance\insert@count \@ne \fi \else \vCfootnote{C}{{0|0|0|0|0|0|0}{}{#1}}% \fi\ignorespaces} -\renewcommand*{\Dfootnote}[2][]{% -\newcommand{\content}{#2}% +\renewcommand*{\Dfootnote}[1]{% \ifnumberedpar@ - \ifledRcol% - \footnoteoptions@[R]{#1}{true}% + \ifledRcol \xright@appenditem{\noexpand\vDfootnote{D}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR - \footnoteoptions@[R]{#1}{false}% - \global\advance\insert@countR \@ne% - \else% - \footnoteoptions@{#1}{true}% + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR + \global\advance\insert@countR \@ne + \else \xright@appenditem{\noexpand\vDfootnote{D}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list - \global\advance\insert@count \@ne% - \footnoteoptions@{#1}{false}% + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list + \global\advance\insert@count \@ne \fi \else \vDfootnote{D}{{0|0|0|0|0|0|0}{}{#1}}% \fi\ignorespaces} -\renewcommand*{\Efootnote}[2][]{% -\newcommand{\content}{#2}% +\renewcommand*{\Efootnote}[1]{% \ifnumberedpar@ - \ifledRcol% - \footnoteoptions@[R]{#1}{true}% + \ifledRcol \xright@appenditem{\noexpand\vEfootnote{E}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR - \footnoteoptions@[R]{#1}{false}% - \global\advance\insert@countR \@ne% - \else% - \footnoteoptions@{#1}{true}% + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR + \global\advance\insert@countR \@ne + \else \xright@appenditem{\noexpand\vEfootnote{E}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list - \global\advance\insert@count \@ne% - \footnoteoptions@{#1}{false}% + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list + \global\advance\insert@count \@ne \fi \else \vEfootnote{E}{{0|0|0|0|0|0|0}{}{#1}}% \fi\ignorespaces} -\renewcommand*{\mpAfootnote}[2][]{% -\newcommand{\content}{#2}% +\renewcommand*{\mpAfootnote}[1]{% \ifnumberedpar@ \ifledRcol \xright@appenditem{\noexpand\mpvAfootnote{A}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR \global\advance\insert@countR \@ne \else \xright@appenditem{\noexpand\mpvAfootnote{A}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list \global\advance\insert@count \@ne \fi \else \mpvAfootnote{A}{{0|0|0|0|0|0|0}{}{#1}}% \fi\ignorespaces} -\renewcommand*{\mpBfootnote}[2][]{% -\newcommand{\content}{#2}% +\renewcommand*{\mpBfootnote}[1]{% \ifnumberedpar@ \ifledRcol \xright@appenditem{\noexpand\mpvBfootnote{B}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR \global\advance\insert@countR \@ne \else \xright@appenditem{\noexpand\mpvBfootnote{B}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list \global\advance\insert@count \@ne \fi \else \mpvBfootnote{B}{{0|0|0|0|0|0|0}{}{#1}}% \fi\ignorespaces} -\renewcommand*{\mpCfootnote}[2][]{% -\newcommand{\content}{#2}% +\renewcommand*{\mpCfootnote}[1]{% \ifnumberedpar@ \ifledRcol \xright@appenditem{\noexpand\mpvCfootnote{C}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR \global\advance\insert@countR \@ne \else \xright@appenditem{\noexpand\mpvCfootnote{C}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list \global\advance\insert@count \@ne \fi \else \mpvCfootnote{C}{{0|0|0|0|0|0|0}{}{#1}}% \fi\ignorespaces} -\renewcommand*{\mpDfootnote}[2][]{% -\newcommand{\content}{#2}% +\renewcommand*{\mpDfootnote}[1]{% \ifnumberedpar@ \ifledRcol \xright@appenditem{\noexpand\mpvDfootnote{D}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR \global\advance\insert@countR \@ne \else \xright@appenditem{\noexpand\mpvDfootnote{D}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list \global\advance\insert@count \@ne \fi \else \mpvDfootnote{D}{{0|0|0|0|0|0|0}{}{#1}}% \fi\ignorespaces} -\renewcommand*{\mpEfootnote}[2][]{% -\newcommand{\content}{#2}% +\renewcommand*{\mpEfootnote}[1]{% \ifnumberedpar@ \ifledRcol \xright@appenditem{\noexpand\mpvEfootnote{E}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR \global\advance\insert@countR \@ne \else \xright@appenditem{\noexpand\mpvEfootnote{E}% - {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list \global\advance\insert@count \@ne \fi \else @@ -1538,50 +1510,38 @@ \renewcommand*{\l@dlsnote}[1]{% \ifnumberedpar@ - \ifledRcol% - \footnoteoptions@[R]{#1}{true}% + \ifledRcol \xright@appenditem{\noexpand\vl@dlsnote{#1}}% \to\inserts@listR - \footnoteoptions@[R]{#1}{false}% - \global\advance\insert@countR \@ne% - \else% - \footnoteoptions@{#1}{true}% + \global\advance\insert@countR \@ne + \else \xright@appenditem{\noexpand\vl@dlsnote{#1}}% \to\inserts@list - \global\advance\insert@count \@ne% - \footnoteoptions@{#1}{false}% + \global\advance\insert@count \@ne \fi \fi\ignorespaces} \renewcommand*{\l@drsnote}[1]{% \ifnumberedpar@ - \ifledRcol% - \footnoteoptions@[R]{#1}{true}% + \ifledRcol \xright@appenditem{\noexpand\vl@drsnote{#1}}% \to\inserts@listR - \footnoteoptions@[R]{#1}{false}% - \global\advance\insert@countR \@ne% - \else% - \footnoteoptions@{#1}{true}% + \global\advance\insert@countR \@ne + \else \xright@appenditem{\noexpand\vl@drsnote{#1}}% \to\inserts@list - \global\advance\insert@count \@ne% - \footnoteoptions@{#1}{false}% + \global\advance\insert@count \@ne \fi \fi\ignorespaces} \renewcommand*{\l@dcsnote}[1]{% \ifnumberedpar@ - \ifledRcol% - \footnoteoptions@[R]{#1}{true}% + \ifledRcol \xright@appenditem{\noexpand\vl@dcsnote{#1}}% \to\inserts@listR - \footnoteoptions@[R]{#1}{false}% - \global\advance\insert@countR \@ne% - \else% - \footnoteoptions@{#1}{true}% + \global\advance\insert@countR \@ne + \else \xright@appenditem{\noexpand\vl@dcsnote{#1}}% \to\inserts@list - \global\advance\insert@count \@ne% - \footnoteoptions@{#1}{false}% + \global\advance\insert@count \@ne \fi \fi\ignorespaces} @@ -1609,32 +1569,27 @@ \renewcommand{\l@dbfnote}[1]{% \ifnumberedpar@ - \ifledRcol% - \footnoteoptions@[R]{#1}{true}% + \ifledRcol \xright@appenditem{\noexpand\vl@dbfnote{{#1}}{\@thefnmark}}% \to\inserts@listR - \footnoteoptions@[R]{#1}{false}% - \global\advance\insert@countR \@ne% - \else% - \footnoteoptions@{#1}{true}% + \global\advance\insert@countR \@ne + \else \xright@appenditem{\noexpand\vl@dbfnote{{#1}}{\@thefnmark}}% \to\inserts@list - \global\advance\insert@count \@ne% - \footnoteoptions@{#1}{false}% + \global\advance\insert@count \@ne \fi \fi\ignorespaces} \renewcommand{\normalbfnoteX}[2]{% \ifnumberedpar@ - \ifledRcol% + \ifledRcol \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\@nameuse{thefootnote#1}}}% \to\inserts@listR - \footnoteoptions@[R]{#1}{false}% - \global\advance\insert@countR \@ne% - \else% + \global\advance\insert@countR \@ne + \else \xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\@nameuse{thefootnote#1}}}% \to\inserts@list - \global\advance\insert@count \@ne% + \global\advance\insert@count \@ne \fi \fi\ignorespaces} @@ -2196,7 +2151,7 @@ \ifbypstart@R \ifnum\value{pstartR}<\value{pstartRold} \else - \global\line@numR=0 + \global\line@numR=0 \fi \fi \addtocounter{pstartR}{1} |