texlive[56367] Master/texmf-dist: reledmac (17sep20)
commits+karl at tug.org
commits+karl at tug.org
Thu Sep 17 23:20:04 CEST 2020
Revision: 56367
http://tug.org/svn/texlive?view=revision&revision=56367
Author: karl
Date: 2020-09-17 23:20:04 +0200 (Thu, 17 Sep 2020)
Log Message:
-----------
reledmac (17sep20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/README.md
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/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/README.md 2020-09-17 21:19:32 UTC (rev 56366)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/README.md 2020-09-17 21:20:04 UTC (rev 56367)
@@ -58,8 +58,9 @@
# Installation
+This package is included in the two main TeX's distribution : TeXLive (and MacTeX) and MikTeX. However, if you want to install it manually :
- run: `latex reledmac.ins` (which will generate `reledmac.sty`) and `latex reledpar.ins` (which will generate `reledpar.sty`)
-- move `reledmac.sty` and `reledpar.sty` to a location where LaTeX will find it (for more information on this see the FAQ).
+- move `reledmac.sty` and `reledpar.sty` to a location where LaTeX will find it (for more information on this see the FAQ of your distribution).
To generate a second copy of the manual (which is already supplied as a PDF file):
@@ -86,7 +87,7 @@
- Download the zip file of the branch (or, if you know Git, go to the branch there):
- Go to [the project page](https://github.com/maieul/ledmac/).
- Choose the correct branch in the "branch" menu.
- - Choose "Download zip" in the "Clone or download" menu, on the right side.
+ - Choose "Download zip" in the "Code" (green) menu, on the right side.
- Unzip the file
- Run the `.ins` files with pdflatex, to obtain the `.sty` files.
- Put the `.sty` files with your test files (in the same folder).
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 2020-09-17 21:19:32 UTC (rev 56366)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2020-09-17 21:20:04 UTC (rev 56367)
@@ -563,6 +563,8 @@
% \changes{v2.34.3}{2020/08/19}{Fix bug with \protect\cs{parafootsepX} when the footnotes are called outside of a numbered section.}
% \changes{v2.34.3}{2020/08/19}{Fixes incompatibility between Fixes incompatibility between lineation by \protect\cs{pstart} and (a)stanza.}
% \changes{v2.34.3}{2020/08/19}{Makes command like \protect\cs{hidenumbering} working at the very beginning of a verse when the first argument of \protect\cs{setstanzaindents} is equal to 0.}
+% \changes{v2.34.4}{2020/09/16}{Fix some bugs with lineation by page, when a numbered section starts at the very beginning of page.}
+% \changes{v2.34.4}{2020/09/16}{Fix bugs with \protect\cs{parafootsepX} outside of numbered section.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -4403,7 +4405,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2020/08/19 v2.34.3 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2020/09/16 v2.34.4 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -5026,6 +5028,20 @@
}%
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\led at error@fail at patch@setcounter}
+% \begin{macrocode}
+\newcommand{\led at error@fail at patch@setcounter}{%
+ \reledmac at error{Failed to patch the \string\setcounter\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}{%
+ \reledmac at error{Failed to patch the \string\addtocounter\space command}{\@ehc}%
+}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\led at warn@edinde at outsidenumbering}
% \begin{macrocode}
\newcommand{\led at warn@edinde at outsidenumbering}{%
@@ -6694,9 +6710,9 @@
\fi%
\fi
\page at numR=#1%
- \this at section@page at numR=#1%
+ \global\this at section@page at numR=#1%
\last at page@numR=#1%
- \this at section@last at page@numR=#1%
+ \global\this at section@last at page@numR=#1%
\def\next at page@numR{#1}%
\gdef\this at section@next at page@numR{#1}%
\fi
@@ -7344,7 +7360,7 @@
% It is written in the file list.
% If we process a line-list file which used a older version, that means the commands used inside are deprecated, and we can't use them.
% \begin{macrocode}
-\newcommand{\this at line@list at version}{7}%
+\newcommand{\this at line@list at version}{8}%
% \end{macrocode}
% \end{macro}
% \begin{macro}{\line at list@stuff}
@@ -7432,7 +7448,6 @@
% \changes{v0.6.0}{2004/11/16}{Extended \protect\cs{new at line} to output page numbers}
% \begin{macrocode}
\newcommand*{\new at line}{%
- \set at this@c at page%
\ifnumberline%
\IfStrEq{\led at pb@setting}{after}%
{\xifinlist{\the\absline at num}{\l at prev@nopb}%
@@ -13667,11 +13682,15 @@
{\csuse{parafootsepX@#1}}%
{}%
\global\csname prevpage#1 at num\endcsname=\page at num%
- \else%
- \ifnumequal{\csuse{prevpage#1 at num}}{\c at page}%
+ \else%We can't use directly the page counter, see https://tex.stackexchange.com/a/239457/7712
+ \global\expandafter\advance\csname footnote#1 at parafootsepX\endcsname by 1%
+ \edef\@tmpa{parafootsepX@#1@\the\csname footnote#1 at parafootsepX\endcsname}%
+ \expandafter\edlabel\expandafter{\@tmpa}%
+ \edef\@tmpb{\expandafter\xpageref\expandafter{\@tmpa}}%
+ \IfStrEq{\csuse{prevpage#1 at num}}{\@tmpb}%
{\csuse{parafootsepX@#1}}%
{}%
- \global\csname prevpage#1 at num\endcsname=\c at page%
+ \global\cslet{prevpage#1 at num}{\@tmpb}%
\fi%
\fi%
}
@@ -15055,6 +15074,7 @@
% \begin{macrocode}
\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
% \end{macrocode}
% Add \cs{let}\cs{footnoteX}\cs{@gobble} to \cs{no at expands}.
% \begin{macrocode}
@@ -16224,9 +16244,10 @@
% \end{macro}
% \begin{macro}{\@outputpage}
% As its name says, \cs{@outputpage} is a \LaTeX\ macro called in the output routine. It is this macro which increases the \verb+page+ counter.
-% We patch it in order to increase, conditionally, the \verb+par at page+ counter.
+% We patch it in order to increase, conditionally, the \verb+par at page+ counter, and to set correctly the page number send to the auxiliaries file (\verb+.1+, \verb+.2+, etc.).
% \begin{macrocode}
\AtBeginDocument{%
+ \set at this@c at page%
\apptocmd{\@outputpage}{%
\ifsameparallelpagenumber%
\ifl at dprintingpages%
@@ -16243,6 +16264,16 @@
{}%
{\led at error@fail at patch@@outputpage}%
}%
+\apptocmd{\setcounter}{%
+ \IfStrEq{#1}{page}{\set at this@c at page}{}%
+ }%
+ {}%
+ {\led at error@fail at patch@setcounter}%
+\apptocmd{\addtocounter}{%
+ \IfStrEq{#1}{page}{\set at this@c at page}{}%
+ }%
+ {}%
+ {\led at error@fail at patch@addtocounter}%
% \end{macrocode}
% \end{macro}
%
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2020-09-17 21:19:32 UTC (rev 56366)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2020-09-17 21:20:04 UTC (rev 56367)
@@ -345,6 +345,7 @@
% \changes{v2.24.0}{2020/05/31}{Add antilabe feature.}
% \changes{v2.24.1}{2020/08/19}{Makes \protect\cs{numberstantzatrue} working with \protect\env{astanza}.}
% \changes{v2.24.1}{2020/08/19}{Fixes incompatibility between lineation by \protect\cs{pstart} and (a)stanza.}
+% \changes{v2.24.2}{2020/09/16}{Fix some bugs with lineation by page, when a numbered section starts at the very beginning of page.}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -1400,7 +1401,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2020/08/19 v2.24.1 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2020/09/16 v2.24.2 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -3034,7 +3035,6 @@
% line-list file, to mark the start of a new text line.
% \begin{macrocode}
\newcommand*{\new at lineL}{%
- \set at this@c at page%
\ifnumberline%
\write\linenum at out{\string\@nl[\the\@this at c@page][\thepage]}%
\fi%
@@ -3046,7 +3046,6 @@
% line-list file, to mark the start of a new text line.
% \begin{macrocode}
\newcommand*{\new at lineR}{%
- \set at this@c at page%
\ifnumberline%
\write\linenum at outR{\string\@nl[\the\@this at c@page][\thepage]}%
\fi%
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2020-09-17 21:19:32 UTC (rev 56366)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2020-09-17 21:20:04 UTC (rev 56367)
@@ -35,7 +35,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2020/08/19 v2.34.3 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2020/09/16 v2.34.4 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\newif\ifsameparallelpagenumber%
@@ -335,6 +335,12 @@
\newcommand{\led at error@fail at patch@makeindex}{%
\reledmac at error{Failed to patch the \string\makeindex\space command}{\@ehc}%
}%
+\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@addtocounter}{%
+ \reledmac at error{Failed to patch the \string\addtocounter\space command}{\@ehc}%
+}%
\newcommand{\led at warn@edinde at outsidenumbering}{%
\reledmac at warning{\string\edindex\space called outside of \string\beginnumbering\space ...\space \string\endnumbering. \MessageBreak Automatically switched to \string\index.}%
}%
@@ -962,9 +968,9 @@
\fi%
\fi
\page at numR=#1%
- \this at section@page at numR=#1%
+ \global\this at section@page at numR=#1%
\last at page@numR=#1%
- \this at section@last at page@numR=#1%
+ \global\this at section@last at page@numR=#1%
\def\next at page@numR{#1}%
\gdef\this at section@next at page@numR{#1}%
\fi
@@ -1330,7 +1336,7 @@
\newwrite\linenum at out
\newif\iffirst at linenum@out@
\first at linenum@out at true
-\newcommand{\this at line@list at version}{7}%
+\newcommand{\this at line@list at version}{8}%
\let\next at line@list at stuff\relax%
\newcommand*{\line at list@stuff}[1]{%
\global\newtoggle{notfirstrun@#1}%
@@ -1361,7 +1367,6 @@
}%
\newcommand*{\new at line}{%
- \set at this@c at page%
\ifnumberline%
\IfStrEq{\led at pb@setting}{after}%
{\xifinlist{\the\absline at num}{\l at prev@nopb}%
@@ -4586,11 +4591,15 @@
{\csuse{parafootsepX@#1}}%
{}%
\global\csname prevpage#1 at num\endcsname=\page at num%
- \else%
- \ifnumequal{\csuse{prevpage#1 at num}}{\c at page}%
+ \else%We can't use directly the page counter, see https://tex.stackexchange.com/a/239457/7712
+ \global\expandafter\advance\csname footnote#1 at parafootsepX\endcsname by 1%
+ \edef\@tmpa{parafootsepX@#1@\the\csname footnote#1 at parafootsepX\endcsname}%
+ \expandafter\edlabel\expandafter{\@tmpa}%
+ \edef\@tmpb{\expandafter\xpageref\expandafter{\@tmpa}}%
+ \IfStrEq{\csuse{prevpage#1 at num}}{\@tmpb}%
{\csuse{parafootsepX@#1}}%
{}%
- \global\csname prevpage#1 at num\endcsname=\c at page%
+ \global\cslet{prevpage#1 at num}{\@tmpb}%
\fi%
\fi%
}
@@ -5510,6 +5519,7 @@
\expandafter\newcount\csname footnote#1 at reading\endcsname%
\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
\expandafter\gappto\expandafter\no at expands\expandafter{\expandafter\let\csname footnote#1\endcsname\@gobble}%
\expandafter\newcommand\csname footnote#1mark\endcsname[1][]{%
\begingroup%
@@ -6243,6 +6253,7 @@
\AtBeginDocument{\par at patch@thepage}%
\AtBeginDocument{%
+ \set at this@c at page%
\apptocmd{\@outputpage}{%
\ifsameparallelpagenumber%
\ifl at dprintingpages%
@@ -6259,6 +6270,16 @@
{}%
{\led at error@fail at patch@@outputpage}%
}%
+\apptocmd{\setcounter}{%
+ \IfStrEq{#1}{page}{\set at this@c at page}{}%
+ }%
+ {}%
+ {\led at error@fail at patch@setcounter}%
+\apptocmd{\addtocounter}{%
+ \IfStrEq{#1}{page}{\set at this@c at page}{}%
+ }%
+ {}%
+ {\led at error@fail at patch@addtocounter}%
\newcounter{par at page}%
\setcounter{par at page}{1}%
\list at create{\labelref at list}
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2020-09-17 21:19:32 UTC (rev 56366)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2020-09-17 21:20:04 UTC (rev 56367)
@@ -28,7 +28,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2020/08/19 v2.24.1 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2020/09/16 v2.24.2 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -783,13 +783,11 @@
}%
\newcommand*{\new at lineL}{%
- \set at this@c at page%
\ifnumberline%
\write\linenum at out{\string\@nl[\the\@this at c@page][\thepage]}%
\fi%
}%
\newcommand*{\new at lineR}{%
- \set at this@c at page%
\ifnumberline%
\write\linenum at outR{\string\@nl[\the\@this at c@page][\thepage]}%
\fi%
More information about the tex-live-commits
mailing list.