From 1895e2b04949f111ac2f813897b0cebe52114b6e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 26 Sep 2016 20:53:10 +0000 Subject: reledmac (26sep16) git-svn-id: svn://tug.org/texlive/trunk@42155 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 17439 -> 17438 bytes .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 26403 -> 26406 bytes .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 21154 -> 21123 bytes .../doc/latex/reledmac/examples/1-verses.pdf | Bin 17433 -> 17432 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 18591 -> 18587 bytes .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 20753 -> 20752 bytes .../doc/latex/reledmac/examples/2-glossaries.pdf | Bin 21830 -> 21831 bytes .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 21750 -> 21748 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 17113 -> 17111 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 31415 -> 31420 bytes .../doc/latex/reledmac/examples/2-linespacing.pdf | Bin 26286 -> 26288 bytes .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 36334 -> 36334 bytes .../doc/latex/reledmac/examples/2-notes-width.pdf | Bin 24687 -> 24683 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 25882 -> 25882 bytes .../doc/latex/reledmac/examples/2-performances.pdf | Bin 23388 -> 23387 bytes .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 33910 -> 33912 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 22856 -> 22851 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 17197 -> 17198 bytes .../3-reledpar_columns_different_languages.pdf | Bin 26433 -> 26435 bytes .../doc/latex/reledmac/examples/3-reledpar_mwe.pdf | Bin 12215 -> 12215 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 39974 -> 39974 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 22794 -> 22797 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 35112 -> 35103 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 34850 -> 34851 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 33391 -> 33390 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 35006 -> 35007 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 34570 -> 34583 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 34620 -> 34615 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 34835 -> 34834 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 22304 -> 22303 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 27062 -> 27059 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 21264 -> 21263 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 29536 -> 29521 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 36413 -> 36413 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 58536 -> 58537 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 22748 -> 22746 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 18881 -> 18881 bytes ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 32414 -> 32477 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 22209 -> 22206 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 16250 -> 16251 bytes Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 87881 -> 87883 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 1226822 -> 1229878 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 467257 -> 466598 bytes .../texmf-dist/source/latex/reledmac/reledmac.dtx | 37 ++++++++++++--------- .../texmf-dist/source/latex/reledmac/reledpar.dtx | 19 ++--------- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 17 ++++++---- Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 18 +--------- 47 files changed, 35 insertions(+), 56 deletions(-) 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 be639c360a6..411e0b4e2af 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 c4342bae02f..2960ff53e12 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 cbc30d68a5a..9fc21a799da 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 0a52c668a4d..6bfd1074cdc 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 395f6df4495..972bf56e2ae 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 a4e8001ae44..3d2c0213d88 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 7896da9e027..7e3897677fb 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 bb6cc031a36..aebe238c83d 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 bef08af198f..01e8332e01b 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 3f26ad0b9dd..1e444c1362e 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 83bc92e7067..808eeb7e6b3 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 f3fa6d97d92..97ec34180b8 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 0f8609b68a1..0b03be82c28 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 a93bfc07b90..fd165dd7266 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 1d3b0b3d04f..209c461742a 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 d0849c0009d..d33d3882ff3 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 94c3347c873..122c5dda3d5 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 d5971ec4228..498b34ed598 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 ef457365ba3..cf9d1fb58ab 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 9806df8149a..91f7e8b8c2e 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 e8fcff1713d..0c5dd29957c 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 33343307b0d..d7546aaa84e 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 f4dcfd9407f..29ff9440f8a 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 9ea4e839a64..1a7882663f9 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 098d59037d7..8b639e8ab94 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 de32f3b49a0..dc50599a1d2 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 67fda0825af..60ff65e2854 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 2012334063e..3a662d189f2 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 761caede05a..bd07fc53793 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 10b8e675317..25f56cb50f6 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 64239332469..4fa04fe89b6 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 749f179c66e..fbd6b409452 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 b57f24674d4..00cc2fbfb4a 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_one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf index 54de9d828d4..031c68bd865 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 b95f098e1fd..a75a13b474d 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 ac192015f7a..6a1078134fb 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 08be9577b46..dbbb789d881 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 612d97106d7..a22937b82d9 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 1f780aac97d..165b9ce014b 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 b0ca265aed3..ac9094624b9 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 571839d49d5..ddade5b593c 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 4363fef232e..27cbc6fd732 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 7720b6a3a15..1ac9c6a34ba 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 775f819bc58..926e17c0054 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -427,6 +427,8 @@ % \changes{v2.15.0}{2016/07/22}{Fix \protect\cs{Xtxtbeforenotes} in ledgroup.} % \changes{v2.15.1}{2016/09/07}{Fix \protect\cs{edindex} in tabular environments.} % \changes{v2.15.2}{2016/09/12}{Fix bug with \protect\package{fancyhdr} package 3.8 and later.} +% \changes{v2.15.3}{2016/09/26}{Fix bug with \protect\cs{section} in optional argument of \protect\cs{pstart} and empty line before \protect\cs{pend} (bug added in v2.8.2).} +% \changes{v2.15.3}{2016/09/26}{Simplification of the code concerning sectioning command.} % \title{\Macpackage \\ % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} @@ -2408,13 +2410,6 @@ % especially within the notes, and then in % subsequent sections specify how these commands are used. % -% For those who are setting up for a large job, here is -% a list of the complete set of \macpackage macros relating to fonts that -% are intended for manipulation by the user: -% \protect\cs{endashchar}, -% \protect\cs{fullstop}, -% \protect\cs{numlabfont}, and -% \protect\cs{rbracket}. % % % \DescribeMacro{\numlabfont} @@ -2976,6 +2971,9 @@ % If two note commands for the same side are called in the same line, they will % be appended and separated by a comma. % +% \textbf{The notes will appear only at the second \LaTeX\ run. If the note positions change in your \texttt{.tex} file, +% you need two runs to get the correction position in the output file. +% You are strongly encouraged to use tools like \emph{latexmk}, to be sure to get the good number of runs.} % \subsection{Setting} % % \subsubsection{Width} @@ -3763,7 +3761,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/09/12 v2.15.2 typeset critical editions]% +\ProvidesPackage{reledmac}[2016/09/26 v2.15.3 typeset critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -7701,10 +7699,12 @@ \newcommandx*{\pstart}[1][1]{% \normal@pars% \ifstrempty{#1}{\at@every@pstart}{\noindent#1}% + \ifautopar% + \autopar% + \fi% \ifluatex% \edef\l@luatextextdir@L{\the\textdir}% \fi% - \@nobreaktrue% \ifnumbering \else% \led@err@PstartNotNumbered% \beginnumbering% @@ -7715,9 +7715,14 @@ \fi% \list@clear{\inserts@list}% \global\let\next@insert=\empty% - \begingroup% + \begingroup\normal@pars% \global\advance \l@dnumpstartsL\@ne \global\setbox\raw@text=\vbox\bgroup% + \if@nobreak% + \if@afterindent\else% + \noindent% + \fi% + \fi% \ifautopar\else% \ifnumberpstart% \ifinstanza\else% @@ -7805,15 +7810,12 @@ \normal@pars% \ifstrempty{#1}{\at@every@pend}{\noindent#1}% % \end{macrocode} -% Restore standard nobreak setting and autopar setting. -% Normally, \cs{if@nobreak} is equal to true only immediately after a sectioning command (read latex.ltx file). As a \cs{pstart}…\cs{pend} structure can't contain any sectioning command, we set \cs{if@nobreak} to false. +% Restore autopar setting. % \begin{macrocode} - \@nobreakfalse% \ifautopar% \autopar% \fi% } - % \end{macrocode} % \end{macro} % Here, two macros to insert content after every \protect\cs{pend}, between numbered line. @@ -7909,7 +7911,7 @@ % are in force. We will want to do this within a footnotes, for % example. % \begin{macrocode} -\newcommand*{\normal@pars}{\ifautopar\everypar{}\fi\let\par\endgraf} +\newcommand*{\normal@pars}{\everypar{}\let\par\endgraf} % \end{macrocode} % \end{macro} @@ -10250,7 +10252,10 @@ % \protect\cs{printlines}. The right bracket macro is the same again; % it crops up in \protect\cs{normalfootfmt} and the other footnote % macros for controlling the format of the footnotes. -% +% +% Note that these commands are not directly called by \macpackage, but are enclosed as default value of specific hooks. +% Consequently, people should not redefine them, but use instead the \cs{Xlinerangeseparator}, \cs{Xendlinerangeseparator}, \cs{Xsublinesep}, \cs{Xendsublinesep} and \cs{Xlemmaseparator} macros. +% % With \protect\package{polyglossia}, each critical note has a \protect\cs{footnote@lang} which shows the language of the lemma, % and which can be used to switch the bracket from right to left. % \changes{v1.4.0}{2012/11/16}{Switch the right bracket to a left bracket when the lemma is RTL (needs polyglossia or LuaTeX).} diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index 1ce4e2075fe..d556831e0c5 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -279,6 +279,7 @@ % \changes{v2.12.0}{2016/07/01}{Fix bug with \protect\cs{lineationR}.} % \changes{v2.12.0}{2016/07/01}{Fix bug with \protect\cs{AtBeginPairs}.} % \changes{v2.13.0}{2016/07/22}{Compatibility with the new features of \protect\macpackage 2.15.0} +% \changes{v2.13.1}{2016/09/26}{Simplification of the code concerning sectioning command} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1198,7 +1199,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2016/07/22 v2.13.0 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/09/26 v2.13.1 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -3198,12 +3199,6 @@ \renewcommand{\thepstartR}{{\bfseries\@arabic\c@pstartR}. } \newcommandx*{\pstartL}[1][1]{% - \if@nobreak% - \let\@oldnobreak\@nobreaktrue% - \else% - \let\@oldnobreak\@nobreakfalse% - \fi% - \@nobreaktrue% \ifluatex% \xdef\l@luatextextdir@L{\the\textdir}% \xdef\l@luatexpardir@L{\the\pardir}% @@ -3276,12 +3271,6 @@ % % \begin{macrocode} \newcommandx*{\pstartR}[1][1]{% - \if@nobreak% - \let\@oldnobreak\@nobreaktrue% - \else% - \let\@oldnobreak\@nobreakfalse% - \fi% - \@nobreaktrue% \ifluatex% \xdef\l@luatextextdir@R{\the\textdir}% \xdef\l@luatexpardir@R{\the\pardir}% @@ -3358,7 +3347,6 @@ % \begin{macrocode} \endgroup% \ignorespaces% - \@oldnobreak% \dump@pstartL@pc% \ifnumberpstart% \addtocounter{pstartL}{1}% @@ -3391,7 +3379,6 @@ \global\par@lineR=0% \endgroup% \ignorespaces% - \@oldnobreak% \dump@pstartR@pc% \ifnumberpstart% \addtocounter{pstartR}{1}% @@ -3587,7 +3574,6 @@ \ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{} \ifdefstring{\@eledsectmark}{L}{}{\ledsectnomark} \numdef{\temp@}{\l@dpscL-1}% - \xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}% \@eled@sectioningtrue% \bgroup% \ifluatex% @@ -3759,7 +3745,6 @@ \ifdefstring{\@eledsectnotoc}{R}{\ledsectnotoc}{}% \ifdefstring{\@eledsectmark}{R}{}{\ledsectnomark}% \numdef{\temp@}{\l@dpscR-1}% - \xifinlist{\temp@}{\eled@sectionsR@@}{\@nobreaktrue}{\@nobreakfalse}% \@eled@sectioningtrue% \bgroup% \ifluatex% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 0e552921e63..739c82184b8 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty @@ -34,7 +34,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/09/12 v2.15.2 typeset critical editions]% +\ProvidesPackage{reledmac}[2016/09/26 v2.15.3 typeset critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -1614,10 +1614,12 @@ \newcommandx*{\pstart}[1][1]{% \normal@pars% \ifstrempty{#1}{\at@every@pstart}{\noindent#1}% + \ifautopar% + \autopar% + \fi% \ifluatex% \edef\l@luatextextdir@L{\the\textdir}% \fi% - \@nobreaktrue% \ifnumbering \else% \led@err@PstartNotNumbered% \beginnumbering% @@ -1628,9 +1630,14 @@ \fi% \list@clear{\inserts@list}% \global\let\next@insert=\empty% - \begingroup% + \begingroup\normal@pars% \global\advance \l@dnumpstartsL\@ne \global\setbox\raw@text=\vbox\bgroup% + \if@nobreak% + \if@afterindent\else% + \noindent% + \fi% + \fi% \ifautopar\else% \ifnumberpstart% \ifinstanza\else% @@ -1679,13 +1686,11 @@ \addtocounter{pstart}{1}% \normal@pars% \ifstrempty{#1}{\at@every@pend}{\noindent#1}% - \@nobreakfalse% \ifautopar% \autopar% \fi% } - \newcommand{\AtEveryPend}[1]{% \ifstrempty{#1}% {\xdef\at@every@pend{}}% @@ -1718,7 +1723,7 @@ \pstart \noindent \kern\wd0 \ifnumberpstart\ifinstanza\else\thepstart\fi\fi \let\par=\pend}% \ignorespaces} -\newcommand*{\normal@pars}{\ifautopar\everypar{}\fi\let\par\endgraf} +\newcommand*{\normal@pars}{\everypar{}\let\par\endgraf} \newif\ifautopar@pause \newcommand*{\l@dunhbox@line}[1]{\unhbox #1} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 20cc516de57..34ebcc9df1a 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/07/22 v2.13.0 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/09/26 v2.13.1 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -837,12 +837,6 @@ \renewcommand{\thepstartR}{{\bfseries\@arabic\c@pstartR}. } \newcommandx*{\pstartL}[1][1]{% - \if@nobreak% - \let\@oldnobreak\@nobreaktrue% - \else% - \let\@oldnobreak\@nobreakfalse% - \fi% - \@nobreaktrue% \ifluatex% \xdef\l@luatextextdir@L{\the\textdir}% \xdef\l@luatexpardir@L{\the\pardir}% @@ -888,12 +882,6 @@ \ignorespaces% } \newcommandx*{\pstartR}[1][1]{% - \if@nobreak% - \let\@oldnobreak\@nobreaktrue% - \else% - \let\@oldnobreak\@nobreakfalse% - \fi% - \@nobreaktrue% \ifluatex% \xdef\l@luatextextdir@R{\the\textdir}% \xdef\l@luatexpardir@R{\the\pardir}% @@ -948,7 +936,6 @@ \global\par@line=0% \endgroup% \ignorespaces% - \@oldnobreak% \dump@pstartL@pc% \ifnumberpstart% \addtocounter{pstartL}{1}% @@ -969,7 +956,6 @@ \global\par@lineR=0% \endgroup% \ignorespaces% - \@oldnobreak% \dump@pstartR@pc% \ifnumberpstart% \addtocounter{pstartR}{1}% @@ -1085,7 +1071,6 @@ \ifdefstring{\@eledsectnotoc}{L}{\ledsectnotoc}{} \ifdefstring{\@eledsectmark}{L}{}{\ledsectnomark} \numdef{\temp@}{\l@dpscL-1}% - \xifinlist{\temp@}{\eled@sections@@}{\@nobreaktrue}{\@nobreakfalse}% \@eled@sectioningtrue% \bgroup% \ifluatex% @@ -1216,7 +1201,6 @@ \ifdefstring{\@eledsectnotoc}{R}{\ledsectnotoc}{}% \ifdefstring{\@eledsectmark}{R}{}{\ledsectnomark}% \numdef{\temp@}{\l@dpscR-1}% - \xifinlist{\temp@}{\eled@sectionsR@@}{\@nobreaktrue}{\@nobreakfalse}% \@eled@sectioningtrue% \bgroup% \ifluatex% -- cgit v1.2.3