glossaries-extra (9aug17)

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

2 files changed, 2709 insertions, 308 deletions

diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty
index a9863bf49a8..e3b19f4f39d 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2017/06/15 v1.16 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2017/08/09 v1.17 (NLCT)]
 \newcommand*{\@glsxtr@loadstyles}{}
 \DeclareOption*{%
   \IfFileExists{glossary-\CurrentOption.sty}
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 d6911ce06cc..c516340d069 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/06/15 v1.16 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2017/08/09 v1.17 (NLCT)]
 \RequirePackage{xkeyval}
 \RequirePackage{etoolbox}
 \@ifpackageloaded{glossaries}
@@ -352,6 +352,34 @@
   \newcommand*{\newabbr}{\newabbreviation}%
   \let\GlsXtrDefineAbbreviationShortcuts\relax
 }
+\newcommand*{\GlsXtrDefineAcShortcuts}{%
+  \newcommand*{\ac}{\cgls}%
+  \newcommand*{\acp}{\cglspl}%
+  \newcommand*{\acs}{\glsxtrshort}%
+  \newcommand*{\acsp}{\glsxtrshortpl}%
+  \newcommand*{\acl}{\glsxtrlong}%
+  \newcommand*{\aclp}{\glsxtrlongpl}%
+  \newcommand*{\acf}{\glsxtrfull}%
+  \newcommand*{\acfp}{\glsxtrfullpl}%
+  \newcommand*{\Ac}{\cGls}%
+  \newcommand*{\Acp}{\cGlspl}%
+  \newcommand*{\Acs}{\Glsxtrshort}%
+  \newcommand*{\Acsp}{\Glsxtrshortpl}%
+  \newcommand*{\Acl}{\Glsxtrlong}%
+  \newcommand*{\Aclp}{\Glsxtrlongpl}%
+  \newcommand*{\Acf}{\Glsxtrfull}%
+  \newcommand*{\Acfp}{\Glsxtrfullpl}%
+  \newcommand*{\AC}{\cGLS}%
+  \newcommand*{\ACP}{\cGLSpl}%
+  \newcommand*{\ACS}{\GLSxtrshort}%
+  \newcommand*{\ACSP}{\GLSxtrshortpl}%
+  \newcommand*{\ACL}{\GLSxtrlong}%
+  \newcommand*{\ACLP}{\GLSxtrlongpl}%
+  \newcommand*{\ACF}{\GLSxtrfull}%
+  \newcommand*{\ACFP}{\GLSxtrfullpl}%
+  \newcommand*{\newabbr}{\newabbreviation}%
+  \let\GlsXtrDefineAcShortcuts\relax
+}
 \newcommand*{\GlsXtrDefineOtherShortcuts}{%
   \newcommand*{\newentry}{\newglossaryentry}%
   \ifdef\printsymbols
@@ -367,7 +395,7 @@
 \newcommand*{\@glsxtr@setupshortcuts}{}
 \newcommand*{\@glsxtr@shortcutsval}{\ifglsacrshortcuts acro\else none\fi}%
 \define@choicekey{glossaries-extra.sty}{shortcuts}[\val\nr]%
- {acronyms,acro,abbreviations,abbr,other,all,true,none,false}[true]{%
+ {acronyms,acro,abbreviations,abbr,other,all,true,none,false,ac}[true]{%
    \let\@glsxtr@shortcutsval\val
    \ifcase\nr\relax % acronyms
      \renewcommand*{\@glsxtr@setupshortcuts}{%
@@ -405,8 +433,13 @@
        \GlsXtrDefineAbbreviationShortcuts
        \GlsXtrDefineOtherShortcuts
      }%
-   \else % none, false
+   \or % none, false
      \renewcommand*{\@glsxtr@setupshortcuts}{}%
+   \or % ac
+     \renewcommand*{\@glsxtr@setupshortcuts}{%
+       \glsacrshortcutstrue
+       \GlsXtrDefineAcShortcuts
+     }%
    \fi
  }
 \newcommand*{\@glsxtr@doaccsupp}{}
@@ -3406,7 +3439,8 @@
     \@gls@noidxloclist@prev
   }%
   {%
-    ??\glsdoifexists{#1}%
+    \glsxtrundeftag
+    \glsdoifexists{#1}%
     {%
       \GlossariesWarning{Missing location list for `#1'. Either
         a rerun is required or you haven't referenced the entry.}%
@@ -3425,7 +3459,8 @@
     \forlistloop{\glsnoidxnumberlistloophandler}{\@gls@loclist}%
   }%
   {%
-    ??\glsdoifexists{#1}%
+    \glsxtrundeftag
+    \glsdoifexists{#1}%
     {%
       \GlossariesWarning{Missing location list for `##1'. Either
         a rerun is required or you haven't referenced the entry.}%
@@ -3441,7 +3476,8 @@
     \glsnoidxloclist{\@gls@loclist}%
   }%
   {%
-    ??\glsdoifexists{#1}%
+    \glsxtrundeftag
+    \glsdoifexists{#1}%
     {%
       \GlossariesWarning{Missing location list for `#1'. Either
         a rerun is required or you haven't referenced the entry.}%
@@ -5133,6 +5169,24 @@
   \fi
   \@glsxtr@insert@dots@next#1%
 }
+\newcommand*{\glsxtrwordsep}{\space}
+\newcommand*{\glsxtrword}[1]{#1}
+\newcommand*{\@glsxtr@markwordseps}[2]{%
+  \def#1{}%
+  \@glsxtr@mark@wordseps#1#2 \@nnil
+}
+\def\@glsxtr@mark@wordseps#1#2 #3{%
+  \ifdefempty{#1}%
+  {\def#1{\protect\glsxtrword{#2}}}%
+  {\appto#1{\protect\glsxtrwordsep\protect\glsxtrword{#2}}}%
+  \ifx\@nnil#3\relax
+   \let\@glsxtr@mark@wordseps@next\relax
+  \else
+   \def\@glsxtr@mark@wordseps@next{%
+     \@glsxtr@mark@wordseps#1#3}%
+  \fi
+  \@glsxtr@mark@wordseps@next
+}
 \newcommand*{\newabbreviation}[4][]{%
   \glsxtr@newabbreviation{#1}{#2}{#3}{#4}%
 }
@@ -5141,47 +5195,61 @@
   \glslabeltok{#2}%
   \glsshorttok{#3}%
   \glslongtok{#4}%
+  \def\glsxtrorgshort{#3}%
+  \def\glsxtrorglong{#4}%
   \def\glscategorylabel{abbreviation}%
   \glsxtr@applyabbrvstyle{\@glsabbrv@current@abbreviation}%
   \setkeys*{glsxtrabbrv}[shortplural,longplural]{#1}%
   \def\@gls@longpl{#4\glspluralsuffix}%
-  \glsifcategoryattribute{\glscategorylabel}{insertdots}{true}%
+  \let\@gls@default@longpl\@gls@longpl
+  \glsifcategoryattribute{\glscategorylabel}{markwords}{true}%
   {%
-    \@glsxtr@insertdots\@gls@short{#3}%
-    \expandafter\glsshorttok\expandafter{\@gls@short\spacefactor1000 \relax}%
-    \glsifcategoryattribute{\glscategorylabel}{aposplural}{true}%
-    {%
-      \expandafter\def\expandafter\@gls@shortpl\expandafter{\@gls@short
-        '\abbrvpluralsuffix}%
-    }%
+    \@glsxtr@markwordseps\@gls@long{#4}%
+    \expandafter\def\expandafter\@gls@longpl\expandafter
+     {\@gls@long\glspluralsuffix}%
+    \let\@gls@default@longpl\@gls@longpl
+    \expandafter\glslongtok\expandafter{\@gls@long}%
+  }%
+  {}%
+  \glsifcategoryattribute{\glscategorylabel}{markshortwords}{true}%
+  {%
+    \@glsxtr@markwordseps\@gls@short{#3}%
+  }%
+  {%
+    \glsifcategoryattribute{\glscategorylabel}{insertdots}{true}%
     {%
-      \glsifcategoryattribute{\glscategorylabel}{noshortplural}{true}%
-      {%
-        \let\@gls@shortpl\@gls@short
-      }%
-      {%
-        \expandafter\def\expandafter\@gls@shortpl\expandafter{\@gls@short
-          \abbrvpluralsuffix}%
-      }%
+      \@glsxtr@insertdots\@gls@short{#3}%
+      \expandafter\glsshorttok\expandafter{\@gls@short\spacefactor1000 \relax}%
     }%
+    {\def\@gls@short{#3}}%
   }%
+  \glsifcategoryattribute{\glscategorylabel}{aposplural}{true}%
   {%
-    \glsifcategoryattribute{\glscategorylabel}{aposplural}{true}%
+    \expandafter\def\expandafter\@gls@shortpl\expandafter{\@gls@short
+      '\abbrvpluralsuffix}%
+  }%
+  {%
+    \glsifcategoryattribute{\glscategorylabel}{noshortplural}{true}%
     {%
-      \def\@gls@shortpl{#3'\abbrvpluralsuffix}%
+      \let\@gls@shortpl\@gls@short
     }%
-    {%
-      \glsifcategoryattribute{\glscategorylabel}{noshortplural}{true}%
       {%
-        \def\@gls@shortpl{#3}%
-      }%
-      {%
-        \def\@gls@shortpl{#3\abbrvpluralsuffix}%
-      }%
+      \expandafter\def\expandafter\@gls@shortpl\expandafter{\@gls@short
+        \abbrvpluralsuffix}%
     }%
   }%
+  \expandafter\glsshorttok\expandafter{\@gls@short}%
   \glsxtrnewabbrevpresetkeyhook{#1}{#2}{#3}%
   \setkeys*{glsxtrabbrv}[category]{#1}%
+  \ifx\@gls@default@longpl\@gls@longpl
+  \else
+    \glsifcategoryattribute{\glscategorylabel}{markwords}{true}%
+    {%
+      \expandafter\@glsxtr@markwordseps\expandafter\@gls@longpl\expandafter
+       {\@gls@longpl}%
+    }%
+    {}%
+  \fi
   \expandafter\glsshortpltok\expandafter{\@gls@shortpl}%
   \expandafter\glslongpltok\expandafter{\@gls@longpl}%
   \newabbreviationhook
@@ -5206,21 +5274,22 @@
 \newcommand*{\GlsXtrPostNewAbbreviation}{}
 \newcommand*{\newabbreviationhook}{}
 \newcommand*{\CustomAbbreviationFields}{}
+\newcommand*{\glsxtrparen}[1]{(#1)}
 \newcommand*{\glsxtrfullformat}[2]{%
   \glsfirstlongfont{\glsaccesslong{#1}}#2\glsxtrfullsep{#1}%
-  (\protect\glsfirstabbrvfont{\glsaccessshort{#1}})%
+  \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{#1}}}%
 }
 \newcommand*{\Glsxtrfullformat}[2]{%
   \glsfirstlongfont{\Glsaccesslong{#1}}#2\glsxtrfullsep{#1}%
-  (\protect\glsfirstabbrvfont{\glsaccessshort{#1}})%
+  \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{#1}}}%
 }
 \newcommand*{\glsxtrfullplformat}[2]{%
   \glsfirstlongfont{\glsaccesslongpl{#1}}#2\glsxtrfullsep{#1}%
-  (\protect\glsfirstabbrvfont{\glsaccessshortpl{#1}})%
+  \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{#1}}}%
 }
 \newcommand*{\Glsxtrfullplformat}[2]{%
   \glsfirstlongfont{\Glsaccesslongpl{#1}}#2\glsxtrfullsep{#1}%
-  (\protect\glsfirstabbrvfont{\glsaccessshortpl{#1}})%
+  \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{#1}}}%
 }
 \newcommand*{\glsxtrfullsep}[1]{\space}
 \newcommand*{\glsxtrinlinefullformat}{\glsxtrfullformat}
@@ -5626,27 +5695,27 @@
       {%
         \glscapscase
         {%
-          \glsabbrvfont{\glsaccessshortpl{\glslabel}}\glsinsert
+          \glsxtrsubsequentplfmt{\glslabel}{\glsinsert}%
         }%
         {%
-          \glsabbrvfont{\Glsaccessshortpl{\glslabel}}\glsinsert
+          \Glsxtrsubsequentplfmt{\glslabel}{\glsinsert}%
         }%
         {%
           \mfirstucMakeUppercase
-            {\glsabbrvfont{\glsaccessshortpl{\glslabel}}\glsinsert}%
+            {\glsxtrsubsequentplfmt{\glslabel}{\glsinsert}}%
         }%
       }%
       {%
         \glscapscase
         {%
-          \glsabbrvfont{\glsaccessshort{\glslabel}}\glsinsert
+          \glsxtrsubsequentfmt{\glslabel}{\glsinsert}%
         }%
         {%
-          \glsabbrvfont{\Glsaccessshort{\glslabel}}\glsinsert
+          \Glsxtrsubsequentfmt{\glslabel}{\glsinsert}%
         }%
         {%
           \mfirstucMakeUppercase
-            {\glsabbrvfont{\glsaccessshort{\glslabel}}\glsinsert}%
+            {\glsxtrsubsequentfmt{\glslabel}{\glsinsert}}%
         }%
       }%
     }%
@@ -5684,6 +5753,26 @@
     \glscustomtext
   }%
 }
+\newcommand*{\glsxtrsubsequentfmt}[2]{%
+  \glsabbrvfont{\glsaccessshort{#1}\ifglsxtrinsertinside #2\fi}%
+  \ifglsxtrinsertinside \else#2\fi
+}
+\let\glsxtrdefaultsubsequentfmt\glsxtrsubsequentfmt
+\newcommand*{\glsxtrsubsequentplfmt}[2]{%
+  \glsabbrvfont{\glsaccessshortpl{#1}\ifglsxtrinsertinside #2\fi}%
+  \ifglsxtrinsertinside \else#2\fi
+}
+\let\glsxtrdefaultsubsequentplfmt\glsxtrsubsequentplfmt
+\newcommand*{\Glsxtrsubsequentfmt}[2]{%
+  \glsabbrvfont{\Glsaccessshort{#1}\ifglsxtrinsertinside #2\fi}%
+  \ifglsxtrinsertinside \else#2\fi
+}
+\let\Glsxtrdefaultsubsequentfmt\Glsxtrsubsequentfmt
+\newcommand*{\Glsxtrsubsequentplfmt}[2]{%
+  \glsabbrvfont{\Glsaccessshortpl{#1}\ifglsxtrinsertinside #2\fi}%
+  \ifglsxtrinsertinside \else#2\fi
+}
+\let\Glsxtrdefaultsubsequentplfmt\Glsxtrsubsequentplfmt
 \newcommand*{\setabbreviationstyle}[2][abbreviation]{%
   \ifcsundef{@glsabbrv@dispstyle@setup@#2}
   {%
@@ -5733,6 +5822,10 @@
     \renewcommand*{\Glsxtrinlinefullformat}{\Glsxtrfullformat}%
     \renewcommand*{\glsxtrinlinefullplformat}{\glsxtrfullplformat}%
     \renewcommand*{\Glsxtrinlinefullplformat}{\Glsxtrfullplformat}%
+    \let\glsxtrsubsequentfmt\glsxtrdefaultsubsequentfmt
+    \let\glsxtrsubsequentplfmt\glsxtrdefaultsubsequentplfmt
+    \let\Glsxtrsubsequentfmt\Glsxtrdefaultsubsequentfmt
+    \let\Glsxtrsubsequentplfmt\Glsxtrdefaultsubsequentplfmt
     #3}%
   }%
 }
@@ -5797,10 +5890,10 @@
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongfont{\the\glslongtok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
-     (\protect\glsfirstabbrvfont{\the\glsshorttok})},%
+     \glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshorttok}}},%
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
-     (\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
+     \glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshortpltok}}},%
     plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
     description={\the\glslongtok}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
@@ -5821,37 +5914,43 @@
     \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
     \glsxtrfullsep{##1}%
-    (\glsfirstabbrvfont{\glsaccessshort{##1}})%
+    \glsxtrparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}%
   }%
   \renewcommand*{\glsxtrfullplformat}[2]{%
     \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstabbrvfont{\glsaccessshortpl{##1}})%
+    \glsxtrparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
   }%
   \renewcommand*{\Glsxtrfullformat}[2]{%
     \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstabbrvfont{\glsaccessshort{##1}})%
+    \glsxtrparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}%
   }%
   \renewcommand*{\Glsxtrfullplformat}[2]{%
     \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstabbrvfont{\glsaccessshortpl{##1}})%
+    \glsxtrparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
   }%
 }
 \setabbreviationstyle{long-short}
-\newcommand*{\glsxtrlongshortdescsort}{\the\glslongtok\space(\the\glsshorttok)}
+\newcommand*{\glsxtrlongshortdescsort}{%
+ \expandonce\glsxtrorglong\space (\expandonce\glsxtrorgshort)%
+}
+\newcommand*{\glsxtrlongshortdescname}{%
+  \protect\glslongfont{\the\glslongtok}
+  \glsxtrparen{\protect\glsabbrvfont{\the\glsshorttok}}%
+}
 \newabbreviationstyle{long-short-desc}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsxtrfullformat{\the\glslabeltok}{}},
+    name={\glsxtrlongshortdescname},
     sort={\glsxtrlongshortdescsort},%
     first={\protect\glsfirstlongfont{\the\glslongtok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
-     (\protect\glsfirstabbrvfont{\the\glsshorttok})},%
+     \glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshorttok}}},%
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
-     (\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
+     \glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshortpltok}}},%
     text={\protect\glsabbrvfont{\the\glsshorttok}},%
     plural={\protect\glsabbrvfont{\the\glsshortpltok}}%
   }%
@@ -5874,10 +5973,10 @@
     description={\the\glslongtok},%
     first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
-     (\protect\glsfirstlongfont{\the\glslongtok})},%
+     \glsxtrparen{\protect\glsfirstlongfont{\the\glslongtok}}},%
     firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
-     (\protect\glsfirstlongfont{\the\glslongpltok})},%
+     \glsxtrparen{\protect\glsfirstlongfont{\the\glslongpltok}}},%
     plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \glshasattribute{\the\glslabeltok}{regular}%
@@ -5897,36 +5996,41 @@
     \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
     \glsxtrfullsep{##1}%
-    (\glsfirstlongfont{\glsaccesslong{##1}})%
+    \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
   }%
   \renewcommand*{\glsxtrfullplformat}[2]{%
     \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
     \glsxtrfullsep{##1}%
-    (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+    \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
   }%
   \renewcommand*{\Glsxtrfullformat}[2]{%
     \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfont{\glsaccesslong{##1}})%
+    \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
   }%
   \renewcommand*{\Glsxtrfullplformat}[2]{%
     \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
      \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+    \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
   }%
 }
+\newcommand*{\glsxtrshortlongdescsort}{\the\glsshorttok}
+\newcommand*{\glsxtrshortlongdescname}{%
+  \protect\glsabbrvfont{\the\glsshorttok}
+  \glsxtrparen{\protect\glslongfont{\the\glslongtok}}%
+}
 \newabbreviationstyle{short-long-desc}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsxtrfullformat{\the\glslabeltok}{}},
-    sort={\the\glsshorttok},%
+    name={\glsxtrshortlongdescname},
+    sort={\glsxtrshortlongdescsort},
     first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
-     (\protect\glsfirstlongfont{\the\glslongtok})},%
+     \glsxtrparen{\protect\glsfirstlongfont{\the\glslongtok}}},%
     firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
-     (\protect\glsfirstlongfont{\the\glslongpltok})},%
+     \glsxtrparen{\protect\glsfirstlongfont{\the\glslongpltok}}},%
     text={\protect\glsabbrvfont{\the\glsshorttok}},%
     plural={\protect\glsabbrvfont{\the\glsshortpltok}}%
   }%
@@ -5999,22 +6103,22 @@
   \renewcommand*{\glsxtrinlinefullformat}[2]{%
     \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
      \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfootnotefont{\glsaccesslong{##1}})%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
   }%
   \renewcommand*{\glsxtrinlinefullplformat}[2]{%
     \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfootnotefont{\glsaccesslongpl{##1}})%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
   }%
   \renewcommand*{\Glsxtrinlinefullformat}[2]{%
     \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
      \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfootnotefont{\glsaccesslong{##1}})%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
   }%
   \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
     \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
      \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfootnotefont{\glsaccesslongpl{##1}})%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
   }%
 }
 \letabbreviationstyle{short-footnote}{footnote}
@@ -6071,22 +6175,22 @@
   \renewcommand*{\glsxtrinlinefullformat}[2]{%
     \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
      \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfootnotefont{\glsaccesslong{##1}})%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
   }%
   \renewcommand*{\glsxtrinlinefullplformat}[2]{%
     \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfootnotefont{\glsaccesslongpl{##1}})%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
   }%
   \renewcommand*{\Glsxtrinlinefullformat}[2]{%
     \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
      \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfootnotefont{\glsaccesslong{##1}})%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
   }%
   \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
     \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
      \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfootnotefont{\glsaccesslongpl{##1}})%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
   }%
 }
 \letabbreviationstyle{short-postfootnote}{postfootnote}
@@ -6113,25 +6217,25 @@
     \protect\glsfirstabbrvfont{\glsaccessshort{##1}%
       \ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfont{\glsaccesslong{##1}})%
+    \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
   }%
   \renewcommand*{\glsxtrinlinefullplformat}[2]{%
     \protect\glsfirstabbrvfont{\glsaccessshortpl{##1}%
      \ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+    \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
   }%
   \renewcommand*{\Glsxtrinlinefullformat}[2]{%
     \protect\glsfirstabbrvfont{\glsaccessshort{##1}%
       \ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfont{\Glsaccesslong{##1}})%
+    \glsxtrparen{\glsfirstlongfont{\Glsaccesslong{##1}}}%
   }%
   \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
     \protect\glsfirstabbrvfont{\glsaccessshortpl{##1}%
        \ifglsxtrinsertinside##2\fi}%
      \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfont{\Glsaccesslongpl{##1}})%
+    \glsxtrparen{\glsfirstlongfont{\Glsaccesslongpl{##1}}}%
   }%
   \renewcommand*{\glsxtrfullformat}[2]{%
     \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
@@ -6152,10 +6256,27 @@
 }
 \setabbreviationstyle[acronym]{short}
 \letabbreviationstyle{short-nolong}{short}
+\newabbreviationstyle{short-nolong-noreg}%
+{%
+  \GlsXtrUseAbbrStyleSetup{short-nolong}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \GlsXtrUseAbbrStyleFmts{short-nolong}%
+}
+\newcommand*{\glsxtrshortdescname}{%
+  \protect\glsabbrvfont{\the\glsshorttok}%
+}
 \newabbreviationstyle{short-desc}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsxtrinlinefullformat{\the\glslabeltok}{}},
+    name={\glsxtrshortdescname},
     sort={\the\glsshorttok},
     first={\protect\glsfirstabbrvfont{\the\glsshorttok}},
     firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}},
@@ -6174,22 +6295,22 @@
   \renewcommand*{\glsxtrinlinefullformat}[2]{%
     \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
      \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfont{\glsaccesslong{##1}})%
+    \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
   }%
   \renewcommand*{\glsxtrinlinefullplformat}[2]{%
     \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+    \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
   }%
   \renewcommand*{\Glsxtrinlinefullformat}[2]{%
     \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfont{\glsaccesslong{##1}})%
+    \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
   }%
   \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
     \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
      \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+    \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
   }%
   \renewcommand*{\glsxtrfullformat}[2]{%
     \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
@@ -6209,15 +6330,29 @@
   }%
 }
 \letabbreviationstyle{short-nolong-desc}{short-desc}
+\newabbreviationstyle{short-nolong-desc-noreg}%
+{%
+  \GlsXtrUseAbbrStyleSetup{short-nolong-desc}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \GlsXtrUseAbbrStyleFmts{short-nolong-desc}%
+}
 \newabbreviationstyle{long-desc}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\protect\glsfirstlongfont{\the\glslongtok}},
+    name={\protect\protect\glslongfont{\the\glslongtok}},
     sort={\the\glslongtok},
     first={\protect\glsfirstlongfont{\the\glslongtok}},
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},
-    text={\the\glslongtok},
-    plural={\the\glslongpltok}%
+    text={\glslongfont{\the\glslongtok}},
+    plural={\glslongfont{\the\glslongpltok}}%
   }%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \glssetattribute{\the\glslabeltok}{regular}{true}}%
@@ -6228,25 +6363,41 @@
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
   \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
   \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+    \glslongfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+    \glslongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+    \glslongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+    \glslongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
   \renewcommand*{\glsxtrinlinefullformat}[2]{%
     \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
      \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\protect\glsfirstabbrvfont{\glsaccessshort{##1}})%
+    \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{##1}}}%
   }%
   \renewcommand*{\glsxtrinlinefullplformat}[2]{%
     \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
      \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}})%
+    \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
   }%
   \renewcommand*{\Glsxtrinlinefullformat}[2]{%
     \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
      \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\protect\glsfirstabbrvfont{\glsaccessshort{##1}})%
+    \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{##1}}}%
   }%
   \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
     \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
      \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
-    (\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}})%
+    \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
   }%
   \renewcommand*{\glsxtrfullformat}[2]{%
     \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
@@ -6266,6 +6417,20 @@
   }%
 }
 \letabbreviationstyle{long-noshort-desc}{long-desc}
+\newabbreviationstyle{long-noshort-desc-noreg}%
+{%
+  \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
+}
 \newabbreviationstyle{long}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
@@ -6273,8 +6438,8 @@
     sort={\the\glsshorttok},
     first={\protect\glsfirstlongfont{\the\glslongtok}},
     firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},
-    text={\the\glslongtok},
-    plural={\the\glslongpltok},%
+    text={\glslongfont{\the\glslongtok}},
+    plural={\glslongfont{\the\glslongpltok}},%
     description={\the\glslongtok}%
   }%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
@@ -6284,80 +6449,364 @@
   \GlsXtrUseAbbrStyleFmts{long-desc}%
 }
 \letabbreviationstyle{long-noshort}{long}
+\newabbreviationstyle{long-noshort-noreg}%
+{%
+  \GlsXtrUseAbbrStyleSetup{long-noshort}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \GlsXtrUseAbbrStyleFmts{long-noshort}%
+}
 \newcommand*{\glsxtrscfont}[1]{\textsc{#1}}
-\newcommand*{\glsxtrfirstscfont}[1]{\glsxtrscfont{#1}}
+\newcommand*{\glsabbrvscfont}{\glsxtrscfont}
+\newcommand*{\glsxtrfirstscfont}[1]{\glsabbrvscfont{#1}}
+\newcommand*{\glsfirstabbrvscfont}{\glsxtrfirstscfont}
 \newcommand*{\glsxtrscsuffix}{\glstextup{\glsxtrabbrvpluralsuffix}}
 \newabbreviationstyle{long-short-sc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{long-short}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvscfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvscfont{\the\glsshorttok}}},%
+    firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvscfont{\the\glsshortpltok}}},%
+    plural={\protect\glsabbrvscfont{\the\glsshortpltok}},%
+    description={\the\glslongtok}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{long-short}%
   \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+  }%
 }
 \newabbreviationstyle{long-short-sc-desc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrlongshortdescname},
+    sort={\glsxtrlongshortdescsort},%
+    first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvscfont{\the\glsshorttok}}},%
+    firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvscfont{\the\glsshortpltok}}},%
+    text={\protect\glsabbrvscfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvscfont{\the\glsshortpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{long-short-desc}%
-  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+  \GlsXtrUseAbbrStyleFmts{long-short-sc}%
 }
 \newabbreviationstyle{short-sc-long}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-long}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvscfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    description={\the\glslongtok},%
+    first={\protect\glsfirstabbrvscfont{\the\glsshorttok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+    firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+    plural={\protect\glsabbrvscfont{\the\glsshortpltok}}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-long}%
   \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+  }%
 }
 \newabbreviationstyle{short-sc-long-desc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-long-desc}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrshortlongdescname},
+    sort={\glsxtrshortlongdescsort},
+    first={\protect\glsfirstabbrvscfont{\the\glsshorttok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+    firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+    text={\protect\glsabbrvscfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvscfont{\the\glsshortpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-long-desc}%
-  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+  \GlsXtrUseAbbrStyleFmts{short-sc-long}%
 }
 \newabbreviationstyle{short-sc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-nolong}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvscfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstabbrvscfont{\the\glsshorttok}},
+    firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}},
+    text={\protect\glsabbrvscfont{\the\glsshorttok}},
+    plural={\protect\glsabbrvscfont{\the\glsshortpltok}},
+    description={\the\glslongtok}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glssetattribute{\the\glslabeltok}{regular}{true}}%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-nolong}%
   \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \protect\glsfirstabbrvscfont{\glsaccessshort{##1}%
+      \ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}%
+     \ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \protect\glsfirstabbrvscfont{\glsaccessshort{##1}%
+      \ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}%
+       \ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
 }
 \letabbreviationstyle{short-sc-nolong}{short-sc}
 \newabbreviationstyle{short-sc-desc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-desc}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrshortdescname},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstabbrvscfont{\the\glsshorttok}},
+    firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}},
+    text={\protect\glsabbrvscfont{\the\glsshorttok}},
+    plural={\protect\glsabbrvscfont{\the\glsshortpltok}},
+    description={\the\glslongtok}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glssetattribute{\the\glslabeltok}{regular}{true}}%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-desc}%
   \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi
+  }%
 }
 \letabbreviationstyle{short-sc-nolong-desc}{short-sc-desc}
 \newabbreviationstyle{long-noshort-sc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{long-noshort}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvscfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstlongdefaultfont{\the\glslongtok}},
+    firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}},
+    text={\protect\glslongdefaultfont{\the\glslongtok}},
+    plural={\protect\glslongdefaultfont{\the\glslongpltok}},%
+    description={\the\glslongtok}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glssetattribute{\the\glslabeltok}{regular}{true}}%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{long-noshort}%
   \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+    \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+    \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+    \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+    \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
 }
 \@glsxtr@deprecated@abbrstyle{long-sc}{long-noshort-sc}
 \newabbreviationstyle{long-noshort-sc-desc}%
@@ -6365,108 +6814,555 @@
   \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
   \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+    \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+    \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+    \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+    \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
 }
 \@glsxtr@deprecated@abbrstyle{long-desc-sc}{long-noshort-sc-desc}
 \newabbreviationstyle{short-sc-footnote}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-footnote}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvscfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    description={\the\glslongtok},%
+    first={\protect\glsfirstabbrvscfont{\the\glsshorttok}%
+     \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+       {\protect\glsfirstlongfootnotefont{\the\glslongtok}}},%
+    firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}%
+     \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+       {\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+    plural={\protect\glsabbrvscfont{\the\glsshortpltok}}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-footnote}%
   \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \protect\glsxtrabbrvfootnote{##1}%
+      {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \protect\glsxtrabbrvfootnote{##1}%
+      {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \protect\glsxtrabbrvfootnote{##1}%
+      {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \protect\glsxtrabbrvfootnote{##1}%
+      {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
 }
 \@glsxtr@deprecated@abbrstyle{footnote-sc}{short-sc-footnote}
 \newabbreviationstyle{short-sc-postfootnote}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-postfootnote}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvscfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    description={\the\glslongtok},%
+    first={\protect\glsfirstabbrvscfont{\the\glsshorttok}},%
+    firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}},%
+    plural={\protect\glsabbrvscfont{\the\glsshortpltok}}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \csdef{glsxtrpostlink\glscategorylabel}{%
+      \glsxtrifwasfirstuse
+      {%
+        \glsxtrdopostpunc{\protect\glsxtrabbrvfootnote{\glslabel}%
+        {\glsfirstlongfootnotefont{\glsentrylong{\glslabel}}}}%
+      }%
+      {}%
+    }%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+  \renewcommand*{\glsxtrsetupfulldefs}{%
+    \let\glsxtrifwasfirstuse\@secondoftwo
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-postfootnote}%
   \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
 }
 \@glsxtr@deprecated@abbrstyle{postfootnote-sc}{short-sc-postfootnote}
 \newcommand*{\glsxtrsmfont}[1]{\textsmaller{#1}}
-\newcommand*{\glsxtrfirstsmfont}[1]{\glsxtrsmfont{#1}}
+\newcommand*{\glsabbrvsmfont}{\glsxtrsmfont}
+\newcommand*{\glsxtrfirstsmfont}[1]{\glsabbrvsmfont{#1}}
+\newcommand*{\glsfirstabbrvsmfont}{\glsxtrfirstsmfont}
 \newcommand*{\glsxtrsmsuffix}{\glsxtrabbrvpluralsuffix}
 \newabbreviationstyle{long-short-sm}%
 {%
-  \GlsXtrUseAbbrStyleSetup{long-short}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvsmfont{\the\glsshorttok}}},%
+    firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvsmfont{\the\glsshortpltok}}},%
+    plural={\protect\glsabbrvsmfont{\the\glsshortpltok}},%
+    description={\the\glslongtok}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{long-short}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
   \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+  }%
 }
 \newabbreviationstyle{long-short-sm-desc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrlongshortdescname},
+    sort={\glsxtrlongshortdescsort},%
+    first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvsmfont{\the\glsshorttok}}},%
+    firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvsmfont{\the\glsshortpltok}}},%
+    text={\protect\glsabbrvsmfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{long-short-desc}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
-  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+  \GlsXtrUseAbbrStyleFmts{long-short-sm}%
 }
 \newabbreviationstyle{short-sm-long}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-long}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    description={\the\glslongtok},%
+    first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+    firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+    plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-long}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
   \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+  }%
 }
 \newabbreviationstyle{short-sm-long-desc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-long-desc}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrshortlongdescname},
+    sort={\glsxtrshortlongdescsort},
+    first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+    firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+    text={\protect\glsabbrvsmfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-long-desc}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
-  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+  \GlsXtrUseAbbrStyleFmts{short-sm-long}%
 }
 \newabbreviationstyle{short-sm}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-nolong}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}},
+    firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}},
+    text={\protect\glsabbrvsmfont{\the\glsshorttok}},
+    plural={\protect\glsabbrvsmfont{\the\glsshortpltok}},
+    description={\the\glslongtok}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glssetattribute{\the\glslabeltok}{regular}{true}}%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-nolong}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
   \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \protect\glsfirstabbrvsmfont{\glsaccessshort{##1}%
+      \ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}%
+     \ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \protect\glsfirstabbrvsmfont{\glsaccessshort{##1}%
+      \ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}%
+       \ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
 }
 \letabbreviationstyle{short-sm-nolong}{short-sm}
 \newabbreviationstyle{short-sm-desc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-nolong-desc}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrshortdescname},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}},
+    firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}},
+    text={\protect\glsabbrvsmfont{\the\glsshorttok}},
+    plural={\protect\glsabbrvsmfont{\the\glsshortpltok}},
+    description={\the\glslongtok}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glssetattribute{\the\glslabeltok}{regular}{true}}%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-nolong-desc}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
   \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi
+  }%
 }
 \letabbreviationstyle{short-sm-nolong-desc}{short-sm-desc}
 \newabbreviationstyle{long-noshort-sm}%
 {%
-  \GlsXtrUseAbbrStyleSetup{long-noshort}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstlongdefaultfont{\the\glslongtok}},
+    firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}},
+    text={\protect\glslongdefaultfont{\the\glslongtok}},
+    plural={\protect\glslongdefaultfont{\the\glslongpltok}},%
+    description={\the\glslongtok}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glssetattribute{\the\glslabeltok}{regular}{true}}%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{long-noshort}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
   \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+    \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+    \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+    \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+    \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
 }
 \@glsxtr@deprecated@abbrstyle{long-sm}{long-noshort-sm}
 \newabbreviationstyle{long-noshort-sm-desc}%
@@ -6474,66 +7370,302 @@
   \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
   \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+    \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+    \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+    \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+    \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
 }
 \@glsxtr@deprecated@abbrstyle{long-desc-sm}{long-noshort-sm-desc}
 \newabbreviationstyle{short-sm-footnote}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-footnote}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    description={\the\glslongtok},%
+    first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}%
+     \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+       {\protect\glsfirstlongfootnotefont{\the\glslongtok}}},%
+    firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}%
+     \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+       {\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+    plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-footnote}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
   \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \protect\glsxtrabbrvfootnote{##1}%
+      {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \protect\glsxtrabbrvfootnote{##1}%
+      {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \protect\glsxtrabbrvfootnote{##1}%
+      {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \protect\glsxtrabbrvfootnote{##1}%
+      {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
 }
 \@glsxtr@deprecated@abbrstyle{footnote-sm}{short-sm-footnote}
 \newabbreviationstyle{short-sm-postfootnote}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-postfootnote}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    description={\the\glslongtok},%
+    first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}},%
+    firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}},%
+    plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \csdef{glsxtrpostlink\glscategorylabel}{%
+      \glsxtrifwasfirstuse
+      {%
+        \glsxtrdopostpunc{\protect\glsxtrabbrvfootnote{\glslabel}%
+        {\glsfirstlongfootnotefont{\glsentrylong{\glslabel}}}}%
+      }%
+      {}%
+    }%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+  \renewcommand*{\glsxtrsetupfulldefs}{%
+    \let\glsxtrifwasfirstuse\@secondoftwo
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-postfootnote}%
-  \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
   \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
 }
 \@glsxtr@deprecated@abbrstyle{postfootnote-sm}{short-sm-postfootnote}
 \newcommand*{\glsabbrvemfont}[1]{\emph{#1}}%
 \newcommand*{\glsfirstabbrvemfont}[1]{\glsabbrvemfont{#1}}%
+\newcommand*{\glsxtremsuffix}{\glsxtrabbrvpluralsuffix}
 \newcommand*{\glsfirstlongemfont}[1]{\glslongemfont{#1}}%
 \newcommand*{\glslongemfont}[1]{\emph{#1}}%
 \newabbreviationstyle{long-short-em}%
 {%
-  \GlsXtrUseAbbrStyleSetup{long-short}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvemfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshorttok}}},%
+    firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshortpltok}}},%
+    plural={\protect\glsabbrvemfont{\the\glsshortpltok}},%
+    description={\the\glslongtok}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{long-short}%
   \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvemfont{##1}}%
+  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+  }%
 }
 \newabbreviationstyle{long-short-em-desc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrlongshortdescname},
+    sort={\glsxtrlongshortdescsort},%
+    first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshorttok}}},%
+    firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshortpltok}}},%
+    text={\protect\glsabbrvemfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvemfont{\the\glsshortpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{long-short-desc}%
-  \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+  \GlsXtrUseAbbrStyleFmts{long-short-em}%
 }
 \newabbreviationstyle{long-em-short-em}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvfont{\the\glsshorttok}},
+    name={\protect\glsabbrvemfont{\the\glsshorttok}},
     sort={\the\glsshorttok},
-    first={\protect\glsfirstlongfont{\the\glslongtok}%
+    first={\protect\glsfirstlongemfont{\the\glslongtok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
-     (\protect\glsfirstabbrvfont{\the\glsshorttok})},%
-    firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
+     \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshorttok}}},%
+    firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
-     (\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
-    plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
+     \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshortpltok}}},%
+    plural={\protect\glsabbrvemfont{\the\glsshortpltok}},%
     description={\protect\glslongemfont{\the\glslongtok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \glshasattribute{\the\glslabeltok}{regular}%
@@ -6544,56 +7676,146 @@
   }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{long-short}%
+  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
   \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
   \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
   \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstlongemfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstlongemfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+  }%
 }
 \newabbreviationstyle{long-em-short-em-desc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrlongshortdescname},
+    sort={\glsxtrlongshortdescsort},%
+    first={\protect\glsfirstlongemfont{\the\glslongtok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshorttok}}},%
+    firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshortpltok}}},%
+    text={\protect\glsabbrvemfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvemfont{\the\glsshortpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{long-short-desc}%
-  \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
-  \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
-  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
-  \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+  \GlsXtrUseAbbrStyleFmts{long-em-short-em}%
 }
 \newabbreviationstyle{short-em-long}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-long}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvemfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    description={\the\glslongtok},%
+    first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+    firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+    plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-long}%
+  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
   \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
   \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvemfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+  }%
 }
 \newabbreviationstyle{short-em-long-desc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-long-desc}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrshortlongdescname},
+    sort={\glsxtrshortlongdescsort},
+    first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+    firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+    text={\protect\glsabbrvemfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvemfont{\the\glsshortpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-long-desc}%
-  \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
-  \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvemfont{##1}}%
-  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
-  \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+  \GlsXtrUseAbbrStyleFmts{short-em-long}%
 }
 \newabbreviationstyle{short-em-long-em}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvfont{\the\glsshorttok}},
+    name={\protect\glsabbrvemfont{\the\glsshorttok}},
     sort={\the\glsshorttok},
     description={\protect\glslongemfont{\the\glslongtok}},%
-    first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
+    first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
-     (\protect\glsfirstlongfont{\the\glslongtok})},%
-    firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
+     \glsxtrparen{\protect\glsfirstlongemfont{\the\glslongtok}}},%
+    firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
      \protect\glsxtrfullsep{\the\glslabeltok}%
-     (\protect\glsfirstlongfont{\the\glslongpltok})},%
-    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
+     \glsxtrparen{\protect\glsfirstlongemfont{\the\glslongpltok}}},%
+    plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \glshasattribute{\the\glslabeltok}{regular}%
     {%
@@ -6603,113 +7825,632 @@
   }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-long}%
+  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
   \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
   \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
   \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongemfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongemfont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongemfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongemfont{\glsaccesslongpl{##1}}}%
+  }%
 }
 \newabbreviationstyle{short-em-long-em-desc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-long-desc}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrshortlongdescname},%
+    sort={\glsxtrshortlongdescsort},%
+    first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlongemfont{\the\glslongtok}}},%
+    firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlongemfont{\the\glslongpltok}}},%
+    text={\protect\glsabbrvemfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvemfont{\the\glsshortpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-long-desc}%
-  \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
-  \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
-  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
-  \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+  \GlsXtrUseAbbrStyleFmts{short-em-long-em}%
 }
 \newabbreviationstyle{short-em}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-nolong}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvemfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstabbrvemfont{\the\glsshorttok}},
+    firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}},
+    text={\protect\glsabbrvemfont{\the\glsshorttok}},
+    plural={\protect\glsabbrvemfont{\the\glsshortpltok}},
+    description={\the\glslongtok}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glssetattribute{\the\glslabeltok}{regular}{true}}%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-nolong}%
+  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
   \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \protect\glsfirstabbrvemfont{\glsaccessshort{##1}%
+      \ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}%
+     \ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \protect\glsfirstabbrvemfont{\glsaccessshort{##1}%
+      \ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}%
+       \ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
 }
 \letabbreviationstyle{short-em-nolong}{short-em}
 \newabbreviationstyle{short-em-desc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-nolong-desc}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrshortdescname},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstabbrvemfont{\the\glsshorttok}},
+    firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}},
+    text={\protect\glsabbrvemfont{\the\glsshorttok}},
+    plural={\protect\glsabbrvemfont{\the\glsshortpltok}},
+    description={\the\glslongtok}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glssetattribute{\the\glslabeltok}{regular}{true}}%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-nolong-desc}%
+  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
   \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi
+  }%
 }
 \letabbreviationstyle{short-em-nolong-desc}{short-em-desc}
 \newabbreviationstyle{long-noshort-em}%
 {%
-  \GlsXtrUseAbbrStyleSetup{long-noshort}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvemfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstlongdefaultfont{\the\glslongtok}},
+    firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}},
+    text={\protect\glslongdefaultfont{\the\glslongtok}},
+    plural={\protect\glslongdefaultfont{\the\glslongpltok}},%
+    description={\the\glslongtok}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glssetattribute{\the\glslabeltok}{regular}{true}}%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{long-noshort}%
+  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
   \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+    \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+    \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+    \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+    \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
 }
 \@glsxtr@deprecated@abbrstyle{long-em}{long-noshort-em}
 \newabbreviationstyle{long-em-noshort-em}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvfont{\the\glsshorttok}},
+    name={\protect\glsabbrvemfont{\the\glsshorttok}},
     sort={\the\glsshorttok},
-    first={\protect\glsfirstlongfont{\the\glslongtok}},
-    firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},
-    text={\the\glslongtok},
-    plural={\the\glslongpltok},%
+    first={\protect\glsfirstlongemfont{\the\glslongtok}},
+    firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}},
+    text={\protect\glslongemfont{\the\glslongtok}},
+    plural={\protect\glslongemfont{\the\glslongpltok}},%
     description={\protect\glslongemfont{\the\glslongtok}}%
   }%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \glssetattribute{\the\glslabeltok}{regular}{true}}%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{long-noshort}%
+  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
   \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
   \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
   \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+  \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+    \glslongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+    \glslongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+    \glslongemfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+    \glslongemfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstlongemfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongemfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+}
+\newabbreviationstyle{long-em-noshort-em-noreg}%
+{%
+  \GlsXtrUseAbbrStyleSetup{long-em-noshort-em}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \GlsXtrUseAbbrStyleFmts{long-em-noshort-em}%
 }
 \newabbreviationstyle{long-noshort-em-desc}%
 {%
   \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
+  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
   \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+  \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+    \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+    \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+    \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+    \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
 }
 \@glsxtr@deprecated@abbrstyle{long-desc-em}{long-noshort-em-desc}
 \newabbreviationstyle{long-em-noshort-em-desc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\protect\glslongemfont{\the\glslongtok}},
+    sort={\the\glslongtok},
+    first={\protect\glsfirstlongemfont{\the\glslongtok}},
+    firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}},
+    text={\glslongemfont{\the\glslongtok}},
+    plural={\glslongemfont{\the\glslongpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glssetattribute{\the\glslabeltok}{regular}{true}}%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
+  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
   \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
   \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
   \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+  \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+    \glslongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+    \glslongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+    \glslongemfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+    \glslongemfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+    \ifglsxtrinsertinside \else##2\fi
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstlongemfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongemfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+}
+\newabbreviationstyle{long-em-noshort-em-desc-noreg}%
+{%
+  \GlsXtrUseAbbrStyleSetup{long-em-noshort-em-desc}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \GlsXtrUseAbbrStyleFmts{long-em-noshort-em-desc}%
 }
 \newabbreviationstyle{short-em-footnote}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-footnote}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvemfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    description={\the\glslongtok},%
+    first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
+     \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+       {\protect\glsfirstlongfootnotefont{\the\glslongtok}}},%
+    firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
+     \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+       {\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+    plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-footnote}%
+  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
   \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \protect\glsxtrabbrvfootnote{##1}%
+      {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \protect\glsxtrabbrvfootnote{##1}%
+      {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \protect\glsxtrabbrvfootnote{##1}%
+      {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \protect\glsxtrabbrvfootnote{##1}%
+      {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
 }
 \@glsxtr@deprecated@abbrstyle{footnote-em}{short-em-footnote}
 \newabbreviationstyle{short-em-postfootnote}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-postfootnote}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvemfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    description={\the\glslongtok},%
+    first={\protect\glsfirstabbrvemfont{\the\glsshorttok}},%
+    firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}},%
+    plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \csdef{glsxtrpostlink\glscategorylabel}{%
+      \glsxtrifwasfirstuse
+      {%
+        \glsxtrdopostpunc{\protect\glsxtrabbrvfootnote{\glslabel}%
+        {\glsfirstlongfootnotefont{\glsentrylong{\glslabel}}}}%
+      }%
+      {}%
+    }%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+  \renewcommand*{\glsxtrsetupfulldefs}{%
+    \let\glsxtrifwasfirstuse\@secondoftwo
+  }%
 }%
 {%
-  \GlsXtrUseAbbrStyleFmts{short-postfootnote}%
+  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
   \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+    \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+  }%
 }
 \@glsxtr@deprecated@abbrstyle{postfootnote-em}{short-em-postfootnote}
 \newcommand*{\glsxtruserfield}{useri}
@@ -6717,30 +8458,34 @@
 {
   \newcommand*{\glsxtruserparen}[2]{%
     \glsxtrfullsep{#2}%
-    (#1\ifglshasfield{\glsxtruserfield}{#2}{, \glscurrentfieldvalue}{})%
+    \glsxtrparen
+     {#1\ifglshasfield{\glsxtruserfield}{#2}{, \glscurrentfieldvalue}{}}%
   }
 }
 {
   \newcommand*{\glsxtruserparen}[2]{%
     \glsxtrfullsep{#2}%
-    (#1\ifglshasfield{\glsxtruserfield}{#2}{, \@glo@thisvalue}{})%
+    \glsxtrparen
+      {#1\ifglshasfield{\glsxtruserfield}{#2}{, \@glo@thisvalue}{}}%
   }
 }
-\newcommand*{\glsabbrvuserfont}[1]{#1}
+\newcommand*{\glsabbrvuserfont}[1]{\glsabbrvdefaultfont{#1}}
 \newcommand*{\glsfirstabbrvuserfont}[1]{\glsabbrvuserfont{#1}}
-\newcommand*{\glslonguserfont}[1]{#1}
+\newcommand*{\glslonguserfont}[1]{\glslongdefaultfont{#1}}
 \newcommand*{\glsfirstlonguserfont}[1]{\glslonguserfont{#1}}
 \newcommand*{\glsxtrusersuffix}{\glsxtrabbrvpluralsuffix}
 \newabbreviationstyle{long-short-user}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvfont{\the\glsshorttok}},
+    name={\protect\glsabbrvuserfont{\the\glsshorttok}},
     sort={\the\glsshorttok},
-    first={\protect\glsfirstlongfont{\the\glslongtok}%
-     \protect\glsxtruserparen{\protect\glsfirstabbrvfont{\the\glsshorttok}}{\the\glslabeltok}},%
-    firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
-     \protect\glsxtruserparen{\protect\glsfirstabbrvfont{\the\glsshortpltok}}{\the\glslabeltok}},%
-    plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
+    first={\protect\glsfirstlonguserfont{\the\glslongtok}%
+     \protect\glsxtruserparen{\protect\glsfirstabbrvuserfont{\the\glsshorttok}}%
+      {\the\glslabeltok}},%
+    firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}%
+     \protect\glsxtruserparen
+      {\protect\glsfirstabbrvuserfont{\the\glsshortpltok}}{\the\glslabeltok}},%
+    plural={\protect\glsabbrvuserfont{\the\glsshortpltok}},%
     description={\protect\glslonguserfont{\the\glslongtok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \glshasattribute{\the\glslabeltok}{regular}%
@@ -6757,34 +8502,34 @@
   \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonguserfont{##1}}%
   \renewcommand*{\glslongfont}[1]{\glslonguserfont{##1}}%
   \renewcommand*{\glsxtrfullformat}[2]{%
-    \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstlonguserfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
-    \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}%
+    \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshort{##1}}}{##1}%
   }%
   \renewcommand*{\glsxtrfullplformat}[2]{%
-    \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstlonguserfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
-    \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}%
+    \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshortpl{##1}}}{##1}%
   }%
   \renewcommand*{\Glsxtrfullformat}[2]{%
-    \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstlonguserfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
-    \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}%
+    \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshort{##1}}}{##1}%
   }%
   \renewcommand*{\Glsxtrfullplformat}[2]{%
-    \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstlonguserfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
-    \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}%
+    \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshortpl{##1}}}{##1}%
   }%
 }
 \newabbreviationstyle{long-postshort-user}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvfont{\the\glsshorttok}},
+    name={\protect\glsabbrvuserfont{\the\glsshorttok}},
     sort={\the\glsshorttok},
-    first={\protect\glsfirstlongfont{\the\glslongtok}},%
-    firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
-    plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
+    first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
+    firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
+    plural={\protect\glsabbrvuserfont{\the\glsshortpltok}},%
     description={\protect\glslonguserfont{\the\glslongtok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \csdef{glsxtrpostlink\glscategorylabel}{%
@@ -6810,52 +8555,54 @@
   \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonguserfont{##1}}%
   \renewcommand*{\glslongfont}[1]{\glslonguserfont{##1}}%
   \renewcommand*{\glsxtrfullformat}[2]{%
-    \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstlonguserfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\glsxtrfullplformat}[2]{%
-    \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstlonguserfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\Glsxtrfullformat}[2]{%
-    \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstlonguserfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\Glsxtrfullplformat}[2]{%
-    \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstlonguserfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\glsxtrinlinefullformat}[2]{%
-    \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstlonguserfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
-    \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}%
+    \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshort{##1}}}{##1}%
   }%
   \renewcommand*{\glsxtrinlinefullplformat}[2]{%
-    \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstlonguserfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
-    \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}%
+    \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshortpl{##1}}}{##1}%
   }%
   \renewcommand*{\Glsxtrinlinefullformat}[2]{%
-    \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstlonguserfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
-    \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}%
+    \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshort{##1}}}{##1}%
   }%
   \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
-    \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstlonguserfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
-    \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}%
+    \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshortpl{##1}}}{##1}%
   }%
 }
 \newabbreviationstyle{long-postshort-user-desc}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsfirstlongfont{\the\glslongtok}%
+    name={\protect\glslonguserfont{\the\glslongtok}%
           \protect\glsxtruserparen
-           {\protect\glsabbrvfont{\the\glsshorttok}}{\the\glslabeltok}},
+           {\protect\glsabbrvuserfont{\the\glsshorttok}}{\the\glslabeltok}},
     sort={\the\glslongtok},
-    first={\protect\glsfirstlongfont{\the\glslongtok}},%
-    firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
-    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
+    first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
+    firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
+    text={\protect\glsabbrvuserfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvuserfont{\the\glsshortpltok}}%
+  }%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \csdef{glsxtrpostlink\glscategorylabel}{%
       \glsxtrifwasfirstuse
@@ -6879,18 +8626,18 @@
 \newabbreviationstyle{short-postlong-user}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvfont{\the\glsshorttok}},
+    name={\protect\glsabbrvuserfont{\the\glsshorttok}},
     sort={\the\glsshorttok},
-    first={\protect\glsfirstlongfont{\the\glslongtok}},%
-    firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
-    plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
+    first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
+    firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
+    plural={\protect\glsabbrvuserfont{\the\glsshortpltok}},%
     description={\protect\glslonguserfont{\the\glslongtok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \csdef{glsxtrpostlink\glscategorylabel}{%
       \glsxtrifwasfirstuse
       {%
         \glsxtruserparen
-          {\glsfirstabbrvuserfont{\glsentrylong{\glslabel}}}%
+          {\glsfirstlonguserfont{\glsentrylong{\glslabel}}}%
           {\glslabel}%
       }%
       {}%
@@ -6909,59 +8656,61 @@
   \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonguserfont{##1}}%
   \renewcommand*{\glslongfont}[1]{\glslonguserfont{##1}}%
   \renewcommand*{\glsxtrfullformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstabbrvuserfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\glsxtrfullplformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstabbrvuserfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\Glsxtrfullformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstabbrvuserfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\Glsxtrfullplformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstabbrvuserfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\glsxtrinlinefullformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstabbrvuserfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
-    \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}%
+    \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslong{##1}}}{##1}%
   }%
   \renewcommand*{\glsxtrinlinefullplformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstabbrvuserfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
-    \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}%
+    \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslongpl{##1}}}{##1}%
   }%
   \renewcommand*{\Glsxtrinlinefullformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstabbrvuserfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
-    \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}%
+    \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslong{##1}}}{##1}%
   }%
   \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstabbrvuserfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
-    \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}%
+    \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslongpl{##1}}}{##1}%
   }%
 }
 \newabbreviationstyle{short-postlong-user-desc}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvfont{\the\glsshorttok}%
+    name={\protect\glsabbrvuserfont{\the\glsshorttok}%
            \protect\glsxtruserparen
-             {\protect\glsfirstlongfont{\the\glslongpltok}}%
+             {\protect\glslonguserfont{\the\glslongpltok}}%
              {\the\glslabeltok}},
     sort={\the\glsshorttok},
-    first={\protect\glsfirstlongfont{\the\glslongtok}},%
-    firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
-    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
+    first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
+    firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
+    text={\protect\glsabbrvuserfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvuserfont{\the\glsshortpltok}}%
+  }%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \csdef{glsxtrpostlink\glscategorylabel}{%
       \glsxtrifwasfirstuse
       {%
         \glsxtruserparen
-          {\glsfirstabbrvuserfont{\glsentrylong{\glslabel}}}%
+          {\glsfirstlonguserfont{\glsentrylong{\glslabel}}}%
           {\glslabel}%
       }%
       {}%
@@ -6978,7 +8727,25 @@
 }
 \newabbreviationstyle{long-short-user-desc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrlongshortdescname},
+    sort={\glsxtrlongshortdescsort},%
+    first={\protect\glsfirstlonguserfont{\the\glslongtok}%
+     \protect\glsxtruserparen{\protect\glsfirstabbrvuserfont{\the\glsshorttok}}%
+      {\the\glslabeltok}},%
+    firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}%
+     \protect\glsxtruserparen
+      {\protect\glsfirstabbrvuserfont{\the\glsshortpltok}}{\the\glslabeltok}},%
+    text={\protect\glsabbrvfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
   \GlsXtrUseAbbrStyleFmts{long-short-user}%
@@ -6986,14 +8753,16 @@
 \newabbreviationstyle{short-long-user}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
-    name={\protect\glsabbrvfont{\the\glsshorttok}},
+    name={\protect\glsabbrvuserfont{\the\glsshorttok}},
     sort={\the\glsshorttok},
     description={\protect\glslonguserfont{\the\glslongtok}},%
-    first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
-     \protect\glsxtruserparen{\protect\glslonguserfont{\the\glslongtok}}{\the\glslabeltok}},%
-    firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
-     \protect\glsxtruserparen{\protect\glslonguserfont{\the\glslongpltok}}{\the\glslabeltok}},%
-    plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
+    first={\protect\glsfirstabbrvuserfont{\the\glsshorttok}%
+     \protect\glsxtruserparen{\protect\glsfirstlonguserfont{\the\glslongtok}}%
+       {\the\glslabeltok}},%
+    firstplural={\protect\glsfirstabbrvuserfont{\the\glsshortpltok}%
+     \protect\glsxtruserparen{\protect\glsfirstlonguserfont{\the\glslongpltok}}%
+       {\the\glslabeltok}},%
+    plural={\protect\glsabbrvuserfont{\the\glsshortpltok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \glshasattribute{\the\glslabeltok}{regular}%
     {%
@@ -7009,33 +8778,665 @@
   \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonguserfont{##1}}%
   \renewcommand*{\glslongfont}[1]{\glslonguserfont{##1}}%
   \renewcommand*{\glsxtrfullformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstabbrvuserfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
-    \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}%
+    \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslong{##1}}}{##1}%
   }%
   \renewcommand*{\glsxtrfullplformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstabbrvuserfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
-    \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}%
+    \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslongpl{##1}}}{##1}%
   }%
   \renewcommand*{\Glsxtrfullformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstabbrvuserfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
-    \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}%
+    \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslong{##1}}}{##1}%
   }%
   \renewcommand*{\Glsxtrfullplformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \glsfirstabbrvuserfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
     \ifglsxtrinsertinside\else##2\fi
-    \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}%
+    \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslongpl{##1}}}{##1}%
   }%
 }
 \newabbreviationstyle{short-long-user-desc}%
 {%
-  \GlsXtrUseAbbrStyleSetup{short-long-desc}%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrshortlongdescname},
+    sort={\glsxtrshortlongdescsort},%
+    first={\protect\glsfirstabbrvuserfont{\the\glsshorttok}%
+     \protect\glsxtruserparen{\protect\glsfirstlonguserfont{\the\glslongtok}}%
+       {\the\glslabeltok}},%
+    firstplural={\protect\glsfirstabbrvuserfont{\the\glsshortpltok}%
+     \protect\glsxtruserparen{\protect\glsfirstlonguserfont{\the\glslongpltok}}%
+       {\the\glslabeltok}},%
+    text={\protect\glsabbrvfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvfont{\the\glsshortpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
 }%
 {%
   \GlsXtrUseAbbrStyleFmts{short-long-user}%
 }
+\newrobustcmd*{\glsxtrifhyphenstart}[3]{%
+  \ifx\glsinsert#1\relax
+   \expandafter\@glsxtrifhyphenstart#1\relax\relax
+     \@end@glsxtrifhyphenstart{#2}{#3}%
+  \else
+   \@glsxtrifhyphenstart#1\relax\relax\@end@glsxtrifhyphenstart{#2}{#3}%
+  \fi
+}
+\def\@glsxtrifhyphenstart#1#2\@end@glsxtrifhyphenstart#3#4{%
+  \ifx-#1\relax#3\else #4\fi
+}
+\newcommand*{\glsxtrlonghyphenshort}[4]{%
+ {%
+   \glsxtrifhyphenstart{#4}{\def\glsxtrwordsep{-}}{}%
+   \glsfirstlonghyphenfont{#2\ifglsxtrinsertinside{#4}\fi}%
+   \ifglsxtrinsertinside\else{#4}\fi
+   \glsxtrfullsep{#1}%
+   \glsxtrparen{\glsfirstabbrvhyphenfont{#3\ifglsxtrinsertinside{#4}\fi}%
+    \ifglsxtrinsertinside\else{#4}\fi}%
+ }%
+}
+\newcommand*{\glsabbrvhyphenfont}{\glsabbrvdefaultfont}%
+\newcommand*{\glsfirstabbrvhyphenfont}{\glsabbrvhyphenfont}%
+\newcommand*{\glslonghyphenfont}{\glslongdefaultfont}%
+\newcommand*{\glsfirstlonghyphenfont}{\glslonghyphenfont}%
+\newcommand*{\glsxtrhyphensuffix}{\glsxtrabbrvpluralsuffix}
+\newabbreviationstyle{long-hyphen-short-hyphen}%
+{%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstlonghyphenfont{\the\glslongtok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}}},%
+    firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}}},%
+    plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}},%
+    description={\protect\glslonghyphenfont{\the\glslongtok}}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \renewcommand*{\abbrvpluralsuffix}{\glsxtrhyphensuffix}%
+  \renewcommand*{\glsabbrvfont}[1]{\glsabbrvhyphenfont{##1}}%
+  \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvhyphenfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonghyphenfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslonghyphenfont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsxtrlonghyphenshort{##1}{\glsaccesslong{##1}}{\glsaccessshort{##1}}{##2}%
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsxtrlonghyphenshort{##1}{\glsaccesslongpl{##1}}%
+     {\glsaccessshortpl{##1}}{##2}%
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsxtrlonghyphenshort{##1}{\Glsaccesslong{##1}}{\glsaccessshort{##1}}{##2}%
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsxtrlonghyphenshort{##1}{\Glsaccesslongpl{##1}}%
+     {\glsaccessshortpl{##1}}{##2}%
+  }%
+}
+\newabbreviationstyle{long-hyphen-short-hyphen-desc}%
+{%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrlongshortdescname},
+    sort={\glsxtrlongshortdescsort},
+    first={\protect\glsfirstlonghyphenfont{\the\glslongtok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}}},%
+    firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}}},%
+    text={\protect\glsabbrvhyphenfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \GlsXtrUseAbbrStyleFmts{long-hyphen-short-hyphen}%
+}
+\newcommand*{\glsxtrlonghyphennoshort}[3]{%
+ {%
+   \glsxtrifhyphenstart{#3}{\def\glsxtrwordsep{-}}{}%
+   \glsfirstlonghyphenfont{#2\ifglsxtrinsertinside{#3}\fi}%
+   \ifglsxtrinsertinside\else{#3}\fi
+ }%
+}
+\newabbreviationstyle{long-hyphen-noshort-desc-noreg}%
+{%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\protect\glslonghyphenfont{\the\glslongtok}},
+    sort={\expandonce\glsxtrorglong},
+    first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
+    firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
+    plural={\protect\glslonghyphenfont{\the\glslongpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \GlsXtrUseAbbrStyleFmts{long-hyphen-short-hyphen}%
+  \renewcommand*{\abbrvpluralsuffix}{\glsxtrabbrvpluralsuffix}%
+  \renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}%
+  \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonghyphenfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslonghyphenfont{##1}}%
+  \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+    \glsxtrlonghyphennoshort{##1}{\glsaccesslong{##1}}{##2}%
+  }%
+  \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+    \glsxtrlonghyphennoshort{##1}{\glsaccesslongpl{##1}}{##2}%
+  }%
+  \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+    \glsxtrlonghyphennoshort{##1}{\Glsaccesslong{##1}}{##2}%
+  }%
+  \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+    \glsxtrlonghyphennoshort{##1}{\Glsaccesslongpl{##1}}{##2}%
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsxtrlonghyphennoshort{##1}{\glsaccesslong{##1}}{##2}%
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsxtrlonghyphennoshort{##1}{\glsaccesslongpl{##1}}{##2}%
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsxtrlonghyphennoshort{##1}{\Glsaccesslong{##1}}{##2}%
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsxtrlonghyphennoshort{##1}{\Glsaccesslongpl{##1}}{##2}%
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsxtrlonghyphennoshort{##1}{\glsaccesslong{##1}}{##2}%
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsxtrlonghyphennoshort{##1}{\glsaccesslongpl{##1}}{##2}%
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsxtrlonghyphennoshort{##1}{\Glsaccesslong{##1}}{##2}%
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsxtrlonghyphennoshort{##1}{\Glsaccesslongpl{##1}}{##2}%
+  }%
+}
+\newabbreviationstyle{long-hyphen-noshort-noreg}%
+{%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
+    firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
+    text={\protect\glslonghyphenfont{\the\glslongtok}},%
+    plural={\protect\glslonghyphenfont{\the\glslongpltok}},%
+    description={\the\glslongtok}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \GlsXtrUseAbbrStyleFmts{long-desc}%
+}
+\newcommand*{\glsxtrlonghyphen}[3]{%
+ {%
+   \glsxtrifhyphenstart{#3}{\def\glsxtrwordsep{-}}{}%
+   \glsfirstlonghyphenfont{#1}%
+ }%
+}
+\newcommand*{\glsxtrposthyphenshort}[2]{%
+ {%
+   \glsxtrifhyphenstart{#2}{\def\glsxtrwordsep{-}}{}%
+   \ifglsxtrinsertinside{\glsfirstlonghyphenfont{#2}}\else{#2}\fi
+   \glsxtrfullsep{#1}%
+   \glsxtrparen
+   {\glsfirstabbrvhyphenfont{\glsentryshort{#1}\ifglsxtrinsertinside{#2}\fi}%
+    \ifglsxtrinsertinside\else{#2}\fi
+   }%
+ }%
+}
+\newcommand*{\glsxtrposthyphensubsequent}[2]{%
+  \glsabbrvfont{\ifglsxtrinsertinside {#2}\fi}%
+  \ifglsxtrinsertinside \else{#2}\fi
+}
+\newabbreviationstyle{long-hyphen-postshort-hyphen}%
+{%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
+    firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
+    plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}},%
+    description={\protect\glslonghyphenfont{\the\glslongtok}}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \csdef{glsxtrpostlink\glscategorylabel}{%
+      \glsxtrifwasfirstuse
+      {%
+        \glsxtrposthyphenshort{\glslabel}{\glsinsert}%
+      }%
+      {%
+        \glsxtrposthyphensubsequent{\glslabel}{\glsinsert}%
+      }%
+    }%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \renewcommand*{\abbrvpluralsuffix}{\glsxtrabbrvpluralsuffix}%
+  \renewcommand*{\glsabbrvfont}[1]{\glsabbrvhyphenfont{##1}}%
+  \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvhyphenfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonghyphenfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslonghyphenfont{##1}}%
+  \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+    \glsabbrvfont{\glsaccessshort{##1}}%
+  }%
+  \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+    \glsabbrvfont{\glsaccessshortpl{##1}}%
+  }%
+  \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+    \glsabbrvfont{\Glsaccessshort{##1}}%
+  }%
+  \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+    \glsabbrvfont{\Glsaccessshortpl{##1}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsxtrlonghyphen{\glsaccesslong{##1}}{##1}{##2}%
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsxtrlonghyphen{\glsaccesslongpl{##1}}{##1}{##2}%
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsxtrlonghyphen{\Glsaccesslong{##1}}{##1}{##2}%
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsxtrlonghyphen{\Glsaccesslongpl{##1}}{##1}{##2}%
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstlonghyphenfont{\glsaccesslong{##1}%
+      \ifglsxtrinsertinside{##2}\fi}%
+    \ifglsxtrinsertinside \else{##2}\fi
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstlonghyphenfont{\glsaccesslongpl{##1}%
+      \ifglsxtrinsertinside{##2}\fi}%
+    \ifglsxtrinsertinside \else{##2}\fi
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstlonghyphenfont{\Glsaccesslong{##1}%
+      \ifglsxtrinsertinside{##2}\fi}%
+    \ifglsxtrinsertinside \else{##2}\fi
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstlonghyphenfont{\Glsaccesslongpl{##1}%
+      \ifglsxtrinsertinside{##2}\fi}%
+    \ifglsxtrinsertinside \else{##2}\fi
+  }%
+}
+\newabbreviationstyle{long-hyphen-postshort-hyphen-desc}%
+{%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrlongshortdescname},
+    sort={\glsxtrlongshortdescsort},%
+    first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
+    firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
+    text={\protect\glsabbrvhyphenfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \csdef{glsxtrpostlink\glscategorylabel}{%
+      \glsxtrifwasfirstuse
+      {%
+        \glsxtrposthyphenshort{\glslabel}{\glsinsert}%
+      }%
+      {%
+        \glsxtrposthyphensubsequent{\glslabel}{\glsinsert}%
+      }%
+    }%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \GlsXtrUseAbbrStyleFmts{long-hyphen-postshort-hyphen}%
+}
+\newcommand*{\glsxtrshorthyphenlong}[4]{%
+ {%
+   \glsxtrifhyphenstart{#4}{\def\glsxtrwordsep{-}}{}%
+   \glsfirstabbrvhyphenfont{#2\ifglsxtrinsertinside{#4}\fi}%
+   \ifglsxtrinsertinside\else{#4}\fi
+   \glsxtrfullsep{#1}%
+   \glsxtrparen{\glsfirstlonghyphenfont{#3\ifglsxtrinsertinside{#4}\fi}%
+    \ifglsxtrinsertinside\else{#4}\fi}%
+ }%
+}
+\newabbreviationstyle{short-hyphen-long-hyphen}%
+{%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlonghyphenfont{\the\glslongtok}}},%
+    firstplural={\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlonghyphenfont{\the\glslongpltok}}},%
+    plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}},%
+    description={\protect\glslonghyphenfont{\the\glslongtok}}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \renewcommand*{\abbrvpluralsuffix}{\glsxtrhyphensuffix}%
+  \renewcommand*{\glsabbrvfont}[1]{\glsabbrvhyphenfont{##1}}%
+  \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvhyphenfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonghyphenfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslonghyphenfont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsxtrshorthyphenlong{##1}{\glsaccessshort{##1}}{\glsaccesslong{##1}}{##2}%
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsxtrshorthyphenlong{##1}%
+     {\glsaccessshortpl{##1}}{\glsaccesslongpl{##1}}{##2}%
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsxtrshorthyphenlong{##1}{\glsaccessshort{##1}}{\Glsaccesslong{##1}}{##2}%
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsxtrshorthyphenlong{##1}%
+     {\glsaccessshortpl{##1}}{\Glsaccesslongpl{##1}}{##2}%
+  }%
+}
+\newabbreviationstyle{short-hyphen-long-hyphen-desc}%
+{%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrshortlongdescname},
+    sort={\glsxtrshortlongdescsort},
+    first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlonghyphenfont{\the\glslongtok}}},%
+    firstplural={\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}%
+     \protect\glsxtrfullsep{\the\glslabeltok}%
+     \glsxtrparen{\protect\glsfirstlonghyphenfont{\the\glslongpltok}}},%
+    text={\protect\glsabbrvhyphenfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \GlsXtrUseAbbrStyleFmts{short-hyphen-long-hyphen}%
+}
+\newcommand*{\glsxtrshorthyphen}[3]{%
+ {%
+   \glsxtrifhyphenstart{#3}{\def\glsxtrwordsep{-}}{}%
+   \glsfirstabbrvhyphenfont{#1}%
+ }%
+}
+\newcommand*{\glsxtrposthyphenlong}[2]{%
+ {%
+   \glsxtrifhyphenstart{#2}{\def\glsxtrwordsep{-}}{}%
+   \ifglsxtrinsertinside{\glsfirstabbrvhyphenfont{#2}}\else{#2}\fi
+   \glsxtrfullsep{#1}%
+   \glsxtrparen
+   {\glsfirstlonghyphenfont{\glsentrylong{#1}\ifglsxtrinsertinside{#2}\fi}%
+    \ifglsxtrinsertinside\else{#2}\fi
+   }%
+ }%
+}
+\newabbreviationstyle{short-hyphen-postlong-hyphen}%
+{%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}},%
+    firstplural={\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}},%
+    plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}},%
+    description={\protect\glslonghyphenfont{\the\glslongtok}}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \csdef{glsxtrpostlink\glscategorylabel}{%
+      \glsxtrifwasfirstuse
+      {%
+        \glsxtrposthyphenlong{\glslabel}{\glsinsert}%
+      }%
+      {%
+        \glsxtrposthyphensubsequent{\glslabel}{\glsinsert}%
+      }%
+    }%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \renewcommand*{\abbrvpluralsuffix}{\glsxtrabbrvpluralsuffix}%
+  \renewcommand*{\glsabbrvfont}[1]{\glsabbrvhyphenfont{##1}}%
+  \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvhyphenfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonghyphenfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslonghyphenfont{##1}}%
+  \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+    \glsabbrvfont{\glsaccessshort{##1}}%
+  }%
+  \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+    \glsabbrvfont{\glsaccessshortpl{##1}}%
+  }%
+  \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+    \glsabbrvfont{\Glsaccessshort{##1}}%
+  }%
+  \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+    \glsabbrvfont{\Glsaccessshortpl{##1}}%
+  }%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsxtrshorthyphen{\glsaccessshort{##1}}{##1}{##2}%
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsxtrshorthyphen{\glsaccessshortpl{##1}}{##1}{##2}%
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsxtrshorthyphen{\Glsaccessshort{##1}}{##1}{##2}%
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsxtrshorthyphen{\Glsaccessshortpl{##1}}{##1}{##2}%
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvhyphenfont{\glsaccessshort{##1}%
+      \ifglsxtrinsertinside{##2}\fi}%
+    \ifglsxtrinsertinside \else{##2}\fi
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvhyphenfont{\glsaccessshortpl{##1}%
+      \ifglsxtrinsertinside{##2}\fi}%
+    \ifglsxtrinsertinside \else{##2}\fi
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstabbrvhyphenfont{\Glsaccessshort{##1}%
+      \ifglsxtrinsertinside{##2}\fi}%
+    \ifglsxtrinsertinside \else{##2}\fi
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstabbrvhyphenfont{\Glsaccessshortpl{##1}%
+      \ifglsxtrinsertinside{##2}\fi}%
+    \ifglsxtrinsertinside \else{##2}\fi
+  }%
+}
+\newabbreviationstyle{short-hyphen-postlong-hyphen-desc}%
+{%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtrshortlongdescname},
+    sort={\glsxtrshortlongdescsort},%
+    first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}},%
+    firstplural={\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}},%
+    text={\protect\glsabbrvhyphenfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \csdef{glsxtrpostlink\glscategorylabel}{%
+      \glsxtrifwasfirstuse
+      {%
+        \glsxtrposthyphenlong{\glslabel}{\glsinsert}%
+      }%
+      {%
+        \glsxtrposthyphensubsequent{\glslabel}{\glsinsert}%
+      }%
+    }%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \GlsXtrUseAbbrStyleFmts{short-hyphen-postlong-hyphen}%
+}
+\newcommand*{\glsabbrvonlyfont}{\glsabbrvdefaultfont}%
+\newcommand*{\glsfirstabbrvonlyfont}{\glsabbrvonlyfont}%
+\newcommand*{\glslongonlyfont}{\glslongdefaultfont}%
+\newcommand*{\glsfirstlongonlyfont}{\glslongonlyfont}%
+\newcommand*{\glsxtronlysuffix}{\glsxtrabbrvpluralsuffix}
+\newabbreviationstyle{long-only-short-only}%
+{%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\protect\glsabbrvonlyfont{\the\glsshorttok}},
+    sort={\the\glsshorttok},
+    first={\protect\glsfirstlongonlyfont{\the\glslongtok}},%
+    firstplural={\protect\glsfirstlongonlyfont{\the\glslongpltok}},%
+    plural={\protect\glsabbrvonlyfont{\the\glsshortpltok}},%
+    description={\protect\glslongonlyfont{\the\glslongtok}}}%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtronlysuffix}%
+  \renewcommand*{\glsabbrvfont}[1]{\glsabbrvonlyfont{##1}}%
+  \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvonlyfont{##1}}%
+  \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongonlyfont{##1}}%
+  \renewcommand*{\glslongfont}[1]{\glslongonlyfont{##1}}%
+  \renewcommand*{\glsxtrfullformat}[2]{%
+    \glsfirstlongonlyfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrfullplformat}[2]{%
+    \glsfirstlongonlyfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullformat}[2]{%
+    \glsfirstlongonlyfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\Glsxtrfullplformat}[2]{%
+    \glsfirstlongonlyfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+  }%
+  \renewcommand*{\glsxtrinlinefullformat}[2]{%
+    \glsfirstlongonlyfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvonlyfont{\glsaccessshort{##1}}}%
+  }%
+  \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongonlyfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvonlyfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+    \glsfirstlongonlyfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvonlyfont{\glsaccessshortpl{##1}}}%
+  }%
+  \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+    \glsfirstlongonlyfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
+    \glsxtrparen{\protect\glsfirstabbrvonlyfont{\Glsaccessshortpl{##1}}}%
+  }%
+}
+\newcommand*{\glsxtronlydescsort}{\the\glslongtok}
+\newcommand*{\glsxtronlydescname}{%
+  \protect\glslongfont{\the\glslongtok}%
+}
+\newabbreviationstyle{long-only-short-only-desc}%
+{%
+  \renewcommand*{\CustomAbbreviationFields}{%
+    name={\glsxtronlydescname},
+    sort={\glsxtronlydescsort},%
+    first={\protect\glsfirstlongonlyfont{\the\glslongtok}},%
+    firstplural={\protect\glsfirstlongonlyfont{\the\glslongpltok}},%
+    text={\protect\glsabbrvonlyfont{\the\glsshorttok}},%
+    plural={\protect\glsabbrvonlyfont{\the\glsshortpltok}}%
+  }%
+  \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+    \glshasattribute{\the\glslabeltok}{regular}%
+    {%
+      \glssetattribute{\the\glslabeltok}{regular}{false}%
+    }%
+    {}%
+  }%
+}%
+{%
+  \GlsXtrUseAbbrStyleFmts{long-only-short-only}%
+}
 \let\@glsxtr@org@markright\markright
 \renewcommand*{\markright}[1]{%
  \glsxtrmarkhook