texlive[42224] Master/texmf-dist: reledmac (7oct16)
commits+karl at tug.org
commits+karl at tug.org
Sat Oct 8 00:24:16 CEST 2016
Revision: 42224
http://tug.org/svn/texlive?view=revision&revision=42224
Author: karl
Date: 2016-10-08 00:24:15 +0200 (Sat, 08 Oct 2016)
Log Message:
-----------
reledmac (7oct16)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.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/examples/4-reledpar_titles_not_in_line_numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.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-criticalnotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.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-glossaries.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.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-notes-width.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.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/2-titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.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/3-reledpar_mwe.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.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/examples/4-reledpar_titles_not_in_line_numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.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-07 22:23:53 UTC (rev 42223)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2016-10-07 22:24:15 UTC (rev 42224)
@@ -442,6 +442,8 @@
% \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)}
+% \changes{v2.16.2}{2016/10/07}{Error message if \protect\package{footmisc} is loaded after \protect\package{reledmac}.}
+% \changes{v2.16.2}{2016/10/07}{Fix bug introduced by v2.16.1 when using not expandable control sequence, like \protect\cs{normalfont}, in the footnote number style.}
% \title{\Macpackage \\
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
@@ -3837,7 +3839,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2016/10/04 v2.16.1 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2016/10/07 v2.16.2 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -4016,6 +4018,7 @@
\@ifpackageloaded{imakeidx}{\l at imakeidxtrue}{}%False is the default value
% \end{macrocode}
% \end{macro}
+
% \begin{macro}{\ifl at indextools}
% Define a flag for if the \protect\package{indextools} package has been used.
% \begin{macrocode}
@@ -4028,6 +4031,13 @@
% \end{macrocode}
%False is the default value. We consider \protect\package{indextools} as a variant of \protect\package{imakeidx}. That is why we set \protect\cs{ifl at imakeidx} to true. We also let \protect\cs{imki at wrindexentry} to \protect\cs{indtl at wrindexentry}.
% \end{macro}
+% \begin{macro}{\ifl at footmisc}
+% Define a flag for if the \protect\package{footmisc} package has been used.
+% \begin{macrocode}
+\newif\ifl at footmisc
+\@ifpackageloaded{footmisc}{\l at footmisctrue}{}%False is the default value
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\if at RTL}
% The \protect\cs{if at RTL} is defined by the bidi package, which is sometimes loaded by \emph{polyglossia}.
% But we define it as well if the \protect\package{bidi} package is not loaded.
@@ -4348,20 +4358,13 @@
}%
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\led at error@ImakeidxAfterEledmac}
+% \begin{macro}{\led at error@PackageAfterEledmac}
% \begin{macrocode}
-\newcommand{\led at error@ImakeidxAfterEledmac}{%
- \reledmac at error{Imakeidx must be loaded before reledmac.}{\@ehc}%
+\newcommand{\led at error@PackageAfterEledmac}[1]{%
+ \reledmac at error{#1 must be loaded before reledmac.}{\@ehc}%
}%
% \end{macrocode}
% \end{macro}
-% \begin{macro}{\led at error@IndextoolsAfterEledmac}
-% \begin{macrocode}
-\newcommand{\led at error@IndextoolsAfterEledmac}{%
- \reledmac at error{Indextools must be loaded before reledmac.}{\@ehc}%
-}%
-% \end{macrocode}
-% \end{macro}
% \begin{macro}{\led at error@fail at patch@@makecol}
% \begin{macrocode}
\newcommand{\led at error@fail at patch@@makecol}{%
@@ -11118,7 +11121,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}{\thisc at footnote}%
+ \get at fnmark{\thisc at footnote}%
\ifcsdef{footnotereading\the\footnote at reading=typeset}%
{\setcounter{\@mpfn}{\csuse{footnotereading\the\footnote at reading=typeset}}}%
{\setcounter{\@mpfn}{\footnote at reading}}%
@@ -11131,11 +11134,9 @@
\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\thisc at footnote{\the\c at footnote}%
- \protected at xdef\thisfootnote{\thefootnote}%
}%
}%
@@ -11147,7 +11148,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}{\thisc at footnote}%
+ \noexpand\vl at dbfnote{{\expandonce\@tag}}{\thisc at footnote}%
}%
\to\inserts at listR
\global\advance\insert at countR \@ne%
@@ -11156,7 +11157,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}{\thisc at footnote}%
+ \noexpand\vl at dbfnote{{\expandonce\@tag}}{\thisc at footnote}%
}%
\to\inserts at list
\global\advance\insert at count \@ne%
@@ -11164,23 +11165,24 @@
\ignorespaces%
}%
-\newcommand{\get at fnmark}[2]{%
+\newcommand{\get at fnmark}[1]{%
\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#2=typeset}{\the\c at footnote@typeset}%
+ \csgdef{footnotereading#1=typeset}{\the\c at footnote@typeset}%
}%
\def\@thefnmark{\thefootnote}%
}%
{%
- \@namedef{@thefnmark}{#1}%
+ \setcounter{footnote}{#1}%
+ \def\@thefnmark{\thefootnote}%
}%
}%
-\newcommand{\vl at dbfnote}[3]{%
- \get at fnmark{#2}{#3}%
+\newcommand{\vl at dbfnote}[2]{%
+ \get at fnmark{#2}%
\@footnotetext{#1}%
}%
% \end{macrocode}
@@ -11290,7 +11292,7 @@
% \begin{macrocode}
\newcommand*{\mpnormalvfootnoteX}[2]{%
\get at thisfootnoteX{#1}%
- \get at fnmarkX{#1}{\thisfootnote}{\thisc at footnote}%
+ \get at fnmarkX{#1}{\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}
@@ -11434,7 +11436,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}{\thisfootnote}{\thisc at footnote}%
+ \noexpand\vbfnoteX{#1}{#2}{\thisc at footnote}%
\noexpand\led at reinit@index at fornote%
\unexpanded{\advance\@edindex at fornote@\m at ne}%
}%
@@ -11451,7 +11453,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}{\thisc at footnote}%
+ \noexpand\vbfnoteX{#1}{#2}{\thisc at footnote}%
\noexpand\led at reinit@index at fornote%
\unexpanded{\advance\@edindex at fornote@\m at ne}%
}%
@@ -11468,10 +11470,8 @@
% \begin{macrocode}
\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{\csname thefootnote#1\endcsname}%
\protected at xdef\thisc at footnote{\the\csname c at footnote#1\endcsname}%
}%
}%
@@ -11481,8 +11481,8 @@
% This command calls the correct footnote-inserting commands.
%
% \begin{macrocode}
-\newcommand{\vbfnoteX}[4]{%
- \get at fnmarkX{#1}{#3}{#4}%
+\newcommand{\vbfnoteX}[3]{%
+ \get at fnmarkX{#1}{#3}%
\@nameuse{regvfootnote#1}{#1}{#2}%
}%
@@ -11492,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}[3]{%
+\newcommand{\get at fnmarkX}[2]{%
\ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}%
{%
\stepcounter{footnote#1 at typeset}%
@@ -11499,11 +11499,12 @@
\setcounter{footnote#1}{\value{footnote#1 at typeset}}%
\@namedef{@thefnmark#1}{\csuse{thefootnote#1}}%
\immediate\write\@mainaux{%
- \csgdef{footnote#1reading#3=typeset}{\the\csname c at footnote#1 at typeset\endcsname}%
+ \csgdef{footnote#1reading#2=typeset}{\the\csname c at footnote#1 at typeset\endcsname}%
}%
}%
{%
- \@namedef{@thefnmark#1}{#2}%
+ \setcounter{footnote#1}{#2}%
+ \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}%
}%
}
%
@@ -11518,7 +11519,7 @@
\else
\def\this at footnoteX@reading{\the\csname footnote#1 at reading\endcsname}%
\get at thisfootnoteX{#1}%
- \get at fnmarkX{#1}{\expandonce\thisfootnote}{\expandonce\thisc at footnote}%
+ \get at fnmarkX{#1}{\expandonce\thisc at footnote}%
\@nameuse{regvfootnote#1}{#1}{#2}%
\fi}
@@ -11910,7 +11911,7 @@
\egroup}
\newcommand*{\mppara at vfootnoteX}[2]{%
\get at thisfootnoteX{#1}%
- \get at fnmarkX{#1}{\thisfootnote}{\thisc at footnote}%
+ \get at fnmarkX{#1}{\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}
@@ -15740,11 +15741,14 @@
% \begin{macrocode}
\AtBeginDocument{%
\unless\ifl at imakeidx%
- \@ifpackageloaded{imakeidx}{\led at error@ImakeidxAfterEledmac}{}%
+ \@ifpackageloaded{imakeidx}{\led at error@PackageAfterEledmac{imakeidx}}{}%
\fi%
\unless\ifl at indextools%
- \@ifpackageloaded{indextools}{\led at error@indextoolsAfterEledmac}{}%
+ \@ifpackageloaded{indextools}{\led at error@PackageAfterEledmac{indextools}}{}%
\fi%
+ \unless\ifl at footmisc%
+ \@ifpackageloaded{footmisc}{\led at error@PackageAfterEledmac{footmisc}}{}%
+ \fi%
}
% \end{macrocode}
% \subsection{Auxiliary macros for \cs{edindex}}
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2016-10-07 22:23:53 UTC (rev 42223)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2016-10-07 22:24:15 UTC (rev 42224)
@@ -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 at series{#1}}
@@ -133,6 +133,7 @@
\newif\if at ledgroup%
\newif\ifl at imakeidx
\@ifpackageloaded{imakeidx}{\l at imakeidxtrue}{}%False is the default value
+
\newif\ifl at indextools%
\@ifpackageloaded{indextools}{%
\l at indextoolstrue%
@@ -139,6 +140,8 @@
\l at imakeidxtrue%
\let\imki at wrindexentry\indtl at wrindexentry%
}{}%
+\newif\ifl at footmisc
+\@ifpackageloaded{footmisc}{\l at footmisctrue}{}%False is the default value
\ifdef{\if at RTL}{}{\newif\if at RTL}
\newif\if at firstlineofpage%
\newif\if at firstlineofpageR%
@@ -276,12 +279,9 @@
\newcommand{\led at err@FootnoteNotInSecondArgEdtext}[1]{%
\reledmac at error{#1footnote outside of the second argument of an edtext. Check syntax}{\@ehc}%
}%
-\newcommand{\led at error@ImakeidxAfterEledmac}{%
- \reledmac at error{Imakeidx must be loaded before reledmac.}{\@ehc}%
+\newcommand{\led at error@PackageAfterEledmac}[1]{%
+ \reledmac at error{#1 must be loaded before reledmac.}{\@ehc}%
}%
-\newcommand{\led at error@IndextoolsAfterEledmac}{%
- \reledmac at error{Indextools must be loaded before reledmac.}{\@ehc}%
-}%
\newcommand{\led at error@fail at patch@@makecol}{%
\reledmac at error{Fail to patch \string\@makecol\space command.}{\@ehc}%
}%
@@ -3238,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}{\thisc at footnote}%
+ \get at fnmark{\thisc at footnote}%
\ifcsdef{footnotereading\the\footnote at reading=typeset}%
{\setcounter{\@mpfn}{\csuse{footnotereading\the\footnote at reading=typeset}}}%
{\setcounter{\@mpfn}{\footnote at reading}}%
@@ -3251,11 +3251,9 @@
\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\thisc at footnote{\the\c at footnote}%
- \protected at xdef\thisfootnote{\thefootnote}%
}%
}%
@@ -3267,7 +3265,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}{\thisc at footnote}%
+ \noexpand\vl at dbfnote{{\expandonce\@tag}}{\thisc at footnote}%
}%
\to\inserts at listR
\global\advance\insert at countR \@ne%
@@ -3276,7 +3274,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}{\thisc at footnote}%
+ \noexpand\vl at dbfnote{{\expandonce\@tag}}{\thisc at footnote}%
}%
\to\inserts at list
\global\advance\insert at count \@ne%
@@ -3284,23 +3282,24 @@
\ignorespaces%
}%
-\newcommand{\get at fnmark}[2]{%
+\newcommand{\get at fnmark}[1]{%
\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#2=typeset}{\the\c at footnote@typeset}%
+ \csgdef{footnotereading#1=typeset}{\the\c at footnote@typeset}%
}%
\def\@thefnmark{\thefootnote}%
}%
{%
- \@namedef{@thefnmark}{#1}%
+ \setcounter{footnote}{#1}%
+ \def\@thefnmark{\thefootnote}%
}%
}%
-\newcommand{\vl at dbfnote}[3]{%
- \get at fnmark{#2}{#3}%
+\newcommand{\vl at dbfnote}[2]{%
+ \get at fnmark{#2}%
\@footnotetext{#1}%
}%
\newcommand*{\prebodyfootmark}{%
@@ -3349,7 +3348,7 @@
\newcommand*{\mpnormalvfootnoteX}[2]{%
\get at thisfootnoteX{#1}%
- \get at fnmarkX{#1}{\thisfootnote}{\thisc at footnote}%
+ \get at fnmarkX{#1}{\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}
@@ -3445,7 +3444,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}{\thisfootnote}{\thisc at footnote}%
+ \noexpand\vbfnoteX{#1}{#2}{\thisc at footnote}%
\noexpand\led at reinit@index at fornote%
\unexpanded{\advance\@edindex at fornote@\m at ne}%
}%
@@ -3462,7 +3461,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}{\thisc at footnote}%
+ \noexpand\vbfnoteX{#1}{#2}{\thisc at footnote}%
\noexpand\led at reinit@index at fornote%
\unexpanded{\advance\@edindex at fornote@\m at ne}%
}%
@@ -3473,19 +3472,17 @@
\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{\csname thefootnote#1\endcsname}%
\protected at xdef\thisc at footnote{\the\csname c at footnote#1\endcsname}%
}%
}%
-\newcommand{\vbfnoteX}[4]{%
- \get at fnmarkX{#1}{#3}{#4}%
+\newcommand{\vbfnoteX}[3]{%
+ \get at fnmarkX{#1}{#3}%
\@nameuse{regvfootnote#1}{#1}{#2}%
}%
-\newcommand{\get at fnmarkX}[3]{%
+\newcommand{\get at fnmarkX}[2]{%
\ifboolexpr{bool{l at dpairing} or bool{l at dprintingpages} or bool{l at dprintingcolumns}}%
{%
\stepcounter{footnote#1 at typeset}%
@@ -3492,11 +3489,12 @@
\setcounter{footnote#1}{\value{footnote#1 at typeset}}%
\@namedef{@thefnmark#1}{\csuse{thefootnote#1}}%
\immediate\write\@mainaux{%
- \csgdef{footnote#1reading#3=typeset}{\the\csname c at footnote#1 at typeset\endcsname}%
+ \csgdef{footnote#1reading#2=typeset}{\the\csname c at footnote#1 at 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 at footnoteX@reading{\the\csname footnote#1 at reading\endcsname}%
\get at thisfootnoteX{#1}%
- \get at fnmarkX{#1}{\expandonce\thisfootnote}{\expandonce\thisc at footnote}%
+ \get at fnmarkX{#1}{\expandonce\thisc at footnote}%
\@nameuse{regvfootnote#1}{#1}{#2}%
\fi}
@@ -3775,7 +3773,7 @@
\egroup}
\newcommand*{\mppara at vfootnoteX}[2]{%
\get at thisfootnoteX{#1}%
- \get at fnmarkX{#1}{\thisfootnote}{\thisc at footnote}%
+ \get at fnmarkX{#1}{\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}
@@ -6098,11 +6096,14 @@
\newif\ifledgroupnotesR@
\AtBeginDocument{%
\unless\ifl at imakeidx%
- \@ifpackageloaded{imakeidx}{\led at error@ImakeidxAfterEledmac}{}%
+ \@ifpackageloaded{imakeidx}{\led at error@PackageAfterEledmac{imakeidx}}{}%
\fi%
\unless\ifl at indextools%
- \@ifpackageloaded{indextools}{\led at error@indextoolsAfterEledmac}{}%
+ \@ifpackageloaded{indextools}{\led at error@PackageAfterEledmac{indextools}}{}%
\fi%
+ \unless\ifl at footmisc%
+ \@ifpackageloaded{footmisc}{\led at error@PackageAfterEledmac{footmisc}}{}%
+ \fi%
}
\newcommand{\pagelinesep}{-}
\newcommand{\edindexlab}{$&}
More information about the tex-live-commits
mailing list