summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/reledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-05-25 21:12:25 +0000
committerKarl Berry <karl@freefriends.org>2020-05-25 21:12:25 +0000
commit010c2f7beeabd7ee027bda0b20ade470bbec1a14 (patch)
tree8d789fb2b1aafe9be1f94f42d7db2288e548ac1f /Master/texmf-dist/tex/latex/reledmac
parent68218acf993770c592e4f8dcafcb739bb1245b3b (diff)
reledmac (25may20)
git-svn-id: svn://tug.org/texlive/trunk@55273 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/reledmac')
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty42
1 files changed, 30 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index 15d34014512..981bd7d23ba 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2020/05/03 v2.32.7 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2020/05/24 v2.32.8 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\newif\ifsameparallelpagenumber%
@@ -814,9 +814,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
\ifledRcol
@@ -934,6 +936,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{%
@@ -960,6 +963,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@%
@@ -7711,12 +7715,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}%
@@ -7868,6 +7876,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%
@@ -7875,6 +7884,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%
@@ -7885,11 +7895,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%
@@ -7904,13 +7916,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%
@@ -7953,12 +7968,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
}%