diff options
| author | Karl Berry <karl@freefriends.org> | 2018-11-30 21:51:01 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2018-11-30 21:51:01 +0000 |
| commit | 24748f7503a2f497895f7275c53a40398674f23d (patch) | |
| tree | 8190df725b7f879fc29c2cc8f9ea77d7c1a21fba | |
| parent | 0bd32067cf6f4a5766a35c9230c0d3b6e33fbfff (diff) | |
reledmac (30nov18)
git-svn-id: svn://tug.org/texlive/trunk@49287 c570f23f-e606-0410-a88d-b1316a301751
52 files changed, 122 insertions, 89 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 3f7f46af7e6..7b6e5a090d8 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 3e08018140e..0e1732191d6 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 afb8188014b..2153cd6332b 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 f1034041765..6b8d14d8c74 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 1bf11f2b355..9081e75652a 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 b2ca3cbd3a1..3d7a594836f 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 07241499c69..e1e4afa4fd4 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 6fdd2100996..a987f095b3c 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 78979277766..0a11214c7c3 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 98584658225..8e5504ce1b7 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 c0b56e20c1e..38e98ec7fac 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 7591051f612..3b5de326bf1 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 c3476beac27..aea7368ce4f 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 5f701be63dc..92674d14215 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 5889bb1a05c..dd5ddabe450 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 793549ff794..bb732054850 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 ce493fbf1ad..212ccf3df83 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 6e8dc67028b..448e0d270af 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 3a7d4212b19..d5bf109c524 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 a7053d40d00..a5cc475616c 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 8957f4fff69..fbd7e879622 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 aa1cefcd77f..d6f3da73efe 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 4460ecab7c2..5d6374c5a00 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 fb0b3ee4801..7ec604002fd 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 17ea616f002..9abeab75d0b 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 404827632a6..5cf3e8bda33 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 97337ff3fda..d76873dd1a4 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 c1ffcd501f8..d92cd781dce 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 03828fe212a..b902113b5fc 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 c41b0540919..bcdba7a63d4 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 8b7ad96c196..515421bdbdd 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 ea38a00e732..fabdadb52fb 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 27de19c084f..609d078938f 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 0d015ab44c7..1a666c31370 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 8a1bb612118..354d29b9c54 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 fa17690fac0..589411622a5 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 bf8f7567bd4..0794fd900e5 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 91b03517ddc..2657ce68434 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 e4f00fb3955..57d0560a958 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 915a479c7ae..672c6f795fb 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 4b9ef3c8307..b242491fdfd 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 663291de64d..813dc5e7e04 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 512ff9e50f6..3845773d573 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 f13be4595c7..731047ba73e 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 d770037cdb0..2c7ba4b6fa5 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/examples/makefile b/Master/texmf-dist/doc/latex/reledmac/examples/makefile index 8972a102292..7bebbcb0f43 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/makefile +++ b/Master/texmf-dist/doc/latex/reledmac/examples/makefile @@ -8,7 +8,7 @@ all:$(OBJ) PDF:$(OBJ) -%.test: %.pdf +%.test: %.pdf python3 check-example.py --filename=$< %.pdf: %.tex diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf Binary files differindex 12729c34348..d23240f121c 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 eb151b3f704..d4008fa9e24 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 b8630eba49a..5546f02dd4f 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 cf8f4e10485..d4650a858ab 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -516,6 +516,7 @@ % \changes{v2.26.12}{2018/07/19}{Precise minimal version of xparse package required.} % \changes{v2.27.0}{2018/09/13}{Add \protect\cs{doinsidethislinehook}.} % \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.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -986,10 +987,10 @@ % \setcounter{pstart}{value} % \end{verbatim} % On each \protect\cs{beginnumbering} the numbering restarts. -% \changes{v0.15.0}{2012/06/11}{Possibility to print \protect\cs{pstart} number inside.} +% \changes{v0.15.0}{2012/06/11}{Possibility to print \protect\cs{pstart} number in the sides of the text.} % % \DescribeMacro{\sidepstartnumtrue} -% With the \protect\cs{sidepstartnumtrue} command, the number of \protect\cs{pstart} will be printed inside. +% With the \protect\cs{sidepstartnumtrue} command, the number of \protect\cs{pstart} will be printed in the sides of the text. % In this case, the line number will be not printed. % % \changes{v1.1.0}{2012/09/25}{Add \protect\cs{labelpstarttrue}.} @@ -1931,7 +1932,11 @@ % name whereas the critical footnotes have the series letter at the start % of the name. % -% +% The footnote can take a first optional argument to manually define the footnote number or footnote symbol. +% For example: +% \begin{verbatim} +% \footnoteA[22]{This footnote will be numbered 22} +% \end{verbatim} % \subsubsection{Customizing mark} % \DescribeMacro{\thefootnoteA} % \DescribeMacro{\bodyfootmarkA} @@ -4216,7 +4221,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2018/10/12 v2.27.1 typesetting critical editions]% +\ProvidesPackage{reledmac}[2018/11/30 v2.28.0 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -12481,10 +12486,14 @@ % \begin{macro}{\mpnormalvfootnoteX} % The minipage version. % \begin{macrocode} -\newcommand*{\mpnormalvfootnoteX}[2]{% +\newcommand*{\mpnormalvfootnoteX}[3]{% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\thisc@footnote}% - \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% + \get@fnmarkX{#1}{\thisc@footnote}{#3}% + \ifstrempty{#3}{% + \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% + }{% + \edef\this@footnoteX@reading{###3}% + }% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} \noindent\csuse{bhooknoteX@#1}% @@ -12612,9 +12621,10 @@ % \begin{macro}{\normalbfnoteX} % \changes{v0.7.0}{2005/02/18}{Removed extraneous space from \protect\cs{normalbfnoteX}} % \changes{v1.4.9}{2013/07/10}{Allow to redefine \protect\cs{thefootnoteX} with \c{alph} when some packages are loaded.} +% \#1 = footnote series, \#2 = footnote content, \#3 manual footnote number % \begin{macrocode} -\newcommand{\normalbfnoteX}[2]{% +\newcommand{\normalbfnoteX}[3]{% \get@thisfootnoteX{#1}% \ifledRcol% \ifluatex @@ -12627,7 +12637,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}{\thisc@footnote}% + \noexpand\vbfnoteX{#1}{#2}{\thisc@footnote}{#3}% \noexpand\led@reinit@index@fornote% \unexpanded{\advance\@edindex@fornote@\m@ne}% }% @@ -12644,7 +12654,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}{\thisc@footnote}% + \noexpand\vbfnoteX{#1}{#2}{\thisc@footnote}{#3}% \noexpand\led@reinit@index@fornote% \unexpanded{\advance\@edindex@fornote@\m@ne}% }% @@ -12670,50 +12680,56 @@ % \end{macro} % \begin{macro}{\vbfnoteX} % This command calls the correct footnote-inserting commands. -% +% \#1 footnote serie, \#2 footnote content, \#3 footnote counter, \#4 manuel footnote mark % \begin{macrocode} -\newcommand{\vbfnoteX}[3]{% - \get@fnmarkX{#1}{#3}% +\newcommand{\vbfnoteX}[4]{% + \get@fnmarkX{#1}{#3}{#4}\relax% \@nameuse{regvfootnote#1}{#1}{#2}% }% - % \end{macrocode} % \end{macro} % % \begin{macro}{\get@fnmarkX} % This command gets the correct footnote number when typesetting parallel texts. +% \#1 footnote series, \#2 footnote counter, \#3 manuel footnote number % \begin{macrocode} -\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#2=typeset}{\the\csname c@footnote#1@typeset\endcsname}% - }% - }% - {% - \setcounter{footnote#1}{#2}% - \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}% - }% -} +\newcommand{\get@fnmarkX}[3]{% + \ifstrempty{#3}{% + \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#2=typeset}{\the\csname c@footnote#1@typeset\endcsname}% + }% + }% + {% + \setcounter{footnote#1}{#2}% + \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}% + }% + }% + {% + \csdef{@thefnmark#1}{#3}% + }% +}% % % \end{macrocode} % \end{macro} % \begin{macro}{\vnumfootnoteX} % \changes{v0.7.0}{2005/02/18}{Removed extraneous space from \protect\cs{vnumfootnoteX}} +% \#1 footnote series, \#2 footnote content, \#3 manual footnote mark % \begin{macrocode} -\newcommand{\vnumfootnoteX}[2]{% + +\newcommand{\vnumfootnoteX}[3]{% \ifnumberedpar@ - \edtext{}{\normalbfnoteX{#1}{#2}}% + \edtext{}{\normalbfnoteX{#1}{#2}{#3}}% \else \def\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\expandonce\thisc@footnote}% + \get@fnmarkX{#1}{\expandonce\thisc@footnote}{#3}% \@nameuse{regvfootnote#1}{#1}{#2}% \fi} - % \end{macrocode} % \end{macro} % @@ -13101,9 +13117,9 @@ \box0 \penalty0 \egroup} -\newcommand*{\mppara@vfootnoteX}[2]{% +\newcommand*{\mppara@vfootnoteX}[3]{% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\thisc@footnote}% + \get@fnmarkX{#1}{\thisc@footnote}{#3}% \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} @@ -14458,10 +14474,10 @@ % Note the double \# in command: it is because a command is called inside another command. % \begin{macrocode} - \global\expandafter\newcommand\csname footnote#1\endcsname[1]{% + \global\expandafter\newcommand\csname footnote#1\endcsname[2][]{% \begingroup% \prepare@prenotesX{#1}% - \newcommand{\content}{##1}% + \newcommand{\content}{##2}% % \end{macrocode} % If we use the \cs{csquotes} package, we reset the quotation level. % \begin{macrocode} @@ -14471,15 +14487,18 @@ % \end{macrocode} % If we are preparing parallel typesetting, we cannot just increase the footnote counter. % Read \parpackage's handbook about that (\reff{reledpar-familiarfootnotenumber}). +% If we have manual footnote mark, use it. % \begin{macrocode} \global\expandafter\advance\csname footnote#1@reading\endcsname by \@ne% - \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{% - \ifcsdef{footnote#1reading\the\csname footnote#1@reading\endcsname=typeset}% - {\setcounter{footnote#1}{\csuse{footnote#1reading\the\csname footnote#1@reading\endcsname=typeset}}}% - {\setcounter{footnote#1}{\the\csname footnote#1@reading\endcsname}}% - }{% - \stepcounter{footnote#1}% - }% + \ifstrempty{##1}{% + \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{% + \ifcsdef{footnote#1reading\the\csname footnote#1@reading\endcsname=typeset}% + {\setcounter{footnote#1}{\csuse{footnote#1reading\the\csname footnote#1@reading\endcsname=typeset}}}% + {\setcounter{footnote#1}{\the\csname footnote#1@reading\endcsname}}% + }{% + \stepcounter{footnote#1}% + }% + }{}% % \end{macrocode} % We also have to check consistency with \cs{onlysideX} setting. % \begin{macrocode} @@ -14491,7 +14510,9 @@ % \end{macrocode} % And now, the feature not depending of wether we are preparing parallel typesetting % \begin{macrocode} - \protected@csxdef{@thefnmark#1}{\csuse{thefootnote#1}}% + \ifstrempty{##1}% + {\protected@csxdef{@thefnmark#1}{\csuse{thefootnote#1}}}% + {\protected@csxdef{@thefnmark#1}{##1}}% \nottoggle{nomk@}%Nomk is set to true when using \footnoteXnomk with \parpackage {\csuse{@footnotemark#1}}% {}% @@ -14502,7 +14523,7 @@ \if@ledgroup% \led@set@index@fornote{#1}% \fi% - \csuse{vfootnote#1}{#1}{\expandonce\content}\m@mmf@prepare% + \csuse{vfootnote#1}{#1}{\expandonce\content}{##1}\m@mmf@prepare% \ifbool{indtl@innote}% {\let\index\orig@@index}% {}% diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index 90c8adf1c4d..909a2f9dd0b 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -1235,7 +1235,7 @@ % treated as zero \protect\cs{sza@0@}' it is because you have forgotten to use % \protect\cs{setstanzaindents} to set the stanza indents. % -% As \env{astanza} is a specify type \cs{pstart}\ldots\cs{pend} structure, you can: +% As \env{astanza} is a specific type of \cs{pstart}\ldots\cs{pend} structure, you can: % \begin{itemize} % \item Add optional argument (in brackets) after \cs{begin}\arg{astanza}, as the optional argument of \cs{pstart}. % \item Use optional argument after the last \expandafter\cs\expandafter{\&} as optional argument of \cs{pend}. diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index c725a1a0238..aa8fe5e2b36 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/10/12 v2.27.1 typesetting critical editions]% +\ProvidesPackage{reledmac}[2018/11/30 v2.28.0 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -3878,10 +3878,14 @@ \spaceskip=\z@skip \xspaceskip=\z@skip \csuse{\csuse{footnote@dir}}\@nameuse{footfmt#1}{#1}{#2}\egroup} -\newcommand*{\mpnormalvfootnoteX}[2]{% +\newcommand*{\mpnormalvfootnoteX}[3]{% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\thisc@footnote}% - \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% + \get@fnmarkX{#1}{\thisc@footnote}{#3}% + \ifstrempty{#3}{% + \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% + }{% + \edef\this@footnoteX@reading{###3}% + }% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} \noindent\csuse{bhooknoteX@#1}% @@ -3963,7 +3967,7 @@ \unvbox\@nameuse{mpfootins#1}} -\newcommand{\normalbfnoteX}[2]{% +\newcommand{\normalbfnoteX}[3]{% \get@thisfootnoteX{#1}% \ifledRcol% \ifluatex @@ -3976,7 +3980,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}{\thisc@footnote}% + \noexpand\vbfnoteX{#1}{#2}{\thisc@footnote}{#3}% \noexpand\led@reinit@index@fornote% \unexpanded{\advance\@edindex@fornote@\m@ne}% }% @@ -3993,7 +3997,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}{\thisc@footnote}% + \noexpand\vbfnoteX{#1}{#2}{\thisc@footnote}{#3}% \noexpand\led@reinit@index@fornote% \unexpanded{\advance\@edindex@fornote@\m@ne}% }% @@ -4009,36 +4013,40 @@ \protected@xdef\thisc@footnote{\the\csname c@footnote#1\endcsname}% }% }% -\newcommand{\vbfnoteX}[3]{% - \get@fnmarkX{#1}{#3}% +\newcommand{\vbfnoteX}[4]{% + \get@fnmarkX{#1}{#3}{#4}\relax% \@nameuse{regvfootnote#1}{#1}{#2}% }% +\newcommand{\get@fnmarkX}[3]{% + \ifstrempty{#3}{% + \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#2=typeset}{\the\csname c@footnote#1@typeset\endcsname}% + }% + }% + {% + \setcounter{footnote#1}{#2}% + \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}% + }% + }% + {% + \csdef{@thefnmark#1}{#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#2=typeset}{\the\csname c@footnote#1@typeset\endcsname}% - }% - }% - {% - \setcounter{footnote#1}{#2}% - \@namedef{@thefnmark#1}{\csuse{thefootnote#1}}% - }% -} -\newcommand{\vnumfootnoteX}[2]{% +\newcommand{\vnumfootnoteX}[3]{% \ifnumberedpar@ - \edtext{}{\normalbfnoteX{#1}{#2}}% + \edtext{}{\normalbfnoteX{#1}{#2}{#3}}% \else \def\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\expandonce\thisc@footnote}% + \get@fnmarkX{#1}{\expandonce\thisc@footnote}{#3}% \@nameuse{regvfootnote#1}{#1}{#2}% \fi} - \newcommand*{\arrangementX@normal}[1]{% \csgdef{series@displayX#1}{normal} \expandafter\let\csname footstart#1\endcsname=\normalfootstartX @@ -4304,9 +4312,9 @@ \box0 \penalty0 \egroup} -\newcommand*{\mppara@vfootnoteX}[2]{% +\newcommand*{\mppara@vfootnoteX}[3]{% \get@thisfootnoteX{#1}% - \get@fnmarkX{#1}{\thisc@footnote}% + \get@fnmarkX{#1}{\thisc@footnote}{#3}% \edef\this@footnoteX@reading{\the\csname footnote#1@reading\endcsname}% \global\setbox\@nameuse{mpfootins#1}\vbox{% \unvbox\@nameuse{mpfootins#1} @@ -5210,27 +5218,31 @@ \expandafter\newinsert\csname mpfootins#1\endcsname% \fi% - \global\expandafter\newcommand\csname footnote#1\endcsname[1]{% + \global\expandafter\newcommand\csname footnote#1\endcsname[2][]{% \begingroup% \prepare@prenotesX{#1}% - \newcommand{\content}{##1}% + \newcommand{\content}{##2}% \ifdefined\csq@qlevel% \csq@qlevel=0\relax% \fi% \global\expandafter\advance\csname footnote#1@reading\endcsname by \@ne% - \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{% - \ifcsdef{footnote#1reading\the\csname footnote#1@reading\endcsname=typeset}% - {\setcounter{footnote#1}{\csuse{footnote#1reading\the\csname footnote#1@reading\endcsname=typeset}}}% - {\setcounter{footnote#1}{\the\csname footnote#1@reading\endcsname}}% - }{% - \stepcounter{footnote#1}% - }% + \ifstrempty{##1}{% + \ifboolexpr{bool{l@dpairing} or bool{l@dprintingpages} or bool{l@dprintingcolumns}}{% + \ifcsdef{footnote#1reading\the\csname footnote#1@reading\endcsname=typeset}% + {\setcounter{footnote#1}{\csuse{footnote#1reading\the\csname footnote#1@reading\endcsname=typeset}}}% + {\setcounter{footnote#1}{\the\csname footnote#1@reading\endcsname}}% + }{% + \stepcounter{footnote#1}% + }% + }{}% \ifledRcol% \ifcsstring{onlysideX@#1}{L}{\led@error@note@called@onrightside{footnote#1}}{}% \else% \ifcsstring{onlysideX@#1}{R}{\led@error@note@called@onleftside{footnote#1}}{}% \fi% - \protected@csxdef{@thefnmark#1}{\csuse{thefootnote#1}}% + \ifstrempty{##1}% + {\protected@csxdef{@thefnmark#1}{\csuse{thefootnote#1}}}% + {\protected@csxdef{@thefnmark#1}{##1}}% \nottoggle{nomk@}%Nomk is set to true when using \footnoteXnomk with \parpackage {\csuse{@footnotemark#1}}% {}% @@ -5241,7 +5253,7 @@ \if@ledgroup% \led@set@index@fornote{#1}% \fi% - \csuse{vfootnote#1}{#1}{\expandonce\content}\m@mmf@prepare% + \csuse{vfootnote#1}{#1}{\expandonce\content}{##1}\m@mmf@prepare% \ifbool{indtl@innote}% {\let\index\orig@@index}% {}% |