summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-04 22:12:40 +0000
committerKarl Berry <karl@freefriends.org>2019-03-04 22:12:40 +0000
commit270f51a641098929ca9083788eb12f01203014cd (patch)
tree07a191f2df180d12f23392d33f837b905751e501 /Master/texmf-dist
parentcdcd34b4700774946edede081d49d6a110feba9c (diff)
reledmac (4mar19)
git-svn-id: svn://tug.org/texlive/trunk@50229 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx9
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdfbin41034 -> 41030 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdfbin17700 -> 17699 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdfbin16742 -> 16743 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdfbin26370 -> 26371 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdfbin20868 -> 20869 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdfbin18655 -> 18660 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdfbin18835 -> 18835 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.pdfbin20716 -> 20717 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdfbin21254 -> 21251 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdfbin21741 -> 21744 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdfbin17122 -> 17124 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdfbin31343 -> 31340 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdfbin26110 -> 26111 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdfbin36353 -> 36350 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdfbin24486 -> 24481 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdfbin25882 -> 25876 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdfbin22687 -> 22686 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdfbin34327 -> 34325 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdfbin39492 -> 39492 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdfbin22823 -> 22823 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdfbin17207 -> 17207 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdfbin27718 -> 27717 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdfbin12233 -> 12234 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdfbin44014 -> 44014 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdfbin22783 -> 22784 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdfbin43587 -> 43580 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdfbin43163 -> 43161 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdfbin41076 -> 41074 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdfbin43357 -> 43358 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdfbin42849 -> 42847 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdfbin42894 -> 42888 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdfbin43155 -> 43155 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdfbin28314 -> 28312 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdfbin27055 -> 27052 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdfbin21263 -> 21263 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdfbin29533 -> 29535 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdfbin22467 -> 22469 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdfbin36424 -> 36424 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdfbin58559 -> 58558 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdfbin22759 -> 22758 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdfbin18710 -> 18713 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdfbin32469 -> 32470 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdfbin22220 -> 22218 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdfbin16269 -> 16265 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/migration.pdfbin92271 -> 92579 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/reledmac.pdfbin1379365 -> 1384705 bytes
-rw-r--r--Master/texmf-dist/doc/latex/reledmac/reledpar.pdfbin516912 -> 516913 bytes
-rw-r--r--Master/texmf-dist/source/latex/reledmac/reledmac.dtx203
-rw-r--r--Master/texmf-dist/tex/latex/reledmac/reledmac.sty159
51 files changed, 257 insertions, 114 deletions
diff --git a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx
index 0b9df667af6..e2351b65577 100644
--- a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx
+++ b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx
@@ -426,12 +426,17 @@
% You must delete your \verb+.aux+ file after having upgraded to this new version of \reledmac.
% \subsection{Migration to \reledmac 2.27.1}
This release fix spurious space in \cs{hidenumbering}.
-If you considered this spurious space as normal, you must insert it manually using.
+%If you considered this spurious space as normal, you must insert it manually using.
\begin{verbatim}
xx\hidenumbering\ xx
\end{verbatim}
-To get the space after \verb+xx+.
+%To get the space after \verb+xx+.
+
+% \subsection{Migration to \reledmac 2.31.1}
+%If you use \cs{Xgroupbyline}, the indentation of the notes has been deleted, in order to have the same behavior as for normal critical notes.
+%
+%Use \cs{Xparindent} to restore indentation.
\subsection{Migration to \reledmac 2.30.0}
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 963c576273c..558f80980ef 100644
--- a/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
Binary files 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 4389b146d1f..48a0570b64f 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendotes.pdf
Binary files 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 aff50a0cb4d..87804d61c9d 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 4791a362285..f7064fde1fe 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 90556aa79ab..bdc61104d1a 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-doublenumbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf
index 9e68c5b7fcd..4a0232d1783 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf
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 bbe0bd332f7..efaaddc5502 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 ccff57a659a..73f74d8115e 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 238ef64bf24..a46f645fdaf 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 a0cb7bbf89d..324d020531d 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 9bd770a1094..ec1863e17d8 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 14112a17f34..9232135eacd 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 5aa447a3d05..295c7813891 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 459a0b9fa5f..3d52dc5a8a9 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 c236a5c1cfd..02ce4bfea08 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 6b33685a602..e2aea3db966 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 61b6450691f..dee81f8846c 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 98da81ea863..2568b1a7dd7 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 37e3187804c..9e6b4beb406 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-subdivision-number-in-header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf
index ef08bb32348..b30a7b63083 100644
--- a/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf
+++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf
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 a7ba92c3848..1d2929c6b1b 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 390a9611d28..342712c0138 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 829fb2fae87..b4f9cfa0157 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 71f0da7b949..2b475e8dba7 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 a3122c4fb24..d9bd219b87c 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 b5606ed4a76..8c99736adb4 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 83d39c15ee0..f6ee2fd47bd 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 168bb8c509e..852279e6d88 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 6a95279de66..9850bd92dba 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 f1ee6e3a5fc..4193dd001ca 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 52d9291a31c..fe52d6a74e8 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 bbdeee4ec9a..d7c2a6dfafb 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 d129783e81c..2fffb8f8138 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 f3a9996b014..530bc9d6400 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 f125a9f4eb0..84c6a545157 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 d108fc7cbe9..8ec2f69633e 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 775312358cb..23400503819 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 322171a09e8..fcdbdebac4c 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 396e96b9b20..661d26f6b5d 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 e6d5bcbdd5c..d608c4838f6 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 8abfe17dc12..64004df44dc 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 afe44d97f3c..8c887ce59e8 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 df4995e7f78..079833dc40c 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 11a391414f5..827f68d19ad 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 48ca3cafd82..67bf96b611f 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 41267b13a9a..5414582ac32 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 85175dce73b..681ea0a9503 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 90552d6bb7c..0af430cb96c 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 aec7bc9adc4..bae73f9fe41 100644
--- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
+++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
@@ -525,6 +525,13 @@
% \changes{v2.30.0}{2019/01/22}{Add \protect\cs{Xnoidenticallinenumannotation} and \protect\cs{Xendnoidenticallinenumannotation} hooks}
% \changes{v2.30.0}{2019/01/22}{Add separator between line number annotations in margin. Add \protect\cs{setlinenumannotationsep}}
% \changes{v2.31.0}{2019/02/22}{Add \protect\option{noprefix} and \protect\option{prefixmore} to \protect\cs{appref} and \protect\cs{SEref}.}
+% \changes{v2.31.1}{2019/03/03}{Fix bug with \protect\cs{Xgroupbyline}, which could produce spurious blank line}
+% \changes{v2.31.1}{2019/03/03}{Fix bug with multiple footnote layer and \protect\cs{Xgroupbyline}}
+% \changes{v2.31.1}{2019/03/03}{Fix incompatibility between \protect\cs{Xgroupbyline} and \protect\package{hyperref} package}
+% \changes{v2.31.1}{2019/03/03}{Fix incompatibility between \protect\cs{Xgroupbyline} and optional argument of critical footnotes}
+% \changes{v2.31.1}{2019/03/03}{Fix bug in vertical spacing with \protect\cs{Xgroupbyline}}
+% \changes{v2.31.1}{2019/03/03}{Fix bug with indentation with \protect\cs{Xgroupbyline}}
+% \changes{v2.31.1}{2019/03/03}{Fix bug with \protect\cs{Xhangindent} and \protect\cs{hangindentX} for right-to-left texts.}
% Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename)
% has version number \fileversion, last revised \filedate.}}
%
@@ -4260,7 +4267,7 @@
% \begin{macrocode}
%<*code>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2019/02/22 v2.31.0 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2019/03/03 v2.31.1 typesetting critical editions]%
% \end{macrocode}
%
% \subsection{Package options}
@@ -9969,12 +9976,13 @@
% \end{macro}
%
% \begin{macro}{\add@Xgroupbyline}
-% If you use \cs{Xgroupbyline}, the insertion of the critical footnotes are not made immediately in \cs{add@inserts}, but the content to be inserted is stored, to be inserted in one block.
+% If you use \cs{Xgroupbyline}, the insertion of the critical footnotes are not made immediately in \cs{add@inserts}, but the content to be inserted is stored, in order to be inserted later in one block.
% This insertion in one block is made by \cs{add@Xgroupbyline}.
% \begin{macrocode}
\newcommand{\add@Xgroupbyline}{%
\unless\ifnocritical@%
\def\do##1{%Looping on the series
+ \let\olddo\do%Save the old \do macro, that is this macro itself!
\def\do####1{%Looping on the ##1@forinserting command
\ifcsdef{##1@forinserting@####1}{%
\X@beforeinsertion{##1}%
@@ -9984,6 +9992,7 @@
\insert\csname ##1footins\endcsname%
\fi%
{%
+ \nottoggle{Xparindent@##1}{\parindent=\z@}{}%
\ifcsdef{Xhsize\csuse{series@display##1}@##1}%
{\hsize \csuse{Xhsize\csuse{series@display##1}@##1}}%
{}%
@@ -10008,6 +10017,7 @@
\dolistcsloop{##1@forinserting}%
}{}%
\global\csundef{##1@forinserting}%
+ \let\do\olddo%Restore old do
}%
\dolistloop{\@series}%
\fi%
@@ -10490,11 +10500,12 @@
% \end{macro}
%
% \begin{macro}{\normalvfootnote@inserted}
-% The \cs{normalvfootnote@inserted} macro is expanded to the content to be add to a \cs{insert} for normal critical footnote.
+% The \cs{normalvfootnote@inserted} macro is expanded to the content to be added to a \cs{insert} for normal critical footnote.
% \begin{macrocode}
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnote@inserted}[2]{%
\nottoggle{Xgroupbyline@#1}{\noindent}{}\csuse{Xbhooknote@#1}%
\csuse{Xnotefontsize@#1}%
+ \iftoggle{Xgroupbyline@#1}{\strut}{}%
\footsplitskips
\ifl@dpairing\ifl@dpaging\else%
\setXnoteswidthliketwocolumns@{#1}%
@@ -10583,8 +10594,7 @@
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalfootfmt}[4]{%
\Xstorelineinfo{#1}{#4}%
\nottoggle{Xgroupbyline@#4}{\Xledsetnormalparstuff{#4}}{}%
- \hangindent=\csuse{Xhangindent@#4}%
- \everypar{\hangindent=\csuse{Xhangindent@#4}}%
+ \Xsethangindent{#4}%
\nottoggle{Xgroupbyline@#4}{\rule\z@\splittopskip}{}%
{\printlinefootnote{#1}{#4}}%
\print@lemma{#1}{#2}{#4}%
@@ -11339,8 +11349,7 @@
{}%
\nottoggle{Xparindent@#1}{\parindent=\z@}{}%
\tolerance=5000%
- \hangindent=\csuse{Xhangindent@#1}%
- \everypar{\hangindent=\csuse{Xhangindent@#1}}%
+ \Xsethangindent{#1}%
\@tempdima=\parindent%
\csuse{Xcolalign@#1}%
\parindent=\@tempdima%
@@ -11488,8 +11497,7 @@
\hsize \csuse{Xhsizetwocol@#1}%
\nottoggle{Xparindent@#1}{\parindent=\z@}{}%
\tolerance=5000%
- \hangindent=\csuse{Xhangindent@#1}%
- \everypar{\hangindent=\csuse{Xhangindent@#1}}%
+ \Xsethangindent{#1}%
\@tempdima=\parindent%
\csuse{Xcolalign@#1}%
\parindent=\@tempdima%
@@ -11552,6 +11560,32 @@
% \end{macro}
%
%
+% \subsection{Footnote hanging indent}
+% \begin{macro}{\Xsethangindent}
+% \begin{macro}{\sethangindentX}
+% \cs{Xsethangindent} set the hangindent for a critical footnote, while \cs{sethangindentX} does it for a familiar footnote.
+% \begin{macrocode}
+\newcommand{\Xsethangindent}[1]{%
+ \if@RTL%
+ \hangindent=-\csuse{Xhangindent@#1}%
+ \everypar{\hangindent=-\csuse{Xhangindent@#1}}%
+ \else%
+ \hangindent=\csuse{Xhangindent@#1}%
+ \everypar{\hangindent=\csuse{Xhangindent@#1}}%
+ \fi%
+}%
+\newcommand{\sethangindentX}[1]{%
+ \if@RTL%
+ \hangindent=-\csuse{hangindentX@#1}%
+ \everypar{\hangindent=-\csuse{hangindentX@#1}}%
+ \else%
+ \hangindent=\csuse{hangindentX@#1}%
+ \everypar{\hangindent=\csuse{hangindentX@#1}}%
+ \fi%
+}%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
% \subsection{Critical notes presentation}
% Here, we define some commons macro which are used in order to print a critical notes, that is a note with 1) line number 2) lemma 3) lemma separator 4) text associated to the lemma.
@@ -12224,53 +12258,64 @@
% \subsubsection{Footnote grouped by line}
% \begin{macro}{\prepare@Xgroupbyline}
% \cs{prepare@Xgroupbyline} is a macro called on the \cs{meta{XXX}vfootnote} if \cs{Xgroupbyline} is set to true, instead of calling \cs{insert} directly.
+% \#1 The series\\
+% \#2 The content of the footnote, that is also the line number indication\\
+% \#3 This macro which prepare the content of the insertion \\
% \begin{macrocode}
\newcommand{\prepare@Xgroupbyline}[3]{%
\iftoggle{Xgroupbylineseparetwolines@#1}{%
\l@dparsefootspec#2%
\ifcsdef{#1@forinserting@\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}%
- {%
- \csgappto%
- {#1@forinserting@\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}%
- {%
- \ifcsempty{Xsymlinenum@#1}%
- {\csuse{Xparafootsep@#1}}%
- {}%
- #3{#1}{#2}%
- \hskip\csuse{Xafternote@#1}\relax%
- }%
- }%
- {%
- \csdef%
- {#1@forinserting@\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}%
- {%
- #3{#1}{#2}%
+ {%
+ \csgappto{#1@forinserting@\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}{%
\hskip\csuse{Xafternote@#1}\relax%
}%
- }%
- \listcsxadd{#1@forinserting}{\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}%
- }{%
- \ifcsdef{#1@forinserting@all}{%
- \csgappto%
- {#1@forinserting@all}%
- {%
+ }%
+ {}%
+ \add@hooktoggle@specific@to@cs{#1@forinserting@\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}%
+ \add@hookarg@specific@to@cs{#1@forinserting@\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}%
+ \csxappto%
+ {#1@forinserting@\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}%
+ {%
+ \keep@this@crossref@forinserting%
+ \unexpanded{%
\ifcsempty{Xsymlinenum@#1}%
{\csuse{Xparafootsep@#1}}%
{}%
#3{#1}{#2}%
- \hskip\csuse{Xafternote@#1}\relax%
}%
- }%
+ }%
+ \listcsxadd{#1@forinserting}{\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}%
+ }{%
+ \ifcsdef{#1@forinserting@all}{%
+ \csgappto%
+ {#1@forinserting@all}%
+ {\hskip\csuse{Xafternote@#1}\relax}%
+ }{}%
+ \add@hooktoggle@specific@to@cs{#1@forinserting@all}%
+ \add@hookarg@specific@to@cs{#1@forinserting@all}%
+ \csxappto%
+ {#1@forinserting@all}%
{%
- \csdef%
- {#1@forinserting@all}%
- {%
- #3{#1}{#2}%
- \hskip\csuse{Xafternote@#1}\relax%
- }%
+ \keep@this@crossref@forinserting%
+ \unexpanded{%
+ \ifcsempty{Xsymlinenum@#1}%
+ {\csuse{Xparafootsep@#1}}%
+ {}%
+ #3{#1}{#2}%
+ }%
}%
- \listcsgadd{#1@forinserting}{all}%
}%
+ \listcsgadd{#1@forinserting}{all}%
+}%
+% \end{macrocode}
+% \end{macro}
+% \begin{macro}{\keep@this@crossref@forinserting}
+% \cs{keep@this@crossref@forinserting} is called by \cs{prepare@Xgroupbyline}. It just ensures that \cs{@this@crossref@start} and \cs{this@crossref@end} value are kept in memory.
+% \begin{macrocode}
+\newcommand{\keep@this@crossref@forinserting}{%
+ \unexpanded{\gdef\@this@crossref@start}{\@this@crossref@start}%
+ \unexpanded{\gdef\@this@crossref@end}{\@this@crossref@end}%
}%
% \end{macrocode}
% \end{macro}
@@ -12610,8 +12655,7 @@
\@nameuse{@thefnmark#1}%
}%
\ledsetnormalparstuffX{#1}%
- \hangindent=\csuse{hangindentX@#1}%
- \everypar{\hangindent=\csuse{hangindentX@#1}}%
+ \sethangindentX{#1}%
\rule\z@\splittopskip%
{{\csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}}%
\csuse{wrapcontentX@#1}{#2}%
@@ -12930,8 +12974,7 @@
\@nameuse{@thefnmark#1}%
}%
\normal@pars%
- \hangindent=\csuse{hangindentX@#1}%
- \everypar{\hangindent=\csuse{hangindentX@#1}}%
+ \sethangindentX{#1}%
\hsize \csuse{hsizetwocolX@#1}%
\nottoggle{parindentX@#1}{\parindent=\z@}{}%
\tolerance=5000\relax%
@@ -13053,8 +13096,7 @@
\protected@edef\@currentlabel{%
\@nameuse{@thefnmark#1}%
}%
- \hangindent=\csuse{hangindentX@#1}%
- \everypar{\hangindent=\csuse{hangindentX@#1}}%
+ \sethangindentX{#1}%
\normal@pars%
\hsize \csuse{hsizethreecolX@#1}%
\nottoggle{parindentX@#1}{\parindent=\z@}{}%
@@ -13738,8 +13780,6 @@
\def\@this@crossref@end{#7:end}%
\printlineendnote{#1}{#4}%
\IfStrEq{#6}{R}{\ledRcol@false}{}%
- \undef\@this@crossref@start%
- \undef\@this@crossref@end%
\nottoggle{Xendlemmadisablefontselection@#4}%
{\select@lemmafont#1|}%
{}%
@@ -14452,8 +14492,6 @@
{{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}%
\noexpand\Xnote@false%
\unexpanded{\advance\@edindex@fornote@\m@ne}%
- \unexpanded{\undef\@this@crossref@start}%
- \unexpanded{\undef\@this@crossref@end}%
\ifbool{indtl@innote}%
{\unexpanded{\let\index\orig@@index}}%
{}%
@@ -14492,8 +14530,6 @@
\noexpand\csuse{v#1footnote}%
{#1}%
{{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}%
- \unexpanded{\undef\@this@crossref@start}%
- \unexpanded{\undef\@this@crossref@end}%
\noexpand\Xnote@false%
\unexpanded{\advance\@edindex@fornote@\m@ne}%
\ifbool{indtl@innote}%
@@ -15267,6 +15303,7 @@
% \begin{macrocode}
\newcommand{\newhooktoggle@specific}[1]{%
\newtoggle{#1@}%
+ \listgadd{\hooktoggle@specific}{#1}%
\define@key[mac]{truefootnoteoption}{#1}[]{\global\settoggle{#1@}{true}}%When enabling footnote option
\define@key[mac]{falsefootnoteoption}{#1}[]{\global\settoggle{#1@}{false}}
}
@@ -15276,11 +15313,67 @@
% \cs{newhookarg@specific} is a generic command to create argumen hook specific to a note.
% \begin{macrocode}
\newcommand{\newhookarg@specific}[1]{%
+ \listgadd{\hookarg@specific}{#1}%
\define@key[mac]{truefootnoteoption}{#1}{\csgdef{#1@}{##1}}%When enabling footnote option
\define@key[mac]{falsefootnoteoption}{#1}{\global\csundef{#1@}}%When disabling footnote option
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{\hooktoggle@specific}
+% \begin{macro}{\add@hooktoggle@specific@to@cs}
+% The \cs{add@hooktoggle@specific@to@cs} macro stores to a macro
+% all the current values of hook toggle specific to a command.
+% It is useful for \cs{Xgroupbyline} option, which does not add immediately notes to the inserts list.
+% It uses the \cs{hooktoggle@specific} list.
+% \begin{macrocode}
+\def\hooktoggle@specific{}%
+\newcommand{\add@hooktoggle@specific@to@cs}[1]{%
+ \def\do##1{%
+ \iftoggle{##1@}{%
+ \ifcsdef{#1}{%
+ \csgappto{#1}{\toggletrue{##1@}}%
+ }{%
+ \csgdef{#1}{\toggletrue{##1@}}%
+ }%
+ }{%
+ \ifcsdef{#1}{%
+ \csgappto{#1}{\togglefalse{##1@}}%
+ }{%
+ \csgdef{#1}{\togglefalse{##1@}}%
+ }%
+ }%
+ }%
+ \dolistloop{\hooktoggle@specific}%
+}%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \begin{macro}{\hookarg@specific}
+% \begin{macro}{\add@hookarg@specific@to@cs}
+% The same, but for optional argument of critical footnotes with assigned value.
+% \begin{macrocode}
+\def\hookarg@specific{}%
+\newcommand{\add@hookarg@specific@to@cs}[1]{%
+ \def\do##1{%
+ \ifcsvoid{##1@}{}{%
+ \ifcsdef{#1}{%
+ \csxappto{#1}{%
+ \noexpand\csdef%
+ {##1@}{\csname##1@\endcsname}%
+ }%
+ }{%
+ \csxdef{#1}{%
+ \noexpand\csdef%
+ {##1@}{\csname##1@\endcsname}%
+ }%
+ }%
+ }%
+ }%
+ \dolistloop{\hookarg@specific}%
+}%
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
% And now, we define some hooks specific to a note.
% \begin{macrocode}
\newhooktoggle@specific{fulllines}%
@@ -16534,8 +16627,6 @@
\xdef\annot@start{\xannotationref{#2:start}}%
\xdef\annot@end{\xannotationref{#2:end}}%
\printlines\xpageref{#2:start}|\xlineref{#2:start}|\xsublineref{#2:start}|\xpageref{#2:end}|\xlineref{#2:end}|\xsublineref{#2:end}|\relax|\xflagref{#2:start}|%
- \undef\@this@crossref@end%
- \undef\@this@crossref@start%
}%
\def\do##1{%
\setkeys[mac]{falsefootnoteoption}{##1}%
@@ -16558,8 +16649,6 @@
\def\@this@crossref@start{#2:start}%
\def\@this@crossref@end{#2:end}%
\printendlines\xpageref{#2:start}|\xlineref{#2:start}|\xsublineref{#2:start}|\xpageref{#2:end}|\xlineref{#2:end}|\xsublineref{#2:end}|\relax|\xflagref{#2:start}|%
- \undef\@this@crossref@end%
- \undef\@this@crossref@start%
}%
\def\do##1{%
\setkeys[mac]{falsefootnoteoption}{##1}%
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index 08eb6ab09c6..4aa20e12ee1 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/02/22 v2.31.0 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2019/03/03 v2.31.1 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\newif\ifsameparallelpagenumber%
@@ -2557,6 +2557,7 @@
\newcommand{\add@Xgroupbyline}{%
\unless\ifnocritical@%
\def\do##1{%Looping on the series
+ \let\olddo\do%Save the old \do macro, that is this macro itself!
\def\do####1{%Looping on the ##1@forinserting command
\ifcsdef{##1@forinserting@####1}{%
\X@beforeinsertion{##1}%
@@ -2566,6 +2567,7 @@
\insert\csname ##1footins\endcsname%
\fi%
{%
+ \nottoggle{Xparindent@##1}{\parindent=\z@}{}%
\ifcsdef{Xhsize\csuse{series@display##1}@##1}%
{\hsize \csuse{Xhsize\csuse{series@display##1}@##1}}%
{}%
@@ -2590,6 +2592,7 @@
\dolistcsloop{##1@forinserting}%
}{}%
\global\csundef{##1@forinserting}%
+ \let\do\olddo%Restore old do
}%
\dolistloop{\@series}%
\fi%
@@ -2811,6 +2814,7 @@
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnote@inserted}[2]{%
\nottoggle{Xgroupbyline@#1}{\noindent}{}\csuse{Xbhooknote@#1}%
\csuse{Xnotefontsize@#1}%
+ \iftoggle{Xgroupbyline@#1}{\strut}{}%
\footsplitskips
\ifl@dpairing\ifl@dpaging\else%
\setXnoteswidthliketwocolumns@{#1}%
@@ -2858,8 +2862,7 @@
\notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalfootfmt}[4]{%
\Xstorelineinfo{#1}{#4}%
\nottoggle{Xgroupbyline@#4}{\Xledsetnormalparstuff{#4}}{}%
- \hangindent=\csuse{Xhangindent@#4}%
- \everypar{\hangindent=\csuse{Xhangindent@#4}}%
+ \Xsethangindent{#4}%
\nottoggle{Xgroupbyline@#4}{\rule\z@\splittopskip}{}%
{\printlinefootnote{#1}{#4}}%
\print@lemma{#1}{#2}{#4}%
@@ -3184,8 +3187,7 @@
{}%
\nottoggle{Xparindent@#1}{\parindent=\z@}{}%
\tolerance=5000%
- \hangindent=\csuse{Xhangindent@#1}%
- \everypar{\hangindent=\csuse{Xhangindent@#1}}%
+ \Xsethangindent{#1}%
\@tempdima=\parindent%
\csuse{Xcolalign@#1}%
\parindent=\@tempdima%
@@ -3280,8 +3282,7 @@
\hsize \csuse{Xhsizetwocol@#1}%
\nottoggle{Xparindent@#1}{\parindent=\z@}{}%
\tolerance=5000%
- \hangindent=\csuse{Xhangindent@#1}%
- \everypar{\hangindent=\csuse{Xhangindent@#1}}%
+ \Xsethangindent{#1}%
\@tempdima=\parindent%
\csuse{Xcolalign@#1}%
\parindent=\@tempdima%
@@ -3326,6 +3327,24 @@
\expandafter
\Xrigidbalance\csname mp#1footins\endcsname \tw@ \splittopskip}}
+\newcommand{\Xsethangindent}[1]{%
+ \if@RTL%
+ \hangindent=-\csuse{Xhangindent@#1}%
+ \everypar{\hangindent=-\csuse{Xhangindent@#1}}%
+ \else%
+ \hangindent=\csuse{Xhangindent@#1}%
+ \everypar{\hangindent=\csuse{Xhangindent@#1}}%
+ \fi%
+}%
+\newcommand{\sethangindentX}[1]{%
+ \if@RTL%
+ \hangindent=-\csuse{hangindentX@#1}%
+ \everypar{\hangindent=-\csuse{hangindentX@#1}}%
+ \else%
+ \hangindent=\csuse{hangindentX@#1}%
+ \everypar{\hangindent=\csuse{hangindentX@#1}}%
+ \fi%
+}%
\def\endashchar{\textnormal{--}}
@@ -3717,48 +3736,51 @@
\iftoggle{Xgroupbylineseparetwolines@#1}{%
\l@dparsefootspec#2%
\ifcsdef{#1@forinserting@\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}%
- {%
- \csgappto%
- {#1@forinserting@\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}%
- {%
- \ifcsempty{Xsymlinenum@#1}%
- {\csuse{Xparafootsep@#1}}%
- {}%
- #3{#1}{#2}%
- \hskip\csuse{Xafternote@#1}\relax%
- }%
- }%
- {%
- \csdef%
- {#1@forinserting@\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}%
- {%
- #3{#1}{#2}%
+ {%
+ \csgappto{#1@forinserting@\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}{%
\hskip\csuse{Xafternote@#1}\relax%
}%
- }%
- \listcsxadd{#1@forinserting}{\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}%
- }{%
- \ifcsdef{#1@forinserting@all}{%
- \csgappto%
- {#1@forinserting@all}%
- {%
+ }%
+ {}%
+ \add@hooktoggle@specific@to@cs{#1@forinserting@\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}%
+ \add@hookarg@specific@to@cs{#1@forinserting@\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}%
+ \csxappto%
+ {#1@forinserting@\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}%
+ {%
+ \keep@this@crossref@forinserting%
+ \unexpanded{%
\ifcsempty{Xsymlinenum@#1}%
{\csuse{Xparafootsep@#1}}%
{}%
#3{#1}{#2}%
- \hskip\csuse{Xafternote@#1}\relax%
}%
- }%
+ }%
+ \listcsxadd{#1@forinserting}{\l@dparsedendpage-\l@dparsedendline-\l@dparsedendsub}%
+ }{%
+ \ifcsdef{#1@forinserting@all}{%
+ \csgappto%
+ {#1@forinserting@all}%
+ {\hskip\csuse{Xafternote@#1}\relax}%
+ }{}%
+ \add@hooktoggle@specific@to@cs{#1@forinserting@all}%
+ \add@hookarg@specific@to@cs{#1@forinserting@all}%
+ \csxappto%
+ {#1@forinserting@all}%
{%
- \csdef%
- {#1@forinserting@all}%
- {%
- #3{#1}{#2}%
- \hskip\csuse{Xafternote@#1}\relax%
- }%
+ \keep@this@crossref@forinserting%
+ \unexpanded{%
+ \ifcsempty{Xsymlinenum@#1}%
+ {\csuse{Xparafootsep@#1}}%
+ {}%
+ #3{#1}{#2}%
+ }%
}%
- \listcsgadd{#1@forinserting}{all}%
}%
+ \listcsgadd{#1@forinserting}{all}%
+}%
+\newcommand{\keep@this@crossref@forinserting}{%
+ \unexpanded{\gdef\@this@crossref@start}{\@this@crossref@start}%
+ \unexpanded{\gdef\@this@crossref@end}{\@this@crossref@end}%
}%
\providecommand*{\multiplefootnotemarker}{3sp}
\providecommand*{\multfootsep}{\textsuperscript{\normalfont,}}
@@ -3941,8 +3963,7 @@
\@nameuse{@thefnmark#1}%
}%
\ledsetnormalparstuffX{#1}%
- \hangindent=\csuse{hangindentX@#1}%
- \everypar{\hangindent=\csuse{hangindentX@#1}}%
+ \sethangindentX{#1}%
\rule\z@\splittopskip%
{{\csuse{notenumfontX@#1}\wrapped@footfootmarkX{#1}}%
\csuse{wrapcontentX@#1}{#2}%
@@ -4150,8 +4171,7 @@
\@nameuse{@thefnmark#1}%
}%
\normal@pars%
- \hangindent=\csuse{hangindentX@#1}%
- \everypar{\hangindent=\csuse{hangindentX@#1}}%
+ \sethangindentX{#1}%
\hsize \csuse{hsizetwocolX@#1}%
\nottoggle{parindentX@#1}{\parindent=\z@}{}%
\tolerance=5000\relax%
@@ -4234,8 +4254,7 @@
\protected@edef\@currentlabel{%
\@nameuse{@thefnmark#1}%
}%
- \hangindent=\csuse{hangindentX@#1}%
- \everypar{\hangindent=\csuse{hangindentX@#1}}%
+ \sethangindentX{#1}%
\normal@pars%
\hsize \csuse{hsizethreecolX@#1}%
\nottoggle{parindentX@#1}{\parindent=\z@}{}%
@@ -4656,8 +4675,6 @@
\def\@this@crossref@end{#7:end}%
\printlineendnote{#1}{#4}%
\IfStrEq{#6}{R}{\ledRcol@false}{}%
- \undef\@this@crossref@start%
- \undef\@this@crossref@end%
\nottoggle{Xendlemmadisablefontselection@#4}%
{\select@lemmafont#1|}%
{}%
@@ -5167,8 +5184,6 @@
{{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}%
\noexpand\Xnote@false%
\unexpanded{\advance\@edindex@fornote@\m@ne}%
- \unexpanded{\undef\@this@crossref@start}%
- \unexpanded{\undef\@this@crossref@end}%
\ifbool{indtl@innote}%
{\unexpanded{\let\index\orig@@index}}%
{}%
@@ -5207,8 +5222,6 @@
\noexpand\csuse{v#1footnote}%
{#1}%
{{\l@d@nums}{\expandonce\@tag}{\expandonce\content}}%
- \unexpanded{\undef\@this@crossref@start}%
- \unexpanded{\undef\@this@crossref@end}%
\noexpand\Xnote@false%
\unexpanded{\advance\@edindex@fornote@\m@ne}%
\ifbool{indtl@innote}%
@@ -5726,13 +5739,53 @@
\newhooktoggle@series{Xendnoidenticallinenumannotation}[apprefwithpage,SErefwithpage]%
\newcommand{\newhooktoggle@specific}[1]{%
\newtoggle{#1@}%
+ \listgadd{\hooktoggle@specific}{#1}%
\define@key[mac]{truefootnoteoption}{#1}[]{\global\settoggle{#1@}{true}}%When enabling footnote option
\define@key[mac]{falsefootnoteoption}{#1}[]{\global\settoggle{#1@}{false}}
}
\newcommand{\newhookarg@specific}[1]{%
+ \listgadd{\hookarg@specific}{#1}%
\define@key[mac]{truefootnoteoption}{#1}{\csgdef{#1@}{##1}}%When enabling footnote option
\define@key[mac]{falsefootnoteoption}{#1}{\global\csundef{#1@}}%When disabling footnote option
}
+\def\hooktoggle@specific{}%
+\newcommand{\add@hooktoggle@specific@to@cs}[1]{%
+ \def\do##1{%
+ \iftoggle{##1@}{%
+ \ifcsdef{#1}{%
+ \csgappto{#1}{\toggletrue{##1@}}%
+ }{%
+ \csgdef{#1}{\toggletrue{##1@}}%
+ }%
+ }{%
+ \ifcsdef{#1}{%
+ \csgappto{#1}{\togglefalse{##1@}}%
+ }{%
+ \csgdef{#1}{\togglefalse{##1@}}%
+ }%
+ }%
+ }%
+ \dolistloop{\hooktoggle@specific}%
+}%
+\def\hookarg@specific{}%
+\newcommand{\add@hookarg@specific@to@cs}[1]{%
+ \def\do##1{%
+ \ifcsvoid{##1@}{}{%
+ \ifcsdef{#1}{%
+ \csxappto{#1}{%
+ \noexpand\csdef%
+ {##1@}{\csname##1@\endcsname}%
+ }%
+ }{%
+ \csxdef{#1}{%
+ \noexpand\csdef%
+ {##1@}{\csname##1@\endcsname}%
+ }%
+ }%
+ }%
+ }%
+ \dolistloop{\hookarg@specific}%
+}%
\newhooktoggle@specific{fulllines}%
\newhooktoggle@specific{nonum}
\newhooktoggle@specific{nosep}
@@ -6449,8 +6502,6 @@
\xdef\annot@start{\xannotationref{#2:start}}%
\xdef\annot@end{\xannotationref{#2:end}}%
\printlines\xpageref{#2:start}|\xlineref{#2:start}|\xsublineref{#2:start}|\xpageref{#2:end}|\xlineref{#2:end}|\xsublineref{#2:end}|\relax|\xflagref{#2:start}|%
- \undef\@this@crossref@end%
- \undef\@this@crossref@start%
}%
\def\do##1{%
\setkeys[mac]{falsefootnoteoption}{##1}%
@@ -6473,8 +6524,6 @@
\def\@this@crossref@start{#2:start}%
\def\@this@crossref@end{#2:end}%
\printendlines\xpageref{#2:start}|\xlineref{#2:start}|\xsublineref{#2:start}|\xpageref{#2:end}|\xlineref{#2:end}|\xsublineref{#2:end}|\relax|\xflagref{#2:start}|%
- \undef\@this@crossref@end%
- \undef\@this@crossref@start%
}%
\def\do##1{%
\setkeys[mac]{falsefootnoteoption}{##1}%