summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/reledmac
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-07-05 03:01:54 +0000
committerNorbert Preining <norbert@preining.info>2023-07-05 03:01:54 +0000
commit973c785dccc1812d63162178e8362e83e8c263c2 (patch)
treeb2cb12a6b36a0a59e90f1611d32cf7e8d125d575 /macros/latex/contrib/reledmac
parentab7f5e4df027c13f5aef4fbdb032184cf2f3d5c3 (diff)
CTAN sync 202307050301
Diffstat (limited to 'macros/latex/contrib/reledmac')
-rw-r--r--macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdfbin40812 -> 40796 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdfbin201047 -> 201564 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-criticalnotes.pdfbin199198 -> 197819 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-sidenotes.pdfbin295846 -> 295209 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-tabular.pdfbin284805 -> 285556 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdfbin200374 -> 198959 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/1-verses.pdfbin200202 -> 198794 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-antilabe.pdfbin209856 -> 210969 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-cross_referencing.pdfbin199200 -> 198304 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdfbin202703 -> 201443 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-glossaries.pdfbin284461 -> 285503 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-indexing.pdfbin283595 -> 278070 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdfbin277763 -> 276219 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdfbin293260 -> 292434 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-linespacing.pdfbin288423 -> 286626 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdfbin290106 -> 288123 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-notes-width.pdfbin205926 -> 204669 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdfbin211560 -> 212242 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-performances.pdfbin286176 -> 284583 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdfbin31502 -> 36940 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.tex74
-rw-r--r--macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdfbin309317 -> 310603 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdfbin287548 -> 288795 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdfbin199051 -> 199918 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdfbin23436 -> 23442 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdfbin174535 -> 175650 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdfbin32047 -> 32046 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdfbin288680 -> 289211 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdfbin199951 -> 200040 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdfbin199183 -> 199277 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdfbin177024 -> 177103 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdfbin199585 -> 199679 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdfbin198512 -> 198615 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdfbin198564 -> 198664 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdfbin198700 -> 198795 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdfbin213255 -> 214377 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdfbin211866 -> 210464 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdfbin204143 -> 204974 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdfbin297136 -> 298422 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdfbin203250 -> 204015 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdfbin224505 -> 225555 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdfbin249189 -> 251002 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdfbin203977 -> 202374 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdfbin199821 -> 198565 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdfbin301520 -> 302774 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdfbin206315 -> 206955 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdfbin195381 -> 194198 bytes
-rw-r--r--macros/latex/contrib/reledmac/examples/makefile2
-rw-r--r--macros/latex/contrib/reledmac/migration.pdfbin367961 -> 368425 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledmac.dtx40
-rw-r--r--macros/latex/contrib/reledmac/reledmac.pdfbin2046154 -> 2146083 bytes
-rw-r--r--macros/latex/contrib/reledmac/reledpar.dtx9
-rw-r--r--macros/latex/contrib/reledmac/reledpar.pdfbin1006519 -> 1046676 bytes
53 files changed, 65 insertions, 60 deletions
diff --git a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
index a2c8ba5bb6..523946af89 100644
--- a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
+++ b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
index 6718d07e1c..19ba32bad0 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
index 372a14dcd5..fe66f4945b 100644
--- a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
index 4b412e8c94..951422285e 100644
--- a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf
index 7481913d9e..8d351658e9 100644
--- a/macros/latex/contrib/reledmac/examples/1-tabular.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-tabular.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
index bf23212e5f..1ef8d93197 100644
--- a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf
index d92d74d5e3..4989ff02b1 100644
--- a/macros/latex/contrib/reledmac/examples/1-verses.pdf
+++ b/macros/latex/contrib/reledmac/examples/1-verses.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
index 101950acdd..13b5060290 100644
--- a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
index 73961b2311..e0cb89f043 100644
--- a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
index 3132c5d3aa..2e1a4a6334 100644
--- a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
index 04ed547699..e65fe02f84 100644
--- a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf
index 0c0fbad885..956bdb0ffb 100644
--- a/macros/latex/contrib/reledmac/examples/2-indexing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-indexing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
index 5d1594698e..4ccc2a650b 100644
--- a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
index 44c9ca68ae..0f7d961a91 100644
--- a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
index ce1e005316..5c5f13a442 100644
--- a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
index c3f10d9bab..9c5d315d01 100644
--- a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
index 2d2ddd6780..22c41071f1 100644
--- a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
index fc5afbfa26..354a3cc663 100644
--- a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf
index 48a9b6289d..2dd623c65f 100644
--- a/macros/latex/contrib/reledmac/examples/2-performances.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-performances.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
index dd00c33a60..f98c09da4b 100644
--- a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.tex b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.tex
index 469a027b84..863575f1f4 100644
--- a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.tex
+++ b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.tex
@@ -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.
-
-\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}
+\newpage
+\selectlanguage{hebrew}
-\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}
diff --git a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
index 3963fa9cf0..99106157b5 100644
--- a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
index b1cce47306..b2bb7fb529 100644
--- a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
index 8fb7815549..26ec158089 100644
--- a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
index cd60587a70..595db9ad5f 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
index bd7d288890..033bd89660 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
index a036d76974..cd38fbfd95 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
index 526eab6028..0a9fe7c53e 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
index 2ea055f0e6..d17c1ac8f1 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
index 84fa9f70ee..c0bbca8579 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
index 9074228adc..49afdc60c5 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
index 47e23321e1..1ec7968e16 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
index 9615eca582..267dfe8114 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
index c45fd43eda..4deba4efeb 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
index 4ee71747c2..5ab2e7e3f1 100644
--- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
+++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
index d11ecdce7c..bec579ad90 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
index 07b85c0036..6f2b389507 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
index eb9a8e2aa3..471e042ef0 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
index ea0ed3234b..d7410052fa 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
index 5a3661bc4e..b5f3b61ae0 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
index f4978b8e85..58e1fa96d2 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
index edda5a1570..f1e920079c 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
index 0a5a91ac26..80d084ea17 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
index 0b67d713d5..527331fa0b 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
index 20724af5b3..79a4d85b83 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
index 8fb2a74cb2..84a04f5278 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
index 972199e49d..2fbe4f7db8 100644
--- a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
+++ b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/examples/makefile b/macros/latex/contrib/reledmac/examples/makefile
index 6ab0cfccf3..ebb0f728ba 100644
--- a/macros/latex/contrib/reledmac/examples/makefile
+++ b/macros/latex/contrib/reledmac/examples/makefile
@@ -24,7 +24,7 @@ PDF:$(OBJ)
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\)
diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf
index 7bb32f83fa..9aa00f694a 100644
--- a/macros/latex/contrib/reledmac/migration.pdf
+++ b/macros/latex/contrib/reledmac/migration.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx
index a5b00a144a..416894fb73 100644
--- a/macros/latex/contrib/reledmac/reledmac.dtx
+++ b/macros/latex/contrib/reledmac/reledmac.dtx
@@ -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@regR%
+ \csnumgdef{@page@forlineR@\the\section@numR @\the\absline@numR}{#1}%
\else%
\@nl@reg%
\fi%
@@ -6834,10 +6838,16 @@
\csnumgdef{@lastline@forpageR@\the\page@numR}{\the\line@numR}%
\csnumgdef{@lastsubline@forpageR@\the\page@numR}{\the\subline@numR}%
\ifbypage@R
+ \letcs{\prevsection@last@page@num}{last@page@num@\the\numexpr\section@num-1\relax}%
+ \ifundef{\prevsection@last@page@num}{\def\prevsection@last@page@num{-999}}{}%
\ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum
\ifboolexpr{%
(bool{continuousnumberingwithcolumns} or bool{resumenumberingR@start})%
and test {\ifnumequal{\last@page@numR}{-10000}}%
+ and not (%
+ bool{continuousnumberingwithcolumns}%
+ and test {\ifnumcomp{\prevsection@last@page@num}{<}{#1}}%
+ )%
}%
{}%
{%
@@ -6871,7 +6881,8 @@
\global\this@section@page@num=#1%
\last@page@num=#1%
\global\this@section@last@page@num=#1%
- \def\next@page@num{#1}%
+ \global\csdef{last@page@num@\the\section@num}{#1}%
+ \gdef\next@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@line}
-% \changes{v1.13.1}{2014/09/25}{Coming back of add@penalties, mistakenly deleted in version 0.17!}
+% \changes{v1.13.1}{2014/09/25}{Coming back of \protect\cs{add@penalties}, mistakenly deleted in version 0.17.}
% \changes{v1.18.0}{2015/02/23}{Compatibility with \LuaLaTeX\ RTL languages.}
% \protect\cs{print@line} is for normal line, i. e line without sectioning command.
% \begin{macrocode}
@@ -9491,6 +9502,7 @@
% \begin{macrocode}
\def\print@eledsection{%
\disable@edindex%
+ \disable@edlabel%
\if@firstlineofpage%
\set@Xtxtbeforenotes%
\set@txtbeforenotesX%
@@ -9522,6 +9534,7 @@
\vskip-\baselineskip%
\continuousnumberingwithcolumns@sync@linenumber@singletext%
\restore@edindex%
+ \restore@edlabel%
}
% \end{macrocode}
% \end{macro}
@@ -20340,17 +20353,21 @@
% \end{macro}
% \end{macro}
%
-% \begin{macro}{\EDLABEL}
-% \begin{macro}{\xedlabel}
+% \begin{macro}{\disable@edlabel}
+% \begin{macro}{\restore@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@edlabel}{%
+ \global\let\old@edlabel\edlabel%
+ \global\let\edlabel\@gobble%
+}%
+\newcommand{\restore@edlabel}{%
+ \global\let\edlabel\old@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@dgobbleoptarg}}%
\dolistloop{\@series}%
- \let\edindex\nulledindex
+ \let\edindex\nulledinde%
+ \disable@edlabel%
\let\linenum\@gobble}
\newcommand{\l@drestoreforedtext}{%
\def\do##1{\global\csletcs{##1footnote}{##1@@footnote}}
@@ -20441,8 +20459,8 @@
\let\linenum\@line@@num
\hilfsskip=\l@dcolwidth%
\advance\hilfsskip by -\wd\hilfsbox
- \def\edlabel##1{\xedlabel{##1}}}
-
+ \restore@edlabel%
+}%
% \end{macrocode}
% \end{macro}
% \begin{macro}{\disablel@dtabfeet}
diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf
index 4bf3db4261..5dad2b6ea2 100644
--- a/macros/latex/contrib/reledmac/reledmac.pdf
+++ b/macros/latex/contrib/reledmac/reledmac.pdf
Binary files differ
diff --git a/macros/latex/contrib/reledmac/reledpar.dtx b/macros/latex/contrib/reledmac/reledpar.dtx
index b2f8fb7d88..081ba44c16 100644
--- a/macros/latex/contrib/reledmac/reledpar.dtx
+++ b/macros/latex/contrib/reledmac/reledpar.dtx
@@ -351,6 +351,7 @@
% \changes{v2.25.1}{2021/01/21}{\protect\cs{ifsublines@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@dtempcntb=\line@margin@columnsR}%
{\@l@dtempcntb=\line@marginR}%
\ifnum\@l@dtempcntb>\@ne
- \advance\@l@dtempcntb by\page@numR
+ \advance\@l@dtempcntb by \numexpr\csuse{@page@forlineR@\the\section@numR @\the\absline@numR}+0\relax%
\fi
\ifboolexpr{%
bool {l@dprintingcolumns}%
and (%
(test {\ifdefstring{\linenum@OnlyPages@ForColumnsR}{left}}%
- and test {\ifnumodd{\page@numR}}%
+ and test {\ifnumodd{\csuse{@page@forlineR@\the\section@numR @\the\absline@numR}+0}}%
)%
or%
(test {\ifdefstring{\linenum@OnlyPages@ForColumnsR}{right}}%
- and not test {\ifnumodd{\page@numR}}%
+ and not test {\ifnumodd{\csuse{@page@forlineR@\the\section@numR @\the\absline@numR}+0}}%
)%
)%
}%
diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf
index 5749dd6b44..19ca6cadca 100644
--- a/macros/latex/contrib/reledmac/reledpar.pdf
+++ b/macros/latex/contrib/reledmac/reledpar.pdf
Binary files differ