texlive[67547] Master/texmf-dist: reledmac (4jul23)
commits+karl at tug.org
commits+karl at tug.org
Tue Jul 4 21:54:27 CEST 2023
Revision: 67547
http://tug.org/svn/texlive?view=revision&revision=67547
Author: karl
Date: 2023-07-04 21:54:27 +0200 (Tue, 04 Jul 2023)
Log Message:
-----------
reledmac (4jul23)
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-reledmac-right-to-left.tex
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/examples/makefile
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-reledmac-right-to-left.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.tex 2023-07-04 19:54:11 UTC (rev 67546)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.tex 2023-07-04 19:54:27 UTC (rev 67547)
@@ -1,75 +1,61 @@
\documentclass{article}
-\usepackage[osf,p]{libertinus}
+\usepackage[osf,p,nomath]{libertinus}
\usepackage{microtype}
\usepackage[pdfusetitle,hidelinks]{hyperref}
\usepackage[noend,nofamiliar,noeledsec,series={A}]{reledmac}
-\usepackage{ifluatex}
-\ifluatex
- \usepackage[main=english,bidi=basic]{babel}
- \babelprovide[import=he]{hebrew}
- \babelfont{rm}{Libertinus Serif}
- \babelfont[hebrew]{rm}{Ezra SIL}
- \newcommand{\texthebrew}[2][]{\foreignlanguage{hebrew}{#2}}
- \newenvironment{hebrew}[2][]{\begin{otherlanguage}{hebrew}}{\end{otherlanguage}}
- \usepackage{metalogo}
-\else
- \usepackage{polyglossia}
- \setmainlanguage{english}
- \setotherlanguage{hebrew}
- \newfontfamily{\hebrewfont}[Scale=0.9]{Ezra SIL}
-\fi
-
+\usepackage[bidi=default,english]{babel}
+\babelprovide[import=he]{hebrew}
+\babelfont{rm}{Libertinus Serif}
+\babelfont[hebrew]{rm}{Ezra SIL}
+\newcommand{\texthebrew}[2][]{\foreignlanguage{hebrew}{#2}}
+\newcommand{\textenglish}[2][]{\foreignlanguage{english}{#2}}
+\usepackage{metalogo}
+\Xparafootsep{$||$\ }
\Xarrangement{paragraph}
-\Xbeforeinserting{\LTR}
-\Xlemmaseparator{[}%Will be reversed by Ezra SIL font
\Xafterlemmaseparator{0.5em}
\Xbeforelemmaseparator{0.25em}
-\Xwrapcontent{\textenglish}
-\Xwraplemma{\RL}
-\linenumincrement{2}
+\linenumincrement{1}
\firstlinenum{1}
-\title{Editing right-to-left text with left-to-right notes}
+% Here the reledmac settings for RTL
+\Xwrapcontent{\textenglish}
+\Xbhookgroup{\textdir TRT}
+\Xlemmaseparator{[}%Will be reversed by Ezra SIL font
+
+ \title{Editing right-to-left text}
\date{}
\begin{document}
\maketitle
\begin{abstract}
+ In this example, we use Lua\LaTeX.
+ After this introduction page, all the document will be in Hebrew, except some notes in English.
+ So the apparatus will be typeset right-to-left, except the comment, which will be typeset left-to-right.
+\end{abstract}
-In this file, we provide an example of an edition with right-to-left text and left-to-right notes, using \XeLaTeX.
+\newpage
+\selectlanguage{hebrew}
-\begin{itemize}
- \item The `hebrew' environment allows us to write Hebrew right-to-left.
- \item \verb+\Xbeforeinserting{\LTR}+ makes the critical notes be typeset left-to-right.
- \item \verb+\Xwraplemma{\RL}+ ensures the lemmas, which are in Hebrew, are typeset right-to-left.
- \item \verb+\Xwrapcontent{\textenglish}+ ensures the content of the note is marked as English text.
- \item As the `Ezra SIL' font transforms a `]' to a `[', we use a `[' as lemma separator, that will be typeset as `]' by `Ezra SIL'. So the need for \verb+\Xlemmaseparator+ is not directly linked to reledmac.
-\end{itemize}
-
-\end{abstract}
-
-\begin{hebrew}
\beginnumbering
\pstart
-\edtext{בְּרֵאשִׁ֖ית בָּרָ֣א}{\Afootnote{Some comment}}
+\edtext{בְּרֵאשִׁ֖ית בָּרָ֣א}{\Afootnote{Some comment (1)}}
אֱלֹהִ֑ים אֵ֥ת הַשָּׁמַ֖יִם וְאֵ֥ת הָאָֽרֶץ׃
-\edtext{וְהָאָ֗רֶץ הָיְתָ֥ה}{\Afootnote{Some comment}}
-\edtext{
+\edtext{וְהָאָ֗רֶץ הָיְתָ֥ה}{\Afootnote{Some comment (2)}}
+\edtext{%
תֹ֨הוּ֙ וָבֹ֔הוּ וְחֹ֖שֶׁךְ עַל־פְּנֵ֣י תְהֹ֑ום וְר֣וּחַ אֱלֹהִ֔ים מְרַחֶ֖פֶת עַל־פְּנֵ֥י הַמָּֽיִם׃
-וַיֹּ֥אמֶר אֱלֹהִ֖ים יְהִ֣י אֹ֑ור וַֽיְהִי־אֹֽור׃
-}{\Afootnote{Some comment on a long lemma}}
+וַיֹּ֥אמֶר אֱלֹהִ֖ים יְהִ֣י אֹ֑ור וַֽיְהִי־אֹֽור׃%
+}{\Afootnote{Some comment on a long lemma (3)}}
וַיַּ֧רְא אֱלֹהִ֛ים אֶת־הָאֹ֖ור כִּי־טֹ֑וב וַיַּבְדֵּ֣ל אֱלֹהִ֔ים בֵּ֥ין הָאֹ֖ור וּבֵ֥ין הַחֹֽשֶׁךְ׃
-\edtext{וַיִּקְרָ֨א אֱלֹהִ֤ים׀}{\Afootnote{Some comment}}
+\edtext{וַיִּקְרָ֨א אֱלֹהִ֤ים׀}{\Afootnote{Some comment (4)}}
לָאֹור֙ יֹ֔ום וְלַחֹ֖שֶׁךְ קָ֣רָא לָ֑יְלָה וַֽיְהִי־עֶ֥רֶב וַֽיְהִי־בֹ֖קֶר יֹ֥ום אֶחָֽד׃ פ
-\edtext{וַיַּ֤רְא אֱלֹהִים֙}{\Afootnote{Some comment}}
+ \edtext{וַיַּ֤רְא אֱלֹהִים֙}{\Afootnote{Some comment (5)}}
אֶת־כָּל־אֲשֶׁ֣ר עָשָׂ֔ה וְהִנֵּה־טֹ֖וב מְאֹ֑ד וַֽיְהִי־עֶ֥רֶב וַֽיְהִי־בֹ֖קֶר יֹ֥ום הַשִּׁשִּֽׁי׃ פ
\pend
\endnumbering
-\end{hebrew}
-\end{document}
+\end{document}
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/examples/makefile
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/makefile 2023-07-04 19:54:11 UTC (rev 67546)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/makefile 2023-07-04 19:54:27 UTC (rev 67547)
@@ -24,7 +24,7 @@
latexmk --xelatex $<
2-reledmac-right-to-left.pdf: 2-reledmac-right-to-left.tex
- latexmk --xelatex $<
+ latexmk --lualatex $<
clean:
@$(RM) *pdf *toc *.1* *.2* *.3* *.4* *.5* *.6* *.7* *.8* *.9* *.eledsec* *.Aend* *.Bend* *.fls* *.xdv* *.glg* *.glo* *.gls* *.ist* *.log *.fdb_latexmk *.aux *.end *.ilg *.ind *.idx *.out *.synctex.gz *.synctex.gz\(busy\)
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-04 19:54:11 UTC (rev 67546)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2023-07-04 19:54:27 UTC (rev 67547)
@@ -591,6 +591,9 @@
% \changes{v2.38.2}{2021/11/03}{Fix some trouble in indentation in stanza, when switching to some language with \protect\package{polyglossia}.}
% \changes{v2.39.0}{2021/01/11}{Add \protect\cs{Xnotboxingsubline} and \protect\cs{Xendnotboxingsubline} hooks.}
% \changes{v2.39.1}{2021/02/04}{Fix bug with index in familiar and critical footnotes.}
+% \changes{v2.39.2}{2023/07/04}{Fix bug with \protect\cs{edlabel} in \protect\cs{eledsection} and related.}
+% \changes{v2.39.2}{2022/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}{2022/07/04}{Tools for \protect\parpackage v2.25.4}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -4503,7 +4506,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2022/02/04 v2.39.1 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2023/07/04 v2.39.2 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -6745,6 +6748,7 @@
\@page{#1}%
\ifledRcol%
\@nl at regR%
+ \csnumgdef{@page at forlineR@\the\section at numR @\the\absline at numR}{#1}%
\else%
\@nl at reg%
\fi%
@@ -6834,10 +6838,16 @@
\csnumgdef{@lastline at forpageR@\the\page at numR}{\the\line at numR}%
\csnumgdef{@lastsubline at forpageR@\the\page at numR}{\the\subline at numR}%
\ifbypage at R
+ \letcs{\prevsection at last@page at num}{last at page@num@\the\numexpr\section at num-1\relax}%
+ \ifundef{\prevsection at last@page at num}{\def\prevsection at last@page at num{-999}}{}%
\ifx\l at dchset@num\relax%Not resetting if preceded by a \setlinenum
\ifboolexpr{%
(bool{continuousnumberingwithcolumns} or bool{resumenumberingR at start})%
and test {\ifnumequal{\last at page@numR}{-10000}}%
+ and not (%
+ bool{continuousnumberingwithcolumns}%
+ and test {\ifnumcomp{\prevsection at last@page at num}{<}{#1}}%
+ )%
}%
{}%
{%
@@ -6871,7 +6881,8 @@
\global\this at section@page at num=#1%
\last at page@num=#1%
\global\this at section@last at page@num=#1%
- \def\next at page@num{#1}%
+ \global\csdef{last at page@num@\the\section at num}{#1}%
+ \gdef\next at page@num{#1}%
% \end{macrocode}
% And we set a flag that tells \cs{@nl} that a new page number is
% to be set, because other associated actions shouldn't occur until the
@@ -9393,7 +9404,7 @@
%
% \subsubsection{Process for \enquote{normal} line}
% \begin{macro}{\print at line}
-% \changes{v1.13.1}{2014/09/25}{Coming back of add at penalties, mistakenly deleted in version 0.17!}
+% \changes{v1.13.1}{2014/09/25}{Coming back of \protect\cs{add at penalties}, mistakenly deleted in version 0.17.}
% \changes{v1.18.0}{2015/02/23}{Compatibility with \LuaLaTeX\ RTL languages.}
% \protect\cs{print at line} is for normal line, i. e line without sectioning command.
% \begin{macrocode}
@@ -9491,6 +9502,7 @@
% \begin{macrocode}
\def\print at eledsection{%
\disable at edindex%
+ \disable at edlabel%
\if at firstlineofpage%
\set at Xtxtbeforenotes%
\set at txtbeforenotesX%
@@ -9522,6 +9534,7 @@
\vskip-\baselineskip%
\continuousnumberingwithcolumns at sync@linenumber at singletext%
\restore at edindex%
+ \restore at edlabel%
}
% \end{macrocode}
% \end{macro}
@@ -20340,17 +20353,21 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\EDLABEL}
-% \begin{macro}{\xedlabel}
+% \begin{macro}{\disable at edlabel}
+% \begin{macro}{\restore at edlabel}
% We need to be able to modify and restore the \protect\cs{edlabel} macro.
% \begin{macrocode}
-\let\EDLABEL=\edlabel
-\newcommand*{\xedlabel}[1]{\EDLABEL{#1}}
+\newcommand{\disable at edlabel}{%
+ \global\let\old at edlabel\edlabel%
+ \global\let\edlabel\@gobble%
+}%
+\newcommand{\restore at edlabel}{%
+ \global\let\edlabel\old at edlabel%
+}%
% \end{macrocode}
% \end{macro}
% \end{macro}
%
-%
% \begin{macro}{\xedindex}
% \begin{macro}{\nulledindex}
% Macros supporting modification and restoration of \protect\cs{edindex}.
@@ -20403,7 +20420,8 @@
\let\edtext\relax
\def\do##1{\global\csletcs{##1footnote}{l at dgobbleoptarg}}%
\dolistloop{\@series}%
- \let\edindex\nulledindex
+ \let\edindex\nulledinde%
+ \disable at edlabel%
\let\linenum\@gobble}
\newcommand{\l at drestoreforedtext}{%
\def\do##1{\global\csletcs{##1footnote}{##1@@footnote}}
@@ -20441,8 +20459,8 @@
\let\linenum\@line@@num
\hilfsskip=\l at dcolwidth%
\advance\hilfsskip by -\wd\hilfsbox
- \def\edlabel##1{\xedlabel{##1}}}
-
+ \restore at edlabel%
+}%
% \end{macrocode}
% \end{macro}
% \begin{macro}{\disablel at dtabfeet}
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2023-07-04 19:54:11 UTC (rev 67546)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2023-07-04 19:54:27 UTC (rev 67547)
@@ -351,6 +351,7 @@
% \changes{v2.25.1}{2021/01/21}{\protect\cs{ifsublines at R} migrated to \protect\macpackage}
% \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}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -1407,7 +1408,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2022/04/22 v2.25.3 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2023/07/04 v2.25.4 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -4657,17 +4658,17 @@
{\@l at dtempcntb=\line at margin@columnsR}%
{\@l at dtempcntb=\line at marginR}%
\ifnum\@l at dtempcntb>\@ne
- \advance\@l at dtempcntb by\page at numR
+ \advance\@l at dtempcntb by \numexpr\csuse{@page at forlineR@\the\section at numR @\the\absline at numR}+0\relax%
\fi
\ifboolexpr{%
bool {l at dprintingcolumns}%
and (%
(test {\ifdefstring{\linenum at OnlyPages@ForColumnsR}{left}}%
- and test {\ifnumodd{\page at numR}}%
+ and test {\ifnumodd{\csuse{@page at forlineR@\the\section at numR @\the\absline at numR}+0}}%
)%
or%
(test {\ifdefstring{\linenum at OnlyPages@ForColumnsR}{right}}%
- and not test {\ifnumodd{\page at numR}}%
+ and not test {\ifnumodd{\csuse{@page at forlineR@\the\section at numR @\the\absline at numR}+0}}%
)%
)%
}%
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2023-07-04 19:54:11 UTC (rev 67546)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2023-07-04 19:54:27 UTC (rev 67547)
@@ -37,7 +37,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2022/02/04 v2.39.1 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2023/07/04 v2.39.2 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\newif\ifsameparallelpagenumber%
@@ -917,6 +917,7 @@
\@page{#1}%
\ifledRcol%
\@nl at regR%
+ \csnumgdef{@page at forlineR@\the\section at numR @\the\absline at numR}{#1}%
\else%
\@nl at reg%
\fi%
@@ -981,10 +982,16 @@
\csnumgdef{@lastline at forpageR@\the\page at numR}{\the\line at numR}%
\csnumgdef{@lastsubline at forpageR@\the\page at numR}{\the\subline at numR}%
\ifbypage at R
+ \letcs{\prevsection at last@page at num}{last at page@num@\the\numexpr\section at num-1\relax}%
+ \ifundef{\prevsection at last@page at num}{\def\prevsection at last@page at num{-999}}{}%
\ifx\l at dchset@num\relax%Not resetting if preceded by a \setlinenum
\ifboolexpr{%
(bool{continuousnumberingwithcolumns} or bool{resumenumberingR at start})%
and test {\ifnumequal{\last at page@numR}{-10000}}%
+ and not (%
+ bool{continuousnumberingwithcolumns}%
+ and test {\ifnumcomp{\prevsection at last@page at num}{<}{#1}}%
+ )%
}%
{}%
{%
@@ -1018,7 +1025,8 @@
\global\this at section@page at num=#1%
\last at page@num=#1%
\global\this at section@last at page@num=#1%
- \def\next at page@num{#1}%
+ \global\csdef{last at page@num@\the\section at num}{#1}%
+ \gdef\next at page@num{#1}%
\gdef\this at section@next at page@num{#1}%
\listxadd{\normal at page@break}{\the\absline at num}
\fi
@@ -2235,6 +2243,7 @@
}
\def\print at eledsection{%
\disable at edindex%
+ \disable at edlabel%
\if at firstlineofpage%
\set at Xtxtbeforenotes%
\set at txtbeforenotesX%
@@ -2266,6 +2275,7 @@
\vskip-\baselineskip%
\continuousnumberingwithcolumns at sync@linenumber at singletext%
\restore at edindex%
+ \restore at edlabel%
}
\newcommand*{\do at linehook}{}
\newcommand*{\do at insidelinehook}{}
@@ -8723,8 +8733,13 @@
}%
\let\EDTEXT=\edtext
\newcommand{\xedtext}[2]{\EDTEXT{#1}{#2}}
-\let\EDLABEL=\edlabel
-\newcommand*{\xedlabel}[1]{\EDLABEL{#1}}
+\newcommand{\disable at edlabel}{%
+ \global\let\old at edlabel\edlabel%
+ \global\let\edlabel\@gobble%
+}%
+\newcommand{\restore at edlabel}{%
+ \global\let\edlabel\old at edlabel%
+}%
\AtBeginDocument{\let\xedindex\edindex}%
\newcommand{\nulledindex}[2][\jobname]{\@bsphack\@esphack}
@@ -8739,7 +8754,8 @@
\let\edtext\relax
\def\do##1{\global\csletcs{##1footnote}{l at dgobbleoptarg}}%
\dolistloop{\@series}%
- \let\edindex\nulledindex
+ \let\edindex\nulledinde%
+ \disable at edlabel%
\let\linenum\@gobble}
\newcommand{\l at drestoreforedtext}{%
\def\do##1{\global\csletcs{##1footnote}{##1@@footnote}}
@@ -8761,8 +8777,8 @@
\let\linenum\@line@@num
\hilfsskip=\l at dcolwidth%
\advance\hilfsskip by -\wd\hilfsbox
- \def\edlabel##1{\xedlabel{##1}}}
-
+ \restore at edlabel%
+}%
\newcommand\disablel at dtabfeet{\l at dmodforedtext}%
\newcommand\enablel at dtabfeet{\l at drestoreforedtext}%
\newcount\l at dampcount
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2023-07-04 19:54:11 UTC (rev 67546)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2023-07-04 19:54:27 UTC (rev 67547)
@@ -28,7 +28,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2022/04/22 v2.25.3 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2023/07/04 v2.25.4 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -1770,17 +1770,17 @@
{\@l at dtempcntb=\line at margin@columnsR}%
{\@l at dtempcntb=\line at marginR}%
\ifnum\@l at dtempcntb>\@ne
- \advance\@l at dtempcntb by\page at numR
+ \advance\@l at dtempcntb by \numexpr\csuse{@page at forlineR@\the\section at numR @\the\absline at numR}+0\relax%
\fi
\ifboolexpr{%
bool {l at dprintingcolumns}%
and (%
(test {\ifdefstring{\linenum at OnlyPages@ForColumnsR}{left}}%
- and test {\ifnumodd{\page at numR}}%
+ and test {\ifnumodd{\csuse{@page at forlineR@\the\section at numR @\the\absline at numR}+0}}%
)%
or%
(test {\ifdefstring{\linenum at OnlyPages@ForColumnsR}{right}}%
- and not test {\ifnumodd{\page at numR}}%
+ and not test {\ifnumodd{\csuse{@page at forlineR@\the\section at numR @\the\absline at numR}+0}}%
)%
)%
}%
More information about the tex-live-commits
mailing list.