From fb9a8ffb415de6aca48954ade22852bc93eb7f89 Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Sun, 9 Jul 2023 03:01:12 +0000 Subject: CTAN sync 202307090301 --- macros/latex/contrib/reledmac/reledmac.dtx | 51 +++++++++++++++++++----------- 1 file changed, 32 insertions(+), 19 deletions(-) (limited to 'macros/latex/contrib/reledmac/reledmac.dtx') diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx index 416894fb73..a23876c9cd 100644 --- a/macros/latex/contrib/reledmac/reledmac.dtx +++ b/macros/latex/contrib/reledmac/reledmac.dtx @@ -592,8 +592,9 @@ % \changes{v2.39.0}{2021/01/11}{Add \protect\cs{Xnotboxingsubline} and \protect\cs{Xendnotboxingsubline} hooks.} % \changes{v2.39.1}{2021/02/04}{Fix bug with index in familiar and critical footnotes.} % \changes{v2.39.2}{2023/07/04}{Fix bug with \protect\cs{edlabel} in \protect\cs{eledsection} and related.} -% \changes{v2.39.2}{2022/07/04}{Fix bug with with \protect\option{continuousnumberingwithcolumns} when right column starts a new page and we use lineation by page.} -% \changes{v2.39.2}{2022/07/04}{Tools for \protect\parpackage v2.25.4} +% \changes{v2.39.2}{2023/07/04}{Fix bug with with \protect\option{continuousnumberingwithcolumns} when right column starts a new page and we use lineation by page.} +% \changes{v2.39.2}{2023/07/04}{Tools for \protect\parpackage v2.25.4} +% \changes{v2.39.3}{2023/07/08}{Fix big with \protect\cs{edlabel} after tabular environment (added by v2.39.2).} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -4506,7 +4507,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2023/07/04 v2.39.2 typesetting critical editions]% +\ProvidesPackage{reledmac}[2023/07/08 v2.39.3 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -20358,11 +20359,11 @@ % We need to be able to modify and restore the \protect\cs{edlabel} macro. % \begin{macrocode} \newcommand{\disable@edlabel}{% - \global\let\old@edlabel\edlabel% - \global\let\edlabel\@gobble% + \let\old@edlabel\edlabel% + \let\edlabel\@gobble% }% \newcommand{\restore@edlabel}{% - \global\let\edlabel\old@edlabel% + \let\edlabel\old@edlabel% }% % \end{macrocode} % \end{macro} @@ -20436,7 +20437,7 @@ % Nullify and restore some column fillers, etc. % \begin{macrocode} \newcommand{\l@dnullfills}{% - \def\edlabel##1{}% + \disable@edlabel% \def\edrowfill##1##2##3{}% } \newcommand{\l@drestorefills}{% @@ -20708,7 +20709,8 @@ % \begin{macro}{\setmcellright} % Typeset (recursively) cells of display math right justified. % \begin{macrocode} -\def\setmcellright #1&{\def\edlabel##1{}% +\def\setmcellright #1&{% + \disable@edlabel% \let\edindex\nulledindex \ifx #1\\ \ifnum\l@dcolcount=0%\removelastskip \let\Next\relax% @@ -20733,7 +20735,8 @@ % \begin{macro}{\settcellright} % Typeset (recursively) cells of text right justified. % \begin{macrocode} -\def\settcellright #1&{\def\edlabel##1{}% +\def\settcellright #1&{% + \disable@edlabel% \let\edindex\nulledindex \ifx #1\\ \ifnum\l@dcolcount=0%\removelastskip \let\Next\relax% @@ -20757,7 +20760,8 @@ % \begin{macro}{\setmcellleft} % Typeset (recursively) cells of display math left justified. % \begin{macrocode} -\def\setmcellleft #1&{\def\edlabel##1{}% +\def\setmcellleft #1&{% + \disable@edlabel% \let\edindex\nulledindex \ifx #1\\ \ifnum\l@dcolcount=0 \let\Next\relax% \else\l@dcolcount=0% @@ -20779,7 +20783,8 @@ % \begin{macro}{\settcellleft} % Typeset (recursively) cells of text left justified. % \begin{macrocode} -\def\settcellleft #1&{\def\edlabel##1{}% +\def\settcellleft #1&{% + \disable@edlabel% \let\edindex\nulledindex \ifx #1\\ \ifnum\l@dcolcount=0 \let\Next\relax% \else\l@dcolcount=0% @@ -20800,7 +20805,8 @@ % \begin{macro}{\setmcellcenter} % Typeset (recursively) cells of display math centered. % \begin{macrocode} -\def\setmcellcenter #1&{\def\edlabel##1{}% +\def\setmcellcenter #1&{% + \disable@edlabel% \let\edindex\nulledindex \ifx #1\\ \ifnum\l@dcolcount=0\let\Next\relax% \else\l@dcolcount=0% @@ -20823,7 +20829,8 @@ % \begin{macro}{\settcellcenter} % Typeset (recursively) cells of text centered. % \begin{macrocode} -\def\settcellcenter #1&{\def\edlabel##1{}% +\def\settcellcenter #1&{% + \disable@edlabel% \let\edindex\nulledindex \ifx #1\\ \ifnum\l@dcolcount=0 \let\Next\relax% \else\l@dcolcount=0% @@ -21092,7 +21099,8 @@ \newcommand{\leftctab}[2]{% \hb@xt@\z@{\vbox{\edtabindent\l@dcolcount=\l@dampcount% \advance\Hilfsskip by 0.5\dcoli% - \setbox\hilfsbox=\hbox{\def\edlabel##1{}% + \setbox\hilfsbox=\hbox{% + \disable@edlabel% \disablel@dtabfeet$\displaystyle{#2}$}% \advance\Hilfsskip by -0.5\wd\hilfsbox% \moveleft\Hilfsskip\hbox{\ #1}}\hss}% @@ -21105,12 +21113,14 @@ % \protect\cs{rightctab}\marg{math}\marg{text} for \protect\cs{edaftertab} in \protect\cs{ctab}. % \begin{macrocode} \newcommand{\rightctab}[2]{% - \setbox\hilfsbox=\hbox{\def\edlabel##1{}% + \setbox\hilfsbox=\hbox{% + \disable@edlabel% \disablel@dtabfeet#2}\l@dampcount=\l@dcolcount% #1\hb@xt@\z@{\vbox{\edtabindent\l@dcolcount=\l@dampcount% \advance\Hilfsskip by 0.5\l@dcolwidth% \advance\Hilfsskip by -\wd\hilfsbox% - \setbox\hilfsbox=\hbox{\def\edlabel##1{}% + \setbox\hilfsbox=\hbox{% + \disable@edlabel% \disablel@dtabfeet$\displaystyle{#1}$}% \advance\Hilfsskip by -0.5\wd\hilfsbox% \advance\Hilfsskip by \edtabcolsep% @@ -21124,12 +21134,14 @@ % \protect\cs{rightltab}\marg{math}\marg{text} for \protect\cs{edaftertab} in \protect\cs{ltab}. % \begin{macrocode} \newcommand{\rightltab}[2]{% - \setbox\hilfsbox=\hbox{\def\edlabel##1{}% + \setbox\hilfsbox=\hbox{% + \disable@edlabel% \disablel@dtabfeet#2}\l@dampcount=\l@dcolcount% #1\hb@xt@\z@{\vbox{\edtabindent\l@dcolcount=\l@dampcount% \advance\Hilfsskip by\l@dcolwidth% \advance\Hilfsskip by-\wd\hilfsbox% - \setbox\hilfsbox=\hbox{\def\edlabel##1{}% + \setbox\hilfsbox=\hbox{% + \disable@edlabel% \disablel@dtabfeet$\displaystyle{#1}$}% \advance\Hilfsskip by-\wd\hilfsbox% \advance\Hilfsskip by\edtabcolsep% @@ -21143,7 +21155,8 @@ % \protect\cs{rightrtab}\marg{math}\marg{text} for \protect\cs{edaftertab} in \protect\cs{rtab}. % \begin{macrocode} \newcommand{\rightrtab}[2]{% - \setbox\hilfsbox=\hbox{\def\edlabel##1{}% + \setbox\hilfsbox=\hbox{% + \disable@edlabel% \disablel@dtabfeet#2}% #1\hb@xt@\z@{\vbox{\edtabindent% \advance\Hilfsskip by-\wd\hilfsbox% -- cgit v1.2.3