diff options
Diffstat (limited to 'macros/latex/contrib/reledmac/reledmac.dtx')
-rw-r--r-- | macros/latex/contrib/reledmac/reledmac.dtx | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx index 2bce791494..2109ca38b5 100644 --- a/macros/latex/contrib/reledmac/reledmac.dtx +++ b/macros/latex/contrib/reledmac/reledmac.dtx @@ -602,6 +602,9 @@ % \changes{v2.39.7}{2023/08/21}{Again fix with hyperref, footnote and tabular environment} % \changes{v2.40.0}{2023/09/30}{Add\protect\cs{Xonlyonerule} and \protect\cs{onlyoneruleX} hooks} % \changes{v2.40.0}{2023/09/30}{Add\protect\option{onlyonerule} option} +% \changes{v2.40.1}{2024/05/11}{Reset \protect\cs{parfillskip} after paragraphed and columned footnote} +% \changes{v2.40.1}{2024/05/11}{Fix bug when using \protect\cs{edlabel} in \protect\env{edtabular} and related} +% \changes{v2.40.1}{2024/05/11}{Dealing with direction in \protect\cs{footnoteXtxt} when using LuaLaTeX} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -4528,7 +4531,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2023/08/21 v2.39.7 typesetting critical editions]% +\ProvidesPackage{reledmac}[2024/05/11 v2.40.1 typesetting critical editions]% % \end{macrocode} % % \subsection{Loading packages} @@ -10872,6 +10875,7 @@ % \item \protect\cs{splitmaxdepth}. % \item \protect\cs{floatingpenalty}, that is penalty values being added when a long note flows from one page to another. % Here, we let it to 0 when we process parallel pages in \protect\package{eledpar}, in order to allow notes to flow from left to right pages and \emph{vice-versa}. +% \item\cs{parfillskip} for ending of paragraph. % Otherwise, we let it to \protect\cs{@MM}, which is the standard \LaTeX\ \protect\cs{floatingpenalty}. % \end{itemize} % \changes{v0.7.0}{2005/02/18}{Added \protect\cs{footsplitskips} for use in many @@ -10883,8 +10887,12 @@ \unless\ifl@dprintingpages% \floatingpenalty=\@MM% \fi% - \splittopskip=\ht\strutbox \splitmaxdepth=\dp\strutbox - \leftskip=\z@skip \rightskip=\z@skip} + \splittopskip=\ht\strutbox% + \splitmaxdepth=\dp\strutbox% + \leftskip=\z@skip% + \rightskip=\z@skip% + \parfillskip=0pt plus 1fil% +} % \end{macrocode} % \end{macro} @@ -11169,6 +11177,7 @@ % Read \reff{width2columns} for the general description of the problem. % \begin{macrocode} \leftskip0pt \rightskip0pt + \parfillskip=0pt plus 1fil \ifl@dpairing\else% \hsize=\old@hsize% \fi% @@ -11349,6 +11358,7 @@ \let\bidi@RTL@everypar\@empty% \noindent\leavevmode% \let\bidi@RTL@everypar\old@bidi@RTL@everypar% + \parfillskip=0pt plus 1fil% }% % \end{macrocode} % \end{macro} @@ -13917,6 +13927,7 @@ }% \leftskip=\z@ \rightskip=\z@ + \parfillskip=0pt plus 1fil \setparindentX{#1}% \vskip\skip\@nameuse{footins#1}% \setnoteswidthliketwocolumnsX@{#1}% @@ -15589,6 +15600,10 @@ }% \expandafter\newcommand\csname footnote#1text\endcsname[2][]{% \begingroup% + \ifluatex% + \xdef\footnote@luatextextdir{\the\textdir}% + \xdef\footnote@luatexpardir{\the\pardir}% + \fi% \csuse{vfootnote#1}{#1}{\expandonce{##2}}{##1}% \endgroup% }% @@ -19897,8 +19912,8 @@ \listxadd{\@msdata@list}{% \@msd@options@iffullpage% \ifluatex% - \csxdef{footnote@luatextextdir}{\the\textdir}% - \csxdef{footnote@luatexpardir}{\the\pardir}% + \xdef\footnote@luatextextdir{\the\textdir}% + \xdef\footnote@luatexpardir{\the\pardir}% \fi% \csdef{@this@crossref@start}{\add@msd@c:start:msdata}% \csdef{@this@crossref@end}{\add@msd@c:end:msdata}% @@ -20457,12 +20472,12 @@ % \begin{macro}{\restore@edlabel} % We need to be able to modify and restore the \protect\cs{edlabel} macro. % \begin{macrocode} +\let\original@edlabel\edlabel% \newcommand{\disable@edlabel}{% - \let\old@edlabel\edlabel% \let\edlabel\@gobble% }% \newcommand{\restore@edlabel}{% - \let\edlabel\old@edlabel% + \let\edlabel\original@edlabel% }% % \end{macrocode} % \end{macro} |