diff options
| author | Karl Berry <karl@freefriends.org> | 2021-03-12 23:31:56 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2021-03-12 23:31:56 +0000 |
| commit | 2d57d53d4429c576c4fe3d705b2d8ff25e86f8fa (patch) | |
| tree | b1bfb0886b84eda4f77d6eb8c8fb412d55950c1a | |
| parent | 14df3a3807ffaef563023db7b570f36b3ed45b4e (diff) | |
reledmac (9mar21) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58312 c570f23f-e606-0410-a88d-b1316a301751
54 files changed, 128 insertions, 97 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 1c0587d73d6..d6ddd459377 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 ca23dc8bd24..55d142af2e2 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 32c10b641ac..52e10b2057c 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 713ae63aad6..998177959c7 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 5333254fa4d..aec8073b5c4 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 ab9862489a6..cba0531af6c 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 01d05a49aa3..228b70627d0 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 5646fb5622c..3544ca7255e 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 9ae77067ffd..3fa62022e03 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 a70f8388cc0..3d41bd0ac43 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 85464b2a446..557a885e620 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-glossaries.tex b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.tex index 28e88cc1ea5..ccc8d0c165e 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.tex @@ -9,7 +9,7 @@ \usepackage[nocritical,noend,noeledsec,series={A},nofamiliar]{reledmac} -\usepackage{glossaries} +\usepackage{glossaries, glossaries-extra} \glsSetCompositor{-} \makeglossaries \newglossaryentry{monistero}{name={monistero},description={monastero}} 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 4a63998d9cf..1c959040478 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 d5e06e6b934..95ec71c6ee7 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 d971e5f2a1b..b7110f0191a 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 bf497aa4681..08d1604eddb 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 63bd1d3ab63..8b53eef328a 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 be206bf8ed5..edfe84f457b 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 2457cac597c..50daaa32d15 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 422c0e60a02..562be32f2c9 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 636f3da0983..f0925c078e7 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 9c3429b96d9..b8bd11a6866 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 0a26c9593ab..62e7f9392db 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 ebd3bba1bbf..c99fc42632c 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 30a8d95f437..612aef36a8b 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 a0f7c03ae77..264c3127e72 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 b62895763df..f7df44052b1 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 6f700386cde..5008b620e69 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 d2537e9a690..c80f4073332 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 7000f32f274..9dc7c4876d3 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 fc91fe4efdb..d441a597337 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 30522f74ab5..1bf544a515b 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 91eecc07a2a..7b6e3d3829f 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 281208f8f70..8c47ab49180 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 ad963fb22b1..5c192d4b1aa 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 aaa5b15071d..3c85efd97f5 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 9d6f76e19c6..9d407600c2d 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 c915cf9fb40..75123ed9472 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 096ca858176..ba289c1ab01 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 d1c331140e2..c09c66b4e23 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 03adf25176e..e94e68bcab0 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 5e48abecca0..88c67bd0b9e 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 31556cc6217..5b8022b5216 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 616cbd578dd..e20e0366041 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 2df64392701..2f8fd1a4aac 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 a8b7028e9c4..42500710482 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 021b5640627..cea68e30721 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 04b799404a8..0fa30756fd1 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 b5df111969e..26e04e5fd9b 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 325e3f86112..80a0afcce9b 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 7fe954be7f8..7535c44e0e3 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -156,7 +156,7 @@ % \my@changes#1.\@nil % }% %\makeatother -% \newcommand{\edmac}{\protect\package{edmac}\xspace} +% \newcommand{\edmac}{\protect\package{EDMAC}\xspace} % \newcommand{\tabmac}{\protect\package{tabmac}\xspace} % \newcommand{\edstanza}{\protect\package{edstanza}\xspace} @@ -577,16 +577,19 @@ % \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.} +% \changes{v2.37.1}{2021/03/08}{Fix bug with \protect\cs{edgls} and related in \protect\cs{edtext} argument. Require \protect\package{glossaries-extra} is \protect\package{glossaries} is loaded.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % % \author{% % Ma\"ieul Rouquette\thanks{\texttt{maieul at maieul dot net}} \\ -% {\small based on the original \protect\package{ledmac} by} \\ +% {\small based on the \protect\package{ledmac} by} \\ % Peter Wilson \\ % Herries Press \\ -% {\small which was based on the original \edmac, \tabmac{} and \edstanza{} by} \\ -% John Lavagnino, Dominik Wujastyk, Herbert Breger and Wayne Sullivan. +% {\small with the \edmac\ plugins \tabmac{} and \edstanza{} by}\\ +% Herbert Breger and Wayne Sullivan, +% {\small all based on \edmac\ by} \\ +% John Lavagnino and Dominik Wujastyk % } % % \date{} @@ -3818,6 +3821,8 @@ % \section{Glossary} % \Macpackage\ provides mechanism to make glossaries with the \package{glossaries} package, refering not to the page, but to the page and line. % \subsection{Preamble setting} +% When using \macpackage\ with \package{glossaries}, you must use also \package{glossaries-extra}. +% % The standard compositor between page and line number in \macpackage\ is a dash, while \package{glossaries} uses, by default, a dot. % Consequently, you must: % \begin{itemize} @@ -4463,7 +4468,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2021/02/28 v2.37.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2021/03/08 v2.37.1 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -5043,6 +5048,13 @@ }% % \end{macrocode} % \end{macro} +% \begin{macro}{\led@error@require@glossariesextra} +% \begin{macrocode} +\newcommand{\led@error@require@glossariesextra}{% + \reledmac@error{When using both reledmac and glossaries, you must also use glossaries-extra}{\@ehc}% +}% +% \end{macrocode} +% \end{macro} % \begin{macro}{\led@error@fail@patch@@makecol} % \begin{macrocode} \newcommand{\led@error@fail@patch@@makecol}{% @@ -18760,6 +18772,8 @@ % \begin{macrocode} \AtBeginDocument{% \@ifpackageloaded{glossaries}{% + \@ifpackageloaded{glossaries-extra}{}{\led@error@require@glossariesextra}% + \newif\ifl@noexpands@edgl%A boolean switched to true in \no@expands % \end{macrocode} % First those which arguments are \oarg{options}\marg{label}\oarg{insert}. % \begin{macrocode} @@ -18811,17 +18825,25 @@ \renewcommand{\do}[1]{% \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,3,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname[counter=pageline,##1]{##2}[##3]% + \ifl@noexpands@edgl% + \csname#1\endcsname[counter=pageline,noindex,##1]{##2}[##3]% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname[counter=pageline,##1]{##2}[##3]% + \fi% }% \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,3,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname*[counter=pageline,##1]{##2}[##3]% + \ifl@noexpands@edgl% + \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}[##3]% + \else% + \csname#1\endcsname*[counter=pageline,##1]{##2}[##3]% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \fi% }% }% \dolistloop{\edglsomo}% @@ -18834,17 +18856,25 @@ \renewcommand{\do}[1]{% \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname[counter=pageline,##1]{##2}{##3}% + \ifl@noexpands@edgl% + \csname#1\endcsname[counter=pageline,noindex,##1]{##2}{##3}% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname[counter=pageline,##1]{##2}{##3}% + \fi% }% \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname*[counter=pageline,##1]{##2}{##3}% + \ifl@noexpands@edgl% + \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}{##3}% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname*[counter=pageline,##1]{##2}{##3}% + \fi% }% }% \dolistloop{\edglsomm}% @@ -18856,44 +18886,34 @@ \renewcommand{\do}[1]{% \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[2][1,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname[counter=pageline,##1]{##2}% + \ifl@noexpands@edgl% + \csname#1\endcsname[counter=pageline,noindex,##1]{##2}% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname[counter=pageline,##1]{##2}% + \fi% }% \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[2][1,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname*[counter=pageline,##1]{##2}% + \ifl@noexpands@edgl% + \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname*[counter=pageline,##1]{##2}% + \fi% }% }% \dolistloop{\edglsom}% % \end{macrocode} -% \cs{l@noexpands@edgl} is a macro to avoid expanding glossaries macros in \cs{edtext} first argument. It is called by \cs{no@expands}. +% \cs{l@noexpands@edgl} is a macro to switch \cs{ifl@noexpands@edgl} to true in \cs{no@expands}. % Its definition is made dynamically. % \begin{macro}{\l@noexpands@edgl} % \begin{macrocode} - \def\l@noexpands@edgl{}% - \renewcommand\do[1]{% - \xappto\l@noexpands@edgl{% - \noexpand\RenewDocumentCommand\csname ed#1\endcsname{omos}{}% - }% - }% - \dolistloop{\edglsomo}% - \renewcommand\do[1]{% - \xappto\l@noexpands@edgl{% - \noexpand\RenewDocumentCommand\csname ed#1\endcsname{omms}{}% - }% - }% - \dolistloop{\edglsomm}% - \renewcommand\do[1]{% - \xappto\l@noexpands@edgl{% - \noexpand\RenewDocumentCommand\csname ed#1\endcsname{oms}{}% - }% - }% - \dolistloop{\edglsom}% + \def\l@noexpands@edgl{\l@noexpands@edgltrue}% }{\let\l@noexpands@edgl\relax}% }% % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index b460ec7a227..4fe935f799f 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -58,7 +58,7 @@ \CodelineIndex \RecordChanges \renewcommand{\MakeUppercase}[1]{#1} - \newcommand{\edmac}{\protect\package{edmac}\xspace} + \newcommand{\edmac}{\protect\package{EDMAC}\xspace} \newcommand{\tabmac}{\protect\package{tabmac}\xspace} \newcommand{\edstanza}{\protect\package{edstanza}\xspace} @@ -1405,7 +1405,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2021/01/21 v2.25.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2021/03/08 v2.25.1a reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 53dfff0e9a3..03efa588363 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/28 v2.37.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2021/03/08 v2.37.1 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -319,6 +319,9 @@ \newcommand{\led@error@PackageAfterEledmac}[1]{% \reledmac@error{#1 must be loaded before reledmac}{\@ehc}% }% +\newcommand{\led@error@require@glossariesextra}{% + \reledmac@error{When using both reledmac and glossaries, you must also use glossaries-extra}{\@ehc}% +}% \newcommand{\led@error@fail@patch@@makecol}{% \reledmac@error{Fail to patch \string\@makecol\space command}{\@ehc}% }% @@ -7777,6 +7780,8 @@ }% \AtBeginDocument{% \@ifpackageloaded{glossaries}{% + \@ifpackageloaded{glossaries-extra}{}{\led@error@require@glossariesextra}% + \newif\ifl@noexpands@edgl%A boolean switched to true in \no@expands \gdef\edglsomo{}% \listgadd{\edglsomo}{gls}% \listgadd{\edglsomo}{Gls}% @@ -7825,17 +7830,25 @@ \renewcommand{\do}[1]{% \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,3,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname[counter=pageline,##1]{##2}[##3]% + \ifl@noexpands@edgl% + \csname#1\endcsname[counter=pageline,noindex,##1]{##2}[##3]% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname[counter=pageline,##1]{##2}[##3]% + \fi% }% \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,3,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname*[counter=pageline,##1]{##2}[##3]% + \ifl@noexpands@edgl% + \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}[##3]% + \else% + \csname#1\endcsname*[counter=pageline,##1]{##2}[##3]% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \fi% }% }% \dolistloop{\edglsomo}% @@ -7845,17 +7858,25 @@ \renewcommand{\do}[1]{% \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname[counter=pageline,##1]{##2}{##3}% + \ifl@noexpands@edgl% + \csname#1\endcsname[counter=pageline,noindex,##1]{##2}{##3}% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname[counter=pageline,##1]{##2}{##3}% + \fi% }% \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname*[counter=pageline,##1]{##2}{##3}% + \ifl@noexpands@edgl% + \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}{##3}% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname*[counter=pageline,##1]{##2}{##3}% + \fi% }% }% \dolistloop{\edglsomm}% @@ -7864,39 +7885,29 @@ \renewcommand{\do}[1]{% \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[2][1,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname[counter=pageline,##1]{##2}% + \ifl@noexpands@edgl% + \csname#1\endcsname[counter=pageline,noindex,##1]{##2}% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname[counter=pageline,##1]{##2}% + \fi% }% \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[2][1,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname*[counter=pageline,##1]{##2}% - }% - }% - \dolistloop{\edglsom}% - \def\l@noexpands@edgl{}% - \renewcommand\do[1]{% - \xappto\l@noexpands@edgl{% - \noexpand\RenewDocumentCommand\csname ed#1\endcsname{omos}{}% - }% - }% - \dolistloop{\edglsomo}% - \renewcommand\do[1]{% - \xappto\l@noexpands@edgl{% - \noexpand\RenewDocumentCommand\csname ed#1\endcsname{omms}{}% - }% - }% - \dolistloop{\edglsomm}% - \renewcommand\do[1]{% - \xappto\l@noexpands@edgl{% - \noexpand\RenewDocumentCommand\csname ed#1\endcsname{oms}{}% + \ifl@noexpands@edgl% + \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname*[counter=pageline,##1]{##2}% + \fi% }% }% \dolistloop{\edglsom}% + \def\l@noexpands@edgl{\l@noexpands@edgltrue}% }{\let\l@noexpands@edgl\relax}% }% \def\@hangingsymbol{} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index aed2a4c66c5..63bab28ab8d 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -28,7 +28,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2021/01/21 v2.25.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2021/03/08 v2.25.1a reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} |