From 24748f7503a2f497895f7275c53a40398674f23d Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 30 Nov 2018 21:51:01 +0000 Subject: reledmac (30nov18) git-svn-id: svn://tug.org/texlive/trunk@49287 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 94 +++++++++++++---------- 1 file changed, 53 insertions(+), 41 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index c725a1a0238..aa8fe5e2b36 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2018/10/12 v2.27.1 typesetting critical editions]% +\ProvidesPackage{reledmac}[2018/11/30 v2.28.0 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -3878,10 +3878,14 @@ \spaceskip=\z@skip \xspaceskip=\z@skip \csuse{\csuse{footnote@dir}}\@nameuse{footfmt#1}{#1}{#2}\egroup} -\newcommand*{\mpnormalvfootnoteX}[2]{% +\newcommand*{\mpnormalvfootnoteX}[3]{% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\thisc@footnote}% - \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% + \get@fnmarkX{#1}{\thisc@footnote}{#3}% + \ifstrempty{#3}{% + \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% + }{% + \edef\this@footnoteX@reading{###3}% + }% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} \noindent\csuse{bhooknoteX@#1}% @@ -3963,7 +3967,7 @@ \unvbox\@nameuse{mpfootins#1}} -\newcommand{\normalbfnoteX}[2]{% +\newcommand{\normalbfnoteX}[3]{% \get@thisfootnoteX{#1}% \ifledRcol% \ifluatex @@ -3976,7 +3980,7 @@ \noexpand\led@set@index@fornote{#1}% \noexpand\prepare@edindex@fornote{\l@d@nums}% \unexpanded{\def\this@footnoteX@reading}{\the\csname footnote#1@reading\endcsname}% - \noexpand\vbfnoteX{#1}{#2}{\thisc@footnote}% + \noexpand\vbfnoteX{#1}{#2}{\thisc@footnote}{#3}% \noexpand\led@reinit@index@fornote% \unexpanded{\advance\@edindex@fornote@\m@ne}% }% @@ -3993,7 +3997,7 @@ \noexpand\led@set@index@fornote{#1}% \noexpand\prepare@edindex@fornote{\l@d@nums}% \unexpanded{\def\this@footnoteX@reading}{\the\csname footnote#1@reading\endcsname}% - \noexpand\vbfnoteX{#1}{#2}{\thisc@footnote}% + \noexpand\vbfnoteX{#1}{#2}{\thisc@footnote}{#3}% \noexpand\led@reinit@index@fornote% \unexpanded{\advance\@edindex@fornote@\m@ne}% }% @@ -4009,36 +4013,40 @@ \protected@xdef\thisc@footnote{\the\csname c@footnote#1\endcsname}% }% }% -\newcommand{\vbfnoteX}[3]{% - \get@fnmarkX{#1}{#3}% +\newcommand{\vbfnoteX}[4]{% + \get@fnmarkX{#1}{#3}{#4}\relax% \@nameuse{regvfootnote#1}{#1}{#2}% }% +\newcommand{\get@fnmarkX}[3]{% + \ifstrempty{#3}{% + \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}% + {% + \stepcounter{footnote#1@typeset}% + \setcounter{footnote#1}{\value{footnote#1@typeset}}% + \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}% + \immediate\write\@mainaux{% + \csgdef{footnote#1reading#2=typeset}{\the\csname c@footnote#1@typeset\endcsname}% + }% + }% + {% + \setcounter{footnote#1}{#2}% + \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}% + }% + }% + {% + \csdef{@thefnmark#1}{#3}% + }% +}% -\newcommand{\get@fnmarkX}[2]{% - \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}% - {% - \stepcounter{footnote#1@typeset}% - \setcounter{footnote#1}{\value{footnote#1@typeset}}% - \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}% - \immediate\write\@mainaux{% - \csgdef{footnote#1reading#2=typeset}{\the\csname c@footnote#1@typeset\endcsname}% - }% - }% - {% - \setcounter{footnote#1}{#2}% - \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}% - }% -} -\newcommand{\vnumfootnoteX}[2]{% +\newcommand{\vnumfootnoteX}[3]{% \ifnumberedpar@ - \edtext{}{\normalbfnoteX{#1}{#2}}% + \edtext{}{\normalbfnoteX{#1}{#2}{#3}}% \else \def\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\expandonce\thisc@footnote}% + \get@fnmarkX{#1}{\expandonce\thisc@footnote}{#3}% \@nameuse{regvfootnote#1}{#1}{#2}% \fi} - \newcommand*{\arrangementX@normal}[1]{% \csgdef{series@displayX#1}{normal} \expandafter\let\csname footstart#1\endcsname=\normalfootstartX @@ -4304,9 +4312,9 @@ \box0 \penalty0 \egroup} -\newcommand*{\mppara@vfootnoteX}[2]{% +\newcommand*{\mppara@vfootnoteX}[3]{% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\thisc@footnote}% + \get@fnmarkX{#1}{\thisc@footnote}{#3}% \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} @@ -5210,27 +5218,31 @@ \expandafter\newinsert\csname mpfootins#1\endcsname% \fi% - \global\expandafter\newcommand\csname footnote#1\endcsname[1]{% + \global\expandafter\newcommand\csname footnote#1\endcsname[2][]{% \begingroup% \prepare@prenotesX{#1}% - \newcommand{\content}{##1}% + \newcommand{\content}{##2}% \ifdefined\csq@qlevel% \csq@qlevel=0\relax% \fi% \global\expandafter\advance\csname footnote#1@reading\endcsname by \@ne% - \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{% - \ifcsdef{footnote#1reading\the\csname footnote#1@reading\endcsname=typeset}% - {\setcounter{footnote#1}{\csuse{footnote#1reading\the\csname footnote#1@reading\endcsname=typeset}}}% - {\setcounter{footnote#1}{\the\csname footnote#1@reading\endcsname}}% - }{% - \stepcounter{footnote#1}% - }% + \ifstrempty{##1}{% + \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{% + \ifcsdef{footnote#1reading\the\csname footnote#1@reading\endcsname=typeset}% + {\setcounter{footnote#1}{\csuse{footnote#1reading\the\csname footnote#1@reading\endcsname=typeset}}}% + {\setcounter{footnote#1}{\the\csname footnote#1@reading\endcsname}}% + }{% + \stepcounter{footnote#1}% + }% + }{}% \ifledRcol% \ifcsstring{onlysideX@#1}{L}{\led@error@note@called@onrightside{footnote#1}}{}% \else% \ifcsstring{onlysideX@#1}{R}{\led@error@note@called@onleftside{footnote#1}}{}% \fi% - \protected@csxdef{@thefnmark#1}{\csuse{thefootnote#1}}% + \ifstrempty{##1}% + {\protected@csxdef{@thefnmark#1}{\csuse{thefootnote#1}}}% + {\protected@csxdef{@thefnmark#1}{##1}}% \nottoggle{nomk@}%Nomk is set to true when using \footnoteXnomk with \parpackage {\csuse{@footnotemark#1}}% {}% @@ -5241,7 +5253,7 @@ \if@ledgroup% \led@set@index@fornote{#1}% \fi% - \csuse{vfootnote#1}{#1}{\expandonce\content}\m@mmf@prepare% + \csuse{vfootnote#1}{#1}{\expandonce\content}{##1}\m@mmf@prepare% \ifbool{indtl@innote}% {\let\index\orig@@index}% {}% -- cgit v1.2.3