summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/ledmac/ledpar.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-09-06 22:19:01 +0000
committerKarl Berry <karl@freefriends.org>2012-09-06 22:19:01 +0000
commitb6497536e6cd73690c11f64736a30f2a9fc3fc4c (patch)
tree5495f095787e51bee1b3d0e1709fd3489f37b3c6 /Master/texmf-dist/source/latex/ledmac/ledpar.dtx
parent3d35ef1512ddbbb3536ee7da4a32d0b4e741f9b7 (diff)
ledmac (6sep12)
git-svn-id: svn://tug.org/texlive/trunk@27608 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/ledmac/ledpar.dtx')
-rw-r--r--Master/texmf-dist/source/latex/ledmac/ledpar.dtx204
1 files changed, 127 insertions, 77 deletions
diff --git a/Master/texmf-dist/source/latex/ledmac/ledpar.dtx b/Master/texmf-dist/source/latex/ledmac/ledpar.dtx
index ae8039e7fd6..d99177cb6c1 100644
--- a/Master/texmf-dist/source/latex/ledmac/ledpar.dtx
+++ b/Master/texmf-dist/source/latex/ledmac/ledpar.dtx
@@ -50,7 +50,7 @@
%
% \fi
%
-% \CheckSum{4822}
+% \CheckSum{4902}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -134,6 +134,7 @@
% \def\fileversion{v0.11}\def\filedate{2012/06/11}
% \def\fileversion{v0.12}\def\filedate{2012/08/03}
% \def\fileversion{v0.13}\def\filedate{2012/08/30}
+% \def\fileversion{v0.13.1}\def\filedate{2012/09/05}
% \changes{v0.1}{2004/12/10}{First public release}
% \changes{v0.2}{2005/01/01}{Fix babel problems}
% \changes{v0.3}{2005/03/24}{Reorganize for ledarab}
@@ -707,7 +708,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledpar}[2012/08/30 v0.13 ledmac extension for parallel texts]
+\ProvidesPackage{ledpar}[2012/09/05 v0.13.1 ledmac extension for parallel texts]
% \end{macrocode}
% With the option `shiftedverses' a long verse one the left side (or in the right side) don't make a blank on the corresponding verse, but the blank is put on the bottom of the page. Consequently, the verses on the parallel pages are shifted, but the shifted stop at every end of pages.
@@ -966,7 +967,7 @@
%
% \subsection{Choosing the system of lineation}
%% \changes{v0.11}{2012/06/11}{Lineation can be by pstart (like in ledmac 0.15).}
-%M \changes{v0.14}{2012/08/30}{Debug in lineation by pstart}
+%M \changes{v0.13.1}{2012/08/30}{Debug in lineation by pstart}
% Sometimes you want line numbers that start at $1$ at the top of each
% page; sometimes you want line numbers that start at $1$ at each \cs{pstart}; other times you want line numbers that start at $1$ at the start
% of each section and increase regardless of page breaks.
@@ -2033,8 +2034,7 @@
% \begin{macrocode}
\long\def\critext#1#2/{\leavevmode
\begingroup
- \no@expands
- \xdef\@tag{#1}%
+ \renewcommand{\@tag}{\no@expands #1}%
\set@line
\ifledRcol \global\insert@countR \z@
\else \global\insert@count \z@ \fi
@@ -2056,8 +2056,7 @@
% \begin{macrocode}
\renewcommand{\edtext}[2]{\leavevmode
\begingroup
- \no@expands
- \xdef\@tag{#1}%
+ \renewcommand{\@tag}{\no@expands #1}%
\set@line
\ifledRcol \global\insert@countR \z@
\else \global\insert@count \z@ \fi
@@ -3070,6 +3069,7 @@
% \label{footnotes}\relax
%
% \subsection{Outer-level footnote commands}
+% \changes{v0.13.1}{2012/09/05}{Compatibility with optional argument in \cs{Xfootnote}s introduced by ledmac 0.18.1}
% \begin{macro}{\Afootnote}
% The outer-level footnote commands will look familiar: they're
% just called \cs{Afootnote}, \cs{Bfootnote}, etc., instead of
@@ -3081,16 +3081,21 @@
% the \cs{inserts@list} list, and increment the deferred-page-bottom-note
% counter.
% \begin{macrocode}
-\renewcommand*{\Afootnote}[1]{%
+\renewcommand*{\Afootnote}[2][]{%
+\newcommand{\content}{#2}%
\ifnumberedpar@
- \ifledRcol
+ \ifledRcol%
+ \footnoteoptions@[R]{#1}{true}%
\xright@appenditem{\noexpand\vAfootnote{A}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR
- \global\advance\insert@countR \@ne
- \else
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR
+ \footnoteoptions@[R]{#1}{false}%
+ \global\advance\insert@countR \@ne%
+ \else%
+ \footnoteoptions@{#1}{true}%
\xright@appenditem{\noexpand\vAfootnote{A}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
- \global\advance\insert@count \@ne
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\fi
% \end{macrocode}
%
@@ -3111,64 +3116,84 @@
% \begin{macro}{\Efootnote}
% We need similar commands for the other footnote series.
% \begin{macrocode}
-\renewcommand*{\Bfootnote}[1]{%
+\renewcommand*{\Bfootnote}[2][]{%
+\newcommand{\content}{#2}%
\ifnumberedpar@
- \ifledRcol
+ \ifledRcol%
+ \footnoteoptions@[R]{#1}{true}%
\xright@appenditem{\noexpand\vBfootnote{B}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR
- \global\advance\insert@countR \@ne
- \else
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR
+ \footnoteoptions@[R]{#1}{false}%
+ \global\advance\insert@countR \@ne%
+ \else%
+ \footnoteoptions@{#1}{true}%
\xright@appenditem{\noexpand\vBfootnote{B}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
- \global\advance\insert@count \@ne
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\fi
\else
\vBfootnote{B}{{0|0|0|0|0|0|0}{}{#1}}%
\fi\ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\renewcommand*{\Cfootnote}[1]{%
+\renewcommand*{\Cfootnote}[2][]{%
+\newcommand{\content}{#2}%
\ifnumberedpar@
- \ifledRcol
+ \ifledRcol%
+ \footnoteoptions@[R]{#1}{true}%
\xright@appenditem{\noexpand\vCfootnote{C}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR
- \global\advance\insert@countR \@ne
- \else
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR
+ \footnoteoptions@[R]{#1}{false}%
+ \global\advance\insert@countR \@ne%
+ \else%
+ \footnoteoptions@{#1}{true}%
\xright@appenditem{\noexpand\vCfootnote{C}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
- \global\advance\insert@count \@ne
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\fi
\else
\vCfootnote{C}{{0|0|0|0|0|0|0}{}{#1}}%
\fi\ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\renewcommand*{\Dfootnote}[1]{%
+\renewcommand*{\Dfootnote}[2][]{%
+\newcommand{\content}{#2}%
\ifnumberedpar@
- \ifledRcol
+ \ifledRcol%
+ \footnoteoptions@[R]{#1}{true}%
\xright@appenditem{\noexpand\vDfootnote{D}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR
- \global\advance\insert@countR \@ne
- \else
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR
+ \footnoteoptions@[R]{#1}{false}%
+ \global\advance\insert@countR \@ne%
+ \else%
+ \footnoteoptions@{#1}{true}%
\xright@appenditem{\noexpand\vDfootnote{D}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
- \global\advance\insert@count \@ne
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\fi
\else
\vDfootnote{D}{{0|0|0|0|0|0|0}{}{#1}}%
\fi\ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\renewcommand*{\Efootnote}[1]{%
+\renewcommand*{\Efootnote}[2][]{%
+\newcommand{\content}{#2}%
\ifnumberedpar@
- \ifledRcol
+ \ifledRcol%
+ \footnoteoptions@[R]{#1}{true}%
\xright@appenditem{\noexpand\vEfootnote{E}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR
- \global\advance\insert@countR \@ne
- \else
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR
+ \footnoteoptions@[R]{#1}{false}%
+ \global\advance\insert@countR \@ne%
+ \else%
+ \footnoteoptions@{#1}{true}%
\xright@appenditem{\noexpand\vEfootnote{E}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
- \global\advance\insert@count \@ne
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\fi
\else
\vEfootnote{E}{{0|0|0|0|0|0|0}{}{#1}}%
@@ -3187,15 +3212,16 @@
% \begin{macro}{\mpEfootnote}
% For footnotes in minipages and the like, we need a similar series of commands.
% \begin{macrocode}
-\renewcommand*{\mpAfootnote}[1]{%
+\renewcommand*{\mpAfootnote}[2][]{%
+\newcommand{\content}{#2}%
\ifnumberedpar@
\ifledRcol
\xright@appenditem{\noexpand\mpvAfootnote{A}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR
\global\advance\insert@countR \@ne
\else
\xright@appenditem{\noexpand\mpvAfootnote{A}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
\global\advance\insert@count \@ne
\fi
\else
@@ -3203,15 +3229,16 @@
\fi\ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\renewcommand*{\mpBfootnote}[1]{%
+\renewcommand*{\mpBfootnote}[2][]{%
+\newcommand{\content}{#2}%
\ifnumberedpar@
\ifledRcol
\xright@appenditem{\noexpand\mpvBfootnote{B}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR
\global\advance\insert@countR \@ne
\else
\xright@appenditem{\noexpand\mpvBfootnote{B}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
\global\advance\insert@count \@ne
\fi
\else
@@ -3219,15 +3246,16 @@
\fi\ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\renewcommand*{\mpCfootnote}[1]{%
+\renewcommand*{\mpCfootnote}[2][]{%
+\newcommand{\content}{#2}%
\ifnumberedpar@
\ifledRcol
\xright@appenditem{\noexpand\mpvCfootnote{C}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR
\global\advance\insert@countR \@ne
\else
\xright@appenditem{\noexpand\mpvCfootnote{C}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
\global\advance\insert@count \@ne
\fi
\else
@@ -3235,15 +3263,16 @@
\fi\ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\renewcommand*{\mpDfootnote}[1]{%
+\renewcommand*{\mpDfootnote}[2][]{%
+\newcommand{\content}{#2}%
\ifnumberedpar@
\ifledRcol
\xright@appenditem{\noexpand\mpvDfootnote{D}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR
\global\advance\insert@countR \@ne
\else
\xright@appenditem{\noexpand\mpvDfootnote{D}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
\global\advance\insert@count \@ne
\fi
\else
@@ -3251,15 +3280,16 @@
\fi\ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\renewcommand*{\mpEfootnote}[1]{%
+\renewcommand*{\mpEfootnote}[2][]{%
+\newcommand{\content}{#2}%
\ifnumberedpar@
\ifledRcol
\xright@appenditem{\noexpand\mpvEfootnote{E}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@listR
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@listR
\global\advance\insert@countR \@ne
\else
\xright@appenditem{\noexpand\mpvEfootnote{E}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
+ {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
\global\advance\insert@count \@ne
\fi
\else
@@ -3462,38 +3492,50 @@
% \begin{macrocode}
\renewcommand*{\l@dlsnote}[1]{%
\ifnumberedpar@
- \ifledRcol
+ \ifledRcol%
+ \footnoteoptions@[R]{#1}{true}%
\xright@appenditem{\noexpand\vl@dlsnote{#1}}%
\to\inserts@listR
- \global\advance\insert@countR \@ne
- \else
+ \footnoteoptions@[R]{#1}{false}%
+ \global\advance\insert@countR \@ne%
+ \else%
+ \footnoteoptions@{#1}{true}%
\xright@appenditem{\noexpand\vl@dlsnote{#1}}%
\to\inserts@list
- \global\advance\insert@count \@ne
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\fi
\fi\ignorespaces}
\renewcommand*{\l@drsnote}[1]{%
\ifnumberedpar@
- \ifledRcol
+ \ifledRcol%
+ \footnoteoptions@[R]{#1}{true}%
\xright@appenditem{\noexpand\vl@drsnote{#1}}%
\to\inserts@listR
- \global\advance\insert@countR \@ne
- \else
+ \footnoteoptions@[R]{#1}{false}%
+ \global\advance\insert@countR \@ne%
+ \else%
+ \footnoteoptions@{#1}{true}%
\xright@appenditem{\noexpand\vl@drsnote{#1}}%
\to\inserts@list
- \global\advance\insert@count \@ne
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\fi
\fi\ignorespaces}
\renewcommand*{\l@dcsnote}[1]{%
\ifnumberedpar@
- \ifledRcol
+ \ifledRcol%
+ \footnoteoptions@[R]{#1}{true}%
\xright@appenditem{\noexpand\vl@dcsnote{#1}}%
\to\inserts@listR
- \global\advance\insert@countR \@ne
- \else
+ \footnoteoptions@[R]{#1}{false}%
+ \global\advance\insert@countR \@ne%
+ \else%
+ \footnoteoptions@{#1}{true}%
\xright@appenditem{\noexpand\vl@dcsnote{#1}}%
\to\inserts@list
- \global\advance\insert@count \@ne
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\fi
\fi\ignorespaces}
@@ -3540,14 +3582,18 @@
% \begin{macrocode}
\renewcommand{\l@dbfnote}[1]{%
\ifnumberedpar@
- \ifledRcol
+ \ifledRcol%
+ \footnoteoptions@[R]{#1}{true}%
\xright@appenditem{\noexpand\vl@dbfnote{{#1}}{\@thefnmark}}%
\to\inserts@listR
- \global\advance\insert@countR \@ne
- \else
+ \footnoteoptions@[R]{#1}{false}%
+ \global\advance\insert@countR \@ne%
+ \else%
+ \footnoteoptions@{#1}{true}%
\xright@appenditem{\noexpand\vl@dbfnote{{#1}}{\@thefnmark}}%
\to\inserts@list
- \global\advance\insert@count \@ne
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\fi
\fi\ignorespaces}
@@ -3560,14 +3606,18 @@
% \begin{macrocode}
\renewcommand{\normalbfnoteX}[2]{%
\ifnumberedpar@
- \ifledRcol
+ \ifledRcol%
+ \footnoteoptions@[R]{#1}{true}%
\xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\@nameuse{thefootnote#1}}}%
\to\inserts@listR
- \global\advance\insert@countR \@ne
- \else
+ \footnoteoptions@[R]{#1}{false}%
+ \global\advance\insert@countR \@ne%
+ \else%
+ \footnoteoptions@{#1}{true}%
\xright@appenditem{\noexpand\vbfnoteX{#1}{#2}{\@nameuse{thefootnote#1}}}%
\to\inserts@list
- \global\advance\insert@count \@ne
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\fi
\fi\ignorespaces}