diff options
author | Karl Berry <karl@freefriends.org> | 2016-01-26 22:53:06 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-01-26 22:53:06 +0000 |
commit | 9144cd7fe8a83679a67b2739e85be044b997c4a7 (patch) | |
tree | 1bdb3b0ad9936940a275eb7a44463157a85f9986 /Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty | |
parent | 8d88e6714a570bf2b598132718ae2beb4641c80b (diff) |
glossaries (24jan15)
git-svn-id: svn://tug.org/texlive/trunk@39488 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty | 64 |
1 files changed, 45 insertions, 19 deletions
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty index 630715293b8..71e5ff4bd5d 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty @@ -7,7 +7,7 @@ %% glossaries.dtx (with options: `glossaries.sty,package') %% %% glossaries.dtx -%% Copyright 2015 Nicola Talbot +%% Copyright 2016 Nicola Talbot %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either version 1.3 @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, minimalgls.tex, glossary-lipsum-examples.tex, example-glossaries-acronym-desc.tex, example-glossaries-acronym.tex, example-glossaries-acronyms-lang.tex, example-glossaries-brief.tex, example-glossaries-childnoname.tex, example-glossaries-cite.tex, example-glossaries-images.tex, example-glossaries-long.tex, example-glossaries-multipar.tex, example-glossaries-parent.tex, example-glossaries-symbols.tex, example-glossaries-url.tex, sample-chap-hyperfirst.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dot-abbr.tex, sample-dual.tex, sample-entrycount.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-font-abbr.tex, sample-ignored.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-newkeys.tex, sample-noidxapp-utf8.tex, sample-noidxapp.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample-storage-abbr-desc.tex, sample-storage-abbr.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleCustomAcr.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleFnAcrDesc.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy2.tex, mwe-acr-desc.tex, mwe-acr.tex, mwe-gls.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longbooktabs.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, minimalgls.tex, glossary-lipsum-examples.tex, example-glossaries-acronym-desc.tex, example-glossaries-acronym.tex, example-glossaries-acronyms-lang.tex, example-glossaries-brief.tex, example-glossaries-childnoname.tex, example-glossaries-cite.tex, example-glossaries-images.tex, example-glossaries-long.tex, example-glossaries-multipar.tex, example-glossaries-parent.tex, example-glossaries-symbols.tex, example-glossaries-url.tex, sample-chap-hyperfirst.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dot-abbr.tex, sample-dual.tex, sample-entrycount.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-font-abbr.tex, sample-ignored.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-newkeys.tex, sample-noidxapp-utf8.tex, sample-noidxapp.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample-storage-abbr-desc.tex, sample-storage-abbr.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleCustomAcr.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleFnAcrDesc.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy2.tex, mwe-acr-desc.tex, mwe-acr.tex, mwe-gls.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2015/11/30 v4.20 (NLCT)] +\ProvidesPackage{glossaries}[2016/01/24 v4.21 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} @@ -1685,6 +1685,13 @@ false,nolabel,autolabel,nameref}[nolabel]{% or \string\makenoidxglossaries\space before defining any entries that have a `see' key}% } +\newcommand*{\gls@checkseeallowed@preambleonly}{% + \GlossariesWarning{glossaries}% + {`see' key doesn't have any effect when used in the document + environment. Move the definition to the preamble + after \string\makeglossaries\space + or \string\makenoidxglossaries}% +} \define@key{glossentry}{parent}{% \def\@glo@parent{#1}} \define@choicekey{glossentry}{nonumberlist}[\val\nr]{true,false}[true]{% @@ -1834,6 +1841,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% } \newcommand*{\gls@defdocnewglossaryentry}{% + \let\gls@checkseeallowed\gls@checkseeallowed@preambleonly \let\newglossaryentry\new@glossaryentry } \newrobustcmd{\provideglossaryentry}[2]{% @@ -3100,6 +3108,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \expandafter\DTLifinlist\expandafter{\glstype}{\@gls@nohyperlist}% {\KV@glslink@hyperfalse}{}% } +\newcommand*{\@gls@setdefault@glslink@opts}{} \def\@gls@link[#1]#2#3{% \leavevmode \edef\glslabel{\glsdetoklabel{#2}}% @@ -3109,6 +3118,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \edef\@gls@counter{\csname glo@\glslabel @counter\endcsname}% \edef\glstype{\csname glo@\glslabel @type\endcsname}% \let\org@ifKV@glslink@hyper\ifKV@glslink@hyper + \@gls@setdefault@glslink@opts \do@glsdisablehyperinlist \do@gls@link@checkfirsthyper \setkeys{glslink}{#1}% @@ -3119,7 +3129,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \ifKV@glslink@hyper \@glslink{\glolinkprefix\glslabel}{\glstextformat{#3}}% \else - \glstextformat{#3}% + \glsdonohyperlink{\glolinkprefix\glslabel}{\glstextformat{#3}}% \fi \let\ifKV@glslink@hyper\org@ifKV@glslink@hyper } @@ -3503,9 +3513,10 @@ false,nolabel,autolabel,nameref}[nolabel]{% \raisebox{\gls@tmplen}{\hypertarget{#1}{}}#2% } \newcommand*{\glsdohyperlink}[2]{\hyperlink{#1}{#2}} +\newcommand*{\glsdonohyperlink}[2]{#2} \ifcsundef{hyperlink}% {% - \let\@glslink\@secondoftwo + \let\@glslink\glsdonohyperlink }% {% \let\@glslink\glsdohyperlink @@ -3519,7 +3530,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% } \newcommand{\glsdisablehyper}{% \KV@glslink@hyperfalse - \let\@glslink\@secondoftwo + \let\@glslink\glsdonohyperlink \let\@glstarget\@secondoftwo } \newcommand{\glsenablehyper}{% @@ -3965,7 +3976,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \def\@acrshort#1#2[#3]{% \glsdoifexists{#2}% {% - \let\do@gls@link@checkfirsthyper\relax + \let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper \let\glsifplural\@secondoftwo \let\glscapscase\@firstofthree \let\glsinsert\@empty @@ -3983,7 +3994,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \def\@Acrshort#1#2[#3]{% \glsdoifexists{#2}% {% - \let\do@gls@link@checkfirsthyper\relax + \let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper \def\glslabel{#2}% \let\glsifplural\@secondoftwo \let\glscapscase\@secondofthree @@ -4002,7 +4013,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \def\@ACRshort#1#2[#3]{% \glsdoifexists{#2}% {% - \let\do@gls@link@checkfirsthyper\relax + \let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper \def\glslabel{#2}% \let\glsifplural\@secondoftwo \let\glscapscase\@thirdofthree @@ -4021,7 +4032,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \def\@acrshortpl#1#2[#3]{% \glsdoifexists{#2}% {% - \let\do@gls@link@checkfirsthyper\relax + \let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper \def\glslabel{#2}% \let\glsifplural\@firstoftwo \let\glscapscase\@firstofthree @@ -4040,7 +4051,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \def\@Acrshortpl#1#2[#3]{% \glsdoifexists{#2}% {% - \let\do@gls@link@checkfirsthyper\relax + \let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper \def\glslabel{#2}% \let\glsifplural\@firstoftwo \let\glscapscase\@secondofthree @@ -4059,7 +4070,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \def\@ACRshortpl#1#2[#3]{% \glsdoifexists{#2}% {% - \let\do@gls@link@checkfirsthyper\relax + \let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper \def\glslabel{#2}% \let\glsifplural\@firstoftwo \let\glscapscase\@thirdofthree @@ -4078,7 +4089,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \def\@acrlong#1#2[#3]{% \glsdoifexists{#2}% {% - \let\do@gls@link@checkfirsthyper\relax + \let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper \def\glslabel{#2}% \let\glsifplural\@secondoftwo \let\glscapscase\@firstofthree @@ -4097,7 +4108,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \def\@Acrlong#1#2[#3]{% \glsdoifexists{#2}% {% - \let\do@gls@link@checkfirsthyper\relax + \let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper \def\glslabel{#2}% \let\glsifplural\@secondoftwo \let\glscapscase\@secondofthree @@ -4116,7 +4127,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \def\@ACRlong#1#2[#3]{% \glsdoifexists{#2}% {% - \let\do@gls@link@checkfirsthyper\relax + \let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper \def\glslabel{#2}% \let\glsifplural\@secondoftwo \let\glscapscase\@thirdofthree @@ -4135,7 +4146,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \def\@acrlongpl#1#2[#3]{% \glsdoifexists{#2}% {% - \let\do@gls@link@checkfirsthyper\relax + \let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper \def\glslabel{#2}% \let\glsifplural\@firstoftwo \let\glscapscase\@firstofthree @@ -4154,7 +4165,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \def\@Acrlongpl#1#2[#3]{% \glsdoifexists{#2}% {% - \let\do@gls@link@checkfirsthyper\relax + \let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper \def\glslabel{#2}% \let\glsifplural\@firstoftwo \let\glscapscase\@secondofthree @@ -4173,7 +4184,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% \def\@ACRlongpl#1#2[#3]{% \glsdoifexists{#2}% {% - \let\do@gls@link@checkfirsthyper\relax + \let\do@gls@link@checkfirsthyper\@gls@link@nocheckfirsthyper \def\glslabel{#2}% \let\glsifplural\@firstoftwo \let\glscapscase\@thirdofthree @@ -5224,7 +5235,16 @@ you \def\glossarytitle{\csname @glotype@\@glo@type @title\endcsname}% \def\glossarytoctitle{\glossarytitle}% \let\org@glossarytitle\glossarytitle - \def\@glossarystyle{}% + \def\@glossarystyle{% + \ifx\@glossary@default@style\relax + \GlossariesWarning{No default glossary style provided \MessageBreak + for the glossary `\@glo@type'. \MessageBreak + Using deprecated fallback. \MessageBreak + To fix this set the style with \MessageBreak + \string\setglossarystyle\space or use the \MessageBreak + style key=value option}% + \fi + }% \def\gls@dotoctitle{\glssettoctitle{\@glo@type}}% \let\@org@glossaryentrynumbers\glossaryentrynumbers \bgroup @@ -5976,6 +5996,9 @@ false,nolabel,autolabel,nameref}[nolabel]{% {% \csname @glsstyle@#1\endcsname }% + \ifx\@glossary@default@style\relax + \protected@edef\@glossary@default@style{#1}% + \fi } \newcommand*{\glossarystyle}[1]{% \ifcsundef{@glsstyle@#1}% @@ -5993,6 +6016,9 @@ false,nolabel,autolabel,nameref}[nolabel]{% {\setglossentrycompatibility\csuse{@glscompstyle@#1}}% {}% }% + \ifx\@glossary@default@style\relax + \protected@edef\@glossary@default@style{#1}% + \fi } \newcommand{\newglossarystyle}[2]{% \ifcsundef{@glsstyle@#1}% |