diff options
| author | Karl Berry <karl@freefriends.org> | 2018-02-28 23:46:15 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2018-02-28 23:46:15 +0000 |
| commit | 9e7da4a10152b2d4e13563fd86ec830328532014 (patch) | |
| tree | 812935f0baa5f92ac3a350e6ae34ec291c44e971 | |
| parent | f454682b52ffa2e5948eb3f0c394b1f89a6555a3 (diff) | |
reledmac (28feb18)
git-svn-id: svn://tug.org/texlive/trunk@46767 c570f23f-e606-0410-a88d-b1316a301751
51 files changed, 110 insertions, 44 deletions
diff --git a/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf b/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf Binary files differindex 411ecad2311..9cebf1ed260 100644 --- a/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf Binary files differindex a19063c9f26..0f47e7be9c7 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf Binary files differindex dc00da69435..2d1b2c79d30 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf Binary files differindex 3a90ebd6fb9..711b21445a6 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf Binary files differindex 818003dcb8f..5dffc11d038 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf Binary files differindex 3b669db5218..ff9eede3be3 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf Binary files differindex d0f0dd1d636..874cb758f76 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf 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 Binary files differindex 01400288270..1435f3e2cc1 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf 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 Binary files differindex c16e91b4d1b..41d2f8aed71 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf Binary files differindex 48266d406c5..fc2589bcdcf 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf Binary files differindex 326264f2ae0..ebb1bb07bc2 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf 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 Binary files differindex b8a65aa5564..5ad0ab91358 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf 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 Binary files differindex 6550b95027b..dca98b0dd92 100644 --- 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 diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf Binary files differindex 45a69441eb1..9784da7bb9a 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf 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 Binary files differindex 4aa33fae9c8..df701ac05a9 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf 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 Binary files differindex 8ae228d193f..b89ba8a32c6 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf 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 Binary files differindex ff45f4c6e3c..22ee3c65efd 100644 --- 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 diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf Binary files differindex d0e41b391d4..fb5f89b6d52 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf 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 Binary files differindex 6b09b9a5466..3cd5e0af76d 100644 --- 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 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 Binary files differindex d1e3592c685..5ca30c1d72f 100644 --- 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 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 Binary files differindex 16f6cb0e42f..5938fbe3103 100644 --- 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 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 Binary files differindex 17b6ec00223..40c6295fbec 100644 --- 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 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 Binary files differindex beefc5de67f..3a8be6a4df6 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf 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 Binary files differindex 9ba2b6e1a54..787e440590b 100644 --- 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 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 Binary files differindex 1b0acc4f5ee..c69724dde2b 100644 --- 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 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 Binary files differindex a66008579cc..4fa59955833 100644 --- 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 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 Binary files differindex cbe92a9a55d..610e3cf486c 100644 --- 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 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 Binary files differindex bf668970537..a2940e9c29a 100644 --- 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 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 Binary files differindex 57069a52bea..d1c7fc54ecd 100644 --- 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 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 Binary files differindex ba82cbd4758..3bd0de22a5b 100644 --- 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 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 Binary files differindex dadc4565ec4..0b6aff0cd3b 100644 --- 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 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 Binary files differindex 81e8155b0b1..977d773a448 100644 --- 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 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 Binary files differindex 0b3c4294746..5c14b3a31fe 100644 --- 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 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 Binary files differindex 7481bdfb3f9..52c932b46b1 100644 --- 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 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 Binary files differindex 6c93848f1d9..3ef3c8665c9 100644 --- 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 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 Binary files differindex 4d145e30f22..449a690fe71 100644 --- 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 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 Binary files differindex dd9a5b54d55..dba4d2eefcc 100644 --- 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 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 Binary files differindex 503d228484c..03fafeb2f14 100644 --- 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 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 Binary files differindex f724346fc09..9ced627353b 100644 --- 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 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 Binary files differindex e4f330598cf..85da4547563 100644 --- 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 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 Binary files differindex 4096aeace7e..637c72e5fa0 100644 --- 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 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 Binary files differindex 668b0179572..fbe341f2f93 100644 --- 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 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 Binary files differindex 6dc4bff4bba..844c6c2a3f9 100644 --- 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 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 Binary files differindex 60a08eeedfa..3bbe7430cda 100644 --- 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 diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf Binary files differindex 28c3a566b6b..51c8d8cba18 100644 --- a/Master/texmf-dist/doc/latex/reledmac/migration.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/migration.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf Binary files differindex 6ca372eaa08..090a529225e 100644 --- a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf Binary files differindex 05ba2cac97e..75744b20eec 100644 --- a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index 01d28e59495..52886e74712 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -504,6 +504,7 @@ % \changes{v2.26.5}{2018/01/28}{Check that users have a enough recent version of \protect\package{xparse}} % \changes{v2.26.5}{2018/01/18}{Fix bug when using \protect\cs{eledsection} with the \protect\option{continuousnumberingwithcolumns} of \protect\parpackage} % \changes{v2.26.5}{2018/01/28}{Fix bug with \protect\option{continuousnumberingwithcolumns}} +% \changes{v2.26.6}{2018/02/28}{Fix bug with \protect\cs{lineation} by page and nexted \protect\cs{edtext} between two pages (added in v.~2.24.0)} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -3439,6 +3440,8 @@ % Note that the file \verb+.idx+ will contain the right reference only after the third run, because of the internal indexing mechanism of \protect\macpackage. % That means you must first run (Xe/Lua)\LaTeX three times, then run \verb+makeindex+, and then finally run (Xe/Lua)\LaTeX\ again, in order to get an index with the right page numbers. % +% Also note that using \cs{edtext} in familiar footnotes refers to the line where the footnotes are called +% \subsection{Use with \package{imakeidx} or \package{indextools}} % If the \protect\package{imakeidx} or \protect\package{indextools} package is used then the macro takes an optional % argument, which is the name of a raw index file. For example % |\edindex[line]{item}| will use |line.idx| as the raw file instead of @@ -3453,7 +3456,6 @@ % \item Declare the index with the macro \cs{makeindex} of \package{imakeidx} and \package{indextools}. % \end{enumerate} % -% Also note that using \cs{edtext} in familiar footnotes refers to the line where the footnotes are called % \subsection{Referring to critical notes} % If you want to refer to a word inside an % \protect\cs{edtext}\marg{lemma}\marg{app} command, \protect\cs{edindex} should be defined inside @@ -4181,7 +4183,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2018/01/28 v2.26.5 typesetting critical editions]% +\ProvidesPackage{reledmac}[2018/02/28 v2.26.6 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -5089,6 +5091,7 @@ \global\sub@lock \z@ \global\sublines@false \global\let\next@page@num=\relax + \global\let\this@section@next@page@num=\relax% \global\let\sub@change=\relax \global\last@page@num=-10000% \ifdefined\line@numR% @@ -5122,6 +5125,13 @@ \ifnum\l@dnumpstartsL=0% \led@err@NumberingWithoutPstart% \fi% +% \end{macrocode} +% For the continuousnumberingwithcolumn options, we need to store some value globally, for the next \cs{endnumbering}. +% We didn't modify this counter globally, because that creates problem for nested \cs{edtext}. +% \begin{macrocode} + \global\page@num=\this@section@page@num% + \global\last@page@num=\this@section@last@page@num% + \global\let\next@page@num\this@section@next@page@num% \ifl@dpairing \global\pst@rtedLfalse \else @@ -5159,14 +5169,14 @@ % show that numbering continues across the gap.\footnote{Peter Wilson's thanks % to Wayne Sullivan,\index{Sullivan, Wayne} who suggested the idea % behind these macros.} -% The \cs{pausenumbering@page@num} counter stores the \cs{next@page@num} when the \cs{pause@numbering} is called. +% The \cs{pausenumbering@page@num} counter stores the \cs{this@section@next@page@num} when the \cs{pause@numbering} is called. % \begin{macrocode} \newcount\pausenumbering@page@num% \newcommand{\pausenumbering}{% - \ifx\next@page@num\relax% + \ifx\this@section@next@page@num\relax% \global\pausenumbering@page@num=0% \else% - \global\pausenumbering@page@num=\next@page@num% + \global\pausenumbering@page@num=\this@section@next@page@num% \fi% \ifautopar\global\autopar@pausetrue\fi% \endnumbering\global\numberingtrue} @@ -6006,7 +6016,12 @@ % \end{macro} % \end{macro} % \end{macro} -% +% \begin{macro}{\this@section@page@num} +% The \cs{this@section@page@num} stores the page number of the on which a numbering section finish. +% \begin{macrocode} +\newcount\this@section@page@num% +% \end{macrocode} +% \end{macro} % \begin{macro}{\ifnoteschanged@} % \begin{macro}{\noteschanged@true} % \begin{macro}{\noteschanged@false} @@ -6273,7 +6288,7 @@ % these to the macro. It is now: \\ % \protect\cs{@nl}\marg{page counter number}\marg{printed page number} \\ % We do not (yet) use the printed number (i.e., the \protect\cs{thepage}) but -% it may come in handy later. The macro \protect\cs{fix@page} checks if a new +% it may come in handy later. The macro \cs{@page} checks if a new % page has started. % % Exactly what \protect\cs{@nl} does depends @@ -6283,12 +6298,11 @@ % \changes{v0.3.0}{2004/02/14}{Added a bunch of code to \protect\cs{@nl} for handling % \protect\cs{setlinenum}} % \changes{v0.6.0}{2004/11/16}{Extended \protect\cs{@nl} to include the page number} -% \changes{v0.6.0}{2004/11/16}{Added \protect\cs{fix@page} to \protect\cs{@nl}} % \changes{v0.7.0}{2005/02/22}{Added \protect\cs{@nl@reg}} % \begin{macrocode} \newcommand*{\@nl}[2]{% - \fix@page{#1}% + \@page{#1}% \ifledRcol% \@nl@regR% \else% @@ -6361,15 +6375,18 @@ % % % \begin{macro}{\last@page@num} -% \begin{macro}{\fix@page} -% \protect\cs{fix@page} basically replaces \protect\cs{@page}. It determines whether or not +% \begin{macro}{\this@section@last@page@num} +% \begin{macro}{\@page} +% \protect\cs{@page} determines whether or not % a new page has been started, based on the page values held by \protect\cs{@nl}. -% \changes{v0.6.0}{2004/11/16}{Added \protect\cs{last@page@num} and \protect\cs{fix@page}} % \begin{macrocode} \newcount\last@page@num \last@page@num=-10000 + +\newcount\this@section@last@page@num% + \this@section@last@page@num=-10000% -\newcommand*{\fix@page}[1]{% +\newcommand*{\@page}[1]{% \ifledRcol \ifnum #1=\last@page@numR \else @@ -6389,9 +6406,12 @@ }% \fi% \fi - \global\page@numR=#1% - \global\last@page@numR=#1% - \global\def\next@page@numR{#1}% + \page@numR=#1% + \this@section@page@numR=#1% + \last@page@numR=#1% + \this@section@last@page@numR=#1% + \def\next@page@numR{#1}% + \gdef\this@section@next@page@numR{#1}% \fi \else \ifnum #1=\last@page@num @@ -6400,19 +6420,29 @@ \csnumgdef{@lastline@forpage@\the\page@num}{\the\line@num}% \ifbypage@ \ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum - \line@num \z@ \subline@num \z@% + \line@num \z@% + \subline@num \z@% \global\csdef{reset@line\the\numexpr\absline@num+1\relax @\the\section@num}{}% \fi% \fi - \global\page@num=#1% - \global\last@page@num=#1% - \global\def\next@page@num{#1}% + \page@num=#1% + \global\this@section@page@num=#1% + \last@page@num=#1% + \global\this@section@last@page@num=#1% + \def\next@page@num{#1}% +% \end{macrocode} +% And we set a flag that tells \cs{@nl} that a new page number is +% to be set, because other associated actions shouldn't occur until the +% next line-start occurs. +% \begin{macrocode} + \gdef\this@section@next@page@num{#1}% \listxadd{\normal@page@break}{\the\absline@num} \fi \fi} % \end{macrocode} % \end{macro} % \end{macro} +% \end{macro} % % \begin{macro}{\@pend} % \begin{macro}{\@pendR} @@ -9121,7 +9151,8 @@ {\global\@firstlineofpagetrue}% \ifcsdef{reset@line\the\absline@num @\the\section@num}% {% - \global\line@num=\z@ \global\subline@num=\z@% + \global\line@num=\z@% + \global\subline@num=\z@% \resetprevline@% }% {}% diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index f3f10c08641..9990a9cdf4f 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -327,6 +327,7 @@ % \changes{v2.21.2}{2018/01/08}{Fix bug with \protect\cs{Xpstart} and \protect\cs{edtextlater}} % \changes{v2.21.3}{2018/01/18}{Fix bug when using \protect\cs{numberpstarttrue} and alterning between manual \protect\cs{pstart} and automatic \protect\cs{pstart} produced by \protect\cs{autopar}} % \changes{v2.21.4}{2018/01/18}{Fix bug with using \protect\cs{eledsection} and related when alternate normal typesetting and parallel typesetting} +% \changes{v2.21.5}{2018/01/18}{Compatibility with reledmac v.~2.26.6} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1372,7 +1373,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2018/01/28 v2.21.4 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2018/02/28 v2.21.5 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -1821,6 +1822,7 @@ \global\sub@lockR \z@ \global\sublines@Rfalse \global\let\next@page@numR\relax + \global\let\this@section@next@page@numR\relax% \global\let\sub@change\relax \global\last@page@numR=-10000% \global\stopmsdata@inserted@true% @@ -1873,6 +1875,9 @@ \ifnum\l@dnumpstartsR=0% \led@err@NumberingWithoutPstart% \fi% + \global\page@numR=\this@section@page@numR% + \global\last@page@numR=\this@section@last@page@numR% + \global\let\next@page@numR\this@section@next@page@numR% \ifl@dpairing \global\pst@rtedRfalse \else @@ -1953,10 +1958,10 @@ % \begin{macrocode} \newcount\pausenumbering@page@numR% \newcommand*{\pausenumberingR}{% - \ifx\next@page@numR\relax% + \ifx\this@section@next@page@numR\relax% \global\pausenumbering@page@numR=0% \else% - \global\pausenumbering@page@numR=\next@page@numR% + \global\pausenumbering@page@numR=\this@section@next@page@numR% \fi% \endnumberingR% \global\numberingRtrue% @@ -2446,12 +2451,14 @@ % \end{macro} % % \begin{macro}{\page@numR} -% The right text page number. +% \begin{macro}{\this@section@page@numR} +% The right text page numbers. % \begin{macrocode} \newcount\page@numR - +\newcount\this@section@page@numR% % \end{macrocode} % \end{macro} +% \end{macro} % \subsubsection{Specific to \parpackage} % \begin{macro}{\linesinpar@listL} % \begin{macro}{\linesinpar@listR} @@ -2582,18 +2589,24 @@ % \end{macro} % \end{macro} % \begin{macro}{\last@page@numR} +% \begin{macro}{\this@section@last@page@numR} % \begin{macro}{\fix@page} % \protect\cs{last@page@numR} store the page number of the last right page. -% It is modified by \protect\cs{fix@page}, defined by \reledmac. +% \protect\cs{this@section@last@page@numR} store the page number of the last right page of the current section. Is value is modified globally, contrary to \cs{last@page@numR}. +% Both are modified by \protect\cs{fix@page}, defined by \reledmac. +% % \changes{v2.0.0}{2105/06/28}{\protect\cs{fix@page} is defined only once in \reledmac} % % \begin{macrocode} \newcount\last@page@numR \last@page@numR=-10000 +\newcount\this@section@last@page@numR% + \this@section@last@page@numR=-10000% % \end{macrocode} % \end{macro} % \end{macro} +% \end{macro} % % % \begin{macro}{\@adv} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index c9aa1e66add..1e6b2346737 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}[2018/01/28 v2.26.5 typesetting critical editions]% +\ProvidesPackage{reledmac}[2018/02/28 v2.26.6 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -421,6 +421,7 @@ \global\sub@lock \z@ \global\sublines@false \global\let\next@page@num=\relax + \global\let\this@section@next@page@num=\relax% \global\let\sub@change=\relax \global\last@page@num=-10000% \ifdefined\line@numR% @@ -441,6 +442,9 @@ \ifnum\l@dnumpstartsL=0% \led@err@NumberingWithoutPstart% \fi% + \global\page@num=\this@section@page@num% + \global\last@page@num=\this@section@last@page@num% + \global\let\next@page@num\this@section@next@page@num% \ifl@dpairing \global\pst@rtedLfalse \else @@ -468,10 +472,10 @@ } \newcount\pausenumbering@page@num% \newcommand{\pausenumbering}{% - \ifx\next@page@num\relax% + \ifx\this@section@next@page@num\relax% \global\pausenumbering@page@num=0% \else% - \global\pausenumbering@page@num=\next@page@num% + \global\pausenumbering@page@num=\this@section@next@page@num% \fi% \ifautopar\global\autopar@pausetrue\fi% \endnumbering\global\numberingtrue} @@ -754,6 +758,7 @@ \newcount\endpage@num \newcount\endline@num \newcount\endsubline@num +\newcount\this@section@page@num% \newif\ifnoteschanged@ \newcommand*{\resetprevline@}{% \def\do##1{\global\csundef{prevline##1}}% @@ -842,7 +847,7 @@ }% \newcommand*{\@nl}[2]{% - \fix@page{#1}% + \@page{#1}% \ifledRcol% \@nl@regR% \else% @@ -898,7 +903,10 @@ \newcount\last@page@num \last@page@num=-10000 -\newcommand*{\fix@page}[1]{% +\newcount\this@section@last@page@num% + \this@section@last@page@num=-10000% + +\newcommand*{\@page}[1]{% \ifledRcol \ifnum #1=\last@page@numR \else @@ -918,9 +926,12 @@ }% \fi% \fi - \global\page@numR=#1% - \global\last@page@numR=#1% - \global\def\next@page@numR{#1}% + \page@numR=#1% + \this@section@page@numR=#1% + \last@page@numR=#1% + \this@section@last@page@numR=#1% + \def\next@page@numR{#1}% + \gdef\this@section@next@page@numR{#1}% \fi \else \ifnum #1=\last@page@num @@ -929,13 +940,17 @@ \csnumgdef{@lastline@forpage@\the\page@num}{\the\line@num}% \ifbypage@ \ifx\l@dchset@num\relax%Not resetting if preceded by a \setlinenum - \line@num \z@ \subline@num \z@% + \line@num \z@% + \subline@num \z@% \global\csdef{reset@line\the\numexpr\absline@num+1\relax @\the\section@num}{}% \fi% \fi - \global\page@num=#1% - \global\last@page@num=#1% - \global\def\next@page@num{#1}% + \page@num=#1% + \global\this@section@page@num=#1% + \last@page@num=#1% + \global\this@section@last@page@num=#1% + \def\next@page@num{#1}% + \gdef\this@section@next@page@num{#1}% \listxadd{\normal@page@break}{\the\absline@num} \fi \fi} @@ -2170,7 +2185,8 @@ {\global\@firstlineofpagetrue}% \ifcsdef{reset@line\the\absline@num @\the\section@num}% {% - \global\line@num=\z@ \global\subline@num=\z@% + \global\line@num=\z@% + \global\subline@num=\z@% \resetprevline@% }% {}% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index c9e83f816ff..e4fabf2e8cf 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -28,7 +28,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2018/01/28 v2.21.4 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2018/02/28 v2.21.5 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -203,6 +203,7 @@ \global\sub@lockR \z@ \global\sublines@Rfalse \global\let\next@page@numR\relax + \global\let\this@section@next@page@numR\relax% \global\let\sub@change\relax \global\last@page@numR=-10000% \global\stopmsdata@inserted@true% @@ -242,6 +243,9 @@ \ifnum\l@dnumpstartsR=0% \led@err@NumberingWithoutPstart% \fi% + \global\page@numR=\this@section@page@numR% + \global\last@page@numR=\this@section@last@page@numR% + \global\let\next@page@numR\this@section@next@page@numR% \ifl@dpairing \global\pst@rtedRfalse \else @@ -298,10 +302,10 @@ }% \newcount\pausenumbering@page@numR% \newcommand*{\pausenumberingR}{% - \ifx\next@page@numR\relax% + \ifx\this@section@next@page@numR\relax% \global\pausenumbering@page@numR=0% \else% - \global\pausenumbering@page@numR=\next@page@numR% + \global\pausenumbering@page@numR=\this@section@next@page@numR% \fi% \endnumberingR% \global\numberingRtrue% @@ -533,7 +537,7 @@ \list@create{\actions@listR} \list@create{\annot@listR}% \newcount\page@numR - +\newcount\this@section@page@numR% \list@create{\linesinpar@listL} \list@create{\linesinpar@listR} \list@create{\maxlinesinpar@list} @@ -605,6 +609,8 @@ \newcount\last@page@numR \last@page@numR=-10000 +\newcount\this@section@last@page@numR% + \this@section@last@page@numR=-10000% |