From 607271b02699d8c352fa9d38361bc4bf55693d54 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 28 Apr 2017 21:17:28 +0000 Subject: reledmac (28apr17) git-svn-id: svn://tug.org/texlive/trunk@44099 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 17291 -> 17330 bytes .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 26392 -> 26393 bytes .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 20913 -> 20908 bytes .../doc/latex/reledmac/examples/1-verses.pdf | Bin 17433 -> 17432 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 18602 -> 18603 bytes .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 20754 -> 20757 bytes .../doc/latex/reledmac/examples/2-glossaries.pdf | Bin 21725 -> 21903 bytes .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 21743 -> 21742 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 17115 -> 17115 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 31424 -> 31428 bytes .../doc/latex/reledmac/examples/2-linespacing.pdf | Bin 26387 -> 26420 bytes .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 36346 -> 36346 bytes .../doc/latex/reledmac/examples/2-notes-width.pdf | Bin 24782 -> 24824 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 25900 -> 25903 bytes .../doc/latex/reledmac/examples/2-performances.pdf | Bin 23270 -> 23295 bytes .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 34250 -> 34250 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 22811 -> 22806 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 17200 -> 17202 bytes .../3-reledpar_columns_different_languages.pdf | Bin 26170 -> 26170 bytes .../doc/latex/reledmac/examples/3-reledpar_mwe.pdf | Bin 12216 -> 12215 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 42532 -> 42532 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 22788 -> 22794 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 43294 -> 43294 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 42871 -> 42868 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 40799 -> 40796 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 43079 -> 43069 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 42561 -> 42560 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 42613 -> 42612 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 42870 -> 42868 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 22315 -> 22315 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 27235 -> 27238 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 21264 -> 21265 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 29552 -> 29556 bytes .../examples/4-reledpar_inside-outside-columns.pdf | Bin 22446 -> 22447 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 36446 -> 36448 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 58540 -> 58540 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 22751 -> 22753 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 18840 -> 19014 bytes ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 32473 -> 32474 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 22219 -> 22220 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 16266 -> 16263 bytes Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 89697 -> 89700 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 1269012 -> 1269066 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 487985 -> 488271 bytes .../texmf-dist/source/latex/reledmac/reledmac.dtx | 2 +- .../texmf-dist/source/latex/reledmac/reledpar.dtx | 43 ++++++++++++--------- Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 39 ++++++++++--------- 47 files changed, 45 insertions(+), 39 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 592fe23e8dc..b18b10aa76f 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 9efa9ef99fc..8aadd06c1f1 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 6e2112183b9..a6bc38a37eb 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 0ff3520f851..a15fc12a4d5 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 5b8ccb24e57..b204342a385 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 cf6d6244d47..985da68070c 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 2857baa9853..b2285e501ce 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 7148b025019..62ec2fbfea3 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 86780e5063e..563e67a9bc3 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 c42fe2693d1..ae7a0ce0a5b 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 51de6527830..0c5c1672988 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 f9f8aef08ae..7ffc365b450 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 78f48c06d12..a9924006c0e 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 e51e7d602a6..39be3ea878b 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 9b1d4a8b693..bac38286006 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 f9c116ac0d7..0cbe4444d95 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 7956586c6f6..a1c47788a9a 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 5c9463ec002..26cdb8dd5e0 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 ec5c9d6b354..62da6175784 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 f9a2070380a..45b850f6685 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 58eca38f6c0..05e76e4268e 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 a5e07d4b6a1..56c6597aa46 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 31900148214..bc2171da0b2 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 7f4cdc800cf..76127eda89f 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 a0bb4255a35..b1faa321cfd 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 7b2ee2b97d7..21e9a3dbffe 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 44c08097b23..88c390bdf11 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 3925af32b43..b2c53047b8e 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 37d954d9e63..e1b9d857b30 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 c6138712eec..fa4d8a3f9cd 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 69af09aa573..322e92798b3 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 ea8f73d4fcc..b81fc0a75fd 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 4d1471623ec..d9588c99fee 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 94e8ad95984..442b56a7943 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 801dc748258..84880c6ba8b 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 33b021b43b6..8dd32bf5d8a 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 59ed7b5eb15..7ede13c36c1 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 c06e369fad8..83f24d9029e 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 473aae49bc9..c6a75d1af8b 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 df96550d4d1..5c06f203e61 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 bdfdd58b7e1..957ffdb2e3a 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 6d910f2b650..cef6a4e0866 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 87d7bf4d187..a88c237b15a 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 f8b37f9371e..9f3dcfd358b 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 9a676c6c571..b689c1b5538 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -1089,7 +1089,7 @@ % or sub-line depending on what it started out as, even if it % changes in the middle. % -% You can change the separator between line number and subline number or using \cs{Xsublinesep} without any option argument (\reff{Xsublinesep} or using \cs{Xsublinesepside}. But in the second case, it will change the separator only for line number in side, not for the footnotes. +% You can change the separator between line number and subline number or using \cs{Xsublinesep} without any option argument (\reff{Xsublinesep} or using \cs{Xsublinesepside}). But in the second case, it will change the separator only for line number in side, not for the footnotes. % \subsubsection{Locking lineation} % \DescribeMacro{\startlock} % \DescribeMacro{\endlock} diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index d7b172451ac..29bf4e21228 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -302,6 +302,7 @@ % \changes{v2.17.0}{2017/02/22}{Change code for compatibility with \protect\reledmac 2.18.0} % \changes{v2.17.1}{2017/03/26}{Fix bug with \protect\option{prevpgstyle} option when not using \protect\option{prevpgnotnumbered}.} % \changes{v2.17.3}{2017/04/20}{Fix bug when using multiple sidenotes on the same line, on right side.} +% \changes{v2.17.4}{2017/04/28}{Fix bugs with sublines in parallel typesetting.} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1257,7 +1258,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2017/04/20 v2.17.3 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2017/04/28 v2.17.4 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -1694,7 +1695,7 @@ \global\line@numR \z@ \global\@lockR \z@ \global\sub@lockR \z@ - \global\sublines@false + \global\sublines@Rfalse \global\let\next@page@numR\relax \global\let\sub@change\relax \global\stopmsdata@inserted@true% @@ -2096,8 +2097,8 @@ \setcounter{linenumincrement}{#1}% } \WithSuffix\newcommand\firstsublinenum*[1]{% - \setcounter{subfirstlinenumR}{#1}% - \setcounter{subfirstlinenum}{#1}% + \setcounter{firstsublinenumR}{#1}% + \setcounter{firstsublinenum}{#1}% } \WithSuffix\newcommand\sublinenumincrement*[1]{% \setcounter{sublinenumincrementR}{#1}% @@ -2215,8 +2216,8 @@ \l@dlinenumR} \newcommand*{\l@dlinenumR}{% \numlabfont\linenumrepR{\line@numR}\@Rlineflag% - \ifsublines@ - \ifnum\subline@num>\z@ + \ifsublines@R + \ifnum\subline@numR>\z@ \unskip\fullstop\sublinenumrepR{\subline@numR}% \fi \fi} @@ -2235,6 +2236,7 @@ % \begin{macro}{\line@numR} % \begin{macro}{\subline@numR} % \begin{macro}{\absline@numR} +% \begin{macro}{\ifsublines@R} % The count \protect\cs{line@numR} stores the line number that is used in % the right text's marginal line numbering and in notes. % The count \protect\cs{subline@numR} stores @@ -2244,15 +2246,18 @@ % of the right text section: that is, the number we have actually printed, % no matter what numbers we attached to them. % +% The boolean \cs{ifsublines@R} is set to true when we start subline on rightside. % \begin{macrocode} \newcount\line@numR \newcount\subline@numR \newcount\absline@numR +\newif\ifsublines@R% % \end{macrocode} % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % \begin{macro}{\line@listR} % \begin{macro}{\insertlines@listR} @@ -2378,9 +2383,9 @@ \fi \ifx\sub@change\relax \else \ifnum\sub@change>\z@ - \sublines@true + \sublines@Rtrue \else - \sublines@false + \sublines@Rfalse \fi \sub@action \let\sub@change\relax @@ -2397,7 +2402,7 @@ \or\or \sub@lockR \z@ \fi - \ifsublines@ + \ifsublines@R \ifnum\sub@lockR<\tw@ \advance\subline@numR \@ne \fi @@ -2491,7 +2496,7 @@ \newcommand*{\do@lockonR}{% \xright@appenditem{\the\absline@numR}\to\actionlines@listR - \ifsublines@ + \ifsublines@R \xright@appenditem{-1005}\to\actions@listR \ifnum\sub@lockR=\z@ \sub@lockR \@ne @@ -2528,7 +2533,7 @@ \newcommand{\do@lockoffR}{% \xright@appenditem{\the\absline@numR}\to\actionlines@listR - \ifsublines@ + \ifsublines@R \xright@appenditem{-1006}\to\actions@listR \ifnum\sub@lockR=\tw@ \sub@lockR \thr@@ @@ -2622,9 +2627,9 @@ % \begin{macrocode} \xright@appenditem% {\the\page@numR|\the\line@numR|% - \ifsublines@ \the\subline@numR \else 0\fi|% + \ifsublines@R \the\subline@numR \else 0\fi|% \the\endpage@num|\the\endline@num|% - \ifsublines@ \the\endsubline@num \else 0\fi}\to\line@listR + \ifsublines@R \the\endsubline@num \else 0\fi}\to\line@listR % \end{macrocode} % Create a list which will store all the second argument of each \protect\cs{@sw} % in this lemma, at this level. @@ -3980,7 +3985,7 @@ \do@ballastR \ifledgroupnotesR@\else \ifnumberline - \ifsublines@ + \ifsublines@R \ifnum\sub@lockR<\tw@ \global\advance\subline@numR \@ne \fi @@ -4056,9 +4061,9 @@ \newcommand*{\do@actions@fixedcodeR}{% \ifcase\@l@dtempcnta% \or% % 1001 = starting sublineation - \global\sublines@true + \global\sublines@Rtrue \or% % 1002 = ending sublineation - \global\sublines@false + \global\sublines@Rfalse \or% % 1003 = starting locking number \global\@lockR=\@ne \or% % 1004 = ending locking number @@ -4104,7 +4109,7 @@ \ifnum\next@actionR<-4999\relax % 9/05 added relax here \@l@dtempcnta=-\next@actionR \advance\@l@dtempcnta by -5001\relax - \ifsublines@ + \ifsublines@R \global\subline@numR=\@l@dtempcnta \else \global\line@numR=\@l@dtempcnta @@ -4210,10 +4215,10 @@ \ifl@dskipnumber \global\l@dskipnumberfalse \else - \ifsublines@ + \ifsublines@R \@l@dtempcntb=\subline@numR \l@dcalcnum{\subline@numR}{\c@firstsublinenumR}{\c@sublinenumincrementR}% - \ch@cksub@lockR + \ch@cksub@l@ckR \else \@l@dtempcntb=\line@numR \ifx\linenumberlistR\empty% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index d9fcec32595..e1f0f7648f4 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}[2017/04/20 v2.17.3 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2017/04/28 v2.17.4 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -197,7 +197,7 @@ \global\line@numR \z@ \global\@lockR \z@ \global\sub@lockR \z@ - \global\sublines@false + \global\sublines@Rfalse \global\let\next@page@numR\relax \global\let\sub@change\relax \global\stopmsdata@inserted@true% @@ -432,8 +432,8 @@ \setcounter{linenumincrement}{#1}% } \WithSuffix\newcommand\firstsublinenum*[1]{% - \setcounter{subfirstlinenumR}{#1}% - \setcounter{subfirstlinenum}{#1}% + \setcounter{firstsublinenumR}{#1}% + \setcounter{firstsublinenum}{#1}% } \WithSuffix\newcommand\sublinenumincrement*[1]{% \setcounter{sublinenumincrementR}{#1}% @@ -481,8 +481,8 @@ \l@dlinenumR} \newcommand*{\l@dlinenumR}{% \numlabfont\linenumrepR{\line@numR}\@Rlineflag% - \ifsublines@ - \ifnum\subline@num>\z@ + \ifsublines@R + \ifnum\subline@numR>\z@ \unskip\fullstop\sublinenumrepR{\subline@numR}% \fi \fi} @@ -490,6 +490,7 @@ \newcount\line@numR \newcount\subline@numR \newcount\absline@numR +\newif\ifsublines@R% \list@create{\line@listR} \list@create{\insertlines@listR} @@ -536,9 +537,9 @@ \fi \ifx\sub@change\relax \else \ifnum\sub@change>\z@ - \sublines@true + \sublines@Rtrue \else - \sublines@false + \sublines@Rfalse \fi \sub@action \let\sub@change\relax @@ -555,7 +556,7 @@ \or\or \sub@lockR \z@ \fi - \ifsublines@ + \ifsublines@R \ifnum\sub@lockR<\tw@ \advance\subline@numR \@ne \fi @@ -576,7 +577,7 @@ \newcommand*{\do@lockonR}{% \xright@appenditem{\the\absline@numR}\to\actionlines@listR - \ifsublines@ + \ifsublines@R \xright@appenditem{-1005}\to\actions@listR \ifnum\sub@lockR=\z@ \sub@lockR \@ne @@ -599,7 +600,7 @@ \newcommand{\do@lockoffR}{% \xright@appenditem{\the\absline@numR}\to\actionlines@listR - \ifsublines@ + \ifsublines@R \xright@appenditem{-1006}\to\actions@listR \ifnum\sub@lockR=\tw@ \sub@lockR \thr@@ @@ -639,9 +640,9 @@ \endgroup \xright@appenditem% {\the\page@numR|\the\line@numR|% - \ifsublines@ \the\subline@numR \else 0\fi|% + \ifsublines@R \the\subline@numR \else 0\fi|% \the\endpage@num|\the\endline@num|% - \ifsublines@ \the\endsubline@num \else 0\fi}\to\line@listR + \ifsublines@R \the\endsubline@num \else 0\fi}\to\line@listR \expandafter\list@create\expandafter{\csname sw@list@edtext@tmp@\the\@edtext@level\endcsname}% \@ref@reg@parseR{#2}% \global\advance\@edtext@level by -1% @@ -1334,7 +1335,7 @@ \do@ballastR \ifledgroupnotesR@\else \ifnumberline - \ifsublines@ + \ifsublines@R \ifnum\sub@lockR<\tw@ \global\advance\subline@numR \@ne \fi @@ -1381,9 +1382,9 @@ \newcommand*{\do@actions@fixedcodeR}{% \ifcase\@l@dtempcnta% \or% % 1001 = starting sublineation - \global\sublines@true + \global\sublines@Rtrue \or% % 1002 = ending sublineation - \global\sublines@false + \global\sublines@Rfalse \or% % 1003 = starting locking number \global\@lockR=\@ne \or% % 1004 = ending locking number @@ -1428,7 +1429,7 @@ \ifnum\next@actionR<-4999\relax % 9/05 added relax here \@l@dtempcnta=-\next@actionR \advance\@l@dtempcnta by -5001\relax - \ifsublines@ + \ifsublines@R \global\subline@numR=\@l@dtempcnta \else \global\line@numR=\@l@dtempcnta @@ -1515,10 +1516,10 @@ \ifl@dskipnumber \global\l@dskipnumberfalse \else - \ifsublines@ + \ifsublines@R \@l@dtempcntb=\subline@numR \l@dcalcnum{\subline@numR}{\c@firstsublinenumR}{\c@sublinenumincrementR}% - \ch@cksub@lockR + \ch@cksub@l@ckR \else \@l@dtempcntb=\line@numR \ifx\linenumberlistR\empty% -- cgit v1.2.3