glossaries-extra (24nov17)

git-svn-id: svn://tug.org/texlive/trunk@45898 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 83 insertions, 52 deletions

diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
index aa4aeac9f32..b316e74887e 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2017/11/14 v1.24 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2017/11/24 v1.25 (NLCT)]
 \RequirePackage{xkeyval}
 \RequirePackage{etoolbox}
 \@ifpackageloaded{glossaries}
@@ -5525,8 +5525,10 @@ defined}{}%
 \newcommand*{\glsxtrpostnamehook}[1]{%
   \let\@glsnumberformat\@glsxtr@defaultnumberformat
   \glsxtrdoautoindexname{#1}{indexname}%
+  \glsextrapostnamehook{#1}%
   \csuse{glsxtrpostname\glscategory{#1}}%
 }
+\newcommand*{\glsextrapostnamehook}[1]{}%
 \@ifpackageloaded{glossaries-accsupp}
 {
   \newcommand*{\glsxtr@setaccessdisplay}[1]{%
@@ -5903,12 +5905,14 @@ defined}{}%
  }%
 }
 \newcommand*{\glsxtrpostlinkAddDescOnFirstUse}{%
-  \glsxtrifwasfirstuse{\space(\glsaccessdesc{\glslabel})}{}%
+  \glsxtrifwasfirstuse{\space\glsxtrparen{\glsaccessdesc{\glslabel}}}{}%
 }
 \newcommand*{\glsxtrpostlinkAddSymbolOnFirstUse}{%
   \glsxtrifwasfirstuse
   {%
-    \ifglshassymbol{\glslabel}{\space(\glsaccesssymbol{\glslabel})}{}%
+    \ifglshassymbol{\glslabel}%
+    {\space\glsxtrparen{\glsaccesssymbol{\glslabel}}}%
+    {}%
   }%
   {}%
 }
@@ -6735,10 +6739,13 @@ defined}{}%
 }
 \newif\ifglsxtrinsertinside
 \glsxtrinsertinsidefalse
+\newcommand*{\glsxtrlongshortname}{%
+  \protect\glsabbrvfont{\the\glsshorttok}%
+}
 \newabbreviationstyle{long-short}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvfont{\the\glsshorttok}},
+    name={\glsxtrlongshortname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongfont{\the\glslongtok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
@@ -6817,10 +6824,13 @@ defined}{}%
 {%
   \GlsXtrUseAbbrStyleFmts{long-short}%
 }
+\newcommand*{\glsxtrshortlongname}{%
+  \protect\glsabbrvfont{\the\glsshorttok}%
+}
 \newabbreviationstyle{short-long}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvfont{\the\glsshorttok}},
+    name={\glsxtrshortlongname},
     sort={\the\glsshorttok},
     description={\the\glslongtok},%
     first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
@@ -6900,10 +6910,13 @@ defined}{}%
 \newcommand*{\glsfirstlongfootnotefont}[1]{\glslongfootnotefont{#1}}%
 \newcommand*{\glslongfootnotefont}[1]{\glslongdefaultfont{#1}}%
 \newcommand*{\glsxtrabbrvfootnote}[2]{\footnote{#2}}
+\newcommand*{\glsxtrfootnotename}{%
+  \protect\glsabbrvfont{\the\glsshorttok}%
+}
 \newabbreviationstyle{footnote}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvfont{\the\glsshorttok}},
+    name={\glsxtrfootnotename},
     sort={\the\glsshorttok},
     description={\the\glslongtok},%
     first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
@@ -6977,7 +6990,7 @@ defined}{}%
 \newabbreviationstyle{postfootnote}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvfont{\the\glsshorttok}},
+    name={\glsxtrfootnotename},
     sort={\the\glsshorttok},
     description={\the\glslongtok},%
     first={\protect\glsfirstabbrvfont{\the\glsshorttok}},%
@@ -7046,10 +7059,13 @@ defined}{}%
   }%
 }
 \letabbreviationstyle{short-postfootnote}{postfootnote}
+\newcommand*{\glsxtrshortnolongname}{%
+  \protect\glsabbrvfont{\the\glsshorttok}%
+}
 \newabbreviationstyle{short}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvfont{\the\glsshorttok}},
+    name={\glsxtrshortnolongname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstabbrvfont{\the\glsshorttok}},
     firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}},
@@ -7241,10 +7257,13 @@ defined}{}%
 {%
   \GlsXtrUseAbbrStyleFmts{nolong-short}%
 }
+\newcommand*{\glsxtrlongnoshortdescname}{%
+  \protect\glslongfont{\the\glslongtok}%
+}
 \newabbreviationstyle{long-desc}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\protect\glslongfont{\the\glslongtok}},
+    name={\glsxtrlongnoshortdescname},
     sort={\the\glslongtok},
     first={\protect\glsfirstlongfont{\the\glslongtok}},
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},
@@ -7328,10 +7347,13 @@ defined}{}%
 {%
   \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
 }
+\newcommand*{\glsxtrlongnoshortname}{%
+  \protect\glsabbrvfont{\the\glsshorttok}%
+}
 \newabbreviationstyle{long}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvfont{\the\glsshorttok}},
+    name={\glsxtrlongnoshortname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongfont{\the\glslongtok}},
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},
@@ -7368,7 +7390,7 @@ defined}{}%
 \newabbreviationstyle{long-short-sc}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvscfont{\the\glsshorttok}},
+    name={\glsxtrlongshortname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
@@ -7442,7 +7464,7 @@ defined}{}%
 \newabbreviationstyle{short-sc-long}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvscfont{\the\glsshorttok}},
+    name={\glsxtrshortlongname},
     sort={\the\glsshorttok},
     description={\the\glslongtok},%
     first={\protect\glsfirstabbrvscfont{\the\glsshorttok}%
@@ -7517,7 +7539,7 @@ defined}{}%
 \newabbreviationstyle{short-sc}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvscfont{\the\glsshorttok}},
+    name={\glsxtrshortnolongname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstabbrvscfont{\the\glsshorttok}},
     firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}},
@@ -7666,7 +7688,7 @@ defined}{}%
 \newabbreviationstyle{long-noshort-sc}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvscfont{\the\glsshorttok}},
+    name={\glsxtrlongnoshortname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongdefaultfont{\the\glslongtok}},
     firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}},
@@ -7804,7 +7826,7 @@ defined}{}%
 \newabbreviationstyle{short-sc-footnote}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvscfont{\the\glsshorttok}},
+    name={\glsxtrfootnotename},
     sort={\the\glsshorttok},
     description={\the\glslongtok},%
     first={\protect\glsfirstabbrvscfont{\the\glsshorttok}%
@@ -7878,7 +7900,7 @@ defined}{}%
 \newabbreviationstyle{short-sc-postfootnote}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvscfont{\the\glsshorttok}},
+    name={\glsxtrfootnotename},
     sort={\the\glsshorttok},
     description={\the\glslongtok},%
     first={\protect\glsfirstabbrvscfont{\the\glsshorttok}},%
@@ -7955,7 +7977,7 @@ defined}{}%
 \newabbreviationstyle{long-short-sm}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+    name={\glsxtrlongshortname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
@@ -8029,7 +8051,7 @@ defined}{}%
 \newabbreviationstyle{short-sm-long}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+    name={\glsxtrshortlongname},
     sort={\the\glsshorttok},
     description={\the\glslongtok},%
     first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}%
@@ -8104,7 +8126,7 @@ defined}{}%
 \newabbreviationstyle{short-sm}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+    name={\glsxtrshortnolongname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}},
     firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}},
@@ -8253,7 +8275,7 @@ defined}{}%
 \newabbreviationstyle{long-noshort-sm}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+    name={\glsxtrlongnoshortname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongdefaultfont{\the\glslongtok}},
     firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}},
@@ -8391,7 +8413,7 @@ defined}{}%
 \newabbreviationstyle{short-sm-footnote}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+    name={\glsxtrfootnotename},
     sort={\the\glsshorttok},
     description={\the\glslongtok},%
     first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}%
@@ -8465,7 +8487,7 @@ defined}{}%
 \newabbreviationstyle{short-sm-postfootnote}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+    name={\glsxtrfootnotename},
     sort={\the\glsshorttok},
     description={\the\glslongtok},%
     first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}},%
@@ -8542,7 +8564,7 @@ defined}{}%
 \newabbreviationstyle{long-short-em}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvemfont{\the\glsshorttok}},
+    name={\glsxtrlongshortname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
@@ -8616,7 +8638,7 @@ defined}{}%
 \newabbreviationstyle{long-em-short-em}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvemfont{\the\glsshorttok}},
+    name={\glsxtrlongshortname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongemfont{\the\glslongtok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
@@ -8690,7 +8712,7 @@ defined}{}%
 \newabbreviationstyle{short-em-long}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvemfont{\the\glsshorttok}},
+    name={\glsxtrshortlongname},
     sort={\the\glsshorttok},
     description={\the\glslongtok},%
     first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
@@ -8765,7 +8787,7 @@ defined}{}%
 \newabbreviationstyle{short-em-long-em}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvemfont{\the\glsshorttok}},
+    name={\glsxtrshortlongname},
     sort={\the\glsshorttok},
     description={\protect\glslongemfont{\the\glslongtok}},%
     first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
@@ -8840,7 +8862,7 @@ defined}{}%
 \newabbreviationstyle{short-em}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvemfont{\the\glsshorttok}},
+    name={\glsxtrshortnolongname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstabbrvemfont{\the\glsshorttok}},
     firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}},
@@ -8989,7 +9011,7 @@ defined}{}%
 \newabbreviationstyle{long-noshort-em}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvemfont{\the\glsshorttok}},
+    name={\glsxtrlongnoshortname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongdefaultfont{\the\glslongtok}},
     firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}},
@@ -9063,7 +9085,7 @@ defined}{}%
 \newabbreviationstyle{long-em-noshort-em}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvemfont{\the\glsshorttok}},
+    name={\glsxtrlongnoshortname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongemfont{\the\glslongtok}},
     firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}},
@@ -9214,7 +9236,7 @@ defined}{}%
 \newabbreviationstyle{long-em-noshort-em-desc}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\protect\glslongemfont{\the\glslongtok}},
+    name={\glsxtrlongnoshortdescname},
     sort={\the\glslongtok},
     first={\protect\glsfirstlongemfont{\the\glslongtok}},
     firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}},
@@ -9300,7 +9322,7 @@ defined}{}%
 \newabbreviationstyle{short-em-footnote}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvemfont{\the\glsshorttok}},
+    name={\glsxtrfootnotename},
     sort={\the\glsshorttok},
     description={\the\glslongtok},%
     first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
@@ -9374,7 +9396,7 @@ defined}{}%
 \newabbreviationstyle{short-em-postfootnote}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvemfont{\the\glsshorttok}},
+    name={\glsxtrfootnotename},
     sort={\the\glsshorttok},
     description={\the\glslongtok},%
     first={\protect\glsfirstabbrvemfont{\the\glsshorttok}},%
@@ -9467,7 +9489,7 @@ defined}{}%
 \newabbreviationstyle{long-short-user}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvuserfont{\the\glsshorttok}},
+    name={\glsxtrlongshortname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlonguserfont{\the\glslongtok}%
      \protect\glsxtruserparen{\protect\glsfirstabbrvuserfont{\the\glsshorttok}}%
@@ -9515,7 +9537,7 @@ defined}{}%
 \newabbreviationstyle{long-postshort-user}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvuserfont{\the\glsshorttok}},
+    name={\glsxtrlongshortname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
     firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
@@ -9581,12 +9603,15 @@ defined}{}%
     \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshortpl{##1}}}{##1}%
   }%
 }
+\newcommand*{\glsxtrlongshortuserdescname}{%
+  \protect\glslonguserfont{\the\glslongtok}%
+  \protect\glsxtruserparen
+   {\protect\glsabbrvuserfont{\the\glsshorttok}}{\the\glslabeltok}%
+}
 \newabbreviationstyle{long-postshort-user-desc}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glslonguserfont{\the\glslongtok}%
-          \protect\glsxtruserparen
-           {\protect\glsabbrvuserfont{\the\glsshorttok}}{\the\glslabeltok}},
+    name={\glsxtrlongshortuserdescname},
     sort={\the\glslongtok},
     first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
     firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
@@ -9616,7 +9641,7 @@ defined}{}%
 \newabbreviationstyle{short-postlong-user}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvuserfont{\the\glsshorttok}},
+    name={\glsxtrshortlongname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
     firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
@@ -9682,13 +9707,16 @@ defined}{}%
     \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslongpl{##1}}}{##1}%
   }%
 }
+\newcommand*{\glsxtrshortlonguserdescname}{%
+ \protect\glsabbrvuserfont{\the\glsshorttok}%
+ \protect\glsxtruserparen
+   {\protect\glslonguserfont{\the\glslongpltok}}%
+   {\the\glslabeltok}%
+}
 \newabbreviationstyle{short-postlong-user-desc}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvuserfont{\the\glsshorttok}%
-           \protect\glsxtruserparen
-             {\protect\glslonguserfont{\the\glslongpltok}}%
-             {\the\glslabeltok}},
+    name={\glsxtrshortlonguserdescname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
     firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
@@ -9718,7 +9746,7 @@ defined}{}%
 \newabbreviationstyle{long-short-user-desc}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\glsxtrlongshortdescname},
+    name={\glsxtrlongshortuserdescname},
     sort={\glsxtrlongshortdescsort},%
     first={\protect\glsfirstlonguserfont{\the\glslongtok}%
      \protect\glsxtruserparen{\protect\glsfirstabbrvuserfont{\the\glsshorttok}}%
@@ -9743,7 +9771,7 @@ defined}{}%
 \newabbreviationstyle{short-long-user}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvuserfont{\the\glsshorttok}},
+    name={\glsxtrshortlongname},
     sort={\the\glsshorttok},
     description={\protect\glslonguserfont{\the\glslongtok}},%
     first={\protect\glsfirstabbrvuserfont{\the\glsshorttok}%
@@ -9791,7 +9819,7 @@ defined}{}%
 \newabbreviationstyle{short-long-user-desc}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\glsxtrshortlongdescname},
+    name={\glsxtrshortlonguserdescname},
     sort={\glsxtrshortlongdescsort},%
     first={\protect\glsfirstabbrvuserfont{\the\glsshorttok}%
      \protect\glsxtruserparen{\protect\glsfirstlonguserfont{\the\glslongtok}}%
@@ -9842,7 +9870,7 @@ defined}{}%
 \newabbreviationstyle{long-hyphen-short-hyphen}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+    name={\glsxtrlongshortname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlonghyphenfont{\the\glslongtok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
@@ -9916,7 +9944,7 @@ defined}{}%
 \newabbreviationstyle{long-hyphen-noshort-desc-noreg}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\protect\glslonghyphenfont{\the\glslongtok}},
+    name={\glsxtrlongnoshortdescname},
     sort={\expandonce\glsxtrorglong},
     first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
     firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
@@ -9985,7 +10013,7 @@ defined}{}%
 \newabbreviationstyle{long-hyphen-noshort-noreg}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvfont{\the\glsshorttok}},
+    name={\glsxtrlongnoshortname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
     firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
@@ -10028,7 +10056,7 @@ defined}{}%
 \newabbreviationstyle{long-hyphen-postshort-hyphen}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+    name={\glsxtrlongshortname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
     firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
@@ -10145,7 +10173,7 @@ defined}{}%
 \newabbreviationstyle{short-hyphen-long-hyphen}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+    name={\glsxtrshortlongname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
@@ -10229,7 +10257,7 @@ defined}{}%
 \newabbreviationstyle{short-hyphen-postlong-hyphen}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+    name={\glsxtrshortlongname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}},%
     firstplural={\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}},%
@@ -10338,10 +10366,13 @@ defined}{}%
 \newcommand*{\glslongonlyfont}{\glslongdefaultfont}%
 \newcommand*{\glsfirstlongonlyfont}{\glslongonlyfont}%
 \newcommand*{\glsxtronlysuffix}{\glsxtrabbrvpluralsuffix}
+\newcommand*{\glsxtronlyname}{%
+  \protect\glsabbrvonlyfont{\the\glsshorttok}%
+}
 \newabbreviationstyle{long-only-short-only}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvonlyfont{\the\glsshorttok}},
+    name={\glsxtronlyname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongonlyfont{\the\glslongtok}},%
     firstplural={\protect\glsfirstlongonlyfont{\the\glslongpltok}},%