glossaries (4nov17)

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

2 files changed, 48 insertions, 34 deletions

diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
index c017572d295..86d183f7103 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
@@ -1,12 +1,10 @@
 %\iffalse
 % glossaries.dtx generated using makedtx version 1.2 (c) Nicola Talbot
 % Command line args:
-%   -section "chapter"
-%   -setambles ".*\.perl=>\nopreamble\nopostamble"
-%   -setambles ".*\.tex=>\nopreamble\nopostamble"
-%   -setambles ".*\.xdy=>\nopreamble\nopostamble"
-%   -codetitle "Main Package Code"
 %   -author "Nicola Talbot"
+%   -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"
@@ -23,15 +21,17 @@
 %   -src "(samplexdy-mc.*\.xdy)\Z=>\1"
 %   -src "(database.*\.tex)\Z=>\1"
 %   -src "(.*\.perl)\Z=>\1"
-%   -comment ".*\.perl"
-%   -comment ".*\.tex"
-%   -comment ".*\.xdy"
 %   -macrocode ".*\.perl"
 %   -macrocode ".*\.tex"
 %   -macrocode ".*\.xdy"
+%   -codetitle "Main Package Code"
+%   -section "chapter"
 %   -doc "glossaries-manual.tex"
+%   -setambles ".*\.perl=>\nopreamble\nopostamble"
+%   -setambles ".*\.tex=>\nopreamble\nopostamble"
+%   -setambles ".*\.xdy=>\nopreamble\nopostamble"
 %   glossaries
-% Created on 2017/9/21 0:28
+% Created on 2017/11/3 20:12
 %\fi
 %\iffalse
 %<*package>
@@ -145,7 +145,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 
 \setcounter{IndexColumns}{2}
 
-\CheckSum{19469}
+\CheckSum{19480}
 
 \newcommand*{\ifirstuse}{\iterm{first use}}
 \newcommand*{\firstuse}{\gls{firstuse}}
@@ -172,12 +172,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 %\fi
 %\MakeShortVerb{"}
 %
-% \title{Documented Code For glossaries v4.33}
+% \title{Documented Code For glossaries v4.34}
 % \author{Nicola L.C. Talbot\\[10pt]
 %Dickimaw Books\\
 %\url{http://www.dickimaw-books.com/}}
 %
-% \date{2017-09-20}
+% \date{2017-11-03}
 % \maketitle
 %
 %This is the documented code for the \styfmt{glossaries} package.
@@ -193,7 +193,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.33:
+%For the main user guide, read \qt{glossaries.sty v4.34:
 %\LaTeX2e\ Package to Assist Generating Glossaries}.
 %
 %\item[\url{mfirstuc-manual.pdf}]
@@ -248,7 +248,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 % This package requires \LaTeXe.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2017/09/20 v4.33 (NLCT)]
+\ProvidesPackage{glossaries}[2017/11/03 v4.34 (NLCT)]
 %    \end{macrocode}
 %\changes{4.18}{2015-09-09}{split mfirstuc into separate bundle}
 % Required packages:
@@ -380,10 +380,21 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 %\end{option}
 %\begin{macro}{\glsshowtarget}
 %\changes{4.32}{2017-08-24}{new}
+%\changes{4.34}{2017-11-03}{modified to check for math mode and inner}
 %If \pkgopt[showtargets]{debug}, show the hyperlink target name in the
 %margin.
 %    \begin{macrocode}
-\newcommand*{\glsshowtarget}[1]{\marginpar{\texttt{\small #1}}}
+\newcommand*{\glsshowtarget}[1]{%
+ \ifmmode
+   \nfss@text{\ttfamily\small [#1]}%
+ \else
+   \ifinner
+     \texttt{\small [#1]}%
+   \else
+     \marginpar{\texttt{\small #1}}%
+   \fi
+ \fi
+}
 %    \end{macrocode}
 %\end{macro}
 %\begin{macro}{\@glsshowtarget}
@@ -807,7 +818,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %    \end{macrocode}
 %\end{option}
 %
-%\begin{option}{entrycounterwithin}
+%\begin{option}{counterwithin}
 % This option can be used to set a parent counter for
 % \ctr{glossaryentry}. This option automatically sets
 % \pkgopt[true]{entrycounter}.
@@ -18839,7 +18850,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % \cs{gls}\marg{label}} on subsequent use.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-prefix}[2017/09/20 v4.33 (NLCT)]
+\ProvidesPackage{glossaries-prefix}[2017/11/03 v4.34 (NLCT)]
 %    \end{macrocode}
 % Pass all options to \sty{glossaries}:
 %    \begin{macrocode}
@@ -19254,7 +19265,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %\label{sec:code:hypernav}
 % Package Definition:
 %    \begin{macrocode}
-\ProvidesPackage{glossary-hypernav}[2017/09/20 v4.33 (NLCT)]
+\ProvidesPackage{glossary-hypernav}[2017/11/03 v4.34 (NLCT)]
 %    \end{macrocode}
 %
 % The commands defined in this package are provided to 
@@ -19447,7 +19458,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}[2017/09/20 v4.33 (NLCT)]
+\ProvidesPackage{glossary-inline}[2017/11/03 v4.34 (NLCT)]
 %    \end{macrocode}
 %
 %\begin{style}{inline}
@@ -19638,7 +19649,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % \ics{item} command, it will appear in a bold font by
 % default.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-list}[2017/09/20 v4.33 (NLCT)]
+\ProvidesPackage{glossary-list}[2017/11/03 v4.34 (NLCT)]
 %    \end{macrocode}
 %\begin{macro}{\indexspace}
 %\changes{4.13}{2015-02-03}{new}
@@ -19920,7 +19931,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}[2017/09/20 v4.33 (NLCT)]
+\ProvidesPackage{glossary-long}[2017/11/03 v4.34 (NLCT)]
 %    \end{macrocode}
 % Requires the \isty{longtable} package:
 %    \begin{macrocode}
@@ -20417,7 +20428,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % \url{http://tex.stackexchange.com/a/56890}
 %
 %    \begin{macrocode}
-\ProvidesPackage{glossary-longbooktabs}[2017/09/20 v4.33 (NLCT)]
+\ProvidesPackage{glossary-longbooktabs}[2017/11/03 v4.34 (NLCT)]
 %    \end{macrocode}
 % Requires \sty{booktabs} package:
 %    \begin{macrocode}
@@ -20758,7 +20769,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}[2017/09/20 v4.33 (NLCT)]
+\ProvidesPackage{glossary-longragged}[2017/11/03 v4.34 (NLCT)]
 %    \end{macrocode}
 % Requires the \isty{array} package:
 %    \begin{macrocode}
@@ -21191,7 +21202,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}[2017/09/20 v4.33 (NLCT)]
+\ProvidesPackage{glossary-mcols}[2017/11/03 v4.34 (NLCT)]
 %    \end{macrocode}
 % Required packages:
 %    \begin{macrocode}
@@ -21600,6 +21611,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
   {\par\end{multicols}}%
 %    \end{macrocode}
 % Put a hypertarget at the start of each group
+%\changes{4.34}{2017-11-03}{removed spurious space}
 %    \begin{macrocode}
   \renewcommand*{\glsgroupheading}[1]{%
     \par
@@ -21607,7 +21619,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
     \hangindent0pt\relax
     \parindent0pt\relax
     \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par
-    \indexspace}
+    \indexspace}%
 }
 %    \end{macrocode}
 %\end{style}
@@ -21627,7 +21639,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}[2017/09/20 v4.33 (NLCT)]
+\ProvidesPackage{glossary-super}[2017/11/03 v4.34 (NLCT)]
 %    \end{macrocode}
 % Requires the \isty{supertabular} package:
 %    \begin{macrocode}
@@ -22159,7 +22171,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}[2017/09/20 v4.33 (NLCT)]
+\ProvidesPackage{glossary-superragged}[2017/11/03 v4.34 (NLCT)]
 %    \end{macrocode}
 % Requires the \isty{array} package:
 %    \begin{macrocode}
@@ -22599,7 +22611,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % that have a tree-like structure. These are designed for
 % hierarchical glossaries.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-tree}[2017/09/20 v4.33 (NLCT)]
+\ProvidesPackage{glossary-tree}[2017/11/03 v4.34 (NLCT)]
 %    \end{macrocode}
 %
 %\begin{macro}{\indexspace}
@@ -23320,7 +23332,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % hyperlinks may not work properly.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-207}[2017/09/20 v4.33 (NLCT)]
+\ProvidesPackage{glossaries-compatible-207}[2017/11/03 v4.34 (NLCT)]
 %    \end{macrocode}
 %\begin{macro}{\GlsAddXdyAttribute}
 % Adds an attribute in old format.
@@ -23681,7 +23693,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %\section{glossaries-compatible-307}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-307}[2017/09/20 v4.33 (NLCT)]
+\ProvidesPackage{glossaries-compatible-307}[2017/11/03 v4.34 (NLCT)]
 %    \end{macrocode}
 %
 % Compatibility macros for predefined glossary styles:
@@ -24489,7 +24501,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %    \end{macrocode}
 % Package version number now in line with main glossaries package number.
 %    \begin{macrocode}
-\ProvidesPackage{glossaries-accsupp}[2017/09/20 v4.33 (NLCT)
+\ProvidesPackage{glossaries-accsupp}[2017/11/03 v4.34 (NLCT)
   Experimental glossaries accessibility]
 %    \end{macrocode}
 % Pass all options to \sty{glossaries}:
@@ -26928,7 +26940,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % modules.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2017/09/20 v4.33 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2017/11/03 v4.34 (NLCT)]
 %    \end{macrocode}
 % Load \sty{tracklang} to obtain language settings.
 %    \begin{macrocode}
@@ -26972,7 +26984,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 % modules.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-polyglossia}[2017/09/20 v4.33 (NLCT)]
+\ProvidesPackage{glossaries-polyglossia}[2017/11/03 v4.34 (NLCT)]
 %    \end{macrocode}
 % Load \sty{tracklang} to obtain language settings.
 %    \begin{macrocode}
@@ -34899,6 +34911,8 @@ description={the hash symbol}}
 # Description   : LaTeX2HTML (limited!) implementation of glossaries 
 #                  package. Note that not all the glossaries.sty
 #                  macros have been implemented.
+#                Note that this may not work with new versions of
+#                LaTeX2HTML.
 
 # This is a LaTeX2HTML style implementing the glossaries package, and
 # is distributed as part of that package.
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
index de0351dc47f..93c4e6b34f1 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.2 2017/9/21 0:28
+% glossaries.ins generated using makedtx version 1.2 2017/11/3 20:12
 \input docstrip
 
 \preamble