diff options
author | Karl Berry <karl@freefriends.org> | 2017-10-22 19:52:32 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-10-22 19:52:32 +0000 |
commit | f0b3725a6cd0e0cc60160c7f1320ec09b8fe00b4 (patch) | |
tree | 3b5ff0672532b14d77a8f28b4e6bc63bbb254d12 /Master/texmf-dist/source/latex/reledmac/reledmac.dtx | |
parent | 8d35bb877599c6b68fd5c2e554834291c07118d2 (diff) |
reledmac (22oct17)
git-svn-id: svn://tug.org/texlive/trunk@45580 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/reledmac/reledmac.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/reledmac/reledmac.dtx | 75 |
1 files changed, 51 insertions, 24 deletions
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index de88625b0c0..fe550515fbb 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -470,11 +470,11 @@ % \changes{v2.20.0}{2017/05/04}{Reset font specification at the beginning of familiar footnotes.} % \changes{v2.20.0}{2017/05/04}{Add starred version of \protect\cs{AtEveryPstart}, \protect\cs{AtEveryPend}, \protect\cs{AtEveryStanza} and \protect\cs{AtEveryStopStanza}.} % \changes{v2.20.0}{2017/05/04}{Add \protect\cs{AtStartEveryStanza}, \protect\cs{BeforeEveryStopStanza}, \protect\cs{AtEndEveryPend}, \protect\cs{AtStartEveryPstart}.} -% \changes{v2.20.0}{2017/05/04}{Add second optional argument of \protect\cs{pstart}, \protect\cs{pend} and \protect\cs{stanza}.} -% \changes{v2.20.0}{2017/05/04}{Add third and fourth optional argument of \protect\cs{newverse}.} +% \changes{v2.20.0}{2017/05/04}{Add second optional argument to \protect\cs{pstart}, \protect\cs{pend} and \protect\cs{stanza}.} +% \changes{v2.20.0}{2017/05/04}{Add third and fourth optional argument to \protect\cs{newverse}.} % \changes{v2.21.0}{2017/06/04}{Fix a bug when using formatting command in the argument of \protect\cs{edindex} inside \protect\cs{edtext}.} -% \changes{v2.21.0}{2017/06/04}{Now, as explained in the handbook, an \protect\cs{edindex} inside \protect\cs{edtext} only creates index reference to main text, and not to the critical footnote.} -% \changes{v2.21.0}{2017/06/04}{Add the possibility of nested \protect\cs{sameword}.} +% \changes{v2.21.0}{2017/06/04}{Now, as explained in the handbook, a \protect\cs{edindex} inside \protect\cs{edtext} only creates an index reference to the main text, and not to the critical footnote.} +% \changes{v2.21.0}{2017/06/04}{Add the possibility of nested \protect\cs{sameword} commands.} % \changes{v2.22.0}{2017/06/08}{Fix a bug added in v2.16.0 when using \protect\cs{Xtxtbeforenotes} with paragraphed or normal footnotes.} % \changes{v2.22.0}{2017/06/08}{Fix a bug with three and two columns critical footnotes, broken in v.~2.17.6.} % \changes{v2.22.0}{2017/06/08}{Add \protect\cs{txtbeforenotesX} hook.} @@ -489,6 +489,7 @@ % \changes{v2.24.0}{2017/08/17}{Add \protect\cs{swnoexpands} macro to avoid problems with not fully expandable macro inside \protect\cs{sameword}.} % \changes{v2.24.0}{2017/08/17}{Fix spurious space with \protect\cs{labelpstarttrue}} % \changes{v2.24.1}{2017/08/31}{Compatibility with \protect\parpackage 2.20.2} +% \changes{v2.24.2}{2017/10/21}{Fix bug between tabular environments and endnotes} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -922,13 +923,13 @@ % Its content will be printed before the beginning of \protect\cs{pstart} / after the end of \protect\cs{pend} instead of the argument of \protect\cs{AtEveryPstart} / \protect\cs{AtEveryPend}. % % Note that a \cs{noindent} will be automatically added before this argument, and, consequently, a \cs{parskip} will be inserted. -% You can use a second optional argument, in brackets, to not have this \cs{noindent}. +% You can use a second optional argument in brackets to avoid that \cs{noindent}. % \begin{verbatim} % \pstart[foo] % A \noindent will be inserted before foo. % \pstart[][foo]% No \noindent before foo. % \end{verbatim} % -% The second optional argument of \cs{pstart} / \cs{pend} replace the argument of \cs{AtEveryPstart*} / \cs{AtEveryPend*}. +% The second optional argument of \cs{pstart} / \cs{pend} replaces the argument of \cs{AtEveryPstart*} / \cs{AtEveryPend*}. % % If you need to start a \protect\cs{pstart} with brackets, or to add brackets after a \protect\cs{pend}, just add a \protect\cs{relax} between \protect\cs{pstart}\,\ldots\,\protect\cs{pend} and the brackets. % @@ -942,7 +943,7 @@ % You can use both \protect\cs{AtEveryPstart} and \protect\cs{AtEveryPend}. % Their arguments will be printed before every \protect\cs{pstart} begins / after every \protect\cs{pend} ends. % -% Note that a \cs{noindent} will be inserted before the argument, and, consequently, a \cs{parskip}. You can use the starred version of \protect\cs{AtEveryPstart} and \protect\cs{AtEveryPend} to no insert the \cs{noindent}. +% Note that a \cs{noindent} will be inserted before the argument, and, consequently, a \cs{parskip}. You can use the starred version of \protect\cs{AtEveryPstart} and \protect\cs{AtEveryPend} to avoid the \cs{noindent}. % % \DescribeMacro{\AtStartEveryPstart}\DescribeMacro{\AtEndEveryPend} % The argument of \cs{AtStartEveryPstart} / \cs{AtEndEveryPend} will be inserted at the beginning / the end of every \cs{pstart} / \cs{pend} in the same paragraph. For example, if you want each \cs{pstart} to start with a star, you can use: @@ -1134,7 +1135,7 @@ % or sub-line depending on what it started out as, even if it % changes in the middle. % -% You can change the separator between line number and subline number either by using \cs{Xsublinesep} without any optional argument (\reff{Xsublinesep}) or by using \cs{Xsublinesepside}. But in the second case, it will change the separator only for line numbers in the margins, not in the footnotes. +% You can change the separator between the line number and the subline number either by using \cs{Xsublinesep} without any optional argument (\reff{Xsublinesep}) or by using \cs{Xsublinesepside}. In the second case, it will change the separator only for line numbers in the margins, not in the footnotes. % \subsubsection{Locking lineation} % \DescribeMacro{\startlock} % \DescribeMacro{\endlock} @@ -1698,7 +1699,7 @@ % \egend % % \subsubsection{Sameword for a group of words} -% Sometime, a group of words, and not only a single word, occurs multiple times. +% Sometimes a group of words and not only a single word, occurs multiple times. % In this case, you have two possibilities. % % First, you can consider only the individual words, and not groups of word. @@ -1725,11 +1726,11 @@ % \pend % \endnumbering % \end{ledgroup} -% Here, it is not ambiguous what \enquote{per causam} refers to. +% In this case it is clear which \enquote{per causam} is meant. % -% However, we may think that as \enquote{per causam} is the lemma of the second note, there should be only one number for the whole lemma. +% However, in the case that \enquote{per causam} is the lemma of the second note, there should be only one number for that whole lemma. % In this case we can mark all \enquote{per causam} groups. -% But as \enquote{causam} is also called as lemma in note~1 and ~3, we need to use nested \cs{sameword}. +% But as \enquote{causam} is also called as lemma in note~1 and ~3, we need to use nested \cs{sameword} commands. % Consequently, we need to use \cs{lemma} for the \cs{edtext} linked to \enquote{per causam}, as we don't want to number each individual word. % % \begin{verbatim} @@ -1989,7 +1990,7 @@ % Note that you must define the position of all the series of footnotes you use. % If you don't, you will have infinite runs of \LaTeX. % -% \section{Critical apparatus appearance} +% \section{Apparatus customization} % \label{displayoptions} % \changes{v1.0.0}{2012/09/15}{New generic commands to customize footnote display.} % Some commands can be used to change the display of the footnotes. @@ -2058,7 +2059,7 @@ % value. % \subsection{Control line number printing} % \subsubsection{Print line number only at first time} -% \DescribeMacro{\Xnumberonlyfirstinline}\label{Xnumberonlyfirstinline}. +% \DescribeMacro{\Xnumberonlyfirstinline}\label{Xnumberonlyfirstinline} % \changes{v1.0.1}{2012/09/16}{Correction on \protect\cs{Xnumberonlyfirstinline} with lineation by pstart or by page.} % By default, the line number is printed in every note. If you want to print it only the first time for a given line number % (i.e., one time for line 1, one time for line 2, etc.), you can use \protect\cs{Xnumberonlyfirstinline}\oarg{s}. @@ -2220,8 +2221,8 @@ % \DescribeMacro{\Xafternumber} % With \protect\cs{Xafternumber}\oarg{s}\marg{l} you can add some space after the line number in a footnote. If the line number is not printed, the space is not either. The default value is 0.5~em. % -% \DescribeMacro{\Xendbeforenumber}\DescribeMacro{Xendafterenumber} -% \cs{Xendbeforenumber} and \cs{Xendafterenumber} are the equivalents of \cs{Xbeforenumber} and \cs{afterenumber} for endnotes. +% \DescribeMacro{\Xendbeforenumber}\DescribeMacro{\Xendaftrenumber} +% \cs{Xendbeforenumber} and \cs{Xendafterenumber} are the equivalents of \cs{Xbeforenumber} and \cs{Xafterenumber} for endnotes. % %\changes{v1.4.3}{2012/12/18}{Add \protect\cs{Xnonbreakableafternumber}.} %\DescribeMacro{\Xnonbreakableafternumber} @@ -2567,7 +2568,7 @@ % \subsubsection{Code before notes} %\DescribeMacro{\Xbhookgroup} %\DescribeMacro{\bhookgroupX} -% While \cs{Xtxtbeforenotes} is for typesetting code before notes, \cs{Xbhookgroup} and \cs{bhookgroupX} (respectively for critical and familiar) are for executing code before a groups of notes, between the rules and the printing of the notes. +% While \cs{Xtxtbeforenotes} is for typesetting text before notes, \cs{Xbhookgroup}\oarg{s}\marg{code} and \cs{bhookgroupX}\oarg{s}\marg{code} (respectively for critical and familiar) are for executing code before a groups of notes, between the rules and the printing of the notes. % % % \subsubsection{Spacing} @@ -4061,7 +4062,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2017/08/31 v2.24.1 typesetting critical editions]% +\ProvidesPackage{reledmac}[2017/10/21 v2.24.2 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -8313,7 +8314,7 @@ \endgraf\global\num@lines=\prevgraf\egroup% \global\par@line=0% % \end{macrocode} -% We check if lineation is by pstart: in this case, we reset line number, but only in the second line of the pstart. +% We check if lineation is by pstart: in this case, we reset the line number, but only in the second line of the pstart. % We can't reset line number at the beginning of \protect\cs{pstart}, as \protect\cs{setline} is parsed at the end of previous \protect\cs{pend}, and so, we must do it at the end of first line of pstart. % \begin{macrocode} \csnumdef{pstartline}{0}% @@ -13817,7 +13818,7 @@ \prepare@prenotesX{#1}% \newcommand{\content}{##1}% % \end{macrocode} -% If we use the \cs{csquotes} package, we reset quotation level. +% If we use the \cs{csquotes} package, we reset the quotation level. % \begin{macrocode} \ifdefined\csq@qlevel% \csq@qlevel=0\relax% @@ -13946,7 +13947,7 @@ \newcommand{\content}{##2}% \stepcounter{labidx}% \expandafter\immediate\expandafter\write\csname l@d@#1end\endcsname{% - \unexpanded{\def\sw@list@inedtext}{\expandafter\unexpanded\expandafter{\sw@inthisedtext}}\@percentchar\space%Explicit space, to add a linebreak in the output file + \unexpanded{\def\sw@list@inedtext}{\expandafter\unexpanded\expandafter{\sw@inthisedtext}}\@percentchar\space%Explicit space, to add a linebreak in the output file \expandafter\string\csname #1end\endcsname% {\ifnumberedpar@\l@d@nums\fi}% {\ifnumberedpar@\expandonce\@tag\fi}% @@ -17037,7 +17038,7 @@ % \begin{macro}{\ifinstanza} % The macro \protect\cs{@hangingsymbol} is used to insert a symbol on each hanging of verses. It is set by user level macro \protect\cs{sethangingsymbol}. % -% For example, in french typographie the symbol is `['. We obtain it by the next code: +% For example, in French typography the symbol is `['. We obtain it by the next code: %\begin{verbatim} %\sethangingsymbol{[\,} %\end{verbatim} @@ -17472,7 +17473,7 @@ % \begin{macro}{\msdata} % \begin{macro}{\msdata@c} % \begin{macro}{\msdata@cR} -% The user level \cs{msdata} command only writes the manuscripts data in numbered auxiliary file. There are two associated etoolbox counters. +% The user level \cs{msdata} command only writes the manuscripts data in a numbered auxiliary file. There are two associated etoolbox counters. % \begin{macrocode} \def\msdata@c{}% \def\msdata@cR{}% @@ -18151,17 +18152,43 @@ % \end{macrocode} % \end{macro} % \end{macro} +% \begin{macro}{\disable@endnotes} +% \begin{macro}{\restore@endnotes} +% The same for endnotes. +% \begin{macrocode} +\newcommand{\disable@endnotes}{% + \unless\ifnoend@% + \def\do##1{% + \csletcs{##1@@endnote}{##1endnote}% + \expandafter\renewcommand \csname ##1endnote\endcsname[1]{}% + }% + \dolistloop{\@series}% + \fi% +}% +\newcommand{\restore@endnotes}{% + \unless\ifnofamiliar@% + \def\do##1{% + \csletcs{##1endnote}{##1@@endnote}% + }% + \dolistloop{\@series}% + \fi% +}% +% \end{macrocode} +% \end{macro} +% \end{macro} % \begin{macro}{\disable@notes} % \begin{macro}{\restore@notes} -% Disable/restore side and familiar notes. +% Disable/restore side, familiar and end notes. % \begin{macrocode} \newcommand{\disable@notes}{% \disable@sidenotes% \disable@familiarnotes% + \disable@endnotes% }% \newcommand{\restore@notes}{% \restore@sidenotes% \restore@familiarnotes% + \restore@endnotes% }% % \end{macrocode} % \end{macro} |