texlive[42207] Master/texmf-dist: reledmac (4oct16)
commits+karl at tug.org
commits+karl at tug.org
Tue Oct 4 23:34:29 CEST 2016
Revision: 42207
http://tug.org/svn/texlive?view=revision&revision=42207
Author: karl
Date: 2016-10-04 23:34:29 +0200 (Tue, 04 Oct 2016)
Log Message:
-----------
reledmac (4oct16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/migration.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/migration.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2016-10-04 21:34:10 UTC (rev 42206)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2016-10-04 21:34:29 UTC (rev 42207)
@@ -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 at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}{%
\global\advance\footnote at reading by \@ne%
\get at thisfootnote%
- \get at fnmark{\thisfootnote}%
+ \get at fnmark{\thisfootnote}{\thisc at footnote}%
\ifcsdef{footnotereading\the\footnote at reading=typeset}%
{\setcounter{\@mpfn}{\csuse{footnotereading\the\footnote at reading=typeset}}}%
{\setcounter{\@mpfn}{\footnote at reading}}%
@@ -11132,8 +11132,10 @@
\newcommand{\get at thisfootnote}{%
\ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}{%
\protected at xdef\thisfootnote{\the\footnote at reading}%
+ \protected at xdef\thisc at footnote{\the\footnote at reading}%
}{%
- \protected at xdef\thisfootnote{\the\c at footnote}%
+ \protected at xdef\thisc at footnote{\the\c at footnote}%
+ \protected at xdef\thisfootnote{\thefootnote}%
}%
}%
@@ -11145,7 +11147,7 @@
\ifdefined\Hy at footnote@currentHref%
\noexpand\def\noexpand\Hy at footnote@currentHref{\Hy at footnote@currentHref}%
\fi%
- \noexpand\vl at dbfnote{{\expandonce\@tag}}{\thisfootnote}%
+ \noexpand\vl at dbfnote{{\expandonce\@tag}}{\thisfootnote}{\thisc at footnote}%
}%
\to\inserts at listR
\global\advance\insert at countR \@ne%
@@ -11154,7 +11156,7 @@
\ifdefined\Hy at footnote@currentHref%
\noexpand\def\noexpand\Hy at footnote@currentHref{\Hy at footnote@currentHref}%
\fi%
- \noexpand\vl at dbfnote{{\expandonce\@tag}}{\thisfootnote}%
+ \noexpand\vl at dbfnote{{\expandonce\@tag}}{\thisfootnote}{\thisc at footnote}%
}%
\to\inserts at list
\global\advance\insert at count \@ne%
@@ -11162,13 +11164,13 @@
\ignorespaces%
}%
-\newcommand{\get at fnmark}[1]{%
+\newcommand{\get at fnmark}[2]{%
\ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}%
{%
\stepcounter{footnote at typeset}%
\setcounter{footnote}{\c at footnote@typeset}%
\immediate\write\@mainaux{%
- \csgdef{footnotereading#1=typeset}{\the\c at footnote@typeset}%
+ \csgdef{footnotereading#2=typeset}{\the\c at footnote@typeset}%
}%
\def\@thefnmark{\thefootnote}%
}%
@@ -11177,8 +11179,8 @@
}%
}%
-\newcommand{\vl at dbfnote}[2]{%
- \get at fnmark{#2}%
+\newcommand{\vl at dbfnote}[3]{%
+ \get at fnmark{#2}{#3}%
\@footnotetext{#1}%
}%
% \end{macrocode}
@@ -11288,7 +11290,7 @@
% \begin{macrocode}
\newcommand*{\mpnormalvfootnoteX}[2]{%
\get at thisfootnoteX{#1}%
- \get at fnmarkX{#1}{\thisfootnote}%
+ \get at fnmarkX{#1}{\thisfootnote}{\thisc at footnote}%
\edef\this at footnoteX@reading{\the\csname footnote#1 at reading\endcsname}%
\global\setbox\@nameuse{mpfootins#1}\vbox{%
\unvbox\@nameuse{mpfootins#1}
@@ -11432,7 +11434,7 @@
\noexpand\led at set@index at fornote{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
\unexpanded{\def\this at footnoteX@reading}{\the\csname footnote#1 at reading\endcsname}%
- \noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}%
+ \noexpand\vbfnoteX{#1}{#2}{\thisfootnote}{\thisc at footnote}%
\noexpand\led at reinit@index at fornote%
\unexpanded{\advance\@edindex at fornote@\m at ne}%
}%
@@ -11449,7 +11451,7 @@
\noexpand\led at set@index at fornote{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
\unexpanded{\def\this at footnoteX@reading}{\the\csname footnote#1 at reading\endcsname}%
- \noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}%
+ \noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}{\thisc at footnote}%
\noexpand\led at reinit@index at fornote%
\unexpanded{\advance\@edindex at fornote@\m at ne}%
}%
@@ -11467,8 +11469,10 @@
\newcommand{\get at thisfootnoteX}[1]{%
\ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}{%
\protected at xdef\thisfootnote{\the\csname footnote#1 at reading\endcsname}%
+ \protected at xdef\thisc at footnote{\the\csname footnote#1 at reading\endcsname}%
}{%
- \protected at xdef\thisfootnote{\the\csname c at footnote#1\endcsname}%
+ \protected at xdef\thisfootnote{\csname thefootnote#1\endcsname}%
+ \protected at xdef\thisc at footnote{\the\csname c at footnote#1\endcsname}%
}%
}%
% \end{macrocode}
@@ -11477,8 +11481,8 @@
% This command calls the correct footnote-inserting commands.
%
% \begin{macrocode}
-\newcommand{\vbfnoteX}[3]{%
- \get at fnmarkX{#1}{#3}%
+\newcommand{\vbfnoteX}[4]{%
+ \get at fnmarkX{#1}{#3}{#4}%
\@nameuse{regvfootnote#1}{#1}{#2}%
}%
@@ -11488,7 +11492,7 @@
% \begin{macro}{\get at fnmarkX}
% This command gets the correct footnote number when typesetting parallel texts.
% \begin{macrocode}
-\newcommand{\get at fnmarkX}[2]{%
+\newcommand{\get at fnmarkX}[3]{%
\ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}%
{%
\stepcounter{footnote#1 at typeset}%
@@ -11495,7 +11499,7 @@
\setcounter{footnote#1}{\value{footnote#1 at typeset}}%
\@namedef{@thefnmark#1}{\csuse{thefootnote#1}}%
\immediate\write\@mainaux{%
- \csgdef{footnote#1reading#2=typeset}{\the\csname c at footnote#1 at typeset\endcsname}%
+ \csgdef{footnote#1reading#3=typeset}{\the\csname c at footnote#1 at typeset\endcsname}%
}%
}%
{%
@@ -11514,7 +11518,7 @@
\else
\def\this at footnoteX@reading{\the\csname footnote#1 at reading\endcsname}%
\get at thisfootnoteX{#1}%
- \get at fnmarkX{#1}{\expandonce\thisfootnote}%
+ \get at fnmarkX{#1}{\expandonce\thisfootnote}{\expandonce\thisc at footnote}%
\@nameuse{regvfootnote#1}{#1}{#2}%
\fi}
@@ -11906,7 +11910,7 @@
\egroup}
\newcommand*{\mppara at vfootnoteX}[2]{%
\get at thisfootnoteX{#1}%
- \get at fnmarkX{#1}{\thisfootnote}%
+ \get at fnmarkX{#1}{\thisfootnote}{\thisc at footnote}%
\edef\this at footnoteX@reading{\the\csname footnote#1 at reading\endcsname}%
\global\setbox\@nameuse{mpfootins#1}\vbox{%
\unvbox\@nameuse{mpfootins#1}
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2016-10-04 21:34:10 UTC (rev 42206)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2016-10-04 21:34:29 UTC (rev 42207)
@@ -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 at series{#1}}
@@ -3239,7 +3238,7 @@
\ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}{%
\global\advance\footnote at reading by \@ne%
\get at thisfootnote%
- \get at fnmark{\thisfootnote}%
+ \get at fnmark{\thisfootnote}{\thisc at footnote}%
\ifcsdef{footnotereading\the\footnote at reading=typeset}%
{\setcounter{\@mpfn}{\csuse{footnotereading\the\footnote at reading=typeset}}}%
{\setcounter{\@mpfn}{\footnote at reading}}%
@@ -3253,8 +3252,10 @@
\newcommand{\get at thisfootnote}{%
\ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}{%
\protected at xdef\thisfootnote{\the\footnote at reading}%
+ \protected at xdef\thisc at footnote{\the\footnote at reading}%
}{%
- \protected at xdef\thisfootnote{\the\c at footnote}%
+ \protected at xdef\thisc at footnote{\the\c at footnote}%
+ \protected at xdef\thisfootnote{\thefootnote}%
}%
}%
@@ -3266,7 +3267,7 @@
\ifdefined\Hy at footnote@currentHref%
\noexpand\def\noexpand\Hy at footnote@currentHref{\Hy at footnote@currentHref}%
\fi%
- \noexpand\vl at dbfnote{{\expandonce\@tag}}{\thisfootnote}%
+ \noexpand\vl at dbfnote{{\expandonce\@tag}}{\thisfootnote}{\thisc at footnote}%
}%
\to\inserts at listR
\global\advance\insert at countR \@ne%
@@ -3275,7 +3276,7 @@
\ifdefined\Hy at footnote@currentHref%
\noexpand\def\noexpand\Hy at footnote@currentHref{\Hy at footnote@currentHref}%
\fi%
- \noexpand\vl at dbfnote{{\expandonce\@tag}}{\thisfootnote}%
+ \noexpand\vl at dbfnote{{\expandonce\@tag}}{\thisfootnote}{\thisc at footnote}%
}%
\to\inserts at list
\global\advance\insert at count \@ne%
@@ -3283,13 +3284,13 @@
\ignorespaces%
}%
-\newcommand{\get at fnmark}[1]{%
+\newcommand{\get at fnmark}[2]{%
\ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}%
{%
\stepcounter{footnote at typeset}%
\setcounter{footnote}{\c at footnote@typeset}%
\immediate\write\@mainaux{%
- \csgdef{footnotereading#1=typeset}{\the\c at footnote@typeset}%
+ \csgdef{footnotereading#2=typeset}{\the\c at footnote@typeset}%
}%
\def\@thefnmark{\thefootnote}%
}%
@@ -3298,8 +3299,8 @@
}%
}%
-\newcommand{\vl at dbfnote}[2]{%
- \get at fnmark{#2}%
+\newcommand{\vl at dbfnote}[3]{%
+ \get at fnmark{#2}{#3}%
\@footnotetext{#1}%
}%
\newcommand*{\prebodyfootmark}{%
@@ -3348,7 +3349,7 @@
\newcommand*{\mpnormalvfootnoteX}[2]{%
\get at thisfootnoteX{#1}%
- \get at fnmarkX{#1}{\thisfootnote}%
+ \get at fnmarkX{#1}{\thisfootnote}{\thisc at footnote}%
\edef\this at footnoteX@reading{\the\csname footnote#1 at reading\endcsname}%
\global\setbox\@nameuse{mpfootins#1}\vbox{%
\unvbox\@nameuse{mpfootins#1}
@@ -3444,7 +3445,7 @@
\noexpand\led at set@index at fornote{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
\unexpanded{\def\this at footnoteX@reading}{\the\csname footnote#1 at reading\endcsname}%
- \noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}%
+ \noexpand\vbfnoteX{#1}{#2}{\thisfootnote}{\thisc at footnote}%
\noexpand\led at reinit@index at fornote%
\unexpanded{\advance\@edindex at fornote@\m at ne}%
}%
@@ -3461,7 +3462,7 @@
\noexpand\led at set@index at fornote{#1}%
\noexpand\prepare at edindex@fornote{\l at d@nums}%
\unexpanded{\def\this at footnoteX@reading}{\the\csname footnote#1 at reading\endcsname}%
- \noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}%
+ \noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}{\thisc at footnote}%
\noexpand\led at reinit@index at fornote%
\unexpanded{\advance\@edindex at fornote@\m at ne}%
}%
@@ -3473,16 +3474,18 @@
\newcommand{\get at thisfootnoteX}[1]{%
\ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}{%
\protected at xdef\thisfootnote{\the\csname footnote#1 at reading\endcsname}%
+ \protected at xdef\thisc at footnote{\the\csname footnote#1 at reading\endcsname}%
}{%
- \protected at xdef\thisfootnote{\the\csname c at footnote#1\endcsname}%
+ \protected at xdef\thisfootnote{\csname thefootnote#1\endcsname}%
+ \protected at xdef\thisc at footnote{\the\csname c at footnote#1\endcsname}%
}%
}%
-\newcommand{\vbfnoteX}[3]{%
- \get at fnmarkX{#1}{#3}%
+\newcommand{\vbfnoteX}[4]{%
+ \get at fnmarkX{#1}{#3}{#4}%
\@nameuse{regvfootnote#1}{#1}{#2}%
}%
-\newcommand{\get at fnmarkX}[2]{%
+\newcommand{\get at fnmarkX}[3]{%
\ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}%
{%
\stepcounter{footnote#1 at typeset}%
@@ -3489,7 +3492,7 @@
\setcounter{footnote#1}{\value{footnote#1 at typeset}}%
\@namedef{@thefnmark#1}{\csuse{thefootnote#1}}%
\immediate\write\@mainaux{%
- \csgdef{footnote#1reading#2=typeset}{\the\csname c at footnote#1 at typeset\endcsname}%
+ \csgdef{footnote#1reading#3=typeset}{\the\csname c at footnote#1 at typeset\endcsname}%
}%
}%
{%
@@ -3502,7 +3505,7 @@
\else
\def\this at footnoteX@reading{\the\csname footnote#1 at reading\endcsname}%
\get at thisfootnoteX{#1}%
- \get at fnmarkX{#1}{\expandonce\thisfootnote}%
+ \get at fnmarkX{#1}{\expandonce\thisfootnote}{\expandonce\thisc at footnote}%
\@nameuse{regvfootnote#1}{#1}{#2}%
\fi}
@@ -3772,7 +3775,7 @@
\egroup}
\newcommand*{\mppara at vfootnoteX}[2]{%
\get at thisfootnoteX{#1}%
- \get at fnmarkX{#1}{\thisfootnote}%
+ \get at fnmarkX{#1}{\thisfootnote}{\thisc at footnote}%
\edef\this at footnoteX@reading{\the\csname footnote#1 at reading\endcsname}%
\global\setbox\@nameuse{mpfootins#1}\vbox{%
\unvbox\@nameuse{mpfootins#1}
More information about the tex-live-commits
mailing list