summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/glossaries-extra
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-04-25 21:49:55 +0000
committerKarl Berry <karl@freefriends.org>2016-04-25 21:49:55 +0000
commitad6971d5fe287aa59138369c498a8037d6832589 (patch)
tree33e9afe811868f334669aa822eb3d3cdc8aa7961 /Master/texmf-dist/source/latex/glossaries-extra
parentbcd63dd9814f27dfadde30f6a94c2c376ea0a9fd (diff)
glossaries-extra (25apr16)
git-svn-id: svn://tug.org/texlive/trunk@40746 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/glossaries-extra')
-rw-r--r--Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx1080
-rw-r--r--Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins6
2 files changed, 1023 insertions, 63 deletions
diff --git a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
index 953ec51a6c9..ec1f5a8514a 100644
--- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
+++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
@@ -1,13 +1,14 @@
%\iffalse
% glossaries-extra.dtx generated using makedtx version 1.1 (c) Nicola Talbot
% Command line args:
-% -codetitle "Main Package Code"
-% -doc "glossaries-extra-codedoc.tex"
+% -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})"
% -section "chapter"
-% -src "glossaries-extra.sty\Z=>glossaries-extra.sty"
% -author "Nicola Talbot"
+% -doc "glossaries-extra-codedoc.tex"
+% -src "glossaries-extra.sty\Z=>glossaries-extra.sty"
+% -src "glossaries-extra-stylemods.sty\Z=>glossaries-extra-stylemods.sty"
% glossaries-extra
-% Created on 2016/2/2 12:31
+% Created on 2016/4/25 12:22
%\fi
%\iffalse
%<*package>
@@ -116,7 +117,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\setcounter{IndexColumns}{2}
-\CheckSum{6812}
+\CheckSum{7699}
\newcommand*{\ifirstuse}{\iterm{first use}}
\newcommand*{\firstuse}{\gls{firstuse}}
@@ -152,13 +153,13 @@ styles (glossaries):>#1={\protect\ttfamily#1}|main}}
\raggedright
}
-\title{glossaries-extra.sty v1.01:
+\title{glossaries-extra.sty v1.02:
documented code}
\author{Nicola L.C. Talbot\\[10pt]
Dickimaw Books\\
\url{http://www.dickimaw-books.com/}}
-\date{2016-02-02}
+\date{2016-04-25}
\begin{document}
\DocInput{glossaries-extra.dtx}
@@ -193,7 +194,7 @@ Dickimaw Books\\
%
%
%
-%\chapter{Main Package Code}
+%\chapter{Main Package Code (\styfmt{glossaries-extra.sty})}
%\iffalse
% \begin{macrocode}
%<*glossaries-extra.sty>
@@ -203,7 +204,7 @@ Dickimaw Books\\
%\section{Package Initialisation and Options}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2016/02/02 v1.01 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2016/04/25 v1.02 (NLCT)]
% \end{macrocode}
% Requires \sty{xkeyval} to define package options.
% \begin{macrocode}
@@ -572,6 +573,46 @@ Dickimaw Books\\
% \end{macrocode}
%\end{option}
%
+% Provide option to load \sty{glossaries-extra-stylemods}
+% (Deferred to the end.)
+%\begin{macro}{\@glsxtr@redefstyles}
+% \begin{macrocode}
+\newcommand*{\@glsxtr@redefstyles}{}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{option}{stylemods}
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\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}}%
+ }%
+}
+% \end{macrocode}
+%\end{option}
+%
% Pass all other options to \sty{glossaries}.
% \begin{macrocode}
\DeclareOptionX*{%
@@ -1105,6 +1146,47 @@ Dickimaw Books\\
%
%\subsection{Existing Glossary Style Modifications}
%
+% Modify \cs{setglossarystyle} to keep track of the current style.
+% This allows the \cs{glossaries-extra-stylemods} package to reset the
+% current style after the required modifications have been made.
+%\begin{macro}{\@glsxtr@current@style}
+%\changes{1.02}{2016-04-25}{new}
+% Initialise the current style to the default style.
+% \begin{macrocode}
+\newcommand*{\@glsxtr@current@style}{\@glossary@default@style}
+% \end{macrocode}
+%\end{macro}
+% Modify \cs{setglossarystyle} to set the above.
+%\begin{macro}{\setglossarystyle}
+% \begin{macrocode}
+\renewcommand*{\setglossarystyle}[1]{%
+ \ifcsundef{@glsstyle@#1}%
+ {%
+ \PackageError{glossaries}{Glossary style `#1' undefined}{}%
+ }%
+ {%
+ \csname @glsstyle@#1\endcsname
+% \end{macrocode}
+% Only set the current style if it exists.
+% \begin{macrocode}
+ \protected@edef\@glsxtr@current@style{#1}%
+ }%
+ \ifx\@glossary@default@style\relax
+ \protected@edef\@glossary@default@style{#1}%
+ \fi
+}
+% \end{macrocode}
+%\end{macro}
+%
+% In case we have an old version of \sty{glossaries}:
+% \begin{macrocode}
+\ifdef\@glossary@default@style
+{}
+{%
+ \let\@glossary@default@style\relax
+}
+% \end{macrocode}
+%
%\begin{macro}{\glslistdottedwidth}
%If \cs{glslistdottedwidth} has been defined and is currently equal
%to \verb|.5\hsize| then make the modification suggested in
@@ -6440,8 +6522,10 @@ want
%\begin{macro}{\glsxtrpostdescription}
%This command will only be used if \cs{@gls@preglossaryhook} is
%available \emph{and} the glossary style uses
-%\cs{glspostdescription} without modifying it. (The nopostdesc
-%option will suppress this.)
+%\cs{glspostdescription} without modifying it. (\cs{nopostdesc}
+%will suppress this.) The \sty{glossaries-extra-stylemods} package will
+%add the post description hook to all the predefined styles that
+%don't include it.
% \begin{macrocode}
\newcommand*{\glsxtrpostdescription}{%
\csuse{glsxtrpostdesc\glscategory{\glscurrententrylabel}}%
@@ -7957,6 +8041,17 @@ want
% those keys are set. The final optional argument of \cs{glsfirst}
% will behave differently to the final optional argument of \cs{gls}
% with some styles.
+%
+%\begin{macro}{\ifglsxtrinsertinside}
+%\changes{1.02}{2016-04-25}{new}
+% Switch to determine if the insert text should be inside or outside
+% the font changing command. The default is outside.
+% \begin{macrocode}
+\newif\ifglsxtrinsertinside
+\glsxtrinsertinsidefalse
+% \end{macrocode}
+%\end{macro}
+%
%\begin{abbrvstyle}{long-short}
% \begin{macrocode}
\newabbreviationstyle{long-short}%
@@ -7998,19 +8093,24 @@ want
% this style.
% \begin{macrocode}
\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}})%
}%
}
@@ -8098,19 +8198,25 @@ want
% this style.
% \begin{macrocode}
\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}})%
}%
}
@@ -8196,19 +8302,23 @@ want
% as a footnote.
% \begin{macrocode}
\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}}}%
}%
% \end{macrocode}
@@ -8216,19 +8326,23 @@ want
% (long) style.
% \begin{macrocode}
\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}})%
}%
}
@@ -8260,8 +8374,12 @@ want
% \begin{macrocode}
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\csdef{glsxtrpostlink\glscategorylabel}{%
- \glsxtrifwasfirstuse{\glsxtrdopostpunc{\protect\footnote
- {\glsfirstlongfont{\glsentrylong{\glslabel}}}}}{}%
+ \glsxtrifwasfirstuse
+ {%
+ \glsxtrdopostpunc{\protect\footnote
+ {\glsfirstlongfont{\glsentrylong{\glslabel}}}}%
+ }%
+ {}%
}%
\glshasattribute{\the\glslabeltok}{regular}%
{%
@@ -8269,6 +8387,14 @@ want
}%
{}%
}%
+% \end{macrocode}
+%\changes{1.02}{2016-04-25}{added redef of \cs{glsxtrsetupfulldefs}}
+% The footnote needs to be suppressed in the inline form, so
+% \cs{glsxtrfull} must set the first use switch off.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrsetupfulldefs}{%
+ \let\glsxtrifwasfirstuse\@secondoftwo
+ }%
}%
{%
% \end{macrocode}
@@ -8284,35 +8410,43 @@ want
% deferred.
% \begin{macrocode}
\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
}%
% \end{macrocode}
% The first use full form and the inline full form use the short
% (long) style.
% \begin{macrocode}
\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}})%
}%
}
@@ -8356,19 +8490,27 @@ want
%\changes{0.2}{2015-11-30}{switched inline full form to short (long)}
% \begin{macrocode}
\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}})%
}%
% \end{macrocode}
@@ -8376,16 +8518,20 @@ want
% typically won't be used as the \catattr{regular} attribute is set by this style.
% \begin{macrocode}
\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
}%
}
% \end{macrocode}
@@ -8429,19 +8575,23 @@ want
% long form in parentheses.
% \begin{macrocode}
\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}})%
}%
% \end{macrocode}
@@ -8449,16 +8599,20 @@ want
% typically won't be used as the \catattr{regular} attribute is set by this style.
% \begin{macrocode}
\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
}%
}
% \end{macrocode}
@@ -8498,19 +8652,23 @@ want
% short form in parentheses.
% \begin{macrocode}
\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}})%
}%
% \end{macrocode}
@@ -8518,16 +8676,20 @@ want
% typically won't be used as the \catattr{regular} attribute is set by this style.
% \begin{macrocode}
\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
}%
}
% \end{macrocode}
@@ -9267,6 +9429,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
% \end{macrocode}
% New definitions
% \begin{macrocode}
@@ -9283,6 +9453,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
}
% \end{macrocode}
%\end{macro}
@@ -9309,6 +9487,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
}
% \end{macrocode}
%\end{macro}
@@ -9672,6 +9858,256 @@ want
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glsxtrheadlong}
+% Command used to display long form in the page header.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrheadlong}[1]{%
+ \protect\NoCaseChange
+ {%
+ \glsifattribute{#1}{headuc}{true}%
+ {%
+ \GLSxtrlong[noindex,hyper=false]{#1}[]%
+ }%
+ {%
+ \glsxtrlong[noindex,hyper=false]{#1}[]%
+ }%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtrtitlelong}
+% Command to display long form of abbreviation in section title and
+% table of contents.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\newrobustcmd*{\glsxtrtitlelong}[1]{%
+ \glsxtrlong[noindex,hyper=false]{#1}[]%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtrheadlongpl}
+% Command used to display plural long form in the page header.
+% If you want the text converted to upper case, this needs to be
+% redefined to use \cs{GLSxtrlongpl} instead. If you are using a
+% smallcaps style, the default fonts don't provide italic smallcaps.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrheadlongpl}[1]{%
+ \protect\NoCaseChange
+ {%
+ \glsifattribute{#1}{headuc}{true}%
+ {%
+ \GLSxtrlongpl[noindex,hyper=false]{#1}[]%
+ }%
+ {%
+ \glsxtrlongpl[noindex,hyper=false]{#1}[]%
+ }%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtrtitlelongpl}
+% Command to display plural long form of abbreviation in section title and
+% table of contents.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\newrobustcmd*{\glsxtrtitlelongpl}[1]{%
+ \glsxtrlong[noindex,hyper=false]{#1}[]%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\Glsxtrheadlong}
+% Command used to display long form in the page header with the
+% first letter converted to upper case.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\newcommand*{\Glsxtrheadlong}[1]{%
+ \protect\NoCaseChange
+ {%
+ \glsifattribute{#1}{headuc}{true}%
+ {%
+ \GLSxtrlong[noindex,hyper=false]{#1}[]%
+ }%
+ {%
+ \Glsxtrlong[noindex,hyper=false]{#1}[]%
+ }%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\Glsxtrtitlelong}
+% Command to display long form of abbreviation in section title and
+% table of contents with the first letter converted to upper case.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\newrobustcmd*{\Glsxtrtitlelong}[1]{%
+ \Glsxtrlong[noindex,hyper=false]{#1}[]%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\Glsxtrheadlongpl}
+% Command used to display plural long form in the page header with the
+% first letter converted to upper case.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\newcommand*{\Glsxtrheadlongpl}[1]{%
+ \protect\NoCaseChange
+ {%
+ \glsifattribute{#1}{headuc}{true}%
+ {%
+ \GLSxtrlongpl[noindex,hyper=false]{#1}[]%
+ }%
+ {%
+ \Glsxtrlongpl[noindex,hyper=false]{#1}[]%
+ }%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\Glsxtrtitlelongpl}
+% Command to display plural long form of abbreviation in section title and
+% table of contents with the first letter converted to upper case.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\newrobustcmd*{\Glsxtrtitlelongpl}[1]{%
+ \Glsxtrlongpl[noindex,hyper=false]{#1}[]%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtrheadfull}
+% Command used to display full form in the page header.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrheadfull}[1]{%
+ \protect\NoCaseChange
+ {%
+ \glsifattribute{#1}{headuc}{true}%
+ {%
+ \GLSxtrfull[noindex,hyper=false]{#1}[]%
+ }%
+ {%
+ \glsxtrfull[noindex,hyper=false]{#1}[]%
+ }%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtrtitlefull}
+% Command to display full form of abbreviation in section title and
+% table of contents.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\newrobustcmd*{\glsxtrtitlefull}[1]{%
+ \glsxtrfull[noindex,hyper=false]{#1}[]%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtrheadfullpl}
+% Command used to display plural full form in the page header.
+% If you want the text converted to upper case, this needs to be
+% redefined to use \cs{GLSxtrfullpl} instead. If you are using a
+% smallcaps style, the default fonts don't provide italic smallcaps.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrheadfullpl}[1]{%
+ \protect\NoCaseChange
+ {%
+ \glsifattribute{#1}{headuc}{true}%
+ {%
+ \GLSxtrfullpl[noindex,hyper=false]{#1}[]%
+ }%
+ {%
+ \glsxtrfullpl[noindex,hyper=false]{#1}[]%
+ }%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtrtitlefullpl}
+% Command to display plural full form of abbreviation in section title and
+% table of contents.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\newrobustcmd*{\glsxtrtitlefullpl}[1]{%
+ \glsxtrfullpl[noindex,hyper=false]{#1}[]%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\Glsxtrheadfull}
+% Command used to display full form in the page header with the
+% first letter converted to upper case.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\newcommand*{\Glsxtrheadfull}[1]{%
+ \protect\NoCaseChange
+ {%
+ \glsifattribute{#1}{headuc}{true}%
+ {%
+ \GLSxtrfull[noindex,hyper=false]{#1}[]%
+ }%
+ {%
+ \Glsxtrfull[noindex,hyper=false]{#1}[]%
+ }%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\Glsxtrtitlefull}
+% Command to display full form of abbreviation in section title and
+% table of contents with the first letter converted to upper case.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\newrobustcmd*{\Glsxtrtitlefull}[1]{%
+ \Glsxtrfull[noindex,hyper=false]{#1}[]%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\Glsxtrheadfullpl}
+% Command used to display plural full form in the page header with the
+% first letter converted to upper case.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\newcommand*{\Glsxtrheadfullpl}[1]{%
+ \protect\NoCaseChange
+ {%
+ \glsifattribute{#1}{headuc}{true}%
+ {%
+ \GLSxtrfullpl[noindex,hyper=false]{#1}[]%
+ }%
+ {%
+ \Glsxtrfullpl[noindex,hyper=false]{#1}[]%
+ }%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\Glsxtrtitlefullpl}
+% Command to display plural full form of abbreviation in section title and
+% table of contents with the first letter converted to upper case.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\newrobustcmd*{\Glsxtrtitlefullpl}[1]{%
+ \Glsxtrfullpl[noindex,hyper=false]{#1}[]%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\glsfmtshort}
% Provide a way of using the formatted short form in section
% headings. If \sty{hyperref} has been loaded, use
@@ -9913,6 +10349,158 @@ want
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glsfmtlong}
+%As above but for the \gloskey{long} value.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\ifdef\texorpdfstring
+{
+ \newcommand*{\glsfmtlong}[1]{%
+ \texorpdfstring
+ {\glsxtrtitlelong{#1}}%
+ {\glsentrylong{#1}}%
+ }
+}
+{
+ \newcommand*{\glsfmtlong}[1]{%
+ \glsxtrtitlelong{#1}}
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\Glsfmtlong}
+%First letter converted to upper case.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\ifdef\texorpdfstring
+{
+ \newcommand*{\Glsfmtlong}[1]{%
+ \texorpdfstring
+ {\Glsxtrtitlelong{#1}}%
+ {\glsentrylong{#1}}%
+ }
+}
+{
+ \newcommand*{\Glsfmtlong}[1]{%
+ \Glsxtrtitlelong{#1}}
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsfmtlongpl}
+%As above but for the \gloskey{longplural} value.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\ifdef\texorpdfstring
+{
+ \newcommand*{\glsfmtlongpl}[1]{%
+ \texorpdfstring
+ {\glsxtrtitlelongpl{#1}}%
+ {\glsentrylongpl{#1}}%
+ }
+}
+{
+ \newcommand*{\glsfmtlongpl}[1]{%
+ \glsxtrtitlelongpl{#1}}
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\Glsfmtlongpl}
+%First letter converted to upper case.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\ifdef\texorpdfstring
+{
+ \newcommand*{\Glsfmtlongpl}[1]{%
+ \texorpdfstring
+ {\Glsxtrtitlelongpl{#1}}%
+ {\glsentrylongpl{#1}}%
+ }
+}
+{
+ \newcommand*{\Glsfmtlongpl}[1]{%
+ \Glsxtrtitlelongpl{#1}}
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsfmtfull}
+%In-line full format.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\ifdef\texorpdfstring
+{
+ \newcommand*{\glsfmtfull}[1]{%
+ \texorpdfstring
+ {\glsxtrtitlefull{#1}}%
+ {\glsxtrinlinefullformat{#1}{}}%
+ }
+}
+{
+ \newcommand*{\glsfmtfull}[1]{%
+ \glsxtrtitlefull{#1}}
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\Glsfmtfull}
+%First letter converted to upper case.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\ifdef\texorpdfstring
+{
+ \newcommand*{\Glsfmtfull}[1]{%
+ \texorpdfstring
+ {\Glsxtrtitlefull{#1}}%
+ {\Glsxtrinlinefullformat{#1}{}}%
+ }
+}
+{
+ \newcommand*{\Glsfmtfull}[1]{%
+ \Glsxtrtitlefull{#1}}
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsfmtfullpl}
+%In-line full plural format.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\ifdef\texorpdfstring
+{
+ \newcommand*{\glsfmtfullpl}[1]{%
+ \texorpdfstring
+ {\glsxtrtitlefullpl{#1}}%
+ {\glsxtrinlinefullplformat{#1}{}}%
+ }
+}
+{
+ \newcommand*{\glsfmtfullpl}[1]{%
+ \glsxtrtitlefullpl{#1}}
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\Glsfmtfullpl}
+%First letter converted to upper case.
+%\changes{1.02}{2016-04-25}{new}
+% \begin{macrocode}
+\ifdef\texorpdfstring
+{
+ \newcommand*{\Glsfmtfullpl}[1]{%
+ \texorpdfstring
+ {\Glsxtrtitlefullpl{#1}}%
+ {\Glsxtrinlinefullplformat{#1}{}}%
+ }
+}
+{
+ \newcommand*{\Glsfmtfullpl}[1]{%
+ \Glsxtrtitlefullpl{#1}}
+}
+% \end{macrocode}
+%\end{macro}
+%
%\section{Multi-Lingual Support}
% Add the facility to load language modules, if they are installed,
% but none are provided with this package.
@@ -9959,10 +10547,380 @@ want
}
{}
% \end{macrocode}
+% Load \sty{glossaries-extra-stylemods} if required.
+% \begin{macrocode}
+\@glsxtr@redefstyles
+% \end{macrocode}
%\iffalse
% \begin{macrocode}
%</glossaries-extra.sty>
% \end{macrocode}
%\fi
+%\iffalse
+% \begin{macrocode}
+%<*glossaries-extra-stylemods.sty>
+% \end{macrocode}
+%\fi
+%\chapter{Style Adjustments (\styfmt{glossaries-extra-stylemods.sty})}
+% This package adjusts the predefined styles so that they include the post
+% description hook.
+%
+%\section{Package Initialisation}
+% First identify package:
+% \begin{macrocode}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{glossaries-extra-stylemods}[2016/04/25 v1.02 (NLCT)]
+% \end{macrocode}
+% Provide package options to automatically load required predefined
+% styles. The simplest method is to just test for the existence of
+% the file \texttt{glossary-}\meta{option}\texttt{.sty}. Packages
+% can't be loaded whilst the options are being processed, so save
+% the list in \cs{@glsxtr@loadstyles}.
+%\begin{macro}{\@glsxtr@loadstyles}
+% \begin{macrocode}
+\newcommand*{\@glsxtr@loadstyles}{}
+% \end{macrocode}
+%\end{macro}
+%
+% \begin{macrocode}
+\DeclareOption*{%
+ \IfFileExists{glossary-\CurrentOption.sty}
+ {\eappto\@glsxtr@loadstyles{%
+ \noexpand\RequirePackage{glossary-\CurrentOption}}}%
+ {\PackageError{glossaries-extra-styles}%
+ {Unknown option `\CurrentOption'}{}}
+}
+% \end{macrocode}
+% Process the package options:
+% \begin{macrocode}
+\ProcessOptions
+% \end{macrocode}
+%
+% Load the required packages:
+% \begin{macrocode}
+\@glsxtr@loadstyles
+% \end{macrocode}
+% Adjust the styles that the post description hook added, but only
+% for styles that have already been defined. All the tree styles in
+% \sty{glossary-tree} include the post description hook, so they
+% don't require adjustment. Similarly for \sty{glossary-mcols} which
+% builds on the tree styles.
+%
+%In case we have an old version of \sty{glossaries}:
+%\begin{macro}{\renewglossarystyle}
+% \begin{macrocode}
+\providecommand{\renewglossarystyle}[2]{%
+ \ifcsundef{@glsstyle@#1}%
+ {%
+ \PackageError{glossaries}{Glossary style `#1' isn't already defined}{}%
+ }%
+ {%
+ \csdef{@glsstyle@#1}{#2}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\section{List-Like Styles}
+% The list-like styles mostly already use the post description hook.
+% Only the \glostyle{listdotted} style need modifying.
+% \begin{macrocode}
+\ifdef{\@glsstyle@listdotted}
+{%
+ \renewglossarystyle{listdotted}{%
+ \setglossarystyle{list}%
+ \renewcommand*{\glossentry}[2]{%
+ \item[]\makebox[\glslistdottedwidth][l]{%
+ \glsentryitem{##1}%
+ \glstarget{##1}{\glossentryname{##1}}%
+ \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}%
+ \glossentrydesc{##1}\glspostdescription}%
+ \renewcommand*{\subglossentry}[3]{%
+ \item[]\makebox[\glslistdottedwidth][l]{%
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\glossentryname{##2}}%
+ \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}%
+ \glossentrydesc{##2}\glspostdescription}%
+ }
+}
+{}
+% \end{macrocode}
+% The \glostyle{sublistdotted} style doesn't display the description
+% for top-level entries. Sub-level entries use the
+% \glostyle{listdottedstyle}.
+%
+%\section{Longtable Styles}
+% The three and four column styles require adjustment, but not the
+% two column styles.
+% \begin{macrocode}
+\ifcsdef{@glsstyle@long3col}
+{%
+ \renewglossarystyle{long3col}{%
+ \renewenvironment{theglossary}%
+ {\begin{longtable}{lp{\glsdescwidth}p{\glspagelistwidth}}}%
+ {\end{longtable}}%
+ \renewcommand*{\glossaryheader}{}%
+ \renewcommand*{\glsgroupheading}[1]{}%
+ \renewcommand{\glossentry}[2]{%
+ \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+ \glossentrydesc{##1}\glspostdescription & ##2\tabularnewline
+ }%
+ \renewcommand{\subglossentry}[3]{%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription &
+ ##3\tabularnewline
+ }%
+ \renewcommand*{\glsgroupskip}{%
+ \ifglsnogroupskip\else & &\tabularnewline\fi}%
+ }
+}
+{}
+% \end{macrocode}
+% Four column style:
+% \begin{macrocode}
+\ifcsdef{@glsstyle@long4col}
+{%
+ \renewglossarystyle{long4col}{%
+ \renewenvironment{theglossary}%
+ {\begin{longtable}{llll}}%
+ {\end{longtable}}%
+ \renewcommand*{\glossaryheader}{}%
+ \renewcommand*{\glsgroupheading}[1]{}%
+ \renewcommand{\glossentry}[2]{%
+ \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+ \glossentrydesc{##1}\glspostdescription &
+ \glossentrysymbol{##1} &
+ ##2\tabularnewline
+ }%
+ \renewcommand{\subglossentry}[3]{%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription &
+ \glossentrysymbol{##2} & ##3\tabularnewline
+ }%
+ \renewcommand*{\glsgroupskip}{%
+ \ifglsnogroupskip\else & & &\tabularnewline\fi}%
+ }
+}
+{}
+% \end{macrocode}
+%
+%The styles in \sty{glossary-longbooktabs} are all based on the
+%styles in \sty{glossary-long}, so no adjustments are needed for
+%that package.
+%
+%\section{Long Ragged Styles}
+% The three and four column styles require adjustment, but not the
+% two column styles.
+% \begin{macrocode}
+\ifcsdef{@glsstyle@longragged3col}
+{%
+ \renewglossarystyle{longragged3col}{%
+ \renewenvironment{theglossary}%
+ {\begin{longtable}{l>{\raggedright}p{\glsdescwidth}%
+ >{\raggedright}p{\glspagelistwidth}}}%
+ {\end{longtable}}%
+ \renewcommand*{\glossaryheader}{}%
+ \renewcommand*{\glsgroupheading}[1]{}%
+ \renewcommand{\glossentry}[2]{%
+ \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+ \glossentrydesc{##1}\glspostdescription & ##2\tabularnewline
+ }%
+ \renewcommand{\subglossentry}[3]{%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription &
+ ##3\tabularnewline
+ }%
+ \renewcommand*{\glsgroupskip}{%
+ \ifglsnogroupskip\else & &\tabularnewline\fi}%
+ }
+}
+{}
+% \end{macrocode}
+% Four column style:
+% \begin{macrocode}
+\ifcsdef{@glsstyle@altlongragged4col}
+{%
+ \renewglossarystyle{altlongragged4col}{%
+ \renewenvironment{theglossary}%
+ {\begin{longtable}{l>{\raggedright}p{\glsdescwidth}l%
+ >{\raggedright}p{\glspagelistwidth}}}%
+ {\end{longtable}}%
+ \renewcommand*{\glossaryheader}{}%
+ \renewcommand*{\glsgroupheading}[1]{}%
+ \renewcommand{\glossentry}[2]{%
+ \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+ \glossentrydesc{##1}\glspostdescription & \glossentrysymbol{##1} &
+ ##2\tabularnewline
+ }%
+ \renewcommand{\subglossentry}[3]{%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription &
+ \glossentrysymbol{##2} & ##3\tabularnewline
+ }%
+ \renewcommand*{\glsgroupskip}{%
+ \ifglsnogroupskip\else & & &\tabularnewline\fi}%
+ }
+}
+{}
+% \end{macrocode}
+%
+%\section{Supertabular Styles}
+% The three and four column styles require adjustment, but not the
+% two column styles.
+% \begin{macrocode}
+\ifcsdef{@glsstyle@super3col}
+{%
+ \renewglossarystyle{super3col}{%
+ \renewenvironment{theglossary}%
+ {\tablehead{}\tabletail{}%
+ \begin{supertabular}{lp{\glsdescwidth}p{\glspagelistwidth}}}%
+ {\end{supertabular}}%
+ \renewcommand*{\glossaryheader}{}%
+ \renewcommand*{\glsgroupheading}[1]{}%
+ \renewcommand{\glossentry}[2]{%
+ \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+ \glossentrydesc{##1}\glspostdescription & ##2\tabularnewline
+ }%
+ \renewcommand{\subglossentry}[3]{%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription &
+ ##3\tabularnewline
+ }%
+ \renewcommand*{\glsgroupskip}{%
+ \ifglsnogroupskip\else & &\tabularnewline\fi}%
+ }
+}
+{}
+% \end{macrocode}
+% Four column styles:
+% \begin{macrocode}
+\ifcsdef{@glsstyle@super4col}
+{%
+ \renewglossarystyle{super4col}{%
+ \renewenvironment{theglossary}%
+ {\tablehead{}\tabletail{}%
+ \begin{supertabular}{llll}}{%
+ \end{supertabular}}%
+ \renewcommand*{\glossaryheader}{}%
+ \renewcommand*{\glsgroupheading}[1]{}%
+ \renewcommand{\glossentry}[2]{%
+ \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+ \glossentrydesc{##1}\glspostdescription &
+ \glossentrysymbol{##1} & ##2\tabularnewline
+ }%
+ \renewcommand{\subglossentry}[3]{%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription &
+ \glossentrysymbol{##2} & ##3\tabularnewline
+ }%
+ \renewcommand*{\glsgroupskip}{%
+ \ifglsnogroupskip\else & & &\tabularnewline\fi}%
+ }
+}
+{}
+% \end{macrocode}
+%
+%\section{Super Ragged Styles}
+% The three and four column styles require adjustment, but not the
+% two column styles.
+% \begin{macrocode}
+\ifcsdef{@glsstyle@superragged3col}
+{%
+ \renewglossarystyle{superragged3col}{%
+ \renewenvironment{theglossary}%
+ {\tablehead{}\tabletail{}%
+ \begin{supertabular}{l>{\raggedright}p{\glsdescwidth}%
+ >{\raggedright}p{\glspagelistwidth}}}%
+ {\end{supertabular}}%
+ \renewcommand*{\glossaryheader}{}%
+ \renewcommand*{\glsgroupheading}[1]{}%
+ \renewcommand{\glossentry}[2]{%
+ \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+ \glossentrydesc{##1}\glspostdescription &
+ ##2\tabularnewline
+ }%
+ \renewcommand{\subglossentry}[3]{%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription &
+ ##3\tabularnewline
+ }%
+ \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else &
+ &\tabularnewline\fi}%
+ }
+}
+{}
+% \end{macrocode}
+% Four columns:
+% \begin{macrocode}
+\ifcsdef{@glsstyle@altsuperragged4col}
+{%
+ \renewglossarystyle{altsuperragged4col}{%
+ \renewenvironment{theglossary}%
+ {\tablehead{}\tabletail{}%
+ \begin{supertabular}{l>{\raggedright}p{\glsdescwidth}l%
+ >{\raggedright}p{\glspagelistwidth}}}%
+ {\end{supertabular}}%
+ \renewcommand*{\glossaryheader}{}%
+ \renewcommand{\glossentry}[2]{%
+ \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+ \glossentrydesc{##1}\glspostdescription &
+ \glossentrysymbol{##1} & ##2\tabularnewline
+ }%
+ \renewcommand{\subglossentry}[3]{%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription &
+ \glossentrysymbol{##2} & ##3\tabularnewline
+ }%
+ \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &
+ &\tabularnewline\fi}%
+ }
+}
+{}
+% \end{macrocode}
+%
+%\section{Inline Style}
+% The \glostyle{inline} style is dealt with slightly differently.
+% The \cs{glspostdescription} hook is actually in
+% \cs{glspostinline}, which is called at the end of the glossary.
+% The original definition of \cs{glspostinline} also includes a
+% space, which is unnecessary. Here, instead of redefining the
+% \glostyle{inline} style, just redefine \cs{glspostinline} and
+% \cs{glsinlinedescformat}.
+% \begin{macrocode}
+\ifdef{\@glsstyle@inline}
+{%
+ \renewcommand*{\glspostinline}{.\spacefactor\sfcode`\.}
+% \end{macrocode}
+% Just use \cs{glsxtrpostdescription} instead of
+% \cs{glspostdescription}.
+% \begin{macrocode}
+ \renewcommand*{\glsinlinedescformat}[3]{%
+ \space#1\glsxtrpostdescription}
+ \renewcommand*{\glsinlinesubdescformat}[3]{%
+ #1\glsxtrpostdescription}
+}
+{}
+% \end{macrocode}
+%
+% Reset the default style
+% \begin{macrocode}
+\ifx\@glossary@default@style\relax
+\else
+ \setglossarystyle{\@glsxtr@current@style}
+\fi
+% \end{macrocode}
+%\iffalse
+% \begin{macrocode}
+%</glossaries-extra-stylemods.sty>
+% \end{macrocode}
+%\fi
%\Finale
\endinput
diff --git a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins
index 2e34c0e9868..12d4ae7b55a 100644
--- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins
+++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins
@@ -1,4 +1,4 @@
-% glossaries-extra.ins generated using makedtx version 1.1 2016/2/2 12:31
+% glossaries-extra.ins generated using makedtx version 1.1 2016/4/25 12:22
\input docstrip
\preamble
@@ -18,7 +18,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.
\endpreamble
@@ -26,6 +26,8 @@
\generate{\file{glossaries-extra.sty}{\usepreamble\defaultpreamble
\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{glossaries-extra.sty,package}}
+\file{glossaries-extra-stylemods.sty}{\usepreamble\defaultpreamble
+\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{glossaries-extra-stylemods.sty,package}}
}
\endbatchfile