1 files changed, 403 insertions, 52 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
index 3b1643d23f4..4de2e2d245e 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
@@ -21,7 +21,7 @@
 %% 
 %%  The Current Maintainer of this work is Nicola Talbot.
 %% 
-%%  This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived file glossaries-extra.sty.
+%%  This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty.
 %% 
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -39,7 +39,7 @@
 %%   Grave accent  \`     Left brace    \{     Vertical bar  \|
 %%   Right brace   \}     Tilde         \~}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2016/02/02 v1.01 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2016/04/25 v1.02 (NLCT)]
 \RequirePackage{xkeyval}
 \RequirePackage{etoolbox}
 \@ifpackageloaded{glossaries}
@@ -232,6 +232,33 @@
      }%
    \fi
  }
+\newcommand*{\@glsxtr@redefstyles}{}
+\define@key{glossaries-extra.sty}{stylemods}{%
+  \ifblank{#1}%
+  {%
+    \renewcommand*{\@glsxtr@redefstyles}{%
+      \RequirePackage{glossaries-extra-stylemods}}%
+  }%
+  {%
+    \renewcommand*{\@glsxtr@redefstyles}{}%
+    \@for\@glsxtr@tmp:=#1\do{%
+      \IfFileExists{glossary-\@glsxtr@tmp.sty}%
+      {%
+        \eappto\@glsxtr@redefstyles{%
+          \noexpand\RequirePackage{glossary-\@glsxtr@tmp}}%
+      }%
+      {%
+         \PackageError{glossaries-extra}%
+           {Glossaries style package `glossary-\@glsxtr@tmp.sty'
+            doesn't exist (did you mean to use the `style' key?)}%
+           {The list of values (#1) in the `styles' key should
+            match the glossary-xxx.sty files provided with
+            glossaries.sty}%
+      }%
+    }%
+    \appto\@glsxtr@redefstyles{\RequirePackage{glossaries-extra-stylemods}}%
+  }%
+}
 \DeclareOptionX*{%
  \expandafter\glsxtr@dooption\expandafter{\CurrentOption}}
 \ProcessOptionsX
@@ -501,6 +528,25 @@
   \let\GlsXtrEnableOnTheFly\relax
 }
 \@onlypreamble\GlsXtrEnableOnTheFly
+\newcommand*{\@glsxtr@current@style}{\@glossary@default@style}
+\renewcommand*{\setglossarystyle}[1]{%
+  \ifcsundef{@glsstyle@#1}%
+  {%
+    \PackageError{glossaries}{Glossary style `#1' undefined}{}%
+  }%
+  {%
+    \csname @glsstyle@#1\endcsname
+    \protected@edef\@glsxtr@current@style{#1}%
+  }%
+  \ifx\@glossary@default@style\relax
+    \protected@edef\@glossary@default@style{#1}%
+  \fi
+}
+\ifdef\@glossary@default@style
+{}
+{%
+  \let\@glossary@default@style\relax
+}
 \ifdef\glslistdottedwidth
 {%
   \ifdim\glslistdottedwidth=.5\hsize
@@ -3792,6 +3838,8 @@ want
      \csname @glsabbrv@dispstyle@fmts@#1\endcsname
   }%
 }
+\newif\ifglsxtrinsertinside
+\glsxtrinsertinsidefalse
 \newabbreviationstyle{long-short}%
 {%
   \renewcommand*{\CustomAbbreviationFields}{%
@@ -3819,19 +3867,24 @@ want
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
   \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
   \renewcommand*{\glsxtrfullformat}[2]{%
-    \glsfirstlongfont{\glsaccesslong{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
     (\glsfirstabbrvfont{\glsaccessshort{##1}})%
   }%
   \renewcommand*{\glsxtrfullplformat}[2]{%
-    \glsfirstlongfont{\glsaccesslongpl{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstabbrvfont{\glsaccessshortpl{##1}})%
   }%
   \renewcommand*{\Glsxtrfullformat}[2]{%
-    \glsfirstlongfont{\Glsaccesslong{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstabbrvfont{\glsaccessshort{##1}})%
   }%
   \renewcommand*{\Glsxtrfullplformat}[2]{%
-    \glsfirstlongfont{\Glsaccesslongpl{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstabbrvfont{\glsaccessshortpl{##1}})%
   }%
 }
@@ -3886,19 +3939,25 @@ want
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
   \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
   \renewcommand*{\glsxtrfullformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslong{##1}})%
   }%
   \renewcommand*{\glsxtrfullplformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
+    \glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslongpl{##1}})%
   }%
   \renewcommand*{\Glsxtrfullformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshort{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslong{##1}})%
   }%
   \renewcommand*{\Glsxtrfullplformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslongpl{##1}})%
   }%
 }
@@ -3951,35 +4010,43 @@ want
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
   \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
   \renewcommand*{\glsxtrfullformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshort{##1}}##2%
+    \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
     \protect\footnote{\glsfirstlongfont{\glsaccesslong{##1}}}%
   }%
   \renewcommand*{\glsxtrfullplformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2%
+    \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
     \protect\footnote{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
   }%
   \renewcommand*{\Glsxtrfullformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshort{##1}}##2%
+    \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
     \protect\footnote{\glsfirstlongfont{\glsaccesslong{##1}}}%
   }%
   \renewcommand*{\Glsxtrfullplformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2%
+    \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
     \protect\footnote{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
   }%
   \renewcommand*{\glsxtrinlinefullformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslong{##1}})%
   }%
   \renewcommand*{\glsxtrinlinefullplformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslongpl{##1}})%
   }%
   \renewcommand*{\Glsxtrinlinefullformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshort{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslong{##1}})%
   }%
   \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslongpl{##1}})%
   }%
 }
@@ -3996,8 +4063,12 @@ want
     plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
   \renewcommand*{\GlsXtrPostNewAbbreviation}{%
     \csdef{glsxtrpostlink\glscategorylabel}{%
-      \glsxtrifwasfirstuse{\glsxtrdopostpunc{\protect\footnote
-        {\glsfirstlongfont{\glsentrylong{\glslabel}}}}}{}%
+      \glsxtrifwasfirstuse
+      {%
+        \glsxtrdopostpunc{\protect\footnote
+        {\glsfirstlongfont{\glsentrylong{\glslabel}}}}%
+      }%
+      {}%
     }%
     \glshasattribute{\the\glslabeltok}{regular}%
     {%
@@ -4005,6 +4076,9 @@ want
     }%
     {}%
   }%
+  \renewcommand*{\glsxtrsetupfulldefs}{%
+    \let\glsxtrifwasfirstuse\@secondoftwo
+  }%
 }%
 {%
   \renewcommand*{\abbrvpluralsuffix}{\glspluralsuffix}%
@@ -4012,31 +4086,39 @@ want
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
   \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
   \renewcommand*{\glsxtrfullformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshort{##1}}##2%
+    \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\glsxtrfullplformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2%
+    \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\Glsxtrfullformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshort{##1}}##2%
+    \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\Glsxtrfullplformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2%
+    \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\glsxtrinlinefullformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslong{##1}})%
   }%
   \renewcommand*{\glsxtrinlinefullplformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslongpl{##1}})%
   }%
   \renewcommand*{\Glsxtrinlinefullformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshort{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslong{##1}})%
   }%
   \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslongpl{##1}})%
   }%
 }
@@ -4059,32 +4141,44 @@ want
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
   \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
   \renewcommand*{\glsxtrinlinefullformat}[2]{%
-    \protect\glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}%
+    \protect\glsfirstabbrvfont{\glsaccessshort{##1}%
+      \ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslong{##1}})%
   }%
   \renewcommand*{\glsxtrinlinefullplformat}[2]{%
-    \protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}%
+    \protect\glsfirstabbrvfont{\glsaccessshortpl{##1}%
+     \ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslongpl{##1}})%
   }%
   \renewcommand*{\Glsxtrinlinefullformat}[2]{%
-    \protect\glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}%
+    \protect\glsfirstabbrvfont{\glsaccessshort{##1}%
+      \ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\Glsaccesslong{##1}})%
   }%
   \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
-    \protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}%
+    \protect\glsfirstabbrvfont{\glsaccessshortpl{##1}%
+       \ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\Glsaccesslongpl{##1}})%
   }%
   \renewcommand*{\glsxtrfullformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshort{##1}}##2%
+    \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\glsxtrfullplformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2%
+    \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\Glsxtrfullformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshort{##1}}##2%
+    \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\Glsxtrfullplformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2%
+    \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
   }%
 }
 \setabbreviationstyle[acronym]{short}
@@ -4107,32 +4201,40 @@ want
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
   \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
   \renewcommand*{\glsxtrinlinefullformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslong{##1}})%
   }%
   \renewcommand*{\glsxtrinlinefullplformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslongpl{##1}})%
   }%
   \renewcommand*{\Glsxtrinlinefullformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshort{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslong{##1}})%
   }%
   \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
-    \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\glsfirstlongfont{\glsaccesslongpl{##1}})%
   }%
   \renewcommand*{\glsxtrfullformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshort{##1}}##2%
+    \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\glsxtrfullplformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2%
+    \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\Glsxtrfullformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshort{##1}}##2%
+    \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\Glsxtrfullplformat}[2]{%
-    \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2%
+    \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi
   }%
 }
 \newabbreviationstyle{long-desc}%
@@ -4154,32 +4256,40 @@ want
   \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
   \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
   \renewcommand*{\glsxtrinlinefullformat}[2]{%
-    \glsfirstlongfont{\glsaccesslong{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\protect\glsfirstabbrvfont{\glsaccessshort{##1}})%
   }%
   \renewcommand*{\glsxtrinlinefullplformat}[2]{%
-    \glsfirstlongfont{\glsaccesslongpl{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}})%
   }%
   \renewcommand*{\Glsxtrinlinefullformat}[2]{%
-    \glsfirstlongfont{\Glsaccesslong{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\protect\glsfirstabbrvfont{\glsaccessshort{##1}})%
   }%
   \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
-    \glsfirstlongfont{\Glsaccesslongpl{##1}}##2\glsxtrfullsep{##1}%
+    \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+     \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
     (\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}})%
   }%
   \renewcommand*{\glsxtrfullformat}[2]{%
-    \glsfirstlongfont{\glsaccesslong{##1}}##2%
+    \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\glsxtrfullplformat}[2]{%
-    \glsfirstlongfont{\glsaccesslongpl{##1}}##2%
+    \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\Glsxtrfullformat}[2]{%
-    \glsfirstlongfont{\glsaccesslong{##1}}##2%
+    \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
   }%
   \renewcommand*{\Glsxtrfullplformat}[2]{%
-    \glsfirstlongfont{\glsaccesslongpl{##1}}##2%
+    \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+    \ifglsxtrinsertinside\else##2\fi
   }%
 }
 \newabbreviationstyle{long}%
@@ -4493,6 +4603,14 @@ want
   \let\@glsxtr@org@Glsxtrtitlefirst\Glsxtrtitlefirst
   \let\@glsxtr@org@glsxtrtitlefirstplural\glsxtrtitlefirstplural
   \let\@glsxtr@org@Glsxtrtitlefirstplural\Glsxtrtitlefirstplural
+  \let\@glsxtr@org@glsxtrtitlelong\glsxtrtitlelong
+  \let\@glsxtr@org@glsxtrtitlelongpl\glsxtrtitlelongpl
+  \let\@glsxtr@org@Glsxtrtitlelong\Glsxtrtitlelong
+  \let\@glsxtr@org@Glsxtrtitlelongpl\Glsxtrtitlelongpl
+  \let\@glsxtr@org@glsxtrtitlefull\glsxtrtitlefull
+  \let\@glsxtr@org@glsxtrtitlefullpl\glsxtrtitlefullpl
+  \let\@glsxtr@org@Glsxtrtitlefull\Glsxtrtitlefull
+  \let\@glsxtr@org@Glsxtrtitlefullpl\Glsxtrtitlefullpl
   \let\MakeUppercase\MakeTextUppercase
   \let\glsxtrtitleshort\glsxtrheadshort
   \let\glsxtrtitleshortpl\glsxtrheadshortpl
@@ -4506,6 +4624,14 @@ want
   \let\Glsxtrtitlefirst\Glsxtrheadfirst
   \let\glsxtrtitlefirstplural\glsxtrheadfirstplural
   \let\Glsxtrtitlefirstplural\Glsxtrheadfirstplural
+  \let\glsxtrtitlelong\glsxtrheadlong
+  \let\glsxtrtitlelongpl\glsxtrheadlongpl
+  \let\Glsxtrtitlelong\Glsxtrheadlong
+  \let\Glsxtrtitlelongpl\Glsxtrheadlongpl
+  \let\glsxtrtitlefull\glsxtrheadfull
+  \let\glsxtrtitlefullpl\glsxtrheadfullpl
+  \let\Glsxtrtitlefull\Glsxtrheadfull
+  \let\Glsxtrtitlefullpl\Glsxtrheadfullpl
 }
 \newcommand*{\glsxtrrestoremarkhook}{%
   \let\MakeUppercase\@glsxtr@org@MakeUppercase
@@ -4521,6 +4647,14 @@ want
   \let\Glsxtrtitlefirst\@glsxtr@org@Glsxtrtitlefirst
   \let\glsxtrtitlefirstplural\@glsxtr@org@glsxtrtitlefirstplural
   \let\Glsxtrtitlefirstplural\@glsxtr@org@Glsxtrtitlefirstplural
+  \let\glsxtrtitlelong\@glsxtr@org@glsxtrtitlelong
+  \let\glsxtrtitlelongpl\@glsxtr@org@glsxtrtitlelongpl
+  \let\Glsxtrtitlelong\@glsxtr@org@Glsxtrtitlelong
+  \let\Glsxtrtitlelongpl\@glsxtr@org@Glsxtrtitlelongpl
+  \let\glsxtrtitlefull\@glsxtr@org@glsxtrtitlefull
+  \let\glsxtrtitlefullpl\@glsxtr@org@glsxtrtitlefullpl
+  \let\Glsxtrtitlefull\@glsxtr@org@Glsxtrtitlefull
+  \let\Glsxtrtitlefullpl\@glsxtr@org@Glsxtrtitlefullpl
 }
 \newcommand*{\glsxtrheadshort}[1]{%
  \protect\NoCaseChange
@@ -4702,6 +4836,126 @@ want
 \newrobustcmd*{\Glsxtrtitlefirstplural}[1]{%
   \Glsfirstplural[noindex,hyper=false]{#1}[]%
 }
+\newcommand*{\glsxtrheadlong}[1]{%
+ \protect\NoCaseChange
+ {%
+   \glsifattribute{#1}{headuc}{true}%
+   {%
+     \GLSxtrlong[noindex,hyper=false]{#1}[]%
+   }%
+   {%
+     \glsxtrlong[noindex,hyper=false]{#1}[]%
+   }%
+ }%
+}
+\newrobustcmd*{\glsxtrtitlelong}[1]{%
+  \glsxtrlong[noindex,hyper=false]{#1}[]%
+}
+\newcommand*{\glsxtrheadlongpl}[1]{%
+ \protect\NoCaseChange
+ {%
+   \glsifattribute{#1}{headuc}{true}%
+   {%
+      \GLSxtrlongpl[noindex,hyper=false]{#1}[]%
+   }%
+   {%
+      \glsxtrlongpl[noindex,hyper=false]{#1}[]%
+   }%
+ }%
+}
+\newrobustcmd*{\glsxtrtitlelongpl}[1]{%
+  \glsxtrlong[noindex,hyper=false]{#1}[]%
+}
+\newcommand*{\Glsxtrheadlong}[1]{%
+ \protect\NoCaseChange
+ {%
+   \glsifattribute{#1}{headuc}{true}%
+   {%
+     \GLSxtrlong[noindex,hyper=false]{#1}[]%
+   }%
+   {%
+     \Glsxtrlong[noindex,hyper=false]{#1}[]%
+   }%
+ }%
+}
+\newrobustcmd*{\Glsxtrtitlelong}[1]{%
+  \Glsxtrlong[noindex,hyper=false]{#1}[]%
+}
+\newcommand*{\Glsxtrheadlongpl}[1]{%
+ \protect\NoCaseChange
+ {%
+   \glsifattribute{#1}{headuc}{true}%
+   {%
+     \GLSxtrlongpl[noindex,hyper=false]{#1}[]%
+   }%
+   {%
+     \Glsxtrlongpl[noindex,hyper=false]{#1}[]%
+   }%
+ }%
+}
+\newrobustcmd*{\Glsxtrtitlelongpl}[1]{%
+  \Glsxtrlongpl[noindex,hyper=false]{#1}[]%
+}
+\newcommand*{\glsxtrheadfull}[1]{%
+ \protect\NoCaseChange
+ {%
+   \glsifattribute{#1}{headuc}{true}%
+   {%
+     \GLSxtrfull[noindex,hyper=false]{#1}[]%
+   }%
+   {%
+     \glsxtrfull[noindex,hyper=false]{#1}[]%
+   }%
+ }%
+}
+\newrobustcmd*{\glsxtrtitlefull}[1]{%
+  \glsxtrfull[noindex,hyper=false]{#1}[]%
+}
+\newcommand*{\glsxtrheadfullpl}[1]{%
+ \protect\NoCaseChange
+ {%
+   \glsifattribute{#1}{headuc}{true}%
+   {%
+      \GLSxtrfullpl[noindex,hyper=false]{#1}[]%
+   }%
+   {%
+      \glsxtrfullpl[noindex,hyper=false]{#1}[]%
+   }%
+ }%
+}
+\newrobustcmd*{\glsxtrtitlefullpl}[1]{%
+  \glsxtrfullpl[noindex,hyper=false]{#1}[]%
+}
+\newcommand*{\Glsxtrheadfull}[1]{%
+ \protect\NoCaseChange
+ {%
+   \glsifattribute{#1}{headuc}{true}%
+   {%
+     \GLSxtrfull[noindex,hyper=false]{#1}[]%
+   }%
+   {%
+     \Glsxtrfull[noindex,hyper=false]{#1}[]%
+   }%
+ }%
+}
+\newrobustcmd*{\Glsxtrtitlefull}[1]{%
+  \Glsxtrfull[noindex,hyper=false]{#1}[]%
+}
+\newcommand*{\Glsxtrheadfullpl}[1]{%
+ \protect\NoCaseChange
+ {%
+   \glsifattribute{#1}{headuc}{true}%
+   {%
+     \GLSxtrfullpl[noindex,hyper=false]{#1}[]%
+   }%
+   {%
+     \Glsxtrfullpl[noindex,hyper=false]{#1}[]%
+   }%
+ }%
+}
+\newrobustcmd*{\Glsxtrtitlefullpl}[1]{%
+  \Glsxtrfullpl[noindex,hyper=false]{#1}[]%
+}
 \ifdef\texorpdfstring
 {
   \newcommand*{\glsfmtshort}[1]{%
@@ -4846,6 +5100,102 @@ want
   \newcommand*{\Glsfmtfirstpl}[1]{%
    \Glsxtrtitlefirstplural{#1}}
 }
+\ifdef\texorpdfstring
+{
+  \newcommand*{\glsfmtlong}[1]{%
+    \texorpdfstring
+    {\glsxtrtitlelong{#1}}%
+    {\glsentrylong{#1}}%
+  }
+}
+{
+  \newcommand*{\glsfmtlong}[1]{%
+   \glsxtrtitlelong{#1}}
+}
+\ifdef\texorpdfstring
+{
+  \newcommand*{\Glsfmtlong}[1]{%
+    \texorpdfstring
+    {\Glsxtrtitlelong{#1}}%
+    {\glsentrylong{#1}}%
+  }
+}
+{
+  \newcommand*{\Glsfmtlong}[1]{%
+   \Glsxtrtitlelong{#1}}
+}
+\ifdef\texorpdfstring
+{
+  \newcommand*{\glsfmtlongpl}[1]{%
+    \texorpdfstring
+    {\glsxtrtitlelongpl{#1}}%
+    {\glsentrylongpl{#1}}%
+  }
+}
+{
+  \newcommand*{\glsfmtlongpl}[1]{%
+   \glsxtrtitlelongpl{#1}}
+}
+\ifdef\texorpdfstring
+{
+  \newcommand*{\Glsfmtlongpl}[1]{%
+    \texorpdfstring
+    {\Glsxtrtitlelongpl{#1}}%
+    {\glsentrylongpl{#1}}%
+  }
+}
+{
+  \newcommand*{\Glsfmtlongpl}[1]{%
+   \Glsxtrtitlelongpl{#1}}
+}
+\ifdef\texorpdfstring
+{
+  \newcommand*{\glsfmtfull}[1]{%
+    \texorpdfstring
+    {\glsxtrtitlefull{#1}}%
+    {\glsxtrinlinefullformat{#1}{}}%
+  }
+}
+{
+  \newcommand*{\glsfmtfull}[1]{%
+   \glsxtrtitlefull{#1}}
+}
+\ifdef\texorpdfstring
+{
+  \newcommand*{\Glsfmtfull}[1]{%
+    \texorpdfstring
+    {\Glsxtrtitlefull{#1}}%
+    {\Glsxtrinlinefullformat{#1}{}}%
+  }
+}
+{
+  \newcommand*{\Glsfmtfull}[1]{%
+   \Glsxtrtitlefull{#1}}
+}
+\ifdef\texorpdfstring
+{
+  \newcommand*{\glsfmtfullpl}[1]{%
+    \texorpdfstring
+    {\glsxtrtitlefullpl{#1}}%
+    {\glsxtrinlinefullplformat{#1}{}}%
+  }
+}
+{
+  \newcommand*{\glsfmtfullpl}[1]{%
+   \glsxtrtitlefullpl{#1}}
+}
+\ifdef\texorpdfstring
+{
+  \newcommand*{\Glsfmtfullpl}[1]{%
+    \texorpdfstring
+    {\Glsxtrtitlefullpl{#1}}%
+    {\Glsxtrinlinefullplformat{#1}{}}%
+  }
+}
+{
+  \newcommand*{\Glsfmtfullpl}[1]{%
+   \Glsxtrtitlefullpl{#1}}
+}
 \newcommand*{\RequireGlossariesExtraLang}[1]{%
   \@ifundefined{ver@glossariesxtr-#1.ldf}{\input{glossariesxtr-#1.ldf}}{}%
 }
@@ -4870,6 +5220,7 @@ want
   {}%
 }
 {}
+\@glsxtr@redefstyles
 \endinput
 %%
 %% End of file `glossaries-extra.sty'.