From 4a8bf7a112a3fe0c9e1ee259bfdd877f3bccf488 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 8 May 2016 22:29:03 +0000 Subject: reledmac (8may16) git-svn-id: svn://tug.org/texlive/trunk@40955 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 17165 -> 17339 bytes .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 20114 -> 20289 bytes .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 21226 -> 21227 bytes .../doc/latex/reledmac/examples/1-verses.pdf | Bin 17413 -> 17415 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 18549 -> 18556 bytes .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 20980 -> 20983 bytes .../doc/latex/reledmac/examples/2-glossaries.pdf | Bin 21555 -> 21734 bytes .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 21724 -> 21722 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 17092 -> 17095 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 31478 -> 31479 bytes .../doc/latex/reledmac/examples/2-linespacing.pdf | Bin 26182 -> 26363 bytes .../doc/latex/reledmac/examples/2-notes-width.pdf | Bin 24711 -> 24901 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 25872 -> 25877 bytes .../doc/latex/reledmac/examples/2-performances.pdf | Bin 23055 -> 23242 bytes .../examples/2-reledmac--right-to-left.pdf | Bin 0 -> 33899 bytes .../examples/2-reledmac--right-to-left.tex | 61 ++++ .../2-titles_in_line_numbering_with_notes.pdf | Bin 22799 -> 22800 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 17191 -> 17192 bytes .../3-reledpar_columns_different_languages.pdf | Bin 26307 -> 26313 bytes .../doc/latex/reledmac/examples/3-reledpar_mwe.pdf | Bin 12223 -> 12225 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 39706 -> 39706 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 23249 -> 23244 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 35016 -> 35013 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 34745 -> 34744 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 33303 -> 33301 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 34904 -> 34912 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 34470 -> 34471 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 34514 -> 34507 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 34745 -> 34743 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 22439 -> 22442 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 27083 -> 27088 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 21171 -> 21174 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 29686 -> 29689 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 36495 -> 36494 bytes ...ar_page_titles_in_line_numbering_with_notes.pdf | Bin 32641 -> 32643 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 59060 -> 59061 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 22729 -> 22728 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 19066 -> 19247 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 22222 -> 22219 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 16236 -> 16239 bytes Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 86730 -> 86729 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 1109397 -> 1118713 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 448320 -> 448883 bytes .../texmf-dist/source/latex/reledmac/reledmac.dtx | 316 ++++++++++++++------- .../texmf-dist/source/latex/reledmac/reledpar.dtx | 41 ++- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 208 ++++++++------ Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 21 +- 47 files changed, 449 insertions(+), 198 deletions(-) create mode 100644 Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac--right-to-left.pdf create mode 100644 Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac--right-to-left.tex (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf index 0a65f1a90b6..33fad5d95ae 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf index dc76d8e72c1..d4e172fcb8a 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf index e0bcd69236a..4d2bc4ac24b 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf index d5d3a89e1e7..009ddf81357 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf differ 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 index 489b023612d..6c8f302c993 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf differ 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 index 3ebd973cf2c..aeaec7e7327 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf index 61a1a535f80..2b1961e4078 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf index c58b9c9f68d..7ab0def4d59 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf differ 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 index 7fcfd965954..9931a9eab85 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf differ 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 index 3b5e9903484..04b34b114bd 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf index 085510dc5a1..832d99e17e1 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf differ 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 index 9e279cfbaee..60ebf29e734 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf differ 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 index 941c1e0d52d..8a425f992d1 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf index ae8f0f84c52..cadc395562d 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf differ 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 new file mode 100644 index 00000000000..0a8ac0e2ef9 Binary files /dev/null and b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac--right-to-left.pdf differ 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 new file mode 100644 index 00000000000..81e03b449f2 --- /dev/null +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac--right-to-left.tex @@ -0,0 +1,61 @@ +\documentclass[12pt]{article} +\usepackage{libertineotf} +\usepackage[noend,nofamiliar,noeledsec,series={A}]{reledmac} +\usepackage{fontspec} +\usepackage{polyglossia} +\setmainlanguage{english} +\setotherlanguage{hebrew} + +\newfontfamily{\hebrewfont}[Scale=0.9]{Ezra SIL} + +\Xarrangement{paragraph} +\Xbeforeinserting{\LTR} +\Xlemmaseparator{[}%Will be reversed by Ezra SIL font +\Xafterlemmaseparator{0.5em} +\Xbeforelemmaseparator{0.25em} +\Xwrapcontent{\textenglish} +\Xwraplemma{\RL} + +\linenumincrement{2} +\firstlinenum{1} + +\title{Editing right-to-left text with left-to-right notes} +\date{} +\begin{document} +\maketitle +\begin{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 The \verb+\Xbeforeinserting{\LTR}+ makes the critical notes to be typeset left-to-right. + \item The \verb+\Xwraplemma{\RL}+ assures the lemmas, which are in Hebrew, be typeset right-to-left. + \item The \verb+\Xwrapcontent{\textenglish}+ assures 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}} + תֹ֨הוּ֙ וָבֹ֔הוּ וְחֹ֖שֶׁךְ עַל־פְּנֵ֣י תְהֹ֑ום וְר֣וּחַ אֱלֹהִ֔ים מְרַחֶ֖פֶת עַל־פְּנֵ֥י הַמָּֽיִם׃ +וַיֹּ֥אמֶר אֱלֹהִ֖ים יְהִ֣י אֹ֑ור וַֽיְהִי־אֹֽור׃ +וַיַּ֧רְא אֱלֹהִ֛ים אֶת־הָאֹ֖ור כִּי־טֹ֑וב וַיַּבְדֵּ֣ל אֱלֹהִ֔ים בֵּ֥ין הָאֹ֖ור וּבֵ֥ין הַחֹֽשֶׁךְ׃ +\edtext{וַיִּקְרָ֨א אֱלֹהִ֤ים׀}{\Afootnote{Some comment}} + לָאֹור֙ יֹ֔ום וְלַחֹ֖שֶׁךְ קָ֣רָא לָ֑יְלָה וַֽיְהִי־עֶ֥רֶב וַֽיְהִי־בֹ֖קֶר יֹ֥ום אֶחָֽד׃ פ +\edtext{וַיַּ֤רְא אֱלֹהִים֙}{\Afootnote{Some comment}} + אֶת־כָּל־אֲשֶׁ֣ר עָשָׂ֔ה וְהִנֵּה־טֹ֖וב מְאֹ֑ד וַֽיְהִי־עֶ֥רֶב וַֽיְהִי־בֹ֖קֶר יֹ֥ום הַשִּׁשִּֽׁי׃ פ + +\pend +\endnumbering + +\end{hebrew} +\end{document} 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 index 23c427263f2..1d6e4b5b474 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf differ 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 index d63aa03c87d..b03760102b6 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf differ 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 index e5902cf99ad..db8948f63c8 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf differ 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 index 3f2d76ec378..f3d62a4005d 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf differ 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 index e5a0cfa26e6..12681f849dc 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf differ 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 index cfec751ed5d..37dbd2eac12 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf differ 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 index 6f2a1c855be..20bf87c3aca 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf differ 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 index ab6898e6cd5..c622a5c0c44 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf differ 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 index b352530106e..401eccfcc88 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf differ 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 index 558f8fd802c..89dfd9a8f81 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf differ 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 index 818af89be83..27ffb878f42 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf differ 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 index 4b275ec01ba..36c774ef318 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf differ 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 index 77a4df34d14..82838747c81 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf differ 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 index 4e6a1f257ac..6a96c00c5a3 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf differ 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 index 1cbb56761f6..145f90a836c 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf differ 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 index 19a80aa0d77..3a8dd49234c 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf differ 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 index ca95f4cd525..9547537e5e6 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf differ 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 index c92c182e087..360313b873d 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf index d1bf7112f62..167de4284d1 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf differ 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 index 20a2dd27d1f..1c2af2f8a24 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf differ 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 index 3dca17fd9ee..4f650326671 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf differ 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 index d100e125b53..f31c8958b74 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf differ 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 index 83a2312628e..eb64fa7459d 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf differ 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 index 474e9c8fe14..1236b656910 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf index ea8cc07b804..c65f17c9c0a 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/migration.pdf and b/Master/texmf-dist/doc/latex/reledmac/migration.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf index 26a97e21824..1eea7ca8177 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf and b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf index 075a3ebfa2a..3f1864fa576 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf and b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf differ diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index d5df4c8a5bb..5231f29f8fb 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -391,9 +391,12 @@ % \changes{v2.9.0}{2016/03/23}{Write correct metadata in numbered files when using \protect\cs{pausenumbering}\protect\ldots\protect\cs{resumenumbering}.} % \changes{v2.9.0}{2016/03/23}{Fix bug with three- and two-column footnote setting (added in v.2.4.0).} % \changes{v2.9.0}{2016/03/23}{Fix spurious space inside three-column familiar footnote.} -% \changes{v2.9.1}{2016/04/09}{Fix bug when notes start by ``plus'' or ``minus''.} -% \changes{v2.9.2}{2016/04/30}{Fix bug with \protect\package{hyperref} package when a lemma starts by ``plus'' or ``minus'' (bug introduced in v.~2.7.0).} +% \changes{v2.9.1}{2016/04/09}{Fix bug when notes start with ``plus'' or ``minus''.} +% \changes{v2.9.2}{2016/04/30}{Fix bug with \protect\package{hyperref} package when a lemma starts with ``plus'' or ``minus'' (bug introduced in v.~2.7.0).} % \changes{v2.9.3}{2016/05/02}{Fix bug with line number position and reset added by v.~2.9.0} +% \changes{v2.10.0}{2016/05/08}{Add \protect\cs{AtEveryStanza} and \protect\cs{AtEveryStopStanza}.} +% \changes{v2.10.0}{2016/05/08}{More accurate error messages.} +% \changes{v2.10.0}{2016/05/08}{Fix bug with \protect\cs{ledlsnotefontsetup} and \protect\cs{ledrsnotefontsetup} when using \protect\cs{color} command inside.} % \title{\Macpackage \\ % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} @@ -646,7 +649,7 @@ % However, the best way to be sure that one has made the right number of runs % is to use some of \LaTeX's run scripts like \emph{latexmk}. % -% If you other class than \cs{article} or \cs{book} or modify geometry layout with \package{geometry} some setting should be made to have correct height for the blocks of note. +% If you use other classes than \cs{article} or \cs{book}, or modify the layout with \package{geometry}, some settings should be made to have correct height for the blocks of notes. % %Please read \reff{Xmaxhnotes}. % @@ -1922,12 +1925,14 @@ % \changes{v2.7.0}{2015/11/29}{New hooks: \protect\cs{Xlemmafont} and \protect\cs{Xendlemmafont}} % \DescribeMacro{\Xlemmafont}\DescribeMacro{\Xendlemmafont} -% Use \cs{Xlemmafont}\oarg{s}\meta{cmd} to apply a \TeX\ font command to the lemma. +% Use \cs{Xlemmafont}\oarg{s}\marg{cmd} to apply a \TeX\ font command to the lemma. %For example, to have boldface lemma: % \begin{verbatim} %\Xlemmafont{\bfseries} % \end{verbatim} -% \cs{Xendlemmafont}\meta{arg}\meta{cmd} is the same for endnotes. +% \cs{Xendlemmafont}\oarg{s}\marg{cmd} is the same for endnotes. +% +% % \subsubsection{For all notes} % \DescribeMacro{\Xnotefontsize} % \protect\cs{Xnotefontsize}\oarg{s}\marg{command} is used to define the font size of critical footnotes of the series. The default value is \protect\cs{footnotesize}. @@ -1940,6 +1945,29 @@ % \DescribeMacro{\Xendnotefontsize} % \protect\cs{Xendnotefontsize}\oarg{s}\marg{l} is used to define the font size of end critical footnotes of the series. The default value is \protect\cs{footnotesize}. % The \meta{command} must not be a size in pt, but a standard \LaTeX\ size, like \protect\cs{small}. +% +% \subsection{Wrapping notes} +% \subsubsection{Wrapping lemmas} +% \changes{v2.10.0}{2016/05/08}{New hooks: \protect\cs{Xwraplemma} and \protect\cs{Xendwraplemma}} +% \DescribeMacro{\Xwraplemma}\label{Xwraplemma} +% \cs{Xwraplemma}\oarg{s}\marg{cmd} is used to wrap, in the footnote, the lemma in a \LaTeX\ command. +% For example, with the \package{bidi} package, to ensure having a lemma written right to left, use \cs{Xwraplemma}\arg{\cs{RL}}. +% +% \DescribeMacro{\Xwrapendlemma} +% \cs{Xendwraplemma}\oarg{s}\marg{cmd} is the same for endnotes. +% +% \subsubsection{Wrapping contents} +% \changes{v2.10.0}{2016/05/08}{New hooks: \protect\cs{Xwrapcontent}, \protect\cs{Xendwrapcontent} and \protect\cs{wrapcontentX}.} +% \DescribeMacro{\Xwrapcontent} +% \cs{Xwrapcontent}\oarg{s}\marg{cmd} is used to wrap the footnote contents --- excluding the lemma --- in a \LaTeX command. +% +% For example, if the language of your note is not the same as the language of the lemma, use \cs{Xwrapcontent}\arg{\cs{foreignlanguage}\marg{language}} (with \package{babel}) or \cs{Xwrapcontent}\arg{\cs{text\meta{language}}} (for babel). +% +% \DescribeMacro{\Xendwrapcontent} +% \cs{Xendwrapcontent}\oarg{s}\marg{cmd} is the same for endnotes. +% +% \DescribeMacro{\wrapcontentX} +% \cs{wrapcontentX}\oarg{s}\marg{cmd} is the same for critical footnotes. % \subsection{Indent of notes content} % \changes{v1.21.0}{2015/04/13}{Add \protect\cs{Xparindent} and \protect\cs{hangindentX}} % \DescribeMacro{\Xparindent} @@ -1980,6 +2008,21 @@ % \DescribeMacro{\Xendbhooknote} % \protect\cs{Xendbhooknote}\oarg{s}\marg{code} is to be used at the beginning of the endnotes. % +% \subsection{Arbitrary code before inserting note} +% \DescribeMacro{\Xbeforeinserting} +% \DescribeMacro{beforeinsertingX} +% \cs{Xbeforeinserting}\oarg{s}\marg{code} +% and \cs{beforeinsertingX}\oarg{s}\marg{code} +% are very technical commands. +% +% They allow one to add any arbitrary code just before the footnotes are added in the list of footnotes. +% The main use is to insert text direction code. +% For example, if you edit right-to-left text with \package{bidi}, but want your critical footnote be left-to-right, use \cs{Xbeforeinserting}{\cs{LTR}}. +% You should also use \cs{Xwraplemma} to ensure your lemmas are right-to-left in a left-to-right paragraph (\reff{Xwraplemma})). +% +% Note that the changes are local to the footnote. +% +% % \subsection{Options for footnotes in columns} % % \subsubsection{Alignment} @@ -2337,10 +2380,19 @@ % \subsection{Content before/after verses}\label{contentverse} % It is possible to add content, like a subtitle or a spacing, before or after verse: % \begin{itemize} -% \item \protect\cs{stanza} command can take a optional argument (in brackets). Its content will be printed before the stanza. -% \item \verb+&+ can be replaced by \protect\cs{newverse} with two optional arguments (in brackets). The first will be printed after the current verse, the second before the next verse. -% \item \verb+\&+ can take a optional argument (in brackets). Its content will be printed after the stanza. +% \item The \protect\cs{stanza} command can take an optional argument (in brackets). Its content will be printed before the stanza. +% +% Use \cs{AtEveryStanza}\marg{arg} to automatically add content at the begining of stanza. +% \item \verb+&+ can be replaced by \protect\cs{newverse} with two optional arguments (in brackets). The first will be printed after the current verse, the second before the next verse. +% +% Use \cs{AtEveryPend}\marg{arg} to automatically add content after verses (including the final one) and \cs{AtEveryPstart}\marg{arg} to automatically add content before verses (including the first one). +% \item \verb+\&+ can take an optional argument (in brackets). Its content will be printed after the stanza. +% +% Use \cs{AtEveryStopStanza} to automatically add content at the end of stanzas. +% % \end{itemize} +% +% % \subsection{Numbering stanza}\label{numbering-stanza} % \DescribeMacro{\numberstanzatrue} % \DescribeMacro{\numberstanzafalse} @@ -2861,7 +2913,7 @@ % \item Or set . % \package{glossaries}:\\ \verb+\glsSetCompositor{-}+ % \item Or set \reledmac:\\ \verb+\renewcommand{\pagelinesep}{-}+\\ -% In this case, the will have consequences on your use of \cs{edindex}, and you should set your \verb+.ist+ file (\reff{\pagelinesep}). +% In this case, the above will have consequences for your use of \cs{edindex} and you should set your \verb+.ist+ file (\reff{pagelinesep}). % % \end{itemize} % \subsection{Commands} @@ -3264,23 +3316,23 @@ % % % \subsection{Known and suspected limitations} -% \subsubsection{Not standard geometry} -% If you use class other than \ltxclass{article} or \ltxclass{book}, or if you use the geometry package, you should use \protect{maxhnotesX} and / or \cs{Xmaxhnotes} as explained in \reff{Xmaxhnotes} in order to prevent footnotes overlapping bottom margin. +% \subsubsection{Non-standard geometry} +% If you use classes other than \ltxclass{article} or \ltxclass{book}, or if you use the geometry package, you should use \protect{maxhnotesX} and\slash{}or \cs{Xmaxhnotes} as explained in \reff{Xmaxhnotes} in order to prevent footnotes from overlapping the bottom margin. % % \subsubsection{\package{floatrow} package compatibility} % The \package{floatrow} package must be loaded before the \macpackage. % \subsubsection{`No room for a new'}\label{noroom} -% Sometime, especially when using \macpackage with other packages, you could obtain warning message such 'no room for a new count' or 'no room for a new write'. +% Sometimes, especially when using \macpackage with other packages, you could obtain warning messages such 'no room for a new count' or 'no room for a new write'. % -% The first thing in order to prevent such problem is to use the options to optimize \macpackage. -% For example, if you need only two series of notes, use \verb+series={A,B}+ option. -% Read \reff{optimize} in order to know which are there options. +% In order to prevent such problems, the first thing is to use the options to optimize \macpackage. +% For example, if you need only two series of notes, use the \verb+series={A,B}+ option. +% Read \reff{optimize} in order to know which are the available options. % -% However, if with these options you still have such message, here are some tricks. +% However, if with these options you still have such messages, here are some tricks. % \begin{description} -% \item['no room for a new count'] is often caused by a conjunction with \protect\package{biblatex}. +% \item['no room for a new count'] is often caused by a use in conjunction with \protect\package{biblatex}. % Load \macpackage (and \parpackage) \emph{before} \protect\package{biblatex}. -% \item['no room for a new write'] can be caused by with multiple indexes. +% \item['no room for a new write'] can be caused by multiple indexes. % In this case, use \protect\package{indextools} of \protect\package{imakeidx} with the \verb+splitindex+ option, in order to obtain only one \verb+.idx+ file. % If that does not solve your problem, you can use \protect\package{morewrites} package. % That should solve the problem, but \LaTeX\ will be slower. @@ -3496,7 +3548,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/05/02 v2.9.3 typeset critical edition]% +\ProvidesPackage{reledmac}[2016/05/08 v2.10.0 typeset critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -3821,7 +3873,8 @@ % \begin{macrocode} \newcommand*{\led@err@PstartNotNumbered}{% \reledmac@error{\string\pstart\space must be used within a - numbered section}{\@ehc}} + numbered section % + (\string\beginnumbering…\string\endnumbering)}{\@ehc}}% \newcommand*{\led@err@PstartInPstart}{% \reledmac@error{\string\pstart\space encountered while another \string\pstart\space was in effect}{\@ehc}} @@ -8638,6 +8691,7 @@ % this note series to format the text of the note. % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnote}[2]{% + \csuse{Xbeforeinserting@#1}% \insert\csname #1footins\endcsname\bgroup \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax% \noindent\csuse{Xbhooknote@#1}% @@ -8691,20 +8745,9 @@ \hangindent=\csuse{Xhangindent@#4} \everypar{\hangindent=\csuse{Xhangindent@#4}}% \strut{\printlinefootnote{#1}{#4}}% - {\nottoggle{Xlemmadisablefontselection@#4}% - {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% - {{\csuse{Xlemmafont@#4}#2}}% - }% - \iftoggle{nosep@}{% - \hskip\csuse{Xinplaceoflemmaseparator@#4}% - \relax% - }% - {\ifcsempty{Xlemmaseparator@#4}% - {\hskip\csuse{Xinplaceoflemmaseparator@#4}\relax}% - {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% - \relax% - }}% - #3\strut\par} + \print@lemma{#1}{#2}{#4}% + \csuse{Xwrapcontent@#4}{#3}% + \strut\par} % \end{macrocode} % \end{macro} % @@ -9027,6 +9070,7 @@ % % \begin{macrocode} \newcommand*{\paravfootnote}[2]{% + \csuse{Xbeforeinserting@#1}% \insert\csname #1footins\endcsname \bgroup \csuse{Xnotefontsize@#1} @@ -9115,9 +9159,9 @@ % \begin{macro}{\parafootfmt} % \protect\cs{parafootfmt} is % \protect\cs{normalfootfmt} adapted to do the special stuff -% needed for paragraphed notes---leaving out the \protect\cs{endgraf} at the -% end, sticking in special penalties and kern, and leaving out the -% \protect\cs{footstrut}. The first argument is the line and page +% needed for paragraphed notes --- leaving out the \protect\cs{endgraf} at the +% end, sticking in special penalties and kern and leaving out the +% \protect\cs{footstrut}. The first argument is the line and page % number information, the second is the lemma, the third is the % text of the footnote, and the fourth is the series (optional, for backward compatibility). % \begin{macrocode} @@ -9125,21 +9169,9 @@ \Xinsertparafootsep{#4}% \ledsetnormalparstuff@common% \printlinefootnote{#1}{#4}% - {\nottoggle{Xlemmadisablefontselection@#4}% - {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% - {{\csuse{Xlemmafont@#4}#2}}% - }% - \iftoggle{nosep@}{% - \hskip\csuse{Xinplaceoflemmaseparator@#4}\relax% - }% - {\ifcsempty{Xlemmaseparator@#4}% - {% - \hskip\csuse{Xinplaceoflemmaseparator@#4}\relax% - }% - {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% - \relax% - }}% - #3\penalty-10 } + \print@lemma{#1}{#2}{#4}% + \csuse{Xwrapcontent@#4}{#3}% + \penalty-10 } % \end{macrocode} % Note that in the above definition, the penalty of $-10$ % encourages a line break between notes, so that notes have a @@ -9396,6 +9428,7 @@ % of the note (including numbers, lemma and text). % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnote}[2]{% + \csuse{Xbeforeinserting@#1}% \insert\csname #1footins\endcsname\bgroup% \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax% \noindent\csuse{Xbhooknote@#1}% @@ -9426,20 +9459,10 @@ \strut{% \hspace{\parindent}% \printlinefootnote{#1}{#4}% - }% - {\nottoggle{Xlemmadisablefontselection@#4}% - {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% - {{\csuse{Xlemmafont@#4}#2}}% }% - \iftoggle{nosep@}{% - \hskip\csuse{Xinplaceoflemmaseparator@#4}\relax% - }{% - \ifcsempty{Xlemmaseparator@#4}% - {\hskip\csuse{Xinplaceoflemmaseparator@#4}\relax}% - {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% - \relax% - }}% - #3\strut\par\allowbreak} + \print@lemma{#1}{#2}{#4}% + \csuse{Xwrapcontent@#4}{#3}% + \strut\par\allowbreak} % \end{macrocode} % \end{macro} % @@ -9543,6 +9566,7 @@ % \end{macrocode} % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnote}[2]{% + \csuse{Xbeforeinserting@#1}% \insert\csname #1footins\endcsname\bgroup% \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax% \noindent\csuse{Xbhooknote@#1}% @@ -9565,19 +9589,9 @@ \hspace{\parindent}% \printlinefootnote{#1}{#4}% }% - {\nottoggle{Xlemmadisablefontselection@#4}% - {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% - {{\csuse{Xlemmafont@#4}#2}}% - }% - \iftoggle{nosep@}{% - \hskip\csuse{Xinplaceoflemmaseparator@#4}% - \relax% - }{\ifcsempty{Xlemmaseparator@#4}% - {\hskip\csuse{Xinplaceoflemmaseparator@#4}\relax}% - {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% - \relax% - }}% - #3\strut\par\allowbreak} + \print@lemma{#1}{#2}{#4}% + \csuse{Xwrapcontent@#4}{#3}% + \strut\par\allowbreak} % \end{macrocode} % \begin{macrocode} \newcommand*{\twocolfootgroup}[1]{{\csuse{Xnotefontsize@#1} @@ -9696,6 +9710,43 @@ % \end{macrocode} % % \end{macro} +% \subsubsection{Lemma printing} +% +% \begin{macro}{\print@lemma} +% \cs{print@lemma} is called inside critical footnotes to print the lemma and the lemma separator (\#1: line number and font information, \#2: lemma, \#3: series). +% \changes{v2.10.0}{2016/05/08}{Code refactoring between \protect\cs{parafootfmt}, \protect\cs{twocolfootfmt}, \protect\cs{threecolfootfmt} and \protect\cs{normalfootfmt}.} +% \begin{macrocode} +% +\newcommand{\print@lemma}[3]{% + \bgroup% + \nottoggle{Xlemmadisablefontselection@#3}% + {\select@lemmafont#1|}% + {}% + \bgroup% + \csuse{Xlemmafont@#3}%Deprecated + \csuse{Xwraplemma@#3}{#2}% + \egroup% + \egroup% + \iftoggle{nosep@}{% + \hskip\csuse{Xinplaceoflemmaseparator@#3}% + \relax% + }% + {\ifcsempty{Xlemmaseparator@#3}% + {% + \hskip\csuse{Xinplaceoflemmaseparator@#3}% + \relax% + }% + {% + \nobreak% + \hskip\csuse{Xbeforelemmaseparator@#3}% + \csuse{Xlemmaseparator@#3}% + \hskip\csuse{Xafterlemmaseparator@#3}% + \relax% + }% + }% +}% +% \end{macrocode} +% \end{macro} % \subsubsection{Line number printing} % \begin{macro}{\printlinefootnote} % The \protect\cs{printlinefootnote} macro is called in each \protect\cs{footfmt} command. @@ -10445,6 +10496,7 @@ % \meta{text}. % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnoteX}[2]{% + \csuse{beforeinsertingX@#1}% \insert\@nameuse{footins#1}\bgroup \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% @@ -10496,7 +10548,8 @@ \hangindent=\csuse{hangindentX@#1}% \everypar{\hangindent=\csuse{hangindentX@#1}}% {{\csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}}\strut% - #2\strut\par}} + \csuse{wrapcontentX@#1}{#2}% + \strut\par}} % \end{macrocode} % \end{macro} @@ -10778,6 +10831,7 @@ % \protect\cs{twocolvfootnoteX}\marg{series} % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnoteX}[2]{% + \csuse{beforeinsertingX@#1}% \insert\csname footins#1\endcsname\bgroup% \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% @@ -10808,7 +10862,8 @@ \parindent=\@tempdima% {\hspace{\parindent}% \csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut% - #2\strut\par}% + \csuse{wrapcontentX@#1}{#2}% + \strut\par}% \allowbreak% }% @@ -10901,6 +10956,7 @@ % \protect\cs{threecolvfootnoteX}\marg{series}\marg{text} % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnoteX}[2]{% + \csuse{beforeinsertingX@#1}% \insert\csname footins#1\endcsname\bgroup% \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% @@ -10929,7 +10985,8 @@ \parindent=\@tempdima% {\hspace{\parindent}% \csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut% - #2\strut\par}\allowbreak} + \csuse{wrapcontentX@#1}{#2}% + \strut\par}\allowbreak} % \end{macrocode} % \end{macro} @@ -11056,6 +11113,7 @@ % \protect\cs{para@vfootnoteX}\marg{series}\marg{text} % \begin{macrocode} \newcommand*{\para@vfootnoteX}[2]{% + \csuse{beforeinsertingX@#1}% \insert\csname footins#1\endcsname% \bgroup \csuse{notefontsizeX@#1} @@ -11119,7 +11177,8 @@ \csuse{notenumfontX@#1}% \wrapped@footfootmarkX{#1}% \strut% - #2\penalty-10}} + \csuse{wrapcontentX@#1}{#2}% + \penalty-10}} % \end{macrocode} % \end{macro} @@ -11590,8 +11649,12 @@ \undef\@this@crossref@start% \undef\@this@crossref@end% \nottoggle{Xendlemmadisablefontselection@#4}% - {\select@lemmafont#1|{\csuse{Xendlemmafont@#4}#2}}% - {{\csuse{Xendlemmafont@#4}#2}}% + {\select@lemmafont#1|}% + {}% + \bgroup% + \csuse{Xendlemmafont@#4}% + \csuse{Xendwraplemma@#4}{#2}% + \egroup% \ifboolexpr{% togl {nosep@}% or test{\ifcsempty{Xendlemmaseparator@#4}}% @@ -11603,7 +11666,7 @@ \hskip\csuse{Xendafterlemmaseparator@#4}% \relax% }% - #3% + \csuse{Xendwrapcontent@#4}{#3}% \nottoggle{Xendparagraph@#4}{\par}{}% \def\do##1{% \setkeys[mac]{falsefootnoteoption}{##1}% @@ -11974,6 +12037,8 @@ \newtoggle{Xlineflag@#1} \newtoggle{Xparindent@#1} \newtoggle{Xlemmadisablefontselection@#1} + \csgdef{Xwrapcontent@#1}{}% + \csgdef{Xbeforeinserting@#1}{}% \csgdef{Xhangindent@#1}{0pt}% \csgdef{Xragged@#1}{}% \csgdef{Xhsizetwocol@#1}{0.45 \hsize}% @@ -12026,6 +12091,7 @@ \csgdef{Xlinerangeseparator@#1}{\endashchar}% \csgdef{Xlemmafont@#1}{}% + \csgdef{Xwraplemma@#1}{} \csgdef{Xwidth@#1}{\hsize}% % \end{macrocode} % \subsubsection{Create inserts, needed to add notes in foot} @@ -12153,7 +12219,9 @@ % \subsubsection{Options} % \begin{macrocode} \newtoggle{parindentX@#1} + \csgdef{wrapcontentX@#1}{}% \csgdef{hangindentX@#1}{0pt}% + \csgdef{beforeinsertingX@#1}{}% \csgdef{raggedX@#1}{}% \csgdef{hsizetwocolX@#1}{0.45 \hsize}% \csgdef{hsizethreecolX@#1}{.3 \hsize}% @@ -12308,6 +12376,8 @@ % \end{macrocode} % \subsubsection{The options} % \begin{macrocode} + \csgdef{Xendwraplemma@#1}{} + \csgdef{Xendwrapcontent@#1}{}% \csgdef{Xendtwolines@#1}{}% \csgdef{Xendmorethantwolines@#1}{}% \newtoggle{Xendtwolinesbutnotmore@#1}{}% @@ -12597,7 +12667,10 @@ % Before generating the commands that are used to set the critical notes, such as \protect\cs{Xnumberonlyfirstinline}, \protect\cs{Xlemmaseparator} and the like, we check the \verb+nocritical+ option. % \begin{macrocode} \unless\ifnocritical@ + \newhookcommand@series{Xwrapcontent}% + \newhookcommand@series{Xbeforeinserting}% \newhookcommand@series{Xlemmafont}% + \newhookcommand@series{Xwraplemma}% \newhooktoggle@series{Xparindent} \newhookcommand@series{Xhangindent} \newhookcommand@series{Xragged} @@ -12670,6 +12743,8 @@ % Before generating the optional commands for familiar notes, we check the \protect\cs{nofamiliar} option. % \begin{macrocode} \unless\ifnofamiliar@ + \newhookcommand@series{wrapcontentX}% + \newhookcommand@series{beforeinsertingX}% \newhooktoggle@series{parindentX} \newhookcommand@series{hangindentX} \newhookcommand@series{raggedX} @@ -12701,6 +12776,8 @@ % Before generating the commands that are used to set the endnotes, such as \protect\cs{Xnumberonlyfirstinline}, \protect\cs{Xlemmaseparator}+ and the like, we check the \verb+noend+ option. % \begin{macrocode} \unless\ifnoend@ + \newhookcommand@series{Xendwraplemma} + \newhookcommand@series{Xendwrapcontent} \newhookcommand@series{Xendnotenumfont} \newhookcommand@series{Xendlemmafont}% \newhookcommand@series{Xendbhooknote} @@ -14186,21 +14263,30 @@ % get displayed in the margins. % \begin{macrocode} \newcommand*{\setl@dlp@rbox}[1]{% - {\parindent\z@\hsize=\ledlsnotewidth\ledlsnotefontsetup - \global\setbox\l@dlp@rbox - \ifleftnoteup - =\vbox to\z@{\vss #1}% - \else - =\vbox to 0.70\baselineskip{\strut#1\vss}% - \fi}} + \begingroup% + \parindent\z@\hsize=\ledlsnotewidth% + \ledlsnotefontsetup%We kept it outside of the vbox, because can affect the ragging + \global\setbox\l@dlp@rbox% + \ifleftnoteup% + =\vbox to\z@{{\ledlsnotefontsetup\vss #1}}%We put \ledlsnotefontsetup inside footnote because required for color command. Note the {} to kept setting local. + \else% + =\vbox to 0.70\baselineskip{{\ledlsnotefontsetup\strut#1\vss}}% + \fi% + \endgroup% +} + \newcommand*{\setl@drp@rbox}[1]{% - {\parindent\z@\hsize=\ledrsnotewidth\ledrsnotefontsetup - \global\setbox\l@drp@rbox - \ifrightnoteup - =\vbox to\z@{\vss#1}% - \else - =\vbox to0.7\baselineskip{\strut#1\vss}% - \fi}} + \begingroup% + \parindent\z@\hsize=\ledrsnotewidth% + \ledrsnotefontsetup%We kept it outside of the vbox, because can affect the ragging + \global\setbox\l@drp@rbox% + \ifrightnoteup% + =\vbox to\z@{{\ledrsnotefontsetup\vss#1}}%We put \ledrsnotefontsetup inside footnote because required for color command. Note the {} to kept setting local. + \else% + =\vbox to0.7\baselineskip{{\ledrsnotefontsetup\strut#1\vss}}% + \fi% + \endgroup% +}% \newif\ifleftnoteup \leftnoteuptrue % \end{macrocode} @@ -15326,6 +15412,8 @@ % \changes{v1.12.0}{2014/08/05}{\ampersand can have an optional argument: content to be printed after.} % \changes{v1.20.0}{2015/03/22}{\ampersand\ and \textbackslash\ampersand\ can be preceded by spaces.} % \begin{macro}{\@stopstanza} +% \begin{macro}{\AtEveryStopStanza} +% \begin{macro}{\AtEveryStanza} % \begin{macro}{\newverse} % \changes{v1.6.0}{2013/10/09}{Add \protect\cs{falseverse} macro.} % Now we have the components of the \protect\cs{stanza} macro, @@ -15360,20 +15448,42 @@ \noexpand\newverse[][]}% \def\noexpand\&{\noexpand\@stopstanza}% \noexpand\@advancestanzanumber% - \noexpand\stanza@line[#1]\noexpand\@insertstanzanumber% + \noexpand\stanza@line[#1]% + \noexpand\@insertstanzanumber% \let\par\relax\ignorespaces%No paragraph in verses } -\newcommandx{\stanza}[1][1,usedefault]{\@startstanza[#1]} +\newcommandx{\stanza}[1][1,usedefault]{% + \ifboolexpr{not test{\ifdefvoid{\at@every@stanza}} and test{\ifstrempty{#1}}}% + {\@startstanza[\at@every@stanza]}% + {\@startstanza[#1]}% +}% \newcommandx{\@stopstanza}[1][1,usedefault]{% \unskip% \endlock% - \pend[#1]% + \ifboolexpr{not test{\ifdefvoid{\at@every@stop@stanza}} and test{\ifstrempty{#1}}}% + {\pend[\at@every@stop@stanza]}% + {\pend[#1]}% \endgroup% \instanzafalse% } +\newcommand{\AtEveryStopStanza}[1]{% + \ifstrempty{#1}% + {\xdef\at@every@stop@stanza{}}% + {\gdef\at@every@stop@stanza{#1}}% +}% +\def\at@every@stop@stanza{}% + +\newcommand{\AtEveryStanza}[1]{% + \ifstrempty{#1}% + {\xdef\at@every@stanza{}}% + {\gdef\at@every@stanza{#1}}% +}% +\def\at@every@stanza{}% + + \newcommandx*{\newverse}[2][1,2,usedefault]{% \unskip% \endlock\pend[#1]\sza@penalty\global% @@ -15385,6 +15495,8 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} % \begin{macro}{\flagstanza} % Use \verb?\flagstanza[len]{text}? at the start of a line to put \texttt{text} % a distance \texttt{len} before the start of the line. The default for diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index fe2cf7b0ed2..4839f901d0f 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -270,6 +270,8 @@ % \changes{v2.8.0}{2016/03/23}{{Allow continuing line numbering between normal text and parallel text, using \protect\cs{pausenumbering} and \protect\cs{resumenumbering} and the \protect\option{continuousnumberingwithcolumns} options.}} % \changes{v2.8.0}{2016/03/23}{Fix bug when the right line number style is not the same to the left line number style} % \changes{v2.8.0}{2016/03/23}{Add \protect\cs{linenumberLevenifblanktrue} and \protect\cs{linenumberRevenifblank} commands} +% \changes{v2.9.0}{2016/05/08}{Add \protect\cs{AtEveryStanza} and \protect\cs{AtEveryStopStanza}.} +% \changes{v2.9.0}{2016/05/08}{More accurate error messages.} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -411,7 +413,7 @@ % in the columnar case, all footnotes are set at the bottom left of the % page on which they are called out --- they are not set below the % relevant column. -% The line numbering schemes need not be the same for the two texts. +% % % % \Macpackage essentially puts each chunk of numbered text @@ -472,12 +474,12 @@ % The general scheme for parallel columns looks like this: % \begin{verbatim} % \begin{pairs} -% \begin{Leftside} ... \end{Leftside} -% \begin{Rightside} ... \end{Rightside} +% \begin{Leftside} reledmac numbering text command \end{Leftside} +% \begin{Rightside} reledmac numbering text command \end{Rightside} % \end{pairs} % \Columns % \begin{pairs} -% \begin{Leftside} ... \end{Leftside} +% \begin{Leftside} reledmac numbering text command \end{Leftside} % ... % \end{pairs} % \Columns @@ -564,9 +566,9 @@ % The general scheme for parallel pages looks like this: % \begin{verbatim} % \begin{pages} -% \begin{Leftside} ... \end{Leftside} -% \begin{Rightside} ... \end{Rightside} -% \begin{Leftside} ... \end{Leftside} +% \begin{Leftside} reledmac numbering text command \end{Leftside} +% \begin{Rightside} reledmac numbering text command \end{Rightside} +% \begin{Leftside} reledmac numbering text command \end{Leftside} % ... % \end{pages} % \Pages @@ -1170,7 +1172,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2016/03/23 v2.8.0 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/05/08 v2.9.0 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -1431,6 +1433,13 @@ } % \end{macrocode} % \end{macro} +% \begin{macro}{\led@error@missing@numbering} +% \begin{macrocode} +\newcommand{\led@error@missing@numbering}[1]{% + \reledpar@error{Missing \string\pstart…\string\pend\space inside `#1` environment}{\@ehc}% +}% +% \end{macrocode} +% \end{macro} % \section{Sectioning commands} % % \begin{macro}{\section@numR} @@ -2951,6 +2960,9 @@ \let\old@startstanza\@startstanza \def\@startstanza[##1]{\global\instanzaLtrue\old@startstanza[##1]} }{ + \expandafter\ifvoid\csname l@dLcolrawbox1\endcsname% + \led@error@missing@numbering{Leftside}% + \fi% \Leftsidehookend} % \end{macrocode} % \end{environment} @@ -3002,6 +3014,9 @@ \def\@startstanza[##1]{\global\instanzaRtrue\old@startstanza[##1]} }{% \ledRcolfalse + \expandafter\ifvoid\csname l@dRcolrawbox1\endcsname% + \led@error@missing@numbering{Rightside}% + \fi% \Rightsidehookend } @@ -4538,7 +4553,9 @@ \global\advance\stanza@count\@ne \@astanza@line}% \def\&{\@stopastanza}% - \pstart[#1]% + \ifboolexpr{not test{\ifdefvoid{\at@every@stanza}} and test{\ifstrempty{#1}}}% + {\pstart[\at@every@stanza]}% + {\pstart[#1]}% \@astanza@line \let\par\relax\ignorespaces%No paragraph in verses }{} @@ -4551,8 +4568,10 @@ % It allows optional arguments. % \begin{macrocode} \newcommandx{\@stopastanza}[1][1,usedefault]{% - \endlock\mbox{}% - \pend[#1]% + \endlock\mbox{}% + \ifboolexpr{not test{\ifdefvoid{\at@every@stop@stanza}} and test{\ifstrempty{#1}}}% + {\pend[\at@every@stop@stanza]}% + {\pend[#1]}% }% % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index aa032a8b273..e9f22a65574 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/05/02 v2.9.3 typeset critical edition]% +\ProvidesPackage{reledmac}[2016/05/08 v2.10.0 typeset critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -176,7 +176,8 @@ \reledmac@warning{Bad \string\setlinenum\space argument}} \newcommand*{\led@err@PstartNotNumbered}{% \reledmac@error{\string\pstart\space must be used within a - numbered section}{\@ehc}} + numbered section % + (\string\beginnumbering…\string\endnumbering)}{\@ehc}}% \newcommand*{\led@err@PstartInPstart}{% \reledmac@error{\string\pstart\space encountered while another \string\pstart\space was in effect}{\@ehc}} @@ -2093,6 +2094,7 @@ } \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnote}[2]{% + \csuse{Xbeforeinserting@#1}% \insert\csname #1footins\endcsname\bgroup \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax% \noindent\csuse{Xbhooknote@#1}% @@ -2120,20 +2122,9 @@ \hangindent=\csuse{Xhangindent@#4} \everypar{\hangindent=\csuse{Xhangindent@#4}}% \strut{\printlinefootnote{#1}{#4}}% - {\nottoggle{Xlemmadisablefontselection@#4}% - {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% - {{\csuse{Xlemmafont@#4}#2}}% - }% - \iftoggle{nosep@}{% - \hskip\csuse{Xinplaceoflemmaseparator@#4}% - \relax% - }% - {\ifcsempty{Xlemmaseparator@#4}% - {\hskip\csuse{Xinplaceoflemmaseparator@#4}\relax}% - {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% - \relax% - }}% - #3\strut\par} + \print@lemma{#1}{#2}{#4}% + \csuse{Xwrapcontent@#4}{#3}% + \strut\par} \newcommand*{\normalfootstart}[1]{% \ifdimequal{0pt}{\preXnotes@}{}% {% @@ -2238,6 +2229,7 @@ \let\bidi@RTL@everypar\@empty% \noindent\leavevmode} \newcommand*{\paravfootnote}[2]{% + \csuse{Xbeforeinserting@#1}% \insert\csname #1footins\endcsname \bgroup \csuse{Xnotefontsize@#1} @@ -2283,21 +2275,9 @@ \Xinsertparafootsep{#4}% \ledsetnormalparstuff@common% \printlinefootnote{#1}{#4}% - {\nottoggle{Xlemmadisablefontselection@#4}% - {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% - {{\csuse{Xlemmafont@#4}#2}}% - }% - \iftoggle{nosep@}{% - \hskip\csuse{Xinplaceoflemmaseparator@#4}\relax% - }% - {\ifcsempty{Xlemmaseparator@#4}% - {% - \hskip\csuse{Xinplaceoflemmaseparator@#4}\relax% - }% - {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% - \relax% - }}% - #3\penalty-10 } + \print@lemma{#1}{#2}{#4}% + \csuse{Xwrapcontent@#4}{#3}% + \penalty-10 } \newcommand*{\parafootgroup}[1]{% \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax% \unvbox\csname #1footins\endcsname @@ -2415,6 +2395,7 @@ \multiply\dimen\csname mp#1footins\endcsname \thr@@} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnote}[2]{% + \csuse{Xbeforeinserting@#1}% \insert\csname #1footins\endcsname\bgroup% \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax% \noindent\csuse{Xbhooknote@#1}% @@ -2434,20 +2415,10 @@ \strut{% \hspace{\parindent}% \printlinefootnote{#1}{#4}% - }% - {\nottoggle{Xlemmadisablefontselection@#4}% - {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% - {{\csuse{Xlemmafont@#4}#2}}% }% - \iftoggle{nosep@}{% - \hskip\csuse{Xinplaceoflemmaseparator@#4}\relax% - }{% - \ifcsempty{Xlemmaseparator@#4}% - {\hskip\csuse{Xinplaceoflemmaseparator@#4}\relax}% - {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% - \relax% - }}% - #3\strut\par\allowbreak} + \print@lemma{#1}{#2}{#4}% + \csuse{Xwrapcontent@#4}{#3}% + \strut\par\allowbreak} \newcommand*{\threecolfootgroup}[1]{{\csuse{Xnotefontsize@#1}% \noindent\csuse{Xtxtbeforenotes@#1}}% \csuse{Xbhookgroup@#1}\par% @@ -2502,6 +2473,7 @@ \csxdef{default@#1footins}{500}% \multiply\dimen\csname #1footins\endcsname \tw@} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnote}[2]{% + \csuse{Xbeforeinserting@#1}% \insert\csname #1footins\endcsname\bgroup% \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax% \noindent\csuse{Xbhooknote@#1}% @@ -2522,19 +2494,9 @@ \hspace{\parindent}% \printlinefootnote{#1}{#4}% }% - {\nottoggle{Xlemmadisablefontselection@#4}% - {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% - {{\csuse{Xlemmafont@#4}#2}}% - }% - \iftoggle{nosep@}{% - \hskip\csuse{Xinplaceoflemmaseparator@#4}% - \relax% - }{\ifcsempty{Xlemmaseparator@#4}% - {\hskip\csuse{Xinplaceoflemmaseparator@#4}\relax}% - {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% - \relax% - }}% - #3\strut\par\allowbreak} + \print@lemma{#1}{#2}{#4}% + \csuse{Xwrapcontent@#4}{#3}% + \strut\par\allowbreak} \newcommand*{\twocolfootgroup}[1]{{\csuse{Xnotefontsize@#1} \noindent\csuse{Xtxtbeforenotes@#1}}% \csuse{Xbhookgroup@#1}\par% @@ -2597,6 +2559,34 @@ \thepstart% }% } +\newcommand{\print@lemma}[3]{% + \bgroup% + \nottoggle{Xlemmadisablefontselection@#3}% + {\select@lemmafont#1|}% + {}% + \bgroup% + \csuse{Xlemmafont@#3}%Deprecated + \csuse{Xwraplemma@#3}{#2}% + \egroup% + \egroup% + \iftoggle{nosep@}{% + \hskip\csuse{Xinplaceoflemmaseparator@#3}% + \relax% + }% + {\ifcsempty{Xlemmaseparator@#3}% + {% + \hskip\csuse{Xinplaceoflemmaseparator@#3}% + \relax% + }% + {% + \nobreak% + \hskip\csuse{Xbeforelemmaseparator@#3}% + \csuse{Xlemmaseparator@#3}% + \hskip\csuse{Xafterlemmaseparator@#3}% + \relax% + }% + }% +}% \newcommand{\printlinefootnote}[2]{% \l@dp@rsefootspec#1|% \iftoggle{Xnumberonlyfirstintwolines@#2}{% @@ -3000,6 +2990,7 @@ \newcommand*{\normalbodyfootmarkX}[1]{% \hbox{\textsuperscript{\normalfont\@nameuse{@thefnmark#1}}}} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnoteX}[2]{% + \csuse{beforeinsertingX@#1}% \insert\@nameuse{footins#1}\bgroup \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% @@ -3038,7 +3029,8 @@ \hangindent=\csuse{hangindentX@#1}% \everypar{\hangindent=\csuse{hangindentX@#1}}% {{\csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}}\strut% - #2\strut\par}} + \csuse{wrapcontentX@#1}{#2}% + \strut\par}} \newcommand*{\normalfootfootmarkX}[1]{% \textsuperscript{\@nameuse{@thefnmark#1}}} @@ -3218,6 +3210,7 @@ \multiply\dimen\csname mpfootins#1\endcsname by \tw@} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnoteX}[2]{% + \csuse{beforeinsertingX@#1}% \insert\csname footins#1\endcsname\bgroup% \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% @@ -3242,7 +3235,8 @@ \parindent=\@tempdima% {\hspace{\parindent}% \csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut% - #2\strut\par}% + \csuse{wrapcontentX@#1}{#2}% + \strut\par}% \allowbreak% }% @@ -3302,6 +3296,7 @@ \multiply\dimen\csname mpfootins#1\endcsname by \thr@@} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnoteX}[2]{% + \csuse{beforeinsertingX@#1}% \insert\csname footins#1\endcsname\bgroup% \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% @@ -3324,7 +3319,8 @@ \parindent=\@tempdima% {\hspace{\parindent}% \csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}\strut% - #2\strut\par}\allowbreak} + \csuse{wrapcontentX@#1}{#2}% + \strut\par}\allowbreak} \newcommand*{\threecolfootgroupX}[1]{{\csuse{bhookgroupX@#1}\csuse{notefontsizeX@#1} \splittopskip=\ht\strutbox @@ -3411,6 +3407,7 @@ } \newcommand*{\para@vfootnoteX}[2]{% + \csuse{beforeinsertingX@#1}% \insert\csname footins#1\endcsname% \bgroup \csuse{notefontsizeX@#1} @@ -3464,7 +3461,8 @@ \csuse{notenumfontX@#1}% \wrapped@footfootmarkX{#1}% \strut% - #2\penalty-10}} + \csuse{wrapcontentX@#1}{#2}% + \penalty-10}} \newcommand*{\para@footgroupX}[1]{% \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% @@ -3721,8 +3719,12 @@ \undef\@this@crossref@start% \undef\@this@crossref@end% \nottoggle{Xendlemmadisablefontselection@#4}% - {\select@lemmafont#1|{\csuse{Xendlemmafont@#4}#2}}% - {{\csuse{Xendlemmafont@#4}#2}}% + {\select@lemmafont#1|}% + {}% + \bgroup% + \csuse{Xendlemmafont@#4}% + \csuse{Xendwraplemma@#4}{#2}% + \egroup% \ifboolexpr{% togl {nosep@}% or test{\ifcsempty{Xendlemmaseparator@#4}}% @@ -3734,7 +3736,7 @@ \hskip\csuse{Xendafterlemmaseparator@#4}% \relax% }% - #3% + \csuse{Xendwrapcontent@#4}{#3}% \nottoggle{Xendparagraph@#4}{\par}{}% \def\do##1{% \setkeys[mac]{falsefootnoteoption}{##1}% @@ -3966,6 +3968,8 @@ \newtoggle{Xlineflag@#1} \newtoggle{Xparindent@#1} \newtoggle{Xlemmadisablefontselection@#1} + \csgdef{Xwrapcontent@#1}{}% + \csgdef{Xbeforeinserting@#1}{}% \csgdef{Xhangindent@#1}{0pt}% \csgdef{Xragged@#1}{}% \csgdef{Xhsizetwocol@#1}{0.45 \hsize}% @@ -4018,6 +4022,7 @@ \csgdef{Xlinerangeseparator@#1}{\endashchar}% \csgdef{Xlemmafont@#1}{}% + \csgdef{Xwraplemma@#1}{} \csgdef{Xwidth@#1}{\hsize}% \expandafter\newinsert\csname #1footins\endcsname% \unless\ifnoledgroup@% @@ -4118,7 +4123,9 @@ \fi \unless\ifnofamiliar@ \newtoggle{parindentX@#1} + \csgdef{wrapcontentX@#1}{}% \csgdef{hangindentX@#1}{0pt}% + \csgdef{beforeinsertingX@#1}{}% \csgdef{raggedX@#1}{}% \csgdef{hsizetwocolX@#1}{0.45 \hsize}% \csgdef{hsizethreecolX@#1}{.3 \hsize}% @@ -4203,6 +4210,8 @@ \global\cslet{#1end}{\@gobblefive} \global\expandafter\newcount\csname #1end@bysection\endcsname% + \csgdef{Xendwraplemma@#1}{} + \csgdef{Xendwrapcontent@#1}{}% \csgdef{Xendtwolines@#1}{}% \csgdef{Xendmorethantwolines@#1}{}% \newtoggle{Xendtwolinesbutnotmore@#1}{}% @@ -4365,7 +4374,10 @@ }% } \unless\ifnocritical@ + \newhookcommand@series{Xwrapcontent}% + \newhookcommand@series{Xbeforeinserting}% \newhookcommand@series{Xlemmafont}% + \newhookcommand@series{Xwraplemma}% \newhooktoggle@series{Xparindent} \newhookcommand@series{Xhangindent} \newhookcommand@series{Xragged} @@ -4434,6 +4446,8 @@ \newhooktoggle@series{Xtwolinesonlyinsamepage}[appref,SEref] \newhookcommand@series{Xlinerangeseparator}[appref,SEref] \unless\ifnofamiliar@ + \newhookcommand@series{wrapcontentX}% + \newhookcommand@series{beforeinsertingX}% \newhooktoggle@series{parindentX} \newhookcommand@series{hangindentX} \newhookcommand@series{raggedX} @@ -4461,6 +4475,8 @@ {}% \fi \unless\ifnoend@ + \newhookcommand@series{Xendwraplemma} + \newhookcommand@series{Xendwrapcontent} \newhookcommand@series{Xendnotenumfont} \newhookcommand@series{Xendlemmafont}% \newhookcommand@series{Xendbhooknote} @@ -5279,21 +5295,30 @@ \newcommand*{\vl@dcsnote}[1]{\listgadd{\l@dcsnotetext}{#1}} \newcommand*{\setl@dlp@rbox}[1]{% - {\parindent\z@\hsize=\ledlsnotewidth\ledlsnotefontsetup - \global\setbox\l@dlp@rbox - \ifleftnoteup - =\vbox to\z@{\vss #1}% - \else - =\vbox to 0.70\baselineskip{\strut#1\vss}% - \fi}} + \begingroup% + \parindent\z@\hsize=\ledlsnotewidth% + \ledlsnotefontsetup%We kept it outside of the vbox, because can affect the ragging + \global\setbox\l@dlp@rbox% + \ifleftnoteup% + =\vbox to\z@{{\ledlsnotefontsetup\vss #1}}%We put \ledlsnotefontsetup inside footnote because required for color command. Note the {} to kept setting local. + \else% + =\vbox to 0.70\baselineskip{{\ledlsnotefontsetup\strut#1\vss}}% + \fi% + \endgroup% +} + \newcommand*{\setl@drp@rbox}[1]{% - {\parindent\z@\hsize=\ledrsnotewidth\ledrsnotefontsetup - \global\setbox\l@drp@rbox - \ifrightnoteup - =\vbox to\z@{\vss#1}% - \else - =\vbox to0.7\baselineskip{\strut#1\vss}% - \fi}} + \begingroup% + \parindent\z@\hsize=\ledrsnotewidth% + \ledrsnotefontsetup%We kept it outside of the vbox, because can affect the ragging + \global\setbox\l@drp@rbox% + \ifrightnoteup% + =\vbox to\z@{{\ledrsnotefontsetup\vss#1}}%We put \ledrsnotefontsetup inside footnote because required for color command. Note the {} to kept setting local. + \else% + =\vbox to0.7\baselineskip{{\ledrsnotefontsetup\strut#1\vss}}% + \fi% + \endgroup% +}% \newif\ifleftnoteup \leftnoteuptrue \newcommand{\setsidenotesep}[1]{\gdef\@sidenotesep{#1}} @@ -5928,20 +5953,41 @@ \noexpand\newverse[][]}% \def\noexpand\&{\noexpand\@stopstanza}% \noexpand\@advancestanzanumber% - \noexpand\stanza@line[#1]\noexpand\@insertstanzanumber% + \noexpand\stanza@line[#1]% + \noexpand\@insertstanzanumber% \let\par\relax\ignorespaces%No paragraph in verses } -\newcommandx{\stanza}[1][1,usedefault]{\@startstanza[#1]} +\newcommandx{\stanza}[1][1,usedefault]{% + \ifboolexpr{not test{\ifdefvoid{\at@every@stanza}} and test{\ifstrempty{#1}}}% + {\@startstanza[\at@every@stanza]}% + {\@startstanza[#1]}% +}% \newcommandx{\@stopstanza}[1][1,usedefault]{% \unskip% \endlock% - \pend[#1]% + \ifboolexpr{not test{\ifdefvoid{\at@every@stop@stanza}} and test{\ifstrempty{#1}}}% + {\pend[\at@every@stop@stanza]}% + {\pend[#1]}% \endgroup% \instanzafalse% } +\newcommand{\AtEveryStopStanza}[1]{% + \ifstrempty{#1}% + {\xdef\at@every@stop@stanza{}}% + {\gdef\at@every@stop@stanza{#1}}% +}% +\def\at@every@stop@stanza{}% + +\newcommand{\AtEveryStanza}[1]{% + \ifstrempty{#1}% + {\xdef\at@every@stanza{}}% + {\gdef\at@every@stanza{#1}}% +}% +\def\at@every@stanza{}% + \newcommandx*{\newverse}[2][1,2,usedefault]{% \unskip% \endlock\pend[#1]\sza@penalty\global% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 438858dee0c..15719b6d6d2 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2016/03/23 v2.8.0 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/05/08 v2.9.0 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -122,6 +122,9 @@ Such behavior is deprecated.\MessageBreak% Use instead #1R or #1* in your preamble.}% } +\newcommand{\led@error@missing@numbering}[1]{% + \reledpar@error{Missing \string\pstart…\string\pend\space inside `#1` environment}{\@ehc}% +}% \newcount\section@numR \section@numR=\z@ \pst@rtedLfalse @@ -758,6 +761,9 @@ \let\old@startstanza\@startstanza \def\@startstanza[##1]{\global\instanzaLtrue\old@startstanza[##1]} }{ + \expandafter\ifvoid\csname l@dLcolrawbox1\endcsname% + \led@error@missing@numbering{Leftside}% + \fi% \Leftsidehookend} \newcommand*{\Leftsidehook}{} \newcommand*{\Leftsidehookend}{} @@ -785,6 +791,9 @@ \def\@startstanza[##1]{\global\instanzaRtrue\old@startstanza[##1]} }{% \ledRcolfalse + \expandafter\ifvoid\csname l@dRcolrawbox1\endcsname% + \led@error@missing@numbering{Rightside}% + \fi% \Rightsidehookend } @@ -1687,14 +1696,18 @@ \global\advance\stanza@count\@ne \@astanza@line}% \def\&{\@stopastanza}% - \pstart[#1]% + \ifboolexpr{not test{\ifdefvoid{\at@every@stanza}} and test{\ifstrempty{#1}}}% + {\pstart[\at@every@stanza]}% + {\pstart[#1]}% \@astanza@line \let\par\relax\ignorespaces%No paragraph in verses }{} \newcommandx{\@stopastanza}[1][1,usedefault]{% - \endlock\mbox{}% - \pend[#1]% + \endlock\mbox{}% + \ifboolexpr{not test{\ifdefvoid{\at@every@stop@stanza}} and test{\ifstrempty{#1}}}% + {\pend[\at@every@stop@stanza]}% + {\pend[#1]}% }% \newcommand*{\@astanza@line}{% \ifnum\value{stanzaindentsrepetition}=0 -- cgit v1.2.3