summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx2
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdfbin17330 -> 17292 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdfbin26393 -> 26394 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdfbin20908 -> 21351 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdfbin17432 -> 17434 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdfbin18603 -> 18601 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdfbin20757 -> 20953 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdfbin21903 -> 21703 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdfbin21742 -> 21743 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdfbin17115 -> 17113 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdfbin31428 -> 31427 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdfbin26420 -> 26385 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdfbin36346 -> 36349 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdfbin24824 -> 24782 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdfbin25903 -> 25914 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdfbin23295 -> 23274 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdfbin34250 -> 34253 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdfbin22806 -> 22811 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdfbin17202 -> 17201 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdfbin26170 -> 26385 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdfbin12215 -> 12220 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdfbin42532 -> 42532 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdfbin22794 -> 23021 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdfbin43294 -> 43294 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdfbin42868 -> 42875 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdfbin40796 -> 40800 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdfbin43069 -> 43073 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdfbin42560 -> 42566 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdfbin42612 -> 42610 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdfbin42868 -> 42873 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdfbin22315 -> 22317 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdfbin27238 -> 27050 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdfbin21265 -> 21265 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdfbin29556 -> 29757 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdfbin22447 -> 22450 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdfbin36448 -> 36454 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdfbin58540 -> 58543 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdfbin22753 -> 22753 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdfbin19014 -> 19196 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdfbin32474 -> 32682 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdfbin22220 -> 22222 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdfbin16263 -> 16269 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/migration.pdfbin89700 -> 89668 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/reledmac.pdfbin1269066 -> 1278445 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/reledpar.pdfbin488271 -> 495946 bytes
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledmac.dtx239
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledpar.dtx192
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty146
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledpar.sty163
49 files changed, 608 insertions, 134 deletions
diff --git a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx
index d6d7b89244e..2aab5d9adcf 100644
--- a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx
+++ b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx
@@ -84,6 +84,6 @@
% Please contact us if that causes problems.
% \subsection{Migration to v.~2.17.2}
% If you change the \cs{Lcolwidth} and \cs{Rcolwidth} length inside the \env{pages} environment, the contents were aligned to right.
-% Now, it is, more normally, aligned to left.
+% Now, it is aligned to left.
% Please contact us if you need to keep the older behavior.
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 b18b10aa76f..cc16fc0ca39 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
Binary files 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 8aadd06c1f1..3df3bcd28e1 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
Binary files 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 a6bc38a37eb..3dc0c29c6c7 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
Binary files 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 a15fc12a4d5..616f7b44fa0 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
Binary files 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 b204342a385..20c63fc4fc2 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
Binary files 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 985da68070c..8de37f3798c 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
Binary files 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 b2285e501ce..ffa137aeffa 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
Binary files 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 62ec2fbfea3..8ca30d6a5d7 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
Binary files 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 563e67a9bc3..8697a654034 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
Binary files 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 ae7a0ce0a5b..60743bd286c 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
Binary files 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 0c5c1672988..5206a8958f9 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
Binary files 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 7ffc365b450..68f1851b2bf 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
Binary files 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 a9924006c0e..0b52953bd8b 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
Binary files 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 39be3ea878b..17777ba6e22 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
Binary files 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 bac38286006..bbe774a5473 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
Binary files 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 0cbe4444d95..3403e3769e7 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
Binary files 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 a1c47788a9a..c3c879d89bb 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
Binary files 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 26cdb8dd5e0..19bc460cba3 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
Binary files 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 62da6175784..4c01ef664d9 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
Binary files 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 45b850f6685..c5db8b7d7b4 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
Binary files 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 05e76e4268e..1392afef6e1 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
Binary files 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 56c6597aa46..ce25e49f673 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
Binary files 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 bc2171da0b2..8247623ef3a 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
Binary files 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 76127eda89f..7af7753cfa2 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
Binary files 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 b1faa321cfd..3e4bb804c66 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
Binary files 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 21e9a3dbffe..46d61c7651f 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
Binary files 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 88c390bdf11..bb20db24d08 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
Binary files 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 b2c53047b8e..fd16fb70f81 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
Binary files 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 e1b9d857b30..b3f60bb6db7 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
Binary files 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 fa4d8a3f9cd..54b1ec81dcf 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
Binary files 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 322e92798b3..dcf25ad1942 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
Binary files 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 b81fc0a75fd..8e3d2146600 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
Binary files 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 d9588c99fee..268a91d841e 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
Binary files 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 442b56a7943..5f88810da95 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
Binary files 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 84880c6ba8b..59f0196661c 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
Binary files 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 8dd32bf5d8a..e989594da39 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
Binary files 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 7ede13c36c1..dd89ad80922 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
Binary files 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 83f24d9029e..552a483ac5c 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
Binary files 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 c6a75d1af8b..97a2470ee25 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
Binary files 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 5c06f203e61..563983c8626 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
Binary files 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 957ffdb2e3a..5c3c3fe0ea6 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
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf
index cef6a4e0866..7dbac14371b 100644
--- a/Master/texmf-dist/doc/latex/reledmac/migration.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/migration.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
index a88c237b15a..92b46150be3 100644
--- a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
index 9f3dcfd358b..31a3db2c7d4 100644
--- a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
index b689c1b5538..4c760d334e7 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
@@ -461,11 +461,17 @@
% \changes{v2.17.5}{2017/02/12}{Fix bug with \protect\cs{pstartref} when refering to the left side in parallel typesetting.}
% \changes{v2.18.0}{2017/02/22}{Fix bug when using both \protect\cs{Xnumberonlyfirstintwolines} or \protect\cs{Xnumberonlyfirstinline} and \protect\cs{Xparafootsep} and \protect\cs{Xsymlinenum}.}
% \changes{v2.18.0}{2017/02/22}{Fix bug when using a \protect\cs{edtext} in two lines or more in right-to-left typesetting with \protect\XeLaTeX.}
-% \changes{v2.18.1}{2017/03/20}{Fix bug when using \protect\cs{msdata} with \protect\LuaLaTeX or with \protect\package{hyperref} package.}
-% \changes{v2.19.0}{2017/04/14}{Add better compatibility with \protect\package{csquotes} package when using familiar footnotes.}
+% \changes{v2.18.1}{2017/03/20}{Fix bug when using \protect\cs{msdata} with \protect\LuaLaTeX or with the \protect\package{hyperref} package.}
+% \changes{v2.19.0}{2017/04/14}{Add better compatibility with the \protect\package{csquotes} package when using familiar footnotes.}
% \changes{v2.19.0}{2017/04/14}{Add \protect\cs{footnoteXmark} and \protect\cs{footnoteXtext} commands.}
% \title{\Macpackage \\
-% \changes{v2.19.0}{2017/04/14}{Fix bug with paragraph indent after sectioning command.}
+% \changes{v2.19.0}{2017/04/14}{Fix bug with paragraph indent after sectioning command.}
+% \changes{v2.20.0}{2017/05/04}{Fix bug when using familiar footnotes in \protect\cs{eledsection} and related.}
+% \changes{v2.20.0}{2017/05/04}{Reset font specification at the beginning of familiar footnotes.}
+% \changes{v2.20.0}{2017/05/04}{Add starred version of \protect\cs{AtEveryPstart}, \protect\cs{AtEveryPend}, \protect\cs{AtEveryStanza} and \protect\cs{AtEveryStopStanza}.}
+% \changes{v2.20.0}{2017/05/04}{Add \protect\cs{AtStartEveryStanza}, \protect\cs{BeforeEveryStopStanza}, \protect\cs{AtEndEveryPend}, \protect\cs{AtStartEveryPstart}.}
+% \changes{v2.20.0}{2017/05/04}{Add second optional argument of \protect\cs{pstart}, \protect\cs{pend} and \protect\cs{stanza}.}
+% \changes{v2.20.0}{2017/05/04}{Add third and fourth optional argument of \protect\cs{newverse}.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -896,6 +902,16 @@
% \changes{v1.12.0}{2014/08/05}{Optional arguments for \protect\cs{pstart} and \protect\cs{pend}.}
% Both \protect\cs{pstart} and \protect\cs{pend} can take a optional argument in brackets.
% Its content will be printed before the beginning of \protect\cs{pstart} / after the end of \protect\cs{pend} instead of the argument of \protect\cs{AtEveryPstart} / \protect\cs{AtEveryPend}.
+%
+% Note that a \cs{noindent} will be automatically added before this argument, and, consequently, a \cs{parskip} will be inserted.
+% You can use a second optional argument, in brackets, to not have this \cs{noindent}.
+% \begin{verbatim}
+% \pstart[foo] % A \noindent will be inserted before foo.
+% \pstart[][foo]% No \noindent before foo.
+% \end{verbatim}
+%
+% The second optional argument of \cs{pstart} / \cs{pend} replace the argument of \cs{AtEveryPstart*} / \cs{AtEveryPend*}.
+%
% If you need to start a \protect\cs{pstart} with brackets, or to add brackets after a \protect\cs{pend}, just add a \protect\cs{relax} between \protect\cs{pstart}\,\ldots\,\protect\cs{pend} and the brackets.
%
% This feature is also useful when typesetting verses (see \reff{verse}) or \parpackage\ (see \reff{eledpar}).
@@ -907,7 +923,18 @@
% \label{AtEveryPstart} \DescribeMacro{\AtEveryPstart}\DescribeMacro{\AtEveryPend}
% You can use both \protect\cs{AtEveryPstart} and \protect\cs{AtEveryPend}.
% Their arguments will be printed before every \protect\cs{pstart} begins / after every \protect\cs{pend} ends.
+%
+% Note that a \cs{noindent} will be inserted before the argument, and, consequently, a \cs{parskip}. You can use the starred version of \protect\cs{AtEveryPstart} and \protect\cs{AtEveryPend} to no insert the \cs{noindent}.
%
+% \DescribeMacro{\AtStartEveryPstart}\DescribeMacro{\AtEndEveryPend}
+% The argument of \cs{AtStartEveryPstart} / \cs{AtEndEveryPend} will be inserted at the beginning / the end of every \cs{pstart} / \cs{pend} in the same paragraph. For example, if you want each \cs{pstart} to start with a star, you can use:
+% \begin{verbatim}
+% \AtStartEveryPstart{*}
+% \end{verbatim}
+% Instead of manually doing
+% \begin{verbatim}
+% \pstart * Real pstart content.\pend
+% \end{verbatim}
% \subsubsection{Numbering paragraphs (\protect\cs{pstart})}
% \changes{v0.12.0}{2011/10/01}{Possibility to number \protect\cs{pstart}.}
% It is possible to insert a number at every \protect\cs{pstart} command; you must use the \DescribeMacro{\numberpstarttrue}\protect\cs{numberpstarttrue} command to have it. You can stop the numbering with \DescribeMacro{\numberpstartfalse}\protect\cs{numberpstartfalse}.
@@ -1089,7 +1116,7 @@
% or sub-line depending on what it started out as, even if it
% changes in the middle.
%
-% You can change the separator between line number and subline number or using \cs{Xsublinesep} without any option argument (\reff{Xsublinesep} or using \cs{Xsublinesepside}). But in the second case, it will change the separator only for line number in side, not for the footnotes.
+% You can change the separator between line number and subline number either by using \cs{Xsublinesep} without any optional argument (\reff{Xsublinesep}) or by using \cs{Xsublinesepside}. But in the second case, it will change the separator only for line numbers in the margins, not in the footnotes.
% \subsubsection{Locking lineation}
% \DescribeMacro{\startlock}
% \DescribeMacro{\endlock}
@@ -1771,21 +1798,21 @@
% \verb?\providecommand*{\multfootsep}{\textsuperscript{\normalfont,}}? \\
% and can be changed if necessary.
%
-% \subsection{Printing footnote mark without printing footnote text}
+% \subsection{Printing the footnote mark without printing the footnote text}
% \DescribeMacro{\footnoteXmark}
% \DescribeMacro{\footnoteXtext}
-% In some case, you can't use directly \cs{footnoteA}, for example when using the \cs{uline} command of the \package{ulem} package. You need to print the footnote mark, and then, call the footnote text to be inserted.
+% In certain cases, you can't directly use \cs{footnoteX}; for example, when using\cs{uline} command of the \package{ulem} package. You need to print the footnote mark first, then call the footnote text to be inserted.
%
-% For all \meta{X} command, \macpackage provides a \cs{footnote\meta{X}mark} command and a \cs{footnote\meta{X}text} command, equivalent to the standard \LaTeX's command \cs{footnotemark} and \cs{footnotetext}.
+% For all \meta{X} command, \macpackage provides a \cs{footnote\meta{X}mark} command and a \cs{footnote\meta{X}text} command, equivalent to standard \LaTeX's command \cs{footnotemark} and \cs{footnotetext}.
% For example, to use with \cs{uline}, do:
% \begin{verbatim}
% This is \uline{a test containing\mbox{\footnoteAmark}}\footnoteAtext{A
% simple footnote.}\uline{ a simple footnote.}
% \end{verbatim}
%
-% If you use \parpackage, you can't use these two commands to print footnote mark in one side and footnote text in other side.
+% If you use \parpackage, you can't use these two commands to print the footnote mark on one side and the footnote text on the other side.
%
-% You muse use \cs{footnote\meta{X}nomk} and \cs{footnote\meta{X}mk}, defined in \parpackage (\reff{reledpar-nomk})
+% You must use \cs{footnote\meta{X}nomk} and \cs{footnote\meta{X}mk}, defined in \parpackage (\reff{reledpar-nomk})
% \subsection{Changing series}
% \subsubsection{Create a new series}\label{newseries}
%
@@ -2703,16 +2730,29 @@
% \subsection{Content before/after verses}\label{contentverse}
% It is possible to add content, like a subtitle or a spacing, before or after verse:
% \begin{itemize}
-% \item The \protect\cs{stanza} command can take an optional argument (in brackets). Its content will be printed before the stanza.
+% \item The \protect\cs{stanza} command can take an optional argument (in brackets). Its content will be printed before the stanza. A \cs{noindent} is inserted before the content of first optional argument.
+% If you don't want this \cs{noindent}, you can use the second optional argument (also in brackets):
+% \begin{verbatim}
+% \stanza[foo] % \noindent is inserted before foo.
+% \stanza[][foo] % There is no \noindent inserted before foo.
+% \end{verbatim}
%
-% Use \cs{AtEveryStanza}\marg{arg} to automatically add content at the begining of stanza.
-% \item \verb+&+ can be replaced by \protect\cs{newverse} with two optional arguments (in brackets). The first will be printed after the current verse, the second before the next verse.
+% \item \DescribeMacro{\AtEveryStanza} Use \cs{AtEveryStanza}\marg{arg} to automatically add content before the stanza (not in the same paragraph).
%
-% Use \cs{AtEveryPend}\marg{arg} to automatically add content after verses (including the final one) and \cs{AtEveryPstart}\marg{arg} to automatically add content before verses (including the first one).
+% Note that a \cs{noindent} will be inserted before the argument, and, consequently, a \cs{parskip}. You can use the starred version of \protect\cs{AtEveryStanza} to avoid this \cs{noindent}.
+% \item \DescribeMacro{\AtStartEveryStanza} Use \cs{AtStartEveryStanza} to automatically add content at the beginning of stanza (in the same paragraph).
+% \item \verb+&+ can be replaced by \protect\cs{newverse} with two optional arguments (in brackets). The first will be printed after the current verse, the second before the next verse.
+%
+% A \cs{noindent} is automatically inserted before the contents of these optional arguments.
+%
+% Use a third and fourth optional argument to not add these \cs{noindent}s (to add content respectively after the current verse / before the next verse).
+% \item Use \cs{AtEveryPend}\marg{arg} to automatically add content after verses (including the final one) and \cs{AtEveryPstart}\marg{arg} to automatically add content before verses (including the first one).
% \item \verb+\&+ can take an optional argument (in brackets). Its content will be printed after the stanza.
%
-% Use \cs{AtEveryStopStanza} to automatically add content at the end of stanzas.
+% \item \DescribeMacro{\AtEveryStopStanza} Use \cs{AtEveryStopStanza} to automatically add content after the end of stanzas (not in the same paragraph).
%
+% Note that a \cs{noindent} will be inserted before the argument, and, consequently, a \cs{parskip}. You can use the starred version of \protect\cs{AtEveryStopStanza} to avoid this \cs{noindent}.
+% \item \DescribeMacro{\AtStartEveryStanza} Use \cs{AtStartEveryStanza} to automatically add content at the end of stanza (in the same paragraph).
% \end{itemize}
%
%
@@ -2908,7 +2948,7 @@
% \verb"\edlabel{mouse}" was placed, and the ending numbers to those where
% \verb"\edlabel{elephant}" occurs.
%
-% Here, an example of use:
+% For example, one might use the following:
% \begin{verbatim}
%\beginnumbering
%
@@ -3899,7 +3939,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2017/04/12 v2.19.0 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2017/05/04 v2.20.0 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -7881,6 +7921,7 @@
%
% \begin{macro}{\pstart}
% \begin{macro}{\AtEveryPstart}
+% \begin{macro}{\AtStartEveryPstart}
% \changes{v1.6.1}{2013/10/27}{Spurious space in \protect\cs{pstart}.}
% \changes{v1.12.0}{2014/08/05}{New optional argument for \protect\cs{pstart}, to execute code before it.}
% \begin{macro}{\numberpstarttrue}
@@ -7888,6 +7929,7 @@
% \begin{macro}{\labelpstarttrue}
% \begin{macro}{\labelpstartfalse}
% \begin{macro}{\thepstart}
+% \begin{macro}{\ifat@every@pstart@star@}
% \protect\cs{pstart} starts the paragraph by
% clearing the \protect\cs{inserts@list} list and other
% relevant variables, and then arranges for the
@@ -7902,12 +7944,27 @@
% \changes{v1.13.1}{2014/09/25}{Add \protect\cs{l@dzeropenalties} in \protect\cs{pstart}}
% \begin{macrocode}
+\newcommand{\AtStartEveryPstart}[1]{%
+ \ifstrempty{#1}%
+ {\gdef\@at@start@every@pstart{}}%
+ {\gdef\@at@start@every@pstart{#1}}%
+}%
+\def\@at@start@every@pstart{}%
+
+\newif\ifat@every@pstart@star@%
\newcommand{\AtEveryPstart}[1]{%
\ifstrempty{#1}%
- {\xdef\at@every@pstart{}}%
+ {\gdef\at@every@pstart{}}%
{\gdef\at@every@pstart{\noindent#1}}%
+ \global\at@every@pstart@star@false%
+}%
+\WithSuffix\newcommand\AtEveryPstart*[1]{%
+ \ifstrempty{#1}%
+ {\gdef\at@every@pstart{}}%
+ {\gdef\at@every@pstart{#1}}%
+ \global\at@every@pstart@star@true%
}%
-\xdef\at@every@pstart{}%
+\def\at@every@pstart{}%
\newcounter{pstart}
\renewcommand{\thepstart}{{\bfseries\@arabic\c@pstart}. }
@@ -7915,9 +7972,17 @@
\numberpstartfalse
\newif\iflabelpstart
\labelpstartfalse
-\newcommandx*{\pstart}[1][1]{%
+\newcommandx*{\pstart}[2][1,2,usedefault]{%
\normal@pars%
- \ifstrempty{#1}{\at@every@pstart}{\noindent#1}%
+ \ifboolexpr{%
+ test {\ifstrempty{#1}}%
+ and test {\ifstrempty{#2}}%
+ }%
+ {\at@every@pstart}%
+ {%
+ \ifstrempty{#1}{}{\noindent#1}%
+ \ifstrempty{#2}{}{#2}%
+ }%
\ifautopar%
\autopar%
\fi%
@@ -7958,6 +8023,7 @@
{\p@pstart\thepstart}
\fi%
\l@dzeropenalties%
+ \@at@start@every@pstart%
\ignorespaces%because not automatically ignored if an optional argument is used (classical TeX behavior for space after commands)
}
% \end{macrocode}
@@ -7968,13 +8034,15 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
% \begin{macro}{\pend}
% \changes{v1.12.0}{2014/08/05}{New optional argument for \protect\cs{pend}, to execute code after it.}
% \changes{v1.6.1}{2013/10/27}{Spurious space in \protect\cs{pend}.}
% \protect\cs{pend} must be used to end a numbered paragraph.
%
% \begin{macrocode}
-\newcommandx*{\pend}[1][1]{\ifnumbering \else%
+\newcommandx*{\pend}[2][1,2,usedefault]{\ifnumbering \else%
\led@err@PendNotNumbered%
\fi%
\global\l@dskipversenumberfalse%
@@ -7992,6 +8060,7 @@
% we keep doing this until there are not any more lines left.
% \begin{macrocode}
\l@dzeropenalties%
+ \@at@end@every@pend%
\endgraf\global\num@lines=\prevgraf\egroup%
\global\par@line=0%
% \end{macrocode}
@@ -8026,10 +8095,18 @@
\fi%
\addtocounter{pstart}{1}%
% \end{macrocode}
-% Print the optional argument of \protect\cs{pend} or the content printed after every \protect\cs{pend}
+% Print the optional arguments of \protect\cs{pend} or the content printed after every \protect\cs{pend}
% \begin{macrocode}
\normal@pars%
- \ifstrempty{#1}{\at@every@pend}{\noindent#1}%
+ \ifboolexpr{%
+ test {\ifstrempty{#1}}%
+ and test {\ifstrempty{#2}}%
+ }%
+ {\at@every@pend}%
+ {%
+ \ifstrempty{#1}{}{\noindent#1}%
+ \ifstrempty{#2}{}{#2}%
+ }%
% \end{macrocode}
% Restore standard \enquote{nobreak} and \enquote{autopar} settings.
% Normally, \cs{if@nobreak} is true only immediately after a sectioning command (see latex.ltx file). As a \cs{pstart}…\cs{pend} structure can't contain any sectioning command, we set \cs{if@nobreak} to false.
@@ -8046,19 +8123,41 @@
%
% \begin{macro}{\AtEveryPend}
% \begin{macro}{\at@every@pend}
+% \begin{macro}{\ifat@every@pend@star@}
% \begin{macrocode}
+
+\newif\ifat@every@pend@star@%
\newcommand{\AtEveryPend}[1]{%
\ifstrempty{#1}%
- {\xdef\at@every@pend{}}%
+ {\gdef\at@every@pend{}}%
{\gdef\at@every@pend{\noindent#1}}%
+ \global\at@every@pend@star@false%
+}%
+\WithSuffix\newcommand\AtEveryPend*[1]{%
+ \ifstrempty{#1}%
+ {\gdef\at@every@pend{}}%
+ {\gdef\at@every@pend{#1}}%
+ \global\at@every@pend@star@true%
}%
\xdef\at@every@pend{}%
% \end{macrocode}
% \end{macro}
% \end{macro}
+% \end{macro}
%
+% \begin{macro}{\AtEndEveryPend}
+% Here a macro to insert automatically any content at the end of \cs{pend}, in numbered lines.
+% \begin{macrocode}
+\newcommand{\AtEndEveryPend}[1]{%
+ \ifstrempty{#1}%
+ {\xdef\@at@end@every@pend{}}%
+ {\gdef\@at@end@every@pend{#1}}%
+}%
+\def\@at@end@every@pend{}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\l@dzeropenalties}
% A macro to zero penalties for \protect\cs{pend} or \protect\cs{pstart}.
% \changes{v0.7.0}{2005/02/22}{Added \protect\cs{l@dzeropenalties}}
@@ -11413,6 +11512,7 @@
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnoteX}[2]{%
\csuse{beforeinsertingX@#1}%
\insert\@nameuse{footins#1}\bgroup
+ \reset@font%
\hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax%
\noindent\csuse{bhooknoteX@#1}%
\csuse{notefontsizeX@#1}%
@@ -16769,7 +16869,7 @@
% the user may initiate these penalties to indicate good and bad
% places in the stanza for page breaking.
% \begin{macrocode}
-\newcommandx{\stanza@line}[1][1]{
+\newcommandx{\stanza@line}[2][1,2,usedefault]{%
\ifnum\value{stanzaindentsrepetition}=0
\ifcsdef{sza@\number\stanza@count @}%
{%
@@ -16786,7 +16886,8 @@
\led@err@StanzaIndentNotDefined%
}%
\fi
- \pstart[#1]\stanza@hang\ignorespaces}
+ \pstart[#1][#2]\stanza@hang\ignorespaces%
+}%
\xdef\stanza@hang{\noexpand\leavevmode\noexpand\startlock
\hangindent\expandafter
\noexpand\csname sza@0@\endcsname\stanzaindentbase
@@ -16808,6 +16909,8 @@
% \begin{macro}{\@stopstanza}
% \begin{macro}{\AtEveryStopStanza}
% \begin{macro}{\AtEveryStanza}
+% \begin{macro}{\AtStartEveryStanza}
+% \begin{macro}{\BeforeEveryStopStanza}
% \begin{macro}{\newverse}
% \changes{v1.6.0}{2013/10/09}{Add \protect\cs{falseverse} macro.}
% Now we have the components of the \protect\cs{stanza} macro,
@@ -16827,7 +16930,7 @@
%
%
% \begin{macrocode}
-\xdef\@startstanza[#1]{%
+\xdef\@startstanza[#1][#2]{%
\noexpand\instanzatrue\expandafter
\begingroup%
\catcode`\noexpand\&\active%
@@ -16842,46 +16945,76 @@
\noexpand\newverse[][]}%
\def\noexpand\&{\noexpand\@stopstanza}%
\noexpand\@advancestanzanumber%
- \noexpand\stanza@line[#1]%
+ \noexpand\stanza@line[#1][#2]%
\noexpand\@insertstanzanumber%
\let\par\relax\ignorespaces%No paragraph in verses
}
-\newcommandx{\stanza}[1][1,usedefault]{%
- \ifboolexpr{not test{\ifdefvoid{\at@every@stanza}} and test{\ifstrempty{#1}}}%
- {\@startstanza[\at@every@stanza]}%
- {\@startstanza[#1]}%
+\newcommandx{\stanza}[2][1,2,usedefault]{%
+ \ifboolexpr{%
+ not test{\ifdefvoid{\at@every@stanza}}%
+ and test{\ifstrempty{#1}}%
+ and test{\ifstrempty{#2}}}%
+ {\@startstanza[][\at@every@stanza]\at@start@every@stanza}%
+ {\@startstanza[#1][#2]\at@start@every@stanza}%
}%
-\newcommandx{\@stopstanza}[1][1,usedefault]{%
+\newcommandx{\@stopstanza}[2][1,2,usedefault]{%
\unskip%
\endlock%
- \ifboolexpr{not test{\ifdefvoid{\at@every@stop@stanza}} and test{\ifstrempty{#1}}}%
- {\pend[\at@every@stop@stanza]}%
- {\pend[#1]}%
+ \ifboolexpr{%
+ not test{\ifdefvoid{\at@every@stop@stanza}}%
+ and test{\ifstrempty{#1}}%
+ and test{\ifstrempty{#2}}}%
+ {\before@every@stop@stanza\pend[][\at@every@stop@stanza]}%
+ {\before@every@stop@stanza\pend[#1][#2]}%
\endgroup%
\instanzafalse%
}
\newcommand{\AtEveryStopStanza}[1]{%
\ifstrempty{#1}%
- {\xdef\at@every@stop@stanza{}}%
+ {\gdef\at@every@stop@stanza{}}%
+ {\gdef\at@every@stop@stanza{\noindent#1}}%
+}%
+\WithSuffix\newcommand\AtEveryStopStanza*[1]{%
+ \ifstrempty{#1}%
+ {\gdef\at@every@stop@stanza{}}%
{\gdef\at@every@stop@stanza{#1}}%
}%
\def\at@every@stop@stanza{}%
\newcommand{\AtEveryStanza}[1]{%
\ifstrempty{#1}%
- {\xdef\at@every@stanza{}}%
+ {\gdef\at@every@stanza{}}%
+ {\gdef\at@every@stanza{\noindent#1}}%
+}%
+\WithSuffix\newcommand\AtEveryStanza*[1]{%
+ \ifstrempty{#1}%
+ {\gdef\at@every@stanza{}}%
{\gdef\at@every@stanza{#1}}%
}%
-\def\at@every@stanza{}%
-\newcommandx*{\newverse}[2][1,2,usedefault]{%
+
+\newcommand{\AtStartEveryStanza}[1]{%
+ \ifstrempty{#1}%
+ {\gdef\at@start@every@stanza{}}%
+ {\gdef\at@start@every@stanza{#1}}%
+}%
+\def\at@start@every@stanza{}%
+
+\newcommand{\BeforeEveryStopStanza}[1]{%
+ \ifstrempty{#1}%
+ {\gdef\before@every@stop@stanza{}}%
+ {\gdef\before@every@stop@stanza{#1}}%
+}%
+\def\before@every@stop@stanza{}%
+
+\newcommandx*{\newverse}[4][1,2,3,4,usedefault]{%
\unskip%
- \endlock\pend[#1]\sza@penalty\global%
- \advance\stanza@count\@ne\stanza@line[#2]%
+ \endlock\pend[#1][#3]\sza@penalty\global%
+ \advance\stanza@count\@ne\stanza@line[#2][#4]%
}
% \end{macrocode}
@@ -16891,6 +17024,8 @@
% \end{macro}
% \end{macro}
% \end{macro}
+% \end{macro}
+% \end{macro}
% \begin{macro}{\flagstanza}
% Use \verb?\flagstanza[len]{text}? at the start of a line to put \texttt{text}
% a distance \texttt{len} before the start of the line. The default for
@@ -16925,7 +17060,7 @@
% \begin{macro}{\msdata}
% \begin{macro}{\msdata@c}
% \begin{macro}{\msdata@cR}
-% The user level \cs{msdata} command only writes the manuscripts data in numbered auxiliary file. There is two associated etoolbox counter.
+% The user level \cs{msdata} command only writes the manuscripts data in numbered auxiliary file. There are two associated etoolbox counters.
% \begin{macrocode}
\def\msdata@c{}%
\def\msdata@cR{}%
@@ -19133,7 +19268,9 @@
% And now, the user sectioning commands, which write to the file, and also add content as a ``normal'' line.
% \begin{macrocode}
\newcommand{\eledchapter}[2][]{%
- #2%
+ \disable@familiarnotes%
+ #2%
+ \restore@familiarnotes%
\ifledRcol%
\immediate\write\eled@sectioningR@out{%
\string\eled@chapter{#1}{\unexpanded{#2}}{\the\l@dnumpstartsR}{}{R}
@@ -19146,7 +19283,9 @@
}
\newcommand{\eledsection}[2][]{%
+ \disable@familiarnotes%
#2%
+ \restore@familiarnotes%
\ifledRcol%
\immediate\write\eled@sectioningR@out{%
\string\eled@section{#1}{\unexpanded{#2}}{\the\l@dnumpstartsR}{}{R}
@@ -19159,7 +19298,9 @@
}
\newcommand{\eledsubsection}[2][]{%
+ \disable@familiarnotes%
#2%
+ \restore@familiarnotes%
\ifledRcol%
\immediate\write\eled@sectioningR@out{%
\string\eled@subsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsR}{}{R}
@@ -19171,7 +19312,9 @@
\fi%
}
\newcommand{\eledsubsubsection}[2][]{%
+ \disable@familiarnotes%
#2%
+ \restore@familiarnotes%
\ifledRcol%
\immediate\write\eled@sectioningR@out{%
\string\eled@subsubsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsR}{}{R}
@@ -19185,7 +19328,9 @@
\WithSuffix\newcommand\eledchapter*[2][]{%
+ \disable@familiarnotes%
#2%
+ \restore@familiarnotes%
\ifledRcol%
\immediate\write\eled@sectioningR@out{%
\string\eled@chapter{#1}{\unexpanded{#2}}{\the\l@dnumpstartsR}{*}{R}
@@ -19198,7 +19343,9 @@
}
\WithSuffix\newcommand\eledsection*[2][]{%
+ \disable@familiarnotes%
#2%
+ \restore@familiarnotes%
\ifledRcol%
\immediate\write\eled@sectioningR@out{%
\string\eled@section{#1}{\unexpanded{#2}}{\the\l@dnumpstartsR}{*}{R}
@@ -19211,7 +19358,9 @@
}
\WithSuffix\newcommand\eledsubsection*[2][]{%
+ \disable@familiarnotes%
#2%
+ \restore@familiarnotes%
\ifledRcol%
\immediate\write\eled@sectioningR@out{%
\string\eled@subsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsR}{*}{R}
@@ -19224,7 +19373,9 @@
}
\WithSuffix\newcommand\eledsubsubsection*[2][]{%
+ \disable@familiarnotes%
#2%
+ \restore@familiarnotes%
\ifledRcol%
\immediate\write\eled@sectioningR@out{%
\string\eled@subsubsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsR}{*}{R}
diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
index 29bf4e21228..ff0fd4be971 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
@@ -303,6 +303,7 @@
% \changes{v2.17.1}{2017/03/26}{Fix bug with \protect\option{prevpgstyle} option when not using \protect\option{prevpgnotnumbered}.}
% \changes{v2.17.3}{2017/04/20}{Fix bug when using multiple sidenotes on the same line, on right side.}
% \changes{v2.17.4}{2017/04/28}{Fix bugs with sublines in parallel typesetting.}
+% \changes{v2.18.0}{2017/05/04}{Compatibility with v2.20.0 of \protect\reledmac.}
% ^^A PW added following as the definitions are at some unknown elsewhere
%
% \newcommand{\egstart}{%
@@ -584,6 +585,23 @@
% If you want to have continuous line numbers between multiple columns and single columns, use the \option{continuousnumberingwithcolumns} option when loading \macpackage or \parpackage.
% You will need to use \cs{pausenumbering}\ldots\cs{resumenumbering} instead of \cs{endnumbering}\ldots{endnumbering} (see \reff{reledmac-pause}).
%
+% \subsection{Note about \cs{AtEveryPstart*} and \cs{AtEveryPend*}}
+% The content of \cs{AtEveryPstart} / \cs{AtEveryPend} (without star) is added before every \cs{pstart} / after every \cs{pend}, respecting the left / right side.
+%
+% The content of \cs{AtEveryPstart*} / \cs{AtEveryPend*} (with star) is added before every \cs{pstart} / after every \cs{pend}, but there is no distinction between left and right sides.
+%
+% However, as this content is also added when we typeset pages in parallel, \reledmac must add it once for left \cs{pstart} and once for right \cs{pstart}.
+% So if you use it to add vertical spacing, it will be problematic in parallel columns, as you will have two times the vertical spacing, vertical spacing will be twice as large as expected.
+% A solution is to add a test inside to make distinction between columns parallel typesetting / page parallel typesetting.
+% \begin{verbatim}
+%\AtEveryPstart*{%
+%\ifl@dprintingcolumns
+% \vspace{0.125\baselineskip}
+%\else
+% \vspace{0.25\baselineskip}
+%\fi
+%}
+% \end{verbatim}
% \section{Keeping translation in the outside/inside column}
% By default, \parpackage works with left and right columns.
% However, it is possible to work with inner and outer column.
@@ -810,7 +828,7 @@
%
% Notice that these options just tell you \LaTeX\ to not continue long notes on the other side.
% It is not designed to allow you to call footnotes on one side but print them on the other side.
-% \subsubsection{Familiar notes called in the right side, but to be printed in the left side}\label{reledpar-nomk}
+% \subsubsection{Familiar notes called on the right side, but to be printed on the left side}\label{reledpar-nomk}
% \DescribeMacro{\footnoteXnomk}
% \DescribeMacro{\footnoteXmk}
% As often happens, the left side has less room for text.
@@ -925,6 +943,11 @@
% It is possible to insert a number at every \protect\cs{pstart} command.
% You must use the \DescribeMacro{\numberpstarttrue}\protect\cs{numberpstarttrue} command to have it.
% You can stop the numbering with \DescribeMacro{\numberpstartfalse}\protect\cs{numberpstartfalse}.
+%
+% You can modify the number by changing the values of \verb+pstartL+ and \verb+pstartR+ counter (for left and right side, respectivly). For example:
+% \begin{verbatim}
+% \setcounter{pstartL}{0}% To reset the counter of pstart for Left side.
+% \end{verbatim}
% You can redefine the commands \DescribeMacro{\thepstartL}\protect\cs{thepstartL} and \DescribeMacro{\thepstartR}\protect\cs{thepstartR} to change style.
% The numbering restarts on each \protect\cs{beginnumbering}.
%
@@ -1258,7 +1281,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2017/04/28 v2.17.4 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2017/05/04 v2.18.0 reledmac extension for parallel texts]%
% \end{macrocode}
% \subsection{Package's requirement}
@@ -1395,7 +1418,7 @@
% \begin{macro}{\Lcolwidth}
% \begin{macro}{\Rcolwidth}
% The widths of the left and right parallel columns (or pages).
-% The suffixed version are not manipulated directly by user, but we use them to be certain to have the same coldwitdh in \env{pages} environment and in \cs{Pages} command.
+% The suffixed versions are not manipulated directly by user, but we use them to be certain to have the same coldwitdh in the \env{pages} environment and in the \cs{Pages} command.
% \begin{macrocode}
\newdimen\Lcolwidth
\Lcolwidth=0.45\textwidth
@@ -3222,8 +3245,8 @@
\let\pend\pendL
\let\memorydump\memorydumpL
\Leftsidehook
- \let\old@startstanza\@startstanza
- \def\@startstanza[##1]{\global\instanzaLtrue\old@startstanza[##1]}
+ \let\old@startstanza\@startstanza%
+ \def\@startstanza[##1][##2]{\global\instanzaLtrue\old@startstanza[##1][##2]}%
}{
\expandafter\ifvoid\csname l@dLcolrawbox1\endcsname%
\led@error@missing@numbering{Leftside}%
@@ -3275,8 +3298,8 @@
\let\lednopb\lednopbR
\let\lineation\lineationR
\Rightsidehook
- \let\old@startstanza\@startstanza
- \def\@startstanza[##1]{\global\instanzaRtrue\old@startstanza[##1]}
+ \let\old@startstanza\@startstanza%
+ \def\@startstanza[##1][##2]{\global\instanzaRtrue\old@startstanza[##1][##2]}%
}{%
\ledRcolfalse
\expandafter\ifvoid\csname l@dRcolrawbox1\endcsname%
@@ -3359,7 +3382,7 @@
\newcounter{pstartR}
\renewcommand{\thepstartR}{{\bfseries\@arabic\c@pstartR}. }
-\newcommandx*{\pstartL}[1][1]{%
+\newcommandx*{\pstartL}[2][1,2,usedefault]{%
\if@nobreak%
\let\@oldnobreak\@nobreaktrue%
\else%
@@ -3415,6 +3438,7 @@
\fi%
\fi%
\fi%
+ \@at@start@every@pstart%
\hsize=\Lcolwidth%
\numberedpar@true%
\iflabelpstart\protected@edef\@currentlabel%
@@ -3422,9 +3446,30 @@
% \end{macrocode}
% Dump the optional arguments
% \begin{macrocode}
- \ifstrempty{#1}%
- {\csgdef{before@pstartL@\the\l@dnumpstartsL}{\at@every@pstart}}%
- {\csgdef{before@pstartL@\the\l@dnumpstartsL}{\noindent#1}}%
+ \providetoggle{before@pstartL@\the\l@dnumpstartsL @par}%
+ \ifboolexpr{%
+ test {\ifstrempty{#1}}%
+ and test {\ifstrempty{#2}}%
+ }%
+ {%
+ \ifat@every@pstart@star@%
+ \global\togglefalse{before@pstartL@\the\l@dnumpstartsL @par}%
+ \else%
+ \global\toggletrue{before@pstartL@\the\l@dnumpstartsL @par}%
+ \fi%
+ \csgdef{before@pstartL@\the\l@dnumpstartsL}{\at@every@pstart}%
+ }%
+ {%
+ \ifstrempty{#1}{}{%
+ \global\toggletrue{before@pstartL@\the\l@dnumpstartsL @par}%
+ \csgdef{before@pstartL@\the\l@dnumpstartsL}{\noindent#1}%
+ }%
+ \ifstrempty{#2}{}%
+ {%
+ \csgdef{before@pstartL@\the\l@dnumpstartsL}{#2}%
+ \global\togglefalse{before@pstartL@\the\l@dnumpstartsL @par}%
+ }%
+ }%
\at@every@pstart@call%
% \end{macrocode}
% Gobble following space (automatically done if there is no optional argument)
@@ -3437,7 +3482,7 @@
% The same for right side.
%
% \begin{macrocode}
-\newcommandx*{\pstartR}[1][1]{%
+\newcommandx*{\pstartR}[2][1,2,usedefault]{%
\if@nobreak%
\let\@oldnobreak\@nobreaktrue%
\else%
@@ -3477,13 +3522,35 @@
\fi%
\fi%
\fi%
+ \@at@start@every@pstart%
\hsize=\Rcolwidth%
\numberedpar@true%
\iflabelpstart\protected@edef\@currentlabel%
{\p@pstartR\thepstartR}\fi%
- \ifstrempty{#1}%
- {\csgdef{before@pstartR@\the\l@dnumpstartsR}{\at@every@pstart}}%
- {\csgdef{before@pstartR@\the\l@dnumpstartsR}{\noindent#1}}%
+ \providetoggle{before@pstartR@\the\l@dnumpstartsR @par}%
+ \ifboolexpr{%
+ test {\ifstrempty{#1}}%
+ and test {\ifstrempty{#2}}%
+ }%
+ {%
+ \ifat@every@pstart@star@%
+ \global\togglefalse{before@pstartR@\the\l@dnumpstartsR @par}%
+ \else%
+ \global\toggletrue{before@pstartR@\the\l@dnumpstartsR @par}%
+ \fi%
+ \csgdef{before@pstartR@\the\l@dnumpstartsR}{\at@every@pstart}%
+ }%
+ {%
+ \ifstrempty{#1}{}{%
+ \global\toggletrue{before@pstartR@\the\l@dnumpstartsR @par}%
+ \csgdef{before@pstartR@\the\l@dnumpstartsR}{\noindent#1}%
+ }%
+ \ifstrempty{#2}{}%
+ {%
+ \csgdef{before@pstartR@\the\l@dnumpstartsR}{#2}%
+ \global\togglefalse{before@pstartR@\the\l@dnumpstartsR @par}%
+ }%
+ }%
\at@every@pstart@call%
\ignorespaces%
}
@@ -3500,7 +3567,7 @@
% that knows about left parallel texts.
%
% \begin{macrocode}
-\newcommandx*{\pendL}[1][1]{%
+\newcommandx*{\pendL}[2][1,2,usedefault]{%
\ifnumbering \else%
\led@err@PendNotNumbered%
\fi%
@@ -3513,6 +3580,7 @@
% be no large interline penalties to prevent us from slicing the
% paragraph into pieces.
% \begin{macrocode}
+ \@at@end@every@pend%
\endgraf\global\num@lines=\prevgraf\egroup%
\global\par@line=0%
% \end{macrocode}
@@ -3529,10 +3597,31 @@
% \end{macrocode}
% Dump content of the optional argument.
% \begin{macrocode}
- \ifstrempty{#1}%
- {\csgdef{after@pendL@\the\l@dnumpstartsL}{\at@every@pend}}%
- {\csgdef{after@pendL@\the\l@dnumpstartsL}{\noindent#1}}%
- }
+ \providetoggle{after@pendL@\the\l@dnumpstartsL @par}%
+ \ifboolexpr{%
+ test {\ifstrempty{#1}}%
+ and test {\ifstrempty{#2}}%
+ }%
+ {%
+ \ifat@every@pend@star@%
+ \global\togglefalse{after@pendL@\the\l@dnumpstartsL @par}%
+ \else%
+ \global\toggletrue{after@pendL@\the\l@dnumpstartsL @par}%
+ \fi%
+ \csgdef{after@pendL@\the\l@dnumpstartsL}{\at@every@pend}%
+ }%
+ {%
+ \ifstrempty{#1}{}{%
+ \global\toggletrue{after@pendL@\the\l@dnumpstartsL @par}%
+ \csgdef{after@pendL@\the\l@dnumpstartsL}{\noindent#1}%
+ }%
+ \ifstrempty{#2}{}%
+ {%
+ \csgdef{after@pendL@\the\l@dnumpstartsL}{#2}%
+ \global\togglefalse{after@pendL@\the\l@dnumpstartsL @par}%
+ }%
+ }%
+}%
% \end{macrocode}
% \end{macro}
%
@@ -3542,13 +3631,14 @@
% The version of \protect\cs{pend} needed for right texts.
%
% \begin{macrocode}
-\newcommandx*{\pendR}[1][1]{%
+\newcommandx*{\pendR}[2][1,2,usedefault]{%
\ifnumberingR \else%
\led@err@PendNotNumbered%
\fi%
\ifnumberedpar@ \else%
\led@err@PendNoPstart%
\fi%
+ \@at@end@every@pend%
\endgraf\global\num@linesR=\prevgraf\egroup%
\global\par@lineR=0%
\endgroup%
@@ -3559,9 +3649,28 @@
\addtocounter{pstartR}{1}%
\fi%
\parledgroup@beforenotes@save{R}%
- \ifstrempty{#1}%
- {\csgdef{after@pendR@\the\l@dnumpstartsR}{\at@every@pend}}%
- {\csgdef{after@pendR@\the\l@dnumpstartsR}{\noindent#1}}%
+ \providetoggle{after@pendR@\the\l@dnumpstartsR @par}%
+ \ifboolexpr{%
+ test {\ifstrempty{#1}}%
+ and test {\ifstrempty{#2}}%
+ }%
+ {%
+ \ifat@every@pend@star@%
+ \global\togglefalse{after@pendR@\the\l@dnumpstartsR @par}%
+ \else%
+ \global\toggletrue{after@pendR@\the\l@dnumpstartsR @par}%
+ \fi%
+ \csgdef{after@pendR@\the\l@dnumpstartsR}{\at@every@pend}}%
+ {%
+ \ifstrempty{#1}{}{%
+ \csgdef{after@pendR@\the\l@dnumpstartsR}{\noindent#1}%
+ \global\toggletrue{after@pendR@\the\l@dnumpstartsR @par}%
+ }%
+ \ifstrempty{#2}{}{%
+ \csgdef{after@pendR@\the\l@dnumpstartsR}{#2}%
+ \global\togglefalse{after@pendR@\the\l@dnumpstartsR @par}%
+ }%
+ }%
}
% \end{macrocode}
@@ -4929,7 +5038,7 @@
% its stanza-like contents as a single chunk.
%
% \begin{macrocode}
-\newenvironment{astanza}[1][]{%
+\newenvironment{astanza}[2][1,2,usedefault]{%
\catcode`\&\active
\global\stanza@count\@ne\stanza@modulo\@ne
\ifnum\usenamecount{sza@0@}=\z@
@@ -4947,9 +5056,12 @@
\global\advance\stanza@count\@ne
\@astanza@line}%
\def\&{\@stopastanza}%
- \ifboolexpr{not test{\ifdefvoid{\at@every@stanza}} and test{\ifstrempty{#1}}}%
- {\pstart[\at@every@stanza]}%
- {\pstart[#1]}%
+ \ifboolexpr{%
+ not test{\ifdefvoid{\at@every@stanza}}%
+ and test{\ifstrempty{#1}}%
+ and test{\ifstrempty{#2}}}%
+ {\pstart[][\at@every@stanza]\at@start@every@stanza}%
+ {\pstart[#1][#2]\at@start@every@stanza}%
\@astanza@line
\let\par\relax\ignorespaces%No paragraph in verses
}{}
@@ -4961,11 +5073,15 @@
% This command is called by \verb+\&+ in \env{astanza} environment.
% It allows optional arguments.
% \begin{macrocode}
-\newcommandx{\@stopastanza}[1][1,usedefault]{%
+\newcommandx{\@stopastanza}[2][1,2,usedefault]{%
\endlock\mbox{}%
- \ifboolexpr{not test{\ifdefvoid{\at@every@stop@stanza}} and test{\ifstrempty{#1}}}%
- {\pend[\at@every@stop@stanza]}%
- {\pend[#1]}%
+ \ifboolexpr{%
+ not test{\ifdefvoid{\at@every@stop@stanza}}%
+ and test{\ifstrempty{#1}}%
+ and test{\ifstrempty{#2}}%
+ }%
+ {\before@every@stop@stanza\pend[][\at@every@stop@stanza]}%
+ {\before@every@stop@stanza\pend[#1][#2]}%
}%
% \end{macrocode}
% \end{macro}
@@ -5798,6 +5914,10 @@
and test {\ifdefempty{\at@every@pstart}}}%
{}%
{%
+ \ifboolexpr{not togl{before@pstartR@\the\l@dpscR @par} and not togl{before@pstartL@\the\l@dpscL @par}}{%
+ \csuse{before@pstartL@\the\l@dpscL}%
+ \csuse{before@pstartR@\the\l@dpscR}%
+ }{%
\hb@xt@ \hsize{%
\ifdefstring{\columns@position}{L}{}{\hfill }%
\par\parbox[t][][t]{\Lcolwidth}{%
@@ -5809,7 +5929,8 @@
\csuse{before@pstartR@\the\l@dpscR}%
}%
\ifdefstring{\columns@position}{R}{}{\hfill}%
- }%
+ }%
+ }%
}%
\global\csundef{before@pstartL@\the\l@dpscL}%
\global\csundef{before@pstartR@\the\l@dpscR}%
@@ -5821,6 +5942,10 @@
and test {\ifdefempty{\at@every@pend}}}%
{}%
{%
+ \ifboolexpr{not togl{after@pendR@\the\l@dpscR @par} and not togl{after@pendL@\the\l@dpscL @par}}{%
+ \csuse{after@pendL@\the\l@dpscL}%
+ \csuse{after@pendR@\the\l@dpscR}%
+ }{%
\hb@xt@ \hsize{%
\ifdefstring{\columns@position}{L}{}{\hfill }%
\parbox[t][][t]{\Lcolwidth}{%
@@ -5833,6 +5958,7 @@
}%
\ifdefstring{\columns@position}{R}{}{\hfill}%
}%
+ }%
}%
\global\csundef{after@pendL@\the\l@dpscL}%
\global\csundef{after@pendR@\the\l@dpscR}%
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index 2ce474fae86..bcbc5f2f06f 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}[2017/04/12 v2.19.0 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2017/05/04 v2.20.0 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}}
@@ -1649,12 +1649,27 @@
\newbox\one@line
\newcount\par@line
+\newcommand{\AtStartEveryPstart}[1]{%
+ \ifstrempty{#1}%
+ {\gdef\@at@start@every@pstart{}}%
+ {\gdef\@at@start@every@pstart{#1}}%
+}%
+\def\@at@start@every@pstart{}%
+
+\newif\ifat@every@pstart@star@%
\newcommand{\AtEveryPstart}[1]{%
\ifstrempty{#1}%
- {\xdef\at@every@pstart{}}%
+ {\gdef\at@every@pstart{}}%
{\gdef\at@every@pstart{\noindent#1}}%
+ \global\at@every@pstart@star@false%
}%
-\xdef\at@every@pstart{}%
+\WithSuffix\newcommand\AtEveryPstart*[1]{%
+ \ifstrempty{#1}%
+ {\gdef\at@every@pstart{}}%
+ {\gdef\at@every@pstart{#1}}%
+ \global\at@every@pstart@star@true%
+}%
+\def\at@every@pstart{}%
\newcounter{pstart}
\renewcommand{\thepstart}{{\bfseries\@arabic\c@pstart}. }
@@ -1662,9 +1677,17 @@
\numberpstartfalse
\newif\iflabelpstart
\labelpstartfalse
-\newcommandx*{\pstart}[1][1]{%
+\newcommandx*{\pstart}[2][1,2,usedefault]{%
\normal@pars%
- \ifstrempty{#1}{\at@every@pstart}{\noindent#1}%
+ \ifboolexpr{%
+ test {\ifstrempty{#1}}%
+ and test {\ifstrempty{#2}}%
+ }%
+ {\at@every@pstart}%
+ {%
+ \ifstrempty{#1}{}{\noindent#1}%
+ \ifstrempty{#2}{}{#2}%
+ }%
\ifautopar%
\autopar%
\fi%
@@ -1705,9 +1728,10 @@
{\p@pstart\thepstart}
\fi%
\l@dzeropenalties%
+ \@at@start@every@pstart%
\ignorespaces%because not automatically ignored if an optional argument is used (classical TeX behavior for space after commands)
}
-\newcommandx*{\pend}[1][1]{\ifnumbering \else%
+\newcommandx*{\pend}[2][1,2,usedefault]{\ifnumbering \else%
\led@err@PendNotNumbered%
\fi%
\global\l@dskipversenumberfalse%
@@ -1715,6 +1739,7 @@
\led@err@PendNoPstart%
\fi%
\l@dzeropenalties%
+ \@at@end@every@pend%
\endgraf\global\num@lines=\prevgraf\egroup%
\global\par@line=0%
\csnumdef{pstartline}{0}%
@@ -1738,20 +1763,42 @@
\fi%
\addtocounter{pstart}{1}%
\normal@pars%
- \ifstrempty{#1}{\at@every@pend}{\noindent#1}%
+ \ifboolexpr{%
+ test {\ifstrempty{#1}}%
+ and test {\ifstrempty{#2}}%
+ }%
+ {\at@every@pend}%
+ {%
+ \ifstrempty{#1}{}{\noindent#1}%
+ \ifstrempty{#2}{}{#2}%
+ }%
\@nobreakfalse%
\ifautopar%
\autopar%
\fi%
}
+\newif\ifat@every@pend@star@%
\newcommand{\AtEveryPend}[1]{%
\ifstrempty{#1}%
- {\xdef\at@every@pend{}}%
+ {\gdef\at@every@pend{}}%
{\gdef\at@every@pend{\noindent#1}}%
+ \global\at@every@pend@star@false%
+}%
+\WithSuffix\newcommand\AtEveryPend*[1]{%
+ \ifstrempty{#1}%
+ {\gdef\at@every@pend{}}%
+ {\gdef\at@every@pend{#1}}%
+ \global\at@every@pend@star@true%
}%
\xdef\at@every@pend{}%
+\newcommand{\AtEndEveryPend}[1]{%
+ \ifstrempty{#1}%
+ {\xdef\@at@end@every@pend{}}%
+ {\gdef\@at@end@every@pend{#1}}%
+}%
+\def\@at@end@every@pend{}%
\newcommand*{\l@dzeropenalties}{%
\brokenpenalty \z@ \clubpenalty \z@
\displaywidowpenalty \z@ \interlinepenalty \z@ \predisplaypenalty \z@
@@ -3389,6 +3436,7 @@
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnoteX}[2]{%
\csuse{beforeinsertingX@#1}%
\insert\@nameuse{footins#1}\bgroup
+ \reset@font%
\hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax%
\noindent\csuse{bhooknoteX@#1}%
\csuse{notefontsizeX@#1}%
@@ -6686,7 +6734,7 @@
}%
}
-\newcommandx{\stanza@line}[1][1]{
+\newcommandx{\stanza@line}[2][1,2,usedefault]{%
\ifnum\value{stanzaindentsrepetition}=0
\ifcsdef{sza@\number\stanza@count @}%
{%
@@ -6703,7 +6751,8 @@
\led@err@StanzaIndentNotDefined%
}%
\fi
- \pstart[#1]\stanza@hang\ignorespaces}
+ \pstart[#1][#2]\stanza@hang\ignorespaces%
+}%
\xdef\stanza@hang{\noexpand\leavevmode\noexpand\startlock
\hangindent\expandafter
\noexpand\csname sza@0@\endcsname\stanzaindentbase
@@ -6711,7 +6760,7 @@
\def\sza@penalty{\count@\csname szp@\number\stanza@count @\endcsname
\ifnum\count@>\@M\advance\count@-\@M\penalty-\else
\penalty\fi\count@}
-\xdef\@startstanza[#1]{%
+\xdef\@startstanza[#1][#2]{%
\noexpand\instanzatrue\expandafter
\begingroup%
\catcode`\noexpand\&\active%
@@ -6726,45 +6775,74 @@
\noexpand\newverse[][]}%
\def\noexpand\&{\noexpand\@stopstanza}%
\noexpand\@advancestanzanumber%
- \noexpand\stanza@line[#1]%
+ \noexpand\stanza@line[#1][#2]%
\noexpand\@insertstanzanumber%
\let\par\relax\ignorespaces%No paragraph in verses
}
-\newcommandx{\stanza}[1][1,usedefault]{%
- \ifboolexpr{not test{\ifdefvoid{\at@every@stanza}} and test{\ifstrempty{#1}}}%
- {\@startstanza[\at@every@stanza]}%
- {\@startstanza[#1]}%
+\newcommandx{\stanza}[2][1,2,usedefault]{%
+ \ifboolexpr{%
+ not test{\ifdefvoid{\at@every@stanza}}%
+ and test{\ifstrempty{#1}}%
+ and test{\ifstrempty{#2}}}%
+ {\@startstanza[][\at@every@stanza]\at@start@every@stanza}%
+ {\@startstanza[#1][#2]\at@start@every@stanza}%
}%
-\newcommandx{\@stopstanza}[1][1,usedefault]{%
+\newcommandx{\@stopstanza}[2][1,2,usedefault]{%
\unskip%
\endlock%
- \ifboolexpr{not test{\ifdefvoid{\at@every@stop@stanza}} and test{\ifstrempty{#1}}}%
- {\pend[\at@every@stop@stanza]}%
- {\pend[#1]}%
+ \ifboolexpr{%
+ not test{\ifdefvoid{\at@every@stop@stanza}}%
+ and test{\ifstrempty{#1}}%
+ and test{\ifstrempty{#2}}}%
+ {\before@every@stop@stanza\pend[][\at@every@stop@stanza]}%
+ {\before@every@stop@stanza\pend[#1][#2]}%
\endgroup%
\instanzafalse%
}
\newcommand{\AtEveryStopStanza}[1]{%
\ifstrempty{#1}%
- {\xdef\at@every@stop@stanza{}}%
+ {\gdef\at@every@stop@stanza{}}%
+ {\gdef\at@every@stop@stanza{\noindent#1}}%
+}%
+\WithSuffix\newcommand\AtEveryStopStanza*[1]{%
+ \ifstrempty{#1}%
+ {\gdef\at@every@stop@stanza{}}%
{\gdef\at@every@stop@stanza{#1}}%
}%
\def\at@every@stop@stanza{}%
\newcommand{\AtEveryStanza}[1]{%
\ifstrempty{#1}%
- {\xdef\at@every@stanza{}}%
+ {\gdef\at@every@stanza{}}%
+ {\gdef\at@every@stanza{\noindent#1}}%
+}%
+\WithSuffix\newcommand\AtEveryStanza*[1]{%
+ \ifstrempty{#1}%
+ {\gdef\at@every@stanza{}}%
{\gdef\at@every@stanza{#1}}%
}%
-\def\at@every@stanza{}%
-\newcommandx*{\newverse}[2][1,2,usedefault]{%
+\newcommand{\AtStartEveryStanza}[1]{%
+ \ifstrempty{#1}%
+ {\gdef\at@start@every@stanza{}}%
+ {\gdef\at@start@every@stanza{#1}}%
+}%
+\def\at@start@every@stanza{}%
+
+\newcommand{\BeforeEveryStopStanza}[1]{%
+ \ifstrempty{#1}%
+ {\gdef\before@every@stop@stanza{}}%
+ {\gdef\before@every@stop@stanza{#1}}%
+}%
+\def\before@every@stop@stanza{}%
+
+\newcommandx*{\newverse}[4][1,2,3,4,usedefault]{%
\unskip%
- \endlock\pend[#1]\sza@penalty\global%
- \advance\stanza@count\@ne\stanza@line[#2]%
+ \endlock\pend[#1][#3]\sza@penalty\global%
+ \advance\stanza@count\@ne\stanza@line[#2][#4]%
}
\newcommand*{\flagstanza}[2][\stanzaindentbase]{%
@@ -8018,7 +8096,9 @@
\notbool{@noeled@sec}{%
\newwrite\eled@sectioning@out
\newcommand{\eledchapter}[2][]{%
+ \disable@familiarnotes%
#2%
+ \restore@familiarnotes%
\ifledRcol%
\immediate\write\eled@sectioningR@out{%
\string\eled@chapter{#1}{\unexpanded{#2}}{\the\l@dnumpstartsR}{}{R}
@@ -8031,7 +8111,9 @@
}
\newcommand{\eledsection}[2][]{%
+ \disable@familiarnotes%
#2%
+ \restore@familiarnotes%
\ifledRcol%
\immediate\write\eled@sectioningR@out{%
\string\eled@section{#1}{\unexpanded{#2}}{\the\l@dnumpstartsR}{}{R}
@@ -8044,7 +8126,9 @@
}
\newcommand{\eledsubsection}[2][]{%
+ \disable@familiarnotes%
#2%
+ \restore@familiarnotes%
\ifledRcol%
\immediate\write\eled@sectioningR@out{%
\string\eled@subsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsR}{}{R}
@@ -8056,7 +8140,9 @@
\fi%
}
\newcommand{\eledsubsubsection}[2][]{%
+ \disable@familiarnotes%
#2%
+ \restore@familiarnotes%
\ifledRcol%
\immediate\write\eled@sectioningR@out{%
\string\eled@subsubsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsR}{}{R}
@@ -8069,7 +8155,9 @@
}
\WithSuffix\newcommand\eledchapter*[2][]{%
+ \disable@familiarnotes%
#2%
+ \restore@familiarnotes%
\ifledRcol%
\immediate\write\eled@sectioningR@out{%
\string\eled@chapter{#1}{\unexpanded{#2}}{\the\l@dnumpstartsR}{*}{R}
@@ -8082,7 +8170,9 @@
}
\WithSuffix\newcommand\eledsection*[2][]{%
+ \disable@familiarnotes%
#2%
+ \restore@familiarnotes%
\ifledRcol%
\immediate\write\eled@sectioningR@out{%
\string\eled@section{#1}{\unexpanded{#2}}{\the\l@dnumpstartsR}{*}{R}
@@ -8095,7 +8185,9 @@
}
\WithSuffix\newcommand\eledsubsection*[2][]{%
+ \disable@familiarnotes%
#2%
+ \restore@familiarnotes%
\ifledRcol%
\immediate\write\eled@sectioningR@out{%
\string\eled@subsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsR}{*}{R}
@@ -8108,7 +8200,9 @@
}
\WithSuffix\newcommand\eledsubsubsection*[2][]{%
+ \disable@familiarnotes%
#2%
+ \restore@familiarnotes%
\ifledRcol%
\immediate\write\eled@sectioningR@out{%
\string\eled@subsubsection{#1}{\unexpanded{#2}}{\the\l@dnumpstartsR}{*}{R}
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index e1f0f7648f4..0e7091efa6a 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -29,7 +29,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledpar}[2017/04/28 v2.17.4 reledmac extension for parallel texts]%
+\ProvidesPackage{reledpar}[2017/05/04 v2.18.0 reledmac extension for parallel texts]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
@@ -854,8 +854,8 @@
\let\pend\pendL
\let\memorydump\memorydumpL
\Leftsidehook
- \let\old@startstanza\@startstanza
- \def\@startstanza[##1]{\global\instanzaLtrue\old@startstanza[##1]}
+ \let\old@startstanza\@startstanza%
+ \def\@startstanza[##1][##2]{\global\instanzaLtrue\old@startstanza[##1][##2]}%
}{
\expandafter\ifvoid\csname l@dLcolrawbox1\endcsname%
\led@error@missing@numbering{Leftside}%
@@ -883,8 +883,8 @@
\let\lednopb\lednopbR
\let\lineation\lineationR
\Rightsidehook
- \let\old@startstanza\@startstanza
- \def\@startstanza[##1]{\global\instanzaRtrue\old@startstanza[##1]}
+ \let\old@startstanza\@startstanza%
+ \def\@startstanza[##1][##2]{\global\instanzaRtrue\old@startstanza[##1][##2]}%
}{%
\ledRcolfalse
\expandafter\ifvoid\csname l@dRcolrawbox1\endcsname%
@@ -902,7 +902,7 @@
\newcounter{pstartR}
\renewcommand{\thepstartR}{{\bfseries\@arabic\c@pstartR}. }
-\newcommandx*{\pstartL}[1][1]{%
+\newcommandx*{\pstartL}[2][1,2,usedefault]{%
\if@nobreak%
\let\@oldnobreak\@nobreaktrue%
\else%
@@ -943,17 +943,39 @@
\fi%
\fi%
\fi%
+ \@at@start@every@pstart%
\hsize=\Lcolwidth%
\numberedpar@true%
\iflabelpstart\protected@edef\@currentlabel%
{\p@pstartL\thepstartL}\fi%
- \ifstrempty{#1}%
- {\csgdef{before@pstartL@\the\l@dnumpstartsL}{\at@every@pstart}}%
- {\csgdef{before@pstartL@\the\l@dnumpstartsL}{\noindent#1}}%
+ \providetoggle{before@pstartL@\the\l@dnumpstartsL @par}%
+ \ifboolexpr{%
+ test {\ifstrempty{#1}}%
+ and test {\ifstrempty{#2}}%
+ }%
+ {%
+ \ifat@every@pstart@star@%
+ \global\togglefalse{before@pstartL@\the\l@dnumpstartsL @par}%
+ \else%
+ \global\toggletrue{before@pstartL@\the\l@dnumpstartsL @par}%
+ \fi%
+ \csgdef{before@pstartL@\the\l@dnumpstartsL}{\at@every@pstart}%
+ }%
+ {%
+ \ifstrempty{#1}{}{%
+ \global\toggletrue{before@pstartL@\the\l@dnumpstartsL @par}%
+ \csgdef{before@pstartL@\the\l@dnumpstartsL}{\noindent#1}%
+ }%
+ \ifstrempty{#2}{}%
+ {%
+ \csgdef{before@pstartL@\the\l@dnumpstartsL}{#2}%
+ \global\togglefalse{before@pstartL@\the\l@dnumpstartsL @par}%
+ }%
+ }%
\at@every@pstart@call%
\ignorespaces%
}
-\newcommandx*{\pstartR}[1][1]{%
+\newcommandx*{\pstartR}[2][1,2,usedefault]{%
\if@nobreak%
\let\@oldnobreak\@nobreaktrue%
\else%
@@ -993,23 +1015,46 @@
\fi%
\fi%
\fi%
+ \@at@start@every@pstart%
\hsize=\Rcolwidth%
\numberedpar@true%
\iflabelpstart\protected@edef\@currentlabel%
{\p@pstartR\thepstartR}\fi%
- \ifstrempty{#1}%
- {\csgdef{before@pstartR@\the\l@dnumpstartsR}{\at@every@pstart}}%
- {\csgdef{before@pstartR@\the\l@dnumpstartsR}{\noindent#1}}%
+ \providetoggle{before@pstartR@\the\l@dnumpstartsR @par}%
+ \ifboolexpr{%
+ test {\ifstrempty{#1}}%
+ and test {\ifstrempty{#2}}%
+ }%
+ {%
+ \ifat@every@pstart@star@%
+ \global\togglefalse{before@pstartR@\the\l@dnumpstartsR @par}%
+ \else%
+ \global\toggletrue{before@pstartR@\the\l@dnumpstartsR @par}%
+ \fi%
+ \csgdef{before@pstartR@\the\l@dnumpstartsR}{\at@every@pstart}%
+ }%
+ {%
+ \ifstrempty{#1}{}{%
+ \global\toggletrue{before@pstartR@\the\l@dnumpstartsR @par}%
+ \csgdef{before@pstartR@\the\l@dnumpstartsR}{\noindent#1}%
+ }%
+ \ifstrempty{#2}{}%
+ {%
+ \csgdef{before@pstartR@\the\l@dnumpstartsR}{#2}%
+ \global\togglefalse{before@pstartR@\the\l@dnumpstartsR @par}%
+ }%
+ }%
\at@every@pstart@call%
\ignorespaces%
}
-\newcommandx*{\pendL}[1][1]{%
+\newcommandx*{\pendL}[2][1,2,usedefault]{%
\ifnumbering \else%
\led@err@PendNotNumbered%
\fi%
\ifnumberedpar@ \else%
\led@err@PendNoPstart%
\fi%
+ \@at@end@every@pend%
\endgraf\global\num@lines=\prevgraf\egroup%
\global\par@line=0%
\endgroup%
@@ -1020,17 +1065,39 @@
\addtocounter{pstartL}{1}%
\fi
\parledgroup@beforenotes@save{L}%
- \ifstrempty{#1}%
- {\csgdef{after@pendL@\the\l@dnumpstartsL}{\at@every@pend}}%
- {\csgdef{after@pendL@\the\l@dnumpstartsL}{\noindent#1}}%
- }
-\newcommandx*{\pendR}[1][1]{%
+ \providetoggle{after@pendL@\the\l@dnumpstartsL @par}%
+ \ifboolexpr{%
+ test {\ifstrempty{#1}}%
+ and test {\ifstrempty{#2}}%
+ }%
+ {%
+ \ifat@every@pend@star@%
+ \global\togglefalse{after@pendL@\the\l@dnumpstartsL @par}%
+ \else%
+ \global\toggletrue{after@pendL@\the\l@dnumpstartsL @par}%
+ \fi%
+ \csgdef{after@pendL@\the\l@dnumpstartsL}{\at@every@pend}%
+ }%
+ {%
+ \ifstrempty{#1}{}{%
+ \global\toggletrue{after@pendL@\the\l@dnumpstartsL @par}%
+ \csgdef{after@pendL@\the\l@dnumpstartsL}{\noindent#1}%
+ }%
+ \ifstrempty{#2}{}%
+ {%
+ \csgdef{after@pendL@\the\l@dnumpstartsL}{#2}%
+ \global\togglefalse{after@pendL@\the\l@dnumpstartsL @par}%
+ }%
+ }%
+}%
+\newcommandx*{\pendR}[2][1,2,usedefault]{%
\ifnumberingR \else%
\led@err@PendNotNumbered%
\fi%
\ifnumberedpar@ \else%
\led@err@PendNoPstart%
\fi%
+ \@at@end@every@pend%
\endgraf\global\num@linesR=\prevgraf\egroup%
\global\par@lineR=0%
\endgroup%
@@ -1041,9 +1108,28 @@
\addtocounter{pstartR}{1}%
\fi%
\parledgroup@beforenotes@save{R}%
- \ifstrempty{#1}%
- {\csgdef{after@pendR@\the\l@dnumpstartsR}{\at@every@pend}}%
- {\csgdef{after@pendR@\the\l@dnumpstartsR}{\noindent#1}}%
+ \providetoggle{after@pendR@\the\l@dnumpstartsR @par}%
+ \ifboolexpr{%
+ test {\ifstrempty{#1}}%
+ and test {\ifstrempty{#2}}%
+ }%
+ {%
+ \ifat@every@pend@star@%
+ \global\togglefalse{after@pendR@\the\l@dnumpstartsR @par}%
+ \else%
+ \global\toggletrue{after@pendR@\the\l@dnumpstartsR @par}%
+ \fi%
+ \csgdef{after@pendR@\the\l@dnumpstartsR}{\at@every@pend}}%
+ {%
+ \ifstrempty{#1}{}{%
+ \csgdef{after@pendR@\the\l@dnumpstartsR}{\noindent#1}%
+ \global\toggletrue{after@pendR@\the\l@dnumpstartsR @par}%
+ }%
+ \ifstrempty{#2}{}{%
+ \csgdef{after@pendR@\the\l@dnumpstartsR}{#2}%
+ \global\togglefalse{after@pendR@\the\l@dnumpstartsR @par}%
+ }%
+ }%
}
\newcommand{\AtEveryPstartCall}[1]{\gdef\at@every@pstart@call{#1}}%
@@ -1899,7 +1985,7 @@
\chardef\next=\catcode`\&
\catcode`\&=\active
-\newenvironment{astanza}[1][]{%
+\newenvironment{astanza}[2][1,2,usedefault]{%
\catcode`\&\active
\global\stanza@count\@ne\stanza@modulo\@ne
\ifnum\usenamecount{sza@0@}=\z@
@@ -1917,18 +2003,25 @@
\global\advance\stanza@count\@ne
\@astanza@line}%
\def\&{\@stopastanza}%
- \ifboolexpr{not test{\ifdefvoid{\at@every@stanza}} and test{\ifstrempty{#1}}}%
- {\pstart[\at@every@stanza]}%
- {\pstart[#1]}%
+ \ifboolexpr{%
+ not test{\ifdefvoid{\at@every@stanza}}%
+ and test{\ifstrempty{#1}}%
+ and test{\ifstrempty{#2}}}%
+ {\pstart[][\at@every@stanza]\at@start@every@stanza}%
+ {\pstart[#1][#2]\at@start@every@stanza}%
\@astanza@line
\let\par\relax\ignorespaces%No paragraph in verses
}{}
-\newcommandx{\@stopastanza}[1][1,usedefault]{%
+\newcommandx{\@stopastanza}[2][1,2,usedefault]{%
\endlock\mbox{}%
- \ifboolexpr{not test{\ifdefvoid{\at@every@stop@stanza}} and test{\ifstrempty{#1}}}%
- {\pend[\at@every@stop@stanza]}%
- {\pend[#1]}%
+ \ifboolexpr{%
+ not test{\ifdefvoid{\at@every@stop@stanza}}%
+ and test{\ifstrempty{#1}}%
+ and test{\ifstrempty{#2}}%
+ }%
+ {\before@every@stop@stanza\pend[][\at@every@stop@stanza]}%
+ {\before@every@stop@stanza\pend[#1][#2]}%
}%
\newcommand*{\@astanza@line}{%
\ifnum\value{stanzaindentsrepetition}=0
@@ -2369,6 +2462,10 @@
and test {\ifdefempty{\at@every@pstart}}}%
{}%
{%
+ \ifboolexpr{not togl{before@pstartR@\the\l@dpscR @par} and not togl{before@pstartL@\the\l@dpscL @par}}{%
+ \csuse{before@pstartL@\the\l@dpscL}%
+ \csuse{before@pstartR@\the\l@dpscR}%
+ }{%
\hb@xt@ \hsize{%
\ifdefstring{\columns@position}{L}{}{\hfill }%
\par\parbox[t][][t]{\Lcolwidth}{%
@@ -2381,6 +2478,7 @@
}%
\ifdefstring{\columns@position}{R}{}{\hfill}%
}%
+ }%
}%
\global\csundef{before@pstartL@\the\l@dpscL}%
\global\csundef{before@pstartR@\the\l@dpscR}%
@@ -2392,6 +2490,10 @@
and test {\ifdefempty{\at@every@pend}}}%
{}%
{%
+ \ifboolexpr{not togl{after@pendR@\the\l@dpscR @par} and not togl{after@pendL@\the\l@dpscL @par}}{%
+ \csuse{after@pendL@\the\l@dpscL}%
+ \csuse{after@pendR@\the\l@dpscR}%
+ }{%
\hb@xt@ \hsize{%
\ifdefstring{\columns@position}{L}{}{\hfill }%
\parbox[t][][t]{\Lcolwidth}{%
@@ -2404,6 +2506,7 @@
}%
\ifdefstring{\columns@position}{R}{}{\hfill}%
}%
+ }%
}%
\global\csundef{after@pendL@\the\l@dpscL}%
\global\csundef{after@pendR@\the\l@dpscR}%