diff options
| author | Karl Berry <karl@freefriends.org> | 2021-03-01 23:00:39 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2021-03-01 23:00:39 +0000 |
| commit | 3ef6c533945def33c3dd38add0932d7956c8de01 (patch) | |
| tree | b1564d94fd644b14abb354c730647376b29afdb3 | |
| parent | aaceeb5824730591d2a438735fdf613621fc7230 (diff) | |
reledmac (1mar21) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58044 c570f23f-e606-0410-a88d-b1316a301751
51 files changed, 141 insertions, 74 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 d922ac97c59..1c0587d73d6 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 3557889e53c..ca23dc8bd24 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 2956a995dd8..32c10b641ac 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 66b1d0bdc49..713ae63aad6 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 2b22872ff1f..5333254fa4d 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 a2751a55bd8..ab9862489a6 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 b955cb86c7a..01d05a49aa3 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 edad13ac9a0..5646fb5622c 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 a85c5ed4caf..9ae77067ffd 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 fd04a369f56..a70f8388cc0 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 baeff7cebc0..85464b2a446 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 de2c48df82a..4a63998d9cf 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 98ab6f5abe0..d5e06e6b934 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 93426cc000b..d971e5f2a1b 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 358b2802d3a..bf497aa4681 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 9092fd05133..63bd1d3ab63 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 a9f41d55d20..be206bf8ed5 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 9931ef416c0..2457cac597c 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 8ca11ac3199..422c0e60a02 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 bfe9513f983..636f3da0983 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-subdivision-number-in-header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf Binary files differindex 56fb7e50f60..9c3429b96d9 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 db198be2c46..0a26c9593ab 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 37afb6905b9..ebd3bba1bbf 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 d19d9b20bb6..30a8d95f437 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 f9c3b1b389e..a0f7c03ae77 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 7fa8e901c20..b62895763df 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 311737e2da0..6f700386cde 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 dfa8fc67387..d2537e9a690 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 61286c642b5..7000f32f274 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 e39214ce63a..fc91fe4efdb 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 b717c9fc2bb..30522f74ab5 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 2a952503b43..91eecc07a2a 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 80fb9ae37f5..281208f8f70 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 91e6b935173..ad963fb22b1 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 e7ea3fece55..aaa5b15071d 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 effe2d7b69b..9d6f76e19c6 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 ae7deb7d07c..c915cf9fb40 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 bd5b80ad829..096ca858176 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 65ab68e1c59..d1c331140e2 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 a01e1bb1e8a..03adf25176e 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 9e82ce62c5a..5e48abecca0 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 dd463643f56..31556cc6217 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 c96b6706cad..616cbd578dd 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 17726a67f9d..2df64392701 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 949b97b5037..a8b7028e9c4 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 ede0873d4e5..021b5640627 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/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf Binary files differindex 7e2d214d59e..04b799404a8 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 cc9b749b1ee..b5df111969e 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 e4216577e11..325e3f86112 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 af00ef41de0..7fe954be7f8 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -573,7 +573,10 @@ % \changes{v2.35.1}{2020/12/20}{Fix a bug when printing ending page number in endnotes and using the \protect\package{hyperref} package.} % \changes{v2.36.0}{2021/01/21}{Fix bug with sublineation on right side of parallel typesetting.} % \changes{v2.36.0}{2021/01/21}{Add \protect\cs{Xnonote} and \protect\cs{nonoteX}.} -% \changes{v2.36.0}{2021/02/14}{Fix bug with crossreferecing in parallel typesetting (added in v2.34.4)} +% \changes{v2.36.1}{2021/02/14}{Fix bug with crossreferencing in parallel typesetting (added in v2.34.4)} +% \changes{v2.37.0}{2021/02/28}{Fix incompatibility between \protect\cs{eledsection} (and related) and \protect\package{hyperref}. Incompatibility was introduced by some changes in \protect\package{hyperref} package.} +% \changes{v2.37.0}{2021/02/28}{Fix bug with \protect\cs{Xnonote}} +% \changes{v2.37.0}{2021/02/28}{Improve syntaxis check.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -4460,7 +4463,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2021/02/14 v2.36.1 typesetting critical editions]% +\ProvidesPackage{reledmac}[2021/02/28 v2.37.0 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -5019,17 +5022,17 @@ }% % \end{macrocode} % \end{macro} -% \begin{macro}{\led@err@EdtextWithoutFootnote} +% \begin{macro}{\led@err@EdtextWithoutNote} % \begin{macrocode} -\newcommand{\led@err@EdtextWithoutFootnote}{% - \reledmac@error{edtext without Xfootnote. Check syntaxis}{\@ehc}% +\newcommand{\led@err@EdtextWithoutNote}[1]{% + \reledmac@error{edtext `\unexpanded{#1}` without Xfootnote or Xendnote. Check syntaxis.}{\@ehc}% }% % \end{macrocode} % \end{macro} % \begin{macro}{\led@err@FootnoteNotInSecondArgEdtext} % \begin{macrocode} \newcommand{\led@err@FootnoteNotInSecondArgEdtext}[1]{% - \reledmac@error{#1footnote outside of the second argument of an edtext. Check syntax}{\@ehc}% + \reledmac@error{#1footnote outside of the second argument of an edtext. Check syntaxis.}{\@ehc}% }% % \end{macrocode} % \end{macro} @@ -7593,8 +7596,6 @@ % \end{macrocode} % \end{macro} % \end{macro} -% \begin{macro}{\if@noneed@Footnote} -% \protect\cs{if@noneed@Footnote} is a boolean to check if we have to print a error message when a \protect\cs{edtext} is called without any critical notes. % % \begin{macro}{\flag@start} % \begin{macro}{\flag@end} @@ -7607,41 +7608,30 @@ % setting the value of \protect\cs{insert@count} appropriately; it % actually gets done by the various footnote macros. % \begin{macrocode} -\newif\if@noneed@Footnote% \newcommand*{\flag@start}{% \ifledRcol% \edef\next{\write\linenum@outR{% \string\@ref[\the\insert@countR][}}% - \next% - \ifnum\insert@countR<1% - \if@noneed@Footnote\else% - \led@err@EdtextWithoutFootnote% - \fi% - \fi% \else% \edef\next{\write\linenum@out{% \string\@ref[\the\insert@count][}}% - \next% - \ifnum\insert@count<1% - \if@noneed@Footnote\else% - \led@err@EdtextWithoutFootnote% - \fi% - \fi% - \fi}% + \fi% + \next% +}% \newcommand*{\flag@end}{% \ifledRcol% \write\linenum@outR{]}% \else% \write\linenum@out{]}% - \fi}% + \fi% +}% % \end{macrocode} % \end{macro} % \end{macro} -% \end{macro} % \begin{macro}{\flag@start@RTL} % \begin{macro}{\flag@end@RTL} % With \XeLaTeX, there is a problem when using RTL: the writing of a command in the numbered auxiliary files (\verb+.1+, \verb+.2+ etc) is reversed when the first argument of \cs{edtext} is typset in one line, but it is \textbf{not} reversed when this first argument is typset in two lines or more.\footnote{This problem is caused by the way \XeTeX\ manages right-to-left typsetting. David Carlisle explains it on \url{http://tex.stackexchange.com/a/333373/7712} and provides a potential solution, using \cs{vadjust}. However in some cases this adds spurious vertical spaces in reledmac. That is why we are using the solution explained below.} @@ -8133,6 +8123,24 @@ \renewcommand{\theedtext}{edtxt@\the\c@edtext}% % \end{macrocode} % \end{macro} +% \begin{macro}{\edtext@notes} +% \begin{macro}{\edtext@notes@start} +% The \cs{edtext@notes} is increased each time we have a footnote required in the second argument of \cs{edtext}, that is a \cs{Xfootnote} or a \cs{Xendfootnote}. +% +% The \cs{edtext@notes@start} is let to \cs{edtext@notes} at the beginning of a \cs{edtext} +% +% \begin{macrocode} +\newcount\edtext@notes% +\newcount\edtext@notes@start% +% \end{macrocode} +% \end{macro} +% \end{macro} +% \begin{macro}{\if@noneed@notes} +% The \cs{if@noneed@notes} macro is (locally) set to true when we read a critical note for a series with \Xnonote set to true. +% \begin{macrocode} +\newif\if@noneed@notes% +% \end{macrocode} +% \end{macro} % \begin{macro}{\edtext} % \changes{v0.4.0}{2004/02/29}{Added \protect\cs{showlemma} to \protect\cs{edtext}} % \changes{v1.4.0}{2012/11/16}{Compatibility of \protect\cs{edtext} with the right-to-left direction (with Polyglossia).} @@ -8154,6 +8162,10 @@ % \begin{macrocode} \global\advance\@edtext@level by 1% % \end{macrocode} +% We let \cs{edtext@notes@start} equal to \cs{edtext@notes} to check later the number of notes associated to the edtext. +% \begin{macrocode} + \global\edtext@notes@start=\edtext@notes% +% \end{macrocode} % We also increase the \verb+edtext+ \LaTeX\ counter to insert a hypertarget if the \package{hyperref} package is loaded, and also works with \cs{edtext} on right-to-left typesetting with \XeLaTeX. % % We store the value for the current level in a global macro. So we have one macro by level of \cs{edtext}. That is required, because \cs{edtext} can contain \cs{edtext}. @@ -8227,6 +8239,14 @@ \ignorespaces #2\relax% \@edtext@secondarg@false% % \end{macrocode} +% Check if we inded insert footnotes or critical notes. +% \begin{macrocode} + \ifnum\edtext@notes=\edtext@notes@start% + \unless\if@noneed@notes% + \led@err@EdtextWithoutNote{#1}% + \fi% + \fi% +% \end{macrocode} % With \XeLaTeX, you must track whether the language reads left to right (English) or right to left (Arabic). \reledmac defines an \cs{if@RTL} boolean test is not already defined. % \begin{macrocode} \if@RTL% @@ -8292,7 +8312,6 @@ % \item The one that says we are inside a \protect\cs{@lemma}. % \end{itemize} % \begin{macrocode} - \global\@noneed@Footnotefalse% \global\advance\@edtext@level by -1% \global\@lemmacommand@false% % \end{macrocode} @@ -12923,7 +12942,10 @@ % \begin{macrocode} \pretocmd{\@footnotetext}{% \ifnumberedpar@ - \edtext{}{\l@dbfnote{#1}}% + \edtext{}{% + \advance \edtext@notes by 1% + \l@dbfnote{#1}% + }% \else }{}{} \apptocmd{\@footnotetext}{\fi}{}{}% @@ -13360,7 +13382,10 @@ \newcommand{\vnumfootnoteX}[3]{% \ifnumberedpar@ - \edtext{}{\normalbfnoteX{#1}{#2}{#3}}% + \edtext{}{% + \advance\edtext@notes by 1% + \normalbfnoteX{#1}{#2}{#3}% + }% \else \def\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \get@thisfootnoteX{#1}% @@ -15074,6 +15099,7 @@ % \begin{macrocode} \global\notbool{parapparatus@}{\expandafter\newcommand\expandafter *}{\expandafter\newcommand}\csname #1footnote\endcsname[2][]{% \nottoggle{Xnonote@#1}{% + \advance \edtext@notes by 1% \if@edtext@secondarg@% \ifledRcol% \ifcsstring{Xonlyside@#1}{L}{\led@error@note@called@onrightside{#1footnote}}{}% @@ -15170,7 +15196,7 @@ \else% \led@err@FootnoteNotInSecondArgEdtext{#1}% \fi% - }{\@noneed@Footnotetrue}% End of \nottoggle{Xnonote@#1}{% + }{\@noneed@notestrue}% End of \nottoggle{Xnonote@#1}{% \ignorespaces% } % \end{macrocode} @@ -15377,9 +15403,9 @@ % \begin{macrocode} \global\expandafter\newcommandx\csname #1endnote\endcsname[2][1,usedefault]{% + \advance \edtext@notes by 1% \bgroup% \newlinechar='40% - \global\@noneed@Footnotetrue% \newcommand{\content}{##2}% \stepcounter{labidx}% \expandafter\immediate\expandafter\write\csname l@d@#1end\endcsname{% @@ -17619,22 +17645,42 @@ % \begin{macro}{\ledinnernote} % \begin{macro}{\ledouternote} % \begin{macro}{\ledsidenote} +% \begin{macro}{\ledsidenote@} % \protect\cs{ledleftnote}, \protect\cs{ledrightnote}, \protect\cs{ledinnernote}, \protect\cs{ledouternote} are the % user commands for left, right, inner and outer sidenotes. % The two last ones are just alias for the two first ones, depending on the page number. % \protect\cs{ledsidenote}\marg{text} is the command for a moveable sidenote. +% +% All these macro call the macro \cs{ledsidenote@}, as they have the same structure. % \begin{macrocode} -\newcommand*{\ledleftnote}[1]{\edtext{}{\l@dlsnote{#1}}} -\newcommand*{\ledrightnote}[1]{\edtext{}{\l@drsnote{#1}}} -\newcommand*{\ledsidenote}[1]{\edtext{}{\l@dcsnote{#1}}}% -\newcommand*{\ledinnernote}[1]{\edtext{}{\l@disnote{#1}}}% -\newcommand*{\ledouternote}[1]{\edtext{}{\l@dosnote{#1}}}% +\newcommand*{\ledleftnote}[1]{% + \ledsidenote@{\l@dlsnote{#1}}% +}% +\newcommand*{\ledrightnote}[1]{% + \ledsidenote@{\l@drsnote{#1}}% +}% +\newcommand*{\ledsidenote}[1]{% + \ledsidenote@{\l@dcsnote{#1}}% +}% +\newcommand*{\ledinnernote}[1]{% + \ledsidenote@{\l@disnote{#1}}% +}% +\newcommand*{\ledouternote}[1]{% + \ledsidenote@{\l@dosnote{#1}}% +}% +\newcommand*{\ledsidenote@}[1]{% + \edtext{}{% + \advance\edtext@notes@start by 1% + #1% + }%+ +}% % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % % \begin{macro}{\l@dlsnote} @@ -21505,11 +21551,11 @@ % \end{macrocode} % \changes{v1.14.1}{2014/12/15}{Debug sectioning commands when using both \protect\package{handout} and \protect\package{hyperref} package.} -% \protect\package{hyperref} also redefines \protect\cs{@sect}. That is why, when manipulating arguments, we patch \protect\cs{@sect} and the same only if \protect\package{hyperref} is not used. If it is, we patch the \protect\cs{NR} commands. +% \protect\package{hyperref} also redefines \protect\cs{@sect}. That is why, when manipulating arguments, we patch \protect\cs{@sect} and the same only if \protect\package{hyperref} is not used. If it is, we patch the \protect\cs{H@old} commands. % \begin{macrocode} -\@ifpackageloaded{nameref}{ +\ifdef{\H@old@sect}{% - \patchcmd{\NR@sect} + \patchcmd{\H@old@sect}% {#8} {#8% \print@rightmargin@eledsection% @@ -21517,7 +21563,7 @@ {} {} - \patchcmd{\NR@sect} + \patchcmd{\H@old@sect}% {\hskip #3\relax} {\hskip #3\relax% \print@leftmargin@eledsection% @@ -21525,7 +21571,7 @@ {} {} - \patchcmd{\NR@ssect} + \patchcmd{\H@old@@sect}% {#5} {#5% \print@rightmargin@eledsection% @@ -21533,7 +21579,7 @@ {} {} - \patchcmd{\NR@ssect} + \patchcmd{\H@old@@sect}% {\hskip #1} {\hskip #1% \print@leftmargin@eledsection% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 253afd6a744..53dfff0e9a3 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}[2021/02/14 v2.36.1 typesetting critical editions]% +\ProvidesPackage{reledmac}[2021/02/28 v2.37.0 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -310,11 +310,11 @@ \newcommand{\led@err@toendnotes@outsidenumbering}{% \reledmac@error{\string\toendnotes\space and related commands must be called inside a numbered texte (\string\beginnumbering\space ...\space\string\endnumbering)}{\@ehc}% }% -\newcommand{\led@err@EdtextWithoutFootnote}{% - \reledmac@error{edtext without Xfootnote. Check syntaxis}{\@ehc}% +\newcommand{\led@err@EdtextWithoutNote}[1]{% + \reledmac@error{edtext `\unexpanded{#1}` without Xfootnote or Xendnote. Check syntaxis.}{\@ehc}% }% \newcommand{\led@err@FootnoteNotInSecondArgEdtext}[1]{% - \reledmac@error{#1footnote outside of the second argument of an edtext. Check syntax}{\@ehc}% + \reledmac@error{#1footnote outside of the second argument of an edtext. Check syntaxis.}{\@ehc}% }% \newcommand{\led@error@PackageAfterEledmac}[1]{% \reledmac@error{#1 must be loaded before reledmac}{\@ehc}% @@ -1445,35 +1445,25 @@ {\global\@this@c@page=\c@par@page}% {\global\@this@c@page=\c@page}% }% -\newif\if@noneed@Footnote% \newcommand*{\flag@start}{% \ifledRcol% \edef\next{\write\linenum@outR{% \string\@ref[\the\insert@countR][}}% - \next% - \ifnum\insert@countR<1% - \if@noneed@Footnote\else% - \led@err@EdtextWithoutFootnote% - \fi% - \fi% \else% \edef\next{\write\linenum@out{% \string\@ref[\the\insert@count][}}% - \next% - \ifnum\insert@count<1% - \if@noneed@Footnote\else% - \led@err@EdtextWithoutFootnote% - \fi% - \fi% - \fi}% + \fi% + \next% +}% \newcommand*{\flag@end}{% \ifledRcol% \write\linenum@outR{]}% \else% \write\linenum@out{]}% - \fi}% + \fi% +}% \newcommand{\flag@start@RTL}{% \edlabel{edtext:start:\csuse{thisedtext@\the\@edtext@level}}% @@ -1633,10 +1623,14 @@ \newif\if@edtext@secondarg@% \newcounter{edtext} \renewcommand{\theedtext}{edtxt@\the\c@edtext}% +\newcount\edtext@notes% +\newcount\edtext@notes@start% +\newif\if@noneed@notes% \newcommand{\edtext}[2]{\leavevmode% \ifnumberedpar@% \@check@edtext@args{#1}{#2}% \global\advance\@edtext@level by 1% + \global\edtext@notes@start=\edtext@notes% \stepcounter{edtext}% \csxdef{thisedtext@\the\@edtext@level}{\theedtext}% \global\@lemmacommand@false% @@ -1659,6 +1653,11 @@ \@edtext@secondarg@true% \ignorespaces #2\relax% \@edtext@secondarg@false% + \ifnum\edtext@notes=\edtext@notes@start% + \unless\if@noneed@notes% + \led@err@EdtextWithoutNote{#1}% + \fi% + \fi% \if@RTL% \flag@start@RTL% \else% @@ -1691,7 +1690,6 @@ \else% \flag@end% \fi% - \global\@noneed@Footnotefalse% \global\advance\@edtext@level by -1% \global\@lemmacommand@false% \global\let\@beforeinsertofthisedtext\relax% @@ -4046,7 +4044,10 @@ \pretocmd{\@footnotetext}{% \ifnumberedpar@ - \edtext{}{\l@dbfnote{#1}}% + \edtext{}{% + \advance \edtext@notes by 1% + \l@dbfnote{#1}% + }% \else }{}{} \apptocmd{\@footnotetext}{\fi}{}{}% @@ -4330,7 +4331,10 @@ \newcommand{\vnumfootnoteX}[3]{% \ifnumberedpar@ - \edtext{}{\normalbfnoteX{#1}{#2}{#3}}% + \edtext{}{% + \advance\edtext@notes by 1% + \normalbfnoteX{#1}{#2}{#3}% + }% \else \def\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \get@thisfootnoteX{#1}% @@ -5476,6 +5480,7 @@ \fi% \global\notbool{parapparatus@}{\expandafter\newcommand\expandafter *}{\expandafter\newcommand}\csname #1footnote\endcsname[2][]{% \nottoggle{Xnonote@#1}{% + \advance \edtext@notes by 1% \if@edtext@secondarg@% \ifledRcol% \ifcsstring{Xonlyside@#1}{L}{\led@error@note@called@onrightside{#1footnote}}{}% @@ -5572,7 +5577,7 @@ \else% \led@err@FootnoteNotInSecondArgEdtext{#1}% \fi% - }{\@noneed@Footnotetrue}% End of \nottoggle{Xnonote@#1}{% + }{\@noneed@notestrue}% End of \nottoggle{Xnonote@#1}{% \ignorespaces% } \expandafter\newcount\csname #1prevpage@num\endcsname% @@ -5688,9 +5693,9 @@ \expandafter\newif\csname ifl@dend@#1\endcsname% \global\expandafter\newcommandx\csname #1endnote\endcsname[2][1,usedefault]{% + \advance \edtext@notes by 1% \bgroup% \newlinechar='40% - \global\@noneed@Footnotetrue% \newcommand{\content}{##2}% \stepcounter{labidx}% \expandafter\immediate\expandafter\write\csname l@d@#1end\endcsname{% @@ -7074,11 +7079,27 @@ \newcommand*{\ledlsnotefontsetup}{\raggedleft\footnotesize} \newcommand*{\ledrsnotefontsetup}{\raggedright\footnotesize} -\newcommand*{\ledleftnote}[1]{\edtext{}{\l@dlsnote{#1}}} -\newcommand*{\ledrightnote}[1]{\edtext{}{\l@drsnote{#1}}} -\newcommand*{\ledsidenote}[1]{\edtext{}{\l@dcsnote{#1}}}% -\newcommand*{\ledinnernote}[1]{\edtext{}{\l@disnote{#1}}}% -\newcommand*{\ledouternote}[1]{\edtext{}{\l@dosnote{#1}}}% +\newcommand*{\ledleftnote}[1]{% + \ledsidenote@{\l@dlsnote{#1}}% +}% +\newcommand*{\ledrightnote}[1]{% + \ledsidenote@{\l@drsnote{#1}}% +}% +\newcommand*{\ledsidenote}[1]{% + \ledsidenote@{\l@dcsnote{#1}}% +}% +\newcommand*{\ledinnernote}[1]{% + \ledsidenote@{\l@disnote{#1}}% +}% +\newcommand*{\ledouternote}[1]{% + \ledsidenote@{\l@dosnote{#1}}% +}% +\newcommand*{\ledsidenote@}[1]{% + \edtext{}{% + \advance\edtext@notes@start by 1% + #1% + }%+ +}% \newif\ifrightnoteup \rightnoteuptrue @@ -9351,9 +9372,9 @@ {} {} -\@ifpackageloaded{nameref}{ +\ifdef{\H@old@sect}{% - \patchcmd{\NR@sect} + \patchcmd{\H@old@sect}% {#8} {#8% \print@rightmargin@eledsection% @@ -9361,7 +9382,7 @@ {} {} - \patchcmd{\NR@sect} + \patchcmd{\H@old@sect}% {\hskip #3\relax} {\hskip #3\relax% \print@leftmargin@eledsection% @@ -9369,7 +9390,7 @@ {} {} - \patchcmd{\NR@ssect} + \patchcmd{\H@old@@sect}% {#5} {#5% \print@rightmargin@eledsection% @@ -9377,7 +9398,7 @@ {} {} - \patchcmd{\NR@ssect} + \patchcmd{\H@old@@sect}% {\hskip #1} {\hskip #1% \print@leftmargin@eledsection% |