diff options
55 files changed, 92 insertions, 71 deletions
diff --git a/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf b/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf Binary files differindex a2c8ba5bb6a..523946af89b 100644 --- a/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf Binary files differindex 6718d07e1c8..19ba32bad08 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf Binary files differindex 372a14dcd51..fe66f4945b2 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf Binary files differindex 4b412e8c94e..951422285e8 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf Binary files differindex 7481913d9e7..8d351658e99 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf Binary files differindex bf23212e5f9..1ef8d93197b 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf Binary files differindex d92d74d5e38..4989ff02b1b 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf Binary files differindex 101950acddc..13b5060290d 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf Binary files differindex 73961b23115..e0cb89f0439 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf Binary files differindex 3132c5d3aaf..2e1a4a63341 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf Binary files differindex 04ed547699f..e65fe02f842 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf Binary files differindex 0c0fbad885c..956bdb0ffb6 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf Binary files differindex 5d1594698e5..4ccc2a650b0 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf Binary files differindex 44c9ca68aec..0f7d961a91f 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf Binary files differindex ce1e0053167..5c5f13a442b 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf Binary files differindex c3f10d9bab1..9c5d315d019 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf Binary files differindex 2d2ddd6780b..22c41071f16 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf Binary files differindex fc5afbfa26a..354a3cc6636 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf Binary files differindex 48a9b6289dd..2dd623c65f6 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf Binary files differindex dd00c33a60a..f98c09da4bc 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.tex b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.tex index 469a027b84e..863575f1f43 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.tex +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf Binary files differindex 3963fa9cf0f..99106157b5f 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf Binary files differindex b1cce473069..b2bb7fb529e 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf Binary files differindex 8fb78155491..26ec158089c 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf Binary files differindex cd60587a70c..595db9ad5f6 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf Binary files differindex bd7d2888907..033bd896607 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf Binary files differindex a036d76974b..cd38fbfd95a 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf Binary files differindex 526eab60281..0a9fe7c53e3 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf Binary files differindex 2ea055f0e67..d17c1ac8f11 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf Binary files differindex 84fa9f70ee2..c0bbca85799 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf Binary files differindex 9074228adcb..49afdc60c55 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf Binary files differindex 47e23321e11..1ec7968e16d 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf Binary files differindex 9615eca5827..267dfe81147 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf Binary files differindex c45fd43eda3..4deba4efeb0 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf Binary files differindex 4ee71747c29..5ab2e7e3f1d 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf Binary files differindex d11ecdce7cc..bec579ad903 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf Binary files differindex 07b85c00366..6f2b389507e 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf Binary files differindex eb9a8e2aa35..471e042ef02 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf Binary files differindex ea0ed3234bf..d7410052fa4 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf Binary files differindex 5a3661bc4e2..b5f3b61ae02 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf Binary files differindex f4978b8e853..58e1fa96d24 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf Binary files differindex edda5a1570c..f1e920079c3 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf Binary files differindex 0a5a91ac266..80d084ea17e 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf Binary files differindex 0b67d713d5f..527331fa0b4 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf Binary files differindex 20724af5b34..79a4d85b838 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf Binary files differindex 8fb2a74cb2e..84a04f52786 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf Binary files differindex 972199e49dc..2fbe4f7db89 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/makefile b/Master/texmf-dist/doc/latex/reledmac/examples/makefile index 6ab0cfccf3a..ebb0f728bac 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/makefile +++ b/Master/texmf-dist/doc/latex/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/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf Binary files differindex 7bb32f83fa2..9aa00f694a8 100644 --- a/Master/texmf-dist/doc/latex/reledmac/migration.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/migration.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf Binary files differindex 4bf3db4261b..5dad2b6ea2a 100644 --- a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf Binary files differindex 5749dd6b441..19ca6cadca6 100644 --- a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index a5b00a144a9..416894fb73b 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/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/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index b2f8fb7d88b..081ba44c16d 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/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/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 6aad4c83f22..c77f82fad58 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -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@regR% + \csnumgdef{@page@forlineR@\the\section@numR @\the\absline@numR}{#1}% \else% \@nl@reg% \fi% @@ -981,10 +982,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}}% + )% }% {}% {% @@ -1018,7 +1025,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}% \gdef\this@section@next@page@num{#1}% \listxadd{\normal@page@break}{\the\absline@num} \fi @@ -2235,6 +2243,7 @@ } \def\print@eledsection{% \disable@edindex% + \disable@edlabel% \if@firstlineofpage% \set@Xtxtbeforenotes% \set@txtbeforenotesX% @@ -2266,6 +2275,7 @@ \vskip-\baselineskip% \continuousnumberingwithcolumns@sync@linenumber@singletext% \restore@edindex% + \restore@edlabel% } \newcommand*{\do@linehook}{} \newcommand*{\do@insidelinehook}{} @@ -8723,8 +8733,13 @@ }% \let\EDTEXT=\edtext \newcommand{\xedtext}[2]{\EDTEXT{#1}{#2}} -\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% +}% \AtBeginDocument{\let\xedindex\edindex}% \newcommand{\nulledindex}[2][\jobname]{\@bsphack\@esphack} @@ -8739,7 +8754,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}} @@ -8761,8 +8777,8 @@ \let\linenum\@line@@num \hilfsskip=\l@dcolwidth% \advance\hilfsskip by -\wd\hilfsbox - \def\edlabel##1{\xedlabel{##1}}} - + \restore@edlabel% +}% \newcommand\disablel@dtabfeet{\l@dmodforedtext}% \newcommand\enablel@dtabfeet{\l@drestoreforedtext}% \newcount\l@dampcount diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index d187c1787ec..fda5e9b8a5d 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -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@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}}% )% )% }% |