summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/ledmac/ledpar.sty
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/tex/latex/ledmac/ledpar.sty
parent3d35ef1512ddbbb3536ee7da4a32d0b4e741f9b7 (diff)
ledmac (6sep12)
git-svn-id: svn://tug.org/texlive/trunk@27608 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/ledmac/ledpar.sty')
-rw-r--r--Master/texmf-dist/tex/latex/ledmac/ledpar.sty198
1 files changed, 123 insertions, 75 deletions
diff --git a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty
index 7c388ec8882..4ffb3a1e755 100644
--- a/Master/texmf-dist/tex/latex/ledmac/ledpar.sty
+++ b/Master/texmf-dist/tex/latex/ledmac/ledpar.sty
@@ -24,7 +24,7 @@
%%
\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]
\newif\ifshiftedverses
\shiftedversesfalse
@@ -664,8 +664,7 @@
\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
@@ -681,8 +680,7 @@
\flag@end}
\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
@@ -1277,142 +1275,172 @@
\global\let\@insertR=\undefined
\repeat}
-\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
\else
\vAfootnote{A}{{0|0|0|0|0|0|0}{}{#1}}%
\fi\ignorespaces}
-\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}
-\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}
-\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}
-\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}}%
\fi\ignorespaces}
-\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
\mpvAfootnote{A}{{0|0|0|0|0|0|0}{}{#1}}%
\fi\ignorespaces}
-\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
\mpvBfootnote{B}{{0|0|0|0|0|0|0}{}{#1}}%
\fi\ignorespaces}
-\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
\mpvCfootnote{C}{{0|0|0|0|0|0|0}{}{#1}}%
\fi\ignorespaces}
-\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
\mpvDfootnote{D}{{0|0|0|0|0|0|0}{}{#1}}%
\fi\ignorespaces}
-\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
@@ -1510,38 +1538,50 @@
\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}
@@ -1569,27 +1609,35 @@
\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}
\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}