From 47af91cb8475b7352015cf05ce881e6b8415112d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Mon, 4 May 2020 03:02:37 +0000 Subject: CTAN sync 202005040302 --- .../contrib/reledmac/doc-include/migrate-mac.dtx | 10 +++-- .../reledmac/doc-more/page-typesetting-columns.pdf | Bin 40839 -> 40839 bytes .../reledmac/examples/1-criticalendnotes.pdf | Bin 177475 -> 177475 bytes .../contrib/reledmac/examples/1-criticalnotes.pdf | Bin 121597 -> 121597 bytes .../contrib/reledmac/examples/1-sidenotes.pdf | Bin 145283 -> 145283 bytes .../latex/contrib/reledmac/examples/1-tabular.pdf | Bin 189798 -> 189792 bytes .../reledmac/examples/1-verses-doublenumbering.pdf | Bin 123178 -> 123178 bytes .../latex/contrib/reledmac/examples/1-verses.pdf | Bin 123463 -> 123463 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 122256 -> 122256 bytes .../reledmac/examples/2-footnote_spacing.pdf | Bin 126016 -> 126016 bytes .../contrib/reledmac/examples/2-glossaries.pdf | Bin 18323 -> 18323 bytes .../latex/contrib/reledmac/examples/2-indexing.pdf | Bin 187631 -> 187631 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 124324 -> 124324 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 144492 -> 144492 bytes .../contrib/reledmac/examples/2-linespacing.pdf | Bin 138405 -> 138405 bytes .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 158108 -> 158108 bytes .../contrib/reledmac/examples/2-notes-width.pdf | Bin 129005 -> 129005 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 140523 -> 140523 bytes .../contrib/reledmac/examples/2-performances.pdf | Bin 135414 -> 135414 bytes .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 31754 -> 31756 bytes .../examples/2-subdivision-number-in-header.pdf | Bin 215012 -> 215012 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 190222 -> 190222 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 175170 -> 175170 bytes .../3-reledpar_columns_different_languages.pdf | Bin 24477 -> 24477 bytes .../contrib/reledmac/examples/3-reledpar_mwe.pdf | Bin 93475 -> 93475 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 37801 -> 37801 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 138222 -> 138222 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 190161 -> 190161 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 189362 -> 189362 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 168099 -> 168099 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 189915 -> 189915 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 188836 -> 188836 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 188745 -> 188745 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 188865 -> 188865 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 189690 -> 189690 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 134815 -> 134815 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 190204 -> 190204 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 201833 -> 201833 bytes .../examples/4-reledpar_inside-outside-columns.pdf | Bin 123601 -> 123601 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 215182 -> 215182 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 239560 -> 239560 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 125082 -> 125082 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 123151 -> 123151 bytes ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 263410 -> 263410 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 183782 -> 183782 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 118947 -> 118947 bytes macros/latex/contrib/reledmac/makefile | 2 +- macros/latex/contrib/reledmac/migration.pdf | Bin 356244 -> 356785 bytes macros/latex/contrib/reledmac/reledmac.dtx | 42 +++++++++++++-------- macros/latex/contrib/reledmac/reledmac.pdf | Bin 1847190 -> 1986367 bytes macros/latex/contrib/reledmac/reledpar.pdf | Bin 988616 -> 988622 bytes 51 files changed, 33 insertions(+), 21 deletions(-) (limited to 'macros/latex/contrib/reledmac') diff --git a/macros/latex/contrib/reledmac/doc-include/migrate-mac.dtx b/macros/latex/contrib/reledmac/doc-include/migrate-mac.dtx index 9110e4a009..e8e006ff71 100644 --- a/macros/latex/contrib/reledmac/doc-include/migrate-mac.dtx +++ b/macros/latex/contrib/reledmac/doc-include/migrate-mac.dtx @@ -422,9 +422,9 @@ % When using \cs{labelpstarttrue}, a spurious space\footnote{See \url{https://github.com/maieul/ledmac/issues/673\#issuecomment-322457149} for an example.} was introduced after the pstart number (only for normal typesetting, not while typesetting in parallel). % The new version of the package has deleted this spurious space. % If you consider that it was NOT a spurious space, you should add it manually in your definition of \cs{thepstart}. -% \subsection{Migration to \reledmac 2.26.0} +% \subsection{Migration to \reledmac~2.26.0} % You must delete your \verb+.aux+ file after having upgraded to this new version of \reledmac. -% \subsection{Migration to \reledmac 2.27.1} +% \subsection{Migration to \reledmac~2.27.1} This release fixes spurious space in \cs{hidenumbering}. %If you considered this spurious space as normal, you must insert it manually using. \begin{verbatim} @@ -433,11 +433,13 @@ xx\hidenumbering\ xx %To get the space after \verb+xx+. -\subsection{Migration to \reledmac 2.30.0} +% \subsection{Migration to \reledmac~2.30.0} If you have multiple annotations for the same line, these are now separated with a comma in the margin. You can use \cs{setlinenumannotationsep} to change the separator. -% \subsection{Migration to \reledmac 2.31.1} +% \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.32.7} +% For paragraphed familiar footnotes, the separator between notes was \cs{Xparafootsep} instead of \cs{parafootsepX}. This release fixes this bug. You may adapte your settings. diff --git a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf index a573eab690..be0c0a4c51 100644 Binary files a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf and b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf index 86bc6586e0..cc14357519 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf and b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf index dc66a76df9..f426e46519 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf and b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf index 27f44aaa24..2f406ad2f9 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf and b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf index 5017cbfe52..005cbb4063 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-tabular.pdf and b/macros/latex/contrib/reledmac/examples/1-tabular.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf index 83f880f4c2..e78280ae2f 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf and b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf index 0f67cf21db..cba4149a9a 100644 Binary files a/macros/latex/contrib/reledmac/examples/1-verses.pdf and b/macros/latex/contrib/reledmac/examples/1-verses.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf index bbd1ce59e7..43a4d38655 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf and b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf index ed1cb1a9bf..57964276e4 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf and b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf index bed2b14615..402216df1d 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf and b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf index 613d8e1e45..ffee0f5dbf 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-indexing.pdf and b/macros/latex/contrib/reledmac/examples/2-indexing.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf index c69365c478..6fe99c3c6a 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf and b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf index 2cbc60c572..c37aae78d2 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf and b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf index 8e9afbd9b6..5d0cdcaff5 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf and b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf index c1a159046d..625d480335 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf and b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf index be64a10566..ccff976090 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf and b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf index c46b358e56..544fc8a7d2 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf and b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf index 9127236015..fe8af3ddff 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-performances.pdf and b/macros/latex/contrib/reledmac/examples/2-performances.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf index 7122422fd1..5b2096deb0 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf and b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf index 9d68fe42db..284a8a1e5a 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf and b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf index 7279fd65fd..95bd7622cb 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf and b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf index bac948ef54..0d3e6f7e16 100644 Binary files a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf and b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf index acb74e6b32..323628e30b 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf index 91b2519792..f014ed15ad 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf index 96c1f950de..16c3b73766 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf index b56828afab..a011c87b87 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf index 800eeb88fd..29a52ebe6e 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf index 6e27aea885..53fdf089ee 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf index 503997cc43..b357f9b772 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf index 32115ab4b7..6f10f9af49 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf index 1de5e4bb0d..31e950a05c 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf index a8180687cc..2c405eff8f 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf index 2f8bc198ac..71b8e778e5 100644 Binary files a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf and b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf index 00c2fac4e6..db4d5edd86 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf index f87c13957d..6cfb526f37 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf index ebf58aaf56..93045f4902 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf index 61554fad0e..884850350c 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf index 0e088228ed..f8e2e7a285 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf index 1a276771ae..c8759eeb8e 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf index 2295af22dc..77417feb1c 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf index 538b451de4..2ced3bbfe3 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf index 08f6e18440..f9270fdcbb 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf index 40f3a123bc..dc6cd965b9 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf index e1a1f48349..51ce6a016e 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf differ diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf index e26b41ccc7..2717b023b5 100644 Binary files a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf and b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf differ diff --git a/macros/latex/contrib/reledmac/makefile b/macros/latex/contrib/reledmac/makefile index a530fdd0a9..87f38bb0e7 100644 --- a/macros/latex/contrib/reledmac/makefile +++ b/macros/latex/contrib/reledmac/makefile @@ -12,7 +12,7 @@ PACKAGE = *.dtx \ .PHONY: all dist clean doc test -all: reledmac.sty reledpar.sty reledmac.pdf reledpar.pdf migration.pdf dist +all: test reledmac.sty reledpar.sty reledmac.pdf reledpar.pdf migration.pdf dist doc: *.pdf diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf index c35fc3ac1d..2e3b040973 100644 Binary files a/macros/latex/contrib/reledmac/migration.pdf and b/macros/latex/contrib/reledmac/migration.pdf differ diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx index 97dfb0c005..c7275b5af6 100644 --- a/macros/latex/contrib/reledmac/reledmac.dtx +++ b/macros/latex/contrib/reledmac/reledmac.dtx @@ -548,6 +548,9 @@ % \changes{v2.32.5}{2020/03/08}{Fix bug with macro inside \protect\cs{sameword} with no-\protect\XeTeX\ engines.} % \changes{v2.32.6}{2020/04/19}{Fix bug with glossary entries inside the first argument of \protect\cs{edtext}.} % \changes{v2.32.6}{2020/04/19}{Add hyperref link when inserting glossary entries.} +% \changes{v2.32.7}{2020/05/03}{Fix bug with \protect\cs{parafootsepX}.} +% \changes{v2.32.7}{2020/05/03}{Fix bug with \protect\cs{lineation}\arg{pstart} and \protect\cs{edtext} in the very first line of a \protect\cs{pstart}.} +% \changes{v2.32.7}{2020/05/03}{Fix spurious spaces at the very first line of \protect\env{edtabular} environnments.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -4331,7 +4334,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2020/04/19 v2.32.6 typesetting critical editions]% +\ProvidesPackage{reledmac}[2020/05/03 v2.32.7 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -8800,21 +8803,10 @@ \endgraf\global\num@lines=\prevgraf\egroup% \global\par@line=0% % \end{macrocode} -% We check if lineation is by pstart: in this case, we reset the line number, but only in the second line of the pstart. -% We can't reset line number at the beginning of \protect\cs{pstart}, as \protect\cs{setline} is parsed at the end of previous \protect\cs{pend}, and so, we must do it at the end of first line of pstart. +% Output the lines. % \begin{macrocode} - \csnumdef{pstartline}{0}% \loop\ifvbox\raw@text% - \csnumdef{pstartline}{\pstartline+\@ne}% \do@line% - \ifbypstart@% - \ifnumequal{\pstartline}{1}{% - \bgroup% - \let\leavevmode\relax% - \setline{1}% - \egroup% - \resetprevline@}{}% - \fi% \repeat% % \end{macrocode} % Deal with any leftover notes, and then end the group that was begun @@ -8855,6 +8847,16 @@ \ifautopar% \autopar% \fi% +% \end{macrocode} +% At the very end, we check if the lineation is made by \cs{pstart}. In this case, we reset the line number, using \cs{setlinenum}, as we are, technically, already out of \cs{pstart}\cs{pend} structure. +% \begin{macrocode} + \ifbypstart@% + \begingroup% + \let\leavevmode\relax% + \setlinenum{0}% + \endgroup% + \resetprevline@% + \fi% } % \end{macrocode} % \end{macro} @@ -13490,12 +13492,12 @@ \newcommand{\insertparafootsepX}[1]{% \ifledRcol@% \ifnumequal{\csuse{prevpage#1@numR}}{\page@numR}% - {\csuse{Xparafootsep@#1}}% + {\csuse{parafootsepX@#1}}% {}% \global\csname prevpage#1@numR\endcsname=\page@numR% \else% \ifnumequal{\csuse{prevpage#1@num}}{\page@num}% - {\csuse{Xparafootsep@#1}}% + {\csuse{parafootsepX@#1}}% {}% \global\csname prevpage#1@num\endcsname=\page@num% \fi% @@ -19238,7 +19240,13 @@ % \begin{macrocode} \newcommand{\addtol@denvbody}[1]{% \global\l@denvbody\expandafter{\the\l@denvbody#1}} - +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\if@edtabular} +% A boolean set to true inside a \macpackage' tabular environnment. +% \begin{macrocode} +\newif\if@edtabular% % \end{macrocode} % \end{macro} % @@ -19251,10 +19259,12 @@ % % \begin{macrocode} \newcommand{\l@dcollect@body}[1]{% + \\%Ensure that we don't have spurious indentation at the very first line, caused by some text before. \l@denvbody{\expandafter#1\expandafter{\the\l@denvbody}}% \edef\processl@denvbody{\the\l@denvbody\noexpand\end{\@currenvir}}% \l@denvbody\@emptytoks \def\l@dbegin@stack{b}% \begingroup + \@edtabulartrue% \expandafter\let\csname\@currenvir\endcsname\l@dcollect@@body \edef\processl@denvbody{\expandafter\noexpand\csname\@currenvir\endcsname}% \processl@denvbody% diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf index 11d404b54c..f9d28cda8f 100644 Binary files a/macros/latex/contrib/reledmac/reledmac.pdf and b/macros/latex/contrib/reledmac/reledmac.pdf differ diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf index b29193003b..9853b3fdad 100644 Binary files a/macros/latex/contrib/reledmac/reledpar.pdf and b/macros/latex/contrib/reledmac/reledpar.pdf differ -- cgit v1.2.3