From a54d580a3fabbe9506227e953f7e31598ada525c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 7 Oct 2016 22:24:15 +0000 Subject: reledmac (7oct16) git-svn-id: svn://tug.org/texlive/trunk@42224 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 61 ++++++++++++----------- 1 file changed, 31 insertions(+), 30 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 08f67c5869a..6e6cf89267c 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}[2016/10/04 v2.16.1 typesetting critical editions]% +\ProvidesPackage{reledmac}[2016/10/07 v2.16.2 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -133,12 +133,15 @@ \newif\if@ledgroup% \newif\ifl@imakeidx \@ifpackageloaded{imakeidx}{\l@imakeidxtrue}{}%False is the default value + \newif\ifl@indextools% \@ifpackageloaded{indextools}{% \l@indextoolstrue% \l@imakeidxtrue% \let\imki@wrindexentry\indtl@wrindexentry% }{}% +\newif\ifl@footmisc +\@ifpackageloaded{footmisc}{\l@footmisctrue}{}%False is the default value \ifdef{\if@RTL}{}{\newif\if@RTL} \newif\if@firstlineofpage% \newif\if@firstlineofpageR% @@ -276,11 +279,8 @@ \newcommand{\led@err@FootnoteNotInSecondArgEdtext}[1]{% \reledmac@error{#1footnote outside of the second argument of an edtext. Check syntax}{\@ehc}% }% -\newcommand{\led@error@ImakeidxAfterEledmac}{% - \reledmac@error{Imakeidx must be loaded before reledmac.}{\@ehc}% -}% -\newcommand{\led@error@IndextoolsAfterEledmac}{% - \reledmac@error{Indextools must be loaded before reledmac.}{\@ehc}% +\newcommand{\led@error@PackageAfterEledmac}[1]{% + \reledmac@error{#1 must be loaded before reledmac.}{\@ehc}% }% \newcommand{\led@error@fail@patch@@makecol}{% \reledmac@error{Fail to patch \string\@makecol\space command.}{\@ehc}% @@ -3238,7 +3238,7 @@ \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{% \global\advance\footnote@reading by \@ne% \get@thisfootnote% - \get@fnmark{\thisfootnote}{\thisc@footnote}% + \get@fnmark{\thisc@footnote}% \ifcsdef{footnotereading\the\footnote@reading=typeset}% {\setcounter{\@mpfn}{\csuse{footnotereading\the\footnote@reading=typeset}}}% {\setcounter{\@mpfn}{\footnote@reading}}% @@ -3251,11 +3251,9 @@ \newcommand{\get@thisfootnote}{% \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{% - \protected@xdef\thisfootnote{\the\footnote@reading}% \protected@xdef\thisc@footnote{\the\footnote@reading}% }{% \protected@xdef\thisc@footnote{\the\c@footnote}% - \protected@xdef\thisfootnote{\thefootnote}% }% }% @@ -3267,7 +3265,7 @@ \ifdefined\Hy@footnote@currentHref% \noexpand\def\noexpand\Hy@footnote@currentHref{\Hy@footnote@currentHref}% \fi% - \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}{\thisc@footnote}% + \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisc@footnote}% }% \to\inserts@listR \global\advance\insert@countR \@ne% @@ -3276,7 +3274,7 @@ \ifdefined\Hy@footnote@currentHref% \noexpand\def\noexpand\Hy@footnote@currentHref{\Hy@footnote@currentHref}% \fi% - \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}{\thisc@footnote}% + \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisc@footnote}% }% \to\inserts@list \global\advance\insert@count \@ne% @@ -3284,23 +3282,24 @@ \ignorespaces% }% -\newcommand{\get@fnmark}[2]{% +\newcommand{\get@fnmark}[1]{% \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}% {% \stepcounter{footnote@typeset}% \setcounter{footnote}{\c@footnote@typeset}% \immediate\write\@mainaux{% - \csgdef{footnotereading#2=typeset}{\the\c@footnote@typeset}% + \csgdef{footnotereading#1=typeset}{\the\c@footnote@typeset}% }% \def\@thefnmark{\thefootnote}% }% {% - \@namedef{@thefnmark}{#1}% + \setcounter{footnote}{#1}% + \def\@thefnmark{\thefootnote}% }% }% -\newcommand{\vl@dbfnote}[3]{% - \get@fnmark{#2}{#3}% +\newcommand{\vl@dbfnote}[2]{% + \get@fnmark{#2}% \@footnotetext{#1}% }% \newcommand*{\prebodyfootmark}{% @@ -3349,7 +3348,7 @@ \newcommand*{\mpnormalvfootnoteX}[2]{% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\thisfootnote}{\thisc@footnote}% + \get@fnmarkX{#1}{\thisc@footnote}% \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} @@ -3445,7 +3444,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}{\thisfootnote}{\thisc@footnote}% + \noexpand\vbfnoteX{#1}{#2}{\thisc@footnote}% \noexpand\led@reinit@index@fornote% \unexpanded{\advance\@edindex@fornote@\m@ne}% }% @@ -3462,7 +3461,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}{\expandonce\thisfootnote}{\thisc@footnote}% + \noexpand\vbfnoteX{#1}{#2}{\thisc@footnote}% \noexpand\led@reinit@index@fornote% \unexpanded{\advance\@edindex@fornote@\m@ne}% }% @@ -3473,30 +3472,29 @@ \newcommand{\get@thisfootnoteX}[1]{% \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{% - \protected@xdef\thisfootnote{\the\csname footnote#1@reading\endcsname}% \protected@xdef\thisc@footnote{\the\csname footnote#1@reading\endcsname}% }{% - \protected@xdef\thisfootnote{\csname thefootnote#1\endcsname}% \protected@xdef\thisc@footnote{\the\csname c@footnote#1\endcsname}% }% }% -\newcommand{\vbfnoteX}[4]{% - \get@fnmarkX{#1}{#3}{#4}% +\newcommand{\vbfnoteX}[3]{% + \get@fnmarkX{#1}{#3}% \@nameuse{regvfootnote#1}{#1}{#2}% }% -\newcommand{\get@fnmarkX}[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#3=typeset}{\the\csname c@footnote#1@typeset\endcsname}% + \csgdef{footnote#1reading#2=typeset}{\the\csname c@footnote#1@typeset\endcsname}% }% }% {% - \@namedef{@thefnmark#1}{#2}% + \setcounter{footnote#1}{#2}% + \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}% }% } \newcommand{\vnumfootnoteX}[2]{% @@ -3505,7 +3503,7 @@ \else \def\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\expandonce\thisfootnote}{\expandonce\thisc@footnote}% + \get@fnmarkX{#1}{\expandonce\thisc@footnote}% \@nameuse{regvfootnote#1}{#1}{#2}% \fi} @@ -3775,7 +3773,7 @@ \egroup} \newcommand*{\mppara@vfootnoteX}[2]{% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\thisfootnote}{\thisc@footnote}% + \get@fnmarkX{#1}{\thisc@footnote}% \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} @@ -6098,10 +6096,13 @@ \newif\ifledgroupnotesR@ \AtBeginDocument{% \unless\ifl@imakeidx% - \@ifpackageloaded{imakeidx}{\led@error@ImakeidxAfterEledmac}{}% + \@ifpackageloaded{imakeidx}{\led@error@PackageAfterEledmac{imakeidx}}{}% \fi% \unless\ifl@indextools% - \@ifpackageloaded{indextools}{\led@error@indextoolsAfterEledmac}{}% + \@ifpackageloaded{indextools}{\led@error@PackageAfterEledmac{indextools}}{}% + \fi% + \unless\ifl@footmisc% + \@ifpackageloaded{footmisc}{\led@error@PackageAfterEledmac{footmisc}}{}% \fi% } \newcommand{\pagelinesep}{-} -- cgit v1.2.3