texlive[58311] Master/texmf-dist: reledmac (9mar21)
commits+karl at tug.org
commits+karl at tug.org
Sat Mar 13 00:31:19 CET 2021
Revision: 58311
http://tug.org/svn/texlive?view=revision&revision=58311
Author: karl
Date: 2021-03-13 00:31:18 +0100 (Sat, 13 Mar 2021)
Log Message:
-----------
reledmac (9mar21)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.tex
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/migration.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
trunk/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/doc-more/page-typesetting-columns.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalendnotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-criticalnotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-sidenotes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-tabular.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses-doublenumbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/1-verses.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-antilabe.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-cross_referencing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-footnote_spacing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.tex 2021-03-12 23:30:42 UTC (rev 58310)
+++ trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-glossaries.tex 2021-03-12 23:31:18 UTC (rev 58311)
@@ -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}}
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-indexing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-lemma_disambigution.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-line_numbers_in_header.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-linespacing.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-manuscript-apparatus.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-notes-width.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-performances.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-reledmac-right-to-left.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-subdivision-number-in-header.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/2-titles_not_in_line_numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_columns_different_languages.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_mwe.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_pages_different_languages_lualatex.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_same_page_number_in_both_side.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted-nomax.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_advancedshifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_default.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax-shifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nomax.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_nosync.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/3-reledpar_sync_setting_shifted.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column-continuous-numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_column_mix_with_not_column.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_alignment.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_columns_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_inside-outside-columns.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_one_series_per_pstart.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_long_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_notes_leftpage.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_paragraph_separator_between.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_pages_titles_in_line_numbering_with_notes.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_titles_not_in_line_numbering.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/examples/4-reledpar_verse_text_between.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/migration.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/reledmac.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/reledmac/reledpar.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2021-03-12 23:30:42 UTC (rev 58310)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledmac.dtx 2021-03-12 23:31:18 UTC (rev 58311)
@@ -156,7 +156,7 @@
% \my at 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 at error@require at glossariesextra}
+% \begin{macrocode}
+\newcommand{\led at error@require at glossariesextra}{%
+ \reledmac at error{When using both reledmac and glossaries, you must also use glossaries-extra}{\@ehc}%
+}%
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\led at error@fail at patch@@makecol}
% \begin{macrocode}
\newcommand{\led at error@fail at patch@@makecol}{%
@@ -18760,6 +18772,8 @@
% \begin{macrocode}
\AtBeginDocument{%
\@ifpackageloaded{glossaries}{%
+ \@ifpackageloaded{glossaries-extra}{}{\led at error@require at glossariesextra}%
+ \newif\ifl at noexpands@edgl%A boolean switched to true in \no at 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 at raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
- }{}%
- \csname#1\endcsname[counter=pageline,##1]{##2}[##3]%
+ \ifl at noexpands@edgl%
+ \csname#1\endcsname[counter=pageline,noindex,##1]{##2}[##3]%
+ \else%
+ \ifdef{\hypertarget}{%
+ \Hy at 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 at raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
- }{}%
- \csname#1\endcsname*[counter=pageline,##1]{##2}[##3]%
+ \ifl at noexpands@edgl%
+ \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}[##3]%
+ \else%
+ \csname#1\endcsname*[counter=pageline,##1]{##2}[##3]%
+ \ifdef{\hypertarget}{%
+ \Hy at 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 at raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
- }{}%
- \csname#1\endcsname[counter=pageline,##1]{##2}{##3}%
+ \ifl at noexpands@edgl%
+ \csname#1\endcsname[counter=pageline,noindex,##1]{##2}{##3}%
+ \else%
+ \ifdef{\hypertarget}{%
+ \Hy at 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 at raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
- }{}%
- \csname#1\endcsname*[counter=pageline,##1]{##2}{##3}%
+ \ifl at noexpands@edgl%
+ \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}{##3}%
+ \else%
+ \ifdef{\hypertarget}{%
+ \Hy at 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 at raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
- }{}%
- \csname#1\endcsname[counter=pageline,##1]{##2}%
+ \ifl at noexpands@edgl%
+ \csname#1\endcsname[counter=pageline,noindex,##1]{##2}%
+ \else%
+ \ifdef{\hypertarget}{%
+ \Hy at 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 at raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
- }{}%
- \csname#1\endcsname*[counter=pageline,##1]{##2}%
+ \ifl at noexpands@edgl%
+ \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}%
+ \else%
+ \ifdef{\hypertarget}{%
+ \Hy at raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
+ }{}%
+ \csname#1\endcsname*[counter=pageline,##1]{##2}%
+ \fi%
}%
}%
\dolistloop{\edglsom}%
% \end{macrocode}
-% \cs{l at noexpands@edgl} is a macro to avoid expanding glossaries macros in \cs{edtext} first argument. It is called by \cs{no at expands}.
+% \cs{l at noexpands@edgl} is a macro to switch \cs{ifl at noexpands@edgl} to true in \cs{no at expands}.
% Its definition is made dynamically.
% \begin{macro}{\l at noexpands@edgl}
% \begin{macrocode}
- \def\l at noexpands@edgl{}%
- \renewcommand\do[1]{%
- \xappto\l at noexpands@edgl{%
- \noexpand\RenewDocumentCommand\csname ed#1\endcsname{omos}{}%
- }%
- }%
- \dolistloop{\edglsomo}%
- \renewcommand\do[1]{%
- \xappto\l at noexpands@edgl{%
- \noexpand\RenewDocumentCommand\csname ed#1\endcsname{omms}{}%
- }%
- }%
- \dolistloop{\edglsomm}%
- \renewcommand\do[1]{%
- \xappto\l at noexpands@edgl{%
- \noexpand\RenewDocumentCommand\csname ed#1\endcsname{oms}{}%
- }%
- }%
- \dolistloop{\edglsom}%
+ \def\l at noexpands@edgl{\l at noexpands@edgltrue}%
}{\let\l at noexpands@edgl\relax}%
}%
% \end{macrocode}
Modified: trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2021-03-12 23:30:42 UTC (rev 58310)
+++ trunk/Master/texmf-dist/source/latex/reledmac/reledpar.dtx 2021-03-12 23:31:18 UTC (rev 58311)
@@ -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}
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2021-03-12 23:30:42 UTC (rev 58310)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledmac.sty 2021-03-12 23:31:18 UTC (rev 58311)
@@ -37,7 +37,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{reledmac}[2021/02/28 v2.37.0 typesetting critical editions]%
+\ProvidesPackage{reledmac}[2021/03/08 v2.37.1 typesetting critical editions]%
\RequirePackage{xkeyval}
\newif\ifparledgroup
\newif\ifsameparallelpagenumber%
@@ -319,6 +319,9 @@
\newcommand{\led at error@PackageAfterEledmac}[1]{%
\reledmac at error{#1 must be loaded before reledmac}{\@ehc}%
}%
+\newcommand{\led at error@require at glossariesextra}{%
+ \reledmac at error{When using both reledmac and glossaries, you must also use glossaries-extra}{\@ehc}%
+}%
\newcommand{\led at error@fail at patch@@makecol}{%
\reledmac at error{Fail to patch \string\@makecol\space command}{\@ehc}%
}%
@@ -7777,6 +7780,8 @@
}%
\AtBeginDocument{%
\@ifpackageloaded{glossaries}{%
+ \@ifpackageloaded{glossaries-extra}{}{\led at error@require at glossariesextra}%
+ \newif\ifl at noexpands@edgl%A boolean switched to true in \no at expands
\gdef\edglsomo{}%
\listgadd{\edglsomo}{gls}%
\listgadd{\edglsomo}{Gls}%
@@ -7825,17 +7830,25 @@
\renewcommand{\do}[1]{%
\expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,3,usedefault]{%
\doedindexlabel%
- \ifdef{\hypertarget}{%
- \Hy at raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
- }{}%
- \csname#1\endcsname[counter=pageline,##1]{##2}[##3]%
+ \ifl at noexpands@edgl%
+ \csname#1\endcsname[counter=pageline,noindex,##1]{##2}[##3]%
+ \else%
+ \ifdef{\hypertarget}{%
+ \Hy at 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 at raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
- }{}%
- \csname#1\endcsname*[counter=pageline,##1]{##2}[##3]%
+ \ifl at noexpands@edgl%
+ \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}[##3]%
+ \else%
+ \csname#1\endcsname*[counter=pageline,##1]{##2}[##3]%
+ \ifdef{\hypertarget}{%
+ \Hy at raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
+ }{}%
+ \fi%
}%
}%
\dolistloop{\edglsomo}%
@@ -7845,17 +7858,25 @@
\renewcommand{\do}[1]{%
\expandafter\DeclareRobustCommandx\csname ed#1\endcsname[3][1,usedefault]{%
\doedindexlabel%
- \ifdef{\hypertarget}{%
- \Hy at raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
- }{}%
- \csname#1\endcsname[counter=pageline,##1]{##2}{##3}%
+ \ifl at noexpands@edgl%
+ \csname#1\endcsname[counter=pageline,noindex,##1]{##2}{##3}%
+ \else%
+ \ifdef{\hypertarget}{%
+ \Hy at 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 at raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
- }{}%
- \csname#1\endcsname*[counter=pageline,##1]{##2}{##3}%
+ \ifl at noexpands@edgl%
+ \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}{##3}%
+ \else%
+ \ifdef{\hypertarget}{%
+ \Hy at raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
+ }{}%
+ \csname#1\endcsname*[counter=pageline,##1]{##2}{##3}%
+ \fi%
}%
}%
\dolistloop{\edglsomm}%
@@ -7864,39 +7885,29 @@
\renewcommand{\do}[1]{%
\expandafter\DeclareRobustCommandx\csname ed#1\endcsname[2][1,usedefault]{%
\doedindexlabel%
- \ifdef{\hypertarget}{%
- \Hy at raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
- }{}%
- \csname#1\endcsname[counter=pageline,##1]{##2}%
+ \ifl at noexpands@edgl%
+ \csname#1\endcsname[counter=pageline,noindex,##1]{##2}%
+ \else%
+ \ifdef{\hypertarget}{%
+ \Hy at 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 at raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
- }{}%
- \csname#1\endcsname*[counter=pageline,##1]{##2}%
+ \ifl at noexpands@edgl%
+ \csname#1\endcsname*[counter=pageline,noindex,##1]{##2}%
+ \else%
+ \ifdef{\hypertarget}{%
+ \Hy at raisedlink@left{\hypertarget{pageline.\thepageline}{}}%
+ }{}%
+ \csname#1\endcsname*[counter=pageline,##1]{##2}%
+ \fi%
}%
}%
\dolistloop{\edglsom}%
- \def\l at noexpands@edgl{}%
- \renewcommand\do[1]{%
- \xappto\l at noexpands@edgl{%
- \noexpand\RenewDocumentCommand\csname ed#1\endcsname{omos}{}%
- }%
- }%
- \dolistloop{\edglsomo}%
- \renewcommand\do[1]{%
- \xappto\l at noexpands@edgl{%
- \noexpand\RenewDocumentCommand\csname ed#1\endcsname{omms}{}%
- }%
- }%
- \dolistloop{\edglsomm}%
- \renewcommand\do[1]{%
- \xappto\l at noexpands@edgl{%
- \noexpand\RenewDocumentCommand\csname ed#1\endcsname{oms}{}%
- }%
- }%
- \dolistloop{\edglsom}%
+ \def\l at noexpands@edgl{\l at noexpands@edgltrue}%
}{\let\l at noexpands@edgl\relax}%
}%
\def\@hangingsymbol{}
Modified: trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2021-03-12 23:30:42 UTC (rev 58310)
+++ trunk/Master/texmf-dist/tex/latex/reledmac/reledpar.sty 2021-03-12 23:31:18 UTC (rev 58311)
@@ -28,7 +28,7 @@
\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]%
\RequirePackage{xspace}%
\RequirePackage{xkeyval}
More information about the tex-live-commits
mailing list.