From e2d776e4380890862007f3a0b2b6982a081ce452 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 19 Aug 2018 21:25:32 +0000 Subject: glossaries-extra (19aug18) git-svn-id: svn://tug.org/texlive/trunk@48437 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty | 12 +++++++++++- .../tex/latex/glossaries-extra/glossaries-extra.sty | 9 ++++++--- .../tex/latex/glossaries-extra/glossary-bookindex.sty | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) (limited to 'Master/texmf-dist/tex/latex/glossaries-extra') diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty index 557df0654c6..7dca62e8c98 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-bib2gls.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra-bib2gls}[2018/08/13 v1.35 (NLCT)] +\ProvidesPackage{glossaries-extra-bib2gls}[2018/08/18 v1.36 (NLCT)] \newcommand*{\glshex}{\string\u} \newcommand*{\glscapturedgroup}{\string\$} \newcommand*{\GlsXtrIfHasNonZeroChildCount}[3]{% @@ -101,6 +101,16 @@ \glsaddstoragekey{bibtextype}{}{\glsxtrbibtype}% \glsaddstoragekey{volume}{}{\glsxtrbibvolume}% } +\newcommand*{\glsxtrmultisupplocation}[3]{% + {% + \def\glsxtrsupplocationurl{#2}% + \glshypernumber{#1}% + }% +} +\newcommand*\glsxtrdisplaysupploc[5]{% + \setentrycounter[#1]{#2}% + \glsxtrmultisupplocation{#5}{#4}{#3}% +} \providecommand*{\Alpha}{\mathrm{A}} \providecommand*{\Beta}{\mathrm{B}} \providecommand*{\Epsilon}{\mathrm{E}} diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty index e3669546914..4be61aae9d4 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra}[2018/08/13 v1.35 (NLCT)] +\ProvidesPackage{glossaries-extra}[2018/08/18 v1.36 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{etoolbox} \@ifpackageloaded{glossaries} @@ -6170,11 +6170,14 @@ defined}{}% {}% } \newcommand*{\glsxtrautoindex}{\index} +\newcommand{\glsxtrautoindexesc}{% + \@gls@checkmkidxchars\@glo@sort + \@glsxtr@autoindex@doextra@esc\@glo@sort +} \newcommand*{\@glsxtr@autoindex@setname}[1]{% \protected@edef\@glo@name{\glsxtrautoindexentry{#1}}% \glsxtrautoindexassignsort{\@glo@sort}{#1}% - \@gls@checkmkidxchars\@glo@sort - \@glsxtr@autoindex@doextra@esc\@glo@sort + \glsxtrautoindexesc \epreto\@glo@name{\@glo@sort\@glsxtr@autoindex@at}% } \newcommand*{\glsxtrautoindexentry}[1]{\string\glsentryname{#1}} diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty index 9d1a5214282..67485ea1419 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossary-bookindex}[2018/08/13 v1.35 (NLCT)] +\ProvidesPackage{glossary-bookindex}[2018/08/18 v1.36 (NLCT)] \RequirePackage{multicol} \RequirePackage{glossary-tree} \newcommand{\glsxtrbookindexcols}{2} -- cgit v1.2.3