From e8ee5c83e727bc3ba3d2a3d6811a45054564e3a1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 21 Jul 2019 20:51:47 +0000 Subject: reledmac (21jul19) git-svn-id: svn://tug.org/texlive/trunk@51698 c570f23f-e606-0410-a88d-b1316a301751 --- .../reledmac/doc-more/page-typesetting-columns.pdf | Bin 40947 -> 40947 bytes .../latex/reledmac/examples/1-criticalendotes.pdf | Bin 177473 -> 177473 bytes .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 121595 -> 121595 bytes .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 145280 -> 145280 bytes .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 189795 -> 189795 bytes .../reledmac/examples/1-verses-doublenumbering.pdf | Bin 123176 -> 123176 bytes .../doc/latex/reledmac/examples/1-verses.pdf | Bin 123461 -> 123461 bytes .../doc/latex/reledmac/examples/1-verses.tex | 2 +- .../reledmac/examples/2-cross_referencing.pdf | Bin 122255 -> 122255 bytes .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 126043 -> 126043 bytes .../doc/latex/reledmac/examples/2-glossaries.pdf | Bin 18101 -> 18098 bytes .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 187629 -> 187629 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 124322 -> 124322 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 144489 -> 144489 bytes .../doc/latex/reledmac/examples/2-linespacing.pdf | Bin 138403 -> 138403 bytes .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 158107 -> 158107 bytes .../doc/latex/reledmac/examples/2-notes-width.pdf | Bin 128998 -> 128998 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 140521 -> 140521 bytes .../doc/latex/reledmac/examples/2-performances.pdf | Bin 135412 -> 135412 bytes .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 31451 -> 31446 bytes .../examples/2-subdivision-number-in-header.pdf | Bin 215010 -> 215010 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 190220 -> 190220 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 175168 -> 175168 bytes .../3-reledpar_columns_different_languages.pdf | Bin 24286 -> 24283 bytes .../doc/latex/reledmac/examples/3-reledpar_mwe.pdf | Bin 93473 -> 93473 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 37579 -> 37579 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 138220 -> 138220 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 190160 -> 190160 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 189359 -> 189359 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 168096 -> 168096 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 189912 -> 189912 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 188834 -> 188834 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 188743 -> 188743 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 188861 -> 188861 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 189688 -> 189688 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 134813 -> 134813 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 190132 -> 190132 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 201832 -> 201832 bytes .../examples/4-reledpar_inside-outside-columns.pdf | Bin 123598 -> 123598 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 215181 -> 215181 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 239558 -> 239558 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 125081 -> 125081 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 123149 -> 123149 bytes ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 263408 -> 263408 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 183780 -> 183780 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 118947 -> 118947 bytes Master/texmf-dist/doc/latex/reledmac/makefile | 1 + Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 356254 -> 356254 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 1976550 -> 1980104 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 984053 -> 984935 bytes .../texmf-dist/source/latex/reledmac/reledmac.dtx | 87 ++++++++++++++++----- .../texmf-dist/source/latex/reledmac/reledpar.dtx | 11 ++- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 67 +++++++++++----- Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 8 +- 54 files changed, 131 insertions(+), 45 deletions(-) (limited to 'Master/texmf-dist') 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 eaf05867bc6..5fcd27452fd 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-criticalendotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf index 900d113cf3e..b1922cc097b 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.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 fbf7b2c58e6..6ae23f4af14 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 634d0580bc8..46e48abb689 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 f5d3c884030..357b2dd5735 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 061ec68eb42..c90c50e0392 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 c5a5c23882a..99526e2ee87 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/1-verses.tex b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.tex index 16ce5c2a509..3b76a18b864 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.tex @@ -5,7 +5,7 @@ \usepackage[english, main=latin]{babel} \babeltags{english = english} -\usepackage[series={A,B},noend,noeledsec,noledgroup]{reledmac} +\usepackage[series={A,B},nofamiliar,noend,noeledsec,noledgroup]{reledmac} \sethangingsymbol{[\,} 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 2f1e05588aa..6553af3cfec 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 81974416ef8..772b5e654d8 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 0852dc4cac6..d97b1b8dd52 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 a0a562e48bc..b220e946e7b 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 5c98d59669e..dccaabebb35 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 a6648a15791..8514ca85540 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 37eabd6e913..6775c2a934e 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 36b41bfe011..eaf4c8125ad 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 484556674e8..e9c85a8c308 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 9fd2aa7a7c9..a6bee7a66db 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 a2b8c73fa35..9bc4dcf11fa 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 c041e23e1ad..bb333d32553 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 ccf0872765c..0659619d988 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 9b82933d608..c2e109247b5 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 4e1150f646e..71b8a6cccb6 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 b081ddbbeaa..8a114ced30e 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 c95e330a026..963b38229f1 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 81291577aee..498971aa08c 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 c58cd961901..aaacbce0d95 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 e1944ecb31e..6ace33f5679 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 6fec80334a3..66197bcd367 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 f5f37fdb246..2365c12b19a 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 fadc4e0352b..b607294c4b5 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 375a81c7aac..f5c829a5e19 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 3e7636dfe3c..0c94c222c6e 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 a87280ed94a..c8eccdb04b2 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 a75090423f0..e8230737805 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 9040917cad9..b533c732571 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 ca5d921115f..8b8ca6859da 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 1976a008c9f..043200bc81b 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 b155ac1ce63..2a06fbd49e8 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 4c883644ef6..4d35aab7041 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 b8a8f4d23f2..4640fab5e0d 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 a2a57adfab0..3c84529677d 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 893715851b4..b5a2464b1ea 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 e266d476ddb..03325c65639 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 6885db61b10..7cc3387dc84 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 6faa28ea6bb..de35968058c 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/makefile b/Master/texmf-dist/doc/latex/reledmac/makefile index 6d051c399cf..87f38bb0e76 100644 --- a/Master/texmf-dist/doc/latex/reledmac/makefile +++ b/Master/texmf-dist/doc/latex/reledmac/makefile @@ -61,6 +61,7 @@ dist: $(PACKAGE) examples ln doc-more/makefile reledmac/doc-more ln doc-more/latexmkrc reledmac/doc-more ln $(PACKAGE) reledmac + rm -rf build @$(RM) ../reledmac.zip zip -r ../reledmac.zip reledmac diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf index da5fe60c595..6b141a47aec 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 41a06ba6b9d..3a7491af5b8 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 7f3b733adb9..1e3fa6e695c 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 57347b09852..ecba0e4fb29 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -535,6 +535,8 @@ % \changes{v2.31.2}{2019/04/03}{Fix bug with familiar footnote containing not default font (introduced with v.~2.20.0).} % \changes{v2.31.3}{2019/06/19}{Fix bug with paragraphed footnote in RTL context.} % \changes{v2.32.0}{2019/07/15}{Add \protect\cs{Xlinenumannotationonlyfirst}, \protect\cs{Xlinenumannotationonlyfirstintwo}, \protect\cs{Xsymlinenumannotation}, \protect\cs{Xendlinenumannotationonlyfirst}, \protect\cs{Xendlinenumannotationonlyfirstintwo} and \protect\cs{Xendsymlinenumannotation}.} +% \changes{v2.32.1}{2019/07/21}{Do not print \protect\cs{Xendsep} if we print \protect\cs{Xendsymlinenum}.} +% \changes{v2.32.1}{2019/07/21}{When using \protect\cs{parindentX} or \protect\cs{Xparindent} and stanza, use the normal indentation in the footnote, not the verse indentation.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -4314,7 +4316,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2019/07/15 v2.32.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2019/07/21 v2.32.1 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -10039,7 +10041,7 @@ \insert\csname ##1footins\endcsname% \fi% {% - \nottoggle{Xparindent@##1}{\parindent=\z@}{}% + \Xsetparindent{##1}% \ifcsdef{Xhsize\csuse{series@display##1}@##1}% {\hsize \csuse{Xhsize\csuse{series@display##1}@##1}}% {}% @@ -10865,7 +10867,7 @@ % \begin{macrocode} \newcommand*{\parafootstart}[1]{% \rightskip=0pt \leftskip=0pt% - \nottoggle{Xparindent@#1}{\parindent=\z@}{}% + \Xsetparindent{#1}% \ifdimequal{0pt}{\Xprenotes@}{}% {% \iftoggle{Xprenotes@}{% @@ -11139,7 +11141,7 @@ \setbox0=\hbox{\unhbox0 \removehboxes}% \csuse{Xbhookgroup@#1}% \csuse{Xnotefontsize@#1}% - \nottoggle{Xparindent@#1}{\parindent=\z@}{}% + \Xsetparindent{#1}% \unhbox0\par}} % \end{macrocode} @@ -11397,7 +11399,7 @@ \nottoggle{Xgroupbyline@#1}% {\hsize \csuse{Xhsizethreecol@#1}}% {}% - \nottoggle{Xparindent@#1}{\parindent=\z@}{}% + \Xsetparindent{#1}% \tolerance=5000% \Xsethangindent{#1}% \@tempdima=\parindent% @@ -11545,7 +11547,7 @@ \newcommand{\twocol@begin@insert}[1]{% \normal@pars% \hsize \csuse{Xhsizetwocol@#1}% - \nottoggle{Xparindent@#1}{\parindent=\z@}{}% + \Xsetparindent{#1}% \tolerance=5000% \Xsethangindent{#1}% \@tempdima=\parindent% @@ -11610,6 +11612,30 @@ % \end{macro} % % +% \subsection{Footnote paragraph indent} +% \begin{macro}{\Xsetparindent} +% \begin{macro}{\setparindentX} +% These two commands set the paragraph indentation of the footnotes, depending of the settings of the user. +% \begin{macrocode} +\newcommand{\Xsetparindent}[1]{% + \nottoggle{Xparindent@#1}{% + \parindent=\z@% + }% + {% + \ifdef{\parindent@beforestanza}{\parindent=\parindent@beforestanza}{}% + }% +}% +\newcommand{\setparindentX}[1]{% + \nottoggle{parindentX@#1}{% + \parindent=\z@% + }% + {% + \ifdef{\parindent@beforestanza}{\parindent=\parindent@beforestanza}{}% + }% +}% +% \end{macrocode} +% \end{macro} +% \end{macro} % \subsection{Footnote hanging indent} % \begin{macro}{\Xsethangindent} % \begin{macro}{\sethangindentX} @@ -13055,7 +13081,7 @@ \normal@pars% \sethangindentX{#1}% \hsize \csuse{hsizetwocolX@#1}% - \nottoggle{parindentX@#1}{\parindent=\z@}{}% + \setparindentX{#1}% \tolerance=5000\relax% \par% \@tempdima=\parindent% @@ -13178,7 +13204,7 @@ \sethangindentX{#1}% \normal@pars% \hsize \csuse{hsizethreecolX@#1}% - \nottoggle{parindentX@#1}{\parindent=\z@}{}% + \setparindentX{#1}% \tolerance=5000\relax% \@tempdima=\parindent% \csuse{colalignX@#1}% @@ -13297,7 +13323,7 @@ }% \leftskip=\z@ \rightskip=\z@ - \nottoggle{parindentX@#1}{\parindent=\z@}{}% + \setparindentX{#1}% \vskip\skip\@nameuse{footins#1}% \setnoteswidthliketwocolumnsX@{#1}% \setnotesXpositionliketwocolumns@{#1}% @@ -13426,7 +13452,7 @@ \setbox0=\hbox{\unhbox0 \removehboxes}% \csuse{bhookgroupX@#1}% \csuse{notefontsizeX@#1}% - \nottoggle{parindentX@#1}{\parindent=\z@}{}% + \setparindentX{#1}% \unhbox0\par}} % \end{macrocode} @@ -13522,12 +13548,14 @@ \newcommand*{\Xledsetnormalparstuff}[1]{% \ledsetnormalparstuff@common% - \nottoggle{Xparindent@#1}{\parindent=\z@}{\hspace{\parindent}}% + \Xsetparindent{#1}% + \iftoggle{Xparindent@#1}{\hspace{\parindent}}{}% }% \newcommand*{\ledsetnormalparstuffX}[1]{% \ledsetnormalparstuff@common% - \nottoggle{parindentX@#1}{\parindent=\z@}{\hspace{\parindent}}% + \setparindentX{#1}% + \iftoggle{parindentX@#1}{\hspace{\parindent}}{}% }% % \end{macrocode} % \end{macro} @@ -13841,9 +13869,15 @@ \csuse{Xendbhooknote@#4}% \csuse{Xendnotefontsize@#4}% \hangindent=\csuse{Xendhangindent@#4}% + \Xendstorelineinfo{#1}{#4}% \ifXendinsertsep@% \hskip\csuse{Xendafternote@#4}\relax% - \csuse{Xendsep@#4}% + \ifcsdef{prevendline#4}% + {\ifcsequal{prevendline#4}{lineinfo@}% + {\ifcsempty{Xendsymlinenum@#4}{\csuse{Xendsep@#4}}{}}% + {\csuse{Xendsep@#4}}% + }% + {\csuse{Xendsep@#4}}% \else% \iftoggle{Xendparagraph@#4}% {\global\Xendinsertsep@true}% @@ -13890,17 +13924,27 @@ % \end{macrocode} % \end{macro} % \end{macro} +% \begin{macro}{\Xendstorelineinfo} +% The \cs{Xendstorelineinfo} macro is used to store some data about line number of the current critical endnote, data which will be reused later for the \cs{Xnumberonlyfirstinline} and related setting. +% +% \#1 endnote specification for the current endnote; +% \#2 endnote series. +% \begin{macrocode} +\newcommand{\Xendstorelineinfo}[2]{% + \l@dp@rsefootspec#1|% + \iftoggle{Xendnumberonlyfirstintwolines@#2}{% + \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub - \l@dparsedendpage - \l@dparsedendline - \l@dparsedendsub}% + }% + {% + \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub}% + }% +}% +% \end{macrocode} +% \end{macro} % \begin{macro}{\printlineendnote} % This macro controls, in endnote, whether the line number is printed or not, according to the series options. Its first argument is the information about lines; its second is the series of the footnote. % \begin{macrocode} \newcommand{\printlineendnote}[2]{% - \l@dp@rsefootspec#1|% - \iftoggle{Xendnumberonlyfirstintwolines@#2}{% - \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub - \l@dparsedendpage - \l@dparsedendline - \l@dparsedendsub}% - }% - {% - \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub}% - }% \ifboolexpr{% togl {nonum@}% or togl {Xendnonumber@#2}% @@ -18530,6 +18574,8 @@ \noexpand\instanzatrue\expandafter \begingroup% \catcode`\noexpand\&\active% + \unexpanded{\newdimen\parindent@beforestanza% + \parindent@beforestanza=\parindent}%Keep in memory the standard \parindent \global\stanza@count\@ne\stanza@modulo\@ne \noexpand\ifnum\expandafter\noexpand \csname sza@0@\endcsname=\z@\let\noexpand\stanza@hang\relax @@ -18566,6 +18612,7 @@ {\before@every@stop@stanza\pend[#1][#2]}% \endgroup% \instanzafalse% + \global\undef\parindent@beforestanza% } \newcommand{\AtEveryStopStanza}[1]{% diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index 6dfd2d870ca..8cde9933a52 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -337,6 +337,7 @@ % \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} % \changes{v2.22.2}{2019/01/22}{Fix bug with \protect\cs{Xonlyside} and \protect\cs{onlysideX}} +% \changes{v2.22.3}{2019/07/21}{When using \protect\cs{parindentX} or \protect\cs{Xparindent} and stanza, use the normal indentation in the footnote, not the verse indentation.} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1385,7 +1386,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2019/01/22 v2.22.2 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2019/07/21 v2.22.3 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -3149,7 +3150,7 @@ % \item A \LaTeX\ counter \verb+footnoteX+. This the only one manipulated by user, and the only one finally printed. % \item A \TeX\ counter \verb+footnoteX@reading+. Its value is incremented when reading the \cs{footnoteX} command in left or right side environments. It is used to get the correct footnote number from the \verb+.aux+ file to be typeset in the main text. This counter is already defined in \macpackage, as it is also used for hyperlink. % \changes{v2.6.2}{2015/11/29}{The \TeX\ counter \protect\cs{footnoteX@reading} is defined in \protect\reledmac.} -% \item A \LaTeX\ counter \verb+footnoteX@typeset. Its value is increased when inserting footnotes. Its value is directly used in the footnote, and is stored in the \verb+aux+ files to be used on the next run for the main text. +% \item A \LaTeX\ counter \verb+footnoteX@typeset+. Its value is increased when inserting footnotes. Its value is directly used in the footnote, and is stored in the \verb+aux+ files to be used on the next run for the main text. % \end{enumerate} % % @@ -5345,6 +5346,8 @@ \newenvironmentx{astanza}[2][1,2,usedefault]{% \catcode`\&\active \global\stanza@count\@ne\stanza@modulo\@ne + \newdimen\parindent@beforestanza% + \parindent@beforestanza=\parindent%Keep in memory the standard \parindent \ifnum\usenamecount{sza@0@}=\z@ \let\stanza@hang\relax \let\endlock\relax @@ -5368,7 +5371,9 @@ {\pstart[#1][#2]\at@start@every@stanza}% \@astanza@line \let\par\relax\ignorespaces%No paragraph in verses -}{} +}{% + \global\undef\parindent@beforestanza% +}% % \end{macrocode} % \end{environment} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index f383181c2a4..94457cd40da 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/07/15 v2.32.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2019/07/21 v2.32.1 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \newif\ifsameparallelpagenumber% @@ -2567,7 +2567,7 @@ \insert\csname ##1footins\endcsname% \fi% {% - \nottoggle{Xparindent@##1}{\parindent=\z@}{}% + \Xsetparindent{##1}% \ifcsdef{Xhsize\csuse{series@display##1}@##1}% {\hsize \csuse{Xhsize\csuse{series@display##1}@##1}}% {}% @@ -2953,7 +2953,7 @@ \newcommand*{\parafootstart}[1]{% \rightskip=0pt \leftskip=0pt% - \nottoggle{Xparindent@#1}{\parindent=\z@}{}% + \Xsetparindent{#1}% \ifdimequal{0pt}{\Xprenotes@}{}% {% \iftoggle{Xprenotes@}{% @@ -3065,7 +3065,7 @@ \setbox0=\hbox{\unhbox0 \removehboxes}% \csuse{Xbhookgroup@#1}% \csuse{Xnotefontsize@#1}% - \nottoggle{Xparindent@#1}{\parindent=\z@}{}% + \Xsetparindent{#1}% \unhbox0\par}} \newcommand*{\makehboxofhboxes}{\setbox0=\hbox{}% @@ -3188,7 +3188,7 @@ \nottoggle{Xgroupbyline@#1}% {\hsize \csuse{Xhsizethreecol@#1}}% {}% - \nottoggle{Xparindent@#1}{\parindent=\z@}{}% + \Xsetparindent{#1}% \tolerance=5000% \Xsethangindent{#1}% \@tempdima=\parindent% @@ -3283,7 +3283,7 @@ \newcommand{\twocol@begin@insert}[1]{% \normal@pars% \hsize \csuse{Xhsizetwocol@#1}% - \nottoggle{Xparindent@#1}{\parindent=\z@}{}% + \Xsetparindent{#1}% \tolerance=5000% \Xsethangindent{#1}% \@tempdima=\parindent% @@ -3330,6 +3330,22 @@ \expandafter \Xrigidbalance\csname mp#1footins\endcsname \tw@ \splittopskip}} +\newcommand{\Xsetparindent}[1]{% + \nottoggle{Xparindent@#1}{% + \parindent=\z@% + }% + {% + \ifdef{\parindent@beforestanza}{\parindent=\parindent@beforestanza}{}% + }% +}% +\newcommand{\setparindentX}[1]{% + \nottoggle{parindentX@#1}{% + \parindent=\z@% + }% + {% + \ifdef{\parindent@beforestanza}{\parindent=\parindent@beforestanza}{}% + }% +}% \newcommand{\Xsethangindent}[1]{% \if@RTL% \hangindent=-\csuse{Xhangindent@#1}% @@ -4202,7 +4218,7 @@ \normal@pars% \sethangindentX{#1}% \hsize \csuse{hsizetwocolX@#1}% - \nottoggle{parindentX@#1}{\parindent=\z@}{}% + \setparindentX{#1}% \tolerance=5000\relax% \par% \@tempdima=\parindent% @@ -4286,7 +4302,7 @@ \sethangindentX{#1}% \normal@pars% \hsize \csuse{hsizethreecolX@#1}% - \nottoggle{parindentX@#1}{\parindent=\z@}{}% + \setparindentX{#1}% \tolerance=5000\relax% \@tempdima=\parindent% \csuse{colalignX@#1}% @@ -4372,7 +4388,7 @@ }% \leftskip=\z@ \rightskip=\z@ - \nottoggle{parindentX@#1}{\parindent=\z@}{}% + \setparindentX{#1}% \vskip\skip\@nameuse{footins#1}% \setnoteswidthliketwocolumnsX@{#1}% \setnotesXpositionliketwocolumns@{#1}% @@ -4477,7 +4493,7 @@ \setbox0=\hbox{\unhbox0 \removehboxes}% \csuse{bhookgroupX@#1}% \csuse{notefontsizeX@#1}% - \nottoggle{parindentX@#1}{\parindent=\z@}{}% + \setparindentX{#1}% \unhbox0\par}} \newcommand{\insertparafootsepX}[1]{% @@ -4533,12 +4549,14 @@ \newcommand*{\Xledsetnormalparstuff}[1]{% \ledsetnormalparstuff@common% - \nottoggle{Xparindent@#1}{\parindent=\z@}{\hspace{\parindent}}% + \Xsetparindent{#1}% + \iftoggle{Xparindent@#1}{\hspace{\parindent}}{}% }% \newcommand*{\ledsetnormalparstuffX}[1]{% \ledsetnormalparstuff@common% - \nottoggle{parindentX@#1}{\parindent=\z@}{\hspace{\parindent}}% + \setparindentX{#1}% + \iftoggle{parindentX@#1}{\hspace{\parindent}}{}% }% \newdimen\old@hsize% @@ -4686,9 +4704,15 @@ \csuse{Xendbhooknote@#4}% \csuse{Xendnotefontsize@#4}% \hangindent=\csuse{Xendhangindent@#4}% + \Xendstorelineinfo{#1}{#4}% \ifXendinsertsep@% \hskip\csuse{Xendafternote@#4}\relax% - \csuse{Xendsep@#4}% + \ifcsdef{prevendline#4}% + {\ifcsequal{prevendline#4}{lineinfo@}% + {\ifcsempty{Xendsymlinenum@#4}{\csuse{Xendsep@#4}}{}}% + {\csuse{Xendsep@#4}}% + }% + {\csuse{Xendsep@#4}}% \else% \iftoggle{Xendparagraph@#4}% {\global\Xendinsertsep@true}% @@ -4732,14 +4756,16 @@ \let\l@d@section=\@gobble -\newcommand{\printlineendnote}[2]{% +\newcommand{\Xendstorelineinfo}[2]{% \l@dp@rsefootspec#1|% \iftoggle{Xendnumberonlyfirstintwolines@#2}{% - \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub - \l@dparsedendpage - \l@dparsedendline - \l@dparsedendsub}% - }% - {% - \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub}% - }% + \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub - \l@dparsedendpage - \l@dparsedendline - \l@dparsedendsub}% + }% + {% + \xdef\lineinfo@{\l@dparsedstartpage - \l@dparsedstartline - \l@dparsedstartsub}% + }% +}% +\newcommand{\printlineendnote}[2]{% \ifboolexpr{% togl {nonum@}% or togl {Xendnonumber@#2}% @@ -7622,6 +7648,8 @@ \noexpand\instanzatrue\expandafter \begingroup% \catcode`\noexpand\&\active% + \unexpanded{\newdimen\parindent@beforestanza% + \parindent@beforestanza=\parindent}%Keep in memory the standard \parindent \global\stanza@count\@ne\stanza@modulo\@ne \noexpand\ifnum\expandafter\noexpand \csname sza@0@\endcsname=\z@\let\noexpand\stanza@hang\relax @@ -7658,6 +7686,7 @@ {\before@every@stop@stanza\pend[#1][#2]}% \endgroup% \instanzafalse% + \global\undef\parindent@beforestanza% } \newcommand{\AtEveryStopStanza}[1]{% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index daeadd1eb8a..6ef2a6e4746 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}[2019/01/22 v2.22.2 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2019/07/21 v2.22.3 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -2123,6 +2123,8 @@ \newenvironmentx{astanza}[2][1,2,usedefault]{% \catcode`\&\active \global\stanza@count\@ne\stanza@modulo\@ne + \newdimen\parindent@beforestanza% + \parindent@beforestanza=\parindent%Keep in memory the standard \parindent \ifnum\usenamecount{sza@0@}=\z@ \let\stanza@hang\relax \let\endlock\relax @@ -2146,7 +2148,9 @@ {\pstart[#1][#2]\at@start@every@stanza}% \@astanza@line \let\par\relax\ignorespaces%No paragraph in verses -}{} +}{% + \global\undef\parindent@beforestanza% +}% \newcommandx{\@stopastanza}[2][1,2,usedefault]{% \endlock\mbox{}% -- cgit v1.2.3