From dfc4c0ad9b76fe25957d87a99f017d7f246ce290 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 5 May 2018 21:14:52 +0000 Subject: reledmac (5may18) git-svn-id: svn://tug.org/texlive/trunk@47622 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/reledmac/README | 4 +- .../reledmac/doc-more/page-typesetting-columns.pdf | Bin 41022 -> 41026 bytes .../latex/reledmac/examples/1-criticalendotes.pdf | Bin 17710 -> 17709 bytes .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 16742 -> 16742 bytes .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 26474 -> 26473 bytes .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 20870 -> 20866 bytes .../reledmac/examples/1-verses-doublenumbering.pdf | Bin 18660 -> 18658 bytes .../doc/latex/reledmac/examples/1-verses.pdf | Bin 18835 -> 18834 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 18607 -> 18612 bytes .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 20719 -> 20719 bytes .../doc/latex/reledmac/examples/2-glossaries.pdf | Bin 21254 -> 21250 bytes .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 21749 -> 21751 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 17120 -> 17121 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 31333 -> 31332 bytes .../doc/latex/reledmac/examples/2-linespacing.pdf | Bin 26108 -> 26111 bytes .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 36356 -> 36354 bytes .../doc/latex/reledmac/examples/2-notes-width.pdf | Bin 24488 -> 24493 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 25876 -> 25880 bytes .../doc/latex/reledmac/examples/2-performances.pdf | Bin 22691 -> 22680 bytes .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 34214 -> 34217 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 22827 -> 22827 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 17207 -> 17208 bytes .../3-reledpar_columns_different_languages.pdf | Bin 27661 -> 27661 bytes .../doc/latex/reledmac/examples/3-reledpar_mwe.pdf | Bin 12234 -> 12234 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 43971 -> 43971 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 22785 -> 22784 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 43586 -> 43585 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 43161 -> 43160 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 41081 -> 41073 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 43361 -> 43354 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 42852 -> 42848 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 42893 -> 42893 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 43160 -> 43154 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 28248 -> 28249 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 27079 -> 27078 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 21261 -> 21264 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 29533 -> 29532 bytes .../examples/4-reledpar_inside-outside-columns.pdf | Bin 22462 -> 22464 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 36422 -> 36424 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 58569 -> 58570 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 22759 -> 22757 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 18707 -> 18711 bytes ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 32471 -> 32468 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 22218 -> 22216 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 16267 -> 16268 bytes Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 91639 -> 91637 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 1363215 -> 1362917 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 515616 -> 515607 bytes .../texmf-dist/source/latex/reledmac/reledmac.dtx | 67 ++++++++++++++------- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 49 +++++++++------ 50 files changed, 78 insertions(+), 42 deletions(-) diff --git a/Master/texmf-dist/doc/latex/reledmac/README b/Master/texmf-dist/doc/latex/reledmac/README index 01dfc1be949..19491b5d3ed 100644 --- a/Master/texmf-dist/doc/latex/reledmac/README +++ b/Master/texmf-dist/doc/latex/reledmac/README @@ -129,7 +129,7 @@ Bibliography We maintain two collaborative bibliographies: - [Critical Editions Typeset with EDMAC, LEDMAC and - eLEDMAC](https://www.zotero.org/groups/critical_editions_typeset_with_edmac_ledmac_and_eledmac/items) + eLEDMAC](https://www.zotero.org/groups/209265/) - [Articles and books about - (r)(e)(l)edmac](https://www.zotero.org/groups/articles_and_books_about_reledmac/items) + (r)(e)(l)edmac](https://www.zotero.org/groups/1024519/) 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 index 1f58ad2d5b5..6821da48c43 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf and b/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf index b0db272f725..87a506f9ae2 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf differ 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 49995aec382..653e86fc06e 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 5fd4c37ac67..bf79eb061eb 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 822ef82994a..ba8f044e43a 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-doublenumbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf index 64c1074f726..9ec8134089f 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.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 1d99e3ecbf2..154bc15af9e 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 2e19664525d..07a953e37c9 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 cc04a966b13..07b5f7e692f 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 2ffffe27663..5b83f66e9ed 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 e1e6e1d618f..9545dc15dea 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 9d55b342ae0..e97abd308a6 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 fb159ce5c0b..262c191abc5 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 8d78c70599b..ddd27f998f5 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-manuscript-apparatus.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf index c4b8b8b2270..9ef273fa666 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.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 9c01b4cf482..37224aa7815 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 8e6a9a51a8b..094892dca77 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 f013d89b1a4..3a18149516d 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 index 35351da3b07..791e137b930 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf 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-titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf index 7f5729c5114..4688d7c6a40 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 0293dc7bb8c..9a68b73fb1e 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 890daf3dac6..853c802d070 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 7c0dd7be058..80ff035737a 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 de2a1625a85..9ed7727fea6 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 3431a02fb03..ebfa90b74e6 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 cfdf5c14ad2..1395d733bab 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 f6bcf5b8c98..ce1468581d8 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 a30006fa602..b76f70a6c6f 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 aed0ce04240..809d3d89c7b 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 40a55d3a83b..c17ba6270ad 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 0720efbc3c6..9d512269324 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 7c76f948ee9..4b8f713ecab 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 b37358e5733..a525991bdc9 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 fe65150ef77..9ad4621d434 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 667e663df3b..c51bfced8b2 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 cb73436aea9..b2afad09e46 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_inside-outside-columns.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf index 493bd741885..23866de9e67 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.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 8da44747bdd..dcab52face5 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_pages_long_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf index 78f45ccb32c..36c33bb9047 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 4cadf66f86e..71e211b534c 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 7180b8be482..21b3c3bef96 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_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 index b7f8cff4aed..0e69fbf64d2 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.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 081f6be5bfe..e7e6b1db9ef 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 156279dce1e..653c38036da 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 133657a42b2..0c67b9c4bd2 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 d9257904b0d..b2f357bcf7f 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 674a7201a95..08834d09142 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 a0d7c036ace..d6cb63df18a 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -510,6 +510,8 @@ % \changes{v2.26.9}{2018/05/02}{Fix bug with critical footnotes line number when alternating between \protect\cs{numberlinefalse} and \protect\cs{numberlinetrue}.} % \changes{v2.26.9}{2018/05/02}{Fix bug with page number in footnote after \protect\cs{mainmatter} (bug introduced in v2.26.7)} % \changes{v2.26.9}{2018/05/02}{Workaround with a bug of \protect\LaTeX 2018/04/01 patch level 3 to generate the .sty file from a .ins file} +% \changes{v2.26.10}{2018/05/05}{Really fix bug with page number in footnote after \protect\cs{mainmatter} (bug introduced in v2.26.7)} +% \changes{v2.26.10}{2018/05/05}{Add error message when insertion a \protect\cs{pstart} or \protect\cs{pend} inside \protect\cs{edtext} arguments} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -4188,7 +4190,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2018/05/02 v2.26.9 typesetting critical editions]% +\ProvidesPackage{reledmac}[2018/05/05 v2.26.10 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -4453,11 +4455,23 @@ % \end{macro} % % \begin{macro}{\led@err@edtextoutsidepstart} +% \begin{macro}{\led@err@PstartInEdtext} +% \begin{macro}{\led@err@PendInEdtext} % \begin{macrocode} \newcommand*{\led@err@edtextoutsidepstart}{% \reledmac@error{\string\edtext\space outside numbered paragraph (\pstart\space …\space\pend)}{\@ehc}}% + +\newcommand{\led@err@PstartInEdtext}[1]{% + \reledmac@error{\string\pstart\space in \string\edtext\space #1 argument}{\@ehc}% +}% + +\newcommand{\led@err@PendInEdtext}[1]{% + \reledmac@error{\string\pend\space in \string\edtext\space #1 argument}{\@ehc}% +}% % \end{macrocode} % \end{macro} +% \end{macro} +% \end{macro} % \begin{macro}{\led@mess@NotesChanged} % \begin{macrocode} \newcommand*{\led@mess@NotesChanged}{% @@ -7729,7 +7743,11 @@ % \begin{macrocode} \ifnumberedpar@% % \end{macrocode} -% we increment the \cs{@edtext@level} \TeX\ counter to know in which level of \protect\cs{edtext} we are. +% Check the content of the arguments, to be certain there is no forbidden command inside. +% \begin{macrocode}% + \@check@edtext@args{#1}{#2}% +% \end{macrocode} +% We increment the \cs{@edtext@level} \TeX\ counter to know in which level of \protect\cs{edtext} we are. % \begin{macrocode} \global\advance\@edtext@level by 1% % \end{macrocode} @@ -7749,15 +7767,15 @@ % \end{macrocode} % We get the next series of samewords data in the list of samewords data for the current edtext level. We push them inside \protect\cs{sw@inthisedtext}. % \begin{macrocode} - \ifledRcol% - \ifcsvoid{sw@list@edtextR@\the\@edtext@level}% - {\global\let\sw@inthisedtext\empty}% - {\expandafter\gl@p\csname sw@list@edtextR@\the\@edtext@level\endcsname\to\sw@inthisedtext}% - \else% - \ifcsvoid{sw@list@edtext@\the\@edtext@level}% - {\global\let\sw@inthisedtext\empty}% - {\expandafter\gl@p\csname sw@list@edtext@\the\@edtext@level\endcsname\to\sw@inthisedtext}% - \fi% + \ifledRcol% + \ifcsvoid{sw@list@edtextR@\the\@edtext@level}% + {\global\let\sw@inthisedtext\empty}% + {\expandafter\gl@p\csname sw@list@edtextR@\the\@edtext@level\endcsname\to\sw@inthisedtext}% + \else% + \ifcsvoid{sw@list@edtext@\the\@edtext@level}% + {\global\let\sw@inthisedtext\empty}% + {\expandafter\gl@p\csname sw@list@edtext@\the\@edtext@level\endcsname\to\sw@inthisedtext}% + \fi% % \end{macrocode} % \begin{macro}{\@tag} % \label{@tag}Our normal lemma is just argument \verb"#1"; but that argument could have @@ -7774,7 +7792,7 @@ % \begin{macrocode} \global\renewcommand{\@tag}{% \no@expands #1% - }% + }% % \end{macrocode} % \end{macro} % \begin{macro}{\l@d@nums} @@ -7890,8 +7908,22 @@ % \end{macrocode} % \end{macro} -% +% \begin{macro}{\@check@edtext@args} +% A macro which just checks the arguments of the \cs{edtext} and let know +% if there is some probleme, like, for example, \cs{pstart} inside. +% \begin{macrocode} +\newcommand{\@check@edtext@args}[2]{% + \begingroup% + \noexpandarg% + \IfSubStr{#1}{\pstart}{\led@err@PstartInEdtext{first}}{}% + \IfSubStr{#1}{\pend}{\led@err@PendInEdtext{first}}{}% + \IfSubStr{#2}{\pstart}{\led@err@PstartInEdtext{second}}{}% + \IfSubStr{#2}{\pend}{\led@err@PendInEdtext{second}}{}% + \endgroup% +}% % +% \end{macrocode} +% \end{macro} % \begin{macro}{\@beforeinsertofthisedtext} % \cs{@beforeinsertofthisedtext} is an internal macro. \macpackage\ or \parpackage can add in this macro any content required to be executed before doing any \cs{insert} related to a \cs{edtext}. % Its content is \cs{let} equal to \cs{relax} at the end of every \cs{edtext}. @@ -15482,14 +15514,7 @@ }% \newcommand{\par@patch@pagenumbering}{% - \ifboolexpr{% - bool{sameparallelpagenumber}% - or bool{prevpgnotnumbered}% - }% - {% - \setcounter{par@page}{1}% - }% - {}% + \setcounter{par@page}{1}% \par@patch@thepage% }% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 53666177709..37620b969f7 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}[2018/05/02 v2.26.9 typesetting critical editions]% +\ProvidesPackage{reledmac}[2018/05/05 v2.26.10 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -163,6 +163,14 @@ \reledmac@error{Numbering should already have been started}{\@ehc}} \newcommand*{\led@err@edtextoutsidepstart}{% \reledmac@error{\string\edtext\space outside numbered paragraph (\pstart\space …\space\pend)}{\@ehc}}% + +\newcommand{\led@err@PstartInEdtext}[1]{% + \reledmac@error{\string\pstart\space in \string\edtext\space #1 argument}{\@ehc}% +}% + +\newcommand{\led@err@PendInEdtext}[1]{% + \reledmac@error{\string\pend\space in \string\edtext\space #1 argument}{\@ehc}% +}% \newcommand*{\led@mess@NotesChanged}{% \typeout{reledmac reminder: }% \typeout{ The number of the footnotes in this section @@ -1536,23 +1544,24 @@ \renewcommand{\theedtext}{edtxt@\arabic{edtext}}% \newcommand{\edtext}[2]{\leavevmode% \ifnumberedpar@% + \@check@edtext@args{#1}{#2}% \global\advance\@edtext@level by 1% \stepcounter{edtext}% \csxdef{thisedtext@\the\@edtext@level}{\theedtext}% \global\@lemmacommand@false% \begingroup% - \ifledRcol% - \ifcsvoid{sw@list@edtextR@\the\@edtext@level}% - {\global\let\sw@inthisedtext\empty}% - {\expandafter\gl@p\csname sw@list@edtextR@\the\@edtext@level\endcsname\to\sw@inthisedtext}% - \else% - \ifcsvoid{sw@list@edtext@\the\@edtext@level}% - {\global\let\sw@inthisedtext\empty}% - {\expandafter\gl@p\csname sw@list@edtext@\the\@edtext@level\endcsname\to\sw@inthisedtext}% - \fi% + \ifledRcol% + \ifcsvoid{sw@list@edtextR@\the\@edtext@level}% + {\global\let\sw@inthisedtext\empty}% + {\expandafter\gl@p\csname sw@list@edtextR@\the\@edtext@level\endcsname\to\sw@inthisedtext}% + \else% + \ifcsvoid{sw@list@edtext@\the\@edtext@level}% + {\global\let\sw@inthisedtext\empty}% + {\expandafter\gl@p\csname sw@list@edtext@\the\@edtext@level\endcsname\to\sw@inthisedtext}% + \fi% \global\renewcommand{\@tag}{% \no@expands #1% - }% + }% \set@line% \ifledRcol \global\insert@countR \z@% \else \global\insert@count \z@ \fi% @@ -1600,6 +1609,15 @@ \fi% }% +\newcommand{\@check@edtext@args}[2]{% + \begingroup% + \noexpandarg% + \IfSubStr{#1}{\pstart}{\led@err@PstartInEdtext{first}}{}% + \IfSubStr{#1}{\pend}{\led@err@PendInEdtext{first}}{}% + \IfSubStr{#2}{\pstart}{\led@err@PstartInEdtext{second}}{}% + \IfSubStr{#2}{\pend}{\led@err@PendInEdtext{second}}{}% + \endgroup% +}% \let\@beforeinsertofthisedtext\relax \newif\ifnumberline \numberlinetrue @@ -5853,14 +5871,7 @@ }% \newcommand{\par@patch@pagenumbering}{% - \ifboolexpr{% - bool{sameparallelpagenumber}% - or bool{prevpgnotnumbered}% - }% - {% - \setcounter{par@page}{1}% - }% - {}% + \setcounter{par@page}{1}% \par@patch@thepage% }% -- cgit v1.2.3