From c2966e2771806280acae359474ea9ce7799776bb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 17 Sep 2020 21:20:04 +0000 Subject: reledmac (17sep20) git-svn-id: svn://tug.org/texlive/trunk@56367 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/reledmac/README.md | 5 ++- .../reledmac/doc-more/page-typesetting-columns.pdf | Bin 40836 -> 40829 bytes .../latex/reledmac/examples/1-criticalendnotes.pdf | Bin 175600 -> 175600 bytes .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 119720 -> 119720 bytes .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 145283 -> 145283 bytes .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 187373 -> 187373 bytes .../reledmac/examples/1-verses-doublenumbering.pdf | Bin 121150 -> 121150 bytes .../doc/latex/reledmac/examples/1-verses.pdf | Bin 121318 -> 121318 bytes .../doc/latex/reledmac/examples/2-antilabe.pdf | Bin 128416 -> 128416 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 120386 -> 120386 bytes .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 123574 -> 123574 bytes .../doc/latex/reledmac/examples/2-glossaries.pdf | Bin 132844 -> 132844 bytes .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 185822 -> 185822 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 122378 -> 122378 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 142433 -> 142433 bytes .../doc/latex/reledmac/examples/2-linespacing.pdf | Bin 136296 -> 136296 bytes .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 156021 -> 156021 bytes .../doc/latex/reledmac/examples/2-notes-width.pdf | Bin 126635 -> 126635 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 131284 -> 131284 bytes .../doc/latex/reledmac/examples/2-performances.pdf | Bin 133738 -> 133738 bytes .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 31049 -> 31056 bytes .../examples/2-subdivision-number-in-header.pdf | Bin 212782 -> 212782 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 188331 -> 188331 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 173338 -> 173338 bytes .../3-reledpar_columns_different_languages.pdf | Bin 23275 -> 23271 bytes .../doc/latex/reledmac/examples/3-reledpar_mwe.pdf | Bin 93085 -> 93085 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 37801 -> 37801 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 135907 -> 135907 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 190089 -> 190058 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 189289 -> 189289 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 168067 -> 168067 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 189852 -> 189695 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 188770 -> 188621 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 188677 -> 188677 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 188808 -> 188808 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 187768 -> 187768 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 132837 -> 132837 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 173906 -> 173906 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 199864 -> 199864 bytes .../examples/4-reledpar_inside-outside-columns.pdf | Bin 123230 -> 123230 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 144326 -> 144326 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 226079 -> 226079 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 124679 -> 124679 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 120874 -> 120874 bytes ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 260966 -> 260966 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 180904 -> 180904 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 116963 -> 116963 bytes Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 356983 -> 356983 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 2004082 -> 2007517 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 989589 -> 988567 bytes .../texmf-dist/source/latex/reledmac/reledmac.dtx | 49 +++++++++++++++++---- .../texmf-dist/source/latex/reledmac/reledpar.dtx | 5 +-- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 37 ++++++++++++---- Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 4 +- 54 files changed, 75 insertions(+), 25 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/reledmac/README.md b/Master/texmf-dist/doc/latex/reledmac/README.md index e23ad45e65f..27f3af27584 100644 --- a/Master/texmf-dist/doc/latex/reledmac/README.md +++ b/Master/texmf-dist/doc/latex/reledmac/README.md @@ -58,8 +58,9 @@ The distribution consists of the following files: # Installation +This package is included in the two main TeX's distribution : TeXLive (and MacTeX) and MikTeX. However, if you want to install it manually : - run: `latex reledmac.ins` (which will generate `reledmac.sty`) and `latex reledpar.ins` (which will generate `reledpar.sty`) -- move `reledmac.sty` and `reledpar.sty` to a location where LaTeX will find it (for more information on this see the FAQ). +- move `reledmac.sty` and `reledpar.sty` to a location where LaTeX will find it (for more information on this see the FAQ of your distribution). To generate a second copy of the manual (which is already supplied as a PDF file): @@ -86,7 +87,7 @@ Maïeul Rouquette is the only one maintainer. To help him in his work, please fo - Download the zip file of the branch (or, if you know Git, go to the branch there): - Go to [the project page](https://github.com/maieul/ledmac/). - Choose the correct branch in the "branch" menu. - - Choose "Download zip" in the "Clone or download" menu, on the right side. + - Choose "Download zip" in the "Code" (green) menu, on the right side. - Unzip the file - Run the `.ins` files with pdflatex, to obtain the `.sty` files. - Put the `.sty` files with your test files (in the same folder). 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 index 0a8f1a4f597..6b85070222b 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf and b/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf index 70eb0fcf9e6..1942baa6085 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf index 78d94863b81..9db09d2ec30 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf index e71ac057a90..6019fc3887d 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf index d2308f501f2..de09baa4a8b 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf index 2f4a6424a74..f00a59297cb 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf index 7dc1310345f..d5099f50f95 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf index 6ad8abb626d..601ba99085b 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf index 4478eb70f64..5b3675f7738 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf index 914e2148b76..9c90f6014aa 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf index d69aa2d5d5f..cb3bee719f2 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf index 61dbcfe94c3..6c2f8ca732a 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf index 35494fe2dc4..342b351d70a 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf index b3b237d1ed5..68fbebaa30d 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf index 05eb7058851..20e27869b93 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf index f4f916a8e3a..54b76efd42e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf index ab821f550df..d94d0ba5347 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf index d6d468e170c..dcff23b484e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf index 867f9273c94..6291ae5384e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf index 7b2e049f36e..30adfc18b55 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf index 82f0696c7b7..70d1483715e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf index f3212b5cf61..38e1031ebb0 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf index a7f456243c3..17405a91ba7 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf index 2ff8b07f711..a532213cf89 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf index 18bffd18c2f..2d458ccfa68 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf index dd7a0cb583b..21967907a98 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf index 7d24d26f349..bec9689f96e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf index b9072668f49..e5e4c2019cb 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf index 75c31447459..a5e01c83fb2 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf index f1b0a91afdc..fbaaed66e04 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf index 1959d313368..c6ac1b4777f 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf index 12bda733c88..04df30bd97d 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf index 8623e289cc8..23cd6eb9a39 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf index 43863c3f59c..6f10539ca2c 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf index 731a816e29e..ebe85f0eb66 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf index aabb96429bb..d37969d5b2e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf index 84ea8b47358..a4a083725b3 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf index 660f345338b..5df84527d4a 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf index bfc981593b5..cccd9f5a8b3 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf index 22854199d4f..9802b9af803 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf index b3ccd178ee8..1e25b68962f 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf index f1eeaddd228..9267d7dad3f 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf index 1154fe4b6e4..17a8918dacd 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf index 8b9084f6266..9247d629803 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf index fd5c0650166..c659eaa383f 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf index f1f6ddc92bc..bc3d4513f6e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf index e278cd02674..93b51e7d461 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/migration.pdf and b/Master/texmf-dist/doc/latex/reledmac/migration.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf index c9d70a57a21..f60cdc1a7a7 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf and b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf index d6db142012a..1e642d79903 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf and b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf differ diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index a2e92f6b3e9..cf019983342 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -563,6 +563,8 @@ % \changes{v2.34.3}{2020/08/19}{Fix bug with \protect\cs{parafootsepX} when the footnotes are called outside of a numbered section.} % \changes{v2.34.3}{2020/08/19}{Fixes incompatibility between Fixes incompatibility between lineation by \protect\cs{pstart} and (a)stanza.} % \changes{v2.34.3}{2020/08/19}{Makes command like \protect\cs{hidenumbering} working at the very beginning of a verse when the first argument of \protect\cs{setstanzaindents} is equal to 0.} +% \changes{v2.34.4}{2020/09/16}{Fix some bugs with lineation by page, when a numbered section starts at the very beginning of page.} +% \changes{v2.34.4}{2020/09/16}{Fix bugs with \protect\cs{parafootsepX} outside of numbered section.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -4403,7 +4405,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2020/08/19 v2.34.3 typesetting critical editions]% +\ProvidesPackage{reledmac}[2020/09/16 v2.34.4 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -5026,6 +5028,20 @@ }% % \end{macrocode} % \end{macro} +% \begin{macro}{\led@error@fail@patch@setcounter} +% \begin{macrocode} +\newcommand{\led@error@fail@patch@setcounter}{% + \reledmac@error{Failed to patch the \string\setcounter\space command}{\@ehc}% +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\led@error@fail@patch@addtocounter} +% \begin{macrocode} +\newcommand{\led@error@fail@patch@addtocounter}{% + \reledmac@error{Failed to patch the \string\addtocounter\space command}{\@ehc}% +}% +% \end{macrocode} +% \end{macro} % \begin{macro}{\led@warn@edinde@outsidenumbering} % \begin{macrocode} \newcommand{\led@warn@edinde@outsidenumbering}{% @@ -6694,9 +6710,9 @@ \fi% \fi \page@numR=#1% - \this@section@page@numR=#1% + \global\this@section@page@numR=#1% \last@page@numR=#1% - \this@section@last@page@numR=#1% + \global\this@section@last@page@numR=#1% \def\next@page@numR{#1}% \gdef\this@section@next@page@numR{#1}% \fi @@ -7344,7 +7360,7 @@ % It is written in the file list. % If we process a line-list file which used a older version, that means the commands used inside are deprecated, and we can't use them. % \begin{macrocode} -\newcommand{\this@line@list@version}{7}% +\newcommand{\this@line@list@version}{8}% % \end{macrocode} % \end{macro} % \begin{macro}{\line@list@stuff} @@ -7432,7 +7448,6 @@ % \changes{v0.6.0}{2004/11/16}{Extended \protect\cs{new@line} to output page numbers} % \begin{macrocode} \newcommand*{\new@line}{% - \set@this@c@page% \ifnumberline% \IfStrEq{\led@pb@setting}{after}% {\xifinlist{\the\absline@num}{\l@prev@nopb}% @@ -13667,11 +13682,15 @@ {\csuse{parafootsepX@#1}}% {}% \global\csname prevpage#1@num\endcsname=\page@num% - \else% - \ifnumequal{\csuse{prevpage#1@num}}{\c@page}% + \else%We can't use directly the page counter, see https://tex.stackexchange.com/a/239457/7712 + \global\expandafter\advance\csname footnote#1@parafootsepX\endcsname by 1% + \edef\@tmpa{parafootsepX@#1@\the\csname footnote#1@parafootsepX\endcsname}% + \expandafter\edlabel\expandafter{\@tmpa}% + \edef\@tmpb{\expandafter\xpageref\expandafter{\@tmpa}}% + \IfStrEq{\csuse{prevpage#1@num}}{\@tmpb}% {\csuse{parafootsepX@#1}}% {}% - \global\csname prevpage#1@num\endcsname=\c@page% + \global\cslet{prevpage#1@num}{\@tmpb}% \fi% \fi% } @@ -15055,6 +15074,7 @@ % \begin{macrocode} \expandafter\newcount\csname prevpage#1@num\endcsname% \expandafter\newcount\csname prevpage#1@numR\endcsname% + \expandafter\newcount\csname footnote#1@parafootsepX\endcsname%For the case we use \parafootsepX outside of numbered section % \end{macrocode} % Add \cs{let}\cs{footnoteX}\cs{@gobble} to \cs{no@expands}. % \begin{macrocode} @@ -16224,9 +16244,10 @@ % \end{macro} % \begin{macro}{\@outputpage} % As its name says, \cs{@outputpage} is a \LaTeX\ macro called in the output routine. It is this macro which increases the \verb+page+ counter. -% We patch it in order to increase, conditionally, the \verb+par@page+ counter. +% We patch it in order to increase, conditionally, the \verb+par@page+ counter, and to set correctly the page number send to the auxiliaries file (\verb+.1+, \verb+.2+, etc.). % \begin{macrocode} \AtBeginDocument{% + \set@this@c@page% \apptocmd{\@outputpage}{% \ifsameparallelpagenumber% \ifl@dprintingpages% @@ -16243,6 +16264,16 @@ {}% {\led@error@fail@patch@@outputpage}% }% +\apptocmd{\setcounter}{% + \IfStrEq{#1}{page}{\set@this@c@page}{}% + }% + {}% + {\led@error@fail@patch@setcounter}% +\apptocmd{\addtocounter}{% + \IfStrEq{#1}{page}{\set@this@c@page}{}% + }% + {}% + {\led@error@fail@patch@addtocounter}% % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index bc15113c887..e084103eafe 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -345,6 +345,7 @@ % \changes{v2.24.0}{2020/05/31}{Add antilabe feature.} % \changes{v2.24.1}{2020/08/19}{Makes \protect\cs{numberstantzatrue} working with \protect\env{astanza}.} % \changes{v2.24.1}{2020/08/19}{Fixes incompatibility between lineation by \protect\cs{pstart} and (a)stanza.} +% \changes{v2.24.2}{2020/09/16}{Fix some bugs with lineation by page, when a numbered section starts at the very beginning of page.} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1400,7 +1401,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2020/08/19 v2.24.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2020/09/16 v2.24.2 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -3034,7 +3035,6 @@ % line-list file, to mark the start of a new text line. % \begin{macrocode} \newcommand*{\new@lineL}{% - \set@this@c@page% \ifnumberline% \write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}% \fi% @@ -3046,7 +3046,6 @@ % line-list file, to mark the start of a new text line. % \begin{macrocode} \newcommand*{\new@lineR}{% - \set@this@c@page% \ifnumberline% \write\linenum@outR{\string\@nl[\the\@this@c@page][\thepage]}% \fi% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index ae2a67ba432..7f57d55875e 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}[2020/08/19 v2.34.3 typesetting critical editions]% +\ProvidesPackage{reledmac}[2020/09/16 v2.34.4 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -335,6 +335,12 @@ \newcommand{\led@error@fail@patch@makeindex}{% \reledmac@error{Failed to patch the \string\makeindex\space command}{\@ehc}% }% +\newcommand{\led@error@fail@patch@setcounter}{% + \reledmac@error{Failed to patch the \string\setcounter\space command}{\@ehc}% +}% +\newcommand{\led@error@fail@patch@addtocounter}{% + \reledmac@error{Failed to patch the \string\addtocounter\space command}{\@ehc}% +}% \newcommand{\led@warn@edinde@outsidenumbering}{% \reledmac@warning{\string\edindex\space called outside of \string\beginnumbering\space ...\space \string\endnumbering. \MessageBreak Automatically switched to \string\index.}% }% @@ -962,9 +968,9 @@ \fi% \fi \page@numR=#1% - \this@section@page@numR=#1% + \global\this@section@page@numR=#1% \last@page@numR=#1% - \this@section@last@page@numR=#1% + \global\this@section@last@page@numR=#1% \def\next@page@numR{#1}% \gdef\this@section@next@page@numR{#1}% \fi @@ -1330,7 +1336,7 @@ \newwrite\linenum@out \newif\iffirst@linenum@out@ \first@linenum@out@true -\newcommand{\this@line@list@version}{7}% +\newcommand{\this@line@list@version}{8}% \let\next@line@list@stuff\relax% \newcommand*{\line@list@stuff}[1]{% \global\newtoggle{notfirstrun@#1}% @@ -1361,7 +1367,6 @@ }% \newcommand*{\new@line}{% - \set@this@c@page% \ifnumberline% \IfStrEq{\led@pb@setting}{after}% {\xifinlist{\the\absline@num}{\l@prev@nopb}% @@ -4586,11 +4591,15 @@ {\csuse{parafootsepX@#1}}% {}% \global\csname prevpage#1@num\endcsname=\page@num% - \else% - \ifnumequal{\csuse{prevpage#1@num}}{\c@page}% + \else%We can't use directly the page counter, see https://tex.stackexchange.com/a/239457/7712 + \global\expandafter\advance\csname footnote#1@parafootsepX\endcsname by 1% + \edef\@tmpa{parafootsepX@#1@\the\csname footnote#1@parafootsepX\endcsname}% + \expandafter\edlabel\expandafter{\@tmpa}% + \edef\@tmpb{\expandafter\xpageref\expandafter{\@tmpa}}% + \IfStrEq{\csuse{prevpage#1@num}}{\@tmpb}% {\csuse{parafootsepX@#1}}% {}% - \global\csname prevpage#1@num\endcsname=\c@page% + \global\cslet{prevpage#1@num}{\@tmpb}% \fi% \fi% } @@ -5510,6 +5519,7 @@ \expandafter\newcount\csname footnote#1@reading\endcsname% \expandafter\newcount\csname prevpage#1@num\endcsname% \expandafter\newcount\csname prevpage#1@numR\endcsname% + \expandafter\newcount\csname footnote#1@parafootsepX\endcsname%For the case we use \parafootsepX outside of numbered section \expandafter\gappto\expandafter\no@expands\expandafter{\expandafter\let\csname footnote#1\endcsname\@gobble}% \expandafter\newcommand\csname footnote#1mark\endcsname[1][]{% \begingroup% @@ -6243,6 +6253,7 @@ \AtBeginDocument{\par@patch@thepage}% \AtBeginDocument{% + \set@this@c@page% \apptocmd{\@outputpage}{% \ifsameparallelpagenumber% \ifl@dprintingpages% @@ -6259,6 +6270,16 @@ {}% {\led@error@fail@patch@@outputpage}% }% +\apptocmd{\setcounter}{% + \IfStrEq{#1}{page}{\set@this@c@page}{}% + }% + {}% + {\led@error@fail@patch@setcounter}% +\apptocmd{\addtocounter}{% + \IfStrEq{#1}{page}{\set@this@c@page}{}% + }% + {}% + {\led@error@fail@patch@addtocounter}% \newcounter{par@page}% \setcounter{par@page}{1}% \list@create{\labelref@list} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 25ae14d2533..5adccabeb1c 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}[2020/08/19 v2.24.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2020/09/16 v2.24.2 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -783,13 +783,11 @@ }% \newcommand*{\new@lineL}{% - \set@this@c@page% \ifnumberline% \write\linenum@out{\string\@nl[\the\@this@c@page][\thepage]}% \fi% }% \newcommand*{\new@lineR}{% - \set@this@c@page% \ifnumberline% \write\linenum@outR{\string\@nl[\the\@this@c@page][\thepage]}% \fi% -- cgit v1.2.3