From 86ffc22eba4103f3f056180b2eb16e078d76bb90 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 23 Feb 2019 22:18:42 +0000 Subject: reledmac (22feb19) git-svn-id: svn://tug.org/texlive/trunk@50105 c570f23f-e606-0410-a88d-b1316a301751 --- .../reledmac/doc-more/page-typesetting-columns.pdf | Bin 41032 -> 41034 bytes .../latex/reledmac/examples/1-criticalendotes.pdf | Bin 17697 -> 17700 bytes .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 16742 -> 16742 bytes .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 26372 -> 26370 bytes .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 20870 -> 20868 bytes .../reledmac/examples/1-verses-doublenumbering.pdf | Bin 18660 -> 18655 bytes .../doc/latex/reledmac/examples/1-verses.pdf | Bin 18837 -> 18835 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 18601 -> 18603 bytes .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 20719 -> 20716 bytes .../doc/latex/reledmac/examples/2-glossaries.pdf | Bin 21254 -> 21254 bytes .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 21742 -> 21741 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 17124 -> 17122 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 31339 -> 31343 bytes .../doc/latex/reledmac/examples/2-linespacing.pdf | Bin 26108 -> 26110 bytes .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 36355 -> 36353 bytes .../doc/latex/reledmac/examples/2-notes-width.pdf | Bin 24485 -> 24486 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 25881 -> 25882 bytes .../doc/latex/reledmac/examples/2-performances.pdf | Bin 22687 -> 22687 bytes .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 34325 -> 34327 bytes .../examples/2-subdivision-number-in-header.pdf | Bin 39495 -> 39492 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 22825 -> 22823 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 17208 -> 17207 bytes .../3-reledpar_columns_different_languages.pdf | Bin 27718 -> 27718 bytes .../doc/latex/reledmac/examples/3-reledpar_mwe.pdf | Bin 12233 -> 12233 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 44018 -> 44014 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 22784 -> 22783 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 43584 -> 43587 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 43164 -> 43163 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 41075 -> 41076 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 43361 -> 43357 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 42852 -> 42849 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 42893 -> 42894 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 43159 -> 43155 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 28313 -> 28314 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 27054 -> 27055 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 21264 -> 21263 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 29535 -> 29533 bytes .../examples/4-reledpar_inside-outside-columns.pdf | Bin 22465 -> 22467 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 36422 -> 36424 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 58561 -> 58559 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 22759 -> 22759 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 18709 -> 18710 bytes ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 32469 -> 32469 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 22220 -> 22220 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 16270 -> 16269 bytes Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 92267 -> 92271 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 1378716 -> 1379365 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 516910 -> 516912 bytes .../texmf-dist/source/latex/reledmac/reledmac.dtx | 42 ++++++++++++++++----- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 24 ++++++++---- 50 files changed, 48 insertions(+), 18 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 index 3ca65badae9..963c576273c 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 61713a2318e..4389b146d1f 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 dddcd27278b..aff50a0cb4d 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 9113d78fc58..4791a362285 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 f310e8c572e..90556aa79ab 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 6a6cc1ddf00..9e68c5b7fcd 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 d5a40f8da6d..bbe0bd332f7 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 41c2622c40f..ccff57a659a 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 1bf1c724124..238ef64bf24 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 12645da8e03..a0cb7bbf89d 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 34385d9a312..9bd770a1094 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 285f670cb65..14112a17f34 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 b2d2053ead8..5aa447a3d05 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 950826ac550..459a0b9fa5f 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 f86d7021980..c236a5c1cfd 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 2ab9f75fde1..6b33685a602 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 064bc0c4da1..61b6450691f 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 9cca1665988..98da81ea863 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 4ab9c8fe22e..37e3187804c 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-subdivision-number-in-header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf index 0751a2f8ea4..ef08bb32348 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.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 02559c8ca9d..a7ba92c3848 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 3a1db9f18da..390a9611d28 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 95a133da6b9..829fb2fae87 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 bc48077c101..71f0da7b949 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 2abd87292e0..a3122c4fb24 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 2ae8dd3b594..b5606ed4a76 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 a0078108e85..83d39c15ee0 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 7e639a4d223..168bb8c509e 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 46b4a230c4e..6a95279de66 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 06c90b79923..f1ee6e3a5fc 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 ecc8c7387a3..52d9291a31c 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 6ba2294c187..bbdeee4ec9a 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 f3f646746b7..d129783e81c 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 a60336e10d4..f3a9996b014 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 d721bb9685f..f125a9f4eb0 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 293c62b2835..d108fc7cbe9 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 d4b31e56136..775312358cb 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 1113659692f..322171a09e8 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 bc74754256b..396e96b9b20 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 b6db90659d3..e6d5bcbdd5c 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 f7e4f48f42e..8abfe17dc12 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 6d602af34cc..afe44d97f3c 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 946dd312f60..df4995e7f78 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 1508806a0da..11a391414f5 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 88760e9c262..48ca3cafd82 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 3fabafb3dff..41267b13a9a 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 c8eb882696c..85175dce73b 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 f4cc9497714..90552d6bb7c 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 5bab19f8b7d..aec7bc9adc4 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -524,6 +524,7 @@ % \changes{v2.29.0}{2019/01/08}{Fix little bug with \protect\cs{msdata}} % \changes{v2.30.0}{2019/01/22}{Add \protect\cs{Xnoidenticallinenumannotation} and \protect\cs{Xendnoidenticallinenumannotation} hooks} % \changes{v2.30.0}{2019/01/22}{Add separator between line number annotations in margin. Add \protect\cs{setlinenumannotationsep}} +% \changes{v2.31.0}{2019/02/22}{Add \protect\option{noprefix} and \protect\option{prefixmore} to \protect\cs{appref} and \protect\cs{SEref}.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -3038,10 +3039,10 @@ % \stanza[][foo] % There is no \noindent inserted before foo. % \end{verbatim} % -% \item \DescribeMacro{\AtEveryStanza} Use \cs{AtEveryStanza}\marg{arg} to automatically add content before the stanza (not in the same paragraph). +% \item \DescribeMacro{\AtEveryStanza} Use \cs{AtEveryStanza}\marg{arg} to automatically add content before stanzas (not in the same paragraph). % % Note that a \cs{noindent} will be inserted before the argument, and, consequently, a \cs{parskip}. You can use the starred version of \protect\cs{AtEveryStanza} to avoid this \cs{noindent}. -% \item \DescribeMacro{\AtStartEveryStanza} Use \cs{AtStartEveryStanza} to automatically add content at the beginning of stanza (in the same paragraph). +% \item \DescribeMacro{\AtStartEveryStanza} Use \cs{AtStartEveryStanza} to automatically add content at the beginning of stanzas (in the same paragraph). % \item \verb+&+ can be replaced by \protect\cs{newverse} with two optional arguments (in brackets). The first will be printed after the current verse, the second before the next verse. % % A \cs{noindent} is automatically inserted before the contents of these optional arguments. @@ -3053,6 +3054,8 @@ % \item \DescribeMacro{\AtEveryStopStanza} Use \cs{AtEveryStopStanza} to automatically add content after the end of stanzas (not in the same paragraph). % % Note that a \cs{noindent} will be inserted before the argument, and, consequently, a \cs{parskip}. You can use the starred version of \protect\cs{AtEveryStopStanza} to avoid this \cs{noindent}. +% +% \item \DescribeMacro{\BeforeEveryStopStanza} Use \cs{BeforeEveryStopStanza} to automatically add content at the end of stanzas (in the same paragraph). % \end{itemize} % % @@ -3406,6 +3409,17 @@ % When calling \cs{appref} and \cs{SEref}, you can use as a first optional argument, in brackets (\verb+[]+), any optional argument which can be used for critical footnotes (\reff{Xfootnoteopt}). % % When calling \cs{apprefwithpage}, \cs{SErefwithpage} or \cs{SErefonlypage} you can use as a first optional argument, in brackets (\verb+[]+), any optional argument which can be used for critical endnotes (\reff{Xendnoteopt}). +% +% \subsubsection{Combining multiple references} +% +% When combining multiple cross references into a list, it is possible to prevent prefixes reappearing by adding an optional argument to \cs{appref} and \cs{SEref}. The available options are: +% \begin{itemize} +% \item \option{noprefix} to remove any prefix set by \cs{setapprefprefixsingle} or the equivalent for a single reference; +% \item \option{prefixmore} to force the plural version of a prefix. +% \end{itemize} +% +% For example, a reference to `lines 65--66, 72, and 75' might use \verb|\SEref[prefixmore]{ref1}, \SEref[noprefix]{ref2}, and \SEref[noprefix]{ref3}| to achieve this result. +% % \subsection{Compatibility with \protect\package{xr} package} % The \cs{externaldocument} command of the \cs{xr} package allows making cross-references from an external document, with the standard \LaTeX\ commands \cs{label} and \cs{ref} (and related). % @@ -4246,7 +4260,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2019/01/22 v2.30.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2019/02/22 v2.31.0 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -15272,6 +15286,8 @@ \newhooktoggle@specific{fulllines}% \newhooktoggle@specific{nonum} \newhooktoggle@specific{nosep} +\newhooktoggle@specific{noprefix}% +\newhooktoggle@specific{prefixmore}% \newhookarg@specific{linerangesep} % \end{macrocode} % \begin{macro}{linerangesep@} @@ -16494,13 +16510,19 @@ }% \notblank{#1}{\docsvlist{#1}}{}% \xdef\@currentseries{#3}% - \ifcsempty{@#3prefixmore}% - {\@apprefprefixsingle}% - {% - \IfEq{\xlineref{#2:start}}{\xlineref{#2:end}}% - {\csuse{@#3prefixsingle}}% - {\csuse{@#3prefixmore}}% - }% + \iftoggle{noprefix@}{}% + {% + \ifcsempty{@#3prefixmore}% + {\@apprefprefixsingle}% + {% + \IfEq{\xlineref{#2:start}}{\xlineref{#2:end}}% + {\iftoggle{prefixmore@}% + {\csuse{@#3prefixmore}}% + {\csuse{@#3prefixsingle}}% + }% + {\csuse{@#3prefixmore}}% + }% + }% \ifboolexpr{% test{\ifcsundef{the@label#2:start}}% or test{\ifcsundef{the@label#2:end}}% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 691e42bc162..08eb6ab09c6 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}[2019/01/22 v2.30.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2019/02/22 v2.31.0 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -5736,6 +5736,8 @@ \newhooktoggle@specific{fulllines}% \newhooktoggle@specific{nonum} \newhooktoggle@specific{nosep} +\newhooktoggle@specific{noprefix}% +\newhooktoggle@specific{prefixmore}% \newhookarg@specific{linerangesep} \newtoggle{nomk@}% \newcommandx*{\Xnolemmaseparator}[1][1]{\Xlemmaseparator[#1]{}} @@ -6423,13 +6425,19 @@ }% \notblank{#1}{\docsvlist{#1}}{}% \xdef\@currentseries{#3}% - \ifcsempty{@#3prefixmore}% - {\@apprefprefixsingle}% - {% - \IfEq{\xlineref{#2:start}}{\xlineref{#2:end}}% - {\csuse{@#3prefixsingle}}% - {\csuse{@#3prefixmore}}% - }% + \iftoggle{noprefix@}{}% + {% + \ifcsempty{@#3prefixmore}% + {\@apprefprefixsingle}% + {% + \IfEq{\xlineref{#2:start}}{\xlineref{#2:end}}% + {\iftoggle{prefixmore@}% + {\csuse{@#3prefixmore}}% + {\csuse{@#3prefixsingle}}% + }% + {\csuse{@#3prefixmore}}% + }% + }% \ifboolexpr{% test{\ifcsundef{the@label#2:start}}% or test{\ifcsundef{the@label#2:end}}% -- cgit v1.2.3