From 79b0cb0ee590ef15c9104c36cd82ee8cd4871668 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 15 Jan 2016 23:00:13 +0000 Subject: reledmac (15jan16) git-svn-id: svn://tug.org/texlive/trunk@39395 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/reledmac/doc-include/migrate-mac.dtx | 2 + .../doc/latex/reledmac/doc-include/migrate-par.dtx | 4 +- .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 17022 -> 17288 bytes .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 20238 -> 20228 bytes .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 20864 -> 21110 bytes .../doc/latex/reledmac/examples/1-verses.pdf | Bin 17411 -> 17414 bytes .../reledmac/examples/2-cross_referencing.pdf | Bin 18553 -> 18557 bytes .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 20863 -> 20908 bytes .../doc/latex/reledmac/examples/2-glossaries.pdf | Bin 21701 -> 21686 bytes .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 21722 -> 21722 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 17092 -> 17091 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 31487 -> 31606 bytes .../doc/latex/reledmac/examples/2-linespacing.pdf | Bin 26100 -> 26365 bytes .../doc/latex/reledmac/examples/2-notes-width.pdf | Bin 24588 -> 24855 bytes .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 25876 -> 25996 bytes .../doc/latex/reledmac/examples/2-performances.pdf | Bin 23111 -> 23184 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 22801 -> 22797 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 17140 -> 17140 bytes .../3-reledpar_columns_different_languages.pdf | Bin 26192 -> 26231 bytes .../doc/latex/reledmac/examples/3-reledpar_mwe.pdf | Bin 12221 -> 12225 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 39708 -> 39704 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 23137 -> 23175 bytes ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 35008 -> 35012 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 34744 -> 34745 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 33299 -> 33304 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 34914 -> 34910 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 34470 -> 34467 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 34511 -> 34512 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 34740 -> 34742 bytes .../4-reledpar_column_mix_with_not_column.pdf | Bin 18434 -> 18434 bytes .../examples/4-reledpar_columns_alignment.pdf | Bin 21173 -> 21173 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 29579 -> 29615 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 36500 -> 36499 bytes ...ar_page_titles_in_line_numbering_with_notes.pdf | Bin 32536 -> 32562 bytes .../examples/4-reledpar_pages_long_notes.pdf | Bin 59062 -> 59061 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 22726 -> 22729 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 18726 -> 18991 bytes .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 22218 -> 22220 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 16238 -> 16236 bytes Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 86580 -> 86726 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 1101705 -> 1107999 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 443562 -> 443684 bytes .../texmf-dist/source/latex/reledmac/migration.dtx | 3 +- .../texmf-dist/source/latex/reledmac/reledmac.dtx | 223 ++++++++++++++------- .../texmf-dist/source/latex/reledmac/reledpar.dtx | 13 +- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 129 ++++++++---- Master/texmf-dist/tex/latex/reledmac/reledpar.sty | 8 +- 47 files changed, 258 insertions(+), 124 deletions(-) diff --git a/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx b/Master/texmf-dist/doc/latex/reledmac/doc-include/migrate-mac.dtx index 43e9c18a2ca..d9d94146845 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 @@ -396,3 +396,5 @@ % It becomes \cs{Xwidth}, and, consequently, \cs{hsizeX} becomes \cs{widthX}. % % The ancient names are temporarily maintained as aliases. +% \subsection{Migration to \reledmac~2.8.0} +% \Reledmac~2.8.0 fix spurious indents for paragraphed critical and familiar footnotes in \env{ledgroup} and \ledgroup{minipage}. You can re-establish the indent with \cs{Xparinden} and \cs{parindentX}. 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 361c1518298..cfc33fe665f 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 @@ -44,7 +44,7 @@ % \cs{Rlineflag} & \cs{setRlineflag} \\ % \end{longtable} % \subsubsection{Commands the names of which have changed} -% \label{eledmac-compat} +% \label{eledmac-compat2} % In order to ease the migration from \eledpar to \reledpar, you may load \reledmac with \verb+eledmac-compat+ option. % However, it is advised to change the command names. % @@ -69,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 either \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 \reffsamefile{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 bfdb0d7c946..34265d7d026 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 bb53342b6fd..341b0f5048d 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 c7b60db9337..7f115e184d9 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 23009cbb1a3..9655b1ea5a5 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 4f6b7c6c22b..d7afe1eba72 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 d40332f804b..45e31af731f 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 93db873f9d6..78d56636c90 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 6fcc73feea9..34fb7a82e57 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 e68bbc614d6..6cfaaff4193 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 66aacfe014a..12a5f567e7c 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 05a940599b0..14daf2a13c6 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 374186bab07..afc7f5fa654 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 92d7437924c..aaf9220647d 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 528f9f5b5b0..dd410f1af87 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 73e129badb8..d4d34f3ca8e 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 0908194ce5a..353d770b3ff 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 5e8765cbbbb..7a9a08d2ec6 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 eaf66613b7c..0591a851101 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 b8daddbf491..b4a5e7a433a 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 95ca64944e3..00d8432d831 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 2c9c94e46a6..731b2455a5e 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 d2a45cfdf4a..966e48b9ace 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 018c0fc8e85..03fb841e38a 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 aefc2911cd8..b575198a6e2 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 f1ffe5c396b..49bdfaf5639 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 56e1eb787f0..aa8d07026e1 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 ec370129dab..dbdb4815380 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 db2ae49182d..1a394a0b113 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 1c93c8f6e58..e0899dff9fa 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 4c458083ab2..d76e026c4bd 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 a7485b12dc6..3b0efce75fa 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 168e5d7ba4a..0d933ae466a 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 d25fd6ae8e7..45e263569be 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 98a15b8d604..61010638f43 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 a175f093d07..8fc6e5edfad 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 67075592ff4..e36fc2e2f76 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 f8ed21494e9..cd0697238e1 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 1c3a11c78c6..5223b02d824 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 aab32cf0198..633e569324e 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 74b9523ef42..0d7db1edece 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/migration.dtx b/Master/texmf-dist/source/latex/reledmac/migration.dtx index aa24268c20b..c751e47227a 100644 --- a/Master/texmf-dist/source/latex/reledmac/migration.dtx +++ b/Master/texmf-dist/source/latex/reledmac/migration.dtx @@ -32,6 +32,7 @@ ]{hyperref} \usepackage[mono=false]{libertine} \usepackage[noeledsec,series={},nocritical,noend,nofamiliar]{reledmac} +\usepackage{reledpar} \usepackage{doctools} \usepackage[english]{babel} \usepackage{xspace} @@ -117,7 +118,7 @@ % % \section{For \macpackage} % \newcommand{\reff}[1]{\ref{reledmac-#1} p.~\pageref{reledmac-#1}} -% \WithSuffix\newcommand\reff*[1]{\ref{#1} p.~\pageref{#1}} +% \newcommand\reffsamefile[1]{\ref{#1} p.~\pageref{#1}} % \input{doc-include/migrate-mac.dtx} % \renewcommand{\reff}[1]{\ref{reledpar-#1} p.~\pageref{reledpar-#1}} % \section{For \parpackage} diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index ab92b294f4f..2dd569c356f 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -34,6 +34,7 @@ \addtolength\marginparwidth{30pt} \usepackage[mono=false]{libertine} \usepackage[series={A,B},noend,noeledsec,nofamiliar]{reledmac} +\usepackage{reledpar} \usepackage[english]{babel} \usepackage{xspace} \usepackage{doctools} @@ -378,6 +379,9 @@ % \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 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).} +% \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.} % \title{\Macpackage \\ % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} @@ -1194,7 +1198,7 @@ % \label{fulllines}The available options are: % \begin{itemize} % \item \verb|fulllines| to disable \protect\cs{Xtwolines} and \protect\cs{Xmorethantwolines} features for this note (cf. \reff{Xtwolines}). -% \item \verb|nonum| to disable line numbering for this note. +% \item \verb|nonum| disables line numbering for this note. A horizontal blank space is added instead. You can use \cs{Xinplaceoflemmaseparator} to set it (\reff{Xinplaceoflemmaseparator}). % \item \verb|nosep| to disable the lemma separator for this note. % \item \verb|linerangesep=|\meta{c} to change to \meta{c} the separator between start line and end line for this particular note. % \end{itemize} @@ -1218,7 +1222,7 @@ % \begin{itemize} % \item \verb|fulllines| to disable \protect\cs{Xendtwolines} and \protect\cs{Xendmorethantwolines} features for this particular note (cf. \reff{Xtwolines}). % \item \verb+nonum+ to disable line number for this particular note. -% \item \verb|nosep| to disable the lemma separator for this particular note. +% \item \verb|nosep| to disable the lemma separator for this particular note. A horizontal blank space is added instead. You can use \cs{Xendinplaceoflemmaseparator} to set it (\reff{Xendinplaceoflemmaseparator}). % \item \verb|linerangesep=|\meta{c} to change to \meta{c} the separator between start line and end line for this particular note. % \end{itemize} % @@ -1367,7 +1371,7 @@ % If you use UTF-8 processor, like \XeLaTeX\ or \LuaLaTeX, there should not be any glitches. % However, pay attention to how characters are encoded. Similar-looking characters may be represented differently in unicode numbering. % -% For instance, in Greek, ``ᾳ'' has two possible unicode numbers: +% For instance, in Greek, ``ᾳ'' has two possible unicode numbers: % \begin{itemize} % \item GREEK SMALL LETTER ALPHA (U+03B1) + COMBINING GREEK YPOGEGRAMMENI (U+0345) % \item GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI (U+1FB3) @@ -1548,6 +1552,14 @@ % When a length, noted \meta{l}, is used, it can be stretchable: \verb|a plus b minus c|. The final length |m| is calculated by \LaTeX{} to have: $a-c \leq m \leq a+b$. If you use some relative unit\footnote{Like \verb|em| which is the width of an `m' in a given font.}, it will be relative to font size of the footnote, except for commands concerning the place kept by the notes --- including blank space. % +% Some commands are boolean, indicating when an option is enabled. +% If you want to disable the option after enabling it, you must use \verb+[false+] as the second optional argument. +% For example: +% \begin{itemize} +% \item \verb+\XX[A][false]+ to disable the `XX' option for the series A. +% \item \verb+\XX[][false]+ to disable it for all series. +% +% \end{itemize} % There is also name convention: % \begin{itemize} % \item Names prefixed by \verb+X+ are for setting of critical footnotes. @@ -1604,15 +1616,12 @@ % By default, the line number is printed in every note. If you want to print it only the first time for a given line number % (i.e., one time for line 1, one time for line 2, etc.), you can use \protect\cs{Xnumberonlyfirstinline}\oarg{s}. % -% Use \protect\cs{Xnumberonlyfirstinline}\oarg{s}\verb+[false]+ to disable this. \meta{s} can be empty if you want to disable it for every series. % % \changes{v1.1.0}{2012/09/25}{Add \protect\cs{Xnumberonlyfirstintwolines}} % \DescribeMacro{\Xnumberonlyfirstintwolines} % Suppose you have a lemma on line~2 and a lemma between line~2 and line~3. % With \protect\cs{Xnumberonlyfirstinline}, the second lemma is considered to be on the same line as the first lemma. % But if you use both \protect\cs{Xnumberonlyfirstinline}\oarg{s} and \protect\cs{Xnumberonlyfirstintwolines}\oarg{s}, a distinction is made. -% Use the command \linebreak\protect\cs{Xnumberonlyfirstintwolines}\oarg{s}\verb+[false]+ -% to disable this. \meta{s} can be empty if you want to disable it for every series. % % % \DescribeMacro{\Xsymlinenum} @@ -1655,7 +1664,6 @@ % % However, if you want to use a short form (when the lemma overlaps two lines, but not more than two), use \protect\cs{Xtwolinesbutnotmore}\oarg{series}. % -% It is possible to disable this again with \protect\cs{Xtwolinesbutnotmore}\oarg{series}\verb+[false]+. % % When you use lineation by page, the final page number, if different from the initial page number, % will not be printed, because the final page number is included in the \protect\cs{Xendtwolines} symbol. @@ -1664,7 +1672,6 @@ % However, you can force print the final page number with\\ % \protect\cs{Xtwolinesonlyinsamepage}\oarg{series}. % -% Use \protect\cs{Xtwolinesonlyinsamepage}\oarg{series}\verb+[false]+ to disable this. % % You can disable \protect\cs{Xtwolines} and related for a specific note by using the `[fulllines]` argument in the note macro cf.~\reff{fulllines}. % @@ -1677,7 +1684,7 @@ % % \subsubsection{Disable line number} % \DescribeMacro{\Xnonumber} -% You can use \protect\cs{Xnonumber}\oarg{s} if you do not want to have the line number in a footnote. To cancel it, use \protect\cs{Xnonumber}\oarg{s}\verb+[false]+. +% You can use \protect\cs{Xnonumber}\oarg{s} if you do not want to have the line number in a footnote. % \DescribeMacro{\Xendnonumber} \protect\cs{Xendnonumber}\oarg{s} is the same for endnote. % % \subsubsection{Printing pstart number} @@ -1686,7 +1693,6 @@ % \changes{v1.18.0}{2015/02/23}{Debug \protect\cs{Xonlypstart} when using \protect\cs{Xnumberonlyfirstinline} and the current line number differs from the previous.} % \DescribeMacro{\Xpstart} % You can use \protect\cs{Xpstart}\oarg{s} if you want to print the pstart number in the footnote, before the line and subline number. -% Use \protect\cs{Xpstart}\oarg{s}\verb+[false]+ to disable this. \meta{s} can be empty if you want to disable it for every series. % Note that when you change the lineation system, the option is automatically switched : % \begin{itemize} % \item If you use lineation by pstart, the option is enabled. @@ -1701,13 +1707,11 @@ % % \DescribeMacro{\Xonlypstart} % In combination with \protect\cs{Xpstart}, you can use \protect\cs{Xonlypstart}\oarg{s} if you want to print only the pstart number in the footnote, and not the line and subline number. -% Use \protect\cs{Xonlypstart}\oarg{s}\verb+[false]+ disable this. \meta{s} can be empty, if you want to disable it for every series. % % \subsubsection{Printing stanza number} % % \DescribeMacro{\Xstanza}\label{Xstanza} % You can use \cs{Xstanza}\oarg{s} if you want to print the stanza number in the footnote, before the line and subline number. -% Use \cs{Xstanza}\oarg{s}\verb+[false]+ to disable this. \meta{s} can be empty if you want to disable it for every series. % % Of course the stanza number is printed only when you use \cs{numberstanza} % @@ -1742,7 +1746,6 @@ %\DescribeMacro{\Xnonbreakableafternumber} % By default, the space defined by \protect\cs{Xafternumber} is breakable. % With \protect\cs{Xnonbreakableafternumber}\oarg{s} it becomes nonbreakable. -% Use \protect\cs{Xnonbreakableafternumber}\oarg{s}\verb+[false]+ to disable this. \meta{s} can be empty if you want to disable it for every series. % % \subsubsection{Space around line symbol} % \DescribeMacro{\Xbeforesymlinenum} @@ -1850,7 +1853,7 @@ % \DescribeMacro{\Xnolemmaseparator} % You can suppress the lemma separator, using \protect\cs{Xnolemmaseparator}\oarg{s}, which is simply a alias of \protect\cs{Xlemmaseparator}\oarg{s}\verb|{}|. % -% \DescribeMacro{\Xinplaceoflemmaseparator} +% \DescribeMacro{\Xinplaceoflemmaseparator}\label{Xinplaceoflemmaseparator} % With \protect\cs{Xinplaceoflemmaseparator}\oarg{s}\marg{l} you can add a space if no lemma separator is printed. The default value is 1~em. % % @@ -1869,7 +1872,7 @@ % Using \protect\cs{Xendafterlemmaseparator}\oarg{s}\marg{l} you can add some space between the separator and the content of the note. If your lemma separator is empty, this space won't be printed. The default value is 0.5~em. % % -% \DescribeMacro{\Xendinplaceoflemmaseparator} +% \DescribeMacro{\Xendinplaceoflemmaseparator}\label{Xendinplaceoflemmaseparator} % With \protect\cs{Xendinplaceoflemmaseparator}\oarg{s}\marg{l} you can add some space if you chose to remove the lemma separator. The default value is 0.5~em. % % @@ -2112,8 +2115,8 @@ % \DescribeMacro{\Xnoteswidthliketwocolumns}\DescribeMacro{\noteswidthliketwocolumnsX} % If you use \parpackage\ \protect\cs{columns} macro, you can call : % \begin{itemize} -% \item \protect\cs{Xnoteswidthliketwocolumns}\oarg{s} to create critical notes with a two-column size width. Use \protect\cs{Xnoteswidthliketwocolumns}\oarg{s}\verb+[false]+ to disable it. -% \item \protect\cs{noteswidthliketwocolumnsX}\oarg{s} to create familiar notes with a two-column size width. Use \protect\cs{noteswidthliketwocolumnsX}\oarg{s}\verb+[false]+ to disable it. +% \item \protect\cs{Xnoteswidthliketwocolumns}\oarg{s} to create critical notes with a two-column size width. +% \item \protect\cs{noteswidthliketwocolumnsX}\oarg{s} to create familiar notes with a two-column size width. % \end{itemize} % \subsection{Endnotes in one paragraph} % \changes{v1.12.0}{2015/04/25}{Add \protect\cs{Xendparagraph} and related settings.} @@ -2649,10 +2652,19 @@ % When calling \cs{appref} and \cs{SEref}, you can use as a first optional argument, in brackets (\verb+[]+), any optional argument which can be used for critical footnotes (\reff{Xfootnoteopt}). % % When calling \cs{apprefwithpage}, \cs{SErefwithpage} or \cs{SErefonlypage} you can use as a first optional argument, in brackets (\verb+[]+), any optional argument which can be used for critical endnotes (\reff{Xendnoteopt}). +% \subsection{Compatibility with \protect\package{xr} package} +% The \cs{externaldocument} command of the \cs{xr} package allows making cross-references from an external document, with the standard \LaTeX\ commands \cs{label} and \cs{ref} (and related). +% +% To use it with the \macpackage cross-reference commands (i.e. \cs{edlabel} and related), you must do the following: +% \begin{enumerate} +% \item Load the \package{xr} package. +% \item Load the \package{reledmac} package. +% \item Use the \cs{externaldocument} document command. +% \end{enumerate} % \section{Side notes} % % \subsection{Basics} -% The \protect\cs{marginpar} command does not work in numbered text. Instead, +% The \protect\cs{marginpar} command does not work in numbered text. Instead, % the package provides for non-floating sidenotes in either margin. % % \DescribeMacro{\ledinnernote} @@ -3461,7 +3473,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2015/12/13 v2.7.2 typeset critical edition]% +\ProvidesPackage{reledmac}[2016/01/15 v2.8.0 typeset critical edition]% % \end{macrocode} % % \subsection{Package options} @@ -9142,6 +9154,7 @@ \setbox0=\hbox{{\csuse{Xnotefontsize@#1}\csuse{Xtxtbeforenotes@#1}}\unhbox0 \removehboxes}% \csuse{Xbhookgroup@#1}% \csuse{Xnotefontsize@#1}% + \nottoggle{Xparindent@#1}{\parindent=\z@}{}% \unhbox0\par}} % \end{macrocode} @@ -11087,7 +11100,8 @@ \makehboxofhboxes \setbox0=\hbox{\unhbox0 \removehboxes}% \csuse{bhookgroupX@#1}% - \csuse{notefontsizeX@#1} + \csuse{notefontsizeX@#1}% + \nottoggle{parindentX@#1}{\parindent=\z@}{}% \unhbox0\par}} % \end{macrocode} @@ -11473,6 +11487,7 @@ % \changes{v1.21.0}{2015/04/13}{\protect\cs{endnotes} take five arguments.} % \changes{v2.5.0}{2015/11/13}{\protect\cs{endnotes} take six arguments.} % \changes{v2.7.0}{2015/11/13}{\protect\cs{endnotes} take seven arguments.} +% \changes{v2.8.0}{2016/01/15}{\protect\cs{Xendhangindent} and \protect\cs{Xendafternote} can take values which are relative to the font size of the endnote.} % Arguments are: % \begin{itemize} % \item \verb+#1+ Line numbers and font selection. @@ -11485,6 +11500,8 @@ % \end{itemize} % \begin{macrocode} \global\notbool{parapparatus@}{}{\long}\def\endprint#1#2#3#4#5#6#7{{% + \csuse{Xendbhooknote@#4}% + \csuse{Xendnotefontsize@#4}% \hangindent=\csuse{Xendhangindent@#4}% \ifXendinsertsep@% \hskip\csuse{Xendafternote@#4}% @@ -11499,8 +11516,6 @@ \setkeys[mac]{truefootnoteoption}{##1}% }% \notblank{#5}{\docsvlist{#5}}{}% - \csuse{Xendbhooknote@#4}% - \csuse{Xendnotefontsize@#4}% \IfStrEq{#6}{R}{\ledRcol@true}{}% \def\@this@crossref@start{#7:start}% \def\@this@crossref@end{#7:end}% @@ -13207,10 +13222,10 @@ % \begin{macrocode} \newcommand*{\l@dmake@labels}{} \def\l@dmake@labels#1|#2|#3|#4|#5{% - \expandafter\ifx\csname the@label#5\endcsname \relax\else - \led@warn@DuplicateLabel{#5}% + \expandafter\ifx\csname the@label\csuse{XR@prefix}#5\endcsname \relax\else + \led@warn@DuplicateLabel{\csuse{XR@prefix}#5}% \fi - \expandafter\gdef\csname the@label#5\endcsname{#1|#2|#3|#4|\relax}% + \expandafter\gdef\csname the@label\csuse{XR@prefix}#5\endcsname{#1|#2|#3|#4|\relax}% \ignorespaces} % \end{macrocode} @@ -13771,7 +13786,40 @@ % \end{macro} % % +% \subsection{Compatibility with \package{xref}} +% Here, we provide compatibility with the \package{xref} to enable \macpackage's cross-referencing to external documents. +% We assume that the user loads \package{xref} \emph{before} \package{reledmac}, but uses \cs{externaldocument} \emph{after} loading \package{reledmac}. % +% \begin{macro}{\XR@test} +% First, we patch the \package{xr} macro \cs{XR@test}, which is called on every line of the external \verb+.aux+ file, in order to also call macros specific to \macpackage. +% \begin{macrocode} +\pretocmd{\XR@test}% + {\XR@test@mac+++#1#2#3#4+++}% + {}% + {}% +% \end{macrocode} +% \end{macro} +% \begin{macro}{\XR@test@mac} +% The \cs{XR@test@mac} takes the full content of a line of the external \verb+.aux+ files, with the three final dots added by \package{xr}. +% \begin{macrocode} +\long\def\XR@test@mac+++#1+++{\XR@test@mac@test#1} +% \end{macrocode} +% \end{macro} +% \begin{macro}{\XR@test@mac@test} +% And finally, \cs{XR@test@mac@test} does the job. +% This code is based on the \cs{XR@test} macro of the \package{xr} package. However, not that the \cs{XR@prefix} is not called here, but it is integrated directly in \cs{l@dmake@labels} and \cs{l@dmake@labelsR}. +% \begin{macrocode} +\long\def\XR@test@mac@test#1#2...{%The triple dots (NOT \ldots) are because of the line 22 of xr.sty v5.02 1994/05/28 + \ifx#1\l@dmake@labels% + \l@dmake@labels#2% + \else + \ifx#1\l@dmake@labelsR% + \l@dmake@labelsR #2% + \fi% + \fi% +}% +% \end{macrocode} +% \end{macro} % \section{Side notes} % % Regular \protect\cs{marginpar}s do not work inside numbered text\,---\,they @@ -14845,63 +14893,86 @@ % \end{macrocode} % \end{macro} % \section{Glossaries} -% Here, we define the \cs{gls}-Like commands prefixed by \verb+ed+. -% \begin{macro}{\edgls} +% Here, we define the \cs{gls}-like commands prefixed by \verb+ed+, only if the package \package{glossaries} is loaded. % \begin{macrocode} -\DeclareRobustCommandx{\edgls}[3][1,3,usedefault]{% - \doedindexlabel% - \gls[counter=pageline,#1]{#2}[#3]% -} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\edGls} -% \begin{macrocode} -\DeclareRobustCommandx{\edGls}[3][1,3,usedefault]{% - \doedindexlabel% - \Gls[counter=pageline,#1]{#2}[#3]% -} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\edGLS} -% \begin{macrocode} -\DeclareRobustCommandx{\edGLS}[3][1,3,usedefault]{% - \doedindexlabel% - \GLS[counter=pageline,#1]{#2}[#3]% -} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\edglspl} -% \begin{macrocode} -\DeclareRobustCommandx{\edglspl}[3][1,3,usedefault]{% - \doedindexlabel% - \glspl[counter=pageline,#1]{#2}[#3]% -} -% \end{macrocode} -% \end{macro} -% \begin{macro}{\edGlspl} -% \begin{macrocode} -\DeclareRobustCommandx{\edGlspl}[3][1,3,usedefault]{% - \doedindexlabel% - \Glspl[counter=pageline,#1]{#2}[#3]% -} +\AtBeginDocument{% + \@ifpackageloaded{glossaries}{% % \end{macrocode} -% \end{macro} -% \begin{macro}{\edGLSpl} +% First those which arguments are \oarg{options}\marg{label}\oarg{insert}. % \begin{macrocode} -\DeclareRobustCommandx{\edGLSpl}[3][1,3,usedefault]{% - \doedindexlabel% - \GLSpl[counter=pageline,#1]{#2}[#3]% -} + \renewcommand{\do}[1]{% + \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,3,usedefault]{% + \doedindexlabel% + \csname#1\endcsname[counter=pageline,##1]{##2}[##3]% + }% + \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,3,usedefault]{% + \doedindexlabel% + \csname#1\endcsname*[counter=pageline,##1]{##2}[##3]% + }% + }% + \docsvlist{% + gls,% + Gls,% + GLS,% + glspl,% + Glspl,% + GLSpl,% + glstext,% + Glstext,% + GLStext,% + Glsfirst,% + GLSfirst,% + glsplural% + Glsplural,% + GLSplural,% + glsfirstplural,% + Glsfirstplural,% + GLSfirstplural,% + glsname,% + Glsname,% + GLSname,% + glssymbol,% + Glssymbol,% + GLSsymbol,% + glsdesc,% + Glsdesc,% + GLSdesc,% + glsuseri,% + Glsuseri,% + GLSuseri,% + glsuserii,% + Glsuserii,% + GLSuserii,% + glsuseriii,% + Glsuseriii,% + GLSuseriii,% + glsuseriv,% + Glsuseriv,% + GLSuseriv,% + glsuserv,% + Glsuserv,% + GLSuserv,% + glsuservi,% + Glsuservi,% + GLSuservi% + }% % \end{macrocode} -% \end{macro} -% \begin{macro}{\edglsdisp} +% First those which arguments are \oarg{options}\marg{label}\marg{link text}. % \begin{macrocode} -\DeclareRobustCommandx{\edglsdisp}[3][1,3,usedefault]{% - \doedindexlabel% - \glsdisp[counter=pageline,#1]{#2}[#3]% -} + \renewcommand{\do}[1]{% + \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,usedefault]{% + \doedindexlabel% + \csname#1\endcsname[counter=pageline,##1]{##2}{##3}% + }% + \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,usedefault]{% + \doedindexlabel% + \csname#1\endcsname*[counter=pageline,##1]{##2}{##3}% + }% + }% + \docsvlist{glsdisp,glslink}% + }{}% +}% % \end{macrocode} -% \end{macro} % \section{Verse} % % The original code is principally Wayne Sullivan's\index{Sullivan, Wayne} diff --git a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx index 90e4a7c8b85..9cd154fd9f6 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledpar.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledpar.dtx @@ -96,7 +96,7 @@ % % \fi % \newcommand{\reff}[1]{\ref{#1} p.~\pageref{#1}} -% \WithSuffix\newcommand\reff*[1]{\reff{#1}} +% \newcommand\reffsamefile[1]{\reff{#1}} % \makeatletter % \newcommand*{\DescribeIt}{\leavevmode\@bsphack\begingroup\MakePrivateLetters % \Describe@It} @@ -264,7 +264,8 @@ % \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 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).} +% \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.} % ^^A PW added following as the definitions are at some unknown elsewhere % % \newcommand{\egstart}{% @@ -1157,7 +1158,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2015/12/13 v2.6.3 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/01/15 v2.7.0 reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} @@ -4271,10 +4272,10 @@ % % \begin{macrocode} \def\l@dmake@labelsR#1|#2|#3|#4|#5{% - \expandafter\ifx\csname the@label#5\endcsname \relax\else - \led@warn@DuplicateLabel{#5}% + \expandafter\ifx\csname the@label\csuse{XR@prefix}#5\endcsname \relax\else + \led@warn@DuplicateLabel{\csuse{XR@prefix}#5}% \fi - \expandafter\gdef\csname the@label#5\endcsname{#1|#2|#3|#4|\@Rlineflag}% + \expandafter\gdef\csname the@label\csuse{XR@prefix}#5\endcsname{#1|#2|#3|#4|\@Rlineflag}% \ignorespaces} \AtBeginDocument{% \def\l@dmake@labelsR#1|#2|#3|#4|#5{}% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index cf3029a0d03..e9dcdefa8f4 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/13 v2.7.2 typeset critical edition]% +\ProvidesPackage{reledmac}[2016/01/15 v2.8.0 typeset critical edition]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -2311,6 +2311,7 @@ \setbox0=\hbox{{\csuse{Xnotefontsize@#1}\csuse{Xtxtbeforenotes@#1}}\unhbox0 \removehboxes}% \csuse{Xbhookgroup@#1}% \csuse{Xnotefontsize@#1}% + \nottoggle{Xparindent@#1}{\parindent=\z@}{}% \unhbox0\par}} \newcommand*{\makehboxofhboxes}{\setbox0=\hbox{}% @@ -3460,7 +3461,8 @@ \makehboxofhboxes \setbox0=\hbox{\unhbox0 \removehboxes}% \csuse{bhookgroupX@#1}% - \csuse{notefontsizeX@#1} + \csuse{notefontsizeX@#1}% + \nottoggle{parindentX@#1}{\parindent=\z@}{}% \unhbox0\par}} \newcommand{\insertparafootsepX}[1]{% @@ -3652,6 +3654,8 @@ }% \global\notbool{parapparatus@}{}{\long}\def\endprint#1#2#3#4#5#6#7{{% + \csuse{Xendbhooknote@#4}% + \csuse{Xendnotefontsize@#4}% \hangindent=\csuse{Xendhangindent@#4}% \ifXendinsertsep@% \hskip\csuse{Xendafternote@#4}% @@ -3666,8 +3670,6 @@ \setkeys[mac]{truefootnoteoption}{##1}% }% \notblank{#5}{\docsvlist{#5}}{}% - \csuse{Xendbhooknote@#4}% - \csuse{Xendnotefontsize@#4}% \IfStrEq{#6}{R}{\ledRcol@true}{}% \def\@this@crossref@start{#7:start}% \def\@this@crossref@end{#7:end}% @@ -4729,10 +4731,10 @@ \def\labelrefsparsesubline#1|#2{#2} \newcommand*{\l@dmake@labels}{} \def\l@dmake@labels#1|#2|#3|#4|#5{% - \expandafter\ifx\csname the@label#5\endcsname \relax\else - \led@warn@DuplicateLabel{#5}% + \expandafter\ifx\csname the@label\csuse{XR@prefix}#5\endcsname \relax\else + \led@warn@DuplicateLabel{\csuse{XR@prefix}#5}% \fi - \expandafter\gdef\csname the@label#5\endcsname{#1|#2|#3|#4|\relax}% + \expandafter\gdef\csname the@label\csuse{XR@prefix}#5\endcsname{#1|#2|#3|#4|\relax}% \ignorespaces} \AtBeginDocument{% @@ -5054,6 +5056,20 @@ }% \newcommand*{\edmakelabel}[2]{\expandafter\xdef\csname the@label#1\endcsname{#2}} +\pretocmd{\XR@test}% + {\XR@test@mac+++#1#2#3#4+++}% + {}% + {}% +\long\def\XR@test@mac+++#1+++{\XR@test@mac@test#1} +\long\def\XR@test@mac@test#1#2...{%The triple dots (NOT \ldots) are because of the line 22 of xr.sty v5.02 1994/05/28 + \ifx#1\l@dmake@labels% + \l@dmake@labels#2% + \else + \ifx#1\l@dmake@labelsR% + \l@dmake@labelsR #2% + \fi% + \fi% +}% \pretocmd{\@xympar}% {\ifnumberedpar@ \led@warn@NoMarginpars @@ -5661,34 +5677,77 @@ {\let\index\orig@@index}% {}% }% -\DeclareRobustCommandx{\edgls}[3][1,3,usedefault]{% - \doedindexlabel% - \gls[counter=pageline,#1]{#2}[#3]% -} -\DeclareRobustCommandx{\edGls}[3][1,3,usedefault]{% - \doedindexlabel% - \Gls[counter=pageline,#1]{#2}[#3]% -} -\DeclareRobustCommandx{\edGLS}[3][1,3,usedefault]{% - \doedindexlabel% - \GLS[counter=pageline,#1]{#2}[#3]% -} -\DeclareRobustCommandx{\edglspl}[3][1,3,usedefault]{% - \doedindexlabel% - \glspl[counter=pageline,#1]{#2}[#3]% -} -\DeclareRobustCommandx{\edGlspl}[3][1,3,usedefault]{% - \doedindexlabel% - \Glspl[counter=pageline,#1]{#2}[#3]% -} -\DeclareRobustCommandx{\edGLSpl}[3][1,3,usedefault]{% - \doedindexlabel% - \GLSpl[counter=pageline,#1]{#2}[#3]% -} -\DeclareRobustCommandx{\edglsdisp}[3][1,3,usedefault]{% - \doedindexlabel% - \glsdisp[counter=pageline,#1]{#2}[#3]% -} +\AtBeginDocument{% + \@ifpackageloaded{glossaries}{% + \renewcommand{\do}[1]{% + \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,3,usedefault]{% + \doedindexlabel% + \csname#1\endcsname[counter=pageline,##1]{##2}[##3]% + }% + \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,3,usedefault]{% + \doedindexlabel% + \csname#1\endcsname*[counter=pageline,##1]{##2}[##3]% + }% + }% + \docsvlist{% + gls,% + Gls,% + GLS,% + glspl,% + Glspl,% + GLSpl,% + glstext,% + Glstext,% + GLStext,% + Glsfirst,% + GLSfirst,% + glsplural% + Glsplural,% + GLSplural,% + glsfirstplural,% + Glsfirstplural,% + GLSfirstplural,% + glsname,% + Glsname,% + GLSname,% + glssymbol,% + Glssymbol,% + GLSsymbol,% + glsdesc,% + Glsdesc,% + GLSdesc,% + glsuseri,% + Glsuseri,% + GLSuseri,% + glsuserii,% + Glsuserii,% + GLSuserii,% + glsuseriii,% + Glsuseriii,% + GLSuseriii,% + glsuseriv,% + Glsuseriv,% + GLSuseriv,% + glsuserv,% + Glsuserv,% + GLSuserv,% + glsuservi,% + Glsuservi,% + GLSuservi% + }% + \renewcommand{\do}[1]{% + \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,usedefault]{% + \doedindexlabel% + \csname#1\endcsname[counter=pageline,##1]{##2}{##3}% + }% + \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,usedefault]{% + \doedindexlabel% + \csname#1\endcsname*[counter=pageline,##1]{##2}{##3}% + }% + }% + \docsvlist{glsdisp,glslink}% + }{}% +}% \def\@hangingsymbol{} \newcommand*{\sethangingsymbol}[1]{% \gdef\@hangingsymbol{#1}% diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty index 995184f77d1..cf94b8f3da3 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/12/13 v2.6.3 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2016/01/15 v2.7.0 reledmac extension for parallel texts]% \RequirePackage{xspace}% \RequirePackage{xkeyval} @@ -1538,10 +1538,10 @@ \list@create{\labelref@listR} \def\l@dmake@labelsR#1|#2|#3|#4|#5{% - \expandafter\ifx\csname the@label#5\endcsname \relax\else - \led@warn@DuplicateLabel{#5}% + \expandafter\ifx\csname the@label\csuse{XR@prefix}#5\endcsname \relax\else + \led@warn@DuplicateLabel{\csuse{XR@prefix}#5}% \fi - \expandafter\gdef\csname the@label#5\endcsname{#1|#2|#3|#4|\@Rlineflag}% + \expandafter\gdef\csname the@label\csuse{XR@prefix}#5\endcsname{#1|#2|#3|#4|\@Rlineflag}% \ignorespaces} \AtBeginDocument{% \def\l@dmake@labelsR#1|#2|#3|#4|#5{}% -- cgit v1.2.3