diff options
author | Karl Berry <karl@freefriends.org> | 2020-09-17 21:20:04 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-09-17 21:20:04 +0000 |
commit | c2966e2771806280acae359474ea9ce7799776bb (patch) | |
tree | 58b10f2ba464530b866faf463b83b9cde9ed50ae /Master/texmf-dist/source/latex/reledmac/reledmac.dtx | |
parent | f160c5eb0e0ad64a045468874f9824dd6994a389 (diff) |
reledmac (17sep20)
git-svn-id: svn://tug.org/texlive/trunk@56367 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 | 49 |
1 files changed, 40 insertions, 9 deletions
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index a2e92f6b3e9..cf019983342 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -563,6 +563,8 @@ % \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.} +% \changes{v2.34.4}{2020/09/16}{Fix some bugs with lineation by page, when a numbered section starts at the very beginning of page.} +% \changes{v2.34.4}{2020/09/16}{Fix bugs with \protect\cs{parafootsepX} outside of numbered section.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -4403,7 +4405,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2020/08/19 v2.34.3 typesetting critical editions]% +\ProvidesPackage{reledmac}[2020/09/16 v2.34.4 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -5026,6 +5028,20 @@ }% % \end{macrocode} % \end{macro} +% \begin{macro}{\led@error@fail@patch@setcounter} +% \begin{macrocode} +\newcommand{\led@error@fail@patch@setcounter}{% + \reledmac@error{Failed to patch the \string\setcounter\space command}{\@ehc}% +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\led@error@fail@patch@addtocounter} +% \begin{macrocode} +\newcommand{\led@error@fail@patch@addtocounter}{% + \reledmac@error{Failed to patch the \string\addtocounter\space command}{\@ehc}% +}% +% \end{macrocode} +% \end{macro} % \begin{macro}{\led@warn@edinde@outsidenumbering} % \begin{macrocode} \newcommand{\led@warn@edinde@outsidenumbering}{% @@ -6694,9 +6710,9 @@ \fi% \fi \page@numR=#1% - \this@section@page@numR=#1% + \global\this@section@page@numR=#1% \last@page@numR=#1% - \this@section@last@page@numR=#1% + \global\this@section@last@page@numR=#1% \def\next@page@numR{#1}% \gdef\this@section@next@page@numR{#1}% \fi @@ -7344,7 +7360,7 @@ % It is written in the file list. % If we process a line-list file which used a older version, that means the commands used inside are deprecated, and we can't use them. % \begin{macrocode} -\newcommand{\this@line@list@version}{7}% +\newcommand{\this@line@list@version}{8}% % \end{macrocode} % \end{macro} % \begin{macro}{\line@list@stuff} @@ -7432,7 +7448,6 @@ % \changes{v0.6.0}{2004/11/16}{Extended \protect\cs{new@line} to output page numbers} % \begin{macrocode} \newcommand*{\new@line}{% - \set@this@c@page% \ifnumberline% \IfStrEq{\led@pb@setting}{after}% {\xifinlist{\the\absline@num}{\l@prev@nopb}% @@ -13667,11 +13682,15 @@ {\csuse{parafootsepX@#1}}% {}% \global\csname prevpage#1@num\endcsname=\page@num% - \else% - \ifnumequal{\csuse{prevpage#1@num}}{\c@page}% + \else%We can't use directly the page counter, see https://tex.stackexchange.com/a/239457/7712 + \global\expandafter\advance\csname footnote#1@parafootsepX\endcsname by 1% + \edef\@tmpa{parafootsepX@#1@\the\csname footnote#1@parafootsepX\endcsname}% + \expandafter\edlabel\expandafter{\@tmpa}% + \edef\@tmpb{\expandafter\xpageref\expandafter{\@tmpa}}% + \IfStrEq{\csuse{prevpage#1@num}}{\@tmpb}% {\csuse{parafootsepX@#1}}% {}% - \global\csname prevpage#1@num\endcsname=\c@page% + \global\cslet{prevpage#1@num}{\@tmpb}% \fi% \fi% } @@ -15055,6 +15074,7 @@ % \begin{macrocode} \expandafter\newcount\csname prevpage#1@num\endcsname% \expandafter\newcount\csname prevpage#1@numR\endcsname% + \expandafter\newcount\csname footnote#1@parafootsepX\endcsname%For the case we use \parafootsepX outside of numbered section % \end{macrocode} % Add \cs{let}\cs{footnoteX}\cs{@gobble} to \cs{no@expands}. % \begin{macrocode} @@ -16224,9 +16244,10 @@ % \end{macro} % \begin{macro}{\@outputpage} % As its name says, \cs{@outputpage} is a \LaTeX\ macro called in the output routine. It is this macro which increases the \verb+page+ counter. -% We patch it in order to increase, conditionally, the \verb+par@page+ counter. +% We patch it in order to increase, conditionally, the \verb+par@page+ counter, and to set correctly the page number send to the auxiliaries file (\verb+.1+, \verb+.2+, etc.). % \begin{macrocode} \AtBeginDocument{% + \set@this@c@page% \apptocmd{\@outputpage}{% \ifsameparallelpagenumber% \ifl@dprintingpages% @@ -16243,6 +16264,16 @@ {}% {\led@error@fail@patch@@outputpage}% }% +\apptocmd{\setcounter}{% + \IfStrEq{#1}{page}{\set@this@c@page}{}% + }% + {}% + {\led@error@fail@patch@setcounter}% +\apptocmd{\addtocounter}{% + \IfStrEq{#1}{page}{\set@this@c@page}{}% + }% + {}% + {\led@error@fail@patch@addtocounter}% % \end{macrocode} % \end{macro} % |