summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-01-11 22:00:38 +0000
committerKarl Berry <karl@freefriends.org>2022-01-11 22:00:38 +0000
commit94a61ef951904c933eda185e73e73a42ce34725f (patch)
tree56683c3498537912b81fabbdc27ee83c755a2648 /Master/texmf-dist/source
parentf658c5ca98d188dab032e6155c12e4a57c0d71b6 (diff)
reledmac (11jan22)
git-svn-id: svn://tug.org/texlive/trunk@61571 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledmac.dtx54
1 files changed, 44 insertions, 10 deletions
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
index 9009f1a2ae0..84f70591beb 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
@@ -589,6 +589,7 @@
% \changes{v2.38.1}{2021/09/27}{Fix incompatibility between \protect\parpackage's option \protect\option{continuousnumberingwithcolumns} and lineation by page.}
% \changes{v2.38.2}{2021/11/03}{Fix bug when using \protect\cs{applabel} in conjunction with \protect\package{hyperref} package.}
% \changes{v2.38.2}{2021/11/03}{Fix some trouble in indentation in stanza, when switching to some language with \protect\package{polyglossia}.}
+% \changes{v2.39.0}{2021/01/11}{Add \protect\cs{Xnotboxingsubline} and \protect\cs{Xendnotboxingsubline} hooks.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -2596,10 +2597,10 @@
% \DescribeMacro{\Xendinplaceofnumber} \cs{Xendinplaceofnumber}\oarg{s}\marg{l} is the same, for critical endnotes.
% \subsubsection{Boxing line number and line symbol}
% \DescribeMacro{\Xboxlinenum}
-% It could be useful to put the line number inside a fixed box: the content of the note will be printed after this box.
+% It could be useful to put the line numbers inside a fixed box: the content of the note will be printed after this box.
% You can use \protect\cs{Xboxlinenum}\oarg{s}\marg{l} to do that.
% To subsequently disable this feature, use \protect\cs{Xboxlinenum} with length equal to 0~pt.
-% One use of this feature is to print line number in a column, and the note in an other column:
+% One use of this feature is to print line numbers in a column, and the note in an other column:
% \begin{verbatim}
%\Xhangindent{1em}
%\Xafternumber{0em}
@@ -2630,18 +2631,41 @@
% \item \protect\cs{Xboxendlinenum}\oarg{s}\marg{l} will box the dash plus the end line number or the range symbol in a box of length \meta{l}. The content will be put at the left of the box.
% \end{itemize}
%
-% With these two commands, it is possible to horizontaly align the dash of line number when using critical notes, to obtain something like:
+% With these two commands, it is possible to horizontally align the dash of line number when using critical notes, to obtain something like:
% \begin{verbatim}
% 1
% 12-23
% 24ff.
% \end{verbatim}
+%
+% \DescribeMacro{\Xnotboxingsubline}
+% By default, for the start line number, these things are boxed:
+% \begin{itemize}
+% \item (start) line number annotation, if before line number;
+% \item (start) page and (start) line number;
+% \item (start) line flag;
+% \item (start) line number annotation, if after line number;
+% \item (start) subline number.
+% \end{itemize}
+%
+% You may exclude subline number and line number annotation after line number, using \cs{Xnotboxingsubline}\oarg{s}.
% \DescribeMacro{\Xendboxlinenum}
% \DescribeMacro{\Xendboxlinenumalign}
-% \DescribeMacro{\Xendboxstartlinenumalign}
-% \DescribeMacro{\Xendboxendlinenumalign}
+% \DescribeMacro{\Xendboxstartline}
+% \DescribeMacro{\Xendboxendlinenum}
% \changes{v1.20.0}{2015/03/22}{Add \protect\cs{Xendboxlinenum}}
-% \protect\cs{Xendboxlinenum}\oarg{s}\marg{l}, \protect\cs{Xendboxlinenumalign}\oarg{s}\marg{text}, \protect\cs{Xendboxstartlinenum}\oarg{s}\marg{l}, \protect\cs{Xendboxendlinenum}\oarg{s}\marg{l} are the same as, respectively, \protect\cs{Xboxlinenum} and \protect\cs{Xboxlinenumalign}, \protect\cs{Xboxstartlinenum}, \protect\cs{Xboxendlinenum} except in endnotes.
+% \protect\cs{Xendboxlinenum}\oarg{s}\marg{l},
+% \protect\cs{Xendboxlinenumalign}\oarg{s}\marg{text},
+% \protect\cs{Xendboxstartlinenum}\oarg{s}\marg{l},
+% \protect\cs{Xendnotboxingsubline}\oarg{s},
+% \protect\cs{Xendboxendlinenum}\oarg{s}\marg{l}
+% are the same as, respectively,
+% \protect\cs{Xboxlinenum},
+% \protect\cs{Xboxlinenumalign},
+% \protect\cs{Xboxstartlinenum},
+% \protect\cs{Xnotboxingsubline},
+% \protect\cs{Xboxendlinenum}
+% except in endnotes.
%
%
%\subsection{Separator between the lemma and the note}
@@ -3608,7 +3632,7 @@
% \item\cs{Xendtwolinesonlyinsamepage}
% \item\cs{Xendlinenumannotationposition}
% \item\cs{Xendwraplinenumannotation}
-% \item\cs{Xemdnoidenticallinenumannotation}
+% \item\cs{Xendnoidenticallinenumannotation}
% \end{itemize}
% \paragraph{For one specific command}
%
@@ -4478,7 +4502,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2021/11/03 v2.38.2 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2022/01/11 v2.39.0 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -12786,6 +12810,7 @@
\linenumrep{#2}%
\iftoggle{Xlineflag@\@currentseries}{#8}{}%
}%
+ \iftoggle{Xnotboxingsubline@\@currentseries}{\egroup}{}%Close startline box
\ifl@d@ssub%
\csuse{Xsublinesep@\@currentseries}%
\wrap@edcrossref{\@this@crossref@start}{\sublinenumrep{#3}}%
@@ -12794,7 +12819,7 @@
\ifcsstring{Xlinenumannotationposition@\@currentseries}{after}%
{\@annot@start@print}%
{}%
- \egroup%
+ \iftoggle{Xnotboxingsubline@\@currentseries}{}{\egroup}%Close startline box
% \end{macrocode}
% Then print the dash + end line number, or the range symbol.
% \changes{v0.3.0}{2004/02/14}{Added \protect\cs{linenumr@p} and \protect\cs{sublinenumr@p}
@@ -14911,6 +14936,7 @@
}%
\fi%
\iftoggle{Xendlineflag@\@currentseries}{\ifledRcol@\@Rlineflag\fi}{}%
+ \iftoggle{Xendnotboxingsubline@\@currentseries}{\egroup}{}%Close the box
\ifl@d@Xendlinenumber%
\ifl@d@ssub%
\csuse{Xendsublinesep@\@currentseries}%
@@ -14929,7 +14955,7 @@
% \end{macrocode}
% Close the box.
% \begin{macrocode}
- \egroup%
+ \iftoggle{Xendnotboxingsubline@\@currentseries}{}{\egroup}%
% \end{macrocode}
% Open the box for the ending line number.
% \begin{macrocode}
@@ -15099,6 +15125,7 @@
\csgdef{Xboxlinenumalign@#1}{L}%
\csgdef{Xboxstartlinenum@#1}{0pt}%
+ \newtoggle{Xnotboxingsubline@#1}%
\csgdef{Xboxendlinenum@#1}{0pt}%
\csgdef{Xboxsymlinenum@#1}{0pt}%
@@ -15572,6 +15599,7 @@
\csgdef{Xendboxlinenumalign@#1}{L}%
\csgdef{Xendboxstartlinenum@#1}{0pt}%
+ \newtoggle{Xendnotboxingsubline@#1}%
\csgdef{Xendboxendlinenum@#1}{0pt}%
\csgdef{Xendlemmaseparator@#1}{}%
@@ -15941,6 +15969,7 @@
\newhookcommand@series{Xboxlinenumalign}%
\newhookcommand@series{Xboxstartlinenum}%
+ \newhooktoggle@series{Xnotboxingsubline}%
\newhookcommand@series{Xboxendlinenum}%
\newhookcommand@series{Xafternote}%
@@ -16024,6 +16053,7 @@
\newhookcommand@series{Xendboxlinenumalign}%
\newhookcommand@series{Xendboxstartlinenum}%
+ \newhooktoggle@series{Xendnotboxingsubline}%
\newhookcommand@series{Xendboxendlinenum}%
\newhookcommand@series{Xendnotefontsize}
@@ -17373,12 +17403,16 @@
\gdef\Xboxstartlinenum@appref{0pt}
\gdef\Xboxstartlinenum@SEref{0pt}
+\newtoggle{Xnotboxingsubline@appref}%
+\newtoggle{Xnotboxingsubline@SEref}%
\gdef\Xboxendlinenum@appref{0pt}
\gdef\Xboxendlinenum@SEref{0pt}
\gdef\Xendboxstartlinenum@apprefwithpage{0pt}
\gdef\Xendboxstartlinenum@SErefwithpage{0pt}
+\newtoggle{Xendnotboxingsubline@apprefwithpage}%
+\newtoggle{Xendnotboxingsubline@SErefwithpage}%
\gdef\Xendboxendlinenum@apprefwithpage{0pt}
\gdef\Xendboxendlinenum@SErefwithpage{0pt}