summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/reledmac
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-08-19 21:37:24 +0000
committerKarl Berry <karl@freefriends.org>2020-08-19 21:37:24 +0000
commit90532b85c4696e210a3c2c9753868ab286d9713a (patch)
tree00e65706ad258deb3bb6c10536135cca9fc7fa3c /Master/texmf-dist/source/latex/reledmac
parent492eb1f967b7d8fb3e5b2159a8166d4893340de7 (diff)
reledmac (19aug20)
git-svn-id: svn://tug.org/texlive/trunk@56134 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/reledmac')
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledmac.dtx44
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledpar.dtx38
2 files changed, 59 insertions, 23 deletions
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
index a568f76f44f..a2e92f6b3e9 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
@@ -560,6 +560,9 @@
% \changes{v2.34.0}{2020/06/24}{Add \protect\cs{Xpstartseparator}.}
% \changes{v2.34.1}{2020/06/30}{Fix bug with page number when using stanazindentsrepetition, bug introduced in v2.33.0}
% \changes{v2.34.2}{2020/07/06}{Fix bug with tabular environment, in some specific use case, added in v2.32.7}
+% \changes{v2.34.3}{2020/08/19}{Fix bug with \protect\cs{parafootsepX} when the footnotes are called outside of a numbered section.}
+% \changes{v2.34.3}{2020/08/19}{Fixes incompatibility between Fixes incompatibility between lineation by \protect\cs{pstart} and (a)stanza.}
+% \changes{v2.34.3}{2020/08/19}{Makes command like \protect\cs{hidenumbering} working at the very beginning of a verse when the first argument of \protect\cs{setstanzaindents} is equal to 0.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -4400,7 +4403,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2020/07/06 v2.34.2 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2020/08/19 v2.34.3 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -7673,12 +7676,16 @@
% \begin{macrocode}
\newcommand*{\setlinenum}[1]{%
- \ifnum#1<\z@
- \led@warn@BadSetlinenum
- \else
- \ifledRcol \write\linenum@outR{\string\l@d@set[#1]}
- \else \write\linenum@out{\string\l@d@set[#1]} \fi
- \fi}
+ \ifnum#1<\z@%
+ \led@warn@BadSetlinenum%
+ \else%
+ \ifledRcol%
+ \write\linenum@outR{\string\l@d@set[#1]}%
+ \else%
+ \write\linenum@out{\string\l@d@set[#1]}%
+ \fi%
+ \fi%
+}%
% \end{macrocode}
% \end{macro}
@@ -8953,8 +8960,10 @@
% \begin{macrocode}
\ifbypstart@%
\begingroup%
- \let\leavevmode\relax%
- \setlinenum{0}%
+ \unless\ifinstanza%
+ \let\leavevmode\relax%
+ \setlinenum{0}%
+ \fi%
\endgroup%
\resetprevline@%
\fi%
@@ -13653,10 +13662,17 @@
{}%
\global\csname prevpage#1@numR\endcsname=\page@numR%
\else%
- \ifnumequal{\csuse{prevpage#1@num}}{\page@num}%
- {\csuse{parafootsepX@#1}}%
- {}%
- \global\csname prevpage#1@num\endcsname=\page@num%
+ \ifnumbering%
+ \ifnumequal{\csuse{prevpage#1@num}}{\page@num}%
+ {\csuse{parafootsepX@#1}}%
+ {}%
+ \global\csname prevpage#1@num\endcsname=\page@num%
+ \else%
+ \ifnumequal{\csuse{prevpage#1@num}}{\c@page}%
+ {\csuse{parafootsepX@#1}}%
+ {}%
+ \global\csname prevpage#1@num\endcsname=\c@page%
+ \fi%
\fi%
}
% \end{macrocode}
@@ -18877,7 +18893,7 @@
\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%
+ \def\noexpand\stanza@hang{\unexpanded{\leavevmode\null}}%
\let\noexpand\endlock\relax%
\noexpand\else%
\interlinepenalty%
diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
index 25704732767..bc15113c887 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
@@ -343,6 +343,8 @@
% \changes{v2.23.1}{2020/04/19}{Fix bug when using \protect\package{polyglossia} v1.45 or later.}
% \changes{v2.24.0}{2020/05/31}{Add startstanzaindentsrepetition feature.}
% \changes{v2.24.0}{2020/05/31}{Add antilabe feature.}
+% \changes{v2.24.1}{2020/08/19}{Makes \protect\cs{numberstantzatrue} working with \protect\env{astanza}.}
+% \changes{v2.24.1}{2020/08/19}{Fixes incompatibility between lineation by \protect\cs{pstart} and (a)stanza.}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -1398,7 +1400,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2020/05/31 v2.24.0 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2020/08/19 v2.24.1 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -2897,11 +2899,21 @@
%
% \begin{macrocode}
\renewcommand*{\@pend}[1]{%
- \ifbypstart@\global\line@num=0\fi%
- \xright@appenditem{#1}\to\linesinpar@listL}
+ \ifbypstart@%
+ \unless\ifinstanza%
+ \global\line@num=0%
+ \fi%
+ \fi%
+ \xright@appenditem{#1}\to\linesinpar@listL%
+}%
\renewcommand*{\@pendR}[1]{%
- \ifbypstart@R\global\line@numR=0\fi
- \xright@appenditem{#1}\to\linesinpar@listR}
+ \ifbypstart@R%
+ \unless\ifinstanzaR%
+ \global\line@numR=0%
+ \fi%
+ \fi%
+ \xright@appenditem{#1}\to\linesinpar@listR%
+}%
% \end{macrocode}
% \end{macro}
@@ -5386,6 +5398,7 @@
\fi%
\catcode`\&\active
\global\stanza@count\@ne\stanza@modulo\@ne
+ \@advancestanzanumber%
\newdimen\parindent@beforestanza%
\parindent@beforestanza=\parindent%Keep in memory the standard \parindent
\ifnum\usenamecount{sza@0@}=\z@
@@ -5410,6 +5423,7 @@
{\pstart[][\at@every@stanza]\at@start@every@stanza}%
{\pstart[#1][#2]\at@start@every@stanza}%
\@astanza@line
+ \@insertstanzanumber%
\let\par\relax\ignorespaces%No paragraph in verses
}{%
\global\undef\parindent@beforestanza%
@@ -5935,12 +5949,16 @@
\@writelinesinparR
\check@pstarts
\ifbypstart@%
- \write\linenum@out{\string\@set[1]}
- \resetprevline@
+ \unless\ifinstanza%
+ \write\linenum@out{\string\@set[1]}%
+ \resetprevline@%
+ \fi%
\fi
\ifbypstart@R
- \write\linenum@outR{\string\@set[1]}
- \resetprevline@
+ \unless\ifinstanza%
+ \write\linenum@outR{\string\@set[1]}%
+ \resetprevline@%
+ \fi%
\fi
\Columns@print@after@pend%
\repeat
@@ -7343,8 +7361,10 @@
\ifnum\l@dnumpstartsR>\l@dpscR
\writtenlinesRfalse
\ifbypstart@R
+ \unless\ifinstanzaR%
\global\line@numR=0%
\resetprevline@%
+ \fi%
\fi
\csuse{after@pendR@\the\l@dpscR}%
\global\csundef{after@pendR@\the\l@dpscR}%