From 93ce4959f15b3a5e4790597cded9ca47050e6d91 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 10 Apr 2016 21:01:44 +0000 Subject: reledmac (10apr16) git-svn-id: svn://tug.org/texlive/trunk@40388 c570f23f-e606-0410-a88d-b1316a301751 --- .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 17167 -> 17312 bytes .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 20306 -> 20240 bytes .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 21004 -> 20778 bytes .../doc/latex/reledmac/examples/1-verses.pdf | Bin 17412 -> 17414 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 18555 -> 18553 bytes .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 20986 -> 20769 bytes .../doc/latex/reledmac/examples/2-glossaries.pdf | Bin 21757 -> 21879 bytes .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 21720 -> 21720 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 17092 -> 17091 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 31487 -> 31486 bytes .../doc/latex/reledmac/examples/2-linespacing.pdf | Bin 26189 -> 26340 bytes .../doc/latex/reledmac/examples/2-notes-width.pdf | Bin 24717 -> 24871 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 25882 -> 25870 bytes .../doc/latex/reledmac/examples/2-performances.pdf | Bin 23262 -> 23217 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 22799 -> 22798 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 17193 -> 17192 bytes .../3-reledpar_columns_different_languages.pdf | Bin 26317 -> 26096 bytes .../doc/latex/reledmac/examples/3-reledpar_mwe.pdf | Bin 12223 -> 12223 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 39706 -> 39706 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 23263 -> 23030 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 35012 -> 35014 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 34749 -> 34744 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 33307 -> 33303 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 34911 -> 34915 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 34478 -> 34471 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 34511 -> 34513 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 34741 -> 34742 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 22435 -> 22442 bytes ...mn_mix_with_not_column-continuous-numbering.tex | 4 +- .../4-reledpar_column_mix_with_not_column.pdf | Bin 27102 -> 27266 bytes .../4-reledpar_column_mix_with_not_column.tex | 4 +- .../examples/4-reledpar_columns_alignment.pdf | Bin 21175 -> 21172 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 29692 -> 29485 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 36501 -> 36488 bytes ...ar_page_titles_in_line_numbering_with_notes.pdf | Bin 32642 -> 32438 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 59059 -> 59064 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 22728 -> 22726 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 19083 -> 19009 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 22222 -> 22218 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 16239 -> 16241 bytes Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 86728 -> 86728 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 1109028 -> 1107657 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 449603 -> 448314 bytes .../texmf-dist/source/latex/reledmac/reledmac.dtx | 74 +++++++++++++-------- .../texmf-dist/source/latex/reledmac/reledpar.dtx | 18 ++--- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 53 ++++++++++----- 46 files changed, 98 insertions(+), 55 deletions(-) (limited to 'Master/texmf-dist') 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 634ac6c3b42..9f3cff55f81 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf index 385b6e92df0..a662585cc2e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf index 86b0cf83208..7d0bb129df1 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf index 911a692bb2b..aff54788f64 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf index 1b06cf805d8..76bba33b587 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf index b19c68cb77c..139f3133bf7 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf index d65e3ea20a6..372e0cd369f 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf index 54543ab9690..7a6d42279ec 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf index 7a47ad5239b..8fc045925be 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf index 5e7e0d38584..853b2c3d55e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf index d47407b7607..afd28b7843f 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf index 02b3bf1f6d4..b49b7f6781f 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf index 306061f1658..d1cc6f60bd6 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf index ef0c8e55a39..90a315c2581 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf index 31d4d9fe928..440af6d9c82 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf index 69106b1232c..d7e979adeb4 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf index b35aff832d3..1e21e25de71 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf index 650ed7e87f5..c72d121808b 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf index 898401827b5..3270454c3c4 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf index d7c9ecb4e03..44f763311ad 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf index cbe52180d37..48662a59c83 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf index 6a5997010d8..020f559fb33 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf index 68d130200ac..a48776f8e6e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf index c1f3cd96fd8..89d93968177 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf index 2d53f53a122..199627ebbb8 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf index ba6f7c1c7f4..f1c525a1b44 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf index 12db28d9ed0..1e05276a447 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf index 085167c2f13..351c03cb6f4 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex index 36d252b34b3..d56d66e1f76 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex @@ -18,9 +18,9 @@ \begin{document} \begin{english} -\title{Mixing columns with not column, using continuous numbering} +\title{Mixing multiple columns with a single column, using continuous numbering} \begin{abstract} -In this example, we use the \verb+widthliketwocolumns+ and \\ \verb+continuousnumberingwithcolumns+ and \verb+\pausenumbering+ to alternate parallel typesetting in columns and normal typesetting, getting continuous line numbering between them. +In this example, we use the \verb+widthliketwocolumns+ and \\ \verb+continuousnumberingwithcolumns+ and \verb+\pausenumbering+ to alternate parallel typesetting in columns and typesetting in a single column, getting continuous line numbering between them. \end{abstract} \end{english} \begin{pairs} 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 01b2c1033b8..e7b6cf89b25 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.tex b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.tex index e6398f65f92..ae7ac1c7139 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.tex @@ -18,10 +18,10 @@ \begin{document} \begin{english} -\title{Mixing columns with not column} +\title{Mixing multiple columns with single column} \maketitle \begin{abstract} -In this example, we use the \verb+widthliketwocolumns+ option and the \verb+\Xnoteswidthliketwocolumns+ and \verb+\noteswidthliketwocolumnsX+ to alternate parallel typesetting in columns and normal typesetting. +In this example, we use the \verb+widthliketwocolumns+ option and the \verb+\Xnoteswidthliketwocolumns+ and \verb+\noteswidthliketwocolumnsX+ to alternate parallel typesetting in multiple columns and single column typesetting. \end{abstract} \end{english} 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 11477bed082..236d73e766c 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf index df4d3eec3a8..d46c5995377 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf index a985e7682f7..d16cb161714 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf index 730c8dc4837..d6c07f93663 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_page_titles_in_line_numbering_with_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf index d7e07611d2f..098b5faac59 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf index 1f7971d782f..3bb7ec356db 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf index 80be471916c..7acc9cd3c59 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf index cd8fbbd7e85..d862c8dd75b 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf index 4e63a8a406f..7a97d815b97 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf index b5d4dd9626d..d86f253129e 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/migration.pdf and b/Master/texmf-dist/doc/latex/reledmac/migration.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf index 69b24680441..a861ae42451 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf and b/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf index 00da8794912..7cf3b7cfffe 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf and b/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf differ diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index 903771c1dfb..06e07289a51 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -382,15 +382,16 @@ % \changes{v2.8.0}{2016/01/15}{\protect\macpackage cross-referencing can take advantage of \protect\package{xr} package.} % \changes{v2.8.0}{2016/01/15}{No indentation for paragraphed notes in ledgroup. Can be changed with \protect\cs{Xparindent} and \protect\cs{parindentX}.} % \changes{v2.8.0}{2016/01/15}{More \protect\cs{edgls…} commands.} -% \changes{v2.8.1}{2016/02/22}{Warning for undefined labels are really parsable by latexmk} +% \changes{v2.8.1}{2016/02/22}{Warnings for undefined labels are really parsable by latexmk} % \changes{v2.8.2}{2016/02/27}{Fix bug with \protect\cs{AtEveryPstart} added in version 2.0.0.} -% \changes{v2.8.2}{2016/02/27}{Fix bug with vertical space after between sectioning command as optional argument of a \protect\cs{pstart} and \protect\cs{pstart} content} -% \changes{v2.8.2}{2016/02/27}{Fix bug concerning indent in a paragraph immediatly following a sectioning command (bug NOT fixed on reledpar)} -% \changes{v2.9.0}{2016/03/23}{Allow to make continuing line numbering between normal text and parallel text, using \protect\cs{pausenumbering} and \protect\cs{resumenumbering} and the \protect\option{continuousnumberingwithcolumns} option.} +% \changes{v2.8.2}{2016/02/27}{Fix bug with vertical space after the between-sectioning command as optional argument of a \protect\cs{pstart} and \protect\cs{pstart} content} +% \changes{v2.8.2}{2016/02/27}{Fix bug concerning indent in a paragraph immediately following a sectioning command (bug NOT fixed on reledpar)} +% \changes{v2.9.0}{2016/03/23}{Allow continuing line numbering between normal text and parallel text, using \protect\cs{pausenumbering} and \protect\cs{resumenumbering} and the \protect\option{continuousnumberingwithcolumns} option.} % \changes{v2.9.0}{2016/03/23}{Fix bug when using \protect\cs{linenum}\protect\arg{page} and \protect\cs{pausenumbering}\protect\ldots\protect\cs{resumenumbering}.} % \changes{v2.9.0}{2016/03/23}{Write correct metadata in numbered files when using \protect\cs{pausenumbering}\protect\ldots\protect\cs{resumenumbering}.} -% \changes{v2.9.0}{2016/03/23}{Fix bug with three and two columns footnote setting (added in v.2.4.0).} -% \changes{v2.9.0}{2016/03/23}{Fix spurious space inside three columns familiar footnote.} +% \changes{v2.9.0}{2016/03/23}{Fix bug with three- and two-column footnote setting (added in v.2.4.0).} +% \changes{v2.9.0}{2016/03/23}{Fix spurious space inside three-column familiar footnote.} +% \changes{v2.9.1}{2016/04/09}{Fix bug when notes start by ``plus'' or ``minus''.} % \title{\Macpackage \\ % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} @@ -639,8 +640,8 @@ % problems with a line or two misnumbered at the top of a page, try % running \LaTeX\ once or twice more. % -% However, the best way to be sure to have made the good number of runs -% is to use some \LaTeX's run scripts like \emph{latexmk}. +% However, the best way to be sure that one has made the right number of runs +% is to use some of \LaTeX's run scripts like \emph{latexmk}. % % A file may mix \emph{numbered} and \emph{unnumbered} text. % @@ -3485,7 +3486,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2016/03/23 v2.9.0 typeset critical edition]% +\ProvidesPackage{reledmac}[2016/04/09 v2.9.1 typeset critical edition]% % \end{macrocode} % % \subsection{Package options} @@ -7341,8 +7342,8 @@ \normal@pars% \ifstrempty{#1}{\at@every@pend}{\noindent#1}% % \end{macrocode} -% Restore standard nobreak setting and autopar setting. -% Normally, \cs{if@nobreak} is equal to true only immediatly after a sectioning command (read latex.ltx file). As a \cs{pstart}…\cs{pend} structure can't contain any sectioning command, we set \cs{if@nobreak} to false. +% Restore standard nobreak setting and autopar setting. +% Normally, \cs{if@nobreak} is equal to true only immediately after a sectioning command (read latex.ltx file). As a \cs{pstart}…\cs{pend} structure can't contain any sectioning command, we set \cs{if@nobreak} to false. % \begin{macrocode} \@nobreakfalse% \ifautopar% @@ -8678,9 +8679,14 @@ {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% {{\csuse{Xlemmafont@#4}#2}}% }% - \iftoggle{nosep@}{\hskip\csuse{Xinplaceoflemmaseparator@#4}}{\ifcsempty{Xlemmaseparator@#4}% - {\hskip\csuse{Xinplaceoflemmaseparator@#4}}% - {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}\relax% + \iftoggle{nosep@}{% + \hskip\csuse{Xinplaceoflemmaseparator@#4}% + \relax% + }% + {\ifcsempty{Xlemmaseparator@#4}% + {\hskip\csuse{Xinplaceoflemmaseparator@#4}\relax}% + {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% + \relax% }}% #3\strut\par} % \end{macrocode} @@ -9083,7 +9089,7 @@ \unskip % remove \rightskip, \unskip % remove \parfillskip, \unpenalty % remove \penalty of 10000, - \hskip\csuse{Xafternote@#2}} % but add the glue to go between the notes + \hskip\csuse{Xafternote@#2}\relax}% but add the glue to go between the notes % \end{macrocode} % \end{macro} @@ -9107,9 +9113,15 @@ {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% {{\csuse{Xlemmafont@#4}#2}}% }% - \iftoggle{nosep@}{\hskip\csuse{Xinplaceoflemmaseparator@#4}}{\ifcsempty{Xlemmaseparator@#4}% - {\hskip\csuse{Xinplaceoflemmaseparator@#4}}% - {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% + \iftoggle{nosep@}{% + \hskip\csuse{Xinplaceoflemmaseparator@#4}\relax% + }% + {\ifcsempty{Xlemmaseparator@#4}% + {% + \hskip\csuse{Xinplaceoflemmaseparator@#4}\relax% + }% + {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% + \relax% }}% #3\penalty-10 } % \end{macrocode} @@ -9403,9 +9415,13 @@ {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% {{\csuse{Xlemmafont@#4}#2}}% }% - \iftoggle{nosep@}{\hskip\csuse{Xinplaceoflemmaseparator@#4}}{\ifcsempty{Xlemmaseparator@#4}% - {\hskip\csuse{Xinplaceoflemmaseparator@#4}}% - {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% + \iftoggle{nosep@}{% + \hskip\csuse{Xinplaceoflemmaseparator@#4}\relax% + }{% + \ifcsempty{Xlemmaseparator@#4}% + {\hskip\csuse{Xinplaceoflemmaseparator@#4}\relax}% + {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% + \relax% }}% #3\strut\par\allowbreak} % \end{macrocode} @@ -9537,9 +9553,13 @@ {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% {{\csuse{Xlemmafont@#4}#2}}% }% - \iftoggle{nosep@}{\hskip\csuse{Xinplaceoflemmaseparator@#4}}{\ifcsempty{Xlemmaseparator@#4}% - {\hskip\csuse{Xinplaceoflemmaseparator@#4}}% + \iftoggle{nosep@}{% + \hskip\csuse{Xinplaceoflemmaseparator@#4}% + \relax% + }{\ifcsempty{Xlemmaseparator@#4}% + {\hskip\csuse{Xinplaceoflemmaseparator@#4}\relax}% {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% + \relax% }}% #3\strut\par\allowbreak} % \end{macrocode} @@ -11065,7 +11085,8 @@ \unskip % remove \rightskip, \unskip % remove \parfillskip, \unpenalty % remove \penalty of 10000, - \hskip\csuse{afternoteX@#2}} % but add the glue to go between the notes + \hskip\csuse{afternoteX@#2}% + \relax}% but add the glue to go between the notes % \end{macrocode} % \end{macro} @@ -11533,7 +11554,7 @@ \csuse{Xendnotefontsize@#4}% \hangindent=\csuse{Xendhangindent@#4}% \ifXendinsertsep@% - \hskip\csuse{Xendafternote@#4}% + \hskip\csuse{Xendafternote@#4}\relax% \csuse{Xendsep@#4}% \else% \iftoggle{Xendparagraph@#4}% @@ -11559,11 +11580,12 @@ togl {nosep@}% or test{\ifcsempty{Xendlemmaseparator@#4}}% }% - {\hskip\csuse{Xendinplaceoflemmaseparator@#4}}% + {\hskip\csuse{Xendinplaceoflemmaseparator@#4}\relax}% {\nobreak% \hskip\csuse{Xendbeforelemmaseparator@#4}% \csuse{Xendlemmaseparator@#4}% \hskip\csuse{Xendafterlemmaseparator@#4}% + \relax% }% #3% \nottoggle{Xendparagraph@#4}{\par}{}% diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index 62f9ec33255..fe2cf7b0ed2 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -266,8 +266,8 @@ % \changes{v2.6.2}{2015/11/29}{Fix bug (added in v2.6.0) with footnote numbering in parallel typesetting while using \protect\package{polyglossia} with specific numbering systems (like Greek).} % \changes{v2.6.3}{2015/12/13}{Fix spurious dot when using \protect\cs{linenummargin} on right side (introduced in v2.5.0).} % \changes{v2.7.0}{2016/01/15}{\protect\macpackage cross-referencing can take advantage of \protect\package{xr} package.} -% \changes{v2.7.1}{2016/03/06}{Fix bug added in \protect\reledmac~2.8.2, when typesetting parallel text just after a sectionning command} -% \changes{v2.8.0}{2016/03/23}{{Allow to make continuing line numbering between normal text and parallel text, using \protect\cs{pausenumbering} and \protect\cs{resumenumbering} and the \protect\option{continuousnumberingwithcolumns} option.}} +% \changes{v2.7.1}{2016/03/06}{Fix bug added in \protect\reledmac~2.8.2, when typesetting parallel text just after a sectioning command} +% \changes{v2.8.0}{2016/03/23}{{Allow continuing line numbering between normal text and parallel text, using \protect\cs{pausenumbering} and \protect\cs{resumenumbering} and the \protect\option{continuousnumberingwithcolumns} options.}} % \changes{v2.8.0}{2016/03/23}{Fix bug when the right line number style is not the same to the left line number style} % \changes{v2.8.0}{2016/03/23}{Add \protect\cs{linenumberLevenifblanktrue} and \protect\cs{linenumberRevenifblank} commands} % ^^A PW added following as the definitions are at some unknown elsewhere @@ -546,7 +546,7 @@ % In most cases, you should use \protect\cs{widthliketwocolumns} in combination with \protect\cs{Xnoteswidthliketwocolumns} and \protect\cs{notesXwidthliketwocolumns} to align the critical/familiar footnotes with the two colums. % See \macpackage's handbook for more details. % -% If you want to have continuous line numbers between columns and not column, use the \option{continuousnumberingwithcolumns} option when loading \macpackage or \parpackage. +% 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}). % % @@ -938,8 +938,8 @@ % % \DescribeMacro{\linenumberLevenifblanktrue} % \DescribeMacro{\linenumberRevenifblanktrue} -% By default, when a blank line is printed on one side for the need of synchronism with the other side, no line number is printed. -% However, you can decide to print them also for blank lines. +% By default, when a blank line is printed on one side, in order to synchronize with the other side, no line number is printed. +% However, you can decide to print them for blank lines, also. % Use \cs{linenumberLevenifblanktrue} to enable it on the left side, and \cs{linenumberRevenifblanktrue} to enable it on right side. % % \subsection{Chunks} @@ -1706,7 +1706,7 @@ % \end{macro} % % \begin{macro}{\set@continuousnumberingforR} -% \cs{set@continuousnumberingforR} set the right line numbers at a \cs{beginnumberingR} or a \cs{resumenumberingR} in order to have continuous numbering with not parallel text. +% \cs{set@continuousnumberingforR} set the right line numbers at a \cs{beginnumberingR} or a \cs{resumenumberingR} in order to have continuous numbering with single column text. % \begin{macrocode} \newcommand{\set@continuousnumberingforR}{% \ifcontinuousnumberingwithcolumns% @@ -1934,7 +1934,7 @@ % \subsection{Print marginal line number} % \begin{macro}{\iflinenumberLevenifblank} % \begin{macro}{\iflinenumberRevenifblank} -% \cs{iflinenumberLevenifblank} and \cs{iflinenumberRevenifblank} can be switchen to TRUE if we want to print the line number even if the line is blank. +% \cs{iflinenumberLevenifblank} and \cs{iflinenumberRevenifblank} can be switched to TRUE if we want to print the line number, even if the line is blank. % \begin{macrocode} \newif\iflinenumberLevenifblank \newif\iflinenumberRevenifblank @@ -6370,8 +6370,8 @@ % \begin{macro}{\par@patch@pagenumbering} % \cs{par@patch@thepage} patches \cs{thepage} in order to use the value of \verb+par@page+ counter and not the value of \verb+par@page+. % It must be called after any redefinition of \cs{thepage}. -% That why we insert it at the end of the \LaTeX\ macro \cs{pagenumbering}, which is called by some \cs{xxxmatter} commands. -% In the case of \ltxclass{memoir} class using, we insert it at the end of \cs{@mempnum}. +% That is why we insert it at the end of the \LaTeX\ macro \cs{pagenumbering}, which is called by some \cs{xxxmatter} commands. +% In cases when we are using the \ltxclass{memoir} class, we insert it at the end of \cs{@mempnum}. % When using \cs{pagenumbering}, we also need to restart \verb+par@page+ counter. Consequently, we have wrapped \cs{par@patch@thepage} and counter restart in \cs{par@patch@pagenumbering} % We also call \cs{par@patch@thepage} it at the beginning of the document. % \begin{macrocode} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 533987befdd..cbc159c2b9e 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}[2016/03/23 v2.9.0 typeset critical edition]% +\ProvidesPackage{reledmac}[2016/04/09 v2.9.1 typeset critical edition]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -2118,9 +2118,14 @@ {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% {{\csuse{Xlemmafont@#4}#2}}% }% - \iftoggle{nosep@}{\hskip\csuse{Xinplaceoflemmaseparator@#4}}{\ifcsempty{Xlemmaseparator@#4}% - {\hskip\csuse{Xinplaceoflemmaseparator@#4}}% - {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}\relax% + \iftoggle{nosep@}{% + \hskip\csuse{Xinplaceoflemmaseparator@#4}% + \relax% + }% + {\ifcsempty{Xlemmaseparator@#4}% + {\hskip\csuse{Xinplaceoflemmaseparator@#4}\relax}% + {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% + \relax% }}% #3\strut\par} \newcommand*{\normalfootstart}[1]{% @@ -2266,7 +2271,7 @@ \unskip % remove \rightskip, \unskip % remove \parfillskip, \unpenalty % remove \penalty of 10000, - \hskip\csuse{Xafternote@#2}} % but add the glue to go between the notes + \hskip\csuse{Xafternote@#2}\relax}% but add the glue to go between the notes \newcommand*{\parafootfmt}[4]{% \Xinsertparafootsep{#4}% @@ -2276,9 +2281,15 @@ {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% {{\csuse{Xlemmafont@#4}#2}}% }% - \iftoggle{nosep@}{\hskip\csuse{Xinplaceoflemmaseparator@#4}}{\ifcsempty{Xlemmaseparator@#4}% - {\hskip\csuse{Xinplaceoflemmaseparator@#4}}% - {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% + \iftoggle{nosep@}{% + \hskip\csuse{Xinplaceoflemmaseparator@#4}\relax% + }% + {\ifcsempty{Xlemmaseparator@#4}% + {% + \hskip\csuse{Xinplaceoflemmaseparator@#4}\relax% + }% + {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% + \relax% }}% #3\penalty-10 } \newcommand*{\parafootgroup}[1]{% @@ -2422,9 +2433,13 @@ {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% {{\csuse{Xlemmafont@#4}#2}}% }% - \iftoggle{nosep@}{\hskip\csuse{Xinplaceoflemmaseparator@#4}}{\ifcsempty{Xlemmaseparator@#4}% - {\hskip\csuse{Xinplaceoflemmaseparator@#4}}% - {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% + \iftoggle{nosep@}{% + \hskip\csuse{Xinplaceoflemmaseparator@#4}\relax% + }{% + \ifcsempty{Xlemmaseparator@#4}% + {\hskip\csuse{Xinplaceoflemmaseparator@#4}\relax}% + {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% + \relax% }}% #3\strut\par\allowbreak} \newcommand*{\threecolfootgroup}[1]{{\csuse{Xnotefontsize@#1}% @@ -2505,9 +2520,13 @@ {\select@lemmafont#1|{\csuse{Xlemmafont@#4}#2}}% {{\csuse{Xlemmafont@#4}#2}}% }% - \iftoggle{nosep@}{\hskip\csuse{Xinplaceoflemmaseparator@#4}}{\ifcsempty{Xlemmaseparator@#4}% - {\hskip\csuse{Xinplaceoflemmaseparator@#4}}% + \iftoggle{nosep@}{% + \hskip\csuse{Xinplaceoflemmaseparator@#4}% + \relax% + }{\ifcsempty{Xlemmaseparator@#4}% + {\hskip\csuse{Xinplaceoflemmaseparator@#4}\relax}% {\nobreak\hskip\csuse{Xbeforelemmaseparator@#4}\csuse{Xlemmaseparator@#4}\hskip\csuse{Xafterlemmaseparator@#4}% + \relax% }}% #3\strut\par\allowbreak} \newcommand*{\twocolfootgroup}[1]{{\csuse{Xnotefontsize@#1} @@ -3426,7 +3445,8 @@ \unskip % remove \rightskip, \unskip % remove \parfillskip, \unpenalty % remove \penalty of 10000, - \hskip\csuse{afternoteX@#2}} % but add the glue to go between the notes + \hskip\csuse{afternoteX@#2}% + \relax}% but add the glue to go between the notes \newcommand*{\parafootfmtX}[2]{% \protected@edef\@currentlabel{% @@ -3675,7 +3695,7 @@ \csuse{Xendnotefontsize@#4}% \hangindent=\csuse{Xendhangindent@#4}% \ifXendinsertsep@% - \hskip\csuse{Xendafternote@#4}% + \hskip\csuse{Xendafternote@#4}\relax% \csuse{Xendsep@#4}% \else% \iftoggle{Xendparagraph@#4}% @@ -3701,11 +3721,12 @@ togl {nosep@}% or test{\ifcsempty{Xendlemmaseparator@#4}}% }% - {\hskip\csuse{Xendinplaceoflemmaseparator@#4}}% + {\hskip\csuse{Xendinplaceoflemmaseparator@#4}\relax}% {\nobreak% \hskip\csuse{Xendbeforelemmaseparator@#4}% \csuse{Xendlemmaseparator@#4}% \hskip\csuse{Xendafterlemmaseparator@#4}% + \relax% }% #3% \nottoggle{Xendparagraph@#4}{\par}{}% -- cgit v1.2.3