reledmac (9mar21) (branch)

git-svn-id: svn://tug.org/texlive/branches/branch2020.0@58312 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 56 insertions, 45 deletions

diff --git a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
index 53dfff0e9a3..03efa588363 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledmac.sty
@@ -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@error@PackageAfterEledmac}[1]{%
   \reledmac@error{#1 must be loaded before reledmac}{\@ehc}%
 }%
+\newcommand{\led@error@require@glossariesextra}{%
+  \reledmac@error{When using both reledmac and glossaries, you must also use glossaries-extra}{\@ehc}%
+}%
 \newcommand{\led@error@fail@patch@@makecol}{%
   \reledmac@error{Fail to patch \string\@makecol\space command}{\@ehc}%
 }%
@@ -7777,6 +7780,8 @@
 }%
 \AtBeginDocument{%
   \@ifpackageloaded{glossaries}{%
+    \@ifpackageloaded{glossaries-extra}{}{\led@error@require@glossariesextra}%
+    \newif\ifl@noexpands@edgl%A boolean switched to true in \no@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@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}%
@@ -7845,17 +7858,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}%
@@ -7864,39 +7885,29 @@
     \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}%
-      }%
-    }%
-    \dolistloop{\edglsom}%
-    \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}{}%
+        \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}%
+    \def\l@noexpands@edgl{\l@noexpands@edgltrue}%
   }{\let\l@noexpands@edgl\relax}%
 }%
 \def\@hangingsymbol{}
diff --git a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
index aed2a4c66c5..63bab28ab8d 100644
--- a/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
+++ b/Master/texmf-dist/tex/latex/reledmac/reledpar.sty
@@ -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}