From b8bba40d8f2548af807f7de6206adff564669857 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 18 Sep 2012 23:40:10 +0000 Subject: ledmac 0.17 reversion (18sep12) git-svn-id: svn://tug.org/texlive/trunk@27721 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/ledmac/afoot.sty | 2 +- Master/texmf-dist/tex/latex/ledmac/ledarab.sty | 2 +- Master/texmf-dist/tex/latex/ledmac/ledmac.sty | 710 ++++++------------------- Master/texmf-dist/tex/latex/ledmac/ledpar.sty | 205 +++---- 4 files changed, 239 insertions(+), 680 deletions(-) (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/ledmac/afoot.sty b/Master/texmf-dist/tex/latex/ledmac/afoot.sty index cede6703a88..8d70439bfb3 100644 --- a/Master/texmf-dist/tex/latex/ledmac/afoot.sty +++ b/Master/texmf-dist/tex/latex/ledmac/afoot.sty @@ -18,7 +18,7 @@ %% 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 "unmaintained". +%% This work has the LPPL maintenance status "unmaintened". %% %% This work consists of the files listed in the README file. %% diff --git a/Master/texmf-dist/tex/latex/ledmac/ledarab.sty b/Master/texmf-dist/tex/latex/ledmac/ledarab.sty index 7de30505d15..cdef0f3fb29 100644 --- a/Master/texmf-dist/tex/latex/ledmac/ledarab.sty +++ b/Master/texmf-dist/tex/latex/ledmac/ledarab.sty @@ -18,7 +18,7 @@ %% 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 "unmaintained". +%% This work has the LPPL maintenance status "unmaintened". %% %% This work consists of the files listed in the README file. %% diff --git a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty index dda57873f91..8e95c510adc 100644 --- a/Master/texmf-dist/tex/latex/ledmac/ledmac.sty +++ b/Master/texmf-dist/tex/latex/ledmac/ledmac.sty @@ -6,9 +6,9 @@ %% %% ledmac.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 -%% Copyright 2004, 2005 Peter R. Wilson -%% 2011- Maïeul Rouquette +%% Author: Peter Wilson (Herries Press) herries dot press at earthlink dot net +%% Copyright 2003 -- 2005 Peter R. Wilson +%% %% 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,24 +18,25 @@ %% 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{ledmac}[2012/09/08 v0.18.3 LaTeX port of EDMAC] +\ProvidesPackage{ledmac}[2012/08/14 v0.18 LaTeX port of EDMAC] \newif\ifledfinal +\newif\ifnoeledmac \DeclareOption{final}{\ledfinaltrue} \DeclareOption{draft}{\ledfinalfalse} +\DeclareOption{noeledmac}{\noeledmactrue} \ExecuteOptions{final} \ProcessOptions*\relax -\RequirePackage{xargs} -\RequirePackage{etoolbox} \ifledfinal \newcommand*{\showlemma}[1]{#1} \else - \newcommand*{\showlemma}[1]{\underline{#1}} + \newcommand*{\showlemma}[1]{\textit{#1}} \fi \let\linenumberlist=\empty @@ -46,6 +47,10 @@ \newcommand{\ledmac@warning}[1]{\PackageWarning{ledmac}{#1}} \newcommand{\ledmac@error}[2]{\PackageError{ledmac}{#1}{#2}} +\ifnoeledmac +\else +\ledmac@error{Ledmac is an depreciated package. We suggest you to use eledmac instead. If you want to continue to use ledmac, you can disable this message by adding option noeledmac when loading package.}{\@ehc} +\fi \newcommand*{\led@err@NumberingStarted}{% \ledmac@error{Numbering has already been started}{\@ehc}} \newcommand*{\led@err@NumberingNotStarted}{% @@ -211,12 +216,12 @@ \global\bypage@false \global\bypstart@true \else - \def\@tempb{section} - \ifx\@tempa\@tempb + \def\@tempb{section} + \ifx\@tempa\@tempb \global\bypage@false \global\bypstart@false - \else - \led@warn@BadLineation + \else + \led@warn@BadLineation \fi \fi \fi @@ -659,8 +664,10 @@ \list@create{\end@lemmas} \long\def\dummy@text#1#2/{#1} \newcommand{\dummy@edtext}[2]{#1} -\newcommand*{\no@expands}{% +\newcommand*{\no@expands}{\let\rm=0\let\it=0\let\sl=0\let\bf=0\let\tt=0% + \let\b=0\let\c=0\let\d=0\let\t=0% \let\select@@lemmafont=0% + \def\protect{\noexpand\protect\noexpand}% \let\startsub=\relax \let\endsub=\relax \let\startlock=\relax \let\endlock=\relax \let\edlabel=\@gobble @@ -671,10 +678,10 @@ \morenoexpands} \let\morenoexpands=\relax -\newcommand{\@tag}{} \long\def\critext#1#2/{\leavevmode \begingroup - \global\renewcommand{\@tag}{\no@expands #1}%% + \no@expands + \xdef\@tag{\protect#1}% \set@line \global\insert@count=0 \ignorespaces #2\relax @@ -689,7 +696,8 @@ \flag@end} \newcommand{\edtext}[2]{\leavevmode \begingroup - \global\renewcommand{\@tag}{\no@expands #1}%% + \no@expands + \xdef\@tag{\protect#1}% \set@line \global\insert@count=0 \ignorespaces #2\relax @@ -717,7 +725,7 @@ \newcommand*{\edfont@info}{\f@encoding/\f@family/\f@series/\f@shape} -\newcommand*{\lemma}[1]{\global\renewcommand{\@tag}{\no@expands #1}} +\newcommand*{\lemma}[1]{\xdef\@tag{\protect#1}\ignorespaces} \newcommand*{\linenum}[1]{% \xdef\@tempa{#1|||||||\noexpand\\\l@d@nums}% \global\let\l@d@nums=\empty @@ -773,21 +781,23 @@ \fi \l@dzeropenalties \endgraf\global\num@lines=\prevgraf\egroup - \global\par@line=0 - \csnumdef{pstartline}{0} - \loop\ifvbox\raw@text - \csnumdef{pstartline}{\pstartline+1}% - \do@line - \ifbypstart@% - \ifnumequal{\pstartline}{1}{\setline{1}}{}% - \fi + \newcount\pstartline% + \pstartline=0\relax% + \loop\ifvbox\raw@text% + \advance\pstartline 1% + \do@line% + \ifbypstart@% + \ifnum\pstartline=1% + \setline{1}% + \fi% + \fi% \repeat \flush@notes \endgroup \ignorespaces \ifnumberpstart - \pstartnumtrue - \fi +\pstartnumtrue +\fi \@oldnobreak \addtocounter{pstart}{1}} @@ -855,7 +865,7 @@ \newcommand*{\getline@num}{% \ifnumberline - \global\advance\absline@num \@ne + \global\advance\absline@num \@ne \fi \do@actions \do@ballast @@ -1160,83 +1170,46 @@ {\fontencoding{#1}\fontfamily{#2}\fontseries{#3}\fontshape{#4}% \selectfont} -\newcommandx*{\footnoteoptions@}[3][1=L,usedefault]{% - \renewcommand{\do}[1]{% - \ifstrequal{#1}{L}{% In Leftside - \xright@appenditem{\global\noexpand\settoggle{##1@}{#3}}\to\inserts@list% Switch toogle, in all case - \global\advance\insert@count \@ne% Increment the left insert counter. - }% - {% - \xright@appenditem{\global\noexpand\settoggle{##1@}{#3}}\to\inserts@listR% Switch toogle, in all case - \global\advance\insert@countR \@ne% Increment the right insert counter insert. - }% - }% - \notblank{#2}{\docsvlist{#2}}{}% Parsing all options -} -\newcommand*{\Afootnote}[2][]{% - \newcommand{\content}{#2}% - \footnoteoptions@{#1}{true}% +\newcommand*{\Afootnote}[1]{% \ifnumberedpar@ \xright@appenditem{\noexpand\vAfootnote{A}% - {{\l@d@nums}{\csexpandonce{@tag}}{{\csexpandonce{content}}}}}\to\inserts@list + {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list \global\advance\insert@count \@ne \else - \vAfootnote{A}{{0|0|0|0|0|0|0}{}{{\csexpandonce{content}}}}% - \fi% -\footnoteoptions@{#1}{false}% - \ignorespaces} -\newcommand*{\Bfootnote}[2][]{% - \newcommand{\content}{#2}% - \footnoteoptions@{#1}{true}% + \vAfootnote{A}{{0|0|0|0|0|0|0}{}{#1}}% + \fi\ignorespaces} +\newcommand*{\Bfootnote}[1]{% \ifnumberedpar@ \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 \else - \vBfootnote{B}{{0|0|0|0|0|0|0}{}{{\csexpandonce{content}}}}% - \fi% -\footnoteoptions@{#1}{false}% - \ignorespaces} -\newcommand*{\Cfootnote}[2][]{% - \newcommand{\content}{#2}% - \footnoteoptions@{#1}{true}% + \vBfootnote{B}{{0|0|0|0|0|0|0}{}{#1}}% + \fi\ignorespaces} +\newcommand*{\Cfootnote}[1]{% \ifnumberedpar@ \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 \else - \vCfootnote{C}{{0|0|0|0|0|0|0}{}{{\csexpandonce{content}}}}% - \fi% -\footnoteoptions@{#1}{false}% - \ignorespaces} -\newcommand*{\Dfootnote}[2][]{% - \newcommand{\content}{#2}% - \footnoteoptions@{#1}{true}% + \vCfootnote{C}{{0|0|0|0|0|0|0}{}{#1}}% + \fi\ignorespaces} +\newcommand*{\Dfootnote}[1]{% \ifnumberedpar@ \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 \else - \vDfootnote{D}{{0|0|0|0|0|0|0}{}{{\csexpandonce{content}}}}% - \fi% -\footnoteoptions@{#1}{false}% - \ignorespaces} -\newcommand*{\Efootnote}[2][]{% - \newcommand{\content}{#2}% - \footnoteoptions@{#1}{true}% + \vDfootnote{D}{{0|0|0|0|0|0|0}{}{#1}}% + \fi\ignorespaces} +\newcommand*{\Efootnote}[1]{% \ifnumberedpar@ \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 \else - \vEfootnote{E}{{0|0|0|0|0|0|0}{}{{\csexpandonce{content}}}}% - \fi% -\footnoteoptions@{#1}{false}% - \ignorespaces} + \vEfootnote{E}{{0|0|0|0|0|0|0}{}{#1}}% + \fi\ignorespaces} \newinsert\mpAfootins \newinsert\mpBfootins @@ -1244,77 +1217,52 @@ \newinsert\mpDfootins \newinsert\mpEfootins -\newcommand*{\mpAfootnote}[2][]{% - \newcommand{\content}{#2}% - \footnoteoptions@{#1}{true}% +\newcommand*{\mpAfootnote}[1]{% \ifnumberedpar@ \xright@appenditem{\noexpand\mpvAfootnote{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 \else \mpvAfootnote{A}{{0|0|0|0|0|0|0}{}{#1}}% - \fi% -\footnoteoptions@{#1}{false}% - \ignorespaces} -\newcommand*{\mpBfootnote}[2][]{% - \newcommand{\content}{#2}% - \footnoteoptions@{#1}{true}% + \fi\ignorespaces} +\newcommand*{\mpBfootnote}[1]{% \ifnumberedpar@ \xright@appenditem{\noexpand\mpvBfootnote{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 \else \mpvBfootnote{B}{{0|0|0|0|0|0|0}{}{#1}}% - \fi% -\footnoteoptions@{#1}{false}% - \ignorespaces} -\newcommand*{\mpCfootnote}[2][]{% - \newcommand{\content}{#2}% - \footnoteoptions@{#1}{true}% + \fi\ignorespaces} +\newcommand*{\mpCfootnote}[1]{% \ifnumberedpar@ \xright@appenditem{\noexpand\mpvCfootnote{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 \else \mpvCfootnote{C}{{0|0|0|0|0|0|0}{}{#1}}% - \fi% -\footnoteoptions@{#1}{false}% - \ignorespaces} -\newcommand*{\mpDfootnote}[2][]{% - \newcommand{\content}{#2}% - \footnoteoptions@{#1}{true}% + \fi\ignorespaces} +\newcommand*{\mpDfootnote}[1]{% \ifnumberedpar@ \xright@appenditem{\noexpand\mpvDfootnote{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 \else \mpvDfootnote{D}{{0|0|0|0|0|0|0}{}{#1}}% - \fi% - \footnoteoptions@{#1}{false}% - \ignorespaces} -\newcommand*{\mpEfootnote}[2][]{% - \newcommand{\content}{#2}% - \footnoteoptions@{#1}{true}% + \fi\ignorespaces} +\newcommand*{\mpEfootnote}[1]{% \ifnumberedpar@ \xright@appenditem{\noexpand\mpvEfootnote{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 \else \mpvEfootnote{E}{{0|0|0|0|0|0|0}{}{#1}}% - \fi% -\footnoteoptions@{#1}{false}% - \ignorespaces} + \fi\ignorespaces} \newcommand*{\normalvfootnote}[2]{% \insert\csname #1footins\endcsname\bgroup \notefontsetup \footsplitskips \spaceskip=\z@skip \xspaceskip=\z@skip - \csname #1footfmt\endcsname #2[#1]\egroup} + \csname #1footfmt\endcsname #2\egroup} \newcommand*{\footsplitskips}{% \interlinepenalty=\interfootnotelinepenalty \floatingpenalty=\@MM @@ -1328,20 +1276,16 @@ \hsize\columnwidth \@parboxrestore \color@begingroup - \csname #1footfmt\endcsname #2[#1]\color@endgroup}} + \csname #1footfmt\endcsname #2\color@endgroup}} \newcommand*{\ledsetnormalparstuff}{% \normal@pars \parindent \z@ \parfillskip \z@ \@plus 1fil} -\newcommandx*{\normalfootfmt}[4][4=Z]{% 4th arg is optional, for ascendant compatibility - \ledsetnormalparstuff% - \strut{\printlinefootnote{#1}{#4}}% - {\select@lemmafont#1|#2}% - \iftoggle{nosep@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}% - {\hskip\csuse{inplaceoflemmaseparator@#4}}% - {\nobreak\hskip\csuse{beforelemmaseparator@#4}\csuse{lemmaseparator@#4}\hskip\csuse{afterlemmaseparator@#4}% - }}% - #3\strut\par} +\newcommand*{\normalfootfmt}[3]{% + \ledsetnormalparstuff + {\notenumfont\printlines#1|}\strut\enspace + {\select@lemmafont#1|#2}\rbracket\enskip#3\strut\par} + \def\endashchar{\textnormal{--}} \newcommand*{\fullstop}{\textnormal{.}} \newcommand*{\rbracket}{\textnormal{\thinspace]}} @@ -1356,6 +1300,10 @@ \l@d@eslfalse \newif\ifl@d@dash \l@d@dashfalse +\newif\ifledplinenum + \ledplinenumtrue +\newcommand*{\symplinenum}{} + \newcommand*{\l@dparsefootspec}[3]{\l@dp@rsefootspec#1|} \def\l@dp@rsefootspec#1|#2|#3|#4|#5|#6|#7|{% \gdef\l@dparsedstartpage{#1}% @@ -1412,13 +1360,14 @@ \fi% \setprintlines{#1}{#2}{#3}{#4}{#5}{#6}% \ifl@d@pnum #1\fullstop\fi - \linenumrep{#2} + \ifledplinenum \linenumrep{#2}\else \symplinenum\fi \ifl@d@ssub \fullstop \sublinenumrep{#3}\fi \ifl@d@dash \endashchar\fi \ifl@d@pnum #4\fullstop\fi \ifl@d@elin \linenumrep{#5}\fi \ifl@d@esl \ifl@d@elin \fullstop\fi \sublinenumrep{#6}\fi \endgroup} + \newcommand*{\normalfootstart}[1]{% \vskip\skip\csname #1footins\endcsname \leftskip0pt \rightskip0pt @@ -1461,7 +1410,6 @@ \footnormal{E} \newcommand*{\footparagraph}[1]{% - \expandafter\newcount\csname prevpage#1@num\endcsname \expandafter\let\csname #1footstart\endcsname=\parafootstart \expandafter\let\csname v#1footnote\endcsname=\para@vfootnote \expandafter\let\csname #1footfmt\endcsname=\parafootfmt @@ -1472,6 +1420,7 @@ \expandafter\let\csname mp#1footgroup\endcsname=\mppara@footgroup \count\csname mp#1footins\endcsname=1000 } + \providecommand{\footfudgefiddle}{64} \newcommand*{\para@footsetup}[1]{{\notefontsetup \dimen0=\baselineskip @@ -1491,8 +1440,8 @@ \notefontsetup \footsplitskips \setbox0=\vbox{\hsize=\maxdimen - \noindent\csname #1footfmt\endcsname#2[#1]}% - \setbox0=\hbox{\unvxh0[#1]}% + \noindent\csname #1footfmt\endcsname#2}% + \setbox0=\hbox{\unvxh0}% \dp0=0pt \ht0=\csname #1footfudgefactor\endcsname\wd0 \box0 @@ -1505,32 +1454,33 @@ \notefontsetup \footsplitskips \setbox0=\vbox{\hsize=\maxdimen - \noindent\color@begingroup\csname #1footfmt\endcsname #2[#1]\color@endgroup}% - \setbox0=\hbox{\unvxh0[#1]}% + \noindent\color@begingroup\csname #1footfmt\endcsname #2\color@endgroup}% + \setbox0=\hbox{\unvxh0}% \dp0=\z@ \ht0=\csname #1footfudgefactor\endcsname\wd0 \box0 \penalty0 }} -\newcommandx*{\unvxh}[2][2=Z]{% 2th is optional for retro-compatibility +\newcommand*{\unvxh}[1]{% \setbox0=\vbox{\unvbox#1% \global\setbox1=\lastbox}% \unhbox1 \unskip % remove \rightskip, \unskip % remove \parfillskip, \unpenalty % remove \penalty of 10000, - \hskip\csuse{afternote@#2}} % but add the glue to go between the notes - -\newcommandx*{\parafootfmt}[4][4=Z]{% - \insertparafootsep{#4}% - \ledsetnormalparstuff% - \printlinefootnote{#1}{#4}% - {\select@lemmafont#1|#2}% - \iftoggle{nosep@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}% - {\hskip\csuse{inplaceoflemmaseparator@#4}}% - {\nobreak\hskip\csuse{beforelemmaseparator@#4}\csuse{lemmaseparator@#4}\hskip\csuse{afterlemmaseparator@#4}% - }}% + \hskip\ipn@skip} % but add the glue to go between the notes + +\newskip\ipn@skip +\newcommand*{\interparanoteglue}[1]{% + {\notefontsetup\global\ipn@skip=#1 \relax}} +\interparanoteglue{1em plus.4em minus.4em} + +\newcommand*{\parafootfmt}[3]{% + \insertparafootftmsep% + \ledsetnormalparstuff + {\notenumfont\printlines#1|}\enspace + {\select@lemmafont#1|#2}\rbracket\enskip #3\penalty-10 } \newcommand*{\para@footgroup}[1]{% \unvbox\csname #1footins\endcsname @@ -1560,17 +1510,13 @@ \newcommand*{\removehboxes}{\setbox0=\lastbox \ifhbox0{\removehboxes}\unhbox0 \fi} -\newcommand{\insertparafootsep}[1]{% - \ifnumequal{\csuse{prevpage#1@num}}{\page@num}% - {\ifcsdef{prevline#1}% Be sur \prevline#1 exists. - {\ifnumequal{\csuse{prevline#1}}{\line@num}% - {\ifcsempty{symplinenum}{\csuse{parafootsep@#1}}{}}% - {\csuse{parafootsep@#1}}% - }% - {\csuse{parafootsep@#1}}% - }% - {}% - \global\csname prevpage#1@num\endcsname=\page@num% +\newcommand{\parafootftmsep}{} +\newcount\prevpage@num +\newcommand{\insertparafootftmsep}{% + \ifnum\prevpage@num=\page@num% + \parafootftmsep% + \fi% + \global\prevpage@num=\page@num% } \newcount\@k \newdimen\@h \newcommand*{\rigidbalance}[3]{\setbox0=\box#1 \@k=#2 \@h=#3 @@ -1606,20 +1552,16 @@ \insert\csname #1footins\endcsname\bgroup \notefontsetup \footsplitskips - \csname #1footfmt\endcsname #2[#1]\egroup} -\newcommandx*{\threecolfootfmt}[4][4=Z]{% + \csname #1footfmt\endcsname #2\egroup} +\newcommand*{\threecolfootfmt}[3]{% \normal@pars \hsize .3\hsize \parindent=0pt \tolerance=5000 \raggedright \leavevmode - \strut{\printlinefootnote{#1}{#4}}% - {\select@lemmafont#1|#2}% - \iftoggle{nosep@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}% - {\hskip\csuse{inplaceoflemmaseparator@#4}}% - {\nobreak\hskip\csuse{beforelemmaseparator@#4}\csuse{lemmaseparator@#4}\hskip\csuse{afterlemmaseparator@#4}% - }}% + \strut{\notenumfont\printlines#1|}\enspace + {\select@lemmafont#1|#2}\rbracket\enskip #3\strut\par\allowbreak} \newcommand*{\threecolfootgroup}[1]{{\notefontsetup \splittopskip=\ht\strutbox @@ -1649,20 +1591,16 @@ \newcommand*{\twocolvfootnote}[2]{\insert\csname #1footins\endcsname\bgroup \notefontsetup \footsplitskips - \csname #1footfmt\endcsname #2[#1]\egroup} -\newcommandx*{\twocolfootfmt}[4][4=Z]{% 4th arg is optional, for ascendant compatibility + \csname #1footfmt\endcsname #2\egroup} +\newcommand*{\twocolfootfmt}[3]{% \normal@pars \hsize .45\hsize \parindent=0pt \tolerance=5000 \raggedright \leavevmode - \strut{\printlinefootnote{#1}{#4}}% - {\select@lemmafont#1|#2}% - \iftoggle{nosep@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}% - {\hskip\csuse{inplaceoflemmaseparator@#4}}% - {\nobreak\hskip\csuse{beforelemmaseparator@#4}\csuse{lemmaseparator@#4}\hskip\csuse{afterlemmaseparator@#4}% - }}% + \strut{\notenumfont\printlines#1|}\enspace + {\select@lemmafont#1|#2}\rbracket\enskip #3\strut\par\allowbreak} \newcommand*{\twocolfootgroup}[1]{{\notefontsetup \splittopskip=\ht\strutbox @@ -1680,335 +1618,6 @@ \expandafter \rigidbalance\csname mp#1footins\endcsname \tw@ \splittopskip}} -\newtoggle{numberonlyfirstinline@A} -\newtoggle{numberonlyfirstinline@B} -\newtoggle{numberonlyfirstinline@C} -\newtoggle{numberonlyfirstinline@D} -\newtoggle{numberonlyfirstinline@E} -\newtoggle{numberonlyfirstinline@Z} - -\newcommandx{\numberonlyfirstinline}[2][1,2={true}]{% - \ifstrempty{#1}{ - \settoggle{numberonlyfirstinline@A}{#2} - \settoggle{numberonlyfirstinline@B}{#2} - \settoggle{numberonlyfirstinline@C}{#2} - \settoggle{numberonlyfirstinline@D}{#2} - \settoggle{numberonlyfirstinline@E}{#2} - } - { - \settoggle{numberonlyfirstinline@#1}{#2} - } -} -\newif\ifledplinenum - \ledplinenumtrue -\newcommand*{\symplinenum}{} -\def\symlinenum@A{\symplinenum} -\def\symlinenum@B{\symplinenum} -\def\symlinenum@C{\symplinenum} -\def\symlinenum@D{\symplinenum} -\def\symlinenum@E{\symplinenum} -\def\symlinenum@Z{\symplinenum} -\newcommandx{\symlinenum}[2][1]{% - \ifstrequal{#1}{}% If arg 1 is empty - {% - \csdef{symlinenum@A}{#2}% - \csdef{symlinenum@B}{#2}% - \csdef{symlinenum@C}{#2}% - \csdef{symlinenum@D}{#2}% - \csdef{symlinenum@E}{#2}% - \csdef{symlinenum@Z}{#2}% - }% - {% - \csdef{symlinenum@#1}{#2}% - } -} -\newtoggle{nonumberinfootnote@A} -\newtoggle{nonumberinfootnote@B} -\newtoggle{nonumberinfootnote@C} -\newtoggle{nonumberinfootnote@D} -\newtoggle{nonumberinfootnote@E} -\newtoggle{nonumberinfootnote@Z} -\newcommandx{\nonumberinfootnote}[2][1,2={true}]{% - \ifstrempty{#1}{ - \settoggle{nonumberinfootnote@A}{#2} - \settoggle{nonumberinfootnote@B}{#2} - \settoggle{nonumberinfootnote@C}{#2} - \settoggle{nonumberinfootnote@D}{#2} - \settoggle{nonumberinfootnote@E}{#2} - } - { - \settoggle{nonumberinfootnote@#1}{#2} - } -} -\newtoggle{nonum@} -\newtoggle{nosep@} -\def\beforenumberinfootnote@A{0pt} -\def\beforenumberinfootnote@B{0pt} -\def\beforenumberinfootnote@C{0pt} -\def\beforenumberinfootnote@D{0pt} -\def\beforenumberinfootnote@E{0pt} -\def\beforenumberinfootnote@Z{0pt} -\newcommandx*{\beforenumberinfootnote}[2][1,usedefault]{% - \ifstrequal{#1}{}% If arg 1 is empty - {% - \csdef{beforenumberinfootnote@A}{#2}% - \csdef{beforenumberinfootnote@B}{#2}% - \csdef{beforenumberinfootnote@C}{#2}% - \csdef{beforenumberinfootnote@D}{#2}% - \csdef{beforenumberinfootnote@E}{#2}% - \csdef{beforenumberinfootnote@Z}{#2}% - }% - {% - \csdef{beforenumberinfootnote@#1}{#2}% - }% -} -\def\afternumberinfootnote@A{0.5em} -\def\afternumberinfootnote@B{0.5em} -\def\afternumberinfootnote@C{0.5em} -\def\afternumberinfootnote@D{0.5em} -\def\afternumberinfootnote@E{0.5em} -\def\afternumberinfootnote@Z{0.5em} -\newcommandx*{\afternumberinfootnote}[2][1,usedefault]{% - \ifstrequal{#1}{}% If arg 1 is empty - {% - \csdef{afternumberinfootnote@A}{#2}% - \csdef{afternumberinfootnote@B}{#2}% - \csdef{afternumberinfootnote@C}{#2}% - \csdef{afternumberinfootnote@D}{#2}% - \csdef{afternumberinfootnote@E}{#2}% - \csdef{afternumberinfootnote@Z}{#2}% - }% - {% - \csdef{afternumberinfootnote@#1}{#2}% - }% -} -\def\beforesymlinenum@A{\beforenumberinfootnote@A} -\def\beforesymlinenum@B{\beforenumberinfootnote@B} -\def\beforesymlinenum@C{\beforenumberinfootnote@C} -\def\beforesymlinenum@D{\beforenumberinfootnote@D} -\def\beforesymlinenum@E{\beforenumberinfootnote@E} -\def\beforesymlinenum@Z{\beforenumberinfootnote@Z} -\newcommandx*{\beforesymlinenum}[2][1,usedefault]{% - \ifstrequal{#1}{}% If arg 1 is empty - {% - \csdef{beforesymlinenum@A}{#2}% - \csdef{beforesymlinenum@B}{#2}% - \csdef{beforesymlinenum@C}{#2}% - \csdef{beforesymlinenum@D}{#2}% - \csdef{beforesymlinenum@E}{#2}% - \csdef{beforesymlinenum@Z}{#2}% - }% - {% - \csdef{beforesymlinenum@#1}{#2}% - }% -} -\def\aftersymlinenum@A{\afternumberinfootnote@A} -\def\aftersymlinenum@B{\afternumberinfootnote@B} -\def\aftersymlinenum@C{\afternumberinfootnote@C} -\def\aftersymlinenum@D{\afternumberinfootnote@D} -\def\aftersymlinenum@E{\afternumberinfootnote@E} -\def\aftersymlinenum@Z{\afternumberinfootnote@Z} -\newcommandx*{\aftersymlinenum}[2][1,usedefault]{% - \ifstrequal{#1}{}% If arg 1 is empty - {% - \csdef{aftersymlinenum@A}{#2}% - \csdef{aftersymlinenum@B}{#2}% - \csdef{aftersymlinenum@C}{#2}% - \csdef{aftersymlinenum@D}{#2}% - \csdef{aftersymlinenum@E}{#2}% - \csdef{aftersymlinenum@Z}{#2}% - }% - {% - \csdef{aftersymlinenum@#1}{#2}% - }% -} -\def\inplaceofnumber@A{1em} -\def\inplaceofnumber@B{1em} -\def\inplaceofnumber@C{1em} -\def\inplaceofnumber@D{1em} -\def\inplaceofnumber@E{1em} -\def\inplaceofnumber@Z{1em} -\newcommandx*{\inplaceofnumber}[2][1,usedefault]{% - \ifstrequal{#1}{}% If arg 1 is empty - {% - \csdef{inplaceofnumber@A}{#2}% - \csdef{inplaceofnumber@B}{#2}% - \csdef{inplaceofnumber@C}{#2}% - \csdef{inplaceofnumber@D}{#2}% - \csdef{inplaceofnumber@E}{#2}% - \csdef{inplaceofnumber@Z}{#2}% - }% - {% - \csdef{inplaceofnumber@#1}{#2}% - }% -} -\let\lemmaseparator@A\rbracket -\let\lemmaseparator@B\rbracket -\let\lemmaseparator@C\rbracket -\let\lemmaseparator@D\rbracket -\let\lemmaseparator@E\rbracket -\let\lemmaseparator@E\rbracket -\let\lemmaseparator@Z\rbracket -\newcommandx*{\lemmaseparator}[2][1,usedefault]{% - \ifstrequal{#1}{}% If arg 1 is empty - {% - \csdef{lemmaseparator@A}{#2}% - \csdef{lemmaseparator@B}{#2}% - \csdef{lemmaseparator@C}{#2}% - \csdef{lemmaseparator@D}{#2}% - \csdef{lemmaseparator@E}{#2}% - \csdef{lemmaseparator@Z}{#2}% - }% - {% - \csdef{lemmaseparator@#1}{#2}% - }% -} -\def\beforelemmaseparator@A{0em} -\def\beforelemmaseparator@B{0em} -\def\beforelemmaseparator@C{0em} -\def\beforelemmaseparator@D{0em} -\def\beforelemmaseparator@E{0em} -\def\beforelemmaseparator@Z{0em} -\newcommandx*{\beforelemmaseparator}[2][1,usedefault]{% - \ifstrequal{#1}{}% If arg 1 is empty - {% - \csdef{beforelemmaseparator@A}{#2}% - \csdef{beforelemmaseparator@B}{#2}% - \csdef{beforelemmaseparator@C}{#2}% - \csdef{beforelemmaseparator@D}{#2}% - \csdef{beforelemmaseparator@E}{#2}% - \csdef{beforelemmaseparator@Z}{#2}% - }% - {% - \csdef{beforelemmaseparator@#1}{#2}% - }% -} -\def\afterlemmaseparator@A{0.5em} -\def\afterlemmaseparator@B{0.5em} -\def\afterlemmaseparator@C{0.5em} -\def\afterlemmaseparator@D{0.5em} -\def\afterlemmaseparator@E{0.5em} -\def\afterlemmaseparator@Z{0.5em} -\newcommandx*{\afterlemmaseparator}[2][1,usedefault]{% - \ifstrequal{#1}{}% If arg 1 is empty - {% - \csdef{afterlemmaseparator@A}{#2}% - \csdef{afterlemmaseparator@B}{#2}% - \csdef{afterlemmaseparator@C}{#2}% - \csdef{afterlemmaseparator@D}{#2}% - \csdef{afterlemmaseparator@E}{#2}% - \csdef{afterlemmaseparator@Z}{#2}% - }% - {% - \csdef{afterlemmaseparator@#1}{#2}% - }% -} -\newcommandx*{\nolemmaseparator}[1][1]{\lemmaseparator[#1]{}} -\def\inplaceoflemmaseparator@A{1em} -\def\inplaceoflemmaseparator@B{1em} -\def\inplaceoflemmaseparator@C{1em} -\def\inplaceoflemmaseparator@D{1em} -\def\inplaceoflemmaseparator@E{1em} -\def\inplaceoflemmaseparator@Z{1em} -\newcommandx*{\inplaceoflemmaseparator}[2][1,usedefault]{% - \ifstrequal{#1}{}% If arg 1 is empty - {% - \csdef{inplaceoflemmaseparator@A}{#2}% - \csdef{inplaceoflemmaseparator@B}{#2}% - \csdef{inplaceoflemmaseparator@C}{#2}% - \csdef{inplaceoflemmaseparator@D}{#2}% - \csdef{inplaceoflemmaseparator@E}{#2}% - \csdef{inplaceoflemmaseparator@Z}{#2}% - }% - {% - \csdef{inplaceoflemmaseparator@#1}{#2}% - }% -} -\def\afternote@A{1em plus.4em minus.4em} -\def\afternote@B{1em plus.4em minus.4em} -\def\afternote@C{1em plus.4em minus.4em} -\def\afternote@D{1em plus.4em minus.4em} -\def\afternote@E{1em plus.4em minus.4em} -\def\afternote@Z{1em plus.4em minus.4em} -\newcommandx*{\afternote}[2][1,usedefault]{% - \ifstrequal{#1}{}% If arg 1 is empty - {% - \csdef{afternote@A}{#2}% - \csdef{afternote@B}{#2}% - \csdef{afternote@C}{#2}% - \csdef{afternote@D}{#2}% - \csdef{afternote@E}{#2}% - \csdef{afternote@Z}{#2}% - }% - {% - \csdef{afternote@#1}{#2}% - }% -} -\newskip\ipn@skip -\newcommand*{\interparanoteglue}[1]{% - {\notefontsetup\global\ipn@skip=#1 \relax}} -\interparanoteglue{1em plus.4em minus.4em} -\newcommand{\parafootftmsep}{} -\def\parafootsep@A{\parafootftmsep} -\def\parafootsep@B{\parafootftmsep} -\def\parafootsep@C{\parafootftmsep} -\def\parafootsep@D{\parafootftmsep} -\def\parafootsep@E{\parafootftmsep} -\def\parafootsep@Z{\parafootftmsep} -\newcommandx*{\parafootsep}[2][1,usedefault]{% - \ifstrequal{#1}{}% If arg 1 is empty - {% - \csdef{parafootsep@A}{#2}% - \csdef{parafootsep@B}{#2}% - \csdef{parafootsep@C}{#2}% - \csdef{parafootsep@D}{#2}% - \csdef{parafootsep@E}{#2}% - \csdef{parafootsep@Z}{#2}% - }% - {% - \csdef{parafootsep@#1}{#2}% - }% -} -\newcommand{\printlinefootnote}[2]{% - \iftoggle{nonum@}{%Try if the line number must printed for this specific not (by default, yes) - \hspace{\csuse{inplaceofnumber@#2}}% - }% - {% - {% - \iftoggle{nonumberinfootnote@#2}%Try if the line number must printed (by default, yes) - {% - \hspace{\csuse{inplaceofnumber@#2}}% - }% - {% - {\iftoggle{numberonlyfirstinline@#2}% If for this series the line number must be printed only in the first time. - {% - \ifcsdef{prevline#2}% - {%Be sure the \prevline exists. - \ifnumequal{\csuse{prevline#2}}{\line@num}%Try it - {% - \ifcsstring{symlinenum@#2}{}% Try if a symbol is define - {% - \hspace{\csuse{inplaceofnumber@#2}}% - }% - {\hspace{\csuse{beforesymlinenum@#2}}\notenumfont\csuse{symlinenum@#2}\hspace{\csuse{aftersymlinenum@#2}}}% - }% - {% - \hspace{\csuse{beforenumberinfootnote@#2}}\notenumfont\printlines#1|\hspace{\csuse{afternumberinfootnote@#2}}% - }% - }% - {% - \hspace{\csuse{beforenumberinfootnote@#2}}\notenumfont\printlines#1|\hspace{\csuse{afternumberinfootnote@#2}}% - }% - }% - {% - \hspace{\csuse{beforenumberinfootnote@#2}}\notenumfont\printlines#1|\hspace{\csuse{afternumberinfootnote@#2}}% - }% - \csnumgdef{prevline#2}{\line@num}% - }% - }% - }% - }% -} \countdef\pageno=0 \pageno=1 \newcommand*{\advancepageno}{\ifnum\pageno<\z@ \global\advance\pageno\m@ne \else\global\advance\pageno\@ne\fi} @@ -2188,7 +1797,7 @@ \else \gl@p\labelref@list\to\label@refs \ifvmode - \advancelabel@refs + \advancelabel@refs \fi \fi \protected@write\@auxout{}% @@ -2196,19 +1805,18 @@ \@esphack} \newcommand{\advancelabel@refs}{% - \newcount\line% - \ledmac@warning{\label@refs} - \line=\expandafter\labelrefsparseline\label@refs% - \advance\line by 1% - \ifsublines@% - \newcount\subline% - \subline=\labelrefsparsesubline\label@refs% - \advance\subline by 1% - \def\label@refs{\the\line|\the\subline}% - \else% - \def\label@refs{\the\line|0}% - \fi% - } + \newcounter{line}% + \setcounter{line}{\expandafter\labelrefsparseline\label@refs}% + \stepcounter{line}% + \ifsublines@% + \newcounter{subline}% + \setcounter{subline}{\expandafter\labelrefsparsesubline\label@refs}% + \stepcounter{subline}{1}% + \def\label@refs{\theline|\thesubline}% + \else% + \def\label@refs{\theline|0}% +\fi% +} \def\labelrefsparseline#1|#2{#1} \def\labelrefsparsesubline#1|#2{#2} \newcommand*{\l@dmake@labels}{} @@ -2282,23 +1890,23 @@ \newcommand*{\Aendnote}[1]{{\newlinechar='40 \immediate\write\l@d@end{\string\Aend% {\ifnumberedpar@\l@d@nums\fi}% - {\ifnumberedpar@\csexpandonce{@tag}\fi}{#1}}}\ignorespaces} + {\ifnumberedpar@\@tag\fi}{#1}}}\ignorespaces} \newcommand*{\Bendnote}[1]{{\newlinechar='40 \immediate\write\l@d@end{\string\Bend% {\ifnumberedpar@\l@d@nums\fi}% - {\ifnumberedpar@\csexpandonce{@tag}\fi}{#1}}}\ignorespaces} + {\ifnumberedpar@\@tag\fi}{#1}}}\ignorespaces} \newcommand*{\Cendnote}[1]{{\newlinechar='40 \immediate\write\l@d@end{\string\Cend% {\ifnumberedpar@\l@d@nums\fi}% - {\ifnumberedpar@\csexpandonce{@tag}\fi}{#1}}}\ignorespaces} + {\ifnumberedpar@\@tag\fi}{#1}}}\ignorespaces} \newcommand*{\Dendnote}[1]{{\newlinechar='40 \immediate\write\l@d@end{\string\Dend% {\ifnumberedpar@\l@d@nums\fi}% - {\ifnumberedpar@\csexpandonce{@tag}\fi}{#1}}}\ignorespaces} + {\ifnumberedpar@\@tag\fi}{#1}}}\ignorespaces} \newcommand*{\Eendnote}[1]{{\newlinechar='40 \immediate\write\l@d@end{\string\Eend% {\ifnumberedpar@\l@d@nums\fi}% - {\ifnumberedpar@\csexpandonce{@tag}\fi}{#1}}}\ignorespaces} + {\ifnumberedpar@\@tag\fi}{#1}}}\ignorespaces} \def\endprint#1#2#3{{\notefontsetup{\notenumfont\printendlines#1|}% \enspace{\select@lemmafont#1|#2}\enskip#3\par}} @@ -2411,23 +2019,20 @@ \newif\ifrightnoteup \rightnoteuptrue \newcommand*{\l@dlsnote}[1]{% - \newcommand{\content}{#1}% \ifnumberedpar@ - \xright@appenditem{\noexpand\vl@dlsnote{\csexpandonce{content}}}% + \xright@appenditem{\noexpand\vl@dlsnote{#1}}% \to\inserts@list \global\advance\insert@count \@ne \fi\ignorespaces} \newcommand*{\l@drsnote}[1]{% - \newcommand{\content}{#1}% \ifnumberedpar@ - \xright@appenditem{\noexpand\vl@drsnote{\csexpandonce{content}}}% + \xright@appenditem{\noexpand\vl@drsnote{#1}}% \to\inserts@list \global\advance\insert@count \@ne \fi\ignorespaces} \newcommand*{\l@dcsnote}[1]{% - \newcommand{\content}{#1}% \ifnumberedpar@ - \xright@appenditem{\noexpand\vl@dcsnote{\csexpandonce{content}}}% + \xright@appenditem{\noexpand\vl@dcsnote{#1}}% \to\inserts@list \global\advance\insert@count \@ne \fi\ignorespaces} @@ -2737,7 +2342,6 @@ \rigidbalance\csname mpfootins#1\endcsname \thr@@ \splittopskip}} \newcommand*{\footparagraphX}[1]{% - \expandafter\newcount\csname prevpage#1@num\endcsname \expandafter\let\csname footstart#1\endcsname=\parafootstartX \expandafter\let\csname regvfootnote#1\endcsname=\para@vfootnoteX \expandafter\let\csname footfmt#1\endcsname=\parafootfmtX @@ -2772,7 +2376,7 @@ \footsplitskips \setbox0=\vbox{\hsize=\maxdimen \noindent\@nameuse{footfmt#1}{#1}{#2}}% - \setbox0=\hbox{\unvxh0[#1]}% + \setbox0=\hbox{\unvxh0}% \dp0=\z@ \ht0=\csname footfudgefactor#1\endcsname\wd0 \box0 @@ -2785,14 +2389,14 @@ \footsplitskips \setbox0=\vbox{\hsize=\maxdimen \noindent\color@begingroup\@nameuse{footfmt#1}{#1}{#2}\color@endgroup}% - \setbox0=\hbox{\unvxh0[#1]}% + \setbox0=\hbox{\unvxh0}% \dp0=\z@ \ht0=\csname footfudgefactor#1\endcsname\wd0 \box0 \penalty0}} \newcommand*{\parafootfmtX}[2]{% - \insertparafootsep{#1}% + \insertparafootftmsep \ledsetnormalparstuff {\notenumfont\@nameuse{footfootmark#1}\strut%\enspace #2\penalty-10}} @@ -3089,9 +2693,9 @@ \newif\ifinserthangingsymbol \newcommand{\inserthangingsymbol}{% \ifinserthangingsymbol% - \ifinstanza% - \hfill\hangingsymbol% - \fi% +\ifinstanza% +\hfill\hangingsymbol% +\fi% \fi% } \newcommand*{\ampersand}{\char`\&} @@ -3143,11 +2747,11 @@ \hangafter\@ne} \def\sza@penalty{\count@\csname szp@\number\stanza@count @\endcsname \ifnum\count@>\@M\advance\count@-\@M\penalty-\else - \penalty\fi\count@} + \penalty\fi\count@} \let\startstanzahook\relax \let\endstanzaextra\relax \xdef\stanza{\noexpand\instanzatrue\expandafter - \begingroup\startstanzahook% + \begingroup\startstanzahook% \catcode`\&\active\global\stanza@count\@ne\stanza@modulo\@ne \noexpand\ifnum\expandafter\noexpand \csname sza@0@\endcsname=\z@\let\noexpand\stanza@hang\relax 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} -- cgit v1.2.3