summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/ledmac
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
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')
-rw-r--r--Master/texmf-dist/source/latex/ledmac/ledmac.dtx211
-rw-r--r--Master/texmf-dist/source/latex/ledmac/ledpar.dtx204
2 files changed, 236 insertions, 179 deletions
diff --git a/Master/texmf-dist/source/latex/ledmac/ledmac.dtx b/Master/texmf-dist/source/latex/ledmac/ledmac.dtx
index 85d674e538a..a4028ab11e2 100644
--- a/Master/texmf-dist/source/latex/ledmac/ledmac.dtx
+++ b/Master/texmf-dist/source/latex/ledmac/ledmac.dtx
@@ -50,7 +50,7 @@
%
% \fi
%
-% \CheckSum{10327}
+% \CheckSum{9858}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -143,6 +143,7 @@
% \def\fileversion{v0.17} \def\filedate{2012/08/03}
% \def\fileversion{v0.18} \def\filedate{2012/08/30}
% \def\fileversion{v0.18.1} \def\filedate{2012/09/02}
+% \def\fileversion{v0.18.2} \def\filedate{2012/09/05}
% \changes{v0.1}{2003/03/25}{First public release}
% \changes{v0.2}{2003/08/16}{Added tabmac code, and extended indexing}
% \changes{v0.2.1}{2003/09/13}{Bug fixes and match with mempatch v1.8}
@@ -1024,6 +1025,7 @@
% is supplied with the line number at which the lemma appears
% in the main text.
%
+% \changes{v0.18.2}{2012/09/05}{Debug nexted \cs{edtext} with v0.18.1 functions.}
% The \meta{lemma} may contain further \cs{edtext} commands.
% Nesting makes
% it possible to print an explanatory note on a long passage together with
@@ -1231,7 +1233,7 @@
% \subsection{Display options}
% \label{displayoptions}
% \changes{v0.18}{2012/08/30}{New generic commands to customize footnote display.}
-% \changes{v0.18.1}{2012/09/02}{\cs{nonumberthisnote} deleted.}
+% \changes{v0.18.1}{2012/09/02}{\cs{nosum} deleted.}
% Since version 0.18, some commands can be used to change display of footnote. All can have a optional argument, which is the letter of the series which option is applied.
%
% When a length is used, it can be stretchable : \verb|a minus b minus c|. The final length |m| is calculated by \LaTeX to have : $b-a \leq m \leq b+c$. If you use relative unity\footnote{Like \verb|em| which is the width of a M.}, it will be relative to fontsize of the footnote.
@@ -1883,7 +1885,7 @@
% \cs{ledleftnote}\marg{text} will put \meta{text} into the left margin level
% with where the command was issued. Similarly, \cs{ledrightnote}\marg{text}
% puts \meta{text} in the right margin.
-%
+% \changes{v0.18.2}{2012/09/05}{Possibility to have commands in sidenotes.}
% \DescribeMacro{\ledsidenote}
% \DescribeMacro{\sidenotemargin}
% \cs{ledsidenote}\marg{text} will put \meta{text} into the margin specified
@@ -2800,7 +2802,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledmac}[2012/09/02 v0.18.1 LaTeX port of EDMAC]
+\ProvidesPackage{ledmac}[2012/09/05 v0.18.2 LaTeX port of EDMAC]
% \end{macrocode}
%
@@ -5113,17 +5115,13 @@
% \changes{v0.2.1}{203/08/25}{Removed some \cs{let}s from \cs{no@expands}.
% These were in \edmac{} but I feel that they should not have been as they
% disabled page/line refs in footnotes}
+% \changes{v0.18.2}{2012/09/05}{Change to be compatible with 0.18.1 changes, and to have formating commands in nexted \cs{edtext}.}
% \begin{macrocode}
-\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%
+\newcommand*{\no@expands}{%
\let\select@@lemmafont=0%
- \def\protect{\noexpand\protect\noexpand}%
\let\startsub=\relax \let\endsub=\relax
\let\startlock=\relax \let\endlock=\relax
\let\edlabel=\@gobble
-% \let\edpageref=\@gobble
-% \let\lineref=\@gobble
-% \let\sublineref=\@gobble
\let\setline=\@gobble \let\advanceline=\@gobble
\let\critext=\dummy@text
\let\edtext=\dummy@edtext
@@ -5135,6 +5133,12 @@
% \end{macro}
% \end{macro}
%
+% \begin{macro}{\@tag}
+% Now, we define an empty \cs{@tag} command. It will be redefine by \cs{edtext} : its value is the first args. It will be used by the \cs{Xfootnote} commands.
+% \begin{macrocode}
+\newcommand{\@tag}{}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\critext}
% Now we begin \cs{critext} itself. The definition requires a \verb"/" after
% the arguments: this eliminates the possibility of problems about
@@ -5164,8 +5168,7 @@
% that can cause trouble for us.
% \begin{macrocode}
\begingroup
- \no@expands
- \global\newcommand{\@tag}{#1}%
+ \global\renewcommand{\@tag}{\no@expands #1}%%
% \end{macrocode}
% \end{macro}
%
@@ -5233,7 +5236,7 @@
% \begin{macrocode}
\newcommand{\edtext}[2]{\leavevmode
\begingroup
- \global\newcommand{\@tag}{#1}%
+ \global\renewcommand{\@tag}{\no@expands #1}%%
\set@line
\global\insert@count=0
\ignorespaces #2\relax
@@ -5306,7 +5309,7 @@
% The \cs{lemma}\marg{text} macro allows you to change the lemma
% that's passed on to the notes.
% \begin{macrocode}
-\newcommand*{\lemma}[1]{\global\renewcommand{\@tag}{#1}\ignorespaces}
+\newcommand*{\lemma}[1]{\global\renewcommand{\@tag}{\no@expands #1}}
% \end{macrocode}
% \end{macro}
%
@@ -6472,7 +6475,26 @@
%
%
% \subsection{Outer-level footnote commands}
-% \changes{v0.18.1}{2012/09/02}{Options nonum and nosep in \cs{Xfootnote}.}
+% \changes{v0.18.1}{2012/09/02}{Options nonum and nosep in \cs{Xfootnote}s.}
+% \changes{v0.18.2}{2012/09/05}{Code refactoring in options of \cs{Xfootnote}s.}
+% \begin{macro}{\footnoteoptions@}
+% The \cs{footnoteoption@}\oarg{side}\marg{options}\marg{value} change the value of on options of Xfootnote, to switch between true and false.
+% \begin{macrocode}
+\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
+}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\Afootnote}
% The outer-level footnote commands will look familiar: they're
% just called \cs{Afootnote}, \cs{Bfootnote}, etc., instead of
@@ -6484,11 +6506,9 @@
% the \cs{inserts@list} list, and increment the deferred-page-bottom-note
% counter.
% \begin{macrocode}
-\newcommand*{\Afootnote}[2][\relax]{%
+\newcommand*{\Afootnote}[2][]{%
\newcommand{\content}{#2}%
- \forcsvlist{\listadd\options}{#1}% Made a list of options
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+ \footnoteoptions@{#1}{true}%
\ifnumberedpar@
\xright@appenditem{\noexpand\vAfootnote{A}%
{{\l@d@nums}{\csexpandonce{@tag}}{{\csexpandonce{content}}}}}\to\inserts@list
@@ -6503,8 +6523,7 @@
\else
\vAfootnote{A}{{0|0|0|0|0|0|0}{}{{\csexpandonce{content}}}}%
\fi%
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+\footnoteoptions@{#1}{false}%
\ignorespaces}
% \end{macrocode}
% \end{macro}
@@ -6515,71 +6534,63 @@
% \begin{macro}{\Efootnote}
% We need similar commands for the other footnote series.
% \begin{macrocode}
-\newcommand*{\Bfootnote}[2][\relax]{%
+\newcommand*{\Bfootnote}[2][]{%
\newcommand{\content}{#2}%
- \forcsvlist{\listadd\options}{#1}% Made a list of options
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+ \footnoteoptions@{#1}{true}%
\ifnumberedpar@
\xright@appenditem{\noexpand\vBfootnote{B}%
{{\l@d@nums}{\csexpandonce{@tag}}{{\csexpandonce{content}}}}}\to\inserts@list
- \global\advance\insert@count \@ne
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\else
\vBfootnote{B}{{0|0|0|0|0|0|0}{}{{\csexpandonce{content}}}}%
\fi%
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+\footnoteoptions@{#1}{false}%
\ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*{\Cfootnote}[2][\relax]{%
+\newcommand*{\Cfootnote}[2][]{%
\newcommand{\content}{#2}%
- \forcsvlist{\listadd\options}{#1}% Made a list of options
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+ \footnoteoptions@{#1}{true}%
\ifnumberedpar@
\xright@appenditem{\noexpand\vCfootnote{C}%
{{\l@d@nums}{\csexpandonce{@tag}}{{\csexpandonce{content}}}}}\to\inserts@list
- \global\advance\insert@count \@ne
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\else
\vCfootnote{C}{{0|0|0|0|0|0|0}{}{{\csexpandonce{content}}}}%
\fi%
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+\footnoteoptions@{#1}{false}%
\ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*{\Dfootnote}[2][\relax]{%
+\newcommand*{\Dfootnote}[2][]{%
\newcommand{\content}{#2}%
- \forcsvlist{\listadd\options}{#1}% Made a list of options
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+ \footnoteoptions@{#1}{true}%
\ifnumberedpar@
\xright@appenditem{\noexpand\vDfootnote{D}%
{{\l@d@nums}{\csexpandonce{@tag}}{{\csexpandonce{content}}}}}\to\inserts@list
- \global\advance\insert@count \@ne
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\else
\vDfootnote{D}{{0|0|0|0|0|0|0}{}{{\csexpandonce{content}}}}%
\fi%
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+\footnoteoptions@{#1}{false}%
\ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*{\Efootnote}[2][\relax]{%
+\newcommand*{\Efootnote}[2][]{%
\newcommand{\content}{#2}%
- \forcsvlist{\listadd\options}{#1}% Made a list of options
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+ \footnoteoptions@{#1}{true}%
\ifnumberedpar@
\xright@appenditem{\noexpand\vEfootnote{E}%
{{\l@d@nums}{\csexpandonce{@tag}}{{\csexpandonce{content}}}}}\to\inserts@list
- \global\advance\insert@count \@ne
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\else
\vEfootnote{E}{{0|0|0|0|0|0|0}{}{{\csexpandonce{content}}}}%
\fi%
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+\footnoteoptions@{#1}{false}%
\ignorespaces}
% \end{macrocode}
@@ -6618,88 +6629,78 @@
% For footnotes in minipages and the like, we need a similar series of commands.
% \changes{v0.4}{2004/02/29}{Added \cs{mpAfootnote} and friends}
% \begin{macrocode}
-\newcommand*{\mpAfootnote}[2][\relax]{%
+\newcommand*{\mpAfootnote}[2][]{%
\newcommand{\content}{#2}%
- \forcsvlist{\listadd\options}{#1}% Made a list of options
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+ \footnoteoptions@{#1}{true}%
\ifnumberedpar@
\xright@appenditem{\noexpand\mpvAfootnote{A}%
{{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
- \global\advance\insert@count \@ne
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\else
\mpvAfootnote{A}{{0|0|0|0|0|0|0}{}{#1}}%
\fi%
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+\footnoteoptions@{#1}{false}%
\ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*{\mpBfootnote}[2][\relax]{%
+\newcommand*{\mpBfootnote}[2][]{%
\newcommand{\content}{#2}%
- \forcsvlist{\listadd\options}{#1}% Made a list of options
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+ \footnoteoptions@{#1}{true}%
\ifnumberedpar@
\xright@appenditem{\noexpand\mpvBfootnote{B}%
{{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
- \global\advance\insert@count \@ne
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\else
\mpvBfootnote{B}{{0|0|0|0|0|0|0}{}{#1}}%
\fi%
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+\footnoteoptions@{#1}{false}%
\ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*{\mpCfootnote}[2][\relax]{%
+\newcommand*{\mpCfootnote}[2][]{%
\newcommand{\content}{#2}%
- \forcsvlist{\listadd\options}{#1}% Made a list of options
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+ \footnoteoptions@{#1}{true}%
\ifnumberedpar@
\xright@appenditem{\noexpand\mpvCfootnote{C}%
{{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
- \global\advance\insert@count \@ne
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\else
\mpvCfootnote{C}{{0|0|0|0|0|0|0}{}{#1}}%
\fi%
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+\footnoteoptions@{#1}{false}%
\ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*{\mpDfootnote}[2][\relax]{%
+\newcommand*{\mpDfootnote}[2][]{%
\newcommand{\content}{#2}%
- \forcsvlist{\listadd\options}{#1}% Made a list of options
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+ \footnoteoptions@{#1}{true}%
\ifnumberedpar@
\xright@appenditem{\noexpand\mpvDfootnote{D}%
{{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
- \global\advance\insert@count \@ne
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\else
\mpvDfootnote{D}{{0|0|0|0|0|0|0}{}{#1}}%
\fi%
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+ \footnoteoptions@{#1}{false}%
\ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*{\mpEfootnote}[2][\relax]{%
+\newcommand*{\mpEfootnote}[2][]{%
\newcommand{\content}{#2}%
- \forcsvlist{\listadd\options}{#1}% Made a list of options
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\toggletrue{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+ \footnoteoptions@{#1}{true}%
\ifnumberedpar@
\xright@appenditem{\noexpand\mpvEfootnote{E}%
{{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
- \global\advance\insert@count \@ne
+ \global\advance\insert@count \@ne%
+ \footnoteoptions@{#1}{false}%
\else
\mpvEfootnote{E}{{0|0|0|0|0|0|0}{}{#1}}%
\fi%
- \ifinlist{nonum}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nonumberthisnote@}}\to\inserts@list}{}%
- \ifinlist{nosep}{\options}{\global\advance\insert@count \@ne\xright@appenditem{\global\noexpand\togglefalse{nolemmaseparatorthisnote@}}\to\inserts@list}{}%
+\footnoteoptions@{#1}{false}%
\ignorespaces}
% \end{macrocode}
% \end{macro}
@@ -6817,7 +6818,7 @@
\ledsetnormalparstuff%
\strut{\printlinefootnote{#1}{#4}}%
{\select@lemmafont#1|#2}%
- \iftoggle{nolemmaseparatorthisnote@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}%
+ \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}%
}}%
@@ -7506,7 +7507,7 @@
\ledsetnormalparstuff%
\printlinefootnote{#1}{#4}%
{\select@lemmafont#1|#2}%
- \iftoggle{nolemmaseparatorthisnote@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}%
+ \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}%
}}%
@@ -7749,7 +7750,7 @@
\leavevmode
\strut{\printlinefootnote{#1}{#4}}%
{\select@lemmafont#1|#2}%
- \iftoggle{nolemmaseparatorthisnote@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}%
+ \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}%
}}%
@@ -7851,7 +7852,7 @@
\leavevmode
\strut{\printlinefootnote{#1}{#4}}%
{\select@lemmafont#1|#2}%
- \iftoggle{nolemmaseparatorthisnote@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}%
+ \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}%
}}%
@@ -7980,16 +7981,16 @@
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\nonumberthisnote@}
-% \cs{nonumberthisnote@} toggle is used to disable line number printing in a particular footnote.
+% \begin{macro}{\nonum@}
+% \cs{nonum@} toggle is used to disable line number printing in a particular footnote.
% \begin{macrocode}
-\newtoggle{nonumberthisnote@}
+\newtoggle{nonum@}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\nolemmaseparatorthisnote@}
-% \cs{nonumberthisnote@} toggle is used to disable lemma separator in a particular footnote.
+% \begin{macro}{\nosep@}
+% \cs{nonum@} toggle is used to disable lemma separator in a particular footnote.
% \begin{macrocode}
-\newtoggle{nolemmaseparatorthisnote@}
+\newtoggle{nosep@}
% \end{macrocode}
% \end{macro}
% \begin{macro}{\beforenumberinfootnote}
@@ -8325,7 +8326,7 @@
% The \cs{printlinefootnote} macro is called in each \cs{<type>footfmt} command. It prints or not the line number, depending previous options. Its first argument is the information about lines, its secund is the series of footnote.
% \begin{macrocode}
\newcommand{\printlinefootnote}[2]{%
- \iftoggle{nonumberthisnote@}{%Try if the line number must printed for this specific not (by default, yes)
+ \iftoggle{nonum@}{%Try if the line number must printed for this specific not (by default, yes)
\hspace{\csuse{inplaceofnumber@#2}}%
}%
{%
@@ -9568,20 +9569,23 @@
\newif\ifrightnoteup
\rightnoteuptrue
\newcommand*{\l@dlsnote}[1]{%
+ \newcommand{\content}{#1}%
\ifnumberedpar@
- \xright@appenditem{\noexpand\vl@dlsnote{#1}}%
+ \xright@appenditem{\noexpand\vl@dlsnote{\csexpandonce{content}}}%
\to\inserts@list
\global\advance\insert@count \@ne
\fi\ignorespaces}
\newcommand*{\l@drsnote}[1]{%
+ \newcommand{\content}{#1}%
\ifnumberedpar@
- \xright@appenditem{\noexpand\vl@drsnote{#1}}%
+ \xright@appenditem{\noexpand\vl@drsnote{\csexpandonce{content}}}%
\to\inserts@list
\global\advance\insert@count \@ne
\fi\ignorespaces}
\newcommand*{\l@dcsnote}[1]{%
+ \newcommand{\content}{#1}%
\ifnumberedpar@
- \xright@appenditem{\noexpand\vl@dcsnote{#1}}%
+ \xright@appenditem{\noexpand\vl@dcsnote{\csexpandonce{content}}}%
\to\inserts@list
\global\advance\insert@count \@ne
\fi\ignorespaces}
@@ -12761,11 +12765,12 @@
% \begin{verbatim}
% \newcommandx*{\Afootmt}[4][4]{<code>}
% \end{verbatim}
-% \section{Examples}\label{examples}
-%
% \subsection{Version 0.18.1}
% As the \cs{Xfootnote} commands can have now an optional argument, you should modify your own \cs{Xfootnote} commands, using \cs{Afootnote} model. Note that in version 1.0, you wont't have to define \cs{Xfootnote} commands : it will be generic.
%
+% \section{Examples}\label{examples}
+%
+%
% \begin{PW}
% This section presents some sample documents.
%
@@ -13474,7 +13479,8 @@ in section~\ref{subsec}.
\newbox\lp@rbox
- \newcommand{\ffootnote}[1]{%
+ \newcommand{\ffootnote}[2][]{%
+ \newcommand{\content}{#2}%
\ifnumberedpar@
\xright@appenditem{\noexpand\vffootnote{f}{{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}%
\to\inserts@list
@@ -13483,7 +13489,8 @@ in section~\ref{subsec}.
% \vffootnote{f}{{0|0|0|0|0|0|0}{}{#1}}%
\fi\ignorespaces}
- \newcommand{\gfootnote}[1]{%
+ \newcommand{\gfootnote}[2][]{%
+ \newcommand{\content}{#2}%
\ifnumberedpar@
\xright@appenditem{\noexpand\vgfootnote{g}{#1}}%
\to\inserts@list
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}