diff options
author | Norbert Preining <norbert@preining.info> | 2021-03-09 03:01:02 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-03-09 03:01:02 +0000 |
commit | 0da44a32af4f9dd986fd60a51e7f9a1f932fe27c (patch) | |
tree | d808a7d66257621c8aa482570d0d7b9846690d4e /macros/latex/contrib/reledmac | |
parent | d9784b9287b55be1161c5d383c2a7ebde45671ee (diff) |
CTAN sync 202103090301
Diffstat (limited to 'macros/latex/contrib/reledmac')
52 files changed, 72 insertions, 52 deletions
diff --git a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf Binary files differindex 1c0587d73d..d6ddd45937 100644 --- a/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf +++ b/macros/latex/contrib/reledmac/doc-more/page-typesetting-columns.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf Binary files differindex ca23dc8bd2..55d142af2e 100644 --- a/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-criticalendnotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf Binary files differindex 32c10b641a..52e10b2057 100644 --- a/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-criticalnotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf Binary files differindex 713ae63aad..998177959c 100644 --- a/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf +++ b/macros/latex/contrib/reledmac/examples/1-sidenotes.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-tabular.pdf b/macros/latex/contrib/reledmac/examples/1-tabular.pdf Binary files differindex 5333254fa4..aec8073b5c 100644 --- a/macros/latex/contrib/reledmac/examples/1-tabular.pdf +++ b/macros/latex/contrib/reledmac/examples/1-tabular.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf Binary files differindex ab9862489a..cba0531af6 100644 --- a/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf +++ b/macros/latex/contrib/reledmac/examples/1-verses-doublenumbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/1-verses.pdf b/macros/latex/contrib/reledmac/examples/1-verses.pdf Binary files differindex 01d05a49aa..228b70627d 100644 --- a/macros/latex/contrib/reledmac/examples/1-verses.pdf +++ b/macros/latex/contrib/reledmac/examples/1-verses.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf Binary files differindex 5646fb5622..3544ca7255 100644 --- a/macros/latex/contrib/reledmac/examples/2-antilabe.pdf +++ b/macros/latex/contrib/reledmac/examples/2-antilabe.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf Binary files differindex 9ae77067ff..3fa62022e0 100644 --- a/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-cross_referencing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf Binary files differindex a70f8388cc..3d41bd0ac4 100644 --- a/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-footnote_spacing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf Binary files differindex 85464b2a44..557a885e62 100644 --- a/macros/latex/contrib/reledmac/examples/2-glossaries.pdf +++ b/macros/latex/contrib/reledmac/examples/2-glossaries.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-glossaries.tex b/macros/latex/contrib/reledmac/examples/2-glossaries.tex index 28e88cc1ea..ccc8d0c165 100644 --- a/macros/latex/contrib/reledmac/examples/2-glossaries.tex +++ b/macros/latex/contrib/reledmac/examples/2-glossaries.tex @@ -9,7 +9,7 @@ \usepackage[nocritical,noend,noeledsec,series={A},nofamiliar]{reledmac} -\usepackage{glossaries} +\usepackage{glossaries, glossaries-extra} \glsSetCompositor{-} \makeglossaries \newglossaryentry{monistero}{name={monistero},description={monastero}} diff --git a/macros/latex/contrib/reledmac/examples/2-indexing.pdf b/macros/latex/contrib/reledmac/examples/2-indexing.pdf Binary files differindex 4a63998d9c..1c95904047 100644 --- a/macros/latex/contrib/reledmac/examples/2-indexing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-indexing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf Binary files differindex d5e06e6b93..95ec71c6ee 100644 --- a/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf +++ b/macros/latex/contrib/reledmac/examples/2-lemma_disambigution.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf Binary files differindex d971e5f2a1..b7110f0191 100644 --- a/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf +++ b/macros/latex/contrib/reledmac/examples/2-line_numbers_in_header.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf Binary files differindex bf497aa468..08d1604edd 100644 --- a/macros/latex/contrib/reledmac/examples/2-linespacing.pdf +++ b/macros/latex/contrib/reledmac/examples/2-linespacing.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf Binary files differindex 63bd1d3ab6..8b53eef328 100644 --- a/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf +++ b/macros/latex/contrib/reledmac/examples/2-manuscript-apparatus.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf Binary files differindex be206bf8ed..edfe84f457 100644 --- a/macros/latex/contrib/reledmac/examples/2-notes-width.pdf +++ b/macros/latex/contrib/reledmac/examples/2-notes-width.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf Binary files differindex 2457cac597..50daaa32d1 100644 --- a/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf +++ b/macros/latex/contrib/reledmac/examples/2-one_series_per_pstart.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-performances.pdf b/macros/latex/contrib/reledmac/examples/2-performances.pdf Binary files differindex 422c0e60a0..562be32f2c 100644 --- a/macros/latex/contrib/reledmac/examples/2-performances.pdf +++ b/macros/latex/contrib/reledmac/examples/2-performances.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf Binary files differindex 636f3da098..f0925c078e 100644 --- a/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf +++ b/macros/latex/contrib/reledmac/examples/2-reledmac-right-to-left.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf Binary files differindex 9c3429b96d..b8bd11a686 100644 --- a/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf +++ b/macros/latex/contrib/reledmac/examples/2-subdivision-number-in-header.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf Binary files differindex 0a26c9593a..62e7f9392d 100644 --- a/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf Binary files differindex ebd3bba1bb..c99fc42632 100644 --- a/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/2-titles_not_in_line_numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf Binary files differindex 30a8d95f43..612aef36a8 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_columns_different_languages.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf Binary files differindex a0f7c03ae7..264c3127e7 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_mwe.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf Binary files differindex b62895763d..f7df44052b 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf Binary files differindex 6f700386cd..5008b620e6 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf Binary files differindex d2537e9a69..c80f407333 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf Binary files differindex 7000f32f27..9dc7c4876d 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf Binary files differindex fc91fe4efd..d441a59733 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_default.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf Binary files differindex 30522f74ab..1bf544a515 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf Binary files differindex 91eecc07a2..7b6e3d3829 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nomax.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf Binary files differindex 281208f8f7..8c47ab4918 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_nosync.pdf diff --git a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf Binary files differindex ad963fb22b..5c192d4b1a 100644 --- a/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf +++ b/macros/latex/contrib/reledmac/examples/3-reledpar_sync_setting_shifted.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf Binary files differindex aaa5b15071..3c85efd97f 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf Binary files differindex 9d6f76e19c..9d407600c2 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf Binary files differindex c915cf9fb4..75123ed947 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_alignment.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf Binary files differindex 096ca85817..ba289c1ab0 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf Binary files differindex d1c331140e..c09c66b4e2 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_inside-outside-columns.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf Binary files differindex 03adf25176..e94e68bcab 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_one_series_per_pstart.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf Binary files differindex 5e48abecca..88c67bd0b9 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_long_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf Binary files differindex 31556cc621..5b8022b521 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf Binary files differindex 616cbd578d..e20e036604 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf Binary files differindex 2df6439270..2f8fd1a4aa 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf Binary files differindex a8b7028e9c..4250071048 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf diff --git a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf Binary files differindex 021b564062..cea68e3072 100644 --- a/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf +++ b/macros/latex/contrib/reledmac/examples/4-reledpar_verse_text_between.pdf diff --git a/macros/latex/contrib/reledmac/migration.pdf b/macros/latex/contrib/reledmac/migration.pdf Binary files differindex 04b799404a..0fa30756fd 100644 --- a/macros/latex/contrib/reledmac/migration.pdf +++ b/macros/latex/contrib/reledmac/migration.pdf diff --git a/macros/latex/contrib/reledmac/reledmac.dtx b/macros/latex/contrib/reledmac/reledmac.dtx index 7fe954be7f..7535c44e0e 100644 --- a/macros/latex/contrib/reledmac/reledmac.dtx +++ b/macros/latex/contrib/reledmac/reledmac.dtx @@ -156,7 +156,7 @@ % \my@changes#1.\@nil % }% %\makeatother -% \newcommand{\edmac}{\protect\package{edmac}\xspace} +% \newcommand{\edmac}{\protect\package{EDMAC}\xspace} % \newcommand{\tabmac}{\protect\package{tabmac}\xspace} % \newcommand{\edstanza}{\protect\package{edstanza}\xspace} @@ -577,16 +577,19 @@ % \changes{v2.37.0}{2021/02/28}{Fix incompatibility between \protect\cs{eledsection} (and related) and \protect\package{hyperref}. Incompatibility was introduced by some changes in \protect\package{hyperref} package.} % \changes{v2.37.0}{2021/02/28}{Fix bug with \protect\cs{Xnonote}} % \changes{v2.37.0}{2021/02/28}{Improve syntaxis check.} +% \changes{v2.37.1}{2021/03/08}{Fix bug with \protect\cs{edgls} and related in \protect\cs{edtext} argument. Require \protect\package{glossaries-extra} is \protect\package{glossaries} is loaded.} % Typeset scholarly editions with \LaTeX\thanks{This file (\dtxfilename) % has version number \fileversion, last revised \filedate.}} % % \author{% % Ma\"ieul Rouquette\thanks{\texttt{maieul at maieul dot net}} \\ -% {\small based on the original \protect\package{ledmac} by} \\ +% {\small based on the \protect\package{ledmac} by} \\ % Peter Wilson \\ % Herries Press \\ -% {\small which was based on the original \edmac, \tabmac{} and \edstanza{} by} \\ -% John Lavagnino, Dominik Wujastyk, Herbert Breger and Wayne Sullivan. +% {\small with the \edmac\ plugins \tabmac{} and \edstanza{} by}\\ +% Herbert Breger and Wayne Sullivan, +% {\small all based on \edmac\ by} \\ +% John Lavagnino and Dominik Wujastyk % } % % \date{} @@ -3818,6 +3821,8 @@ % \section{Glossary} % \Macpackage\ provides mechanism to make glossaries with the \package{glossaries} package, refering not to the page, but to the page and line. % \subsection{Preamble setting} +% When using \macpackage\ with \package{glossaries}, you must use also \package{glossaries-extra}. +% % The standard compositor between page and line number in \macpackage\ is a dash, while \package{glossaries} uses, by default, a dot. % Consequently, you must: % \begin{itemize} @@ -4463,7 +4468,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledmac}[2021/02/28 v2.37.0 typesetting critical editions]% +\ProvidesPackage{reledmac}[2021/03/08 v2.37.1 typesetting critical editions]% % \end{macrocode} % % \subsection{Package options} @@ -5043,6 +5048,13 @@ }% % \end{macrocode} % \end{macro} +% \begin{macro}{\led@error@require@glossariesextra} +% \begin{macrocode} +\newcommand{\led@error@require@glossariesextra}{% + \reledmac@error{When using both reledmac and glossaries, you must also use glossaries-extra}{\@ehc}% +}% +% \end{macrocode} +% \end{macro} % \begin{macro}{\led@error@fail@patch@@makecol} % \begin{macrocode} \newcommand{\led@error@fail@patch@@makecol}{% @@ -18760,6 +18772,8 @@ % \begin{macrocode} \AtBeginDocument{% \@ifpackageloaded{glossaries}{% + \@ifpackageloaded{glossaries-extra}{}{\led@error@require@glossariesextra}% + \newif\ifl@noexpands@edgl%A boolean switched to true in \no@expands % \end{macrocode} % First those which arguments are \oarg{options}\marg{label}\oarg{insert}. % \begin{macrocode} @@ -18811,17 +18825,25 @@ \renewcommand{\do}[1]{% \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,3,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname[counter=pageline,##1]{##2}[##3]% + \ifl@noexpands@edgl% + \csname#1\endcsname[counter=pageline,noindex,##1]{##2}[##3]% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname[counter=pageline,##1]{##2}[##3]% + \fi% }% \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,3,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname*[counter=pageline,##1]{##2}[##3]% + \ifl@noexpands@edgl% + \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}[##3]% + \else% + \csname#1\endcsname*[counter=pageline,##1]{##2}[##3]% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \fi% }% }% \dolistloop{\edglsomo}% @@ -18834,17 +18856,25 @@ \renewcommand{\do}[1]{% \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname[counter=pageline,##1]{##2}{##3}% + \ifl@noexpands@edgl% + \csname#1\endcsname[counter=pageline,noindex,##1]{##2}{##3}% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname[counter=pageline,##1]{##2}{##3}% + \fi% }% \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[3][1,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname*[counter=pageline,##1]{##2}{##3}% + \ifl@noexpands@edgl% + \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}{##3}% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname*[counter=pageline,##1]{##2}{##3}% + \fi% }% }% \dolistloop{\edglsomm}% @@ -18856,44 +18886,34 @@ \renewcommand{\do}[1]{% \expandafter\DeclareRobustCommandx\csname ed#1\endcsname[2][1,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname[counter=pageline,##1]{##2}% + \ifl@noexpands@edgl% + \csname#1\endcsname[counter=pageline,noindex,##1]{##2}% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname[counter=pageline,##1]{##2}% + \fi% }% \expandafter\WithSuffix\expandafter\DeclareRobustCommandx\csname ed#1\endcsname*[2][1,usedefault]{% \doedindexlabel% - \ifdef{\hypertarget}{% - \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% - }{}% - \csname#1\endcsname*[counter=pageline,##1]{##2}% + \ifl@noexpands@edgl% + \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}% + \else% + \ifdef{\hypertarget}{% + \Hy@raisedlink@left{\hypertarget{pageline.\thepageline}{}}% + }{}% + \csname#1\endcsname*[counter=pageline,##1]{##2}% + \fi% }% }% \dolistloop{\edglsom}% % \end{macrocode} -% \cs{l@noexpands@edgl} is a macro to avoid expanding glossaries macros in \cs{edtext} first argument. It is called by \cs{no@expands}. +% \cs{l@noexpands@edgl} is a macro to switch \cs{ifl@noexpands@edgl} to true in \cs{no@expands}. % Its definition is made dynamically. % \begin{macro}{\l@noexpands@edgl} % \begin{macrocode} - \def\l@noexpands@edgl{}% - \renewcommand\do[1]{% - \xappto\l@noexpands@edgl{% - \noexpand\RenewDocumentCommand\csname ed#1\endcsname{omos}{}% - }% - }% - \dolistloop{\edglsomo}% - \renewcommand\do[1]{% - \xappto\l@noexpands@edgl{% - \noexpand\RenewDocumentCommand\csname ed#1\endcsname{omms}{}% - }% - }% - \dolistloop{\edglsomm}% - \renewcommand\do[1]{% - \xappto\l@noexpands@edgl{% - \noexpand\RenewDocumentCommand\csname ed#1\endcsname{oms}{}% - }% - }% - \dolistloop{\edglsom}% + \def\l@noexpands@edgl{\l@noexpands@edgltrue}% }{\let\l@noexpands@edgl\relax}% }% % \end{macrocode} diff --git a/macros/latex/contrib/reledmac/reledmac.pdf b/macros/latex/contrib/reledmac/reledmac.pdf Binary files differindex b5df111969..26e04e5fd9 100644 --- a/macros/latex/contrib/reledmac/reledmac.pdf +++ b/macros/latex/contrib/reledmac/reledmac.pdf diff --git a/macros/latex/contrib/reledmac/reledpar.dtx b/macros/latex/contrib/reledmac/reledpar.dtx index b460ec7a22..4fe935f799 100644 --- a/macros/latex/contrib/reledmac/reledpar.dtx +++ b/macros/latex/contrib/reledmac/reledpar.dtx @@ -58,7 +58,7 @@ \CodelineIndex \RecordChanges \renewcommand{\MakeUppercase}[1]{#1} - \newcommand{\edmac}{\protect\package{edmac}\xspace} + \newcommand{\edmac}{\protect\package{EDMAC}\xspace} \newcommand{\tabmac}{\protect\package{tabmac}\xspace} \newcommand{\edstanza}{\protect\package{edstanza}\xspace} @@ -1405,7 +1405,7 @@ % \begin{macrocode} %<*code> \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reledpar}[2021/01/21 v2.25.1 reledmac extension for parallel texts]% +\ProvidesPackage{reledpar}[2021/03/08 v2.25.1a reledmac extension for parallel texts]% % \end{macrocode} % \subsection{Package's requirement} diff --git a/macros/latex/contrib/reledmac/reledpar.pdf b/macros/latex/contrib/reledmac/reledpar.pdf Binary files differindex 325e3f8611..80a0afcce9 100644 --- a/macros/latex/contrib/reledmac/reledpar.pdf +++ b/macros/latex/contrib/reledmac/reledpar.pdf |