From ecbec9cafc9521dc8b1bd2d8f7532c9d5419cbe4 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 28 Sep 2021 20:41:20 +0000 Subject: reledmac (28sep21) git-svn-id: svn://tug.org/texlive/trunk@60637 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/reledmac/reledmac.dtx | 7 ++++--- Master/texmf-dist/source/latex/reledmac/reledpar.dtx | 8 ++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index dd6a6f39c04..996dc980080 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -586,6 +586,7 @@ % \changes{v2.38.0}{2021/05/30}{Add hyperlinks between footnote and lemma when using abbreviated line range.} % \changes{v2.38.0}{2021/05/30}{Add \protect\cs{Xnopagenumberifcurrent} hook.} % \changes{v2.38.0}{2021/05/30}{Add \protect\cs{Xbeforepagenumber} hook.} +% \changes{v2.38.1}{2021/09/27}{Fix incompatibility between \protect\parpackage's option \protect\option{continuousnumberingwithcolumns} and lineation by page.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -4475,7 +4476,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2021/05/30 v2.38.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2021/09/27 v2.38.1 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -6808,7 +6809,7 @@ \ifbypage@R \ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum \ifboolexpr{% - bool{resumenumberingR@start}% + (bool{continuousnumberingwithcolumns} or bool{resumenumberingR@start})% and test {\ifnumequal{\last@page@numR}{-10000}}% }% {}% @@ -6821,7 +6822,7 @@ \fi \page@numR=#1% \global\this@section@page@numR=#1% - \last@page@numR=#1% + \global\last@page@numR=#1% \global\this@section@last@page@numR=#1% \def\next@page@numR{#1}% \gdef\this@section@next@page@numR{#1}% diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index 4fe935f799f..55d7ea094be 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -349,6 +349,7 @@ % \changes{v2.24.3}{2020/11/08}{Fix bug with hanging verse in parallel typesetting.} % \changes{v2.25.0}{2020/11/29}{Add compatibility with \protect\cs{linenumannotationothersidetrue} of \protect\macpackage.}. % \changes{v2.25.1}{2021/01/21}{\protect\cs{ifsublines@R} migrated to \protect\macpackage} +% \changes{v2.25.2}{2021/09/27}{Fix incompatibility with \protect\package{babel} v.3.61} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1405,7 +1406,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2021/03/08 v2.25.1a reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2021/09/27 v2.25.2 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -5617,7 +5618,10 @@ % that \protect\cs{theledlanguageL} and \protect\cs{theledlanguageR} are unaltered. % \begin{macrocode} \renewcommand*{\l@duselanguage}[1]{% - \expandafter\l@doldselectlanguage\expandafter{#1}} + \let\bbl@savelastskip\relax% Babel 3.61, which provokes spurious vertical space + \let\bbl@restorelastskip\relax%% Babel 3.61, which provokes spurious vertical space + \expandafter\l@doldselectlanguage\expandafter{#1}% + }% % \end{macrocode} % Lastly, initialise the left and right languages to the current \protect\package{babel} % one. -- cgit v1.2.3