From 8f297a0f3c1cb1bae98db441a5f5964a066150e1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 4 Feb 2020 22:20:09 +0000 Subject: reledmac (4feb20) git-svn-id: svn://tug.org/texlive/trunk@53675 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/source/latex/reledmac/reledmac.dtx | 28 ++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) (limited to 'Master/texmf-dist/source/latex/reledmac') diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index 4c9a2b16cdc..41a7e622448 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -539,6 +539,10 @@ % \changes{v2.32.1}{2019/07/21}{When using \protect\cs{parindentX} or \protect\cs{Xparindent} and stanza, use the normal indentation in the footnote, not the verse indentation.} % \changes{v2.32.2}{2019/11/28}{Fix spurious vertical space in familiar footnotes with \protect\LuaLaTeX.} % \changes{v2.32.3}{2019/12/09}{Fix bug with critical footnotes when typesetting arabic text with \protect\package{polyglossia}.} +% \changes{v2.32.4}{2020/02/04}{Fix bug \protect\cs{footnoteXmark} and \protect\cs{footnoteXtext}.} +% \changes{v2.32.4}{2020/01/04}{\protect\cs{footnoteXmark} and \protect\cs{footnoteXtext} can now have an optional argument, setting the footnotenote number.} +% \changes{v2.32.4}{2020/02/04}{Fix bug when using \protect\cs{Xgroupbyline} and twocol arrangement.} +% \changes{v2.32.4}{2020/02/04}{Fix bug with three and two columns footnotes when using \protect\package{bidi}.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -4317,7 +4321,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2019/12/09 v2.32.3 typesetting critical editions]% +\ProvidesPackage{reledmac}[2020/02/04 v2.32.4 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -10050,7 +10054,7 @@ \unvbox\@nameuse{mp##1footins}% \fi% \X@atbegininsertion{##1}% - \ifcsstring{series@display##1}% + \ifcsstring{series@display##1}{normal}% {% \Xledsetnormalparstuff{##1}% \rule\z@\splittopskip% @@ -11352,6 +11356,7 @@ \prepare@Xgroupbyline{#1}{#2}{\threecolvfootnote@inserted}% }% {% + \let\bidi@RTL@everypar\relax% \X@beforeinsertion{#1}% \insert\csname #1footins\endcsname{% \threecolvfootnote@inserted{#1}{#2}% @@ -11517,6 +11522,7 @@ \iftoggle{Xgroupbyline@#1}{% \prepare@Xgroupbyline{#1}{#2}{\twocolvfootnote@inserted}% }{% + \let\bidi@RTL@everypar\relax% \X@beforeinsertion{#1}% \insert\csname #1footins\endcsname{% \twocolvfootnote@inserted{#1}{#2}% @@ -11547,7 +11553,9 @@ % \begin{macrocode} \newcommand{\twocol@begin@insert}[1]{% \normal@pars% - \hsize \csuse{Xhsizetwocol@#1}% + \nottoggle{Xgroupbyline@#1}% + {\hsize \csuse{Xhsizetwocol@#1}}% + {}% \Xsetparindent{#1}% \tolerance=5000% \Xsethangindent{#1}% @@ -13060,6 +13068,7 @@ % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnoteX}[2]{% \beforeinsertion@X{#1}% + \let\bidi@RTL@everypar\relax% \insert\csname footins#1\endcsname\bgroup% \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% @@ -13183,6 +13192,7 @@ % \protect\cs{threecolvfootnoteX}\marg{series}\marg{text} % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnoteX}[2]{% + \let\bidi@RTL@everypar\relax% \beforeinsertion@X{#1}% \insert\csname footins#1\endcsname\bgroup% \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% @@ -14850,18 +14860,22 @@ % \end{macrocode} % And now, define \cs{footnoteXmark} and \cs{footnoteXtext}, equivalent to classical \cs{footnotemark} and \cs{footnotetext}. % \begin{macrocode} - \expandafter\newcommand\csname footnote#1mark\endcsname{% + \expandafter\newcommand\csname footnote#1mark\endcsname[1][]{% \begingroup% \prepare@prenotesX{#1}% - \stepcounter{footnote#1}% + \ifstrempty{##1}{% + \stepcounter{footnote#1}% + }{% + \setcounter{footnote#1}{##1}% + }% \protected@csxdef{@thefnmark#1}{\csuse{thefootnote#1}}% \csuse{@footnotemark#1}% \m@mmf@prepare% \endgroup% }% - \expandafter\newcommand\csname footnote#1text\endcsname[1]{% + \expandafter\newcommand\csname footnote#1text\endcsname[2][]{% \begingroup% - \csuse{vfootnote#1}{#1}{\expandonce{##1}}% + \csuse{vfootnote#1}{#1}{\expandonce{##2}}{##1}% \endgroup% }% % \end{macrocode} -- cgit v1.2.3