From 2f84d45b969f3d03fc9dde2011830a39118f9a35 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 13 Dec 2015 23:45:02 +0000 Subject: reledmac (13dec15) git-svn-id: svn://tug.org/texlive/trunk@39095 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/reledmac/doc-include/migrate-mac.dtx | 5 + .../doc/latex/reledmac/doc-include/migrate-par.dtx | 3 +- .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 17191 -> 17022 bytes .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 20113 -> 20238 bytes .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 20940 -> 20864 bytes .../doc/latex/reledmac/examples/1-verses.pdf | Bin 17412 -> 17411 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 18554 -> 18553 bytes .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 20953 -> 20863 bytes .../doc/latex/reledmac/examples/2-glossaries.pdf | Bin 21664 -> 21701 bytes .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 21720 -> 21722 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 17095 -> 17092 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 31487 -> 31487 bytes .../doc/latex/reledmac/examples/2-linespacing.pdf | Bin 26240 -> 26100 bytes .../doc/latex/reledmac/examples/2-notes-width.pdf | Bin 24733 -> 24588 bytes .../doc/latex/reledmac/examples/2-notes-width.tex | 4 +- .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 25883 -> 25876 bytes .../doc/latex/reledmac/examples/2-performances.pdf | Bin 23081 -> 23111 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 22796 -> 22801 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 17137 -> 17140 bytes .../3-reledpar_columns_different_languages.pdf | Bin 26279 -> 26192 bytes .../doc/latex/reledmac/examples/3-reledpar_mwe.pdf | Bin 12225 -> 12221 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 42225 -> 39708 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 23217 -> 23137 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 35015 -> 35008 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 34741 -> 34744 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 33292 -> 33299 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 34914 -> 34914 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 34473 -> 34470 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 34510 -> 34511 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 34743 -> 34740 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 18435 -> 18434 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 21173 -> 21173 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 29660 -> 29579 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 36504 -> 36500 bytes ...ar_page_titles_in_line_numbering_with_notes.pdf | Bin 32539 -> 32536 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 59061 -> 59062 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 22727 -> 22726 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 18886 -> 18726 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 22222 -> 22218 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 16237 -> 16238 bytes Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 86195 -> 86580 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 1095214 -> 1101705 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 443461 -> 443562 bytes .../texmf-dist/source/latex/reledmac/reledmac.dtx | 173 +++++++++++++++------ .../texmf-dist/source/latex/reledmac/reledpar.dtx | 8 +- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 127 ++++++++++----- Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 4 +- 47 files changed, 231 insertions(+), 93 deletions(-) (limited to 'Master') 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 f4d1615633a..43e9c18a2ca 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 @@ -391,3 +391,8 @@ % \cs{rigidbalance} is split to two new commands: \cs{Xrigidbalance} for critical footnotes and \cs{rigidbalanceX} for familiar footnotes. If you have redefined it --- but why should you have ?---, you should split your single redefinition in two redefinitions. % % +% \subsection{Migration to \reledmac~2.7.2} +% \cs{Xhsize} is already defined in the \package{floatrow} package. +% It becomes \cs{Xwidth}, and, consequently, \cs{hsizeX} becomes \cs{widthX}. +% +% The ancient names are temporarily maintained as aliases. diff --git a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx index 49d56919f20..361c1518298 100644 --- a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx +++ b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-par.dtx @@ -1,4 +1,3 @@ - % \subsection{Migration to \eledpar 1.4.3} % Version 1.4.3 corrects a bug added in version 0.12, which made hanging verse always flush right, despite the value of the first element in the \cs{setstanzaindents} command. % @@ -70,7 +69,7 @@ % % We have tested and saw no problem with this correction, but if you see a difference in alignment between version 2.3.0 and 2.4.0, please contact us. % \subsection{Migration to \reledpar~2.5.0} -% If you use \cs{stanza} or \env{astanza} environment, please read \reff*{reledmac-mac2.3.0migration}. +% If you use either \cs{stanza} or \env{astanza} environment, please read \reff*{reledmac-mac2.3.0migration}. % \subsection{Migration to \reledpar~2.6.0} % \cs{printlinenumR} was deleted. Use \cs{Xlineflag} instead. % \subsection{Migration to \reledpar~2.6.1} 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 99668fa506e..bfdb0d7c946 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 efdd15d6b99..bb53342b6fd 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 a6dd038f325..c7b60db9337 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 bda2c4de791..23009cbb1a3 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 c69aa4546a7..4f6b7c6c22b 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 c6428c865c8..d40332f804b 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 09cd7efb35f..93db873f9d6 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 aa161fc89da..6fcc73feea9 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 38c55ef1ecc..e68bbc614d6 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 c2731600058..66aacfe014a 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 8ad6af53a50..05a940599b0 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 df0acc254ad..374186bab07 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-notes-width.tex b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.tex index 628a4530d47..c1b884b957d 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.tex @@ -12,8 +12,8 @@ \arrangementX[A]{paragraph} \arrangementX[B]{twocol} \arrangementX[C]{threecol} -\Xhsize{\columnwidth+\marginparsep+\ledrsnotewidth} -\hsizeX{\columnwidth+\marginparsep+\ledrsnotewidth} +\Xwidth{\columnwidth+\marginparsep+\ledrsnotewidth} +\widthX{\columnwidth+\marginparsep+\ledrsnotewidth} \rightnoteupfalse \AtBeginDocument{% 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 e13052581e8..92d7437924c 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 2f9f44378eb..528f9f5b5b0 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 b6157cc0257..73e129badb8 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 3ec48fbb04e..0908194ce5a 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 76bbb884b74..5e8765cbbbb 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 bcee3c64ff8..eaf66613b7c 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 a3d602c8095..b8daddbf491 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 1c559dc1358..95ca64944e3 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 792bc62bfa7..2c9c94e46a6 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 faaa1019bdd..d2a45cfdf4a 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 989362fa394..018c0fc8e85 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 bfb42a19973..aefc2911cd8 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 b5e902eb0ec..f1ffe5c396b 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 e4e1d9f4513..56e1eb787f0 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 a0253d4fd69..ec370129dab 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.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf index e1d8fa4c8c3..db2ae49182d 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf index 46e103029f7..1c93c8f6e58 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 4acff56a57f..4c458083ab2 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 967f637bfd3..a7485b12dc6 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 feffcb57acb..168e5d7ba4a 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 3b425f5845b..d25fd6ae8e7 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 b502854ecba..98a15b8d604 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 74e1516d445..a175f093d07 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 e78913613fa..67075592ff4 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 c570a0165f0..f8ed21494e9 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 01eea33b597..1c3a11c78c6 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 92808007b0a..aab32cf0198 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 3cb13d7c756..74b9523ef42 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 3a1c95173b3..ab92b294f4f 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -371,12 +371,13 @@ % \changes{v2.7.0}{2015/11/29}{When using \protect\package{hyperref} package, add links from critical footnotes and critical endnotes to the line of text they refers} % \changes{v2.7.0}{2015/11/29}{When using \protect\package{hyperref} package, add link in familiar footnotes between the footnote marks in the text and the footnote marks in the footnote} % \changes{v2.7.0}{2015/11/29}{Fix bugs in compatibility with \protect\option{innote} and \protect\option{notenumber} options of \protect\package{indextools} package, when indexing outside of a \protect\env{ledgroup}.} -% \changes{v2.7.0}{2015/11/29}{New commands to make glossaries related to page and linenumber with the \protect\package{glossaries} package} +% \changes{v2.7.0}{2015/11/29}{New commands to make glossaries connected to page and linenumber with the \protect\package{glossaries} package} % \changes{v2.7.0}{2015/11/29}{Add dash as default page range separator for \protect\cs{SEonlypage}} % \changes{v2.7.0}{2015/11/29}{Delete parenthesis after \protect\cs{SErefonlypage}.} % \changes{v2.7.0}{2015/11/29}{New setting commands: \protect\cs{setSErefonlypageprefixsingle} and \protect\cs{setSErefonlypageprefixmore}} % \changes{v2.7.0}{2015/11/29}{Debug \protect\cs{SErefonlypage} when referring to only one page.} -% \changes{v2.7.1}{2015/12/06}{Debug \protect\cs{Xbhookgroup} hooks executed on column footnote (moved to a larger group, to have indeed effect).} +% \changes{v2.7.1}{2015/12/06}{Debug \protect\cs{Xbhookgroup} hooks executed on columnar footnotes (moved to a larger group, to take effect).} +% \changes{v2.7.2}{2015/12/13}{Fix problem of hyphenation when using \protect\package{hyperref} package (added in v2.7.0).} % \title{\Macpackage \\ % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} @@ -2090,16 +2091,17 @@ % The debug is in the todolist. % \subsubsection{Width} % \changes{v2.7.0}{2015/11/29}{New hooks: \protect\cs{Xhsize} and \protect\cs{hsizeX}} -% \DescribeMacro{\Xhsize} -% \DescribeMacro{\hsizeX} -% \cs{Xhsize}\oarg{s}\marg{l} sets the total width of critical footnote. -% \cs{hsizeX}\oarg{s}\marg{l} does the same for familiar footnotes. +% \changes{v2.7.2}{2015/12/13}{\protect\cs{Xhsize} and \protect\cs{hsizeX} become \protect\cs{Xwidth} and \protect\cs{widthX}} +% \DescribeMacro{\Xwidth} +% \DescribeMacro{\widthX} +% \cs{Xwidth}\oarg{s}\marg{l} sets the total width of critical footnotes. +% \cs{widthX}\oarg{s}\marg{l} does the same for familiar footnotes. % % \meta{l} can be a length expression, parsable with \cs{dimexpr}. % For example: % \begin{verbatim} -%\Xhsize{\columnwidth+\marginparsep+\ledrsnotewidth} -%\hsizeX{\columnwidth+\marginparsep+\ledrsnotewidth} +%\Xwidth{\columnwidth+\marginparsep+\ledrsnotewidth} +%\widthX{\columnwidth+\marginparsep+\ledrsnotewidth} % \end{verbatim} % % Note that changes the with of the block of notes. @@ -3230,6 +3232,8 @@ % % % \subsection{Known and suspected limitations} +% \subsubsection{\package{floatrow} package compatibility} +% The \package{floatrow} package must be loaded before the \macpackage. % \subsubsection{`No room for a new'}\label{noroom} % Sometime, especially when using \macpackage with other packages, you could obtain warning message such 'no room for a new count' or 'no room for a new write'. % @@ -3457,7 +3461,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2015/12/06 v2.7.1 typeset critical edition]% +\ProvidesPackage{reledmac}[2015/12/13 v2.7.2 typeset critical edition]% % \end{macrocode} % % \subsection{Package options} @@ -3982,6 +3986,20 @@ }% % \end{macrocode} % \end{macro} +% \begin{macro}{\led@warning@hsizeX@deprecated} +% \begin{macrocode} +\newcommand{\led@warning@hsizeX@deprecated}{% + \reledmac@warning{\string\hsizeX\space command deprecated, use \string\widthX\space instead.}% +}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\led@warning@Xhsize@deprecated} +% \begin{macrocode} +\newcommand{\led@warning@Xhsize@deprecated}{% + \reledmac@warning{\string\Xhsize\space command deprecated, use \string\Xwidth\space instead.}% +}% +% \end{macrocode} +% \end{macro} % \subsection{Gobbling} % \changes{v1.14.0}{2014/10/27}{Provide \protect\cs{@gobblefour}} % \changes{v1.14.0}{2014/10/27}{Move gobbling command} @@ -4622,7 +4640,7 @@ \newcommand*{\firstlinenum}[1]{% \ifledRcol% \setcounter{firstlinenumR}{#1}% - \led@warn@setting@in@rightside{\firstlinenum} + \led@warn@setting@in@rightside{\firstlinenum}% \else% \setcounter{firstlinenum}{#1}% \fi% @@ -4630,7 +4648,7 @@ \newcommand*{\linenumincrement}[1]{% \ifledRcol% \setcounter{linenumincrementR}{#1}% - \led@warn@setting@in@rightside{\linenumincrement} + \led@warn@setting@in@rightside{\linenumincrement}% \else% \setcounter{linenumincrement}{#1}% \fi% @@ -4638,7 +4656,7 @@ \newcommand*{\firstsublinenum}[1]{% \ifledRcol% \setcounter{firstsublinenumR}{#1}% - \led@warn@setting@in@rightside{\firstsublinenum} + \led@warn@setting@in@rightside{\firstsublinenum}% \else% \setcounter{firstsublinenum}{#1}% \fi% @@ -4646,7 +4664,7 @@ \newcommand*{\sublinenumincrement}[1]{% \ifledRcol% \setcounter{sublinenumincrementR}{#1}% - \led@warn@setting@in@rightside{\sublinenumincrement} + \led@warn@setting@in@rightside{\sublinenumincrement}% \else% \setcounter{sublinenumincrement}{#1}% \fi% @@ -6617,7 +6635,7 @@ \ifdef{\hypertarget}% {% \csedef{thisedtext@\the\@edtext@level}{\theedtext}% - \Hy@raisedlink{\hypertarget{\csuse{thisedtext@\the\@edtext@level}:start}{}}% + \Hy@raisedlink@left{\hypertarget{\csuse{thisedtext@\the\@edtext@level}:start}{}}% \showlemma{#1}% \Hy@raisedlink{\hypertarget{\csuse{thisedtext@\the\@edtext@level}:end}{}}% }% @@ -8570,7 +8588,7 @@ % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnote}[2]{% \insert\csname #1footins\endcsname\bgroup - \hsize=\expandafter\dimexpr\csuse{Xhsize@#1}\relax% + \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax% \noindent\csuse{Xbhooknote@#1}% \csuse{Xnotefontsize@#1}% \footsplitskips @@ -8824,9 +8842,9 @@ % \begin{macrocode} \newcommand*{\para@footsetup}[1]{{\csuse{Xbhookgroup@#1}\csuse{Xnotefontsize@#1} \setXnoteswidthliketwocolumns@{#1}% - \ifcsempty{Xhsize@#1}% + \ifcsempty{Xwidth@#1}% {}% - {\columnwidth=\expandafter\dimexpr\csuse{Xhsize@#1}\relax}% + {\columnwidth=\expandafter\dimexpr\csuse{Xwidth@#1}\relax}% \dimen0=\baselineskip \multiply\dimen0 by 1024 \divide \dimen0 by \columnwidth \multiply\dimen0 by \footfudgefiddle\relax @@ -9079,7 +9097,7 @@ % note series letter. % \begin{macrocode} \newcommand*{\parafootgroup}[1]{% - \hsize=\expandafter\dimexpr\csuse{Xhsize@#1}\relax% + \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax% \unvbox\csname #1footins\endcsname \ifcsstring{Xragged@#1}{L}{\RaggedLeft}{}% \ifcsstring{Xragged@#1}{R}{\RaggedRight}{}% @@ -9193,18 +9211,18 @@ % % The \LaTeX\ \protect\cs{line} macro has no relationship to the % TeX \protect\cs{line}. The \LaTeX\ equivalent is \protect\cs{@@line}. -% \changes{v2.7.0}{2015/11/29}{\protect\cs{rigidbalance} is split to \protect\cs{Xrigidbalance} and \protect\cs{rigidbalanceX}.} +% \changes{v2.7.0}{2015/11/29}{\protect\cs{rigidbalance} is split in \protect\cs{Xrigidbalance} and \protect\cs{rigidbalanceX}.} % % We do not call directly \cs{rigidbalance}, but we call \cs{Xrigidbalance} for critical notes and \cs{rigidbalanceX} for familiar notes. Both of them call \cs{rigidbalance}. % \begin{macrocode} \newcount\@k \newdimen\@h \newcommand*{\Xrigidbalance}[3]{% - \hsize=\expandafter\dimexpr\csuse{Xhsize@\@currentseries}\relax% + \hsize=\expandafter\dimexpr\csuse{Xwidth@\@currentseries}\relax% \rigidbalance{#1}{#2}{#3}% }% \newcommand*{\rigidbalanceX}[3]{% - \hsize=\expandafter\dimexpr\csuse{hsizeX@\@currentseries}\relax% + \hsize=\expandafter\dimexpr\csuse{widthX@\@currentseries}\relax% \rigidbalance{#1}{#2}{#3}% }% @@ -9316,7 +9334,7 @@ % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnote}[2]{% \insert\csname #1footins\endcsname\bgroup% - \hsize=\expandafter\dimexpr\csuse{Xhsize@#1}\relax% + \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax% \noindent\csuse{Xbhooknote@#1}% \csuse{Xnotefontsize@#1}% \footsplitskips% @@ -9457,7 +9475,7 @@ % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnote}[2]{% \insert\csname #1footins\endcsname\bgroup% - \hsize=\expandafter\dimexpr\csuse{Xhsize@#1}\relax% + \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax% \noindent\csuse{Xbhooknote@#1}% \csuse{Xnotefontsize@#1}% \footsplitskips% @@ -10353,7 +10371,7 @@ % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnoteX}[2]{% \insert\@nameuse{footins#1}\bgroup - \hsize=\expandafter\dimexpr\csuse{hsizeX@#1}\relax% + \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% \csuse{notefontsizeX@#1}% \footsplitskips @@ -10686,7 +10704,7 @@ % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnoteX}[2]{% \insert\csname footins#1\endcsname\bgroup% - \hsize=\expandafter\dimexpr\csuse{hsizeX@#1}\relax% + \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% \csuse{notefontsizeX@#1}% \footsplitskips% @@ -10806,7 +10824,7 @@ % \begin{macrocode} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnoteX}[2]{% \insert\csname footins#1\endcsname\bgroup% - \hsize=\expandafter\dimexpr\csuse{hsizeX@#1}\relax% + \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% \csuse{notefontsizeX@#1} \footsplitskips% @@ -10917,9 +10935,9 @@ % \begin{macrocode} \newcommand*{\para@footsetupX}[1]{{\csuse{bhookgroupX@#1}\csuse{notefontsizeX@#1} \setnoteswidthliketwocolumnsX@{#1}% - \ifcsempty{hsizeX@#1}% + \ifcsempty{widthX@#1}% {}% - {\columnwidth=\expandafter\dimexpr\csuse{hsizeX@#1}\relax}% + {\columnwidth=\expandafter\dimexpr\csuse{widthX@#1}\relax}% \dimen0=\baselineskip \multiply\dimen0 by 1024 \divide\dimen0 by \columnwidth \multiply\dimen0 by \footfudgefiddle\relax% @@ -11032,7 +11050,7 @@ % \protect\cs{para@footgroupX}\marg{series} % \begin{macrocode} \newcommand*{\para@footgroupX}[1]{% - \hsize=\expandafter\dimexpr\csuse{hsizeX@#1}\relax% + \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \unvbox\csname footins#1\endcsname \ifcsstring{raggedX@#1}{L}{\RaggedLeft}{}% \ifcsstring{raggedX@#1}{R}{\RaggedRight}{}% @@ -11094,14 +11112,14 @@ % \begin{macrocode} \newcommand{\wrapped@footfootmarkX}[1]{% \ifdefined\hypertarget% + \hyperlink% + {@bodyfootmark#1@\this@footnoteX@reading}% + {\@nameuse{footfootmark#1}}% \Hy@raisedlink{% \hypertarget% {@footnotemark#1@\this@footnoteX@reading}% {}% }% - \hyperlink% - {@bodyfootmark#1@\this@footnoteX@reading}% - {\@nameuse{footfootmark#1}}% \else% \@nameuse{footfootmark#1}% \fi% @@ -11113,14 +11131,14 @@ % \begin{macrocode} \newcommand{\wrapped@bodyfootmarkX}[1]{% \ifdefined\hypertarget% + \hyperlink% + {@footnotemark#1@\expandafter\the\csname footnote#1@reading\endcsname}% + {\@nameuse{bodyfootmark#1}}% \Hy@raisedlink{% \hypertarget% {@bodyfootmark#1@\expandafter\the\csname footnote#1@reading\endcsname}% {}% }% - \hyperlink% - {@footnotemark#1@\expandafter\the\csname footnote#1@reading\endcsname}% - {\@nameuse{bodyfootmark#1}}% \else% \@nameuse{bodyfootmark#1}% \fi% @@ -11926,7 +11944,7 @@ \csgdef{Xlinerangeseparator@#1}{\endashchar}% \csgdef{Xlemmafont@#1}{}% - \csgdef{Xhsize@#1}{\hsize}% + \csgdef{Xwidth@#1}{\hsize}% % \end{macrocode} % \subsubsection{Create inserts, needed to add notes in foot} % As regards inserts, see chapter 15 of \thetexbook\ by D. Knuth. @@ -12068,7 +12086,7 @@ \newtoggle{noteswidthliketwocolumnsX@#1}% \csgdef{parafootsepX@#1}{}% \csgdef{afternoteX@#1}{1em plus.4em minus.4em} - \csgdef{hsizeX@#1}{\hsize}% + \csgdef{widthX@#1}{\hsize}% % End of for familiar footnotes. % \subsubsection{Create inserts, needed to add notes in foot} % As regards inserts, see chapter 15 of the TeXBook by D. Knuth. @@ -12547,8 +12565,16 @@ \newhookcommand@series{Xafternote}% \newhookcommand@series{Xparafootsep} - \newhookcommand@series@reload{Xhsize}{critical}% + \newhookcommand@series@reload{Xwidth}{critical}% + \ifundef{\Xhsize}% + {% + \newcommandx{\Xhsize}[2][1,usedefault]{% + \led@warning@Xhsize@deprecated% + \Xwidth[#1]{#2}% + }% + }% + {}% \fi \newhooktoggle@series{Xlineflag}[appref,SEref] \newhookcommand@series{Xtwolines}[appref,SEref] @@ -12578,7 +12604,15 @@ \newhookcommand@series@reload{notefontsizeX}{familiar} \newhookcommand@series{afternoteX} \newhookcommand@series{parafootsepX} - \newhookcommand@series@reload{hsizeX}{familiar}% + \newhookcommand@series@reload{widthX}{familiar}% + \ifundef{\hsizeX}% + {% + \newcommandx{\hsizeX}[2][1,usedefault]{% + \led@warning@hsizeX@deprecated% + \widthX[#1]{#2}% + }% + }% + {}% \fi % \end{macrocode} % \subsubsection{Options for endnotes} @@ -13077,7 +13111,9 @@ \ifXnote@% \protected@write\@auxout{}% {\string\l@dmake@labelsR\space\thepage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstartR|{#1}}% - \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1}{}}}{}% + \ifdef{\hypertarget}% + {\Hy@raisedlink{\hypertarget{#1}{}}}% + {}% \else% \write\linenum@outR{\string\@lab}% \ifx\labelref@listR\empty% @@ -13095,13 +13131,17 @@ % \begin{macrocode} \protected@write\@auxout{}% {\string\l@dmake@labelsR\space\thepage|\label@refs|\the\c@pstartR|{#1}}% - \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1}{}}}{}% + \ifdef{\hypertarget}% + {\Hy@raisedlink{\hypertarget{#1}{}}}% + {}% \fi% }{% \ifXnote@% \protected@write\@auxout{}% {\string\l@dmake@labels\space\thepage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstart|{#1}}% - \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1}{}}}{}% + \ifdef{\hypertarget}% + {\Hy@raisedlink{\hypertarget{#1}{}}}% + {}% \else% \write\linenum@out{\string\@lab}% \ifx\labelref@list\empty% @@ -13114,7 +13154,9 @@ \fi% \protected@write\@auxout{}% {\string\l@dmake@labels\space\thepage|\label@refs|\the\c@pstart|{#1}}% - \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1}{}}}{}% + \ifdef{\hypertarget}% + {\Hy@raisedlink{\hypertarget{#1}{}}}% + {}% \fi% }% \@esphack}% @@ -13243,13 +13285,17 @@ \ifledRcol% \protected@write\@auxout{}% {\string\l@dmake@labelsR\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstartR|{#1:start}}% - \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1:start}{}}}{}% + \ifdef{\hypertarget}% + {\Hy@raisedlink{\hypertarget{#1:start}{}}}% + {}% \protected@write\@auxout{}% {\string\l@dmake@labelsR\space\l@dparsedendpage|\l@dparsedendline|\l@dparsedendsub|\the\c@pstartR|{#1:end}}% \else% \protected@write\@auxout{}% {\string\l@dmake@labels\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstart|{#1:start}}% - \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1:start}{}}}{}% + \ifdef{\hypertarget}% + {\Hy@raisedlink{\hypertarget{#1:start}{}}}% + {}% \protected@write\@auxout{}% {\string\l@dmake@labels\space\l@dparsedendpage|\l@dparsedendline|\l@dparsedendsub|\the\c@pstart|{#1:end}}% \fi% @@ -17353,9 +17399,42 @@ } % \end{macrocode} % \end{macro} +% \section{Tools for \package{hyperref} package} +% \begin{macro}{\Hy@raisedlink@left} +% The \package{hyperref} package provides a \cs{Hy@raisedlink} command, to be used to add an anchor to the top of a line and not to the bottom of it.\footnote{\url{http://tex.stackexchange.com/a/17138/7712}.} +% +% However, this command disrupts the line breaking mechanism when it is called before any word. +% This is why \macpackage defines \cs{Hy@raisedlink@left} that is called to the left of words, at the beginning of \cs{edtext} or inside the \cs{edlabel} commands.\footnote{The code is inspired by an answer given by @unbonpetit. +% Thanks to him. +% \url{http://texnique.fr:80/osqa/questions/781/hyraisedlink-perturbe-la-maniere-dont-se-fait-la-coupure-de-ligne/801}.} +% +% \begin{macrocode} +\def\Hy@raisedlink@left#1{% + \ifvmode + #1% + \else + \Hy@SaveSpaceFactor + \llap{\smash{% + \begingroup + \let\HyperRaiseLinkLength\@tempdima + \setlength\HyperRaiseLinkLength\HyperRaiseLinkDefault + \HyperRaiseLinkHook + \expandafter\endgroup + \expandafter\raise\the\HyperRaiseLinkLength\hbox{% + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + }% + }}% + \Hy@RestoreSpaceFactor + \penalty\@M\hskip\z@ + \fi +} +% \end{macrocode} +% \end{macro} % \section{Compatibility with \eledmac} % -% Here, we define some command for the \verb+eledmac-compat+ option. +% Here, we define some commands for the \verb+eledmac-compat+ option. % % \begin{macrocode} \ifeledmaccompat@% @@ -17446,7 +17525,7 @@ % \appendix % \let\oldthesection\thesection % \renewcommand{\thesection}{Appendix \oldthesection} -% \section{Some things to do when changing version} +% \section{Things to do when changing versions} % \input{doc-include/migrate-mac.dtx} % \clearpage % \bibliographystyle{alpha} diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index bc7f8600f27..90e4a7c8b85 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -263,8 +263,8 @@ % \changes{v2.6.0}{2015/11/13}{Fix bug with right side title number when using title commands before \protect\env{pages} or \protect\env{columns} environments.} % \changes{v2.6.1}{2015/11/20}{Fix bug, introduced in v2.6.0, with footnote numbering when using \protect\package{perpage} package.} % \changes{v2.6.2}{2015/11/29}{Fix (again) bugs with footnote numbering in parallel typesetting while using \protect\env{ledgroup} environments (bug added in v2.6.0).} -% -% \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 number formatting (like Greek).} +% \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} in right side (introduced in v2.5.0).} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1157,7 +1157,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2015/11/29 v2.6.2 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2015/12/13 v2.6.3 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -1413,7 +1413,7 @@ \newcommand{\led@warn@setting@in@rightside}[1]{% \reledpar@warning{You use #1 inside rightside environment.\MessageBreak% Such behavior is deprecated.\MessageBreak% - Use instead #1R or #1* in your preamble}.% + Use instead #1R or #1* in your preamble.}% } % \end{macrocode} % \end{macro} diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index 06f46e4d199..cf3029a0d03 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}[2015/12/06 v2.7.1 typeset critical edition]% +\ProvidesPackage{reledmac}[2015/12/13 v2.7.2 typeset critical edition]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -274,6 +274,12 @@ \newcommand{\led@error@fail@patch@endminipage}{% \reledmac@error{Fail to patch \string\endminipage\space command.}{\@ehc}% }% +\newcommand{\led@warning@hsizeX@deprecated}{% + \reledmac@warning{\string\hsizeX\space command deprecated, use \string\widthX\space instead.}% +}% +\newcommand{\led@warning@Xhsize@deprecated}{% + \reledmac@warning{\string\Xhsize\space command deprecated, use \string\Xwidth\space instead.}% +}% \providecommand*{\@gobblethree}[3]{} \providecommand*{\@gobblefour}[4]{} \providecommand*{\@gobblefive}[5]{} @@ -515,7 +521,7 @@ \newcommand*{\firstlinenum}[1]{% \ifledRcol% \setcounter{firstlinenumR}{#1}% - \led@warn@setting@in@rightside{\firstlinenum} + \led@warn@setting@in@rightside{\firstlinenum}% \else% \setcounter{firstlinenum}{#1}% \fi% @@ -523,7 +529,7 @@ \newcommand*{\linenumincrement}[1]{% \ifledRcol% \setcounter{linenumincrementR}{#1}% - \led@warn@setting@in@rightside{\linenumincrement} + \led@warn@setting@in@rightside{\linenumincrement}% \else% \setcounter{linenumincrement}{#1}% \fi% @@ -531,7 +537,7 @@ \newcommand*{\firstsublinenum}[1]{% \ifledRcol% \setcounter{firstsublinenumR}{#1}% - \led@warn@setting@in@rightside{\firstsublinenum} + \led@warn@setting@in@rightside{\firstsublinenum}% \else% \setcounter{firstsublinenum}{#1}% \fi% @@ -539,7 +545,7 @@ \newcommand*{\sublinenumincrement}[1]{% \ifledRcol% \setcounter{sublinenumincrementR}{#1}% - \led@warn@setting@in@rightside{\sublinenumincrement} + \led@warn@setting@in@rightside{\sublinenumincrement}% \else% \setcounter{sublinenumincrement}{#1}% \fi% @@ -1249,7 +1255,7 @@ \ifdef{\hypertarget}% {% \csedef{thisedtext@\the\@edtext@level}{\theedtext}% - \Hy@raisedlink{\hypertarget{\csuse{thisedtext@\the\@edtext@level}:start}{}}% + \Hy@raisedlink@left{\hypertarget{\csuse{thisedtext@\the\@edtext@level}:start}{}}% \showlemma{#1}% \Hy@raisedlink{\hypertarget{\csuse{thisedtext@\the\@edtext@level}:end}{}}% }% @@ -2072,7 +2078,7 @@ \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnote}[2]{% \insert\csname #1footins\endcsname\bgroup - \hsize=\expandafter\dimexpr\csuse{Xhsize@#1}\relax% + \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax% \noindent\csuse{Xbhooknote@#1}% \csuse{Xnotefontsize@#1}% \footsplitskips @@ -2183,9 +2189,9 @@ \providecommand{\footfudgefiddle}{64} \newcommand*{\para@footsetup}[1]{{\csuse{Xbhookgroup@#1}\csuse{Xnotefontsize@#1} \setXnoteswidthliketwocolumns@{#1}% - \ifcsempty{Xhsize@#1}% + \ifcsempty{Xwidth@#1}% {}% - {\columnwidth=\expandafter\dimexpr\csuse{Xhsize@#1}\relax}% + {\columnwidth=\expandafter\dimexpr\csuse{Xwidth@#1}\relax}% \dimen0=\baselineskip \multiply\dimen0 by 1024 \divide \dimen0 by \columnwidth \multiply\dimen0 by \footfudgefiddle\relax @@ -2266,7 +2272,7 @@ }}% #3\penalty-10 } \newcommand*{\parafootgroup}[1]{% - \hsize=\expandafter\dimexpr\csuse{Xhsize@#1}\relax% + \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax% \unvbox\csname #1footins\endcsname \ifcsstring{Xragged@#1}{L}{\RaggedLeft}{}% \ifcsstring{Xragged@#1}{R}{\RaggedRight}{}% @@ -2332,12 +2338,12 @@ } \newcount\@k \newdimen\@h \newcommand*{\Xrigidbalance}[3]{% - \hsize=\expandafter\dimexpr\csuse{Xhsize@\@currentseries}\relax% + \hsize=\expandafter\dimexpr\csuse{Xwidth@\@currentseries}\relax% \rigidbalance{#1}{#2}{#3}% }% \newcommand*{\rigidbalanceX}[3]{% - \hsize=\expandafter\dimexpr\csuse{hsizeX@\@currentseries}\relax% + \hsize=\expandafter\dimexpr\csuse{widthX@\@currentseries}\relax% \rigidbalance{#1}{#2}{#3}% }% @@ -2382,7 +2388,7 @@ \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnote}[2]{% \insert\csname #1footins\endcsname\bgroup% - \hsize=\expandafter\dimexpr\csuse{Xhsize@#1}\relax% + \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax% \noindent\csuse{Xbhooknote@#1}% \csuse{Xnotefontsize@#1}% \footsplitskips% @@ -2463,7 +2469,7 @@ \multiply\dimen\csname #1footins\endcsname \tw@} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnote}[2]{% \insert\csname #1footins\endcsname\bgroup% - \hsize=\expandafter\dimexpr\csuse{Xhsize@#1}\relax% + \hsize=\expandafter\dimexpr\csuse{Xwidth@#1}\relax% \noindent\csuse{Xbhooknote@#1}% \csuse{Xnotefontsize@#1}% \footsplitskips% @@ -2955,7 +2961,7 @@ \hbox{\textsuperscript{\normalfont\@nameuse{@thefnmark#1}}}} \notbool{parapparatus@}{\newcommand*}{\newcommand}{\normalvfootnoteX}[2]{% \insert\@nameuse{footins#1}\bgroup - \hsize=\expandafter\dimexpr\csuse{hsizeX@#1}\relax% + \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% \csuse{notefontsizeX@#1}% \footsplitskips @@ -3173,7 +3179,7 @@ \notbool{parapparatus@}{\newcommand*}{\newcommand}{\twocolvfootnoteX}[2]{% \insert\csname footins#1\endcsname\bgroup% - \hsize=\expandafter\dimexpr\csuse{hsizeX@#1}\relax% + \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% \csuse{notefontsizeX@#1}% \footsplitskips% @@ -3254,7 +3260,7 @@ \notbool{parapparatus@}{\newcommand*}{\newcommand}{\threecolvfootnoteX}[2]{% \insert\csname footins#1\endcsname\bgroup% - \hsize=\expandafter\dimexpr\csuse{hsizeX@#1}\relax% + \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \noindent\csuse{bhooknoteX@#1}% \csuse{notefontsizeX@#1} \footsplitskips% @@ -3332,9 +3338,9 @@ \newcommand*{\para@footsetupX}[1]{{\csuse{bhookgroupX@#1}\csuse{notefontsizeX@#1} \setnoteswidthliketwocolumnsX@{#1}% - \ifcsempty{hsizeX@#1}% + \ifcsempty{widthX@#1}% {}% - {\columnwidth=\expandafter\dimexpr\csuse{hsizeX@#1}\relax}% + {\columnwidth=\expandafter\dimexpr\csuse{widthX@#1}\relax}% \dimen0=\baselineskip \multiply\dimen0 by 1024 \divide\dimen0 by \columnwidth \multiply\dimen0 by \footfudgefiddle\relax% @@ -3417,7 +3423,7 @@ #2\penalty-10}} \newcommand*{\para@footgroupX}[1]{% - \hsize=\expandafter\dimexpr\csuse{hsizeX@#1}\relax% + \hsize=\expandafter\dimexpr\csuse{widthX@#1}\relax% \unvbox\csname footins#1\endcsname \ifcsstring{raggedX@#1}{L}{\RaggedLeft}{}% \ifcsstring{raggedX@#1}{R}{\RaggedRight}{}% @@ -3464,28 +3470,28 @@ } \newcommand{\wrapped@footfootmarkX}[1]{% \ifdefined\hypertarget% + \hyperlink% + {@bodyfootmark#1@\this@footnoteX@reading}% + {\@nameuse{footfootmark#1}}% \Hy@raisedlink{% \hypertarget% {@footnotemark#1@\this@footnoteX@reading}% {}% }% - \hyperlink% - {@bodyfootmark#1@\this@footnoteX@reading}% - {\@nameuse{footfootmark#1}}% \else% \@nameuse{footfootmark#1}% \fi% }% \newcommand{\wrapped@bodyfootmarkX}[1]{% \ifdefined\hypertarget% + \hyperlink% + {@footnotemark#1@\expandafter\the\csname footnote#1@reading\endcsname}% + {\@nameuse{bodyfootmark#1}}% \Hy@raisedlink{% \hypertarget% {@bodyfootmark#1@\expandafter\the\csname footnote#1@reading\endcsname}% {}% }% - \hyperlink% - {@footnotemark#1@\expandafter\the\csname footnote#1@reading\endcsname}% - {\@nameuse{bodyfootmark#1}}% \else% \@nameuse{bodyfootmark#1}% \fi% @@ -3966,7 +3972,7 @@ \csgdef{Xlinerangeseparator@#1}{\endashchar}% \csgdef{Xlemmafont@#1}{}% - \csgdef{Xhsize@#1}{\hsize}% + \csgdef{Xwidth@#1}{\hsize}% \expandafter\newinsert\csname #1footins\endcsname% \unless\ifnoledgroup@% \expandafter\newinsert\csname mp#1footins\endcsname% @@ -4081,7 +4087,7 @@ \newtoggle{noteswidthliketwocolumnsX@#1}% \csgdef{parafootsepX@#1}{}% \csgdef{afternoteX@#1}{1em plus.4em minus.4em} - \csgdef{hsizeX@#1}{\hsize}% + \csgdef{widthX@#1}{\hsize}% \expandafter\newinsert\csname footins#1\endcsname% \unless\ifnoledgroup@% \expandafter\newinsert\csname mpfootins#1\endcsname% @@ -4363,8 +4369,16 @@ \newhookcommand@series{Xafternote}% \newhookcommand@series{Xparafootsep} - \newhookcommand@series@reload{Xhsize}{critical}% + \newhookcommand@series@reload{Xwidth}{critical}% + \ifundef{\Xhsize}% + {% + \newcommandx{\Xhsize}[2][1,usedefault]{% + \led@warning@Xhsize@deprecated% + \Xwidth[#1]{#2}% + }% + }% + {}% \fi \newhooktoggle@series{Xlineflag}[appref,SEref] \newhookcommand@series{Xtwolines}[appref,SEref] @@ -4390,7 +4404,15 @@ \newhookcommand@series@reload{notefontsizeX}{familiar} \newhookcommand@series{afternoteX} \newhookcommand@series{parafootsepX} - \newhookcommand@series@reload{hsizeX}{familiar}% + \newhookcommand@series@reload{widthX}{familiar}% + \ifundef{\hsizeX}% + {% + \newcommandx{\hsizeX}[2][1,usedefault]{% + \led@warning@hsizeX@deprecated% + \widthX[#1]{#2}% + }% + }% + {}% \fi \unless\ifnoend@ \newhookcommand@series{Xendnotenumfont} @@ -4645,7 +4667,9 @@ \ifXnote@% \protected@write\@auxout{}% {\string\l@dmake@labelsR\space\thepage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstartR|{#1}}% - \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1}{}}}{}% + \ifdef{\hypertarget}% + {\Hy@raisedlink{\hypertarget{#1}{}}}% + {}% \else% \write\linenum@outR{\string\@lab}% \ifx\labelref@listR\empty% @@ -4658,13 +4682,17 @@ \fi% \protected@write\@auxout{}% {\string\l@dmake@labelsR\space\thepage|\label@refs|\the\c@pstartR|{#1}}% - \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1}{}}}{}% + \ifdef{\hypertarget}% + {\Hy@raisedlink{\hypertarget{#1}{}}}% + {}% \fi% }{% \ifXnote@% \protected@write\@auxout{}% {\string\l@dmake@labels\space\thepage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstart|{#1}}% - \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1}{}}}{}% + \ifdef{\hypertarget}% + {\Hy@raisedlink{\hypertarget{#1}{}}}% + {}% \else% \write\linenum@out{\string\@lab}% \ifx\labelref@list\empty% @@ -4677,7 +4705,9 @@ \fi% \protected@write\@auxout{}% {\string\l@dmake@labels\space\thepage|\label@refs|\the\c@pstart|{#1}}% - \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1}{}}}{}% + \ifdef{\hypertarget}% + {\Hy@raisedlink{\hypertarget{#1}{}}}% + {}% \fi% }% \@esphack}% @@ -4733,13 +4763,17 @@ \ifledRcol% \protected@write\@auxout{}% {\string\l@dmake@labelsR\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstartR|{#1:start}}% - \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1:start}{}}}{}% + \ifdef{\hypertarget}% + {\Hy@raisedlink{\hypertarget{#1:start}{}}}% + {}% \protected@write\@auxout{}% {\string\l@dmake@labelsR\space\l@dparsedendpage|\l@dparsedendline|\l@dparsedendsub|\the\c@pstartR|{#1:end}}% \else% \protected@write\@auxout{}% {\string\l@dmake@labels\space\l@dparsedstartpage|\l@dparsedstartline|\l@dparsedstartsub|\the\c@pstart|{#1:start}}% - \ifdef{\hypertarget}{\Hy@raisedlink{\hypertarget{#1:start}{}}}{}% + \ifdef{\hypertarget}% + {\Hy@raisedlink{\hypertarget{#1:start}{}}}% + {}% \protected@write\@auxout{}% {\string\l@dmake@labels\space\l@dparsedendpage|\l@dparsedendline|\l@dparsedendsub|\the\c@pstart|{#1:end}}% \fi% @@ -6975,6 +7009,27 @@ \fi% \fi\fi\fi% } +\def\Hy@raisedlink@left#1{% + \ifvmode + #1% + \else + \Hy@SaveSpaceFactor + \llap{\smash{% + \begingroup + \let\HyperRaiseLinkLength\@tempdima + \setlength\HyperRaiseLinkLength\HyperRaiseLinkDefault + \HyperRaiseLinkHook + \expandafter\endgroup + \expandafter\raise\the\HyperRaiseLinkLength\hbox{% + \Hy@RestoreSpaceFactor + #1% + \Hy@SaveSpaceFactor + }% + }}% + \Hy@RestoreSpaceFactor + \penalty\@M\hskip\z@ + \fi +} \ifeledmaccompat@% \newcommand{\footnormalX}[1]{\arrangementX[#1]{normal}}% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index be0291d00a9..995184f77d1 100644 --- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty +++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty @@ -29,7 +29,7 @@ \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2015/11/29 v2.6.2 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2015/12/13 v2.6.3 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -119,7 +119,7 @@ \newcommand{\led@warn@setting@in@rightside}[1]{% \reledpar@warning{You use #1 inside rightside environment.\MessageBreak% Such behavior is deprecated.\MessageBreak% - Use instead #1R or #1* in your preamble}.% + Use instead #1R or #1* in your preamble.}% } \newcount\section@numR \section@numR=\z@ -- cgit v1.2.3