From bdc2fd6fc8085793ddd27d01d8ec34565f4905e9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 24 Dec 2016 22:12:46 +0000 Subject: reledmac (24dec16) git-svn-id: svn://tug.org/texlive/trunk@42785 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 17193 -> 17197 bytes .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 26402 -> 26403 bytes .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 21001 -> 21003 bytes .../doc/latex/reledmac/examples/1-verses.pdf | Bin 17432 -> 17432 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 18587 -> 18593 bytes .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 20833 -> 20836 bytes .../doc/latex/reledmac/examples/2-glossaries.pdf | Bin 21683 -> 21881 bytes .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 21749 -> 21749 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 17118 -> 17115 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 31421 -> 31423 bytes .../doc/latex/reledmac/examples/2-linespacing.pdf | Bin 26288 -> 26286 bytes .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 36332 -> 36333 bytes .../doc/latex/reledmac/examples/2-notes-width.pdf | Bin 24691 -> 24695 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 25884 -> 25878 bytes .../doc/latex/reledmac/examples/2-performances.pdf | Bin 23135 -> 23335 bytes .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 33912 -> 33911 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 22852 -> 22851 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 17191 -> 17196 bytes .../3-reledpar_columns_different_languages.pdf | Bin 26266 -> 26268 bytes .../doc/latex/reledmac/examples/3-reledpar_mwe.pdf | Bin 12215 -> 12215 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 42530 -> 39974 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 22893 -> 22895 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 35110 -> 35107 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 34849 -> 34849 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 33390 -> 33395 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 35008 -> 35012 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 34582 -> 34587 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 34618 -> 34620 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 34831 -> 34833 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 22304 -> 22304 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 27056 -> 27058 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 21264 -> 21262 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 29631 -> 29627 bytes .../examples/4-reledpar_inside-outside-columns.pdf | Bin 22443 -> 22445 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 36411 -> 36413 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 58538 -> 58533 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 22746 -> 22747 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 18880 -> 18882 bytes ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 32512 -> 32512 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 22208 -> 22206 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 16250 -> 16253 bytes Master/texmf-dist/doc/latex/reledmac/makefile | 2 +- Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 88636 -> 88647 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 1251594 -> 1255182 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 485349 -> 486149 bytes .../texmf-dist/source/latex/reledmac/reledmac.dtx | 77 ++++++++++++++++----- .../texmf-dist/source/latex/reledmac/reledpar.dtx | 55 +++++++++++---- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 55 +++++++++++---- Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 54 +++++++++++---- 49 files changed, 181 insertions(+), 62 deletions(-) (limited to 'Master/texmf-dist') 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 605b3a94ba3..8c887fdad90 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 b1349c67f78..cc94a0158c4 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 77c3f7ccf7a..8922a3fa77e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf index d3424ed56ea..255b615eb9d 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 c72f97b55cc..28eb0866143 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 e1c1dfbe281..9d693f2f935 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 ade3ed481bf..e5805ff7e99 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 49147aab22d..229156e906c 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 f02182c9dfa..ed1f8a4c17f 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 c478ad42151..c05a3894761 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 3402e1bd175..c0775ee1716 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 852da52f9b0..d5c14a5158d 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 5a5affc3a5c..db796b7dc24 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 57aeccfdcf6..0c88a8e5e26 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 8748db1248f..25ed87db3f9 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 38fa9bcd847..8a0dea90c6a 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 d5026f575f4..188ca4589d4 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 0f8c9d7ed7f..14eb483fcdf 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 6b49c466657..923cef500bd 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 41f69d7e7db..f68d3c44f31 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 dadad6e8574..a74c65cb398 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 d162d27b03e..12b5ccd8718 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 286614c3860..0472fc686e6 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 896bc8a9952..406d98dae92 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 14454650e32..01efbff5fd4 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 942cfaa6c04..fdb37c4cb7a 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 b082693fea5..6c11c02a7f3 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 fbe28711168..aa0f28fd7ec 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 340de2c9267..32c48e5d1c2 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 3906a39b429..84ab815c229 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 a3956a3ce3b..841803bf091 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 a18c77f8e71..c5ab4fde4a5 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 6971b72116a..43270adb1d9 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 37412e4e76f..af05bce89af 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 72f5405222f..d66055dfcf0 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 3605a72c235..8488e6e0caa 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 04cc799e63f..c1cba59aa6b 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 d6e92fd053f..c919f312fbc 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 40d64113712..acab54d1813 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 da25818630c..d9c8ece66a1 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 de5f6749af7..67561daed0c 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/makefile b/Master/texmf-dist/doc/latex/reledmac/makefile index f8331fde44e..bea3f46d8eb 100644 --- a/Master/texmf-dist/doc/latex/reledmac/makefile +++ b/Master/texmf-dist/doc/latex/reledmac/makefile @@ -42,7 +42,7 @@ dist: $(PACKAGE) examples rm -rf reledmac mkdir reledmac @xelatex reledmac.dtx #We call it at last time because reledmac handbook can refer to page of reledpar handbook, and so we need to run reledmac.dtx a last time after reledpar.dtx has been run - rm examples/*pdf + rm -f examples/*pdf $(MAKE) -C examples all mkdir reledmac/examples ln examples/latexmkrc reledmac/examples diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf index 4197003c897..7055e2a35ea 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 c070cf3d534..a2ce1fe334e 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 2f8c218128c..97d9a914ebb 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 a3b77f7aa1b..acb6aa8ce8b 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -452,6 +452,8 @@ % \changes{v2.16.7}{2016/12/12}{Fix bug with \protect\cs{numberpstarttrue} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}} % \changes{v2.16.7}{2016/12/12}{Fix bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}} % \changes{v2.16.8}{2016/12/16}{Fix bug with \protect\cs{edindex} in footnote in parallel typesetting} +% \changes{v2.17.0}{2016/12/23}{Add \protect\cs{edglsadd} command.} +% \changes{v2.17.0}{2016/12/23}{Add \protect\cs{setmsdataposition} setting.} % \title{\Macpackage \\ % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} @@ -1698,6 +1700,12 @@ % By default, it is \enquote{Ms.}. % You can change it using \cs{setmsdatalabel}\marg{txt}. % +% \DescribeMacro{\setmsdataposition} +% If you tel that the manuscript apparatus will be on the same level of critical footnotes than other apparatus, for each line, reledmac will first insert manuscript apparatus, then other footnotes. +% You can change it using:\\ +% \cs{msdataposition}\arg{regular-msdata}\\ +% And restore the default behavior using +% \cs{msdataposition}\arg{msdata-regular} % \subsection{Familiar notes} \label{sec:desc:familiar} % % @@ -3848,7 +3856,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/12/16 v2.16.8 typesetting critical editions]% +\ProvidesPackage{reledmac}[2016/12/23 v2.17.0 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -4370,28 +4378,28 @@ % \begin{macro}{\led@error@PackageAfterEledmac} % \begin{macrocode} \newcommand{\led@error@PackageAfterEledmac}[1]{% - \reledmac@error{#1 must be loaded before reledmac.}{\@ehc}% + \reledmac@error{#1 must be loaded before reledmac}{\@ehc}% }% % \end{macrocode} % \end{macro} % \begin{macro}{\led@error@fail@patch@@makecol} % \begin{macrocode} \newcommand{\led@error@fail@patch@@makecol}{% - \reledmac@error{Fail to patch \string\@makecol\space command.}{\@ehc}% + \reledmac@error{Fail to patch \string\@makecol\space command}{\@ehc}% }% % \end{macrocode} % \end{macro} % \begin{macro}{\led@error@fail@patch@@reinserts} % \begin{macrocode} \newcommand{\led@error@fail@patch@@reinserts}{% - \reledmac@error{Fail to patch \string\@reinserts\space command.}{\@ehc}% + \reledmac@error{Fail to patch \string\@reinserts\space command}{\@ehc}% }% % \end{macrocode} % \end{macro} % \begin{macro}{\led@error@fail@patch@@doclearpage} % \begin{macrocode} \newcommand{\led@error@fail@patch@@doclearpage}{% - \reledmac@error{Fail to patch \string\@doclearpage\space command.}{\@ehc}% + \reledmac@error{Fail to patch \string\@doclearpage\space command}{\@ehc}% }% % \end{macrocode} % \end{macro} @@ -4399,21 +4407,21 @@ % \begin{macro}{\led@error@fail@patch@@iiiminipage} % \begin{macrocode} \newcommand{\led@error@fail@patch@@iiiminipage}{% - \reledmac@error{Fail to patch \string\@iiiminipage\space command.}{\@ehc}% + \reledmac@error{Fail to patch \string\@iiiminipage\space command}{\@ehc}% }% % \end{macrocode} % \end{macro} % \begin{macro}{\led@error@fail@patch@endminipage} % \begin{macrocode} \newcommand{\led@error@fail@patch@endminipage}{% - \reledmac@error{Failed to patch the \string\endminipage\space command.}{\@ehc}% + \reledmac@error{Failed to patch the \string\endminipage\space command}{\@ehc}% }% % \end{macrocode} % \end{macro} % \begin{macro}{\led@error@fail@patch@endminipage} % \begin{macrocode} \newcommand{\led@error@fail@patch@makeindex}{% - \reledmac@error{Failed to patch the \string\makeindex\space command.}{\@ehc}% + \reledmac@error{Failed to patch the \string\makeindex\space command}{\@ehc}% }% % \end{macrocode} % \end{macro} @@ -8121,14 +8129,20 @@ \global\@firstlineofpagefalse% \fi% % \end{macrocode} -% Insert footnotes made of manuscripts data. +% Insert footnotes made of manuscripts data and critical footnotes. % \begin{macrocode} - \insert@msdata% + \ifdefstring{\ms@data@position}{msdata-regular}{% + \insert@msdata% + \add@inserts% + \add@Xgroupbyline% + }{% + \add@inserts% + \add@Xgroupbyline% + \insert@msdata% + }% % \end{macrocode} -% Restore marginal and footnotes. +% Insert marginal notes. % \begin{macrocode} - \add@inserts% - \add@Xgroupbyline% \affixside@note% % \end{macrocode} % Print left notes. @@ -8179,9 +8193,15 @@ \set@Xtxtbeforenotes% \global\@firstlineofpagefalse% \fi% - \insert@msdata% - \add@inserts% - \add@Xgroupbyline% + \ifdefstring{\ms@data@position}{msdata-regular}{% + \insert@msdata% + \add@inserts% + \add@Xgroupbyline% + }{% + \add@inserts% + \add@Xgroupbyline% + \insert@msdata% + }% \affixside@note% \numdef{\temp@}{\l@dnumpstartsL-1}% \xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}% @@ -16286,7 +16306,7 @@ GLSuservi% }% % \end{macrocode} -% First those which arguments are \oarg{options}\marg{label}\marg{link text}. +% Then those which arguments are \oarg{options}\marg{label}\marg{link text}. % \begin{macrocode} \renewcommand{\do}[1]{% \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,usedefault]{% @@ -16299,6 +16319,20 @@ }% }% \docsvlist{glsdisp,glslink}% +% \end{macrocode} +% Then those which arguments are \oarg{options}\marg{label}. +% \begin{macrocode} + \renewcommand{\do}[1]{% + \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[2][1,usedefault]{% + \doedindexlabel% + \csname#1\endcsname[counter=pageline,##1]{##2}% + }% + \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[2][1,usedefault]{% + \doedindexlabel% + \csname#1\endcsname*[counter=pageline,##1]{##2}% + }% + }% + \docsvlist{glsadd}% }{}% }% % \end{macrocode} @@ -16770,6 +16804,15 @@ \def\@msdata@series{A}% % \end{macrocode} % \end{macro} +% \begin{macro}{\setmsdataposition} +% The label for the manuscripts data. +% \begin{macrocode} +\def\ms@data@position{msdata-regular}% +\newcommand{\setmsdataposition}[1]{% + \gdef\ms@data@position{#1}% +}% +% \end{macrocode} +% \end{macro} % \begin{macro}{\setmsdatalabel} % The label for the manuscripts data. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index 004444aaa54..f4baa778199 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -295,6 +295,7 @@ % \changes{v.2.15.0}{2016/12/12}{Fix bug with \protect\cs{msdata} when using multiple \protect\cs{beginnumbering}…\protect\cs{endnumbering}} % \changes{v2.15.0}{2016/12/12}{Fix bug about space before sectioning commands after a pairs environment (bug added in v.~2.14.4).} % \changes{v2.15.0}{2016/12/12}{Fix bug with page break when using \protect\cs{columns} (bug added in v.~2.14.1).} +% \changes{v2.15.0}{2016/12/12}{Compatibility with \protect\cs{setmsdataposition}} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1250,7 +1251,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2016/12/12 v2.15.0 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/12/23 v2.16.0 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -3657,9 +3658,15 @@ \set@Xtxtbeforenotes% \global\@firstlineofpagefalse% \fi% - \insert@msdata% - \add@inserts% - \add@Xgroupbyline% + \ifdefstring{\ms@data@position}{msdata-regular}{% + \insert@msdata% + \add@inserts% + \add@Xgroupbyline% + }{% + \add@inserts% + \add@Xgroupbyline% + \insert@msdata% + }% \affixside@note% }% {\print@lineL}% @@ -3700,10 +3707,15 @@ \set@Xtxtbeforenotes% \global\@firstlineofpagefalse% \fi% - \insert@msdata% - \add@inserts% - \add@Xgroupbyline% - \affixside@note% + \ifdefstring{\ms@data@position}{msdata-regular}{% + \insert@msdata% + \add@inserts% + \add@Xgroupbyline% + }{% + \add@inserts% + \add@Xgroupbyline% + \insert@msdata% + }% \l@dlsn@te% \do@insidelineLhook% \hb@xt@ \Lcolwidth{\ledllfill\hb@xt@ \wd\one@line{% @@ -3832,9 +3844,15 @@ \set@Xtxtbeforenotes% \global\@firstlineofpageRfalse% \fi% - \insert@msdata% - \add@insertsR% - \add@Xgroupbyline% + \ifdefstring{\ms@data@position}{msdata-regular}{% + \insert@msdata% + \add@insertsR% + \add@Xgroupbyline% + }{% + \add@insertsR% + \add@Xgroupbyline% + \insert@msdata% + }% \affixside@noteR% }% {\print@lineR}% @@ -3877,9 +3895,15 @@ \set@Xtxtbeforenotes% \global\@firstlineofpageRfalse% \fi% - \insert@msdata% - \add@insertsR% - \add@Xgroupbyline% + \ifdefstring{\ms@data@position}{msdata-regular}{% + \insert@msdata% + \add@insertsR% + \add@Xgroupbyline% + }{% + \add@insertsR% + \add@Xgroupbyline% + \insert@msdata% + }% \affixside@noteR% \l@dlsn@te% \do@insidelineRhook% @@ -3891,7 +3915,8 @@ \fi% \l@dunhbox@line{\one@lineR}}\ledrlfill\l@drd@ta% \l@drsn@te% - }} + }% +} \def\print@eledsectionR{% \addtocounter{pstartR}{-1}% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index f8abf59e550..75fe162aa11 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/12/16 v2.16.8 typesetting critical editions]% +\ProvidesPackage{reledmac}[2016/12/23 v2.17.0 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -280,25 +280,25 @@ \reledmac@error{#1footnote outside of the second argument of an edtext. Check syntax}{\@ehc}% }% \newcommand{\led@error@PackageAfterEledmac}[1]{% - \reledmac@error{#1 must be loaded before reledmac.}{\@ehc}% + \reledmac@error{#1 must be loaded before reledmac}{\@ehc}% }% \newcommand{\led@error@fail@patch@@makecol}{% - \reledmac@error{Fail to patch \string\@makecol\space command.}{\@ehc}% + \reledmac@error{Fail to patch \string\@makecol\space command}{\@ehc}% }% \newcommand{\led@error@fail@patch@@reinserts}{% - \reledmac@error{Fail to patch \string\@reinserts\space command.}{\@ehc}% + \reledmac@error{Fail to patch \string\@reinserts\space command}{\@ehc}% }% \newcommand{\led@error@fail@patch@@doclearpage}{% - \reledmac@error{Fail to patch \string\@doclearpage\space command.}{\@ehc}% + \reledmac@error{Fail to patch \string\@doclearpage\space command}{\@ehc}% }% \newcommand{\led@error@fail@patch@@iiiminipage}{% - \reledmac@error{Fail to patch \string\@iiiminipage\space command.}{\@ehc}% + \reledmac@error{Fail to patch \string\@iiiminipage\space command}{\@ehc}% }% \newcommand{\led@error@fail@patch@endminipage}{% - \reledmac@error{Failed to patch the \string\endminipage\space command.}{\@ehc}% + \reledmac@error{Failed to patch the \string\endminipage\space command}{\@ehc}% }% \newcommand{\led@error@fail@patch@makeindex}{% - \reledmac@error{Failed to patch the \string\makeindex\space command.}{\@ehc}% + \reledmac@error{Failed to patch the \string\makeindex\space command}{\@ehc}% }% \newcommand{\led@warn@edinde@outsidenumbering}{% \reledmac@warning{\string\edindex\space called outside of \string\beginnumbering…\string\endnumbering. \MessageBreak Automatically switched to \string\index.}% @@ -1781,9 +1781,15 @@ \set@Xtxtbeforenotes% \global\@firstlineofpagefalse% \fi% - \insert@msdata% - \add@inserts% - \add@Xgroupbyline% + \ifdefstring{\ms@data@position}{msdata-regular}{% + \insert@msdata% + \add@inserts% + \add@Xgroupbyline% + }{% + \add@inserts% + \add@Xgroupbyline% + \insert@msdata% + }% \affixside@note% \l@dlsn@te {\ledllfill\hb@xt@ \wd\one@line{\new@line% @@ -1802,9 +1808,15 @@ \set@Xtxtbeforenotes% \global\@firstlineofpagefalse% \fi% - \insert@msdata% - \add@inserts% - \add@Xgroupbyline% + \ifdefstring{\ms@data@position}{msdata-regular}{% + \insert@msdata% + \add@inserts% + \add@Xgroupbyline% + }{% + \add@inserts% + \add@Xgroupbyline% + \insert@msdata% + }% \affixside@note% \numdef{\temp@}{\l@dnumpstartsL-1}% \xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}% @@ -6462,6 +6474,17 @@ }% }% \docsvlist{glsdisp,glslink}% + \renewcommand{\do}[1]{% + \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[2][1,usedefault]{% + \doedindexlabel% + \csname#1\endcsname[counter=pageline,##1]{##2}% + }% + \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[2][1,usedefault]{% + \doedindexlabel% + \csname#1\endcsname*[counter=pageline,##1]{##2}% + }% + }% + \docsvlist{glsadd}% }{}% }% \def\@hangingsymbol{} @@ -6691,6 +6714,10 @@ \gdef\@msdata@series{#1}% }% \def\@msdata@series{A}% +\def\ms@data@position{msdata-regular}% +\newcommand{\setmsdataposition}[1]{% + \gdef\ms@data@position{#1}% +}% \def\ms@data@label{Ms.}% \newcommand{\setmsdatalabel}[1]{% \gdef\ms@data@label{#1}% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index c94978841e8..4c0800dca9b 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2016/12/12 v2.15.0 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/12/23 v2.16.0 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -1086,9 +1086,15 @@ \set@Xtxtbeforenotes% \global\@firstlineofpagefalse% \fi% - \insert@msdata% - \add@inserts% - \add@Xgroupbyline% + \ifdefstring{\ms@data@position}{msdata-regular}{% + \insert@msdata% + \add@inserts% + \add@Xgroupbyline% + }{% + \add@inserts% + \add@Xgroupbyline% + \insert@msdata% + }% \affixside@note% }% {\print@lineL}% @@ -1121,10 +1127,15 @@ \set@Xtxtbeforenotes% \global\@firstlineofpagefalse% \fi% - \insert@msdata% - \add@inserts% - \add@Xgroupbyline% - \affixside@note% + \ifdefstring{\ms@data@position}{msdata-regular}{% + \insert@msdata% + \add@inserts% + \add@Xgroupbyline% + }{% + \add@inserts% + \add@Xgroupbyline% + \insert@msdata% + }% \l@dlsn@te% \do@insidelineLhook% \hb@xt@ \Lcolwidth{\ledllfill\hb@xt@ \wd\one@line{% @@ -1212,9 +1223,15 @@ \set@Xtxtbeforenotes% \global\@firstlineofpageRfalse% \fi% - \insert@msdata% - \add@insertsR% - \add@Xgroupbyline% + \ifdefstring{\ms@data@position}{msdata-regular}{% + \insert@msdata% + \add@insertsR% + \add@Xgroupbyline% + }{% + \add@insertsR% + \add@Xgroupbyline% + \insert@msdata% + }% \affixside@noteR% }% {\print@lineR}% @@ -1250,9 +1267,15 @@ \set@Xtxtbeforenotes% \global\@firstlineofpageRfalse% \fi% - \insert@msdata% - \add@insertsR% - \add@Xgroupbyline% + \ifdefstring{\ms@data@position}{msdata-regular}{% + \insert@msdata% + \add@insertsR% + \add@Xgroupbyline% + }{% + \add@insertsR% + \add@Xgroupbyline% + \insert@msdata% + }% \affixside@noteR% \l@dlsn@te% \do@insidelineRhook% @@ -1264,7 +1287,8 @@ \fi% \l@dunhbox@line{\one@lineR}}\ledrlfill\l@drd@ta% \l@drsn@te% - }} + }% +} \def\print@eledsectionR{% \addtocounter{pstartR}{-1}% -- cgit v1.2.3