summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/glossaries
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-04-04 23:19:17 +0000
committerKarl Berry <karl@freefriends.org>2011-04-04 23:19:17 +0000
commitd49526563e8a66d6774a086ad2a91fbf249b35b3 (patch)
treeaecb9254e4f4db280b2f7ab8a9dc9f154fa08dd7 /Master/texmf-dist/tex/latex/glossaries
parentaeb22f958bf3b465bb5e3f085176c7fe0f2ef562 (diff)
glossaries 3.0 (4apr11)
git-svn-id: svn://tug.org/texlive/trunk@21968 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/glossaries')
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty328
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty1912
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty15
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazilian.dict4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Serbian.dict4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty233
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty4
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty27
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty24
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty24
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty24
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty24
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty24
25 files changed, 1991 insertions, 704 deletions
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 291fa313d0e..cb4c936813a 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-babel.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
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
new file mode 100644
index 00000000000..05bd60a57d5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty
@@ -0,0 +1,328 @@
+%%
+%% This is file `glossaries-compatible-207.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% glossaries.dtx (with options: `glossaries-compatible-207.sty,package')
+%%
+%% glossaries.dtx
+%% Copyright 2011 Nicola Talbot
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license of (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `maintained'.
+%%
+%% 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
+%% Lower-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
+%% Digits \0\1\2\3\4\5\6\7\8\9
+%% Exclamation \! Double quote \" Hash (number) \#
+%% Dollar \$ Percent \% Ampersand \&
+%% Acute accent \' Left paren \( Right paren \)
+%% Asterisk \* Plus \+ Comma \,
+%% Minus \- Point \. Solidus \/
+%% Colon \: Semicolon \; Less than \<
+%% Equals \= Greater than \> Question mark \?
+%% Commercial at \@ Left bracket \[ Backslash \\
+%% Right bracket \] Circumflex \^ Underscore \_
+%% Grave accent \` Left brace \{ Vertical bar \|
+%% Right brace \} Tilde \~}
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{glossaries-compatible-207}[2011/04/02 v1.0 (NLCT)]
+\ifglsxindy
+ \renewcommand*\GlsAddXdyAttribute[1]{%
+ \edef\@xdyattributes{\@xdyattributes ^^J \string"#1\string"}%
+ \expandafter\toks@\expandafter{\@xdylocref}%
+ \edef\@xdylocref{\the\toks@ ^^J%
+ (markup-locref
+ :open \string"\string~n\string\setentrycounter
+ {\noexpand\glscounter}%
+ \expandafter\string\csname#1\endcsname
+ \expandafter\@gobble\string\{\string" ^^J
+ :close \string"\expandafter\@gobble\string\}\string" ^^J
+ :attr \string"#1\string")}}
+\fi
+\renewcommand*\GlsAddXdyCounters[1]{%
+ \GlossariesWarning{\string\GlsAddXdyCounters\space not available
+ in compatibility mode.}%
+}
+ \GlsAddXdyAttribute{glsnumberformat}
+ \GlsAddXdyAttribute{textrm}
+ \GlsAddXdyAttribute{textsf}
+ \GlsAddXdyAttribute{texttt}
+ \GlsAddXdyAttribute{textbf}
+ \GlsAddXdyAttribute{textmd}
+ \GlsAddXdyAttribute{textit}
+ \GlsAddXdyAttribute{textup}
+ \GlsAddXdyAttribute{textsl}
+ \GlsAddXdyAttribute{textsc}
+ \GlsAddXdyAttribute{emph}
+ \GlsAddXdyAttribute{glshypernumber}
+ \GlsAddXdyAttribute{hyperrm}
+ \GlsAddXdyAttribute{hypersf}
+ \GlsAddXdyAttribute{hypertt}
+ \GlsAddXdyAttribute{hyperbf}
+ \GlsAddXdyAttribute{hypermd}
+ \GlsAddXdyAttribute{hyperit}
+ \GlsAddXdyAttribute{hyperup}
+ \GlsAddXdyAttribute{hypersl}
+ \GlsAddXdyAttribute{hypersc}
+ \GlsAddXdyAttribute{hyperemph}
+\ifglsxindy
+ \renewcommand*{\GlsAddXdyLocation}[2]{%
+ \edef\@xdyuserlocationdefs{%
+ \@xdyuserlocationdefs ^^J%
+ (define-location-class \string"#1\string"^^J\space\space
+ \space(#2))
+ }%
+ \edef\@xdyuserlocationnames{%
+ \@xdyuserlocationnames^^J\space\space\space
+ \string"#1\string"}%
+ }
+\fi
+\renewcommand{\@do@wrglossary}[1]{%
+\ifglsxindy
+ \expandafter\@glo@check@mkidxrangechar\@glsnumberformat\@nil
+ \def\@glo@range{}%
+ \expandafter\if\@glo@prefix(\relax
+ \def\@glo@range{:open-range}%
+ \else
+ \expandafter\if\@glo@prefix)\relax
+ \def\@glo@range{:close-range}%
+ \fi
+ \fi
+ \protected@edef\@glslocref{\theglsentrycounter}%
+ \@gls@checkmkidxchars\@glslocref
+ \glossary[\csname glo@#1@type\endcsname]{%
+ (indexentry :tkey (\csname glo@#1@index\endcsname)
+ :locref \string"\@glslocref\string" %
+ :attr \string"\@glo@suffix\string" \@glo@range
+ )
+ }%
+\else
+ \@set@glo@numformat\@glo@numfmt\@gls@counter\@glsnumberformat
+ \glossary[\csname glo@#1@type\endcsname]{%
+ \string\glossaryentry{\csname glo@#1@index\endcsname
+ \@gls@encapchar\@glo@numfmt}{\theglsentrycounter}}%
+\fi
+}
+\def\@set@glo@numformat#1#2#3{%
+ \expandafter\@glo@check@mkidxrangechar#3\@nil
+ \protected@edef#1{%
+ \@glo@prefix setentrycounter[]{#2}%
+ \expandafter\string\csname\@glo@suffix\endcsname
+ }%
+ \@gls@checkmkidxchars#1%
+}
+\ifglsxindy
+ \def\writeist{%
+ \openout\glswrite=\istfilename
+ \write\glswrite{;; xindy style file created by the glossaries
+ package in compatible-2.07 mode}%
+ \write\glswrite{;; for document '\jobname' on
+ \the\year-\the\month-\the\day}%
+ \write\glswrite{^^J; required styles^^J}
+ \@for\@xdystyle:=\@xdyrequiredstyles\do{%
+ \ifx\@xdystyle\@empty
+ \else
+ \protected@write\glswrite{}{(require
+ \string"\@xdystyle.xdy\string")}%
+ \fi
+ }%
+ \write\glswrite{^^J%
+ ; list of allowed attributes (number formats)^^J}%
+ \write\glswrite{(define-attributes ((\@xdyattributes)))}%
+ \write\glswrite{^^J; user defined alphabets^^J}%
+ \write\glswrite{\@xdyuseralphabets}%
+ \write\glswrite{^^J; location class definitions^^J}%
+ \protected@edef\@gls@roman{\@roman{0\string"
+ \string"roman-numbers-lowercase\string" :sep \string"}}%
+ \@onelevel@sanitize\@gls@roman
+ \edef\@tmp{\string" \string"roman-numbers-lowercase\string"
+ :sep \string"}%
+ \@onelevel@sanitize\@tmp
+ \ifx\@tmp\@gls@roman
+ \write\glswrite{(define-location-class
+ \string"roman-page-numbers\string"^^J\space\space\space
+ (\string"roman-numbers-lowercase\string")
+ :min-range-length \@glsminrange)}%
+ \else
+ \write\glswrite{(define-location-class
+ \string"roman-page-numbers\string"^^J\space\space\space
+ (:sep "\@gls@roman")
+ :min-range-length \@glsminrange)}%
+ \fi
+ \write\glswrite{(define-location-class
+ \string"Roman-page-numbers\string"^^J\space\space\space
+ (\string"roman-numbers-uppercase\string")
+ :min-range-length \@glsminrange)}%
+ \write\glswrite{(define-location-class
+ \string"arabic-page-numbers\string"^^J\space\space\space
+ (\string"arabic-numbers\string")
+ :min-range-length \@glsminrange)}%
+ \write\glswrite{(define-location-class
+ \string"alpha-page-numbers\string"^^J\space\space\space
+ (\string"alpha\string")
+ :min-range-length \@glsminrange)}%
+ \write\glswrite{(define-location-class
+ \string"Alpha-page-numbers\string"^^J\space\space\space
+ (\string"ALPHA\string")
+ :min-range-length \@glsminrange)}%
+ \write\glswrite{(define-location-class
+ \string"Appendix-page-numbers\string"^^J\space\space\space
+ (\string"ALPHA\string"
+ :sep \string"\@glsAlphacompositor\string"
+ \string"arabic-numbers\string")
+ :min-range-length \@glsminrange)}%
+ \write\glswrite{(define-location-class
+ \string"arabic-section-numbers\string"^^J\space\space\space
+ (\string"arabic-numbers\string"
+ :sep \string"\glscompositor\string"
+ \string"arabic-numbers\string")
+ :min-range-length \@glsminrange)}%
+ \write\glswrite{^^J; user defined location classes}%
+ \write\glswrite{\@xdyuserlocationdefs}%
+ \write\glswrite{^^J; define cross-reference class^^J}%
+ \write\glswrite{(define-crossref-class \string"see\string"
+ :unverified )}%
+ \write\glswrite{(markup-crossref-list
+ :class \string"see\string"^^J\space\space\space
+ :open \string"\string\glsseeformat\string"
+ :close \string"{}\string")}%
+ \write\glswrite{^^J; define the order of the location classes}%
+ \write\glswrite{(define-location-class-order
+ (\@xdylocationclassorder))}%
+ \write\glswrite{^^J; define the glossary markup^^J}%
+ \write\glswrite{(markup-index^^J\space\space\space
+ :open \string"\string
+ \glossarysection[\string\glossarytoctitle]{\string
+ \glossarytitle}\string\glossarypreamble\string~n\string\begin
+ {theglossary}\string\glossaryheader\string~n\string" ^^J\space
+ \space\space:close \string"\expandafter\@gobble
+ \string\%\string~n\string
+ \end{theglossary}\string\glossarypostamble
+ \string~n\string" ^^J\space\space\space
+ :tree)}%
+ \write\glswrite{(markup-letter-group-list
+ :sep \string"\string\glsgroupskip\string~n\string")}%
+ \write\glswrite{(markup-indexentry
+ :open \string"\string\relax \string\glsresetentrylist
+ \string~n\string")}%
+ \write\glswrite{(markup-locclass-list :open
+ \string"\glsopenbrace\string\glossaryentrynumbers
+ \glsopenbrace\string\relax\space \string"^^J\space\space\space
+ :sep \string", \string"
+ :close \string"\glsclosebrace\glsclosebrace\string")}%
+ \write\glswrite{(markup-locref-list
+ :sep \string"\string\delimN\space\string")}%
+ \write\glswrite{(markup-range
+ :sep \string"\string\delimR\space\string")}%
+ \@onelevel@sanitize\gls@suffixF
+ \@onelevel@sanitize\gls@suffixFF
+ \ifx\gls@suffixF\@empty
+ \else
+ \write\glswrite{(markup-range
+ :close "\gls@suffixF" :length 1 :ignore-end)}%
+ \fi
+ \ifx\gls@suffixFF\@empty
+ \else
+ \write\glswrite{(markup-range
+ :close "\gls@suffixFF" :length 2 :ignore-end)}%
+ \fi
+ \write\glswrite{^^J; define format to use for locations^^J}%
+ \write\glswrite{\@xdylocref}%
+ \write\glswrite{^^J; define letter group list format^^J}%
+ \write\glswrite{(markup-letter-group-list
+ :sep \string"\string\glsgroupskip\string~n\string")}%
+ \write\glswrite{^^J; letter group headings^^J}%
+ \write\glswrite{(markup-letter-group
+ :open-head \string"\string\glsgroupheading
+ \glsopenbrace\string"^^J\space\space\space
+ :close-head \string"\glsclosebrace\string")}%
+ \write\glswrite{^^J; additional letter groups^^J}%
+ \write\glswrite{\@xdylettergroups}%
+ \write\glswrite{^^J; additional sort rules^^J}
+ \write\glswrite{\@xdysortrules}%
+ \noist}
+\else
+ \edef\@gls@actualchar{\string?}
+ \edef\@gls@encapchar{\string|}
+ \edef\@gls@levelchar{\string!}
+ \edef\@gls@quotechar{\string"}
+ \def\writeist{\relax
+ \openout\glswrite=\istfilename
+ \write\glswrite{\expandafter\@gobble\string\% makeindex style file
+ created by the glossaries package}
+ \write\glswrite{\expandafter\@gobble\string\% for document
+ '\jobname' on \the\year-\the\month-\the\day}
+ \write\glswrite{actual '\@gls@actualchar'}
+ \write\glswrite{encap '\@gls@encapchar'}
+ \write\glswrite{level '\@gls@levelchar'}
+ \write\glswrite{quote '\@gls@quotechar'}
+ \write\glswrite{keyword \string"\string\\glossaryentry\string"}
+ \write\glswrite{preamble \string"\string\\glossarysection[\string
+ \\glossarytoctitle]{\string\\glossarytitle}\string
+ \\glossarypreamble\string\n\string\\begin{theglossary}\string
+ \\glossaryheader\string\n\string"}
+ \write\glswrite{postamble \string"\string\%\string\n\string
+ \\end{theglossary}\string\\glossarypostamble\string\n
+ \string"}
+ \write\glswrite{group_skip \string"\string\\glsgroupskip\string\n
+ \string"}
+ \write\glswrite{item_0 \string"\string\%\string\n\string"}
+ \write\glswrite{item_1 \string"\string\%\string\n\string"}
+ \write\glswrite{item_2 \string"\string\%\string\n\string"}
+ \write\glswrite{item_01 \string"\string\%\string\n\string"}
+ \write\glswrite{item_x1
+ \string"\string\\relax \string\\glsresetentrylist\string\n
+ \string"}
+ \write\glswrite{item_12 \string"\string\%\string\n\string"}
+ \write\glswrite{item_x2
+ \string"\string\\relax \string\\glsresetentrylist\string\n
+ \string"}
+ \write\glswrite{delim_0 \string"\string\{\string
+ \\glossaryentrynumbers\string\{\string\\relax \string"}
+ \write\glswrite{delim_1 \string"\string\{\string
+ \\glossaryentrynumbers\string\{\string\\relax \string"}
+ \write\glswrite{delim_2 \string"\string\{\string
+ \\glossaryentrynumbers\string\{\string\\relax \string"}
+ \write\glswrite{delim_t \string"\string\}\string\}\string"}
+ \write\glswrite{delim_n \string"\string\\delimN \string"}
+ \write\glswrite{delim_r \string"\string\\delimR \string"}
+ \write\glswrite{headings_flag 1}
+ \write\glswrite{heading_prefix
+ \string"\string\\glsgroupheading\string\{\string"}
+ \write\glswrite{heading_suffix
+ \string"\string\}\string\\relax
+ \string\\glsresetentrylist \string"}
+ \write\glswrite{symhead_positive \string"glssymbols\string"}
+ \write\glswrite{numhead_positive \string"glsnumbers\string"}
+ \write\glswrite{page_compositor \string"\glscompositor\string"}
+ \@gls@escbsdq\gls@suffixF
+ \@gls@escbsdq\gls@suffixFF
+ \ifx\gls@suffixF\@empty
+ \else
+ \write\glswrite{suffix_2p \string"\gls@suffixF\string"}
+ \fi
+ \ifx\gls@suffixFF\@empty
+ \else
+ \write\glswrite{suffix_3p \string"\gls@suffixFF\string"}
+ \fi
+ \noist
+ }
+\fi
+\renewcommand*{\noist}{\let\writeist\relax}
+\endinput
+%%
+%% End of file `glossaries-compatible-207.sty'.
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 370d530b711..a92f5411d54 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-polyglossia.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
index 7d8714a0042..76d7739d757 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 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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,16 +39,18 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2010/07/10 v2.07 (NLCT)]
+\ProvidesPackage{glossaries}[2011/04/02 v3.0 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}[2006/11/18]
\RequirePackage{mfirstuc}
\RequirePackage{xfor}
\RequirePackage{amsgen}
+\RequirePackage{etoolbox}
\define@boolkey{glossaries.sty}[gls]{toc}[true]{}
\define@boolkey{glossaries.sty}[gls]{numberline}[true]{}
-\@ifundefined{chapter}{\newcommand*{\@@glossarysec}{section}}{%
- \newcommand*{\@@glossarysec}{chapter}}
+\ifcsundef{chapter}%
+ {\newcommand*{\@@glossarysec}{section}}%
+ {\newcommand*{\@@glossarysec}{chapter}}
\define@choicekey{glossaries.sty}{section}{part,chapter,section,%
subsection,subsubsection,paragraph,subparagraph}[section]{%
\renewcommand*{\@@glossarysec}{#1}}
@@ -75,6 +77,12 @@ false,nolabel,autolabel}[nolabel]{%
\newcommand*{\glossaryentrynumbers}[1]{#1}
\DeclareOptionX{nonumberlist}{%
\renewcommand*{\glossaryentrynumbers}[1]{}}
+\newcommand*\@glo@seeautonumberlist{}
+\DeclareOptionX{seeautonumberlist}{%
+ \renewcommand*{\@glo@seeautonumberlist}{%
+ \def\@glo@prefix{\glsnextpages}%
+ }%
+}
\newcommand*{\@gls@loadlong}{\RequirePackage{glossary-long}}
\DeclareOptionX{nolong}{\renewcommand*{\@gls@loadlong}{}}
\IfFileExists{supertabular.sty}{%
@@ -92,6 +100,81 @@ false,nolabel,autolabel}[nolabel]{%
\renewcommand*{\@gls@loadtree}{}%
\let\@glossary@default@style\relax
}
+\define@boolkey{glossaries.sty}[gls]{entrycounter}[true]{}
+\glsentrycounterfalse
+\define@key{glossaries.sty}{counterwithin}{%
+ \renewcommand*{\@gls@counterwithin}{#1}%
+ \glsentrycountertrue
+}
+\newcommand*{\@gls@counterwithin}{}
+\define@boolkey{glossaries.sty}[gls]{subentrycounter}[true]{}
+\glssubentrycounterfalse
+\define@choicekey{glossaries.sty}{sort}{standard,def,use}{%
+ \csname @gls@setupsort@#1\endcsname
+}
+\newcommand*{\@gls@setupsort@standard}{%
+ \def\do@glo@storeentry{\@glo@storeentry}%
+ \def\@gls@defsortcount##1{}%
+ \def\@gls@defsort##1##2{%
+ \ifx\@glo@sort\@glsdefaultsort
+ \let\@glo@sort\@glo@name
+ \fi
+ \@onelevel@sanitize\@glo@sort
+ \expandafter\protected@xdef\csname glo@##2@sort\endcsname{\@glo@sort}%
+ }%
+ \def\@gls@setsort##1{}%
+}
+\@gls@setupsort@standard
+\newcommand*\glssortnumberfmt[1]{%
+ \ifnum#1<100000 0\fi
+ \ifnum#1<10000 0\fi
+ \ifnum#1<1000 0\fi
+ \ifnum#1<100 0\fi
+ \ifnum#1<10 0\fi
+ \number#1%
+}
+\newcommand*{\@gls@setupsort@def}{%
+ \def\do@glo@storeentry{\@glo@storeentry}%
+ \def\@gls@defsortcount##1{%
+ \expandafter\global
+ \expandafter\newcount\csname glossary@##1@sortcount\endcsname
+ }%
+ \def\@gls@defsort##1##2{%
+ \expandafter\global\expandafter
+ \advance\csname glossary@##1@sortcount\endcsname by 1\relax
+ \expandafter\protected@xdef\csname glo@##2@sort\endcsname{%
+ \expandafter\glssortnumberfmt
+ {\csname glossary@##1@sortcount\endcsname}}%
+ }%
+ \def\@gls@setsort##1{}%
+}
+\newcommand*{\@gls@setupsort@use}{%
+ \let\do@glo@storeentry\@gobble
+ \def\@gls@defsortcount##1{%
+ \expandafter\global
+ \expandafter\newcount\csname glossary@##1@sortcount\endcsname
+ }%
+ \def\@gls@defsort##1##2{%
+ \expandafter\gdef\csname glo@##2@sort\endcsname{}%
+ }%
+ \def\@gls@setsort##1{%
+ \edef\@glo@parent{\csname glo@##1@parent\endcsname}%
+ \ifx\@glo@parent\@empty
+ \else
+ \expandafter\@gls@setsort\expandafter{\@glo@parent}%
+ \fi
+ \edef\@glo@type{\csname glo@##1@type\endcsname}%
+ \edef\@gls@tmp{\csname glo@##1@sort\endcsname}%
+ \ifx\@gls@tmp\@empty
+ \expandafter\global\expandafter
+ \advance\csname glossary@\@glo@type @sortcount\endcsname by 1\relax
+ \expandafter\protected@xdef\csname glo@##1@sort\endcsname{%
+ \expandafter\glssortnumberfmt
+ {\csname glossary@\@glo@type @sortcount\endcsname}}%
+ \@glo@storeentry{##1}%
+ \fi
+ }%
+}
\newcommand*{\glsdefmain}{%
\newglossary{main}{gls}{glo}{\glossaryname}%
}
@@ -211,7 +294,7 @@ name=true]{%
\gls@xindy@glsnumberstrue
\def\@xdy@main@language{\rootlanguagename}%
\define@key[gls]{xindy}{language}{\def\@xdy@main@language{#1}}
-\@ifundefined{inputencodingname}{%
+\ifcsundef{inputencodingname}{%
\def\gls@codepage{}}{%
\def\gls@codepage{\inputencodingname}
}
@@ -220,6 +303,8 @@ name=true]{%
\glsxindytrue
\setkeys[gls]{xindy}{#1}%
}
+\define@boolkey{glossaries.sty}[gls]{savewrites}[true]{}
+\glssavewritesfalse
\newcommand*{\GlossariesWarning}[1]{%
\PackageWarning{glossaries}{#1}%
}
@@ -230,16 +315,23 @@ name=true]{%
\renewcommand*{\GlossariesWarning}[1]{}%
\renewcommand*{\GlossariesWarningNoLine}[1]{}%
}
+\define@boolkey{glossaries.sty}[gls]{compatible-2.07}[true]{}
+\csname glscompatible-2.07false\endcsname
\ProcessOptionsX
\ifglstranslate
\@ifpackageloaded{babel}{\IfFileExists{translator.sty}{%
\RequirePackage{translator}}{}}{}
\fi
-\ifthenelse{\equal{\glscounter}{section}}{%
-\@ifundefined{chapter}{}{%
-\let\@gls@old@chapter\@chapter
-\def\@chapter[#1]#2{\@gls@old@chapter[{#1}]{#2}%
-\@ifundefined{hyperdef}{}{\hyperdef{section}{\thesection}{}}}}}{}
+\ifthenelse{\equal{\glscounter}{section}}%
+{%
+ \ifcsundef{chapter}{}%
+ {%
+ \let\@gls@old@chapter\@chapter
+ \def\@chapter[#1]#2{\@gls@old@chapter[{#1}]{#2}%
+ \ifcsundef{hyperdef}{}{\hyperdef{section}{\thesection}{}}}%
+ }%
+}%
+{}
\newcommand*{\@gls@onlypremakeg}{}
\newcommand*{\@onlypremakeg}[1]{%
\ifx\@gls@onlypremakeg\@empty
@@ -271,7 +363,8 @@ name=true]{%
\providecommand*{\seename}{see}
\providecommand*{\andname}{\&}
\newcommand*{\addglossarytocaptions}[1]{%
- \@ifundefined{captions#1}{}{%
+ \ifcsundef{captions#1}{}%
+ {%
\expandafter\let\expandafter\@gls@tmp\csname captions#1\endcsname
\expandafter\toks@\expandafter{\@gls@tmp
\renewcommand*{\glossaryname}{\translate{Glossary}}%
@@ -380,23 +473,35 @@ name=true]{%
\@onlypremakeg\glsSetSuffixF
\newcommand*{\gls@suffixFF}{}
\newcommand*{\glsSetSuffixFF}[1]{%
- \renewcommand*{\gls@suffixFF}{#1}}
-\@ifundefined{hyperlink}{%
-\newcommand*{\glsnumberformat}[1]{#1}}{%
-\newcommand*{\glsnumberformat}[1]{\glshypernumber{#1}}}
+ \renewcommand*{\gls@suffixFF}{#1}%
+}
+\ifcsdef{hyperlink}%
+{%
+ \newcommand*{\glsnumberformat}[1]{#1}%
+}%
+{%
+ \newcommand*{\glsnumberformat}[1]{\glshypernumber{#1}}%
+}
\newcommand{\delimN}{, }
\newcommand{\delimR}{--}
\newcommand*{\glossarypreamble}{}
\newcommand*{\glossarypostamble}{}
\newcommand*{\glossarysection}[2][\@gls@title]{%
\def\@gls@title{#2}%
- \@ifundefined{phantomsection}{%
- \@glossarysection{#1}{#2}}{\@p@glossarysection{#1}{#2}}%
+ \ifcsundef{phantomsection}%
+ {%
+ \@glossarysection{#1}{#2}%
+ }%
+ {%
+ \@p@glossarysection{#1}{#2}%
+ }%
\glossarymark{\glossarytoctitle}%
}
-\@ifundefined{glossarymark}{%
+\ifcsundef{glossarymark}%
+{%
\newcommand{\glossarymark}[1]{\@mkboth{#1}{#1}}
-}{%
+}%
+{%
\GlossariesWarning{overriding \string\glossarymark}%
\@ifclassloaded{memoir}%
{
@@ -429,8 +534,11 @@ name=true]{%
\fi
\@@glossaryseclabel}
\newcommand*{\gls@doclearpage}{%
-\ifthenelse{\equal{\@@glossarysec}{chapter}}{%
-\@ifundefined{cleardoublepage}{\clearpage}{\cleardoublepage}}{}%
+ \ifthenelse{\equal{\@@glossarysec}{chapter}}%
+ {%
+ \ifcsundef{cleardoublepage}{\clearpage}{\cleardoublepage}%
+ }%
+ {}%
}
\newcommand*{\glsclearpage}{\gls@doclearpage}
\newcommand*{\@gls@toc}[2]{%
@@ -448,26 +556,85 @@ name=true]{%
\edef\@xdyattributes{\string"default\string"}%
\fi
\ifglsxindy
+ \edef\@xdyattributelist{}%
+\fi
+\ifglsxindy
\def\@xdylocref{}
\fi
+\newcommand*{\@gls@ifinlist}[4]{%
+ \def\@do@ifinlist##1,#1,##2\end@doifinlist{%
+ \def\@gls@listsuffix{##2}%
+ \ifx\@gls@listsuffix\@empty
+ #4%
+ \else
+ #3%
+ \fi
+ }%
+ \@do@ifinlist,#2,#1,\end@doifinlist
+}
+\ifglsxindy
+ \newcommand*{\@xdycounters}{\glscounter}
+ \newcommand*\GlsAddXdyCounters[1]{%
+ \@for\@gls@ctr:=#1\do{%
+ \edef\@do@addcounter{%
+ \noexpand\@gls@ifinlist{\@gls@ctr}{\@xdycounters}{}%
+ {%
+ \noexpand\edef\noexpand\@xdycounters{\@xdycounters,%
+ \noexpand\@gls@ctr}%
+ }%
+ }%
+ \@do@addcounter
+ }
+ }
+ \@onlypremakeg\GlsAddXdyCounters
+\else
+ \newcommand*\GlsAddXdyCounters[1]{%
+ \glsnoxindywarning\GlsAddXdyAttribute
+ }
+\fi
+\newcommand*\@disabled@glsaddxdycounters{%
+ \PackageError{glossaries}{\string\GlsAddXdyCounters\space
+ can't be used after \string\GlsAddXdyAttribute}{Move all
+ occurrences of \string\GlsAddXdyCounters\space before the first
+ instance of \string\GlsAddXdyAttribute}%
+}
\ifglsxindy
+ \newcommand*\@glsaddxdyattribute[2]{%
+ \edef\@xdyattributes{\@xdyattributes ^^J \string"#1\string" ^^J
+ \string"#2#1\string"}%
+ \expandafter\toks@\expandafter{\@xdylocref}%
+ \edef\@xdylocref{\the\toks@ ^^J%
+ (markup-locref
+ :open \string"\string~n%
+ \expandafter\string\csname glsX#2X#1\endcsname
+ \string" ^^J
+ :close \string"\string" ^^J
+ :attr \string"#2#1\string")}%
+ \expandafter\gdef\csname glsX#2X#1\endcsname##1##2{%
+ \setentrycounter[##1]{#2}\csname #1\endcsname{##2}%
+ }%
+ }
\newcommand*\GlsAddXdyAttribute[1]{%
- \edef\@xdyattributes{\@xdyattributes ^^J \string"#1\string"}%
- \expandafter\toks@\expandafter{\@xdylocref}%
- \edef\@xdylocref{\the\toks@ ^^J%
- (markup-locref
- :open \string"\string~n\string\setentrycounter
- {\noexpand\glscounter}%
- \expandafter\string\csname#1\endcsname
- \expandafter\@gobble\string\{\string" ^^J
- :close \string"\expandafter\@gobble\string\}\string" ^^J
- :attr \string"#1\string")}}
+ \ifx\@xdyattributelist\@empty
+ \edef\@xdyattributelist{#1}%
+ \else
+ \edef\@xdyattributelist{\@xdyattributelist,#1}%
+ \fi
+ \@for\@this@counter:=\@xdycounters\do{%
+ \protected@edef\gls@do@addxdyattribute{%
+ \noexpand\@glsaddxdyattribute{#1}{\@this@counter}%
+ }
+ \gls@do@addxdyattribute
+ }%
+ \let\GlsAddXdyCounters\@disabled@glsaddxdycounters
+ }
\@onlypremakeg\GlsAddXdyAttribute
\else
\newcommand*\GlsAddXdyAttribute[1]{%
\glsnoxindywarning\GlsAddXdyAttribute}
\fi
\ifglsxindy
+\newcommand*{\@gls@addpredefinedattributes}{%
\GlsAddXdyAttribute{glsnumberformat}
\GlsAddXdyAttribute{textrm}
\GlsAddXdyAttribute{textsf}
@@ -490,6 +657,9 @@ name=true]{%
\GlsAddXdyAttribute{hypersl}
\GlsAddXdyAttribute{hypersc}
\GlsAddXdyAttribute{hyperemph}
+}
+\else
+ \let\@gls@addpredefinedattributes\relax
\fi
\def\@xdyuseralphabets{}
\ifglsxindy
@@ -501,15 +671,78 @@ name=true]{%
\newcommand*{\GlsAddXdyAlphabet}[2]{%
\glsnoxindywarning\GlsAddXdyAlphabet}
\fi
-\def\@xdyuserlocationdefs{}
-\def\@xdyuserlocationnames{}
\ifglsxindy
- \newcommand*{\GlsAddXdyLocation}[2]{%
- \edef\@xdyuserlocationdefs{%
- \@xdyuserlocationdefs ^^J%
- (define-location-class \string"#1\string"^^J\space\space
- \space(#2))
- }%
+ \newcommand*{\@gls@xdy@locationlist}{%
+ roman-page-numbers,%
+ Roman-page-numbers,%
+ arabic-page-numbers,%
+ alpha-page-numbers,%
+ Alpha-page-numbers,%
+ Appendix-page-numbers,%
+ arabic-section-numbers%
+ }
+ \protected@edef\@gls@roman{\@roman{0\string"
+ \string"roman-numbers-lowercase\string" :sep \string"}}%
+ \@onelevel@sanitize\@gls@roman
+ \edef\@tmp{\string" \string"roman-numbers-lowercase\string"
+ :sep \string"}%
+ \@onelevel@sanitize\@tmp
+ \ifx\@tmp\@gls@roman
+ \expandafter
+ \edef\csname @gls@xdy@Lclass@roman-page-numbers\endcsname{%
+ \string"roman-numbers-lowercase\string"%
+ }%
+ \else
+ \expandafter
+ \edef\csname @gls@xdy@Lclass@roman-page-numbers\endcsname{
+ :sep \string"\@gls@roman\string"%
+ }%
+ \fi
+ \expandafter\def\csname @gls@xdy@Lclass@Roman-page-numbers\endcsname{%
+ \string"roman-numbers-uppercase\string"%
+ }%
+ \expandafter\def\csname @gls@xdy@Lclass@arabic-page-numbers\endcsname{%
+ \string"arabic-numbers\string"%
+ }%
+ \expandafter\def\csname @gls@xdy@Lclass@alpha-page-numbers\endcsname{%
+ \string"alpha\string"%
+ }%
+ \expandafter\def\csname @gls@xdy@Lclass@Alpha-page-numbers\endcsname{%
+ \string"ALPHA\string"%
+ }%
+ \expandafter\def\csname @gls@xdy@Lclass@Appendix-page-numbers\endcsname{%
+ \string"ALPHA\string"
+ :sep \string"\@glsAlphacompositor\string"
+ \string"arabic-numbers\string"%
+ }
+ \expandafter\def\csname @gls@xdy@Lclass@arabic-section-numbers\endcsname{%
+ \string"arabic-numbers\string"
+ :sep \string"\glscompositor\string"
+ \string"arabic-numbers\string"%
+ }%
+ \def\@xdyuserlocationdefs{}
+ \def\@xdyuserlocationnames{}
+\fi
+\ifglsxindy
+ \newcommand*{\GlsAddXdyLocation}[3][]{%
+ \def\@gls@tmp{#1}%
+ \ifx\@gls@tmp\@empty
+ \edef\@xdyuserlocationdefs{%
+ \@xdyuserlocationdefs ^^J%
+ (define-location-class \string"#2\string"^^J\space\space
+ \space(:sep \string"{}\glsopenbrace\string" #3
+ :sep \string"\glsclosebrace\string"))
+ }%
+ \else
+ \edef\@xdyuserlocationdefs{%
+ \@xdyuserlocationdefs ^^J%
+ (define-location-class \string"#2\string"^^J\space\space
+ \space(:sep "\glsopenbrace"
+ #1
+ :sep "\glsclosebrace\glsopenbrace" #3
+ :sep "\glsclosebrace"))
+ }%
+ \fi
\edef\@xdyuserlocationnames{%
\@xdyuserlocationnames^^J\space\space\space
\string"#1\string"}%
@@ -650,10 +883,11 @@ name=true]{%
\expandafter\forallglossaries\expandafter[#1]{\@@this@glo@}{%
\forglsentries[\@@this@glo@]{#2}{#3}}}
\newcommand{\ifglossaryexists}[3]{%
- \@ifundefined{@glotype@#1@out}{#3}{#2}%
+ \ifcsundef{@glotype@#1@out}{#3}{#2}%
}
\newcommand{\ifglsentryexists}[3]{%
-\@ifundefined{glo@#1@name}{#3}{#2}}
+ \ifcsundef{glo@#1@name}{#3}{#2}%
+}
\newcommand*{\ifglsused}[3]{\ifthenelse{\boolean{glo@#1@flag}}{#2}{#3}}
\newcommand{\glsdoifexists}[2]{%
\ifglsentryexists{#1}{#2}{%
@@ -682,14 +916,22 @@ name=true]{%
\expandafter\def\csname @glotype@#2@out\endcsname{#4}%
\expandafter\def\csname @glotype@#2@title\endcsname{#5}%
\protected@write\@auxout{}{\string\@newglossary{#2}{#1}{#3}{#4}}%
- \@ifundefined{gls@#2@display}{%
- \expandafter\gdef\csname gls@#2@display\endcsname{%
- \glsdisplay}}{}%
- \@ifundefined{gls@#2@displayfirst}{%
- \expandafter\gdef\csname gls@#2@displayfirst\endcsname{%
- \glsdisplayfirst}}{}%
+ \ifcsundef{gls@#2@display}%
+ {%
+ \expandafter\gdef\csname gls@#2@display\endcsname{\glsdisplay}%
+ }%
+ {}%
+ \ifcsundef{gls@#2@displayfirst}%
+ {%
+ \expandafter\gdef\csname gls@#2@displayfirst\endcsname{%
+ \glsdisplayfirst
+ }%
+ }%
+ {}%
+ \@gls@defsortcount{#2}%
\@ifnextchar[{\@gls@setcounter{#2}}%
- {\@gls@setcounter{#2}[\glscounter]}}}
+ {\@gls@setcounter{#2}[\glscounter]}}%
+}
\newcommand*{\altnewglossary}[3]{%
\newglossary[#2-glg]{#1}{#2-gls}{#2-glo}{#3}%
}
@@ -697,7 +939,10 @@ name=true]{%
\@onlypremakeg\newglossary
\newcommand*{\@newglossary}[4]{}
\def\@gls@setcounter#1[#2]{%
-\expandafter\def\csname @glotype@#1@counter\endcsname{#2}%
+ \expandafter\def\csname @glotype@#1@counter\endcsname{#2}%
+ \ifglsxindy
+ \GlsAddXdyCounters{#2}%
+ \fi
}
\newcommand*{\@gls@getcounter}[1]{%
\csname @glotype@#1@counter\endcsname}
@@ -734,16 +979,32 @@ name=true]{%
\define@key{glossentry}{type}{%
\def\@glo@type{#1}}
\define@key{glossentry}{counter}{%
-\@ifundefined{c@#1}{\PackageError{glossaries}{There is no counter
-called `#1'}{The counter key should have the name of a valid
-counter as its value}}{%
-\def\@glo@counter{#1}}}
+ \ifcsundef{c@#1}%
+ {%
+ \PackageError{glossaries}%
+ {There is no counter called `#1'}%
+ {%
+ The counter key should have the name of a valid counter
+ as its value%
+ }%
+ }%
+ {%
+ \def\@glo@counter{#1}%
+ }%
+}
\define@key{glossentry}{see}{%
-\def\@glo@see{#1}}
+ \def\@glo@see{#1}%
+ \@glo@seeautonumberlist
+}
\define@key{glossentry}{parent}{%
\def\@glo@parent{#1}}
-\define@key{glossentry}{nonumberlist}[none]{%
-\def\@glo@prefix{\glsnonextpages}}
+\define@choicekey{glossentry}{nonumberlist}[\val\nr]{true,false}[true]{%
+ \ifcase\nr\relax
+ \def\@glo@prefix{\glsnonextpages}%
+ \else
+ \def\@glo@prefix{\glsnextpages}%
+ \fi
+}
\define@key{glossentry}{user1}{%
\def\@glo@useri{#1}%
}
@@ -762,6 +1023,18 @@ counter as its value}}{%
\define@key{glossentry}{user6}{%
\def\@glo@uservi{#1}%
}
+\define@key{glossentry}{short}{%
+ \def\@glo@short{#1}%
+}
+\define@key{glossentry}{shortplural}{%
+ \def\@glo@shortpl{#1}%
+}
+\define@key{glossentry}{long}{%
+ \def\@glo@long{#1}%
+}
+\define@key{glossentry}{longplural}{%
+ \def\@glo@longpl{#1}%
+}
\newcommand*{\@glsnoname}{%
\PackageError{glossaries}{name key required in
\string\newglossaryentry\space for entry `\@glo@label'}{You
@@ -769,7 +1042,7 @@ counter as its value}}{%
\newcommand*{\@glsdefaultplural}{\@glo@text\glspluralsuffix}
\newcommand*{\@glsdefaultsort}{\@glo@name}
\newcount\gls@level
-\DeclareRobustCommand{\newglossaryentry}[2]{%
+\newrobustcmd{\newglossaryentry}[2]{%
\glsdoifnoexists{#1}{%
\def\@glo@label{#1}%
\let\@glo@name\@glsnoname
@@ -794,14 +1067,22 @@ counter as its value}}{%
\def\@glo@useriv{}%
\def\@glo@userv{}%
\def\@glo@uservi{}%
+\def\@glo@short{}%
+\def\@glo@shortpl{}%
+\def\@glo@long{}%
+\def\@glo@longpl{}%
\@newglossaryentryprehook
\setkeys{glossentry}{#2}%
-\@ifundefined{glolist@\@glo@type}{\PackageError{glossaries}{%
-Glossary type '\@glo@type' has not been defined}{%
-You need to define a new glossary type, before making entries
-in it}}{%
-\protected@edef\@glolist@{\csname glolist@\@glo@type\endcsname}%
-\expandafter\xdef\csname glolist@\@glo@type\endcsname{\@glolist@{#1},}%
+\ifcsundef{glolist@\@glo@type}%
+{%
+ \PackageError{glossaries}%
+ {Glossary type '\@glo@type' has not been defined}%
+ {You need to define a new glossary type, before making entries
+ in it}%
+}%
+{%
+ \protected@edef\@glolist@{\csname glolist@\@glo@type\endcsname}%
+ \expandafter\xdef\csname glolist@\@glo@type\endcsname{\@glolist@{#1},}%
}%
\gls@level=0\relax
\ifx\@glo@parent\@empty
@@ -870,6 +1151,14 @@ in it}}{%
\protected@xdef\csname glo@#1@userv\endcsname{\@glo@userv}%
\expandafter
\protected@xdef\csname glo@#1@uservi\endcsname{\@glo@uservi}%
+\expandafter
+ \protected@xdef\csname glo@#1@short\endcsname{\@glo@short}%
+\expandafter
+ \protected@xdef\csname glo@#1@shortpl\endcsname{\@glo@shortpl}%
+\expandafter
+ \protected@xdef\csname glo@#1@long\endcsname{\@glo@long}%
+\expandafter
+ \protected@xdef\csname glo@#1@longpl\endcsname{\@glo@longpl}%
\@gls@sanitizename
\expandafter\protected@xdef\csname glo@#1@name\endcsname{\@glo@name}%
\def\@glo@@desc{\@glo@first}%
@@ -879,11 +1168,7 @@ in it}}{%
\@gls@sanitizedesc
\expandafter\protected@xdef\csname glo@#1@desc\endcsname{\@glo@desc}%
\expandafter\protected@xdef\csname glo@#1@descplural\endcsname{\@glo@descplural}%
-\ifx\@glo@sort\@glsdefaultsort
- \let\@glo@sort\@glo@name
-\fi
-\@onelevel@sanitize\@glo@sort
-\expandafter\protected@xdef\csname glo@#1@sort\endcsname{\@glo@sort}%
+\@gls@defsort{\@glo@type}{#1}%
\def\@glo@@symbol{\@glo@text}%
\ifx\@glo@symbol\@glo@@symbol
\let\@glo@symbol\@glo@text
@@ -907,7 +1192,7 @@ in it}}{%
\@do@glssee
\fi
}%
- \@glo@storeentry{#1}%
+ \do@glo@storeentry{#1}%
\@newglossaryentryposthook
}
\newcommand*{\@newglossaryentryprehook}{}
@@ -1012,10 +1297,19 @@ in it}}{%
\newcommand*{\defglsdisplayfirst}[2][\glsdefaulttype]{%
\expandafter\def\csname gls@#1@displayfirst\endcsname##1##2##3##4{#2}}
\define@key{glslink}{counter}{%
-\@ifundefined{c@#1}{\PackageError{glossaries}{There is no counter
-called `#1'}{The counter key should have the name of a valid
-counter as its value}}{%
-\def\@gls@counter{#1}}}
+ \ifcsundef{c@#1}%
+ {%
+ \PackageError{glossaries}%
+ {There is no counter called `#1'}%
+ {%
+ The counter key should have the name of a valid counter
+ as its value%
+ }%
+ }%
+ {%
+ \def\@gls@counter{#1}%
+ }%
+}
\define@key{glslink}{format}{%
\def\@glsnumberformat{#1}}
\define@boolkey{glslink}{hyper}[true]{}
@@ -1040,8 +1334,8 @@ counter as its value}}{%
\edef\@gls@counter{\csname glo@#2@counter\endcsname}%
\KV@glslink@hypertrue
\setkeys{glslink}{#1}%
- \edef\theglsentrycounter{\expandafter\noexpand
- \csname the\@gls@counter\endcsname}%
+ \@gls@saveentrycounter
+ \@gls@setsort{#2}%
\@do@wrglossary{#2}%
\ifKV@glslink@hyper
\@glslink{glo:#2}{\glstextformat{#3}}%
@@ -1049,11 +1343,58 @@ counter as its value}}{%
\glstextformat{#3}\relax
\fi
}
-\def\@set@glo@numformat#1#2#3{%
-\expandafter\@glo@check@mkidxrangechar#3\@nil
-\protected@edef#1{\@glo@prefix setentrycounter{#2}%
-\expandafter\string\csname\@glo@suffix\endcsname}%
-\@gls@checkmkidxchars#1}
+\newcommand*{\@gls@saveentrycounter}{%
+ \def\@gls@Hcounter{}%
+ \ifthenelse{\equal{\@gls@counter}{equation}}%
+ {
+ \ifcsundef{xatlevel@}%
+ {%
+ \edef\theglsentrycounter{\expandafter\noexpand
+ \csname the\@gls@counter\endcsname}%
+ }%
+ {%
+ \ifx\xatlevel@\@empty
+ \edef\theglsentrycounter{\expandafter\noexpand
+ \csname the\@gls@counter\endcsname}%
+ \else
+ \savecounters@
+ \advance\c@equation by 1\relax
+ \edef\theglsentrycounter{\csname the\@gls@counter\endcsname}%
+ \ifcsundef{theH\@gls@counter}%
+ {%
+ \def\@gls@Hcounter{\theglsentrycounter}%
+ }%
+ {%
+ \def\@gls@Hcounter{\csname theH\@gls@counter\endcsname}%
+ }%
+ \protected@edef\theHglsentrycounter{\@gls@Hcounter}%
+ \restorecounters@
+ \fi
+ }%
+ }%
+ {%
+ \edef\theglsentrycounter{\expandafter\noexpand
+ \csname the\@gls@counter\endcsname}%
+ }%
+ \ifx\@gls@Hcounter\@empty
+ \ifcsundef{theH\@gls@counter}%
+ {%
+ \def\theHglsentrycounter{\theglsentrycounter}%
+ }%
+ {%
+ \protected@edef\theHglsentrycounter{\expandafter\noexpand
+ \csname theH\@gls@counter\endcsname}%
+ }%
+ \fi
+}
+\def\@set@glo@numformat#1#2#3#4{%
+ \expandafter\@glo@check@mkidxrangechar#3\@nil
+ \protected@edef#1{%
+ \@glo@prefix setentrycounter[#4]{#2}%
+ \expandafter\string\csname\@glo@suffix\endcsname
+ }%
+ \@gls@checkmkidxchars#1%
+}
\def\@glo@check@mkidxrangechar#1#2\@nil{%
\if#1(\relax
\def\@glo@prefix{(}%
@@ -1356,18 +1697,23 @@ counter as its value}}{%
}%
}
\def@gls@xdycheckbackslash
-\@ifundefined{hyperlink}{%
+\ifcsundef{hyperlink}%
+{%
\gdef\@glslink#1#2{#2}%
-}{%
+}%
+{%
\gdef\@glslink#1#2{\hyperlink{#1}{#2}}%
}
\newlength\gls@tmplen
-\@ifundefined{hypertarget}{%
+\ifcsundef{hypertarget}%
+{%
\gdef\@glstarget#1#2{#2}%
-}{%
- \gdef\@glstarget#1#2{%
+}%
+{%
+ \gdef\@glstarget#1#2{%
\settoheight{\gls@tmplen}{#2}%
- \raisebox{\gls@tmplen}{\hypertarget{#1}{}}#2}%
+ \raisebox{\gls@tmplen}{\hypertarget{#1}{}}#2%
+ }%
}
\newcommand{\glsdisablehyper}{%
\renewcommand*\@glslink[2]{##2}%
@@ -2076,6 +2422,210 @@ counter as its value}}{%
\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
}%
}
+\newcommand*{\acrshort}{\@ifstar\s@acrshort\ns@acrshort}
+\newcommand*{\s@acrshort}[2][]{%
+ \new@ifnextchar[{\@acrshort{hyper=false,#1}{#2}}%
+ {\@acrshort{hyper=false,#1}{#2}[]}%
+}
+\newcommand*{\ns@acrshort}[2][]{%
+ \new@ifnextchar[{\@acrshort{#1}{#2}}{\@acrshort{#1}{#2}[]}%
+}
+\def\@acrshort#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \protected@edef\@glo@text{\glsentryshort{#2}}%
+ \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}%
+ }%
+}
+\newcommand*{\Acrshort}{\@ifstar\s@Acrshort\ns@Acrshort}
+\newcommand*{\s@Acrshort}[2][]{%
+ \new@ifnextchar[{\@Acrshort{hyper=false,#1}{#2}}%
+ {\@Acrshort{hyper=false,#1}{#2}[]}%
+}
+\newcommand*{\ns@Acrshort}[2][]{%
+ \new@ifnextchar[{\@Acrshort{#1}{#2}}{\@Acrshort{#1}{#2}[]}%
+}
+\def\@Acrshort#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \protected@edef\@glo@text{\glsentryshort{#2}}%
+ \@gls@link[#1]{#2}%
+ {%
+ \acronymfont{\expandafter\makefirstuc\expandafter{\@glo@text}}#3%
+ }%
+ }%
+}
+\newcommand*{\ACRshort}{\@ifstar\s@ACRshort\ns@ACRshort}
+\newcommand*{\s@ACRshort}[2][]{%
+ \new@ifnextchar[{\@ACRshort{hyper=false,#1}{#2}}%
+ {\@ACRshort{hyper=false,#1}{#2}[]}%
+}
+\newcommand*{\ns@ACRshort}[2][]{%
+ \new@ifnextchar[{\@ACRshort{#1}{#2}}{\@ACRshort{#1}{#2}[]}%
+}
+\def\@ACRshort#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \protected@edef\@glo@text{\glsentryshort{#2}}%
+ \@gls@link[#1]{#2}{\acronymfont{\MakeUppercase{\@glo@text#3}}}%
+ }%
+}
+\newcommand*{\acrshortpl}{\@ifstar\s@acrshortpl\ns@acrshortpl}
+\newcommand*{\s@acrshortpl}[2][]{%
+ \new@ifnextchar[{\@acrshortpl{hyper=false,#1}{#2}}%
+ {\@acrshortpl{hyper=false,#1}{#2}[]}%
+}
+\newcommand*{\ns@acrshortpl}[2][]{%
+ \new@ifnextchar[{\@acrshortpl{#1}{#2}}{\@acrshortpl{#1}{#2}[]}%
+}
+\def\@acrshortpl#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \protected@edef\@glo@text{\glsentryshortpl{#2}}%
+ \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}%
+ }%
+}
+\newcommand*{\Acrshortpl}{\@ifstar\s@Acrshortpl\ns@Acrshortpl}
+\newcommand*{\s@Acrshortpl}[2][]{%
+ \new@ifnextchar[{\@Acrshortpl{hyper=false,#1}{#2}}%
+ {\@Acrshortpl{hyper=false,#1}{#2}[]}%
+}
+\newcommand*{\ns@Acrshortpl}[2][]{%
+ \new@ifnextchar[{\@Acrshortpl{#1}{#2}}{\@Acrshortpl{#1}{#2}[]}%
+}
+\def\@Acrshortpl#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \protected@edef\@glo@text{\glsentryshortpl{#2}}%
+ \@gls@link[#1]{#2}%
+ {%
+ \acronymfont{\expandafter\makefirstuc\expandafter{\@glo@text}}#3%
+ }%
+ }%
+}
+\newcommand*{\ACRshortpl}{\@ifstar\s@ACRshortpl\ns@ACRshortpl}
+\newcommand*{\s@ACRshortpl}[2][]{%
+ \new@ifnextchar[{\@ACRshortpl{hyper=false,#1}{#2}}%
+ {\@ACRshortpl{hyper=false,#1}{#2}[]}%
+}
+\newcommand*{\ns@ACRshortpl}[2][]{%
+ \new@ifnextchar[{\@ACRshortpl{#1}{#2}}{\@ACRshortpl{#1}{#2}[]}%
+}
+\def\@ACRshortpl#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \protected@edef\@glo@text{\glsentryshortpl{#2}}%
+ \@gls@link[#1]{#2}{\acronymfont{\MakeUppercase{\@glo@text#3}}}%
+ }%
+}
+\newcommand*{\acrlong}{\@ifstar\s@acrlong\ns@acrlong}
+\newcommand*{\s@acrlong}[2][]{%
+ \new@ifnextchar[{\@acrlong{hyper=false,#1}{#2}}%
+ {\@acrlong{hyper=false,#1}{#2}[]}%
+}
+\newcommand*{\ns@acrlong}[2][]{%
+ \new@ifnextchar[{\@acrlong{#1}{#2}}{\@acrlong{#1}{#2}[]}%
+}
+\def\@acrlong#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \protected@edef\@glo@text{\glsentrylong{#2}}%
+ \@gls@link[#1]{#2}{\@glo@text#3}%
+ }%
+}
+\newcommand*{\Acrlong}{\@ifstar\s@Acrlong\ns@Acrlong}
+\newcommand*{\s@Acrlong}[2][]{%
+ \new@ifnextchar[{\@Acrlong{hyper=false,#1}{#2}}%
+ {\@Acrlong{hyper=false,#1}{#2}[]}%
+}
+\newcommand*{\ns@Acrlong}[2][]{%
+ \new@ifnextchar[{\@Acrlong{#1}{#2}}{\@Acrlong{#1}{#2}[]}%
+}
+\def\@Acrlong#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \protected@edef\@glo@text{\glsentrylong{#2}}%
+ \@gls@link[#1]{#2}%
+ {%
+ \expandafter\makefirstuc\expandafter{\@glo@text}#3%
+ }%
+ }%
+}
+\newcommand*{\ACRlong}{\@ifstar\s@ACRlong\ns@ACRlong}
+\newcommand*{\s@ACRlong}[2][]{%
+ \new@ifnextchar[{\@ACRlong{hyper=false,#1}{#2}}%
+ {\@ACRlong{hyper=false,#1}{#2}[]}%
+}
+\newcommand*{\ns@ACRlong}[2][]{%
+ \new@ifnextchar[{\@ACRlong{#1}{#2}}{\@ACRlong{#1}{#2}[]}%
+}
+\def\@ACRlong#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \protected@edef\@glo@text{\glsentrylong{#2}}%
+ \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
+ }%
+}
+\newcommand*{\acrlongpl}{\@ifstar\s@acrlongpl\ns@acrlongpl}
+\newcommand*{\s@acrlongpl}[2][]{%
+ \new@ifnextchar[{\@acrlongpl{hyper=false,#1}{#2}}%
+ {\@acrlongpl{hyper=false,#1}{#2}[]}%
+}
+\newcommand*{\ns@acrlongpl}[2][]{%
+ \new@ifnextchar[{\@acrlongpl{#1}{#2}}{\@acrlongpl{#1}{#2}[]}%
+}
+\def\@acrlongpl#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \protected@edef\@glo@text{\glsentrylongpl{#2}}%
+ \@gls@link[#1]{#2}{\@glo@text#3}%
+ }%
+}
+\newcommand*{\Acrlongpl}{\@ifstar\s@Acrlongpl\ns@Acrlongpl}
+\newcommand*{\s@Acrlongpl}[2][]{%
+ \new@ifnextchar[{\@Acrlongpl{hyper=false#1}{#2}}%
+ {\@Acrlongpl{hyper=false,#1}{#2}[]}%
+}
+\newcommand*{\ns@Acrlongpl}[2][]{%
+ \new@ifnextchar[{\@Acrlongpl{#1}{#2}}{\@Acrlongpl{#1}{#2}[]}%
+}
+\def\@Acrlongpl#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \protected@edef\@glo@text{\glsentrylongpl{#2}}%
+ \@gls@link[#1]{#2}%
+ {%
+ \expandafter\makefirstuc\expandafter{\@glo@text}#3%
+ }%
+ }%
+}
+\newcommand*{\ACRlongpl}{\@ifstar\s@ACRlongpl\ns@ACRlongpl}
+\newcommand*{\s@ACRlongpl}[2][]{%
+ \new@ifnextchar[{\@ACRlongpl{hyper=false,#1}{#2}}%
+ {\@ACRlongpl{hyper=false,#1}{#2}[]}%
+}
+\newcommand*{\ns@ACRlongpl}[2][]{%
+ \new@ifnextchar[{\@ACRlongpl{#1}{#2}}{\@ACRlongpl{#1}{#2}[]}%
+}
+\def\@ACRlongpl#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \protected@edef\@glo@text{\glsentrylongpl{#2}}%
+ \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}%
+ }%
+}
\newcommand*{\glsentryname}[1]{\csname glo@#1@name\endcsname}
\newcommand*{\Glsentryname}[1]{%
\protected@edef\@glo@text{\csname glo@#1@name\endcsname}%
@@ -2141,21 +2691,50 @@ counter as its value}}{%
\newcommand*{\Glsentryuservi}[1]{%
\protected@edef\@glo@text{\csname glo@#1@uservi\endcsname}%
\expandafter\makefirstuc\expandafter{\@glo@text}}
-\newcommand*{\glshyperlink}[2][\glsentryname{\@glo@label}]{%
+\newcommand*{\glsentryshort}[1]{\csname glo@#1@short\endcsname}
+\newcommand*{\Glsentryshort}[1]{%
+\protected@edef\@glo@text{\csname glo@#1@short\endcsname}%
+\expandafter\makefirstuc\expandafter{\@glo@text}}
+\newcommand*{\glsentryshortpl}[1]{\csname glo@#1@shortpl\endcsname}
+\newcommand*{\Glsentryshortpl}[1]{%
+\protected@edef\@glo@text{\csname glo@#1@shortpl\endcsname}%
+\expandafter\makefirstuc\expandafter{\@glo@text}}
+\newcommand*{\glsentrylong}[1]{\csname glo@#1@long\endcsname}
+\newcommand*{\Glsentrylong}[1]{%
+\protected@edef\@glo@text{\csname glo@#1@long\endcsname}%
+\expandafter\makefirstuc\expandafter{\@glo@text}}
+\newcommand*{\glsentrylongpl}[1]{\csname glo@#1@longpl\endcsname}
+\newcommand*{\Glsentrylongpl}[1]{%
+\protected@edef\@glo@text{\csname glo@#1@longpl\endcsname}%
+\expandafter\makefirstuc\expandafter{\@glo@text}}
+\newcommand*{\glsentryfull}[1]{%
+ \glsentrylong{#1}\space(\glsentryshort{#1})%
+}
+\newcommand*{\Glsentryfull}[1]{%
+ \Glsentrylong{#1}\space(\glsentryshort{#1})%
+}
+\newcommand*{\glsentryfullpl}[1]{%
+ \glsentrylongpl{#1}\space(\glsentryshort{#1})%
+}
+\newcommand*{\Glsentryfullpl}[1]{%
+ \Glsentrylongpl{#1}\space(\glsentryshort{#1})%
+}
+\newcommand*{\glshyperlink}[2][\glsentrytext{\@glo@label}]{%
\def\@glo@label{#2}%
\@glslink{glo:#2}{#1}}
\define@key{glossadd}{counter}{\def\@gls@counter{#1}}
\define@key{glossadd}{format}{\def\@glsnumberformat{#1}}
\define@key{glossadd}{types}{\def\@glo@type{#1}}
\newcommand*{\glsadd}[2][]{%
-\glsdoifexists{#2}{%
-\def\@glsnumberformat{glsnumberformat}%
-\edef\@gls@counter{\csname glo@#2@counter\endcsname}%
-\setkeys{glossadd}{#1}%
-\edef\theglsentrycounter{\expandafter\noexpand
- \csname the\@gls@counter\endcsname}%
-\@do@wrglossary{#2}%
-}}
+ \glsdoifexists{#2}%
+ {%
+ \def\@glsnumberformat{glsnumberformat}%
+ \edef\@gls@counter{\csname glo@#2@counter\endcsname}%
+ \setkeys{glossadd}{#1}%
+ \@gls@saveentrycounter
+ \@do@wrglossary{#2}%
+ }%
+}
\newcommand*{\glsaddall}[1][]{%
\edef\@glo@type{\@glo@types}%
\setkeys{glossadd}{#1}%
@@ -2183,217 +2762,240 @@ counter as its value}}{%
\newcommand*{\GlsSetXdyMinRangeLength}[1]{%
\glsnoxindywarning\GlsSetXdyMinRangeLength}
\fi
-\newwrite\istfile
+
\ifglsxindy
\def\writeist{%
- \openout\istfile=\istfilename
- \write\istfile{;; xindy style file created by the glossaries
- package}%
- \write\istfile{;; for document '\jobname' on
- \the\year-\the\month-\the\day}%
- \write\istfile{^^J; required styles^^J}
+ \@gls@addpredefinedattributes
+ \openout\glswrite=\istfilename
+ \write\glswrite{;; xindy style file created by the glossaries
+ package}%
+ \write\glswrite{;; for document '\jobname' on
+ \the\year-\the\month-\the\day}%
+ \write\glswrite{^^J; required styles^^J}
\@for\@xdystyle:=\@xdyrequiredstyles\do{%
- \ifx\@xdystyle\@empty
- \else
- \protected@write\istfile{}{(require
- \string"\@xdystyle.xdy\string")}%
- \fi
+ \ifx\@xdystyle\@empty
+ \else
+ \protected@write\glswrite{}{(require
+ \string"\@xdystyle.xdy\string")}%
+ \fi
}%
- \write\istfile{^^J%
+ \write\glswrite{^^J%
; list of allowed attributes (number formats)^^J}%
- \write\istfile{(define-attributes ((\@xdyattributes)))}%
- \write\istfile{^^J; user defined alphabets^^J}%
- \write\istfile{\@xdyuseralphabets}%
- \write\istfile{^^J; location class definitions^^J}%
- \protected@edef\@gls@roman{\@roman{0\string"
- \string"roman-numbers-lowercase\string" :sep \string"}}%
- \@onelevel@sanitize\@gls@roman
- \edef\@tmp{\string" \string"roman-numbers-lowercase\string"
- :sep \string"}%
- \@onelevel@sanitize\@tmp
- \ifx\@tmp\@gls@roman
- \write\istfile{(define-location-class
- \string"roman-page-numbers\string"^^J\space\space\space
- (\string"roman-numbers-lowercase\string")
- :min-range-length \@glsminrange)}%
- \else
- \write\istfile{(define-location-class
- \string"roman-page-numbers\string"^^J\space\space\space
- (:sep "\@gls@roman")
- :min-range-length \@glsminrange)}%
- \fi
- \write\istfile{(define-location-class
- \string"Roman-page-numbers\string"^^J\space\space\space
- (\string"roman-numbers-uppercase\string")
- :min-range-length \@glsminrange)}%
- \write\istfile{(define-location-class
- \string"arabic-page-numbers\string"^^J\space\space\space
- (\string"arabic-numbers\string")
- :min-range-length \@glsminrange)}%
- \write\istfile{(define-location-class
- \string"alpha-page-numbers\string"^^J\space\space\space
- (\string"alpha\string")
- :min-range-length \@glsminrange)}%
- \write\istfile{(define-location-class
- \string"Alpha-page-numbers\string"^^J\space\space\space
- (\string"ALPHA\string")
- :min-range-length \@glsminrange)}%
- \write\istfile{(define-location-class
- \string"Appendix-page-numbers\string"^^J\space\space\space
- (\string"ALPHA\string"
- :sep \string"\@glsAlphacompositor\string"
- \string"arabic-numbers\string")
- :min-range-length \@glsminrange)}%
- \write\istfile{(define-location-class
- \string"arabic-section-numbers\string"^^J\space\space\space
- (\string"arabic-numbers\string"
- :sep \string"\glscompositor\string"
- \string"arabic-numbers\string")
- :min-range-length \@glsminrange)}%
- \write\istfile{^^J; user defined location classes}%
- \write\istfile{\@xdyuserlocationdefs}%
- \write\istfile{^^J; define cross-reference class^^J}%
- \write\istfile{(define-crossref-class \string"see\string"
- :unverified )}%
- \write\istfile{(markup-crossref-list
- :class \string"see\string"^^J\space\space\space
- :open \string"\string\glsseeformat\string"
- :close \string"{}\string")}%
- \write\istfile{^^J; define the order of the location classes}%
- \write\istfile{(define-location-class-order
- (\@xdylocationclassorder))}%
- \write\istfile{^^J; define the glossary markup^^J}%
- \write\istfile{(markup-index^^J\space\space\space
- :open \string"\string
- \glossarysection[\string\glossarytoctitle]{\string
- \glossarytitle}\string\glossarypreamble\string~n\string\begin
- {theglossary}\string\glossaryheader\string~n\string" ^^J\space
- \space\space:close \string"\expandafter\@gobble
- \string\%\string~n\string
- \end{theglossary}\string\glossarypostamble
- \string~n\string" ^^J\space\space\space
- :tree)}%
- \write\istfile{(markup-letter-group-list
- :sep \string"\string\glsgroupskip\string~n\string")}%
- \write\istfile{(markup-indexentry
- :open \string"\string\relax \string\glsresetentrylist
- \string~n\string")}%
- \write\istfile{(markup-locclass-list :open
- \string"\glsopenbrace\string\glossaryentrynumbers
- \glsopenbrace\string\relax\space \string"^^J\space\space\space
- :sep \string", \string"
- :close \string"\glsclosebrace\glsclosebrace\string")}%
- \write\istfile{(markup-locref-list
- :sep \string"\string\delimN\space\string")}%
- \write\istfile{(markup-range
- :sep \string"\string\delimR\space\string")}%
+ \write\glswrite{(define-attributes ((\@xdyattributes)))}%
+ \write\glswrite{^^J; user defined alphabets^^J}%
+ \write\glswrite{\@xdyuseralphabets}%
+ \write\glswrite{^^J; location class definitions^^J}%
+ \@for\@gls@classI:=\@gls@xdy@locationlist\do{%
+ \protected@write\glswrite{}{(define-location-class
+ \string"\@gls@classI\string"^^J\space\space\space
+ (
+ :sep "{}{"
+ \csname @gls@xdy@Lclass@\@gls@classI\endcsname\space
+ :sep "}"
+ )
+ ^^J\space\space\space
+ :min-range-length \@glsminrange^^J%
+ )
+ }%
+ {%
+ \@for\@gls@classII:=\@gls@xdy@locationlist\do{%
+ \protected@write\glswrite{}{(define-location-class
+ \string"\@gls@classII-\@gls@classI\string"
+ ^^J\space\space\space
+ (
+ :sep "{"
+ \csname @gls@xdy@Lclass@\@gls@classII\endcsname\space
+ :sep "}{"
+ \csname @gls@xdy@Lclass@\@gls@classI\endcsname\space
+ :sep "}"
+ )
+ ^^J\space\space\space
+ :min-range-length \@glsminrange^^J%
+ )
+ }%
+ }%
+ }%
+ }%
+ \write\glswrite{^^J; user defined location classes}%
+ \write\glswrite{\@xdyuserlocationdefs}%
+ \write\glswrite{^^J; define cross-reference class^^J}%
+ \write\glswrite{(define-crossref-class \string"see\string"
+ :unverified )}%
+ \write\glswrite{(markup-crossref-list
+ :class \string"see\string"^^J\space\space\space
+ :open \string"\string\glsseeformat\string"
+ :close \string"{}\string")}%
+ \write\glswrite{^^J; define the order of the location classes}%
+ \write\glswrite{(define-location-class-order
+ (\@xdylocationclassorder))}%
+ \write\glswrite{^^J; define the glossary markup^^J}%
+ \write\glswrite{(markup-index^^J\space\space\space
+ :open \string"\string
+ \glossarysection[\string\glossarytoctitle]{\string
+ \glossarytitle}\string\glossarypreamble}%
+ \@for\@this@ctr:=\@xdycounters\do{%
+ {%
+ \@for\@this@attr:=\@xdyattributelist\do{%
+ \protected@write\glswrite{}{\string\providecommand*%
+ \expandafter\string
+ \csname glsX\@this@ctr X\@this@attr\endcsname[2]%
+ {%
+ \string\setentrycounter
+ [\expandafter\@gobble\string\#1]{\@this@ctr}%
+ \expandafter\string
+ \csname\@this@attr\endcsname
+ {\expandafter\@gobble\string\#2}%
+ }%
+ }%
+ }%
+ }%
+ }%
+ \write\glswrite{%
+ \string\begin
+ {theglossary}\string\glossaryheader\string~n\string" ^^J\space
+ \space\space:close \string"\expandafter\@gobble
+ \string\%\string~n\string
+ \end{theglossary}\string\glossarypostamble
+ \string~n\string" ^^J\space\space\space
+ :tree)}%
+ \write\glswrite{(markup-letter-group-list
+ :sep \string"\string\glsgroupskip\string~n\string")}%
+ \write\glswrite{(markup-indexentry
+ :open \string"\string\relax \string\glsresetentrylist
+ \string~n\string")}%
+ \write\glswrite{(markup-locclass-list :open
+ \string"\glsopenbrace\string\glossaryentrynumbers
+ \glsopenbrace\string\relax\space \string"^^J\space\space\space
+ :sep \string", \string"
+ :close \string"\glsclosebrace\glsclosebrace\string")}%
+ \write\glswrite{(markup-locref-list
+ :sep \string"\string\delimN\space\string")}%
+ \write\glswrite{(markup-range
+ :sep \string"\string\delimR\space\string")}%
\@onelevel@sanitize\gls@suffixF
\@onelevel@sanitize\gls@suffixFF
\ifx\gls@suffixF\@empty
\else
- \write\istfile{(markup-range
- :close "\gls@suffixF" :length 1 :ignore-end)}%
+ \write\glswrite{(markup-range
+ :close "\gls@suffixF" :length 1 :ignore-end)}%
\fi
\ifx\gls@suffixFF\@empty
\else
- \write\istfile{(markup-range
- :close "\gls@suffixFF" :length 2 :ignore-end)}%
+ \write\glswrite{(markup-range
+ :close "\gls@suffixFF" :length 2 :ignore-end)}%
\fi
- \write\istfile{^^J; define format to use for locations^^J}%
- \write\istfile{\@xdylocref}%
- \write\istfile{^^J; define letter group list format^^J}%
- \write\istfile{(markup-letter-group-list
- :sep \string"\string\glsgroupskip\string~n\string")}%
- \write\istfile{^^J; letter group headings^^J}%
- \write\istfile{(markup-letter-group
- :open-head \string"\string\glsgroupheading
- \glsopenbrace\string"^^J\space\space\space
- :close-head \string"\glsclosebrace\string")}%
- \write\istfile{^^J; additional letter groups^^J}%
- \write\istfile{\@xdylettergroups}%
- \write\istfile{^^J; additional sort rules^^J}
- \write\istfile{\@xdysortrules}%
- \noist}
+ \write\glswrite{^^J; define format to use for locations^^J}%
+ \write\glswrite{\@xdylocref}%
+ \write\glswrite{^^J; define letter group list format^^J}%
+ \write\glswrite{(markup-letter-group-list
+ :sep \string"\string\glsgroupskip\string~n\string")}%
+ \write\glswrite{^^J; letter group headings^^J}%
+ \write\glswrite{(markup-letter-group
+ :open-head \string"\string\glsgroupheading
+ \glsopenbrace\string"^^J\space\space\space
+ :close-head \string"\glsclosebrace\string")}%
+ \write\glswrite{^^J; additional letter groups^^J}%
+ \write\glswrite{\@xdylettergroups}%
+ \write\glswrite{^^J; additional sort rules^^J}
+ \write\glswrite{\@xdysortrules}%
+ \closeout\glswrite
+ \let\writeist\relax
+ }
\else
\edef\@gls@actualchar{\string?}
\edef\@gls@encapchar{\string|}
\edef\@gls@levelchar{\string!}
\edef\@gls@quotechar{\string"}
\def\writeist{\relax
- \openout\istfile=\istfilename
- \write\istfile{\expandafter\@gobble\string\% makeindex style file
+ \openout\glswrite=\istfilename
+ \write\glswrite{\expandafter\@gobble\string\% makeindex style file
created by the glossaries package}
- \write\istfile{\expandafter\@gobble\string\% for document
+ \write\glswrite{\expandafter\@gobble\string\% for document
'\jobname' on \the\year-\the\month-\the\day}
- \write\istfile{actual '\@gls@actualchar'}
- \write\istfile{encap '\@gls@encapchar'}
- \write\istfile{level '\@gls@levelchar'}
- \write\istfile{quote '\@gls@quotechar'}
- \write\istfile{keyword \string"\string\\glossaryentry\string"}
- \write\istfile{preamble \string"\string\\glossarysection[\string
+ \write\glswrite{actual '\@gls@actualchar'}
+ \write\glswrite{encap '\@gls@encapchar'}
+ \write\glswrite{level '\@gls@levelchar'}
+ \write\glswrite{quote '\@gls@quotechar'}
+ \write\glswrite{keyword \string"\string\\glossaryentry\string"}
+ \write\glswrite{preamble \string"\string\\glossarysection[\string
\\glossarytoctitle]{\string\\glossarytitle}\string
\\glossarypreamble\string\n\string\\begin{theglossary}\string
\\glossaryheader\string\n\string"}
- \write\istfile{postamble \string"\string\%\string\n\string
+ \write\glswrite{postamble \string"\string\%\string\n\string
\\end{theglossary}\string\\glossarypostamble\string\n
\string"}
- \write\istfile{group_skip \string"\string\\glsgroupskip\string\n
+ \write\glswrite{group_skip \string"\string\\glsgroupskip\string\n
\string"}
- \write\istfile{item_0 \string"\string\%\string\n\string"}
- \write\istfile{item_1 \string"\string\%\string\n\string"}
- \write\istfile{item_2 \string"\string\%\string\n\string"}
- \write\istfile{item_01 \string"\string\%\string\n\string"}
- \write\istfile{item_x1
+ \write\glswrite{item_0 \string"\string\%\string\n\string"}
+ \write\glswrite{item_1 \string"\string\%\string\n\string"}
+ \write\glswrite{item_2 \string"\string\%\string\n\string"}
+ \write\glswrite{item_01 \string"\string\%\string\n\string"}
+ \write\glswrite{item_x1
\string"\string\\relax \string\\glsresetentrylist\string\n
\string"}
- \write\istfile{item_12 \string"\string\%\string\n\string"}
- \write\istfile{item_x2
+ \write\glswrite{item_12 \string"\string\%\string\n\string"}
+ \write\glswrite{item_x2
\string"\string\\relax \string\\glsresetentrylist\string\n
\string"}
- \write\istfile{delim_0 \string"\string\{\string
+ \write\glswrite{delim_0 \string"\string\{\string
\\glossaryentrynumbers\string\{\string\\relax \string"}
- \write\istfile{delim_1 \string"\string\{\string
+ \write\glswrite{delim_1 \string"\string\{\string
\\glossaryentrynumbers\string\{\string\\relax \string"}
- \write\istfile{delim_2 \string"\string\{\string
+ \write\glswrite{delim_2 \string"\string\{\string
\\glossaryentrynumbers\string\{\string\\relax \string"}
- \write\istfile{delim_t \string"\string\}\string\}\string"}
- \write\istfile{delim_n \string"\string\\delimN \string"}
- \write\istfile{delim_r \string"\string\\delimR \string"}
- \write\istfile{headings_flag 1}
- \write\istfile{heading_prefix
+ \write\glswrite{delim_t \string"\string\}\string\}\string"}
+ \write\glswrite{delim_n \string"\string\\delimN \string"}
+ \write\glswrite{delim_r \string"\string\\delimR \string"}
+ \write\glswrite{headings_flag 1}
+ \write\glswrite{heading_prefix
\string"\string\\glsgroupheading\string\{\string"}
- \write\istfile{heading_suffix
+ \write\glswrite{heading_suffix
\string"\string\}\string\\relax
\string\\glsresetentrylist \string"}
- \write\istfile{symhead_positive \string"glssymbols\string"}
- \write\istfile{numhead_positive \string"glsnumbers\string"}
- \write\istfile{page_compositor \string"\glscompositor\string"}
+ \write\glswrite{symhead_positive \string"glssymbols\string"}
+ \write\glswrite{numhead_positive \string"glsnumbers\string"}
+ \write\glswrite{page_compositor \string"\glscompositor\string"}
\@gls@escbsdq\gls@suffixF
\@gls@escbsdq\gls@suffixFF
\ifx\gls@suffixF\@empty
\else
- \write\istfile{suffix_2p \string"\gls@suffixF\string"}
+ \write\glswrite{suffix_2p \string"\gls@suffixF\string"}
\fi
\ifx\gls@suffixFF\@empty
\else
- \write\istfile{suffix_3p \string"\gls@suffixFF\string"}
+ \write\glswrite{suffix_3p \string"\gls@suffixFF\string"}
\fi
- \noist
+ \closeout\glswrite
+ \let\writeist\relax
}
\fi
-\newcommand{\noist}{\let\writeist\relax}
+\newcommand{\noist}{%
+ \@gls@addpredefinedattributes
+ \let\writeist\relax
+}
\newcommand*{\@makeglossary}[1]{%
-\ifglossaryexists{#1}{%
-\edef\glo@out{\csname @glotype@#1@out\endcsname}%
-\expandafter\newwrite\csname glo@#1@file\endcsname
-\edef\@glo@file{\csname glo@#1@file\endcsname}%
-\immediate\openout\@glo@file=\jobname.\glo@out
-\@gls@renewglossary
-\PackageInfo{glossaries}{Writing glossary file \jobname.\glo@out}
-\writeist
-}{\PackageError{glossaries}{%
-Glossary type `#1' not defined}{New glossaries must be defined before
-using \string\makeglossary}}}
+ \ifglossaryexists{#1}%
+ {%
+ \ifglssavewrites
+ \expandafter\newtoks\csname glo@#1@filetok\endcsname
+ \else
+ \expandafter\newwrite\csname glo@#1@file\endcsname
+ \expandafter\@glsopenfile\csname glo@#1@file\endcsname{#1}%
+ \fi
+ \@gls@renewglossary
+ \writeist
+ }%
+ {%
+ \PackageError{glossaries}%
+ {Glossary type `#1' not defined}%
+ {New glossaries must be defined before using \string\makeglossary}%
+ }%
+}
+\newcommand*{\@glsopenfile}[2]{%
+ \immediate\openout#1=\jobname.\csname @glotype@#2@out\endcsname
+ \PackageInfo{glossaries}{Writing glossary file
+ \jobname.\csname @glotype@#2@out\endcsname}%
+}
\newcommand*{\warn@nomakeglossaries}{%
\GlossariesWarningNoLine{\string\makeglossaries\space
hasn't been used,^^Jthe glossaries will not be updated}%
@@ -2421,18 +3023,53 @@ using \string\makeglossary}}}
\warn@nomakeglossaries
\warn@noprintglossary
}
+\newwrite\glswrite
+\def\istfile{\glswrite}
+\AtEndDocument{%
+ \glswritefiles
+}
+\ifglssavewrites
+ \newcommand*{\glswritefiles}{%
+ \forallglossaries{\@glo@type}{%
+ \@glsopenfile{\glswrite}{\@glo@type}%
+ \immediate\write\glswrite{%
+ \expandafter\the\csname glo@\@glo@type @filetok\endcsname}%
+ \immediate\closeout\glswrite
+ }%
+ }
+\else
+ \let\glswritefiles\relax
+\fi
\renewcommand*{\glossary}[1][\glsdefaulttype]{%
\@glossary[#1]}
\def\@glossary[#1]{\index}
\newcommand{\@gls@renewglossary}{%
-\gdef\@glossary[##1]{\@bsphack\begingroup\@wrglossary{##1}}%
-\let\@gls@renewglossary\@empty
+ \gdef\@glossary[##1]{\@bsphack\begingroup\@wrglossary{##1}}%
+ \let\@gls@renewglossary\@empty
}
\renewcommand*{\@wrglossary}[2]{%
- \expandafter\protected@write\csname glo@#1@file\endcsname{}{#2}%
+ \ifglssavewrites
+ \protected@edef\@gls@tmp{\the\csname glo@#1@filetok\endcsname#2}%
+ \expandafter\global\expandafter\csname glo@#1@filetok\endcsname
+ \expandafter{\@gls@tmp^^J}%
+ \else
+ \expandafter\protected@write\csname glo@#1@file\endcsname{}{#2}%
+ \fi
\endgroup\@esphack
}
\newcommand{\@do@wrglossary}[1]{%
+ \protected@edef\@glslocref{\theglsentrycounter}%
+ \@gls@checkmkidxchars\@glslocref
+ \expandafter\ifx\theHglsentrycounter\theglsentrycounter
+ \def\@glo@counterprefix{}%
+ \else
+ \protected@edef\@glsHlocref{\theHglsentrycounter}%
+ \@gls@checkmkidxchars\@glsHlocref
+ \edef\@do@gls@getcounterprefix{\noexpand\@gls@getcounterprefix
+ {\@glslocref}{\@glsHlocref}%
+ }%
+ \@do@gls@getcounterprefix
+ \fi
\ifglsxindy
\expandafter\@glo@check@mkidxrangechar\@glsnumberformat\@nil
\def\@glo@range{}%
@@ -2443,34 +3080,53 @@ using \string\makeglossary}}}
\def\@glo@range{:close-range}%
\fi
\fi
-\protected@edef\@glslocref{\theglsentrycounter}%
-\@gls@checkmkidxchars\@glslocref
\glossary[\csname glo@#1@type\endcsname]{%
(indexentry :tkey (\csname glo@#1@index\endcsname)
- :locref \string"\@glslocref\string" %
- :attr \string"\@glo@suffix\string" \@glo@range
+ :locref \string"{\@glo@counterprefix}{\@glslocref}\string" %
+ :attr \string"\@gls@counter\@glo@suffix\string"
+ \@glo@range
)
}%
\else
- \@set@glo@numformat\@glo@numfmt\@gls@counter\@glsnumberformat
+ \@set@glo@numformat{\@glo@numfmt}{\@gls@counter}{\@glsnumberformat}%
+ {\@glo@counterprefix}%
\glossary[\csname glo@#1@type\endcsname]{%
\string\glossaryentry{\csname glo@#1@index\endcsname
\@gls@encapchar\@glo@numfmt}{\theglsentrycounter}}%
\fi
}
+\newcommand*\@gls@getcounterprefix[2]{%
+ \edef\@gls@thisloc{#1}\edef\@gls@thisHloc{#2}%
+ \ifx\@gls@thisloc\@gls@thisHloc
+ \def\@glo@counterprefix{}%
+ \else
+ \def\@gls@get@counterprefix##1.#1##2\end@getprefix{%
+ \def\@glo@tmp{##2}%
+ \ifx\@glo@tmp\@empty
+ \def\@glo@counterprefix{}%
+ \else
+ \def\@glo@counterprefix{##1}%
+ \fi
+ }%
+ \@gls@get@counterprefix#2.#1\end@getprefix
+ \fi
+}
\newcommand{\@do@seeglossary}[2]{%
+\def\@gls@xref{#2}%
+\@onelevel@sanitize\@gls@xref
+\@gls@checkmkidxchars\@gls@xref
\ifglsxindy
\glossary[\csname glo@#1@type\endcsname]{%
(indexentry
:tkey (\csname glo@#1@index\endcsname)
- :xref (\string"#2\string")
+ :xref (\string"\@gls@xref\string")
:attr \string"see\string"
)
}%
\else
\glossary[\csname glo@#1@type\endcsname]{%
\string\glossaryentry{\csname glo@#1@index\endcsname
- \@gls@encapchar glsseeformat#2}{Z}}%
+ \@gls@encapchar glsseeformat\@gls@xref}{Z}}%
\fi
}
\def\@gls@fixbraces#1#2#3\@nil{%
@@ -2501,25 +3157,35 @@ using \string\makeglossary}}}
}
\newcommand*{\glsseelastsep}{\space\andname\space}
\newcommand*{\glsseesep}{, }
-\newcommand*{\glsseeitem}[1]{\glshyperlink{#1}}
+\newcommand*{\glsseeitem}[1]{\glshyperlink[\glsseeitemformat{#1}]{#1}}
+\newcommand*{\glsseeitemformat}[1]{\glsentrytext{#1}}
\def\warn@noprintglossary{\GlossariesWarningNoLine{No
\string\printglossary\space or \string\printglossaries\space
found.^^JThis document will not have a glossary}}
-\@ifundefined{printglossary}{}{%
+\ifcsundef{printglossary}{}%
+{%
\GlossariesWarning{Overriding \string\printglossary}%
- \let\printglossary\undefined
+ \undef\printglossary
}
\newcommand*{\printglossary}[1][type=\glsdefaulttype]{%
\ifglsxindy\findrootlanguage\fi
\def\@glo@type{\glsdefaulttype}%
\def\glossarytitle{\csname @glotype@\@glo@type @title\endcsname}%
+ \let\org@glossarytitle\glossarytitle
\def\@glossarystyle{}%
\def\gls@dotoctitle{\glssettoctitle{\@glo@type}}%
\let\@org@glossaryentrynumbers\glossaryentrynumbers
\bgroup
\setkeys{printgloss}{#1}%
+ \ifx\glossarytitle\org@glossarytitle
+ \else
+ \expandafter\let\csname @glotype@\@glo@type @title\endcsname
+ \glossarytitle
+ \fi
+ \let\currentglossary\@glo@type
\let\org@glossaryentrynumbers\glossaryentrynumbers
\let\glsnonextpages\@glsnonextpages
+ \let\glsnextpages\@glsnextpages
\let\nopostdesc\@nopostdesc
\gls@dotoctitle
\@glossarystyle
@@ -2528,10 +3194,12 @@ using \string\makeglossary}}}
\IfFileExists{\jobname.\csname @glotype@\@glo@type @in\endcsname}{}%
{\null}%
\ifglsxindy
- \@ifundefined{@xdy@\@glo@type @language}{%
+ \ifcsundef{@xdy@\@glo@type @language}%
+ {%
\protected@write\@auxout{}{%
\string\@xdylanguage{\@glo@type}{\@xdy@main@language}}%
- }{%
+ }%
+ {%
\protected@write\@auxout{}{%
\string\@xdylanguage{\@glo@type}{\csname @xdy@\@glo@type
@language\endcsname}}%
@@ -2551,9 +3219,15 @@ using \string\makeglossary}}}
\let\gls@dotoctitle\relax
}
\define@key{printgloss}{style}{%
-\@ifundefined{@glsstyle@#1}{\PackageError{glossaries}{Glossary
-style `#1' undefined}{}}{%
-\def\@glossarystyle{\csname @glsstyle@#1\endcsname}}}
+ \ifcsundef{@glsstyle@#1}%
+ {%
+ \PackageError{glossaries}%
+ {Glossary style `#1' undefined}{}%
+ }%
+ {%
+ \def\@glossarystyle{\csname @glsstyle@#1\endcsname}%
+ }%
+}
\define@choicekey{printgloss}{numberedsection}[\val\nr]{%
false,nolabel,autolabel}[nolabel]{%
\ifcase\nr\relax
@@ -2575,12 +3249,91 @@ false,nolabel,autolabel}[nolabel]{%
\newcommand*{\@glsnonextpages}{%
\gdef\glossaryentrynumbers##1{%
\glsresetentrylist}}
+\newcommand*{\@glsnextpages}{%
+ \gdef\glossaryentrynumbers##1{%
+ ##1\glsresetentrylist}}
\newcommand*{\glsresetentrylist}{%
\global\let\glossaryentrynumbers\org@glossaryentrynumbers}
\newcommand*{\glsnonextpages}{}
-\@ifundefined{theglossary}{%
+\newcommand*{\glsnextpages}{}
+\ifglsentrycounter
+ \ifx\@gls@counterwithin\@empty
+ \newcounter{glossaryentry}
+ \else
+ \newcounter{glossaryentry}[\@gls@counterwithin]
+ \fi
+ \def\theHglossaryentry{\currentglossary.\theglossaryentry}
+\fi
+\ifglssubentrycounter
+ \ifglsentrycounter
+ \newcounter{glossarysubentry}[glossaryentry]
+ \else
+ \newcounter{glossarysubentry}
+ \fi
+ \def\theHglossarysubentry{\currentglssubentry.\theglossarysubentry}
+\fi
+\ifglssubentrycounter
+ \newcommand*{\glsresetsubentrycounter}{%
+ \setcounter{glossarysubentry}{0}%
+ }
+\else
+ \newcommand*{\glsresetsubentrycounter}{}
+\fi
+\ifglsentrycounter
+ \newcommand*{\glsstepentry}[1]{%
+ \refstepcounter{glossaryentry}%
+ \label{glsentry-#1}%
+ }
+\else
+ \newcommand*{\glsstepentry}[1]{}
+\fi
+\ifglssubentrycounter
+ \newcommand*{\glsstepsubentry}[1]{%
+ \def\currentglssubentry{#1}%
+ \refstepcounter{glossarysubentry}%
+ \label{glsentry-#1}%
+ }
+\else
+ \newcommand*{\glsstepsubentry}[1]{}
+\fi
+\ifglsentrycounter
+ \newcommand*{\glsrefentry}[1]{\ref{glsentry-#1}}
+\else
+ \ifglssubentrycounter
+ \newcommand*{\glsrefentry}[1]{\ref{glsentry-#1}}
+ \else
+ \newcommand*{\glsrefentry}[1]{\gls{#1}}
+ \fi
+\fi
+\ifglsentrycounter
+ \newcommand*{\glsentrycounterlabel}{\theglossaryentry.\space}
+\else
+ \newcommand*{\glsentrycounterlabel}{}
+\fi
+\ifglssubentrycounter
+ \newcommand*{\glssubentrycounterlabel}{\theglossarysubentry)\space}
+\else
+ \newcommand*{\glssubentrycounterlabel}{}
+\fi
+\ifglsentrycounter
+ \newcommand*{\glsentryitem}[1]{%
+ \glsstepentry{#1}\glsentrycounterlabel
+ }
+\else
+ \newcommand*{\glsentryitem}[1]{\glsresetsubentrycounter}
+\fi
+\ifglssubentrycounter
+ \newcommand*{\glssubentryitem}[1]{%
+ \glsstepsubentry{#1}\glssubentrycounterlabel
+ }
+\else
+ \newcommand*{\glssubentryitem}[1]{}
+\fi
+\ifcsundef{theglossary}%
+{%
\newenvironment{theglossary}{}{}%
-}{%
+}%
+{%
\GlossariesWarning{overriding `theglossary' environment}%
\renewenvironment{theglossary}{}{}%
}
@@ -2593,24 +3346,46 @@ false,nolabel,autolabel}[nolabel]{%
\newcommand*{\glsgroupskip}{}
\newcommand*{\glsgroupheading}[1]{}
\newcommand*{\glsgetgrouptitle}[1]{%
-\@ifundefined{#1groupname}{#1}{\csname #1groupname\endcsname}}
+ \ifcsundef{#1groupname}{#1}{\csname #1groupname\endcsname}%
+}
\newcommand*{\glsgetgrouplabel}[1]{%
\ifthenelse{\equals{#1}{\glssymbolsgroupname}}{glssymbols}{%
\ifthenelse{\equals{#1}{\glsnumbersgroupname}}{glsnumbers}{#1}}}
-\newcommand*{\setentrycounter}[1]{\def\glsentrycounter{#1}}
+\newcommand*{\setentrycounter}[2][]{%
+ \def\@glo@counterprefix{#1}%
+ \ifx\@glo@counterprefix\@empty
+ \def\@glo@counterprefix{.}%
+ \else
+ \def\@glo@counterprefix{.#1.}%
+ \fi
+ \def\glsentrycounter{#2}%
+}
\newcommand*{\glossarystyle}[1]{%
-\@ifundefined{@glsstyle@#1}{\PackageError{glossaries}{Glossary
-style `#1' undefined}{}}{%
-\csname @glsstyle@#1\endcsname}}
+ \ifcsundef{@glsstyle@#1}%
+ {%
+ \PackageError{glossaries}{Glossary style `#1' undefined}{}%
+ }%
+ {%
+ \csname @glsstyle@#1\endcsname
+ }%
+}
\newcommand{\newglossarystyle}[2]{%
-\@ifundefined{@glsstyle@#1}{%
-\expandafter\def\csname @glsstyle@#1\endcsname{#2}}{%
-\PackageError{glossaries}{Glossary style `#1' is already defined}{}}}
+ \ifcsundef{@glsstyle@#1}%
+ {%
+ \expandafter\def\csname @glsstyle@#1\endcsname{#2}%
+ }%
+ {%
+ \PackageError{glossaries}{Glossary style `#1' is already defined}{}%
+ }%
+}
\newcommand*{\glsnamefont}[1]{#1}
-\@ifundefined{hyperlink}{%
-\def\glshypernumber#1{#1}}{%
-\def\glshypernumber#1{%
- \@glshypernumber#1\nohyperpage{}\@nil}}
+\ifcsundef{hyperlink}%
+{%
+ \def\glshypernumber#1{#1}%
+}%
+{%
+ \def\glshypernumber#1{\@glshypernumber#1\nohyperpage{}\@nil}
+}
\def\@glshypernumber#1\nohyperpage#2#3\@nil{%
\ifx\\#1\\%
\else
@@ -2650,7 +3425,8 @@ style `#1' undefined}{}}{%
\edef\x{\the\toks@}%
\ifx\x\empty
\else
- \hyperlink{\glsentrycounter.\the\toks@}{\the\toks@}%
+ \hyperlink{\glsentrycounter\@glo@counterprefix\the\toks@}%
+ {\the\toks@}%
\fi
\else
\@gls@ReturnAfterFi{%
@@ -2676,57 +3452,113 @@ style `#1' undefined}{}}{%
\newcommand{\oldacronym}[4][\gls@label]{%
\def\gls@label{#2}%
\newacronym[#4]{#1}{#2}{#3}%
- \@ifundefined{xspace}{%
+ \ifcsundef{xspace}%
+ {%
\expandafter\edef\csname#1\endcsname{%
- \noexpand\@ifstar{\noexpand\Gls{#1}}{\noexpand\gls{#1}}}%
- }{%
+ \noexpand\@ifstar{\noexpand\Gls{#1}}{\noexpand\gls{#1}}%
+ }%
+ }%
+ {%
\expandafter\edef\csname#1\endcsname{%
\noexpand\@ifstar{\noexpand\Gls{#1}\noexpand\xspace}{%
- \noexpand\gls{#1}\noexpand\xspace}}%
+ \noexpand\gls{#1}\noexpand\xspace}%
+ }%
}%
}
\newcommand{\newacronym}[4][]{}
\newcommand*{\acrpluralsuffix}{\glspluralsuffix}
-\newcommand*{\glsshortkey}{text}
-\newcommand*{\glsshortpluralkey}{plural}
-\newcommand*{\glslongkey}{description}
-\newcommand*{\glslongpluralkey}{descriptionplural}
-\newcommand*{\acrshort}[2][]{%
- \new@ifnextchar[{\@acrshort{#1}{#2}}{\@acrshort{#1}{#2}[]}}
-\newcommand*{\Acrshort}[2][]{%
- \new@ifnextchar[{\@Acrshort{#1}{#2}}{\@Acrshort{#1}{#2}[]}}
-\newcommand*{\ACRshort}[2][]{%
- \new@ifnextchar[{\@ACRshort{#1}{#2}}{\@ACRshort{#1}{#2}[]}}
-\newcommand*{\acrshortpl}[2][]{%
- \new@ifnextchar[{\@acrshortpl{#1}{#2}}{\@acrshortpl{#1}{#2}[]}}
-\newcommand*{\Acrshortpl}[2][]{%
- \new@ifnextchar[{\@Acrshortpl{#1}{#2}}{\@Acrshortpl{#1}{#2}[]}}
-\newcommand*{\ACRshortpl}[2][]{%
- \new@ifnextchar[{\@ACRshortpl{#1}{#2}}{\@ACRshortpl{#1}{#2}[]}}
-\newcommand*{\acrlong}[2][]{%
- \new@ifnextchar[{\@acrlong{#1}{#2}}{\@acrlong{#1}{#2}[]}}
-\newcommand*{\Acrlong}[2][]{%
- \new@ifnextchar[{\@Acrlong{#1}{#2}}{\@Acrlong{#1}{#2}[]}}
-\newcommand*{\ACRlong}[2][]{%
- \new@ifnextchar[{\@ACRlong{#1}{#2}}{\@ACRlong{#1}{#2}[]}}
-\newcommand*{\acrlongpl}[2][]{%
- \new@ifnextchar[{\@acrlongpl{#1}{#2}}{\@acrlongpl{#1}{#2}[]}}
-\newcommand*{\Acrlongpl}[2][]{%
- \new@ifnextchar[{\@Acrlongpl{#1}{#2}}{\@Acrlongpl{#1}{#2}[]}}
-\newcommand*{\ACRlongpl}[2][]{%
- \new@ifnextchar[{\@ACRlongpl{#1}{#2}}{\@ACRlongpl{#1}{#2}[]}}
-\newcommand*{\acrfull}[2][]{%
- \new@ifnextchar[{\@acrfull{#1}{#2}}{\@acrfull{#1}{#2}[]}}
-\newcommand*{\Acrfull}[2][]{%
- \new@ifnextchar[{\@Acrfull{#1}{#2}}{\@Acrfull{#1}{#2}[]}}
-\newcommand*{\ACRfull}[2][]{%
- \new@ifnextchar[{\@ACRfull{#1}{#2}}{\@ACRfull{#1}{#2}[]}}
-\newcommand*{\acrfullpl}[2][]{%
- \new@ifnextchar[{\@acrfullpl{#1}{#2}}{\@acrfullpl{#1}{#2}[]}}
-\newcommand*{\Acrfullpl}[2][]{%
- \new@ifnextchar[{\@Acrfullpl{#1}{#2}}{\@Acrfullpl{#1}{#2}[]}}
-\newcommand*{\ACRfullpl}[2][]{%
- \new@ifnextchar[{\@ACRfullpl{#1}{#2}}{\@ACRfullpl{#1}{#2}[]}}
+\newcommand*{\glsshortkey}{short}
+\newcommand*{\glsshortpluralkey}{shortplural}
+\newcommand*{\glslongkey}{long}
+\newcommand*{\glslongpluralkey}{longplural}
+\newcommand*{\acrfull}{%
+ \@ifstar\s@acrfull\ns@acrfull
+}
+\newcommand*\s@acrfull[2][]{%
+ \new@ifnextchar[{\@acrfull{hyper=false,#1}{#2}}%
+ {\@acrfull{hyper=false,#1}{#2}[]}%
+}
+\newcommand*\ns@acrfull[2][]{%
+ \new@ifnextchar[{\@acrfull{#1}{#2}}%
+ {\@acrfull{#1}{#2}[]}%
+}
+\def\@acrfull#1#2[#3]{%
+ \acrlinkfullformat{\@acrlong}{\@acrshort}{#1}{#2}{#3}%
+}
+\newcommand{\acrlinkfullformat}[5]{%
+ \acrfullformat{#1{#3}{#4}[#5]}{#2{#3}{#4}[]}%
+}
+\newcommand{\acrfullformat}[2]{#1\space(\acronymfont{#2})}
+\newcommand*{\Acrfull}{%
+ \@ifstar\s@Acrfull\ns@Acrfull
+}
+\newcommand*\s@Acrfull[2][]{%
+ \new@ifnextchar[{\@Acrfull{hyper=false,#1}{#2}}%
+ {\@Acrfull{hyper=false,#1}{#2}[]}%
+}
+\newcommand*\ns@Acrfull[2][]{%
+ \new@ifnextchar[{\@Acrfull{#1}{#2}}%
+ {\@Acrfull{#1}{#2}[]}%
+}
+\def\@Acrfull#1#2[#3]{%
+ \acrlinkfullformat{\@Acrlong}{\@acrshort}{#1}{#2}{#3}%
+}
+\newcommand*{\ACRfull}{%
+ \@ifstar\s@ACRfull\ns@ACRfull
+}
+\newcommand*\s@ACRfull[2][]{%
+ \new@ifnextchar[{\@ACRfull{hyper=false,#1}{#2}}%
+ {\@ACRfull{hyper=false,#1}{#2}[]}%
+}
+\newcommand*\ns@ACRfull[2][]{%
+ \new@ifnextchar[{\@ACRfull{#1}{#2}}%
+ {\@ACRfull{#1}{#2}[]}%
+}
+\def\@ACRfull#1#2[#3]{%
+ \acrlinkfullformat{\@ACRlong}{\@ACRshort}{#1}{#2}{#3}%
+}
+\newcommand*{\acrfullpl}{%
+ \@ifstar\s@acrfullpl\ns@acrfullpl
+}
+\newcommand*\s@acrfullpl[2][]{%
+ \new@ifnextchar[{\@acrfullpl{hyper=false,#1}{#2}}%
+ {\@acrfullpl{hyper=false,#1}{#2}[]}%
+}
+\newcommand*\ns@acrfullpl[2][]{%
+ \new@ifnextchar[{\@acrfullpl{#1}{#2}}%
+ {\@acrfullpl{#1}{#2}[]}%
+}
+\def\@acrfullpl#1#2[#3]{%
+ \acrlinkfullformat{\@acrlongpl}{\@acrshortpl}{#1}{#2}{#3}%
+}
+\newcommand*{\Acrfullpl}{%
+ \@ifstar\s@Acrfullpl\ns@Acrfullpl
+}
+\newcommand*\s@Acrfullpl[2][]{%
+ \new@ifnextchar[{\@Acrfullpl{hyper=false,#1}{#2}}%
+ {\@Acrfullpl{hyper=false,#1}{#2}[]}%
+}
+\newcommand*\ns@Acrfullpl[2][]{%
+ \new@ifnextchar[{\@Acrfullpl{#1}{#2}}%
+ {\@Acrfullpl{#1}{#2}[]}%
+}
+\def\@Acrfullpl#1#2[#3]{%
+ \acrlinkfullformat{\@Acrlong}{\@acrshort}{#1}{#2}{#3}%
+}
+\newcommand*{\ACRfullpl}{%
+ \@ifstar\s@ACRfullpl\ns@ACRfullpl
+}
+\newcommand*\s@ACRfullpl[2][]{%
+ \new@ifnextchar[{\@ACRfullpl{hyper=false,#1}{#2}}%
+ {\@ACRfullpl{hyper=false,#1}{#2}[]}%
+}
+\newcommand*\ns@ACRfullpl[2][]{%
+ \new@ifnextchar[{\@ACRfullpl{#1}{#2}}%
+ {\@ACRfullpl{#1}{#2}[]}%
+}
+\def\@ACRfullpl#1#2[#3]{%
+ \acrlinkfullformat{\@ACRlongpl}{\@ACRshortpl}{#1}{#2}{#3}%
+}
\newcommand{\acronymfont}[1]{#1}
\newcommand{\firstacronymfont}[1]{\acronymfont{#1}}
\newcommand*{\acrnameformat}[2]{\acronymfont{#1}}
@@ -2745,14 +3577,18 @@ style `#1' undefined}{}}{%
{%
type=\acronymtype,%
name={\the\glsshorttok},%
- description={\the\glslongtok},%
- text={\the\glsshorttok},%
sort={\the\glsshorttok},%
- descriptionplural={\the\glslongtok\noexpand\acrpluralsuffix},%
- first={\the\glslongtok\space(\the\glsshorttok)},%
+ text={\the\glsshorttok},%
+ first={\acrfullformat{\the\glslongtok}{\the\glsshorttok}},%
plural={\the\glsshorttok\noexpand\acrpluralsuffix},%
- firstplural={\noexpand\@glo@descplural\space
- (\noexpand\@glo@plural)},%
+ firstplural={\acrfullformat{\noexpand\@glo@longpl}%
+ {\noexpand\@glo@shortpl}},%
+ short={\the\glsshorttok},%
+ shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ long={\the\glslongtok},%
+ longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
+ description={\the\glslongtok},%
+ descriptionplural={\the\glslongtok\noexpand\acrpluralsuffix},%
\the\glskeylisttok
}%
}%
@@ -2777,34 +3613,20 @@ style `#1' undefined}{}}{%
\DefaultNewAcronymDef
}%
\renewcommand*{\acrpluralsuffix}{\glspluralsuffix}%
- \renewcommand*{\glsshortkey}{text}%
- \renewcommand*{\glsshortpluralkey}{plural}%
- \renewcommand*{\glslongkey}{description}%
- \renewcommand*{\glslongpluralkey}{descriptionplural}%
- \def\@acrshort##1##2[##3]{\@glstext@{##1}{##2}[##3]}%
- \def\@Acrshort##1##2[##3]{\@Glstext@{##1}{##2}[##3]}%
- \def\@ACRshort##1##2[##3]{\@GLStext@{##1}{##2}[##3]}%
- \def\@acrshortpl##1##2[##3]{\@glsplural@{##1}{##2}[##3]}%
- \def\@Acrshortpl##1##2[##3]{\@Glsplural@{##1}{##2}[##3]}%
- \def\@ACRshortpl##1##2[##3]{\@GLSplural@{##1}{##2}[##3]}%
- \def\@acrlong##1##2[##3]{\@glsdesc@{##1}{##2}[##3]}%
- \def\@Acrlong##1##2[##3]{\@Glsdesc@{##1}{##2}[##3]}%
- \def\@ACRlong##1##2[##3]{\@GLSdesc@{##1}{##2}[##3]}%
- \def\@acrlongpl##1##2[##3]{\@glsdescplural@{##1}{##2}[##3]}%
- \def\@Acrlongpl##1##2[##3]{\@Glsdescplural@{##1}{##2}[##3]}%
- \def\@ACRlongpl##1##2[##3]{\@GLSdescplural@{##1}{##2}[##3]}%
- \def\@acrfull##1##2[##3]{\@glsfirst@{##1}{##2}[##3]}%
- \def\@Acrfull##1##2[##3]{\@Glsfirst@{##1}{##2}[##3]}%
- \def\@ACRfull##1##2[##3]{\@GLSfirst@{##1}{##2}[##3]}%
- \def\@acrfullpl##1##2[##3]{\@glsfirstplural@{##1}{##2}[##3]}%
- \def\@Acrfullpl##1##2[##3]{\@Glsfirstplural@{##1}{##2}[##3]}%
- \def\@ACRfullpl##1##2[##3]{\@GLSfirstplural@{##1}{##2}[##3]}%
+}
+\newcommand*{\acrfootnote}[3]{\acrlinkfootnote{#1}{#2}{#3}}
+\newcommand*{\acrlinkfootnote}[3]{%
+ \footnote{\glslink[#1]{#2}{#3}}%
+}
+\newcommand*{\acrnolinkfootnote}[3]{%
+ \footnote{#3}%
}
\newcommand*{\SetDescriptionFootnoteAcronymDisplayStyle}[1]{%
\defglsdisplayfirst[#1]{%
\firstacronymfont{##1}##4%
- \protect\footnote{%
- \glslink[\@gls@link@opts]{\@gls@link@label}{##3}}}%
+ \expandafter\protect\expandafter\acrfootnote\expandafter
+ {\@gls@link@opts}{\@gls@link@label}{##3}
+ }%
\defglsdisplay[#1]{\acronymfont{##1}##4}%
}
\newcommand*{\DescriptionFootnoteNewAcronymDef}{%
@@ -2816,6 +3638,10 @@ style `#1' undefined}{}}{%
sort={\the\glsshorttok},%
text={\the\glsshorttok},%
plural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ short={\the\glsshorttok},%
+ shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ long={\the\glslongtok},%
+ longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
symbol={\the\glslongtok},%
symbolplural={\the\glslongtok\noexpand\acrpluralsuffix},%
\the\glskeylisttok
@@ -2838,40 +3664,6 @@ style `#1' undefined}{}}{%
\newacronymhook
\DescriptionFootnoteNewAcronymDef
}%
- \def\glsshortkey{text}%
- \def\glsshortpluralkey{plural}%
- \def\glslongkey{symbol}%
- \def\glslongpluralkey{symbolplural}%
- \def\@acrshort##1##2[##3]{%
- \acronymfont{\@glstext@{##1}{##2}[##3]}}%
- \def\@Acrshort##1##2[##3]{%
- \acronymfont{\@Glstext@{##1}{##2}[##3]}}%
- \def\@ACRshort##1##2[##3]{%
- \acronymfont{\@GLStext@{##1}{##2}[##3]}}%
- \def\@acrshortpl##1##2[##3]{%
- \acronymfont{\@glsplural@{##1}{##2}[##3]}}%
- \def\@Acrshortpl##1##2[##3]{%
- \acronymfont{\@Glsplural@{##1}{##2}[##3]}}%
- \def\@ACRshortpl##1##2[##3]{%
- \acronymfont{\@GLSplural@{##1}{##2}[##3]}}%
- \def\@acrlong##1##2[##3]{\@glssymbol@{##1}{##2}[##3]}%
- \def\@Acrlong##1##2[##3]{\@Glssymbol@{##1}{##2}[##3]}%
- \def\@ACRlong##1##2[##3]{\@GLSsymbol@{##1}{##2}[##3]}%
- \def\@acrlongpl##1##2[##3]{\@glssymbolplural@{##1}{##2}[##3]}%
- \def\@Acrlongpl##1##2[##3]{\@Glssymbolplural@{##1}{##2}[##3]}%
- \def\@ACRlongpl##1##2[##3]{\@GLSsymbolplural@{##1}{##2}[##3]}%
- \def\@acrfull##1##2[##3]{\@glssymbol@{##1}{##2}[##3]
- (\acronymfont{\@glstext@{##1}{##2}[##3]})}%
- \def\@Acrfull##1##2[##3]{\@Glssymbol@{##1}{##2}[##3]
- (\acronymfont{\@glstext@{##1}{##2}[##3]})}%
- \def\@ACRfull##1##2[##3]{\@GLSsymbol@{##1}{##2}[##3]
- (\acronymfont{\@GLStext@{##1}{##2}[##3]})}%
- \def\@acrfullpl##1##2[##3]{\@glssymbolplural@{##1}{##2}[##3]
- (\acronymfont{\@glsplural@{##1}{##2}[##3]})}%
- \def\@Acrfullpl##1##2[##3]{\@Glssymbolplural@{##1}{##2}[##3]
- (\acronymfont{\@glsplural@{##1}{##2}[##3]})}%
- \def\@ACRfullpl##1##2[##3]{\@GLSsymbolplural@{##1}{##2}[##3]
- (\acronymfont{\@GLSplural@{##1}{##2}[##3]})}%
\@for\@gls@type:=\@glsacronymlists\do{%
\SetDescriptionFootnoteAcronymDisplayStyle{\@gls@type}%
}%
@@ -2902,6 +3694,10 @@ style `#1' undefined}{}}{%
sort={\the\glslongtok},
text={\the\glslongtok},%
plural={\the\glslongtok\noexpand\acrpluralsuffix},%
+ short={\the\glsshorttok},%
+ shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ long={\the\glslongtok},%
+ longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
symbol={\the\glsshorttok},%
symbolplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
\the\glskeylisttok
@@ -2933,40 +3729,6 @@ style `#1' undefined}{}}{%
\newacronymhook
\DescriptionDUANewAcronymDef
}%
- \def\glsshortkey{symbol}%
- \def\glsshortpluralkey{symbolplural}%
- \def\glslongkey{first}%
- \def\glslongpluralkey{plural}%
- \def\@acrshort##1##2[##3]{%
- \acronymfont{\@glssymbol@{##1}{##2}[##3]}}%
- \def\@Acrshort##1##2[##3]{%
- \acronymfont{\@Glssymbol@{##1}{##2}[##3]}}%
- \def\@ACRshort##1##2[##3]{%
- \acronymfont{\@GLSsymbol@{##1}{##2}[##3]}}%
- \def\@acrshortpl##1##2[##3]{%
- \acronymfont{\@glssymbolplural@{##1}{##2}[##3]}}%
- \def\@Acrshortpl##1##2[##3]{%
- \acronymfont{\@Glssymbolplural@{##1}{##2}[##3]}}%
- \def\@ACRshortpl##1##2[##3]{%
- \acronymfont{\@GLSsymbolplural@{##1}{##2}[##3]}}%
- \def\@acrlong##1##2[##3]{\@glsfirst@{##1}{##2}[##3]}%
- \def\@Acrlong##1##2[##3]{\@Glsfirst@{##1}{##2}[##3]}%
- \def\@ACRlong##1##2[##3]{\@GLSfirst@{##1}{##2}[##3]}%
- \def\@acrlongpl##1##2[##3]{\@glsfirstplural@{##1}{##2}[##3]}%
- \def\@Acrlongpl##1##2[##3]{\@Glsfirstplural@{##1}{##2}[##3]}%
- \def\@ACRlongpl##1##2[##3]{\@GLSfirstplural@{##1}{##2}[##3]}%
- \def\@acrfull##1##2[##3]{\@glsfirst@{##1}{##2}[##3]
- (\acronymfont{\@glssymbol@{##1}{##2}[##3]})}%
- \def\@Acrfull##1##2[##3]{\@Glsfirst@{##1}{##2}[##3]
- (\acronymfont{\@glssymbol@{##1}{##2}[##3]})}%
- \def\@ACRfull##1##2[##3]{\@GLSfirst@{##1}{##2}[##3]
- (\acronymfont{\@GLSsymbol@{##1}{##2}[##3]})}%
- \def\@acrfullpl##1##2[##3]{\@glsfirstplural@{##1}{##2}[##3]
- (\acronymfont{\@glssymbolplural@{##1}{##2}[##3]})}%
- \def\@Acrfullpl##1##2[##3]{\@Glsfirstplural@{##1}{##2}[##3]
- (\acronymfont{\@glssymbolplural@{##1}{##2}[##3]})}%
- \def\@ACRfullpl##1##2[##3]{\@GLSfirstplural@{##1}{##2}[##3]
- (\acronymfont{\@GLSsymbolplural@{##1}{##2}[##3]})}%
\@for\@gls@type:=\@glsacronymlists\do{%
\SetDescriptionDUAAcronymDisplayStyle{\@gls@type}%
}%
@@ -2988,6 +3750,10 @@ style `#1' undefined}{}}{%
firstplural={\the\glslongtok\noexpand\acrpluralsuffix},%
text={\the\glsshorttok},%
plural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ short={\the\glsshorttok},%
+ shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ long={\the\glslongtok},%
+ longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
symbol={\noexpand\@glo@text},%
symbolplural={\noexpand\@glo@plural},%
\the\glskeylisttok}%
@@ -3009,40 +3775,6 @@ style `#1' undefined}{}}{%
\newacronymhook
\DescriptionNewAcronymDef
}%
- \def\glsshortkey{text}%
- \def\glsshortpluralkey{plural}%
- \def\glslongkey{first}%
- \def\glslongpluralkey{firstplural}%
- \def\@acrshort##1##2[##3]{%
- \acronymfont{\@glstext@{##1}{##2}[##3]}}%
- \def\@Acrshort##1##2[##3]{%
- \acronymfont{\@Glstext@{##1}{##2}[##3]}}%
- \def\@ACRshort##1##2[##3]{%
- \acronymfont{\@GLStext@{##1}{##2}[##3]}}%
- \def\@acrshortpl##1##2[##3]{%
- \acronymfont{\@glsplural@{##1}{##2}[##3]}}%
- \def\@Acrshortpl##1##2[##3]{%
- \acronymfont{\@Glsplural@{##1}{##2}[##3]}}%
- \def\@ACRshortpl##1##2[##3]{%
- \acronymfont{\@GLSplural@{##1}{##2}[##3]}}%
- \def\@acrlong##1##2[##3]{\@glsfirst@{##1}{##2}[##3]}%
- \def\@Acrlong##1##2[##3]{\@Glsfirst@{##1}{##2}[##3]}%
- \def\@ACRlong##1##2[##3]{\@GLSfirst@{##1}{##2}[##3]}%
- \def\@acrlongpl##1##2[##3]{\@glsfirstplural@{##1}{##2}[##3]}%
- \def\@Acrlongpl##1##2[##3]{\@Glsfirstplural@{##1}{##2}[##3]}%
- \def\@ACRlongpl##1##2[##3]{\@GLSfirstplural@{##1}{##2}[##3]}%
- \def\@acrfull##1##2[##3]{\@glsfirst@{##1}{##2}[##3]
- (\acronymfont{\@glssymbol@{##1}{##2}[##3]})}%
- \def\@Acrfull##1##2[##3]{\@Glsfirst@{##1}{##2}[##3]
- (\acronymfont{\@glssymbol@{##1}{##2}[##3]})}%
- \def\@ACRfull##1##2[##3]{\@GLSfirst@{##1}{##2}[##3]
- (\acronymfont{\@GLSsymbol@{##1}{##2}[##3]})}%
- \def\@acrfullpl##1##2[##3]{\@glsfirstplural@{##1}{##2}[##3]
- (\acronymfont{\@glssymbolplural@{##1}{##2}[##3]})}%
- \def\@Acrfullpl##1##2[##3]{\@Glsfirstplural@{##1}{##2}[##3]
- (\acronymfont{\@glssymbolplural@{##1}{##2}[##3]})}%
- \def\@ACRfullpl##1##2[##3]{\@GLSfirstplural@{##1}{##2}[##3]
- (\acronymfont{\@GLSsymbolplural@{##1}{##2}[##3]})}%
\@for\@gls@type:=\@glsacronymlists\do{%
\SetDescriptionAcronymDisplayStyle{\@gls@type}%
}%
@@ -3058,9 +3790,10 @@ style `#1' undefined}{}}{%
}%
\newcommand*{\SetFootnoteAcronymDisplayStyle}[1]{%
\defglsdisplayfirst[#1]{%
- \firstacronymfont{##1}##4\protect\footnote{%
- \protect\glslink
- [\@gls@link@opts]{\@gls@link@label}{##2}}}%
+ \firstacronymfont{##1}##4%
+ \expandafter\protect\expandafter\acrfootnote\expandafter
+ {\@gls@link@opts}{\@gls@link@label}{##2}%
+ }%
\defglsdisplay[#1]{\acronymfont{##1}##4}%
}
\newcommand*{\FootnoteNewAcronymDef}{%
@@ -3072,6 +3805,10 @@ style `#1' undefined}{}}{%
sort={\the\glsshorttok},%
text={\the\glsshorttok},%
plural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ short={\the\glsshorttok},%
+ shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ long={\the\glslongtok},%
+ longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
description={\the\glslongtok},%
descriptionplural={\the\glslongtok\noexpand\acrpluralsuffix},%
\the\glskeylisttok
@@ -3094,40 +3831,9 @@ style `#1' undefined}{}}{%
\newacronymhook
\FootnoteNewAcronymDef
}%
- \def\glsshortkey{text}%
- \def\glsshortpluralkey{plural}%
- \def\glslongkey{description}%
- \def\glslongpluralkey{descriptionplural}%
\@for\@gls@type:=\@glsacronymlists\do{%
\SetFootnoteAcronymDisplayStyle{\@gls@type}%
}%
- \def\@acrshort##1##2[##3]{\acronymfont{\@glstext@{##1}{##2}[##3]}}%
- \def\@Acrshort##1##2[##3]{\acronymfont{\@Glstext@{##1}{##2}[##3]}}%
- \def\@ACRshort##1##2[##3]{\acronymfont{\@GLStext@{##1}{##2}[##3]}}%
- \def\@acrshortpl##1##2[##3]{%
- \acronymfont{\@glsplural@{##1}{##2}[##3]}}%
- \def\@Acrshortpl##1##2[##3]{%
- \acronymfont{\@Glsplural@{##1}{##2}[##3]}}%
- \def\@ACRshortpl##1##2[##3]{%
- \acronymfont{\@GLSplural@{##1}{##2}[##3]}}%
- \def\@acrlong##1##2[##3]{\@glsdesc@{##1}{##2}[##3]}%
- \def\@Acrlong##1##2[##3]{\@Glsdesc@{##1}{##2}[##3]}%
- \def\@ACRlong##1##2[##3]{\@GLSdesc@{##1}{##2}[##3]}%
- \def\@acrlongpl##1##2[##3]{\@glsdescplural@{##1}{##2}[##3]}%
- \def\@Acrlongpl##1##2[##3]{\@Glsdescplural@{##1}{##2}[##3]}%
- \def\@ACRlongpl##1##2[##3]{\@GLSdescplural@{##1}{##2}[##3]}%
- \def\@acrfull##1##2[##3]{\@glsdesc@{##1}{##2}[##3]
- (\@glstext@{##1}{##2}[##3])}%
- \def\@Acrfull##1##2[##3]{\@Glsdesc@{##1}{##2}[##3]
- (\@glstext@{##1}{##2}[##3])}%
- \def\@ACRfull##1##2[##3]{\@GLSdesc@{##1}{##2}[##3]
- (\@GLStext@{##1}{##2}[##3])}%
- \def\@acrfullpl##1##2[##3]{\@glsdescplural@{##1}{##2}[##3]
- (\@glsplural@{##1}{##2}[##3])}%
- \def\@Acrfullpl##1##2[##3]{\@Glsdesctext@{##1}{##2}[##3]
- (\@glsplural@{##1}{##2}[##3])}%
- \def\@ACRfullpl##1##2[##3]{\@GLSdesctext@{##1}{##2}[##3]
- (\@GLSplural@{##1}{##2}[##3])}%
\ifglsacrsmallcaps
\renewcommand*{\acronymfont}[1]{\textsc{##1}}%
\renewcommand*{\acrpluralsuffix}{%
@@ -3157,6 +3863,10 @@ style `#1' undefined}{}}{%
plural={\noexpand\@glo@symbolplural},%
first={\the\glslongtok},%
firstplural={\the\glslongtok\noexpand\acrpluralsuffix},%
+ short={\the\glsshorttok},%
+ shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ long={\the\glslongtok},%
+ longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
description={\noexpand\@glo@first},%
descriptionplural={\noexpand\@glo@firstplural},%
symbol={\the\glsshorttok},%
@@ -3181,10 +3891,6 @@ style `#1' undefined}{}}{%
\newacronymhook
\SmallNewAcronymDef
}%
- \def\glsshortkey{symbol}%
- \def\glsshortpluralkey{symbolplural}%
- \def\glslongkey{first}%
- \def\glslongpluralkey{firstplural}%
\@for\@gls@type:=\@glsacronymlists\do{%
\SetSmallAcronymDisplayStyle{\@gls@type}%
}%
@@ -3195,36 +3901,6 @@ style `#1' undefined}{}}{%
\else
\renewcommand*{\acronymfont}[1]{\textsmaller{##1}}
\fi
- \def\@acrshort##1##2[##3]{%
- \acronymfont{\@glstext@{##1}{##2}[##3]}}%
- \def\@Acrshort##1##2[##3]{%
- \acronymfont{\@Glstext@{##1}{##2}[##3]}}%
- \def\@ACRshort##1##2[##3]{%
- \acronymfont{\@GLStext@{##1}{##2}[##3]}}%
- \def\@acrshortpl##1##2[##3]{%
- \acronymfont{\@glsplural@{##1}{##2}[##3]}}%
- \def\@Acrshortpl##1##2[##3]{%
- \acronymfont{\@Glsplural@{##1}{##2}[##3]}}%
- \def\@ACRshortpl##1##2[##3]{%
- \acronymfont{\@GLSplural@{##1}{##2}[##3]}}%
- \def\@acrlong##1##2[##3]{\@glsfirst@{##1}{##2}[##3]}%
- \def\@Acrlong##1##2[##3]{\@Glsfirst@{##1}{##2}[##3]}%
- \def\@ACRlong##1##2[##3]{\@GLSfirst@{##1}{##2}[##3]}%
- \def\@acrlongpl##1##2[##3]{\@glsfirstplural@{##1}{##2}[##3]}%
- \def\@Acrlongpl##1##2[##3]{\@Glsfirstplural@{##1}{##2}[##3]}%
- \def\@ACRlongpl##1##2[##3]{\@GLSfirstplural@{##1}{##2}[##3]}%
- \def\@acrfull##1##2[##3]{\@glsfirst@{##1}{##2}[##3]
- (\acronymfont{\@glstext@{##1}{##2}[##3]})}%
- \def\@Acrfull##1##2[##3]{\@Glsfirst@{##1}{##2}[##3]
- (\acronymfont{\@glstext@{##1}{##2}[##3]})}%
- \def\@ACRfull##1##2[##3]{\@GLSfirst@{##1}{##2}[##3]
- (\acronymfont{\@GLStext@{##1}{##2}[##3]})}%
- \def\@acrfullpl##1##2[##3]{\@glsfirstplural@{##1}{##2}[##3]
- (\acronymfont{\@glsplural@{##1}{##2}[##3]})}
- \def\@Acrfullpl##1##2[##3]{\@Glsfirstplural@{##1}{##2}[##3]
- (\acronymfont{\@glsplural@{##1}{##2}[##3]})}
- \def\@ACRfullpl##1##2[##3]{\@GLSfirstplural@{##1}{##2}[##3]
- (\acronymfont{\@GLSplural@{##1}{##2}[##3]})}
\ifglsacrdua
\ifglsacrsmallcaps
\PackageError{glossaries}{Option clash: `smallcaps' and `dua'
@@ -3247,6 +3923,10 @@ style `#1' undefined}{}}{%
name={\the\glsshorttok},%
text={\the\glslongtok},%
plural={\the\glslongtok\noexpand\acrpluralsuffix},%
+ short={\the\glsshorttok},%
+ shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ long={\the\glslongtok},%
+ longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
description={\the\glslongtok},%
symbol={\the\glsshorttok},%
symbolplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
@@ -3270,38 +3950,10 @@ style `#1' undefined}{}}{%
\newacronymhook
\DUANewAcronymDef
}%
- \def\glsshortkey{symbol}%
- \def\glsshortpluralkey{symbolplural}%
- \def\glslongkey{text}%
- \def\glslongpluralkey{plural}%
\@for\@gls@type:=\@glsacronymlists\do{%
\SetDUADisplayStyle{\@gls@type}%
}%
- \def\@acrshort##1##2[##3]{\@glssymbol@{##1}{##2}[##3]}%
- \def\@Acrshort##1##2[##3]{\@Glssymbol@{##1}{##2}[##3]}%
- \def\@ACRshort##1##2[##3]{\@GLSsymbol@{##1}{##2}[##3]}%
- \def\@acrshortpl##1##2[##3]{\@glssymbolplural@{##1}{##2}[##3]}%
- \def\@Acrshortpl##1##2[##3]{\@Glssymbolplural@{##1}{##2}[##3]}%
- \def\@ACRshortpl##1##2[##3]{\@GLSsymbolplural@{##1}{##2}[##3]}%
- \def\@acrlong##1##2[##3]{\@glstext@{##1}{##2}[##3]}%
- \def\@Acrlong##1##2[##3]{\@Glstext@{##1}{##2}[##3]}%
- \def\@ACRlong##1##2[##3]{\@GLStext@{##1}{##2}[##3]}%
- \def\@acrlongpl##1##2[##3]{\@glsplural@{##1}{##2}[##3]}%
- \def\@Acrlongpl##1##2[##3]{\@Glsplural@{##1}{##2}[##3]}%
- \def\@ACRlongpl##1##2[##3]{\@GLSplural@{##1}{##2}[##3]}%
- \def\@acrfull##1##2[##3]{\@glstext@{##1}{##2}[##3]
- (\acronymfont{\@glssymbol@{##1}{##2}[##3]})}%
- \def\@Acrfull##1##2[##3]{\@Glstext@{##1}{##2}[##3]
- (\acronymfont{\@glssymbol@{##1}{##2}[##3]})}%
- \def\@ACRfull##1##2[##3]{\@GLStext@{##1}{##2}[##3]
- (\acronymfont{\@GLSsymbol@{##1}{##2}[##3]})}%
- \def\@acrfullpl##1##2[##3]{\@glsplural@{##1}{##2}[##3]
- (\acronymfont{\@glssymbolplural@{##1}{##2}[##3]})}%
- \def\@Acrfullpl##1##2[##3]{\@Glsplural@{##1}{##2}[##3]
- (\acronymfont{\@glssymbolplural@{##1}{##2}[##3]})}%
- \def\@ACRfullpl##1##2[##3]{\@GLSplural@{##1}{##2}[##3]
- (\acronymfont{\@GLSsymbolplural@{##1}{##2}[##3]})}%
-}%
+}
\newcommand*{\SetAcronymStyle}{%
\SetDefaultAcronymStyle
\ifglsacrdescription
@@ -3339,9 +3991,9 @@ style `#1' undefined}{}}{%
\newcommand*{\CustomAcronymFields}{%
name={\the\glsshorttok},%
description={\the\glslongtok},%
- first={\the\glslongtok\space(\the\glsshorttok)},%
- firstplural={\the\glslongtok\noexpand\acrpluralsuffix\space
- (\the\glsshorttok)}%
+ first={\noexpand\acrfullformat{\the\glslongtok}{\the\glsshorttok}},%
+ firstplural={\noexpand\acrfullformat
+ {\the\glslongtok\noexpand\acrpluralsuffix}{\the\glsshorttok}}%
text={\the\glsshorttok},%
plural={\the\glsshorttok\noexpand\acrpluralsuffix}%
}
@@ -3350,6 +4002,10 @@ style `#1' undefined}{}}{%
\noexpand\newglossaryentry{\the\glslabeltok}%
{%
type=\acronymtype,%
+ short={\the\glsshorttok},%
+ shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ long={\the\glslongtok},%
+ longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
user1={\the\glsshorttok},%
user2={\the\glsshorttok\noexpand\acrpluralsuffix},%
user3={\the\glslongtok},%
@@ -3375,38 +4031,10 @@ style `#1' undefined}{}}{%
\newacronymhook
\CustomNewAcronymDef
}%
- \def\glsshortkey{user1}%
- \def\glsshortpluralkey{user2}%
- \def\glslongkey{user3}%
- \def\glslongpluralkey{user4}%
\@for\@gls@type:=\@glsacronymlists\do{%
\SetCustomDisplayStyle{\@gls@type}%
}%
- \def\@acrshort##1##2[##3]{\@glsuseri@{##1}{##2}[##3]}%
- \def\@Acrshort##1##2[##3]{\@Glsuseri@{##1}{##2}[##3]}%
- \def\@ACRshort##1##2[##3]{\@GLSuseri@{##1}{##2}[##3]}%
- \def\@acrshortpl##1##2[##3]{\@glsuserii@{##1}{##2}[##3]}%
- \def\@Acrshortpl##1##2[##3]{\@Glsuserii@{##1}{##2}[##3]}%
- \def\@ACRshortpl##1##2[##3]{\@GLSuserii@{##1}{##2}[##3]}%
- \def\@acrlong##1##2[##3]{\@glsuseriii@{##1}{##2}[##3]}%
- \def\@Acrlong##1##2[##3]{\@Glsuseriii@{##1}{##2}[##3]}%
- \def\@ACRlong##1##2[##3]{\@GLSuseriii@{##1}{##2}[##3]}%
- \def\@acrlongpl##1##2[##3]{\@glsuseriv@{##1}{##2}[##3]}%
- \def\@Acrlongpl##1##2[##3]{\@Glsuseriv@{##1}{##2}[##3]}%
- \def\@ACRlongpl##1##2[##3]{\@GLSuseriv@{##1}{##2}[##3]}%
- \def\@acrfull##1##2[##3]{\@glsuseriii@{##1}{##2}[##3]
- (\acronymfont{\@glsuseri@{##1}{##2}[##3]})}%
- \def\@Acrfull##1##2[##3]{\@Glsuseriii@{##1}{##2}[##3]
- (\acronymfont{\@glsuseri@{##1}{##2}[##3]})}%
- \def\@ACRfull##1##2[##3]{\@GLSuseriii@{##1}{##2}[##3]
- (\acronymfont{\@GLSuseri@{##1}{##2}[##3]})}%
- \def\@acrfullpl##1##2[##3]{\@glsuseriv@{##1}{##2}[##3]
- (\acronymfont{\@glsuserii@{##1}{##2}[##3]})}%
- \def\@Acrfullpl##1##2[##3]{\@Glsuseriv@{##1}{##2}[##3]
- (\acronymfont{\@glsuserii@{##1}{##2}[##3]})}%
- \def\@ACRfullpl##1##2[##3]{\@GLSuseriv@{##1}{##2}[##3]
- (\acronymfont{\@GLSuserii@{##1}{##2}[##3]})}%
-}%
+}
\newcommand*{\DefineAcronymSynonyms}{%
\let\acs\acrshort
\let\Acs\Acrshort
@@ -3437,6 +4065,96 @@ style `#1' undefined}{}}{%
\else
\glossarystyle{\@glossary@default@style}
\fi
+\newcommand*{\showgloparent}[1]{%
+ \expandafter\show\csname glo@#1@parent\endcsname
+}
+\newcommand*{\showglolevel}[1]{%
+ \expandafter\show\csname glo@#1@level\endcsname
+}
+\newcommand*{\showglotext}[1]{%
+ \expandafter\show\csname glo@#1@text\endcsname
+}
+\newcommand*{\showgloplural}[1]{%
+ \expandafter\show\csname glo@#1@plural\endcsname
+}
+\newcommand*{\showglofirst}[1]{%
+ \expandafter\show\csname glo@#1@first\endcsname
+}
+\newcommand*{\showglofirstpl}[1]{%
+ \expandafter\show\csname glo@#1@firstpl\endcsname
+}
+\newcommand*{\showglotype}[1]{%
+ \expandafter\show\csname glo@#1@type\endcsname
+}
+\newcommand*{\showglocounter}[1]{%
+ \expandafter\show\csname glo@#1@counter\endcsname
+}
+\newcommand*{\showglouseri}[1]{%
+ \expandafter\show\csname glo@#1@useri\endcsname
+}
+\newcommand*{\showglouserii}[1]{%
+ \expandafter\show\csname glo@#1@userii\endcsname
+}
+\newcommand*{\showglouseriii}[1]{%
+ \expandafter\show\csname glo@#1@useriii\endcsname
+}
+\newcommand*{\showglouseriv}[1]{%
+ \expandafter\show\csname glo@#1@useriv\endcsname
+}
+\newcommand*{\showglouserv}[1]{%
+ \expandafter\show\csname glo@#1@userv\endcsname
+}
+\newcommand*{\showglouservi}[1]{%
+ \expandafter\show\csname glo@#1@uservi\endcsname
+}
+\newcommand*{\showgloname}[1]{%
+ \expandafter\show\csname glo@#1@name\endcsname
+}
+\newcommand*{\showglodesc}[1]{%
+ \expandafter\show\csname glo@#1@desc\endcsname
+}
+\newcommand*{\showglodescplural}[1]{%
+ \expandafter\show\csname glo@#1@descplural\endcsname
+}
+\newcommand*{\showglosort}[1]{%
+ \expandafter\show\csname glo@#1@sort\endcsname
+}
+\newcommand*{\showglosymbol}[1]{%
+ \expandafter\show\csname glo@#1@symbol\endcsname
+}
+\newcommand*{\showglosymbolplural}[1]{%
+ \expandafter\show\csname glo@#1@symbolplural\endcsname
+}
+\newcommand*{\showgloindex}[1]{%
+ \expandafter\show\csname glo@#1@index\endcsname
+}
+\newcommand*{\showgloflag}[1]{%
+ \expandafter\show\csname ifglo@#1@flag\endcsname
+}
+\newcommand*{\showacronymlists}{%
+ \show\@glsacronymlists
+}
+\newcommand*{\showglossaries}{%
+ \show\@glo@types
+}
+\newcommand*{\showglossaryin}[1]{%
+ \expandafter\show\csname @glotype@#1@in\endcsname
+}
+\newcommand*{\showglossaryout}[1]{%
+ \expandafter\show\csname @glotype@#1@out\endcsname
+}
+\newcommand*{\showglossarytitle}[1]{%
+ \expandafter\show\csname @glotype@#1@title\endcsname
+}
+\newcommand*{\showglossarycounter}[1]{%
+ \expandafter\show\csname @glotype@#1@counter\endcsname
+}
+\newcommand*{\showglossaryentries}[1]{%
+ \expandafter\show\csname @glolist@#1\endcsname
+}
+\csname ifglscompatible-2.07\endcsname
+ \RequirePackage{glossaries-compatible-207}
+\fi
\endinput
%%
%% End of file `glossaries.sty'.
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
index cb10834fddf..15f73330303 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `mfirstuc.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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{mfirstuc}[2009/11/03 v1.04 (NLCT)]
+\ProvidesPackage{mfirstuc}[2011/04/02 v1.05 (NLCT)]
\newif\if@glscs
\newtoks\@glsmfirst
\newtoks\@glsmrest
@@ -53,22 +53,22 @@
\if@glscs
\@gls@getbody #1{}\@nil
\ifx\@gls@rest\@empty
- \@gls@makefirstuc{#1}%
+ \glsmakefirstuc{#1}%
\else
\expandafter\@gls@split\@gls@rest\@nil
\ifx\@gls@first\@empty
- \@gls@makefirstuc{#1}%
+ \glsmakefirstuc{#1}%
\else
\expandafter\@glsmfirst\expandafter{\@gls@first}%
\expandafter\@glsmrest\expandafter{\@gls@rest}%
\edef\@gls@domfirstuc{\noexpand\@gls@body
- {\noexpand\@gls@makefirstuc\the\@glsmfirst}%
+ {\noexpand\glsmakefirstuc\the\@glsmfirst}%
\the\@glsmrest}%
\@gls@domfirstuc
\fi
\fi
\else
- \@gls@makefirstuc{#1}%
+ \glsmakefirstuc{#1}%
\fi
\fi
}
@@ -84,6 +84,7 @@
\fi
}
\def\@gls@makefirstuc#1{\MakeUppercase #1}
+\newcommand*{\glsmakefirstuc}[1]{\@gls@makefirstuc{#1}}
\def\@gls@getbody#1#{\def\@gls@body{#1}\@gls@gobbletonil}
\def\@gls@gobbletonil#1\@nil{\def\@gls@rest{#1}}
\newcommand*{\xmakefirstuc}[1]{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazilian.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazilian.dict
index f235973c80e..aef181f20d1 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazilian.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Brazilian.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Brazilian.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict
index a52b1a4be44..4430d1cccde 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Danish.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Danish.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict
index 37011f0f8b3..daa59ff0bfb 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Dutch.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Dutch.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict
index acf518e4b7c..de7550d74b1 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-English.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-English.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict
index 4cb2a307b0d..3fe71a617f9 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-French.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-French.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict
index c4fbd3a23bf..1edbfbf7b8c 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-German.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-German.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict
index 39e898eb5bb..4e8ae30e84c 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Irish.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Irish.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict
index 61f224ec245..3e8f8ee7a24 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Italian.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Italian.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict
index 35df501a752..00fba3094b3 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Magyar.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Magyar.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict
index 6ca991d0512..b92a84f2548 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Polish.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Polish.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Serbian.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Serbian.dict
index 9631befad3c..5ec30b56554 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Serbian.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Serbian.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Serbian.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
diff --git a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict
index 99621ec1e7a..e0ef0253c84 100644
--- a/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict
+++ b/Master/texmf-dist/tex/latex/glossaries/dict/glossaries-dictionary-Spanish.dict
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-dictionary-Spanish.dict,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
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 4388301741e..574678f709a 100644
--- a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossaries-accsupp.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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,8 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-accsupp}[2009/11/02 v0.2 (NLCT)]
+\ProvidesPackage{glossaries-accsupp}[2011/04/02 v3.0 (NLCT)
+ Experimental glossaries accessibility]
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}}
\ProcessOptions
\RequirePackage{glossaries}
@@ -71,6 +72,18 @@
\define@key{glossentry}{descriptionpluralaccess}{%
\def\@glo@descpluralaccess{#1}%
}
+\define@key{glossentry}{shortaccess}{%
+ \def\@glo@shortaccess{#1}%
+}
+\define@key{glossentry}{shortpluralaccess}{%
+ \def\@glo@shortpluralaccess{#1}%
+}
+\define@key{glossentry}{longaccess}{%
+ \def\@glo@longaccess{#1}%
+}
+\define@key{glossentry}{longpluralaccess}{%
+ \def\@glo@longpluralaccess{#1}%
+}
\def\@gls@noaccess{\relax}
\let\@gls@oldnewglossaryentryprehook\@newglossaryentryprehook
\renewcommand*{\@newglossaryentryprehook}{%
@@ -84,6 +97,10 @@
\def\@glo@symbolpluralaccess{\@glo@symbolaccess}%
\def\@glo@descaccess{\relax}%
\def\@glo@descpluralaccess{\@glo@descaccess}%
+ \def\@glo@shortaccess{\relax}%
+ \def\@glo@shortpluralaccess{\@glo@shortaccess}%
+ \def\@glo@longaccess{\relax}%
+ \def\@glo@longpluralaccess{\@glo@longaccess}%
}
\let\@gls@oldnewglossaryentryposthook\@newglossaryentryposthook
\renewcommand*{\@newglossaryentryposthook}{%
@@ -115,6 +132,18 @@
\expandafter
\protected@xdef\csname glo@\@glo@label @descpluralaccess\endcsname{%
\@glo@descpluralaccess}%
+ \expandafter
+ \protected@xdef\csname glo@\@glo@label @shortaccess\endcsname{%
+ \@glo@shortaccess}%
+ \expandafter
+ \protected@xdef\csname glo@\@glo@label @shortpluralaccess\endcsname{%
+ \@glo@shortpluralaccess}%
+ \expandafter
+ \protected@xdef\csname glo@\@glo@label @longaccess\endcsname{%
+ \@glo@longaccess}%
+ \expandafter
+ \protected@xdef\csname glo@\@glo@label @longpluralaccess\endcsname{%
+ \@glo@longpluralaccess}%
}
\newcommand*{\glsentryaccess}[1]{%
\csname glo@#1@access\endcsname
@@ -143,6 +172,18 @@
\newcommand*{\glsentrydescpluralaccess}[1]{%
\csname glo@#1@descaccess\endcsname
}
+\newcommand*{\glsentryshortaccess}[1]{%
+ \csname glo@#1@shortaccess\endcsname
+}
+\newcommand*{\glsentryshortpluralaccess}[1]{%
+ \csname glo@#1@shortpluralaccess\endcsname
+}
+\newcommand*{\glsentrylongaccess}[1]{%
+ \csname glo@#1@longaccess\endcsname
+}
+\newcommand*{\glsentrylongpluralaccess}[1]{%
+ \csname glo@#1@longpluralaccess\endcsname
+}
\newcommand*{\glsaccsupp}[2]{%
\BeginAccSupp{ActualText=#1}#2\EndAccSupp{}%
}
@@ -222,6 +263,38 @@
\xglsaccsupp{\@glo@access}{#1}%
\fi
}
+\DeclareRobustCommand*{\glsshortaccessdisplay}[2]{%
+ \protected@edef\@glo@access{\glsentryshortaccess{#2}}%
+ \ifx\@glo@access\@gls@noaccess
+ #1%
+ \else
+ \xglsaccsupp{\@glo@access}{#1}%
+ \fi
+}
+\DeclareRobustCommand*{\glsshortpluralaccessdisplay}[2]{%
+ \protected@edef\@glo@access{\glsentryshortpluralaccess{#2}}%
+ \ifx\@glo@access\@gls@noaccess
+ #1%
+ \else
+ \xglsaccsupp{\@glo@access}{#1}%
+ \fi
+}
+\DeclareRobustCommand*{\glslongaccessdisplay}[2]{%
+ \protected@edef\@glo@access{\glsentrylongaccess{#2}}%
+ \ifx\@glo@access\@gls@noaccess
+ #1%
+ \else
+ \xglsaccsupp{\@glo@access}{#1}%
+ \fi
+}
+\DeclareRobustCommand*{\glslongpluralaccessdisplay}[2]{%
+ \protected@edef\@glo@access{\glsentrylongpluralaccess{#2}}%
+ \ifx\@glo@access\@gls@noaccess
+ #1%
+ \else
+ \xglsaccsupp{\@glo@access}{#1}%
+ \fi
+}
\DeclareRobustCommand*{\glsaccessdisplay}[3]{%
\@ifundefined{gls#1accessdisplay}%
{%
@@ -463,6 +536,66 @@
\glsunset{#2}%
}%
}
+\def\@acrshort#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \def\@glo@text{%
+ \glsshortaccessdisplay{\glsentryshort{#2}}{#2}%
+ }%
+ \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}%
+ }%
+}
+\def\@Acrshort#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \def\@glo@text{%
+ \glsshortaccessdisplay{\Glsentryshort{#2}}{#2}%
+ }%
+ \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}%
+ }%
+}
+\def\@ACRshort#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \def\@glo@text{%
+ \glsshortaccessdisplay{\MakeUppercase{\glsentryshort{#2}}}{#2}%
+ }%
+ \@gls@link[#1]{#2}{\acronymfont{\@glo@text#3}}%
+ }%
+}
+\def\@acrlong#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \def\@glo@text{%
+ \glslongaccessdisplay{\glsentrylong{#2}}{#2}%
+ }%
+ \@gls@link[#1]{#2}{\@glo@text#3}%
+ }%
+}
+\def\@Acrlong#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \def\@glo@text{%
+ \glslongaccessdisplay{\Glsentrylong{#2}}{#2}%
+ }%
+ \@gls@link[#1]{#2}{\@glo@text#3}%
+ }%
+}
+\def\@ACRlong#1#2[#3]{%
+ \glsdoifexists{#2}%
+ {%
+ \edef\@glo@type{\glsentrytype{#2}}%
+ \def\@glo@text{%
+ \glslongaccessdisplay{\MakeUppercase{\glsentrylong{#2}}}{#2}%
+ }%
+ \@gls@link[#1]{#2}{\@glo@text#3}%
+ }%
+}
\ifglsxindy
\renewcommand*{\@glossaryentryfield}{%
\string\\accsuppglossaryentryfield}
@@ -490,7 +623,7 @@
{\glssymbolaccessdisplay{#5}{#2}}{#6}%
}
\renewcommand*{\newacronymhook}{%
- \edef\@gls@keylist{\glsshortkey access=\the\glslongtok,%
+ \edef\@gls@keylist{shortaccess=\the\glslongtok,%
\the\glskeylisttok}%
\expandafter\glskeylisttok\expandafter{\@gls@keylist}%
}
@@ -503,21 +636,26 @@
description={\the\glslongtok},%
descriptionaccess=\relax,
text={\the\glsshorttok},%
- textaccess={\the\glslongtok},%
access={\noexpand\@glo@textaccess},%
sort={\the\glsshorttok},%
+ short={\the\glsshorttok},%
+ shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ shortaccess={\the\glslongtok},%
+ long={\the\glslongtok},%
+ longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
descriptionplural={\the\glslongtok\noexpand\acrpluralsuffix},%
- firstaccess=\relax,
- first={\noexpand\glsdescriptionaccessdisplay
+ first={\noexpand\glslongaccessdisplay
{\the\glslongtok}{\the\glslabeltok}\space
- (\noexpand\glstextaccessdisplay
+ (\noexpand\glsshortaccessdisplay
{\the\glsshorttok}{\the\glslabeltok})},%
plural={\the\glsshorttok\acrpluralsuffix},%
- firstplural={\noexpand\glsdescriptionpluralaccessdisplay
- {\noexpand\@glo@descplural}{\the\glslabeltok}\space
- (\noexpand\glspluralaccessdisplay
- {\noexpand\@glo@plural}{\the\glslabeltok})},%
+ firstplural={\noexpand\glslongpluralaccessdisplay
+ {\noexpand\@glo@longpl}{\the\glslabeltok}\space
+ (\noexpand\glsshortpluralaccessdisplay
+ {\noexpand\@glo@shortpl}{\the\glslabeltok})},%
+ firstaccess=\relax,
firstpluralaccess=\relax,
+ textaccess={\noexpand\@glo@shortaccess},%
\the\glskeylisttok
}%
}%
@@ -531,11 +669,17 @@
name={\noexpand\acronymfont{\the\glsshorttok}},%
sort={\the\glsshorttok},%
text={\the\glsshorttok},%
- textaccess={\the\glslongtok},%
+ short={\the\glsshorttok},%
+ shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ shortaccess={\the\glslongtok},%
+ long={\the\glslongtok},%
+ longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
access={\noexpand\@glo@textaccess},%
plural={\the\glsshorttok\noexpand\acrpluralsuffix},%
symbol={\the\glslongtok},%
symbolplural={\the\glslongtok\noexpand\acrpluralsuffix},%
+ firstpluralaccess=\relax,
+ textaccess={\noexpand\@glo@shortaccess},%
\the\glskeylisttok
}%
}%
@@ -550,6 +694,11 @@
\acrnameformat{\the\glsshorttok}{\the\glslongtok}},%
access={\noexpand\@glo@textaccess},%
sort={\the\glsshorttok},%
+ short={\the\glsshorttok},%
+ shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ shortaccess={\the\glslongtok},%
+ long={\the\glslongtok},%
+ longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
first={\the\glslongtok},%
firstaccess=\relax,
firstplural={\the\glslongtok\noexpand\acrpluralsuffix},%
@@ -559,6 +708,8 @@
symbol={\noexpand\@glo@text},%
symbolaccess={\noexpand\@glo@textaccess},%
symbolplural={\noexpand\@glo@plural},%
+ firstpluralaccess=\relax,
+ textaccess={\noexpand\@glo@shortaccess},%
\the\glskeylisttok}%
}%
\@do@newglossaryentry
@@ -569,11 +720,15 @@
{%
type=\acronymtype,%
name={\noexpand\acronymfont{\the\glsshorttok}},%
- access={\noexpand\@glo@textaccess},%
sort={\the\glsshorttok},%
text={\the\glsshorttok},%
textaccess={\the\glslongtok},%
+ access={\noexpand\@glo@textaccess},%
plural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ short={\the\glsshorttok},%
+ shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ long={\the\glslongtok},%
+ longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
description={\the\glslongtok},%
descriptionplural={\the\glslongtok\noexpand\acrpluralsuffix},%
\the\glskeylisttok
@@ -589,9 +744,14 @@
name={\noexpand\acronymfont{\the\glsshorttok}},%
access={\noexpand\@glo@symbolaccess},%
sort={\the\glsshorttok},%
- text={\noexpand\@glo@symbol},%
- textaccess={\noexpand\@glo@symbolaccess},%
- plural={\noexpand\@glo@symbolplural},%
+ short={\the\glsshorttok},%
+ shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},%
+ shortaccess={\the\glslongtok},%
+ long={\the\glslongtok},%
+ longplural={\the\glslongtok\noexpand\acrpluralsuffix},%
+ text={\noexpand\@glo@short},%
+ textaccess={\noexpand\@glo@shortaccess},%
+ plural={\noexpand\@glo@shortpl},%
first={\the\glslongtok},%
firstaccess=\relax,
firstplural={\the\glslongtok\noexpand\acrpluralsuffix},%
@@ -609,6 +769,45 @@
\newcommand*{\glsshortpluralaccesskey}{\glsshortpluralkey access}%
\newcommand*{\glslongaccesskey}{\glslongkey access}%
\newcommand*{\glslongpluralaccesskey}{\glslongpluralkey access}%
+\newcommand*{\showglonameaccess}[1]{%
+ \expandafter\show\csname glo@#1@textaccess\endcsname
+}
+\newcommand*{\showglotextaccess}[1]{%
+ \expandafter\show\csname glo@#1@textaccess\endcsname
+}
+\newcommand*{\showglopluralaccess}[1]{%
+ \expandafter\show\csname glo@#1@pluralaccess\endcsname
+}
+\newcommand*{\showglofirstaccess}[1]{%
+ \expandafter\show\csname glo@#1@firstaccess\endcsname
+}
+\newcommand*{\showglofirstpluralaccess}[1]{%
+ \expandafter\show\csname glo@#1@firstpluralaccess\endcsname
+}
+\newcommand*{\showglosymbolaccess}[1]{%
+ \expandafter\show\csname glo@#1@symbolaccess\endcsname
+}
+\newcommand*{\showglosymbolpluralaccess}[1]{%
+ \expandafter\show\csname glo@#1@symbolpluralaccess\endcsname
+}
+\newcommand*{\showglodescaccess}[1]{%
+ \expandafter\show\csname glo@#1@descaccess\endcsname
+}
+\newcommand*{\showglodescpluralaccess}[1]{%
+ \expandafter\show\csname glo@#1@descpluralaccess\endcsname
+}
+\newcommand*{\showgloshortaccess}[1]{%
+ \expandafter\show\csname glo@#1@shortaccess\endcsname
+}
+\newcommand*{\showgloshortpluralaccess}[1]{%
+ \expandafter\show\csname glo@#1@shortpluralaccess\endcsname
+}
+\newcommand*{\showglolongaccess}[1]{%
+ \expandafter\show\csname glo@#1@longaccess\endcsname
+}
+\newcommand*{\showglolongpluralaccess}[1]{%
+ \expandafter\show\csname glo@#1@longpluralaccess\endcsname
+}
\endinput
%%
%% End of file `glossaries-accsupp.sty'.
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 3c5a4d04c98..3483dd5d9ea 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossary-hypernav.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
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 a465d83341a..8b773da64ab 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossary-list.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
@@ -38,15 +38,17 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-list}[2009/05/30 v2.01 (NLCT)]
+\ProvidesPackage{glossary-list}[2011/03/28 v3.0 (NLCT)]
\newglossarystyle{list}{%
\renewenvironment{theglossary}%
{\begin{description}}{\end{description}}%
\renewcommand*{\glossaryheader}{}%
\renewcommand*{\glsgroupheading}[1]{}%
\renewcommand*{\glossaryentryfield}[5]{%
- \item[\glstarget{##1}{##2}] ##3\glspostdescription\space ##5}%
+ \item[\glsentryitem{##1}\glstarget{##1}{##2}]
+ ##3\glspostdescription\space ##5}%
\renewcommand*{\glossarysubentryfield}[6]{%
+ \glssubentryitem{##2}%
\glstarget{##2}{\strut}##4\glspostdescription\space ##6.}%
\renewcommand*{\glsgroupskip}{\indexspace}%
}
@@ -62,10 +64,12 @@
\newglossarystyle{altlist}{%
\glossarystyle{list}%
\renewcommand*{\glossaryentryfield}[5]{%
- \item[\glstarget{##1}{##2}]\mbox{}\newline
+ \item[\glsentryitem{##1}\glstarget{##1}{##2}]\mbox{}\newline
##3\glspostdescription\space ##5}%
\renewcommand{\glossarysubentryfield}[6]{%
- \par\glstarget{##2}{\strut}##4\glspostdescription\space ##6}%
+ \par
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}##4\glspostdescription\space ##6}%
}
\newglossarystyle{altlistgroup}{%
\glossarystyle{altlist}%
@@ -79,10 +83,13 @@
\newglossarystyle{listdotted}{%
\glossarystyle{list}%
\renewcommand*{\glossaryentryfield}[5]{%
- \item[]\makebox[\glslistdottedwidth][l]{\glstarget{##1}{##2}%
- \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##3}%
+ \item[]\makebox[\glslistdottedwidth][l]{%
+ \glsentryitem{##1}\glstarget{##1}{##2}%
+ \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##3}%
\renewcommand*{\glossarysubentryfield}[6]{%
- \item[]\makebox[\glslistdottedwidth][l]{\glstarget{##2}{##3}%
+ \item[]\makebox[\glslistdottedwidth][l]{%
+ \glssubentryitem{##2}%
+ \glstarget{##2}{##3}%
\unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##4}%
}
\newlength\glslistdottedwidth
@@ -90,7 +97,7 @@
\newglossarystyle{sublistdotted}{%
\glossarystyle{listdotted}%
\renewcommand*{\glossaryentryfield}[5]{%
- \item[\glstarget{##1}{##2}]}%
+ \item[\glsentryitem{##1}\glstarget{##1}{##2}]}%
}
\endinput
%%
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 f03c7059180..756eef5dcbf 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossary-long.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-long}[2009/05/30 v2.01 (NLCT)]
+\ProvidesPackage{glossary-long}[2011/03/28 v3.0 (NLCT)]
\RequirePackage{longtable}
\@ifundefined{glsdescwidth}{%
\newlength\glsdescwidth
@@ -55,9 +55,11 @@
\renewcommand*{\glossaryheader}{}%
\renewcommand*{\glsgroupheading}[1]{}%
\renewcommand*{\glossaryentryfield}[5]{%
- \glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}%
+ \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}%
\renewcommand*{\glossarysubentryfield}[6]{%
- & \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}%
\renewcommand*{\glsgroupskip}{ & \\}%
}
\newglossarystyle{longborder}{%
@@ -85,9 +87,11 @@
\renewcommand*{\glossaryheader}{}%
\renewcommand*{\glsgroupheading}[1]{}%
\renewcommand*{\glossaryentryfield}[5]{%
- \glstarget{##1}{##2} & ##3 & ##5\\}%
+ \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\\}%
\renewcommand*{\glossarysubentryfield}[6]{%
- & \glstarget{##2}{\strut}##4 & ##6\\}%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}##4 & ##6\\}%
\renewcommand*{\glsgroupskip}{ & &\\}%
}
\newglossarystyle{long3colborder}{%
@@ -118,9 +122,11 @@
\renewcommand*{\glossaryheader}{}%
\renewcommand*{\glsgroupheading}[1]{}%
\renewcommand*{\glossaryentryfield}[5]{%
- \glstarget{##1}{##2} & ##3 & ##4 & ##5\\}%
+ \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\\}%
\renewcommand*{\glossarysubentryfield}[6]{%
- & \glstarget{##2}{\strut}##4 & ##5 & ##6\\}%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}##4 & ##5 & ##6\\}%
\renewcommand*{\glsgroupskip}{ & & &\\}%
}
\newglossarystyle{long4colheader}{%
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 ec9ef91e5f7..a05e4bd1a24 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossary-longragged.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-longragged}[2009/05/30 v2.01 (NLCT)]
+\ProvidesPackage{glossary-longragged}[2011/03/28 v3.0 (NLCT)]
\RequirePackage{array}
\RequirePackage{longtable}
\@ifundefined{glsdescwidth}{%
@@ -56,10 +56,12 @@
\renewcommand*{\glossaryheader}{}%
\renewcommand*{\glsgroupheading}[1]{}%
\renewcommand*{\glossaryentryfield}[5]{%
- \glstarget{##1}{##2} & ##3\glspostdescription\space ##5%
+ \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5%
\tabularnewline}%
\renewcommand*{\glossarysubentryfield}[6]{%
- & \glstarget{##2}{\strut}##4\glspostdescription\space ##6%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}##4\glspostdescription\space ##6%
\tabularnewline}%
\renewcommand*{\glsgroupskip}{ & \tabularnewline}%
}
@@ -92,9 +94,11 @@
\renewcommand*{\glossaryheader}{}%
\renewcommand*{\glsgroupheading}[1]{}%
\renewcommand*{\glossaryentryfield}[5]{%
- \glstarget{##1}{##2} & ##3 & ##5\tabularnewline}%
+ \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\tabularnewline}%
\renewcommand*{\glossarysubentryfield}[6]{%
- & \glstarget{##2}{\strut}##4 & ##6\tabularnewline}%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}##4 & ##6\tabularnewline}%
\renewcommand*{\glsgroupskip}{ & &\tabularnewline}%
}
\newglossarystyle{longragged3colborder}{%
@@ -127,9 +131,11 @@
\renewcommand*{\glossaryheader}{}%
\renewcommand*{\glsgroupheading}[1]{}%
\renewcommand*{\glossaryentryfield}[5]{%
- \glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}%
+ \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}%
\renewcommand*{\glossarysubentryfield}[6]{%
- & \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}%
\renewcommand*{\glsgroupskip}{ & & &\tabularnewline}%
}
\newglossarystyle{altlongragged4colheader}{%
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 da1a81fd541..7831f9b0085 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossary-super.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-super}[2009/05/30 v2.01 (NLCT)]
+\ProvidesPackage{glossary-super}[2011/03/28 v3.0 (NLCT)]
\RequirePackage{supertabular}
\@ifundefined{glsdescwidth}{%
\newlength\glsdescwidth
@@ -56,9 +56,11 @@
\renewcommand*{\glossaryheader}{}%
\renewcommand*{\glsgroupheading}[1]{}%
\renewcommand*{\glossaryentryfield}[5]{%
- \glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}%
+ \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}%
\renewcommand*{\glossarysubentryfield}[6]{%
- & \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}%
\renewcommand*{\glsgroupskip}{ & \\}%
}
\newglossarystyle{superborder}{%
@@ -93,9 +95,11 @@
\renewcommand*{\glossaryheader}{}%
\renewcommand*{\glsgroupheading}[1]{}%
\renewcommand*{\glossaryentryfield}[5]{%
- \glstarget{##1}{##2} & ##3 & ##5\\}%
+ \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\\}%
\renewcommand*{\glossarysubentryfield}[6]{%
- & \glstarget{##2}{\strut}##4 & ##6\\}%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}##4 & ##6\\}%
\renewcommand*{\glsgroupskip}{ & &\\}%
}
\newglossarystyle{super3colborder}{%
@@ -131,9 +135,11 @@
\renewcommand*{\glossaryheader}{}%
\renewcommand*{\glsgroupheading}[1]{}%
\renewcommand*{\glossaryentryfield}[5]{%
- \glstarget{##1}{##2} & ##3 & ##4 & ##5\\}%
+ \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\\}%
\renewcommand*{\glossarysubentryfield}[6]{%
- & \glstarget{##2}{\strut}##4 & ##5 & ##6\\}%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}##4 & ##5 & ##6\\}%
\renewcommand*{\glsgroupskip}{ & & &\\}%
}
\newglossarystyle{super4colheader}{%
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 0c38554b9ba..2c02e10e420 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossary-superragged.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-superragged}[2009/05/30 v2.01 (NLCT)]
+\ProvidesPackage{glossary-superragged}[2011/03/28 v3.0 (NLCT)]
\RequirePackage{array}
\RequirePackage{supertabular}
\@ifundefined{glsdescwidth}{%
@@ -57,10 +57,12 @@
\renewcommand*{\glossaryheader}{}%
\renewcommand*{\glsgroupheading}[1]{}%
\renewcommand*{\glossaryentryfield}[5]{%
- \glstarget{##1}{##2} & ##3\glspostdescription\space ##5%
+ \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5%
\tabularnewline}%
\renewcommand*{\glossarysubentryfield}[6]{%
- & \glstarget{##2}{\strut}##4\glspostdescription\space ##6%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}##4\glspostdescription\space ##6%
\tabularnewline}%
\renewcommand*{\glsgroupskip}{ & \tabularnewline}%
}
@@ -98,9 +100,11 @@
\renewcommand*{\glossaryheader}{}%
\renewcommand*{\glsgroupheading}[1]{}%
\renewcommand*{\glossaryentryfield}[5]{%
- \glstarget{##1}{##2} & ##3 & ##5\tabularnewline}%
+ \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\tabularnewline}%
\renewcommand*{\glossarysubentryfield}[6]{%
- & \glstarget{##2}{\strut}##4 & ##6\tabularnewline}%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}##4 & ##6\tabularnewline}%
\renewcommand*{\glsgroupskip}{ & &\tabularnewline}%
}
\newglossarystyle{superragged3colborder}{%
@@ -140,9 +144,11 @@
\renewcommand*{\glossaryheader}{}%
\renewcommand*{\glsgroupheading}[1]{}%
\renewcommand*{\glossaryentryfield}[5]{%
- \glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}%
+ \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}%
\renewcommand*{\glossarysubentryfield}[6]{%
- & \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}%
+ &
+ \glssubentryitem{##2}%
+ \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}%
\renewcommand*{\glsgroupskip}{ & & &\tabularnewline}%
}
\newglossarystyle{altsuperragged4colheader}{%
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 ac00ec2bf85..490ad13ea68 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
@@ -7,7 +7,7 @@
%% glossaries.dtx (with options: `glossary-tree.sty,package')
%%
%% glossaries.dtx
-%% Copyright 2010 Nicola Talbot
+%% Copyright 2011 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, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-custom-acronym.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy-mc.xdy, database1.tex, database2.tex, glossaries.perl.
+%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, sampleSec.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.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
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-tree}[2009/01/14 v1.01 (NLCT)]
+\ProvidesPackage{glossary-tree}[2011/03/28 v3.0 (NLCT)]
\newglossarystyle{index}{%
\renewenvironment{theglossary}%
{\setlength{\parindent}{0pt}%
@@ -48,7 +48,7 @@
\renewcommand*{\glossaryheader}{}%
\renewcommand*{\glsgroupheading}[1]{}%
\renewcommand*{\glossaryentryfield}[5]{%
-\item\textbf{\glstarget{##1}{##2}}%
+\item\glsentryitem{##1}\textbf{\glstarget{##1}{##2}}%
\ifx\relax##4\relax
\else
\space(##4)%
@@ -61,6 +61,7 @@
\or
% level 1
\subitem
+ \glssubentryitem{##2}%
\else
% all other levels
\subsubitem
@@ -95,7 +96,7 @@
\renewcommand{\glossaryentryfield}[5]{%
\hangindent0pt\relax
\parindent0pt\relax
- \textbf{\glstarget{##1}{##2}}%
+ \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}%
\ifx\relax##4\relax
\else
\space(##4)%
@@ -104,6 +105,9 @@
\renewcommand{\glossarysubentryfield}[6]{%
\hangindent##1\glstreeindent\relax
\parindent##1\glstreeindent\relax
+ \ifnum##1=1\relax
+ \glssubentryitem{##2}%
+ \fi
\textbf{\glstarget{##2}{##3}}%
\ifx\relax##5\relax
\else
@@ -137,7 +141,7 @@
\renewcommand{\glossaryentryfield}[5]{%
\hangindent0pt\relax
\parindent0pt\relax
- \textbf{\glstarget{##1}{##2}}%
+ \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}%
\ifx\relax##4\relax
\else
\space(##4)%
@@ -146,6 +150,9 @@
\renewcommand{\glossarysubentryfield}[6]{%
\hangindent##1\glstreeindent\relax
\parindent##1\glstreeindent\relax
+ \ifnum##1=1\relax
+ \glssubentryitem{##2}%
+ \fi
\glstarget{##2}{\strut}%
##4\glspostdescription\space ##6\par}%
\renewcommand*{\glsgroupskip}{\indexspace}%
@@ -184,7 +191,7 @@
\parindent\glstreeindent
\fi
\makebox[0pt][r]{\makebox[\glstreeindent][l]{%
- \textbf{\glstarget{##1}{##2}}}}%
+ \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}}}%
\ifx\relax##4\relax
\else
(##4)\space
@@ -193,6 +200,9 @@
\def\@gls@prevlevel{0}%
}%
\renewcommand{\glossarysubentryfield}[6]{%
+ \ifnum##1=1\relax
+ \glssubentryitem{##2}%
+ \fi
\ifnum\@gls@prevlevel=##1\relax
\else
\@ifundefined{@glswidestname\romannumeral##1}{%