summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/ledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-09-03 22:55:05 +0000
committerKarl Berry <karl@freefriends.org>2012-09-03 22:55:05 +0000
commit60075902f7b24b4f27df8fa26409d3f206c93957 (patch)
treebf9bc5a1d2c7b31d38fbf004823fe7eb24e5c74f /Master/texmf-dist/source/latex/ledmac
parent17f080ff7f73e7c412a23e8e7070ec0f164322fb (diff)
ledmac (3sep12)
git-svn-id: svn://tug.org/texlive/trunk@27582 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/ledmac')
-rw-r--r--Master/texmf-dist/source/latex/ledmac/ledmac.dtx251
1 files changed, 181 insertions, 70 deletions
diff --git a/Master/texmf-dist/source/latex/ledmac/ledmac.dtx b/Master/texmf-dist/source/latex/ledmac/ledmac.dtx
index ade975d6569..85d674e538a 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{9751}
+% \CheckSum{10327}
%
% \makeatletter
% \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters
@@ -142,6 +142,7 @@
% \def\fileversion{v0.16} \def\filedate{2012/06/21}
% \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}
% \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}
@@ -1075,7 +1076,14 @@
% layers of notes in the belief that this will be adequate for
% the most demanding editions. But it is not hard to add further
% layers of notes should they be required.
+% \changes{v0.18.1}{2012/09/02}{Options nonum and nosep in \cs{Xfootnote}.}
+% A optional argument can be add before the texte of footnote. His value is a comma separated list of options. The options are :
+% \begin{itemize}
+% \item \verb|nonum| to disable line numbering for this note.
+% \item \verb|nosep| to disable lemma separator for this note.
+% \end{itemize}
%
+% Exemple : \cs{Afootnote}\verb|[nonum]{texte}|.
% \DescribeMacro{\Aendnote}
% \DescribeMacro{\Bendnote}
% \DescribeMacro{\Cendnote}
@@ -1090,6 +1098,7 @@
% output at the appropriate point in your document.
%
% \DescribeMacro{\lemma}
+% \changes{v0.18.1}{2012/09/02}{\cs{lemma} can contain commands.}
% Sometimes you want to change the lemma that gets passed to the notes.
% You can do this by using \cs{lemma}\marg{alternative} within the
% second argument to \cs{edtext}, before the note commands.
@@ -1222,7 +1231,8 @@
% \subsection{Display options}
% \label{displayoptions}
% \changes{v0.18}{2012/08/30}{New generic commands to customize footnote display.}
-% Since version 0.18, some commands can be used to change display of footnote. All but one can have a optional argument, which is the letter of the series which option is applied.
+% \changes{v0.18.1}{2012/09/02}{\cs{nonumberthisnote} 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.
%
@@ -1235,9 +1245,6 @@
% \DescribeMacro{\nonumberinfootnote}
% If you don't want to have line number in footnote, you can use \cs{nonumberinfootnote}\oarg{series}. To cancel it, use \cs{nonumberinfootnote}\oarg{series}\oarg{false} (\verb|<series>| can be empty).
%
-% \DescribeMacro{\nonumberthisnote}
-% You can use \cs{nonumberthisnote} \emph{before} a note to disable line number printing for a precise note. Not that today \textbf{it can make trouble with ledpar if you have a critical footnote in the other side}. Fixing this bug mean change system of footnote in ledpar, which is a great work.
-%
% \DescribeMacro{\beforenumberinfootnote}
% You can add some space before line number in footnote with \cs{beforenumberinfootnote}\oarg{series}\marg{length}. If the line number is not printed, the space is not too. Default value is 0~pt.
%
@@ -1259,11 +1266,15 @@
% You can add some space between lemma and separator, by using \cs{beforelemmaseparator}\oarg{series}\marg{length}. If your lemma separator is empty, this space won't be printed. Default value is 0~em.
%
% \DescribeMacro{\afterlemmaseparator}
-% You can add some space between separator and note, by using \cs{afterlemmaseparator}\oarg{series}\marg{length}. If your lemma separator is empty, this space won't be printed. Default value is 0.5em.
+% You can add some space between separator and note, by using \cs{afterlemmaseparator}\oarg{series}\marg{length}. If your lemma separator is empty, this space won't be printed. Default value is 0.5~em.
%
% \DescribeMacro{\nolemmaseparator}
% You can suppress lemma separator, using \cs{nolemmaseparator}\oarg{series}, which is only a alias of \cs{lemmaseparator}\oarg{series}\verb|{}|.
%
+% \changes{v0.18.1}{2012/09/02}{\cs{inplaceoflemmaseparator} added.}
+% \DescribeMacro{\inplaceoflemmaseparator}
+% If no lemma separator is printed, you can add a space, with \cs{inplaceoflemmaseparator}\oarg{series}\marg{length}. Default value is 1~em.
+%
% \DescribeMacro{\afternote}
% You can add some space after note, by using \cs{afternote}\oarg{series}\marg{length}. The default value is \verb|1em plus.4em minus.4em|.
%
@@ -1299,7 +1310,7 @@
% \newcommand*{\Gfootnote}[1]{%
% \ifnumberedpar@
% \xright@appenditem{\noexpand\vGfootnote{G}%
-% {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
+% {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
% \global\advance\insert@count by \@ne
% \else
% \vGfootnote{G}{{0|0|0|0|0|0|0}{}{#1}}%
@@ -1309,7 +1320,7 @@
% \newcommand*{\mpGfootnote}[1]{%
% \ifnumberedpar@
% \xright@appenditem{\noexpand\mpvGfootnote{G}%
-% {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
+% {{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}\to\inserts@list
% \global\advance\insert@count by \@ne
% \else
% \mpvGfootnote{G}{{0|0|0|0|0|0|0}{}{#1}}%
@@ -2789,7 +2800,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ledmac}[2012/09/29 v0.18 LaTeX port of EDMAC]
+\ProvidesPackage{ledmac}[2012/09/02 v0.18.1 LaTeX port of EDMAC]
% \end{macrocode}
%
@@ -2846,7 +2857,7 @@
\ifledfinal
\newcommand*{\showlemma}[1]{#1}
\else
- \newcommand*{\showlemma}[1]{\textit{#1}}
+ \newcommand*{\showlemma}[1]{\underline{#1}}
\fi
% \end{macrocode}
@@ -5140,7 +5151,7 @@
\long\def\critext#1#2/{\leavevmode
% \end{macrocode}
%
-% \begin{macro}{\@tag}
+% \begin{macro}{\csexpandonce{@tag}}
% Our normal lemma is just argument \verb"#1"; but that argument could have
% further invocations of \cs{critext} within it. We get a copy of the
% lemma without any \cs{critext} macros within it by temporarily redefining
@@ -5154,7 +5165,7 @@
% \begin{macrocode}
\begingroup
\no@expands
- \xdef\@tag{\protect#1}%
+ \global\newcommand{\@tag}{#1}%
% \end{macrocode}
% \end{macro}
%
@@ -5222,8 +5233,7 @@
% \begin{macrocode}
\newcommand{\edtext}[2]{\leavevmode
\begingroup
- \no@expands
- \xdef\@tag{\protect#1}%
+ \global\newcommand{\@tag}{#1}%
\set@line
\global\insert@count=0
\ignorespaces #2\relax
@@ -5296,7 +5306,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]{\xdef\@tag{\protect#1}\ignorespaces}
+\newcommand*{\lemma}[1]{\global\renewcommand{\@tag}{#1}\ignorespaces}
% \end{macrocode}
% \end{macro}
%
@@ -6462,6 +6472,7 @@
%
%
% \subsection{Outer-level footnote commands}
+% \changes{v0.18.1}{2012/09/02}{Options nonum and nosep in \cs{Xfootnote}.}
% \begin{macro}{\Afootnote}
% The outer-level footnote commands will look familiar: they're
% just called \cs{Afootnote}, \cs{Bfootnote}, etc., instead of
@@ -6473,10 +6484,14 @@
% the \cs{inserts@list} list, and increment the deferred-page-bottom-note
% counter.
% \begin{macrocode}
-\newcommand*{\Afootnote}[1]{%
+\newcommand*{\Afootnote}[2][\relax]{%
+ \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}{}%
\ifnumberedpar@
\xright@appenditem{\noexpand\vAfootnote{A}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
+ {{\l@d@nums}{\csexpandonce{@tag}}{{\csexpandonce{content}}}}}\to\inserts@list
\global\advance\insert@count \@ne
% \end{macrocode}
%
@@ -6486,8 +6501,11 @@
% limitation of \Ledmac.
% \begin{macrocode}
\else
- \vAfootnote{A}{{0|0|0|0|0|0|0}{}{#1}}%
- \fi\ignorespaces}
+ \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}{}%
+ \ignorespaces}
% \end{macrocode}
% \end{macro}
%
@@ -6497,44 +6515,72 @@
% \begin{macro}{\Efootnote}
% We need similar commands for the other footnote series.
% \begin{macrocode}
-\newcommand*{\Bfootnote}[1]{%
+\newcommand*{\Bfootnote}[2][\relax]{%
+ \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}{}%
\ifnumberedpar@
\xright@appenditem{\noexpand\vBfootnote{B}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
+ {{\l@d@nums}{\csexpandonce{@tag}}{{\csexpandonce{content}}}}}\to\inserts@list
\global\advance\insert@count \@ne
\else
- \vBfootnote{B}{{0|0|0|0|0|0|0}{}{#1}}%
- \fi\ignorespaces}
+ \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}{}%
+ \ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*{\Cfootnote}[1]{%
+\newcommand*{\Cfootnote}[2][\relax]{%
+ \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}{}%
\ifnumberedpar@
\xright@appenditem{\noexpand\vCfootnote{C}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
+ {{\l@d@nums}{\csexpandonce{@tag}}{{\csexpandonce{content}}}}}\to\inserts@list
\global\advance\insert@count \@ne
\else
- \vCfootnote{C}{{0|0|0|0|0|0|0}{}{#1}}%
- \fi\ignorespaces}
+ \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}{}%
+ \ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*{\Dfootnote}[1]{%
+\newcommand*{\Dfootnote}[2][\relax]{%
+ \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}{}%
\ifnumberedpar@
\xright@appenditem{\noexpand\vDfootnote{D}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
+ {{\l@d@nums}{\csexpandonce{@tag}}{{\csexpandonce{content}}}}}\to\inserts@list
\global\advance\insert@count \@ne
\else
- \vDfootnote{D}{{0|0|0|0|0|0|0}{}{#1}}%
- \fi\ignorespaces}
+ \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}{}%
+ \ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*{\Efootnote}[1]{%
+\newcommand*{\Efootnote}[2][\relax]{%
+ \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}{}%
\ifnumberedpar@
\xright@appenditem{\noexpand\vEfootnote{E}%
- {{\l@d@nums}{\@tag}{#1}}}\to\inserts@list
+ {{\l@d@nums}{\csexpandonce{@tag}}{{\csexpandonce{content}}}}}\to\inserts@list
\global\advance\insert@count \@ne
\else
- \vEfootnote{E}{{0|0|0|0|0|0|0}{}{#1}}%
- \fi\ignorespaces}
+ \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}{}%
+ \ignorespaces}
% \end{macrocode}
% \end{macro}
@@ -6572,54 +6618,89 @@
% 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}[1]{%
+\newcommand*{\mpAfootnote}[2][\relax]{%
+ \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}{}%
\ifnumberedpar@
\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
\else
\mpvAfootnote{A}{{0|0|0|0|0|0|0}{}{#1}}%
- \fi\ignorespaces}
+ \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}{}%
+ \ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*{\mpBfootnote}[1]{%
+\newcommand*{\mpBfootnote}[2][\relax]{%
+ \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}{}%
\ifnumberedpar@
\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
\else
\mpvBfootnote{B}{{0|0|0|0|0|0|0}{}{#1}}%
- \fi\ignorespaces}
+ \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}{}%
+ \ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*{\mpCfootnote}[1]{%
+\newcommand*{\mpCfootnote}[2][\relax]{%
+ \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}{}%
\ifnumberedpar@
\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
\else
\mpvCfootnote{C}{{0|0|0|0|0|0|0}{}{#1}}%
- \fi\ignorespaces}
+ \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}{}%
+ \ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*{\mpDfootnote}[1]{%
+\newcommand*{\mpDfootnote}[2][\relax]{%
+ \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}{}%
\ifnumberedpar@
\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
\else
\mpvDfootnote{D}{{0|0|0|0|0|0|0}{}{#1}}%
- \fi\ignorespaces}
+ \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}{}%
+ \ignorespaces}
% \end{macrocode}
% \begin{macrocode}
-\newcommand*{\mpEfootnote}[1]{%
+\newcommand*{\mpEfootnote}[2][\relax]{%
+ \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}{}%
\ifnumberedpar@
\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
\else
\mpvEfootnote{E}{{0|0|0|0|0|0|0}{}{#1}}%
- \fi\ignorespaces}
+ \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}{}%
+ \ignorespaces}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -6736,10 +6817,10 @@
\ledsetnormalparstuff%
\strut{\printlinefootnote{#1}{#4}}%
{\select@lemmafont#1|#2}%
- \ifcsempty{lemmaseparator@#4}%
- {}%
+ \iftoggle{nolemmaseparatorthisnote@}{\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}
% \end{macrocode}
% \end{macro}
@@ -7425,10 +7506,10 @@
\ledsetnormalparstuff%
\printlinefootnote{#1}{#4}%
{\select@lemmafont#1|#2}%
- \ifcsempty{lemmaseparator@#4}%
- {}%
+ \iftoggle{nolemmaseparatorthisnote@}{\hskip\csuse{inplaceoflemmaseparator@#4}}{\ifcsempty{lemmaseparator@#4}%
+ {\hskip\csuse{inplaceoflemmaseparator@#4}}%
{\nobreak\hskip\csuse{beforelemmaseparator@#4}\csuse{lemmaseparator@#4}\hskip\csuse{afterlemmaseparator@#4}%
- }%
+ }}%
#3\penalty-10 }
% \end{macrocode}
% Note that in the above definition, the penalty of $-10$
@@ -7668,10 +7749,10 @@
\leavevmode
\strut{\printlinefootnote{#1}{#4}}%
{\select@lemmafont#1|#2}%
- \ifcsempty{lemmaseparator@#4}%
- {}%
+ \iftoggle{nolemmaseparatorthisnote@}{\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\allowbreak}
% \end{macrocode}
% \end{macro}
@@ -7770,10 +7851,10 @@
\leavevmode
\strut{\printlinefootnote{#1}{#4}}%
{\select@lemmafont#1|#2}%
- \ifcsempty{lemmaseparator@#4}%
- {}%
+ \iftoggle{nolemmaseparatorthisnote@}{\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\allowbreak}
% \end{macrocode}
% \begin{macrocode}
@@ -7899,14 +7980,19 @@
}
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\beforenumberinfootnote}
-% \begin{macro}{\nonumberthisnote}
-% \cs{nonumberthisnote} is used to disable line number printing in a particular footnote. It sets to true the \cs{nonumberthisnote@} toggle.
+% \begin{macro}{\nonumberthisnote@}
+% \cs{nonumberthisnote@} toggle is used to disable line number printing in a particular footnote.
% \begin{macrocode}
\newtoggle{nonumberthisnote@}
-\newcommand{\nonumberthisnote}{\global\toggletrue{nonumberthisnote@}}
% \end{macrocode}
-% \end{macro}
+% \end{macro}
+% \begin{macro}{\nolemmaseparatorthisnote@}
+% \cs{nonumberthisnote@} toggle is used to disable lemma separator in a particular footnote.
+% \begin{macrocode}
+\newtoggle{nolemmaseparatorthisnote@}
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\beforenumberinfootnote}
% \cs{beforenumberinfootnote}\oarg{series}\marg{length} is used to add glue before line number printing in footnotes.
% \begin{macrocode}
\def\beforenumberinfootnote@A{0pt}
@@ -8112,6 +8198,31 @@
\newcommandx*{\nolemmaseparator}[1][1]{\lemmaseparator[#1]{}}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\inplaceofnumber}
+% \cs{inplaceoflemmaseparator}\oarg{series}\marg{value} is used to define glue which is printed where no lemma separator is printed.
+% \begin{macrocode}
+\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}%
+ }%
+}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\afternote}
% The \cs{afternote}\oarg{series}\marg{length} is used to change length after note.
%
@@ -8216,7 +8327,6 @@
\newcommand{\printlinefootnote}[2]{%
\iftoggle{nonumberthisnote@}{%Try if the line number must printed for this specific not (by default, yes)
\hspace{\csuse{inplaceofnumber@#2}}%
- \global\togglefalse{nonumberthisnote@}%
}%
{%
{%
@@ -12653,6 +12763,8 @@
% \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.
%
% \begin{PW}
% This section presents some sample documents.
@@ -13364,7 +13476,7 @@ in section~\ref{subsec}.
\newcommand{\ffootnote}[1]{%
\ifnumberedpar@
- \xright@appenditem{\noexpand\vffootnote{f}{{\l@d@nums}{\@tag}{#1}}}%
+ \xright@appenditem{\noexpand\vffootnote{f}{{\l@d@nums}{\csexpandonce{@tag}}{\csexpandonce{content}}}}%
\to\inserts@list
\global\advance\insert@count by 1
% \else %% may be used only in numbered text
@@ -13922,7 +14034,6 @@ Ottonis\edtext{}{\Afootnote{p.\ 130~D}} comitis et civitatis
\renewcommand{\edtext}[2]{\leavevmode
\begingroup
- \no@expands
\xdef\@tag{#1}%
\set@line
\global\insert@count=0