diff options
author | Karl Berry <karl@freefriends.org> | 2016-10-04 21:34:29 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-10-04 21:34:29 +0000 |
commit | 34e262f90a8915241c0599bc2c98030636fd60aa (patch) | |
tree | 5f8023c73f214f6d9c3247fd4593957a772b3b60 /Master/texmf-dist | |
parent | d90bb85661d0273758ed15830e16416bec46fc92 (diff) |
reledmac (4oct16)
git-svn-id: svn://tug.org/texlive/trunk@42207 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
11 files changed, 47 insertions, 40 deletions
diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf Binary files differindex 276a4cb6044..78ac81f92a5 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf Binary files differindex 14e80f3d303..6e86c55b18e 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf Binary files differindex 5afa0cbfcca..01668578f52 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf Binary files differindex 9f0eb081a7e..3ad08e59c0e 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf Binary files differindex 886ad4d359a..1b6ee7eb284 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf Binary files differindex 6058a66ae96..8afa6c45152 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf Binary files differindex 3ad11b7d6b1..f38c06a1cbf 100644 --- a/Master/texmf-dist/doc/latex/reledmac/migration.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/migration.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf Binary files differindex 4e4769eb27e..3f810b325dd 100644 --- a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf Binary files differindex 8ec011f2e4b..d55286fead1 100644 --- a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index 3f8299fe575..6be31ca2928 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -441,7 +441,7 @@ % \changes{v2.16.0}{2016/10/02}{Fix potential bug when using \protect\cs{edindex} in critical footnotes.} % \changes{v2.16.0}{2016/10/02}{Add \protect\cs{Xendpagenumberonlyfirst}, \protect\cs{Xendpagenumberonlyfirstifsingle}, \protect\cs{Xendpagenumberonlyfirstintwo}, \protect\cs{Xendinplaceofpagenumber} and \protect\cs{Xendsympagenum} hooks.} % \changes{v2.16.0}{2016/10/02}{When \protect\cs{edindex} is called outside of a \protect\cs{beginnumbering}\protect\ldots\protect\cs{endnumbering} structure, it is automatically switched to \protect\cs{index}, with a warning message.} - +% \changes{v2.16.1}{2016/10/04}{Fix bug with redefinition of the style of the footnote number (bug added in v2.12.0)} % \title{\Macpackage \\ % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} @@ -3837,7 +3837,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/10/02 v2.16.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2016/10/04 v2.16.1 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -11118,7 +11118,7 @@ \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{% \global\advance\footnote@reading by \@ne% \get@thisfootnote% - \get@fnmark{\thisfootnote}% + \get@fnmark{\thisfootnote}{\thisc@footnote}% \ifcsdef{footnotereading\the\footnote@reading=typeset}% {\setcounter{\@mpfn}{\csuse{footnotereading\the\footnote@reading=typeset}}}% {\setcounter{\@mpfn}{\footnote@reading}}% @@ -11132,8 +11132,10 @@ \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\thisfootnote{\the\c@footnote}% + \protected@xdef\thisc@footnote{\the\c@footnote}% + \protected@xdef\thisfootnote{\thefootnote}% }% }% @@ -11145,7 +11147,7 @@ \ifdefined\Hy@footnote@currentHref% \noexpand\def\noexpand\Hy@footnote@currentHref{\Hy@footnote@currentHref}% \fi% - \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}% + \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}{\thisc@footnote}% }% \to\inserts@listR \global\advance\insert@countR \@ne% @@ -11154,7 +11156,7 @@ \ifdefined\Hy@footnote@currentHref% \noexpand\def\noexpand\Hy@footnote@currentHref{\Hy@footnote@currentHref}% \fi% - \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}% + \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}{\thisc@footnote}% }% \to\inserts@list \global\advance\insert@count \@ne% @@ -11162,13 +11164,13 @@ \ignorespaces% }% -\newcommand{\get@fnmark}[1]{% +\newcommand{\get@fnmark}[2]{% \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#1=typeset}{\the\c@footnote@typeset}% + \csgdef{footnotereading#2=typeset}{\the\c@footnote@typeset}% }% \def\@thefnmark{\thefootnote}% }% @@ -11177,8 +11179,8 @@ }% }% -\newcommand{\vl@dbfnote}[2]{% - \get@fnmark{#2}% +\newcommand{\vl@dbfnote}[3]{% + \get@fnmark{#2}{#3}% \@footnotetext{#1}% }% % \end{macrocode} @@ -11288,7 +11290,7 @@ % \begin{macrocode} \newcommand*{\mpnormalvfootnoteX}[2]{% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\thisfootnote}% + \get@fnmarkX{#1}{\thisfootnote}{\thisc@footnote}% \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} @@ -11432,7 +11434,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}% + \noexpand\vbfnoteX{#1}{#2}{\thisfootnote}{\thisc@footnote}% \noexpand\led@reinit@index@fornote% \unexpanded{\advance\@edindex@fornote@\m@ne}% }% @@ -11449,7 +11451,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}% + \noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}{\thisc@footnote}% \noexpand\led@reinit@index@fornote% \unexpanded{\advance\@edindex@fornote@\m@ne}% }% @@ -11467,8 +11469,10 @@ \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{\the\csname c@footnote#1\endcsname}% + \protected@xdef\thisfootnote{\csname thefootnote#1\endcsname}% + \protected@xdef\thisc@footnote{\the\csname c@footnote#1\endcsname}% }% }% % \end{macrocode} @@ -11477,8 +11481,8 @@ % This command calls the correct footnote-inserting commands. % % \begin{macrocode} -\newcommand{\vbfnoteX}[3]{% - \get@fnmarkX{#1}{#3}% +\newcommand{\vbfnoteX}[4]{% + \get@fnmarkX{#1}{#3}{#4}% \@nameuse{regvfootnote#1}{#1}{#2}% }% @@ -11488,14 +11492,14 @@ % \begin{macro}{\get@fnmarkX} % This command gets the correct footnote number when typesetting parallel texts. % \begin{macrocode} -\newcommand{\get@fnmarkX}[2]{% +\newcommand{\get@fnmarkX}[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}% + \csgdef{footnote#1reading#3=typeset}{\the\csname c@footnote#1@typeset\endcsname}% }% }% {% @@ -11514,7 +11518,7 @@ \else \def\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\expandonce\thisfootnote}% + \get@fnmarkX{#1}{\expandonce\thisfootnote}{\expandonce\thisc@footnote}% \@nameuse{regvfootnote#1}{#1}{#2}% \fi} @@ -11906,7 +11910,7 @@ \egroup} \newcommand*{\mppara@vfootnoteX}[2]{% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\thisfootnote}% + \get@fnmarkX{#1}{\thisfootnote}{\thisc@footnote}% \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index cdaef71ac5f..08f67c5869a 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -32,11 +32,10 @@ - %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/10/02 v2.16.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2016/10/04 v2.16.1 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -3239,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}% + \get@fnmark{\thisfootnote}{\thisc@footnote}% \ifcsdef{footnotereading\the\footnote@reading=typeset}% {\setcounter{\@mpfn}{\csuse{footnotereading\the\footnote@reading=typeset}}}% {\setcounter{\@mpfn}{\footnote@reading}}% @@ -3253,8 +3252,10 @@ \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\thisfootnote{\the\c@footnote}% + \protected@xdef\thisc@footnote{\the\c@footnote}% + \protected@xdef\thisfootnote{\thefootnote}% }% }% @@ -3266,7 +3267,7 @@ \ifdefined\Hy@footnote@currentHref% \noexpand\def\noexpand\Hy@footnote@currentHref{\Hy@footnote@currentHref}% \fi% - \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}% + \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}{\thisc@footnote}% }% \to\inserts@listR \global\advance\insert@countR \@ne% @@ -3275,7 +3276,7 @@ \ifdefined\Hy@footnote@currentHref% \noexpand\def\noexpand\Hy@footnote@currentHref{\Hy@footnote@currentHref}% \fi% - \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}% + \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}{\thisc@footnote}% }% \to\inserts@list \global\advance\insert@count \@ne% @@ -3283,13 +3284,13 @@ \ignorespaces% }% -\newcommand{\get@fnmark}[1]{% +\newcommand{\get@fnmark}[2]{% \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#1=typeset}{\the\c@footnote@typeset}% + \csgdef{footnotereading#2=typeset}{\the\c@footnote@typeset}% }% \def\@thefnmark{\thefootnote}% }% @@ -3298,8 +3299,8 @@ }% }% -\newcommand{\vl@dbfnote}[2]{% - \get@fnmark{#2}% +\newcommand{\vl@dbfnote}[3]{% + \get@fnmark{#2}{#3}% \@footnotetext{#1}% }% \newcommand*{\prebodyfootmark}{% @@ -3348,7 +3349,7 @@ \newcommand*{\mpnormalvfootnoteX}[2]{% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\thisfootnote}% + \get@fnmarkX{#1}{\thisfootnote}{\thisc@footnote}% \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} @@ -3444,7 +3445,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}% + \noexpand\vbfnoteX{#1}{#2}{\thisfootnote}{\thisc@footnote}% \noexpand\led@reinit@index@fornote% \unexpanded{\advance\@edindex@fornote@\m@ne}% }% @@ -3461,7 +3462,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}% + \noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}{\thisc@footnote}% \noexpand\led@reinit@index@fornote% \unexpanded{\advance\@edindex@fornote@\m@ne}% }% @@ -3473,23 +3474,25 @@ \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{\the\csname c@footnote#1\endcsname}% + \protected@xdef\thisfootnote{\csname thefootnote#1\endcsname}% + \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}% \@nameuse{regvfootnote#1}{#1}{#2}% }% -\newcommand{\get@fnmarkX}[2]{% +\newcommand{\get@fnmarkX}[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}% + \csgdef{footnote#1reading#3=typeset}{\the\csname c@footnote#1@typeset\endcsname}% }% }% {% @@ -3502,7 +3505,7 @@ \else \def\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\expandonce\thisfootnote}% + \get@fnmarkX{#1}{\expandonce\thisfootnote}{\expandonce\thisc@footnote}% \@nameuse{regvfootnote#1}{#1}{#2}% \fi} @@ -3772,7 +3775,7 @@ \egroup} \newcommand*{\mppara@vfootnoteX}[2]{% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\thisfootnote}% + \get@fnmarkX{#1}{\thisfootnote}{\thisc@footnote}% \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} |