texlive[67684] Master/texmf-dist: reledmac (20jul23)
commits+karl at tug.org
commits+karl at tug.org
Thu Jul 20 22:10:44 CEST 2023
Revision: 67684
http://tug.org/svn/texlive?view=revision&revision=67684
Author: karl
Date: 2023-07-20 22:10:44 +0200 (Thu, 20 Jul 2023)
Log Message:
-----------
reledmac (20jul23)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf
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-doublenumbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.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-subdivision-number-in-header.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_inside-outside-columns.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/source/latex/reledmac/reledpar.dtx
trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf
===================================================================
(Binary files differ)
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-doublenumbering.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-antilabe.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-subdivision-number-in-header.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_inside-outside-columns.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 2023-07-20 20:10:30 UTC (rev 67683)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2023-07-20 20:10:44 UTC (rev 67684)
@@ -594,7 +594,8 @@
% \changes{v2.39.2}{2023/07/04}{Fix bug with \protect\cs{edlabel} in \protect\cs{eledsection} and related.}
% \changes{v2.39.2}{2023/07/04}{Fix bug with with \protect\option{continuousnumberingwithcolumns} when right column starts a new page and we use lineation by page.}
% \changes{v2.39.2}{2023/07/04}{Tools for \protect\parpackage v2.25.4}
-% \changes{v2.39.3}{2023/07/08}{Fix big with \protect\cs{edlabel} after tabular environment (added by v2.39.2).}
+% \changes{v2.39.3}{2023/07/08}{Fix bug with \protect\cs{edlabel} after tabular environment (added by v2.39.2).}
+% \changes{v2.39.4}{2023/07/20}{Fix bug with hyperlink when using \protect\cs{footnoteXmark} and \protect\cs{footnoteXtext}.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -4507,7 +4508,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2023/07/08 v2.39.3 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2023/07/20 v2.39.4 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -5144,6 +5145,13 @@
}%
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\led at error@fail at patch@stpelt}
+% \begin{macrocode}
+\newcommand{\led at error@fail at patch@stpelt}{%
+ \reledmac at error{Failed to patch the \string\@stpelt\space command}{\@ehc}%
+}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\led at error@fail at patch@addtocounter}
% \begin{macrocode}
\newcommand{\led at error@fail at patch@addtocounter}{%
@@ -13477,7 +13485,8 @@
%
% \begin{macro}{\get at fnmarkX}
% This command gets the correct footnote number when typesetting parallel texts.
-% \#1 footnote series, \#2 footnote counter, \#3 manual footnote number
+% \#1 footnote series, \#2 footnote counter, \#3 manual footnote number.
+% It also gets, if required, a hyperref (almost) unique identifier for the footnote.
% \begin{macrocode}
\newcommand{\get at fnmarkX}[3]{%
\ifstrempty{#3}{%
@@ -13485,7 +13494,6 @@
{%
\stepcounter{footnote#1 at typeset}%
\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}%
}%
@@ -13492,11 +13500,13 @@
}%
{%
\setcounter{footnote#1}{#2}%
- \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}%
}%
+ \csdef{@thefnmark#1}{\csuse{thefootnote#1}}%
+ \csdef{hr at thefnmark#1}{\the\value{footnote#1}@\the\csname footnote#1 at series\endcsname}%
}%
{%
\csdef{@thefnmark#1}{#3}%
+ \csdef{hr at thefnmark#1}{#3@\the\csname footnote#1 at series\endcsname}%
}%
}%
%
@@ -14047,11 +14057,11 @@
\newcommand{\wrapped at footfootmarkX}[1]{%
\ifdefined\hypertarget%
\hyperlink%
- {@bodyfootmark#1@\this at footnoteX@reading}%
+ {@bodyfootmark#1@\csuse{hr at thefnmark#1}}%
{\@nameuse{footfootmark#1}}%
\Hy at raisedlink{%
\hypertarget%
- {@footnotemark#1@\this at footnoteX@reading}%
+ {@footnotemark#1@\csuse{hr at thefnmark#1}}%
{}%
}%
\else%
@@ -14066,13 +14076,17 @@
\newcommand{\wrapped at bodyfootmarkX}[1]{%
\ifdefined\hypertarget%
\hyperlink%
- {@footnotemark#1@\expandafter\the\csname footnote#1 at reading\endcsname}%
+ {@footnotemark#1@\csuse{hr at thefnmark#1}}%
{\@nameuse{bodyfootmark#1}}%
- \Hy at raisedlink{%
- \hypertarget%
- {@bodyfootmark#1@\expandafter\the\csname footnote#1 at reading\endcsname}%
- {}%
+ \ifcsundef{hr at bodyfootmark#1@\csuse{hr at thefnmark#1}}{%
+ \Hy at raisedlink{%
+ \hypertarget%
+ {@bodyfootmark#1@\csuse{hr at thefnmark#1}}%
+ {}%
+ }%
+ \global\csdef{hr at bodyfootmark#1@\csuse{hr at thefnmark#1}}{}%Avoid duplicate body footmark
}%
+ {}%
\else%
\@nameuse{bodyfootmark#1}%
\fi%
@@ -15439,6 +15453,7 @@
\ifstrempty{##1}%
{\protected at csxdef{@thefnmark#1}{\csuse{thefootnote#1}}}%
{\protected at csxdef{@thefnmark#1}{##1}}%
+ \protected at csxdef{hr at thefnmark#1}{\the\value{footnote#1}@\the\csname footnote#1 at series\endcsname}%
\nottoggle{nomk@}%Nomk is set to true when using \footnoteXnomk with \parpackage
{\csuse{@footnotemark#1}}%
{}%
@@ -15462,11 +15477,16 @@
% \end{macrocode}
% Then define the counters.
% The \LaTeX\ counter \verb+footnoteX+ is the only one manipulated by the user. This is the one which is printed.
-% The \TeX\ counter \cs{footnoteX at reading} is increased at each footnote. It is used for hyperlinks, for using \package{hyperlink} package, and for getting the correct footnote number when using parallel typesetting (\reff{reledpar-familiarfootnotenumber}).
+%
+% The \TeX\ counter \cs{footnoteX at reading} is increased at each footnote. It is used to get the correct footnote number when using parallel typesetting (\reff{reledpar-familiarfootnotenumber}).
+%
+% The \TeX\ counter \cs{footnoteX at series} is increased each time we reset the \LaTeX counter \verb+footnoteX+, either using +\verb\setcounter{footnoteX}{0}+ or because of \cs{@addtoreset}.
% \begin{macrocode}
\newcounter{footnote#1}
\global\expandafter\renewcommand\csname thefootnote#1\endcsname{\arabic{footnote#1}}
\expandafter\newcount\csname footnote#1 at reading\endcsname%
+ \expandafter\newcount\csname footnote#1 at series\endcsname%
+ \global\expandafter\csname footnote#1 at series\endcsname=1%
% \end{macrocode}
% Create counter used to determine on which page the previous note was called.
% \begin{macrocode}
@@ -15489,6 +15509,7 @@
\setcounter{footnote#1}{##1}%
}%
\protected at csxdef{@thefnmark#1}{\csuse{thefootnote#1}}%
+ \protected at csxdef{hr at thefnmark#1}{\the\value{footnote#1}@\the\csname footnote#1 at series\endcsname}%
\csuse{@footnotemark#1}%
\m at mmf@prepare%
\endgroup%
@@ -22256,6 +22277,34 @@
}
% \end{macrocode}
% \end{macro}
+% To deal with \verb+footnotemarkX+ and \verb+\footnoteXtext+ commandes in relation with hyperref, we need to generate unique identfier for footnote, called \verb+hr at thefnmarkX+ (where X stands for the footnote series letter).
+%
+% But to generate this unique number, we need to know when the footnoteX counter is reset.
+% So we need to patch both \cs{setcounter} and \cs{@stpelt} macros.
+% \begin{macrocode}
+
+\apptocmd{\setcounter}{%
+ \ifboolexpr{%
+ test {\ifnumequal{#2}{0}}%
+ and%
+ test {\ifcsdef{#1 at series}}%
+ }%
+ {%
+ \global\advance\expandafter\csname #1 at series\endcsname by 1%
+ }%
+ {}%
+}%
+ {}%
+ {\led at error@fail at patch@setcounter}%
+\apptocmd{\@stpelt}{%
+ \ifcsdef{#1 at series}{%
+ \global\advance\expandafter\csname #1 at series\endcsname by 1%
+ }%
+ {}%
+ }%
+ {}%
+ {\led at error@fail at patch@stpelt}%
+% \end{macrocode}
% \section{Compatibility with \eledmac}
%
% Here, we define some commands for the \verb+eledmac-compat+ option.
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2023-07-20 20:10:30 UTC (rev 67683)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2023-07-20 20:10:44 UTC (rev 67684)
@@ -352,6 +352,7 @@
% \changes{v2.25.2}{2021/09/27}{Fix incompatibility with \protect\package{babel} v3.61}
% \changes{v2.25.3}{2022/04/22}{Fix incompatibility with \protect\package{polyglossia} v1.55}
% \changes{v2.25.4}{2023/07/04}{Fix bug with \protect\cs{linenumOnlyPagesForColumnsR} and multiple numbered sections}
+% \changes{v2.25.5}{2023/07/20}{Fix bug with hyperlink when using \protect\cs{footnoteXnomk}}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -1408,7 +1409,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2023/07/04 v2.25.4 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2023/07/20 v2.25.5 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -3250,6 +3251,7 @@
\numdef\@tmpa{\csuse{c at footnote#1}}%
\global\xright at appenditem{\@tmpa}\to\@tmp%
\global\cslet{footnote#1 at mk}{\@tmp}%
+ \global\protected at csxdef{hr at thefnmark#1}{\noexpand\@tmpa @\the\csname footnote#1 at series\endcsname}%
}%
% \end{macrocode}
% Then, declare the command which inserts the footnotemark in the right side.
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2023-07-20 20:10:30 UTC (rev 67683)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2023-07-20 20:10:44 UTC (rev 67684)
@@ -37,7 +37,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2023/07/08 v2.39.3 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2023/07/20 v2.39.4 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\newif\ifsameparallelpagenumber%
@@ -343,6 +343,9 @@
\newcommand{\led at error@fail at patch@setcounter}{%
\reledmac at error{Failed to patch the \string\setcounter\space command}{\@ehc}%
}%
+\newcommand{\led at error@fail at patch@stpelt}{%
+ \reledmac at error{Failed to patch the \string\@stpelt\space command}{\@ehc}%
+}%
\newcommand{\led at error@fail at patch@addtocounter}{%
\reledmac at error{Failed to patch the \string\addtocounter\space command}{\@ehc}%
}%
@@ -4384,7 +4387,6 @@
{%
\stepcounter{footnote#1 at typeset}%
\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}%
}%
@@ -4391,11 +4393,13 @@
}%
{%
\setcounter{footnote#1}{#2}%
- \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}%
}%
+ \csdef{@thefnmark#1}{\csuse{thefootnote#1}}%
+ \csdef{hr at thefnmark#1}{\the\value{footnote#1}@\the\csname footnote#1 at series\endcsname}%
}%
{%
\csdef{@thefnmark#1}{#3}%
+ \csdef{hr at thefnmark#1}{#3@\the\csname footnote#1 at series\endcsname}%
}%
}%
@@ -4787,11 +4791,11 @@
\newcommand{\wrapped at footfootmarkX}[1]{%
\ifdefined\hypertarget%
\hyperlink%
- {@bodyfootmark#1@\this at footnoteX@reading}%
+ {@bodyfootmark#1@\csuse{hr at thefnmark#1}}%
{\@nameuse{footfootmark#1}}%
\Hy at raisedlink{%
\hypertarget%
- {@footnotemark#1@\this at footnoteX@reading}%
+ {@footnotemark#1@\csuse{hr at thefnmark#1}}%
{}%
}%
\else%
@@ -4801,13 +4805,17 @@
\newcommand{\wrapped at bodyfootmarkX}[1]{%
\ifdefined\hypertarget%
\hyperlink%
- {@footnotemark#1@\expandafter\the\csname footnote#1 at reading\endcsname}%
+ {@footnotemark#1@\csuse{hr at thefnmark#1}}%
{\@nameuse{bodyfootmark#1}}%
- \Hy at raisedlink{%
- \hypertarget%
- {@bodyfootmark#1@\expandafter\the\csname footnote#1 at reading\endcsname}%
- {}%
+ \ifcsundef{hr at bodyfootmark#1@\csuse{hr at thefnmark#1}}{%
+ \Hy at raisedlink{%
+ \hypertarget%
+ {@bodyfootmark#1@\csuse{hr at thefnmark#1}}%
+ {}%
+ }%
+ \global\csdef{hr at bodyfootmark#1@\csuse{hr at thefnmark#1}}{}%Avoid duplicate body footmark
}%
+ {}%
\else%
\@nameuse{bodyfootmark#1}%
\fi%
@@ -5720,6 +5728,7 @@
\ifstrempty{##1}%
{\protected at csxdef{@thefnmark#1}{\csuse{thefootnote#1}}}%
{\protected at csxdef{@thefnmark#1}{##1}}%
+ \protected at csxdef{hr at thefnmark#1}{\the\value{footnote#1}@\the\csname footnote#1 at series\endcsname}%
\nottoggle{nomk@}%Nomk is set to true when using \footnoteXnomk with \parpackage
{\csuse{@footnotemark#1}}%
{}%
@@ -5743,6 +5752,8 @@
\newcounter{footnote#1}
\global\expandafter\renewcommand\csname thefootnote#1\endcsname{\arabic{footnote#1}}
\expandafter\newcount\csname footnote#1 at reading\endcsname%
+ \expandafter\newcount\csname footnote#1 at series\endcsname%
+ \global\expandafter\csname footnote#1 at series\endcsname=1%
\expandafter\newcount\csname prevpage#1 at num\endcsname%
\expandafter\newcount\csname prevpage#1 at numR\endcsname%
\expandafter\newcount\csname footnote#1 at parafootsepX\endcsname%For the case we use \parafootsepX outside of numbered section
@@ -5756,6 +5767,7 @@
\setcounter{footnote#1}{##1}%
}%
\protected at csxdef{@thefnmark#1}{\csuse{thefootnote#1}}%
+ \protected at csxdef{hr at thefnmark#1}{\the\value{footnote#1}@\the\csname footnote#1 at series\endcsname}%
\csuse{@footnotemark#1}%
\m at mmf@prepare%
\endgroup%
@@ -9855,6 +9867,28 @@
\penalty\@M\hskip\z@\relax
\fi
}
+
+\apptocmd{\setcounter}{%
+ \ifboolexpr{%
+ test {\ifnumequal{#2}{0}}%
+ and%
+ test {\ifcsdef{#1 at series}}%
+ }%
+ {%
+ \global\advance\expandafter\csname #1 at series\endcsname by 1%
+ }%
+ {}%
+}%
+ {}%
+ {\led at error@fail at patch@setcounter}%
+\apptocmd{\@stpelt}{%
+ \ifcsdef{#1 at series}{%
+ \global\advance\expandafter\csname #1 at series\endcsname by 1%
+ }%
+ {}%
+ }%
+ {}%
+ {\led at error@fail at patch@stpelt}%
\ifeledmaccompat@%
\newcommand{\footnormalX}[1]{\arrangementX[#1]{normal}}%
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2023-07-20 20:10:30 UTC (rev 67683)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2023-07-20 20:10:44 UTC (rev 67684)
@@ -28,7 +28,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2023/07/04 v2.25.4 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2023/07/20 v2.25.5 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -831,6 +831,7 @@
\numdef\@tmpa{\csuse{c at footnote#1}}%
\global\xright at appenditem{\@tmpa}\to\@tmp%
\global\cslet{footnote#1 at mk}{\@tmp}%
+ \global\protected at csxdef{hr at thefnmark#1}{\noexpand\@tmpa @\the\csname footnote#1 at series\endcsname}%
}%
\expandafter\newcommand\csname footnote#1mk\endcsname{%
\letcs{\@tmp}{footnote#1 at mk}%
More information about the tex-live-commits
mailing list.