From 2f0fbea27b80ff89c321ef2771e588f1cd688516 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 5 Jun 2017 23:11:45 +0000 Subject: reledmac (5jun17) git-svn-id: svn://tug.org/texlive/trunk@44473 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/reledmac/doc-include/migrate-mac.dtx | 14 +++ .../latex/reledmac/examples/1-criticalnotes.pdf | Bin 17292 -> 16738 bytes .../latex/reledmac/examples/1-criticalnotes.tex | 1 + .../doc/latex/reledmac/examples/1-sidenotes.pdf | Bin 26394 -> 26446 bytes .../doc/latex/reledmac/examples/1-sidenotes.tex | 1 + .../doc/latex/reledmac/examples/1-tabular.pdf | Bin 21351 -> 20869 bytes .../doc/latex/reledmac/examples/1-tabular.tex | 1 + .../doc/latex/reledmac/examples/1-verses.pdf | Bin 17434 -> 17432 bytes .../doc/latex/reledmac/examples/1-verses.tex | 1 + .../reledmac/examples/2-cross_referencing.pdf | Bin 18601 -> 18601 bytes .../reledmac/examples/2-cross_referencing.tex | 1 + .../latex/reledmac/examples/2-footnote_spacing.pdf | Bin 20953 -> 20705 bytes .../latex/reledmac/examples/2-footnote_spacing.tex | 1 + .../doc/latex/reledmac/examples/2-glossaries.pdf | Bin 21703 -> 21258 bytes .../doc/latex/reledmac/examples/2-glossaries.tex | 2 +- .../doc/latex/reledmac/examples/2-indexing.pdf | Bin 21743 -> 21743 bytes .../reledmac/examples/2-lemma_disambigution.pdf | Bin 17113 -> 17113 bytes .../reledmac/examples/2-line_numbers_in_header.pdf | Bin 31427 -> 31336 bytes .../reledmac/examples/2-line_numbers_in_header.tex | 1 + .../doc/latex/reledmac/examples/2-linespacing.pdf | Bin 26385 -> 26101 bytes .../doc/latex/reledmac/examples/2-linespacing.tex | 1 + .../reledmac/examples/2-manuscript-apparatus.pdf | Bin 36349 -> 36343 bytes .../doc/latex/reledmac/examples/2-notes-width.pdf | Bin 24782 -> 24488 bytes .../doc/latex/reledmac/examples/2-notes-width.tex | 1 + .../reledmac/examples/2-one_series_per_pstart.pdf | Bin 25914 -> 25879 bytes .../reledmac/examples/2-one_series_per_pstart.tex | 2 +- .../doc/latex/reledmac/examples/2-performances.pdf | Bin 23274 -> 22683 bytes .../doc/latex/reledmac/examples/2-performances.tex | 1 + .../reledmac/examples/2-reledmac-right-to-left.pdf | Bin 34253 -> 34254 bytes .../2-titles_in_line_numbering_with_notes.pdf | Bin 22811 -> 22814 bytes .../examples/2-titles_not_in_line_numbering.pdf | Bin 17201 -> 17200 bytes .../3-reledpar_columns_different_languages.pdf | Bin 26385 -> 26014 bytes .../3-reledpar_columns_different_languages.tex | 2 +- .../doc/latex/reledmac/examples/3-reledpar_mwe.pdf | Bin 12220 -> 12222 bytes ...reledpar_pages_different_languages_lualatex.pdf | Bin 42532 -> 42532 bytes .../3-reledpar_same_page_number_in_both_side.pdf | Bin 23021 -> 22762 bytes .../3-reledpar_same_page_number_in_both_side.tex | 1 + ...reledpar_sync_setting_advancedshifted-nomax.pdf | Bin 43294 -> 43295 bytes .../3-reledpar_sync_setting_advancedshifted.pdf | Bin 42875 -> 42870 bytes .../examples/3-reledpar_sync_setting_default.pdf | Bin 40800 -> 40797 bytes .../3-reledpar_sync_setting_nomax-shifted.pdf | Bin 43073 -> 43072 bytes .../examples/3-reledpar_sync_setting_nomax.pdf | Bin 42566 -> 42566 bytes .../examples/3-reledpar_sync_setting_nosync.pdf | Bin 42610 -> 42612 bytes .../examples/3-reledpar_sync_setting_shifted.pdf | Bin 42873 -> 42870 bytes ...mn_mix_with_not_column-continuous-numbering.pdf | Bin 22317 -> 22311 bytes ...mn_mix_with_not_column-continuous-numbering.tex | 1 + .../4-reledpar_column_mix_with_not_column.pdf | Bin 27050 -> 27076 bytes .../4-reledpar_column_mix_with_not_column.tex | 1 + .../examples/4-reledpar_columns_alignment.pdf | Bin 21265 -> 21265 bytes ...columns_titles_in_line_numbering_with_notes.pdf | Bin 29757 -> 29522 bytes ...columns_titles_in_line_numbering_with_notes.tex | 2 +- .../examples/4-reledpar_inside-outside-columns.pdf | Bin 22450 -> 22448 bytes .../examples/4-reledpar_one_series_per_pstart.pdf | Bin 36454 -> 36425 bytes .../examples/4-reledpar_one_series_per_pstart.tex | 2 +- .../examples/4-reledpar_pages_long_notes.pdf | Bin 58543 -> 58540 bytes .../examples/4-reledpar_pages_notes_leftpage.pdf | Bin 22753 -> 22751 bytes ...-reledpar_pages_paragraph_separator_between.pdf | Bin 19196 -> 18696 bytes ...-reledpar_pages_paragraph_separator_between.tex | 1 + ...r_pages_titles_in_line_numbering_with_notes.pdf | Bin 32682 -> 32435 bytes ...r_pages_titles_in_line_numbering_with_notes.tex | 2 +- .../4-reledpar_titles_not_in_line_numbering.pdf | Bin 22222 -> 22221 bytes .../examples/4-reledpar_verse_text_between.pdf | Bin 16269 -> 16268 bytes .../doc/latex/reledmac/examples/makefile | 1 + Master/texmf-dist/doc/latex/reledmac/migration.pdf | Bin 89668 -> 90714 bytes Master/texmf-dist/doc/latex/reledmac/reledmac.pdf | Bin 1278445 -> 1286275 bytes Master/texmf-dist/doc/latex/reledmac/reledpar.pdf | Bin 495946 -> 495907 bytes .../texmf-dist/source/latex/reledmac/migration.dtx | 1 + .../texmf-dist/source/latex/reledmac/reledmac.dtx | 98 ++++++++++++++++++--- Master/texmf-dist/tex/latex/reledmac/reledmac.sty | 35 ++++++-- 69 files changed, 151 insertions(+), 24 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 67029384292..923f8868679 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 @@ -405,3 +405,17 @@ % % \subsection{Migration to \reledmac~2.18.0} % After updating reledmac, and before any new compilation, you need to clean your \verb|.aux| files, if you use \cs{edlabel} or related. +% \subsection{Migration to \reledmac~2.21.0} +% Previously, there were a bug, which was in contradiction with the handbook. +% If you wrote +% \begin{verbatim} +% The \edtext{creature\edindex{elephant} was quite +% unafraid}{\Afootnote{Of the mouse, that is.}} +% \end{verbatim} +% \enquote{elephant} was indexed both in main text and in critical footnotes. +% With the new version of \reledmac, it is indexed only in main text. +% If you want to index it also in critical footnotes, do +% \begin{verbatim} +% The \edtext{creature\edindex{elephant} was quite +% unafraid}{\Afootnote{\edindex{elephant}Of the mouse, that is.}} +% \end{verbatim} 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 cc16fc0ca39..66cdbce99e2 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-criticalnotes.tex b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.tex index 7afd1f754cb..160ee48b6bb 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.tex @@ -11,6 +11,7 @@ \begin{document} \begin{english} +\date{} \title{Critical notes} \maketitle \begin{abstract} 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 3df3bcd28e1..6fb8e5bffcd 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-sidenotes.tex b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.tex index 33182ee3f33..4d943693c7e 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.tex @@ -15,6 +15,7 @@ \begin{document} \begin{english} +\date{} \title{Side notes} \maketitle \begin{abstract} 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 3dc0c29c6c7..357d7bdb730 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-tabular.tex b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.tex index 87fe3e0a77c..3c887573bc2 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.tex @@ -11,6 +11,7 @@ \begin{document} \begin{english} +\date{} \title{Tabulars with reledmac} \maketitle \begin{abstract} 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 616f7b44fa0..db74b5e7c03 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/1-verses.tex b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.tex index ed7e2516e6e..28bb92ec628 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.tex @@ -11,6 +11,7 @@ \begin{document} \begin{english} \date{} + \title{Stanza} \maketitle 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 20c63fc4fc2..68caadf4eb7 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-cross_referencing.tex b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.tex index 3830f5c8483..a88884e7b78 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.tex @@ -15,6 +15,7 @@ \begin{english} \title{Cross-referencing with reledmac} \date{} +\date{} \maketitle \begin{abstract} This file provides a MWE of cross-referencing with reledmac, with reference to line number. 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 8de37f3798c..5bfc8f70264 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-footnote_spacing.tex b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.tex index da0b6fadc72..0e24c814128 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.tex @@ -30,6 +30,7 @@ \begin{document} \begin{english} +\date{} \title{Setting spaces around footnote rules} \maketitle \begin{abstract} 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 ffa137aeffa..09d02de1adf 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-glossaries.tex b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.tex index 8a16ffad38a..4f7ee08f054 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.tex @@ -16,7 +16,7 @@ \begin{english} \title{Glossaries} - +\date{} \maketitle \begin{abstract} This file provides example of using \emph{glossaries} package with \emph{reledmac} package. 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 8ca30d6a5d7..129f665dc3d 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 8697a654034..564ad55caa3 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 60743bd286c..b3a18f0322b 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-line_numbers_in_header.tex b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.tex index 08995166062..9c29eeb284c 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.tex @@ -21,6 +21,7 @@ \begin{document} \begin{english} +\date{} \title{Line numbers in headers} \maketitle \begin{abstract} 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 5206a8958f9..e747b839a92 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-linespacing.tex b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.tex index fa23d6c39d5..ec067a772a3 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.tex @@ -20,6 +20,7 @@ \begin{document} \begin{english} +\date{} \title{Line spacing} \maketitle \begin{abstract} diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf index 68f1851b2bf..a424c445cdf 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.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 0b52953bd8b..0f1e0f3ba12 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 c1b884b957d..7fa938e8531 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 @@ -25,6 +25,7 @@ \begin{document} \begin{english} +\date{} \title{Setting footnotes width} \maketitle \begin{abstract} 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 17777ba6e22..4a0dc5f3cc0 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-one_series_per_pstart.tex b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.tex index 522b9183f24..0eb96733e96 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.tex @@ -16,7 +16,7 @@ \seriesatend{\themynotelevel}%And place current series at the end } \begin{document} - +\date{} \title{One series per \textbackslash pstart with reledmac} \author{} \maketitle 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 bbe774a5473..b3363e6c5f6 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-performances.tex b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.tex index b0b9dfbbfaa..6d644b26ad4 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.tex @@ -10,6 +10,7 @@ \begin{document} \begin{english} +\date{} \title{Options to customize performance} \maketitle \begin{abstract} diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf index 3403e3769e7..427be2efd34 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.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 c3c879d89bb..818f6cbbded 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 19bc460cba3..9f0b9d28098 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 4c01ef664d9..efbab96add8 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_columns_different_languages.tex b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.tex index bf130c0c88a..016a24e3aff 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.tex @@ -21,7 +21,7 @@ \begin{document} - +\date{} \title{Parallel columns in two different languages} 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 c5db8b7d7b4..b808801a140 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 1392afef6e1..7ea4b53c8b7 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 ce25e49f673..ffa0a654a52 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_same_page_number_in_both_side.tex b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.tex index 3289d12a654..e523ed8a782 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.tex @@ -6,6 +6,7 @@ \setmainlanguage{english} \begin{document} +\date{} \author{} \title{Same page number on left and right sides} 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 8247623ef3a..ba43d440e04 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 7af7753cfa2..6bfc3eda10f 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 3e4bb804c66..2471cf22f20 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 46d61c7651f..16cd5f83d80 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 bb20db24d08..6f339c59170 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 fd16fb70f81..f7aa360fbe7 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 b3f60bb6db7..ef86f869ad5 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf index 54b1ec81dcf..2a3c4d57594 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex index d56d66e1f76..f944e1bd287 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.tex @@ -18,6 +18,7 @@ \begin{document} \begin{english} +\date{} \title{Mixing multiple columns with a single column, using continuous numbering} \begin{abstract} In this example, we use the \verb+widthliketwocolumns+ and \\ \verb+continuousnumberingwithcolumns+ and \verb+\pausenumbering+ to alternate parallel typesetting in columns and typesetting in a single column, getting continuous line numbering between them. 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 dcf25ad1942..9ebe38e66b7 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.tex b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.tex index ae7ac1c7139..6aca770de4e 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.tex @@ -18,6 +18,7 @@ \begin{document} \begin{english} +\date{} \title{Mixing multiple columns with single column} \maketitle \begin{abstract} 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 8e3d2146600..a8d53c7a9e0 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 268a91d841e..15d15d4903c 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_columns_titles_in_line_numbering_with_notes.tex b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.tex index 8515ab064a9..c7070fefed4 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.tex @@ -11,7 +11,7 @@ \firstlinenum*{1} \begin{document} - +\date{} \title{Sectioning commands with critical notes in parallel colums} diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf index 5f88810da95..6e056d4f459 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.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 59f0196661c..38d063cb96a 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_one_series_per_pstart.tex b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.tex index 7856855b5bd..db869748d84 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.tex @@ -49,7 +49,7 @@ \makeatother \begin{document} - +\date{} \title{One series per \textbackslash pstart with reledmac} \author{} \maketitle 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 e989594da39..e5380bbd077 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 dd89ad80922..6a6afc92941 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 552a483ac5c..7de4d151d07 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_pages_paragraph_separator_between.tex b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.tex index 995eccd40a3..3687ebd9aff 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.tex @@ -11,6 +11,7 @@ \begin{document} \begin{english} +\date{} \title{Separators between paragraphs} \maketitle \begin{abstract} diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf index 97a2470ee25..628360fa619 100644 Binary files a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf and b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf differ diff --git a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.tex b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.tex index 27f09f4eead..47b391ef8fd 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.tex +++ b/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.tex @@ -8,7 +8,7 @@ \linenumincrement*{1} \firstlinenum*{1} \begin{document} - +\date{} \title{Sectioning commands with critical notes in parallel pages} 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 563983c8626..b0ba297003b 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 5c3c3fe0ea6..00b2a46e8d1 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/examples/makefile b/Master/texmf-dist/doc/latex/reledmac/examples/makefile index 7719d8ee580..655bac967f8 100644 --- a/Master/texmf-dist/doc/latex/reledmac/examples/makefile +++ b/Master/texmf-dist/doc/latex/reledmac/examples/makefile @@ -4,6 +4,7 @@ SRC= $(wildcard *.tex) OBJ= $(SRC:.tex=.pdf) all:$(OBJ) + python3 check-example.py %.pdf: %.tex diff --git a/Master/texmf-dist/doc/latex/reledmac/migration.pdf b/Master/texmf-dist/doc/latex/reledmac/migration.pdf index 7dbac14371b..c771e06e701 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 92b46150be3..f152ef49e82 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 31a3db2c7d4..5f8f0afde76 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 c751e47227a..a4574afc430 100644 --- a/Master/texmf-dist/source/latex/reledmac/migration.dtx +++ b/Master/texmf-dist/source/latex/reledmac/migration.dtx @@ -37,6 +37,7 @@ \usepackage[english]{babel} \usepackage{xspace} \usepackage{graphicx,metalogo} +\usepackage{csquotes} \renewcommand{\MakeUppercase}[1]{#1} \pagestyle{headings} \setcounter{StandardModuleDepth}{1} diff --git a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx index 4c760d334e7..fb5cf076d18 100644 --- a/Master/texmf-dist/source/latex/reledmac/reledmac.dtx +++ b/Master/texmf-dist/source/latex/reledmac/reledmac.dtx @@ -472,6 +472,9 @@ % \changes{v2.20.0}{2017/05/04}{Add \protect\cs{AtStartEveryStanza}, \protect\cs{BeforeEveryStopStanza}, \protect\cs{AtEndEveryPend}, \protect\cs{AtStartEveryPstart}.} % \changes{v2.20.0}{2017/05/04}{Add second optional argument of \protect\cs{pstart}, \protect\cs{pend} and \protect\cs{stanza}.} % \changes{v2.20.0}{2017/05/04}{Add third and fourth optional argument of \protect\cs{newverse}.} +% \changes{v2.21.0}{2017/06/04}{Fix bug when using formatting command in the argument of \protect\cs{edindex} inside \protect\cs{edtext}.} +% \changes{v2.21.0}{2017/06/04}{Now, as explained in the handbook, an \protect\cs{edindex} inside \protect\cs{edtext} index only for main text, and not for critical footnotes.} +% \changes{v2.21.0}{2017/06/04}{Add the possibility of nested \protect\cs{sameword}.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % @@ -1673,6 +1676,59 @@ % \endnumbering % \egend % +% \subsubsection{Sameword for a group of words} +% Sometime, a group of words, and not only a single word, occurs multiple times. +% In this case, you have two solutions. +% +% First, you can consider only individual words, and not groups of word. +% See this example: +% \begin{verbatim} +%\sameword{per} \sameword{causam} +%tamen scire +%\edtext{\sameword{causam}}{\Bfootnote{fnote}} +%est +%\edtext{\sameword{per} \sameword{causam}}{\Bfootnote{causam rei B}} +%cognoscere +%\edtext{\sameword{causam}}{\Bfootnote{fnote}} +% \end{verbatim} +% \begin{ledgroup} +% \beginnumbering +% \pstart +%\sameword{per} \sameword{causam} +%tamen scire +%\edtext{\sameword{causam}}{\Bfootnote{fnote}} +%est +%\edtext{\sameword{per} \sameword{causam}}{\Bfootnote{causam rei B}} +%cognoscere +%\edtext{\sameword{causam}}{\Bfootnote{fnote}} +% \pend +% \endnumbering +% \end{ledgroup} +% Here, there no ambiguity about which \enquote{per causam} we speak. +% +% However, we may consider that as \enquote{per causam} is the lemma of the second note, there should be only one number for the whole lemma. +% In this case we can mark all the \enquote{per causam} groups. +% But as \enquote{causam} is also called as lemma in note~1 and ~3, we need to use nested \cs{sameword}. +% Consequently, we need to use \cs{lemma} for the \cs{edtext} linked to \enquote{per causam}, as we don't want to have number for individual word. +% +% \begin{verbatim} +%\sameword{per \sameword{causam}} tamen scire +%\edtext{\sameword{causam}}{\Bfootnote{fnote}} est +%\edtext{\sameword[1]{per \sameword{causam}}}{\lemma{\sameword{per causam}}\Bfootnote{causam rei B}} cognoscere +%\edtext{\sameword{causam}}{\Bfootnote{fnote}} +% \end{verbatim} +% \begin{ledgroup} +%\beginnumbering +%\pstart +%\sameword{per \sameword{causam}} tamen scire +%\edtext{\sameword{causam}}{\Bfootnote{fnote}} est +%\edtext{\sameword[1]{per \sameword{causam}}}% +% {\lemma{\sameword{per causam}}\Bfootnote{causam rei B}} +% cognoscere +%\edtext{\sameword{causam}}{\Bfootnote{fnote}} +%\pend +%\endnumbering +% \end{ledgroup} % \subsubsection{Customizing} % \DescribeMacro{\showwordrank}You can redefine the \protect\cs{showwordrank} macro to change the way the number is printed. The default value is % \begin{verbatim} @@ -2615,6 +2671,8 @@ % is ended by an ampersand (\verb+&+), and the stanza itself is ended % by putting \verb?\&? at the end of the last line. % +% If you need to add brackets directly after \verb?\stanza?, \verb+&+ or \verb?\&?, add \cs{norelax}, as in other case the brackets will be interpreted as delimitation for optional argument (cf.~\reff{contentverse}) +% % % \subsection{Define stanza indents} % \DescribeMacro{\stanzaindentbase} @@ -3939,7 +3997,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2017/05/04 v2.20.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2017/06/04 v2.21.0 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -7229,6 +7287,7 @@ \let\setline=\@gobble \let\advanceline=\@gobble \let\sameword\sameword@inedtext% \let\edtext=\dummy@edtext + \let\edindex\dummy@edindex% \l@dtabnoexpands \morenoexpands} \let\morenoexpands=\relax @@ -7652,7 +7711,7 @@ % } (E) % % In this example, all lemma information for \protect\cs{edtext} is framed. The text in parenthesis is the content of critical notes associated to the preceding frame. -% As you can see, we have two level of \protect\cs{edtext}. +% As you can see, we have two levels of \protect\cs{edtext}. % %The list for \protect\cs{edtext}s of level~1 is $\{\{1,2,2,3,4,3\},\{5,4\}\}$. % @@ -7689,11 +7748,14 @@ % we detokenize only for non-\XeTeX engines. In any case, in \XeTeX a \protect\cs{csname} construction can contain UTF-8 characters without a problem, as UTF-8 characters are not managed with category codes, but instead read directly as UTF-8 characters. % \begin{macrocode} \newcommand{\get@sw@txt}[1]{% - \ifxetex% - \xdef\sw@txt{#1}% - \else% - \expandafter\xdef\expandafter\sw@txt\expandafter{\detokenize{#1}}% - \fi% + \begingroup% + \let\sameword\@firstofone%Allow to have nested \sameword + \ifxetex% + \xdef\sw@txt{#1}% + \else% + \expandafter\xdef\expandafter\sw@txt\expandafter{\detokenize{#1}}% + \fi% + \endgroup% }% % \end{macrocode} % \end{macro} @@ -16292,12 +16354,27 @@ % \changes{v1.12.0}{2014/08/05}{Use correctly default index when \protect\package{imakeidx} is loaded.} % \changes{v1.14.0}{2014/10/27}{Let eledmac take advantage of imakeidx even when memoir class is used} % \begin{macro}{\@wredindex} +% \begin{macro}{\dummy@edindex} % Write the index information to the \file{idx} file. % \begin{macrocode} \newcommandx{\@wredindex}[2][1=\expandonce\jobname,usedefault]{%#1 = the index name, #2 = the text + \begingroup% + \let\emph\@firstofone% + \let\textbf\@firstofone% + \let\textit\@firstofone% + \let\textmd\@firstofone% + \let\textnormal\@firstofone% + \let\textrm\@firstofone% + \let\textsc\@firstofone% + \let\textsf\@firstofone% + \let\textsl\@firstofone% + \let\texttt\@firstofone% + \let\textup\@firstofone% + \xdef\@tmp{#2}%To be used in IfSubStr instead of #2 directly. Avoid some expansion bugs (for example with \edindex{textsc{something}}) + \endgroup% \ifl@imakeidx% \ifnum\@edindex@fornote@>\z@% - \IfSubStr[1]{#2}{|}{\get@index@command#2+}{\get@index@command#2|+}% + \IfSubStr[1]{\@tmp}{|}{\get@index@command#2+}{\get@index@command#2|+}% \get@edindex@ledinnote@command% \expandafter\imki@wrindexentry{#1}{\@index@txt|(\@ledinnote@command}{\thestartpageline}% \expandafter\imki@wrindexentry{#1}{\@index@txt|)\@ledinnote@command}{\theendpageline}% @@ -16307,7 +16384,7 @@ \fi% \else% \ifnum\@edindex@fornote@>\z@% - \IfSubStr[1]{#2}{|}{\get@index@command#2+}{\get@index@command#2|+}% + \IfSubStr[1]{\@tmp}{|}{\get@index@command#2+}{\get@index@command#2|+}% \get@edindex@ledinnote@command% \expandafter\protected@write\@indexfile{}% {\string\indexentry{\@index@txt|(\@ledinnote@command}{\thestartpageline} @@ -16346,10 +16423,11 @@ {}% {\led@error@fail@patch@makeindex}% \newcommand{\edindex}[1]{\@bsphack\@esphack} +\newcommandx{\dummy@edindex}[2][1=\expandonce\jobname,usedefault]{}% % \end{macrocode} % \end{macro} % \end{macro} -% +% \end{macro} % \subsection{Hyperlink} % \begin{macro}{\hyperlinkformat} % \protect\cs{hyperlinkformat} command is to be used to have both a internal hyperlink and a format, when indexing. diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty index bcbc5f2f06f..b2765feb369 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}[2017/05/04 v2.20.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2017/06/04 v2.21.0 typesetting critical editions]% \RequirePackage{xkeyval} \newif\ifparledgroup \DeclareOptionX{series}[A,B,C,D,E]{\xdef\default@series{#1}} @@ -1402,6 +1402,7 @@ \let\setline=\@gobble \let\advanceline=\@gobble \let\sameword\sameword@inedtext% \let\edtext=\dummy@edtext + \let\edindex\dummy@edindex% \l@dtabnoexpands \morenoexpands} \let\morenoexpands=\relax @@ -1533,11 +1534,14 @@ \newcommand{\l@d@add}[1]{\xdef\l@d@nums{\l@d@nums#1}} \newcommand{\get@sw@txt}[1]{% - \ifxetex% - \xdef\sw@txt{#1}% - \else% - \expandafter\xdef\expandafter\sw@txt\expandafter{\detokenize{#1}}% - \fi% + \begingroup% + \let\sameword\@firstofone%Allow to have nested \sameword + \ifxetex% + \xdef\sw@txt{#1}% + \else% + \expandafter\xdef\expandafter\sw@txt\expandafter{\detokenize{#1}}% + \fi% + \endgroup% }% \newcommandx{\sameword}[2][1,usedefault]{% \leavevmode% @@ -6400,9 +6404,23 @@ \newcommand{\ledinnotehyperpage}[2]{\csuse{#1}{\ledinnotemark{\hyperpage{#2}}}}% \newcommand{\ledinnotemark}[1]{#1\emph{n}}% \newcommandx{\@wredindex}[2][1=\expandonce\jobname,usedefault]{%#1 = the index name, #2 = the text + \begingroup% + \let\emph\@firstofone% + \let\textbf\@firstofone% + \let\textit\@firstofone% + \let\textmd\@firstofone% + \let\textnormal\@firstofone% + \let\textrm\@firstofone% + \let\textsc\@firstofone% + \let\textsf\@firstofone% + \let\textsl\@firstofone% + \let\texttt\@firstofone% + \let\textup\@firstofone% + \xdef\@tmp{#2}%To be used in IfSubStr instead of #2 directly. Avoid some expansion bugs (for example with \edindex{textsc{something}}) + \endgroup% \ifl@imakeidx% \ifnum\@edindex@fornote@>\z@% - \IfSubStr[1]{#2}{|}{\get@index@command#2+}{\get@index@command#2|+}% + \IfSubStr[1]{\@tmp}{|}{\get@index@command#2+}{\get@index@command#2|+}% \get@edindex@ledinnote@command% \expandafter\imki@wrindexentry{#1}{\@index@txt|(\@ledinnote@command}{\thestartpageline}% \expandafter\imki@wrindexentry{#1}{\@index@txt|)\@ledinnote@command}{\theendpageline}% @@ -6412,7 +6430,7 @@ \fi% \else% \ifnum\@edindex@fornote@>\z@% - \IfSubStr[1]{#2}{|}{\get@index@command#2+}{\get@index@command#2|+}% + \IfSubStr[1]{\@tmp}{|}{\get@index@command#2+}{\get@index@command#2|+}% \get@edindex@ledinnote@command% \expandafter\protected@write\@indexfile{}% {\string\indexentry{\@index@txt|(\@ledinnote@command}{\thestartpageline} @@ -6447,6 +6465,7 @@ {}% {\led@error@fail@patch@makeindex}% \newcommand{\edindex}[1]{\@bsphack\@esphack} +\newcommandx{\dummy@edindex}[2][1=\expandonce\jobname,usedefault]{}% \newcommand{\hyperlinkformat}[3]{% \ifstrempty{#1}% {\hyperlink{#2}{#3}}% -- cgit v1.2.3