summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/glossaries-extra
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-11-09 23:44:57 +0000
committerKarl Berry <karl@freefriends.org>2017-11-09 23:44:57 +0000
commitb4ddb0e04d17bd28752d66b3fc94b5613d10335e (patch)
tree75ecde30e419937b22f59ae81593c376feced620 /Master/texmf-dist/tex/latex/glossaries-extra
parentd58e09051eed105b7c4b93a513e0fd02ae2dfd4b (diff)
glossaries-extra (9nov17)
git-svn-id: svn://tug.org/texlive/trunk@45733 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries-extra')
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty148
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossary-bookindex.sty4
3 files changed, 148 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty
index 67146a59603..2cf66fff322 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2017/11/03 v1.21 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2017/11/08 v1.22 (NLCT)]
\newcommand*{\@glsxtr@loadstyles}{}
\DeclareOption{all}{%
\appto\@glsxtr@loadstyles{%
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 22e40c389af..c077b215f8c 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}[2017/11/03 v1.21 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2017/11/08 v1.22 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
\@ifpackageloaded{glossaries}
@@ -1192,7 +1192,7 @@
\glsseeformat[#1]{#2}{}%
}
\renewcommand*{\glsseeitemformat}[1]{%
- \glsifregular{#1}{\glsaccessname{#1}}{\glsaccesstext{#1}}%
+ \ifglshasshort{\glslabel}{\glsaccesstext{#1}}{\glsaccessname{#1}}%
}
\newcommand*{\glsxtruseseealso}[1]{%
\glsdoifexists{#1}%
@@ -3709,7 +3709,7 @@
\let\org@glossaryentrynumbers\glossaryentrynumbers
\let\glsnonextpages\@glsnonextpages
\let\glsnextpages\@glsnextpages
- \let\nopostdesc\@nopostdesc
+ \glsxtractivatenopost
\gls@dotoctitle
\@glossarystyle
\let\gls@org@glossaryentryfield\glossentry
@@ -3728,6 +3728,25 @@
\global\let\glossaryentrynumbers\@org@glossaryentrynumbers
\global\let\warn@noprintglossary\relax
}
+\newcommand*{\glsxtractivatenopost}{%
+ \let\nopostdesc\@nopostdesc
+ \let\glsxtrnopostpunc\@glsxtr@nopostpunc
+}
+\newrobustcmd*{\glsxtrnopostpunc}{}
+\newcommand{\@glsxtr@nopostpunc}{%
+ \let\@@glsxtr@org@postdescription\glspostdescription
+ \ifglsnopostdot
+ \renewcommand{\glspostdescription}{%
+ \glsnopostdottrue
+ \let\glspostdescription\@@glsxtr@org@postdescription
+ \glsxtrpostdescription}%
+ \else
+ \renewcommand{\glspostdescription}{%
+ \let\glspostdescription\@@glsxtr@org@postdescription
+ \glsxtrpostdescription}%
+ \fi
+ \glsnopostdotfalse
+}
\renewcommand{\@printglossary}[2]{%
\def\@glsxtr@printglossopts{#1}%
\@glsxtr@orgprintglossary{#1}{#2}%
@@ -4225,6 +4244,8 @@
\protected@write\@auxout{}%
{\string\providecommand*{\string\glsxtr@linkprefix}[1]{}}%
\protected@write\@auxout{}{\string\glsxtr@fields{\@gls@keymap}}%
+ \protected@write\@auxout{}%
+ {\string\providecommand*{\string\glsxtr@record}[5]{}}%
\ifdef\CurrentTrackedLanguageTag
{%
\protected@write\@auxout{}{%
@@ -4300,6 +4321,48 @@
{\glsentryname{#1}}%
{\glsxtrheadname{#1}}%
}
+\newcommand*{\glsxtrglossentryother}[3]{%
+ \ifstrempty{#1}%
+ {%
+ \ifcsdef{glsxtrhead#3}%
+ {%
+ \glsxtrtitleorpdforheading
+ {\@glsxtrglossentryother{#2}{#3}{#1}}%
+ {\@gls@entry@field{#2}{#3}}%
+ {\csuse{glsxtrhead#3}{#2}}%
+ }%
+ {%
+ \glsxtrtitleorpdforheading
+ {\@glsxtrglossentryother{#2}{#3}{#1}}%
+ {\@gls@entry@field{#2}{#3}}%
+ {\@gls@entry@field{\NoCaseChange{#2}}{#3}}%
+ }%
+ }%
+ {%
+ \glsxtrtitleorpdforheading
+ {\@glsxtrglossentryother{#2}{#3}{#1}}%
+ {\@gls@entry@field{#2}{#3}}%
+ {#1}%
+ }%
+}
+\newrobustcmd*{\@glsxtrglossentryother}[3]{%
+ \glsxtrtitleorpdforheading
+ {%
+ \glsdoifexists{#1}%
+ {%
+ \begingroup
+ \edef\glscurrententrylabel{\glsdetoklabel{#1}}%
+ \edef\currentglossary{\glsentrytype{\glscurrententrylabel}}%
+ \ifglshasparent{#1}%
+ {\glssubentryitem{#1}}%
+ {\glsentryitem{#1}}%
+ \glstarget{#1}{\glossentrynameother{#1}{#2}}%
+ \endgroup
+ }%
+ }%
+ {\@gls@entry@field{#1}{#2}}%
+ {#3}%
+}
\newcommand*{\printunsrtglossary}{%
\@ifstar\s@printunsrtglossary\@printunsrtglossary
}
@@ -5416,6 +5479,85 @@ defined}{}%
\glsxtrdoautoindexname{#1}{indexname}%
\csuse{glsxtrpostname\glscategory{#1}}%
}
+\@ifpackageloaded{glossaries-accsupp}
+{
+ \newcommand*{\glsxtr@setaccessdisplay}[1]{%
+ \ifcsdef{gls#1accessdisplay}%
+ {\letcs\@glsxtr@accessdisplay{gls#1accessdisplay}}%
+ {%
+ \edef\@gls@thisval{#1}%
+ \@for\@gls@map:=\@gls@keymap\do{%
+ \edef\@this@key{\expandafter\@secondoftwo\@gls@map}%
+ \ifdefequal{\@this@key}{\@gls@thisval}%
+ {%
+ \edef\@gls@thisval{\expandafter\@firstoftwo\@gls@map}%
+ \@endfortrue
+ }%
+ {}%
+ }%
+ \ifcsdef{gls\@gls@thisval accessdisplay}%
+ {\letcs\@glsxtr@accessdisplay{gls\@gls@thisval accessdisplay}}%
+ {\let\@glsxtr@accessdisplay\@firstoftwo}%
+ }%
+ }
+}
+{%
+ \newcommand*{\glsxtr@setaccessdisplay}[1]{%
+ \let\@glsxtr@accessdisplay\@firstoftwo}
+}
+\newrobustcmd*{\glossentrynameother}[2]{%
+ \@glsdoifexistsorwarn{#1}%
+ {%
+ \glsxtr@setaccessdisplay{#2}%
+ \glssetabbrvfmt{\glscategory{#1}}%
+ \glshasattribute{#1}{glossnamefont}%
+ {%
+ \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
+ \ifcsdef{\@glsxtr@attrval}%
+ {%
+ \letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}%
+ }%
+ {%
+ \GlossariesExtraWarning{Unknown control sequence name
+ `\@glsxtr@attrval' supplied in glossnamefont attribute
+ for entry `#1'. Reverting to default \string\glsnamefont}%
+ \let\@glsxtr@glossnamefont\glsnamefont
+ }%
+ }%
+ {\let\@glsxtr@glossnamefont\glsnamefont}%
+ \glsifattribute{#1}{glossname}{firstuc}%
+ {%
+ \@glsxtr@accessdisplay
+ {\@glsxtr@glossnamefont{\@Gls@entry@field{#1}{#2}}}%
+ {#1}%
+ }%
+ {%
+ \glsifattribute{#1}{glossname}{title}%
+ {%
+ \@glsxtr@do@titlecaps@warn
+ \@glsxtr@accessdisplay
+ {\@glsxtr@glossnamefont{\glsxtrfieldtitlecase{#1}{#2}}}%
+ {#1}%
+ }%
+ {%
+ \glsifattribute{#1}{glossname}{uc}%
+ {%
+ \letcs{\glo@name}{glo@\glsdetoklabel{#1}@#2}%
+ \@glsxtr@accessdisplay
+ {\@glsxtr@glossnamefont{\mfirstucMakeUppercase{\glo@name}}}%
+ {#1}%
+ }%
+ {%
+ \letcs{\glo@name}{glo@\glsdetoklabel{#1}@#2}%
+ \@glsxtr@accessdisplay
+ {\expandafter\@glsxtr@glossnamefont\expandafter{\glo@name}}%
+ {#1}%
+ }%
+ }%
+ }%
+ \glsxtrpostnamehook{#1}%
+ }%
+}
\newif\if@glsxtr@format@override
\@glsxtr@format@overridefalse
\@ifpackageloaded{hyperref}
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 ccc4bb32f57..a55eb8e5996 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}[2017/11/03 v1.21 (NLCT)]
+\ProvidesPackage{glossary-bookindex}[2017/11/08 v1.22 (NLCT)]
\RequirePackage{multicol}
\RequirePackage{glossary-tree}
\newcommand{\glsxtrbookindexcols}{2}
@@ -49,7 +49,7 @@
\newcommand*{\glsxtrbookindexprelocation}[1]{%
\glsxtrifhasfield{location}{#1}%
- {\ifglsnopostdot,\fi\glsxtrprelocation}%
+ {,\glsxtrprelocation}%
{\glsxtrprelocation}%
}
\newcommand*{\glsxtrbookindexsubprelocation}[1]{%