summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/reledmac/reledmac.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/reledmac/reledmac.dtx')
-rw-r--r--macros/latex/contrib/reledmac/reledmac.dtx53
1 files changed, 36 insertions, 17 deletions
diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx
index c7275b5af6..1596d4231e 100644
--- a/macros/latex/contrib/reledmac/reledmac.dtx
+++ b/macros/latex/contrib/reledmac/reledmac.dtx
@@ -551,6 +551,7 @@
% \changes{v2.32.7}{2020/05/03}{Fix bug with \protect\cs{parafootsepX}.}
% \changes{v2.32.7}{2020/05/03}{Fix bug with \protect\cs{lineation}\arg{pstart} and \protect\cs{edtext} in the very first line of a \protect\cs{pstart}.}
% \changes{v2.32.7}{2020/05/03}{Fix spurious spaces at the very first line of \protect\env{edtabular} environnments.}
+% \changes{v2.32.8}{2020/05/24}{Add subline number in manuscript apparatus.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -1211,8 +1212,8 @@
% or sub-line depending on what it started out as, even if it
% changes in the middle.
%
-% \DescribeMacro{Xsublinesep}
-% \DescribeMacro{Xsublinesepside}
+% \DescribeMacro{\Xsublinesep}
+% \DescribeMacro{\Xsublinesepside}
% 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}\label{startlock}
% \DescribeMacro{\startlock}
@@ -1619,8 +1620,8 @@
% start with the page number where they are called.
%
% \paragraph{Code between endnotes}
-% \DescribeMacro{toendnotes}
-% \DescribeMacro{Xtoendnotes}
+% \DescribeMacro{\toendnotes}
+% \DescribeMacro{\Xtoendnotes}
% Sometimes, it is useful to insert content between endnotes of the same series: for example to separate endnotes of different sections of the same text.
% In this case, you could use \emph{inside
% numbered text} the command:\\
@@ -2302,7 +2303,7 @@
%
% \subsubsection{Print line number annotation only the first time}\label{annotation-inapparatus}
% \DescribeMacro{\Xlinenumannotationonlyfirst}
-% By default, the line number annotation (\reff{annotion} is printed in every note. If you want to print it only the first time for a given annotation
+% By default, the line number annotation (\reff{annotation}) is printed in every note. If you want to print it only the first time for a given annotation
% you can use \cs{Xlinenumannotationonlyfirst}\oarg{s}.
%
% Note the two following points:
@@ -4334,7 +4335,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2020/05/03 v2.32.7 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2020/05/24 v2.32.8 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -6330,9 +6331,11 @@
\unless\ifledRcol%Get the last line of the last page
\csnumgdef{@lastabsline@forpage@\the\page@num}{\the\absline@num}%
\csnumgdef{@lastline@forpage@\the\page@num}{\the\line@num}%
+ \csnumgdef{@lastsubline@forpage@\the\page@num}{\the\subline@num}%
\else%
\csnumgdef{@lastabsline@forpageR@\the\page@numR}{\the\absline@numR}%
\csnumgdef{@lastline@forpageR@\the\page@numR}{\the\line@numR}%
+ \csnumgdef{@lastsubline@forpageR@\the\page@numR}{\the\subline@numR}%
\fi%
\endgroup
% \end{macrocode}
@@ -6577,6 +6580,7 @@
\else
\csnumgdef{@lastabsline@forpageR@\the\page@numR}{\the\absline@numR}%
\csnumgdef{@lastline@forpageR@\the\page@numR}{\the\line@numR}%
+ \csnumgdef{@lastsubline@forpageR@\the\page@numR}{\the\subline@numR}%
\ifbypage@R
\ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum
\ifboolexpr{%
@@ -6603,6 +6607,7 @@
\else
\csnumgdef{@lastabsline@forpage@\the\page@num}{\the\absline@num}%
\csnumgdef{@lastline@forpage@\the\page@num}{\the\line@num}%
+ \csnumgdef{@lastsubline@forpage@\the\page@num}{\the\subline@num}%
\ifbypage@
\ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum
\line@num \z@%
@@ -18658,12 +18663,16 @@
\unexpanded{\newdimen\parindent@beforestanza%
\parindent@beforestanza=\parindent}%Keep in memory the standard \parindent
\global\stanza@count\@ne\stanza@modulo\@ne
- \noexpand\ifnum\expandafter\noexpand
- \csname sza@0@\endcsname=\z@\let\noexpand\stanza@hang\relax
- \let\noexpand\endlock\relax\noexpand\else\interlinepenalty
- \@M\rightskip\z@ plus 1fil\relax\noexpand\fi\noexpand\ifnum
- \expandafter\noexpand\csname szp@0@\endcsname=\z@
- \let\noexpand\sza@penalty\relax\noexpand\fi%
+ \noexpand\ifnum\expandafter\noexpand\csname sza@0@\endcsname=\z@%
+ \let\noexpand\stanza@hang\relax%
+ \let\noexpand\endlock\relax%
+ \noexpand\else%
+ \interlinepenalty%
+ \@M\rightskip\z@ plus 1fil\relax%
+ \noexpand\fi%
+ \noexpand\ifnum\expandafter\noexpand\csname szp@0@\endcsname=\z@%
+ \let\noexpand\sza@penalty%
+ \relax\noexpand\fi%
\def\noexpand&{%
\noexpand\newverse[][]}%
\def\noexpand\&{\noexpand\@stopstanza}%
@@ -18911,6 +18920,7 @@
\global\numdef{\@msd@c}{\@msd@c+\@ne}%
\csgdef{@msdata@\@msd@c @data}{#1}%
\csxdef{@msdata@\@msd@c @linenumber}{\the\line@num}%
+ \csxdef{@msdata@\@msd@c @sublinenumber}{\the\subline@num}%
\csxdef{@msdata@\@msd@c @abslinenumber}{\the\absline@num}%
\xright@appenditem{\the\absline@num}\to\actionlines@list%
\xright@appenditem{-1010}\to\actions@list%
@@ -18918,6 +18928,7 @@
\global\numdef{\@msd@cR}{\@msd@cR+\@ne}%
\csgdef{@msdata@\@msd@cR @dataR}{#1}%
\csxdef{@msdata@\@msd@cR @linenumberR}{\the\line@numR}%
+ \csxdef{@msdata@\@msd@cR @sublinenumberR}{\the\subline@numR}%
\csxdef{@msdata@\@msd@cR @abslinenumberR}{\the\absline@numR}%
\xright@appenditem{\the\absline@numR}\to\actionlines@listR%
\xright@appenditem{-1010}\to\actions@listR%
@@ -18933,11 +18944,13 @@
\ifcsundef{@msdata@\@msd@c @stoplinenumber}{%
\csxdef{@msdata@\@msd@c @stopabslinenumber}{\the\absline@num}%
\csxdef{@msdata@\@msd@c @stoplinenumber}{\the\line@num}%
+ \csxdef{@msdata@\@msd@c @stopsublinenumber}{\the\subline@num}%
}{}%
\else%
\ifcsundef{@msdata@\@msd@cR @stoplinenumberR}{%
\csxdef{@msdata@\@msd@cR @stopabslinenumberR}{\the\absline@numR}%
\csxdef{@msdata@\@msd@cR @stoplinenumberR}{\the\line@numR}%
+ \csxdef{@msdata@\@msd@cR @stopsublinenumberR}{\the\subline@numR}%
}%
{}%
\fi%
@@ -18960,13 +18973,16 @@
\edef\l@d@nums{%
000|% Start page = we don't print it
\csuse{@msdata@\add@msd@c @linenumber}|% Start line number
- 000|% Start subline number, for now, not used
+ \csuse{@msdata@\add@msd@c @sublinenumber}|% Start subline number
000|% End page number, we don't print it
\ifnumless{\csuse{@msdata@\add@msd@c @stopabslinenumber}}{\csuse{@lastabsline@forpage@\the\page@num}}%
{\csuse{@msdata@\add@msd@c @stoplinenumber}}%End line number if in the same page
- {\csuse{@lastline@forpage@\the\page@num}}%Otherwiser, last number of the page
+ {\csuse{@lastline@forpage@\the\page@num}}%Otherwise, last number of the page
+ |%
+ \ifnumless{\csuse{@msdata@\add@msd@c @stopabslinenumber}}{\csuse{@lastabsline@forpage@\the\page@num}}%
+ {\csuse{@msdata@\add@msd@c @stopsublinenumber}}%End subline number if in the same page
+ {\csuse{@lastsubline@forpage@\the\page@num}}%Otherwise, last subnumber of the page
|%
- 000|% End sub line number, for now, not used
\edfont@info%Font
}%
\@msd@options@fullpagefalse%
@@ -19009,12 +19025,15 @@
\edef\l@d@nums{%
000|% Start page = we don't print it
\csuse{@msdata@\add@msd@cR @linenumberR}|% Start line number
- 000|% Start subline number, for now, not used
+ \csuse{@msdata@\add@msd@cR @sublinenumberR}|% Start subline number, for now, not used
000|% End page number, we don't print it
\ifnumless{\csuse{@msdata@\add@msd@cR @stopabslinenumberR}}{\csuse{@lastline@forpageR@\the\page@numR}}%
{\csuse{@msdata@\add@msd@cR @stoplinenumberR}}%End line number if in the same page
- {\csuse{@lastline@forpageR@\the\page@numR}}%Otherwiser, last number of the page
+ {\csuse{@lastline@forpageR@\the\page@numR}}%Otherwise, last number of the page
|%
+ \ifnumless{\csuse{@msdata@\add@msd@cR @stopabslinenumberR}}{\csuse{@lastline@forpageR@\the\page@numR}}%
+ {\csuse{@msdata@\add@msd@cR @stopsublinenumberR}}%End subline number if in the same page
+ {\csuse{@lastsubline@forpageR@\the\page@numR}}%Otherwise, last number of the page
000|% End sub line number, for now, not used
\edfont@info%Font
}%