From a54d580a3fabbe9506227e953f7e31598ada525c Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 7 Oct 2016 22:24:15 +0000 Subject: reledmac (7oct16) git-svn-id: svn://tug.org/texlive/trunk@42224 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 17199 -> 17297 bytes .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 26453 -> 26458 bytes .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 20990 -> 20991 bytes .../doc/latex/reledmac/examples/1-verses.pdf | Bin 17437 -> 17433 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 18588 -> 18588 bytes .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 20866 -> 20869 bytes .../doc/latex/reledmac/examples/2-glossaries.pdf | Bin 21644 -> 21755 bytes .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 21750 -> 21750 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 17114 -> 17113 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 31480 -> 31478 bytes .../doc/latex/reledmac/examples/2-linespacing.pdf | Bin 26345 -> 26445 bytes .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 36333 -> 36335 bytes .../doc/latex/reledmac/examples/2-notes-width.pdf | Bin 24750 -> 24857 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 25877 -> 25881 bytes .../doc/latex/reledmac/examples/2-performances.pdf | Bin 23132 -> 23240 bytes .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 33914 -> 33910 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 22851 -> 22851 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 17199 -> 17198 bytes .../3-reledpar_columns_different_languages.pdf | Bin 26203 -> 26205 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 22798 -> 22799 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 35110 -> 35103 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 34837 -> 34847 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 33393 -> 33393 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 35007 -> 35005 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 34575 -> 34580 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 34612 -> 34617 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 34836 -> 34836 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 22303 -> 22305 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 27117 -> 27119 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 21260 -> 21261 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 29633 -> 29638 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 36407 -> 36408 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 58537 -> 58536 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 22746 -> 22747 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 18985 -> 19096 bytes ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 32595 -> 32592 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 22210 -> 22209 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 16250 -> 16250 bytes Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 88121 -> 88115 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 1246843 -> 1247155 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 474443 -> 474431 bytes .../texmf-dist/source/latex/reledmac/reledmac.dtx | 74 +++++++++++---------- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 61 ++++++++--------- 45 files changed, 70 insertions(+), 65 deletions(-) (limited to 'Master') 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 45b0be7cc88..3fdff4f4400 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 78ac81f92a5..bff93e1c074 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 439178da787..6236a70356f 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 b6b5ee62595..408ce92334d 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 1fd7855834e..d290e4589a9 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 6e86c55b18e..7b772375548 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 4014b56250f..eb1df888f31 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 43f706c380d..f233eb7b8d3 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 d4b40683230..a24305a2c9e 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 32432f1d255..4cc36d1e355 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 59570a78ee5..2b752d77b20 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 01668578f52..de12c37d4cc 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 633142a08eb..51784d2928a 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 f4551ee4a06..13518a8d5ee 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 c60f57a1cfe..41069deef3a 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 3ad08e59c0e..c3f9fca8730 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 a11d33cc97d..5ebff855c97 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 c4c4517eca5..ef6c4894b70 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 1b6ee7eb284..11f559634d7 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 99d822df7d1..2fd81507ce2 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 fd7f6923aba..8d93eda6a0d 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 fa3a29405b3..0ce34c67a80 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 c9387d759c9..200ff32b646 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 a826ee85f5b..8a2f0273607 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 4f4e2e8ba24..b11780cda11 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 9cada58d59d..6e3c63a876a 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 393d3af223a..1ff97e25bb7 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 a481b8bef6d..266d9803f65 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 2ffdaea80f7..4a78ea9cdd4 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 88bd96462ac..afcc26c0817 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 62e8491dc14..53e31802786 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 7735e6adde7..e0f60f9de61 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 fef96aef3a0..2d393042548 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 068ddf8d6ac..017dafd13e9 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 6e58fb3f285..f2e09d0723a 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 c66f117f46c..aa7af6d0c9f 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 89e3ae5d95e..8ea2ec0282f 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 8afa6c45152..03effb1f7f9 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 88a5b0abba4..937c64c7738 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 9cb3e10f82b..e2d59cfcfc9 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 f38c06a1cbf..036c914e11d 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 3f810b325dd..6b57c549924 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 d55286fead1..c2e102153d2 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 6be31ca2928..9c1d5c7ce8b 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -442,6 +442,8 @@ % \changes{v2.16.0}{2016/10/02}{Add \protect\cs{Xendpagenumberonlyfirst}, \protect\cs{Xendpagenumberonlyfirstifsingle}, \protect\cs{Xendpagenumberonlyfirstintwo}, \protect\cs{Xendinplaceofpagenumber} and \protect\cs{Xendsympagenum} hooks.} % \changes{v2.16.0}{2016/10/02}{When \protect\cs{edindex} is called outside of a \protect\cs{beginnumbering}\protect\ldots\protect\cs{endnumbering} structure, it is automatically switched to \protect\cs{index}, with a warning message.} % \changes{v2.16.1}{2016/10/04}{Fix bug with redefinition of the style of the footnote number (bug added in v2.12.0)} +% \changes{v2.16.2}{2016/10/07}{Error message if \protect\package{footmisc} is loaded after \protect\package{reledmac}.} +% \changes{v2.16.2}{2016/10/07}{Fix bug introduced by v2.16.1 when using not expandable control sequence, like \protect\cs{normalfont}, in the footnote number style.} % \title{\Macpackage \\ % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} @@ -3837,7 +3839,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/10/04 v2.16.1 typesetting critical editions]% +\ProvidesPackage{reledmac}[2016/10/07 v2.16.2 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -4016,6 +4018,7 @@ \@ifpackageloaded{imakeidx}{\l@imakeidxtrue}{}%False is the default value % \end{macrocode} % \end{macro} + % \begin{macro}{\ifl@indextools} % Define a flag for if the \protect\package{indextools} package has been used. % \begin{macrocode} @@ -4028,6 +4031,13 @@ % \end{macrocode} %False is the default value. We consider \protect\package{indextools} as a variant of \protect\package{imakeidx}. That is why we set \protect\cs{ifl@imakeidx} to true. We also let \protect\cs{imki@wrindexentry} to \protect\cs{indtl@wrindexentry}. % \end{macro} +% \begin{macro}{\ifl@footmisc} +% Define a flag for if the \protect\package{footmisc} package has been used. +% \begin{macrocode} +\newif\ifl@footmisc +\@ifpackageloaded{footmisc}{\l@footmisctrue}{}%False is the default value +% \end{macrocode} +% \end{macro} % \begin{macro}{\if@RTL} % The \protect\cs{if@RTL} is defined by the bidi package, which is sometimes loaded by \emph{polyglossia}. % But we define it as well if the \protect\package{bidi} package is not loaded. @@ -4348,17 +4358,10 @@ }% % \end{macrocode} % \end{macro} -% \begin{macro}{\led@error@ImakeidxAfterEledmac} +% \begin{macro}{\led@error@PackageAfterEledmac} % \begin{macrocode} -\newcommand{\led@error@ImakeidxAfterEledmac}{% - \reledmac@error{Imakeidx must be loaded before reledmac.}{\@ehc}% -}% -% \end{macrocode} -% \end{macro} -% \begin{macro}{\led@error@IndextoolsAfterEledmac} -% \begin{macrocode} -\newcommand{\led@error@IndextoolsAfterEledmac}{% - \reledmac@error{Indextools must be loaded before reledmac.}{\@ehc}% +\newcommand{\led@error@PackageAfterEledmac}[1]{% + \reledmac@error{#1 must be loaded before reledmac.}{\@ehc}% }% % \end{macrocode} % \end{macro} @@ -11118,7 +11121,7 @@ \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{% \global\advance\footnote@reading by \@ne% \get@thisfootnote% - \get@fnmark{\thisfootnote}{\thisc@footnote}% + \get@fnmark{\thisc@footnote}% \ifcsdef{footnotereading\the\footnote@reading=typeset}% {\setcounter{\@mpfn}{\csuse{footnotereading\the\footnote@reading=typeset}}}% {\setcounter{\@mpfn}{\footnote@reading}}% @@ -11131,11 +11134,9 @@ \newcommand{\get@thisfootnote}{% \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{% - \protected@xdef\thisfootnote{\the\footnote@reading}% \protected@xdef\thisc@footnote{\the\footnote@reading}% }{% \protected@xdef\thisc@footnote{\the\c@footnote}% - \protected@xdef\thisfootnote{\thefootnote}% }% }% @@ -11147,7 +11148,7 @@ \ifdefined\Hy@footnote@currentHref% \noexpand\def\noexpand\Hy@footnote@currentHref{\Hy@footnote@currentHref}% \fi% - \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}{\thisc@footnote}% + \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisc@footnote}% }% \to\inserts@listR \global\advance\insert@countR \@ne% @@ -11156,7 +11157,7 @@ \ifdefined\Hy@footnote@currentHref% \noexpand\def\noexpand\Hy@footnote@currentHref{\Hy@footnote@currentHref}% \fi% - \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}{\thisc@footnote}% + \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisc@footnote}% }% \to\inserts@list \global\advance\insert@count \@ne% @@ -11164,23 +11165,24 @@ \ignorespaces% }% -\newcommand{\get@fnmark}[2]{% +\newcommand{\get@fnmark}[1]{% \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}% {% \stepcounter{footnote@typeset}% \setcounter{footnote}{\c@footnote@typeset}% \immediate\write\@mainaux{% - \csgdef{footnotereading#2=typeset}{\the\c@footnote@typeset}% + \csgdef{footnotereading#1=typeset}{\the\c@footnote@typeset}% }% \def\@thefnmark{\thefootnote}% }% {% - \@namedef{@thefnmark}{#1}% + \setcounter{footnote}{#1}% + \def\@thefnmark{\thefootnote}% }% }% -\newcommand{\vl@dbfnote}[3]{% - \get@fnmark{#2}{#3}% +\newcommand{\vl@dbfnote}[2]{% + \get@fnmark{#2}% \@footnotetext{#1}% }% % \end{macrocode} @@ -11290,7 +11292,7 @@ % \begin{macrocode} \newcommand*{\mpnormalvfootnoteX}[2]{% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\thisfootnote}{\thisc@footnote}% + \get@fnmarkX{#1}{\thisc@footnote}% \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} @@ -11434,7 +11436,7 @@ \noexpand\led@set@index@fornote{#1}% \noexpand\prepare@edindex@fornote{\l@d@nums}% \unexpanded{\def\this@footnoteX@reading}{\the\csname footnote#1@reading\endcsname}% - \noexpand\vbfnoteX{#1}{#2}{\thisfootnote}{\thisc@footnote}% + \noexpand\vbfnoteX{#1}{#2}{\thisc@footnote}% \noexpand\led@reinit@index@fornote% \unexpanded{\advance\@edindex@fornote@\m@ne}% }% @@ -11451,7 +11453,7 @@ \noexpand\led@set@index@fornote{#1}% \noexpand\prepare@edindex@fornote{\l@d@nums}% \unexpanded{\def\this@footnoteX@reading}{\the\csname footnote#1@reading\endcsname}% - \noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}{\thisc@footnote}% + \noexpand\vbfnoteX{#1}{#2}{\thisc@footnote}% \noexpand\led@reinit@index@fornote% \unexpanded{\advance\@edindex@fornote@\m@ne}% }% @@ -11468,10 +11470,8 @@ % \begin{macrocode} \newcommand{\get@thisfootnoteX}[1]{% \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{% - \protected@xdef\thisfootnote{\the\csname footnote#1@reading\endcsname}% \protected@xdef\thisc@footnote{\the\csname footnote#1@reading\endcsname}% }{% - \protected@xdef\thisfootnote{\csname thefootnote#1\endcsname}% \protected@xdef\thisc@footnote{\the\csname c@footnote#1\endcsname}% }% }% @@ -11481,8 +11481,8 @@ % This command calls the correct footnote-inserting commands. % % \begin{macrocode} -\newcommand{\vbfnoteX}[4]{% - \get@fnmarkX{#1}{#3}{#4}% +\newcommand{\vbfnoteX}[3]{% + \get@fnmarkX{#1}{#3}% \@nameuse{regvfootnote#1}{#1}{#2}% }% @@ -11492,18 +11492,19 @@ % \begin{macro}{\get@fnmarkX} % This command gets the correct footnote number when typesetting parallel texts. % \begin{macrocode} -\newcommand{\get@fnmarkX}[3]{% +\newcommand{\get@fnmarkX}[2]{% \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}% {% \stepcounter{footnote#1@typeset}% \setcounter{footnote#1}{\value{footnote#1@typeset}}% \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}% \immediate\write\@mainaux{% - \csgdef{footnote#1reading#3=typeset}{\the\csname c@footnote#1@typeset\endcsname}% + \csgdef{footnote#1reading#2=typeset}{\the\csname c@footnote#1@typeset\endcsname}% }% }% {% - \@namedef{@thefnmark#1}{#2}% + \setcounter{footnote#1}{#2}% + \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}% }% } % @@ -11518,7 +11519,7 @@ \else \def\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\expandonce\thisfootnote}{\expandonce\thisc@footnote}% + \get@fnmarkX{#1}{\expandonce\thisc@footnote}% \@nameuse{regvfootnote#1}{#1}{#2}% \fi} @@ -11910,7 +11911,7 @@ \egroup} \newcommand*{\mppara@vfootnoteX}[2]{% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\thisfootnote}{\thisc@footnote}% + \get@fnmarkX{#1}{\thisc@footnote}% \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} @@ -15740,10 +15741,13 @@ % \begin{macrocode} \AtBeginDocument{% \unless\ifl@imakeidx% - \@ifpackageloaded{imakeidx}{\led@error@ImakeidxAfterEledmac}{}% + \@ifpackageloaded{imakeidx}{\led@error@PackageAfterEledmac{imakeidx}}{}% \fi% \unless\ifl@indextools% - \@ifpackageloaded{indextools}{\led@error@indextoolsAfterEledmac}{}% + \@ifpackageloaded{indextools}{\led@error@PackageAfterEledmac{indextools}}{}% + \fi% + \unless\ifl@footmisc% + \@ifpackageloaded{footmisc}{\led@error@PackageAfterEledmac{footmisc}}{}% \fi% } % \end{macrocode} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 08f67c5869a..6e6cf89267c 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/10/04 v2.16.1 typesetting critical editions]% +\ProvidesPackage{reledmac}[2016/10/07 v2.16.2 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -133,12 +133,15 @@ \newif\if@ledgroup% \newif\ifl@imakeidx \@ifpackageloaded{imakeidx}{\l@imakeidxtrue}{}%False is the default value + \newif\ifl@indextools% \@ifpackageloaded{indextools}{% \l@indextoolstrue% \l@imakeidxtrue% \let\imki@wrindexentry\indtl@wrindexentry% }{}% +\newif\ifl@footmisc +\@ifpackageloaded{footmisc}{\l@footmisctrue}{}%False is the default value \ifdef{\if@RTL}{}{\newif\if@RTL} \newif\if@firstlineofpage% \newif\if@firstlineofpageR% @@ -276,11 +279,8 @@ \newcommand{\led@err@FootnoteNotInSecondArgEdtext}[1]{% \reledmac@error{#1footnote outside of the second argument of an edtext. Check syntax}{\@ehc}% }% -\newcommand{\led@error@ImakeidxAfterEledmac}{% - \reledmac@error{Imakeidx must be loaded before reledmac.}{\@ehc}% -}% -\newcommand{\led@error@IndextoolsAfterEledmac}{% - \reledmac@error{Indextools must be loaded before reledmac.}{\@ehc}% +\newcommand{\led@error@PackageAfterEledmac}[1]{% + \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}% @@ -3238,7 +3238,7 @@ \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{% \global\advance\footnote@reading by \@ne% \get@thisfootnote% - \get@fnmark{\thisfootnote}{\thisc@footnote}% + \get@fnmark{\thisc@footnote}% \ifcsdef{footnotereading\the\footnote@reading=typeset}% {\setcounter{\@mpfn}{\csuse{footnotereading\the\footnote@reading=typeset}}}% {\setcounter{\@mpfn}{\footnote@reading}}% @@ -3251,11 +3251,9 @@ \newcommand{\get@thisfootnote}{% \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{% - \protected@xdef\thisfootnote{\the\footnote@reading}% \protected@xdef\thisc@footnote{\the\footnote@reading}% }{% \protected@xdef\thisc@footnote{\the\c@footnote}% - \protected@xdef\thisfootnote{\thefootnote}% }% }% @@ -3267,7 +3265,7 @@ \ifdefined\Hy@footnote@currentHref% \noexpand\def\noexpand\Hy@footnote@currentHref{\Hy@footnote@currentHref}% \fi% - \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}{\thisc@footnote}% + \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisc@footnote}% }% \to\inserts@listR \global\advance\insert@countR \@ne% @@ -3276,7 +3274,7 @@ \ifdefined\Hy@footnote@currentHref% \noexpand\def\noexpand\Hy@footnote@currentHref{\Hy@footnote@currentHref}% \fi% - \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisfootnote}{\thisc@footnote}% + \noexpand\vl@dbfnote{{\expandonce\@tag}}{\thisc@footnote}% }% \to\inserts@list \global\advance\insert@count \@ne% @@ -3284,23 +3282,24 @@ \ignorespaces% }% -\newcommand{\get@fnmark}[2]{% +\newcommand{\get@fnmark}[1]{% \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}% {% \stepcounter{footnote@typeset}% \setcounter{footnote}{\c@footnote@typeset}% \immediate\write\@mainaux{% - \csgdef{footnotereading#2=typeset}{\the\c@footnote@typeset}% + \csgdef{footnotereading#1=typeset}{\the\c@footnote@typeset}% }% \def\@thefnmark{\thefootnote}% }% {% - \@namedef{@thefnmark}{#1}% + \setcounter{footnote}{#1}% + \def\@thefnmark{\thefootnote}% }% }% -\newcommand{\vl@dbfnote}[3]{% - \get@fnmark{#2}{#3}% +\newcommand{\vl@dbfnote}[2]{% + \get@fnmark{#2}% \@footnotetext{#1}% }% \newcommand*{\prebodyfootmark}{% @@ -3349,7 +3348,7 @@ \newcommand*{\mpnormalvfootnoteX}[2]{% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\thisfootnote}{\thisc@footnote}% + \get@fnmarkX{#1}{\thisc@footnote}% \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} @@ -3445,7 +3444,7 @@ \noexpand\led@set@index@fornote{#1}% \noexpand\prepare@edindex@fornote{\l@d@nums}% \unexpanded{\def\this@footnoteX@reading}{\the\csname footnote#1@reading\endcsname}% - \noexpand\vbfnoteX{#1}{#2}{\thisfootnote}{\thisc@footnote}% + \noexpand\vbfnoteX{#1}{#2}{\thisc@footnote}% \noexpand\led@reinit@index@fornote% \unexpanded{\advance\@edindex@fornote@\m@ne}% }% @@ -3462,7 +3461,7 @@ \noexpand\led@set@index@fornote{#1}% \noexpand\prepare@edindex@fornote{\l@d@nums}% \unexpanded{\def\this@footnoteX@reading}{\the\csname footnote#1@reading\endcsname}% - \noexpand\vbfnoteX{#1}{#2}{\expandonce\thisfootnote}{\thisc@footnote}% + \noexpand\vbfnoteX{#1}{#2}{\thisc@footnote}% \noexpand\led@reinit@index@fornote% \unexpanded{\advance\@edindex@fornote@\m@ne}% }% @@ -3473,30 +3472,29 @@ \newcommand{\get@thisfootnoteX}[1]{% \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{% - \protected@xdef\thisfootnote{\the\csname footnote#1@reading\endcsname}% \protected@xdef\thisc@footnote{\the\csname footnote#1@reading\endcsname}% }{% - \protected@xdef\thisfootnote{\csname thefootnote#1\endcsname}% \protected@xdef\thisc@footnote{\the\csname c@footnote#1\endcsname}% }% }% -\newcommand{\vbfnoteX}[4]{% - \get@fnmarkX{#1}{#3}{#4}% +\newcommand{\vbfnoteX}[3]{% + \get@fnmarkX{#1}{#3}% \@nameuse{regvfootnote#1}{#1}{#2}% }% -\newcommand{\get@fnmarkX}[3]{% +\newcommand{\get@fnmarkX}[2]{% \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}% {% \stepcounter{footnote#1@typeset}% \setcounter{footnote#1}{\value{footnote#1@typeset}}% \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}% \immediate\write\@mainaux{% - \csgdef{footnote#1reading#3=typeset}{\the\csname c@footnote#1@typeset\endcsname}% + \csgdef{footnote#1reading#2=typeset}{\the\csname c@footnote#1@typeset\endcsname}% }% }% {% - \@namedef{@thefnmark#1}{#2}% + \setcounter{footnote#1}{#2}% + \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}% }% } \newcommand{\vnumfootnoteX}[2]{% @@ -3505,7 +3503,7 @@ \else \def\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\expandonce\thisfootnote}{\expandonce\thisc@footnote}% + \get@fnmarkX{#1}{\expandonce\thisc@footnote}% \@nameuse{regvfootnote#1}{#1}{#2}% \fi} @@ -3775,7 +3773,7 @@ \egroup} \newcommand*{\mppara@vfootnoteX}[2]{% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\thisfootnote}{\thisc@footnote}% + \get@fnmarkX{#1}{\thisc@footnote}% \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} @@ -6098,10 +6096,13 @@ \newif\ifledgroupnotesR@ \AtBeginDocument{% \unless\ifl@imakeidx% - \@ifpackageloaded{imakeidx}{\led@error@ImakeidxAfterEledmac}{}% + \@ifpackageloaded{imakeidx}{\led@error@PackageAfterEledmac{imakeidx}}{}% \fi% \unless\ifl@indextools% - \@ifpackageloaded{indextools}{\led@error@indextoolsAfterEledmac}{}% + \@ifpackageloaded{indextools}{\led@error@PackageAfterEledmac{indextools}}{}% + \fi% + \unless\ifl@footmisc% + \@ifpackageloaded{footmisc}{\led@error@PackageAfterEledmac{footmisc}}{}% \fi% } \newcommand{\pagelinesep}{-} -- cgit v1.2.3