summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/glossaries
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-08 22:31:19 +0000
committerKarl Berry <karl@freefriends.org>2016-05-08 22:31:19 +0000
commitfec3a5740e195359a7666cf8d39eace242c8f939 (patch)
tree0b62b75993b536c3af036d7bcb83fc171bd4bc67 /Master/texmf-dist/source/latex/glossaries
parent8ef99cf53c6d05b5d88a4e8fe8a00222d358659e (diff)
glossaries (8may16)
git-svn-id: svn://tug.org/texlive/trunk@40959 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/glossaries')
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.dtx269
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.ins2
2 files changed, 207 insertions, 64 deletions
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
index 766158b01a3..657d60dabae 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
@@ -1,6 +1,18 @@
%\iffalse
% glossaries.dtx generated using makedtx version 1.1 (c) Nicola Talbot
% Command line args:
+% -macrocode ".*\.perl"
+% -macrocode ".*\.tex"
+% -macrocode ".*\.xdy"
+% -doc "glossaries-manual.tex"
+% -author "Nicola Talbot"
+% -section "chapter"
+% -setambles ".*\.perl=>\nopreamble\nopostamble"
+% -setambles ".*\.tex=>\nopreamble\nopostamble"
+% -setambles ".*\.xdy=>\nopreamble\nopostamble"
+% -comment ".*\.perl"
+% -comment ".*\.tex"
+% -comment ".*\.xdy"
% -src "glossaries\.sty\Z=>glossaries.sty"
% -src "glossaries-prefix.sty\Z=>glossaries-prefix.sty"
% -src "(glossary-.+)\.(sty)\Z=>\1.\2"
@@ -17,21 +29,9 @@
% -src "(samplexdy-mc.*\.xdy)\Z=>\1"
% -src "(database.*\.tex)\Z=>\1"
% -src "(.*\.perl)\Z=>\1"
-% -setambles ".*\.perl=>\nopreamble\nopostamble"
-% -setambles ".*\.tex=>\nopreamble\nopostamble"
-% -setambles ".*\.xdy=>\nopreamble\nopostamble"
-% -author "Nicola Talbot"
-% -macrocode ".*\.perl"
-% -macrocode ".*\.tex"
-% -macrocode ".*\.xdy"
-% -section "chapter"
-% -comment ".*\.perl"
-% -comment ".*\.tex"
-% -comment ".*\.xdy"
-% -doc "glossaries-manual.tex"
% -codetitle "Main Package Code"
% glossaries
-% Created on 2016/4/19 23:14
+% Created on 2016/4/30 18:28
%\fi
%\iffalse
%<*package>
@@ -143,7 +143,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\setcounter{IndexColumns}{2}
-\CheckSum{18545}
+\CheckSum{18583}
\newcommand*{\ifirstuse}{\iterm{first use}}
\newcommand*{\firstuse}{\gls{firstuse}}
@@ -171,12 +171,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
%\MakeShortVerb{"}
%\DeleteShortVerb{\|}
%
-% \title{Documented Code For glossaries v4.22}
+% \title{Documented Code For glossaries v4.23}
% \author{Nicola L.C. Talbot\\[10pt]
%Dickimaw Books\\
%\url{http://www.dickimaw-books.com/}}
%
-% \date{2016-04-19}
+% \date{2016-04-30}
% \maketitle
%
%This is the documented code for the \styfmt{glossaries} package.
@@ -192,7 +192,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
%glossaries package}.
%
%\item[\url{glossaries-user.pdf}]
-%For the main user guide, read \qt{glossaries.sty v4.22:
+%For the main user guide, read \qt{glossaries.sty v4.23:
%\LaTeX2e\ Package to Assist Generating Glossaries}.
%
%\item[\url{mfirstuc-manual.pdf}]
@@ -247,7 +247,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
% This package requires \LaTeXe.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2016/04/19 v4.22 (NLCT)]
+\ProvidesPackage{glossaries}[2016/04/30 v4.23 (NLCT)]
% \end{macrocode}
%\changes{4.18}{2015-09-09}{split mfirstuc into separate bundle}
% Required packages:
@@ -3911,7 +3911,22 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Not empty, so check if set to \cs{@gls@default@value}
% \begin{macrocode}
- \ifdefequal\@glo@thisvalue\@gls@default@value{#4}{#3}%
+ \ifdefequal\@glo@thisvalue\@gls@default@value
+ {%
+% \end{macrocode}
+% Value is set to the default value.
+% \begin{macrocode}
+ #4%
+ }%
+ {%
+% \end{macrocode}
+% Non-empty, non-default value. Allow user to access this value
+% through \cs{glscurrentfieldvalue}.
+%\changes{4.23}{2016-04-30}{added \cs{glscurrentfieldvalue}}
+% \begin{macrocode}
+ \let\glscurrentfieldvalue\@glo@thisvalue
+ #3%
+ }%
}%
}%
{%
@@ -3940,7 +3955,22 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Isn't empty so check if it's been set to \cs{@gls@default@value}.
% \begin{macrocode}
- \ifdefequal\@glo@thisvalue\@gls@default@value{#4}{#3}%
+ \ifdefequal\@glo@thisvalue\@gls@default@value
+ {%
+% \end{macrocode}
+% Value is set to the default value.
+% \begin{macrocode}
+ #4%
+ }%
+ {%
+% \end{macrocode}
+% Non-empty, non-default value. Allow user to access this value
+% through \cs{glscurrentfieldvalue}.
+%\changes{4.23}{2016-04-30}{added \cs{glscurrentfieldvalue}}
+% \begin{macrocode}
+ \let\glscurrentfieldvalue\@glo@thisvalue
+ #3%
+ }%
}%
}%
{%
@@ -3956,6 +3986,13 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glscurrentfieldvalue}
+%\changes{4.23}{2016-04-30}{new}
+% \begin{macrocode}
+\newcommand*{\glscurrentfieldvalue}{}
+% \end{macrocode}
+%\end{macro}
+%
%\section{Defining new glossaries}\label{sec:newglos}
% A comma-separated list of glossary names is stored
% in \cs{@glo@types}. When a new glossary type
@@ -5547,7 +5584,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\ifundef\glsdefaulttype
{%
\PackageError{glossaries}%
- {No default glossary type (have you used `nomain'?)}%
+ {No default glossary type (have you used `nomain' by mistake?)}%
{If you use package option `nomain' you must define
a new glossary before you can define entries}%
}%
@@ -17971,7 +18008,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \cs{gls}\marg{label}} on subsequent use.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-prefix}[2016/04/19 v4.22 (NLCT)]
+\ProvidesPackage{glossaries-prefix}[2016/04/30 v4.23 (NLCT)]
% \end{macrocode}
% Pass all options to \sty{glossaries}:
% \begin{macrocode}
@@ -18386,7 +18423,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%\label{sec:code:hypernav}
% Package Definition:
% \begin{macrocode}
-\ProvidesPackage{glossary-hypernav}[2016/04/19 v4.22 (NLCT)]
+\ProvidesPackage{glossary-hypernav}[2016/04/30 v4.23 (NLCT)]
% \end{macrocode}
%
% The commands defined in this package are provided to
@@ -18558,7 +18595,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% This defines an in-line style where the entries are
% comma-separated with just the name and description displayed.
% \begin{macrocode}
-\ProvidesPackage{glossary-inline}[2016/04/19 v4.22 (NLCT)]
+\ProvidesPackage{glossary-inline}[2016/04/30 v4.23 (NLCT)]
% \end{macrocode}
%
%\begin{style}{inline}
@@ -18749,7 +18786,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \ics{item} command, it will appear in a bold font by
% default.
% \begin{macrocode}
-\ProvidesPackage{glossary-list}[2016/04/19 v4.22 (NLCT)]
+\ProvidesPackage{glossary-list}[2016/04/30 v4.23 (NLCT)]
% \end{macrocode}
%\begin{macro}{\indexspace}
%\changes{4.13}{2015-02-03}{new}
@@ -19031,7 +19068,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% The glossary styles defined in the \isty{glossary-long} package
% used the \env{longtable} environment in the glossary.
% \begin{macrocode}
-\ProvidesPackage{glossary-long}[2016/04/19 v4.22 (NLCT)]
+\ProvidesPackage{glossary-long}[2016/04/30 v4.23 (NLCT)]
% \end{macrocode}
% Requires the \isty{longtable} package:
% \begin{macrocode}
@@ -19106,9 +19143,16 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% Blank row between groups:
%\changes{3.03}{2012/09/21}{added check for glsnogroupskip}
%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}}
+%\changes{4.23}{2016-04-30}{check for nogroupskip changed}
+%The check for \pkgopt{nogroupskip} must occur outside
+%\cs{glsgroupskip}
+%(\url{http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=108})
% \begin{macrocode}
- \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else &
-\tabularnewline\fi}%
+ \ifglsnogroupskip
+ \renewcommand*{\glsgroupskip}{}%
+ \else
+ \renewcommand*{\glsgroupskip}{ & \tabularnewline}%
+ \fi
}
% \end{macrocode}
%\end{style}
@@ -19217,9 +19261,16 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Blank row between groups:
%\changes{3.03}{2012/09/21}{added check for glsnogroupskip}
+%\changes{4.23}{2016-04-30}{check for nogroupskip changed}
+%The check for \pkgopt{nogroupskip} must occur outside
+%\cs{glsgroupskip}
+%(\url{http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=108})
% \begin{macrocode}
- \renewcommand*{\glsgroupskip}{%
- \ifglsnogroupskip\else & &\tabularnewline\fi}%
+ \ifglsnogroupskip
+ \renewcommand*{\glsgroupskip}{}%
+ \else
+ \renewcommand*{\glsgroupskip}{ & & \tabularnewline}%
+ \fi
}
% \end{macrocode}
%\end{style}
@@ -19332,9 +19383,16 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Blank row between groups:
%\changes{3.03}{2012/09/21}{added check for glsnogroupskip}
+%\changes{4.23}{2016-04-30}{check for nogroupskip changed}
+%The check for \pkgopt{nogroupskip} must occur outside
+%\cs{glsgroupskip}
+%(\url{http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=108})
% \begin{macrocode}
- \renewcommand*{\glsgroupskip}{%
- \ifglsnogroupskip\else & & &\tabularnewline\fi}%
+ \ifglsnogroupskip
+ \renewcommand*{\glsgroupskip}{}%
+ \else
+ \renewcommand*{\glsgroupskip}{ & & & \tabularnewline}%
+ \fi
}
% \end{macrocode}
%\end{style}
@@ -19507,7 +19565,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \url{http://tex.stackexchange.com/a/56890}
%
% \begin{macrocode}
-\ProvidesPackage{glossary-longbooktabs}[2016/04/19 v4.22 (NLCT)]
+\ProvidesPackage{glossary-longbooktabs}[2016/04/30 v4.23 (NLCT)]
% \end{macrocode}
% Requires \sty{booktabs} package:
% \begin{macrocode}
@@ -19550,9 +19608,15 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% Check for the \pkgopt{nogroupskip} package option. If there should
% be a gap between groups, insert the penalty and the vertical
% space.
+%\changes{4.23}{2016-04-30}{check for nogroupskip changed}
+%The check for \pkgopt{nogroupskip} should occur outside
+%\cs{glsgroupskip} to be on the safe side.
% \begin{macrocode}
- \renewcommand*{\glsgroupskip}{%
- \ifglsnogroupskip \else \glspenaltygroupskip\fi}%
+ \ifglsnogroupskip
+ \renewcommand*{\glsgroupskip}{}%
+ \else
+ \renewcommand*{\glsgroupskip}{\glspenaltygroupskip}%
+ \fi
}
% \end{macrocode}
%\end{style}
@@ -19588,9 +19652,15 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% Check for the \pkgopt{nogroupskip} package option. If there should
% be a gap between groups, insert the penalty and the vertical
% space.
+%\changes{4.23}{2016-04-30}{check for nogroupskip changed}
+%The check for \pkgopt{nogroupskip} should occur outside
+%\cs{glsgroupskip} to be on the safe side.
% \begin{macrocode}
- \renewcommand*{\glsgroupskip}{%
- \ifglsnogroupskip \else \glspenaltygroupskip\fi}%
+ \ifglsnogroupskip
+ \renewcommand*{\glsgroupskip}{}%
+ \else
+ \renewcommand*{\glsgroupskip}{\glspenaltygroupskip}%
+ \fi
}
% \end{macrocode}
%\end{style}
@@ -19627,9 +19697,15 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% Check for the \pkgopt{nogroupskip} package option. If there should
% be a gap between groups, insert the penalty and the vertical
% space.
+%\changes{4.23}{2016-04-30}{check for nogroupskip changed}
+%The check for \pkgopt{nogroupskip} should occur outside
+%\cs{glsgroupskip} to be on the safe side.
% \begin{macrocode}
- \renewcommand*{\glsgroupskip}{%
- \ifglsnogroupskip \else \glspenaltygroupskip\fi}%
+ \ifglsnogroupskip
+ \renewcommand*{\glsgroupskip}{}%
+ \else
+ \renewcommand*{\glsgroupskip}{\glspenaltygroupskip}%
+ \fi
}
% \end{macrocode}
%\end{style}
@@ -19830,7 +19906,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% used the \env{longtable} environment in the glossary and use
% ragged right formatting for the multiline columns.
% \begin{macrocode}
-\ProvidesPackage{glossary-longragged}[2016/04/19 v4.22 (NLCT)]
+\ProvidesPackage{glossary-longragged}[2016/04/30 v4.23 (NLCT)]
% \end{macrocode}
% Requires the \isty{array} package:
% \begin{macrocode}
@@ -19905,8 +19981,16 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Blank row between groups:
%\changes{3.03}{2012/09/21}{added check for glsnogroupskip}
+%\changes{4.23}{2016-04-30}{check for nogroupskip changed}
+%The check for \pkgopt{nogroupskip} must occur outside
+%\cs{glsgroupskip}
+%(\url{http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=108})
% \begin{macrocode}
- \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \tabularnewline\fi}%
+ \ifglsnogroupskip
+ \renewcommand*{\glsgroupskip}{}%
+ \else
+ \renewcommand*{\glsgroupskip}{ & \tabularnewline}%
+ \fi
}
% \end{macrocode}
%\end{style}
@@ -20017,9 +20101,16 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Blank row between groups:
%\changes{3.03}{2012/09/21}{added check for glsnogroupskip}
+%\changes{4.23}{2016-04-30}{check for nogroupskip changed}
+%The check for \pkgopt{nogroupskip} must occur outside
+%\cs{glsgroupskip}
+%(\url{http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=108})
% \begin{macrocode}
- \renewcommand*{\glsgroupskip}{%
- \ifglsnogroupskip\else & &\tabularnewline\fi}%
+ \ifglsnogroupskip
+ \renewcommand*{\glsgroupskip}{}%
+ \else
+ \renewcommand*{\glsgroupskip}{ & & \tabularnewline}%
+ \fi
}
% \end{macrocode}
%\end{style}
@@ -20137,9 +20228,16 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Blank row between groups:
%\changes{3.03}{2012/09/21}{added check for glsnogroupskip}
+%\changes{4.23}{2016-04-30}{check for nogroupskip changed}
+%The check for \pkgopt{nogroupskip} must occur outside
+%\cs{glsgroupskip}
+%(\url{http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=108})
% \begin{macrocode}
- \renewcommand*{\glsgroupskip}{%
- \ifglsnogroupskip\else & & &\tabularnewline\fi}%
+ \ifglsnogroupskip
+ \renewcommand*{\glsgroupskip}{}%
+ \else
+ \renewcommand*{\glsgroupskip}{ & & & \tabularnewline}%
+ \fi
}
% \end{macrocode}
%\end{style}
@@ -20241,7 +20339,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%use the \sty{multicol} package. These use the tree-like glossary
%styles in a multicol environment.
% \begin{macrocode}
-\ProvidesPackage{glossary-mcols}[2016/04/19 v4.22 (NLCT)]
+\ProvidesPackage{glossary-mcols}[2016/04/30 v4.23 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -20666,7 +20764,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% The glossary styles defined in the \isty{glossary-super} package
% use the \env{supertabular} environment.
% \begin{macrocode}
-\ProvidesPackage{glossary-super}[2016/04/19 v4.22 (NLCT)]
+\ProvidesPackage{glossary-super}[2016/04/30 v4.23 (NLCT)]
% \end{macrocode}
% Requires the \isty{supertabular} package:
% \begin{macrocode}
@@ -20743,9 +20841,16 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Blank row between groups:
%\changes{3.03}{2012/09/21}{added check for glsnogroupskip}
+%\changes{4.23}{2016-04-30}{check for nogroupskip changed}
+%The check for \pkgopt{nogroupskip} must occur outside
+%\cs{glsgroupskip}
+%(\url{http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=108})
% \begin{macrocode}
- \renewcommand*{\glsgroupskip}{%
- \ifglsnogroupskip\else & \tabularnewline\fi}%
+ \ifglsnogroupskip
+ \renewcommand*{\glsgroupskip}{}%
+ \else
+ \renewcommand*{\glsgroupskip}{& \tabularnewline}%
+ \fi
}
% \end{macrocode}
%\end{style}
@@ -20863,9 +20968,16 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Blank row between groups:
%\changes{3.03}{2012/09/21}{added check for glsnogroupskip}
+%\changes{4.23}{2016-04-30}{check for nogroupskip changed}
+%The check for \pkgopt{nogroupskip} must occur outside
+%\cs{glsgroupskip}
+%(\url{http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=108})
% \begin{macrocode}
- \renewcommand*{\glsgroupskip}{%
- \ifglsnogroupskip\else & &\tabularnewline\fi}%
+ \ifglsnogroupskip
+ \renewcommand*{\glsgroupskip}{}%
+ \else
+ \renewcommand*{\glsgroupskip}{& & \tabularnewline}%
+ \fi
}
% \end{macrocode}
%\end{style}
@@ -20987,9 +21099,16 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Blank row between groups:
%\changes{3.03}{2012/09/21}{added check for glsnogroupskip}
+%\changes{4.23}{2016-04-30}{check for nogroupskip changed}
+%The check for \pkgopt{nogroupskip} must occur outside
+%\cs{glsgroupskip}
+%(\url{http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=108})
% \begin{macrocode}
- \renewcommand*{\glsgroupskip}{%
- \ifglsnogroupskip\else & & &\tabularnewline\fi}%
+ \ifglsnogroupskip
+ \renewcommand*{\glsgroupskip}{}%
+ \else
+ \renewcommand*{\glsgroupskip}{& & & \tabularnewline}%
+ \fi
}
% \end{macrocode}
%\end{style}
@@ -21177,7 +21296,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% are like those provided by the \isty{glossary-super} package,
% except that the multiline columns have ragged right justification.
% \begin{macrocode}
-\ProvidesPackage{glossary-superragged}[2016/04/19 v4.22 (NLCT)]
+\ProvidesPackage{glossary-superragged}[2016/04/30 v4.23 (NLCT)]
% \end{macrocode}
% Requires the \isty{array} package:
% \begin{macrocode}
@@ -21255,8 +21374,16 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Blank row between groups:
%\changes{3.03}{2012/09/21}{added check for glsnogroupskip}
+%\changes{4.23}{2016-04-30}{check for nogroupskip changed}
+%The check for \pkgopt{nogroupskip} must occur outside
+%\cs{glsgroupskip}
+%(\url{http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=108})
% \begin{macrocode}
- \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \tabularnewline\fi}%
+ \ifglsnogroupskip
+ \renewcommand*{\glsgroupskip}{}%
+ \else
+ \renewcommand*{\glsgroupskip}{& \tabularnewline}%
+ \fi
}
% \end{macrocode}
%\end{style}
@@ -21373,8 +21500,16 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Blank row between groups:
%\changes{3.03}{2012/09/21}{added check for glsnogroupskip}
+%\changes{4.23}{2016-04-30}{check for nogroupskip changed}
+%The check for \pkgopt{nogroupskip} must occur outside
+%\cs{glsgroupskip}
+%(\url{http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=108})
% \begin{macrocode}
- \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\tabularnewline\fi}%
+ \ifglsnogroupskip
+ \renewcommand*{\glsgroupskip}{}%
+ \else
+ \renewcommand*{\glsgroupskip}{& & \tabularnewline}%
+ \fi
}
% \end{macrocode}
%\end{style}
@@ -21497,8 +21632,16 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Blank row between groups:
%\changes{3.03}{2012/09/21}{added check for glsnogroupskip}
+%\changes{4.23}{2016-04-30}{check for nogroupskip changed}
+%The check for \pkgopt{nogroupskip} must occur outside
+%\cs{glsgroupskip}
+%(\url{http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=108})
% \begin{macrocode}
- \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\tabularnewline\fi}%
+ \ifglsnogroupskip
+ \renewcommand*{\glsgroupskip}{}%
+ \else
+ \renewcommand*{\glsgroupskip}{& & & \tabularnewline}%
+ \fi
}
% \end{macrocode}
%\end{style}
@@ -21593,7 +21736,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% that have a tree-like structure. These are designed for
% hierarchical glossaries.
% \begin{macrocode}
-\ProvidesPackage{glossary-tree}[2016/04/19 v4.22 (NLCT)]
+\ProvidesPackage{glossary-tree}[2016/04/30 v4.23 (NLCT)]
% \end{macrocode}
%
%\begin{macro}{\indexspace}
@@ -22261,7 +22404,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% hyperlinks may not work properly.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-207}[2016/04/19 v4.22 (NLCT)]
+\ProvidesPackage{glossaries-compatible-207}[2016/04/30 v4.23 (NLCT)]
% \end{macrocode}
%\begin{macro}{\GlsAddXdyAttribute}
% Adds an attribute in old format.
@@ -22622,7 +22765,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%\section{glossaries-compatible-307}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-307}[2016/04/19 v4.22 (NLCT)]
+\ProvidesPackage{glossaries-compatible-307}[2016/04/30 v4.23 (NLCT)]
% \end{macrocode}
%
% Compatibility macros for predefined glossary styles:
@@ -23430,7 +23573,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Package version number now in line with main glossaries package number.
% \begin{macrocode}
-\ProvidesPackage{glossaries-accsupp}[2016/04/19 v4.22 (NLCT)
+\ProvidesPackage{glossaries-accsupp}[2016/04/30 v4.23 (NLCT)
Experimental glossaries accessibility]
% \end{macrocode}
% Pass all options to \sty{glossaries}:
@@ -25861,7 +26004,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% modules.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2016/04/19 v4.22 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2016/04/30 v4.23 (NLCT)]
% \end{macrocode}
% Load \sty{tracklang} to obtain language settings.
% \begin{macrocode}
@@ -25905,7 +26048,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% modules.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-polyglossia}[2016/04/19 v4.22 (NLCT)]
+\ProvidesPackage{glossaries-polyglossia}[2016/04/30 v4.23 (NLCT)]
% \end{macrocode}
% Load \sty{tracklang} to obtain language settings.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
index 27298acf6f8..ad896d17a8d 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.ins
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
@@ -1,4 +1,4 @@
-% glossaries.ins generated using makedtx version 1.1 2016/4/19 23:14
+% glossaries.ins generated using makedtx version 1.1 2016/4/30 18:28
\input docstrip
\preamble