diff options
Diffstat (limited to 'Master/texmf-dist')
52 files changed, 164 insertions, 111 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 2c25c4070bc..3bca7d27329 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 8c4a371b5c7..75072a88e90 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 8b843a9fc64..398b2868f56 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 c6f253e6586..a45987b5797 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 18ce201bf59..7403c4863b2 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 e92e19776b6..c46f2b2d7d3 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 eac02160df9..6532deb7e7a 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 73af7a4bd45..7d461faa94f 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 3aecefa6823..4610282eec1 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 588239eeca8..6a726bc1124 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 a9ddf4d6903..09006c29fd4 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 3ac801b202a..2fc33ea33d6 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 beebc62f9b1..919bcd21698 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 d2ec64e2322..5351b6a0f9e 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 70b78d257b7..394efd7ebf0 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 41ea2ec72dd..4c0559eda77 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 89fecc75bf3..0c3ea0fe570 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 600dc3129bc..b862c089b41 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 9483ce777f9..918e6f55f5e 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-subdivision-number-in-header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf Binary files differindex b244e297426..4da5fae0b38 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.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 4373308e439..401bbfe1803 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 e66f5991619..b24a58fe72b 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 06d22c8fdd8..28221d31c73 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 bd62e320d9c..4a24e3c8e9c 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 7120d912c53..1fa7ef3f778 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 fd27a1632c4..1b96eb7754b 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 83e6ed503bb..3492618f611 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 3906939d45b..16a12392e5b 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 1cedca3bbf9..173a9a695cb 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 5ed152a0177..bd3e3a77bcb 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 13ed9d97e27..d4db6267ff0 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 ef2feec33d9..53d9a419c0f 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 e78c79bc934..3b4eebae495 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 a3b3afbc0b9..90ad157e666 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 a6070e7c112..045b93c6709 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 244f73e5e3a..10961e183ea 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 12ec907236c..352a8691adc 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 1a9b340ff17..fce1cbfbd88 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 1b01731be0c..16cd4b499a7 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 a36625b6db0..b396db34776 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 3d188cada7f..0fa04355711 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 23ccde8844a..b99dad878ac 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 8eacd026838..bf5a0524f0d 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 6775959072f..8bc6cca55b9 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 ae98b0d7e14..6a15154cb2c 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 060064f5ac2..70bc4707424 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 b2d19e22181..ae89a7bee0d 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 80f8f32dde7..dd4e1a2c1f4 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 771a9118406..37ebef36ee7 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -493,11 +493,11 @@ % \changes{v2.25.0}{2017/11/05}{Add \protect\cs{Xendtxtbeforenotes} hook} % \changes{v2.26.0}{2017/11/11}{Fix bug in \protect\cs{xpstartref}} % \changes{v2.26.0}{2017/11/11}{Add a mechanism for annotation of stanza line numbering} -% \changes{v2.26.1}{2017/11/26}{Fix bug with \protect\cs{linenumberannotation}} +% \changes{v2.26.1}{2017/11/26}{Fix bug with \protect\cs{linenumannotation}} % \changes{v2.26.2}{2017/12/22}{Fix bug with \protect\cs{Xgroupbyline} and optional argument of critical footnotes.} % \changes{v2.26.2}{2017/12/22}{Fix bug with \protect\cs{Xgroupbyline} for the series after the first one.} % \changes{v2.26.2}{2017/12/22}{Fix bug with \protect\cs{Xgroupbyline} and \protect\cs{Xparafootsep}.} -% \changes{v2.26.2}{2017/11/22}{Fix bug with \protect\cs{linenumberannotation} in parallel typesetting} +% \changes{v2.26.2}{2017/11/22}{Fix bug with \protect\cs{linenumannotation} in parallel typesetting} % \changes{v2.26.3}{2018/01/06}{Fix bug added by v2.26.0 with notes in parallel typesetting} % \changes{v2.26.4}{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.26.5}{2018/01/18}{Fix bug with using \protect\cs{eledsection} and related when alternate normal typesetting and parallel typesetting} @@ -518,6 +518,10 @@ % \changes{v2.27.1}{2018/10/12}{Fix spurious space in \protect\cs{hidenumbering}.} % \changes{v2.28.0}{2018/11/30}{Familiar footnotes can take an optional argument to manually define the footnote mark.} % \changes{v2.28.1}{2018/12/22}{Fix bug with the alignment of the columns of two and three columns critical footnotes.} +% \changes{v2.29.0}{2019/01/08}{Fix bug with \protect\cs{linenumannotation} and `nofamiliar` option.} +% \changes{v2.29.0}{2019/01/08}{Really reset line number annotation at each line} +% \changes{v2.29.0}{2018/01/08}{Add \protect\option{noresetlinenumannotation}} +% \changes{v2.29.0}{2018/01/08}{Fix little bug with \protect\cs{msdata}} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -806,11 +810,12 @@ % \item The option does not change the default \LaTeX auxiliary files (.aux, .toc, \ldots). % \end{enumerate} % \item[eledmac-compat] help to migrate from \eledmac to \reledmac (see \reff{eledmac-compat}). -% \item[swcaseinsensitive] make \cs{sameword} command case insensitive. % \item[nopenalties] must be called in some cases when using paragraphed endnotes (\reff{nopenalties)} % \item[nopbinverse] prevents page break within verse environment. % \item[noquotation] by default, the quotation environment is redefined within numbered text. You can disable this redefinition with \verb|noquotation| (see \reff{noquotation}). +% \item[noresetlinenumannotation] Does not reset the annotations to line number at each line. See \reff{annotation}. % \item[parapparatus] by default, the apparatus cannot contain paragraph breaks; this option enables paragraphing inside the apparatus. +% \item[swcaseinsensitive] make \cs{sameword} command case insensitive. % \item[widthliketwocolumns] set the width of the text printed in a single column to be the same as the width of the text printed in two parallel columns with \parpackage. This is useful when alternating between normal and parallel typesetting. % \item[xindy] and \verb|xindy+hyperref| select \verb+xindy+ as the index processor (\reff{xindy}). % \end{description} @@ -1244,6 +1249,100 @@ % \DescribeMacro{\hidenumberingonleftpage} % \cs{hidenumberingonleftpage} is like \protect{hidenumbering}, but is applied only on left page. \cs{hidenumberingonrightpage} is applied on right page. % They can be useful if the position of the line number is depending of the position of the page, but the position of marginal note is fixed. +% \subsubsection{Adding annotations to line numbers}\label{annotation} +% You may want to have two or more numbers associated with a line of text. +% Consider, for example, the following cases: +% \begin{itemize} +% \item You want to split a line of verse into two parts depending upon some stylistic / rythmic / linguistic convention. +% \item You want to add the line number used by a previous edition of the work. +% \item You want to typeset biblical text, and use division in verse. +% \end{itemize} +% In such instances, you must add the second number manually, as \macpackage\ can't determine a general pattern for such numbering, which depends too heavily upon the edited text.\footnote{However, you may create your own commands dealing with such patterns which will in turn call \macpackage\ commands.} +% +% \DescribeMacro{\linenumannotation} +% To resolve this issue, \macpackage\ allows you to annotate line numbers using the following command: +% \begin{verbatim} +% \linenumannotation{<annotation>} +% \end{verbatim} +% +% The annotation can contain any textual value (whether number, text, or other) such as the line number from the older edition. +% Here are some characteristics of line number annotation: +% \begin{itemize} +% \item An annotation is associated with a line of text. It is reset with each new line of text, except if you use \option{noresetlinenumannotation} option of \macpackage. +% \item It is printed alongside the line number in the margin. +% \item It is printed following the line number in critical footnotes and endnotes. +% \item And of particular interest: the annotation is printed in the critical note \emph{only} when the \cs{edtext} is issued after the \cs{linenumannotation}. +% \item If two or more annotations are called before an \cs{edtext}, the last one is used in associated notes. +% \item If an annotation is called within an \cs{edtext}, it is printed as an annotation for the end of the lemma. +% \end{itemize} +% Here is an example, supposing we are on line 1: +% \begin{verbatim} +% \edtext{first lemma} +% \linenumannotation{A} +% \edtext{second lemma}{…} +% \edtext{third% +% \linenumannotation{B} +% lemma}{…} +% \edtext{fourth lemma}& +% \end{verbatim} +% In the critical notes, the line number will be followed +% \begin{itemize} +% \item by nothing in the first lemma, as there is no annotation for this line; +% \item by \enquote{A} for the second lemma; +% \item by \enquote{A-B} for the third lemma, as it starts while annotation A is still in effect and it finishes after annotation B has already taken effect; +% \item by \enquote{B} for the fourth lemma. +% \end{itemize} +% \paragraph{Modifying annotation associated with a specific note}\label{lineannot} +% +% The \cs{linenum} (\reff{linenum}) macro changes the line number passed to a note. +% \DescribeMacro{\lineannot}The \cs{lineannot} macro does the same for the annotations. +% It takes one argument, containing the beginnning and ending annotations separated by a pipe (\verb+|+). +% As with \cs{linenum}, if one wishes to change some specific part of the annotation, one can use +% \begin{verbatim} +% \lineannot{|b}% to change the ending annotation +% \lineannot{a|}% to change the beginning annotation +% \lineannot{a|b}% to change both +% \lineannot{\empty|}% to delete the beginning annotation +% \end{verbatim} +% \paragraph{Changing the position of the annotation}\label{annotationposition} +% By default, annotations are placed after line numbers in both margin and footnote. +% +% \DescribeMacro{\Xlinenumannotationposition} +% \DescribeMacro{\Xendlinenumannotationposition} +% To change this behaviour, one can use one of the following commands: +% \begin{itemize} +% \item \cs{Xlinenumannotationposition}\oarg{s}\marg{v} changes the position in critical footnotes with \meta{s} for the series of footnotes to which it applies, where \meta{s} may be a comma-separated list of series. When \meta{s} is empty, the change applies also to annotations at the sides of the page, alongside the line number. +% \item \cs{Xlinenumannotationpositionside}\marg{v} changes the position at the sides of the page, alongside the line numbers. +% +% Note that \cs{Xlinenumannotationposition} without any optional argument will override this setting. +% \item \cs{Xendlinenumannotationposition}\oarg{s}\marg{v} changes the position in critical endnotes, +% \meta{s} for the series of endnotes to which it applies, where \meta{s} may once again be a comma-separated list of series. +% \end{itemize} +% In each of these three commands, \meta{v} can be \option{after} or \option{before} to indicate position with regards to the line number. +% \paragraph{Changing the macro in which annotations are wrapped}\label{wraplinenumannotation} +% By default, annotations are wrapped in the \cs{textsuperscript} macro. +% You can modify this using one of the following: +% \begin{itemize} +% \item \cs{Xwraplinenumannotation}\oarg{s}\marg{cmd} for critical footnotes; \meta{s} indicates the series of notes to which it applies and may be a comma-separated list of series. +% When \meta{s} is empty, the change applies to the annotations in the margins also---around the line number---as well as to the annotations referenced using the \cs{annotationref} command of the crossref mechanism (\reff{crossref}). +% \item \cs{Xwraplinenumannotationside}\marg{cmd} for annotations in the margins only. +% +% Note that \cs{Xwraplinenumannotation} without any optional argument will override this setting. +% \item \cs{Xwraplinenumannotationref}\marg{cmd} for annotations referenced using the \cs{annotationref} command of the crossref mechanism (\reff{crossref}). +% +% Note that \cs{Xwraplinenumannotation} without any optional argument will override this setting. +% \item \cs{Xendwraplinenumannotation}\oarg{s}\marg{cmd} for critical endnotes, where \meta{s} indicates the series of notes to which it applies, which may be a comma-separated list. +% \end{itemize} +% \meta{cmd} is a command which can take one argument; the backslash is required though. +% +% For example, if you do not wish to have annotations in the margins, but do want to have them in bold in the critical footnotes and endnotes, you say:\footnote{The \cs{@gobble} command takes one argument, and returns nothing.} +% \begin{verbatim} +% \makeatletter +% \Xwraplinenumannotation{\textbf} +% \Xendwraplinenumannotation{\textbf} +% \Xwraplinenumannotationside{\@gobble} +% \makeatother +% \end{verbatim} % \subsection{Executing code at each line}\label{linehook} % \Macpackage provides an advanced feature for users. % \DescribeMacro{\dolinehook}\DescribeMacro{\doinsidelinehook} @@ -2972,99 +3071,6 @@ % \flagstanza{#1}% %} % \end{verbatim} -% \subsection{Adding annotations to line numbers}\label{annotation} -% You may want to have two or more numbers associated with a line of verse. -% Consider, for example, the following cases: -% \begin{itemize} -% \item You want to split a line of verse into two parts depending upon some stylistic / rythmic / linguistic convention. -% \item You want to add the line number used by a previous edition of the work. -% \end{itemize} -% In such instances, you must add the second number manually, as \macpackage\ can't determine a general pattern for such numbering, which depends too heavily upon the edited text.\footnote{However, you may create your own commands dealing with such patterns which will in turn call \macpackage\ commands.} -% -% \DescribeMacro{\linenumannotation} -% To resolve this issue, \macpackage\ allows you to annotate line numbers using the following command: -% \begin{verbatim} -% \linenumannotation{<annotation>} -% \end{verbatim} -% -% The annotation can contain any textual value (whether number, text, or other) such as the line number from the older edition. -% Here are some characteristics of line number annotation: -% \begin{itemize} -% \item An annotation is associated with a line of verse. It is reset with each new line of verse. -% \item It is printed alongside the line number in the margin. -% \item It is printed following the line number in critical footnotes and endnotes. -% \item And of particular interest: the annotation is printed in the critical note \emph{only} when the \cs{edtext} is issued after the \cs{linenumannotation}. -% \item If two or more annotations are called before an \cs{edtext}, the last one is used in associated notes. -% \item If an annotation is called within an \cs{edtext}, it is printed as an annotation for the end of the lemma. -% \end{itemize} -% Here is an example, supposing we are on line 1: -% \begin{verbatim} -% \edtext{first lemma} -% \linenumannotation{A} -% \edtext{second lemma}{…} -% \edtext{third% -% \linenumannotation{B} -% lemma}{…} -% \edtext{fourth lemma}& -% \end{verbatim} -% In the critical notes, the line number will be followed -% \begin{itemize} -% \item by nothing in the first lemma, as there is no annotation for this line; -% \item by \enquote{A} for the second lemma; -% \item by \enquote{A-B} for the third lemma, as it starts while annotation A is still in effect and it finishes after annotation B has already taken effect; -% \item by \enquote{B} for the fourth lemma. -% \end{itemize} -% \subsubsection{Modifying annotation associated with a specific note} -% -% The \cs{linenum} (\reff{linenum}) macro changes the line number passed to a note. -% \DescribeMacro{\lineannot}The \cs{lineannot} macro does the same for the annotations. -% It takes one argument, containing the beginnning and ending annotations separated by a pipe (\verb+|+). -% As with \cs{linenum}, if one wishes to change some specific part of the annotation, one can use -% \begin{verbatim} -% \lineannot{|b}% to change the ending annotation -% \lineannot{a|}% to change the beginning annotation -% \lineannot{a|b}% to change both -% \lineannot{\empty|}% to delete the beginning annotation -% \end{verbatim} -% \subsubsection{Changing the position of the annotation}\label{annotationposition} -% By default, annotations are placed after line numbers in both margin and footnote. -% -% \DescribeMacro{\Xlinenumannotationposition} -% \DescribeMacro{\Xendlinenumannotationposition} -% To change this behaviour, one can use one of the following commands: -% \begin{itemize} -% \item \cs{Xlinenumannotationposition}\oarg{s}\marg{v} changes the position in critical footnotes with \meta{s} for the series of footnotes to which it applies, where \meta{s} may be a comma-separated list of series. When \meta{s} is empty, the change applies also to annotations at the sides of the page, alongside the line number. -% \item \cs{Xlinenumannotationpositionside}\marg{v} changes the position at the sides of the page, alongside the line numbers. -% -% Note that \cs{Xlinenumannotationposition} without any optional argument will override this setting. -% \item \cs{Xendlinenumannotationposition}\oarg{s}\marg{v} changes the position in critical endnotes, -% \meta{s} for the series of endnotes to which it applies, where \meta{s} may once again be a comma-separated list of series. -% \end{itemize} -% In each of these three commands, \meta{v} can be \option{after} or \option{before} to indicate position with regards to the line number. -% \subsubsection{Changing the macro in which annotations are wrapped}\label{wraplinenumannotation} -% By default, annotations are wrapped in the \cs{textsuperscript} macro. -% You can modify this using one of the following: -% \begin{itemize} -% \item \cs{Xwraplinenumannotation}\oarg{s}\marg{cmd} for critical footnotes; \meta{s} indicates the series of notes to which it applies and may be a comma-separated list of series. -% When \meta{s} is empty, the change applies to the annotations in the margins also---around the line number---as well as to the annotations referenced using the \cs{annotationref} command of the crossref mechanism (\reff{crossref}). -% \item \cs{Xwraplinenumannotationside}\marg{cmd} for annotations in the margins only. -% -% Note that \cs{Xwraplinenumannotation} without any optional argument will override this setting. -% \item \cs{Xwraplinenumannotationref}\marg{cmd} for annotations referenced using the \cs{annotationref} command of the crossref mechanism (\reff{crossref}). -% -% Note that \cs{Xwraplinenumannotation} without any optional argument will override this setting. -% \item \cs{Xendwraplinenumannotation}\oarg{s}\marg{cmd} for critical endnotes, where \meta{s} indicates the series of notes to which it applies, which may be a comma-separated list. -% \end{itemize} -% \meta{cmd} is a command which can take one argument; the backslash is required though. -% -% For example, if you do not wish to have annotations in the margins, but do want to have them in bold in the critical footnotes and endnotes, you say:\footnote{The \cs{@gobble} command takes one argument, and returns nothing.} -% \begin{verbatim} -% \makeatletter -% \Xwraplinenumannotation{\textbf} -% \Xendwraplinenumannotation{\textbf} -% \Xwraplinenumannotationside{\@gobble} -% \makeatother -% \end{verbatim} % \subsection{Various tools} % \DescribeMacro{\ampersand} % If you need to print an \& symbol in a stanza, use the \verb?\ampersand? @@ -3272,7 +3278,7 @@ % % \DescribeMacro{\edlabelE} % Use \cs{edlabelE}\marg{label} to mark the end the end line of the passage. -% These two commands just create to label which are named \meta{label}\verb+:start+ and \meta{label}\verb+:end+. +% These two commands just create two labels which are named \meta{label}\verb+:start+ and \meta{label}\verb+:end+. % % \DescribeMacro{\edlabelSE} % Use \cs{edlabelSE}\marg{label} to mark just one location in the text. Contrary to a classical \cs{edlabel}, the \meta{label} could be use with \cs{SEref} and \cs{SErefwithpage}. @@ -4222,7 +4228,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2019/01/04 v2.28.1a typesetting critical editions]% +\ProvidesPackage{reledmac}[2019/01/08 v2.29.0 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -4244,6 +4250,7 @@ % \begin{macro}{\ifxindy@} % \begin{macro}{\ifxindyhyperref@} % \begin{macro}{\ifeledmaccompat@} +% \begin{macro}{\ifnoresetlinenumannotation@} % Use this to remember which option is used, set and execute the options % with final as the default. % We use \protect\package{xkeyval} in order to manage options with argument. @@ -4332,6 +4339,10 @@ \DeclareOptionX{swcaseinsensitive}{% \sw@caseinsensitivetrue% }% +\newif\ifnoresetlinenumannotation@ +\DeclareOptionX{noresetlinenumannotation}{% + \noresetlinenumannotation@true% +}% % \end{macrocode} % We use the starred form of \protect\cs{ProcessOptionsX} which executes options in % the order listed in the source file: class options, then listed package @@ -4358,6 +4369,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % \subsection{Loading packages} % Loading package \protect\package{xargs} to declare commands with optional arguments. % Loading package \package{xparse} to declare fully expandable commands with optional argument. Ideally, we should use only \package{xparse} and not \package{xargs}. For historical reasons, we use both. @@ -6367,7 +6379,6 @@ } \newcommand*{\@nl@reg}{% \ifx\l@dchset@num\relax \else - \reset@current@annot% \advance\absline@num \@ne \csgdef{l@dchset@num@\the\absline@num}{}%To remember this line have been marked by a \setlinenum \set@line@action @@ -6380,6 +6391,7 @@ % First increment the absolute line-number, and perform % deferred actions relating to page starts and sub-lines. % \begin{macrocode} + \reset@current@annot% \advance\absline@num \@ne \ifx\next@page@num\relax \else \page@action @@ -9488,7 +9500,9 @@ % It resets the annotation of line numbers at each line. % \begin{macrocode} \newcommand{\reset@current@annot}{% - \let\current@annot\empty% + \unless\ifnoresetlinenumannotation@ + \let\current@annot\empty% + \fi }% % \end{macrocode} % \end{macro} @@ -14307,6 +14321,7 @@ \csgdef{Xwraplemma@#1}{} \csgdef{Xwidth@#1}{\hsize}% \csgdef{Xwraplinenumannotation@#1}{\textsuperscript}% + \csgdef{Xlinenumannotationposition@#1}{after}% % \end{macrocode} % \subsubsection{Create inserts, needed to add notes in foot} % As regards inserts, see chapter 15 of \thetexbook\ by D. Knuth. @@ -14470,7 +14485,6 @@ \csgdef{txtbeforenotesX@#1}{}% \newtoggle{txtbeforesnotesX@#1@typeset}%Not directly used by user, but internal \newtoggle{txtbeforenotesonlyonceX@#1}% - \csgdef{Xlinenumannotationposition@#1}{after}% % End of for familiar footnotes. % \subsubsection{Create inserts, needed to add notes in foot} % As regards inserts, see chapter 15 of the TeXBook by D. Knuth. @@ -18531,6 +18545,10 @@ \fi% \csdef{@this@crossref@start}{\add@msd@c:start:msdata}% \csdef{@this@crossref@end}{\add@msd@c:end:msdata}% + \unexpanded{% + \def\annot@start{}% + \def\annot@end{}% + }% \noexpand\csuse{v\@msdata@series footnote}{\@msdata@series}{{\expandonce\l@d@nums}{\ms@data@label}{\expandonce\@data}}% \reset@msd@options@iffullpage% }% @@ -18576,6 +18594,10 @@ \fi% \csdef{@this@crossref@start}{\add@msd@cR:start:msdata}% \csdef{@this@crossref@end}{\add@msd@cR:end:msdata}% + \unexpanded{% + \def\annot@start{}% + \def\annot@end{}% + }% \noexpand\csuse{v\@msdata@series footnote}{\@msdata@series}{{\expandonce\l@d@nums}{\ms@data@label}{\expandonce\@data}}% \reset@msd@options@iffullpage% }% @@ -18637,6 +18659,10 @@ \fi% \csdef{@this@crossref@start}{\add@msd@c:start:msdata}% \csdef{@this@crossref@end}{\add@msd@c:end:msdata}% + \unexpanded{% + \def\annot@start{}% + \def\annot@end{}% + }% \noexpand\csuse{v\@msdata@series footnote}{\@msdata@series}{{\expandonce\l@d@nums}{\ms@data@label}{\expandonce\@data}}% \reset@msd@options@iffullpage% }% @@ -18681,6 +18707,10 @@ \fi% \csdef{@this@crossref@start}{\add@msd@cR:start:msdata}% \csdef{@this@crossref@end}{\add@msd@cR:end:msdata}% + \unexpanded{% + \def\annot@start{}% + \def\annot@end{}% + }% \noexpand\csuse{v\@msdata@series footnote}{\@msdata@series}{{\expandonce\l@d@nums}{\ms@data@label}{\expandonce\@data}}% \reset@msd@options@iffullpage% }% @@ -21037,12 +21067,12 @@ % \section{Auxiliary softwares} % This appendix list some softwares and tools related to \package{reledmac} at that may be useful. % \subsection{\emph{samewords}} -% The \emph{samewords} software (Michael Stenskjær Christensen) automatically add \cs{sameword} commands \ref{sameword} into a \verb+.tex+ file. \\ +% The \emph{samewords} software (Michael Stenskjær Christensen) automatically add \cs{sameword} commands (\reff{sameword}) into a \verb+.tex+ file. \\ % \url{https://samewords.readthedocs.io/en/latest/} % \subsection{critical-keys for \emph{Emacs}} % The \emph{Emacs} editor has a package to help inserting \macpackage's commands (Juan Manuel Macías Chaín).\\ % \url{https://gitlab.com/maciaschain/critical-keys} -% \subsection{TEI} +% \subsection{Import from TEI} % There is multiple tools to convert from XML-TEI to \emph{reledmac}. Here a non exhaustive-list: % \begin{itemize} % \item \url{http://ciham-digital.huma-num.fr/teicat/} diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index ff901b00cdd..951b1e45917 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -335,6 +335,7 @@ % \changes{v2.21.8}{2018/05/02}{Workaround with a bug of \protect\LaTeX 2018/04/01 patch level 3 to generate the .sty file from a .ins file} % \changes{v2.21.9}{2018/07/19}{Fix (little) bug when using \protect\package{calc} package.} % \changes{v2.22.0}{2018/09/13}{Compatibility with \protect\cs{doinsidethislinehook} macro.} +% \changes{v2.22.1}{2019/01/08}{Really reset line number annotation at each line} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1383,7 +1384,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2018/11/30 v2.22.0a reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2019/01/08 v2.22.1 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -2545,7 +2546,6 @@ % \begin{macrocode} \newcommand{\@nl@regR}{% \ifx\l@dchset@num\relax \else - \reset@current@annot% \advance\absline@numR \@ne \csgdef{l@dchset@num@R\the\absline@numR}{}%To remember this line have been marked by a \setlinenum \set@line@action @@ -2553,6 +2553,7 @@ \advance\absline@numR \m@ne \advance\line@numR \m@ne% % do we need this? \fi + \reset@current@annot% \advance\absline@numR \@ne \ifx\next@page@numR\relax \else \page@action diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index f6f8db75eab..29a0a54bc88 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}[2019/01/04 v2.28.1a typesetting critical editions]% +\ProvidesPackage{reledmac}[2019/01/08 v2.29.0 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -113,6 +113,10 @@ \DeclareOptionX{swcaseinsensitive}{% \sw@caseinsensitivetrue% }% +\newif\ifnoresetlinenumannotation@ +\DeclareOptionX{noresetlinenumannotation}{% + \noresetlinenumannotation@true% +}% \ProcessOptionsX*\relax \RequirePackage{xargs} @@ -866,7 +870,6 @@ } \newcommand*{\@nl@reg}{% \ifx\l@dchset@num\relax \else - \reset@current@annot% \advance\absline@num \@ne \csgdef{l@dchset@num@\the\absline@num}{}%To remember this line have been marked by a \setlinenum \set@line@action @@ -874,6 +877,7 @@ \advance\absline@num \m@ne \advance\line@num \m@ne \fi + \reset@current@annot% \advance\absline@num \@ne \ifx\next@page@num\relax \else \page@action @@ -2339,7 +2343,9 @@ }% \let\current@annot=\empty% \newcommand{\reset@current@annot}{% - \let\current@annot\empty% + \unless\ifnoresetlinenumannotation@ + \let\current@annot\empty% + \fi }% \def\parse@annot#1|#2|{% \gdef\annot@start{#1}% @@ -5089,6 +5095,7 @@ \csgdef{Xwraplemma@#1}{} \csgdef{Xwidth@#1}{\hsize}% \csgdef{Xwraplinenumannotation@#1}{\textsuperscript}% + \csgdef{Xlinenumannotationposition@#1}{after}% \expandafter\newinsert\csname #1footins\endcsname% \unless\ifnoledgroup@% \expandafter\newinsert\csname mp#1footins\endcsname% @@ -5222,7 +5229,6 @@ \csgdef{txtbeforenotesX@#1}{}% \newtoggle{txtbeforesnotesX@#1@typeset}%Not directly used by user, but internal \newtoggle{txtbeforenotesonlyonceX@#1}% - \csgdef{Xlinenumannotationposition@#1}{after}% \expandafter\newinsert\csname footins#1\endcsname% \unless\ifnoledgroup@% \expandafter\newinsert\csname mpfootins#1\endcsname% @@ -7665,6 +7671,10 @@ \fi% \csdef{@this@crossref@start}{\add@msd@c:start:msdata}% \csdef{@this@crossref@end}{\add@msd@c:end:msdata}% + \unexpanded{% + \def\annot@start{}% + \def\annot@end{}% + }% \noexpand\csuse{v\@msdata@series footnote}{\@msdata@series}{{\expandonce\l@d@nums}{\ms@data@label}{\expandonce\@data}}% \reset@msd@options@iffullpage% }% @@ -7710,6 +7720,10 @@ \fi% \csdef{@this@crossref@start}{\add@msd@cR:start:msdata}% \csdef{@this@crossref@end}{\add@msd@cR:end:msdata}% + \unexpanded{% + \def\annot@start{}% + \def\annot@end{}% + }% \noexpand\csuse{v\@msdata@series footnote}{\@msdata@series}{{\expandonce\l@d@nums}{\ms@data@label}{\expandonce\@data}}% \reset@msd@options@iffullpage% }% @@ -7760,6 +7774,10 @@ \fi% \csdef{@this@crossref@start}{\add@msd@c:start:msdata}% \csdef{@this@crossref@end}{\add@msd@c:end:msdata}% + \unexpanded{% + \def\annot@start{}% + \def\annot@end{}% + }% \noexpand\csuse{v\@msdata@series footnote}{\@msdata@series}{{\expandonce\l@d@nums}{\ms@data@label}{\expandonce\@data}}% \reset@msd@options@iffullpage% }% @@ -7804,6 +7822,10 @@ \fi% \csdef{@this@crossref@start}{\add@msd@cR:start:msdata}% \csdef{@this@crossref@end}{\add@msd@cR:end:msdata}% + \unexpanded{% + \def\annot@start{}% + \def\annot@end{}% + }% \noexpand\csuse{v\@msdata@series footnote}{\@msdata@series}{{\expandonce\l@d@nums}{\ms@data@label}{\expandonce\@data}}% \reset@msd@options@iffullpage% }% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 965a5937810..65b0ad8f432 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/11/30 v2.22.0a reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2019/01/08 v2.22.1 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -561,7 +561,6 @@ }% \newcommand{\@nl@regR}{% \ifx\l@dchset@num\relax \else - \reset@current@annot% \advance\absline@numR \@ne \csgdef{l@dchset@num@R\the\absline@numR}{}%To remember this line have been marked by a \setlinenum \set@line@action @@ -569,6 +568,7 @@ \advance\absline@numR \m@ne \advance\line@numR \m@ne% % do we need this? \fi + \reset@current@annot% \advance\absline@numR \@ne \ifx\next@page@numR\relax \else \page@action |