From fafc6938d345721a476b6c87746b07d6beb09bf3 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 4 Nov 2017 21:12:37 +0000 Subject: glossaries (4nov17) git-svn-id: svn://tug.org/texlive/trunk@45691 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/glossaries/base/glossaries-babel.sty | 2 +- .../latex/glossaries/base/glossaries-compatible-207.sty | 2 +- .../latex/glossaries/base/glossaries-compatible-307.sty | 2 +- .../tex/latex/glossaries/base/glossaries-polyglossia.sty | 2 +- .../tex/latex/glossaries/base/glossaries-prefix.sty | 2 +- Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty | 14 ++++++++++++-- .../tex/latex/glossaries/expl/glossaries-accsupp.sty | 2 +- .../tex/latex/glossaries/styles/glossary-hypernav.sty | 2 +- .../tex/latex/glossaries/styles/glossary-inline.sty | 2 +- .../tex/latex/glossaries/styles/glossary-list.sty | 2 +- .../tex/latex/glossaries/styles/glossary-long.sty | 2 +- .../tex/latex/glossaries/styles/glossary-longbooktabs.sty | 2 +- .../tex/latex/glossaries/styles/glossary-longragged.sty | 2 +- .../tex/latex/glossaries/styles/glossary-mcols.sty | 4 ++-- .../tex/latex/glossaries/styles/glossary-super.sty | 2 +- .../tex/latex/glossaries/styles/glossary-superragged.sty | 2 +- .../tex/latex/glossaries/styles/glossary-tree.sty | 2 +- 17 files changed, 29 insertions(+), 19 deletions(-) (limited to 'Master/texmf-dist/tex/latex/glossaries') diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty index 983c49fdd49..b351ace3cbc 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-babel}[2017/09/20 v4.33 (NLCT)] +\ProvidesPackage{glossaries-babel}[2017/11/03 v4.34 (NLCT)] \RequirePackage{tracklang} \let\glsifusetranslator\@secondoftwo \AnyTrackedLanguages diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty index 4fd5b7c5b80..4516fade98d 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-207}[2017/09/20 v4.33 (NLCT)] +\ProvidesPackage{glossaries-compatible-207}[2017/11/03 v4.34 (NLCT)] \ifglsxindy \renewcommand*\GlsAddXdyAttribute[1]{% \edef\@xdyattributes{\@xdyattributes ^^J \string"#1\string"}% diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty index 305d0aeffcf..183df07e3e2 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-307}[2017/09/20 v4.33 (NLCT)] +\ProvidesPackage{glossaries-compatible-307}[2017/11/03 v4.34 (NLCT)] \newcommand{\compatglossarystyle}[2]{% \ifcsundef{@glscompstyle@#1}% {% diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty index 1b1cb673ba7..a297a602c9e 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-polyglossia}[2017/09/20 v4.33 (NLCT)] +\ProvidesPackage{glossaries-polyglossia}[2017/11/03 v4.34 (NLCT)] \RequirePackage{tracklang} \let\glsifusetranslator\@secondoftwo \AnyTrackedLanguages diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty index 683d06e7518..bd3ed165b6a 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-prefix}[2017/09/20 v4.33 (NLCT)] +\ProvidesPackage{glossaries-prefix}[2017/11/03 v4.34 (NLCT)] \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}} \ProcessOptions \RequirePackage{glossaries} diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty index 045b63c8ba8..1794b8f9089 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2017/09/20 v4.33 (NLCT)] +\ProvidesPackage{glossaries}[2017/11/03 v4.34 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} @@ -97,7 +97,17 @@ \renewcommand{\@glsshowtarget}{\glsshowtarget}% \fi } -\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 +} \newcommand*{\@glsshowtarget}[1]{} \newcommand*{\@gls@see@noindex}{% \PackageError{glossaries}% diff --git a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty index 11c9a29f8ef..abc520df49f 100644 --- a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty +++ b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-accsupp}[2017/09/20 v4.33 (NLCT) +\ProvidesPackage{glossaries-accsupp}[2017/11/03 v4.34 (NLCT) Experimental glossaries accessibility] \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}} \ProcessOptions diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty index d8d8f00f6d9..ad068343b9f 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-hypernav}[2017/09/20 v4.33 (NLCT)] +\ProvidesPackage{glossary-hypernav}[2017/11/03 v4.34 (NLCT)] \newcommand*{\glsnavhyperlink}[3][\@glo@type]{% \edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}% \@glslink{\glsnavhyperlinkname{#1}{#2}}{#3}} diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty index 906376f03d1..2edb042d76b 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-inline}[2017/09/20 v4.33 (NLCT)] +\ProvidesPackage{glossary-inline}[2017/11/03 v4.34 (NLCT)] \newglossarystyle{inline}{% \renewenvironment{theglossary}% {% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty index 73d162ca11e..af03c0290e9 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-list}[2017/09/20 v4.33 (NLCT)] +\ProvidesPackage{glossary-list}[2017/11/03 v4.34 (NLCT)] \providecommand{\indexspace}{% \par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax } diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty index 0f6055451d9..56722e34790 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-long}[2017/09/20 v4.33 (NLCT)] +\ProvidesPackage{glossary-long}[2017/11/03 v4.34 (NLCT)] \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty index c5966fe0e8a..c3cde647bf1 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-longbooktabs}[2017/09/20 v4.33 (NLCT)] +\ProvidesPackage{glossary-longbooktabs}[2017/11/03 v4.34 (NLCT)] \RequirePackage{booktabs} \RequirePackage{glossary-long} \RequirePackage{glossary-longragged} diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty index bf55d45f56c..6f9e07e85b2 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-longragged}[2017/09/20 v4.33 (NLCT)] +\ProvidesPackage{glossary-longragged}[2017/11/03 v4.34 (NLCT)] \RequirePackage{array} \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty index fb4481c4f8d..fa4e4f56f42 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-mcols}[2017/09/20 v4.33 (NLCT)] +\ProvidesPackage{glossary-mcols}[2017/11/03 v4.34 (NLCT)] \RequirePackage{multicol} \RequirePackage{glossary-tree} \providecommand{\indexspace}{% @@ -211,7 +211,7 @@ \hangindent0pt\relax \parindent0pt\relax \glstreegroupheaderfmt{\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}\par - \indexspace} + \indexspace}% } \endinput diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty index 58ad636ec40..b44a3019212 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-super}[2017/09/20 v4.33 (NLCT)] +\ProvidesPackage{glossary-super}[2017/11/03 v4.34 (NLCT)] \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty index 62f015aee77..407e3c6b173 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-superragged}[2017/09/20 v4.33 (NLCT)] +\ProvidesPackage{glossary-superragged}[2017/11/03 v4.34 (NLCT)] \RequirePackage{array} \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty index 5a5bc0bc5c7..16049b6db3b 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-tree}[2017/09/20 v4.33 (NLCT)] +\ProvidesPackage{glossary-tree}[2017/11/03 v4.34 (NLCT)] \providecommand{\indexspace}{% \par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax } -- cgit v1.2.3