diff options
| author | Karl Berry <karl@freefriends.org> | 2013-11-14 22:52:09 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2013-11-14 22:52:09 +0000 |
| commit | 033271bfdf58e2563bd3fbdbeb0f1facfb0c02e5 (patch) | |
| tree | 1ca0cddf673e09a878c83db761e4dc52c65ba48b /Master | |
| parent | e537bba01fd3f3a532b7fc1f6186c24065208638 (diff) | |
glossaries (14nov13)
git-svn-id: svn://tug.org/texlive/trunk@32147 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
115 files changed, 24165 insertions, 12011 deletions
diff --git a/Master/texmf-dist/doc/latex/glossaries/CHANGES b/Master/texmf-dist/doc/latex/glossaries/CHANGES index 44d51fad1e3..840d3fa5d21 100644 --- a/Master/texmf-dist/doc/latex/glossaries/CHANGES +++ b/Master/texmf-dist/doc/latex/glossaries/CHANGES @@ -1,5 +1,181 @@ glossaries change log: +v4.0: First stable release since v3.07. + +v3.14a: + + * glossaries.sty + + - New package options: acronyms, xindygloss, notranslate + + - Modified savewrites option so that it can be set via + \setupglossaries + + - Enabled compatible-3.07 option in \setupglossaries + + - Added \provideglossaryentry and \longprovideglossaryentry + + - Bug fix: fixed the default firstplural value to the value of + the plural key. + + * glossaries-prefix.sty + + - New + + * makeglossaries v2.09: + + - added check for -q switch when issuing warnings + +v3.13a: + + * glossaries.sty + + - Added \glsprestandardsort + + - Renamed \glossarymark to \glsglossarymark to prevent clash + with memoir. + + - Made "translate" package option a choice key rather than boolean + + - Bug fix for \glsaddallunused: + set default value of optional argument to \@glo@types + + - Bug fix for \SetFootnoteAcronymDisplayStyle: + added missing final argument of \ifglshaslong + + - Bug fix for \glossarystyle: + replaced \ifdef with \ifcsdef + + * mfirstuc.sty (v1.08): + + - Made \makefirstuc and \capitalisewords robust + +v3.12a: + + * glossaries.sty + + - Added \glsaddkey (allows the user to add their own custom + keys to glossary entries). + +v3.11a: + + * glossaries.sty + + - Added \setupglossaries + (http://www.dickimaw-books.com/cgi-bin/featuretracker.cgi?action=view&key=7) + + - Added \glsentryfmt and \defglsentryfmt + and deprecated \glsdisplayfirst, \glsdisplay, + \defglsdisplayfirst and \defglsdisplay + (http://www.dickimaw-books.com/cgi-bin/featuretracker.cgi?action=view&key=13) + + - Added \longnewglossaryentry + + - Added \ifglshasshort and \ifglshaslong + + - Added check in \glsgetgrouptitle for non-Latin characters + + - Added compatible-3.07 package option + + - Added "symbols" and "numbers" package options + (http://www.dickimaw-books.com/cgi-bin/featuretracker.cgi?action=view&key=16) + + - Added \printacronyms[opts] as a synonym for + \printglossary[type=\acronymtype,opts] + if "acronym" package option is used and + "compatible-3.07" package has not been used + and \printacronym doesn't already exist at the start + of the document. + + - Added \showgloshort and \showglolong + + - Fixed bug in \@gls@noexpand@fields + + - Fixed bug in \gls@defglossaryentry that didn't set the default + counter correctly + + - Now uses \mfirstucMakeUppercase instead of \MakeUppercase + to be consistent with mfirstuc. + + - Now requires textcase (better handling of case changes) + + * mfirstuc (v1.07) + + - Added \mfirstucMakeUppercase to allow the user to switch from + \MakeUppercase to another case changing command. + + * makeglossaries (v2.08) + + - Added -x and -m switches + +v3.10a: + + * glossaries.sty + + - Added \providecommand to aux file in case user removes + the glossaries package from their document. (This ensures + the next run doesn't throw a load of undefined control + sequence errors when the aux file is parsed.) + + - Fixed new code (from v3.08a) so that document can still + compile if entries are defined within the document after + \printglossary or \printglossaries + +v3.09a: + + * glossaries.sty + + - Added fix for \RecordChanges if doc.sty has been loaded + + - Fixed noexpand for symbolplural field + (http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=41) + + - Made \Glsentryname, \Glsentrytext etc robust + + - Fixed bug in footnote option + (http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=37) + + - Fixed bug where acronym starts with repeated letter + (www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=34) + + - Added \glstextup which checks for \textulc + (http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=40) + +v3.08a: + + * glossaries.sty + + - Changed the way information is written to external glossary + files. Information is now written as just \glossentry{label} + or \subglossentry{level}{label} instead of + \glossaryentryfield{label}{name}{description}{symbol} or + \glossarysubentryfield{level}{label}{name}{description}{symbol} + This means that descriptions can span multiple paragraphs + without exceeding makeindex's buffer. + + - Added \setglossarystyle (replaces \glossarystyle which is now + just for backward compatibility) + + - New user commands: + + \glossentryname, \Glossentryname, + \glossentrydesc, \Glossentrydesc, + \glossentrysymbol, \Glossentrysymbol, + \glsexpandfields, \glsnoexpandfields, + \glsaddallunused, + \ifglshassymbol, ifglshasdesc + + - Added nogroupskip option to \printglossary + + - Added \gls@ifnotmeasuring + + - Made \glsseeformat, \glsseelist, \glsseeitem and \glssee robust + + * glossary-tree.sty + + - Added \par to end of theglossary environment for index style. + (http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=38) + v3.07: * glossaries.sty @@ -15,6 +191,12 @@ v3.07: - Added \glsdoparenifnotempty + - Made \findrootlanguage obsolete + +makeglossaries: + + - Added languagemap to determine root language + v3.06: * glossaries.sty diff --git a/Master/texmf-dist/doc/latex/glossaries/README b/Master/texmf-dist/doc/latex/glossaries/README index 6115f028499..2b7f7bc02c2 100644 --- a/Master/texmf-dist/doc/latex/glossaries/README +++ b/Master/texmf-dist/doc/latex/glossaries/README @@ -1,6 +1,6 @@ -LaTeX Package : glossaries v3.07 +LaTeX Package : glossaries v4.0 -Last Modified : 2013-07-05 +Last Modified : 2013-11-14 Author : Nicola Talbot @@ -45,6 +45,7 @@ amsgen etoolbox longtable (unless you use the nolong or nostyles package options) datatool-base +textcase If the supertabular package is installed, it will also be loaded unless the nosuper or nostyles package options are used. If the diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdf b/Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdf Binary files differindex 58cd49b0d87..2306098fb3d 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html index df8a0454782..a1cbfb92f91 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html @@ -4,13 +4,13 @@ <!--http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd--> <html xmlns="http://www.w3.org/1999/xhtml" > -<head><title>User Manual for glossaries.sty v3.07</title> +<head><title>User Manual for glossaries.sty v4.0</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="generator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" /> <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" /> <!-- xhtml,fn-in,css-in,uni-html4,utf8 --> <meta name="src" content="glossaries-user.tex" /> -<meta name="date" content="2013-07-05 21:47:00" /> +<meta name="date" content="2013-11-14 14:05:00" /> <style type="text/css"> <!-- @@ -34,6 +34,14 @@ .ec-lmss-10x-x-109{ font-family: sans-serif;} .ec-lmss-10x-x-109{ font-family: sans-serif;} .ec-lmss-10x-x-109{ font-family: sans-serif;} +.ec-lmss-10x-x-109{ font-family: sans-serif;} +.ec-lmss-10x-x-109{ font-family: sans-serif;} +.ec-lmss-10x-x-109{ font-family: sans-serif;} +.ec-lmss-10x-x-109{ font-family: sans-serif;} +.ec-lmssbx-10x-x-109{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-109{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-109{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-109{ font-family: sans-serif; font-weight: bold;} .ec-lmssbx-10x-x-109{ font-family: sans-serif; font-weight: bold;} .ec-lmssbx-10x-x-109{ font-family: sans-serif; font-weight: bold;} .ec-lmssbx-10x-x-109{ font-family: sans-serif; font-weight: bold;} @@ -66,6 +74,10 @@ .ec-lmssbx-10x-x-207{ font-family: sans-serif; font-weight: bold;} .ec-lmssbx-10x-x-207{ font-family: sans-serif; font-weight: bold;} .ec-lmssbx-10x-x-207{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-207{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-207{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-207{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-207{ font-family: sans-serif; font-weight: bold;} .ec-lmr-12x-x-120{font-size:130%;} .ec-lmtt-12x-x-120{font-size:130%; font-family: monospace;} .ec-lmtt-12x-x-120{ font-family: monospace;} @@ -83,6 +95,35 @@ .ec-lmtt-12x-x-120{ font-family: monospace;} .ec-lmtt-12x-x-120{ font-family: monospace;} .ec-lmtt-12x-x-120{ font-family: monospace;} +.ec-lmtt-12x-x-120{ font-family: monospace;} +.ec-lmtt-12x-x-120{ font-family: monospace;} +.ec-lmtt-12x-x-120{ font-family: monospace;} +.ec-lmtt-12x-x-120{ font-family: monospace;} +.futrorn-x-x-109{} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtt-10x-x-109{ font-family: monospace;} +.ec-lmtk-10x-x-109{ font-family: monospace;} +.ec-lmtk-10x-x-109{ font-family: monospace;} +.ec-lmtk-10x-x-109{ font-family: monospace;} +.ec-lmtk-10x-x-109{ font-family: monospace;} .ec-lmtk-10x-x-109{ font-family: monospace;} .ec-lmtk-10x-x-109{ font-family: monospace;} .ec-lmtk-10x-x-109{ font-family: monospace;} @@ -119,6 +160,14 @@ .ec-lmbx-10x-x-109{ font-weight: bold;} .ec-lmbx-10x-x-109{ font-weight: bold;} .ec-lmbx-10x-x-109{ font-weight: bold;} +.ec-lmbx-10x-x-109{ font-weight: bold;} +.ec-lmbx-10x-x-109{ font-weight: bold;} +.ec-lmbx-10x-x-109{ font-weight: bold;} +.ec-lmbx-10x-x-109{ font-weight: bold;} +.ec-lmri-10x-x-109{ font-style:italic;} +.ec-lmri-10x-x-109{ font-style:italic;} +.ec-lmri-10x-x-109{ font-style:italic;} +.ec-lmri-10x-x-109{ font-style:italic;} .ec-lmri-10x-x-109{ font-style:italic;} .ec-lmri-10x-x-109{ font-style:italic;} .ec-lmri-10x-x-109{ font-style:italic;} @@ -135,22 +184,6 @@ .ec-lmri-10x-x-109{ font-style:italic;} .ec-lmri-10x-x-109{ font-style:italic;} .ec-lmri-10x-x-109{ font-style:italic;} -.ec-lmtt-10x-x-109{ font-family: monospace;} -.ec-lmtt-10x-x-109{ font-family: monospace;} -.ec-lmtt-10x-x-109{ font-family: monospace;} -.ec-lmtt-10x-x-109{ font-family: monospace;} -.ec-lmtt-10x-x-109{ font-family: monospace;} -.ec-lmtt-10x-x-109{ font-family: monospace;} -.ec-lmtt-10x-x-109{ font-family: monospace;} -.ec-lmtt-10x-x-109{ font-family: monospace;} -.ec-lmtt-10x-x-109{ font-family: monospace;} -.ec-lmtt-10x-x-109{ font-family: monospace;} -.ec-lmtt-10x-x-109{ font-family: monospace;} -.ec-lmtt-10x-x-109{ font-family: monospace;} -.ec-lmtt-10x-x-109{ font-family: monospace;} -.ec-lmtt-10x-x-109{ font-family: monospace;} -.ec-lmtt-10x-x-109{ font-family: monospace;} -.ec-lmtt-10x-x-109{ font-family: monospace;} .ec-lmr-10{font-size:90%;} .ec-lmr-9{font-size:81%;} .ec-lmtt-9{font-size:81%; font-family: monospace;} @@ -169,6 +202,10 @@ .ec-lmtt-9{ font-family: monospace;} .ec-lmtt-9{ font-family: monospace;} .ec-lmtt-9{ font-family: monospace;} +.ec-lmtt-9{ font-family: monospace;} +.ec-lmtt-9{ font-family: monospace;} +.ec-lmtt-9{ font-family: monospace;} +.ec-lmtt-9{ font-family: monospace;} .ec-lmss-9{font-size:81%; font-family: sans-serif;} .ec-lmss-9{ font-family: sans-serif;} .ec-lmss-9{ font-family: sans-serif;} @@ -185,6 +222,10 @@ .ec-lmss-9{ font-family: sans-serif;} .ec-lmss-9{ font-family: sans-serif;} .ec-lmss-9{ font-family: sans-serif;} +.ec-lmss-9{ font-family: sans-serif;} +.ec-lmss-9{ font-family: sans-serif;} +.ec-lmss-9{ font-family: sans-serif;} +.ec-lmss-9{ font-family: sans-serif;} .ec-lmtt-10{font-size:90%; font-family: monospace;} .ec-lmtt-10{ font-family: monospace;} .ec-lmtt-10{ font-family: monospace;} @@ -201,6 +242,90 @@ .ec-lmtt-10{ font-family: monospace;} .ec-lmtt-10{ font-family: monospace;} .ec-lmtt-10{ font-family: monospace;} +.ec-lmtt-10{ font-family: monospace;} +.ec-lmtt-10{ font-family: monospace;} +.ec-lmtt-10{ font-family: monospace;} +.ec-lmtt-10{ font-family: monospace;} +.ec-lmssbx-10x-x-120{font-size:109%; font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmssbx-10x-x-120{ font-family: sans-serif; font-weight: bold;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmtti-10x-x-109{ font-family: monospace; font-style:italic;} +.ec-lmbx-12{font-size:109%; font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbx-12{ font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} +.ec-lmbxi-10x-x-109{ font-style:italic; font-weight: bold;} .ec-lmcsc-10x-x-109{} p.noindent { text-indent: 0em } td p.noindent { text-indent: 0em; margin-top:0em; } @@ -371,20 +496,39 @@ div.important { background-color:red; } id="top"></a> </div> -<h2 class="titleHead">User Manual for glossaries.sty -v3.07</h2> +<h2 class="titleHead">User Manual for glossaries.sty v4.0</h2> <div class="author" ><span class="ec-lmr-12x-x-120">Nicola L.C. Talbot</span> <br /> <a href="http://www.dickimaw-books.com/" class="url" ><span class="ec-lmtt-12x-x-120">http://www.dickimaw-books.com/</span></a></div><br /> <div class="date" ><span -class="ec-lmr-12x-x-120">2013-07-05</span></div> +class="ec-lmr-12x-x-120">2013-11-14</span></div> </div> </div> -<!--l. 268--><p class="noindent" >The <span +<!--l. 289--><p class="indent" > <div class="important" title="Important Note"> Documents have varied styles when it comes to presenting glossaries or +lists of terms or notation. People have their own preferences and to +a large extent this is determined by the kind of information that +needs to go in the glossary. They may just have symbols with terse +descriptions or they may have long technical words with complicated +descriptions. The <span +class="ec-lmss-10x-x-109">glossaries </span>package is flexible enough to accommodate +such varied requirements, but this flexibility comes at a price: a big +manual. +</p><!--l. 299--><p class="indent" > <span +class="futrorn-x-x-109">M</span> If you’re freaking out at the size of this manual, start with +<span +class="ec-lmtt-10x-x-109">glossariesbegin.pdf </span>(“The glossaries package: a guide for beginnners”). +You should find it in the same directory as this document or try <span +class="ec-lmtt-10x-x-109">texdoc</span> +<span +class="ec-lmtt-10x-x-109">glossariesbegin.pdf</span>. Once you’ve got to grips with the basics, then +come back to this manual to find out how to adjust the settings. +</div> +</p><!--l. 305--><p class="noindent" > +</p><!--l. 307--><p class="noindent" >The <span class="ec-lmss-10x-x-109">glossaries </span>bundle comes with the following documentation: </p><dl class="description"><dt class="description"> <a @@ -426,7 +570,7 @@ class="ec-lmtk-10x-x-109">glossaries-code.pdf</span></a> </dt><dd class="description">Advanced users wishing to know more about the inner workings of all the packages provided in the <span class="ec-lmss-10x-x-109">glossaries</span> - bundle should read “Documented Code for glossaries v3.07”. This + bundle should read “Documented Code for glossaries v4.0”. This includes the documented code for the <span class="ec-lmss-10x-x-109">mfirstuc</span><a id="dx1-4"></a> package. @@ -434,6 +578,9 @@ class="ec-lmss-10x-x-109">mfirstuc</span><a <span class="ec-lmssbx-10x-x-109">INSTALL</span> </dt><dd class="description">Installation instructions. + + + </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">CHANGES</span> </dt><dd @@ -443,21 +590,21 @@ class="description">Change log. class="ec-lmssbx-10x-x-109">README</span> </dt><dd class="description">Package summary. </dd></dl> -<!--l. 304--><p class="indent" > <div class="important" title="Important Note"> If you use <span +<!--l. 343--><p class="indent" > <div class="important" title="Important Note"> If you use <span class="ec-lmss-10x-x-109">hyperref</span><a id="dx1-5"></a> and <span class="ec-lmss-10x-x-109">glossaries</span>, you must load <span class="ec-lmss-10x-x-109">hyperref</span><a id="dx1-6"></a> <span -class="ec-lmri-10x-x-109">first</span>. Similarly -the <span +class="ec-lmri-10x-x-109">first</span>. +Similarly the <span class="ec-lmss-10x-x-109">doc</span><a id="dx1-7"></a> package must also be loaded before <span -class="ec-lmss-10x-x-109">glossaries</span>. (If <span -class="ec-lmss-10x-x-109">doc</span><a - id="dx1-8"></a> is -loaded, the file extensions for the default main glossary are changed to +class="ec-lmss-10x-x-109">glossaries</span>. (If <span +class="ec-lmss-10x-x-109">doc</span><a + id="dx1-8"></a> is loaded, the file extensions for the default main glossary are +changed to <span class="ec-lmtt-10x-x-109">gls2</span><a id="dx1-9"></a>, <span class="ec-lmtt-10x-x-109">glo2</span><a @@ -465,15 +612,30 @@ class="ec-lmtt-10x-x-109">glo2</span><a class="ec-lmtt-10x-x-109">.glg2</span><a id="dx1-11"></a> to avoid conflict with <span class="ec-lmss-10x-x-109">doc</span><a - id="dx1-12"></a>’s changes glossary.) -</div> -</p><!--l. 311--><p class="noindent" > -</p><!--l. 313--><p class="indent" > Other documents that describe using <span -class="ec-lmss-10x-x-109">glossaries </span>include: <a -href="http://www.dickimaw-books.com/latex/thesis/" >Using LaTeX to -Write a PhD Thesis</a> and <a -href="http://www.latex-community.org/know-how/latex/55-latex-general/263-glossaries-nomenclature-lists-of-symbols-and-acronyms" >Glossaries, Nomenclature, Lists of Symbols and -Acronyms</a>. + id="dx1-12"></a>’s changes +glossary.)<a + id="pdflatexnote"></a> +</p><!--l. 352--><p class="indent" > If you are using <span +class="ec-lmss-10x-x-109">hyperref</span><a + id="dx1-13"></a>, it’s best to use <span +class="ec-lmtt-10x-x-109">pdflatex</span><a + id="dx1-14"></a> rather than <span +class="ec-lmtt-10x-x-109">latex</span><a + id="dx1-15"></a> +(DVI format) as <span +class="ec-lmtt-10x-x-109">pdflatex </span>deals with hyperlinks much better. If you use +the DVI format, you will encounter problems where you have long +hyperlinks or hyperlinks in subscripts or superscripts. This is an issue with +the DVI format not with <span +class="ec-lmss-10x-x-109">glossaries</span><a + id="dx1-16"></a>. </div> +</p><!--l. 358--><p class="noindent" > +</p><!--l. 360--><p class="indent" > Other documents that describe using the <span +class="ec-lmss-10x-x-109">glossaries </span>package include: +<a +href="http://www.dickimaw-books.com/latex/thesis/" >Using LaTeX to Write a PhD Thesis</a> and <a +href="http://www.latex-community.org/know-how/latex/55-latex-general/263-glossaries-nomenclature-lists-of-symbols-and-acronyms" >Glossaries, Nomenclature, Lists +of Symbols and Acronyms</a>. @@ -485,134 +647,142 @@ Acronyms</a>. id="x1-1000"></a>Contents</h2> <div class="tableofcontents"> <span class="chapterToc" >  <a -href="#Q1-1-2">Glossary</a></span> +href="#sec:glossary">Glossary</a></span> <br /> <span class="chapterToc" >1  <a -href="#x1-30001" id="QQ2-1-4">Introduction</a></span> +href="#sec:intro" id="QQ2-1-6">Introduction</a></span> <br />  <span class="sectionToc" >1.1  <a -href="#x1-40001.1" id="QQ2-1-5">Sample Documents</a></span> +href="#sec:samples" id="QQ2-1-7">Sample Documents</a></span> <br />  <span class="sectionToc" >1.2  <a -href="#x1-50001.2" id="QQ2-1-6">Multi-Lingual Support</a></span> +href="#sec:languages" id="QQ2-1-8">Multi-Lingual Support</a></span> <br />   <span class="subsectionToc" >1.2.1  <a -href="#x1-60001.2.1" id="QQ2-1-7">Changing the Fixed Names</a></span> +href="#sec:fixednames" id="QQ2-1-9">Changing the Fixed Names</a></span> <br />  <span class="sectionToc" >1.3  <a -href="#x1-70001.3" id="QQ2-1-10">Generating the Associated Glossary Files</a></span> +href="#sec:makeglossaries" id="QQ2-1-12">Generating the Associated Glossary Files</a></span> <br />   <span class="subsectionToc" >1.3.1  <a -href="#x1-80001.3.1" id="QQ2-1-12">Using the makeglossaries Perl Script</a></span> +href="#sec:makeglossariesapp" id="QQ2-1-14">Using the makeglossaries Perl Script</a></span> <br />   <span class="subsectionToc" >1.3.2  <a -href="#x1-90001.3.2" id="QQ2-1-13">Using xindy explicitly</a></span> +href="#sec:xindyapp" id="QQ2-1-15">Using xindy explicitly</a></span> <br />   <span class="subsectionToc" >1.3.3  <a -href="#x1-100001.3.3" id="QQ2-1-14">Using makeindex explicitly</a></span> +href="#sec:makeindexapp" id="QQ2-1-16">Using makeindex explicitly</a></span> <br />   <span class="subsectionToc" >1.3.4  <a -href="#x1-110001.3.4" id="QQ2-1-15">Note to Front-End and Script Developers</a></span> +href="#sec:notedev" id="QQ2-1-17">Note to Front-End and Script Developers</a></span> <br /> <span class="chapterToc" >2  <a -href="#x1-120002" id="QQ2-1-16">Package Options</a></span> +href="#sec:pkgopts" id="QQ2-1-18">Package Options</a></span> <br />  <span class="sectionToc" >2.1  <a -href="#x1-130002.1" id="QQ2-1-17">General Options</a></span> +href="#sec:pkgopts-general" id="QQ2-1-19">General Options</a></span> <br />  <span class="sectionToc" >2.2  <a -href="#x1-140002.2" id="QQ2-1-18">Sectioning, Headings and TOC Options</a></span> +href="#sec:pkgopts-sec" id="QQ2-1-20">Sectioning, Headings and TOC Options</a></span> <br />  <span class="sectionToc" >2.3  <a -href="#x1-150002.3" id="QQ2-1-19">Glossary Appearance Options</a></span> +href="#sec:pkgopts-printglos" id="QQ2-1-21">Glossary Appearance Options</a></span> <br />  <span class="sectionToc" >2.4  <a -href="#x1-160002.4" id="QQ2-1-20">Sorting Options</a></span> +href="#sec:pkgopts-sort" id="QQ2-1-22">Sorting Options</a></span> <br />  <span class="sectionToc" >2.5  <a -href="#x1-170002.5" id="QQ2-1-21">Acronym Options</a></span> +href="#sec:pkgopts-acronym" id="QQ2-1-23">Acronym Options</a></span> +<br />  <span class="sectionToc" >2.6  <a +href="#sec:pkgopts-other" id="QQ2-1-24">Other Options</a></span> +<br />  <span class="sectionToc" >2.7  <a +href="#sec:setupglossaries" id="QQ2-1-25">Setting Options After Package Loaded</a></span> <br /> <span class="chapterToc" >3  <a -href="#x1-180003" id="QQ2-1-22">Setting Up</a></span> +href="#sec:setup" id="QQ2-1-26">Setting Up</a></span> <br /> <span class="chapterToc" >4  <a -href="#x1-190004" id="QQ2-1-23">Defining Glossary Entries</a></span> +href="#sec:newglosentry" id="QQ2-1-27">Defining Glossary Entries</a></span> <br />  <span class="sectionToc" >4.1  <a -href="#x1-200004.1" id="QQ2-1-24">Plurals</a></span> +href="#sec:plurals" id="QQ2-1-28">Plurals</a></span> <br />  <span class="sectionToc" >4.2  <a -href="#x1-210004.2" id="QQ2-1-25">Other Grammatical Constructs</a></span> +href="#sec:grammar" id="QQ2-1-29">Other Grammatical Constructs</a></span> <br />  <span class="sectionToc" >4.3  <a -href="#x1-220004.3" id="QQ2-1-26">Sub-Entries</a></span> -<br />   <span class="subsectionToc" >4.3.1  <a -href="#x1-230004.3.1" id="QQ2-1-27">Hierarchical Categories</a></span> -<br />   <span class="subsectionToc" >4.3.2  <a -href="#x1-240004.3.2" id="QQ2-1-28">Homographs</a></span> +href="#sec:addkey" id="QQ2-1-30">Additional Keys</a></span> <br />  <span class="sectionToc" >4.4  <a -href="#x1-250004.4" id="QQ2-1-29">Loading Entries From a File</a></span> +href="#sec:expansion" id="QQ2-1-31">Expansion</a></span> <br />  <span class="sectionToc" >4.5  <a -href="#x1-260004.5" id="QQ2-1-30">Moving Entries to Another Glossary</a></span> +href="#sec:subentries" id="QQ2-1-33">Sub-Entries</a></span> +<br />   <span class="subsectionToc" >4.5.1  <a +href="#sec:hierarchical" id="QQ2-1-34">Hierarchical Categories</a></span> +<br />   <span class="subsectionToc" >4.5.2  <a +href="#sec:homographs" id="QQ2-1-35">Homographs</a></span> +<br />  <span class="sectionToc" >4.6  <a +href="#sec:loadglsentries" id="QQ2-1-36">Loading Entries From a File</a></span> +<br />  <span class="sectionToc" >4.7  <a +href="#sec:moveentry" id="QQ2-1-37">Moving Entries to Another Glossary</a></span> +<br />  <span class="sectionToc" >4.8  <a +href="#sec:docdefs" id="QQ2-1-38">Drawbacks With Defining Entries in the Document Environment</a></span> +<br />   <span class="subsectionToc" >4.8.1  <a +href="#sec:techissues" id="QQ2-1-39">Technical Issues</a></span> +<br />   <span class="subsectionToc" >4.8.2  <a +href="#sec:goodpractice" id="QQ2-1-40">Good Practice Issues</a></span> <br /> <span class="chapterToc" >5  <a -href="#x1-270005" id="QQ2-1-31">Number lists</a></span> +href="#sec:numberlists" id="QQ2-1-41">Number lists</a></span> <br /> <span class="chapterToc" >6  <a -href="#x1-280006" id="QQ2-1-32">Links to Glossary Entries</a></span> +href="#sec:glslink" id="QQ2-1-42">Links to Glossary Entries</a></span> <br />  <span class="sectionToc" >6.1  <a -href="#x1-290006.1" id="QQ2-1-34">Changing the format of the link text</a></span> +href="#sec:glsdisplay" id="QQ2-1-44">Changing the format of the link text</a></span> + + + <br />  <span class="sectionToc" >6.2  <a -href="#x1-300006.2" id="QQ2-1-35">Enabling and disabling hyperlinks to glossary entries</a></span> +href="#sec:disablehyperlinks" id="QQ2-1-45">Enabling and disabling hyperlinks to glossary entries</a></span> <br /> <span class="chapterToc" >7  <a -href="#x1-310007" id="QQ2-1-36">Adding an Entry to the Glossary Without Generating Text</a></span> +href="#sec:glsadd" id="QQ2-1-46">Adding an Entry to the Glossary Without Generating Text</a></span> <br /> <span class="chapterToc" >8  <a -href="#x1-320008" id="QQ2-1-37">Cross-Referencing Entries</a></span> +href="#sec:crossref" id="QQ2-1-47">Cross-Referencing Entries</a></span> <br />  <span class="sectionToc" >8.1  <a -href="#x1-330008.1" id="QQ2-1-38">Customising Cross-reference Text</a></span> +href="#sec:customxr" id="QQ2-1-48">Customising Cross-reference Text</a></span> <br /> <span class="chapterToc" >9  <a -href="#x1-340009" id="QQ2-1-39">Using Glossary Terms Without Links</a></span> +href="#sec:glsnolink" id="QQ2-1-49">Using Glossary Terms Without Links</a></span> <br /> <span class="chapterToc" >10  <a -href="#x1-3500010" id="QQ2-1-40">Displaying a glossary</a></span> +href="#sec:printglossary" id="QQ2-1-50">Displaying a glossary</a></span> <br /> <span class="chapterToc" >11  <a -href="#x1-3600011" id="QQ2-1-41">Xindy</a></span> - - - +href="#sec:xindy" id="QQ2-1-51">Xindy</a></span> <br />  <span class="sectionToc" >11.1  <a -href="#x1-3700011.1" id="QQ2-1-42">Language and Encodings</a></span> +href="#sec:langenc" id="QQ2-1-52">Language and Encodings</a></span> <br />  <span class="sectionToc" >11.2  <a -href="#x1-3800011.2" id="QQ2-1-43">Locations and Number lists</a></span> +href="#sec:xindyloc" id="QQ2-1-53">Locations and Number lists</a></span> <br />  <span class="sectionToc" >11.3  <a -href="#x1-3900011.3" id="QQ2-1-44">Glossary Groups</a></span> +href="#sec:groups" id="QQ2-1-54">Glossary Groups</a></span> <br /> <span class="chapterToc" >12  <a -href="#x1-4000012" id="QQ2-1-45">Defining New Glossaries</a></span> +href="#sec:newglossary" id="QQ2-1-55">Defining New Glossaries</a></span> <br /> <span class="chapterToc" >13  <a -href="#x1-4100013" id="QQ2-1-46">Acronyms</a></span> +href="#sec:acronyms" id="QQ2-1-56">Acronyms</a></span> <br />  <span class="sectionToc" >13.1  <a -href="#x1-4200013.1" id="QQ2-1-48">Predefined Acronym Styles</a></span> +href="#sec:predefinedacrstyles" id="QQ2-1-58">Predefined Acronym Styles</a></span> <br />  <span class="sectionToc" >13.2  <a -href="#x1-4300013.2" id="QQ2-1-49">Displaying the List of Acronyms</a></span> +href="#sec:disploa" id="QQ2-1-59">Displaying the List of Acronyms</a></span> <br />  <span class="sectionToc" >13.3  <a -href="#x1-4400013.3" id="QQ2-1-51">Defining A Custom Acronym Style</a></span> +href="#sec:customacronym" id="QQ2-1-61">Defining A Custom Acronym Style</a></span> <br />  <span class="sectionToc" >13.4  <a -href="#x1-4500013.4" id="QQ2-1-52">Upgrading From the glossary Package</a></span> +href="#sec:oldacronym" id="QQ2-1-62">Upgrading From the glossary Package</a></span> <br /> <span class="chapterToc" >14  <a -href="#x1-4600014" id="QQ2-1-54">Unsetting and Resetting Entry Flags</a></span> +href="#sec:glsunset" id="QQ2-1-64">Unsetting and Resetting Entry Flags</a></span> <br /> <span class="chapterToc" >15  <a -href="#x1-4700015" id="QQ2-1-55">Glossary Styles</a></span> +href="#sec:styles" id="QQ2-1-65">Glossary Styles</a></span> <br />  <span class="sectionToc" >15.1  <a -href="#x1-4800015.1" id="QQ2-1-57">List Styles</a></span> +href="#sec:liststyles" id="QQ2-1-67">List Styles</a></span> <br />  <span class="sectionToc" >15.2  <a -href="#x1-4900015.2" id="QQ2-1-58">Longtable Styles</a></span> +href="#sec:longstyles" id="QQ2-1-68">Longtable Styles</a></span> <br />  <span class="sectionToc" >15.3  <a -href="#x1-5000015.3" id="QQ2-1-59">Longtable Styles (Ragged Right)</a></span> +href="#sec:longraggedstyles" id="QQ2-1-69">Longtable Styles (Ragged Right)</a></span> <br />  <span class="sectionToc" >15.4  <a -href="#x1-5100015.4" id="QQ2-1-60">Supertabular Styles</a></span> +href="#sec:superstyles" id="QQ2-1-70">Supertabular Styles</a></span> <br />  <span class="sectionToc" >15.5  <a -href="#x1-5200015.5" id="QQ2-1-61">Supertabular Styles (Ragged Right)</a></span> +href="#sec:superraggedstyles" id="QQ2-1-71">Supertabular Styles (Ragged Right)</a></span> <br />  <span class="sectionToc" >15.6  <a -href="#x1-5300015.6" id="QQ2-1-62">Tree-Like Styles</a></span> +href="#sec:treestyles" id="QQ2-1-72">Tree-Like Styles</a></span> <br />  <span class="sectionToc" >15.7  <a -href="#x1-5400015.7" id="QQ2-1-63">Multicols Style</a></span> +href="#sec:mcolstyles" id="QQ2-1-73">Multicols Style</a></span> <br />  <span class="sectionToc" >15.8  <a -href="#x1-5500015.8" id="QQ2-1-65">In-Line Style</a></span> +href="#sec:inline" id="QQ2-1-75">In-Line Style</a></span> <br /> <span class="chapterToc" >16  <a -href="#x1-5600016" id="QQ2-1-66">Defining your own glossary style</a></span> -<br />  <span class="sectionToc" >16.1  <a -href="#x1-5700016.1" id="QQ2-1-67">Example: creating a completely new style</a></span> -<br />  <span class="sectionToc" >16.2  <a -href="#x1-5800016.2" id="QQ2-1-68">Example: creating a new glossary style based on an existing style</a></span> -<br />  <span class="sectionToc" >16.3  <a -href="#x1-5900016.3" id="QQ2-1-69">Example: creating a glossary style that uses the <span -class="ec-lmss-10x-x-109">user1</span>, …, <span -class="ec-lmss-10x-x-109">user6 </span>keys</a></span> +href="#sec:newglossarystyle" id="QQ2-1-76">Defining your own glossary style</a></span> <br /> <span class="chapterToc" >17  <a -href="#x1-6000017" id="QQ2-1-70">Utilities</a></span> +href="#sec:utilities" id="QQ2-1-77">Utilities</a></span> <br /> <span class="chapterToc" >18  <a -href="#x1-6100018" id="QQ2-1-71">Accessibility Support</a></span> +href="#sec:prefix" id="QQ2-1-78">Prefixes or Determiners</a></span> <br /> <span class="chapterToc" >19  <a -href="#x1-6200019" id="QQ2-1-72">Troubleshooting</a></span> +href="#sec:accsupp" id="QQ2-1-79">Accessibility Support</a></span> +<br /> <span class="chapterToc" >20  <a +href="#sec:trouble" id="QQ2-1-80">Troubleshooting</a></span> <br /> <span class="chapterToc" >  <a -href="#Q1-1-73">Index</a></span> +href="#sec:index">Index</a></span> </div> @@ -620,15 +790,51 @@ href="#Q1-1-73">Index</a></span> + <h2 class="likechapterHead"><a + id="x1-2000"></a>List of Examples</h2> + + + + + + + <h2 class="likechapterHead"><a + id="x1-3000"></a>List of Tables</h2> +<div class="tableofcontents"><span class="lotToc" >1.1 <a +href="#x1-80131">Supported Languages</a></span><br /><span class="lotToc" >1.2 <a +href="#x1-80152">Customised Text</a></span><br /><span class="lotToc" >1.3 <a +href="#x1-90923">Commands and package +options that have no effect when using <span +class="ec-lmtt-10x-x-109">xindy </span>or <span +class="ec-lmtt-10x-x-109">makeindex </span>explicitly</a></span><br /><span class="lotToc" >4.1 <a +href="#x1-270091">Key to +Field Mappings</a></span><br /><span class="lotToc" >6.1 <a +href="#x1-370641">Predefined Hyperlinked Location Formats</a></span><br /><span class="lotToc" >13.1 <a +href="#x1-500891">Synonyms +provided by the package option shortcuts</a></span><br /><span class="lotToc" >13.2 <a +href="#x1-520182">Package options governing +<span +class="ec-lmtt-10x-x-109">\newacronym </span>and how the information is stored</a></span><br /><span class="lotToc" >13.3 <a +href="#x1-540253">The effect of using +xspace</a></span><br /><span class="lotToc" >15.1 <a +href="#x1-560041">Glossary Styles</a></span><br /><span class="lotToc" >15.2 <a +href="#x1-630122">Multicolumn Styles</a></span><br /> +</div> + + + + + + <!--l. 1--><p class="indent" > <a id="likesection.1"></a><a - id="Q1-1-2"></a> + id="sec:glossary"></a> </p> <h2 class="likechapterHead"><a - id="x1-2000"></a>Glossary</h2> + id="x1-4000"></a>Glossary</h2> <!--l. 1--><p class="noindent" ><span class="ec-lmri-10x-x-109">This glossary style was setup using:</span> </p> <table @@ -661,36 +867,41 @@ style="vertical-align:baseline;" class="tabbing"><td style="width:103;" class="tabbing"></td><td class="tabbing"><span class="ec-lmtt-10x-x-109">toc,</span></td></tr></table> -<!--l. 1--><p class="indent" > </p><table +<!--l. 1--><p class="indent" > </p><table cellpadding="0" border="0" cellspacing="0" class="tabbing"><tr style="vertical-align:baseline;" class="tabbing"><td style="width:103;" class="tabbing"></td><td class="tabbing"><span -class="ec-lmtt-10x-x-109">style=altlist]{glossaries}</span></td></tr></table> +class="ec-lmtt-10x-x-109">style=altlist,</span></td></tr></table> +<!--l. 1--><p class="indent" > </p><table +cellpadding="0" border="0" cellspacing="0" +class="tabbing"><tr +style="vertical-align:baseline;" class="tabbing"><td style="width:103;" +class="tabbing"></td><td +class="tabbing"><span +class="ec-lmtt-10x-x-109">nogroupskip]{glossaries}</span></td></tr></table> <!--l. 1--><p class="indent" > </p><!--l. 1--><p class="noindent" ><span -class="ec-lmtt-10x-x-109">\renewcommand*{\glsgroupskip</span><a - id="dx1-2001"></a><span -class="ec-lmtt-10x-x-109">}{}</span><br +class="ec-lmtt-10x-x-109">\glsnoexpandfields</span><br class="newline" /><span class="ec-lmtt-10x-x-109">\renewcommand*{\glsseeformat</span><a - id="dx1-2002"></a><span + id="dx1-4001"></a><span class="ec-lmtt-10x-x-109">}[3][\seename</span><a - id="dx1-2003"></a><span + id="dx1-4002"></a><span class="ec-lmtt-10x-x-109">]{% </span><br class="newline" /><span class="ec-lmtt-10x-x-109">(\xmakefirstuc</span><a - id="dx1-2004"></a><span + id="dx1-4003"></a><span class="ec-lmtt-10x-x-109">{#1} \glsseelist</span><a - id="dx1-2005"></a><span + id="dx1-4004"></a><span class="ec-lmtt-10x-x-109">{#2}.)}</span> </p><dl class="description"><dt class="description"> <a id="glo:cli"></a><span class="ec-lmssbx-10x-x-109">Command Line Interface (CLI)</span> </dt><dd class="description"><br -class="newline" />an application that doesn’t have a graphical user interface. That +class="newline" />An application that doesn’t have a graphical user interface. That is, an application that doesn’t have any windows, buttons or menus and can be run in a command prompt or terminal (see <a @@ -702,7 +913,7 @@ class="newline" /> <a id="glo:entrylocation"></a><span class="ec-lmssbx-10x-x-109">Entry location</span><a - id="dx1-2006"></a> </dt><dd + id="dx1-4005"></a> </dt><dd class="description"><br class="newline" />The location of the entry in the document. This defaults to the page number on which the entry appears. An entry may have @@ -712,25 +923,25 @@ class="newline" /> <a id="glo:firstuse"></a><span class="ec-lmssbx-10x-x-109">First use</span><a - id="dx1-2007"></a> </dt><dd + id="dx1-4006"></a> </dt><dd class="description"><br class="newline" />The first time a glossary entry is used (from the start of the document or after a reset) with one of the following commands: <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-2008"></a>, <span + id="dx1-4007"></a>, <span class="ec-lmtt-10x-x-109">\Gls</span><a - id="dx1-2009"></a>, <span + id="dx1-4008"></a>, <span class="ec-lmtt-10x-x-109">\GLS</span><a - id="dx1-2010"></a>, <span + id="dx1-4009"></a>, <span class="ec-lmtt-10x-x-109">\glspl</span><a - id="dx1-2011"></a>, <span + id="dx1-4010"></a>, <span class="ec-lmtt-10x-x-109">\Glspl</span><a - id="dx1-2012"></a>, <span + id="dx1-4011"></a>, <span class="ec-lmtt-10x-x-109">\GLSpl</span><a - id="dx1-2013"></a> or <span + id="dx1-4012"></a> or <span class="ec-lmtt-10x-x-109">\glsdisp</span><a - id="dx1-2014"></a>. (See + id="dx1-4013"></a>. (See <a href="#glo:firstuseflag">first use flag</a> & <a href="#glo:firstusetext">first use text</a>.) <br @@ -742,43 +953,43 @@ class="newline" /> <a id="glo:firstuseflag"></a><span class="ec-lmssbx-10x-x-109">First use flag</span><a - id="dx1-2015"></a> </dt><dd + id="dx1-4014"></a> </dt><dd class="description"><br class="newline" />A conditional that determines whether or not the entry has been used according to the rules of <a - id="dx1-2016"></a><a + id="dx1-4015"></a><a href="#glo:firstuse">first use</a>. Commands to unset or reset this conditional are described in <a -href="#x1-4600014">§14 </a><a -href="#x1-4600014">Unsetting and +href="#sec:glsunset">§14 </a><a +href="#sec:glsunset">Unsetting and Resetting Entry Flags<!--tex4ht:ref: sec:glsunset --></a>. <br class="newline" /> </dd><dt class="description"> <a id="glo:firstusetext"></a><span class="ec-lmssbx-10x-x-109">First use text</span><a - id="dx1-2017"></a> </dt><dd + id="dx1-4016"></a> </dt><dd class="description"><br class="newline" />The text that is displayed on <a - id="dx1-2018"></a><a + id="dx1-4017"></a><a href="#glo:firstuse">first use</a>, which is governed by the <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-2019"></a> and <span + id="dx1-4018"></a> and <span class="ec-lmss-10x-x-109">firstplural</span><a - id="dx1-2020"></a> keys of <span + id="dx1-4019"></a> keys of <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-2021"></a>. (May be + id="dx1-4020"></a>. (May be overridden by <span class="ec-lmtt-10x-x-109">\glsdisp</span><a - id="dx1-2022"></a>.) <br + id="dx1-4021"></a>.) <br class="newline" /> </dd><dt class="description"> <a id="glo:indexingapp"></a><span class="ec-lmssbx-10x-x-109">Indexing application</span> </dt><dd class="description"><br -class="newline" />an application (piece of software) +class="newline" />An application (piece of software) separate from <span class="TEX">T<span class="E">E</span>X</span>/<span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> that collates and sorts information @@ -787,15 +998,15 @@ class="E">E</span>X</span></span> that collates and sorts information entry. There are two main indexing applications that are used with <span class="TEX">T<span class="E">E</span>X</span>: <a - id="dx1-2023"></a><a + id="dx1-4022"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-2024"></a></a> and <a - id="dx1-2025"></a><a + id="dx1-4023"></a></a> and <a + id="dx1-4024"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-2026"></a></a>. These are both <a - id="dx1-2027"></a><a + id="dx1-4025"></a></a>. These are both <a + id="dx1-4026"></a><a href="#glo:cli">command line interface (CLI)</a> applications. <br class="newline" /> @@ -803,11 +1014,11 @@ class="newline" /> <a id="glo:linktext"></a><span class="ec-lmssbx-10x-x-109">Link text</span><a - id="dx1-2028"></a> </dt><dd + id="dx1-4027"></a> </dt><dd class="description"><br class="newline" />The text produced by commands such as <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-2029"></a>. It may or may + id="dx1-4028"></a>. It may or may not be a hyperlink to the glossary. <br class="newline" /> </dd><dt class="description"> @@ -816,40 +1027,40 @@ class="newline" /> class="ec-lmssbx-10x-x-109">Location list</span> </dt><dd class="description"><br class="newline" />A list of <a - id="dx1-2030"></a><a -href="#glo:entrylocation">entry locations</a>. 22, (See <a + id="dx1-4029"></a><a +href="#glo:entrylocation">entry locations</a>. (See <a href="#glo:numberlist">number list<a - id="dx1-2031"></a></a>.)<br + id="dx1-4030"></a></a>.)<br class="newline" /> </dd><dt class="description"> <a id="glo:makeglossaries"></a><span class="ec-lmtk-10x-x-109">makeglossaries</span><a - id="dx1-2032"></a> </dt><dd + id="dx1-4031"></a> </dt><dd class="description"><br -class="newline" />A <span -class="ec-lmss-10x-x-109">glossaries </span>custom designed Perl script interface to <a - id="dx1-2033"></a><a +class="newline" />A custom designed Perl script interface to <a + id="dx1-4032"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-2034"></a></a> and - <a - id="dx1-2035"></a><a + id="dx1-4033"></a></a> and <a + id="dx1-4034"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-2036"></a></a>. <br + id="dx1-4035"></a></a> + provided with the <span +class="ec-lmss-10x-x-109">glossaries </span>package. <br class="newline" /> </dd><dt class="description"> <a id="glo:makeglossariesgui"></a><span class="ec-lmtk-10x-x-109">makeglossariesgui</span><a - id="dx1-2037"></a> </dt><dd + id="dx1-4036"></a> </dt><dd class="description"><br class="newline" />A Java GUI alternative to <a - id="dx1-2038"></a><a + id="dx1-4037"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-2039"></a></a> that also provides + id="dx1-4038"></a></a> that also provides @@ -862,30 +1073,30 @@ class="newline" /> <a id="glo:makeindex"></a><span class="ec-lmtk-10x-x-109">makeindex</span><a - id="dx1-2040"></a> </dt><dd + id="dx1-4039"></a> </dt><dd class="description"><br class="newline" />An <a - id="dx1-2041"></a><a + id="dx1-4040"></a><a href="#glo:indexingapp">indexing application</a>. <br class="newline" /> </dd><dt class="description"> <a id="glo:numberlist"></a><span class="ec-lmssbx-10x-x-109">Number list</span><a - id="dx1-2042"></a> </dt><dd + id="dx1-4041"></a> </dt><dd class="description"><br class="newline" />A list of <a - id="dx1-2043"></a><a + id="dx1-4042"></a><a href="#glo:entrylocation">entry locations</a> (also called a location list). The number list can be suppressed using the <span class="ec-lmss-10x-x-109">nonumberlist</span><a - id="dx1-2044"></a> package option. <br + id="dx1-4043"></a> package option. <br class="newline" /> </dd><dt class="description"> <a id="glo:sanitize"></a><span class="ec-lmssbx-10x-x-109">Sanitize</span><a - id="dx1-2045"></a> </dt><dd + id="dx1-4044"></a> </dt><dd class="description"><br class="newline" />Converts command names into character sequences. That is, a command called, say, <span @@ -898,40 +1109,22 @@ class="ec-lmtt-10x-x-109">o</span>. Depending on the font, the backslash character may appear as a dash when used in the main document text, so <span class="ec-lmtt-10x-x-109">\foo </span>will appear as: —foo. - <!--l. 170--><p class="noindent" >When <span class="TEX">T<span -class="E">E</span>X</span> writes information to a file, fragile commands must - be protected. The <span -class="ec-lmss-10x-x-109">name</span><a - id="dx1-2046"></a>, <span -class="ec-lmss-10x-x-109">description</span><a - id="dx1-2047"></a>, <span -class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-2048"></a> and <span + <!--l. 171--><p class="noindent" >Earlier versions of <span +class="ec-lmss-10x-x-109">glossaries </span>used this technique to write + information to the files used by the indexing applications to + prevent problems caused by fragile commands. Now, this is only + used for the <span class="ec-lmss-10x-x-109">sort</span><a - id="dx1-2049"></a> keys all have - their values written to a file, which means that care must be - taken if those values contain fragile commands. There are two - approaches: 1) the fragile commands must be protected using - <span -class="ec-lmtt-10x-x-109">\protect</span><a - id="dx1-2050"></a>; 2) the values are sanitized. Sanitizing the values gets - rid of the inconvenience of having to protect fragile commands, - but at the expense of no longer being able to use those values - in the document. Sanitization is governed by the package option - <span -class="ec-lmss-10x-x-109">sanitize</span><a - id="dx1-2051"></a> described in <a -href="#x1-130002.1">§2.1 </a><a -href="#x1-130002.1">General Options<!--tex4ht:ref: sec:pkgopts-general --></a>. <br + id="dx1-4045"></a> key. <br class="newline" /> </p></dd><dt class="description"> <a id="glo:xindy"></a><span class="ec-lmtk-10x-x-109">xindy</span><a - id="dx1-2052"></a> </dt><dd + id="dx1-4046"></a> </dt><dd class="description"><br class="newline" />A flexible <a - id="dx1-2053"></a><a + id="dx1-4047"></a><a href="#glo:indexingapp">indexing application</a> with multilingual support written in Perl. <br class="newline" /></dd></dl> @@ -939,8 +1132,8 @@ class="newline" /></dd></dl> <h2 class="chapterHead"><span class="titlemark">1</span>  <a - id="x1-30001"></a>Introduction</h2> -<!--l. 328--><p class="noindent" >The <span + id="sec:intro"></a>Introduction</h2> +<!--l. 382--><p class="noindent" >The <span class="ec-lmss-10x-x-109">glossaries </span>package is provided to assist generating glossaries. It has a certain amount of flexibility, allowing the user to customize the format of the glossary and define multiple glossaries. It also @@ -949,87 +1142,87 @@ addition to a name and description) for glossary entries. There is provision for loading a database of glossary terms. Only those terms used<span class="footnote-mark"><a href="#fn1x3" id="fn1x3-bk"><sup class="textsuperscript">1</sup></a></span><a - id="x1-3001f1"></a> -in the document will be added to the glossary. -</p><!--l. 341--><p class="indent" > <span + id="x1-5001f1"></a> in +the document will be added to the glossary. +</p><!--l. 395--><p class="indent" > <span class="ec-lmbx-10x-x-109">This package replaces the </span><span class="ec-lmssbx-10x-x-109">glossary</span><a - id="dx1-3005"></a> <span + id="dx1-5005"></a> <span class="ec-lmbx-10x-x-109">package which is now</span> <span class="ec-lmbx-10x-x-109">obsolete. </span>Please see the document <a href="glossary2glossaries.html" >“Upgrading from the glossary package to the glossaries package”</a> for assistance in upgrading. -</p><!--l. 345--><p class="indent" > One of the strengths of this package is its flexibility, however the +</p><!--l. 399--><p class="indent" > One of the strengths of this package is its flexibility, however the drawback of this is the necessity of having a large manual that can cover all the various settings. If you are daunted by the size of the manual, try starting off with the much shorter <a href="glossariesbegin.html" >guide for beginners</a>. -</p><!--l. 351--><p class="indent" > <div class="important" title="Important Note"> The <span +</p><!--l. 405--><p class="indent" > <div class="important" title="Important Note"> The <span class="ec-lmss-10x-x-109">glossaries </span>package comes with a <a href="http://www.perl.org/about.html" >Perl</a> script called <a - id="dx1-3006"></a><a + id="dx1-5006"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-3007"></a></a>. + id="dx1-5007"></a></a>. This provides a convenient interface to the <a - id="dx1-3008"></a><a + id="dx1-5008"></a><a href="#glo:indexingapp">indexing applications</a> <a - id="dx1-3009"></a><a + id="dx1-5009"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-3010"></a></a> or <a - id="dx1-3011"></a><a + id="dx1-5010"></a></a> or <a + id="dx1-5011"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-3012"></a></a>. It is strongly recommended that you use this script, + id="dx1-5012"></a></a>. It is strongly recommended that you use this script, but <span class="ec-lmri-10x-x-109">it is not essential</span>. If you are reluctant to install Perl, or for any other reason you don’t want to use <a - id="dx1-3013"></a><span + id="dx1-5013"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-3014"></a>, you can call <a - id="dx1-3015"></a><span + id="dx1-5014"></a>, you can call <a + id="dx1-5015"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-3016"></a> or + id="dx1-5016"></a> or <a - id="dx1-3017"></a><span + id="dx1-5017"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-3018"></a> explicitly. See <a -href="#x1-70001.3">§1.3 </a><a -href="#x1-70001.3">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a> for + id="dx1-5018"></a> explicitly. See <a +href="#sec:makeglossaries">§1.3 </a><a +href="#sec:makeglossaries">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a> for further details. </div> -</p><!--l. 361--><p class="noindent" > +</p><!--l. 415--><p class="noindent" > This document uses the <span class="ec-lmss-10x-x-109">glossaries </span>package. For example, when viewing the PDF version of this document in a hyperlinked-enabled PDF viewer (such -as Adobe Reader) if you click on the word “<a - id="dx1-3019"></a><a +as Adobe Reader or Okular) if you click on the word “<a + id="dx1-5019"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-3020"></a></a>” you’ll be taken to the -entry in the glossary where there’s a brief description of what “<a - id="dx1-3021"></a><span + id="dx1-5020"></a></a>” you’ll be +taken to the entry in the glossary where there’s a brief description of what +“<a + id="dx1-5021"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-3022"></a>” -is. -</p><!--l. 369--><p class="indent" > The remainder of this introductory section covers the following: + id="dx1-5022"></a>” is. +</p><!--l. 423--><p class="indent" > The remainder of this introductory section covers the following: </p> <ul class="itemize1"> <li class="itemize"><a -href="#x1-40001.1">§1.1 </a><a -href="#x1-40001.1">Sample Documents<!--tex4ht:ref: sec:samples --></a> lists the sample documents provided +href="#sec:samples">§1.1 </a><a +href="#sec:samples">Sample Documents<!--tex4ht:ref: sec:samples --></a> lists the sample documents provided with this package. </li> <li class="itemize"><a -href="#x1-50001.2">§1.2 </a><a -href="#x1-50001.2">Multi-Lingual Support<!--tex4ht:ref: sec:languages --></a> provides information for users who +href="#sec:languages">§1.2 </a><a +href="#sec:languages">Multi-Lingual Support<!--tex4ht:ref: sec:languages --></a> provides information for users who wish to write in a language other than English. </li> <li class="itemize"><a -href="#x1-70001.3">§1.3 </a><a -href="#x1-70001.3">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a> describes how +href="#sec:makeglossaries">§1.3 </a><a +href="#sec:makeglossaries">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a> describes how to use a post-processor to create the sorted glossaries for your document. </li></ul> @@ -1037,8 +1230,8 @@ href="#x1-70001.3">Generating the Associated Glossary Files<!--tex4ht:ref: s <h3 class="sectionHead"><span class="titlemark">1.1</span>  <a - id="x1-40001.1"></a>Sample Documents</h3> -<!--l. 386--><p class="noindent" >The <span + id="sec:samples"></a>Sample Documents</h3> +<!--l. 440--><p class="noindent" >The <span class="ec-lmss-10x-x-109">glossaries </span>package is provided with some sample documents that illustrate the various functions. These should be located in the <span @@ -1053,107 +1246,116 @@ href="http://www.dickimaw-books.com/latex/novices/html/terminal.html" >terminal <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">texdoc -l glossaries</span></span> -</p><!--l. 396--><p class="indent" > <spacer type=vertical size=10> -This should display the full pathname of the file <span -class="ec-lmtt-10x-x-109">glossaries-code.pdf</span>. -View the contents of that directory and see if it contains the <span -class="ec-lmtt-10x-x-109">samples</span> -subdirectory. -</p><!--l. 401--><p class="indent" > If you can’t find the sample files, they are available in the subdirectory -<span -class="ec-lmtt-10x-x-109">doc/latex/glossaries/samples/ </span>in the <span -class="ec-lmtt-10x-x-109">glossaries.tds.zip </span>archive -which can be downloaded from <a -href="http://tug.ctan.org/tex-archive/macros/latex/contrib/glossaries/" >CTAN</a>. -</p><!--l. 407--><p class="indent" > The sample documents are as follows: +</p><!--l. 450--><p class="indent" > <spacer type=vertical size=10> +This should display a list of all the files in the glossaries documentation +directory with their full pathnames. +</p><!--l. 454--><p class="indent" > If you can’t find the sample files on your computer, +they are also available from your nearest CTAN mirror at +<a +href="http://mirror.ctan.org/macros/latex/contrib/glossaries/samples/" class="url" ><span +class="ec-lmtt-10x-x-109">http://mirror.ctan.org/macros/latex/contrib/glossaries/samples/</span></a>. +</p><!--l. 458--><p class="indent" > The sample documents are as +follows<span class="footnote-mark"><a +href="#fn2x3" id="fn2x3-bk"><sup class="textsuperscript">2</sup></a></span><a + id="x1-6001f2"></a>: </p><dl class="description"><dt class="description"> <span -class="ec-lmssbx-10x-x-109">minimalgls.tex</span> </dt><dd -class="description"> This document is a minimal working example. You can +class="ec-lmtk-10x-x-109">minimalgls.tex</span> </dt><dd +class="description"><a + id="x1-6002r1"></a> This document is a minimal working example. You can test your installation using this file. To create the complete document you will need to do the following steps: <ol class="enumerate1" > <li - class="enumerate" id="x1-4002x1">Run <span + class="enumerate" id="x1-6004x1">Run <span class="ec-lmtt-10x-x-109">minimalgls.tex </span>through <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> either by typing <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">latex minimalgls</span></span> - <!--l. 418--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 471--><p class="noindent" ><spacer type=vertical size=10> in a terminal or by using the relevant button or menu item in your text editor or front-end. This will create the required associated files but you will not see the glossary. If you use PDF<span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> you will also get warnings about non-existent - references. These warnings may be ignored on the first - run. - </p><!--l. 425--><p class="noindent" >If you get a <span class="obeylines-h"><span class="verb"><span + references that look something like: + + + +</p> + <div class="verbatim" id="verbatim-1"> + pdfTeX warning (dest): name{glo:aca} has been +  <br />referenced but does not exist, +  <br />replaced by a fixed one</div> + <!--l. 481--><p class="nopar" > These warnings may be ignored on the first run. + </p><!--l. 484--><p class="noindent" >If you get a <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">Missing</span><span class="ec-lmtt-10x-x-109"> \begin{document}</span></span></span> error, then it’s most likely that your version of <span class="ec-lmss-10x-x-109">xkeyval</span><a - id="dx1-4003"></a> is out of date. Check the log + id="dx1-6005"></a> is out of date. Check the log file for a warning of that nature. If this is the case, you will need to update the <span class="ec-lmss-10x-x-109">xkeyval </span>package. </p></li> <li - class="enumerate" id="x1-4005x2">Run <a - id="dx1-4006"></a><a + class="enumerate" id="x1-6007x2">Run <a + id="dx1-6008"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-4007"></a></a> on the document (<a -href="#x1-70001.3">§1.3 </a><a -href="#x1-70001.3">Generating the + id="dx1-6009"></a></a> on the document (<a +href="#sec:makeglossaries">§1.3 </a><a +href="#sec:makeglossaries">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a>). This can be done on a terminal either by typing <spacer type=vertical size=10><span class="obeylines-h"> - - - <br /><span class="ec-lmtt-10x-x-109">makeglossaries minimalgls</span></span> - <!--l. 435--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 494--><p class="noindent" ><spacer type=vertical size=10> or by typing <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">perl makeglossaries minimalgls</span></span> - </p><!--l. 439--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 498--><p class="noindent" ><spacer type=vertical size=10> If your system doesn’t recognise the command <span class="ec-lmtt-10x-x-109">perl </span>then it’s likely you don’t have Perl installed. In which case you will need to use <a - id="dx1-4008"></a><a + id="dx1-6010"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-4009"></a></a> directly. You can do this in a terminal by + id="dx1-6011"></a></a> directly. You can do this in a terminal by typing (all on one line): <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">makeindex -s minimalgls.ist -t minimalgls.glg -o</span> <span class="ec-lmtt-10x-x-109">minimalgls.gls minimalgls.glo</span></span> - </p><!--l. 446--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 505--><p class="noindent" ><spacer type=vertical size=10> (See <a -href="#x1-100001.3.3">§1.3.3 </a><a -href="#x1-100001.3.3">Using makeindex explicitly<!--tex4ht:ref: sec:makeindexapp --></a> for further details on +href="#sec:makeindexapp">§1.3.3 </a><a +href="#sec:makeindexapp">Using makeindex explicitly<!--tex4ht:ref: sec:makeindexapp --></a> for further details on using <a - id="dx1-4010"></a><span + id="dx1-6012"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-4011"></a> explicitly.) - </p><!--l. 450--><p class="noindent" >Note that if you need to specify the full path and the path + id="dx1-6013"></a> explicitly.) + </p><!--l. 509--><p class="noindent" >Note that if you need to specify the full path and the path contains spaces, you will need to delimit the file names with the double-quote character. </p></li> <li - class="enumerate" id="x1-4013x3">Run <span + class="enumerate" id="x1-6015x3">Run <span class="ec-lmtt-10x-x-109">minimalgls.tex </span>through <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> again (as step 1)</li></ol> - <!--l. 456--><p class="noindent" >You should now have a complete document. The number following + <!--l. 515--><p class="noindent" >You should now have a complete document. The number following each entry in the glossary is the location number. By default, this is the page number where the entry was referenced. + + + </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sample4col.tex</span> </dt><dd -class="description"> This document illustrates a four column glossary +class="ec-lmtk-10x-x-109">sample4col.tex</span> </dt><dd +class="description"><a + id="x1-6016r2"></a> This document illustrates a four column glossary where the entries have a symbol in addition to the name and description. To create the complete document, you need to do: <spacer type=vertical size=10><span class="obeylines-h"> @@ -1163,29 +1365,27 @@ class="ec-lmtt-10x-x-109">latex sample4col</span> class="ec-lmtt-10x-x-109">makeglossaries sample4col</span> <br /><span class="ec-lmtt-10x-x-109">latex sample4col</span></span> - <!--l. 468--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 527--><p class="noindent" ><spacer type=vertical size=10> As before, if you don’t have Perl installed, you will need to use <a - id="dx1-4014"></a><a + id="dx1-6017"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-4015"></a></a> directly instead of using <a - id="dx1-4016"></a><a + id="dx1-6018"></a></a> directly instead of using <a + id="dx1-6019"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-4017"></a></a>. The vertical + id="dx1-6020"></a></a>. The vertical gap between entries is the gap created at the start of each group. This can be suppressed using the <span class="ec-lmss-10x-x-109">nogroupskip</span><a - id="dx1-4018"></a> package + id="dx1-6021"></a> package option. </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sampleAcr.tex</span> </dt><dd -class="description"> This document has some sample acronyms. It also adds - - - +class="ec-lmtk-10x-x-109">sampleAcr.tex</span> </dt><dd +class="description"><a + id="x1-6022r3"></a> This document has some sample acronyms. It also adds the glossary to the table of contents, so an extra run through <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> is required to ensure the document is up to date: @@ -1198,11 +1398,12 @@ class="ec-lmtt-10x-x-109">makeglossaries sampleAcr</span> class="ec-lmtt-10x-x-109">latex sampleAcr</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleAcr</span></span> - <!--l. 484--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 543--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sampleAcrDesc.tex</span> </dt><dd -class="description"> This is similar to the previous example, except that +class="ec-lmtk-10x-x-109">sampleAcrDesc.tex</span> </dt><dd +class="description"><a + id="x1-6023r4"></a> This is similar to the previous example, except that the acronyms have an associated description. As with the previous example, the glossary is added to the table of contents, so an extra run through <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span @@ -1215,17 +1416,21 @@ class="ec-lmtt-10x-x-109">makeglossaries sampleAcrDesc</span> class="ec-lmtt-10x-x-109">latex sampleAcrDesc</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleAcrDesc</span></span> - <!--l. 495--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 554--><p class="noindent" ><spacer type=vertical size=10> + + + </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sampleDesc.tex</span> </dt><dd -class="description"> This is similar to the previous example, except that it +class="ec-lmtk-10x-x-109">sampleDesc.tex</span> </dt><dd +class="description"><a + id="x1-6024r5"></a> This is similar to the previous example, except that it defines the acronyms using <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-4019"></a> instead of + id="dx1-6025"></a> instead of <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-4020"></a>. As with the previous example, the glossary is added to + id="dx1-6026"></a>. As with the previous example, the glossary is added to the table of contents, so an extra run through <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> is required: <spacer type=vertical size=10><span class="obeylines-h"> @@ -1237,27 +1442,39 @@ class="ec-lmtt-10x-x-109">makeglossaries sampleDesc</span> class="ec-lmtt-10x-x-109">latex sampleDesc</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleDesc</span></span> - <!--l. 507--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 566--><p class="noindent" ><spacer type=vertical size=10> + </p></dd><dt class="description"> +<span +class="ec-lmtk-10x-x-109">sample-FnDesc.tex</span> </dt><dd +class="description"><a + id="x1-6027r6"></a> This example defines a custom display format that + puts the description in a footnote on first use. <spacer type=vertical size=10><span class="obeylines-h"> + <br /><span +class="ec-lmtt-10x-x-109">latex sample-FnDesc</span> + <br /><span +class="ec-lmtt-10x-x-109">makeglossaries sample-FnDesc</span> + <br /><span +class="ec-lmtt-10x-x-109">latex sample-FnDesc</span></span> + <!--l. 575--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sample-custom-acronym.tex</span> </dt><dd -class="description"> This document illustrates how to define +class="ec-lmtk-10x-x-109">sample-custom-acronym.tex</span> </dt><dd +class="description"><a + id="x1-6028r7"></a> This document illustrates how to define your own acronym style if the predefined styles don’t suit your requirements. <spacer type=vertical size=10><span class="obeylines-h"> - - - <br /><span class="ec-lmtt-10x-x-109">latex sample-custom-acronym</span> <br /><span class="ec-lmtt-10x-x-109">makeglossaries sample-custom-acronym</span> <br /><span class="ec-lmtt-10x-x-109">latex sample-custom-acronym</span></span> - <!--l. 516--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 584--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sample-crossref.tex</span> </dt><dd -class="description"> This document illustrates how to cross-reference +class="ec-lmtk-10x-x-109">sample-crossref.tex</span> </dt><dd +class="description"><a + id="x1-6029r8"></a> This document illustrates how to cross-reference entries in the glossary. <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">latex sample-crossref</span> @@ -1265,19 +1482,23 @@ class="ec-lmtt-10x-x-109">latex sample-crossref</span> class="ec-lmtt-10x-x-109">makeglossaries sample-crossref</span> <br /><span class="ec-lmtt-10x-x-109">latex sample-crossref</span></span> - <!--l. 525--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 593--><p class="noindent" ><spacer type=vertical size=10> + + + </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sampleDB.tex</span> </dt><dd -class="description"> This document illustrates how to load external files +class="ec-lmtk-10x-x-109">sampleDB.tex</span> </dt><dd +class="description"><a + id="x1-6030r9"></a> This document illustrates how to load external files containing the glossary definitions. It also illustrates how to define a new glossary type. This document has the <a - id="dx1-4021"></a><a + id="dx1-6031"></a><a href="#glo:numberlist">number list<a - id="dx1-4022"></a></a> suppressed + id="dx1-6032"></a></a> suppressed and uses <span class="ec-lmtt-10x-x-109">\glsaddall</span><a - id="dx1-4023"></a> to add all the entries to the glossaries without + id="dx1-6033"></a> to add all the entries to the glossaries without referencing each one explicitly. To create the document do: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span @@ -1286,52 +1507,50 @@ class="ec-lmtt-10x-x-109">latex sampleDB</span> class="ec-lmtt-10x-x-109">makeglossaries sampleDB</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleDB</span></span> - <!--l. 537--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 605--><p class="noindent" ><spacer type=vertical size=10> The glossary definitions are stored in the accompanying files <span class="ec-lmtt-10x-x-109">database1.tex </span>and <span class="ec-lmtt-10x-x-109">database2.tex</span>. Note that if you don’t have Perl installed, you will need to use <a - id="dx1-4024"></a><a + id="dx1-6034"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-4025"></a></a> twice instead of a single call + id="dx1-6035"></a></a> twice instead of a single call to <a - id="dx1-4026"></a><a + id="dx1-6036"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-4027"></a></a>: + id="dx1-6037"></a></a>: </p><ol class="enumerate1" > <li - class="enumerate" id="x1-4029x1">Create the main glossary: <spacer type=vertical size=10><span class="obeylines-h"> + class="enumerate" id="x1-6039x1">Create the main glossary (all on one line): <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">makeindex -s sampleDB.ist -t sampleDB.glg -o</span> <span class="ec-lmtt-10x-x-109">sampleDB.gls sampleDB.glo</span></span> - <!--l. 546--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 614--><p class="noindent" ><spacer type=vertical size=10> </p></li> <li - class="enumerate" id="x1-4031x2">Create the secondary glossary: <spacer type=vertical size=10><span class="obeylines-h"> - - - + class="enumerate" id="x1-6041x2">Create the secondary glossary (all on one line): <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">makeindex -s sampleDB.ist -t sampleDB.nlg -o</span> <span class="ec-lmtt-10x-x-109">sampleDB.not sampleDB.ntn</span></span> - <!--l. 550--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 618--><p class="noindent" ><spacer type=vertical size=10> </p></li></ol> </dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sampleEq.tex</span> </dt><dd -class="description"> This document illustrates how to change the location +class="ec-lmtk-10x-x-109">sampleEq.tex</span> </dt><dd +class="description"><a + id="x1-6042r10"></a> This document illustrates how to change the location to something other than the page number. In this case, the <span class="ec-lmtt-10x-x-109">equation </span>counter is used since all glossary entries appear inside an <span class="ec-lmss-10x-x-109">equation</span><a - id="dx1-4032"></a><a - id="dx1-4033"></a> environment. To create the document do: + id="dx1-6043"></a><a + id="dx1-6044"></a> environment. To create the document do: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">latex sampleEq</span> @@ -1339,15 +1558,19 @@ class="ec-lmtt-10x-x-109">latex sampleEq</span> class="ec-lmtt-10x-x-109">makeglossaries sampleEq</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleEq</span></span> - <!--l. 562--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 630--><p class="noindent" ><spacer type=vertical size=10> + + + </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sampleEqPg.tex</span> </dt><dd -class="description"> This is similar to the previous example, but the <a - id="dx1-4034"></a><a +class="ec-lmtk-10x-x-109">sampleEqPg.tex</span> </dt><dd +class="description"><a + id="x1-6045r11"></a> This is similar to the previous example, but the <a + id="dx1-6046"></a><a href="#glo:numberlist">number list<a - id="dx1-4035"></a>s</a> are a mixture of page numbers and equation numbers. This + id="dx1-6047"></a>s</a> are a mixture of page numbers and equation numbers. This example adds the glossary to the table of contents, so an extra <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> run is required: <spacer type=vertical size=10><span class="obeylines-h"> @@ -1359,11 +1582,12 @@ class="ec-lmtt-10x-x-109">makeglossaries sampleEqPg</span> class="ec-lmtt-10x-x-109">latex sampleEqPg</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleEqPg</span></span> - <!--l. 574--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 642--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sampleSec.tex</span> </dt><dd -class="description"> This document also illustrates how to change the location +class="ec-lmtk-10x-x-109">sampleSec.tex</span> </dt><dd +class="description"><a + id="x1-6048r12"></a> This document also illustrates how to change the location to something other than the page number. In this case, the <span class="ec-lmtt-10x-x-109">section </span>counter is used. This example adds the glossary to @@ -1378,14 +1602,12 @@ class="ec-lmtt-10x-x-109">makeglossaries sampleSec</span> class="ec-lmtt-10x-x-109">latex sampleSec</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleSec</span></span> - <!--l. 586--><p class="noindent" ><spacer type=vertical size=10> - - - + <!--l. 654--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sampleNtn.tex</span> </dt><dd -class="description"> This document illustrates how to create an additional +class="ec-lmtk-10x-x-109">sampleNtn.tex</span> </dt><dd +class="description"><a + id="x1-6049r13"></a> This document illustrates how to create an additional glossary type. This example adds the glossary to the table of contents, so an extra <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> run is required: <spacer type=vertical size=10><span class="obeylines-h"> @@ -1397,43 +1619,47 @@ class="ec-lmtt-10x-x-109">makeglossaries sampleNtn</span> class="ec-lmtt-10x-x-109">latex sampleNtn</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleNtn</span></span> - <!--l. 597--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 665--><p class="noindent" ><spacer type=vertical size=10> Note that if you don’t have Perl installed, you will need to use <a - id="dx1-4036"></a><a + id="dx1-6050"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-4037"></a></a> twice instead of a single call to <a - id="dx1-4038"></a><a + id="dx1-6051"></a></a> twice instead of a single call to <a + id="dx1-6052"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-4039"></a></a>: + id="dx1-6053"></a></a>: </p><ol class="enumerate1" > <li - class="enumerate" id="x1-4041x1">Create the main glossary: <spacer type=vertical size=10><span class="obeylines-h"> + class="enumerate" id="x1-6055x1">Create the main glossary (all on one line): <spacer type=vertical size=10><span class="obeylines-h"> + + + <br /><span class="ec-lmtt-10x-x-109">makeindex -s sampleNtn.ist -t sampleNtn.glg -o</span> <span class="ec-lmtt-10x-x-109">sampleNtn.gls sampleNtn.glo</span></span> - <!--l. 605--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 673--><p class="noindent" ><spacer type=vertical size=10> </p></li> <li - class="enumerate" id="x1-4043x2">Create the secondary glossary: <spacer type=vertical size=10><span class="obeylines-h"> + class="enumerate" id="x1-6057x2">Create the secondary glossary (all on one line): <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">makeindex -s sampleNtn.ist -t sampleNtn.nlg -o</span> <span class="ec-lmtt-10x-x-109">sampleNtn.not sampleNtn.ntn</span></span> - <!--l. 609--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 677--><p class="noindent" ><spacer type=vertical size=10> </p></li></ol> </dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sample.tex</span> </dt><dd -class="description"> This document illustrates some of the basics, including how to - create child entries that use the same name as the parent entry. +class="ec-lmtk-10x-x-109">sample.tex</span> </dt><dd +class="description"><a + id="x1-6058r14"></a> This document illustrates some of the basics, including how + to create child entries that use the same name as the parent entry. This example adds the glossary to the table of contents and it also uses <span class="ec-lmtt-10x-x-109">\glsrefentry</span><a - id="dx1-4044"></a>, so an extra <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span + id="dx1-6059"></a>, so an extra <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> run is required: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span @@ -1444,53 +1670,56 @@ class="ec-lmtt-10x-x-109">makeglossaries sample</span> class="ec-lmtt-10x-x-109">latex sample</span> <br /><span class="ec-lmtt-10x-x-109">latex sample</span></span> - <!--l. 622--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 690--><p class="noindent" ><spacer type=vertical size=10> You can see the difference between word and letter ordering if you substitute <span class="ec-lmss-10x-x-109">order=word</span><a - id="dx1-4045"></a> with <span + id="dx1-6060"></a> with <span class="ec-lmss-10x-x-109">order=letter</span><a - id="dx1-4046"></a>. (Note that this will only + id="dx1-6061"></a>. (Note that this will only have an effect if you use <a - id="dx1-4047"></a><a + id="dx1-6062"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-4048"></a></a>. If you use <a - id="dx1-4049"></a><a + id="dx1-6063"></a></a>. If you use <a + id="dx1-6064"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-4050"></a></a> + id="dx1-6065"></a></a> explicitly, you will need to use the <span class="ec-lmtt-10x-x-109">-l </span>switch to indicate letter ordering.) - - - </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sample-inline.tex</span> </dt><dd -class="description"> This document is like <span -class="ec-lmtt-10x-x-109">sample.tex</span>, above, but uses the - <span +class="ec-lmtk-10x-x-109">sample-inline.tex</span> </dt><dd +class="description"><a + id="x1-6066r15"></a> This document is like <span +class="ec-lmtt-10x-x-109">sample.tex</span>, above, but uses + the <span class="ec-lmss-10x-x-109">inline</span><a - id="dx1-4051"></a> glossary style to put the glossary in a footnote. + id="dx1-6067"></a> glossary style to put the glossary in a footnote. </dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sampletree.tex</span> </dt><dd -class="description"> This document illustrates a hierarchical glossary structure - where child entries have different names to their corresponding parent - entry. To create the document do: <spacer type=vertical size=10><span class="obeylines-h"> +class="ec-lmtk-10x-x-109">sampletree.tex</span> </dt><dd +class="description"><a + id="x1-6068r16"></a> This document illustrates a hierarchical glossary + structure where child entries have different names to their + corresponding parent entry. To create the document do: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">latex sampletree</span> <br /><span class="ec-lmtt-10x-x-109">makeglossaries sampletree</span> <br /><span class="ec-lmtt-10x-x-109">latex sampletree</span></span> - <!--l. 642--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 710--><p class="noindent" ><spacer type=vertical size=10> + + + </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sample-dual.tex</span> </dt><dd -class="description"> This document illustrates how to define an entry that +class="ec-lmtk-10x-x-109">sample-dual.tex</span> </dt><dd +class="description"><a + id="x1-6069r17"></a> This document illustrates how to define an entry that both appears in the list of acronyms and in the main glossary. To create the document do: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span @@ -1499,11 +1728,12 @@ class="ec-lmtt-10x-x-109">latex sample-dual</span> class="ec-lmtt-10x-x-109">makeglossaries sample-dual</span> <br /><span class="ec-lmtt-10x-x-109">latex sample-dual</span></span> - <!--l. 651--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 719--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sample-langdict</span> </dt><dd -class="description"> This document illustrates how to use the glossaries +class="ec-lmtk-10x-x-109">sample-langdict.tex</span> </dt><dd +class="description"><a + id="x1-6070r18"></a> This document illustrates how to use the glossaries package to create English to French and French to English dictionaries. To create the document do: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span @@ -1512,83 +1742,84 @@ class="ec-lmtt-10x-x-109">latex sample-langdict</span> class="ec-lmtt-10x-x-109">makeglossaries sample-langdict</span> <br /><span class="ec-lmtt-10x-x-109">latex sample-langdict</span></span> - <!--l. 661--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 729--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">samplexdy.tex</span> </dt><dd -class="description"> This document illustrates how to use the <span -class="ec-lmss-10x-x-109">glossaries </span>package - with <a - id="dx1-4052"></a><a +class="ec-lmtk-10x-x-109">samplexdy.tex</span> </dt><dd +class="description"><a + id="x1-6071r19"></a> This document illustrates how to use the <span +class="ec-lmss-10x-x-109">glossaries</span> + package with <a + id="dx1-6072"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-4053"></a></a> instead of <a - id="dx1-4054"></a><a + id="dx1-6073"></a></a> instead of <a + id="dx1-6074"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-4055"></a></a>. The document uses UTF8 + id="dx1-6075"></a></a>. The document uses UTF8 encoding (with the <span class="ec-lmss-10x-x-109">inputenc</span><a - id="dx1-4056"></a> package). The encoding is picked up by + id="dx1-6076"></a> package). The encoding is picked up by <a - id="dx1-4057"></a><a + id="dx1-6077"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-4058"></a></a>. By default, this document will create a <a - id="dx1-4059"></a><a + id="dx1-6078"></a></a>. By default, this document will create a <a + id="dx1-6079"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-4060"></a></a> + id="dx1-6080"></a></a> style file called <span class="ec-lmtt-10x-x-109">samplexdy.xdy</span>, but if you uncomment the lines - <div class="verbatim" id="verbatim-1"> + <div class="verbatim" id="verbatim-2"> \setStyleFile{samplexdy-mc}  <br />\noist  <br />\GlsSetXdyLanguage{} </div> - <!--l. 674--><p class="nopar" > it will set the style file to <span + <!--l. 742--><p class="nopar" > it will set the style file to <span class="ec-lmtt-10x-x-109">samplexdy-mc.xdy </span>instead. This provides an additional letter group for entries starting with “Mc” or “Mac”. If you use <a - id="dx1-4061"></a><a + id="dx1-6081"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-4062"></a></a>, you don’t need to supply any additional + id="dx1-6082"></a></a>, you don’t need to supply any additional information. If you don’t use <a - id="dx1-4063"></a><span + id="dx1-6083"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-4064"></a>, you will need to + id="dx1-6084"></a>, you will need to specify the required information. Note that if you set the style file to <span class="ec-lmtt-10x-x-109">samplexdy-mc.xdy </span>you must also specify <span class="ec-lmtt-10x-x-109">\noist</span><a - id="dx1-4065"></a>, otherwise the + id="dx1-6085"></a>, otherwise the <span class="ec-lmss-10x-x-109">glossaries </span>package will overwrite <span class="ec-lmtt-10x-x-109">samplexdy-mc.xdy </span>and you will lose the “Mc” letter group. - </p><!--l. 686--><p class="noindent" >To create the document do: <spacer type=vertical size=10><span class="obeylines-h"> + </p><!--l. 754--><p class="noindent" >To create the document do: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">latex samplexdy</span> <br /><span class="ec-lmtt-10x-x-109">makeglossaries samplexdy</span> <br /><span class="ec-lmtt-10x-x-109">latex samplexdy</span></span> - </p><!--l. 691--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 759--><p class="noindent" ><spacer type=vertical size=10> If you don’t have Perl installed, you will have to call <a - id="dx1-4066"></a><a + id="dx1-6086"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-4067"></a></a> + id="dx1-6087"></a></a> explicitly instead of using <a - id="dx1-4068"></a><a + id="dx1-6088"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-4069"></a></a>. If you are using the + id="dx1-6089"></a></a>. If you are using the default style file <span class="ec-lmtt-10x-x-109">samplexdy.xdy</span>, then do (no line breaks): <spacer type=vertical size=10><span class="obeylines-h"> @@ -1596,7 +1827,7 @@ class="ec-lmtt-10x-x-109">samplexdy.xdy</span>, then do (no line breaks): class="ec-lmtt-10x-x-109">xindy -L english -C utf8 -I xindy -M samplexdy -t</span> <span class="ec-lmtt-10x-x-109">samplexdy.glg -o samplexdy.gls samplexdy.glo</span></span> - </p><!--l. 698--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 766--><p class="noindent" ><spacer type=vertical size=10> otherwise, if you are using <span class="ec-lmtt-10x-x-109">samplexdy-mc.xdy</span>, then do (no line breaks): <spacer type=vertical size=10><span class="obeylines-h"> @@ -1604,18 +1835,19 @@ class="ec-lmtt-10x-x-109">samplexdy-mc.xdy</span>, then do (no line class="ec-lmtt-10x-x-109">xindy -I xindy -M samplexdy-mc -t samplexdy.glg -o</span> <span class="ec-lmtt-10x-x-109">samplexdy.gls samplexdy.glo</span></span> - </p><!--l. 703--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 771--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">samplexdy2.tex</span> </dt><dd -class="description"> This document illustrates how to use the <span +class="ec-lmtk-10x-x-109">samplexdy2.tex</span> </dt><dd +class="description"><a + id="x1-6090r20"></a> This document illustrates how to use the <span class="ec-lmss-10x-x-109">glossaries</span> package where the location numbers don’t follow a standard format. This example will only work with <a - id="dx1-4070"></a><a + id="dx1-6091"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-4071"></a></a>. To create the document do: + id="dx1-6092"></a></a>. To create the document do: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">pdflatex samplexdy2</span> @@ -1626,37 +1858,39 @@ class="ec-lmtt-10x-x-109">pdflatex samplexdy2</span> class="ec-lmtt-10x-x-109">makeglossaries samplexdy2</span> <br /><span class="ec-lmtt-10x-x-109">pdflatex samplexdy2</span></span> - <!--l. 713--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 781--><p class="noindent" ><spacer type=vertical size=10> If you can’t use <a - id="dx1-4072"></a><a + id="dx1-6093"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-4073"></a></a> then you need to do: <spacer type=vertical size=10><span class="obeylines-h"> + id="dx1-6094"></a></a> then you need to do (all on one + line): <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">xindy -L english -C utf8 -I xindy -M samplexdy2 -t</span> <span class="ec-lmtt-10x-x-109">samplexdy2.glg -o samplexdy2.gls samplexdy2.glo</span></span> - </p><!--l. 717--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 786--><p class="noindent" ><spacer type=vertical size=10> See <a -href="#x1-3800011.2">§11.2 </a><a -href="#x1-3800011.2">Locations and Number lists<!--tex4ht:ref: sec:xindyloc --></a> for further details. +href="#sec:xindyloc">§11.2 </a><a +href="#sec:xindyloc">Locations and Number lists<!--tex4ht:ref: sec:xindyloc --></a> for further details. </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sampleutf8.tex</span> </dt><dd -class="description"> This is another example that uses <a - id="dx1-4074"></a><a +class="ec-lmtk-10x-x-109">sampleutf8.tex</span> </dt><dd +class="description"><a + id="x1-6095r21"></a> This is another example that uses <a + id="dx1-6096"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-4075"></a></a>. Unlike + id="dx1-6097"></a></a>. Unlike <a - id="dx1-4076"></a><a + id="dx1-6098"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-4077"></a></a>, <a - id="dx1-4078"></a><a + id="dx1-6099"></a></a>, <a + id="dx1-6100"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-4079"></a></a> can cope with accented or non-Latin characters. + id="dx1-6101"></a></a> can cope with accented or non-Latin characters. This document uses UTF8 encoding. To create the document do: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span @@ -1665,26 +1899,26 @@ class="ec-lmtt-10x-x-109">latex sampleutf8</span> class="ec-lmtt-10x-x-109">makeglossaries sampleutf8</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleutf8</span></span> - <!--l. 728--><p class="noindent" ><spacer type=vertical size=10> + <!--l. 797--><p class="noindent" ><spacer type=vertical size=10> If you don’t have Perl installed, you will have to call <a - id="dx1-4080"></a><a + id="dx1-6102"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-4081"></a></a> + id="dx1-6103"></a></a> explicitly instead of using <a - id="dx1-4082"></a><a + id="dx1-6104"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-4083"></a></a> (no line breaks): + id="dx1-6105"></a></a> (no line breaks): <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">xindy -L english -C utf8 -I xindy -M sampleutf8 -t</span> <span class="ec-lmtt-10x-x-109">sampleutf8.glg -o sampleutf8.gls sampleutf8.glo</span></span> - </p><!--l. 734--><p class="noindent" ><spacer type=vertical size=10> - </p><!--l. 736--><p class="noindent" >If you remove the <span + </p><!--l. 803--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 805--><p class="noindent" >If you remove the <span class="ec-lmss-10x-x-109">xindy</span><a - id="dx1-4084"></a> option from <span + id="dx1-6106"></a> option from <span class="ec-lmtt-10x-x-109">sampleutf8.tex </span>and do: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span @@ -1693,19 +1927,19 @@ class="ec-lmtt-10x-x-109">latex sampleutf8</span> class="ec-lmtt-10x-x-109">makeglossaries sampleutf8</span> <br /><span class="ec-lmtt-10x-x-109">latex sampleutf8</span></span> - </p><!--l. 742--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 811--><p class="noindent" ><spacer type=vertical size=10> you will see that the entries that start with a non-Latin character now appear in the symbols group, and the word “manœuvre” is now after “manor” instead of before it. If you are unable to use <a - id="dx1-4085"></a><a + id="dx1-6107"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-4086"></a></a>, the call to <a - id="dx1-4087"></a><a + id="dx1-6108"></a></a>, the call to <a + id="dx1-6109"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-4088"></a></a> is as follows (no line breaks): + id="dx1-6110"></a></a> is as follows (no line breaks): <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">makeindex -s sampleutf8.ist -t sampleutf8.glg -o</span> @@ -1714,225 +1948,329 @@ class="ec-lmtt-10x-x-109">sampleutf8.gls sampleutf8.glo</span></span> - </p><!--l. 750--><p class="noindent" ><spacer type=vertical size=10> + </p><!--l. 819--><p class="noindent" ><spacer type=vertical size=10> </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sampleaccsupp.tex</span> </dt><dd -class="description"> This document uses the experimental <span +class="ec-lmtk-10x-x-109">sample-index.tex</span> </dt><dd +class="description"><a + id="x1-6111r22"></a> This document uses the <span +class="ec-lmss-10x-x-109">glossaries </span>package + to create both a glossary and an index. This requires two + <a + id="dx1-6112"></a><a +href="#glo:makeglossaries"><span +class="ec-lmtt-10x-x-109">makeglossaries</span><a + id="dx1-6113"></a></a> calls to ensure the document is up to date: + <spacer type=vertical size=10><span class="obeylines-h"> + <br /><span +class="ec-lmtt-10x-x-109">latex sample-index</span> + <br /><span +class="ec-lmtt-10x-x-109">makeglossaries sample-index</span> + <br /><span +class="ec-lmtt-10x-x-109">latex sample-index</span> + <br /><span +class="ec-lmtt-10x-x-109">makeglossaries sample-index</span> + <br /><span +class="ec-lmtt-10x-x-109">latex sample-index</span></span> + <!--l. 831--><p class="noindent" ><spacer type=vertical size=10> + </p></dd><dt class="description"> +<span +class="ec-lmtk-10x-x-109">sample-newkeys.tex</span> </dt><dd +class="description"><a + id="x1-6114r23"></a> This document illustrates how add custom + keys. + </dd><dt class="description"> +<span +class="ec-lmtk-10x-x-109">sample-numberlist.tex</span> </dt><dd +class="description"><a + id="x1-6115r24"></a> This document illustrates how to reference the + <a + id="dx1-6116"></a><a +href="#glo:numberlist">number list<a + id="dx1-6117"></a></a> in the document text. This requires an additional + <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span +class="E">E</span>X</span></span> run: <spacer type=vertical size=10><span class="obeylines-h"> + <br /><span +class="ec-lmtt-10x-x-109">latex sample-numberlist</span> + <br /><span +class="ec-lmtt-10x-x-109">makeglossaries sample-numberlist</span> + <br /><span +class="ec-lmtt-10x-x-109">latex sample-numberlist</span> + <br /><span +class="ec-lmtt-10x-x-109">latex sample-numberlist</span></span> + <!--l. 843--><p class="noindent" ><spacer type=vertical size=10> + </p></dd><dt class="description"> +<span +class="ec-lmtk-10x-x-109">samplePeople.tex</span> </dt><dd +class="description"><a + id="x1-6118r25"></a> This document illustrates how you can hook into the + standard sort mechanism to adjust the way the sort key is set. This + requires an additional run to ensure the table of contents is + up-to-date: <spacer type=vertical size=10><span class="obeylines-h"> + <br /><span +class="ec-lmtt-10x-x-109">latex samplePeople</span> + <br /><span +class="ec-lmtt-10x-x-109">makeglossaries samplePeople</span> + <br /><span +class="ec-lmtt-10x-x-109">latex samplePeople</span> + <br /><span +class="ec-lmtt-10x-x-109">latex samplePeople</span></span> + + + + <!--l. 854--><p class="noindent" ><spacer type=vertical size=10> + </p></dd><dt class="description"> +<span +class="ec-lmtk-10x-x-109">sampleSort.tex</span> </dt><dd +class="description"><a + id="x1-6119r26"></a> This is another document that illustrates how to hook + into the standard sort mechanism. An additional run is required to + ensure the table of contents is up-to-date: <spacer type=vertical size=10><span class="obeylines-h"> + <br /><span +class="ec-lmtt-10x-x-109">latex sampleSort</span> + <br /><span +class="ec-lmtt-10x-x-109">makeglossaries sampleSort</span> + <br /><span +class="ec-lmtt-10x-x-109">latex sampleSort</span> + <br /><span +class="ec-lmtt-10x-x-109">latex sampleSort</span></span> + <!--l. 864--><p class="noindent" ><spacer type=vertical size=10> + </p></dd><dt class="description"> +<span +class="ec-lmtk-10x-x-109">sample-nomathhyper.tex</span> </dt><dd +class="description"><a + id="x1-6120r27"></a> This document illustrates how to selective + enable and disable entry hyperlinks in <span +class="ec-lmtt-10x-x-109">\glsentryfmt</span><a + id="dx1-6121"></a>. + </dd><dt class="description"> +<span +class="ec-lmtk-10x-x-109">sample-entryfmt.tex</span> </dt><dd +class="description"><a + id="x1-6122r28"></a> This document illustrates how to change the way + an entry is displayed in the text. + </dd><dt class="description"> +<span +class="ec-lmtk-10x-x-109">sample-prefix.tex</span> </dt><dd +class="description"><a + id="x1-6123r29"></a> This document illustrates the use of the <span +class="ec-lmss-10x-x-109">glossaries-prefix</span><a + id="dx1-6124"></a> + package. An additional run is required to ensure the table of contents + is up-to-date: <spacer type=vertical size=10><span class="obeylines-h"> + <br /><span +class="ec-lmtt-10x-x-109">latex sample-prefix</span> + <br /><span +class="ec-lmtt-10x-x-109">makeglossaries sample-prefix</span> + <br /><span +class="ec-lmtt-10x-x-109">latex sample-prefix</span> + <br /><span +class="ec-lmtt-10x-x-109">latex sample-prefix</span></span> + <!--l. 880--><p class="noindent" ><spacer type=vertical size=10> + </p></dd><dt class="description"> +<span +class="ec-lmtk-10x-x-109">sampleaccsupp.tex</span> </dt><dd +class="description"><a + id="x1-6125r30"></a> This document uses the experimental <span class="ec-lmss-10x-x-109">glossaries-accsupp</span><a - id="dx1-4089"></a> + id="dx1-6126"></a> package. The symbol is set to the replacement text. Note that some PDF viewers don’t use the accessibility support. Information about the <span class="ec-lmss-10x-x-109">glossaries-accsupp </span>package can be found in <a -href="#x1-6100018">§18 </a><a -href="#x1-6100018">Accessibility +href="#sec:accsupp">§19 </a><a +href="#sec:accsupp">Accessibility Support<!--tex4ht:ref: sec:accsupp --></a>. </dd></dl> -<!--l. 762--><p class="noindent" > + + + +<!--l. 892--><p class="noindent" > </p> -<!--l. 762--><p class="noindent" ><a +<!--l. 892--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">1.2</span>  <a - id="x1-50001.2"></a>Multi-Lingual Support</h3> -<!--l. 765--><p class="noindent" >As from version 1.17, the <span + id="sec:languages"></a>Multi-Lingual Support</h3> +<!--l. 895--><p class="noindent" >As from version 1.17, the <span class="ec-lmss-10x-x-109">glossaries </span>package can now be used with <a - id="dx1-5001"></a><a + id="dx1-7001"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-5002"></a></a> + id="dx1-7002"></a></a> as well as <a - id="dx1-5003"></a><a + id="dx1-7003"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-5004"></a></a>. If you are writing in a language that uses + id="dx1-7004"></a></a>. If you are writing in a language that uses accented characters or non-Latin characters it is recommended that you use <a - id="dx1-5005"></a><span + id="dx1-7005"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-5006"></a> as <a - id="dx1-5007"></a><span + id="dx1-7006"></a> as <a + id="dx1-7007"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-5008"></a> is hard-coded for Latin languages. This + id="dx1-7008"></a> is hard-coded for Latin languages. This means that you are not restricted to the A, …, Z letter groups. If you want to use <a - id="dx1-5009"></a><span + id="dx1-7009"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-5010"></a>, remember to use the <span + id="dx1-7010"></a>, remember to use the <span class="ec-lmss-10x-x-109">xindy</span><a - id="dx1-5011"></a> package option. For + id="dx1-7011"></a> package option. For example: </p> - <div class="verbatim" id="verbatim-2"> + <div class="verbatim" id="verbatim-3"> \documentclass[frenchb]{article}  <br />\usepackage[utf8]{inputenc}  <br />\usepackage[T1]{fontenc}  <br />\usepackage{babel}  <br />\usepackage[xindy]{glossaries} </div> -<!--l. 779--><p class="nopar" > -</p><!--l. 781--><p class="indent" > <div class="important" title="Important Note"> Note that although an accented character, such as é, looks like a plain +<!--l. 909--><p class="nopar" > +</p><!--l. 911--><p class="indent" > <div class="important" title="Important Note"> Note that although an accented character, such as é, looks like a plain character in your tex file, it’s actually a macro and can therefore cause -problems. -</p><!--l. 786--><p class="indent" > - </p><ol class="enumerate1" > - <li - class="enumerate" id="x1-5013x1">If you use an accented (or other expandable) character at - the start of an entry name, you must place it in a group, or - it will cause a problem for commands that convert the first - letter to uppercase (e.g. <span +expansion problems. You may need to switch off the field expansions with +<span +class="ec-lmtt-10x-x-109">\glsnoexpandfields</span>. +</p><!--l. 917--><p class="indent" > If you use an accented (or other expandable) character at the start of an +entry name, you must place it in a group, or it will cause a problem for +commands that convert the first letter to uppercase (e.g. <span class="ec-lmtt-10x-x-109">\Gls</span><a - id="dx1-5014"></a>) due to expansion issues. For - example: + id="dx1-7012"></a>) due to +expansion issues. For example: - <div class="verbatim" id="verbatim-3"> - \newglossaryentry{elite}{name={{é}lite}, -  <br />description={select group or class}} -</div> - <!--l. 795--><p class="nopar" > - </p></li> - <li - class="enumerate" id="x1-5016x2">If you use an accented (or other expandable) character in an entry - name and you haven’t switched off the <span -class="ec-lmss-10x-x-109">name</span><a - id="dx1-5017"></a> key <a - id="dx1-5018"></a><a -href="#glo:sanitize">sanitization<a - id="dx1-5019"></a></a>, you - must use commands like <span -class="ec-lmtt-10x-x-109">\glsentrytext</span><a - id="dx1-5020"></a> or <span -class="ec-lmtt-10x-x-109">\glstext</span><a - id="dx1-5021"></a> instead of - <span -class="ec-lmtt-10x-x-109">\glsentryname</span><a - id="dx1-5022"></a> or <span -class="ec-lmtt-10x-x-109">\glsname</span><a - id="dx1-5023"></a> or you will end up with strange looking - characters in your document. - </li></ol> +</p> + <div class="verbatim" id="verbatim-4"> +\newglossaryentry{elite}{name={{é}lite}, + <br />description={select group or class}} </div> -<!--l. 805--><p class="noindent" > -</p><!--l. 807--><p class="indent" > If you use the <span +<!--l. 924--><p class="nopar" > </div> +</p><!--l. 925--><p class="noindent" > +</p><!--l. 927--><p class="indent" > If you use the <span class="ec-lmss-10x-x-109">inputenc</span><a - id="dx1-5024"></a> package, <a - id="dx1-5025"></a><a + id="dx1-7013"></a> package, <a + id="dx1-7014"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-5026"></a></a> will pick up the + id="dx1-7015"></a></a> will pick up the encoding from the auxiliary file. If you use <a - id="dx1-5027"></a><a + id="dx1-7016"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-5028"></a></a> explicitly instead of via + id="dx1-7017"></a></a> explicitly instead of via <a - id="dx1-5029"></a><span + id="dx1-7018"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-5030"></a>, you may need to specify the encoding using the <span + id="dx1-7019"></a>, you may need to specify the encoding using the <span class="ec-lmtt-10x-x-109">-C</span> option. Read the <a - id="dx1-5031"></a><span + id="dx1-7020"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-5032"></a> manual for further details. -</p><!--l. 813--><p class="noindent" > + id="dx1-7021"></a> manual for further details. +</p><!--l. 933--><p class="noindent" > </p> -<!--l. 813--><p class="noindent" ><a +<!--l. 933--><p class="noindent" ><a href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">1.2.1</span>  <a - id="x1-60001.2.1"></a>Changing the Fixed Names</h4> -<!--l. 816--><p class="noindent" >As from version 1.08, the <span + id="sec:fixednames"></a>Changing the Fixed Names</h4> +<!--l. 936--><p class="noindent" >As from version 1.08, the <span class="ec-lmss-10x-x-109">glossaries </span>package now has limited multi-lingual support, thanks to all the people who have sent me the relevant translations either via email or via <span class="ec-lmtt-10x-x-109">comp.text.tex</span>. However you must load <span class="ec-lmss-10x-x-109">babel</span><a - id="dx1-6001"></a> or <span + id="dx1-8001"></a> or <span class="ec-lmss-10x-x-109">polyglossia</span><a - id="dx1-6002"></a> <span + id="dx1-8002"></a> <span class="ec-lmri-10x-x-109">before </span><span class="ec-lmss-10x-x-109">glossaries </span>to enable this. Note that if <span class="ec-lmss-10x-x-109">babel</span><a - id="dx1-6003"></a> is + id="dx1-8003"></a> is loaded and the <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-6004"></a> package is detected on <span class="TEX">T<span + id="dx1-8004"></a> package is detected on <span class="TEX">T<span class="E">E</span>X</span>’s path, then the <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-6005"></a> package will be loaded automatically. However, it may not pick -up on the required languages so, if the predefined text is not translated, -you may need to explicitly load the <span + id="dx1-8005"></a> package will be loaded automatically, unless you use the +<span +class="ec-lmss-10x-x-109">translate=false</span><a + id="dx1-8006"></a> or <span +class="ec-lmss-10x-x-109">translate=babel</span><a + id="dx1-8007"></a> package options. However, it may not +pick up on the required languages so, if the predefined text is not +translated, you may need to explicitly load the <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-6006"></a> package with the required -languages. For example: + id="dx1-8008"></a> package with the +required languages. For example: </p> - <div class="verbatim" id="verbatim-4"> + <div class="verbatim" id="verbatim-5"> \usepackage[spanish]{babel}  <br />\usepackage[spanish]{translator}  <br />\usepackage{glossaries} </div> -<!--l. 831--><p class="nopar" > Alternatively, specify the language as a class option rather than a package +<!--l. 953--><p class="nopar" > Alternatively, specify the language as a class option rather than a package option. For example: </p> - <div class="verbatim" id="verbatim-5"> + <div class="verbatim" id="verbatim-6"> \documentclass[spanish]{report}  <br />\usepackage{babel}  <br />\usepackage{glossaries} </div> -<!--l. 839--><p class="nopar" > -</p><!--l. 841--><p class="indent" > If you want to use <span +<!--l. 961--><p class="nopar" > +</p><!--l. 963--><p class="indent" > If you want to use <span class="ec-lmss-10x-x-109">ngerman</span><a - id="dx1-6007"></a> or <span + id="dx1-8009"></a> or <span class="ec-lmss-10x-x-109">german</span><a - id="dx1-6008"></a> instead of <span + id="dx1-8010"></a> instead of <span class="ec-lmss-10x-x-109">babel</span><a - id="dx1-6009"></a>, you will need + id="dx1-8011"></a>, you will need to include the <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-6010"></a> package to provide the translations. For + id="dx1-8012"></a> package to provide the translations. For example: </p> - <div class="verbatim" id="verbatim-6"> + <div class="verbatim" id="verbatim-7"> \documentclass[ngerman]{article}  <br />\usepackage{ngerman}  <br />\usepackage{translator}  <br />\usepackage{glossaries} </div> -<!--l. 849--><p class="nopar" > -</p><!--l. 851--><p class="indent" > The languages are currently supported by the <span +<!--l. 971--><p class="nopar" > +</p><!--l. 973--><p class="indent" > The languages are currently supported by the <span class="ec-lmss-10x-x-109">glossaries </span>package are listed in <a -href="#x1-60111">table 1.1</a>. Please note that (apart from spelling mistakes) I don’t +href="#x1-80131">table 1.1</a>. Please note that (apart from spelling mistakes) I don’t intend to change the default translations as it will cause compatibility problems. -</p><!--l. 857--><p class="indent" > <a - id="x1-60111"></a></p><hr class="float" /><div class="float" +</p><!--l. 979--><p class="indent" > <a + id="x1-80131"></a></p><hr class="float" /><div class="float" > <div class="caption"><table class="caption" ><tr style="vertical-align:baseline;" class="caption"><td class="id">Table 1.1: </td><td -class="content">Supported Languages</td></tr></table></div><!--tex4ht:label?: x1-60111 --> +class="content">Supported Languages</td></tr></table></div><!--tex4ht:label?: x1-80131 --> <div class="center" > -<!--l. 860--><p class="noindent" > +<!--l. 982--><p class="noindent" > </p> <div class="tabular"> <table id="TBL-2" class="tabular" cellspacing="0" cellpadding="0" @@ -1995,23 +2333,23 @@ class="td11"> 1.08 </td></tr></table></div></div> </div><hr class="endfloat" /> -<!--l. 879--><p class="indent" > The language dependent commands and <span +<!--l. 1001--><p class="indent" > The language dependent commands and <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-6012"></a> keys used by the + id="dx1-8014"></a> keys used by the glossaries package are listed in <a -href="#x1-60132">table 1.2</a>. +href="#x1-80152">table 1.2</a>. -</p><!--l. 882--><p class="indent" > <a - id="x1-60132"></a></p><hr class="float" /><div class="float" +</p><!--l. 1004--><p class="indent" > <a + id="x1-80152"></a></p><hr class="float" /><div class="float" > <div class="caption"><table class="caption" ><tr style="vertical-align:baseline;" class="caption"><td class="id">Table 1.2: </td><td -class="content">Customised Text</td></tr></table></div><!--tex4ht:label?: x1-60132 --> +class="content">Customised Text</td></tr></table></div><!--tex4ht:label?: x1-80152 --> @@ -2024,22 +2362,22 @@ id="TBL-3-3" /></colgroup><tr style="vertical-align:baseline;" id="TBL-3-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-1-1" class="td01"><span class="ec-lmbx-10x-x-109">Command Name </span></td><td style="white-space:wrap; text-align:left;" id="TBL-3-1-2" -class="td11"> <!--l. 888--><p class="noindent" ><span +class="td11"> <!--l. 1010--><p class="noindent" ><span class="ec-lmbx-10x-x-109">Translator</span> <span class="ec-lmbx-10x-x-109">Key</span> <span class="ec-lmbx-10x-x-109">Word</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-1-3" -class="td10"> <!--l. 889--><p class="noindent" ><span +class="td10"> <!--l. 1011--><p class="noindent" ><span class="ec-lmbx-10x-x-109">Purpose</span> </p></td> </tr><tr style="vertical-align:baseline;" id="TBL-3-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-2-1" class="td01"><span class="ec-lmtt-10x-x-109">\glossaryname</span><a - id="dx1-6014"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-2-2" -class="td11"> <!--l. 890--><p class="noindent" ><span + id="dx1-8016"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-2-2" +class="td11"> <!--l. 1012--><p class="noindent" ><span class="ec-lmtt-10x-x-109">Glossary</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-2-3" -class="td10"> <!--l. 890--><p class="noindent" >Title +class="td10"> <!--l. 1012--><p class="noindent" >Title of the main @@ -2048,10 +2386,10 @@ class="td10"> <!--l. 890--><p class="noindent" >Title style="vertical-align:baseline;" id="TBL-3-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-3-1" class="td01"><span class="ec-lmtt-10x-x-109">\acronymname</span><a - id="dx1-6015"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-3-2" -class="td11"> <!--l. 891--><p class="noindent" ><span + id="dx1-8017"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-3-2" +class="td11"> <!--l. 1013--><p class="noindent" ><span class="ec-lmtt-10x-x-109">Acronyms</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-3-3" -class="td10"> <!--l. 891--><p class="noindent" >Title +class="td10"> <!--l. 1013--><p class="noindent" >Title of the list @@ -2064,17 +2402,17 @@ class="td10"> <!--l. 891--><p class="noindent" >Title option <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-6016"></a>). </p></td> + id="dx1-8018"></a>). </p></td> </tr><tr style="vertical-align:baseline;" id="TBL-3-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-4-1" class="td01"><span class="ec-lmtt-10x-x-109">\entryname</span><a - id="dx1-6017"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-4-2" -class="td11"> <!--l. 893--><p class="noindent" ><span + id="dx1-8019"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-4-2" +class="td11"> <!--l. 1015--><p class="noindent" ><span class="ec-lmtt-10x-x-109">Notation</span> <span class="ec-lmtt-10x-x-109">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-4-3" -class="td10"> <!--l. 894--><p class="noindent" >Header +class="td10"> <!--l. 1016--><p class="noindent" >Header for first column @@ -2095,12 +2433,12 @@ class="td10"> <!--l. 894--><p class="noindent" >Header style="vertical-align:baseline;" id="TBL-3-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-5-1" class="td01"><span class="ec-lmtt-10x-x-109">\descriptionname</span><a - id="dx1-6018"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-5-2" -class="td11"> <!--l. 896--><p class="noindent" ><span + id="dx1-8020"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-5-2" +class="td11"> <!--l. 1018--><p class="noindent" ><span class="ec-lmtt-10x-x-109">Description</span> <span class="ec-lmtt-10x-x-109">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-5-3" -class="td10"> <!--l. 897--><p class="noindent" >Header +class="td10"> <!--l. 1019--><p class="noindent" >Header for second column @@ -2121,12 +2459,12 @@ class="td10"> <!--l. 897--><p class="noindent" >Header style="vertical-align:baseline;" id="TBL-3-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-6-1" class="td01"><span class="ec-lmtt-10x-x-109">\symbolname</span><a - id="dx1-6019"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-6-2" -class="td11"> <!--l. 899--><p class="noindent" ><span + id="dx1-8021"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-6-2" +class="td11"> <!--l. 1021--><p class="noindent" ><span class="ec-lmtt-10x-x-109">Symbol</span> <span class="ec-lmtt-10x-x-109">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-6-3" -class="td10"> <!--l. 899--><p class="noindent" >Header +class="td10"> <!--l. 1021--><p class="noindent" >Header for symbol column @@ -2144,14 +2482,14 @@ class="td10"> <!--l. 899--><p class="noindent" >Header style="vertical-align:baseline;" id="TBL-3-7-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-7-1" class="td01"><span class="ec-lmtt-10x-x-109">\pagelistname</span><a - id="dx1-6020"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-7-2" -class="td11"> <!--l. 901--><p class="noindent" ><span + id="dx1-8022"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-7-2" +class="td11"> <!--l. 1023--><p class="noindent" ><span class="ec-lmtt-10x-x-109">Page</span> <span class="ec-lmtt-10x-x-109">List</span> <span class="ec-lmtt-10x-x-109">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-7-3" -class="td10"> <!--l. 902--><p class="noindent" >Header +class="td10"> <!--l. 1024--><p class="noindent" >Header for page list @@ -2169,12 +2507,12 @@ class="td10"> <!--l. 902--><p class="noindent" >Header style="vertical-align:baseline;" id="TBL-3-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-8-1" class="td01"><span class="ec-lmtt-10x-x-109">\glssymbolsgroupname</span><a - id="dx1-6021"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-8-2" -class="td11"> <!--l. 904--><p class="noindent" ><span + id="dx1-8023"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-8-2" +class="td11"> <!--l. 1026--><p class="noindent" ><span class="ec-lmtt-10x-x-109">Symbols</span> <span class="ec-lmtt-10x-x-109">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-8-3" -class="td10"> <!--l. 905--><p class="noindent" >Header +class="td10"> <!--l. 1027--><p class="noindent" >Header for symbols section @@ -2192,12 +2530,12 @@ class="td10"> <!--l. 905--><p class="noindent" >Header style="vertical-align:baseline;" id="TBL-3-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-9-1" class="td01"><span class="ec-lmtt-10x-x-109">\glsnumbersgroupname</span><a - id="dx1-6022"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-9-2" -class="td11"> <!--l. 907--><p class="noindent" ><span + id="dx1-8024"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-9-2" +class="td11"> <!--l. 1029--><p class="noindent" ><span class="ec-lmtt-10x-x-109">Numbers</span> <span class="ec-lmtt-10x-x-109">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-9-3" -class="td10"> <!--l. 907--><p class="noindent" >Header +class="td10"> <!--l. 1029--><p class="noindent" >Header for numbers section @@ -2219,34 +2557,36 @@ class="td10"> <!--l. 907--><p class="noindent" >Header </div><hr class="endfloat" /> -<!--l. 913--><p class="indent" > Due to the varied nature of glossaries, it’s likely that the predefined +<!--l. 1035--><p class="indent" > Due to the varied nature of glossaries, it’s likely that the predefined translations may not be appropriate. If you are using the <span class="ec-lmss-10x-x-109">babel</span><a - id="dx1-6023"></a> package -and do not have the <span -class="ec-lmss-10x-x-109">translator</span><a - id="dx1-6024"></a> package installed, you need to be familiar + id="dx1-8025"></a> package +and the <span +class="ec-lmss-10x-x-109">glossaries</span><a + id="dx1-8026"></a> package option <span +class="ec-lmss-10x-x-109">translate=babel</span><a + id="dx1-8027"></a>, you need to be familiar with the advice given in <a -href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=latexwords" >changing the words babel uses</a>. If you have the -<span +href="http://www.tex.ac.uk/cgi-bin/texfaq2html?label=latexwords" >changing the words babel uses</a>. If you are using +the <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-6025"></a> package installed, then you can provide your own dictionary with -the necessary modifications (using <span + id="dx1-8028"></a> package, then you can provide your own dictionary with the +necessary modifications (using <span class="ec-lmtt-10x-x-109">\deftranslation</span>) and load it using <span class="ec-lmtt-10x-x-109">\usedictionary</span>. -</p><!--l. 923--><p class="indent" > <div class="important" title="Important Note"> Note that the dictionaries are loaded at the beginning of the document, +</p><!--l. 1044--><p class="indent" > <div class="important" title="Important Note"> Note that the dictionaries are loaded at the beginning of the document, so it won’t have any effect if you put <span class="ec-lmtt-10x-x-109">\deftranslation </span>in the preamble. It should be put in your personal dictionary instead (as in the example below). See the <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-6026"></a> documentation for further details. (Now with + id="dx1-8029"></a> documentation for further details. (Now with <span class="ec-lmss-10x-x-109">beamer</span><a - id="dx1-6027"></a> documentation.) </div> -</p><!--l. 930--><p class="noindent" > -</p><!--l. 932--><p class="indent" > Your custom dictionary doesn’t have to be just a translation from + id="dx1-8030"></a> documentation.) </div> +</p><!--l. 1051--><p class="noindent" > +</p><!--l. 1053--><p class="indent" > Your custom dictionary doesn’t have to be just a translation from English to another language. You may prefer to have a dictionary for a particular type of document. For example, suppose your institution’s in-house reports have to have the glossary labelled as “Nomenclature” and @@ -2256,57 +2596,41 @@ called, say, </p> - <div class="verbatim" id="verbatim-7"> + <div class="verbatim" id="verbatim-8"> myinstitute-glossaries-dictionary-English.dict </div> -<!--l. 940--><p class="nopar" > that contains the following: +<!--l. 1061--><p class="nopar" > that contains the following: </p> - <div class="verbatim" id="verbatim-8"> + <div class="verbatim" id="verbatim-9"> \ProvidesDictionary{myinstitute-glossaries-dictionary}{English}  <br />\deftranslation{Glossary}{Nomenclature}  <br />\deftranslation{Page List (glossaries)}{Location} </div> -<!--l. 946--><p class="nopar" > You can now load it using: +<!--l. 1067--><p class="nopar" > You can now load it using: </p> - <div class="verbatim" id="verbatim-9"> + <div class="verbatim" id="verbatim-10"> \usedictionary{myinstitute-glossaries-dictionary} </div> -<!--l. 950--><p class="nopar" > (Make sure that <span +<!--l. 1071--><p class="nopar" > (Make sure that <span class="ec-lmtt-10x-x-109">myinstitute-glossaries-dictionary-English.dict</span> can be found by <span class="TEX">T<span class="E">E</span>X</span>.) If you want to share your custom dictionary, you can upload it to <a href="http://www.ctan.org/" >CTAN</a>. -</p><!--l. 955--><p class="indent" > If you are using <span +</p><!--l. 1076--><p class="indent" > If you are using <span class="ec-lmss-10x-x-109">babel</span><a - id="dx1-6028"></a> and don’t want to use the <span + id="dx1-8031"></a> and don’t want to use the <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-6029"></a> interface, you -can suppress it using the package option <span -class="ec-lmss-10x-x-109">translate=false</span><a - id="dx1-6030"></a>, and either load -<span -class="ec-lmss-10x-x-109">glossaries-babel</span><a - id="dx1-6031"></a> after <span -class="ec-lmss-10x-x-109">glossaries </span>or specify you’re own translations. For -example: - - - -</p> - <div class="verbatim" id="verbatim-10"> -\documentclass[british]{article} - <br />\usepackage{babel} - <br />\usepackage[translate=false]{glossaries} - <br />\usepackage{glossaries-babel} -</div> -<!--l. 966--><p class="nopar" > or: + id="dx1-8032"></a> interface, you +can use the package option <span +class="ec-lmss-10x-x-109">translate=babel</span><a + id="dx1-8033"></a>. For example: @@ -2314,119 +2638,125 @@ example: <div class="verbatim" id="verbatim-11"> \documentclass[british]{article}  <br />\usepackage{babel} - <br />\usepackage[translate=false]{glossaries} + <br />\usepackage[translate=babel]{glossaries}  <br />\addto\captionsbritish{%  <br />    \renewcommand*{\glossaryname}{List of Terms}%  <br />    \renewcommand*{\acronymname}{List of Acronyms}% - <br />    \renewcommand*{\entryname}{Notation}% - <br />    \renewcommand*{\descriptionname}{Description}% - <br />    \renewcommand*{\symbolname}{Symbol}% - <br />    \renewcommand*{\pagelistname}{Page List}% - <br />    \renewcommand*{\glssymbolsgroupname}{Symbols}% - <br />    \renewcommand*{\glsnumbersgroupname}{Numbers}%  <br />} </div> -<!--l. 984--><p class="nopar" > -</p><!--l. 986--><p class="indent" > If you are using <span +<!--l. 1089--><p class="nopar" > +</p><!--l. 1091--><p class="indent" > If you are using <span class="ec-lmss-10x-x-109">polyglossia</span><a - id="dx1-6032"></a> instead of <span + id="dx1-8034"></a> instead of <span class="ec-lmss-10x-x-109">babel</span><a - id="dx1-6033"></a>, <span + id="dx1-8035"></a>, <span class="ec-lmss-10x-x-109">glossaries-polyglossia</span><a - id="dx1-6034"></a> + id="dx1-8036"></a> will automatically be loaded unless you specify the package option <span class="ec-lmss-10x-x-109">translate=false</span><a - id="dx1-6035"></a>. -</p><!--l. 990--><p class="indent" > Note that <a - id="dx1-6036"></a><a + id="dx1-8037"></a>. +</p><!--l. 1095--><p class="indent" > Note that <a + id="dx1-8038"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-6037"></a></a> provides much better multi-lingual support than + id="dx1-8039"></a></a> provides much better multi-lingual support than <a - id="dx1-6038"></a><a + id="dx1-8040"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-6039"></a></a>, so it’s recommended that you use <a - id="dx1-6040"></a><span + id="dx1-8041"></a></a>, so it’s recommended that you use <a + id="dx1-8042"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-6041"></a> if you have glossary + id="dx1-8043"></a> if you have glossary entries that contain diacritics or non-Roman letters. See <a -href="#x1-3600011">§11 </a><a -href="#x1-3600011">Xindy<!--tex4ht:ref: sec:xindy --></a> for +href="#sec:xindy">§11 </a><a +href="#sec:xindy">Xindy<!--tex4ht:ref: sec:xindy --></a> for further details. </p> -<!--l. 996--><p class="noindent" ><a +<!--l. 1101--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">1.3</span>  <a - id="x1-70001.3"></a>Generating the Associated Glossary Files</h3> -<!--l. 999--><p class="noindent" >In order to generate a sorted glossary with compact <a - id="dx1-7001"></a><a -href="#glo:locationlist">location lists</a>, it is + id="sec:makeglossaries"></a>Generating the Associated Glossary Files</h3> +<!--l. 1104--><p class="noindent" >In order to generate a sorted glossary with compact <a + id="dx1-9001"></a><a +href="#glo:numberlist">number list<a + id="dx1-9002"></a>s</a>, it is necessary to use an external <a - id="dx1-7002"></a><a + id="dx1-9003"></a><a href="#glo:indexingapp">indexing application</a> as an intermediate step. It is this application that creates the file containing the code that typesets the glossary. If this step is omitted, the glossaries will not appear in your document. The two <a - id="dx1-7003"></a>indexing applications that are most commonly used + id="dx1-9004"></a>indexing applications that are most commonly used with <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> are <a - id="dx1-7004"></a><a + id="dx1-9005"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-7005"></a></a> and <a - id="dx1-7006"></a><a + id="dx1-9006"></a></a> and <a + id="dx1-9007"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-7007"></a></a>. As from version 1.17, the + id="dx1-9008"></a></a>. As from version 1.17, the <span class="ec-lmss-10x-x-109">glossaries </span>package can be used with either of these applications. Previous versions were designed to be used with <a - id="dx1-7008"></a><span + id="dx1-9009"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-7009"></a> only. Note that + id="dx1-9010"></a> only. Note that <a - id="dx1-7010"></a><span + id="dx1-9011"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-7011"></a> has much better multi-lingual support than <a - id="dx1-7012"></a><span + id="dx1-9012"></a> has much better multi-lingual support than <a + id="dx1-9013"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-7013"></a>, so + id="dx1-9014"></a>, so <a - id="dx1-7014"></a><span + id="dx1-9015"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-7015"></a> is recommended if you’re not writing in English. Commands + id="dx1-9016"></a> is recommended if you’re not writing in English. Commands that only have an effect when <a - id="dx1-7016"></a><span + id="dx1-9017"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-7017"></a> is used are described in <a -href="#x1-3600011">§11 + id="dx1-9018"></a> is used are described in <a +href="#sec:xindy">§11 </a><a -href="#x1-3600011">Xindy<!--tex4ht:ref: sec:xindy --></a>. +href="#sec:xindy">Xindy<!--tex4ht:ref: sec:xindy --></a>. +</p><!--l. 1119--><p class="indent" > <div class="important" title="Important Note"> This is a multi-stage process, but there are methods of automating +document compilation using applications such as <span +class="ec-lmtt-10x-x-109">latexmk</span><a + id="dx1-9019"></a> and <span +class="ec-lmtt-10x-x-109">arara</span><a + id="dx1-9020"></a>. See +<a +href="http://www.dickimaw-books.com/latex/thesis/html/build.html" class="url" ><span +class="ec-lmtt-10x-x-109">http://www.dickimaw-books.com/latex/thesis/html/build.html</span></a> for +more information. </div> +</p><!--l. 1125--><p class="noindent" > -</p><!--l. 1014--><p class="indent" > The <span +</p><!--l. 1127--><p class="indent" > The <span class="ec-lmss-10x-x-109">glossaries </span>package comes with the Perl script <a - id="dx1-7018"></a><a + id="dx1-9021"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-7019"></a></a> + id="dx1-9022"></a></a> which will run <a - id="dx1-7020"></a><a + id="dx1-9023"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-7021"></a></a> or <a - id="dx1-7022"></a><a + id="dx1-9024"></a></a> or <a + id="dx1-9025"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-7023"></a></a> on all the glossary files using a + id="dx1-9026"></a></a> on all the glossary files using a customized style file (which is created by <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-7024"></a>). See + id="dx1-9027"></a>). See <a -href="#x1-80001.3.1">§1.3.1 </a><a -href="#x1-80001.3.1">Using the makeglossaries Perl Script<!--tex4ht:ref: sec:makeglossariesapp --></a> for further details. Perl +href="#sec:makeglossariesapp">§1.3.1 </a><a +href="#sec:makeglossariesapp">Using the makeglossaries Perl Script<!--tex4ht:ref: sec:makeglossariesapp --></a> for further details. Perl is stable, cross-platform, open source software that is used by a number of <span class="TEX">T<span class="E">E</span>X</span>-related applications. Further information is available @@ -2434,115 +2764,115 @@ at <a href="http://www.perl.org/about.html" class="url" ><span class="ec-lmtt-10x-x-109">http://www.perl.org/about.html</span></a>. The advantages of using <a - id="dx1-7025"></a><span + id="dx1-9028"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-7026"></a>: </p> + id="dx1-9029"></a>: </p> <ul class="itemize1"> <li class="itemize">It automatically detects whether to use <a - id="dx1-7027"></a><span + id="dx1-9030"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-7028"></a> or <a - id="dx1-7029"></a><span + id="dx1-9031"></a> or <a + id="dx1-9032"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-7030"></a> and + id="dx1-9033"></a> and sets the relevant application switches. </li> <li class="itemize">One call of <a - id="dx1-7031"></a><span + id="dx1-9034"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-7032"></a> will run <a - id="dx1-7033"></a><span + id="dx1-9035"></a> will run <a + id="dx1-9036"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-7034"></a>/<a - id="dx1-7035"></a><span + id="dx1-9037"></a>/<a + id="dx1-9038"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-7036"></a> for each + id="dx1-9039"></a> for each glossary type. </li> <li class="itemize">If things go wrong, <a - id="dx1-7037"></a><a + id="dx1-9040"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-7038"></a></a> will scan the messages from + id="dx1-9041"></a></a> will scan the messages from <a - id="dx1-7039"></a><a + id="dx1-9042"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-7040"></a></a> or <a - id="dx1-7041"></a><a + id="dx1-9043"></a></a> or <a + id="dx1-9044"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-7042"></a></a> and attempt to diagnose the problem in + id="dx1-9045"></a></a> and attempt to diagnose the problem in relation to the <span class="ec-lmss-10x-x-109">glossaries </span>package. This will hopefully provide more helpful messages in some cases. If it can’t diagnose the problem, you will have to read the relevant transcript file and see if you can work it out from the <a - id="dx1-7043"></a><span + id="dx1-9046"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-7044"></a> or <a - id="dx1-7045"></a><span + id="dx1-9047"></a> or <a + id="dx1-9048"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-7046"></a> messages. + id="dx1-9049"></a> messages. </li></ul> -<!--l. 1040--><p class="indent" > There is also a Java GUI alternative called <a - id="dx1-7047"></a><a +<!--l. 1153--><p class="indent" > There is also a Java GUI alternative called <a + id="dx1-9050"></a><a href="#glo:makeglossariesgui"><span class="ec-lmtt-10x-x-109">makeglossariesgui</span><a - id="dx1-7048"></a></a>, + id="dx1-9051"></a></a>, distributed separately, that has diagnostic tools. -</p><!--l. 1043--><p class="indent" > Whilst it is strongly recommended that you use the <a - id="dx1-7049"></a><a +</p><!--l. 1156--><p class="indent" > Whilst it is strongly recommended that you use the <a + id="dx1-9052"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-7050"></a></a> + id="dx1-9053"></a></a> script or <a - id="dx1-7051"></a><a + id="dx1-9054"></a><a href="#glo:makeglossariesgui"><span class="ec-lmtt-10x-x-109">makeglossariesgui</span><a - id="dx1-7052"></a></a>, it is possible to use the <span + id="dx1-9055"></a></a>, it is possible to use the <span class="ec-lmss-10x-x-109">glossaries </span>package without using either application. However, note that some commands and package options have no effect if you don’t use <a - id="dx1-7053"></a><span + id="dx1-9056"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-7054"></a> or + id="dx1-9057"></a> or <a - id="dx1-7055"></a><span + id="dx1-9058"></a><span class="ec-lmtt-10x-x-109">makeglossariesgui</span><a - id="dx1-7056"></a>. These are listed in <a -href="#x1-70893">table 1.3</a>. -</p><!--l. 1051--><p class="indent" > <div class="important" title="Important Note"> If you are choosing not to use <a - id="dx1-7057"></a><span + id="dx1-9059"></a>. These are listed in <a +href="#x1-90923">table 1.3</a>. +</p><!--l. 1164--><p class="indent" > <div class="important" title="Important Note"> If you are choosing not to use <a + id="dx1-9060"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-7058"></a> because you don’t want + id="dx1-9061"></a> because you don’t want to install Perl, you will only be able to use <a - id="dx1-7059"></a><span + id="dx1-9062"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-7060"></a> as <a - id="dx1-7061"></a><span + id="dx1-9063"></a> as <a + id="dx1-9064"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-7062"></a> also + id="dx1-9065"></a> also requires Perl. </div> -</p><!--l. 1055--><p class="noindent" > -</p><!--l. 1057--><p class="indent" > Note that if any of your entries use an entry that is not referenced outside +</p><!--l. 1168--><p class="noindent" > +</p><!--l. 1170--><p class="indent" > Note that if any of your entries use an entry that is not referenced outside the glossary, you will need to do an additional <a - id="dx1-7063"></a><a + id="dx1-9066"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-7064"></a></a>, <a - id="dx1-7065"></a><a + id="dx1-9067"></a></a>, <a + id="dx1-9068"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-7066"></a></a> or + id="dx1-9069"></a></a> or <a - id="dx1-7067"></a><a + id="dx1-9070"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-7068"></a></a> run, as appropriate. For example, suppose you have defined the following + id="dx1-9071"></a></a> run, as appropriate. For example, suppose you have defined the following entries:<span class="footnote-mark"><a -href="#fn2x3" id="fn2x3-bk"><sup class="textsuperscript">2</sup></a></span><a - id="x1-7069f2"></a> +href="#fn3x3" id="fn3x3-bk"><sup class="textsuperscript">3</sup></a></span><a + id="x1-9072f3"></a> @@ -2554,25 +2884,25 @@ href="#fn2x3" id="fn2x3-bk"><sup class="textsuperscript">2</sup></a></span><a  <br />\newglossaryentry{orange}{name={orange},  <br />description={an orange coloured fruit.}} </div> -<!--l. 1070--><p class="nopar" > and suppose you have <span class="obeylines-h"><span class="verb"><span +<!--l. 1183--><p class="nopar" > and suppose you have <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls{citrusfruit}</span></span></span> in your document but don’t reference the <span class="ec-lmtt-10x-x-109">orange </span>entry, then the <span class="ec-lmtt-10x-x-109">orange </span>entry won’t appear in your glossary until you first create the glossary and then do another run of <a - id="dx1-7071"></a><a + id="dx1-9074"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-7072"></a></a>, <a - id="dx1-7073"></a><a + id="dx1-9075"></a></a>, <a + id="dx1-9076"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-7074"></a></a> or <a - id="dx1-7075"></a><a + id="dx1-9077"></a></a> or <a + id="dx1-9078"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-7076"></a></a>. For example, if the document is + id="dx1-9079"></a></a>. For example, if the document is called <span class="ec-lmtt-10x-x-109">myDoc.tex</span>, then you must do: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span @@ -2585,42 +2915,42 @@ class="ec-lmtt-10x-x-109">latex myDoc</span> class="ec-lmtt-10x-x-109">makeglossaries myDoc</span> <br /><span class="ec-lmtt-10x-x-109">latex myDoc</span></span> -</p><!--l. 1084--><p class="indent" > <spacer type=vertical size=10> -</p><!--l. 1086--><p class="indent" > Likewise, an additional <a - id="dx1-7077"></a><a +</p><!--l. 1197--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1199--><p class="indent" > Likewise, an additional <a + id="dx1-9080"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-7078"></a></a> and <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span + id="dx1-9081"></a></a> and <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> run may be required if the document pages shift with re-runs. For example, if the page numbering is not reset after the table of contents, the insertion of the table of contents on the second <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> run may push glossary entries across page boundaries, which means that the <a - id="dx1-7079"></a><a + id="dx1-9082"></a><a href="#glo:numberlist">number list<a - id="dx1-7080"></a>s</a> in the glossary may + id="dx1-9083"></a>s</a> in the glossary may need updating. -</p><!--l. 1094--><p class="indent" > The examples in this document assume that you are accessing +</p><!--l. 1207--><p class="indent" > The examples in this document assume that you are accessing <a - id="dx1-7081"></a><a + id="dx1-9084"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-7082"></a></a>, <a - id="dx1-7083"></a><a + id="dx1-9085"></a></a>, <a + id="dx1-9086"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-7084"></a></a> or <a - id="dx1-7085"></a><a + id="dx1-9087"></a></a> or <a + id="dx1-9088"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-7086"></a></a> via a terminal. Windows + id="dx1-9089"></a></a> via a terminal. Windows users can use the MSDOS Prompt which is usually accessed via the <span class="ec-lmss-10x-x-109">Start->All Programs </span>menu or <span class="ec-lmss-10x-x-109">Start->All Programs->Accessories</span> menu. -</p><!--l. 1100--><p class="indent" > Alternatively, your text editor may have the facility to create +</p><!--l. 1213--><p class="indent" > Alternatively, your text editor may have the facility to create a function that will call the required application. The article <a href="http://www.latex-community.org/index.php?option=com_content&view=article&id=263:glossaries-nomenclature-lists-of-symbols-and-acronyms&catid=55:latex-general&Itemid=114" >“Glossaries, Nomenclature, List of Symbols and Acronyms”</a> in the @@ -2628,25 +2958,30 @@ href="http://www.latex-community.org/index.php?option=com_content&view=article&i href="http://www.latex-community.org/" ><span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> Community’s</a> Know How section describes how to do this for TeXnicCenter, and the thread <a -href="http://groups.google.com/group/comp.text.tex/browse_thread/thread/edd83831b81b0759?hl=en" >“Executing Glossaries’ makeindex from a -WinEdt macro”</a> on the <span -class="ec-lmtt-10x-x-109">comp.text.tex </span>newsgroup describes how to do it -for WinEdt. For other editors see the editor’s user manual for further +href="http://groups.google.com/group/comp.text.tex/browse_thread/thread/edd83831b81b0759?hl=en" >“Executing Glossaries’ makeindex +from a WinEdt macro”</a> on the <span +class="ec-lmtt-10x-x-109">comp.text.tex </span>newsgroup describes +how to do it for WinEdt. <a +href="http://www.dickimaw-books.com/latex/thesis/html/build.html" >Section 1.1 (Building Your Document)</a> of +<a +href="http://www.dickimaw-books.com/latex/thesis/" >“Using <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span +class="E">E</span>X</span></span> to Write a PhD Thesis”</a> describes how to do it for +TeXWorks. For other editors see the editor’s user manual for further details. -</p><!--l. 1112--><p class="indent" > If any problems occur, remember to check the transcript files (e.g. <span -class="ec-lmtt-10x-x-109">.glg</span><a - id="dx1-7087"></a> -or <span -class="ec-lmtt-10x-x-109">.alg</span><a - id="dx1-7088"></a>) for messages. +</p><!--l. 1229--><p class="indent" > If any problems occur, remember to check the transcript files (e.g. <span +class="ec-lmtt-10x-x-109">.glg</span><a + id="dx1-9090"></a> +or <span +class="ec-lmtt-10x-x-109">.alg</span><a + id="dx1-9091"></a>) for messages. -</p><!--l. 1115--><p class="indent" > <a - id="x1-70893"></a></p><hr class="float" /><div class="float" +</p><!--l. 1232--><p class="indent" > <a + id="x1-90923"></a></p><hr class="float" /><div class="float" > @@ -2656,7 +2991,7 @@ class="ec-lmtt-10x-x-109">.alg</span><a class="content">Commands and package options that have no effect when using <span class="ec-lmtt-10x-x-109">xindy </span>or <span -class="ec-lmtt-10x-x-109">makeindex </span>explicitly</td></tr></table></div><!--tex4ht:label?: x1-70893 --> +class="ec-lmtt-10x-x-109">makeindex </span>explicitly</td></tr></table></div><!--tex4ht:label?: x1-90923 --> <div class="tabular"> <table id="TBL-4" class="tabular" cellspacing="0" cellpadding="0" ><colgroup id="TBL-4-1g"><col @@ -2667,20 +3002,20 @@ id="TBL-4-3" /></colgroup><tr class="td01"><span class="ec-lmbx-10x-x-109">Command or Package Option </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-4-1-2" class="td11"> <a - id="dx1-7090"></a><a + id="dx1-9093"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-7091"></a></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-4-1-3" + id="dx1-9094"></a></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-4-1-3" class="td10"> <a - id="dx1-7092"></a><a + id="dx1-9095"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-7093"></a></a> </td> + id="dx1-9096"></a></a> </td> </tr><tr style="vertical-align:baseline;" id="TBL-4-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-4-2-1" class="td01"><span class="ec-lmss-10x-x-109">order=letter</span><a - id="dx1-7094"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-4-2-2" + id="dx1-9097"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-4-2-2" class="td11"> use <span class="ec-lmtt-10x-x-109">-l </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-4-2-3" class="td10"> use <span @@ -2689,14 +3024,14 @@ class="ec-lmtt-10x-x-109">-M ord/letorder </span></td> style="vertical-align:baseline;" id="TBL-4-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-4-3-1" class="td01"><span class="ec-lmss-10x-x-109">order=word</span><a - id="dx1-7095"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-4-3-2" + id="dx1-9098"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-4-3-2" class="td11"> default </td><td style="white-space:nowrap; text-align:left;" id="TBL-4-3-3" class="td10"> default </td> </tr><tr style="vertical-align:baseline;" id="TBL-4-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-4-4-1" class="td01"><span class="ec-lmss-10x-x-109">xindy</span><a - id="dx1-7096"></a>={<span + id="dx1-9099"></a>={<span class="ec-lmss-10x-x-109">language=</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">lang</span><span @@ -2719,7 +3054,7 @@ class="lmsy-10x-x-109">⟩</span></td> style="vertical-align:baseline;" id="TBL-4-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-4-5-1" class="td01"><span class="ec-lmtt-10x-x-109">\GlsSetXdyLanguage</span><a - id="dx1-7097"></a><span + id="dx1-9100"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">lang</span><span @@ -2735,7 +3070,7 @@ class="lmsy-10x-x-109">⟩ </span></td> style="vertical-align:baseline;" id="TBL-4-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-4-6-1" class="td01"><span class="ec-lmtt-10x-x-109">\GlsSetXdyCodePage</span><a - id="dx1-7098"></a><span + id="dx1-9101"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">code</span><span @@ -2752,30 +3087,30 @@ class="lmsy-10x-x-109">⟩ </span></td></tr></table> </div><hr class="endfloat" /> -<!--l. 1137--><p class="noindent" ><a +<!--l. 1254--><p class="noindent" ><a href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">1.3.1</span>  <a - id="x1-80001.3.1"></a>Using the makeglossaries Perl Script</h4> -<!--l. 1140--><p class="noindent" >The <a - id="dx1-8001"></a><a + id="sec:makeglossariesapp"></a>Using the makeglossaries Perl Script</h4> +<!--l. 1257--><p class="noindent" >The <a + id="dx1-10001"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-8002"></a></a> script picks up the relevant information from the + id="dx1-10002"></a></a> script picks up the relevant information from the auxiliary (<span class="ec-lmtt-10x-x-109">.aux</span><a - id="dx1-8003"></a>) file and will either call <a - id="dx1-8004"></a><a + id="dx1-10003"></a>) file and will either call <a + id="dx1-10004"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-8005"></a></a> or <a - id="dx1-8006"></a><a + id="dx1-10005"></a></a> or <a + id="dx1-10006"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-8007"></a></a>, depending on + id="dx1-10007"></a></a>, depending on the supplied information. Therefore, you only need to pass the document’s name without the extension to <a - id="dx1-8008"></a><span + id="dx1-10008"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-8009"></a>. For example, if your + id="dx1-10009"></a>. For example, if your document is called <span class="ec-lmtt-10x-x-109">myDoc.tex</span>, type the following in your terminal: <spacer type=vertical size=10><span class="obeylines-h"> @@ -2785,81 +3120,111 @@ class="ec-lmtt-10x-x-109">latex myDoc</span> class="ec-lmtt-10x-x-109">makeglossaries myDoc</span> <br /><span class="ec-lmtt-10x-x-109">latex myDoc</span></span> -</p><!--l. 1151--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1268--><p class="indent" > <spacer type=vertical size=10> You may need to explicitly load <a - id="dx1-8010"></a><a + id="dx1-10010"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-8011"></a></a> into Perl: <spacer type=vertical size=10><span class="obeylines-h"> + id="dx1-10011"></a></a> into Perl: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">perl makeglossaries myDoc</span></span> -</p><!--l. 1155--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1272--><p class="indent" > <spacer type=vertical size=10> There is a batch file called <span class="ec-lmtt-10x-x-109">makeglossaries.bat </span>which does this for -Windows users, but you must have Perl installed to be able to use it. You -can specify in which directory the <span +Windows users, but you must have Perl installed to be able to use +it.<span class="footnote-mark"><a +href="#fn4x3" id="fn4x3-bk"><sup class="textsuperscript">4</sup></a></span><a + id="x1-10012f4"></a> +You can specify in which directory the <span class="ec-lmtt-10x-x-109">.aux</span><a - id="dx1-8012"></a>, <span + id="dx1-10013"></a>, <span class="ec-lmtt-10x-x-109">.glo</span><a - id="dx1-8013"></a> etc files are located using the -<span + id="dx1-10014"></a> etc files are located +using the <span class="ec-lmtt-10x-x-109">-d </span>switch. For example: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">pdflatex -output-directory myTmpDir myDoc</span> <br /><span class="ec-lmtt-10x-x-109">makeglossaries -d myTmpDir myDoc</span></span> -</p><!--l. 1164--><p class="indent" > <spacer type=vertical size=10> -</p><!--l. 1166--><p class="indent" > The <a - id="dx1-8014"></a><a +</p><!--l. 1283--><p class="indent" > <spacer type=vertical size=10> +Note that <a + id="dx1-10015"></a><span +class="ec-lmtt-10x-x-109">makeglossaries</span><a + id="dx1-10016"></a> assumes by default that <a + id="dx1-10017"></a><span +class="ec-lmtt-10x-x-109">makeindex</span><a + id="dx1-10018"></a>/<a + id="dx1-10019"></a><span +class="ec-lmtt-10x-x-109">xindy</span><a + id="dx1-10020"></a> is +on your operating system’s path. If this isn’t the case, you can specify the +full pathname using <span +class="ec-lmtt-10x-x-109">-m </span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">path/to/makeindex</span><span +class="lmsy-10x-x-109">⟩ </span>for <a + id="dx1-10021"></a><span +class="ec-lmtt-10x-x-109">makeindex</span><a + id="dx1-10022"></a> or <span +class="ec-lmtt-10x-x-109">-x</span> +<span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">path/to/xindy</span><span +class="lmsy-10x-x-109">⟩ </span>for <a + id="dx1-10023"></a><span +class="ec-lmtt-10x-x-109">xindy</span><a + id="dx1-10024"></a>. +</p><!--l. 1290--><p class="indent" > The <a + id="dx1-10025"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-8015"></a></a> script contains POD (Plain Old Documentation). + id="dx1-10026"></a></a> script contains POD (Plain Old Documentation). If you want, you can create a man page for <a - id="dx1-8016"></a><span + id="dx1-10027"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-8017"></a> using <span + id="dx1-10028"></a> using <span class="ec-lmtt-10x-x-109">pod2man</span><a - id="dx1-8018"></a> + id="dx1-10029"></a> and move the resulting file onto the man path. Alternatively do <span class="ec-lmtt-10x-x-109">makeglossaries --help </span>for a list of all options or <span class="ec-lmtt-10x-x-109">makeglossaries</span> <span class="ec-lmtt-10x-x-109">--version </span>for the version number. -</p><!--l. 1173--><p class="indent" > <div class="important" title="Important Note"> When upgrading the <span +</p><!--l. 1297--><p class="indent" > <div class="important" title="Important Note"> When upgrading the <span class="ec-lmss-10x-x-109">glossaries </span>package, make sure you also upgrade your version of <a - id="dx1-8019"></a><a + id="dx1-10030"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-8020"></a></a>. The current version is 2.07. </div> -</p><!--l. 1177--><p class="noindent" > -</p><!--l. 1179--><p class="noindent" > + id="dx1-10031"></a></a>. The current version is 2.09. </div> +</p><!--l. 1301--><p class="noindent" > +</p><!--l. 1303--><p class="noindent" > </p> -<!--l. 1179--><p class="noindent" ><a -href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">1.3.2</span>  <a - id="x1-90001.3.2"></a>Using xindy explicitly</h4> -<!--l. 1182--><p class="noindent" ><a - id="dx1-9001"></a><a -href="#glo:xindy"><span -class="ec-lmtt-10x-x-109">Xindy</span><a - id="dx1-9002"></a></a> comes with TeXLive, but not with MiKTeX. However MikTeX users -can install it. There is <a -href="http://www.latex-community.org/forum/viewtopic.php?f=51&t=5383" >a thread</a> in the Makeindex section of the -<a -href="http://www.latex-community.org/" ><span class="LATEX">L<span class="A">A</span><span class="TEX">T<span -class="E">E</span>X</span></span> Community</a> that describes how to do this. -</p><!--l. 1189--><p class="indent" > If you want to use <a - id="dx1-9003"></a><a +<!--l. 1303--><p class="noindent" ><a +href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">1.3.2</span>  <a + id="sec:xindyapp"></a>Using xindy explicitly</h4> +<!--l. 1306--><p class="noindent" ><a + id="dx1-11001"></a><a +href="#glo:xindy"><span +class="ec-lmtt-10x-x-109">Xindy</span><a + id="dx1-11002"></a></a> comes with TeXLive, but not with MiKTeX. However MikTeX +users can install it. See <a +href="http://tex.stackexchange.com/questions/71167/how-to-use-xindy-with-miktex" >How to use Xindy with MikTeX</a> on <a +href="http://www.stackexchange.com/" ><span class="TEX">T<span +class="E">E</span>X</span> on +StackExchange</a>. +</p><!--l. 1312--><p class="indent" > If you want to use <a + id="dx1-11003"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-9004"></a></a> to process the glossary files, you must make + id="dx1-11004"></a></a> to process the glossary files, you must make sure you have used the <span class="ec-lmss-10x-x-109">xindy</span><a - id="dx1-9005"></a> package option: + id="dx1-11005"></a> package option: @@ -2867,33 +3232,33 @@ class="ec-lmss-10x-x-109">xindy</span><a <div class="verbatim" id="verbatim-13"> \usepackage[xindy]{glossaries} </div> -<!--l. 1194--><p class="nopar" > This is required regardless of whether you use <a - id="dx1-9006"></a><a +<!--l. 1317--><p class="nopar" > This is required regardless of whether you use <a + id="dx1-11006"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-9007"></a></a> explicitly or whether -it’s called implicitly via <a - id="dx1-9008"></a><a + id="dx1-11007"></a></a> explicitly or whether +it’s called implicitly via applications such as <a + id="dx1-11008"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-9009"></a></a> or <a - id="dx1-9010"></a><a + id="dx1-11009"></a></a> or +<a + id="dx1-11010"></a><a href="#glo:makeglossariesgui"><span class="ec-lmtt-10x-x-109">makeglossariesgui</span><a - id="dx1-9011"></a></a>. This -causes the glossary entries to be written in raw <a - id="dx1-9012"></a><span + id="dx1-11011"></a></a>. This causes the glossary entries to be written in raw +<a + id="dx1-11012"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-9013"></a> format, so you need -to use <span + id="dx1-11013"></a> format, so you need to use <span class="ec-lmtt-10x-x-109">-I xindy </span><span class="ec-lmri-10x-x-109">not </span><span class="ec-lmtt-10x-x-109">-I tex</span>. -</p><!--l. 1201--><p class="indent" > To run <a - id="dx1-9014"></a><a +</p><!--l. 1324--><p class="indent" > To run <a + id="dx1-11014"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-9015"></a></a> type the following in your terminal (all on one line): + id="dx1-11015"></a></a> type the following in your terminal (all on one line): <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">xindy -L </span><span @@ -2922,7 +3287,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">base</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">.glo</span></span> -</p><!--l. 1205--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1328--><p class="indent" > <spacer type=vertical size=10> where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">language</span><span @@ -2935,26 +3300,26 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">base</span><span class="lmsy-10x-x-109">⟩ </span>is the name of the document without the <span class="ec-lmtt-10x-x-109">.tex</span><a - id="dx1-9016"></a> extension + id="dx1-11016"></a> extension and <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">style</span><span class="lmsy-10x-x-109">⟩ </span>is the name of the <a - id="dx1-9017"></a><a + id="dx1-11017"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-9018"></a></a> style file without the <span + id="dx1-11018"></a></a> style file without the <span class="ec-lmtt-10x-x-109">.xdy</span><a - id="dx1-9019"></a> + id="dx1-11019"></a> extension. The default name for this style file is <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">base</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">.xdy</span><a - id="dx1-9020"></a> but can + id="dx1-11020"></a> but can be changed via <span class="ec-lmtt-10x-x-109">\setStyleFile</span><a - id="dx1-9021"></a><span + id="dx1-11021"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">style</span><span @@ -2963,7 +3328,7 @@ class="ec-lmtt-10x-x-109">}</span>. You may need to specify the full path name depending on the current working directory. If any of the file names contain spaces, you must delimit them using double-quotes. -</p><!--l. 1216--><p class="indent" > For example, if your document is called <span +</p><!--l. 1339--><p class="indent" > For example, if your document is called <span class="ec-lmtt-10x-x-109">myDoc.tex </span>and you are using UTF8 encoding in English, then type the following in your terminal: <spacer type=vertical size=10><span class="obeylines-h"> @@ -2971,79 +3336,79 @@ UTF8 encoding in English, then type the following in your terminal: class="ec-lmtt-10x-x-109">xindy -L english -C utf8 -I xindy -M myDoc -t myDoc.glg -o</span> <span class="ec-lmtt-10x-x-109">myDoc.gls myDoc.glo</span></span> -</p><!--l. 1221--><p class="indent" > <spacer type=vertical size=10> -</p><!--l. 1223--><p class="indent" > Note that this just creates the main glossary. You need to do the same +</p><!--l. 1344--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1346--><p class="indent" > Note that this just creates the main glossary. You need to do the same for each of the other glossaries (including the list of acronyms if you have used the <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-9022"></a> package option), substituting <span + id="dx1-11022"></a> package option), substituting <span class="ec-lmtt-10x-x-109">.glg</span><a - id="dx1-9023"></a>, + id="dx1-11023"></a>, <span class="ec-lmtt-10x-x-109">.gls</span><a - id="dx1-9024"></a> and <span + id="dx1-11024"></a> and <span class="ec-lmtt-10x-x-109">.glo</span><a - id="dx1-9025"></a> with the relevant extensions. For example, if you + id="dx1-11025"></a> with the relevant extensions. For example, if you have used the <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-9026"></a> package option, then you would need to do: + id="dx1-11026"></a> package option, then you would need to do: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">xindy -L english -C utf8 -I xindy -M myDoc -t myDoc.alg -o</span> <span class="ec-lmtt-10x-x-109">myDoc.acr myDoc.acn</span></span> -</p><!--l. 1232--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1355--><p class="indent" > <spacer type=vertical size=10> For additional glossaries, the extensions are those supplied when you created the glossary with <span class="ec-lmtt-10x-x-109">\newglossary</span><a - id="dx1-9027"></a>. -</p><!--l. 1236--><p class="indent" > Note that if you use <a - id="dx1-9028"></a><a + id="dx1-11027"></a>. +</p><!--l. 1359--><p class="indent" > Note that if you use <a + id="dx1-11028"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-9029"></a></a> instead, you can replace all those + id="dx1-11029"></a></a> instead, you can replace all those calls to <a - id="dx1-9030"></a><a + id="dx1-11030"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-9031"></a></a> with just one call to <a - id="dx1-9032"></a><span + id="dx1-11031"></a></a> with just one call to <a + id="dx1-11032"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-9033"></a>: <spacer type=vertical size=10><span class="obeylines-h"> + id="dx1-11033"></a>: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">makeglossaries myDoc</span></span> -</p><!--l. 1241--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1364--><p class="indent" > <spacer type=vertical size=10> Note also that some commands and package options have no effect if you use <a - id="dx1-9034"></a><a + id="dx1-11034"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-9035"></a></a> explicitly instead of using <a - id="dx1-9036"></a><span + id="dx1-11035"></a></a> explicitly instead of using <a + id="dx1-11036"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-9037"></a>. These are listed in + id="dx1-11037"></a>. These are listed in <a -href="#x1-70893">table 1.3</a>. -</p><!--l. 1248--><p class="noindent" > +href="#x1-90923">table 1.3</a>. +</p><!--l. 1371--><p class="noindent" > </p> -<!--l. 1248--><p class="noindent" ><a +<!--l. 1371--><p class="noindent" ><a href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">1.3.3</span>  <a - id="x1-100001.3.3"></a>Using makeindex explicitly</h4> -<!--l. 1251--><p class="noindent" >If you want to use <a - id="dx1-10001"></a><a + id="sec:makeindexapp"></a>Using makeindex explicitly</h4> +<!--l. 1374--><p class="noindent" >If you want to use <a + id="dx1-12001"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-10002"></a></a> explicitly, you must make sure that you + id="dx1-12002"></a></a> explicitly, you must make sure that you haven’t used the <span class="ec-lmss-10x-x-109">xindy</span><a - id="dx1-10003"></a> package option or the glossary entries will be + id="dx1-12003"></a> package option or the glossary entries will be written in the wrong format. To run <a - id="dx1-10004"></a><span + id="dx1-12004"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-10005"></a>, type the following in your + id="dx1-12005"></a>, type the following in your terminal: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">makeindex -s </span><span @@ -3063,31 +3428,31 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">base</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">.glo</span></span> -</p><!--l. 1258--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1381--><p class="indent" > <spacer type=vertical size=10> where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">base</span><span class="lmsy-10x-x-109">⟩ </span>is the name of your document without the <span class="ec-lmtt-10x-x-109">.tex</span><a - id="dx1-10006"></a> extension and + id="dx1-12006"></a> extension and <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">style</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">.ist</span><a - id="dx1-10007"></a> is the name of the <a - id="dx1-10008"></a><a + id="dx1-12007"></a> is the name of the <a + id="dx1-12008"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-10009"></a></a> style file. By default, this is + id="dx1-12009"></a></a> style file. By default, this is <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">base</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">.ist</span><a - id="dx1-10010"></a>, but may be changed via <span + id="dx1-12010"></a>, but may be changed via <span class="ec-lmtt-10x-x-109">\setStyleFile</span><a - id="dx1-10011"></a><span + id="dx1-12011"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">style</span><span @@ -3095,97 +3460,97 @@ class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span>. Note that there are other options, such as <span class="ec-lmtt-10x-x-109">-l </span>(letter ordering). See the <a - id="dx1-10012"></a><span + id="dx1-12012"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-10013"></a> + id="dx1-12013"></a> manual for further details. -</p><!--l. 1267--><p class="indent" > For example, if your document is called <span +</p><!--l. 1390--><p class="indent" > For example, if your document is called <span class="ec-lmtt-10x-x-109">myDoc.tex</span>, then type the following at the terminal: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">makeindex -s myDoc.ist -t myDoc.glg -o myDoc.gls myDoc.glo</span></span> -</p><!--l. 1271--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1394--><p class="indent" > <spacer type=vertical size=10> Note that this only creates the main glossary. If you have additional glossaries (for example, if you have used the <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-10014"></a> package option) then + id="dx1-12014"></a> package option) then you must call <a - id="dx1-10015"></a><a + id="dx1-12015"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-10016"></a></a> for each glossary, substituting <span + id="dx1-12016"></a></a> for each glossary, substituting <span class="ec-lmtt-10x-x-109">.glg</span><a - id="dx1-10017"></a>, <span + id="dx1-12017"></a>, <span class="ec-lmtt-10x-x-109">.gls</span><a - id="dx1-10018"></a> and + id="dx1-12018"></a> and <span class="ec-lmtt-10x-x-109">.glo</span><a - id="dx1-10019"></a> with the relevant extensions. For example, if you have used the + id="dx1-12019"></a> with the relevant extensions. For example, if you have used the <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-10020"></a> package option, then you need to type the following in your + id="dx1-12020"></a> package option, then you need to type the following in your terminal: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">makeindex -s myDoc.ist -t myDoc.alg -o myDoc.acr myDoc.acn</span></span> -</p><!--l. 1282--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1405--><p class="indent" > <spacer type=vertical size=10> For additional glossaries, the extensions are those supplied when you created the glossary with <span class="ec-lmtt-10x-x-109">\newglossary</span><a - id="dx1-10021"></a>. -</p><!--l. 1286--><p class="indent" > Note that if you use <a - id="dx1-10022"></a><a + id="dx1-12021"></a>. +</p><!--l. 1409--><p class="indent" > Note that if you use <a + id="dx1-12022"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-10023"></a></a> instead, you can replace all + id="dx1-12023"></a></a> instead, you can replace all those calls to <a - id="dx1-10024"></a><a + id="dx1-12024"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-10025"></a></a> with just one call to <a - id="dx1-10026"></a><span + id="dx1-12025"></a></a> with just one call to <a + id="dx1-12026"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-10027"></a>: + id="dx1-12027"></a>: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">makeglossaries myDoc</span></span> -</p><!--l. 1291--><p class="indent" > <spacer type=vertical size=10> +</p><!--l. 1414--><p class="indent" > <spacer type=vertical size=10> Note also that some commands and package options have no effect if you use <a - id="dx1-10028"></a><span + id="dx1-12028"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-10029"></a> explicitly instead of using <a - id="dx1-10030"></a><a + id="dx1-12029"></a> explicitly instead of using <a + id="dx1-12030"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-10031"></a></a>. These are + id="dx1-12031"></a></a>. These are listed in <a -href="#x1-70893">table 1.3</a>. -</p><!--l. 1298--><p class="noindent" > +href="#x1-90923">table 1.3</a>. +</p><!--l. 1421--><p class="noindent" > </p> -<!--l. 1298--><p class="noindent" ><a +<!--l. 1421--><p class="noindent" ><a href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">1.3.4</span>  <a - id="x1-110001.3.4"></a>Note to Front-End and Script Developers</h4> -<!--l. 1301--><p class="noindent" >The information needed to determine whether to use <a - id="dx1-11001"></a><a + id="sec:notedev"></a>Note to Front-End and Script Developers</h4> +<!--l. 1424--><p class="noindent" >The information needed to determine whether to use <a + id="dx1-13001"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-11002"></a></a> or <a - id="dx1-11003"></a><a + id="dx1-13002"></a></a> or <a + id="dx1-13003"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-11004"></a></a> + id="dx1-13004"></a></a> and the information needed to call those applications is stored in the auxiliary file. This information can be gathered by a front-end, editor or script to make the glossaries where appropriate. This section describes how the information is stored in the auxiliary file. -</p><!--l. 1308--><p class="indent" > The file extensions used by each defined glossary are given by -</p><!--l. 1309--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1431--><p class="indent" > The file extensions used by each defined glossary are given by +</p><!--l. 1432--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\@newglossary</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-11005"></a> <span + id="dx1-13005"></a> <span class="ec-lmtt-10x-x-109">\@newglossary{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -3204,12 +3569,12 @@ class="ec-lmri-10x-x-109">in-ext</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 1311--><p class="noindent" > +</p><!--l. 1434--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">in-ext</span><span class="lmsy-10x-x-109">⟩ </span>is the extension of the <a - id="dx1-11006"></a><a + id="dx1-13006"></a><a href="#glo:indexingapp"><span class="ec-lmri-10x-x-109">indexing application’s</span></a> input file (the output file from the <span @@ -3218,17 +3583,17 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">out-ext</span><span class="lmsy-10x-x-109">⟩ </span>is the extension of the <a - id="dx1-11007"></a><span + id="dx1-13007"></a><span class="ec-lmri-10x-x-109">indexing application’s </span>output file (the input file from the <span class="ec-lmss-10x-x-109">glossaries </span>package’s point of view) and <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">log</span><span class="lmsy-10x-x-109">⟩ </span>is the extension of the <a - id="dx1-11008"></a>indexing + id="dx1-13008"></a>indexing application’s transcript file. The label for the glossary is also given for information purposes only, but is not required by the <a - id="dx1-11009"></a>indexing applications. + id="dx1-13009"></a>indexing applications. For example, the information for the default main glossary is written as: @@ -3238,67 +3603,67 @@ as: <div class="verbatim" id="verbatim-14"> \@newglossary{main}{glg}{gls}{glo} </div> -<!--l. 1324--><p class="nopar" > -</p><!--l. 1326--><p class="indent" > The <a - id="dx1-11010"></a><a +<!--l. 1447--><p class="nopar" > +</p><!--l. 1449--><p class="indent" > The <a + id="dx1-13010"></a><a href="#glo:indexingapp">indexing application’s</a> style file is specified by -</p><!--l. 1327--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1450--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\@istfilename</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-11011"></a> <span + id="dx1-13011"></a> <span class="ec-lmtt-10x-x-109">\@istfilename{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">filename</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 1329--><p class="noindent" > +</p><!--l. 1452--><p class="noindent" > The file extension indicates whether to use <a - id="dx1-11012"></a><a + id="dx1-13012"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-11013"></a></a> (<span + id="dx1-13013"></a></a> (<span class="ec-lmtt-10x-x-109">.ist</span><a - id="dx1-11014"></a>) or <a - id="dx1-11015"></a><a + id="dx1-13014"></a>) or <a + id="dx1-13015"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-11016"></a></a> + id="dx1-13016"></a></a> (<span class="ec-lmtt-10x-x-109">.xdy</span><a - id="dx1-11017"></a>). Note that the glossary information is formatted differently + id="dx1-13017"></a>). Note that the glossary information is formatted differently depending on which <a - id="dx1-11018"></a>indexing application is supposed to be used, so it’s + id="dx1-13018"></a>indexing application is supposed to be used, so it’s important to call the correct one. -</p><!--l. 1336--><p class="indent" > Word or letter ordering is specified by: -</p><!--l. 1337--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1459--><p class="indent" > Word or letter ordering is specified by: +</p><!--l. 1460--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\@glsorder</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-11019"></a> <span + id="dx1-13019"></a> <span class="ec-lmtt-10x-x-109">\@glsorder{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">order</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 1339--><p class="noindent" > +</p><!--l. 1462--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">order</span><span class="lmsy-10x-x-109">⟩ </span>can be either <span class="ec-lmtt-10x-x-109">word </span>or <span class="ec-lmtt-10x-x-109">letter</span>. -</p><!--l. 1342--><p class="indent" > If <a - id="dx1-11020"></a><a +</p><!--l. 1465--><p class="indent" > If <a + id="dx1-13020"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-11021"></a></a> should be used, the language and code page for each glossary is + id="dx1-13021"></a></a> should be used, the language and code page for each glossary is specified by -</p><!--l. 1344--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1467--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\@xdylanguage</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-11022"></a><span class="marginpar"><span + id="dx1-13022"></a><span class="marginpar"><span class="ec-lmtt-10">\@gls@codepage</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-11023"></a> <span + id="dx1-13023"></a> <span class="ec-lmtt-10x-x-109">\@xdylanguage{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -3318,7 +3683,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">code</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 1347--><p class="noindent" > +</p><!--l. 1470--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -3333,191 +3698,238 @@ class="ec-lmri-10x-x-109">code</span><span class="lmsy-10x-x-109">⟩ </span>is the encoding (e.g. <span class="ec-lmtt-10x-x-109">utf8</span>). These commands are omitted if <a - id="dx1-11024"></a><a + id="dx1-13024"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-11025"></a></a> should be used. + id="dx1-13025"></a></a> should be used. </p> -<!--l. 1354--><p class="noindent" ><a +<!--l. 1477--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">2</span>  <a - id="x1-120002"></a>Package Options</h2> + id="sec:pkgopts"></a>Package Options</h2> This section describes the available <span -class="ec-lmss-10x-x-109">glossaries </span>package options. +class="ec-lmss-10x-x-109">glossaries </span>package options. You may +omit the <span +class="ec-lmtt-10x-x-109">=true </span>for boolean options. (For example, <span +class="ec-lmss-10x-x-109">acronym</span><a + id="dx1-14001"></a> is equivalent to +<span +class="ec-lmss-10x-x-109">acronym=true</span><a + id="dx1-14002"></a>). +<!--l. 1484--><p class="indent" > <div class="important" title="Important Note"> Note that <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">key</span><span +class="lmsy-10x-x-109">⟩</span>=<span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">value</span><span +class="lmsy-10x-x-109">⟩ </span>options can’t be passed via the document class +options. (This includes options where the <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">value</span><span +class="lmsy-10x-x-109">⟩ </span>part may be omitted, +such as <span +class="ec-lmss-10x-x-109">acronym</span><a + id="dx1-14003"></a>.) This is a general limitation not restricted to the +<span +class="ec-lmss-10x-x-109">glossaries </span>package. Options that aren’t <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">key</span><span +class="lmsy-10x-x-109">⟩</span>=<span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">value</span><span +class="lmsy-10x-x-109">⟩ </span>(such as <span +class="ec-lmss-10x-x-109">makeindex</span><a + id="dx1-14004"></a>) +may be passed via the document class options. </div> +</p><!--l. 1491--><p class="noindent" > +</p> <h3 class="sectionHead"><span class="titlemark">2.1</span>  <a - id="x1-130002.1"></a>General Options</h3> + id="sec:pkgopts-general"></a>General Options</h3> <dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">nowarn</span><a - id="dx1-13001"></a> </dt><dd + id="dx1-15001"></a> </dt><dd class="description">This suppresses all warnings generated by the <span class="ec-lmss-10x-x-109">glossaries</span> package. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">nomain</span><a - id="dx1-13002"></a> </dt><dd -class="description">This suppresses the creation of the main glossary. Note that - if you use this option, you must create another glossary in - which to put all your entries (either via the <span + id="dx1-15002"></a> </dt><dd +class="description">This suppresses the creation of the main glossary and + associated <span +class="ec-lmtt-10x-x-109">.glo </span>file, if unrequired. Note that if you use this + option, you must create another glossary in which to put all + your entries (either via the <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-13003"></a> package - option described in <a -href="#x1-170002.5">§2.5 </a><a -href="#x1-170002.5">Acronym Options<!--tex4ht:ref: sec:pkgopts-acronym --></a> or via <span + id="dx1-15003"></a> (or <span +class="ec-lmss-10x-x-109">acronyms</span><a + id="dx1-15004"></a>) package option + described in <a +href="#sec:pkgopts-acronym">§2.5 </a><a +href="#sec:pkgopts-acronym">Acronym Options<!--tex4ht:ref: sec:pkgopts-acronym --></a> or via the <span +class="ec-lmss-10x-x-109">symbols</span><a + id="dx1-15005"></a> or <span +class="ec-lmss-10x-x-109">numbers</span><a + id="dx1-15006"></a> + options described in <a +href="#sec:pkgopts-other">§2.6 </a><a +href="#sec:pkgopts-other">Other Options<!--tex4ht:ref: sec:pkgopts-other --></a> or via <span class="ec-lmtt-10x-x-109">\newglossary</span><a - id="dx1-13004"></a> + id="dx1-15007"></a> described in <a -href="#x1-4000012">§12 </a><a -href="#x1-4000012">Defining New Glossaries<!--tex4ht:ref: sec:newglossary --></a>). - </dd><dt class="description"> +href="#sec:newglossary">§12 </a><a +href="#sec:newglossary">Defining New Glossaries<!--tex4ht:ref: sec:newglossary --></a>). + <!--l. 1509--><p class="noindent" ><div class="important" title="Important Note"> If you don’t use the main glossary and you don’t use this + option, <a + id="dx1-15008"></a><a +href="#glo:makeglossaries"><span +class="ec-lmtt-10x-x-109">makeglossaries</span><a + id="dx1-15009"></a></a> will produce the following warning: + </p><div class="alltt"> + <div class="obeylines-v"> + <span +class="ec-lmtt-10x-x-109">Warning:</span><span +class="ec-lmtt-10x-x-109"> File</span><span +class="ec-lmtt-10x-x-109"> ’</span><span +class="ec-lmtti-10x-x-109">filename</span><span +class="ec-lmtt-10x-x-109">.glo’</span><span +class="ec-lmtt-10x-x-109"> is</span><span +class="ec-lmtt-10x-x-109"> empty.</span> + <br /><span +class="ec-lmtt-10x-x-109">Have</span><span +class="ec-lmtt-10x-x-109"> you</span><span +class="ec-lmtt-10x-x-109"> used</span><span +class="ec-lmtt-10x-x-109"> any</span><span +class="ec-lmtt-10x-x-109"> entries</span><span +class="ec-lmtt-10x-x-109"> defined</span><span +class="ec-lmtt-10x-x-109"> in</span><span +class="ec-lmtt-10x-x-109"> glossary</span> + <br /><span +class="ec-lmtt-10x-x-109">’main’?</span> + <br /><span +class="ec-lmtt-10x-x-109">Remember</span><span +class="ec-lmtt-10x-x-109"> to</span><span +class="ec-lmtt-10x-x-109"> use</span><span +class="ec-lmtt-10x-x-109"> package</span><span +class="ec-lmtt-10x-x-109"> option</span><span +class="ec-lmtt-10x-x-109"> ’nomain’</span><span +class="ec-lmtt-10x-x-109"> if</span> + <br /><span +class="ec-lmtt-10x-x-109">you</span><span +class="ec-lmtt-10x-x-109"> don’t</span><span +class="ec-lmtt-10x-x-109"> want</span><span +class="ec-lmtt-10x-x-109"> to</span><span +class="ec-lmtt-10x-x-109"> use</span><span +class="ec-lmtt-10x-x-109"> the</span><span +class="ec-lmtt-10x-x-109"> main</span><span +class="ec-lmtt-10x-x-109"> glossary.</span> +</div> + + + + </div> If you did actually want to use the main glossary and you see this + warning, check that you have referenced the entries in that glossary + via commands such as <span +class="ec-lmtt-10x-x-109">\gls</span><a + id="dx1-15010"></a>. </div> + <!--l. 1522--><p class="noindent" > + </p></dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">sanitize</span><a - id="dx1-13005"></a> </dt><dd -class="description">This is a <span -class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">key</span><span -class="lmsy-10x-x-109">⟩</span>=<span -class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">value</span><span -class="lmsy-10x-x-109">⟩ </span>option whose value is also a <span -class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">key</span><span -class="lmsy-10x-x-109">⟩</span>=<span -class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">value</span><span -class="lmsy-10x-x-109">⟩</span> - list. By default, the <span -class="ec-lmss-10x-x-109">glossaries </span>package <a - id="dx1-13006"></a><a +class="ec-lmssbx-10x-x-109">sanitizesort</span><a + id="dx1-15011"></a> </dt><dd +class="description">This is a boolean option that determines whether or + not to <a + id="dx1-15012"></a><a href="#glo:sanitize">sanitize<a - id="dx1-13007"></a>s</a> the values of the - <span -class="ec-lmss-10x-x-109">name</span><a - id="dx1-13008"></a>, <span -class="ec-lmss-10x-x-109">description</span><a - id="dx1-13009"></a>, <span -class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-13010"></a> and <span -class="ec-lmss-10x-x-109">sort</span><a - id="dx1-13011"></a> keys used when defining a new - glossary entry. This means that you can use fragile commands in - those keys, but it may lead to unexpected results if you try to display - these values within the document text. This sanitization can be - switched off using the <span -class="ec-lmss-10x-x-109">sanitize</span><a - id="dx1-13012"></a> package option. For example, to switch - off the sanitization for the <span -class="ec-lmss-10x-x-109">description</span><a - id="dx1-13013"></a> and <span -class="ec-lmss-10x-x-109">name</span><a - id="dx1-13014"></a> keys, but not for the - <span -class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-13015"></a> key, do: + id="dx1-15013"></a></a> the sort value when writing to the external + glossary file. For example, suppose you define an entry as + follows: <div class="verbatim" id="verbatim-15"> - \usepackage[sanitize={name=false,description=false,% -  <br />symbol=true}]{glossaries} + \newglossaryentry{hash}{name={\#},sort={#}, +  <br /> description={hash symbol}} </div> - <!--l. 1388--><p class="nopar" > You can use <span -class="ec-lmss-10x-x-109">sanitize=none</span><a - id="dx1-13016"></a> as a shortcut for<br -class="newline" /><span -class="ec-lmss-10x-x-109">sanitize={name=false,description=false,symbol=false}</span>. Note that this - shortcut doesn’t change the <span -class="ec-lmss-10x-x-109">sort</span><a - id="dx1-13017"></a> sanitization. That one needs to be - switched off explicitly: + <!--l. 1531--><p class="nopar" > The sort value (<span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">#</span></span></span>) must be sanitized before writing it to the glossary + file, otherwise <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span +class="E">E</span>X</span></span> will try to interpret it as a parameter + reference. If, on the other hand, you want the sort value expanded, + you need to switch off the sanitization. For example, suppose you + do: </p> <div class="verbatim" id="verbatim-16"> - \usepackage[sanitize=none,sanitize={sort=false}]{glossaries} + \newcommand{\mysortvalue}{AAA} +  <br />\newglossaryentry{sample}{name={sample},sort={\mysortvalue}, +  <br /> description={an example}} </div> - <!--l. 1395--><p class="nopar" > - </p><!--l. 1397--><p class="noindent" ><div class="important" title="Important Note"><span -class="ec-lmbx-10x-x-109">Note</span>: this sanitization only applies to the <span -class="ec-lmss-10x-x-109">name</span><a - id="dx1-13018"></a>, <span -class="ec-lmss-10x-x-109">description</span><a - id="dx1-13019"></a>, <span -class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-13020"></a> - and <span -class="ec-lmss-10x-x-109">sort</span><a - id="dx1-13021"></a> keys. It doesn’t apply to any of the other keys so fragile - commands contained in the value of the other keys must always be - protected using <span -class="ec-lmtt-10x-x-109">\protect</span>. Since the value of the <span -class="ec-lmss-10x-x-109">text</span><a - id="dx1-13022"></a> key is - obtained from the <span -class="ec-lmss-10x-x-109">name</span><a - id="dx1-13023"></a> key, you will still need to protect - fragile commands in the <span -class="ec-lmss-10x-x-109">name</span><a - id="dx1-13024"></a> key if you don’t use the <span -class="ec-lmss-10x-x-109">text</span><a - id="dx1-13025"></a> key. - </div> - </p><!--l. 1405--><p class="noindent" > + <!--l. 1541--><p class="nopar" > and you actually want <span +class="ec-lmtt-10x-x-109">\mysortvalue </span>expanded, so that the + entry is sorted according to <span +class="ec-lmtt-10x-x-109">AAA</span>, then use the package option + <span +class="ec-lmss-10x-x-109">sanitizesort=false</span><a + id="dx1-15014"></a>. (The default is <span +class="ec-lmss-10x-x-109">sanitizesort=true</span><a + id="dx1-15015"></a>.) </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">savewrites</span><a - id="dx1-13026"></a> </dt><dd -class="description">This is a boolean option to minimises the number of write + id="dx1-15016"></a> </dt><dd +class="description">This is a boolean option to minimise the number of write registers used by the <span class="ec-lmss-10x-x-109">glossaries </span>package. (Default is <span class="ec-lmss-10x-x-109">savewrites=false</span><a - id="dx1-13027"></a>.) + id="dx1-15017"></a>.) There are only a limited number of write registers, and if you have a large number of glossaries or if you are using a class or other packages that create a lot of external files, you may exceed the maximum number of available registers. If <span class="ec-lmss-10x-x-109">savewrites</span><a - id="dx1-13028"></a> is set, the + id="dx1-15018"></a> is set, the glossary information will be stored in token registers until the end of the document when they will be written to the external files. If you run out of token registers, you can use <span class="ec-lmss-10x-x-109">etex</span><a - id="dx1-13029"></a>. - <!--l. 1418--><p class="noindent" ><div class="important" title="Important Note"> This option can significantly slow document compilation. As + id="dx1-15019"></a>. + <!--l. 1558--><p class="noindent" ><div class="important" title="Important Note"> This option can significantly slow document compilation. As an alternative, you can use the <span class="ec-lmss-10x-x-109">scrwfile</span><a - id="dx1-13030"></a> package (part of the + id="dx1-15020"></a> package (part of the KOMA-Script bundle) and not use this option. </div> - </p><!--l. 1422--><p class="noindent" > - </p><!--l. 1424--><p class="noindent" ><div class="important" title="Important Note"> If you want to use <span class="TEX">T<span + </p><!--l. 1562--><p class="noindent" > + </p><!--l. 1564--><p class="noindent" ><div class="important" title="Important Note"> If you want to use <span class="TEX">T<span class="E">E</span>X</span>’s <span class="ec-lmtt-10x-x-109">\write18</span><a - id="dx1-13031"></a> mechanism to call <a - id="dx1-13032"></a><a + id="dx1-15021"></a> mechanism to call <a + id="dx1-15022"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-13033"></a></a> + id="dx1-15023"></a></a> or <a - id="dx1-13034"></a><a + id="dx1-15024"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-13035"></a></a> from your document and use <span + id="dx1-15025"></a></a> from your document and use <span class="ec-lmss-10x-x-109">savewrites</span><a - id="dx1-13036"></a>, you must + id="dx1-15026"></a>, you must create the external files with <span class="ec-lmtt-10x-x-109">\glswritefiles </span>before you call <a - id="dx1-13037"></a><span + id="dx1-15027"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-13038"></a>/<a - id="dx1-13039"></a><span + id="dx1-15028"></a>/<a + id="dx1-15029"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-13040"></a>. Also set <span + id="dx1-15030"></a>. Also set <span class="ec-lmtt-10x-x-109">\glswritefiles </span>to nothing or <span class="ec-lmtt-10x-x-109">\relax</span> before the end of the document to avoid rewriting the files. For @@ -3532,49 +3944,37 @@ class="ec-lmtt-10x-x-109">\relax</span>  <br />-t \jobname.glg -o \jobname.gls \jobname}  <br />\let\glswritefiles\relax </div> - <!--l. 1436--><p class="nopar" > </div> - </p><!--l. 1437--><p class="noindent" > + <!--l. 1576--><p class="nopar" > </div> + </p><!--l. 1577--><p class="noindent" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">translate</span><a - id="dx1-13041"></a> </dt><dd -class="description">This is a boolean option. The default is <span -class="ec-lmss-10x-x-109">true</span><a - id="dx1-13042"></a> if <span -class="ec-lmss-10x-x-109">babel</span><a - id="dx1-13043"></a>, <span -class="ec-lmss-10x-x-109">polyglossia</span><a - id="dx1-13044"></a> - or <span -class="ec-lmss-10x-x-109">translator</span><a - id="dx1-13045"></a> have been loaded, otherwise the default value is - <span -class="ec-lmss-10x-x-109">false</span><a - id="dx1-13046"></a>. + id="dx1-15031"></a> </dt><dd +class="description">This can take the following values: <dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">translate=true</span><a - id="dx1-13047"></a> </dt><dd + id="dx1-15032"></a> </dt><dd class="description">If <span class="ec-lmss-10x-x-109">babel</span><a - id="dx1-13048"></a> has been loaded and the <span + id="dx1-15033"></a> has been loaded and the <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-13049"></a> + id="dx1-15034"></a> package is installed, <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-13050"></a> will be loaded and the + id="dx1-15035"></a> will be loaded and the translations will be provided by the <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-13051"></a> package + id="dx1-15036"></a> package interface. You can modify the translations by providing your own dictionary. If the <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-13052"></a> package isn’t installed + id="dx1-15037"></a> package isn’t installed and <span class="ec-lmss-10x-x-109">babel</span><a - id="dx1-13053"></a> is loaded, the <span + id="dx1-15038"></a> is loaded, the <span class="ec-lmss-10x-x-109">glossaries-babel</span><a - id="dx1-13054"></a> package will be + id="dx1-15039"></a> package will be loaded and the translations will be provided using <span class="ec-lmss-10x-x-109">babel</span>’s <span @@ -3583,151 +3983,235 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">language</span><span class="lmsy-10x-x-109">⟩ </span>mechanism. If <span class="ec-lmss-10x-x-109">polyglossia</span><a - id="dx1-13055"></a> has + id="dx1-15040"></a> has been loaded, <span class="ec-lmss-10x-x-109">glossaries-polyglossia</span><a - id="dx1-13056"></a> will be loaded. + id="dx1-15041"></a> will be loaded. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">translate=false</span><a - id="dx1-13057"></a> </dt><dd + id="dx1-15042"></a> </dt><dd class="description">Don’t provide translations, even if <span class="ec-lmss-10x-x-109">babel</span><a - id="dx1-13058"></a> or + id="dx1-15043"></a> or <span class="ec-lmss-10x-x-109">polyglossia</span><a - id="dx1-13059"></a> has been loaded. You can then provide you’re - own translations or explicitly load <span + id="dx1-15044"></a> has been loaded. (Note that <span +class="ec-lmss-10x-x-109">babel</span><a + id="dx1-15045"></a> provides the + command <span +class="ec-lmtt-10x-x-109">\glossaryname</span><a + id="dx1-15046"></a> so that will still be translated if + you have loaded <span +class="ec-lmss-10x-x-109">babel</span><a + id="dx1-15047"></a>.) + </dd><dt class="description"> + <span +class="ec-lmssbx-10x-x-109">translate=babel</span><a + id="dx1-15048"></a> </dt><dd +class="description">Don’t load the <span +class="ec-lmss-10x-x-109">translator</span><a + id="dx1-15049"></a> package. Instead load + <span class="ec-lmss-10x-x-109">glossaries-babel</span><a - id="dx1-13060"></a> or + id="dx1-15050"></a>. + <!--l. 1602--><p class="noindent" ><div class="important" title="Important Note"> I recommend you use <span +class="ec-lmss-10x-x-109">translate=babel</span><a + id="dx1-15051"></a> if you have any problems + with the translations or with PDF bookmarks, but to maintain + backward compatibility, if <span +class="ec-lmss-10x-x-109">babel</span><a + id="dx1-15052"></a> has been loaded the default is <span -class="ec-lmss-10x-x-109">glossaries-polyglossia</span><a - id="dx1-13061"></a>.</dd></dl> - <!--l. 1463--><p class="noindent" >See <a -href="#x1-60001.2.1">§1.2.1 </a><a -href="#x1-60001.2.1">Changing the Fixed Names<!--tex4ht:ref: sec:fixednames --></a> for further details. +class="ec-lmss-10x-x-109">translate=true</span><a + id="dx1-15053"></a>. </div> + </p><!--l. 1607--><p class="noindent" > + + + +</p> + </dd></dl> + <!--l. 1611--><p class="noindent" >If <span +class="ec-lmss-10x-x-109">translate</span><a + id="dx1-15054"></a> is specified without a value, <span +class="ec-lmss-10x-x-109">translate=true</span><a + id="dx1-15055"></a> is assumed. If + <span +class="ec-lmss-10x-x-109">translate</span><a + id="dx1-15056"></a> isn’t specified, <span +class="ec-lmss-10x-x-109">translate=true</span><a + id="dx1-15057"></a> is assumed if <span +class="ec-lmss-10x-x-109">babel</span><a + id="dx1-15058"></a>, <span +class="ec-lmss-10x-x-109">polyglossia</span><a + id="dx1-15059"></a> + or <span +class="ec-lmss-10x-x-109">translator</span><a + id="dx1-15060"></a> have been loaded. Otherwise <span +class="ec-lmss-10x-x-109">translate=false</span><a + id="dx1-15061"></a> is + assumed. + </p><!--l. 1617--><p class="noindent" >See <a +href="#sec:fixednames">§1.2.1 </a><a +href="#sec:fixednames">Changing the Fixed Names<!--tex4ht:ref: sec:fixednames --></a> for further details. </p></dd><dt class="description"> <span +class="ec-lmssbx-10x-x-109">notranslate</span><a + id="dx1-15062"></a> </dt><dd +class="description">This is equivalent to <span +class="ec-lmss-10x-x-109">translate=false</span><a + id="dx1-15063"></a> and may be passed via the + document class options. + </dd><dt class="description"> +<span class="ec-lmssbx-10x-x-109">hyperfirst</span><a - id="dx1-13062"></a> </dt><dd -class="description">This is a boolean option that specifies whether each term has a - hyperlink on <a - id="dx1-13063"></a><a + id="dx1-15064"></a> </dt><dd +class="description">This is a boolean option that specifies whether each term + has a hyperlink on <a + id="dx1-15065"></a><a href="#glo:firstuse">first use</a>. The default is <span class="ec-lmss-10x-x-109">hyperfirst=true</span><a - id="dx1-13064"></a> (terms on <a - id="dx1-13065"></a><a -href="#glo:firstuse">first - use</a> have a hyperlink, unless explicitly suppressed using starred - versions of commands such as <span + id="dx1-15066"></a> + (terms on <a + id="dx1-15067"></a><a +href="#glo:firstuse">first use</a> have a hyperlink, unless explicitly suppressed + using starred versions of commands such as <span class="ec-lmtt-10x-x-109">\gls*</span><a - id="dx1-13066"></a>). + id="dx1-15068"></a>). Note that + this applies to all glossary types. It may be that you only + want to apply this to just the acronyms (where the first use + explains the meaning of the acronym) but not for ordinary + glossary entries (where the first use is identical to subsequent + uses). In this case, you can use <span +class="ec-lmss-10x-x-109">hyperfirst=false</span><a + id="dx1-15069"></a> and apply + <span +class="ec-lmtt-10x-x-109">\glsunsetall </span>to all the regular (non-acronym) glossaries. For + example: - </dd><dt class="description"> + <div class="verbatim" id="verbatim-18"> + \usepackage[acronym,hyperfirst=false]{glossaries} +  <br /> acronym and glossary entry definitions +  <br /> at the end of the preamble +  <br />\glsunsetall[main] +</div> + <!--l. 1640--><p class="nopar" > + </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">nohypertypes</span><a - id="dx1-13067"></a> </dt><dd + id="dx1-15070"></a> </dt><dd class="description">Use this option if you have multiple glossaries and you want to suppress the entry hyperlinks for a particular glossary or glossaries. The value of this option should be a comma-separated list of glossary types where <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-13068"></a> etc shouldn’t have hyperlinks by + id="dx1-15071"></a> etc shouldn’t have hyperlinks by default. Make sure you enclose the value in braces if it contains any commas. Example: - <div class="verbatim" id="verbatim-18"> + <div class="verbatim" id="verbatim-19"> \usepackage[acronym,nohypertypes={acronym,notation}]{glossaries}  <br />\newglossary[nlg]{notation}{not}{ntn}{Notation} </div> - <!--l. 1480--><p class="nopar" > The values must be fully expanded, so <span + <!--l. 1651--><p class="nopar" > The values must be fully expanded, so <span class="ec-lmbx-10x-x-109">don’t </span>try - <span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">nohypertypes=\acronymtype</span></span></span>. See <a -href="#x1-280006">§6 </a><a -href="#x1-280006">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a> for - further details. + <span +class="ec-lmtt-10x-x-109">nohypertypes=\acronymtype</span><a + id="dx1-15072"></a>. You may also use + </p><!--l. 1655--><p class="noindent" ><hr><div title="Definition"><span +class="ec-lmtt-10x-x-109">\GlsDeclareNoHyperList</span><a + id="dx1-15073"></a><span +class="ec-lmtt-10x-x-109">{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">list</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> + </p><!--l. 1656--><p class="noindent" > + instead or additionally. See <a +href="#sec:glslink">§6 </a><a +href="#sec:glslink">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a> for further + details. </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">savenumberlist</span><a - id="dx1-13069"></a> </dt><dd + id="dx1-15074"></a> </dt><dd class="description">This is a boolean option that specifies whether or not to gather and store the <a - id="dx1-13070"></a><a + id="dx1-15075"></a><a href="#glo:numberlist">number list<a - id="dx1-13071"></a></a> for each entry. The + id="dx1-15076"></a></a> for each entry. The default is <span class="ec-lmss-10x-x-109">savenumberlist=false</span><a - id="dx1-13072"></a>. (See <span + id="dx1-15077"></a>. (See <span class="ec-lmtt-10x-x-109">\glsentrynumberlist</span><a - id="dx1-13073"></a> and + id="dx1-15078"></a> and <span class="ec-lmtt-10x-x-109">\glsdisplaynumberlist</span><a - id="dx1-13074"></a> in <a -href="#x1-340009">§9 </a><a -href="#x1-340009">Using Glossary Terms Without + id="dx1-15079"></a> in <a +href="#sec:glsnolink">§9 </a><a +href="#sec:glsnolink">Using Glossary Terms Without Links<!--tex4ht:ref: sec:glsnolink --></a>.) </dd></dl> -<!--l. 1493--><p class="noindent" > +<!--l. 1668--><p class="noindent" > </p> -<!--l. 1493--><p class="noindent" ><a +<!--l. 1668--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">2.2</span>  <a - id="x1-140002.2"></a>Sectioning, Headings and TOC Options</h3> + id="sec:pkgopts-sec"></a>Sectioning, Headings and TOC Options</h3> <dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">toc</span><a - id="dx1-14001"></a> </dt><dd + id="dx1-16001"></a> </dt><dd class="description">Add the glossaries to the table of contents. Note that an extra <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> run is required with this option. Alternatively, you can switch this function on and off using - <!--l. 1500--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 1675--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glstoctrue</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-14002"></a> <span + id="dx1-16002"></a> <span class="ec-lmtt-10x-x-109">\glstoctrue </span></div><hr> - </p><!--l. 1502--><p class="noindent" > + </p><!--l. 1677--><p class="noindent" > and - </p><!--l. 1504--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 1679--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glstocfalse</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-14003"></a> <span + id="dx1-16003"></a> <span class="ec-lmtt-10x-x-109">\glstocfalse </span></div><hr> - </p><!--l. 1506--><p class="noindent" > + </p><!--l. 1681--><p class="noindent" > + + + </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">numberline</span><a - id="dx1-14004"></a> </dt><dd + id="dx1-16004"></a> </dt><dd class="description">When used with <span class="ec-lmss-10x-x-109">toc</span><a - id="dx1-14005"></a>, this will add <span + id="dx1-16005"></a>, this will add <span class="ec-lmtt-10x-x-109">\numberline</span><a - id="dx1-14006"></a><span class="obeylines-h"><span class="verb"><span + id="dx1-16006"></a><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">{}</span></span></span> in the final argument of <span class="ec-lmtt-10x-x-109">\addcontentsline</span><a - id="dx1-14007"></a>. This will align the table of contents + id="dx1-16007"></a>. This will align the table of contents entry with the numbered section titles. Note that this option has no - - - effect if the <span class="ec-lmss-10x-x-109">toc</span><a - id="dx1-14008"></a> option is omitted. If <span + id="dx1-16008"></a> option is omitted. If <span class="ec-lmss-10x-x-109">toc</span><a - id="dx1-14009"></a> is used without <span + id="dx1-16009"></a> is used without <span class="ec-lmss-10x-x-109">numberline</span><a - id="dx1-14010"></a>, + id="dx1-16010"></a>, the title will be aligned with the section numbers rather than the section titles. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">section</span><a - id="dx1-14011"></a> </dt><dd + id="dx1-16011"></a> </dt><dd class="description">This is a <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">key</span><span @@ -3743,133 +4227,179 @@ class="lmsy-10x-x-109">⟩ </span>option. Its value should be the - <div class="verbatim" id="verbatim-19"> + <div class="verbatim" id="verbatim-20"> \usepackage[section=subsection]{glossaries} </div> - <!--l. 1524--><p class="nopar" > You can omit the value if you want to use sections, i.e.  + <!--l. 1699--><p class="nopar" > You can omit the value if you want to use sections, i.e.  </p> - <div class="verbatim" id="verbatim-20"> + <div class="verbatim" id="verbatim-21"> \usepackage[section]{glossaries} </div> - <!--l. 1528--><p class="nopar" > is equivalent to + <!--l. 1703--><p class="nopar" > is equivalent to </p> - <div class="verbatim" id="verbatim-21"> + <div class="verbatim" id="verbatim-22"> \usepackage[section=section]{glossaries} </div> - <!--l. 1532--><p class="nopar" > You can change this value later in the document using - </p><!--l. 1534--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 1707--><p class="nopar" > You can change this value later in the document using + </p><!--l. 1709--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\setglossarysection</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-14012"></a> <span + id="dx1-16012"></a> <span class="ec-lmtt-10x-x-109">\setglossarysection{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> - </p><!--l. 1536--><p class="noindent" > + </p><!--l. 1711--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span class="lmsy-10x-x-109">⟩ </span>is the sectional unit. - </p><!--l. 1539--><p class="noindent" >The start of each glossary adds information to the page header + </p><!--l. 1714--><p class="noindent" >The start of each glossary adds information to the page header via - </p><!--l. 1540--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span -class="ec-lmtt-10">\glossarymark</span><span + </p><!--l. 1715--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsglossarymark</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-14013"></a> <span -class="ec-lmtt-10x-x-109">\glossarymark{</span><span + id="dx1-16013"></a> <span +class="ec-lmtt-10x-x-109">\glsglossarymark{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary title</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> - </p><!--l. 1542--><p class="noindent" > + </p><!--l. 1717--><p class="noindent" > This defaults to <span -class="ec-lmtt-10x-x-109">\@mkboth </span>unless <span -class="ec-lmss-10x-x-109">memoir</span><a - id="dx1-14014"></a> is loaded, but you may - need to redefine it. For example, to only change the right - header: +class="ec-lmtt-10x-x-109">\@mkboth</span>, but you may need to redefine it. For + example, to only change the right header: </p> - <div class="verbatim" id="verbatim-22"> - \renewcommand{\glossarymark}[1]{\markright{#1}} + <div class="verbatim" id="verbatim-23"> + \renewcommand{\glsglossarymark}[1]{\markright{#1}} </div> - <!--l. 1548--><p class="nopar" > or to prevent it from changing the headers: + <!--l. 1723--><p class="nopar" > or to prevent it from changing the headers: </p> - <div class="verbatim" id="verbatim-23"> - \renewcommand{\glossarymark}[1]{} + <div class="verbatim" id="verbatim-24"> + \renewcommand{\glsglossarymark}[1]{} </div> - <!--l. 1552--><p class="nopar" > If you want <span -class="ec-lmtt-10x-x-109">\glossarymark </span>to use <span -class="ec-lmtt-10x-x-109">\MakeUppercase </span>in the header, - use the <span + <!--l. 1727--><p class="nopar" > If you want <span +class="ec-lmtt-10x-x-109">\glsglossarymark </span>to use <span +class="ec-lmtt-10x-x-109">\MakeUppercase </span>in the + header, use the <span class="ec-lmss-10x-x-109">ucmark</span><a - id="dx1-14015"></a> option described below. - </p><!--l. 1556--><p class="noindent" >Occasionally you may find that another package defines + id="dx1-16014"></a> option described below. + </p><!--l. 1731--><p class="noindent" >Occasionally you may find that another package defines <span class="ec-lmtt-10x-x-109">\cleardoublepage </span>when it is not required. This may cause an unwanted blank page to appear before each glossary. This can be - fixed by redefining <span -class="ec-lmtt-10x-x-109">\glsclearpage</span><a - id="dx1-14016"></a>: + fixed by redefining <span class="marginpar"><span +class="ec-lmtt-10">\glsclearpage</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-16015"></a><span +class="ec-lmtt-10x-x-109">\glsclearpage</span>: </p> - <div class="verbatim" id="verbatim-24"> + <div class="verbatim" id="verbatim-25"> \renewcommand*{\glsclearpage}{\clearpage} </div> - <!--l. 1562--><p class="nopar" > + <!--l. 1737--><p class="nopar" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">ucmark</span><a - id="dx1-14017"></a> </dt><dd + id="dx1-16016"></a> </dt><dd class="description">This is a boolean option (default: <span class="ec-lmss-10x-x-109">ucmark=false</span><a - id="dx1-14018"></a>). If set, + id="dx1-16017"></a>, + unless <span +class="ec-lmss-10x-x-109">memoir</span><a + id="dx1-16018"></a> has been loaded, in which case it defaults + to <span +class="ec-lmss-10x-x-109">ucmark=true</span><a + id="dx1-16019"></a>). If set, <span +class="ec-lmtt-10x-x-109">\glsglossarymark</span><a + id="dx1-16020"></a> uses <span -class="ec-lmtt-10x-x-109">\glossarymark</span><a - id="dx1-14019"></a> is defined to use <span -class="ec-lmtt-10x-x-109">\MakeUppercase</span><a - id="dx1-14020"></a>. - </dd><dt class="description"> +class="ec-lmtt-10x-x-109">\MakeTextUppercase</span><a + id="dx1-16021"></a><span class="footnote-mark"><a +href="#fn1x4" id="fn1x4-bk"><sup class="textsuperscript">1</sup></a></span><a + id="x1-16022f1"></a>. + You can test whether this option has been set or not using + <!--l. 1750--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\ifglsucmark</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-16027"></a> <span +class="ec-lmtt-10x-x-109">\ifglsucmark </span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">\else </span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">false part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">\fi</span> + </div><hr> + </p><!--l. 1752--><p class="noindent" > + For example: + + + +</p> + <div class="verbatim" id="verbatim-26"> + \renewcommand{\glsglossarymark}[1]{% +  <br />  \ifglsucmark +  <br />    \markright{\MakeTextUppercase{#1}}% +  <br />  \else +  <br />    \markright{#1}% +  <br />  \fi} +</div> + <!--l. 1761--><p class="nopar" > If <span +class="ec-lmss-10x-x-109">memoir</span><a + id="dx1-16028"></a> has been loaded and <span +class="ec-lmss-10x-x-109">ucfirst</span><a + id="dx1-16029"></a> is set, then <span +class="ec-lmss-10x-x-109">memoir</span><a + id="dx1-16030"></a>’s + <span +class="ec-lmtt-10x-x-109">\memUChead</span><a + id="dx1-16031"></a> is used. + </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">numberedsection</span><a - id="dx1-14021"></a> </dt><dd + id="dx1-16032"></a> </dt><dd class="description">The glossaries are placed in unnumbered sectional units by default, but this can be changed using <span class="ec-lmss-10x-x-109">numberedsection</span><a - id="dx1-14022"></a>. + id="dx1-16033"></a>. This option can take three possible values: <span class="ec-lmss-10x-x-109">false</span><a - id="dx1-14023"></a> (no number, + id="dx1-16034"></a> (no number, i.e. use starred form), <span class="ec-lmss-10x-x-109">nolabel</span><a - id="dx1-14024"></a> (numbered, i.e. unstarred form, + id="dx1-16035"></a> (numbered, i.e. unstarred form, but not labelled) and <span class="ec-lmss-10x-x-109">autolabel</span><a - id="dx1-14025"></a> (numbered with automatic + id="dx1-16036"></a> (numbered with automatic labelling). If <span class="ec-lmss-10x-x-109">numberedsection=autolabel</span><a - id="dx1-14026"></a> is used, each glossary is + id="dx1-16037"></a> is used, each glossary is given a label that matches the glossary type, so the main (default) glossary is labelled <span class="ec-lmtt-10x-x-109">main</span>, the list of acronyms is labelled <span class="ec-lmtt-10x-x-109">acronym</span><span class="footnote-mark"><a -href="#fn1x4" id="fn1x4-bk"><sup class="textsuperscript">1</sup></a></span><a - id="x1-14027f1"></a> +href="#fn2x4" id="fn2x4-bk"><sup class="textsuperscript">2</sup></a></span><a + id="x1-16038f2"></a> and additional glossaries are labelled using the value specified in the first mandatory argument to <span class="ec-lmtt-10x-x-109">\newglossary</span>. For example, if you load @@ -3878,136 +4408,136 @@ class="ec-lmss-10x-x-109">glossaries </span>using: - <div class="verbatim" id="verbatim-25"> + <div class="verbatim" id="verbatim-27"> \usepackage[section,numberedsection=autolabel]{glossaries} </div> - <!--l. 1585--><p class="nopar" > then each glossary will appear in a numbered section, and can be + <!--l. 1783--><p class="nopar" > then each glossary will appear in a numbered section, and can be referenced using something like: </p> - <div class="verbatim" id="verbatim-26"> + <div class="verbatim" id="verbatim-28"> The main glossary is in section~\ref{main} and the list of  <br />acronyms is in section~\ref{acronym}. </div> - <!--l. 1591--><p class="nopar" > If you can’t decide whether to have the acronyms in the main + <!--l. 1789--><p class="nopar" > If you can’t decide whether to have the acronyms in the main glossary or a separate list of acronyms, you can use <span class="ec-lmtt-10x-x-109">\acronymtype</span><a - id="dx1-14029"></a> + id="dx1-16040"></a> which is set to <span class="ec-lmtt-10x-x-109">main </span>if the <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-14030"></a> option is not used and is set to + id="dx1-16041"></a> option is not used and is set to <span class="ec-lmtt-10x-x-109">acronym </span>if the <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-14031"></a> option is used. For example: + id="dx1-16042"></a> option is used. For example: </p> - <div class="verbatim" id="verbatim-27"> + <div class="verbatim" id="verbatim-29"> The list of acronyms is in section~\ref{\acronymtype}. </div> - <!--l. 1599--><p class="nopar" > - </p><!--l. 1601--><p class="noindent" >As from version 1.14, you can add a prefix to the label by + <!--l. 1797--><p class="nopar" > + </p><!--l. 1799--><p class="noindent" >As from version 1.14, you can add a prefix to the label by redefining - </p><!--l. 1603--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 1801--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsautoprefix</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-14032"></a> <span + id="dx1-16043"></a> <span class="ec-lmtt-10x-x-109">\glsautoprefix </span></div><hr> - </p><!--l. 1605--><p class="noindent" > + </p><!--l. 1803--><p class="noindent" > For example: </p> - <div class="verbatim" id="verbatim-28"> + <div class="verbatim" id="verbatim-30"> \renewcommand*{\glsautoprefix}{glo:} </div> - <!--l. 1609--><p class="nopar" > will add <span + <!--l. 1807--><p class="nopar" > will add <span class="ec-lmtt-10x-x-109">glo: </span>to the automatically generated label, so you can then, for example, refer to the list of acronyms as follows: </p> - <div class="verbatim" id="verbatim-29"> + <div class="verbatim" id="verbatim-31"> The list of acronyms is in  <br />section~\ref{glo:\acronymtype}. </div> - <!--l. 1615--><p class="nopar" > Or, if you are undecided on a prefix: + <!--l. 1813--><p class="nopar" > Or, if you are undecided on a prefix: </p> - <div class="verbatim" id="verbatim-30"> + <div class="verbatim" id="verbatim-32"> The list of acronyms is in  <br />section~\ref{\glsautoprefix\acronymtype}. </div> - <!--l. 1620--><p class="nopar" > + <!--l. 1818--><p class="nopar" > </p> </dd></dl> -<!--l. 1624--><p class="noindent" > +<!--l. 1822--><p class="noindent" > </p> -<!--l. 1624--><p class="noindent" ><a +<!--l. 1822--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">2.3</span>  <a - id="x1-150002.3"></a>Glossary Appearance Options</h3> + id="sec:pkgopts-printglos"></a>Glossary Appearance Options</h3> <dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">entrycounter</span><a - id="dx1-15001"></a> </dt><dd + id="dx1-17001"></a> </dt><dd class="description">This is a boolean option. (Default is <span class="ec-lmss-10x-x-109">entrycounter=false</span><a - id="dx1-15002"></a>.) + id="dx1-17002"></a>.) If set, each main (level 0) glossary entry will be numbered when using the standard glossary styles. This option creates the counter <span class="marginpar"><span class="ec-lmtt-10">glossaryentry</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-15003"></a><a - id="dx1-15004"></a><span + id="dx1-17003"></a><a + id="dx1-17004"></a><span class="ec-lmss-10x-x-109">glossaryentry</span>. - <!--l. 1634--><p class="noindent" >If you use this option, you can reference the entry number within the + <!--l. 1832--><p class="noindent" >If you use this option, you can reference the entry number within the document using - </p><!--l. 1636--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 1834--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsrefentry</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-15005"></a> <span + id="dx1-17005"></a> <span class="ec-lmtt-10x-x-109">\glsrefentry{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> - </p><!--l. 1638--><p class="noindent" > + </p><!--l. 1836--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩ </span>is the label associated with that glossary entry. - </p><!--l. 1641--><p class="noindent" ><div class="important" title="Important Note"> If you use <span + </p><!--l. 1839--><p class="noindent" ><div class="important" title="Important Note"> If you use <span class="ec-lmtt-10x-x-109">\glsrefentry</span>, you must run <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> twice after creating the glossary files using <a - id="dx1-15006"></a><a + id="dx1-17006"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-15007"></a></a>, <a - id="dx1-15008"></a><a + id="dx1-17007"></a></a>, <a + id="dx1-17008"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-15009"></a></a> or <a - id="dx1-15010"></a><a + id="dx1-17009"></a></a> or <a + id="dx1-17010"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-15011"></a></a> to + id="dx1-17011"></a></a> to ensure the cross-references are up-to-date. </div> - </p><!--l. 1646--><p class="noindent" > + </p><!--l. 1844--><p class="noindent" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">counterwithin</span><a - id="dx1-15012"></a> </dt><dd + id="dx1-17012"></a> </dt><dd class="description">This is a <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">key</span><span @@ -4021,9 +4551,9 @@ class="lmsy-10x-x-109">⟩ </span>is the name of a counter. If used, this option will automatically set <span class="ec-lmss-10x-x-109">entrycounter=true</span><a - id="dx1-15013"></a> and the <span + id="dx1-17013"></a> and the <span class="ec-lmss-10x-x-109">glossaryentry</span><a - id="dx1-15014"></a> counter will be reset every + id="dx1-17014"></a> counter will be reset every time <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">value</span><span @@ -4031,44 +4561,46 @@ class="lmsy-10x-x-109">⟩ </span>is incremented. - <!--l. 1654--><p class="noindent" ><span class="marginpar"><span -class="ec-lmtt-10">\glsresetentrycounter</span><span -class="ec-lmtt-10"> </span></span><a - id="dx1-15015"></a> - </p><!--l. 1655--><p class="noindent" ><div class="important" title="Important Note"> The <span + <!--l. 1853--><p class="noindent" ><div class="important" title="Important Note"> The <span class="ec-lmss-10x-x-109">glossaryentry</span><a - id="dx1-15016"></a> counter isn’t automatically reset at the start of + id="dx1-17015"></a> counter isn’t automatically reset at the start of each glossary, except when glossary section numbering is on and the counter used by <span class="ec-lmss-10x-x-109">counterwithin</span><a - id="dx1-15017"></a> is the same as the counter used in the - glossary’s sectioning command. If you want the counter reset at the - start of each glossary, you can redefine <span + id="dx1-17016"></a> is the same as the counter used in the + glossary’s sectioning command. </div> + </p><!--l. 1858--><p class="noindent" > + </p><!--l. 1860--><p class="noindent" >If you want the counter reset at the start of each glossary, you can + redefine <span class="ec-lmtt-10x-x-109">\glossarypreamble</span><a - id="dx1-15018"></a> - to use <span -class="ec-lmtt-10x-x-109">\glsresetentrycounter</span>, which sets <span + id="dx1-17017"></a> to use + </p><!--l. 1862--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsresetentrycounter</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-17018"></a> <span +class="ec-lmtt-10x-x-109">\glsresetentrycounter </span></div><hr> + </p><!--l. 1864--><p class="noindent" > + which sets <span class="ec-lmss-10x-x-109">glossaryentry</span><a - id="dx1-15019"></a> to - zero: + id="dx1-17019"></a> to zero: </p> - <div class="verbatim" id="verbatim-31"> + <div class="verbatim" id="verbatim-33"> \renewcommand{\glossarypreamble}{%  <br />  \glsresetentrycounter  <br />} </div> - <!--l. 1667--><p class="nopar" > or if you want a different preamble per glossary, use - <span + <!--l. 1870--><p class="nopar" > or if you are using <span class="ec-lmtt-10x-x-109">\setglossarypreamble</span><a - id="dx1-15020"></a>. For example: + id="dx1-17020"></a>, add it to each glossary + preamble, as required. For example: </p> - <div class="verbatim" id="verbatim-32"> + <div class="verbatim" id="verbatim-34"> \setglossarypreamble[acronym]{%  <br />  \glsresetentrycounter  <br />  The preamble text here for the list of acronyms. @@ -4078,30 +4610,29 @@ class="ec-lmtt-10x-x-109">\setglossarypreamble</span><a  <br />  The preamble text here for the main glossary.  <br />} </div> - <!--l. 1679--><p class="nopar" > </div> - </p><!--l. 1680--><p class="noindent" > + <!--l. 1882--><p class="nopar" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">subentrycounter</span><a - id="dx1-15021"></a> </dt><dd + id="dx1-17021"></a> </dt><dd class="description">This is a boolean option. (Default is <span class="ec-lmss-10x-x-109">subentrycounter=false</span><a - id="dx1-15022"></a>.) + id="dx1-17022"></a>.) If set, each level 1 glossary entry will be numbered when using the standard glossary styles. This option creates the counter <span class="marginpar"><span class="ec-lmtt-10">glossarysubentry</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-15023"></a><a - id="dx1-15024"></a><span + id="dx1-17023"></a><a + id="dx1-17024"></a><span class="ec-lmss-10x-x-109">glossarysubentry</span>. The counter is reset with each main (level 0) entry. Note that this package option is independent of <span class="ec-lmss-10x-x-109">entrycounter</span><a - id="dx1-15025"></a>. You can reference the number within the document + id="dx1-17025"></a>. You can reference the number within the document using <span class="ec-lmtt-10x-x-109">\glsrefentry</span><a - id="dx1-15026"></a><span + id="dx1-17026"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -4114,7 +4645,7 @@ class="lmsy-10x-x-109">⟩ </span>is the label associated </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">style</span><a - id="dx1-15027"></a> </dt><dd + id="dx1-17027"></a> </dt><dd class="description">This is a <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">key</span><span @@ -4123,166 +4654,186 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">value</span><span class="lmsy-10x-x-109">⟩ </span>option. (Default is <span class="ec-lmss-10x-x-109">style=list</span><a - id="dx1-15028"></a>.) Its value should - be the name of the glossary style to use. This key may only be used - for styles defined in <span + id="dx1-17028"></a>.) Its value + should be the name of the glossary style to use. This key may + only be used for styles defined in <span class="ec-lmss-10x-x-109">glossary-list</span><a - id="dx1-15029"></a>, <span + id="dx1-17029"></a>, <span class="ec-lmss-10x-x-109">glossary-long</span><a - id="dx1-15030"></a>, <span -class="ec-lmss-10x-x-109">glossary-super</span><a - id="dx1-15031"></a> or + id="dx1-17030"></a>, <span +class="ec-lmss-10x-x-109">glossary-super</span><a + id="dx1-17031"></a> or <span class="ec-lmss-10x-x-109">glossary-tree</span><a - id="dx1-15032"></a>. (See <a -href="#x1-4700015">§15 </a><a -href="#x1-4700015">Glossary Styles<!--tex4ht:ref: sec:styles --></a>.) - </dd><dt class="description"> + id="dx1-17032"></a>. Alternatively, you can set the style + using + <!--l. 1902--><p class="noindent" ><hr><div title="Definition"><span +class="ec-lmtt-10x-x-109">\setglossarystyle{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">style name</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> + </p><!--l. 1903--><p class="noindent" > + (See <a +href="#sec:styles">§15 </a><a +href="#sec:styles">Glossary Styles<!--tex4ht:ref: sec:styles --></a> for further details.) + </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">nolong</span><a - id="dx1-15033"></a> </dt><dd + id="dx1-17033"></a> </dt><dd class="description">This prevents the <span -class="ec-lmss-10x-x-109">glossaries </span>package from automatically loading - <span +class="ec-lmss-10x-x-109">glossaries </span>package from automatically + loading <span class="ec-lmss-10x-x-109">glossary-long</span><a - id="dx1-15034"></a> (which means that the <span + id="dx1-17034"></a> (which means that the <span class="ec-lmss-10x-x-109">longtable</span><a - id="dx1-15035"></a> package also won’t be - loaded). This reduces overhead by not defining unwanted styles and - commands. Note that if you use this option, you won’t be able - to use any of the glossary styles defined in the <span -class="ec-lmss-10x-x-109">glossary-long</span> - package. + id="dx1-17035"></a> package + also won’t be loaded). This reduces overhead by not defining + unwanted styles and commands. Note that if you use this + option, you won’t be able to use any of the glossary styles + defined in the <span +class="ec-lmss-10x-x-109">glossary-long </span>package (unless you explicitly load + <span +class="ec-lmss-10x-x-109">glossary-long</span><a + id="dx1-17036"></a>). + + + </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">nosuper</span><a - id="dx1-15036"></a> </dt><dd + id="dx1-17037"></a> </dt><dd class="description">This prevents the <span class="ec-lmss-10x-x-109">glossaries </span>package from automatically loading <span class="ec-lmss-10x-x-109">glossary-super</span><a - id="dx1-15037"></a> (which means that the <span + id="dx1-17038"></a> (which means that the <span class="ec-lmss-10x-x-109">supertabular</span><a - id="dx1-15038"></a> package also won’t - - - - be loaded). This reduces overhead by not defining unwanted styles - and commands. Note that if you use this option, you won’t be able to - use any of the glossary styles defined in the <span -class="ec-lmss-10x-x-109">glossary-super</span> - package. + id="dx1-17039"></a> package + also won’t be loaded). This reduces overhead by not defining + unwanted styles and commands. Note that if you use this + option, you won’t be able to use any of the glossary styles + defined in the <span +class="ec-lmss-10x-x-109">glossary-super </span>package (unless you explicitly load + <span +class="ec-lmss-10x-x-109">glossary-super</span><a + id="dx1-17040"></a>). </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">nolist</span><a - id="dx1-15039"></a> </dt><dd + id="dx1-17041"></a> </dt><dd class="description">This prevents the <span class="ec-lmss-10x-x-109">glossaries </span>package from automatically loading <span class="ec-lmss-10x-x-109">glossary-list</span><a - id="dx1-15040"></a>. This reduces overhead by not defining unwanted styles. + id="dx1-17042"></a>. This reduces overhead by not defining unwanted styles. Note that if you use this option, you won’t be able to use any of the glossary styles defined in the <span -class="ec-lmss-10x-x-109">glossary-list </span>package. Note that since the - default style is <span +class="ec-lmss-10x-x-109">glossary-list </span>package (unless you + explicitly load <span +class="ec-lmss-10x-x-109">glossary-list</span><a + id="dx1-17043"></a>). Note that since the default style is <span class="ec-lmss-10x-x-109">list</span><a - id="dx1-15041"></a>, you will also need to use the <span + id="dx1-17044"></a>, + you will also need to use the <span class="ec-lmss-10x-x-109">style</span><a - id="dx1-15042"></a> option to set - the style to something else. + id="dx1-17045"></a> option to set the style to something + else. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">notree</span><a - id="dx1-15043"></a> </dt><dd + id="dx1-17046"></a> </dt><dd class="description">This prevents the <span class="ec-lmss-10x-x-109">glossaries </span>package from automatically loading <span class="ec-lmss-10x-x-109">glossary-tree</span><a - id="dx1-15044"></a>. This reduces overhead by not defining unwanted - styles. Note that if you use this option, you won’t be able - to use any of the glossary styles defined in the <span -class="ec-lmss-10x-x-109">glossary-tree</span> - package. + id="dx1-17047"></a>. This reduces overhead by not defining unwanted styles. + Note that if you use this option, you won’t be able to use any of the + glossary styles defined in the <span +class="ec-lmss-10x-x-109">glossary-tree </span>package (unless you + explicitly load <span +class="ec-lmss-10x-x-109">glossary-tree</span><a + id="dx1-17048"></a>). </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">nostyles</span><a - id="dx1-15045"></a> </dt><dd + id="dx1-17049"></a> </dt><dd class="description">This prevents all the predefined styles from being loaded. If you - use this option, you need to load a glossary style package (such as - <span + use this option, you need to load a glossary style package + (such as <span class="ec-lmss-10x-x-109">glossary-mcols</span><a - id="dx1-15046"></a>). Also if you use this option, you can’t use the <span + id="dx1-17050"></a>). Also if you use this option, you can’t + use the <span class="ec-lmss-10x-x-109">style</span><a - id="dx1-15047"></a> - package option. Instead you must either use <span -class="ec-lmtt-10x-x-109">\glossarystyle</span><a - id="dx1-15048"></a><span + id="dx1-17051"></a> package option. Instead you must either use + <span +class="ec-lmtt-10x-x-109">\setglossarystyle</span><a + id="dx1-17052"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">style</span><span class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">}</span> - or the <span +class="ec-lmtt-10x-x-109">} </span>or the <span class="ec-lmss-10x-x-109">style</span><a - id="dx1-15049"></a> key in the optional argument to <span + id="dx1-17053"></a> key in the optional + argument to <span class="ec-lmtt-10x-x-109">\printglossary</span><a - id="dx1-15050"></a>. - Example: + id="dx1-17054"></a>. Example: - <div class="verbatim" id="verbatim-33"> + <div class="verbatim" id="verbatim-35"> \usepackage[nostyles]{glossaries}  <br />\usepackage{glossary-mcols} -  <br />\glossarystyle{mcoltree} +  <br />\setglossarystyle{mcoltree} </div> - <!--l. 1740--><p class="nopar" > + <!--l. 1950--><p class="nopar" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">nonumberlist</span><a - id="dx1-15051"></a> </dt><dd + id="dx1-17055"></a> </dt><dd class="description">This option will suppress the associated <a - id="dx1-15052"></a><a + id="dx1-17056"></a><a href="#glo:numberlist">number list<a - id="dx1-15053"></a>s</a> in the + id="dx1-17057"></a>s</a> in the glossaries (see also <a -href="#x1-270005">§5 </a><a -href="#x1-270005">Number lists<!--tex4ht:ref: sec:numberlists --></a>). +href="#sec:numberlists">§5 </a><a +href="#sec:numberlists">Number lists<!--tex4ht:ref: sec:numberlists --></a>). </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">seeautonumberlist</span><a - id="dx1-15054"></a> </dt><dd + id="dx1-17058"></a> </dt><dd class="description">If you suppress the <a - id="dx1-15055"></a><a + id="dx1-17059"></a><a href="#glo:numberlist">number list<a - id="dx1-15056"></a>s</a> with <span + id="dx1-17060"></a>s</a> with <span class="ec-lmss-10x-x-109">nonumberlist</span><a - id="dx1-15057"></a>, + id="dx1-17061"></a>, described above, this will also suppress any cross-referencing information supplied by the <span class="ec-lmss-10x-x-109">see</span><a - id="dx1-15058"></a> key in <span + id="dx1-17062"></a> key in <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-15059"></a> or + id="dx1-17063"></a> or <span class="ec-lmtt-10x-x-109">\glssee</span><a - id="dx1-15060"></a>. If you use <span + id="dx1-17064"></a>. If you use <span class="ec-lmss-10x-x-109">seeautonumberlist</span><a - id="dx1-15061"></a>, the <span + id="dx1-17065"></a>, the <span class="ec-lmss-10x-x-109">see</span><a - id="dx1-15062"></a> key will automatically + id="dx1-17066"></a> key will automatically implement <span class="ec-lmss-10x-x-109">nonumberlist=false</span><a - id="dx1-15063"></a> for that entry. (Note this doesn’t + id="dx1-17067"></a> for that entry. (Note this doesn’t affect <span class="ec-lmtt-10x-x-109">\glssee</span>.) For further details see <a -href="#x1-320008">§8 </a><a -href="#x1-320008">Cross-Referencing +href="#sec:crossref">§8 </a><a +href="#sec:crossref">Cross-Referencing Entries<!--tex4ht:ref: sec:crossref --></a>. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">counter</span><a - id="dx1-15064"></a> </dt><dd + id="dx1-17068"></a> </dt><dd class="description">This is a <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">key</span><span @@ -4291,18 +4842,18 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">value</span><span class="lmsy-10x-x-109">⟩ </span>option. (Default is <span class="ec-lmss-10x-x-109">counter=page</span><a - id="dx1-15065"></a>.) The + id="dx1-17069"></a>.) The value should be the name of the default counter to use in the <a - id="dx1-15066"></a><a + id="dx1-17070"></a><a href="#glo:numberlist">number list<a - id="dx1-15067"></a>s</a> (see <a -href="#x1-270005">§5 </a><a -href="#x1-270005">Number lists<!--tex4ht:ref: sec:numberlists --></a>). + id="dx1-17071"></a>s</a> (see <a +href="#sec:numberlists">§5 </a><a +href="#sec:numberlists">Number lists<!--tex4ht:ref: sec:numberlists --></a>). </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">nopostdot</span><a - id="dx1-15068"></a> </dt><dd + id="dx1-17072"></a> </dt><dd class="description">This is a boolean option. If no value is specified, <span class="ec-lmtt-10x-x-109">true </span>is assumed. When set to <span @@ -4310,11 +4861,11 @@ class="ec-lmtt-10x-x-109">true</span>, this option suppresses the default post description dot used by some of the predefined styles. The default setting is <span class="ec-lmss-10x-x-109">nopostdot=false</span><a - id="dx1-15069"></a>. + id="dx1-17073"></a>. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">nogroupskip</span><a - id="dx1-15070"></a> </dt><dd + id="dx1-17074"></a> </dt><dd class="description">This is a boolean option. If no value is specified, <span class="ec-lmtt-10x-x-109">true </span>is assumed. When set to <span @@ -4322,20 +4873,20 @@ class="ec-lmtt-10x-x-109">true</span>, this option suppresses the default vertical gap between groups used by some of the predefined styles. The default setting is <span class="ec-lmss-10x-x-109">nogroupskip=false</span><a - id="dx1-15071"></a>. + id="dx1-17075"></a>. </dd></dl> -<!--l. 1774--><p class="noindent" > +<!--l. 1984--><p class="noindent" > </p> -<!--l. 1774--><p class="noindent" ><a +<!--l. 1984--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">2.4</span>  <a - id="x1-160002.4"></a>Sorting Options</h3> + id="sec:pkgopts-sort"></a>Sorting Options</h3> <dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">sort</span><a - id="dx1-16001"></a> </dt><dd + id="dx1-18001"></a> </dt><dd class="description">This is a <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">key</span><span @@ -4347,127 +4898,421 @@ class="lmsy-10x-x-109">⟩ </span>option where the option can only have <ul class="itemize1"> <li class="itemize"><span class="ec-lmss-10x-x-109">standard</span><a - id="dx1-16002"></a> : entries are sorted according to the value of the <span + id="dx1-18002"></a> : entries are sorted according to the value of the <span class="ec-lmss-10x-x-109">sort</span><a - id="dx1-16003"></a> + id="dx1-18003"></a> key used in <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-16004"></a> (if present) or the <span + id="dx1-18004"></a> (if present) or the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-16005"></a> + id="dx1-18005"></a> key (if <span class="ec-lmss-10x-x-109">sort</span><a - id="dx1-16006"></a> key is missing); + id="dx1-18006"></a> key is missing); </li> <li class="itemize"><span class="ec-lmss-10x-x-109">def</span><a - id="dx1-16007"></a> : entries are sorted in the order in which they were + id="dx1-18007"></a> : entries are sorted in the order in which they were defined (the <span class="ec-lmss-10x-x-109">sort</span><a - id="dx1-16008"></a> key in <span + id="dx1-18008"></a> key in <span class="ec-lmtt-10x-x-109">\newglossaryentry </span>is ignored); </li> <li class="itemize"><span class="ec-lmss-10x-x-109">use</span><a - id="dx1-16009"></a> : entries are sorted according to the order in + id="dx1-18009"></a> : entries are sorted according to the order in which they are used in the document (the <span class="ec-lmss-10x-x-109">sort</span><a - id="dx1-16010"></a> key in + id="dx1-18010"></a> key in <span -class="ec-lmtt-10x-x-109">\newglossaryentry </span>is ignored).</li></ul> - <!--l. 1796--><p class="noindent" >The default is <span +class="ec-lmtt-10x-x-109">\newglossaryentry </span>is ignored). + <!--l. 2005--><p class="noindent" >Both <span +class="ec-lmss-10x-x-109">sort=def</span><a + id="dx1-18011"></a> and <span +class="ec-lmss-10x-x-109">sort=use</span><a + id="dx1-18012"></a> set the sort key to a six digit + number via + </p><!--l. 2007--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glssortnumberfmt</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-18013"></a> <span +class="ec-lmtt-10x-x-109">\glssortnumberfmt{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">number</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}</span> + </div><hr> + </p><!--l. 2009--><p class="noindent" > + (padded with leading zeros, where necessary). This can be + redefined, if required, before the entries are defined (in the case + of <span +class="ec-lmss-10x-x-109">sort=def</span><a + id="dx1-18014"></a>) or before the entries are used (in the case of + <span +class="ec-lmss-10x-x-109">sort=use</span><a + id="dx1-18015"></a>).</p></li></ul> + <!--l. 2016--><p class="noindent" >The default is <span class="ec-lmss-10x-x-109">sort=standard</span><a - id="dx1-16011"></a>. - </p></dd><dt class="description"> + id="dx1-18016"></a>. When the standard sort option is in use, + you can hook into the sort mechanism by redefining: + </p><!--l. 2019--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsprestandardsort</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-18017"></a> <span +class="ec-lmtt-10x-x-109">\glsprestandardsort{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">sort cs</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">type</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}</span> + </div><hr> + </p><!--l. 2021--><p class="noindent" > + where <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">sort cs</span><span +class="lmsy-10x-x-109">⟩ </span>is a temporary control sequence that stores the sort + value (which was either explicitly set via the <span +class="ec-lmss-10x-x-109">sort</span><a + id="dx1-18018"></a> key or implicitly set + via the <span +class="ec-lmss-10x-x-109">name</span><a + id="dx1-18019"></a> key) before any escaping of the <a + id="dx1-18020"></a><a +href="#glo:makeindex"><span +class="ec-lmtt-10x-x-109">makeindex</span><a + id="dx1-18021"></a></a>/<a + id="dx1-18022"></a><a +href="#glo:xindy"><span +class="ec-lmtt-10x-x-109">xindy</span><a + id="dx1-18023"></a></a> + special characters is performed. By default <span +class="ec-lmtt-10x-x-109">\glsprestandardsort</span> + just does: + + + + </p><!--l. 2027--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsdosanitizesort</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-18024"></a> <span +class="ec-lmtt-10x-x-109">\glsdosanitizesort </span></div><hr> + </p><!--l. 2029--><p class="noindent" > + which sanitizes <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">sort cs</span><span +class="lmsy-10x-x-109">⟩ </span>if the <span +class="ec-lmss-10x-x-109">sanitizesort</span><a + id="dx1-18025"></a> package option is set + (or does nothing if the package option <span +class="ec-lmss-10x-x-109">sanitizesort=false</span><a + id="dx1-18026"></a> is + used). + </p><!--l. 2033--><p class="noindent" >The other arguments, <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">type</span><span +class="lmsy-10x-x-109">⟩ </span>and <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>, are the glossary type and + the entry label for the current entry. Note that <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">type</span><span +class="lmsy-10x-x-109">⟩ </span>will always be a + control sequence, but <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩ </span>will be in the form used in the first + argument of <span +class="ec-lmtt-10x-x-109">\newglossaryentry</span><a + id="dx1-18027"></a>. + </p><!--l. 2038--><p class="noindent" ><div class="important" title="Important Note"> Redefining <span +class="ec-lmtt-10x-x-109">\glsprestandardsort </span>won’t affect any entries that have + already been defined and will have no effect at all if you are using + <span +class="ec-lmss-10x-x-109">sort=def</span><a + id="dx1-18028"></a> or <span +class="ec-lmss-10x-x-109">sort=use</span><a + id="dx1-18029"></a>. </div> + </p><!--l. 2042--><p class="noindent" > +<a + id="x1-18030r1"></a> + </p><!--l. 2044--><p class="noindent" ><span +class="ec-lmbx-12">Example 1</span><span +class="ec-lmbx-12"> (Mixing Alphabetical and Order of</span> + <span +class="ec-lmbx-12">Definition Sorting)</span><a + id="x1-18031"></a> + </p><!--l. 2045--><p class="noindent" >Suppose I have three glossaries: <span +class="ec-lmtt-10x-x-109">main</span>, <span +class="ec-lmtt-10x-x-109">acronym </span>and <span +class="ec-lmtt-10x-x-109">notation</span>, and + let’s suppose I want the <span +class="ec-lmtt-10x-x-109">main </span>and <span +class="ec-lmtt-10x-x-109">acronym </span>glossaries to be sorted + alphabetically, but the <span +class="ec-lmtt-10x-x-109">notation </span>type should be sorted in + order of definition. I can set the sort to standard (which is + the default, but can be explicitly set via the package option + <span +class="ec-lmss-10x-x-109">sort=standard</span><a + id="dx1-18032"></a>), and I can either define all my <span +class="ec-lmtt-10x-x-109">main </span>and <span +class="ec-lmtt-10x-x-109">acronym</span> + entries, then redefine <span +class="ec-lmtt-10x-x-109">\glsprestandardsort </span>to set <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">sort cs</span><span +class="lmsy-10x-x-109">⟩ </span>to an + incremented integer, and then define all my <span +class="ec-lmtt-10x-x-109">notation </span>entries. + Alternatively, I can redefine <span +class="ec-lmtt-10x-x-109">\glsprestandardsort </span>to check + for the glossary type and only modify <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">sort cs</span><span +class="lmsy-10x-x-109">⟩ </span>if <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">type</span><span +class="lmsy-10x-x-109">⟩ </span>is + <span +class="ec-lmtt-10x-x-109">notation</span>. + </p><!--l. 2059--><p class="noindent" >The first option can be achieved as follows: + + + +</p> + <div class="verbatim" id="verbatim-36"> + \newcounter{sortcount} +  <br />\renewcommand{\glsprestandardsort}[3]{% +  <br />  \stepcounter{sortcount}% +  <br />  \edef#1{\glssortnumberfmt{\arabic{sortcount}}}% +  <br />} +</div> + <!--l. 2067--><p class="nopar" > The second option can be achieved as follows: + + + +</p> + <div class="verbatim" id="verbatim-37"> + \newcounter{sortcount} +  <br />\renewcommand{\glsprestandardsort}[3]{% +  <br />  \ifdefstring{#2}{notation}% +  <br />  {% +  <br />     \stepcounter{sortcount}% +  <br />     \edef#1{\glssortnumberfmt{\arabic{sortcount}}}% +  <br />  }% +  <br />  {% +  <br />     \glsdosanitizesort +  <br />  }% +  <br />} +</div> + <!--l. 2082--><p class="nopar" > (<span +class="ec-lmtt-10x-x-109">\ifdefstring </span>is defined by the <span +class="ec-lmss-10x-x-109">etoolbox</span><a + id="dx1-18033"></a> package.) For a complete + document, see the sample file <a +href="#x1-6119r26"><span +class="ec-lmtt-10x-x-109">sampleSort.tex</span></a>. </p> + <div class="center" +> +<!--l. 2085--><p class="noindent" > +</p><!--l. 2085--><p class="noindent" >____________________________</p></div> +<a + id="x1-18034r2"></a> + <!--l. 2087--><p class="noindent" ><span +class="ec-lmbx-12">Example 2</span><span +class="ec-lmbx-12"> (Customizing Standard Sort)</span><a + id="x1-18035"></a> + </p><!--l. 2088--><p class="noindent" >Suppose you want a glossary of people and you want the names listed + as <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">first-name</span><span +class="lmsy-10x-x-109">⟩ ⟨</span><span +class="ec-lmri-10x-x-109">surname</span><span +class="lmsy-10x-x-109">⟩ </span>in the glossary, but you want the names + sorted by <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">surname</span><span +class="lmsy-10x-x-109">⟩</span>, <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">first-name</span><span +class="lmsy-10x-x-109">⟩</span>. You can do this by defining a + command called, say, <span +class="ec-lmtt-10x-x-109">\name{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">first-name</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">surname</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span>that you can + use in the <span +class="ec-lmss-10x-x-109">name</span><a + id="dx1-18036"></a> key when you define the entry, but hook into the + standard sort mechanism to temporarily redefine <span +class="ec-lmtt-10x-x-109">\name </span>while the + sort value is being set. + </p><!--l. 2097--><p class="noindent" >First, define two commands to set the person’s name: + + + +</p> + <div class="verbatim" id="verbatim-38"> + \newcommand{\sortname}[2]{#2, #1} +  <br />\newcommand{\textname}[2]{#1 #2} +</div> + <!--l. 2101--><p class="nopar" > and <span +class="ec-lmtt-10x-x-109">\name </span>needs to be initialised to <span +class="ec-lmtt-10x-x-109">\textname</span>: + + + +</p> + <div class="verbatim" id="verbatim-39"> + \let\name\textname +</div> + <!--l. 2105--><p class="nopar" > Now redefine <span +class="ec-lmtt-10x-x-109">\glsprestandardsort </span>so that it temporarily sets + <span +class="ec-lmtt-10x-x-109">\name </span>to <span +class="ec-lmtt-10x-x-109">\sortname </span>and expands the sort value, then sets <span +class="ec-lmtt-10x-x-109">\name </span>to + <span +class="ec-lmtt-10x-x-109">\textname </span>so that the person’s name appears as <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">first-name</span><span +class="lmsy-10x-x-109">⟩</span> + <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">surname</span><span +class="lmsy-10x-x-109">⟩ </span>in the text: + + + +</p> + <div class="verbatim" id="verbatim-40"> + \renewcommand{\glsprestandardsort}[3]{% +  <br /> \let\name\sortname +  <br /> \edef#1{\expandafter\expandonce\expandafter{#1}}% +  <br /> \let\name\textname +  <br /> \glsdosanitizesort +  <br />} +</div> + <!--l. 2117--><p class="nopar" > (The somewhat complicate use of <span +class="ec-lmtt-10x-x-109">\expandafter </span>etc helps to protect + fragile commands, but care is still needed.) + </p><!--l. 2121--><p class="noindent" >Now the entries can be defined: + + + +</p> + <div class="verbatim" id="verbatim-41"> + \newglossaryentry{joebloggs}{name={\name{Joe}{Bloggs}}, +  <br />  description={some information about Joe Bloggs}} +  <br />\newglossaryentry{johnsmith}{name={\name{John}{Smith}}, +  <br />  description={some information about John Smith}} +</div> + <!--l. 2128--><p class="nopar" > For a complete document, see the sample file <a +href="#x1-6118r25"><span +class="ec-lmtt-10x-x-109">samplePeople.tex</span></a>. + </p> + <div class="center" +> +<!--l. 2130--><p class="noindent" > +</p><!--l. 2130--><p class="noindent" >____________________________</p></div> + </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">order</span><a - id="dx1-16012"></a> </dt><dd + id="dx1-18037"></a> </dt><dd class="description">This may take two values: <span class="ec-lmss-10x-x-109">word</span><a - id="dx1-16013"></a> or <span + id="dx1-18038"></a> or <span class="ec-lmss-10x-x-109">letter</span><a - id="dx1-16014"></a>. The default is word + id="dx1-18039"></a>. The default is word ordering. - <!--l. 1802--><p class="noindent" ><div class="important" title="Important Note"> Note that the <span + <!--l. 2136--><p class="noindent" ><div class="important" title="Important Note"> Note that the <span class="ec-lmss-10x-x-109">order</span><a - id="dx1-16015"></a> option has no effect if you don’t use + id="dx1-18040"></a> option has no effect if you don’t use <a - id="dx1-16016"></a><a + id="dx1-18041"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-16017"></a></a>. </div> - </p><!--l. 1805--><p class="noindent" > + id="dx1-18042"></a></a>. </div> + </p><!--l. 2139--><p class="noindent" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">makeindex</span><a - id="dx1-16018"></a> </dt><dd + id="dx1-18043"></a> </dt><dd class="description">(Default) The glossary information and indexing style file will be written in <a - id="dx1-16019"></a><a + id="dx1-18044"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-16020"></a></a> format. If you use <a - id="dx1-16021"></a><a + id="dx1-18045"></a></a> format. If you use <a + id="dx1-18046"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-16022"></a></a>, it + id="dx1-18047"></a></a>, it will automatically detect that it needs to call <a - id="dx1-16023"></a><span + id="dx1-18048"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-16024"></a>. If + id="dx1-18049"></a>. If you don’t use <a - id="dx1-16025"></a><span + id="dx1-18050"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-16026"></a>, you need to remember to use + id="dx1-18051"></a>, you need to remember to use <a - id="dx1-16027"></a><span + id="dx1-18052"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-16028"></a> not <a - id="dx1-16029"></a><a + id="dx1-18053"></a> not <a + id="dx1-18054"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-16030"></a></a>. The indexing style file will been given a <span + id="dx1-18055"></a></a>. The indexing style file will been given a <span class="ec-lmtt-10x-x-109">.ist</span><a - id="dx1-16031"></a> + id="dx1-18056"></a> extension. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">xindy</span><a - id="dx1-16032"></a> </dt><dd + id="dx1-18057"></a> </dt><dd class="description">The glossary information and indexing style file will be written in <a - id="dx1-16033"></a><a + id="dx1-18058"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-16034"></a></a> format. If you use <a - id="dx1-16035"></a><a + id="dx1-18059"></a></a> format. If you use <a + id="dx1-18060"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-16036"></a></a>, it will automatically - - - + id="dx1-18061"></a></a>, it will automatically detect that it needs to call <a - id="dx1-16037"></a><span + id="dx1-18062"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-16038"></a>. If you don’t use <a - id="dx1-16039"></a><span + id="dx1-18063"></a>. If you don’t use <a + id="dx1-18064"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-16040"></a>, + id="dx1-18065"></a>, you need to remember to use <a - id="dx1-16041"></a><span + id="dx1-18066"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-16042"></a> not <a - id="dx1-16043"></a><a + id="dx1-18067"></a> not <a + id="dx1-18068"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-16044"></a></a>. The indexing + id="dx1-18069"></a></a>. The indexing style file will been given a <span class="ec-lmtt-10x-x-109">.xdy</span><a - id="dx1-16045"></a> extension. - <!--l. 1822--><p class="noindent" >The <span -class="ec-lmss-10x-x-109">xindy</span><a - id="dx1-16046"></a> package option may additionally have a value that is a + id="dx1-18070"></a> extension. + <!--l. 2156--><p class="noindent" >This package option may additionally have a value that is a <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">key</span><span @@ -4480,397 +5325,695 @@ class="lmsy-10x-x-109">⟩ </span>comma-separated list to override the lang </p> - <div class="verbatim" id="verbatim-34"> + <div class="verbatim" id="verbatim-42"> \usepackage[xindy={language=english,codepage=utf8}]{glossaries} </div> - <!--l. 1827--><p class="nopar" > You can also specify whether you want a number group in the + <!--l. 2161--><p class="nopar" > You can also specify whether you want a number group in the glossary. This defaults to true, but can be suppressed. For example: </p> - <div class="verbatim" id="verbatim-35"> + <div class="verbatim" id="verbatim-43"> \usepackage[xindy={glsnumbers=false}]{glossaries} </div> - <!--l. 1832--><p class="nopar" > See <a -href="#x1-3600011">§11 </a><a -href="#x1-3600011">Xindy<!--tex4ht:ref: sec:xindy --></a> for further details on using <a - id="dx1-16047"></a><a + <!--l. 2166--><p class="nopar" > If no value is supplied to this package option (either simply writing + <span +class="ec-lmtt-10x-x-109">xindy </span>or writing <span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">xindy={}</span></span></span>) then the language, codepage and number + group settings are unchanged. See <a +href="#sec:xindy">§11 </a><a +href="#sec:xindy">Xindy<!--tex4ht:ref: sec:xindy --></a> for further details on + using <a + id="dx1-18071"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-16048"></a></a> with the <span -class="ec-lmss-10x-x-109">glossaries</span> - package. -</p> + id="dx1-18072"></a></a> with the <span +class="ec-lmss-10x-x-109">glossaries </span>package. + </p></dd><dt class="description"> +<span +class="ec-lmssbx-10x-x-109">xindygloss</span><a + id="dx1-18073"></a> </dt><dd +class="description">This is equivalent to <span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">xindy={}</span></span></span> (that is, the <span +class="ec-lmss-10x-x-109">xindy</span><a + id="dx1-18074"></a> option + without any value supplied) and may be used as a document + class option. The language and code page can be set via + <span +class="ec-lmtt-10x-x-109">\GlsSetXdyLanguage</span><a + id="dx1-18075"></a> and <span +class="ec-lmtt-10x-x-109">\GlsSetXdyCodePage</span><a + id="dx1-18076"></a> (see <a +href="#sec:langenc">§11.1 </a><a +href="#sec:langenc">Language + and Encodings<!--tex4ht:ref: sec:langenc --></a>.) </dd></dl> -<!--l. 1838--><p class="noindent" > +<!--l. 2181--><p class="noindent" > </p> -<!--l. 1838--><p class="noindent" ><a +<!--l. 2181--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">2.5</span>  <a - id="x1-170002.5"></a>Acronym Options</h3> + id="sec:pkgopts-acronym"></a>Acronym Options</h3> <dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">acronym</span><a - id="dx1-17001"></a> </dt><dd + id="dx1-19001"></a> </dt><dd class="description">This creates a new glossary with the label <span class="ec-lmtt-10x-x-109">acronym</span>. This is equivalent to: - <div class="verbatim" id="verbatim-36"> + <div class="verbatim" id="verbatim-44"> \newglossary[alg]{acronym}{acr}{acn}{\acronymname} </div> - <!--l. 1846--><p class="nopar" > If the <span + <!--l. 2189--><p class="nopar" > It will also define + </p><!--l. 2191--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\printacronyms</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-19002"></a> <span +class="ec-lmtt-10x-x-109">\printacronyms[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> + </p><!--l. 2193--><p class="noindent" > + that’s equivalent to </p><div class="alltt"> + <div class="obeylines-v"> + <span +class="ec-lmtt-10x-x-109">\printglossary</span><a + id="dx1-19003"></a><span +class="ec-lmtt-10x-x-109">[type=acronym,</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]</span> +</div> + </div> (unless that command is already defined before the beginning of the + document or the package option <span +class="ec-lmss-10x-x-109">compatible-3.07</span><a + id="dx1-19004"></a> is used). + <!--l. 2201--><p class="noindent" >If the <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-17002"></a> package option is used, <span + id="dx1-19005"></a> package option is used, <span class="ec-lmtt-10x-x-109">\acronymtype</span><a - id="dx1-17003"></a> is set to <span + id="dx1-19006"></a> is set to <span class="ec-lmtt-10x-x-109">acronym </span>otherwise it is set to <span class="ec-lmtt-10x-x-109">main</span>.<span class="footnote-mark"><a -href="#fn2x4" id="fn2x4-bk"><sup class="textsuperscript">2</sup></a></span><a - id="x1-17004f2"></a> +href="#fn3x4" id="fn3x4-bk"><sup class="textsuperscript">3</sup></a></span><a + id="x1-19007f3"></a> Entries that are defined using <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-17009"></a> are placed in the glossary + id="dx1-19013"></a> are placed in the glossary whose label is given by <span class="ec-lmtt-10x-x-109">\acronymtype</span><a - id="dx1-17010"></a>, unless another glossary is + id="dx1-19014"></a>, unless another glossary is explicitly specified. + </p><!--l. 2211--><p class="noindent" ><div class="important" title="Important Note"> Remember to use the <span +class="ec-lmss-10x-x-109">nomain</span><a + id="dx1-19015"></a> package option if you’re only interested + in using this <span +class="ec-lmtt-10x-x-109">acronym </span>glossary. </div> + </p><!--l. 2214--><p class="noindent" > </p></dd><dt class="description"> <span +class="ec-lmssbx-10x-x-109">acronyms</span><a + id="dx1-19016"></a> </dt><dd +class="description">This is equivalent to <span +class="ec-lmss-10x-x-109">acronym=true</span><a + id="dx1-19017"></a> and may be used in the + document class option list. + </dd><dt class="description"> +<span class="ec-lmssbx-10x-x-109">acronymlists</span><a - id="dx1-17011"></a> </dt><dd + id="dx1-19018"></a> </dt><dd class="description">By default, only the <span class="ec-lmtt-10x-x-109">\acronymtype </span>glossary is considered to be a list of acronyms. If you have other lists of acronyms, you can specify them as a comma-separated list in the value of <span class="ec-lmss-10x-x-109">acronymlists</span><a - id="dx1-17012"></a>. + id="dx1-19019"></a>. For example, if you use the <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-17013"></a> package option but you also + id="dx1-19020"></a> package option but you also want the <span class="ec-lmtt-10x-x-109">main </span>glossary to also contain a list of acronyms, you can do: - <div class="verbatim" id="verbatim-37"> + <div class="verbatim" id="verbatim-45"> \usepackage[acronym,acronymlists={main}]{glossaries} </div> - <!--l. 1865--><p class="nopar" > No check is performed to determine if the listed glossaries + <!--l. 2228--><p class="nopar" > No check is performed to determine if the listed glossaries exist, so you can add glossaries you haven’t defined yet. For example: </p> - <div class="verbatim" id="verbatim-38"> + <div class="verbatim" id="verbatim-46"> \usepackage[acronym,acronymlists={main,acronym2}]{glossaries}  <br />\newglossary[alg2]{acronym2}{acr2}{acn2}{Statistical Acronyms} </div> - <!--l. 1871--><p class="nopar" > + <!--l. 2234--><p class="nopar" > You can use + </p><!--l. 2236--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\DeclareAcronymList</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-19021"></a> <span +class="ec-lmtt-10x-x-109">\DeclareAcronymList{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">list</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> + </p><!--l. 2238--><p class="noindent" > + instead of or in addition to the <span +class="ec-lmss-10x-x-109">acronymlists</span><a + id="dx1-19022"></a> option. This will add the + glossaries given in <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">list</span><span +class="lmsy-10x-x-109">⟩ </span>to the list of glossaries that are identified as + lists of acronyms. To replace the list of acronym lists use with a new + list use: + </p><!--l. 2243--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\SetAcronymLists</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-19023"></a> <span +class="ec-lmtt-10x-x-109">\SetAcronymLists{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">list</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> + </p><!--l. 2245--><p class="noindent" > + </p><!--l. 2247--><p class="noindent" >You can determine if a glossary has been identified as being a list of + acronyms using: + </p><!--l. 2249--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsIfListOfAcronyms</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-19024"></a> <span +class="ec-lmtt-10x-x-109">\glsIfListOfAcronyms{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true</span> + <span +class="ec-lmri-10x-x-109">part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">false part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> + </p><!--l. 2251--><p class="noindent" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">description</span><a - id="dx1-17014"></a> </dt><dd + id="dx1-19025"></a> </dt><dd class="description">This option changes the definition of <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-17015"></a> to - allow a description. This option has no effect if you defined + id="dx1-19026"></a> to allow + a description. This option may have no effect if you define your own custom acronym style. See <a -href="#x1-4100013">§13 </a><a -href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further - details. - </dd><dt class="description"> -<span -class="ec-lmssbx-10x-x-109">footnote</span><a - id="dx1-17016"></a> </dt><dd -class="description">This option changes the definition of <span -class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-17017"></a> and the way - that acronyms are displayed. This option has no effect if you defined - your own custom acronym style. See <a -href="#x1-4100013">§13 </a><a -href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further +href="#sec:acronyms">§13 </a><a +href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further details. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">smallcaps</span><a - id="dx1-17018"></a> </dt><dd + id="dx1-19027"></a> </dt><dd class="description">This option changes the definition of <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-17019"></a> and the way + id="dx1-19028"></a> and the way that acronyms are displayed. This option may have no effect if you - defined your own custom acronym style. See <a -href="#x1-4100013">§13 </a><a -href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for - further details. + define your own custom acronym style. See <a +href="#sec:acronyms">§13 </a><a +href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further + details. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">smaller</span><a - id="dx1-17020"></a> </dt><dd + id="dx1-19029"></a> </dt><dd class="description">This option changes the definition of <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-17021"></a> and the way - that acronyms are displayed. If you use this option, you will need to - include the <span + id="dx1-19030"></a> and the way + that acronyms are displayed. + <!--l. 2265--><p class="noindent" ><div class="important" title="Important Note"> If you use this option, you will need to include the <span class="ec-lmss-10x-x-109">relsize</span><a - id="dx1-17022"></a> package or otherwise define <span + id="dx1-19031"></a> package or + otherwise define <span class="ec-lmtt-10x-x-109">\textsmaller</span><a - id="dx1-17023"></a> or - redefine <span + id="dx1-19032"></a> or redefine <span class="ec-lmtt-10x-x-109">\acronymfont</span><a - id="dx1-17024"></a>. This option may have no effect if you defined + id="dx1-19033"></a>. + </div> + + + + </p><!--l. 2269--><p class="noindent" > + This option may have no effect if you define your own custom + acronym style. See <a +href="#sec:acronyms">§13 </a><a +href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further details. + </p></dd><dt class="description"> +<span +class="ec-lmssbx-10x-x-109">footnote</span><a + id="dx1-19034"></a> </dt><dd +class="description">This option changes the definition of <span +class="ec-lmtt-10x-x-109">\newacronym</span><a + id="dx1-19035"></a> and the way + that acronyms are displayed. This option has no effect if you define your own custom acronym style. See <a -href="#x1-4100013">§13 </a><a -href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further +href="#sec:acronyms">§13 </a><a +href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further details. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">dua</span><a - id="dx1-17025"></a> </dt><dd + id="dx1-19036"></a> </dt><dd class="description">This option changes the definition of <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-17026"></a> so that acronyms - are always expanded. This option has no effect if you defined + id="dx1-19037"></a> so that acronyms + are always expanded. This option may have no effect if you define your own custom acronym style. See <a -href="#x1-4100013">§13 </a><a -href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further +href="#sec:acronyms">§13 </a><a +href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further details. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">shortcuts</span><a - id="dx1-17027"></a> </dt><dd -class="description">This option provides shortcut commands for acronyms. See <a -href="#x1-4100013">§13 - </a><a -href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further details. + id="dx1-19038"></a> </dt><dd +class="description">This option provides shortcut commands for acronyms. + See <a +href="#sec:acronyms">§13 </a><a +href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a> for further details. Alternatively you can + use: + <!--l. 2286--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\DefineAcronymShortcuts</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-19039"></a> <span +class="ec-lmtt-10x-x-109">\DefineAcronymShortcuts </span></div><hr> + </p><!--l. 2288--><p class="noindent" > +</p> + </dd></dl> +<!--l. 2292--><p class="noindent" > +</p> +<!--l. 2292--><p class="noindent" ><a +href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">2.6</span>  <a + id="sec:pkgopts-other"></a>Other Options</h3> +<!--l. 2295--><p class="noindent" >Other available options that don’t fit any of the above categories +are: + </p><dl class="description"><dt class="description"> +<span +class="ec-lmssbx-10x-x-109">symbols</span><a + id="dx1-20001"></a> </dt><dd +class="description">This option defines a new glossary type with the label <span +class="ec-lmtt-10x-x-109">symbols</span> + via + + + + <div class="verbatim" id="verbatim-47"> + \newglossary[slg]{symbols}{sls}{slo}{\glssymbolsgroupname} +</div> + <!--l. 2302--><p class="nopar" > It also defines + </p><!--l. 2304--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\printsymbols</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-20002"></a> <span +class="ec-lmtt-10x-x-109">\printsymbols[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> + </p><!--l. 2306--><p class="noindent" > + which is a synonym for <span +class="ec-lmtt-10x-x-109">\printglossary</span><a + id="dx1-20003"></a><span +class="ec-lmtt-10x-x-109">[type=symbols,</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]</span>. + </p><!--l. 2310--><p class="noindent" ><div class="important" title="Important Note"> Remember to use the <span +class="ec-lmss-10x-x-109">nomain</span><a + id="dx1-20004"></a> package option if you’re only interested + in using this <span +class="ec-lmtt-10x-x-109">symbols </span>glossary. </div> + </p><!--l. 2313--><p class="noindent" > + </p></dd><dt class="description"> +<span +class="ec-lmssbx-10x-x-109">numbers</span><a + id="dx1-20005"></a> </dt><dd +class="description">This option defines a new glossary type with the label <span +class="ec-lmtt-10x-x-109">numbers</span> + via + + + + <div class="verbatim" id="verbatim-48"> + \newglossary[nlg]{numbers}{nls}{nlo}{\glsnumbersgroupname} +</div> + <!--l. 2319--><p class="nopar" > It also defines + </p><!--l. 2321--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\printnumbers</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-20006"></a> <span +class="ec-lmtt-10x-x-109">\printnumbers[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> + </p><!--l. 2323--><p class="noindent" > + which is a synonym for <span +class="ec-lmtt-10x-x-109">\printglossary</span><a + id="dx1-20007"></a><span +class="ec-lmtt-10x-x-109">[type=numbers,</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]</span>. + </p><!--l. 2327--><p class="noindent" ><div class="important" title="Important Note"> Remember to use the <span +class="ec-lmss-10x-x-109">nomain</span><a + id="dx1-20008"></a> package option if you’re only interested + in using this <span +class="ec-lmtt-10x-x-109">numbers </span>glossary. </div> + </p><!--l. 2330--><p class="noindent" > + </p></dd><dt class="description"> +<span +class="ec-lmssbx-10x-x-109">compatible-2.07</span><a + id="dx1-20009"></a> </dt><dd +class="description">Compatibility mode for old documents created using + version 2.07 or below. + </dd><dt class="description"> +<span +class="ec-lmssbx-10x-x-109">compatible-3.07</span><a + id="dx1-20010"></a> </dt><dd +class="description">Compatibility mode for old documents created using + version 3.07 or below. </dd></dl> +<!--l. 2340--><p class="noindent" > +</p> +<!--l. 2340--><p class="noindent" ><a +href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">2.7</span>  <a + id="sec:setupglossaries"></a>Setting Options After Package Loaded</h3> +<!--l. 2342--><p class="noindent" >Some of the options described above may also be set after the <span +class="ec-lmss-10x-x-109">glossaries</span><a + id="dx1-21001"></a> +package has been loaded using +</p><!--l. 2344--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\setupglossaries</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-21002"></a> <span +class="ec-lmtt-10x-x-109">\setupglossaries{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">key-val list</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 2346--><p class="noindent" > +The following package options <span +class="ec-lmbx-10x-x-109">can’t </span>be used in <span +class="ec-lmtt-10x-x-109">\setupglossaries</span>: <span +class="ec-lmss-10x-x-109">xindy</span><a + id="dx1-21003"></a>, +<span +class="ec-lmss-10x-x-109">xindygloss</span><a + id="dx1-21004"></a>, <span +class="ec-lmss-10x-x-109">makeindex</span><a + id="dx1-21005"></a>, <span +class="ec-lmss-10x-x-109">nolong</span><a + id="dx1-21006"></a>, <span +class="ec-lmss-10x-x-109">nosuper</span><a + id="dx1-21007"></a>, <span +class="ec-lmss-10x-x-109">nolist</span><a + id="dx1-21008"></a>, <span +class="ec-lmss-10x-x-109">notree</span><a + id="dx1-21009"></a>, <span +class="ec-lmss-10x-x-109">nostyles</span><a + id="dx1-21010"></a>, <span +class="ec-lmss-10x-x-109">nomain</span><a + id="dx1-21011"></a>, +<span +class="ec-lmss-10x-x-109">compatible-2.07</span><a + id="dx1-21012"></a>, <span +class="ec-lmss-10x-x-109">translate</span><a + id="dx1-21013"></a>, <span +class="ec-lmss-10x-x-109">notranslate</span><a + id="dx1-21014"></a>, <span +class="ec-lmss-10x-x-109">acronym</span><a + id="dx1-21015"></a>. These options have to be +set while the package is loading, except for the <span +class="ec-lmss-10x-x-109">xindy</span><a + id="dx1-21016"></a> sub-options which can +be set using commands like <span +class="ec-lmtt-10x-x-109">\GlsSetXdyLanguage</span><a + id="dx1-21017"></a> (see <a +href="#sec:xindy">§11 </a><a +href="#sec:xindy">Xindy<!--tex4ht:ref: sec:xindy --></a> for +further details). +</p><!--l. 2357--><p class="indent" > <div class="important" title="Important Note"> I recommend you use this command as soon as possible after loading +<span +class="ec-lmss-10x-x-109">glossaries</span><a + id="dx1-21018"></a> otherwise you might end up using it too late for the change to +take effect. For example, if you try changing the acronym styles (such as +<span +class="ec-lmss-10x-x-109">smallcaps</span><a + id="dx1-21019"></a>) after you have started defining your acronyms, you are likely to +get unexpected results. If you try changing the sort option after +you have started to define entries, you may get unexpected results. +</div> +</p><!--l. 2365--><p class="noindent" > -<!--l. 1905--><p class="noindent" ><a +</p> +<!--l. 2367--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">3</span>  <a - id="x1-180003"></a>Setting Up</h2> + id="sec:setup"></a>Setting Up</h2> The command -<!--l. 1909--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 2371--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\makeglossaries</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-18001"></a> <span + id="dx1-22001"></a> <span class="ec-lmtt-10x-x-109">\makeglossaries </span></div><hr> -</p><!--l. 1911--><p class="noindent" > +</p><!--l. 2373--><p class="noindent" > must be placed in the preamble in order to create the customised <a - id="dx1-18002"></a><a + id="dx1-22002"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-18003"></a></a> (<span + id="dx1-22003"></a></a> (<span class="ec-lmtt-10x-x-109">.ist</span><a - id="dx1-18004"></a>) or <a - id="dx1-18005"></a><a + id="dx1-22004"></a>) or <a + id="dx1-22005"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-18006"></a></a> (<span + id="dx1-22006"></a></a> (<span class="ec-lmtt-10x-x-109">.xdy</span><a - id="dx1-18007"></a>) style file and to ensure that -glossary entries are written to the appropriate output files. If you omit + id="dx1-22007"></a>) style file and to ensure that glossary +entries are written to the appropriate output files. <span +class="ec-lmbx-10x-x-109">If you omit</span> <span -class="ec-lmtt-10x-x-109">\makeglossaries </span>none of the glossaries will be created. -</p><!--l. 1918--><p class="indent" > <div class="important" title="Important Note"> Note that some of the commands provided by the <span +class="ec-lmtk-10x-x-109">\makeglossaries </span><span +class="ec-lmbx-10x-x-109">none of the glossaries will be created.</span> +</p><!--l. 2380--><p class="indent" > <div class="important" title="Important Note"> Note that some of the commands provided by the <span class="ec-lmss-10x-x-109">glossaries </span>package must be placed before <span class="ec-lmtt-10x-x-109">\makeglossaries </span>as they are required when creating the customised style file. If you attempt to use those commands after <span class="ec-lmtt-10x-x-109">\makeglossaries </span>you will generate an error. -</p><!--l. 1925--><p class="indent" > Similarly, there are some commands that must be used after +</p><!--l. 2387--><p class="indent" > Similarly, there are some commands that must be used after <span class="ec-lmtt-10x-x-109">\makeglossaries</span>. </div> -</p><!--l. 1927--><p class="noindent" > -</p><!--l. 1929--><p class="indent" > You can suppress the creation of the customised <a - id="dx1-18008"></a><a +</p><!--l. 2389--><p class="noindent" > +</p><!--l. 2391--><p class="indent" > You can suppress the creation of the customised <a + id="dx1-22008"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-18009"></a></a> or <a - id="dx1-18010"></a><a + id="dx1-22009"></a></a> or <a + id="dx1-22010"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-18011"></a></a> + id="dx1-22011"></a></a> style file using -</p><!--l. 1931--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2393--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\noist</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-18012"></a> <span + id="dx1-22012"></a> <span class="ec-lmtt-10x-x-109">\noist </span></div><hr> -</p><!--l. 1933--><p class="noindent" > +</p><!--l. 2395--><p class="noindent" > Note that this command must be used before <span class="ec-lmtt-10x-x-109">\makeglossaries</span>. -</p><!--l. 1935--><p class="indent" > <div class="important" title="Important Note"> Note that if you have a custom <span +</p><!--l. 2397--><p class="indent" > <div class="important" title="Important Note"> Note that if you have a custom <span class="ec-lmtt-10x-x-109">.xdy</span><a - id="dx1-18013"></a> file created when using <span + id="dx1-22013"></a> file created when using <span class="ec-lmss-10x-x-109">glossaries</span> version 2.07 or below, you will need to use the <span class="ec-lmss-10x-x-109">compatible-2.07</span><a - id="dx1-18014"></a> package + id="dx1-22014"></a> package option with it. </div> -</p><!--l. 1939--><p class="noindent" > -</p><!--l. 1941--><p class="indent" > The default name for the customised style file is given by <span +</p><!--l. 2401--><p class="noindent" > +</p><!--l. 2403--><p class="indent" > The default name for the customised style file is given by <span class="ec-lmtt-10x-x-109">\jobname</span><a - id="dx1-18015"></a><span + id="dx1-22015"></a><span class="ec-lmtt-10x-x-109">.ist</span><a - id="dx1-18016"></a> + id="dx1-22016"></a> (for <a - id="dx1-18017"></a><a + id="dx1-22017"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-18018"></a></a>) or <span + id="dx1-22018"></a></a>) or <span class="ec-lmtt-10x-x-109">\jobname</span><a - id="dx1-18019"></a><span + id="dx1-22019"></a><span class="ec-lmtt-10x-x-109">.xdy</span><a - id="dx1-18020"></a> (for <a - id="dx1-18021"></a><a + id="dx1-22020"></a> (for <a + id="dx1-22021"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-18022"></a></a>). This name may be changed + id="dx1-22022"></a></a>). This name may be changed using: -</p><!--l. 1945--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2407--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\setStyleFile</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-18023"></a> <span + id="dx1-22023"></a> <span class="ec-lmtt-10x-x-109">\setStyleFile{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 1947--><p class="noindent" > +</p><!--l. 2409--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span class="lmsy-10x-x-109">⟩ </span>is the name of the style file without the extension. Note that this command must be used before <span class="ec-lmtt-10x-x-109">\makeglossaries</span>. -</p><!--l. 1952--><p class="indent" > Each glossary entry is assigned a <a - id="dx1-18024"></a><a +</p><!--l. 2414--><p class="indent" > Each glossary entry is assigned a <a + id="dx1-22024"></a><a href="#glo:numberlist">number list<a - id="dx1-18025"></a></a> that lists all the + id="dx1-22025"></a></a> that lists all the locations in the document where that entry was used. By default, the location refers to the page number but this may be overridden using the <span class="ec-lmss-10x-x-109">counter</span><a - id="dx1-18026"></a> package option. The default form of the location + id="dx1-22026"></a> package option. The default form of the location number assumes a full stop compositor (e.g. 1.2), but if your location numbers use a different compositor (e.g. 1-2) you need to set this using -</p><!--l. 1959--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2421--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsSetCompositor</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-18027"></a> <span + id="dx1-22027"></a> <span class="ec-lmtt-10x-x-109">\glsSetCompositor{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">symbol</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 1961--><p class="noindent" > +</p><!--l. 2423--><p class="noindent" > + + + For example: </p> - <div class="verbatim" id="verbatim-39"> + <div class="verbatim" id="verbatim-49"> \glsSetCompositor{-} </div> -<!--l. 1965--><p class="nopar" > Note that this command must be used before <span +<!--l. 2427--><p class="nopar" > Note that this command must be used before <span class="ec-lmtt-10x-x-109">\makeglossaries</span>. -</p><!--l. 1968--><p class="indent" > If you use <a - id="dx1-18028"></a><a +</p><!--l. 2430--><p class="indent" > If you use <a + id="dx1-22028"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-18029"></a></a>, you can have a different compositor for page numbers + id="dx1-22029"></a></a>, you can have a different compositor for page numbers starting with an uppercase alphabetical character using: -</p><!--l. 1970--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2432--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsSetAlphaCompositor</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-18030"></a> <span + id="dx1-22030"></a> <span class="ec-lmtt-10x-x-109">\glsSetAlphaCompositor{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">symbol</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 1972--><p class="noindent" > +</p><!--l. 2434--><p class="noindent" > Note that this command has no effect if you haven’t used the <span class="ec-lmss-10x-x-109">xindy</span><a - id="dx1-18031"></a> package + id="dx1-22031"></a> package option. For example, if you want <a - id="dx1-18032"></a><a + id="dx1-22032"></a><a href="#glo:numberlist">number list<a - id="dx1-18033"></a>s</a> containing a mixture of A-1 + id="dx1-22033"></a>s</a> containing a mixture of A-1 and 2.3 style formats, then do: </p> - <div class="verbatim" id="verbatim-40"> + <div class="verbatim" id="verbatim-50"> \glsSetCompositor{.}\glsSetAlphaCompositor{-} </div> -<!--l. 1979--><p class="nopar" > See <a -href="#x1-270005">§5 </a><a -href="#x1-270005">Number lists<!--tex4ht:ref: sec:numberlists --></a> for further information about <a - id="dx1-18034"></a><a +<!--l. 2441--><p class="nopar" > See <a +href="#sec:numberlists">§5 </a><a +href="#sec:numberlists">Number lists<!--tex4ht:ref: sec:numberlists --></a> for further information about <a + id="dx1-22034"></a><a href="#glo:numberlist">number list<a - id="dx1-18035"></a>s</a>. + id="dx1-22035"></a>s</a>. </p> <h2 class="chapterHead"><span class="titlemark">4</span>  <a - id="x1-190004"></a>Defining Glossary Entries</h2> -<!--l. 1986--><p class="noindent" >All glossary entries must be defined before they are used, + id="sec:newglosentry"></a>Defining Glossary Entries</h2> +<!--l. 2448--><p class="noindent" >All glossary entries must be defined before they are used, so it is better to define them in the preamble to ensure this.<span class="footnote-mark"><a href="#fn1x6" id="fn1x6-bk"><sup class="textsuperscript">1</sup></a></span><a - id="x1-19001f1"></a> + id="x1-23001f1"></a> However only those entries that occur in the document (using any of the commands described in <a -href="#x1-280006">§6 </a><a -href="#x1-280006">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a>, <a -href="#x1-310007">§7 </a><a -href="#x1-310007">Adding an Entry +href="#sec:glslink">§6 </a><a +href="#sec:glslink">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a>, <a +href="#sec:glsadd">§7 </a><a +href="#sec:glsadd">Adding an Entry to the Glossary Without Generating Text<!--tex4ht:ref: sec:glsadd --></a> or <a -href="#x1-320008">§8 </a><a -href="#x1-320008">Cross-Referencing Entries<!--tex4ht:ref: sec:crossref --></a>) +href="#sec:crossref">§8 </a><a +href="#sec:crossref">Cross-Referencing Entries<!--tex4ht:ref: sec:crossref --></a>) will appear in the glossary. Each time an entry is used in this way, a line is added to an associated glossary file (<span class="ec-lmtt-10x-x-109">.glo</span><a - id="dx1-19005"></a>), which then needs to be + id="dx1-23005"></a>), which then needs to be converted into a corresponding <span class="ec-lmtt-10x-x-109">.gls</span><a - id="dx1-19006"></a> file which contains the typeset + id="dx1-23006"></a> file which contains the typeset glossary which is input by <span class="ec-lmtt-10x-x-109">\printglossary</span><a - id="dx1-19007"></a> or <span + id="dx1-23007"></a> or <span class="ec-lmtt-10x-x-109">\printglossaries</span><a - id="dx1-19008"></a>. The + id="dx1-23008"></a>. The Perl script <a - id="dx1-19009"></a><a + id="dx1-23009"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-19010"></a></a> can be used to call <a - id="dx1-19011"></a><a + id="dx1-23010"></a></a> can be used to call <a + id="dx1-23011"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-19012"></a></a> or <a - id="dx1-19013"></a><a + id="dx1-23012"></a></a> or <a + id="dx1-23013"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-19014"></a></a>, using + id="dx1-23014"></a></a>, using a customised indexing style file, for each of the glossaries that are defined in the document. <span class="ec-lmbx-10x-x-109">Note that there should be no need</span> @@ -4879,33 +6022,122 @@ class="ec-lmbx-10x-x-109">for you to explicitly edit or input any of these exter <span class="ec-lmbx-10x-x-109">files.</span><span class="footnote-mark"><a href="#fn2x6" id="fn2x6-bk"><sup class="textsuperscript">2</sup></a></span><a - id="x1-19015f2"></a> + id="x1-23015f2"></a> See <a -href="#x1-70001.3">§1.3 </a><a -href="#x1-70001.3">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a> for further details. -</p><!--l. 2008--><p class="indent" > New glossary entries are defined using the command: -</p><!--l. 2009--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +href="#sec:makeglossaries">§1.3 </a><a +href="#sec:makeglossaries">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a> for further details. +</p><!--l. 2472--><p class="indent" > New glossary entries are defined using the command: +</p><!--l. 2473--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\newglossaryentry</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-19017"></a> <span + id="dx1-23017"></a> <span class="ec-lmtt-10x-x-109">\newglossaryentry{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}{</span><span class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">key-val list</span><span +class="ec-lmri-10x-x-109">key=value list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 2011--><p class="noindent" > -The first argument, <span +</p><!--l. 2475--><p class="noindent" > +This is a short command, so values in <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">key-val list</span><span +class="lmsy-10x-x-109">⟩ </span>can’t contain any +paragraph breaks. If you have a long description that needs to span +multiple paragraphs, use +</p><!--l. 2479--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\longnewglossaryentry</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-23018"></a> <span +class="ec-lmtt-10x-x-109">\longnewglossaryentry{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span -class="lmsy-10x-x-109">⟩</span>, must be a unique label with which to identify -this entry. The second argument, <span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">key-val list</span><span +class="ec-lmri-10x-x-109">key=value</span> +<span +class="ec-lmri-10x-x-109">list</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">long description</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 2482--><p class="noindent" > +instead. Note that, unlike <span +class="ec-lmtt-10x-x-109">\newglossaryentry</span>, the command +<span +class="ec-lmtt-10x-x-109">\longnewglossaryentry </span>may only be used in the preamble. Be +careful of unwanted spaces. <span +class="ec-lmtt-10x-x-109">\longnewglossaryentry </span>will remove +trailing spaces in the description (via <span +class="ec-lmtt-10x-x-109">\unskip</span>) but won’t remove +leading spaces (otherwise it would interfere with commands like +<span +class="ec-lmtt-10x-x-109">\Glsentrydesc</span>). +</p><!--l. 2490--><p class="indent" > There are also commands that will only define the entry if it hasn’t +already been defined: +</p><!--l. 2492--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\provideglossaryentry</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-23019"></a> <span +class="ec-lmtt-10x-x-109">\provideglossaryentry{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">key=value</span> +<span +class="ec-lmri-10x-x-109">list</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 2494--><p class="noindent" > +and +</p><!--l. 2496--><p class="indent" > <span class="marginpar"><span +class="ec-lmtt-10">\longprovideglossaryentry</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-23020"></a> +</p><!--l. 2498--><p class="indent" > <hr><div title="Definition"><span +class="ec-lmtt-10x-x-109">\longprovideglossaryentry{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">key=value list</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">long</span> +<span +class="ec-lmri-10x-x-109">description</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> + + + +</p><!--l. 2500--><p class="noindent" > +(These are both preamble-only commands.) +</p><!--l. 2503--><p class="indent" > For all the above commands, the first argument, <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>, must be +a unique label with which to identify this entry. This can’t contain any +non-expandable commands or active characters. +</p><!--l. 2507--><p class="indent" > <div class="important" title="Important Note"> Note that although an accented character or other non-Latin character, +such as é or þ, looks like a plain character in your <span +class="ec-lmtt-10x-x-109">.tex </span>file, it’s actually a +macro (an active character) and can therefore can’t be used in the label. +</div> +</p><!--l. 2512--><p class="noindent" > +</p><!--l. 2514--><p class="indent" > The second argument, <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">key=value list</span><span class="lmsy-10x-x-109">⟩</span>, is a <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">key</span><span @@ -4916,445 +6148,458 @@ class="lmsy-10x-x-109">⟩ </span>list that supplies the relevant information about this entry. There are two required fields: <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-19018"></a> and either <span + id="dx1-23021"></a> and either <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-19019"></a> or <span + id="dx1-23022"></a> or <span class="ec-lmss-10x-x-109">parent</span><a - id="dx1-19020"></a>. Available fields are listed + id="dx1-23023"></a>. Available fields are listed below: </p><dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">name</span><a - id="dx1-19021"></a> </dt><dd + id="dx1-23024"></a> </dt><dd class="description">The name of the entry (as it will appear in the glossary). If this key is omitted and the <span class="ec-lmss-10x-x-109">parent</span><a - id="dx1-19022"></a> key is supplied, this value will be + id="dx1-23025"></a> key is supplied, this value will be the same as the parent’s name. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">description</span><a - id="dx1-19023"></a> </dt><dd + id="dx1-23026"></a> </dt><dd class="description">A brief description of this term (to appear in the glossary). Within this value, you can use - <!--l. 2026--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 2527--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\nopostdesc</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-19024"></a> <span + id="dx1-23027"></a> <span class="ec-lmtt-10x-x-109">\nopostdesc </span></div><hr> - </p><!--l. 2028--><p class="noindent" > + </p><!--l. 2529--><p class="noindent" > to suppress the description terminator for this entry. For example, if this entry is a parent entry that doesn’t require a description, you can do <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">description={\nopostdesc}</span></span></span>. If you want a paragraph break in the description use - </p><!--l. 2034--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 2535--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glspar</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-19025"></a> <span + id="dx1-23028"></a> <span class="ec-lmtt-10x-x-109">\glspar </span></div><hr> - - - - </p><!--l. 2036--><p class="noindent" > - However, note that not all glossary styles support multi-line - descriptions. If you are using one of the tabular-like glossary styles - that permit multi-line descriptions, use <span + </p><!--l. 2537--><p class="noindent" > + or, better, use <span +class="ec-lmtt-10x-x-109">\longnewglossaryentry</span>. However, note that not all + glossary styles support multi-line descriptions. If you are using + one of the tabular-like glossary styles that permit multi-line + descriptions, use <span class="ec-lmtt-10x-x-109">\newline</span><a - id="dx1-19026"></a> not <span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">\\</span></span></span> if you want - to force a line break. + id="dx1-23029"></a> not <span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\\</span></span></span> if you want to force a line + break. </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">parent</span><a - id="dx1-19027"></a> </dt><dd + id="dx1-23030"></a> </dt><dd class="description">The label of the parent entry. Note that the parent entry must be defined before its sub-entries. See <a -href="#x1-220004.3">§4.3 </a><a -href="#x1-220004.3">Sub-Entries<!--tex4ht:ref: sec:subentries --></a> for further +href="#sec:subentries">§4.5 </a><a +href="#sec:subentries">Sub-Entries<!--tex4ht:ref: sec:subentries --></a> for further details. </dd><dt class="description"> + + + <span class="ec-lmssbx-10x-x-109">descriptionplural</span><a - id="dx1-19028"></a> </dt><dd -class="description">The plural form of the description (as passed to - <span -class="ec-lmtt-10x-x-109">\glsdisplay</span><a - id="dx1-19029"></a> and <span -class="ec-lmtt-10x-x-109">\glsdisplayfirst</span><a - id="dx1-19030"></a> by <span -class="ec-lmtt-10x-x-109">\glspl</span><a - id="dx1-19031"></a>, <span -class="ec-lmtt-10x-x-109">\Glspl</span><a - id="dx1-19032"></a> and - <span -class="ec-lmtt-10x-x-109">\GLSpl</span><a - id="dx1-19033"></a>). If omitted, the value is set to the same as the <span + id="dx1-23031"></a> </dt><dd +class="description">The plural form of the description, if required. If + omitted, the value is set to the same as the <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-19034"></a> - key. (Note that if you want the description to appear in the main - body of the document, you must switch off the description - <a - id="dx1-19035"></a><a -href="#glo:sanitize">sanitization<a - id="dx1-19036"></a></a> using the <span -class="ec-lmss-10x-x-109">sanitize</span><a - id="dx1-19037"></a> package option described in <a -href="#x1-130002.1">§2.1 - </a><a -href="#x1-130002.1">General Options<!--tex4ht:ref: sec:pkgopts-general --></a>.) + id="dx1-23032"></a> key. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">text</span><a - id="dx1-19038"></a> </dt><dd + id="dx1-23033"></a> </dt><dd class="description">How this entry will appear in the document text when using <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-19039"></a> (or + id="dx1-23034"></a> (or one of its uppercase variants). If this field is omitted, the value of the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-19040"></a> key is used. + id="dx1-23035"></a> key is used. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">first</span><a - id="dx1-19041"></a> </dt><dd + id="dx1-23036"></a> </dt><dd class="description">How the entry will appear in the document text on <a - id="dx1-19042"></a><a + id="dx1-23037"></a><a href="#glo:firstuse">first use</a> with <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-19043"></a> (or one of its uppercase variants). If this field is omitted, the + id="dx1-23038"></a> (or one of its uppercase variants). If this field is omitted, the value of the <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-19044"></a> key is used. Note that if you use <span + id="dx1-23039"></a> key is used. Note that if you use <span class="ec-lmtt-10x-x-109">\glspl</span><a - id="dx1-19045"></a>, <span + id="dx1-23040"></a>, <span class="ec-lmtt-10x-x-109">\Glspl</span><a - id="dx1-19046"></a>, + id="dx1-23041"></a>, <span class="ec-lmtt-10x-x-109">\GLSpl</span><a - id="dx1-19047"></a>, <span + id="dx1-23042"></a>, <span class="ec-lmtt-10x-x-109">\glsdisp</span><a - id="dx1-19048"></a> before using <span + id="dx1-23043"></a> before using <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-19049"></a>, the <span + id="dx1-23044"></a>, the <span class="ec-lmss-10x-x-109">firstplural</span><a - id="dx1-19050"></a> value won’t be + id="dx1-23045"></a> value won’t be used with <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-19051"></a>. + id="dx1-23046"></a>. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">plural</span><a - id="dx1-19052"></a> </dt><dd + id="dx1-23047"></a> </dt><dd class="description">How the entry will appear in the document text when using <span class="ec-lmtt-10x-x-109">\glspl</span><a - id="dx1-19053"></a> + id="dx1-23048"></a> (or one of its uppercase variants). If this field is omitted, the value is obtained by appending <span class="ec-lmtt-10x-x-109">\glspluralsuffix</span><a - id="dx1-19054"></a> to the value of the <span + id="dx1-23049"></a> to the value of the <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-19055"></a> + id="dx1-23050"></a> field. The default value of <span class="ec-lmtt-10x-x-109">\glspluralsuffix</span><a - id="dx1-19056"></a> is the letter + id="dx1-23051"></a> is the letter “s”. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">firstplural</span><a - id="dx1-19057"></a> </dt><dd + id="dx1-23052"></a> </dt><dd class="description">How the entry will appear in the document text on <a - id="dx1-19058"></a><a + id="dx1-23053"></a><a href="#glo:firstuse">first use</a> with <span class="ec-lmtt-10x-x-109">\glspl</span><a - id="dx1-19059"></a> (or one of its uppercase variants). If this field is + id="dx1-23054"></a> (or one of its uppercase variants). If this field is omitted, the value is obtained from the <span class="ec-lmss-10x-x-109">plural</span><a - id="dx1-19060"></a> key, if the <span + id="dx1-23055"></a> key, if the <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-19061"></a> key is + id="dx1-23056"></a> key is omitted, or by appending <span class="ec-lmtt-10x-x-109">\glspluralsuffix</span><a - id="dx1-19062"></a> to the value of the <span + id="dx1-23057"></a> to the value of the <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-19063"></a> + id="dx1-23058"></a> field, if the <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-19064"></a> field is present. Note that if you use <span + id="dx1-23059"></a> field is present. Note that if you use <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-19065"></a>, <span + id="dx1-23060"></a>, <span class="ec-lmtt-10x-x-109">\Gls</span><a - id="dx1-19066"></a>, + id="dx1-23061"></a>, <span class="ec-lmtt-10x-x-109">\GLS</span><a - id="dx1-19067"></a>, <span + id="dx1-23062"></a>, <span class="ec-lmtt-10x-x-109">\glsdisp </span>before using <span class="ec-lmtt-10x-x-109">\glspl</span><a - id="dx1-19068"></a>, the <span + id="dx1-23063"></a>, the <span class="ec-lmss-10x-x-109">firstplural</span><a - id="dx1-19069"></a> value won’t be - - - + id="dx1-23064"></a> value won’t be used with <span class="ec-lmtt-10x-x-109">\glspl</span><a - id="dx1-19070"></a>. - <!--l. 2082--><p class="noindent" ><span + id="dx1-23065"></a>. + <!--l. 2579--><p class="noindent" ><span class="ec-lmbx-10x-x-109">Note: </span>prior to version 1.13, the default value of <span class="ec-lmss-10x-x-109">firstplural</span><a - id="dx1-19071"></a> was always + id="dx1-23066"></a> was always taken by appending “s” to the <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-19072"></a> key, which meant that you had to + id="dx1-23067"></a> key, which meant that you had to specify both <span class="ec-lmss-10x-x-109">plural</span><a - id="dx1-19073"></a> and <span + id="dx1-23068"></a> and <span class="ec-lmss-10x-x-109">firstplural</span><a - id="dx1-19074"></a>, even if you hadn’t used the <span + id="dx1-23069"></a>, even if you hadn’t used the <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-19075"></a> + id="dx1-23070"></a> key. </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">symbol</span><a - id="dx1-19076"></a> </dt><dd + id="dx1-23071"></a> </dt><dd class="description">This field is provided to allow the user to specify an associated symbol. If omitted, the value is set to <span class="ec-lmtt-10x-x-109">\relax</span>. Note that not all - glossary styles display the symbol. (If you want the symbol to appear - in the main body of the document, you must switch off the symbol - <a - id="dx1-19077"></a><a -href="#glo:sanitize">sanitization<a - id="dx1-19078"></a></a> using the <span -class="ec-lmss-10x-x-109">sanitize</span><a - id="dx1-19079"></a> package option described in <a -href="#x1-130002.1">§2.1 - </a><a -href="#x1-130002.1">General Options<!--tex4ht:ref: sec:pkgopts-general --></a>.) + glossary styles display the symbol. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">symbolplural</span><a - id="dx1-19080"></a> </dt><dd + id="dx1-23072"></a> </dt><dd class="description">This is the plural form of the symbol (as passed to <span class="ec-lmtt-10x-x-109">\glsdisplay</span><a - id="dx1-19081"></a> and <span + id="dx1-23073"></a> and <span class="ec-lmtt-10x-x-109">\glsdisplayfirst</span><a - id="dx1-19082"></a> by <span + id="dx1-23074"></a> by <span class="ec-lmtt-10x-x-109">\glspl</span><a - id="dx1-19083"></a>, <span + id="dx1-23075"></a>, <span class="ec-lmtt-10x-x-109">\Glspl</span><a - id="dx1-19084"></a> and + id="dx1-23076"></a> and <span class="ec-lmtt-10x-x-109">\GLSpl</span><a - id="dx1-19085"></a>). If omitted, the value is set to the same as the <span + id="dx1-23077"></a>). If omitted, the value is set to the same as the <span class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-19086"></a> + id="dx1-23078"></a> key. + + + </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">sort</span><a - id="dx1-19087"></a> </dt><dd + id="dx1-23079"></a> </dt><dd class="description">This value indicates how <a - id="dx1-19088"></a><a + id="dx1-23080"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-19089"></a></a> or <a - id="dx1-19090"></a><a + id="dx1-23081"></a></a> or <a + id="dx1-23082"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-19091"></a></a> should sort this entry. + id="dx1-23083"></a></a> should sort this entry. If omitted, the value is given by the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-19092"></a> field. In general, + id="dx1-23084"></a> field. In general, it’s best to use the <span class="ec-lmss-10x-x-109">sort</span><a - id="dx1-19093"></a> key if the <span + id="dx1-23085"></a> key if the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-19094"></a> contains commands + id="dx1-23086"></a> contains commands (e.g. <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\ensuremath{\alpha}</span></span></span>). Note that the package options <span class="ec-lmss-10x-x-109">sort=def</span><a - id="dx1-19095"></a> and <span + id="dx1-23087"></a> and <span class="ec-lmss-10x-x-109">sort=use</span><a - id="dx1-19096"></a> override the <span + id="dx1-23088"></a> override the <span class="ec-lmss-10x-x-109">sort</span><a - id="dx1-19097"></a> key in <span + id="dx1-23089"></a> key in <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-19098"></a> - (see <a -href="#x1-160002.4">§2.4 </a><a -href="#x1-160002.4">Sorting Options<!--tex4ht:ref: sec:pkgopts-sort --></a>). + id="dx1-23090"></a> + and redefining <span +class="ec-lmtt-10x-x-109">\glsprestandardsort</span><a + id="dx1-23091"></a> can also be used to override + the <span +class="ec-lmss-10x-x-109">sort</span><a + id="dx1-23092"></a> key (see <a +href="#sec:pkgopts-sort">§2.4 </a><a +href="#sec:pkgopts-sort">Sorting Options<!--tex4ht:ref: sec:pkgopts-sort --></a>). </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">type</span><a - id="dx1-19099"></a> </dt><dd + id="dx1-23093"></a> </dt><dd class="description">This specifies the label of the glossary in which this entry belongs. If omitted, the default glossary is assumed unless <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-19100"></a> is used + id="dx1-23094"></a> is used (see <a -href="#x1-4100013">§13 </a><a -href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a>). +href="#sec:acronyms">§13 </a><a +href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a>). </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">user1</span><a - id="dx1-19101"></a><span + id="dx1-23095"></a><span class="ec-lmssbx-10x-x-109">, </span><span class="ec-lmssbx-10x-x-109">…, user6</span><a - id="dx1-19102"></a><a - id="dx1-19103"></a><a - id="dx1-19104"></a><a - id="dx1-19105"></a><a - id="dx1-19106"></a> </dt><dd -class="description">Six keys provided for any additional information - the user may want to specify. (For example an associated - dimension or an alternative plural or some other grammatical - construct.) + id="dx1-23096"></a><a + id="dx1-23097"></a><a + id="dx1-23098"></a><a + id="dx1-23099"></a><a + id="dx1-23100"></a> </dt><dd +class="description">Six keys provided for any additional information the user + may want to specify. (For example, an associated dimension or + an alternative plural or some other grammatical construct.) + Alternatively, you can add new keys using <span +class="ec-lmtt-10x-x-109">\glsaddkey</span><a + id="dx1-23101"></a> (see <a +href="#sec:addkey">§4.3 + </a><a +href="#sec:addkey">Additional Keys<!--tex4ht:ref: sec:addkey --></a>). Other keys are also provided by the <span +class="ec-lmss-10x-x-109">glossaries-prefix</span><a + id="dx1-23102"></a> + (<a +href="#sec:prefix">§18 </a><a +href="#sec:prefix">Prefixes or Determiners<!--tex4ht:ref: sec:prefix --></a>) and <span +class="ec-lmss-10x-x-109">glossaries-accsupp</span><a + id="dx1-23103"></a> (<a +href="#sec:accsupp">§19 </a><a +href="#sec:accsupp">Accessibility + Support<!--tex4ht:ref: sec:accsupp --></a>) packages. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">nonumberlist</span><a - id="dx1-19107"></a> </dt><dd -class="description">A boolean key. If the value is missing or is <span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">true</span></span></span>, this will + id="dx1-23104"></a> </dt><dd +class="description">A boolean key. If the value is missing or is <span +class="ec-lmtt-10x-x-109">true</span>, this will suppress the <a - id="dx1-19108"></a><a + id="dx1-23105"></a><a href="#glo:numberlist">number list<a - id="dx1-19109"></a></a> just for this entry. Conversely, if you have + id="dx1-23106"></a></a> just for this entry. Conversely, if you have used the package option <span class="ec-lmss-10x-x-109">nonumberlist</span><a - id="dx1-19110"></a>, you can activate the <a - id="dx1-19111"></a>number + id="dx1-23107"></a>, you can activate the <a + id="dx1-23108"></a>number list<a - id="dx1-19112"></a> just for this entry with <span + id="dx1-23109"></a> just for this entry with <span class="ec-lmss-10x-x-109">nonumberlist=false</span><a - id="dx1-19113"></a>. (See <a -href="#x1-270005">§5 </a><a -href="#x1-270005">Number + id="dx1-23110"></a>. (See <a +href="#sec:numberlists">§5 </a><a +href="#sec:numberlists">Number lists<!--tex4ht:ref: sec:numberlists --></a>.) - - - </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">see</span><a - id="dx1-19114"></a> </dt><dd + id="dx1-23111"></a> </dt><dd class="description">Cross-reference another entry. Using the <span class="ec-lmss-10x-x-109">see</span><a - id="dx1-19115"></a> key will automatically add + id="dx1-23112"></a> key will automatically add this entry to the glossary, but will not automatically add the cross-referenced entry. The referenced entry should be supplied as the - value to this key. If you want to override the “see” tag, you - can supply the new tag in square brackets before the label. - For example <span class="obeylines-h"><span class="verb"><span + value to this key. If you want to override the “see” tag, you can + supply the new tag in square brackets before the label. For + example <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">see=[see</span><span -class="ec-lmtt-10x-x-109"> also]{anotherlabel}</span></span></span>. Note that if - you have suppressed the <a - id="dx1-19116"></a><a -href="#glo:numberlist">number list<a - id="dx1-19117"></a></a>, the cross-referencing - information won’t appear in the glossary. You can override - this for individual glossary entries using <span +class="ec-lmtt-10x-x-109"> also]{anotherlabel}</span></span></span>. <span +class="ec-lmbx-10x-x-109">Note that if you</span> + <span +class="ec-lmbx-10x-x-109">have suppressed the</span> <a + id="dx1-23113"></a><a +href="#glo:numberlist"><span +class="ec-lmbx-10x-x-109">number list</span><a + id="dx1-23114"></a></a><span +class="ec-lmbx-10x-x-109">, the cross-referencing</span> + <span +class="ec-lmbx-10x-x-109">information won’t appear in the glossary, as it forms part of</span> + <span +class="ec-lmbx-10x-x-109">the</span> <a + id="dx1-23115"></a><span +class="ec-lmbx-10x-x-109">number list</span><a + id="dx1-23116"></a><span +class="ec-lmbx-10x-x-109">. </span>You can override this for individual glossary + entries using <span class="ec-lmss-10x-x-109">nonumberlist=false</span><a - id="dx1-19118"></a> - (see above). Alternatively, you can use the <span + id="dx1-23117"></a> (see above). Alternatively, you can + use the <span class="ec-lmss-10x-x-109">seeautonumberlist</span><a - id="dx1-19119"></a> - package option. For further details, see <a -href="#x1-320008">§8 </a><a -href="#x1-320008">Cross-Referencing - Entries<!--tex4ht:ref: sec:crossref --></a>. - <!--l. 2141--><p class="noindent" ><div class="important" title="Important Note"> <span + id="dx1-23118"></a> package option. For further details, see <a +href="#sec:crossref">§8 + </a><a +href="#sec:crossref">Cross-Referencing Entries<!--tex4ht:ref: sec:crossref --></a>. + <!--l. 2640--><p class="noindent" ><div class="important" title="Important Note"> <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-19120"></a> must be used before any occurrence of + id="dx1-23119"></a> must be used before any occurrence of <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-19121"></a> that contains the <span + id="dx1-23120"></a> that contains the <span class="ec-lmss-10x-x-109">see</span><a - id="dx1-19122"></a> key. </div> - </p><!--l. 2144--><p class="noindent" > + id="dx1-23121"></a> key. </div> + + + + </p><!--l. 2643--><p class="noindent" > </p> </dd></dl> -<!--l. 2148--><p class="indent" > The following keys are reserved for <span +<!--l. 2647--><p class="indent" > The following keys are reserved for <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-19123"></a> (see <a -href="#x1-4100013">§13 </a><a -href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a>): + id="dx1-23122"></a> (see <a +href="#sec:acronyms">§13 </a><a +href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a>): <span class="ec-lmss-10x-x-109">long</span><a - id="dx1-19124"></a>, <span + id="dx1-23123"></a>, <span class="ec-lmss-10x-x-109">longplural</span><a - id="dx1-19125"></a>, <span + id="dx1-23124"></a>, <span class="ec-lmss-10x-x-109">short</span><a - id="dx1-19126"></a> and <span + id="dx1-23125"></a> and <span class="ec-lmss-10x-x-109">shortplural</span><a - id="dx1-19127"></a>. -</p><!--l. 2152--><p class="indent" > Note that if the name starts with an accented letter or non-Roman + id="dx1-23126"></a>. Additional keys are provided by the +<span +class="ec-lmss-10x-x-109">glossaries-prefix</span><a + id="dx1-23127"></a> (<a +href="#sec:prefix">§18 </a><a +href="#sec:prefix">Prefixes or Determiners<!--tex4ht:ref: sec:prefix --></a>) and the <span +class="ec-lmss-10x-x-109">glossaries-accsupp</span><a + id="dx1-23128"></a> +(<a +href="#sec:accsupp">§19 </a><a +href="#sec:accsupp">Accessibility Support<!--tex4ht:ref: sec:accsupp --></a>) packages. You can also define your own custom +keys (see <a +href="#sec:addkey">§4.3 </a><a +href="#sec:addkey">Additional Keys<!--tex4ht:ref: sec:addkey --></a>). +</p><!--l. 2655--><p class="indent" > Note that if the name starts with an accented letter or other non-Latin character, you must group the character, otherwise it will cause a problem for commands like <span class="ec-lmtt-10x-x-109">\Gls</span><a - id="dx1-19128"></a> and <span + id="dx1-23129"></a> and <span class="ec-lmtt-10x-x-109">\Glspl</span><a - id="dx1-19129"></a>. For example: + id="dx1-23130"></a>. For example: </p> - <div class="verbatim" id="verbatim-41"> + <div class="verbatim" id="verbatim-51"> \newglossaryentry{elite}{name={{\’e}lite},  <br />description={select group or class}} </div> -<!--l. 2159--><p class="nopar" > Note that the same applies if you are using the <span +<!--l. 2662--><p class="nopar" > Note that the same applies if you are using the <span class="ec-lmss-10x-x-109">inputenc</span><a - id="dx1-19130"></a> package: + id="dx1-23131"></a> package: </p> - <div class="verbatim" id="verbatim-42"> + <div class="verbatim" id="verbatim-52"> \newglossaryentry{elite}{name={{é}lite},  <br />description={select group or class}} </div> -<!--l. 2165--><p class="nopar" > Note that in both of the above examples, you will also need to supply the +<!--l. 2668--><p class="nopar" > Note that in both of the above examples, you will also need to supply the <span class="ec-lmss-10x-x-109">sort</span><a - id="dx1-19131"></a> key if you are using <a - id="dx1-19132"></a><a + id="dx1-23132"></a> key if you are using <a + id="dx1-23133"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-19133"></a></a> whereas <a - id="dx1-19134"></a><a + id="dx1-23134"></a></a> whereas <a + id="dx1-23135"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-19135"></a></a> is usually able to sort + id="dx1-23136"></a></a> is usually able to sort accented letters correctly. </p> <h3 class="sectionHead"><span class="titlemark">4.1</span>  <a - id="x1-200004.1"></a>Plurals</h3> -<!--l. 2174--><p class="noindent" >You may have noticed from above that you can specify the plural form + id="sec:plurals"></a>Plurals</h3> +<!--l. 2677--><p class="noindent" >You may have noticed from above that you can specify the plural form when you define a term. If you omit this, the plural will be obtained by appending -</p><!--l. 2177--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2680--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glspluralsuffix</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-20001"></a> <span + id="dx1-24001"></a> <span class="ec-lmtt-10x-x-109">\glspluralsuffix </span></div><hr> -</p><!--l. 2179--><p class="noindent" > +</p><!--l. 2682--><p class="noindent" > to the singular form. This command defaults to the letter “s”. For example: </p> - <div class="verbatim" id="verbatim-43"> + <div class="verbatim" id="verbatim-53"> \newglossaryentry{cow}{name=cow,description={a fully grown  <br />female of any bovine animal}} </div> -<!--l. 2185--><p class="nopar" > defines a new entry whose singular form is “cow” and plural form is +<!--l. 2688--><p class="nopar" > defines a new entry whose singular form is “cow” and plural form is “cows”. However, if you are writing in archaic English, you may want to use “kine” as the plural form, in which case you would have to do: @@ -5362,26 +6607,26 @@ do: </p> - <div class="verbatim" id="verbatim-44"> + <div class="verbatim" id="verbatim-54"> \newglossaryentry{cow}{name=cow,plural=kine,  <br />description={a fully grown female of any bovine animal}} </div> -<!--l. 2193--><p class="nopar" > -</p><!--l. 2195--><p class="indent" > If you are writing in a language that supports multiple plurals (for a +<!--l. 2696--><p class="nopar" > +</p><!--l. 2698--><p class="indent" > If you are writing in a language that supports multiple plurals (for a given term) then use the <span class="ec-lmss-10x-x-109">plural</span><a - id="dx1-20002"></a> key for one of them and one of the user keys + id="dx1-24002"></a> key for one of them and one of the user keys to specify the other plural form. For example: </p> - <div class="verbatim" id="verbatim-45"> + <div class="verbatim" id="verbatim-55"> \newglossaryentry{cow}{name=cow,description={a fully grown  <br />female of any bovine animal (plural cows, archaic plural kine)},  <br />user1={kine}} </div> -<!--l. 2203--><p class="nopar" > You can then use <span class="obeylines-h"><span class="verb"><span +<!--l. 2706--><p class="nopar" > You can then use <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glspl{cow}</span></span></span> to produce “cows” and <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsuseri{cow}</span></span></span> to produce “kine”. You can, of course, define an easy to remember synonym. @@ -5390,12 +6635,17 @@ For example: </p> - <div class="verbatim" id="verbatim-46"> + <div class="verbatim" id="verbatim-56"> \let\glsaltpl\glsuseri </div> -<!--l. 2209--><p class="nopar" > Then you don’t have to remember which key you used to store the -alternative plural. -</p><!--l. 2213--><p class="indent" > If you are using a language that usually forms plurals by appending a +<!--l. 2712--><p class="nopar" > Then you don’t have to remember which key you used to store the second +plural. Alternatively, you can define your own keys using <span +class="ec-lmtt-10x-x-109">\glsaddkey</span><a + id="dx1-24003"></a>, +described in <a +href="#sec:addkey">§4.3 </a><a +href="#sec:addkey">Additional Keys<!--tex4ht:ref: sec:addkey --></a>. +</p><!--l. 2717--><p class="indent" > If you are using a language that usually forms plurals by appending a different letter, or sequence of letters, you can redefine <span class="ec-lmtt-10x-x-109">\glspluralsuffix</span> as required. However, this must be done <span @@ -5403,22 +6653,22 @@ class="ec-lmri-10x-x-109">before </span>the entries are defined. For languages that don’t form plurals by simply appending a suffix, all the plural forms must be specified using the <span class="ec-lmss-10x-x-109">plural</span><a - id="dx1-20003"></a> key (and the <span + id="dx1-24004"></a> key (and the <span class="ec-lmss-10x-x-109">firstplural</span><a - id="dx1-20004"></a> key + id="dx1-24005"></a> key where necessary). -</p><!--l. 2221--><p class="noindent" > +</p><!--l. 2725--><p class="noindent" > </p> -<!--l. 2221--><p class="noindent" ><a +<!--l. 2725--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">4.2</span>  <a - id="x1-210004.2"></a>Other Grammatical Constructs</h3> -<!--l. 2224--><p class="noindent" >You can use the six user keys to provide alternatives, such as participles. + id="sec:grammar"></a>Other Grammatical Constructs</h3> +<!--l. 2728--><p class="noindent" >You can use the six user keys to provide alternatives, such as participles. For example: </p> - <div class="verbatim" id="verbatim-47"> + <div class="verbatim" id="verbatim-57"> \let\glsing\glsuseri  <br />\let\glsd\glsuserii  <br />\newcommand*{\ingkey}{user1} @@ -5432,33 +6682,410 @@ For example:  <br />  }%  <br />} </div> -<!--l. 2241--><p class="nopar" > With the above definitions, I can now define terms like this: +<!--l. 2745--><p class="nopar" > With the above definitions, I can now define terms like this: </p> - <div class="verbatim" id="verbatim-48"> + <div class="verbatim" id="verbatim-58"> \newterm{play}{to take part in activities for enjoyment}  <br />\newterm[\edkey={ran},\ingkey={running}]{run}{to move fast using  <br />the legs} </div> -<!--l. 2247--><p class="nopar" > and use them in the text: +<!--l. 2751--><p class="nopar" > and use them in the text: </p> - <div class="verbatim" id="verbatim-49"> + <div class="verbatim" id="verbatim-59"> Peter is \glsing{play} in the park today.  <br />Jane \glsd{play} in the park yesterday.  <br />Peter and Jane \glsd{run} in the park last week. </div> -<!--l. 2255--><p class="nopar" > -</p><!--l. 2257--><p class="noindent" > +<!--l. 2759--><p class="nopar" > +</p><!--l. 2761--><p class="indent" > Alternatively, you can define your own keys using <span +class="ec-lmtt-10x-x-109">\glsaddkey</span><a + id="dx1-25001"></a>, described +below in <a +href="#sec:addkey">§4.3 </a><a +href="#sec:addkey">Additional Keys<!--tex4ht:ref: sec:addkey --></a>. +</p><!--l. 2764--><p class="noindent" > </p> -<!--l. 2257--><p class="noindent" ><a +<!--l. 2764--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">4.3</span>  <a - id="x1-220004.3"></a>Sub-Entries</h3> -<!--l. 2260--><p class="noindent" >As from version 1.17, it is possible to specify sub-entries. These may be + id="sec:addkey"></a>Additional Keys</h3> +<!--l. 2767--><p class="noindent" >You can now also define your own custom keys using: +</p><!--l. 2768--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsaddkey</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-26001"></a> <span +class="ec-lmtt-10x-x-109">\glsaddkey{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">key</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">default value</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">no link cs</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">no link</span> +<span +class="ec-lmri-10x-x-109">ucfirst cs</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">link cs</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">link ucfirst cs</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">link allcaps cs</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 2776--><p class="noindent" > +where: + </p><dl class="description"><dt class="description"> +<span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmbxi-10x-x-109">key</span><span +class="lmsy-10x-x-109">⟩</span> </dt><dd +class="description">is the new key to use in <span +class="ec-lmtt-10x-x-109">\newglossaryentry</span><a + id="dx1-26002"></a> (or similar + commands such as <span +class="ec-lmtt-10x-x-109">\longnewglossaryentry</span><a + id="dx1-26003"></a>); + </dd><dt class="description"> +<span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmbxi-10x-x-109">default value</span><span +class="lmsy-10x-x-109">⟩</span> </dt><dd +class="description">is the default value to use if this key isn’t used in + an entry definition (this may reference the current entry label + via <span +class="ec-lmtt-10x-x-109">\glslabel</span>, but you will have to switch on expansion via the + starred version of <span +class="ec-lmtt-10x-x-109">\glsaddkey</span>); + </dd><dt class="description"> +<span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmbxi-10x-x-109">no link cs</span><span +class="lmsy-10x-x-109">⟩</span> </dt><dd +class="description">is the control sequence to use analogous to commands + like <span +class="ec-lmtt-10x-x-109">\glsentrytext</span><a + id="dx1-26004"></a>; + </dd><dt class="description"> +<span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmbxi-10x-x-109">no link ucfirst cs</span><span +class="lmsy-10x-x-109">⟩</span> </dt><dd +class="description">is the control sequence to use analogous to + commands like <span +class="ec-lmtt-10x-x-109">\Glsentrytext</span><a + id="dx1-26005"></a>; + </dd><dt class="description"> +<span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmbxi-10x-x-109">link cs</span><span +class="lmsy-10x-x-109">⟩</span> </dt><dd +class="description">is the control sequence to use analogous to commands like + <span +class="ec-lmtt-10x-x-109">\glstext</span><a + id="dx1-26006"></a>; + + + + </dd><dt class="description"> +<span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmbxi-10x-x-109">link ucfirst cs</span><span +class="lmsy-10x-x-109">⟩</span> </dt><dd +class="description">is the control sequence to use analogous to + commands like <span +class="ec-lmtt-10x-x-109">\Glstext</span><a + id="dx1-26007"></a>; + </dd><dt class="description"> +<span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmbxi-10x-x-109">link allcaps cs</span><span +class="lmsy-10x-x-109">⟩</span> </dt><dd +class="description">is the control sequence to use analogous to + commands like <span +class="ec-lmtt-10x-x-109">\GLStext</span><a + id="dx1-26008"></a>.</dd></dl> +<!--l. 2796--><p class="noindent" >The starred version of <span +class="ec-lmtt-10x-x-109">\glsaddkey </span>switches on expansion for this +key. The unstarred version doesn’t override the current expansion +setting. +<a + id="x1-26009r3"></a> +</p><!--l. 2800--><p class="noindent" ><span +class="ec-lmbx-12">Example 3</span><span +class="ec-lmbx-12"> (Defining Custom Keys)</span><a + id="x1-26010"></a> +</p><!--l. 2801--><p class="indent" > Suppose I want to define two new keys, <span +class="ec-lmtt-10x-x-109">ed </span>and <span +class="ec-lmtt-10x-x-109">ing</span>, that default to the +entry text followed by “ed” and “ing”, respectively. The default +value will need expanding in both cases, so I need to use the starred +form: + + + +</p> + <div class="verbatim" id="verbatim-60"> + % Define "ed" key: + <br /> \glsaddkey* + <br />  {ed}% key + <br />  {\glsentrytext{\glslabel}ed}% default value + <br />  {\glsentryed}% command analogous to \glsentrytext + <br />  {\Glsentryed}% command analogous to \Glsentrytext + <br />  {\glsed}% command analogous to \glstext + <br />  {\Glsed}% command analogous to \Glstext + <br />  {\GLSed}% command analogous to \GLStext + <br /> % Define "ing" key: + <br /> \glsaddkey* + <br />  {ing}% key + <br />  {\glsentrytext{\glslabel}ing}% default value + <br />  {\glsentrying}% command analogous to \glsentrytext + <br />  {\Glsentrying}% command analogous to \Glsentrytext + <br />  {\glsing}% command analogous to \glstext + <br />  {\Glsing}% command analogous to \Glstext + <br />  {\GLSing}% command analogous to \GLStext +</div> +<!--l. 2825--><p class="nopar" > Now I can define some entries: + + + +</p> + <div class="verbatim" id="verbatim-61"> + % No need to override defaults for this entry: + <br /> \newglossaryentry{jump}{name={jump},description={}} + <br /> % Need to override defaults on these entries: + <br /> \newglossaryentry{run}{name={run},% + <br />   ed={ran},% + <br />   ing={running},% + <br />   description={}} + <br /> \newglossaryentry{waddle}{name={waddle},% + <br />   ed={waddled},% + <br />   ing={waddling},% + <br />   description={}} +</div> +<!--l. 2843--><p class="nopar" > +</p><!--l. 2845--><p class="indent" > These entries can later be used in the document: + + + +</p> + <div class="verbatim" id="verbatim-62"> +The dog \glsed{jump} over the duck. + <br />The duck was \glsing{waddle} round the dog. + <br />The dog \glsed{run} away from the duck. +</div> +<!--l. 2852--><p class="nopar" > For a complete document, see the sample file <a +href="#x1-6114r23"><span +class="ec-lmtt-10x-x-109">sample-newkeys.tex</span></a>. +</p> +<div class="center" +> +<!--l. 2854--><p class="noindent" > +</p><!--l. 2854--><p class="noindent" >____________________________</p></div> +<!--l. 2856--><p class="noindent" > +</p> +<!--l. 2856--><p class="noindent" ><a +href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">4.4</span>  <a + id="sec:expansion"></a>Expansion</h3> +<!--l. 2859--><p class="noindent" >When you define new glossary entries expansion is performed by +default, except for the <span +class="ec-lmss-10x-x-109">name</span><a + id="dx1-27001"></a>, <span +class="ec-lmss-10x-x-109">description</span><a + id="dx1-27002"></a>, <span +class="ec-lmss-10x-x-109">descriptionplural</span><a + id="dx1-27003"></a>, <span +class="ec-lmss-10x-x-109">symbol</span><a + id="dx1-27004"></a>, +<span +class="ec-lmss-10x-x-109">symbolplural</span><a + id="dx1-27005"></a> and <span +class="ec-lmss-10x-x-109">sort</span><a + id="dx1-27006"></a> keys (these keys all have expansion suppressed via +<span +class="ec-lmtt-10x-x-109">\glssetnoexpandfield</span>). +</p><!--l. 2865--><p class="indent" > You can switch expansion on or off for individual keys using +</p><!--l. 2866--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glssetexpandfield</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-27007"></a> <span +class="ec-lmtt-10x-x-109">\glssetexpandfield{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">field</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 2868--><p class="noindent" > +or +</p><!--l. 2870--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glssetnoexpandfield</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-27008"></a> <span +class="ec-lmtt-10x-x-109">\glssetnoexpandfield{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">field</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 2872--><p class="noindent" > +respectively, where <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">field</span><span +class="lmsy-10x-x-109">⟩ </span>is the field tag corresponding to the key. In most +cases, this is the same as the name of the key except for those listed in +<a +href="#x1-270091">table 4.1</a>. + + + +</p><!--l. 2877--><p class="indent" > <a + id="x1-270091"></a></p><hr class="float" /><div class="float" +> + + + + <div class="caption"><table class="caption" +><tr style="vertical-align:baseline;" class="caption"><td class="id">Table 4.1: </td><td +class="content">Key to Field Mappings</td></tr></table></div><!--tex4ht:label?: x1-270091 --> +<div class="tabular"> <table id="TBL-5" class="tabular" +cellspacing="0" cellpadding="0" +><colgroup id="TBL-5-1g"><col +id="TBL-5-1" /><col +id="TBL-5-2" /></colgroup><tr + style="vertical-align:baseline;" id="TBL-5-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-1-1" +class="td11"> <span +class="ec-lmbx-10x-x-109">Key </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-5-1-2" +class="td11"> <span +class="ec-lmbx-10x-x-109">Field </span></td> +</tr><tr + style="vertical-align:baseline;" id="TBL-5-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-2-1" +class="td11"> <span +class="ec-lmss-10x-x-109">sort</span><a + id="dx1-27010"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-2-2" +class="td11"> <span +class="ec-lmtt-10x-x-109">sortvalue </span></td></tr><tr + style="vertical-align:baseline;" id="TBL-5-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-3-1" +class="td11"> <span +class="ec-lmss-10x-x-109">firstplural</span><a + id="dx1-27011"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-3-2" +class="td11"> <span +class="ec-lmtt-10x-x-109">firstpl</span></td> +</tr><tr + style="vertical-align:baseline;" id="TBL-5-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-4-1" +class="td11"> <span +class="ec-lmss-10x-x-109">description</span><a + id="dx1-27012"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-4-2" +class="td11"> <span +class="ec-lmtt-10x-x-109">desc </span></td> +</tr><tr + style="vertical-align:baseline;" id="TBL-5-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-5-1" +class="td11"> <span +class="ec-lmss-10x-x-109">descriptionplural</span><a + id="dx1-27013"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-5-2" +class="td11"> <span +class="ec-lmtt-10x-x-109">descplural </span></td> +</tr><tr + style="vertical-align:baseline;" id="TBL-5-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-6-1" +class="td11"> <span +class="ec-lmss-10x-x-109">user1</span><a + id="dx1-27014"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-6-2" +class="td11"> <span +class="ec-lmtt-10x-x-109">useri </span></td> +</tr><tr + style="vertical-align:baseline;" id="TBL-5-7-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-7-1" +class="td11"> <span +class="ec-lmss-10x-x-109">user2</span><a + id="dx1-27015"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-7-2" +class="td11"> <span +class="ec-lmtt-10x-x-109">userii </span></td> +</tr><tr + style="vertical-align:baseline;" id="TBL-5-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-8-1" +class="td11"> <span +class="ec-lmss-10x-x-109">user3</span><a + id="dx1-27016"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-8-2" +class="td11"> <span +class="ec-lmtt-10x-x-109">useriii </span></td> +</tr><tr + style="vertical-align:baseline;" id="TBL-5-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-9-1" +class="td11"> <span +class="ec-lmss-10x-x-109">user4</span><a + id="dx1-27017"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-9-2" +class="td11"> <span +class="ec-lmtt-10x-x-109">useriv </span></td> +</tr><tr + style="vertical-align:baseline;" id="TBL-5-10-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-10-1" +class="td11"> <span +class="ec-lmss-10x-x-109">user5</span><a + id="dx1-27018"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-10-2" +class="td11"> <span +class="ec-lmtt-10x-x-109">userv </span></td> +</tr><tr + style="vertical-align:baseline;" id="TBL-5-11-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-11-1" +class="td11"> <span +class="ec-lmss-10x-x-109">user6</span><a + id="dx1-27019"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-11-2" +class="td11"> <span +class="ec-lmtt-10x-x-109">uservi </span></td> +</tr><tr + style="vertical-align:baseline;" id="TBL-5-12-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-12-1" +class="td11"> <span +class="ec-lmss-10x-x-109">longplural</span><a + id="dx1-27020"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-12-2" +class="td11"> <span +class="ec-lmtt-10x-x-109">longpl </span></td> +</tr><tr + style="vertical-align:baseline;" id="TBL-5-13-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-13-1" +class="td11"> <span +class="ec-lmss-10x-x-109">shortplural</span><a + id="dx1-27021"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-13-2" +class="td11"> <span +class="ec-lmtt-10x-x-109">shortpl </span></td></tr></table> +</div> + + + + </div><hr class="endfloat" /> +<!--l. 2898--><p class="indent" > Any keys that haven’t had the expansion explicitly set using +<span +class="ec-lmtt-10x-x-109">\glssetexpandfield </span>or <span +class="ec-lmtt-10x-x-109">\glssetnoexpandfield </span>are governed by +</p><!--l. 2900--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsexpandfields</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-27022"></a> <span +class="ec-lmtt-10x-x-109">\glsexpandfields </span></div><hr> +</p><!--l. 2902--><p class="noindent" > +and +</p><!--l. 2904--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsnoexpandfields</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-27023"></a> <span +class="ec-lmtt-10x-x-109">\glsnoexpandfields </span></div><hr> +</p><!--l. 2906--><p class="noindent" > +</p><!--l. 2908--><p class="indent" > If your entries contain any fragile commands, I recommend you switch +off expansion via <span +class="ec-lmtt-10x-x-109">\glsnoexpandfields</span>. (This should be used before you +define the entries.) +</p> +<!--l. 2912--><p class="noindent" ><a +href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">4.5</span>  <a + id="sec:subentries"></a>Sub-Entries</h3> +<!--l. 2915--><p class="noindent" >As from version 1.17, it is possible to specify sub-entries. These may be used to order the glossary into categories, in which case the sub-entry will have a different name to its parent entry, or it may be used to distinguish different definitions for the same word, in which case the sub-entries will @@ -5467,66 +7094,74 @@ support hierarchical entries and may display all the entries in a flat format. Of the styles that support sub-entries, some display the sub-entry’s name whilst others don’t. Therefore you need to ensure that you use a suitable style. (See <a -href="#x1-4700015">§15 </a><a -href="#x1-4700015">Glossary Styles<!--tex4ht:ref: sec:styles --></a> for a list of predefined +href="#sec:styles">§15 </a><a +href="#sec:styles">Glossary Styles<!--tex4ht:ref: sec:styles --></a> for a list of predefined styles.) As from version 3.0, level 1 sub-entries are automatically numbered in the predefined styles if you use the <span class="ec-lmss-10x-x-109">subentrycounter</span><a - id="dx1-22001"></a> + id="dx1-28001"></a> package option (see <a -href="#x1-150002.3">§2.3 </a><a -href="#x1-150002.3">Glossary Appearance Options<!--tex4ht:ref: sec:pkgopts-printglos --></a> for further +href="#sec:pkgopts-printglos">§2.3 </a><a +href="#sec:pkgopts-printglos">Glossary Appearance Options<!--tex4ht:ref: sec:pkgopts-printglos --></a> for further details). -</p><!--l. 2275--><p class="indent" > Note that the parent entry will automatically be added to the glossary if +</p><!--l. 2930--><p class="indent" > Note that the parent entry will automatically be added to the glossary if any of its child entries are used in the document. If the parent entry is not referenced in the document, it will not have a <a - id="dx1-22002"></a><a + id="dx1-28002"></a><a href="#glo:numberlist">number list<a - id="dx1-22003"></a></a>. Note + id="dx1-28003"></a></a>. Note also that <a - id="dx1-22004"></a><a + id="dx1-28004"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-22005"></a></a> has a restriction on the maximum sub-entry + id="dx1-28005"></a></a> has a restriction on the maximum sub-entry depth. -</p><!--l. 2281--><p class="noindent" > +</p><!--l. 2936--><p class="noindent" > </p> -<!--l. 2281--><p class="noindent" ><a -href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">4.3.1</span>  <a - id="x1-230004.3.1"></a>Hierarchical Categories</h4> -<!--l. 2284--><p class="noindent" >To arrange a glossary with hierarchical categories, you need to first -define the category and then define the sub-entries using the relevant +<!--l. 2936--><p class="noindent" ><a +href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">4.5.1</span>  <a + id="sec:hierarchical"></a>Hierarchical Categories</h4> +<!--l. 2939--><p class="noindent" >To arrange a glossary with hierarchical categories, you need to first define +the category and then define the sub-entries using the relevant category +entry as the value of the <span +class="ec-lmss-10x-x-109">parent</span><a + id="dx1-29001"></a> key. -category entry as the value of the <span -class="ec-lmss-10x-x-109">parent</span><a - id="dx1-23001"></a> key. For example, suppose -I want a glossary of mathematical symbols that are divided into +<a + id="x1-29002r4"></a> +</p><!--l. 2944--><p class="noindent" ><span +class="ec-lmbx-12">Example 4</span><span +class="ec-lmbx-12"> (Hierarchical Categories—Greek and Roman</span> +<span +class="ec-lmbx-12">Mathematical Symbols)</span><a + id="x1-29003"></a> +</p><!--l. 2946--><p class="indent" > Suppose I want a glossary of mathematical symbols that are divided into Greek letters and Roman letters. Then I can define the categories as follows: </p> - <div class="verbatim" id="verbatim-50"> + <div class="verbatim" id="verbatim-63"> \newglossaryentry{greekletter}{name={Greek letters},  <br />description={\nopostdesc}}  <br />\newglossaryentry{romanletter}{name={Roman letters},  <br />description={\nopostdesc}} </div> -<!--l. 2296--><p class="nopar" > -</p><!--l. 2298--><p class="indent" > Note that in this example, the category entries don’t need a description +<!--l. 2955--><p class="nopar" > +</p><!--l. 2957--><p class="indent" > Note that in this example, the category entries don’t need a description so I have set the descriptions to <span class="ec-lmtt-10x-x-109">\nopostdesc</span><a - id="dx1-23002"></a>. This gives a blank + id="dx1-29004"></a>. This gives a blank description and suppresses the description terminator. -</p><!--l. 2303--><p class="indent" > I can now define my sub-entries as follows: +</p><!--l. 2962--><p class="indent" > I can now define my sub-entries as follows: </p> - <div class="verbatim" id="verbatim-51"> + <div class="verbatim" id="verbatim-64"> \newglossaryentry{pi}{name={\ensuremath{\pi}},sort={pi},  <br />description={ratio of the circumference of a circle to  <br />the diameter}, @@ -5535,37 +7170,44 @@ description and suppresses the description terminator.  <br />description={Euler’s constant},  <br />parent=romanletter} </div> -<!--l. 2313--><p class="nopar" > -</p><!--l. 2316--><p class="noindent" > +<!--l. 2972--><p class="nopar" > For a complete document, see the sample file <a +href="#x1-6068r16"><span +class="ec-lmtt-10x-x-109">sampletree.tex</span></a>. +</p> +<div class="center" +> +<!--l. 2974--><p class="noindent" > +</p><!--l. 2974--><p class="noindent" >____________________________</p></div> +<!--l. 2976--><p class="noindent" > </p> -<!--l. 2316--><p class="noindent" ><a -href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">4.3.2</span>  <a - id="x1-240004.3.2"></a>Homographs</h4> -<!--l. 2319--><p class="noindent" >Sub-entries that have the same name as the parent entry, don’t need to +<!--l. 2976--><p class="noindent" ><a +href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">4.5.2</span>  <a + id="sec:homographs"></a>Homographs</h4> +<!--l. 2979--><p class="noindent" >Sub-entries that have the same name as the parent entry, don’t need to have the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-24001"></a> key. For example, the word “glossary” can mean a list of + id="dx1-30001"></a> key. For example, the word “glossary” can mean a list of technical words or a collection of glosses. In both cases the plural is “glossaries”. So first define the parent entry: </p> - <div class="verbatim" id="verbatim-52"> + <div class="verbatim" id="verbatim-65"> \newglossaryentry{glossary}{name=glossary,  <br />description={\nopostdesc},  <br />plural={glossaries}} </div> -<!--l. 2328--><p class="nopar" > Again, the parent entry has no description, so the description terminator +<!--l. 2988--><p class="nopar" > Again, the parent entry has no description, so the description terminator needs to be suppressed using <span class="ec-lmtt-10x-x-109">\nopostdesc</span><a - id="dx1-24002"></a>. -</p><!--l. 2332--><p class="indent" > Now define the two different meanings of the word: + id="dx1-30002"></a>. +</p><!--l. 2992--><p class="indent" > Now define the two different meanings of the word: </p> - <div class="verbatim" id="verbatim-53"> + <div class="verbatim" id="verbatim-66"> \newglossaryentry{glossarylist}{  <br />description={list of technical words},  <br />sort={1}, @@ -5575,38 +7217,40 @@ class="ec-lmtt-10x-x-109">\nopostdesc</span><a  <br />sort={2},  <br />parent={glossary}} </div> -<!--l. 2343--><p class="nopar" > Note that if I reference the parent entry, the location will be added to the +<!--l. 3003--><p class="nopar" > Note that if I reference the parent entry, the location will be added to the parent’s <a - id="dx1-24003"></a><a + id="dx1-30003"></a><a href="#glo:numberlist">number list<a - id="dx1-24004"></a></a>, whereas if I reference any of the child entries, the + id="dx1-30004"></a></a>, whereas if I reference any of the child entries, the location will be added to the child entry’s number list. Note also that since the sub-entries have the same name, the <span class="ec-lmss-10x-x-109">sort</span><a - id="dx1-24005"></a> key is required unless you are + id="dx1-30005"></a> key is required unless you are using the <span class="ec-lmss-10x-x-109">sort=use</span><a - id="dx1-24006"></a> or <span + id="dx1-30006"></a> or <span class="ec-lmss-10x-x-109">sort=def</span><a - id="dx1-24007"></a> package options. You can use the -<span + id="dx1-30007"></a> package options (see <a +href="#sec:pkgopts-sort">§2.4 </a><a +href="#sec:pkgopts-sort">Sorting Options<!--tex4ht:ref: sec:pkgopts-sort --></a>). +You can use the <span class="ec-lmss-10x-x-109">subentrycounter</span><a - id="dx1-24008"></a> package option to automatically number the first-level -child entries. See <a -href="#x1-150002.3">§2.3 </a><a -href="#x1-150002.3">Glossary Appearance Options<!--tex4ht:ref: sec:pkgopts-printglos --></a> for further -details. -</p><!--l. 2354--><p class="indent" > In the above example, the plural form for both of the child entries is the + id="dx1-30008"></a> package option to automatically number +the first-level child entries. See <a +href="#sec:pkgopts-printglos">§2.3 </a><a +href="#sec:pkgopts-printglos">Glossary Appearance Options<!--tex4ht:ref: sec:pkgopts-printglos --></a> for +further details. +</p><!--l. 3015--><p class="indent" > In the above example, the plural form for both of the child entries is the same as the parent entry, so the <span class="ec-lmss-10x-x-109">plural</span><a - id="dx1-24009"></a> key was not required for the child + id="dx1-30009"></a> key was not required for the child entries. However, if the sub-entries have different plurals, they will need to be specified. For example: </p> - <div class="verbatim" id="verbatim-54"> + <div class="verbatim" id="verbatim-67"> \newglossaryentry{bravo}{name={bravo},  <br />description={\nopostdesc}}  <br />\newglossaryentry{bravocry}{description={cry of approval @@ -5620,18 +7264,18 @@ be specified. For example:  <br />plural={bravoes},  <br />parent=bravo} </div> -<!--l. 2373--><p class="nopar" > -</p><!--l. 2376--><p class="noindent" > +<!--l. 3034--><p class="nopar" > +</p><!--l. 3037--><p class="noindent" > </p> -<!--l. 2376--><p class="noindent" ><a -href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">4.4</span>  <a - id="x1-250004.4"></a>Loading Entries From a File</h3> -<!--l. 2379--><p class="noindent" >You can store all your glossary entry definitions in another file and +<!--l. 3037--><p class="noindent" ><a +href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">4.6</span>  <a + id="sec:loadglsentries"></a>Loading Entries From a File</h3> +<!--l. 3040--><p class="noindent" >You can store all your glossary entry definitions in another file and use: -</p><!--l. 2381--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3042--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\loadglsentries</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-25001"></a> <span + id="dx1-31001"></a> <span class="ec-lmtt-10x-x-109">\loadglsentries[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">type</span><span @@ -5641,34 +7285,43 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">filename</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 2383--><p class="noindent" > +</p><!--l. 3044--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">filename</span><span class="lmsy-10x-x-109">⟩ </span>is the name of the file containing all the <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-25002"></a> -commands. The optional argument <span + id="dx1-31002"></a> +or <span +class="ec-lmtt-10x-x-109">\longnewglossaryentry</span><a + id="dx1-31003"></a> commands. The optional argument +<span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">type</span><span -class="lmsy-10x-x-109">⟩ </span>is the name of the glossary to -which those entries should belong, for those entries where the <span +class="lmsy-10x-x-109">⟩ </span>is the name of the glossary to which those entries should +belong, for those entries where the <span class="ec-lmss-10x-x-109">type</span><a - id="dx1-25003"></a> key has -been omitted (or, more specifically, for those entries whose type has been -specified by <span + id="dx1-31004"></a> key has been omitted (or, +more specifically, for those entries whose type has been specified +by <span class="ec-lmtt-10x-x-109">\glsdefaulttype</span><a - id="dx1-25004"></a>, which is what <span + id="dx1-31005"></a>, which is what <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-25005"></a> uses by -default). For example, suppose I have a file called <span -class="ec-lmtt-10x-x-109">myentries.tex </span>which -contains: + id="dx1-31006"></a> uses by +default). +<a + id="x1-31007r5"></a> +</p><!--l. 3054--><p class="noindent" ><span +class="ec-lmbx-12">Example 5</span><span +class="ec-lmbx-12"> (Loading Entries from Another File)</span><a + id="x1-31008"></a> +</p><!--l. 3055--><p class="indent" > Suppose I have a file called <span +class="ec-lmtt-10x-x-109">myentries.tex </span>which contains: </p> - <div class="verbatim" id="verbatim-55"> + <div class="verbatim" id="verbatim-68"> \newglossaryentry{perl}{type=main,  <br />name={Perl},  <br />description={A scripting language}} @@ -5678,28 +7331,32 @@ contains:  <br />name={html},  <br />description={A mark up language}} </div> -<!--l. 2403--><p class="nopar" > and suppose in my document preamble I use the command: +<!--l. 3067--><p class="nopar" > and suppose in my document preamble I use the command: </p> - <div class="verbatim" id="verbatim-56"> + <div class="verbatim" id="verbatim-69"> \loadglsentries[languages]{myentries} </div> -<!--l. 2407--><p class="nopar" > then this will add the entries <span +<!--l. 3071--><p class="nopar" > then this will add the entries <span class="ec-lmtt-10x-x-109">tex </span>and <span class="ec-lmtt-10x-x-109">html </span>to the glossary whose type is given by <span class="ec-lmtt-10x-x-109">languages</span>, but the entry <span class="ec-lmtt-10x-x-109">perl </span>will be added to the main glossary, since it explicitly sets the type to <span -class="ec-lmtt-10x-x-109">main</span>. -</p><!--l. 2413--><p class="indent" > <span +class="ec-lmtt-10x-x-109">main</span>. </p> +<div class="center" +> +<!--l. 3076--><p class="noindent" > +</p><!--l. 3076--><p class="noindent" >____________________________</p></div> +<!--l. 3078--><p class="indent" > <span class="ec-lmbx-10x-x-109">Note: </span>if you use <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-25006"></a> (see <a -href="#x1-4100013">§13 </a><a -href="#x1-4100013">Acronyms<!--tex4ht:ref: sec:acronyms --></a>) the type is set as + id="dx1-31009"></a> (see <a +href="#sec:acronyms">§13 </a><a +href="#sec:acronyms">Acronyms<!--tex4ht:ref: sec:acronyms --></a>) the type is set as <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">type=\acronymtype</span></span></span> unless you explicitly override it. For example, if my file <span @@ -5708,86 +7365,86 @@ class="ec-lmtt-10x-x-109">myacronyms.tex </span>contains: </p> - <div class="verbatim" id="verbatim-57"> + <div class="verbatim" id="verbatim-70"> \newacronym{aca}{aca}{a contrived acronym} </div> -<!--l. 2419--><p class="nopar" > then (supposing I have defined a new glossary type called <span +<!--l. 3084--><p class="nopar" > then (supposing I have defined a new glossary type called <span class="ec-lmtt-10x-x-109">altacronym</span>) </p> - <div class="verbatim" id="verbatim-58"> + <div class="verbatim" id="verbatim-71"> \loadglsentries[altacronym]{myacronyms} </div> -<!--l. 2424--><p class="nopar" > will add <span +<!--l. 3089--><p class="nopar" > will add <span class="ec-lmtt-10x-x-109">aca </span>to the glossary type <span class="ec-lmtt-10x-x-109">acronym</span>, if the package option <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-25007"></a> has been specified, or will add <span + id="dx1-31010"></a> has been specified, or will add <span class="ec-lmtt-10x-x-109">aca </span>to the glossary type <span class="ec-lmtt-10x-x-109">altacronym</span>, if the package option <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-25008"></a> is not + id="dx1-31011"></a> is not specified.<span class="footnote-mark"><a href="#fn3x6" id="fn3x6-bk"><sup class="textsuperscript">3</sup></a></span><a - id="x1-25009f3"></a> -</p><!--l. 2432--><p class="indent" > If you have used the <span + id="x1-31012f3"></a> +</p><!--l. 3097--><p class="indent" > If you have used the <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-25013"></a> package option, there are two possible + id="dx1-31016"></a> package option, there are two possible solutions to this problem: </p><ol class="enumerate1" > <li - class="enumerate" id="x1-25015x1">Change <span + class="enumerate" id="x1-31018x1">Change <span class="ec-lmtt-10x-x-109">myacronyms.tex </span>so that entries are defined in the form: - <div class="verbatim" id="verbatim-59"> + <div class="verbatim" id="verbatim-72"> \newacronym[type=\glsdefaulttype]{aca}{aca}{a  <br />contrived acronym} </div> - <!--l. 2440--><p class="nopar" > and do: + <!--l. 3105--><p class="nopar" > and do: </p> - <div class="verbatim" id="verbatim-60"> + <div class="verbatim" id="verbatim-73"> \loadglsentries[altacronym]{myacronyms} </div> - <!--l. 2444--><p class="nopar" > + <!--l. 3109--><p class="nopar" > </p></li> <li - class="enumerate" id="x1-25017x2">Temporarily change <span + class="enumerate" id="x1-31020x2">Temporarily change <span class="ec-lmtt-10x-x-109">\acronymtype </span>to the target glossary: - <div class="verbatim" id="verbatim-61"> + <div class="verbatim" id="verbatim-74"> \let\orgacronymtype\acronymtype -  <br />\def\acronymtype{altacronym} +  <br />\renewcommand{\acronymtype}{altacronym}  <br />\loadglsentries{myacronyms}  <br />\let\acronymtype\orgacronymtype </div> - <!--l. 2452--><p class="nopar" ></p></li></ol> -<!--l. 2455--><p class="indent" > Note that only those entries that have been used in the text will appear + <!--l. 3117--><p class="nopar" ></p></li></ol> +<!--l. 3120--><p class="indent" > Note that only those entries that have been used in the text will appear in the relevant glossaries. Note also that <span class="ec-lmtt-10x-x-109">\loadglsentries </span>may only be used in the preamble. -</p><!--l. 2460--><p class="noindent" > +</p><!--l. 3125--><p class="noindent" > </p> -<!--l. 2460--><p class="noindent" ><a -href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">4.5</span>  <a - id="x1-260004.5"></a>Moving Entries to Another Glossary</h3> -<!--l. 2463--><p class="noindent" >As from version 3.02, you can move an entry from one glossary to another +<!--l. 3125--><p class="noindent" ><a +href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">4.7</span>  <a + id="sec:moveentry"></a>Moving Entries to Another Glossary</h3> +<!--l. 3128--><p class="noindent" >As from version 3.02, you can move an entry from one glossary to another using: -</p><!--l. 2465--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3130--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsmoveentry</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-26001"></a> <span + id="dx1-32001"></a> <span class="ec-lmtt-10x-x-109">\glsmoveentry{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -5798,7 +7455,7 @@ class="ec-lmri-10x-x-109">target glossary label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 2467--><p class="noindent" > +</p><!--l. 3132--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -5809,71 +7466,165 @@ class="ec-lmri-10x-x-109">target</span> class="ec-lmri-10x-x-109">glossary label</span><span class="lmsy-10x-x-109">⟩ </span>is the unique label identifying the glossary in which to put the entry. -</p><!--l. 2472--><p class="indent" > Note that no check is performed to determine the existence of the target +</p><!--l. 3137--><p class="indent" > Note that no check is performed to determine the existence of the target glossary. This means that you can, for example, move an entry to an undefined glossary so you can use the entry in the document text but not -have it listed in any of the glossaries. (Maybe you have an acronym so -common it doesn’t need listing.) -</p><!--l. 2478--><p class="indent" > <div class="important" title="Important Note"> If you move an entry to an undefined glossary and you have +have it listed in any of the glossaries. (Maybe you have an acronym that is +so common it doesn’t need listing.) +</p><!--l. 3143--><p class="indent" > <div class="important" title="Important Note"> If you move an entry to an undefined glossary and you have hyperlinked entries, the link will point to an undefined target. (Unless you identify that glossary using <span class="ec-lmss-10x-x-109">nohypertypes</span><a - id="dx1-26002"></a> or <span + id="dx1-32002"></a> or <span class="ec-lmtt-10x-x-109">\GlsDeclareNoHyperList</span><a - id="dx1-26003"></a>, + id="dx1-32003"></a>, as described in <a -href="#x1-280006">§6 </a><a -href="#x1-280006">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a>.) Also, you will get +href="#sec:glslink">§6 </a><a +href="#sec:glslink">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a>.) Also, you will get warnings about no file defined for that glossary (unless you use the <span class="ec-lmss-10x-x-109">nowarn</span><a - id="dx1-26004"></a> package option). Unpredictable results may occur if you + id="dx1-32004"></a> package option). Unpredictable results may occur if you move an entry to a different glossary from its parent or children. </div> -</p><!--l. 2487--><p class="noindent" > +</p><!--l. 3152--><p class="noindent" > + + + +</p><!--l. 3154--><p class="noindent" > +</p> +<!--l. 3154--><p class="noindent" ><a +href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">4.8</span>  <a + id="sec:docdefs"></a>Drawbacks With Defining Entries in the Document Environment</h3> +<!--l. 3157--><p class="noindent" >Originally, <span +class="ec-lmtt-10x-x-109">\newglossaryentry</span><a + id="dx1-33001"></a> (and <span +class="ec-lmtt-10x-x-109">\newacronym</span><a + id="dx1-33002"></a>) could only be used in +the preamble. I reluctantly removed this restriction in version 1.13, but +there are issues with defining commands in the <span +class="ec-lmss-10x-x-109">document</span><a + id="dx1-33003"></a><a + id="dx1-33004"></a> environment +instead of the preamble. +</p><!--l. 3162--><p class="noindent" > +</p> +<!--l. 3162--><p class="noindent" ><a +href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">4.8.1</span>  <a + id="sec:techissues"></a>Technical Issues</h4> +<!--l. 3165--><p class="noindent" > + </p><ol class="enumerate1" > + <li + class="enumerate" id="x1-34002x1">If you define an entry mid-way through your document, but + subsequently shuffle sections around, you could end up using an + entry before it has been defined. + </li> + <li + class="enumerate" id="x1-34004x2">Entry information is required when the glossary is displayed + using <span +class="ec-lmtt-10x-x-109">\printglossary</span><a + id="dx1-34005"></a> or <span +class="ec-lmtt-10x-x-109">\printglossaries</span><a + id="dx1-34006"></a>. When either of + these commands occur at the start of the document, the entry + details are being looked up before the entry has been defined.</li></ol> +<!--l. 3176--><p class="noindent" >To overcome these problems, <span +class="ec-lmss-10x-x-109">glossaries</span><a + id="dx1-34007"></a> v4.0 modifies the definition of +<span +class="ec-lmtt-10x-x-109">\newglossaryentry </span>at the beginning of the <span +class="ec-lmss-10x-x-109">document</span><a + id="dx1-34008"></a><a + id="dx1-34009"></a> environment so that +the definitions are written to an external file (<span +class="ec-lmtt-10x-x-109">\jobname</span>.<span +class="ec-lmtt-10x-x-109">glsdefs</span>) which is +then read in at the start of the document on the next run. The entry will +then only be defined if it doesn’t already exist. This means that the entry +can now be looked up in the glossary, even if the glossary occurs at the +beginning of the document. +</p><!--l. 3185--><p class="indent" > There are drawbacks to this mechanism: if you modify an entry +definition, you need a second run to see the effect of your modification; this +method requires an extra <span +class="ec-lmtt-10x-x-109">\newwrite</span>, which may exceed <span class="TEX">T<span +class="E">E</span>X</span>’s maximum +allocation; if you have very long entries, you could find unexpected line +breaks have been written to the temporary file. +</p><!--l. 3191--><p class="indent" > The last reason is why <span +class="ec-lmtt-10x-x-109">\longnewglossaryentry</span><a + id="dx1-34010"></a> has the preamble-only +restriction, which I don’t intend to lift. + + + +</p><!--l. 3194--><p class="noindent" > +</p> +<!--l. 3194--><p class="noindent" ><a +href="#top">Top</a></p><h4 class="subsectionHead"><span class="titlemark">4.8.2</span>  <a + id="sec:goodpractice"></a>Good Practice Issues</h4> +<!--l. 3197--><p class="noindent" >The above section covers technical issues that can cause your document to +have compilation errors or produce incorrect output. This section focuses +on good writing practice. The main reason cited by users wanting to define +entries within the <span +class="ec-lmss-10x-x-109">document</span><a + id="dx1-35001"></a><a + id="dx1-35002"></a> environment rather than in the preamble is +that they want to write the definition as they type in their document text. +This suggests a “stream of consciousness” style of writing that may be +acceptable in certain literary genres but is inappropriate for factual +documents. +</p><!--l. 3206--><p class="indent" > When you write technical documents, regardless of whether it’s a PhD +thesis or an article for a journal or proceedings, you must plan what you +write in advance. If you plan in advance, you should have a fairly good idea +of the type of terminology that your document will contain, so while you +are planning, create a new file with all your entry definitions. If while +you’re writing your document, you remember another term you need, +then you can switch over to your definition file and add it. Most +text editors have the ability to have more than one file open at a +time. </p> -<!--l. 2489--><p class="noindent" ><a +<!--l. 3216--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">5</span>  <a - id="x1-270005"></a>Number lists</h2> + id="sec:numberlists"></a>Number lists</h2> Each entry in the glossary has an associated <a - id="dx1-27001"></a><a + id="dx1-36001"></a><a href="#glo:numberlist">number list<a - id="dx1-27002"></a></a>. By default, + id="dx1-36002"></a></a>. By default, these numbers refer to the pages on which that entry has been used (using any of the commands described in <a -href="#x1-280006">§6 </a><a -href="#x1-280006">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a> and <a -href="#x1-310007">§7 +href="#sec:glslink">§6 </a><a +href="#sec:glslink">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a> and <a +href="#sec:glsadd">§7 </a><a -href="#x1-310007">Adding an Entry to the Glossary Without Generating Text<!--tex4ht:ref: sec:glsadd --></a>). The number +href="#sec:glsadd">Adding an Entry to the Glossary Without Generating Text<!--tex4ht:ref: sec:glsadd --></a>). The number list can be suppressed using the <span class="ec-lmss-10x-x-109">nonumberlist</span><a - id="dx1-27003"></a> package option, or + id="dx1-36003"></a> package option, or an alternative counter can be set as the default using the <span class="ec-lmss-10x-x-109">counter</span><a - id="dx1-27004"></a> + id="dx1-36004"></a> package option. The number list is also referred to as the location list<a - id="dx1-27005"></a>. -<!--l. 2502--><p class="indent" > Both <a - id="dx1-27006"></a><a + id="dx1-36005"></a>. +<!--l. 3228--><p class="indent" > Both <a + id="dx1-36006"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-27007"></a></a> and <a - id="dx1-27008"></a><a + id="dx1-36007"></a></a> and <a + id="dx1-36008"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-27009"></a></a> concatenate a sequence of 3 or more + id="dx1-36009"></a></a> concatenate a sequence of 3 or more consecutive pages into a range. With <a - id="dx1-27010"></a><span + id="dx1-36010"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-27011"></a> you can vary the minimum + id="dx1-36011"></a> you can vary the minimum sequence length using <span class="ec-lmtt-10x-x-109">\GlsSetXdyMinRangeLength</span><a - id="dx1-27012"></a><span + id="dx1-36012"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">n</span><span @@ -5885,44 +7636,44 @@ class="lmsy-10x-x-109">⟩ </span>is either an integer or the keyword <span class="ec-lmtt-10x-x-109">none </span>which indicates that there should be no range formation. -</p><!--l. 2509--><p class="indent" > <div class="important" title="Important Note"> Note that <span +</p><!--l. 3235--><p class="indent" > <div class="important" title="Important Note"> Note that <span class="ec-lmtt-10x-x-109">\GlsSetXdyMinRangeLength </span>must be used before <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-27013"></a> and has no effect if <span + id="dx1-36013"></a> and has no effect if <span class="ec-lmtt-10x-x-109">\noist</span><a - id="dx1-27014"></a> is used. </div> -</p><!--l. 2512--><p class="noindent" > -</p><!--l. 2514--><p class="indent" > With both <a - id="dx1-27015"></a><a + id="dx1-36014"></a> is used. </div> +</p><!--l. 3238--><p class="noindent" > +</p><!--l. 3240--><p class="indent" > With both <a + id="dx1-36015"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-27016"></a></a> and <a - id="dx1-27017"></a><a + id="dx1-36016"></a></a> and <a + id="dx1-36017"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-27018"></a></a>, you can replace the separator and the + id="dx1-36018"></a></a>, you can replace the separator and the closing number in the range using: -</p><!--l. 2516--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3242--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsSetSuffixF</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-27019"></a> <span + id="dx1-36019"></a> <span class="ec-lmtt-10x-x-109">\glsSetSuffixF{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">suffix</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 2518--><p class="noindent" > -</p><!--l. 2519--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3244--><p class="noindent" > +</p><!--l. 3245--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsSetSuffixFF</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-27020"></a> <span + id="dx1-36020"></a> <span class="ec-lmtt-10x-x-109">\glsSetSuffixFF{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">suffix</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 2521--><p class="noindent" > +</p><!--l. 3247--><p class="noindent" > where the former command specifies the suffix to use for a 2 page list and the latter specifies the suffix to use for longer lists. For example: @@ -5930,133 +7681,155 @@ example: </p> - <div class="verbatim" id="verbatim-62"> + <div class="verbatim" id="verbatim-75"> \glsSetSuffixF{f.}  <br />\glsSetSuffixFF{ff.} </div> -<!--l. 2528--><p class="nopar" > Note that if you use <a - id="dx1-27021"></a><a +<!--l. 3254--><p class="nopar" > Note that if you use <a + id="dx1-36021"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-27022"></a></a>, you will also need to set the minimum range + id="dx1-36022"></a></a>, you will also need to set the minimum range length to 1 if you want to change these suffixes: </p> - <div class="verbatim" id="verbatim-63"> + <div class="verbatim" id="verbatim-76"> \GlsSetXdyMinRangeLength{1} </div> -<!--l. 2534--><p class="nopar" > Note that if you use the <span +<!--l. 3260--><p class="nopar" > Note that if you use the <span class="ec-lmss-10x-x-109">hyperref</span><a - id="dx1-27023"></a> package, you will need to use + id="dx1-36023"></a> package, you will need to use <span class="ec-lmtt-10x-x-109">\nohyperpage</span><a - id="dx1-27024"></a> in the suffix to ensure that the hyperlinks work correctly. + id="dx1-36024"></a> in the suffix to ensure that the hyperlinks work correctly. For example: </p> - <div class="verbatim" id="verbatim-64"> + <div class="verbatim" id="verbatim-77"> \glsSetSuffixF{\nohyperpage{f.}}  <br />\glsSetSuffixFF{\nohyperpage{ff.}} </div> -<!--l. 2541--><p class="nopar" > -</p><!--l. 2543--><p class="indent" > <div class="important" title="Important Note"> Note that <span +<!--l. 3267--><p class="nopar" > +</p><!--l. 3269--><p class="indent" > <div class="important" title="Important Note"> Note that <span class="ec-lmtt-10x-x-109">\glsSetSuffixF </span>and <span class="ec-lmtt-10x-x-109">\glsSetSuffixFF </span>must be used before <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-27025"></a> and have no effect if <span + id="dx1-36025"></a> and have no effect if <span class="ec-lmtt-10x-x-109">\noist</span><a - id="dx1-27026"></a> is used. </div> -</p><!--l. 2547--><p class="noindent" > + id="dx1-36026"></a> is used. </div> +</p><!--l. 3273--><p class="noindent" > </p> <h2 class="chapterHead"><span class="titlemark">6</span>  <a - id="x1-280006"></a>Links to Glossary Entries</h2> -<!--l. 2553--><p class="noindent" >Once you have defined a glossary entry using <span + id="sec:glslink"></a>Links to Glossary Entries</h2> +<!--l. 3279--><p class="noindent" >Once you have defined a glossary entry using <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-28001"></a>, you can + id="dx1-37001"></a>, you can refer to that entry in the document using one of the commands listed in this section. The text which appears at that point in the document when using one of these commands is referred to as the <a - id="dx1-28002"></a><a + id="dx1-37002"></a><a href="#glo:linktext">link text<a - id="dx1-28003"></a></a> (even if there + id="dx1-37003"></a></a> (even if there are no hyperlinks). The commands in this section also add a line to an external file that is used by <a - id="dx1-28004"></a><a + id="dx1-37004"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-28005"></a></a> or <a - id="dx1-28006"></a><a + id="dx1-37005"></a></a> or <a + id="dx1-37006"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-28007"></a></a> to generate the relevant + id="dx1-37007"></a></a> to generate the relevant entry in the glossary. This information includes an associated location that is added to the <a - id="dx1-28008"></a><a + id="dx1-37008"></a><a href="#glo:numberlist">number list<a - id="dx1-28009"></a></a> for that entry. By default, the location refers to + id="dx1-37009"></a></a> for that entry. By default, the location refers to the page number. For further information on number lists, see <a -href="#x1-270005">§5 </a><a -href="#x1-270005">Number +href="#sec:numberlists">§5 </a><a +href="#sec:numberlists">Number lists<!--tex4ht:ref: sec:numberlists --></a>. -</p><!--l. 2565--><p class="indent" > <div class="important" title="Important Note"> It is strongly recommended that you don’t use the commands +</p><!--l. 3291--><p class="indent" > <div class="important" title="Important Note"> It is strongly recommended that you don’t use the commands defined in this section in the arguments of sectioning or caption commands or any other command that has a moving argument. </div> -</p><!--l. 2569--><p class="noindent" > -</p><!--l. 2571--><p class="indent" > The above warning is particularly important if you are using the +</p><!--l. 3295--><p class="noindent" > +</p><!--l. 3297--><p class="indent" > The above warning is particularly important if you are using the <span class="ec-lmss-10x-x-109">glossaries </span>package in conjunction with the <span class="ec-lmss-10x-x-109">hyperref</span><a - id="dx1-28010"></a> package. Instead, use + id="dx1-37010"></a> package. Instead, use one of the commands listed in <a -href="#x1-340009">§9 </a><a -href="#x1-340009">Using Glossary Terms Without Links<!--tex4ht:ref: sec:glsnolink --></a> +href="#sec:glsnolink">§9 </a><a +href="#sec:glsnolink">Using Glossary Terms Without Links<!--tex4ht:ref: sec:glsnolink --></a> (such as <span class="ec-lmtt-10x-x-109">\glsentrytext</span><a - id="dx1-28011"></a>) or provide an alternative via the optional + id="dx1-37011"></a>) or provide an alternative via the optional argument to the sectioning/caption command. Examples: </p> - <div class="verbatim" id="verbatim-65"> + <div class="verbatim" id="verbatim-78"> \chapter{An overview of \glsentrytext{perl}}  <br />\chapter[An overview of Perl]{An overview of \gls{perl}} </div> -<!--l. 2580--><p class="nopar" > -</p><!--l. 2582--><p class="indent" > If you want the <a - id="dx1-28012"></a><a +<!--l. 3306--><p class="nopar" > +</p><!--l. 3308--><p class="indent" > If you want the <a + id="dx1-37012"></a><a href="#glo:linktext">link text<a - id="dx1-28013"></a></a> to produce a hyperlink to the corresponding + id="dx1-37013"></a></a> to produce a hyperlink to the corresponding entry details in the glossary, you should load the <span class="ec-lmss-10x-x-109">hyperref</span><a - id="dx1-28014"></a> package <span + id="dx1-37014"></a> package <span class="ec-lmri-10x-x-109">before</span> the <span class="ec-lmss-10x-x-109">glossaries </span>package. That’s what I’ve done in this document, so if you see a hyperlinked term, such as <a - id="dx1-28015"></a><a + id="dx1-37015"></a><a href="#glo:linktext">link text<a - id="dx1-28016"></a></a>, you can click on the word or + id="dx1-37016"></a></a>, you can click on the word or phrase and it will take you to a brief description in this document’s glossary. -</p><!--l. 2590--><p class="indent" > It may be that you only want terms in a certain glossary to have links, +</p><!--l. 3316--><p class="indent" > <div class="important" title="Important Note"> If you use the <span +class="ec-lmss-10x-x-109">hyperref</span><a + id="dx1-37017"></a> package, I strongly recommend you use <span +class="ec-lmtt-10x-x-109">pdflatex</span><a + id="dx1-37018"></a> +rather than <span +class="ec-lmtt-10x-x-109">latex</span><a + id="dx1-37019"></a> to compile your document, if possible. The DVI format +of <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span +class="E">E</span>X</span></span> has limitations with the hyperlinks that can cause a problem +when used with the <span +class="ec-lmss-10x-x-109">glossaries</span><a + id="dx1-37020"></a> package. Firstly, the DVI format can’t break +a hyperlink across a line whereas PDF<span class="LATEX">L<span class="A">A</span><span class="TEX">T<span +class="E">E</span>X</span></span> can. This means that long +glossary entries (for example, the full form of an acronym) won’t be able to +break across a line with the DVI format. Secondly, the DVI format +doesn’t correctly size hyperlinks in subscripts or superscripts. This +means that if you define a term that may be used as a subscript or +superscript, if you use the DVI format, it won’t come out the correct size. +</div> +</p><!--l. 3329--><p class="noindent" > +</p><!--l. 3331--><p class="indent" > It may be that you only want terms in a certain glossary to have links, but not for another glossary. In which case, you can use the package option <span class="ec-lmss-10x-x-109">nohypertypes</span><a - id="dx1-28017"></a> to identify the glossary lists that shouldn’t have hyperlinked + id="dx1-37021"></a> to identify the glossary lists that shouldn’t have hyperlinked <a - id="dx1-28018"></a><a + id="dx1-37022"></a><a href="#glo:linktext">link text<a - id="dx1-28019"></a></a>. For example, suppose your document contains lots of + id="dx1-37023"></a></a>. For example, suppose your document contains lots of technical acronyms that the reader might not know, but it also contains some very common acronyms that most readers will recognise. So you might want two acronym lists, but only the technical list will @@ -6065,43 +7838,43 @@ hyperlinked to that list, but common acronyms shouldn’t have hyperlinks as there’s no target for them. In this case, identify the common acronym list as having non-hyperlinked entries using <span class="ec-lmss-10x-x-109">nohypertypes</span><a - id="dx1-28020"></a>. + id="dx1-37024"></a>. Example: </p> - <div class="verbatim" id="verbatim-66"> + <div class="verbatim" id="verbatim-79"> \usepackage[acronym,nohypertypes={common}]{glossaries}  <br />\newglossary{common}{cacr}{cacn}{Common Acronyms} </div> -<!--l. 2605--><p class="nopar" > Alternatively, you can use -</p><!--l. 2607--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 3346--><p class="nopar" > Alternatively, you can use +</p><!--l. 3348--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GlsDeclareNoHyperList</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28021"></a> <span + id="dx1-37025"></a> <span class="ec-lmtt-10x-x-109">\GlsDeclareNoHyperList{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">type</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 2609--><p class="noindent" > +</p><!--l. 3350--><p class="noindent" > For example: </p> - <div class="verbatim" id="verbatim-67"> + <div class="verbatim" id="verbatim-80"> \usepackage[acronym]{glossaries}  <br />\newglossary{common}{cacr}{cacn}{Common Acronyms}  <br />\GlsDeclareNoHyperList{common} </div> -<!--l. 2615--><p class="nopar" > Note that no check is performed to see if the glossary types listed in +<!--l. 3356--><p class="nopar" > Note that no check is performed to see if the glossary types listed in <span class="ec-lmss-10x-x-109">nohypertypes</span><a - id="dx1-28022"></a> or <span + id="dx1-37026"></a> or <span class="ec-lmtt-10x-x-109">\GlsDeclareNoHyperList </span>have been defined. -</p><!--l. 2620--><p class="indent" > <div class="important" title="Important Note">The values must be fully expanded, so <span +</p><!--l. 3361--><p class="indent" > <div class="important" title="Important Note">The values must be fully expanded, so <span class="ec-lmbx-10x-x-109">don’t </span>try <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">nohypertypes=\acronymtype</span></span></span> or <span class="obeylines-h"><span class="verb"><span @@ -6114,75 +7887,75 @@ when using the package option. So </p> -<div class="verbatim" id="verbatim-68"> +<div class="verbatim" id="verbatim-81"> \usepackage[nohypertypes={acronym,common}]{glossaries} </div> -<!--l. 2630--><p class="nopar" > is correct, but <span class="obeylines-h"><span class="verb"><span +<!--l. 3371--><p class="nopar" > is correct, but <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">nohypertypes={{acronym},{common}}</span></span></span> won’t work. </div> -</p><!--l. 2632--><p class="noindent" > -</p><!--l. 2634--><p class="indent" > You can override the effect of <span +</p><!--l. 3373--><p class="noindent" > +</p><!--l. 3375--><p class="indent" > You can override the effect of <span class="ec-lmss-10x-x-109">nohypertypes</span><a - id="dx1-28023"></a> or <span + id="dx1-37027"></a> or <span class="ec-lmtt-10x-x-109">\GlsDeclareNoHyperList</span> by explicitly setting the <span class="ec-lmss-10x-x-109">hyper</span><a - id="dx1-28024"></a> option in commands such as <span + id="dx1-37028"></a> option in commands such as <span class="ec-lmtt-10x-x-109">\glslink </span>or <span class="ec-lmtt-10x-x-109">\gls</span>. -</p><!--l. 2639--><p class="indent" > The way the <a - id="dx1-28025"></a><a +</p><!--l. 3380--><p class="indent" > The way the <a + id="dx1-37029"></a><a href="#glo:linktext">link text<a - id="dx1-28026"></a></a> is displayed depends on -</p><!--l. 2640--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="dx1-37030"></a></a> is displayed depends on +</p><!--l. 3381--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glstextformat</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28027"></a> <span + id="dx1-37031"></a> <span class="ec-lmtt-10x-x-109">\glstextformat{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 2642--><p class="noindent" > +</p><!--l. 3383--><p class="noindent" > For example, to make all <a - id="dx1-28028"></a><a + id="dx1-37032"></a><a href="#glo:linktext">link text<a - id="dx1-28029"></a></a> appear in a sans-serif font, do: + id="dx1-37033"></a></a> appear in a sans-serif font, do: </p> - <div class="verbatim" id="verbatim-69"> + <div class="verbatim" id="verbatim-82"> \renewcommand*{\glstextformat}[1]{\textsf{#1}} </div> -<!--l. 2647--><p class="nopar" > -</p><!--l. 2649--><p class="indent" > Each entry has an associated conditional referred to as the <a - id="dx1-28030"></a><a +<!--l. 3388--><p class="nopar" > +</p><!--l. 3390--><p class="indent" > Each entry has an associated conditional referred to as the <a + id="dx1-37034"></a><a href="#glo:firstuseflag">first use flag</a>. This determines whether <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-28031"></a>, <span + id="dx1-37035"></a>, <span class="ec-lmtt-10x-x-109">\glspl</span><a - id="dx1-28032"></a> (and their uppercase variants) + id="dx1-37036"></a> (and their uppercase variants) should use the value of the <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-28033"></a> or <span + id="dx1-37037"></a> or <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-28034"></a> keys. Note that an entry can be + id="dx1-37038"></a> keys. Note that an entry can be used without affecting the <a - id="dx1-28035"></a><a + id="dx1-37039"></a><a href="#glo:firstuseflag">first use flag</a> (for example, when used with <span class="ec-lmtt-10x-x-109">\glslink</span>). See <a -href="#x1-4600014">§14 </a><a -href="#x1-4600014">Unsetting and Resetting Entry Flags<!--tex4ht:ref: sec:glsunset --></a> for commands +href="#sec:glsunset">§14 </a><a +href="#sec:glsunset">Unsetting and Resetting Entry Flags<!--tex4ht:ref: sec:glsunset --></a> for commands that unset or reset this conditional. -</p><!--l. 2657--><p class="indent" > The command: -</p><!--l. 2658--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3398--><p class="indent" > The command: +</p><!--l. 3399--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glslink</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28036"></a> <span + id="dx1-37040"></a> <span class="ec-lmtt-10x-x-109">\glslink[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -6196,7 +7969,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 2660--><p class="noindent" > +</p><!--l. 3401--><p class="noindent" > will place <span class="ec-lmtt-10x-x-109">\glstextformat{</span><span class="lmsy-10x-x-109">⟨</span><span @@ -6213,10 +7986,10 @@ class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩ </span>will be a hyperlink to the relevant line in the glossary. (Note that this command doesn’t affect the <a - id="dx1-28037"></a><a + id="dx1-37041"></a><a href="#glo:firstuseflag">first use flag</a>: use <span class="ec-lmtt-10x-x-109">\glsdisp</span><a - id="dx1-28038"></a> instead.) The optional argument <span + id="dx1-37042"></a> instead.) The optional argument <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span class="lmsy-10x-x-109">⟩</span> @@ -6231,27 +8004,27 @@ keys: </p><dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">format</span><a - id="dx1-28039"></a> </dt><dd + id="dx1-37043"></a> </dt><dd class="description">This specifies how to format the associated location number for this entry in the glossary. This value is equivalent to the <a - id="dx1-28040"></a><a + id="dx1-37044"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-28041"></a></a> + id="dx1-37045"></a></a> encap value, and (as with <span class="ec-lmtt-10x-x-109">\index</span><a - id="dx1-28042"></a>) the value needs to be the + id="dx1-37046"></a>) the value needs to be the name of a command <span class="ec-lmri-10x-x-109">without </span>the initial backslash. As with <span class="ec-lmtt-10x-x-109">\index</span><a - id="dx1-28043"></a>, the characters <span class="obeylines-h"><span class="verb"><span + id="dx1-37047"></a>, the characters <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">(</span></span></span> and <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">)</span></span></span> can also be used to specify the beginning and ending of a number range. Again as with <span class="ec-lmtt-10x-x-109">\index</span><a - id="dx1-28044"></a>, the command should be the name of a command which + id="dx1-37048"></a>, the command should be the name of a command which takes an argument (which will be the associated location). Be careful not to use a declaration (such as <span class="ec-lmtt-10x-x-109">bfseries</span>) instead @@ -6266,152 +8039,152 @@ class="ec-lmri-10x-x-109">italic</span>) you - <div class="verbatim" id="verbatim-70"> + <div class="verbatim" id="verbatim-83"> \newcommand*{\textbfem}[1]{\textbf{\emph{#1}}} </div> - <!--l. 2687--><p class="nopar" > and use that command. - </p><!--l. 2690--><p class="noindent" >In this document, the standard formats refer to the standard text + <!--l. 3428--><p class="nopar" > and use that command. + </p><!--l. 3431--><p class="noindent" >In this document, the standard formats refer to the standard text block commands such as <span class="ec-lmtt-10x-x-109">\textbf</span><a - id="dx1-28045"></a> or <span + id="dx1-37049"></a> or <span class="ec-lmtt-10x-x-109">\emph</span><a - id="dx1-28046"></a> or any of the commands + id="dx1-37050"></a> or any of the commands listed in <a -href="#x1-280601">table 6.1</a>. - </p><!--l. 2694--><p class="noindent" ><div class="important" title="Important Note"> If you use <a - id="dx1-28047"></a><a +href="#x1-370641">table 6.1</a>. + </p><!--l. 3435--><p class="noindent" ><div class="important" title="Important Note"> If you use <a + id="dx1-37051"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-28048"></a></a> instead of <a - id="dx1-28049"></a><a + id="dx1-37052"></a></a> instead of <a + id="dx1-37053"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-28050"></a></a>, you must specify any + id="dx1-37054"></a></a>, you must specify any non-standard formats that you want to use with the <span class="ec-lmss-10x-x-109">format</span><a - id="dx1-28051"></a> key using + id="dx1-37055"></a> key using <span class="ec-lmtt-10x-x-109">\GlsAddXdyAttribute</span><a - id="dx1-28052"></a><span + id="dx1-37056"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span>. So if you use <a - id="dx1-28053"></a><span + id="dx1-37057"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-28054"></a> with the above + id="dx1-37058"></a> with the above example, you would need to add: </p> - <div class="verbatim" id="verbatim-71"> + <div class="verbatim" id="verbatim-84"> \GlsAddXdyAttribute{textbfem} </div> - <!--l. 2702--><p class="nopar" > See <a -href="#x1-3600011">§11 </a><a -href="#x1-3600011">Xindy<!--tex4ht:ref: sec:xindy --></a> for further details. </div> - </p><!--l. 2704--><p class="noindent" > - </p><!--l. 2706--><p class="noindent" >Note that unlike <span + <!--l. 3443--><p class="nopar" > See <a +href="#sec:xindy">§11 </a><a +href="#sec:xindy">Xindy<!--tex4ht:ref: sec:xindy --></a> for further details. </div> + </p><!--l. 3445--><p class="noindent" > + </p><!--l. 3447--><p class="noindent" >Note that unlike <span class="ec-lmtt-10x-x-109">\index</span><a - id="dx1-28055"></a>, you can’t have anything following the + id="dx1-37059"></a>, you can’t have anything following the command name, such as an asterisk or arguments. If you want to cross-reference another entry, either use the <span class="ec-lmss-10x-x-109">see</span><a - id="dx1-28056"></a> key when you define + id="dx1-37060"></a> key when you define the entry or use <span class="ec-lmtt-10x-x-109">\glssee</span><a - id="dx1-28057"></a> (described in <a -href="#x1-320008">§8 </a><a -href="#x1-320008">Cross-Referencing + id="dx1-37061"></a> (described in <a +href="#sec:crossref">§8 </a><a +href="#sec:crossref">Cross-Referencing Entries<!--tex4ht:ref: sec:crossref --></a>). - </p><!--l. 2713--><p class="noindent" >If you are using hyperlinks and you want to change the font of the + </p><!--l. 3454--><p class="noindent" >If you are using hyperlinks and you want to change the font of the hyperlinked location, don’t use <span class="ec-lmtt-10x-x-109">\hyperpage</span><a - id="dx1-28058"></a> (provided by the <span + id="dx1-37062"></a> (provided by the <span class="ec-lmss-10x-x-109">hyperref</span><a - id="dx1-28059"></a> + id="dx1-37063"></a> package) as the locations may not refer to a page number. Instead, the <span class="ec-lmss-10x-x-109">glossaries </span>package provides number formats listed in <a -href="#x1-280601">table 6.1</a>. - </p><!--l. 2719--><p class="noindent" ><a - id="x1-280601"></a></p><hr class="float" /><div class="float" +href="#x1-370641">table 6.1</a>. + </p><!--l. 3460--><p class="noindent" ><a + id="x1-370641"></a></p><hr class="float" /><div class="float" > <div class="caption"><table class="caption" ><tr style="vertical-align:baseline;" class="caption"><td class="id">Table 6.1: </td><td -class="content">Predefined Hyperlinked Location Formats</td></tr></table></div><!--tex4ht:label?: x1-280601 --> -<div class="tabular"> <table id="TBL-5" class="tabular" +class="content">Predefined Hyperlinked Location Formats</td></tr></table></div><!--tex4ht:label?: x1-370641 --> +<div class="tabular"> <table id="TBL-6" class="tabular" cellspacing="0" cellpadding="0" -><colgroup id="TBL-5-1g"><col -id="TBL-5-1" /><col -id="TBL-5-2" /></colgroup><tr - style="vertical-align:baseline;" id="TBL-5-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-1-1" +><colgroup id="TBL-6-1g"><col +id="TBL-6-1" /><col +id="TBL-6-2" /></colgroup><tr + style="vertical-align:baseline;" id="TBL-6-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-1-1" class="td11"> <span class="ec-lmtt-10x-x-109">hyperrm</span><a - id="dx1-28061"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-1-2" + id="dx1-37065"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-1-2" class="td11"> serif hyperlink </td> </tr><tr - style="vertical-align:baseline;" id="TBL-5-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-2-1" + style="vertical-align:baseline;" id="TBL-6-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-2-1" class="td11"> <span class="ec-lmtt-10x-x-109">hypersf</span><a - id="dx1-28062"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-2-2" + id="dx1-37066"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-2-2" class="td11"> sans-serif hyperlink </td> </tr><tr - style="vertical-align:baseline;" id="TBL-5-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-3-1" + style="vertical-align:baseline;" id="TBL-6-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-3-1" class="td11"> <span class="ec-lmtt-10x-x-109">hypertt</span><a - id="dx1-28063"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-3-2" + id="dx1-37067"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-3-2" class="td11"> monospaced hyperlink </td> </tr><tr - style="vertical-align:baseline;" id="TBL-5-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-4-1" + style="vertical-align:baseline;" id="TBL-6-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-4-1" class="td11"> <span class="ec-lmtt-10x-x-109">hyperbf</span><a - id="dx1-28064"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-4-2" + id="dx1-37068"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-4-2" class="td11"> bold hyperlink </td> </tr><tr - style="vertical-align:baseline;" id="TBL-5-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-5-1" + style="vertical-align:baseline;" id="TBL-6-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-5-1" class="td11"> <span class="ec-lmtt-10x-x-109">hypermd</span><a - id="dx1-28065"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-5-2" + id="dx1-37069"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-5-2" class="td11"> medium weight hyperlink </td> </tr><tr - style="vertical-align:baseline;" id="TBL-5-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-6-1" + style="vertical-align:baseline;" id="TBL-6-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-6-1" class="td11"> <span class="ec-lmtt-10x-x-109">hyperit</span><a - id="dx1-28066"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-6-2" + id="dx1-37070"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-6-2" class="td11"> italic hyperlink </td> </tr><tr - style="vertical-align:baseline;" id="TBL-5-7-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-7-1" + style="vertical-align:baseline;" id="TBL-6-7-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-7-1" class="td11"> <span class="ec-lmtt-10x-x-109">hypersl</span><a - id="dx1-28067"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-7-2" + id="dx1-37071"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-7-2" class="td11"> slanted hyperlink </td> </tr><tr - style="vertical-align:baseline;" id="TBL-5-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-8-1" + style="vertical-align:baseline;" id="TBL-6-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-8-1" class="td11"> <span class="ec-lmtt-10x-x-109">hyperup</span><a - id="dx1-28068"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-8-2" + id="dx1-37072"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-8-2" class="td11"> upright hyperlink </td> </tr><tr - style="vertical-align:baseline;" id="TBL-5-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-9-1" + style="vertical-align:baseline;" id="TBL-6-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-9-1" class="td11"> <span class="ec-lmtt-10x-x-109">hypersc</span><a - id="dx1-28069"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-9-2" + id="dx1-37073"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-9-2" class="td11"> small caps hyperlink </td> </tr><tr - style="vertical-align:baseline;" id="TBL-5-10-"><td style="white-space:nowrap; text-align:left;" id="TBL-5-10-1" + style="vertical-align:baseline;" id="TBL-6-10-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-10-1" class="td11"> <span class="ec-lmtt-10x-x-109">hyperemph</span><a - id="dx1-28070"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-5-10-2" + id="dx1-37074"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-10-2" class="td11"> emphasized hyperlink </td></tr></table> </div> </div><hr class="endfloat" /> - <!--l. 2739--><p class="noindent" >Note that if the <span + <!--l. 3480--><p class="noindent" >Note that if the <span class="ec-lmtt-10x-x-109">\hyperlink</span><a - id="dx1-28071"></a> command hasn’t been defined, the + id="dx1-37075"></a> command hasn’t been defined, the <span class="ec-lmtt-10x-x-109">hyper</span><span class="lmsy-10x-x-109">⟨</span><span @@ -6429,85 +8202,84 @@ class="ec-lmtt-10x-x-109">emph</span>). If you want to number to be in a bold sans-serif font, you can define a command called, say, <span class="ec-lmtt-10x-x-109">\hyperbsf</span><a - id="dx1-28072"></a>: + id="dx1-37076"></a>: </p> - <div class="verbatim" id="verbatim-72"> + <div class="verbatim" id="verbatim-85"> \newcommand{\hyperbsf}[1]{\textbf{\hypersf{#1}}} </div> - <!--l. 2749--><p class="nopar" > and then use <span + <!--l. 3490--><p class="nopar" > and then use <span class="ec-lmtt-10x-x-109">hyperbsf </span>as the value for the <span class="ec-lmss-10x-x-109">format</span><a - id="dx1-28073"></a> key. (See + id="dx1-37077"></a> key. (See also “Displaying the glossary” in the documented code, <span class="ec-lmtt-10x-x-109">glossaries-code.pdf</span>.) Remember that if you use <a - id="dx1-28074"></a><a + id="dx1-37078"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-28075"></a></a>, you will + id="dx1-37079"></a></a>, you will need to add this to the list of location attributes: </p> - <div class="verbatim" id="verbatim-73"> + <div class="verbatim" id="verbatim-86"> \GlsAddXdyAttribute{hyperbsf} </div> - <!--l. 2757--><p class="nopar" > + <!--l. 3498--><p class="nopar" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">counter</span><a - id="dx1-28076"></a> </dt><dd + id="dx1-37080"></a> </dt><dd class="description">This specifies which counter to use for this location. This overrides the default counter used by this entry. (See also <a -href="#x1-270005">§5 </a><a -href="#x1-270005">Number +href="#sec:numberlists">§5 </a><a +href="#sec:numberlists">Number lists<!--tex4ht:ref: sec:numberlists --></a>.) </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">hyper</span><a - id="dx1-28077"></a> </dt><dd + id="dx1-37081"></a> </dt><dd class="description">This is a boolean key which can be used to enable/disable the hyperlink to the relevant entry in the glossary. (Note that setting <span class="ec-lmtt-10x-x-109">hyper=true </span>will have no effect if <span class="ec-lmtt-10x-x-109">\hyperlink</span><a - id="dx1-28078"></a> has not been defined.) + id="dx1-37082"></a> has not been defined.) The default value is <span class="ec-lmtt-10x-x-109">hyper=true</span>, unless the entry belongs to a glossary that either has been listed in the package option <span class="ec-lmss-10x-x-109">nohypertypes</span><a - id="dx1-28079"></a> or has been identified using <span + id="dx1-37083"></a> or has been identified using <span class="ec-lmtt-10x-x-109">\GlsDeclareNoHyperList</span><a - id="dx1-28080"></a> + id="dx1-37084"></a> in which case the default is <span class="ec-lmtt-10x-x-109">hyper=false</span>. </dd><dt class="description"> <span -class="ec-lmssbx-10x-x-109">glslink</span><a - id="dx1-28081"></a><span -class="ec-lmssbx-10x-x-109">local</span> </dt><dd -class="description">This is a boolean key that only makes a different when used - with commands that change the entry’s <a - id="dx1-28082"></a><a +class="ec-lmssbx-10x-x-109">local</span><a + id="dx1-37085"></a> </dt><dd +class="description">This is a boolean key that only makes a different when used with + commands that change the entry’s <a + id="dx1-37086"></a><a href="#glo:firstuseflag">first use flag</a> (such as <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-28083"></a>). - If <span + id="dx1-37087"></a>). If + <span class="ec-lmtt-10x-x-109">local=true</span>, the change to the <a - id="dx1-28084"></a>first use flag will be localised to the + id="dx1-37088"></a>first use flag will be localised to the current scope. The default is <span class="ec-lmtt-10x-x-109">local=false</span>. </dd></dl> -<!--l. 2780--><p class="noindent" >There is also a starred version: -</p><!--l. 2781--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 3521--><p class="noindent" >There is also a starred version: +</p><!--l. 3522--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glslink*</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28085"></a> <span + id="dx1-37089"></a> <span class="ec-lmtt-10x-x-109">\glslink*[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -6521,13 +8293,13 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 2783--><p class="noindent" > +</p><!--l. 3524--><p class="noindent" > which is equivalent to <span class="ec-lmtt-10x-x-109">\glslink</span>, except it sets <span class="ec-lmtt-10x-x-109">hyper=false</span>. Similarly, all the following commands described in this section also have a starred version that disables the hyperlink. -</p><!--l. 2789--><p class="indent" > <div class="important" title="Important Note"> Don’t use commands like <span +</p><!--l. 3530--><p class="indent" > <div class="important" title="Important Note"> Don’t use commands like <span class="ec-lmtt-10x-x-109">\glslink </span>or <span class="ec-lmtt-10x-x-109">\gls </span>in the <span class="lmsy-10x-x-109">⟨</span><span @@ -6535,12 +8307,12 @@ class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩ </span>argument of <span class="ec-lmtt-10x-x-109">\glslink</span>. </div> -</p><!--l. 2792--><p class="noindent" > -</p><!--l. 2794--><p class="indent" > The command: -</p><!--l. 2795--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3533--><p class="noindent" > +</p><!--l. 3535--><p class="indent" > The command: +</p><!--l. 3536--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\gls</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28086"></a> <span + id="dx1-37090"></a> <span class="ec-lmtt-10x-x-109">\gls[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -6554,39 +8326,39 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2797--><p class="noindent" > +</p><!--l. 3538--><p class="noindent" > is the same as <span class="ec-lmtt-10x-x-109">\glslink</span>, except that the <a - id="dx1-28087"></a><a + id="dx1-37091"></a><a href="#glo:linktext">link text<a - id="dx1-28088"></a></a> is determined from the + id="dx1-37092"></a></a> is determined from the values of the <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-28089"></a> and <span + id="dx1-37093"></a> and <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-28090"></a> keys supplied when the entry was defined using + id="dx1-37094"></a> keys supplied when the entry was defined using <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-28091"></a>. If the entry has been marked as having been used<a - id="dx1-28092"></a>, + id="dx1-37095"></a>. If the entry has been marked as having been used<a + id="dx1-37096"></a>, the value of the <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-28093"></a> key will be used, otherwise the value of the <span + id="dx1-37097"></a> key will be used, otherwise the value of the <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-28094"></a> key + id="dx1-37098"></a> key will be used. On completion, <span class="ec-lmtt-10x-x-109">\gls </span>will mark the entry’s <a - id="dx1-28095"></a><a + id="dx1-37099"></a><a href="#glo:firstuseflag">first use flag</a> as used. -</p><!--l. 2807--><p class="indent" > There are two uppercase variants: -</p><!--l. 2808--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3548--><p class="indent" > There are two uppercase variants: +</p><!--l. 3549--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Gls</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28096"></a> <span + id="dx1-37100"></a> <span class="ec-lmtt-10x-x-109">\Gls[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -6600,12 +8372,12 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2810--><p class="noindent" > +</p><!--l. 3551--><p class="noindent" > and -</p><!--l. 2812--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3553--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLS</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28097"></a> <span + id="dx1-37101"></a> <span class="ec-lmtt-10x-x-109">\GLS[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -6619,10 +8391,10 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2814--><p class="noindent" > +</p><!--l. 3555--><p class="noindent" > which make the first letter of the link text or all the link text uppercase, respectively. -</p><!--l. 2818--><p class="indent" > The final optional argument <span +</p><!--l. 3559--><p class="indent" > The final optional argument <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span>, allows you to insert some @@ -6631,20 +8403,20 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>at the end of the link text, but this can be changed (see <a -href="#x1-290006.1">§6.1 </a><a -href="#x1-290006.1">Changing the +href="#sec:glsdisplay">§6.1 </a><a +href="#sec:glsdisplay">Changing the format of the link text<!--tex4ht:ref: sec:glsdisplay --></a>). -</p><!--l. 2823--><p class="indent" > The first optional argument <span +</p><!--l. 3564--><p class="indent" > The first optional argument <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span class="lmsy-10x-x-109">⟩ </span>is the same as the optional argument to <span class="ec-lmtt-10x-x-109">\glslink</span><a - id="dx1-28098"></a>. As with <span + id="dx1-37102"></a>. As with <span class="ec-lmtt-10x-x-109">\glslink</span><a - id="dx1-28099"></a>, these commands also have a + id="dx1-37103"></a>, these commands also have a starred version that disable the hyperlink. -</p><!--l. 2827--><p class="indent" > <div class="important" title="Important Note"> Don’t use commands like <span +</p><!--l. 3568--><p class="indent" > <div class="important" title="Important Note"> Don’t use commands like <span class="ec-lmtt-10x-x-109">\glslink </span>or <span class="ec-lmtt-10x-x-109">\gls </span>in the <span class="lmsy-10x-x-109">⟨</span><span @@ -6652,12 +8424,12 @@ class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>argument of <span class="ec-lmtt-10x-x-109">\gls </span>and its variants. </div> -</p><!--l. 2830--><p class="noindent" > -</p><!--l. 2832--><p class="indent" > There are also analogous plural forms: -</p><!--l. 2833--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3571--><p class="noindent" > +</p><!--l. 3573--><p class="indent" > There are also analogous plural forms: +</p><!--l. 3574--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glspl</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28100"></a> <span + id="dx1-37104"></a> <span class="ec-lmtt-10x-x-109">\glspl[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -6671,11 +8443,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2835--><p class="noindent" > -</p><!--l. 2836--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3576--><p class="noindent" > +</p><!--l. 3577--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glspl</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28101"></a> <span + id="dx1-37105"></a> <span class="ec-lmtt-10x-x-109">\Glspl[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -6689,11 +8461,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2838--><p class="noindent" > -</p><!--l. 2839--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3579--><p class="noindent" > +</p><!--l. 3580--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSpl</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28102"></a> <span + id="dx1-37106"></a> <span class="ec-lmtt-10x-x-109">\GLSpl[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -6707,37 +8479,37 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2841--><p class="noindent" > +</p><!--l. 3582--><p class="noindent" > These determine the link text from the <span class="ec-lmss-10x-x-109">plural</span><a - id="dx1-28103"></a> and <span + id="dx1-37107"></a> and <span class="ec-lmss-10x-x-109">firstplural</span><a - id="dx1-28104"></a> keys supplied + id="dx1-37108"></a> keys supplied when the entry was first defined. As before, these commands also have a starred version that disable the hyperlink. -</p><!--l. 2847--><p class="indent" > <div class="important" title="Important Note"> Be careful when you use glossary entries in math mode especially if you +</p><!--l. 3588--><p class="indent" > <div class="important" title="Important Note"> Be careful when you use glossary entries in math mode especially if you are using <span class="ec-lmss-10x-x-109">hyperref</span><a - id="dx1-28105"></a> as it can affect the spacing of subscripts and + id="dx1-37109"></a> as it can affect the spacing of subscripts and superscripts. For example, suppose you have defined the following entry: </p> - <div class="verbatim" id="verbatim-74"> + <div class="verbatim" id="verbatim-87"> \newglossaryentry{Falpha}{name={F_\alpha},  <br />description=sample} </div> -<!--l. 2855--><p class="nopar" > and later you use it in math mode: +<!--l. 3596--><p class="nopar" > and later you use it in math mode: </p> - <div class="verbatim" id="verbatim-75"> + <div class="verbatim" id="verbatim-88"> $\gls{Falpha}^2$ </div> -<!--l. 2859--><p class="nopar" > This will result in <span +<!--l. 3600--><p class="nopar" > This will result in <span class="lmmi-10x-x-109">F</span><sub><span class="lmmi-8x-x-103">α</span></sub><sup><span class="rm-lmr-8x-x-103">2</span></sup> instead of <span @@ -6753,28 +8525,28 @@ argument: </p> - <div class="verbatim" id="verbatim-76"> + <div class="verbatim" id="verbatim-89"> $\gls{Falpha}[^2]$ </div> -<!--l. 2865--><p class="nopar" > </div> -</p><!--l. 2866--><p class="noindent" > -</p><!--l. 2868--><p class="indent" > Note that <span +<!--l. 3606--><p class="nopar" > </div> +</p><!--l. 3607--><p class="noindent" > +</p><!--l. 3609--><p class="indent" > Note that <span class="ec-lmtt-10x-x-109">\glslink</span><a - id="dx1-28106"></a> doesn’t use or affect the <a - id="dx1-28107"></a><a + id="dx1-37110"></a> doesn’t use or affect the <a + id="dx1-37111"></a><a href="#glo:firstuseflag">first use flag</a>, nor does it use <span class="ec-lmtt-10x-x-109">\glsdisplay</span><a - id="dx1-28108"></a> or <span + id="dx1-37112"></a> or <span class="ec-lmtt-10x-x-109">\glsdisplayfirst</span><a - id="dx1-28109"></a> (see <a -href="#x1-290006.1">§6.1 </a><a -href="#x1-290006.1">Changing the format of + id="dx1-37113"></a> (see <a +href="#sec:glsdisplay">§6.1 </a><a +href="#sec:glsdisplay">Changing the format of the link text<!--tex4ht:ref: sec:glsdisplay --></a>). Instead, you can use: -</p><!--l. 2871--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3612--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsdisp</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28110"></a> <span + id="dx1-37114"></a> <span class="ec-lmtt-10x-x-109">\glsdisp[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -6788,34 +8560,34 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">link text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 2873--><p class="noindent" > +</p><!--l. 3614--><p class="noindent" > This behaves in the same way as <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-28111"></a>, except that it uses <span + id="dx1-37115"></a>, except that it uses <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">link text</span><span class="lmsy-10x-x-109">⟩</span> instead of the value of the <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-28112"></a> or <span + id="dx1-37116"></a> or <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-28113"></a> key. (Note that this command always + id="dx1-37117"></a> key. (Note that this command always sets <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>to nothing.) This command affects the <a - id="dx1-28114"></a><a + id="dx1-37118"></a><a href="#glo:firstuseflag">first use flag</a>, and uses <span class="ec-lmtt-10x-x-109">\glsdisplay</span><a - id="dx1-28115"></a> or <span + id="dx1-37119"></a> or <span class="ec-lmtt-10x-x-109">\glsdisplayfirst</span><a - id="dx1-28116"></a>. -</p><!--l. 2880--><p class="indent" > The command: -</p><!--l. 2881--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="dx1-37120"></a>. +</p><!--l. 3621--><p class="indent" > The command: +</p><!--l. 3622--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glstext</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28117"></a> <span + id="dx1-37121"></a> <span class="ec-lmtt-10x-x-109">\glstext[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -6829,14 +8601,14 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2883--><p class="noindent" > +</p><!--l. 3624--><p class="noindent" > is similar to <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-28118"></a> except that it always uses the value of the <span + id="dx1-37122"></a> except that it always uses the value of the <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-28119"></a> key and + id="dx1-37123"></a> key and does not affect the <a - id="dx1-28120"></a><a + id="dx1-37124"></a><a href="#glo:firstuseflag">first use flag</a>. Unlike <span class="ec-lmtt-10x-x-109">\gls</span>, the inserted text <span class="lmsy-10x-x-109">⟨</span><span @@ -6845,16 +8617,16 @@ class="lmsy-10x-x-109">⟩ </span>is always appended to the link text since <span class="ec-lmtt-10x-x-109">\glstext </span>doesn’t use <span class="ec-lmtt-10x-x-109">\glsdisplay</span><a - id="dx1-28121"></a> + id="dx1-37125"></a> or <span class="ec-lmtt-10x-x-109">\glsdisplayfirst</span><a - id="dx1-28122"></a>. (The same is true for all the following commands + id="dx1-37126"></a>. (The same is true for all the following commands described in this section.) -</p><!--l. 2892--><p class="indent" > There are also analogous commands: -</p><!--l. 2893--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3633--><p class="indent" > There are also analogous commands: +</p><!--l. 3634--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glstext</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28123"></a> <span + id="dx1-37127"></a> <span class="ec-lmtt-10x-x-109">\Glstext[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -6868,11 +8640,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2895--><p class="noindent" > -</p><!--l. 2896--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3636--><p class="noindent" > +</p><!--l. 3637--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLStext</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28124"></a> <span + id="dx1-37128"></a> <span class="ec-lmtt-10x-x-109">\GLStext[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -6886,14 +8658,24 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2898--><p class="noindent" > +</p><!--l. 3639--><p class="noindent" > As before, these commands also have a starred version that disable the hyperlink. -</p><!--l. 2902--><p class="indent" > The command: -</p><!--l. 2903--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3643--><p class="indent" > <div class="important" title="Important Note"> When used with acronyms, these commands don’t use <span +class="ec-lmtt-10x-x-109">\acronymfont</span><a + id="dx1-37129"></a>. +For example, if you use the <span +class="ec-lmss-10x-x-109">smallcaps</span><a + id="dx1-37130"></a> package option, <span +class="ec-lmtt-10x-x-109">\gls </span>will use small +caps but <span +class="ec-lmtt-10x-x-109">\glstext </span>won’t. </div> +</p><!--l. 3647--><p class="noindent" > +</p><!--l. 3649--><p class="indent" > The command: +</p><!--l. 3650--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsfirst</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28125"></a> <span + id="dx1-37131"></a> <span class="ec-lmtt-10x-x-109">\glsfirst[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -6907,23 +8689,26 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2905--><p class="noindent" > +</p><!--l. 3652--><p class="noindent" > is similar to <span class="ec-lmtt-10x-x-109">\glstext </span>except that it always uses the value of the <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-28126"></a> key. + id="dx1-37132"></a> key. Again, <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>is always appended to the end of the link text and does not + + + affect the <a - id="dx1-28127"></a><a + id="dx1-37133"></a><a href="#glo:firstuseflag">first use flag</a>. -</p><!--l. 2911--><p class="indent" > There are also analogous commands: -</p><!--l. 2912--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3658--><p class="indent" > There are also analogous commands: +</p><!--l. 3659--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsfirst</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28128"></a> <span + id="dx1-37134"></a> <span class="ec-lmtt-10x-x-109">\Glsfirst[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -6937,14 +8722,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2914--><p class="noindent" > - - - -</p><!--l. 2915--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3661--><p class="noindent" > +</p><!--l. 3662--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSfirst</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28129"></a> <span + id="dx1-37135"></a> <span class="ec-lmtt-10x-x-109">\GLSfirst[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -6958,14 +8740,14 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2917--><p class="noindent" > +</p><!--l. 3664--><p class="noindent" > As before, these commands also have a starred version that disable the hyperlink. -</p><!--l. 2921--><p class="indent" > The command: -</p><!--l. 2922--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3668--><p class="indent" > The command: +</p><!--l. 3669--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsplural</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28130"></a> <span + id="dx1-37136"></a> <span class="ec-lmtt-10x-x-109">\glsplural[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -6979,22 +8761,22 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2924--><p class="noindent" > +</p><!--l. 3671--><p class="noindent" > is similar to <span class="ec-lmtt-10x-x-109">\glstext</span><a - id="dx1-28131"></a> except that it always uses the value of the <span + id="dx1-37137"></a> except that it always uses the value of the <span class="ec-lmss-10x-x-109">plural</span><a - id="dx1-28132"></a> key. + id="dx1-37138"></a> key. Again, <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>is always appended to the end of the link text and does not mark the entry as having been used. -</p><!--l. 2930--><p class="indent" > There are also analogous commands: -</p><!--l. 2931--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3677--><p class="indent" > There are also analogous commands: +</p><!--l. 3678--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsplural</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28133"></a> <span + id="dx1-37139"></a> <span class="ec-lmtt-10x-x-109">\Glsplural[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7008,11 +8790,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2933--><p class="noindent" > -</p><!--l. 2934--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3680--><p class="noindent" > +</p><!--l. 3681--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSplural</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28134"></a> <span + id="dx1-37140"></a> <span class="ec-lmtt-10x-x-109">\GLSplural[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7026,14 +8808,24 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2936--><p class="noindent" > +</p><!--l. 3683--><p class="noindent" > As before, these commands also have a starred version that disable the hyperlink. -</p><!--l. 2940--><p class="indent" > The command: -</p><!--l. 2941--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3687--><p class="indent" > <div class="important" title="Important Note"> When used with acronyms, these commands don’t use <span +class="ec-lmtt-10x-x-109">\acronymfont</span><a + id="dx1-37141"></a>. +For example, if you use the <span +class="ec-lmss-10x-x-109">smallcaps</span><a + id="dx1-37142"></a> package option, <span +class="ec-lmtt-10x-x-109">\glspl </span>will use small +caps but <span +class="ec-lmtt-10x-x-109">\glsplural </span>won’t. </div> +</p><!--l. 3691--><p class="noindent" > +</p><!--l. 3693--><p class="indent" > The command: +</p><!--l. 3694--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsfirstplural</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28135"></a> <span + id="dx1-37143"></a> <span class="ec-lmtt-10x-x-109">\glsfirstplural[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7048,22 +8840,22 @@ class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">]</span> </div><hr> -</p><!--l. 2943--><p class="noindent" > +</p><!--l. 3696--><p class="noindent" > is similar to <span class="ec-lmtt-10x-x-109">\glstext</span><a - id="dx1-28136"></a> except that it always uses the value of the <span + id="dx1-37144"></a> except that it always uses the value of the <span class="ec-lmss-10x-x-109">firstplural</span><a - id="dx1-28137"></a> + id="dx1-37145"></a> key. Again, <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>is always appended to the end of the link text and does not mark the entry as having been used. -</p><!--l. 2949--><p class="indent" > There are also analogous commands: -</p><!--l. 2950--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3702--><p class="indent" > There are also analogous commands: +</p><!--l. 3703--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsfirstplural</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28138"></a> <span + id="dx1-37146"></a> <span class="ec-lmtt-10x-x-109">\Glsfirstplural[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7078,11 +8870,11 @@ class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">]</span> </div><hr> -</p><!--l. 2952--><p class="noindent" > -</p><!--l. 2953--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3705--><p class="noindent" > +</p><!--l. 3706--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSfirstplural</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28139"></a> <span + id="dx1-37147"></a> <span class="ec-lmtt-10x-x-109">\GLSfirstplural[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7097,14 +8889,17 @@ class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">]</span> </div><hr> -</p><!--l. 2955--><p class="noindent" > +</p><!--l. 3708--><p class="noindent" > + + + As before, these commands also have a starred version that disable the hyperlink. -</p><!--l. 2959--><p class="indent" > The command: -</p><!--l. 2960--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3712--><p class="indent" > The command: +</p><!--l. 3713--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsname</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28140"></a> <span + id="dx1-37148"></a> <span class="ec-lmtt-10x-x-109">\glsname[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7118,35 +8913,22 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2962--><p class="noindent" > +</p><!--l. 3715--><p class="noindent" > is similar to <span class="ec-lmtt-10x-x-109">\glstext</span><a - id="dx1-28141"></a> except that it always uses the value of the <span + id="dx1-37149"></a> except that it always uses the value of the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-28142"></a> key. + id="dx1-37150"></a> key. Again, <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span -class="lmsy-10x-x-109">⟩ </span>is always appended to the end of the link text and -does not mark the entry as having been used. Note: if you want to -use this command and the <span -class="ec-lmss-10x-x-109">name</span><a - id="dx1-28143"></a> key contains commands, you will -have to disable the <a - id="dx1-28144"></a><a -href="#glo:sanitize">sanitization<a - id="dx1-28145"></a></a> of the <span -class="ec-lmss-10x-x-109">name</span><a - id="dx1-28146"></a> key and protect fragile - - - -commands. -</p><!--l. 2971--><p class="indent" > There are also analogous commands: -</p><!--l. 2972--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="lmsy-10x-x-109">⟩ </span>is always appended to the end of the link text and does not +mark the entry as having been used. +</p><!--l. 3721--><p class="indent" > There are also analogous commands: +</p><!--l. 3722--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsname</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28147"></a> <span + id="dx1-37151"></a> <span class="ec-lmtt-10x-x-109">\Glsname[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7160,11 +8942,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2974--><p class="noindent" > -</p><!--l. 2975--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3724--><p class="noindent" > +</p><!--l. 3725--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSname</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28148"></a> <span + id="dx1-37152"></a> <span class="ec-lmtt-10x-x-109">\GLSname[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7178,14 +8960,14 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2977--><p class="noindent" > +</p><!--l. 3727--><p class="noindent" > As before, these commands also have a starred version that disable the hyperlink. -</p><!--l. 2981--><p class="indent" > The command: -</p><!--l. 2982--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3731--><p class="indent" > The command: +</p><!--l. 3732--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glssymbol</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28149"></a> <span + id="dx1-37153"></a> <span class="ec-lmtt-10x-x-109">\glssymbol[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7199,32 +8981,22 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2984--><p class="noindent" > +</p><!--l. 3734--><p class="noindent" > is similar to <span class="ec-lmtt-10x-x-109">\glstext</span><a - id="dx1-28150"></a> except that it always uses the value of the <span + id="dx1-37154"></a> except that it always uses the value of the <span class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-28151"></a> + id="dx1-37155"></a> key. Again, <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>is always appended to the end of the link text and does -not mark the entry as having been used. Note: if you want to use this -command and the <span -class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-28152"></a> key contains commands, you will have -to disable the <a - id="dx1-28153"></a><a -href="#glo:sanitize">sanitization<a - id="dx1-28154"></a></a> of the <span -class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-28155"></a> key and protect fragile -commands. -</p><!--l. 2993--><p class="indent" > There are also analogous commands: -</p><!--l. 2994--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +not mark the entry as having been used. +</p><!--l. 3740--><p class="indent" > There are also analogous commands: +</p><!--l. 3741--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glssymbol</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28156"></a> <span + id="dx1-37156"></a> <span class="ec-lmtt-10x-x-109">\Glssymbol[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7238,11 +9010,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2996--><p class="noindent" > -</p><!--l. 2997--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3743--><p class="noindent" > +</p><!--l. 3744--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSsymbol</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28157"></a> <span + id="dx1-37157"></a> <span class="ec-lmtt-10x-x-109">\GLSsymbol[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7256,14 +9028,14 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 2999--><p class="noindent" > +</p><!--l. 3746--><p class="noindent" > As before, these commands also have a starred version that disable the hyperlink. -</p><!--l. 3003--><p class="indent" > The command: -</p><!--l. 3004--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3750--><p class="indent" > The command: +</p><!--l. 3751--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsdesc</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28158"></a> <span + id="dx1-37158"></a> <span class="ec-lmtt-10x-x-109">\glsdesc[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7277,32 +9049,22 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3006--><p class="noindent" > +</p><!--l. 3753--><p class="noindent" > is similar to <span class="ec-lmtt-10x-x-109">\glstext</span><a - id="dx1-28159"></a> except that it always uses the value of the + id="dx1-37159"></a> except that it always uses the value of the <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-28160"></a> key. Again, <span + id="dx1-37160"></a> key. Again, <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>is always appended to the end of the link -text and does not mark the entry as having been used. Note: if you want to -use this command and the <span -class="ec-lmss-10x-x-109">description</span><a - id="dx1-28161"></a> key contains commands, you will -have to disable the <a - id="dx1-28162"></a><a -href="#glo:sanitize">sanitization<a - id="dx1-28163"></a></a> of the <span -class="ec-lmss-10x-x-109">description</span><a - id="dx1-28164"></a> key and protect fragile -commands. -</p><!--l. 3015--><p class="indent" > There are also analogous commands: -</p><!--l. 3016--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +text and does not mark the entry as having been used. +</p><!--l. 3759--><p class="indent" > There are also analogous commands: +</p><!--l. 3760--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsdesc</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28165"></a> <span + id="dx1-37161"></a> <span class="ec-lmtt-10x-x-109">\Glsdesc[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7316,11 +9078,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3018--><p class="noindent" > -</p><!--l. 3019--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3762--><p class="noindent" > +</p><!--l. 3763--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSdesc</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28166"></a> <span + id="dx1-37162"></a> <span class="ec-lmtt-10x-x-109">\GLSdesc[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7334,17 +9096,17 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3021--><p class="noindent" > +</p><!--l. 3765--><p class="noindent" > As before, these commands also have a starred version that disable the -hyperlink. -</p><!--l. 3025--><p class="indent" > The command: -</p><!--l. 3026--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +hyperlink. +</p><!--l. 3769--><p class="indent" > The command: +</p><!--l. 3770--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsuseri</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28167"></a> <span + id="dx1-37163"></a> <span class="ec-lmtt-10x-x-109">\glsuseri[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7358,22 +9120,22 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3028--><p class="noindent" > +</p><!--l. 3772--><p class="noindent" > is similar to <span class="ec-lmtt-10x-x-109">\glstext</span><a - id="dx1-28168"></a> except that it always uses the value of the <span + id="dx1-37164"></a> except that it always uses the value of the <span class="ec-lmss-10x-x-109">user1</span><a - id="dx1-28169"></a> key. + id="dx1-37165"></a> key. Again, <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>is always appended to the end of the link text and does not mark the entry as having been used. -</p><!--l. 3034--><p class="indent" > There are also analogous commands: -</p><!--l. 3035--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3778--><p class="indent" > There are also analogous commands: +</p><!--l. 3779--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsuseri</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28170"></a> <span + id="dx1-37166"></a> <span class="ec-lmtt-10x-x-109">\Glsuseri[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7387,11 +9149,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3037--><p class="noindent" > -</p><!--l. 3038--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3781--><p class="noindent" > +</p><!--l. 3782--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSuseri</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28171"></a> <span + id="dx1-37167"></a> <span class="ec-lmtt-10x-x-109">\GLSuseri[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7405,13 +9167,13 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3040--><p class="noindent" > +</p><!--l. 3784--><p class="noindent" > As before, these commands also have a starred version that disable the hyperlink. Similarly for the other user keys: -</p><!--l. 3043--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3787--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsuserii</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28172"></a> <span + id="dx1-37168"></a> <span class="ec-lmtt-10x-x-109">\glsuserii[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7425,11 +9187,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3045--><p class="noindent" > -</p><!--l. 3046--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3789--><p class="noindent" > +</p><!--l. 3790--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsuserii</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28173"></a> <span + id="dx1-37169"></a> <span class="ec-lmtt-10x-x-109">\Glsuserii[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7443,11 +9205,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3048--><p class="noindent" > -</p><!--l. 3049--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3792--><p class="noindent" > +</p><!--l. 3793--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSuserii</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28174"></a> <span + id="dx1-37170"></a> <span class="ec-lmtt-10x-x-109">\GLSuserii[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7461,11 +9223,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3051--><p class="noindent" > -</p><!--l. 3052--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3795--><p class="noindent" > +</p><!--l. 3796--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsuseriii</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28175"></a> <span + id="dx1-37171"></a> <span class="ec-lmtt-10x-x-109">\glsuseriii[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7479,11 +9241,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3054--><p class="noindent" > -</p><!--l. 3055--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3798--><p class="noindent" > +</p><!--l. 3799--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsuseriii</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28176"></a> <span + id="dx1-37172"></a> <span class="ec-lmtt-10x-x-109">\Glsuseriii[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7497,11 +9259,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3057--><p class="noindent" > -</p><!--l. 3058--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3801--><p class="noindent" > +</p><!--l. 3802--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSuseriii</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28177"></a> <span + id="dx1-37173"></a> <span class="ec-lmtt-10x-x-109">\GLSuseriii[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7515,11 +9277,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3060--><p class="noindent" > -</p><!--l. 3061--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3804--><p class="noindent" > +</p><!--l. 3805--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsuseriv</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28178"></a> <span + id="dx1-37174"></a> <span class="ec-lmtt-10x-x-109">\glsuseriv[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7533,11 +9295,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3063--><p class="noindent" > -</p><!--l. 3064--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3807--><p class="noindent" > +</p><!--l. 3808--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsuseriv</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28179"></a> <span + id="dx1-37175"></a> <span class="ec-lmtt-10x-x-109">\Glsuseriv[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7551,11 +9313,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3066--><p class="noindent" > -</p><!--l. 3067--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3810--><p class="noindent" > +</p><!--l. 3811--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSuseriv</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28180"></a> <span + id="dx1-37176"></a> <span class="ec-lmtt-10x-x-109">\GLSuseriv[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7569,11 +9331,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3069--><p class="noindent" > -</p><!--l. 3070--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3813--><p class="noindent" > +</p><!--l. 3814--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsuserv</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28181"></a> <span + id="dx1-37177"></a> <span class="ec-lmtt-10x-x-109">\glsuserv[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7587,14 +9349,14 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3072--><p class="noindent" > -</p><!--l. 3073--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3816--><p class="noindent" > +</p><!--l. 3817--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsuserv</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28182"></a> <span + id="dx1-37178"></a> <span class="ec-lmtt-10x-x-109">\Glsuserv[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7608,11 +9370,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3075--><p class="noindent" > -</p><!--l. 3076--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3819--><p class="noindent" > +</p><!--l. 3820--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSuserv</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28183"></a> <span + id="dx1-37179"></a> <span class="ec-lmtt-10x-x-109">\GLSuserv[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7626,11 +9388,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3078--><p class="noindent" > -</p><!--l. 3079--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3822--><p class="noindent" > +</p><!--l. 3823--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsuservi</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28184"></a> <span + id="dx1-37180"></a> <span class="ec-lmtt-10x-x-109">\glsuservi[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7644,11 +9406,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3081--><p class="noindent" > -</p><!--l. 3082--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3825--><p class="noindent" > +</p><!--l. 3826--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsuservi</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28185"></a> <span + id="dx1-37181"></a> <span class="ec-lmtt-10x-x-109">\Glsuservi[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7662,11 +9424,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3084--><p class="noindent" > -</p><!--l. 3085--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3828--><p class="noindent" > +</p><!--l. 3829--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GLSuservi</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-28186"></a> <span + id="dx1-37182"></a> <span class="ec-lmtt-10x-x-109">\GLSuservi[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -7680,228 +9442,257 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3087--><p class="noindent" > +</p><!--l. 3831--><p class="noindent" > </p> <h3 class="sectionHead"><span class="titlemark">6.1</span>  <a - id="x1-290006.1"></a>Changing the format of the link text</h3> -<!--l. 3092--><p class="noindent" >The format of the <a - id="dx1-29001"></a><a + id="sec:glsdisplay"></a>Changing the format of the link text</h3> +<!--l. 3836--><p class="noindent" >The format of the <a + id="dx1-38001"></a><a href="#glo:linktext">link text<a - id="dx1-29002"></a></a> for <span + id="dx1-38002"></a></a> for <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-29003"></a>, <span + id="dx1-38003"></a>, <span class="ec-lmtt-10x-x-109">\glspl</span><a - id="dx1-29004"></a> and their uppercase variants -is governed by two commands: -</p><!--l. 3094--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span -class="ec-lmtt-10">\glsdisplayfirst</span><span + id="dx1-38004"></a> and their +uppercase variants and also for <span +class="ec-lmtt-10x-x-109">\glsdisp</span><a + id="dx1-38005"></a> is governed +by<span class="footnote-mark"><a +href="#fn1x8" id="fn1x8-bk"><sup class="textsuperscript">1</sup></a></span><a + id="x1-38006f1"></a>: +</p><!--l. 3841--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsentryfmt</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-29005"></a> <span -class="ec-lmtt-10x-x-109">\glsdisplayfirst{</span><span -class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">first/first</span> + id="dx1-38010"></a> <span +class="ec-lmtt-10x-x-109">\glsentryfmt </span></div><hr> +</p><!--l. 3843--><p class="noindent" > +If you want to redefine this command, you may use the following +commands within its definition: +</p><!--l. 3847--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glslabel</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-38011"></a> <span +class="ec-lmtt-10x-x-109">\glslabel </span></div><hr> +</p><!--l. 3849--><p class="noindent" > +This is the label of the entry being referenced. +</p><!--l. 3852--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glscustomtext</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-38012"></a> <span +class="ec-lmtt-10x-x-109">\glscustomtext </span></div><hr> +</p><!--l. 3854--><p class="noindent" > +This is the custom text supplied in <span +class="ec-lmtt-10x-x-109">\glsdisp</span>. It’s always empty for <span +class="ec-lmtt-10x-x-109">\gls</span><a + id="dx1-38013"></a>, <span -class="ec-lmri-10x-x-109">plural</span><span -class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">}{</span><span -class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">description</span><span -class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">}{</span><span +class="ec-lmtt-10x-x-109">\glspl</span><a + id="dx1-38014"></a> and their uppercase variants. (You can use <span +class="ec-lmss-10x-x-109">etoolbox</span><a + id="dx1-38015"></a>’s <span +class="ec-lmtt-10x-x-109">\ifdefempty</span> +to determine if <span +class="ec-lmtt-10x-x-109">\glscustomtext </span>is empty.) +</p><!--l. 3860--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsinsert</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-38016"></a> <span +class="ec-lmtt-10x-x-109">\glsinsert </span></div><hr> +</p><!--l. 3862--><p class="noindent" > +The custom text supplied in the final optional argument to <span +class="ec-lmtt-10x-x-109">\gls</span>, <span +class="ec-lmtt-10x-x-109">\glspl</span> +and their uppercase variants. +</p><!--l. 3866--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsifplural</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-38017"></a> <span +class="ec-lmtt-10x-x-109">\glsifplural{</span><span class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">symbol</span><span +class="ec-lmri-10x-x-109">true text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}{</span><span class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">insert</span><span +class="ec-lmri-10x-x-109">false text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3096--><p class="noindent" > -which is used the <a - id="dx1-29006"></a><a -href="#glo:firstuse">first time</a> a glossary entry is used in the text and -</p><!--l. 3099--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span -class="ec-lmtt-10">\glsdisplay</span><span -class="ec-lmtt-10"> </span></span><a - id="dx1-29007"></a> <span -class="ec-lmtt-10x-x-109">\glsdisplay{</span><span +</p><!--l. 3868--><p class="noindent" > +If <span +class="ec-lmtt-10x-x-109">\glspl</span>, <span +class="ec-lmtt-10x-x-109">\Glspl </span>or <span +class="ec-lmtt-10x-x-109">\GLSpl </span>was used, this command does <span class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">text/plural</span><span -class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">}{</span><span +class="ec-lmri-10x-x-109">true text</span><span +class="lmsy-10x-x-109">⟩</span> +otherwise it does <span class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">description</span><span +class="ec-lmri-10x-x-109">false text</span><span +class="lmsy-10x-x-109">⟩</span>. + + + +</p><!--l. 3872--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glscapscase</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-38018"></a> <span +class="ec-lmtt-10x-x-109">\glscapscase{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">no case</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}{</span><span class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">symbol</span><span +class="ec-lmri-10x-x-109">first uc</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}{</span><span class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">insert</span><span +class="ec-lmri-10x-x-109">all caps</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 3101--><p class="noindent" > -which is used subsequently. Both commands take four arguments: the first -is either the singular or plural form given by the <span -class="ec-lmss-10x-x-109">text</span><a - id="dx1-29008"></a>, <span -class="ec-lmss-10x-x-109">plural</span><a - id="dx1-29009"></a>, <span -class="ec-lmss-10x-x-109">first</span><a - id="dx1-29010"></a> -or <span -class="ec-lmss-10x-x-109">firstplural</span><a - id="dx1-29011"></a> keys (set when the term was defined) depending on -context; the second argument is the term’s description (as supplied -by the <span -class="ec-lmss-10x-x-109">description</span><a - id="dx1-29012"></a> or <span -class="ec-lmss-10x-x-109">descriptionplural</span><a - id="dx1-29013"></a> keys); the third argument is -the symbol associated with the term (as supplied by the <span -class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-29014"></a> or -<span -class="ec-lmss-10x-x-109">symbolplural</span><a - id="dx1-29015"></a> keys) and the fourth argument is the additional text -supplied in the final optional argument to <span -class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-29016"></a> or <span -class="ec-lmtt-10x-x-109">\glspl</span><a - id="dx1-29017"></a> (or their -uppercase variants). The default definitions of <span -class="ec-lmtt-10x-x-109">\glsdisplay </span>and -<span -class="ec-lmtt-10x-x-109">\glsdisplayfirst </span>simply print the first argument immediately -followed by the fourth argument. The remaining arguments are -ignored. -</p><!--l. 3117--><p class="indent" > <div class="important" title="Important Note"> Care needs to be taken when redefining <span -class="ec-lmtt-10x-x-109">\glsdisplay </span>and -<span -class="ec-lmtt-10x-x-109">\glsdisplayfirst </span>as commands like <span -class="ec-lmtt-10x-x-109">\Gls</span><a - id="dx1-29018"></a> will expand the displayed text -before applying <span -class="ec-lmtt-10x-x-109">\makefirstuc</span><a - id="dx1-29019"></a>. If you want to use formatting commands, - - - -it’s best to define a robust version that deals with all the formatting. For -example, suppose you want the text to appear in bold italic, it’s best to do -something like: - - - -</p> - <div class="verbatim" id="verbatim-77"> -\DeclareRobustCommand{\textbfit}[1]{\emph{\bfseries - <br />#1}} - <br />\renewcommand{\glsdisplay}[4]{\textbfit{#1#4}} -</div> -<!--l. 3128--><p class="nopar" > See the <span -class="ec-lmss-10x-x-109">mfirstuc</span><a - id="dx1-29020"></a> documentation for further details on the limitations of +</p><!--l. 3874--><p class="noindent" > +If <span +class="ec-lmtt-10x-x-109">\gls</span>, <span +class="ec-lmtt-10x-x-109">\glspl </span>or <span +class="ec-lmtt-10x-x-109">\glsdisp </span>were used, this does <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">no case</span><span +class="lmsy-10x-x-109">⟩</span>. If <span +class="ec-lmtt-10x-x-109">\Gls </span>or <span -class="ec-lmtt-10x-x-109">\makefirstuc</span><a - id="dx1-29021"></a>. </div> -</p><!--l. 3131--><p class="noindent" > -</p><!--l. 3133--><p class="indent" > If required, you can access the label for the given entry via -</p><!--l. 3134--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span -class="ec-lmtt-10">\glslabel</span><span +class="ec-lmtt-10x-x-109">\Glspl </span>were used, this does <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">first uc</span><span +class="lmsy-10x-x-109">⟩</span>. If <span +class="ec-lmtt-10x-x-109">\GLS </span>or <span +class="ec-lmtt-10x-x-109">\GLSpl </span>were used, this +does <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">all caps</span><span +class="lmsy-10x-x-109">⟩</span>. +</p><!--l. 3879--><p class="indent" > Note that you can also use commands such as <span +class="ec-lmtt-10x-x-109">\ifglsused</span><a + id="dx1-38019"></a> within the +definition of <span +class="ec-lmtt-10x-x-109">\glsentryfmt </span>(see <a +href="#sec:glsunset">§14 </a><a +href="#sec:glsunset">Unsetting and Resetting Entry +Flags<!--tex4ht:ref: sec:glsunset --></a>). +</p><!--l. 3882--><p class="indent" > If you only want to make minor modifications to <span +class="ec-lmtt-10x-x-109">\glsentryfmt</span>, you can +use +</p><!--l. 3884--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsgenentryfmt</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-29022"></a> <span -class="ec-lmtt-10x-x-109">\glslabel </span></div><hr> -</p><!--l. 3136--><p class="noindent" > -so it is possible to use this label in the definition of <span -class="ec-lmtt-10x-x-109">\glsdisplay </span>or -<span -class="ec-lmtt-10x-x-109">\glsdisplayfirst </span>to supply additional information using any of the -commands described in <a -href="#x1-340009">§9 </a><a -href="#x1-340009">Using Glossary Terms Without Links<!--tex4ht:ref: sec:glsnolink --></a>, if -required. -</p><!--l. 3142--><p class="indent" > Note that <span -class="ec-lmtt-10x-x-109">\glsdisplay </span>and <span -class="ec-lmtt-10x-x-109">\glsdisplayfirst </span>are not used by + id="dx1-38020"></a> <span +class="ec-lmtt-10x-x-109">\glsgenentryfmt </span></div><hr> +</p><!--l. 3886--><p class="noindent" > +This uses the above commands to display just the <span +class="ec-lmss-10x-x-109">first</span><a + id="dx1-38021"></a>, <span +class="ec-lmss-10x-x-109">text</span><a + id="dx1-38022"></a>, <span +class="ec-lmss-10x-x-109">plural</span><a + id="dx1-38023"></a> or <span +class="ec-lmss-10x-x-109">firstplural</span><a + id="dx1-38024"></a> keys (or the custom text) with the insert text appended. +</p><!--l. 3891--><p class="indent" > <div class="important" title="Important Note"> Note that <span +class="ec-lmtt-10x-x-109">\glsentryfmt </span>is not used by <span class="ec-lmtt-10x-x-109">\glslink</span><a - id="dx1-29023"></a>. If you want to supply your own link text, you need to use + id="dx1-38025"></a> or any of the other +commands, such as <span +class="ec-lmtt-10x-x-109">\glstext</span><a + id="dx1-38026"></a>. </div> +</p><!--l. 3894--><p class="noindent" > +<a + id="x1-38027r6"></a> +</p><!--l. 3896--><p class="noindent" ><span +class="ec-lmbx-12">Example 6</span><span +class="ec-lmbx-12"> (Custom Entry Display in Text)</span><a + id="x1-38028"></a> +</p><!--l. 3897--><p class="indent" > Suppose you want a glossary of measurements and units, you can use the <span -class="ec-lmtt-10x-x-109">\glsdisp</span><a - id="dx1-29024"></a> instead. -</p><!--l. 3146--><p class="indent" > For example, suppose you want a glossary of measurements and units, -you can use the <span class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-29025"></a> key to store the unit: + id="dx1-38029"></a> key to store the unit: </p> - <div class="verbatim" id="verbatim-78"> + <div class="verbatim" id="verbatim-90"> \newglossaryentry{distance}{name=distance,  <br />description={The length between two points},  <br />symbol={km}} </div> -<!--l. 3152--><p class="nopar" > and now suppose you want <span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">\gls{distance}</span></span></span> to produce “distance -(km)” on <a - id="dx1-29026"></a><a +<!--l. 3903--><p class="nopar" > and now suppose you want <span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\gls{distance}</span></span></span> to produce “distance (km)” +on <a + id="dx1-38030"></a><a href="#glo:firstuse">first use</a>, then you can redefine <span -class="ec-lmtt-10x-x-109">\glsdisplayfirst </span>as -follows: +class="ec-lmtt-10x-x-109">\glsentryfmt</span><a + id="dx1-38031"></a> as follows: </p> - <div class="verbatim" id="verbatim-79"> -\renewcommand{\glsdisplayfirst}[4]{#1#4 (#3)} + <div class="verbatim" id="verbatim-91"> +\renewcommand*{\glsentryfmt}{% + <br />  \glsgenentryfmt + <br />  \ifglsused{\glslabel}{}{\space (\glsentrysymbol{\glslabel})}% + <br />} </div> -<!--l. 3158--><p class="nopar" > Note that the additional text is placed after <span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">#1</span></span></span>, so <span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">\gls{distance}[’s]</span></span></span> -will produce “distance’s (km)” rather than “distance (km)’s” which looks a -bit odd (even though it may be in the context of “the distance (km) is -measured between the two points” — but in this instance it would be -better not to use a contraction). -</p><!--l. 3166--><p class="indent" > Note also that all of the <a - id="dx1-29027"></a><a +<!--l. 3912--><p class="nopar" > +</p><!--l. 3914--><p class="indent" > (Note that I’ve used <span +class="ec-lmtt-10x-x-109">\glsentrysymbol</span><a + id="dx1-38032"></a> rather than <span +class="ec-lmtt-10x-x-109">\glssymbol</span><a + id="dx1-38033"></a> to avoid +nested hyperlinks.) +</p><!--l. 3917--><p class="indent" > Note also that all of the <a + id="dx1-38034"></a><a href="#glo:linktext">link text<a - id="dx1-29028"></a></a> will be formatted according to + id="dx1-38035"></a></a> will be formatted according to <span class="ec-lmtt-10x-x-109">\glstextformat</span><a - id="dx1-29029"></a> (described earlier). So if you do, say: + id="dx1-38036"></a> (described earlier). So if you do, say: </p> - <div class="verbatim" id="verbatim-80"> + <div class="verbatim" id="verbatim-92"> \renewcommand{\glstextformat}[1]{\textbf{#1}} - <br />\renewcommand{\glsdisplayfirst}[4]{#1#4 (#3)} + <br />\renewcommand*{\glsentryfmt}{% + <br />  \glsgenentryfmt + <br />  \ifglsused{\glslabel}{}{\space(\glsentrysymbol{\glslabel})}% + <br />} </div> -<!--l. 3171--><p class="nopar" > then <span class="obeylines-h"><span class="verb"><span +<!--l. 3925--><p class="nopar" > then <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls{distance}</span></span></span> will produce “<span class="ec-lmbx-10x-x-109">distance (km)</span>”. -</p><!--l. 3174--><p class="indent" > If you have multiple glossaries, changing <span -class="ec-lmtt-10x-x-109">\glsdisplayfirst </span>and -<span -class="ec-lmtt-10x-x-109">\glsdisplay </span>will change the way entries for all of the glossaries appear -when using the commands <span +</p><!--l. 3928--><p class="indent" > For a complete document, see the sample file <a +href="#x1-6122r28"><span +class="ec-lmtt-10x-x-109">sample-entryfmt.tex</span></a>. +</p> +<div class="center" +> +<!--l. 3929--><p class="noindent" > +</p><!--l. 3929--><p class="noindent" >____________________________</p></div> +<!--l. 3931--><p class="indent" > If you have multiple glossaries, changing <span +class="ec-lmtt-10x-x-109">\glsentryfmt </span>will change the +way entries for all of the glossaries appear when using the commands <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-29030"></a>, <span -class="ec-lmtt-10x-x-109">\glspl</span><a - id="dx1-29031"></a>, their uppercase variants and + id="dx1-38037"></a>, <span +class="ec-lmtt-10x-x-109">\glspl</span><a + id="dx1-38038"></a>, their uppercase variants and <span class="ec-lmtt-10x-x-109">\glsdisp</span><a - id="dx1-29032"></a>. If you only want the change to affect entries for a given glossary, -then you need to use -</p><!--l. 3180--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span -class="ec-lmtt-10">\defglsdisplay</span><span + id="dx1-38039"></a>. If you only want +the change to affect entries for a given glossary, then you need to +use +</p><!--l. 3937--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\defglsentryfmt</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-29033"></a> <span -class="ec-lmtt-10x-x-109">\defglsdisplay[</span><span + id="dx1-38040"></a> <span +class="ec-lmtt-10x-x-109">\defglsentryfmt[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">type</span><span class="lmsy-10x-x-109">⟩</span><span @@ -7910,162 +9701,316 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">definition</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3182--><p class="noindent" > -and -</p><!--l. 3184--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span -class="ec-lmtt-10">\defglsdisplayfirst</span><span -class="ec-lmtt-10"> </span></span><a - id="dx1-29034"></a> <span -class="ec-lmtt-10x-x-109">\defglsdisplayfirst[</span><span +</p><!--l. 3939--><p class="noindent" > +instead of redefining <span +class="ec-lmtt-10x-x-109">\glsentryfmt</span>. The optional first argument <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">type</span><span -class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">]{</span><span -class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">definition</span><span -class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">}</span> -</div><hr> -</p><!--l. 3186--><p class="noindent" > -instead of redefining <span -class="ec-lmtt-10x-x-109">\glsdisplay </span>and <span -class="ec-lmtt-10x-x-109">\glsdisplayfirst</span>. -</p><!--l. 3189--><p class="indent" > Both <span -class="ec-lmtt-10x-x-109">\defglsdisplay </span>and <span -class="ec-lmtt-10x-x-109">\defglsdisplayfirst </span>take -two arguments: the first (which is optional) is the glossary’s -label<span class="footnote-mark"><a -href="#fn1x8" id="fn1x8-bk"><sup class="textsuperscript">1</sup></a></span><a - id="x1-29035f1"></a> -and the second is how the term should be displayed when it is invoked -using commands <span -class="ec-lmtt-10x-x-109">\gls</span>, <span -class="ec-lmtt-10x-x-109">\glspl</span>, their uppercase variants and <span -class="ec-lmtt-10x-x-109">\glsdisp</span>. -This is similar to the way <span -class="ec-lmtt-10x-x-109">\glsdisplayfirst </span>was redefined above. -</p><!--l. 3198--><p class="indent" > For example, suppose you have created a new glossary called <span -class="ec-lmtt-10x-x-109">notation</span> -and you want to change the way the entry is displayed on <a - id="dx1-29036"></a><a -href="#glo:firstuse">first use</a> so that -it includes the symbol, you can do: +class="lmsy-10x-x-109">⟩ </span>is +the glossary type. This defaults to <span +class="ec-lmtt-10x-x-109">\glsdefaulttype</span><a + id="dx1-38041"></a> if omitted. The +second argument is the entry format definition. +<a + id="x1-38042r7"></a> +</p><!--l. 3945--><p class="noindent" ><span +class="ec-lmbx-12">Example 7</span><span +class="ec-lmbx-12"> (Custom Format for Particular Glossary)</span><a + id="x1-38043"></a> +</p><!--l. 3946--><p class="indent" > Suppose you have created a new glossary called <span +class="ec-lmtt-10x-x-109">notation </span>and you want +to change the way the entry is displayed on <a + id="dx1-38044"></a><a +href="#glo:firstuse">first use</a> so that it includes the +symbol, you can do: </p> - <div class="verbatim" id="verbatim-81"> -\defglsdisplayfirst[notation]{#1#4 (denoted #3)} + <div class="verbatim" id="verbatim-93"> +\defglsentryfmt[notation]{\glsgenentryfmt + <br /> \ifglsused{\glslabel}{}{\space(denoted \glsentrysymbol{\glslabel})}} </div> -<!--l. 3203--><p class="nopar" > Now suppose you have defined an entry as follows: +<!--l. 3952--><p class="nopar" > Now suppose you have defined an entry as follows: </p> - <div class="verbatim" id="verbatim-82"> + <div class="verbatim" id="verbatim-94"> \newglossaryentry{set}{type=notation,  <br />  name=set,  <br />  description={A collection of objects},  <br />  symbol={$S$}  <br />} </div> -<!--l. 3211--><p class="nopar" > The <a - id="dx1-29037"></a><a +<!--l. 3960--><p class="nopar" > The <a + id="dx1-38045"></a><a href="#glo:firstuse">first time</a> you reference this entry it will be displayed as: “set (denoted <span class="lmmi-10x-x-109">S</span>)” (assuming <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-29038"></a> was used). -</p><!--l. 3215--><p class="indent" > Remember that if you use the <span + id="dx1-38046"></a> was used). </p> +<div class="center" +> +<!--l. 3963--><p class="noindent" > +</p><!--l. 3963--><p class="noindent" >____________________________</p></div> +<!--l. 3965--><p class="indent" > Remember that if you use the <span class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-29039"></a> key, you need to use a glossary -style that displays the symbol, as many of the styles ignore it. In addition, -if you want either the description or symbol to appear in the <a - id="dx1-29040"></a><a -href="#glo:linktext">link text<a - id="dx1-29041"></a></a>, you -will have to disable the <a - id="dx1-29042"></a><a -href="#glo:sanitize">sanitization<a - id="dx1-29043"></a></a> of these keys and protect fragile -commands. -</p><!--l. 3222--><p class="noindent" > + id="dx1-38047"></a> key, you need to use a glossary +style that displays the symbol, as many of the styles ignore it. +</p><!--l. 3969--><p class="noindent" > </p> -<!--l. 3222--><p class="noindent" ><a +<!--l. 3969--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">6.2</span>  <a - id="x1-300006.2"></a>Enabling and disabling hyperlinks to glossary entries</h3> -<!--l. 3225--><p class="noindent" >If you load the <span + id="sec:disablehyperlinks"></a>Enabling and disabling hyperlinks to glossary entries</h3> +<!--l. 3972--><p class="noindent" >If you load the <span class="ec-lmss-10x-x-109">hyperref</span><a - id="dx1-30001"></a> or <span + id="dx1-39001"></a> or <span class="ec-lmss-10x-x-109">html</span><a - id="dx1-30002"></a> packages prior to loading the <span + id="dx1-39002"></a> packages prior to loading the <span class="ec-lmss-10x-x-109">glossaries</span> package, commands such as <span class="ec-lmtt-10x-x-109">\glslink</span><a - id="dx1-30003"></a> and <span + id="dx1-39003"></a> and <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-30004"></a>, described above, will + id="dx1-39004"></a>, described above, will automatically have hyperlinks to the relevant glossary entry, unless the <span class="ec-lmss-10x-x-109">hyper</span><a - id="dx1-30005"></a> option has been set to <span + id="dx1-39005"></a> option has been set to <span class="ec-lmtt-10x-x-109">false</span>. You can disable or enable links using: -</p><!--l. 3230--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3977--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsdisablehyper</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-30006"></a> <span + id="dx1-39006"></a> <span class="ec-lmtt-10x-x-109">\glsdisablehyper </span></div><hr> -</p><!--l. 3232--><p class="noindent" > +</p><!--l. 3979--><p class="noindent" > and -</p><!--l. 3234--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3981--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsenablehyper</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-30007"></a> <span + id="dx1-39007"></a> <span class="ec-lmtt-10x-x-109">\glsenablehyper </span></div><hr> -</p><!--l. 3236--><p class="noindent" > +</p><!--l. 3983--><p class="noindent" > respectively. The effect can be localised by placing the commands within a group. Note that you should only use <span class="ec-lmtt-10x-x-109">\glsenablehyper </span>if the commands <span class="ec-lmtt-10x-x-109">\hyperlink</span><a - id="dx1-30008"></a> and <span + id="dx1-39008"></a> and <span class="ec-lmtt-10x-x-109">\hypertarget</span><a - id="dx1-30009"></a> have been defined (for example, by the + id="dx1-39009"></a> have been defined (for example, by the <span class="ec-lmss-10x-x-109">hyperref</span><a - id="dx1-30010"></a> package). -</p><!--l. 3242--><p class="indent" > You can disable just the <a - id="dx1-30011"></a><a + id="dx1-39010"></a> package). +</p><!--l. 3989--><p class="indent" > You can disable just the <a + id="dx1-39011"></a><a href="#glo:firstuse">first use</a> links using the package option <span class="ec-lmss-10x-x-109">hyperfirst=false</span><a - id="dx1-30012"></a>. Note that this option only affects commands that recognise + id="dx1-39012"></a>. Note that this option only affects commands that recognise the <a - id="dx1-30013"></a><a + id="dx1-39013"></a><a href="#glo:firstuseflag">first use flag</a>, for example <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-30014"></a>, <span + id="dx1-39014"></a>, <span class="ec-lmtt-10x-x-109">\glspl</span><a - id="dx1-30015"></a> and <span + id="dx1-39015"></a> and <span class="ec-lmtt-10x-x-109">\glsdisp</span><a - id="dx1-30016"></a> but not + id="dx1-39016"></a> but not <span class="ec-lmtt-10x-x-109">\glslink</span><a - id="dx1-30017"></a>. + id="dx1-39017"></a>. + + + +<a + id="x1-39018r8"></a> +</p><!--l. 3994--><p class="noindent" ><span +class="ec-lmbx-12">Example 8</span><span +class="ec-lmbx-12"> (First Use With Hyperlinked Footnote</span> +<span +class="ec-lmbx-12">Description)</span><a + id="x1-39019"></a> +</p><!--l. 3995--><p class="indent" > Suppose I want the <a + id="dx1-39020"></a>first use to have a hyperlink to the description in a +footnote instead of hyperlinking to the relevant place in the glossary. First +I need to disable the hyperlinks on first use via the package option +<span +class="ec-lmss-10x-x-109">hyperfirst=false</span><a + id="dx1-39021"></a>: + + + +</p> + <div class="verbatim" id="verbatim-95"> +\usepackage[hyperfirst=false]{glossaries} +</div> +<!--l. 4001--><p class="nopar" > Now I need to redefine <span +class="ec-lmtt-10x-x-109">\glsentryfmt</span><a + id="dx1-39022"></a> (see <a +href="#sec:glsdisplay">§6.1 </a><a +href="#sec:glsdisplay">Changing the format of +the link text<!--tex4ht:ref: sec:glsdisplay --></a>): </p> -<!--l. 3248--><p class="noindent" ><a + <div class="verbatim" id="verbatim-96"> +\renewcommand*{\glsentryfmt}{% + <br />  \glsgenentryfmt + <br />  \ifglsused{\glslabel}{}{\footnote{\glsentrydesc{\glslabel}}}% + <br />} +</div> +<!--l. 4009--><p class="nopar" > +</p><!--l. 4011--><p class="indent" > Now the first use won’t have hyperlinked text, but will be followed by a +footnote. See the sample file <a +href="#x1-6027r6"><span +class="ec-lmtt-10x-x-109">sample-FnDesc.tex</span></a> for a complete document. +</p> +<div class="center" +> +<!--l. 4014--><p class="noindent" > +</p><!--l. 4014--><p class="noindent" >____________________________</p></div> +<!--l. 4016--><p class="indent" > Note that the <span +class="ec-lmss-10x-x-109">hyperfirst</span><a + id="dx1-39023"></a> option applies to all defined glossaries. It may be +that you only want to disable the hyperlinks on <a + id="dx1-39024"></a><a +href="#glo:firstuse">first use</a> for glossaries that +have a different form on <a + id="dx1-39025"></a>first use. This can be achieved by noting that since +the entries that require hyperlinking for all instances have identical first +and subsequent text, they can be unset via <span +class="ec-lmtt-10x-x-109">\glsunsetall</span><a + id="dx1-39026"></a> (see <a +href="#sec:glsunset">§14 +</a><a +href="#sec:glsunset">Unsetting and Resetting Entry Flags<!--tex4ht:ref: sec:glsunset --></a>) so that the <span +class="ec-lmss-10x-x-109">hyperfirst</span><a + id="dx1-39027"></a> option doesn’t +get applied. +<a + id="x1-39028r9"></a> +</p><!--l. 4026--><p class="noindent" ><span +class="ec-lmbx-12">Example 9</span><span +class="ec-lmbx-12"> (Suppressing Hyperlinks on First Use Just For</span> +<span +class="ec-lmbx-12">Acronyms)</span><a + id="x1-39029"></a> +</p><!--l. 4027--><p class="indent" > Suppose I want to suppress the hyperlink on <a + id="dx1-39030"></a><a +href="#glo:firstuse">first use</a> for acronyms but +not for entries in the main glossary. I can load the <span +class="ec-lmss-10x-x-109">glossaries </span>package +using: + + + +</p> + <div class="verbatim" id="verbatim-97"> +\usepackage[hyperfirst=false,acronym]{glossaries} +</div> +<!--l. 4032--><p class="nopar" > Once all glossary entries have been defined I then do: + + + +</p> + <div class="verbatim" id="verbatim-98"> +\glsunsetall[main] +</div> +<!--l. 4036--><p class="nopar" > +</p> +<div class="center" +> +<!--l. 4038--><p class="noindent" > +</p><!--l. 4038--><p class="noindent" >____________________________</p></div> +<!--l. 4040--><p class="indent" > For more complex requirements, you might find it easier to switch off all +hyperlinks via <span +class="ec-lmtt-10x-x-109">\glsdisablehyper</span><a + id="dx1-39031"></a> and put the hyperlinks (where required) +within the definition of <span +class="ec-lmtt-10x-x-109">\glsentryfmt</span><a + id="dx1-39032"></a> (see <a +href="#sec:glsdisplay">§6.1 </a><a +href="#sec:glsdisplay">Changing the format of +the link text<!--tex4ht:ref: sec:glsdisplay --></a>) via <span +class="ec-lmtt-10x-x-109">\glshyperlink</span><a + id="dx1-39033"></a> (see <a +href="#sec:glsnolink">§9 </a><a +href="#sec:glsnolink">Using Glossary Terms Without +Links<!--tex4ht:ref: sec:glsnolink --></a>). +<a + id="x1-39034r10"></a> +</p><!--l. 4047--><p class="noindent" ><span +class="ec-lmbx-12">Example 10</span><span +class="ec-lmbx-12"> (Only Hyperlink in Text Mode Not Math</span> +<span +class="ec-lmbx-12">Mode)</span><a + id="x1-39035"></a> +</p><!--l. 4048--><p class="indent" > This is a bit of a contrived example, but suppose, for some reason, I only +want commands like <span +class="ec-lmtt-10x-x-109">\gls</span><a + id="dx1-39036"></a> and <span +class="ec-lmtt-10x-x-109">\glsdisp</span><a + id="dx1-39037"></a> to have hyperlinks when used in +text mode, but not in math mode. I can do this by disabling all hyperlinks +and redefining <span +class="ec-lmtt-10x-x-109">\glsentryfmt</span><a + id="dx1-39038"></a>: + + + +</p> + <div class="verbatim" id="verbatim-99"> +\glsdisablehyper + <br />\renewcommand*{\glsentryfmt}{% + <br />  \ifmmode + <br />    \glsgenentryfmt + <br />  \else + <br />    % Temporarily enable hyperlinks: + <br />    \glsenablehyper + <br />    \glshyperlink[\glsgenentryfmt]{\glslabel}% + <br />    % Disable hyperlinks again + <br />    \glsdisablehyper + <br />  \fi + <br />} +</div> +<!--l. 4065--><p class="nopar" > To ensure the target exists, the hyperlinks must be enabled again when +the glossary is displayed: + + + +</p> + <div class="verbatim" id="verbatim-100"> +\renewcommand{\glossarypreamble}{\glsenablehyper} + <br />\renewcommand{\glossarypostamble}{\glsdisablehyper} +</div> +<!--l. 4071--><p class="nopar" > (The redefinition of <span +class="ec-lmtt-10x-x-109">\glossarypostamble</span><a + id="dx1-39039"></a> is only necessary if the glossary +is displayed at the start of the document instead of at the end.) See the +sample file <a +href="#x1-6120r27"><span +class="ec-lmtt-10x-x-109">sample-nomathhyper.tex</span></a> for a complete document. +</p> +<div class="center" +> +<!--l. 4077--><p class="noindent" > +</p><!--l. 4077--><p class="noindent" >____________________________</p></div> + + + +<!--l. 4079--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">7</span>  <a - id="x1-310007"></a>Adding an Entry to the Glossary Without Generating Text</h2> + id="sec:glsadd"></a>Adding an Entry to the Glossary Without Generating Text</h2> It is possible to add a line in the glossary file without generating any text at that point in the document using: -<!--l. 3253--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 4084--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsadd</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-31001"></a> <span + id="dx1-40001"></a> <span class="ec-lmtt-10x-x-109">\glsadd[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -8075,19 +10020,19 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3255--><p class="noindent" > +</p><!--l. 4086--><p class="noindent" > This is similar to <span class="ec-lmtt-10x-x-109">\glslink</span><a - id="dx1-31002"></a>, only it doesn’t produce any text (so therefore, + id="dx1-40002"></a>, only it doesn’t produce any text (so therefore, there is no <span class="ec-lmss-10x-x-109">hyper</span><a - id="dx1-31003"></a> key available in <span + id="dx1-40003"></a> key available in <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span class="lmsy-10x-x-109">⟩ </span>but all the other options that can be used with <span class="ec-lmtt-10x-x-109">\glslink</span><a - id="dx1-31004"></a> can be passed to <span + id="dx1-40004"></a> can be passed to <span class="ec-lmtt-10x-x-109">\glsadd</span>). For example, to add a page range to the glossary number list for the entry whose label is given by <span @@ -8096,93 +10041,123 @@ class="ec-lmtt-10x-x-109">set</span>: </p> - <div class="verbatim" id="verbatim-83"> + <div class="verbatim" id="verbatim-101"> \glsadd[format=(]{set}  <br />Lots of text about sets spanning many pages.  <br />\glsadd[format=)]{set} </div> -<!--l. 3266--><p class="nopar" > -</p><!--l. 3268--><p class="indent" > To add all entries that have been defined, use: -</p><!--l. 3269--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 4097--><p class="nopar" > +</p><!--l. 4099--><p class="indent" > To add all entries that have been defined, use: +</p><!--l. 4100--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsaddall</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-31005"></a> <span + id="dx1-40005"></a> <span class="ec-lmtt-10x-x-109">\glsaddall[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3271--><p class="noindent" > +</p><!--l. 4102--><p class="noindent" > The optional argument is the same as for <span class="ec-lmtt-10x-x-109">\glsadd</span>, except there is also a key <span class="ec-lmss-10x-x-109">types</span><a - id="dx1-31006"></a> which can be used to specify which glossaries to use. This should + id="dx1-40006"></a> which can be used to specify which glossaries to use. This should be a comma separated list. For example, if you only want to add all the entries belonging to the list of acronyms (specified by the glossary type <span class="ec-lmtt-10x-x-109">\acronymtype</span><a - id="dx1-31007"></a>) and a list of notation (specified by the glossary type + id="dx1-40007"></a>) and a list of notation (specified by the glossary type <span class="ec-lmtt-10x-x-109">notation</span>) then you can do: </p> - <div class="verbatim" id="verbatim-84"> + <div class="verbatim" id="verbatim-102"> \glsaddall[types={\acronymtype,notation}] </div> -<!--l. 3282--><p class="nopar" > -</p><!--l. 3284--><p class="indent" > <div class="important" title="Important Note"> Note that <span +<!--l. 4113--><p class="nopar" > +</p><!--l. 4115--><p class="indent" > <div class="important" title="Important Note"> Note that <span class="ec-lmtt-10x-x-109">\glsadd </span>and <span class="ec-lmtt-10x-x-109">\glsaddall </span>add the current location to the -number list. In the case of <span +<a + id="dx1-40008"></a><a +href="#glo:numberlist">number list<a + id="dx1-40009"></a></a>. In the case of <span class="ec-lmtt-10x-x-109">\glsaddall</span>, all entries in the glossary will have the same location in the number list. If you want to use <span class="ec-lmtt-10x-x-109">\glsaddall</span>, it’s best to suppress the number list with the <span class="ec-lmss-10x-x-109">nonumberlist</span><a - id="dx1-31008"></a> package option. (See + id="dx1-40010"></a> package option. (See sections <a -href="#x1-150002.3">2.3<!--tex4ht:ref: sec:pkgopts-printglos --></a> and <a -href="#x1-270005">5<!--tex4ht:ref: sec:numberlists --></a>.) </div> -</p><!--l. 3291--><p class="noindent" > -</p><!--l. 3293--><p class="indent" > The sample file <a -href="#x1-40001.1"><span +href="#sec:pkgopts-printglos">2.3<!--tex4ht:ref: sec:pkgopts-printglos --></a> and <a +href="#sec:numberlists">5<!--tex4ht:ref: sec:numberlists --></a>.) </div> +</p><!--l. 4122--><p class="noindent" > +</p><!--l. 4124--><p class="indent" > There is now a variation of <span +class="ec-lmtt-10x-x-109">\glsaddall </span>that skips any entries that have +already been used: +</p><!--l. 4126--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsaddallunused</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-40011"></a> <span +class="ec-lmtt-10x-x-109">\glsaddallunused[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">list</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> +</p><!--l. 4128--><p class="noindent" > +This command uses <span +class="ec-lmtt-10x-x-109">\glsadd[format=@gobble] </span>which will ignore +this location in the number list. The optional argument <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">list</span><span +class="lmsy-10x-x-109">⟩ </span>is a +comma-separated list of glossary types. If omitted, it defaults to the list of +all defined glossaries. +<a + id="x1-40012r11"></a> +</p><!--l. 4134--><p class="noindent" ><span +class="ec-lmbx-12">Example 11</span><span +class="ec-lmbx-12"> (Dual Entries)</span><a + id="x1-40013"></a> +</p><!--l. 4135--><p class="indent" > The sample file <a +href="#x1-6069r17"><span class="ec-lmtt-10x-x-109">sample-dual.tex</span></a> makes use of <span class="ec-lmtt-10x-x-109">\glsadd </span>to allow for an entry that should appear both in the main glossary and in the list of acronyms. This example sets up the list of acronyms using the <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-31009"></a> + id="dx1-40014"></a> package option: </p> - <div class="verbatim" id="verbatim-85"> + <div class="verbatim" id="verbatim-103"> \usepackage[acronym]{glossaries} </div> -<!--l. 3299--><p class="nopar" > A new command is then defined to make it easier to define dual +<!--l. 4141--><p class="nopar" > A new command is then defined to make it easier to define dual entries: </p> - <div class="verbatim" id="verbatim-86"> + <div class="verbatim" id="verbatim-104"> \newcommand*{\newdualentry}[5][]{%  <br />  \newglossaryentry{main-#2}{name={#4},% - <br />  text={#3\protect\glsadd{#2}},% + <br />  text={#3\glsadd{#2}},%  <br />  description={#5},%  <br />  #1  <br />  }% - <br />  \newacronym{#2}{#3\protect\glsadd{main-#2}}{#4} + <br />  \newacronym{#2}{#3\glsadd{main-#2}}{#4}%  <br />} </div> -<!--l. 3311--><p class="nopar" > This has the following syntax: -</p><!--l. 3314--><p class="indent" > <hr><div title="Definition"><span +<!--l. 4153--><p class="nopar" > This has the following syntax: +</p><!--l. 4156--><p class="indent" > <hr><div title="Definition"><span class="ec-lmtt-10x-x-109">\newdualentry</span><a - id="dx1-31010"></a><span + id="dx1-40015"></a><span class="ec-lmtt-10x-x-109">[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -8205,142 +10180,128 @@ class="ec-lmri-10x-x-109">description</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 3315--><p class="noindent" > +</p><!--l. 4157--><p class="noindent" > You can then define a new dual entry: </p> - <div class="verbatim" id="verbatim-87"> + <div class="verbatim" id="verbatim-105"> \newdualentry{svm}% label  <br />  {SVM}% abbreviation  <br />  {support vector machine}% long form  <br />  {Statistical pattern recognition technique}% description </div> -<!--l. 3322--><p class="nopar" > Now you can reference the acronym with <span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">\gls{svm}</span></span></span> or you can reference -the entry in the main glossary with <span class="obeylines-h"><span class="verb"><span +<!--l. 4164--><p class="nopar" > Now you can reference the acronym with <span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\gls{svm}</span></span></span> or you can +reference the entry in the main glossary with <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls{main-svm}</span></span></span>. +</p> +<div class="center" +> +<!--l. 4167--><p class="noindent" > +</p><!--l. 4167--><p class="noindent" >____________________________</p></div> -</p> <h2 class="chapterHead"><span class="titlemark">8</span>  <a - id="x1-320008"></a>Cross-Referencing Entries</h2> -<!--l. 3329--><p class="noindent" ><div class="important" title="Important Note"> You must use <span + id="sec:crossref"></a>Cross-Referencing Entries</h2> +<!--l. 4172--><p class="noindent" ><div class="important" title="Important Note"> You must use <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-32001"></a> <span + id="dx1-41001"></a> <span class="ec-lmri-10x-x-109">before </span>defining any cross-referenced entries. If any of the terms that you have cross-referenced don’t appear in the glossary, check that you have put <span class="ec-lmtt-10x-x-109">\makeglossaries </span>before all entry definitions. </div> -</p><!--l. 3334--><p class="noindent" > -</p><!--l. 3336--><p class="noindent" >There are several ways of cross-referencing entries in the glossary: +</p><!--l. 4177--><p class="noindent" > +</p><!--l. 4179--><p class="noindent" >There are several ways of cross-referencing entries in the glossary: </p><ol class="enumerate1" > <li - class="enumerate" id="x1-32003x1">You can use commands such as <span + class="enumerate" id="x1-41003x1">You can use commands such as <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-32004"></a> in the entries description. For + id="dx1-41004"></a> in the entries description. For example: - <div class="verbatim" id="verbatim-88"> + <div class="verbatim" id="verbatim-106"> \newglossaryentry{apple}{name=apple,  <br />description={firm, round fruit. See also \gls{pear}}} </div> - <!--l. 3345--><p class="nopar" > Note that with this method, if you don’t use the cross-referenced + <!--l. 4188--><p class="nopar" > Note that with this method, if you don’t use the cross-referenced term in the main part of the document, you will need two runs of <a - id="dx1-32005"></a><a + id="dx1-41005"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-32006"></a></a>: + id="dx1-41006"></a></a>: </p> - <div class="verbatim" id="verbatim-89"> + <div class="verbatim" id="verbatim-107"> latex filename  <br />makeglossaries filename  <br />latex filename  <br />makeglossaries filename  <br />latex filename </div> - <!--l. 3355--><p class="nopar" > - </p><!--l. 3357--><p class="noindent" ><div class="important" title="Important Note"> If you switch off the description <a - id="dx1-32007"></a><a -href="#glo:sanitize">sanitization<a - id="dx1-32008"></a></a>, you must protect fragile - commands:<span class="footnote-mark"><a -href="#fn1x10" id="fn1x10-bk"><sup class="textsuperscript">1</sup></a></span><a - id="x1-32009f1"></a> - - - -</p> - <div class="verbatim" id="verbatim-90"> - \newglossaryentry{apple}{name=apple, -  <br />description={firm, round fruit. See also -  <br />\protect\gls{pear}}} -</div> - <!--l. 3365--><p class="nopar" > </div> - </p><!--l. 3366--><p class="noindent" > + <!--l. 4198--><p class="nopar" > </p></li> <li - class="enumerate" id="x1-32012x2">As described in <a -href="#x1-190004">§4 </a><a -href="#x1-190004">Defining Glossary Entries<!--tex4ht:ref: sec:newglosentry --></a>, you can use the <span + class="enumerate" id="x1-41008x2">As described in <a +href="#sec:newglosentry">§4 </a><a +href="#sec:newglosentry">Defining Glossary Entries<!--tex4ht:ref: sec:newglosentry --></a>, you can use the <span class="ec-lmss-10x-x-109">see</span><a - id="dx1-32013"></a> key + id="dx1-41009"></a> key when you define the entry. For example: - <div class="verbatim" id="verbatim-91"> + <div class="verbatim" id="verbatim-108"> \newglossaryentry{MaclaurinSeries}{name={Maclaurin  <br />series},  <br />description={Series expansion},  <br />see={TaylorsTheorem}} </div> - <!--l. 3375--><p class="nopar" > Note that in this case, the entry with the <span + <!--l. 4207--><p class="nopar" > Note that in this case, the entry with the <span class="ec-lmss-10x-x-109">see</span><a - id="dx1-32014"></a> key will automatically + id="dx1-41010"></a> key will automatically be added to the glossary, but the cross-referenced entry won’t. You therefore need to ensure that you use the cross-referenced term with the commands described in <a -href="#x1-280006">§6 </a><a -href="#x1-280006">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a> +href="#sec:glslink">§6 </a><a +href="#sec:glslink">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a> or <a -href="#x1-310007">§7 </a><a -href="#x1-310007">Adding an Entry to the Glossary Without Generating +href="#sec:glsadd">§7 </a><a +href="#sec:glsadd">Adding an Entry to the Glossary Without Generating Text<!--tex4ht:ref: sec:glsadd --></a>. - </p><!--l. 3382--><p class="noindent" >The “see” tag is produce using <span + </p><!--l. 4214--><p class="noindent" >The “see” tag is produce using <span class="ec-lmtt-10x-x-109">\seename</span><a - id="dx1-32015"></a>, but can be overridden in + id="dx1-41011"></a>, but can be overridden in specific instances using square brackets at the start of the <span class="ec-lmss-10x-x-109">see</span><a - id="dx1-32016"></a> value. + id="dx1-41012"></a> value. For example: </p> - <div class="verbatim" id="verbatim-92"> + <div class="verbatim" id="verbatim-109"> \newglossaryentry{MaclaurinSeries}{name={Maclaurin  <br />series},  <br />description={Series expansion},  <br />see=[see also]{TaylorsTheorem}} </div> - <!--l. 3390--><p class="nopar" > + <!--l. 4222--><p class="nopar" > </p></li> <li - class="enumerate" id="x1-32018x3">After you have defined the entry, use - <!--l. 3393--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + class="enumerate" id="x1-41014x3">After you have defined the entry, use + <!--l. 4225--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glssee</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-32019"></a> <span + id="dx1-41015"></a> <span class="ec-lmtt-10x-x-109">\glssee[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">tag</span><span @@ -8354,7 +10315,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">xr label list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> - </p><!--l. 3395--><p class="noindent" > + </p><!--l. 4227--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">xr label list</span><span @@ -8372,15 +10333,15 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">tag</span><span class="lmsy-10x-x-109">⟩ </span>is <span class="ec-lmtt-10x-x-109">\seename</span><a - id="dx1-32020"></a>.) For example: + id="dx1-41016"></a>.) For example: </p> - <div class="verbatim" id="verbatim-93"> + <div class="verbatim" id="verbatim-110"> \glssee[see also]{series}{FourierSeries,TaylorsTheorem} </div> - <!--l. 3403--><p class="nopar" > Note that this automatically adds the entry given by <span + <!--l. 4235--><p class="nopar" > Note that this automatically adds the entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩ </span>to the @@ -8390,59 +10351,59 @@ class="ec-lmri-10x-x-109">xr</span> <span class="ec-lmri-10x-x-109">label list</span><span class="lmsy-10x-x-109">⟩</span>) to the glossary.</p></li></ol> -<!--l. 3409--><p class="indent" > In both cases 2 and 3 above, the cross-referenced information +<!--l. 4241--><p class="indent" > In both cases 2 and 3 above, the cross-referenced information appears in the <a - id="dx1-32021"></a><a + id="dx1-41017"></a><a href="#glo:numberlist">number list<a - id="dx1-32022"></a></a>, whereas in case 1, the cross-referenced + id="dx1-41018"></a></a>, whereas in case 1, the cross-referenced information appears in the description. (See the <a -href="#x1-40001.1"><span +href="#x1-6029r8"><span class="ec-lmtt-10x-x-109">sample-crossref.tex</span></a> example file that comes with this package.) This means that in cases 2 and 3, the cross-referencing information won’t appear if you have suppressed the <a - id="dx1-32023"></a>number list<a - id="dx1-32024"></a>. In this case, you will need to + id="dx1-41019"></a>number list<a + id="dx1-41020"></a>. In this case, you will need to activate the <a - id="dx1-32025"></a>number list<a - id="dx1-32026"></a> for the given entries using <span + id="dx1-41021"></a>number list<a + id="dx1-41022"></a> for the given entries using <span class="ec-lmss-10x-x-109">nonumberlist=false</span><a - id="dx1-32027"></a>. + id="dx1-41023"></a>. Alternatively, if you just use the <span class="ec-lmss-10x-x-109">see</span><a - id="dx1-32028"></a> key instead of <span + id="dx1-41024"></a> key instead of <span class="ec-lmtt-10x-x-109">\glssee</span><a - id="dx1-32029"></a>, you can + id="dx1-41025"></a>, you can automatically activate the <a - id="dx1-32030"></a>number list<a - id="dx1-32031"></a> using the <span + id="dx1-41026"></a>number list<a + id="dx1-41027"></a> using the <span class="ec-lmss-10x-x-109">seeautonumberlist</span><a - id="dx1-32032"></a> package + id="dx1-41028"></a> package option. -</p><!--l. 3421--><p class="indent" > <div class="important" title="Important Note"> You must use <span +</p><!--l. 4253--><p class="indent" > <div class="important" title="Important Note"> You must use <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-32033"></a> <span + id="dx1-41029"></a> <span class="ec-lmri-10x-x-109">before </span>the entry definitions containing the <span class="ec-lmss-10x-x-109">see</span><a - id="dx1-32034"></a> key and before any instances of <span + id="dx1-41030"></a> key and before any instances of <span class="ec-lmtt-10x-x-109">\glssee</span><a - id="dx1-32035"></a> or the entry won’t be + id="dx1-41031"></a> or the entry won’t be automatically added to the glossary. </div> -</p><!--l. 3426--><p class="noindent" > +</p><!--l. 4258--><p class="noindent" > </p> <h3 class="sectionHead"><span class="titlemark">8.1</span>  <a - id="x1-330008.1"></a>Customising Cross-reference Text</h3> -<!--l. 3431--><p class="noindent" >When you use either the <span + id="sec:customxr"></a>Customising Cross-reference Text</h3> +<!--l. 4263--><p class="noindent" >When you use either the <span class="ec-lmss-10x-x-109">see</span><a - id="dx1-33001"></a> key or the command <span + id="dx1-42001"></a> key or the command <span class="ec-lmtt-10x-x-109">\glssee</span>, the cross-referencing information will be typeset in the glossary according to: -</p><!--l. 3434--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4266--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsseeformat</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-33002"></a> <span + id="dx1-42002"></a> <span class="ec-lmtt-10x-x-109">\glsseeformat[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">tag</span><span @@ -8457,7 +10418,7 @@ class="ec-lmri-10x-x-109">location</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 3436--><p class="noindent" > +</p><!--l. 4268--><p class="noindent" > The default definition of <span class="ec-lmtt-10x-x-109">\glsseeformat </span>is: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span @@ -8473,80 +10434,80 @@ class="ec-lmtt-10x-x-109">}</span> <br /><spacer type=vertical size=10></span> Note that the location is always ignored.<span class="footnote-mark"><a -href="#fn2x10" id="fn2x10-bk"><sup class="textsuperscript">2</sup></a></span><a - id="x1-33003f2"></a> +href="#fn1x10" id="fn1x10-bk"><sup class="textsuperscript">1</sup></a></span><a + id="x1-42003f1"></a> For example, if you want the tag to appear in bold, you can do:<span class="footnote-mark"><a -href="#fn3x10" id="fn3x10-bk"><sup class="textsuperscript">3</sup></a></span><a - id="x1-33006f3"></a> +href="#fn2x10" id="fn2x10-bk"><sup class="textsuperscript">2</sup></a></span><a + id="x1-42006f2"></a> </p> - <div class="verbatim" id="verbatim-94"> + <div class="verbatim" id="verbatim-111"> \renewcommand*{\glsseeformat}[3][\seename]{\textbf{#1}  <br /> \glsseelist{#2}} </div> -<!--l. 3452--><p class="nopar" > -</p><!--l. 3455--><p class="indent" > The list of labels is dealt with by <span +<!--l. 4284--><p class="nopar" > +</p><!--l. 4287--><p class="indent" > The list of labels is dealt with by <span class="ec-lmtt-10x-x-109">\glsseelist</span>, which iterates through the list and typesets each entry in the label. The entries are separated by -</p><!--l. 3458--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4290--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsseesep</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-33009"></a> <span + id="dx1-42009"></a> <span class="ec-lmtt-10x-x-109">\glsseesep </span></div><hr> -</p><!--l. 3460--><p class="noindent" > +</p><!--l. 4292--><p class="noindent" > or (for the last pair) -</p><!--l. 3462--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4294--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsseelastsep</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-33010"></a> <span + id="dx1-42010"></a> <span class="ec-lmtt-10x-x-109">\glsseelastsep </span></div><hr> -</p><!--l. 3464--><p class="noindent" > +</p><!--l. 4296--><p class="noindent" > These default to “<span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">,\space</span></span></span>” and “<span class="ec-lmtt-10x-x-109">\space\andname</span><a - id="dx1-33011"></a><span + id="dx1-42011"></a><span class="ec-lmtt-10x-x-109">\space</span>” respectively. The list entry text is displayed using: -</p><!--l. 3468--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4300--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsseeitemformat</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-33012"></a> <span + id="dx1-42012"></a> <span class="ec-lmtt-10x-x-109">\glsseeitemformat{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3470--><p class="noindent" > +</p><!--l. 4302--><p class="noindent" > This defaults to <span class="ec-lmtt-10x-x-109">\glsentrytext</span><a - id="dx1-33013"></a><span + id="dx1-42013"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span>.<span class="footnote-mark"><a -href="#fn4x10" id="fn4x10-bk"><sup class="textsuperscript">4</sup></a></span><a - id="x1-33014f4"></a> +href="#fn3x10" id="fn3x10-bk"><sup class="textsuperscript">3</sup></a></span><a + id="x1-42014f3"></a> For example, to make the cross-referenced list use small caps: </p> - <div class="verbatim" id="verbatim-95"> + <div class="verbatim" id="verbatim-112"> \renewcommand{\glsseeitemformat}[1]{%  <br />  \textsc{\glsentrytext{#1}}} </div> -<!--l. 3478--><p class="nopar" > -</p><!--l. 3480--><p class="indent" > <div class="important" title="Important Note"> You can use <span +<!--l. 4310--><p class="nopar" > +</p><!--l. 4312--><p class="indent" > <div class="important" title="Important Note"> You can use <span class="ec-lmtt-10x-x-109">\glsseeformat</span><a - id="dx1-33018"></a> and <span + id="dx1-42018"></a> and <span class="ec-lmtt-10x-x-109">\glsseelist</span><a - id="dx1-33019"></a> in the main body of the + id="dx1-42019"></a> in the main body of the text, but they won’t automatically add the cross-referenced entries to the glossary. If you want them added with that location, you can do: @@ -8554,421 +10515,606 @@ do: </p> - <div class="verbatim" id="verbatim-96"> + <div class="verbatim" id="verbatim-113"> Some information (see also  <br />\glsseelist{FourierSeries,TaylorsTheorem}%  <br />\glsadd{FourierSeries}\glsadd{TaylorsTheorem}). </div> -<!--l. 3489--><p class="nopar" > </div> -</p><!--l. 3490--><p class="noindent" > +<!--l. 4321--><p class="nopar" > </div> +</p><!--l. 4322--><p class="noindent" > </p> -<!--l. 3492--><p class="noindent" ><a +<!--l. 4324--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">9</span>  <a - id="x1-340009"></a>Using Glossary Terms Without Links</h2> + id="sec:glsnolink"></a>Using Glossary Terms Without Links</h2> The commands described in this section display entry details without adding any information to the glossary. They don’t use <span class="ec-lmtt-10x-x-109">\glstextformat</span><a - id="dx1-34001"></a>, they don’t have any optional arguments, they don’t + id="dx1-43001"></a>, they don’t have any optional arguments, they don’t affect the <a - id="dx1-34002"></a><a + id="dx1-43002"></a><a href="#glo:firstuseflag">first use flag</a> and, apart from <span class="ec-lmtt-10x-x-109">\glshyperlink</span><a - id="dx1-34003"></a>, they don’t + id="dx1-43003"></a>, they don’t produce hyperlinks. -<!--l. 3500--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 4333--><p class="indent" > <div class="important" title="Important Note"> Commands that aren’t expandable will be ignored by PDF bookmarks, +so you will need to provide an alternative via <span +class="ec-lmss-10x-x-109">hyperref</span><a + id="dx1-43004"></a>’s <span +class="ec-lmtt-10x-x-109">\texorpdfstring</span> +if you want to use them in sectioning commands. (This isn’t specific to the +<span +class="ec-lmss-10x-x-109">glossaries </span>package.) See the <span +class="ec-lmss-10x-x-109">hyperref</span><a + id="dx1-43005"></a> documentation for further details. +</div> +</p><!--l. 4339--><p class="noindent" > +</p><!--l. 4341--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryname</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34004"></a> <span + id="dx1-43006"></a> <span class="ec-lmtt-10x-x-109">\glsentryname{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3502--><p class="noindent" > -</p><!--l. 3503--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4343--><p class="noindent" > +</p><!--l. 4344--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryname</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34005"></a> <span + id="dx1-43007"></a> <span class="ec-lmtt-10x-x-109">\Glsentryname{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3505--><p class="noindent" > +</p><!--l. 4346--><p class="noindent" > These commands display the name of the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>, as specified by the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-34006"></a> key. <span -class="ec-lmtt-10x-x-109">\Glsentryname </span>makes the first letter + id="dx1-43008"></a> key. <span +class="ec-lmtt-10x-x-109">\Glsentryname </span>makes the first letter uppercase. +Neither of these commands check for the existence of <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. The first form +<span +class="ec-lmtt-10x-x-109">\glsentryname </span>is expandable (unless the name contains unexpandable +commands). +</p><!--l. 4354--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glossentryname</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-43009"></a> <span +class="ec-lmtt-10x-x-109">\glossentryname{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 4356--><p class="noindent" > +This is like <span +class="ec-lmtt-10x-x-109">\glsnamefont</span>{<span +class="ec-lmtt-10x-x-109">\glsentryname{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}</span>} but also checks for +the existence of <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. This command is not expandable. It’s used in the +predefined glossary styles, so if you want to change the way the name is +formatted in the glossary, you can redefine <span +class="ec-lmtt-10x-x-109">\glsnamefont </span>to use the +required fonts. For example: + + + +</p> + <div class="verbatim" id="verbatim-114"> +\renewcommand*{\glsnamefont}[1]{\textmd{\sffamily #1}} +</div> +<!--l. 4365--><p class="nopar" > +</p><!--l. 4366--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\Glossentryname</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-43010"></a> <span +class="ec-lmtt-10x-x-109">\Glossentryname{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 4368--><p class="noindent" > +This is like <span +class="ec-lmtt-10x-x-109">\glossentryname </span>but makes the first letter of the name uppercase. -</p><!--l. 3509--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4372--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrytext</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34007"></a> <span + id="dx1-43011"></a> <span class="ec-lmtt-10x-x-109">\glsentrytext{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3511--><p class="noindent" > -</p><!--l. 3512--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4374--><p class="noindent" > +</p><!--l. 4375--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentrytext</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34008"></a> <span + id="dx1-43012"></a> <span class="ec-lmtt-10x-x-109">\Glsentrytext{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3514--><p class="noindent" > +</p><!--l. 4377--><p class="noindent" > These commands display the subsequent use text for the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>, as specified by the <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-34009"></a> key. <span + id="dx1-43013"></a> key. <span class="ec-lmtt-10x-x-109">\Glsentrytext </span>makes the -first letter uppercase. -</p><!--l. 3518--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +first letter uppercase. The first form is expandable (unless the text contains +unexpandable commands). The second form is not expandable. Neither +checks for the existence of <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. +</p><!--l. 4385--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryplural</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34010"></a> <span + id="dx1-43014"></a> <span class="ec-lmtt-10x-x-109">\glsentryplural{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3520--><p class="noindent" > -</p><!--l. 3521--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4387--><p class="noindent" > +</p><!--l. 4388--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryplural</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34011"></a> <span + id="dx1-43015"></a> <span class="ec-lmtt-10x-x-109">\Glsentryplural{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3523--><p class="noindent" > +</p><!--l. 4390--><p class="noindent" > These commands display the subsequent use plural text for the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>, as specified by the <span class="ec-lmss-10x-x-109">plural</span><a - id="dx1-34012"></a> key. <span + id="dx1-43016"></a> key. <span class="ec-lmtt-10x-x-109">\Glsentryplural</span> -makes the first letter uppercase. -</p><!--l. 3528--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +makes the first letter uppercase. The first form is expandable (unless the +value of that key contains unexpandable commands). The second form is +not expandable. Neither checks for the existence of <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. +</p><!--l. 4399--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryfirst</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34013"></a> <span + id="dx1-43017"></a> <span class="ec-lmtt-10x-x-109">\glsentryfirst{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3530--><p class="noindent" > -</p><!--l. 3531--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4401--><p class="noindent" > +</p><!--l. 4402--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryfirst</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34014"></a> <span + id="dx1-43018"></a> <span class="ec-lmtt-10x-x-109">\Glsentryfirst{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3533--><p class="noindent" > +</p><!--l. 4404--><p class="noindent" > These commands display the <a - id="dx1-34015"></a><a + id="dx1-43019"></a><a href="#glo:firstusetext">first use text</a> for the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>, as specified by the <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-34016"></a> key. <span + id="dx1-43020"></a> key. <span class="ec-lmtt-10x-x-109">\Glsentryfirst </span>makes the first letter -uppercase. -</p><!--l. 3537--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +uppercase. The first form is expandable (unless the value of that key +contains unexpandable commands). The second form is not expandable. +Neither checks for the existence of <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. +</p><!--l. 4412--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryfirstplural</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34017"></a> <span + id="dx1-43021"></a> <span class="ec-lmtt-10x-x-109">\glsentryfirstplural{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3539--><p class="noindent" > -</p><!--l. 3540--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4414--><p class="noindent" > + + + +</p><!--l. 4415--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryfirstplural</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34018"></a> <span + id="dx1-43022"></a> <span class="ec-lmtt-10x-x-109">\Glsentryfirstplural{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> - - - -</p><!--l. 3542--><p class="noindent" > +</p><!--l. 4417--><p class="noindent" > These commands display the plural form of the <a - id="dx1-34019"></a><a + id="dx1-43023"></a><a href="#glo:firstusetext">first use text</a> for the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>, as specified by the <span class="ec-lmss-10x-x-109">firstplural</span><a - id="dx1-34020"></a> key. + id="dx1-43024"></a> key. <span -class="ec-lmtt-10x-x-109">\Glsentryfirstplural </span>makes the first letter uppercase. -</p><!--l. 3547--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10x-x-109">\Glsentryfirstplural </span>makes the first letter uppercase. The first form is +expandable (unless the value of that key contains unexpandable +commands). The second form is not expandable. Neither checks for the +existence of <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. +</p><!--l. 4426--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrydesc</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34021"></a> <span + id="dx1-43025"></a> <span class="ec-lmtt-10x-x-109">\glsentrydesc{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3549--><p class="noindent" > -</p><!--l. 3550--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4428--><p class="noindent" > +</p><!--l. 4429--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentrydesc</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34022"></a> <span + id="dx1-43026"></a> <span class="ec-lmtt-10x-x-109">\Glsentrydesc{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3552--><p class="noindent" > +</p><!--l. 4431--><p class="noindent" > These commands display the description for the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>. <span -class="ec-lmtt-10x-x-109">\Glsentrydesc </span>makes the first letter uppercase. -</p><!--l. 3555--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10x-x-109">\Glsentrydesc </span>makes the first letter uppercase. The first form is +expandable (unless the value of that key contains unexpandable +commands). The second form is not expandable. Neither checks for the +existence of <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. +</p><!--l. 4438--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glossentrydesc</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-43027"></a> <span +class="ec-lmtt-10x-x-109">\glossentrydesc{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 4440--><p class="noindent" > +This is like <span +class="ec-lmtt-10x-x-109">\glsentrydesc{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span>but also checks for the existence of +<span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. This command is not expandable. It’s used in the predefined +glossary styles to display the description. +</p><!--l. 4445--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\Glossentrydesc</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-43028"></a> <span +class="ec-lmtt-10x-x-109">\Glossentrydesc{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 4447--><p class="noindent" > +This is like <span +class="ec-lmtt-10x-x-109">\glossentrydesc </span>but converts the first letter to uppercase. +This command is not expandable. +</p><!--l. 4451--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrydescplural</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34023"></a> <span + id="dx1-43029"></a> <span class="ec-lmtt-10x-x-109">\glsentrydescplural{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3557--><p class="noindent" > -</p><!--l. 3558--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4453--><p class="noindent" > +</p><!--l. 4454--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentrydescplural</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34024"></a> <span + id="dx1-43030"></a> <span class="ec-lmtt-10x-x-109">\Glsentrydescplural{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3560--><p class="noindent" > -These commands display the plural description for the glossary -entry given by <span +</p><!--l. 4456--><p class="noindent" > +These commands display the plural description for the glossary entry given +by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>. <span -class="ec-lmtt-10x-x-109">\Glsentrydescplural </span>makes the first letter -uppercase. -</p><!--l. 3564--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10x-x-109">\Glsentrydescplural </span>makes the first letter uppercase. +The first form is expandable (unless the value of that key contains +unexpandable commands). The second form is not expandable. Neither +checks for the existence of <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. +</p><!--l. 4465--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrysymbol</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34025"></a> <span + id="dx1-43031"></a> <span class="ec-lmtt-10x-x-109">\glsentrysymbol{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3566--><p class="noindent" > -</p><!--l. 3567--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4467--><p class="noindent" > +</p><!--l. 4468--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentrysymbol</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34026"></a> <span + id="dx1-43032"></a> <span class="ec-lmtt-10x-x-109">\Glsentrysymbol{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3569--><p class="noindent" > +</p><!--l. 4470--><p class="noindent" > These commands display the symbol for the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>. + + + <span -class="ec-lmtt-10x-x-109">\Glsentrysymbol </span>makes the first letter uppercase. -</p><!--l. 3572--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10x-x-109">\Glsentrysymbol </span>makes the first letter uppercase. The first form is +expandable (unless the value of that key contains unexpandable +commands). The second form is not expandable. Neither checks for the +existence of <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. +</p><!--l. 4477--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glossentrysymbol</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-43033"></a> <span +class="ec-lmtt-10x-x-109">\glossentrysymbol{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 4479--><p class="noindent" > +This is like <span +class="ec-lmtt-10x-x-109">\glsentrysymbol{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span>but also checks for the existence of +<span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. This command is not expandable. It’s used in the predefined +glossary styles to display the symbol. +</p><!--l. 4484--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\Glossentrysymbol</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-43034"></a> <span +class="ec-lmtt-10x-x-109">\Glossentrysymbol{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 4486--><p class="noindent" > +This is like <span +class="ec-lmtt-10x-x-109">\glossentrysymbol </span>but converts the first letter to uppercase. +This command is not expandable. +</p><!--l. 4490--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrysymbolplural</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34027"></a> <span + id="dx1-43035"></a> <span class="ec-lmtt-10x-x-109">\glsentrysymbolplural{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3574--><p class="noindent" > -</p><!--l. 3575--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4492--><p class="noindent" > +</p><!--l. 4493--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentrysymbolplural</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34028"></a> <span + id="dx1-43036"></a> <span class="ec-lmtt-10x-x-109">\Glsentrysymbolplural{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3577--><p class="noindent" > -These commands display the plural symbol for the glossary entry -given by <span +</p><!--l. 4495--><p class="noindent" > +These commands display the plural symbol for the glossary entry given by +<span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>. <span -class="ec-lmtt-10x-x-109">\Glsentrysymbolplural </span>makes the first letter -uppercase. -</p><!--l. 3581--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10x-x-109">\Glsentrysymbolplural </span>makes the first letter uppercase. The first +form is expandable (unless the value of that key contains unexpandable +commands). The second form is not expandable. Neither checks for the +existence of <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. +</p><!--l. 4503--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryuseri</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34029"></a> <span + id="dx1-43037"></a> <span class="ec-lmtt-10x-x-109">\glsentryuseri{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3583--><p class="noindent" > -</p><!--l. 3584--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4505--><p class="noindent" > +</p><!--l. 4506--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryuseri</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34030"></a> <span + id="dx1-43038"></a> <span class="ec-lmtt-10x-x-109">\Glsentryuseri{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3586--><p class="noindent" > -</p><!--l. 3587--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4508--><p class="noindent" > +</p><!--l. 4509--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryuserii</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34031"></a> <span + id="dx1-43039"></a> <span class="ec-lmtt-10x-x-109">\glsentryuserii{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3589--><p class="noindent" > - - - -</p><!--l. 3590--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4511--><p class="noindent" > +</p><!--l. 4512--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryuserii</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34032"></a> <span + id="dx1-43040"></a> <span class="ec-lmtt-10x-x-109">\Glsentryuserii{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3592--><p class="noindent" > -</p><!--l. 3593--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4514--><p class="noindent" > +</p><!--l. 4515--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryuseriii</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34033"></a> <span + id="dx1-43041"></a> <span class="ec-lmtt-10x-x-109">\glsentryuseriii{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3595--><p class="noindent" > -</p><!--l. 3596--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4517--><p class="noindent" > +</p><!--l. 4518--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryuseriii</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34034"></a> <span + id="dx1-43042"></a> <span class="ec-lmtt-10x-x-109">\Glsentryuseriii{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3598--><p class="noindent" > -</p><!--l. 3599--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4520--><p class="noindent" > +</p><!--l. 4521--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryuseriv</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34035"></a> <span + id="dx1-43043"></a> <span class="ec-lmtt-10x-x-109">\glsentryuseriv{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3601--><p class="noindent" > -</p><!--l. 3602--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4523--><p class="noindent" > + + + +</p><!--l. 4524--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryuseriv</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34036"></a> <span + id="dx1-43044"></a> <span class="ec-lmtt-10x-x-109">\Glsentryuseriv{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3604--><p class="noindent" > -</p><!--l. 3605--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4526--><p class="noindent" > +</p><!--l. 4527--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryuserv</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34037"></a> <span + id="dx1-43045"></a> <span class="ec-lmtt-10x-x-109">\glsentryuserv{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3607--><p class="noindent" > -</p><!--l. 3608--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4529--><p class="noindent" > +</p><!--l. 4530--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryuserv</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34038"></a> <span + id="dx1-43046"></a> <span class="ec-lmtt-10x-x-109">\Glsentryuserv{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3610--><p class="noindent" > -</p><!--l. 3611--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4532--><p class="noindent" > +</p><!--l. 4533--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryuservi</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34039"></a> <span + id="dx1-43047"></a> <span class="ec-lmtt-10x-x-109">\glsentryuservi{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3613--><p class="noindent" > -</p><!--l. 3614--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4535--><p class="noindent" > +</p><!--l. 4536--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryuservi</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34040"></a> <span + id="dx1-43048"></a> <span class="ec-lmtt-10x-x-109">\Glsentryuservi{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3616--><p class="noindent" > +</p><!--l. 4538--><p class="noindent" > These commands display the value of the user keys for the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. The lower case forms are expandable (unless the value of +the key contains unexpandable commands). The commands beginning with +an uppercase letter convert the first letter of the required value to +uppercase and are not expandable. None of these commands check for the +existence of <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>. -</p><!--l. 3619--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4547--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glshyperlink</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34041"></a> <span + id="dx1-43049"></a> <span class="ec-lmtt-10x-x-109">\glshyperlink[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">link text</span><span @@ -8978,7 +11124,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3621--><p class="noindent" > +</p><!--l. 4549--><p class="noindent" > This command provides a hyperlink to the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span @@ -8988,7 +11134,7 @@ class="ec-lmbx-10x-x-109">but does not add any information to the glossary</span <span class="ec-lmbx-10x-x-109">file</span>. The link text is given by <span class="ec-lmtt-10x-x-109">\glsentrytext</span><a - id="dx1-34042"></a><span + id="dx1-43050"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -8996,102 +11142,102 @@ class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span>by default<span class="footnote-mark"><a href="#fn1x11" id="fn1x11-bk"><sup class="textsuperscript">1</sup></a></span><a - id="x1-34043f1"></a>, + id="x1-43051f1"></a>, but can be overridden using the optional argument. -</p><!--l. 3629--><p class="indent" > <div class="important" title="Important Note"> If you use <span +</p><!--l. 4557--><p class="indent" > <div class="important" title="Important Note"> If you use <span class="ec-lmtt-10x-x-109">\glshyperlink</span>, you need to ensure that the relevant entry has been added to the glossary using any of the commands described in <a -href="#x1-280006">§6 +href="#sec:glslink">§6 </a><a -href="#x1-280006">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a> or <a -href="#x1-310007">§7 </a><a -href="#x1-310007">Adding an Entry to the Glossary Without +href="#sec:glslink">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a> or <a +href="#sec:glsadd">§7 </a><a +href="#sec:glsadd">Adding an Entry to the Glossary Without Generating Text<!--tex4ht:ref: sec:glsadd --></a> otherwise you will end up with an undefined link. </div> -</p><!--l. 3634--><p class="noindent" > -</p><!--l. 3636--><p class="indent" > The next two commands are only available with the <span +</p><!--l. 4562--><p class="noindent" > +</p><!--l. 4564--><p class="indent" > The next two commands are only available with the <span class="ec-lmss-10x-x-109">savenumberlist</span><a - id="dx1-34048"></a> - - - + id="dx1-43056"></a> package option: -</p><!--l. 3638--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4566--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrynumberlist</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34049"></a> <span + id="dx1-43057"></a> <span class="ec-lmtt-10x-x-109">\glsentrynumberlist{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3640--><p class="noindent" > -</p><!--l. 3641--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4568--><p class="noindent" > +</p><!--l. 4569--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsdisplaynumberlist</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34050"></a> <span + id="dx1-43058"></a> <span class="ec-lmtt-10x-x-109">\glsdisplaynumberlist{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3643--><p class="noindent" > +</p><!--l. 4571--><p class="noindent" > Both display the <a - id="dx1-34051"></a><a + id="dx1-43059"></a><a href="#glo:numberlist">number list<a - id="dx1-34052"></a></a> for the entry given by <span + id="dx1-43060"></a></a> for the entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩ </span>and require a + + + run of <a - id="dx1-34053"></a><a + id="dx1-43061"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-34054"></a></a> (or <a - id="dx1-34055"></a><a + id="dx1-43062"></a></a> (or <a + id="dx1-43063"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-34056"></a></a> or <a - id="dx1-34057"></a><a + id="dx1-43064"></a></a> or <a + id="dx1-43065"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-34058"></a></a>) followed by one or + id="dx1-43066"></a></a>) followed by one or two runs of <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span>. The first command, <span class="ec-lmtt-10x-x-109">\glsentrynumberlist</span>, simply displays the number list as is. The second command, <span class="ec-lmtt-10x-x-109">\glsdisplaynumberlist</span>, formats the list using: -</p><!--l. 3650--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4578--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsnumlistsep</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34059"></a> <span + id="dx1-43067"></a> <span class="ec-lmtt-10x-x-109">\glsnumlistsep </span></div><hr> -</p><!--l. 3652--><p class="noindent" > +</p><!--l. 4580--><p class="noindent" > as the separator between all but the last two elements and -</p><!--l. 3654--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4582--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsnumlistlastsep</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-34060"></a> <span + id="dx1-43068"></a> <span class="ec-lmtt-10x-x-109">\glsnumlistlastsep </span></div><hr> -</p><!--l. 3656--><p class="noindent" > +</p><!--l. 4584--><p class="noindent" > between the final two elements. The defaults are <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">,␣</span></span></span> and <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">␣\&␣</span></span></span>, respectively. -</p><!--l. 3660--><p class="indent" > <div class="important" title="Important Note"> <span +</p><!--l. 4588--><p class="indent" > <div class="important" title="Important Note"> <span class="ec-lmtt-10x-x-109">\glsdisplaynumberlist </span>is fairly experimental. It only works when the default counter format is used (that is, when the <span class="ec-lmss-10x-x-109">format</span><a - id="dx1-34061"></a> key is set to + id="dx1-43069"></a> key is set to <span class="ec-lmtt-10x-x-109">glsnumberformat</span>). This command also doesn’t work with <span class="ec-lmss-10x-x-109">hyperref</span><a - id="dx1-34062"></a>. If you + id="dx1-43070"></a>. If you try using it with that package, <span class="ec-lmtt-10x-x-109">\glsentrynumberlist </span>will be used instead. </div> -</p><!--l. 3666--><p class="noindent" > -</p><!--l. 3668--><p class="indent" > For further information see “Displaying entry details without +</p><!--l. 4594--><p class="noindent" > +</p><!--l. 4596--><p class="indent" > For further information see “Displaying entry details without adding information to the glossary” in the documented code (<span class="ec-lmtt-10x-x-109">glossaries-code.pdf</span>). @@ -9100,56 +11246,56 @@ class="ec-lmtt-10x-x-109">glossaries-code.pdf</span>). </p> <h2 class="chapterHead"><span class="titlemark">10</span>  <a - id="x1-3500010"></a>Displaying a glossary</h2> -<!--l. 3675--><p class="noindent" >The command -</p><!--l. 3676--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="sec:printglossary"></a>Displaying a glossary</h2> +<!--l. 4603--><p class="noindent" >The command +</p><!--l. 4604--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\printglossaries</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-35001"></a> <span + id="dx1-44001"></a> <span class="ec-lmtt-10x-x-109">\printglossaries </span></div><hr> -</p><!--l. 3678--><p class="noindent" > +</p><!--l. 4606--><p class="noindent" > will display all the glossaries in the order in which they were defined. Note that no glossaries will appear until you have either used the Perl script <a - id="dx1-35002"></a><a + id="dx1-44002"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-35003"></a></a> or have directly used <a - id="dx1-35004"></a><a + id="dx1-44003"></a></a> or have directly used <a + id="dx1-44004"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-35005"></a></a> or <a - id="dx1-35006"></a><a + id="dx1-44005"></a></a> or <a + id="dx1-44006"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-35007"></a></a> (as described + id="dx1-44007"></a></a> (as described in <a -href="#x1-70001.3">§1.3 </a><a -href="#x1-70001.3">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a>). If the glossary still +href="#sec:makeglossaries">§1.3 </a><a +href="#sec:makeglossaries">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a>). If the glossary still does not appear after you re-<span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> your document, check the <a - id="dx1-35008"></a><span + id="dx1-44008"></a><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-35009"></a>/<a - id="dx1-35010"></a><span + id="dx1-44009"></a>/<a + id="dx1-44010"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-35011"></a> log files to see if there is a problem. Remember that you + id="dx1-44011"></a> log files to see if there is a problem. Remember that you also need to use the command <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-35012"></a> in the preamble to enable + id="dx1-44012"></a> in the preamble to enable the glossaries. -</p><!--l. 3689--><p class="indent" > An individual glossary can be displayed using: -</p><!--l. 3690--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4617--><p class="indent" > An individual glossary can be displayed using: +</p><!--l. 4618--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\printglossary</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-35013"></a> <span + id="dx1-44013"></a> <span class="ec-lmtt-10x-x-109">\printglossary[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 3692--><p class="noindent" > +</p><!--l. 4620--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -9164,64 +11310,64 @@ available: </p><dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">type</span><a - id="dx1-35014"></a> </dt><dd + id="dx1-44014"></a> </dt><dd class="description">The value of this key specifies which glossary to print. If omitted, the default glossary is assumed. For example, to print the list of acronyms: - <div class="verbatim" id="verbatim-97"> + <div class="verbatim" id="verbatim-115"> \printglossary[type=\acronymtype] </div> - <!--l. 3701--><p class="nopar" > + <!--l. 4629--><p class="nopar" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">title</span><a - id="dx1-35015"></a> </dt><dd + id="dx1-44015"></a> </dt><dd class="description">This is the glossary’s title (overriding the title specified when the glossary was defined). </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">toctitle</span><a - id="dx1-35016"></a> </dt><dd + id="dx1-44016"></a> </dt><dd class="description">This is the title to use for the table of contents (if the <span class="ec-lmss-10x-x-109">toc</span><a - id="dx1-35017"></a> package + id="dx1-44017"></a> package option has been used). It may also be used for the page header, depending on the page style. If omitted, the value of <span class="ec-lmss-10x-x-109">title</span><a - id="dx1-35018"></a> is + id="dx1-44018"></a> is used. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">style</span><a - id="dx1-35019"></a> </dt><dd + id="dx1-44019"></a> </dt><dd class="description">This specifies which glossary style to use for this glossary, overriding the effect of the <span class="ec-lmss-10x-x-109">style</span><a - id="dx1-35020"></a> package option or <span + id="dx1-44020"></a> package option or <span class="ec-lmtt-10x-x-109">\glossarystyle</span><a - id="dx1-35021"></a>. + id="dx1-44021"></a>. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">numberedsection</span><a - id="dx1-35022"></a> </dt><dd + id="dx1-44022"></a> </dt><dd class="description">This specifies whether to use a numbered section for this glossary, overriding the effect of the <span class="ec-lmss-10x-x-109">numberedsection</span><a - id="dx1-35023"></a> package + id="dx1-44023"></a> package option. This key has the same syntax as the <span class="ec-lmss-10x-x-109">numberedsection</span><a - id="dx1-35024"></a> + id="dx1-44024"></a> package option, described in <a -href="#x1-140002.2">§2.2 </a><a -href="#x1-140002.2">Sectioning, Headings and TOC +href="#sec:pkgopts-sec">§2.2 </a><a +href="#sec:pkgopts-sec">Sectioning, Headings and TOC Options<!--tex4ht:ref: sec:pkgopts-sec --></a>. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">nonumberlist</span><a - id="dx1-35025"></a> </dt><dd + id="dx1-44025"></a> </dt><dd class="description">This is a boolean key. If true (<span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">nonumberlist=true</span></span></span>) the numberlist is suppressed for this glossary. If false @@ -9229,63 +11375,73 @@ class="ec-lmtt-10x-x-109">nonumberlist=true</span></span></span>) class="ec-lmtt-10x-x-109">nonumberlist=false</span></span></span>) the numberlist is displayed for this glossary. If no value is supplied, true is assumed. </dd></dl> -<!--l. 3731--><p class="indent" > By default, the glossary is started either by <span +<!--l. 4659--><p class="indent" > By default, the glossary is started either by <span class="ec-lmtt-10x-x-109">\chapter*</span><a - id="dx1-35026"></a> or by + id="dx1-44026"></a> or by <span class="ec-lmtt-10x-x-109">\section*</span><a - id="dx1-35027"></a>, depending on whether or not <span + id="dx1-44027"></a>, depending on whether or not <span class="ec-lmtt-10x-x-109">\chapter</span><a - id="dx1-35028"></a> is defined. + id="dx1-44028"></a> is defined. This can be overridden by the <span class="ec-lmss-10x-x-109">section</span><a - id="dx1-35029"></a> package option or the + id="dx1-44029"></a> package option or the <span class="ec-lmtt-10x-x-109">\setglossarysection</span><a - id="dx1-35030"></a> command. Numbered sectional units can be + id="dx1-44030"></a> command. Numbered sectional units can be obtained using the <span class="ec-lmss-10x-x-109">numberedsection</span><a - id="dx1-35031"></a> package option. Each glossary sets the -page header via the command <span -class="ec-lmtt-10x-x-109">\glossarymark</span><a - id="dx1-35032"></a>. If this mechanism is -unsuitable for your chosen class file or page style package, you will -need to redefine <span -class="ec-lmtt-10x-x-109">\glossarymark</span><a - id="dx1-35033"></a>. Further information about these -options and commands is given in <a -href="#x1-140002.2">§2.2 </a><a -href="#x1-140002.2">Sectioning, Headings and TOC -Options<!--tex4ht:ref: sec:pkgopts-sec --></a>. - - - -</p><!--l. 3742--><p class="indent" > Information can be added to the start of the glossary (after the title and + id="dx1-44031"></a> package option. Each glossary sets the +page header via the command +</p><!--l. 4665--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsglossarymark</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-44032"></a> <span +class="ec-lmtt-10x-x-109">\glsglossarymark</span><a + id="dx1-44033"></a><span +class="ec-lmtt-10x-x-109">{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">title</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 4667--><p class="noindent" > +If this mechanism is unsuitable for your chosen class file or page style +package, you will need to redefine <span +class="ec-lmtt-10x-x-109">\glsglossarymark</span><a + id="dx1-44034"></a>. Further information + + + +about these options and commands is given in <a +href="#sec:pkgopts-sec">§2.2 </a><a +href="#sec:pkgopts-sec">Sectioning, Headings +and TOC Options<!--tex4ht:ref: sec:pkgopts-sec --></a>. +</p><!--l. 4673--><p class="indent" > Information can be added to the start of the glossary (after the title and before the main body of the glossary) by redefining -</p><!--l. 3744--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4675--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glossarypreamble</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-35034"></a> <span + id="dx1-44035"></a> <span class="ec-lmtt-10x-x-109">\glossarypreamble </span></div><hr> -</p><!--l. 3746--><p class="noindent" > +</p><!--l. 4677--><p class="noindent" > For example: </p> - <div class="verbatim" id="verbatim-98"> + <div class="verbatim" id="verbatim-116"> \renewcommand{\glossarypreamble}{Numbers in italic  <br />indicate primary definitions.} </div> -<!--l. 3751--><p class="nopar" > This needs to be done before the glossary is displayed using +<!--l. 4682--><p class="nopar" > This needs to be done before the glossary is displayed using <span class="ec-lmtt-10x-x-109">\printglossaries </span>or <span class="ec-lmtt-10x-x-109">\printglossary</span>. -</p><!--l. 3755--><p class="indent" > If you want a different preamble per glossary you can use -</p><!--l. 3756--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4686--><p class="indent" > If you want a different preamble per glossary you can use +</p><!--l. 4687--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\setglossarypreamble</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-35035"></a> <span + id="dx1-44036"></a> <span class="ec-lmtt-10x-x-109">\setglossarypreamble[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">type</span><span @@ -9297,64 +11453,76 @@ class="ec-lmri-10x-x-109">preamble</span> class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3758--><p class="noindent" > +</p><!--l. 4689--><p class="noindent" > If <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">type</span><span class="lmsy-10x-x-109">⟩ </span>is omitted, <span class="ec-lmtt-10x-x-109">\glsdefaulttype </span>is used. -</p><!--l. 3761--><p class="indent" > For example: +</p><!--l. 4692--><p class="indent" > For example: </p> - <div class="verbatim" id="verbatim-99"> + <div class="verbatim" id="verbatim-117"> \setglossarypreamble{Numbers in italic  <br />indicate primary definitions.} </div> -<!--l. 3765--><p class="nopar" > This will print the given preamble text for the main glossary, but not have +<!--l. 4696--><p class="nopar" > This will print the given preamble text for the main glossary, but not have any preamble text for any other glossaries. -</p><!--l. 3769--><p class="indent" > There is an analogous command called -</p><!--l. 3770--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4700--><p class="indent" > There is an analogous command to <span +class="ec-lmtt-10x-x-109">\glossarypreamble </span>called +</p><!--l. 4701--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glossarypostamble</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-35036"></a> <span + id="dx1-44037"></a> <span class="ec-lmtt-10x-x-109">\glossarypostamble </span></div><hr> -</p><!--l. 3772--><p class="noindent" > +</p><!--l. 4703--><p class="noindent" > which is placed at the end of each glossary. -</p><!--l. 3775--><p class="indent" > For example: suppose you are using the <span +<a + id="x1-44038r12"></a> +</p><!--l. 4706--><p class="noindent" ><span +class="ec-lmbx-12">Example 12</span><span +class="ec-lmbx-12"> (Switch to Two Column Mode for Glossary)</span><a + id="x1-44039"></a> +</p><!--l. 4707--><p class="indent" > Suppose you are using the <span class="ec-lmss-10x-x-109">superheaderborder</span><a - id="dx1-35037"></a> + id="dx1-44040"></a> style<span class="footnote-mark"><a href="#fn1x12" id="fn1x12-bk"><sup class="textsuperscript">1</sup></a></span><a - id="x1-35038f1"></a>, + id="x1-44041f1"></a>, and you want the glossary to be in two columns, but after the glossary you want to switch back to one column mode, you could do: </p> - <div class="verbatim" id="verbatim-100"> + <div class="verbatim" id="verbatim-118"> \renewcommand*{\glossarysection}[2][]{%  <br />  \twocolumn[{\chapter*{#2}}]%  <br />  \setlength\glsdescwidth{0.6\linewidth}% - <br />  \glossarymark{\glossarytoctitle}% + <br />  \glsglossarymark{\glossarytoctitle}%  <br />}  <br />\renewcommand*{\glossarypostamble}{\onecolumn} </div> -<!--l. 3789--><p class="nopar" > -</p><!--l. 3791--><p class="indent" > Within each glossary, each entry name is formatted according +<!--l. 4721--><p class="nopar" > +</p> +<div class="center" +> +<!--l. 4723--><p class="noindent" > +</p><!--l. 4723--><p class="noindent" >____________________________</p></div> +<!--l. 4725--><p class="indent" > Within each glossary, each entry name is formatted according to -</p><!--l. 3792--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4726--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsnamefont</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-35042"></a> <span + id="dx1-44045"></a> <span class="ec-lmtt-10x-x-109">\glsnamefont{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3794--><p class="noindent" > +</p><!--l. 4728--><p class="noindent" > which takes one argument: the entry name. This command is always used regardless of the glossary style. By default, <span class="ec-lmtt-10x-x-109">\glsnamefont </span>simply @@ -9362,108 +11530,119 @@ displays its argument in whatever the surrounding font happens to be. This means that in the list-like glossary styles (defined in the <span class="ec-lmss-10x-x-109">glossary-list</span><a - id="dx1-35043"></a> style file) the name will appear in bold, since the name is + id="dx1-44046"></a> style file) the name will appear in bold, since the name is placed in the optional argument of <span class="ec-lmtt-10x-x-109">\item</span>, whereas in the tabular styles (defined in the <span class="ec-lmss-10x-x-109">glossary-long</span><a - id="dx1-35044"></a> and <span + id="dx1-44047"></a> and <span class="ec-lmss-10x-x-109">glossary-super</span><a - id="dx1-35045"></a> style files) + id="dx1-44048"></a> style files) the name will appear in the normal font. The hierarchical glossary styles (defined in the <span class="ec-lmss-10x-x-109">glossary-tree</span><a - id="dx1-35046"></a> style file) also set the name in + id="dx1-44049"></a> style file) also set the name in bold. -</p><!--l. 3807--><p class="indent" > For example, suppose you want all the entry names to appear in medium -weight small caps, then you can do: +<a + id="x1-44050r13"></a> +</p><!--l. 4742--><p class="noindent" ><span +class="ec-lmbx-12">Example 13</span><span +class="ec-lmbx-12"> (Changing the Font Used to Display Entry</span> +<span +class="ec-lmbx-12">Names in the Glossary)</span><a + id="x1-44051"></a> +</p><!--l. 4743--><p class="indent" > Suppose you want all the entry names to appear in medium weight small +caps in your glossaries, then you can do: </p> - <div class="verbatim" id="verbatim-101"> + <div class="verbatim" id="verbatim-119"> \renewcommand{\glsnamefont}[1]{\textsc{\mdseries #1}} </div> -<!--l. 3811--><p class="nopar" > +<!--l. 4747--><p class="nopar" > </p> +<div class="center" +> +<!--l. 4748--><p class="noindent" > +</p><!--l. 4748--><p class="noindent" >____________________________</p></div> -</p> <h2 class="chapterHead"><span class="titlemark">11</span>  <a - id="x1-3600011"></a>Xindy</h2> -<!--l. 3817--><p class="noindent" >If you want to use <a - id="dx1-36001"></a><a + id="sec:xindy"></a>Xindy</h2> +<!--l. 4753--><p class="noindent" >If you want to use <a + id="dx1-45001"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-36002"></a></a> to sort the glossary, you must use the package + id="dx1-45002"></a></a> to sort the glossary, you must use the package option <span class="ec-lmss-10x-x-109">xindy</span><a - id="dx1-36003"></a>: + id="dx1-45003"></a>: </p> - <div class="verbatim" id="verbatim-102"> + <div class="verbatim" id="verbatim-120"> \usepackage[xindy]{glossaries} </div> -<!--l. 3821--><p class="nopar" > This ensures that the glossary information is written in <a - id="dx1-36004"></a><span +<!--l. 4757--><p class="nopar" > This ensures that the glossary information is written in <a + id="dx1-45004"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-36005"></a> + id="dx1-45005"></a> syntax. -</p><!--l. 3825--><p class="indent" > <a -href="#x1-70001.3">§1.3 </a><a -href="#x1-70001.3">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a> covers how to use the +</p><!--l. 4761--><p class="indent" > <a +href="#sec:makeglossaries">§1.3 </a><a +href="#sec:makeglossaries">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a> covers how to use the external <a - id="dx1-36006"></a><a + id="dx1-45006"></a><a href="#glo:indexingapp">indexing application</a>. This section covers the commands provided by the <span class="ec-lmss-10x-x-109">glossaries </span>package that allow you to adjust the <a - id="dx1-36007"></a><a + id="dx1-45007"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-36008"></a></a> style file + id="dx1-45008"></a></a> style file (<span class="ec-lmtt-10x-x-109">.xdy</span><a - id="dx1-36009"></a>) and parameters. -</p><!--l. 3830--><p class="indent" > To assist writing information to the <a - id="dx1-36010"></a><a + id="dx1-45009"></a>) and parameters. +</p><!--l. 4766--><p class="indent" > To assist writing information to the <a + id="dx1-45010"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-36011"></a></a> style file, the <span + id="dx1-45011"></a></a> style file, the <span class="ec-lmss-10x-x-109">glossaries</span> package provides the following commands: -</p><!--l. 3833--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4769--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsopenbrace</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-36012"></a> <span + id="dx1-45012"></a> <span class="ec-lmtt-10x-x-109">\glsopenbrace </span></div><hr> -</p><!--l. 3835--><p class="noindent" > -</p><!--l. 3836--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4771--><p class="noindent" > +</p><!--l. 4772--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsclosebrace</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-36013"></a> <span + id="dx1-45013"></a> <span class="ec-lmtt-10x-x-109">\glsclosebrace </span></div><hr> -</p><!--l. 3838--><p class="noindent" > +</p><!--l. 4774--><p class="noindent" > which produce an open and closing brace. (This is needed because <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\{</span></span></span> and <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\}</span></span></span> don’t expand to a simple brace character when written to a file.) -</p><!--l. 3843--><p class="indent" > In addition, if you are using a package that makes the double quote +</p><!--l. 4779--><p class="indent" > In addition, if you are using a package that makes the double quote character active (e.g. <span class="ec-lmss-10x-x-109">ngerman</span><a - id="dx1-36014"></a>) you can use: -</p><!--l. 3845--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="dx1-45014"></a>) you can use: +</p><!--l. 4781--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsquote</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-36015"></a> <span + id="dx1-45015"></a> <span class="ec-lmtt-10x-x-109">\glsquote{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3847--><p class="noindent" > +</p><!--l. 4783--><p class="noindent" > which will produce <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">"</span></span></span><span class="lmsy-10x-x-109">⟨</span><span @@ -9475,64 +11654,78 @@ the double-quote character. This document assumes that the double quote character has not been made active, so the examples just use <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">"</span></span></span> for clarity. -</p><!--l. 3853--><p class="indent" > If you want greater control over the <a - id="dx1-36016"></a><a +</p><!--l. 4789--><p class="indent" > If you want greater control over the <a + id="dx1-45016"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-36017"></a></a> style file than is available + id="dx1-45017"></a></a> style file than is available through the <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> commands provided by the <span class="ec-lmss-10x-x-109">glossaries </span>package, you will need to edit the <a - id="dx1-36018"></a><span + id="dx1-45018"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-36019"></a> style file. In which case, you must use <span + id="dx1-45019"></a> style file. In which case, you must use <span class="ec-lmtt-10x-x-109">\noist</span><a - id="dx1-36020"></a> + id="dx1-45020"></a> to prevent the style file from being overwritten by the <span -class="ec-lmss-10x-x-109">glossaries</span> -package. For additional information about <a - id="dx1-36021"></a><span +class="ec-lmss-10x-x-109">glossaries </span>package. +For additional information about <a + id="dx1-45021"></a><span +class="ec-lmtt-10x-x-109">xindy</span><a + id="dx1-45022"></a>, read the <a + id="dx1-45023"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-36022"></a>, read the <a - id="dx1-36023"></a><span + id="dx1-45024"></a> documentation. +I’m sorry I can’t provide any assistance with writing <a + id="dx1-45025"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-36024"></a> -documentation. + id="dx1-45026"></a> style files. +If you need help, I recommend you ask on the <a + id="dx1-45027"></a><span +class="ec-lmtt-10x-x-109">xindy</span><a + id="dx1-45028"></a> mailing list +(<a +href="http://xindy.sourceforge.net/mailing-list.html" class="url" ><span +class="ec-lmtt-10x-x-109">http://xindy.sourceforge.net/mailing-list.html</span></a>). </p> <h3 class="sectionHead"><span class="titlemark">11.1</span>  <a - id="x1-3700011.1"></a>Language and Encodings</h3> -<!--l. 3864--><p class="noindent" >When you use <a - id="dx1-37001"></a><a + id="sec:langenc"></a>Language and Encodings</h3> +<!--l. 4803--><p class="noindent" >When you use <a + id="dx1-46001"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-37002"></a></a>, you need to specify the language and encoding used + id="dx1-46002"></a></a>, you need to specify the language and encoding used (unless you have written your own custom <a - id="dx1-37003"></a><span + id="dx1-46003"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-37004"></a> style file that defines the + id="dx1-46004"></a> style file that defines the relevant alphabet and sort rules). If you use <a - id="dx1-37005"></a><a + id="dx1-46005"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-37006"></a></a>, this -information is obtained from the document’s auxiliary (<span -class="ec-lmtt-10x-x-109">.aux</span><a - id="dx1-37007"></a>) file. The -<span -class="ec-lmss-10x-x-109">glossaries </span>package attempts to find the root language, but in the event that + id="dx1-46006"></a></a>, this -it gets it wrong or if <a - id="dx1-37008"></a><span +information is obtained from the document’s auxiliary (<span +class="ec-lmtt-10x-x-109">.aux</span><a + id="dx1-46007"></a>) file. The +<a + id="dx1-46008"></a><a +href="#glo:makeglossaries"><span +class="ec-lmtt-10x-x-109">makeglossaries</span><a + id="dx1-46009"></a></a> script attempts to find the root language given your +document settings, but in the event that it gets it wrong or if <a + id="dx1-46010"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-37009"></a> doesn’t support that language, then you can -specify the language using: -</p><!--l. 3873--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="dx1-46011"></a> +doesn’t support that language, then you can specify the required language +using: +</p><!--l. 4812--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GlsSetXdyLanguage</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-37010"></a> <span + id="dx1-46012"></a> <span class="ec-lmtt-10x-x-109">\GlsSetXdyLanguage[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary type</span><span @@ -9543,7 +11736,7 @@ class="ec-lmri-10x-x-109">language</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 3875--><p class="noindent" > +</p><!--l. 4814--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">language</span><span @@ -9560,23 +11753,23 @@ class="ec-lmri-10x-x-109">glossary</span> <span class="ec-lmri-10x-x-109">type</span><span class="lmsy-10x-x-109">⟩</span>. -</p><!--l. 3883--><p class="indent" > If the <span +</p><!--l. 4822--><p class="indent" > If the <span class="ec-lmss-10x-x-109">inputenc</span><a - id="dx1-37011"></a> package is used, the encoding will be obtained from the + id="dx1-46013"></a> package is used, the encoding will be obtained from the value of <span class="ec-lmtt-10x-x-109">\inputencodingname</span><a - id="dx1-37012"></a>. Alternatively, you can specify the encoding + id="dx1-46014"></a>. Alternatively, you can specify the encoding using: -</p><!--l. 3886--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4825--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GlsSetXdyCodePage</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-37013"></a> <span + id="dx1-46015"></a> <span class="ec-lmtt-10x-x-109">\GlsSetXdyCodePage{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">code</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3888--><p class="noindent" > +</p><!--l. 4827--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">code</span><span @@ -9585,11 +11778,11 @@ class="lmsy-10x-x-109">⟩ </span>is the name of the encoding. For example: </p> - <div class="verbatim" id="verbatim-103"> + <div class="verbatim" id="verbatim-121"> \GlsSetXdyCodePage{utf8} </div> -<!--l. 3892--><p class="nopar" > -</p><!--l. 3894--><p class="indent" > Note that you can also specify the language and encoding using the +<!--l. 4831--><p class="nopar" > +</p><!--l. 4833--><p class="indent" > Note that you can also specify the language and encoding using the package option <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">xindy={language=</span></span></span><span class="lmsy-10x-x-109">⟨</span><span @@ -9605,170 +11798,192 @@ example: </p> - <div class="verbatim" id="verbatim-104"> + <div class="verbatim" id="verbatim-122"> \usepackage[xindy={language=english,codepage=utf8}]{glossaries} </div> -<!--l. 3900--><p class="nopar" > -</p><!--l. 3902--><p class="indent" > If you write your own custom <a - id="dx1-37014"></a><a +<!--l. 4839--><p class="nopar" > +</p><!--l. 4841--><p class="indent" > If you write your own custom <a + id="dx1-46016"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-37015"></a></a> style file that includes the language + id="dx1-46017"></a></a> style file that includes the language settings, you need to set the language to nothing: </p> - <div class="verbatim" id="verbatim-105"> + <div class="verbatim" id="verbatim-123"> \GlsSetXdyLanguage{} </div> -<!--l. 3907--><p class="nopar" > (and remember to use <span +<!--l. 4846--><p class="nopar" > (and remember to use <span class="ec-lmtt-10x-x-109">\noist</span><a - id="dx1-37016"></a> to prevent the style file from being + id="dx1-46018"></a> to prevent the style file from being overwritten). -</p><!--l. 3911--><p class="indent" > <div class="important" title="Important Note"> The commands <span +</p><!--l. 4850--><p class="indent" > <div class="important" title="Important Note"> The commands <span class="ec-lmtt-10x-x-109">\GlsSetXdyLanguage </span>and <span class="ec-lmtt-10x-x-109">\GlsSetXdyCodePage </span>have no effect if you don’t use <a - id="dx1-37017"></a><a + id="dx1-46019"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-37018"></a></a>. If you call <a - id="dx1-37019"></a><a + id="dx1-46020"></a></a>. If you call <a + id="dx1-46021"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-37020"></a></a> without + id="dx1-46022"></a></a> without <a - id="dx1-37021"></a><span + id="dx1-46023"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-37022"></a> you need to remember to set the language and encoding + id="dx1-46024"></a> you need to remember to set the language and encoding using the <span class="ec-lmtt-10x-x-109">-L </span>and <span class="ec-lmtt-10x-x-109">-C </span>switches. </div> -</p><!--l. 3917--><p class="noindent" > -</p><!--l. 3920--><p class="noindent" > +</p><!--l. 4856--><p class="noindent" > +</p><!--l. 4859--><p class="noindent" > </p> -<!--l. 3920--><p class="noindent" ><a +<!--l. 4859--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">11.2</span>  <a - id="x1-3800011.2"></a>Locations and Number lists</h3> -<!--l. 3923--><p class="noindent" >If you use <span + id="sec:xindyloc"></a>Locations and Number lists</h3> +<!--l. 4862--><p class="noindent" >If you use <span class="ec-lmss-10x-x-109">xindy</span><a - id="dx1-38001"></a>, the <span + id="dx1-47001"></a>, the <span class="ec-lmss-10x-x-109">glossaries </span>package needs to know which counters you will be using in the <a - id="dx1-38002"></a><a + id="dx1-47002"></a><a href="#glo:numberlist">number list<a - id="dx1-38003"></a></a> in order to correctly format the <a - id="dx1-38004"></a><a + id="dx1-47003"></a></a> in order to correctly format the <a + id="dx1-47004"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-38005"></a></a> style + id="dx1-47005"></a></a> style file. Counters specified using the <span class="ec-lmss-10x-x-109">counter</span><a - id="dx1-38006"></a> package option or the <span + id="dx1-47006"></a> package option or the <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">counter</span><span class="lmsy-10x-x-109">⟩</span> option of <span class="ec-lmtt-10x-x-109">\newglossary</span><a - id="dx1-38007"></a> are automatically taken care of, but if you plan to + id="dx1-47007"></a> are automatically taken care of, but if you plan to use a different counter in the <span class="ec-lmss-10x-x-109">counter</span><a - id="dx1-38008"></a> key for commands like <span + id="dx1-47008"></a> key for commands like <span class="ec-lmtt-10x-x-109">\glslink</span><a - id="dx1-38009"></a>, + id="dx1-47009"></a>, then you need to identify these counters <span class="ec-lmri-10x-x-109">before </span><span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-38010"></a> + id="dx1-47010"></a> using: -</p><!--l. 3931--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4870--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GlsAddXdyCounters</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-38011"></a> <span + id="dx1-47011"></a> <span class="ec-lmtt-10x-x-109">\GlsAddXdyCounters{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">counter list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3933--><p class="noindent" > +</p><!--l. 4872--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">counter list</span><span class="lmsy-10x-x-109">⟩ </span>is a comma-separated list of counter names. -</p><!--l. 3936--><p class="indent" > The most likely attributes used in the <span +</p><!--l. 4875--><p class="indent" > The most likely attributes used in the <span class="ec-lmss-10x-x-109">format</span><a - id="dx1-38012"></a> key (<span + id="dx1-47012"></a> key (<span class="ec-lmtt-10x-x-109">textrm</span><a - id="dx1-38013"></a>, <span + id="dx1-47013"></a>, <span class="ec-lmtt-10x-x-109">hyperrm</span><a - id="dx1-38014"></a> etc) + id="dx1-47014"></a> etc) are automatically added to the <a - id="dx1-38015"></a><a + id="dx1-47015"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-38016"></a></a> style file, but if you want to use + id="dx1-47016"></a></a> style file, but if you want to use another attribute, you need to add it using: -</p><!--l. 3940--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4879--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GlsAddXdyAttribute</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-38017"></a> <span + id="dx1-47017"></a> <span class="ec-lmtt-10x-x-109">\GlsAddXdyAttribute{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 3942--><p class="noindent" > +</p><!--l. 4881--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span class="lmsy-10x-x-109">⟩ </span>is the name of the attribute, as used in the <span class="ec-lmss-10x-x-109">format</span><a - id="dx1-38018"></a> key. For -example, suppose I want a bold, italic, hyperlinked location. I first need to -define a command that will do this: + id="dx1-47018"></a> +key. +<a + id="x1-47019r14"></a> +</p><!--l. 4885--><p class="noindent" ><span +class="ec-lmbx-12">Example 14</span><span +class="ec-lmbx-12"> (Custom Font for Displaying a Location)</span><a + id="x1-47020"></a> +</p><!--l. 4886--><p class="indent" > Suppose I want a bold, italic, hyperlinked location. I first need to define +a command that will do this: </p> - <div class="verbatim" id="verbatim-106"> + <div class="verbatim" id="verbatim-124"> \newcommand*{\hyperbfit}[1]{\textit{\hyperbf{#1}}} </div> -<!--l. 3949--><p class="nopar" > but with <a - id="dx1-38019"></a><a +<!--l. 4890--><p class="nopar" > but with <a + id="dx1-47021"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-38020"></a></a>, I also need to add this as an allowed attribute: + id="dx1-47022"></a></a>, I also need to add this as an allowed attribute: </p> - <div class="verbatim" id="verbatim-107"> + <div class="verbatim" id="verbatim-125"> \GlsAddXdyAttribute{hyperbfit} </div> -<!--l. 3954--><p class="nopar" > -</p><!--l. 3956--><p class="indent" > <div class="important" title="Important Note"> Note that <span +<!--l. 4895--><p class="nopar" > Now I can use it in the optional argument of commands like <span +class="ec-lmtt-10x-x-109">\gls</span><a + id="dx1-47023"></a>: + + + +</p> + <div class="verbatim" id="verbatim-126"> +Here is a \gls[format=hyperbfit]{sample} entry. +</div> +<!--l. 4900--><p class="nopar" > (where <span +class="ec-lmtt-10x-x-109">sample </span>is the label of the required entry). </p> +<div class="center" +> +<!--l. 4902--><p class="noindent" > +</p><!--l. 4902--><p class="noindent" >____________________________</p></div> +<!--l. 4904--><p class="indent" > <div class="important" title="Important Note"> Note that <span class="ec-lmtt-10x-x-109">\GlsAddXdyAttribute </span>has no effect if <span class="ec-lmtt-10x-x-109">\noist</span><a - id="dx1-38021"></a> is used or if + id="dx1-47024"></a> is used or if <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-38022"></a> is omitted. <span + id="dx1-47025"></a> is omitted. <span class="ec-lmtt-10x-x-109">\GlsAddXdyAttribute </span>must be used before <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-38023"></a>. Additionally, <span + id="dx1-47026"></a>. Additionally, <span class="ec-lmtt-10x-x-109">\GlsAddXdyCounters </span>must come before <span class="ec-lmtt-10x-x-109">\GlsAddXdyAttribute</span>. </div> -</p><!--l. 3962--><p class="noindent" > -</p><!--l. 3964--><p class="indent" > If the location numbers don’t get expanded to a simple Arabic or Roman +</p><!--l. 4910--><p class="noindent" > +</p><!--l. 4912--><p class="indent" > If the location numbers don’t get expanded to a simple Arabic or Roman number or a letter from a, …, z or A, …, Z, then you need to add a location style in the appropriate format using -</p><!--l. 3967--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4915--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\GlsAddXdyLocation</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-38024"></a> <span + id="dx1-47027"></a> <span class="ec-lmtt-10x-x-109">\GlsAddXdyLocation[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">prefix-location</span><span @@ -9783,7 +11998,7 @@ class="ec-lmri-10x-x-109">definition</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 3969--><p class="noindent" > +</p><!--l. 4917--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span @@ -9792,10 +12007,10 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">definition</span><span class="lmsy-10x-x-109">⟩ </span>is the <a - id="dx1-38025"></a><a + id="dx1-47028"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-38026"></a></a> definition. The optional argument <span + id="dx1-47029"></a></a> definition. The optional argument <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">prefix-location</span><span class="lmsy-10x-x-109">⟩ </span>is needed if @@ -9808,39 +12023,45 @@ class="ec-lmtt-10x-x-109">\the</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">counter</span><span class="lmsy-10x-x-109">⟩</span>. -</p><!--l. 3975--><p class="indent" > <div class="important" title="Important Note"> Note that <span +</p><!--l. 4923--><p class="indent" > <div class="important" title="Important Note"> Note that <span class="ec-lmtt-10x-x-109">\GlsAddXdyLocation </span>has no effect if <span class="ec-lmtt-10x-x-109">\noist</span><a - id="dx1-38027"></a> is used or if + id="dx1-47030"></a> is used or if <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-38028"></a> is omitted. <span + id="dx1-47031"></a> is omitted. <span class="ec-lmtt-10x-x-109">\GlsAddXdyLocation </span>must be used before <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-38029"></a>. </div> -</p><!--l. 3979--><p class="noindent" > -</p><!--l. 3981--><p class="indent" > For example, suppose I decide to use a somewhat eccentric numbering -system for sections that redefines <span + id="dx1-47032"></a>. </div> +</p><!--l. 4927--><p class="noindent" > +<a + id="x1-47033r15"></a> +</p><!--l. 4929--><p class="noindent" ><span +class="ec-lmbx-12">Example 15</span><span +class="ec-lmbx-12"> (Custom Numbering System for Locations)</span><a + id="x1-47034"></a> +</p><!--l. 4930--><p class="indent" > Suppose I decide to use a somewhat eccentric numbering system for +sections where I redefine <span class="ec-lmtt-10x-x-109">\thesection </span>as follows: </p> - <div class="verbatim" id="verbatim-108"> + <div class="verbatim" id="verbatim-127"> \renewcommand*{\thesection}{[\thechapter]\arabic{section}} </div> -<!--l. 3985--><p class="nopar" > If I haven’t done <span class="obeylines-h"><span class="verb"><span +<!--l. 4934--><p class="nopar" > If I haven’t done <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">counter=section</span></span></span> in the package option, I need to specify that the counter will be used as a location number: </p> - <div class="verbatim" id="verbatim-109"> + <div class="verbatim" id="verbatim-128"> \GlsAddXdyCounters{section} </div> -<!--l. 3991--><p class="nopar" > Next I need to add the location style (<span +<!--l. 4940--><p class="nopar" > Next I need to add the location style (<span class="ec-lmtt-10x-x-109">\thechapter </span>is assumed to be the standard <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\arabic{chapter}</span></span></span>): @@ -9848,67 +12069,77 @@ class="ec-lmtt-10x-x-109">\arabic{chapter}</span></span></span>): </p> - <div class="verbatim" id="verbatim-110"> + <div class="verbatim" id="verbatim-129"> \GlsAddXdyLocation{section}{:sep "[" "arabic-numbers" :sep "]"  <br />  "arabic-numbers"  <br />} </div> -<!--l. 3998--><p class="nopar" > Note that if I have further decided to use the <span +<!--l. 4947--><p class="nopar" > Note that if I have further decided to use the <span class="ec-lmss-10x-x-109">hyperref</span><a - id="dx1-38030"></a> package and want + id="dx1-47035"></a> package and want to redefine <span class="ec-lmtt-10x-x-109">\theHsection </span>as: </p> - <div class="verbatim" id="verbatim-111"> + <div class="verbatim" id="verbatim-130"> \renewcommand*{\theHsection}{\thepart.\thesection}  <br />\renewcommand*{\thepart}{\Roman{part}} </div> -<!--l. 4004--><p class="nopar" > then I need to modify the <span +<!--l. 4953--><p class="nopar" > then I need to modify the <span class="ec-lmtt-10x-x-109">\GlsAddXdyLocation </span>code above to: </p> - <div class="verbatim" id="verbatim-112"> + <div class="verbatim" id="verbatim-131"> \GlsAddXdyLocation["roman-numbers-uppercase"]{section}{:sep "["  <br />  "arabic-numbers" :sep "]" "arabic-numbers"  <br />} </div> -<!--l. 4010--><p class="nopar" > Since <span +<!--l. 4959--><p class="nopar" > Since <span class="ec-lmtt-10x-x-109">\Roman</span><a - id="dx1-38031"></a> will result in an empty string if the counter is zero, it’s a + id="dx1-47036"></a> will result in an empty string if the counter is zero, it’s a good idea to add an extra location to catch this: </p> - <div class="verbatim" id="verbatim-113"> + <div class="verbatim" id="verbatim-132"> \GlsAddXdyLocation{zero.section}{:sep "["  <br />  "arabic-numbers" :sep "]" "arabic-numbers"  <br />} </div> -<!--l. 4017--><p class="nopar" > The above example is illustrated in the accompanying sample file -<a -href="#x1-40001.1"><span +<!--l. 4966--><p class="nopar" > This example is illustrated in the sample file <a +href="#x1-6090r20"><span class="ec-lmtt-10x-x-109">samplexdy2.tex</span></a>. -</p><!--l. 4021--><p class="indent" > Another example: suppose you want the page numbers written as words -rather than digits and you use the <span +</p> +<div class="center" +> +<!--l. 4969--><p class="noindent" > +</p><!--l. 4969--><p class="noindent" >____________________________</p></div> +<a + id="x1-47037r16"></a> +<!--l. 4971--><p class="noindent" ><span +class="ec-lmbx-12">Example 16</span><span +class="ec-lmbx-12"> (Locations as Words not Digits)</span><a + id="x1-47038"></a> +</p><!--l. 4972--><p class="indent" > Suppose I want the page numbers written as words rather than digits +and I use the <span class="ec-lmss-10x-x-109">fmtcount</span><a - id="dx1-38032"></a> package to do this. You can -redefine <span + id="dx1-47039"></a> package to do this. I can redefine <span class="ec-lmtt-10x-x-109">\thepage</span><a - id="dx1-38033"></a> as follows: + id="dx1-47040"></a> as +follows: </p> - <div class="verbatim" id="verbatim-114"> + <div class="verbatim" id="verbatim-133"> \renewcommand*{\thepage}{\Numberstring{page}} </div> -<!--l. 4026--><p class="nopar" > This gets expanded to <span class="obeylines-h"><span class="verb"><span +<!--l. 4977--><p class="nopar" > This gets expanded to <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\protect</span><span class="ec-lmtt-10x-x-109"> \Numberstringnum</span><span class="ec-lmtt-10x-x-109"> </span></span></span><span @@ -9920,27 +12151,27 @@ class="ec-lmtt-10x-x-109">} </span>where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">n</span><span class="lmsy-10x-x-109">⟩ </span>is -the Arabic page number. This means that you need to define a new -location that has that form: +the Arabic page number. This means that I need to define a new location +that has that form: </p> - <div class="verbatim" id="verbatim-115"> + <div class="verbatim" id="verbatim-134"> \GlsAddXdyLocation{Numberstring}{:sep "\string\protect\space  <br />  \string\Numberstringnum\space\glsopenbrace"  <br />  "arabic-numbers" :sep "\glsclosebrace"} </div> -<!--l. 4034--><p class="nopar" > Note that it’s necessary to use <span +<!--l. 4985--><p class="nopar" > Note that it’s necessary to use <span class="ec-lmtt-10x-x-109">\space </span>to indicate that spaces also appear in the format, since, unlike <span class="TEX">T<span class="E">E</span>X</span>, <a - id="dx1-38034"></a><a + id="dx1-47041"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-38035"></a></a> doesn’t ignore spaces after control + id="dx1-47042"></a></a> doesn’t ignore spaces after control sequences. -</p><!--l. 4039--><p class="indent" > <span +</p><!--l. 4990--><p class="indent" > Note that <span class="ec-lmtt-10x-x-109">\GlsAddXdyLocation{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span @@ -9949,8 +12180,9 @@ class="ec-lmtt-10x-x-109">}{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">definition</span><span class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">} </span>will define commands -</p><!--l. 4041--><p class="indent" > <hr><div title="Definition"><span +class="ec-lmtt-10x-x-109">} </span>will define +commands in the form: +</p><!--l. 4993--><p class="indent" > <hr><div title="Definition"><span class="ec-lmtt-10x-x-109">\glsX</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">counter</span><span @@ -9968,26 +12200,26 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">location</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4042--><p class="noindent" > +</p><!--l. 4994--><p class="noindent" > for each counter that has been identified either by the <span class="ec-lmss-10x-x-109">counter</span><a - id="dx1-38036"></a> package + id="dx1-47043"></a> package option, the <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">counter</span><span class="lmsy-10x-x-109">⟩ </span>option for <span class="ec-lmtt-10x-x-109">\newglossary</span><a - id="dx1-38037"></a> or in the argument of + id="dx1-47044"></a> or in the argument of <span class="ec-lmtt-10x-x-109">\GlsAddXdyCounters</span><a - id="dx1-38038"></a>. -</p><!--l. 4047--><p class="indent" > The first argument <span + id="dx1-47045"></a>. +</p><!--l. 4999--><p class="indent" > The first argument <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">Hprefix</span><span class="lmsy-10x-x-109">⟩ </span>is only relevant when used with the <span class="ec-lmss-10x-x-109">hyperref</span><a - id="dx1-38039"></a> package and indicates that <span + id="dx1-47046"></a> package and indicates that <span class="ec-lmtt-10x-x-109">\the</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">Hcounter</span><span @@ -9999,25 +12231,25 @@ class="ec-lmtt-10x-x-109">\the</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">counter</span><span class="lmsy-10x-x-109">⟩</span>. The sample file <a -href="#x1-40001.1"><span +href="#x1-6071r19"><span class="ec-lmtt-10x-x-109">samplexdy.tex</span></a>, which comes with the <span class="ec-lmss-10x-x-109">glossaries </span>package, uses the default <span class="ec-lmss-10x-x-109">page</span><a - id="dx1-38040"></a> counter for locations, and + id="dx1-47047"></a> counter for locations, and it uses the default <span class="ec-lmtt-10x-x-109">\glsnumberformat</span><a - id="dx1-38041"></a> and a custom <span + id="dx1-47048"></a> and a custom <span class="ec-lmtt-10x-x-109">\hyperbfit</span> format. A new <a - id="dx1-38042"></a><a + id="dx1-47049"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-38043"></a></a> location called <span + id="dx1-47050"></a></a> location called <span class="ec-lmtt-10x-x-109">Numberstring</span>, as illustrated above, is defined to make the page numbers appear as “One”, “Two”, etc. In order for the location numbers to hyperlink to the relevant -pages, I need to redefine the necessary <span +pages, I need to redefine the necessary <span class="ec-lmtt-10x-x-109">\glsX</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">counter</span><span @@ -10031,7 +12263,7 @@ commands: </p> - <div class="verbatim" id="verbatim-116"> + <div class="verbatim" id="verbatim-135"> \renewcommand{\glsXpageXglsnumberformat}[2]{%  <br /> \linkpagenumber#2%  <br />} @@ -10040,11 +12272,15 @@ commands:  <br />}  <br />\newcommand{\linkpagenumber}[3]{\hyperlink{page.#3}{#1#2{#3}}} </div> -<!--l. 4068--><p class="nopar" > -</p><!--l. 4070--><p class="indent" > In the <a - id="dx1-38044"></a><a +<!--l. 5020--><p class="nopar" > </p> +<div class="center" +> +<!--l. 5021--><p class="noindent" > +</p><!--l. 5021--><p class="noindent" >____________________________</p></div> +<!--l. 5023--><p class="indent" > In the <a + id="dx1-47051"></a><a href="#glo:numberlist">number list<a - id="dx1-38045"></a></a>, the locations are sorted according to + id="dx1-47052"></a></a>, the locations are sorted according to type. The default ordering is: <span class="ec-lmtt-10x-x-109">roman-page-numbers </span>(e.g. i), <span @@ -10053,7 +12289,7 @@ class="ec-lmtt-10x-x-109">arabic-section-numbers </span>(e.g. 1.1 if the compositor is a full stop or 1-1 if the compositor is a hyphen<span class="footnote-mark"><a href="#fn1x13" id="fn1x13-bk"><sup class="textsuperscript">1</sup></a></span><a - id="x1-38046f1"></a>), + id="x1-47053f1"></a>), <span class="ec-lmtt-10x-x-109">alpha-page-numbers </span>(e.g. a), <span class="ec-lmtt-10x-x-109">Roman-page-numbers </span>(e.g. I), @@ -10063,31 +12299,31 @@ class="ec-lmtt-10x-x-109">Appendix-page-numbers </span>(e.g. A.1 if the Alpha compositor is a full stop or A-1 if the Alpha compositor is a hyphen<span class="footnote-mark"><a href="#fn2x13" id="fn2x13-bk"><sup class="textsuperscript">2</sup></a></span><a - id="x1-38048f2"></a>), + id="x1-47055f2"></a>), user defined location names (as specified by <span class="ec-lmtt-10x-x-109">\GlsAddXdyLocation</span><a - id="dx1-38050"></a> in the + id="dx1-47057"></a> in the order in which they were defined), <span class="ec-lmtt-10x-x-109">see </span>(cross-referenced entries). This ordering can be changed using: -</p><!--l. 4086--><p class="indent" > <span class="marginpar"><span +</p><!--l. 5039--><p class="indent" > <span class="marginpar"><span class="ec-lmtt-10">\GlsSetXdyLocationClassOrder</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-38051"></a> -</p><!--l. 4088--><p class="indent" > <hr><div title="Definition"><span + id="dx1-47058"></a> +</p><!--l. 5041--><p class="indent" > <hr><div title="Definition"><span class="ec-lmtt-10x-x-109">\GlsSetXdyLocationClassOrder{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">location names</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4089--><p class="noindent" > +</p><!--l. 5042--><p class="noindent" > where each location name is delimited by double quote marks and separated by white space. For example: </p> - <div class="verbatim" id="verbatim-117"> + <div class="verbatim" id="verbatim-136"> \GlsSetXdyLocationClassOrder{  <br />  "arabic-page-numbers"  <br />  "arabic-section-numbers" @@ -10099,8 +12335,8 @@ separated by white space. For example:  <br />  "see"  <br />} </div> -<!--l. 4103--><p class="nopar" > -</p><!--l. 4105--><p class="indent" > +<!--l. 5056--><p class="nopar" > +</p><!--l. 5058--><p class="indent" > <div class="important" title="Important Note">Note that <span @@ -10111,14 +12347,14 @@ effect if <span class="ec-lmtt-10x-x-109">\noist</span><a - id="dx1-38052"></a> + id="dx1-47059"></a> is used or if <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-38053"></a> + id="dx1-47060"></a> is omitted. <span @@ -10129,97 +12365,122 @@ used before <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-38054"></a>. + id="dx1-47061"></a>. </div> -</p><!--l. 4110--><p class="noindent" > -</p><!--l. 4112--><p class="indent" > If a <a - id="dx1-38055"></a><a +</p><!--l. 5063--><p class="noindent" > +</p><!--l. 5065--><p class="indent" > If a <a + id="dx1-47062"></a><a href="#glo:numberlist">number list<a - id="dx1-38056"></a></a> consists of a sequence of consecutive numbers, the + id="dx1-47063"></a></a> consists of a sequence of consecutive numbers, the range will be concatenated. The number of consecutive locations that causes a range formation defaults to 2, but can be changed using: -</p><!--l. 4116--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + + + +</p><!--l. 5070--><p class="indent" > <span class="marginpar"><span class="ec-lmtt-10">\GlsSetXdyMinRangeLength</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-38057"></a> <span + id="dx1-47064"></a> +</p><!--l. 5072--><p class="indent" > <hr><div title="Definition"><span class="ec-lmtt-10x-x-109">\GlsSetXdyMinRangeLength{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">n</span><span class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">}</span> -</div><hr> -</p><!--l. 4118--><p class="noindent" > +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 5073--><p class="noindent" > For example: </p> - <div class="verbatim" id="verbatim-118"> + <div class="verbatim" id="verbatim-137"> \GlsSetXdyMinRangeLength{3} </div> -<!--l. 4122--><p class="nopar" > The argument may also be the keyword <span +<!--l. 5077--><p class="nopar" > The argument may also be the keyword <span class="ec-lmtt-10x-x-109">none</span>, to indicate that there should be no range formations. See the <a - id="dx1-38058"></a><a + id="dx1-47065"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-38059"></a></a> manual for further details on + id="dx1-47066"></a></a> manual for further details on range formations. -</p><!--l. 4127--><p class="indent" > <div class="important" title="Important Note"> Note that <span -class="ec-lmtt-10x-x-109">\GlsSetXdyMinRangeLength </span>has no effect if <span +</p><!--l. 5082--><p class="indent" > +<div class="important" title="Important Note">Note +that +<span +class="ec-lmtt-10x-x-109">\GlsSetXdyMinRangeLength</span> +has +no +effect +if +<span class="ec-lmtt-10x-x-109">\noist</span><a - id="dx1-38060"></a> is used -or if <span + id="dx1-47067"></a> +is +used +or +if +<span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-38061"></a> is omitted. <span -class="ec-lmtt-10x-x-109">\GlsSetXdyMinRangeLength </span>must be -used before <span + id="dx1-47068"></a> +is +omitted. +<span +class="ec-lmtt-10x-x-109">\GlsSetXdyMinRangeLength</span> +must +be +used +before +<span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-38062"></a>. </div> -</p><!--l. 4132--><p class="noindent" > -</p><!--l. 4134--><p class="indent" > See <a -href="#x1-270005">§5 </a><a -href="#x1-270005">Number lists<!--tex4ht:ref: sec:numberlists --></a> for further details. -</p><!--l. 4137--><p class="noindent" > + id="dx1-47069"></a>. +</div> +</p><!--l. 5087--><p class="noindent" > +</p><!--l. 5089--><p class="indent" > See <a +href="#sec:numberlists">§5 </a><a +href="#sec:numberlists">Number lists<!--tex4ht:ref: sec:numberlists --></a> for further details. </p> -<!--l. 4137--><p class="noindent" ><a +<!--l. 5092--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">11.3</span>  <a - id="x1-3900011.3"></a>Glossary Groups</h3> -<!--l. 4140--><p class="noindent" >The glossary is divided into groups according to the first letter of + id="sec:groups"></a>Glossary Groups</h3> +<!--l. 5095--><p class="noindent" >The glossary is divided into groups according to the first letter of the sort key. The <span class="ec-lmss-10x-x-109">glossaries </span>package also adds a number group by default, unless you suppress it in the <span class="ec-lmss-10x-x-109">xindy</span><a - id="dx1-39001"></a> package option. For + id="dx1-48001"></a> package option. For + + + example: </p> - <div class="verbatim" id="verbatim-119"> + <div class="verbatim" id="verbatim-138"> \usepackage[xindy={glsnumbers=false}]{glossaries} </div> -<!--l. 4146--><p class="nopar" > Any entry that doesn’t go in one of the letter groups or the number group +<!--l. 5101--><p class="nopar" > Any entry that doesn’t go in one of the letter groups or the number group is placed in the default group. -</p><!--l. 4150--><p class="indent" > If you have a number group, the default behaviour is to locate it before +</p><!--l. 5105--><p class="indent" > If you have a number group, the default behaviour is to locate it before the “A” letter group. If you are not using a Roman alphabet, you can change this using: -</p><!--l. 4154--><p class="indent" > <span class="marginpar"><span +</p><!--l. 5109--><p class="indent" > <span class="marginpar"><span class="ec-lmtt-10">\GlsSetXdyFirstLetterAfterDigits</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-39002"></a> -</p><!--l. 4156--><p class="indent" > <hr><div title="Definition"><span + id="dx1-48002"></a> +</p><!--l. 5111--><p class="indent" > <hr><div title="Definition"><span class="ec-lmtt-10x-x-109">\GlsSetXdyFirstLetterAfterDigits{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">letter</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4157--><p class="noindent" > -</p><!--l. 4159--><p class="indent" > +</p><!--l. 5112--><p class="noindent" > +</p><!--l. 5114--><p class="indent" > <div class="important" title="Important Note">Note that <span @@ -10230,14 +12491,14 @@ effect if <span class="ec-lmtt-10x-x-109">\noist</span><a - id="dx1-39003"></a> + id="dx1-48003"></a> is used or if <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-39004"></a> + id="dx1-48004"></a> is omitted. <span @@ -10248,21 +12509,21 @@ used before <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-39005"></a>. + id="dx1-48005"></a>. </div> -</p><!--l. 4164--><p class="noindent" > +</p><!--l. 5119--><p class="noindent" > </p> -<!--l. 4167--><p class="noindent" ><a +<!--l. 5121--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">12</span>  <a - id="x1-4000012"></a>Defining New Glossaries</h2> + id="sec:newglossary"></a>Defining New Glossaries</h2> A new glossary can be defined using: -<!--l. 4171--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 5125--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\newglossary</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-40001"></a> <span + id="dx1-49001"></a> <span class="ec-lmtt-10x-x-109">\newglossary[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">log-ext</span><span @@ -10290,7 +12551,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">counter</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4173--><p class="noindent" > +</p><!--l. 5127--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span @@ -10311,105 +12572,133 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">counter</span><span class="lmsy-10x-x-109">⟩ </span>specifies which counter to use for the associated <a - id="dx1-40002"></a><a + id="dx1-49002"></a><a href="#glo:numberlist">number list<a - id="dx1-40003"></a>s</a> (see also <a -href="#x1-270005">§5 </a><a -href="#x1-270005">Number + id="dx1-49003"></a>s</a> (see also <a +href="#sec:numberlists">§5 </a><a +href="#sec:numberlists">Number lists<!--tex4ht:ref: sec:numberlists --></a>). The first optional argument specifies the extension for the <a - id="dx1-40004"></a><a + id="dx1-49004"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-40005"></a></a> or <a - id="dx1-40006"></a><a + id="dx1-49005"></a></a> or <a + id="dx1-49006"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-40007"></a></a> transcript file (this information is only used by + id="dx1-49007"></a></a> transcript file (this information is only used by <a - id="dx1-40008"></a><a + id="dx1-49008"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-40009"></a></a> which picks up the information from the auxiliary + id="dx1-49009"></a></a> which picks up the information from the auxiliary file). -</p><!--l. 4185--><p class="indent" > Note that the main (default) glossary is automatically created +</p><!--l. 5139--><p class="indent" > Note that the main (default) glossary is automatically created as: </p> - <div class="verbatim" id="verbatim-120"> + <div class="verbatim" id="verbatim-139"> \newglossary{main}{gls}{glo}{\glossaryname} </div> -<!--l. 4188--><p class="nopar" > so it can be identified by the label <span +<!--l. 5142--><p class="nopar" > so it can be identified by the label <span class="ec-lmtt-10x-x-109">main </span>(unless the <span class="ec-lmss-10x-x-109">nomain</span><a - id="dx1-40010"></a> package + id="dx1-49010"></a> package option is used). Using the <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-40011"></a> package option is equivalent + id="dx1-49011"></a> package option is equivalent to: </p> - <div class="verbatim" id="verbatim-121"> + <div class="verbatim" id="verbatim-140"> \newglossary[alg]{acronym}{acr}{acn}{\acronymname} </div> -<!--l. 4194--><p class="nopar" > so it can be identified by the label <span +<!--l. 5148--><p class="nopar" > so it can be identified by the label <span class="ec-lmtt-10x-x-109">acronym</span>. If you are not sure whether the <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-40012"></a> option has been used, you can identify the list of acronyms by + id="dx1-49012"></a> option has been used, you can identify the list of acronyms by the command <span class="marginpar"><span class="ec-lmtt-10">\acronymtype</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-40013"></a><span + id="dx1-49013"></a><span class="ec-lmtt-10x-x-109">\acronymtype </span>which is set to <span class="ec-lmtt-10x-x-109">acronym</span>, if the <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-40014"></a> option has been used, otherwise it is set to <span + id="dx1-49014"></a> option has been used, otherwise it is set to <span class="ec-lmtt-10x-x-109">main</span>. Note that if you are using the main glossary as your list of acronyms, you need to declare it as a list of acronyms using the package option <span class="ec-lmss-10x-x-109">acronymlists</span><a - id="dx1-40015"></a>. -</p><!--l. 4205--><p class="indent" > <div class="important" title="Important Note"> All glossaries must be defined before <span + id="dx1-49015"></a>. +</p><!--l. 5159--><p class="indent" > The <span +class="ec-lmss-10x-x-109">symbols</span><a + id="dx1-49016"></a> package option creates a new glossary with the label +<span +class="ec-lmtt-10x-x-109">symbols </span>using: + + + +</p> + <div class="verbatim" id="verbatim-141"> +\newglossary[slg]{symbols}{sls}{slo}{\glssymbolsgroupname} +</div> +<!--l. 5163--><p class="nopar" > and the <span +class="ec-lmss-10x-x-109">numbers</span><a + id="dx1-49017"></a> package option creates a new glossary with the label +<span +class="ec-lmtt-10x-x-109">numbers </span>using: + + + +</p> + <div class="verbatim" id="verbatim-142"> +\newglossary[nlg]{numbers}{nls}{nlo}{\glsnumbersgroupname} +</div> +<!--l. 5168--><p class="nopar" > +</p><!--l. 5170--><p class="indent" > <div class="important" title="Important Note"> All glossaries must be defined before <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-40016"></a> to ensure that + id="dx1-49018"></a> to ensure that the relevant output files are opened. -</p><!--l. 4209--><p class="indent" > See <a -href="#x1-60001.2.1">§1.2.1 </a><a -href="#x1-60001.2.1">Changing the Fixed Names<!--tex4ht:ref: sec:fixednames --></a> if you want to redefine +</p><!--l. 5174--><p class="indent" > See <a +href="#sec:fixednames">§1.2.1 </a><a +href="#sec:fixednames">Changing the Fixed Names<!--tex4ht:ref: sec:fixednames --></a> if you want to redefine <span class="ec-lmtt-10x-x-109">\glossaryname</span>, especially if you are using <span class="ec-lmss-10x-x-109">babel</span><a - id="dx1-40017"></a> or <span + id="dx1-49019"></a> or <span class="ec-lmss-10x-x-109">translator</span><a - id="dx1-40018"></a>. </div> -</p><!--l. 4211--><p class="noindent" > + id="dx1-49020"></a>. (Similarly +for <span +class="ec-lmtt-10x-x-109">\glssymbolsgroupname </span>and <span +class="ec-lmtt-10x-x-109">\glsnumbersgroupname</span>.) </div> +</p><!--l. 5178--><p class="noindent" > </p> <h2 class="chapterHead"><span class="titlemark">13</span>  <a - id="x1-4100013"></a>Acronyms</h2> -<!--l. 4217--><p class="noindent" >You may have noticed in <a -href="#x1-190004">§4 </a><a -href="#x1-190004">Defining Glossary Entries<!--tex4ht:ref: sec:newglosentry --></a> that when you + id="sec:acronyms"></a>Acronyms</h2> +<!--l. 5183--><p class="noindent" >You may have noticed in <a +href="#sec:newglosentry">§4 </a><a +href="#sec:newglosentry">Defining Glossary Entries<!--tex4ht:ref: sec:newglosentry --></a> that when you specify a new entry, you can specify alternate text to use when the term is <a - id="dx1-41001"></a><a + id="dsec:intro"></a><a href="#glo:firstuse">first used</a> in the document. This provides a useful means to define acronyms. For convenience, the <span class="ec-lmss-10x-x-109">glossaries </span>package defines the command: -</p><!--l. 4222--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5188--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\newacronym</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41002"></a> <span + id="dx1-50002"></a> <span class="ec-lmtt-10x-x-109">\newacronym[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">key-val list</span><span @@ -10428,27 +12717,25 @@ class="ec-lmri-10x-x-109">long</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 4225--><p class="noindent" > -</p><!--l. 4227--><p class="indent" > This uses <span +</p><!--l. 5190--><p class="noindent" > +</p><!--l. 5192--><p class="indent" > This uses <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-41003"></a> to create an entry with the given label in + id="dx1-50003"></a> to create an entry with the given label in the glossary given by <span class="ec-lmtt-10x-x-109">\acronymtype</span><a - id="dx1-41004"></a>. Amongst other things, it sets up the + id="dx1-50004"></a>. Amongst other things, it sets up the <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-41005"></a> and <span + id="dx1-50005"></a> and <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-41006"></a> keys and, depending on the acronym style, may also use -<span -class="ec-lmtt-10x-x-109">\defdisplayfirst</span><a - id="dx1-41007"></a> and <span -class="ec-lmtt-10x-x-109">\defdisplay</span><a - id="dx1-41008"></a> (see <a -href="#x1-290006.1">§6.1 </a><a -href="#x1-290006.1">Changing the format of the -link text<!--tex4ht:ref: sec:glsdisplay --></a>). -</p><!--l. 4233--><p class="indent" > The optional argument <span + id="dx1-50006"></a> keys and, depending on the acronym style, may also +use <span +class="ec-lmtt-10x-x-109">\defglsentryfmt</span><a + id="dx1-50007"></a> (see <a +href="#sec:glsdisplay">§6.1 </a><a +href="#sec:glsdisplay">Changing the format of the link +text<!--tex4ht:ref: sec:glsdisplay --></a>). +</p><!--l. 5198--><p class="indent" > The optional argument <span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">key-val list</span><span @@ -10456,9 +12743,9 @@ class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span>allows you to specify keys such as <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-41009"></a> (when used with the <span + id="dx1-50008"></a> (when used with the <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-41010"></a> package option, described + id="dx1-50009"></a> package option, described below) or you can override plural forms of <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span @@ -10468,31 +12755,31 @@ class="ec-lmri-10x-x-109">long</span><span class="lmsy-10x-x-109">⟩ </span>using the <span class="ec-lmss-10x-x-109">shortplural</span><a - id="dx1-41011"></a> or <span + id="dx1-50010"></a> or <span class="ec-lmss-10x-x-109">longplural</span><a - id="dx1-41012"></a> keys. For example: + id="dx1-50011"></a> keys. For example: </p> - <div class="verbatim" id="verbatim-122"> + <div class="verbatim" id="verbatim-143"> \newacronym[longplural={diagonal matrices}]{dm}{DM}{diagonal  <br />matrix} </div> -<!--l. 4242--><p class="nopar" > If the <a - id="dx1-41013"></a><a +<!--l. 5207--><p class="nopar" > If the <a + id="dx1-50012"></a><a href="#glo:firstuse">first use</a> uses the plural form, <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glspl{dm}</span></span></span> will display: diagonal matrices (DMs). -</p><!--l. 4247--><p class="indent" > The following package options are available to change the acronym +</p><!--l. 5212--><p class="indent" > The following package options are available to change the acronym style: </p><dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">description</span><a - id="dx1-41014"></a> </dt><dd + id="dx1-50013"></a> </dt><dd class="description">With this package option, the <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-41015"></a> key needs to be + id="dx1-50014"></a> key needs to be set in the optional argument <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">key-val list</span><span @@ -10504,13 +12791,13 @@ class="ec-lmri-10x-x-109">long</span><span class="lmsy-10x-x-109">⟩ </span>is put in the <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-41016"></a> key.) + id="dx1-50015"></a> key.) </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">footnote</span><a - id="dx1-41017"></a> </dt><dd + id="dx1-50016"></a> </dt><dd class="description">With this package option, on <a - id="dx1-41018"></a><a + id="dx1-50017"></a><a href="#glo:firstuse">first use</a> the long form <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span @@ -10521,21 +12808,21 @@ class="lmsy-10x-x-109">⟩ </span>is - <div class="verbatim" id="verbatim-123"> + <div class="verbatim" id="verbatim-144"> \let\acrfootnote\acrnolinkfootnote </div> - <!--l. 4264--><p class="nopar" > + <!--l. 5229--><p class="nopar" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">smallcaps</span><a - id="dx1-41019"></a> </dt><dd + id="dx1-50018"></a> </dt><dd class="description">With this package option, the short form <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩ </span>is typeset using <span class="ec-lmtt-10x-x-109">\textsc</span><a - id="dx1-41020"></a>. (Recall that <span + id="dx1-50019"></a>. (Recall that <span class="ec-lmtt-10x-x-109">\textsc </span>converts lower case characters into small capitals and leaves upper case characters as they are. Therefore, you need to have lower case characters in <span @@ -10543,83 +12830,96 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩ </span>for this option to have an effect.) - </dd><dt class="description"> + <!--l. 5238--><p class="noindent" ><a + id="boldsc"></a> + </p><!--l. 5239--><p class="noindent" ><div class="important" title="Important Note">Some fonts don’t support bold smallcaps, so you may need to redefine + <span +class="ec-lmtt-10x-x-109">\glsnamefont</span><a + id="dx1-50020"></a> (see <a +href="#sec:printglossary">§10 </a><a +href="#sec:printglossary">Displaying a glossary<!--tex4ht:ref: sec:printglossary --></a>) to switch to medium + weight if you are using a glossary style that displays entry names in + bold. </div> + </p><!--l. 5244--><p class="noindent" > + </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">smaller</span><a - id="dx1-41021"></a> </dt><dd + id="dx1-50021"></a> </dt><dd class="description">This is similar to <span class="ec-lmss-10x-x-109">smallcaps</span><a - id="dx1-41022"></a>, except that <span + id="dx1-50022"></a>, except that <span class="ec-lmtt-10x-x-109">\textsmaller</span><a - id="dx1-41023"></a> is used + id="dx1-50023"></a> is used instead of <span class="ec-lmtt-10x-x-109">\textsc</span><a - id="dx1-41024"></a>. Note that the <span -class="ec-lmss-10x-x-109">glossaries </span>package doesn’t define - <span + id="dx1-50024"></a>. Note that the <span +class="ec-lmss-10x-x-109">glossaries </span>package doesn’t + define <span class="ec-lmtt-10x-x-109">\textsmaller</span><a - id="dx1-41025"></a> nor does it load any package that does so. If you use - this option, you must make sure <span + id="dx1-50025"></a> nor does it load any package that does + so. + <!--l. 5252--><p class="noindent" ><div class="important" title="Important Note"> If you use this option, you must make sure <span class="ec-lmtt-10x-x-109">\textsmaller</span><a - id="dx1-41026"></a> is defined (for - example by loading <span + id="dx1-50026"></a> is defined + (for example by loading <span class="ec-lmss-10x-x-109">relsize</span><a - id="dx1-41027"></a>). - </dd><dt class="description"> + id="dx1-50027"></a>). </div> + </p><!--l. 5255--><p class="noindent" > + </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">dua</span><a - id="dx1-41028"></a> </dt><dd + id="dx1-50028"></a> </dt><dd class="description">This option will set both the <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-41029"></a> and <span + id="dx1-50029"></a> and <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-41030"></a> keys to the long form + id="dx1-50030"></a> keys to the long form <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span class="lmsy-10x-x-109">⟩</span>.</dd></dl> -<!--l. 4285--><p class="indent" > If you want to define your own custom acronym style, see <a -href="#x1-4400013.3">§13.3 </a><a -href="#x1-4400013.3">Defining +<!--l. 5262--><p class="indent" > If you want to define your own custom acronym style, see <a +href="#sec:customacronym">§13.3 </a><a +href="#sec:customacronym">Defining A Custom Acronym Style<!--tex4ht:ref: sec:customacronym --></a>. -</p><!--l. 4288--><p class="indent" > <div class="important" title="Important Note"> If you try using <span +</p><!--l. 5265--><p class="indent" > <div class="important" title="Important Note"> If you try using <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-41031"></a> for entries in a designated list of + id="dx1-50031"></a> for entries in a designated list of acronyms in combination with any of the above named package options -you are likely to get unexpected results such as empty brackets or empty +you may get unexpected results such as empty brackets or empty footnotes. -</p><!--l. 4294--><p class="indent" > If you don’t intend to use <span +</p><!--l. 5271--><p class="indent" > If you don’t intend to use <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-41032"></a> you should skip this section] and + id="dx1-50032"></a> you should skip this section and not use the above package options. </div> -</p><!--l. 4296--><p class="noindent" > -</p><!--l. 4298--><p class="indent" > As mentioned in <a -href="#x1-140002.2">§2.2 </a><a -href="#x1-140002.2">Sectioning, Headings and TOC Options<!--tex4ht:ref: sec:pkgopts-sec --></a>, the + + + +</p><!--l. 5273--><p class="noindent" > +</p><!--l. 5275--><p class="indent" > As mentioned in <a +href="#sec:pkgopts-sec">§2.2 </a><a +href="#sec:pkgopts-sec">Sectioning, Headings and TOC Options<!--tex4ht:ref: sec:pkgopts-sec --></a>, the command <span class="ec-lmtt-10x-x-109">\acronymtype</span><a - id="dx1-41033"></a> is the name of the glossary in which the acronyms -should appear. If the <span + id="dx1-50033"></a> is the name of the glossary in which the acronyms +should appear by default. If the <span class="ec-lmss-10x-x-109">acronym</span><a - id="dx1-41034"></a> package option has been used, this -will be <span + id="dx1-50034"></a> package option has been used, +this will be <span class="ec-lmtt-10x-x-109">acronym</span>, otherwise it will be <span class="ec-lmtt-10x-x-109">main</span>. The acronyms can then be used in exactly the same way as any other glossary entry. If you want more than one list of acronyms, you must identify the others using the package options <span class="ec-lmss-10x-x-109">acronymlists</span><a - id="dx1-41035"></a>. This ensures that + id="dx1-50035"></a>. This ensures that options such as <span class="ec-lmss-10x-x-109">footnote</span><a - id="dx1-41036"></a> and <span + id="dx1-50036"></a> and <span class="ec-lmss-10x-x-109">smallcaps</span><a - id="dx1-41037"></a> work for the additional lists of + id="dx1-50037"></a> work for the additional lists of acronyms. - - - -</p><!--l. 4308--><p class="indent" > +</p><!--l. 5285--><p class="indent" > <div class="important" title="Important Note">Since <span class="ec-lmtt-10x-x-109">\newacronym</span> @@ -10639,7 +12939,7 @@ definitions using <span class="ec-lmtt-10x-x-109">\loadglsentries</span><a - id="dx1-41038"></a><span + id="dx1-50038"></a><span class="ec-lmtt-10x-x-109">[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">type</span><span @@ -10666,6 +12966,9 @@ you explicitly set the + + + type as <span class="obeylines-h"><span class="verb"><span @@ -10677,100 +12980,107 @@ argument to <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-41039"></a>. + id="dx1-50039"></a>. See <a -href="#x1-250004.4">§4.4 - - - +href="#sec:loadglsentries">§4.6 </a><a -href="#x1-250004.4">Loading +href="#sec:loadglsentries">Loading Entries From a File<!--tex4ht:ref: sec:loadglsentries --></a>. </div> -</p><!--l. 4315--><p class="noindent" > -</p><!--l. 4317--><p class="indent" > Since <span +</p><!--l. 5292--><p class="noindent" > +</p><!--l. 5294--><p class="indent" > Since <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-41040"></a> uses <span + id="dx1-50040"></a> uses <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-41041"></a>, you can use commands + id="dx1-50041"></a>, you can use commands like <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-41042"></a> and <span + id="dx1-50042"></a> and <span class="ec-lmtt-10x-x-109">\glsreset</span><a - id="dx1-41043"></a> as with any other glossary entry. -</p><!--l. 4321--><p class="indent" > For example, the following defines the acronym IDN: + id="dx1-50043"></a> as with any other glossary entry. +<a + id="x1-50044r17"></a> +</p><!--l. 5298--><p class="noindent" ><span +class="ec-lmbx-12">Example 17</span><span +class="ec-lmbx-12"> (Defining an Acronym)</span><a + id="x1-50045"></a> +</p><!--l. 5299--><p class="indent" > The following defines the acronym IDN: </p> - <div class="verbatim" id="verbatim-124"> + <div class="verbatim" id="verbatim-145"> \newacronym{idn}{IDN}{identification number} </div> -<!--l. 4324--><p class="nopar" > <span class="obeylines-h"><span class="verb"><span +<!--l. 5302--><p class="nopar" > <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls{idn}</span></span></span> will produce “identification number (IDN)” on <a - id="dx1-41044"></a><a + id="dx1-50046"></a><a href="#glo:firstuse">first use</a> and “IDN” on subsequent uses. If you want to use the <span class="ec-lmss-10x-x-109">smallcaps</span><a - id="dx1-41045"></a> package + id="dx1-50047"></a> package option, you need to use lower case characters for the shortened form: </p> - <div class="verbatim" id="verbatim-125"> + <div class="verbatim" id="verbatim-146"> \newacronym{idn}{idn}{identification number} </div> -<!--l. 4331--><p class="nopar" > Now <span class="obeylines-h"><span class="verb"><span +<!--l. 5309--><p class="nopar" > Now <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls{idn}</span></span></span> will produce “identification number (<span class="ec-lmcsc-10x-x-109">idn</span>)” on <a - id="dx1-41046"></a><a + id="dx1-50048"></a><a href="#glo:firstuse">first use</a> and “<span -class="ec-lmcsc-10x-x-109">IDN</span>” on subsequent uses. -</p><!--l. 4336--><p class="indent" > If you use any of the package options <span +class="ec-lmcsc-10x-x-109">IDN</span>” on subsequent uses. </p> +<div class="center" +> +<!--l. 5313--><p class="noindent" > +</p><!--l. 5313--><p class="noindent" >____________________________</p></div> +<!--l. 5315--><p class="indent" > If you use any of the package options <span class="ec-lmss-10x-x-109">smallcaps</span><a - id="dx1-41047"></a>, <span + id="dx1-50049"></a>, <span class="ec-lmss-10x-x-109">smaller</span><a - id="dx1-41048"></a>, <span + id="dx1-50050"></a>, <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-41049"></a> or + id="dx1-50051"></a> or <span class="ec-lmss-10x-x-109">footnote</span><a - id="dx1-41050"></a>, the short form <span + id="dx1-50052"></a>, the short form <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩ </span>will be displayed in the document using: -</p><!--l. 4339--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5318--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\acronymfont</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41051"></a> <span + id="dx1-50053"></a> <span class="ec-lmtt-10x-x-109">\acronymfont{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4341--><p class="noindent" > +</p><!--l. 5320--><p class="noindent" > and -</p><!--l. 4343--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5322--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\firstacronymfont</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41052"></a> <span + id="dx1-50054"></a> <span class="ec-lmtt-10x-x-109">\firstacronymfont{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4345--><p class="noindent" > +</p><!--l. 5324--><p class="noindent" > where <span class="ec-lmtt-10x-x-109">\firstacronymfont </span>is applied on <a - id="dx1-41053"></a><a + id="dx1-50055"></a><a href="#glo:firstuse">first use</a> and <span class="ec-lmtt-10x-x-109">\acronymfont </span>is applied on subsequent use. Note that if you don’t use any of the @@ -10780,56 +13090,57 @@ class="ec-lmtt-10x-x-109">\acronymfont </span>or class="ec-lmtt-10x-x-109">\firstacronymfont </span>will have no effect. In this case, the recommended route is to use either the <span class="ec-lmss-10x-x-109">smaller</span><a - id="dx1-41054"></a> or the <span + id="dx1-50056"></a> or the <span class="ec-lmss-10x-x-109">smallcaps</span><a - id="dx1-41055"></a> package option and + id="dx1-50057"></a> package option and redefine <span class="ec-lmtt-10x-x-109">\acronymfont </span>and <span class="ec-lmtt-10x-x-109">\firstacronymfont </span>as required. (The <span class="ec-lmss-10x-x-109">smallcaps</span><a - id="dx1-41056"></a> option sets the default plural suffix in an upright font to cancel + id="dx1-50058"></a> option sets the default plural suffix in an upright font to cancel the effect of <span class="ec-lmtt-10x-x-109">\textsc</span><a - id="dx1-41057"></a>, whereas <span + id="dx1-50059"></a>, whereas <span class="ec-lmss-10x-x-109">smaller</span><a - id="dx1-41058"></a> sets the suffix in the surrounding + id="dx1-50060"></a> sets the suffix in the surrounding font.) For example, if you want acronyms in a normal font on <a - id="dx1-41059"></a><a + id="dx1-50061"></a><a href="#glo:firstuse">first use</a> and emphasized on subsequent use, do: </p> - <div class="verbatim" id="verbatim-126"> + <div class="verbatim" id="verbatim-147"> \usepackage[smaller]{glossaries}  <br />\renewcommand*{\firstacronymfont}[1]{#1}  <br />\renewcommand*{\acronymfont}[1]{\emph{#1}} </div> -<!--l. 4362--><p class="nopar" > (Note that it is for this reason that the <span +<!--l. 5341--><p class="nopar" > (Note that it is for this reason that the <span class="ec-lmss-10x-x-109">relsize</span><a - id="dx1-41060"></a> package is not automatically + id="dx1-50062"></a> package is not automatically loaded when selecting the <span class="ec-lmss-10x-x-109">smaller</span><a - id="dx1-41061"></a> package option.) -</p><!--l. 4367--><p class="indent" > There are commands analogous to <span + id="dx1-50063"></a> package option as it may not actually be +required.) +</p><!--l. 5346--><p class="indent" > There are commands analogous to <span class="ec-lmtt-10x-x-109">\glstext</span><a - id="dx1-41062"></a> (described in <a -href="#x1-280006">§6 </a><a -href="#x1-280006">Links to + id="dx1-50064"></a> (described in <a +href="#sec:glslink">§6 </a><a +href="#sec:glslink">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a>) that allow you to access just the short form, just the long form or the full form, without affecting the <a - id="dx1-41063"></a><a + id="dx1-50065"></a><a href="#glo:firstuseflag">first use flag</a>. (Note that the full form isn’t necessarily the same as the text produced on <a - id="dx1-41064"></a><a + id="dx1-50066"></a><a href="#glo:firstuse">first use</a>.) -</p><!--l. 4373--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5352--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\acrshort</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41065"></a> <span + id="dx1-50067"></a> <span class="ec-lmtt-10x-x-109">\acrshort[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -10843,20 +13154,20 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4375--><p class="noindent" > +</p><!--l. 5354--><p class="noindent" > This displays the short form for the entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>. The optional arguments are the same as those for <span class="ec-lmtt-10x-x-109">\glstext</span><a - id="dx1-41066"></a>. There is also a starred + id="dx1-50068"></a>. There is also a starred version to suppress the hyperlink. There are also analogous upper case variants: -</p><!--l. 4380--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5359--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Acrshort</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41067"></a> <span + id="dx1-50069"></a> <span class="ec-lmtt-10x-x-109">\Acrshort[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -10870,11 +13181,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4382--><p class="noindent" > -</p><!--l. 4383--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5361--><p class="noindent" > +</p><!--l. 5362--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ACRshort</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41068"></a> <span + id="dx1-50070"></a> <span class="ec-lmtt-10x-x-109">\ACRshort[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -10888,11 +13199,67 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4385--><p class="noindent" > -</p><!--l. 4387--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5364--><p class="noindent" > +There are also plural versions: +</p><!--l. 5366--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\acrshortpl</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-50071"></a> <span +class="ec-lmtt-10x-x-109">\acrshortpl[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> +</p><!--l. 5368--><p class="noindent" > +</p><!--l. 5369--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\Acrshortpl</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-50072"></a> <span +class="ec-lmtt-10x-x-109">\Acrshortpl[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> +</p><!--l. 5371--><p class="noindent" > +</p><!--l. 5372--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\ACRshortpl</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-50073"></a> <span +class="ec-lmtt-10x-x-109">\ACRshortpl[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> +</p><!--l. 5374--><p class="noindent" > +</p><!--l. 5376--><p class="indent" > Similarly for the long form: +</p><!--l. 5377--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\acrlong</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41069"></a> <span + id="dx1-50074"></a> <span class="ec-lmtt-10x-x-109">\acrlong[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -10906,17 +13273,17 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4389--><p class="noindent" > +</p><!--l. 5379--><p class="noindent" > This displays the long form for the entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>. The optional arguments are the same as before. There is also a starred version to suppress the hyperlink. There are also analogous upper case variants: -</p><!--l. 4394--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5384--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Acrlong</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41070"></a> <span + id="dx1-50075"></a> <span class="ec-lmtt-10x-x-109">\Acrlong[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -10930,11 +13297,14 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4396--><p class="noindent" > -</p><!--l. 4397--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + + + +</p><!--l. 5386--><p class="noindent" > +</p><!--l. 5387--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ACRlong</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41071"></a> <span + id="dx1-50076"></a> <span class="ec-lmtt-10x-x-109">\ACRlong[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -10948,11 +13318,67 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4399--><p class="noindent" > -</p><!--l. 4401--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5389--><p class="noindent" > +Again there are also plural versions: +</p><!--l. 5391--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\acrlongpl</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-50077"></a> <span +class="ec-lmtt-10x-x-109">\acrlongpl[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> +</p><!--l. 5393--><p class="noindent" > +</p><!--l. 5394--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\Acrlongpl</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-50078"></a> <span +class="ec-lmtt-10x-x-109">\Acrlongpl[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> +</p><!--l. 5396--><p class="noindent" > +</p><!--l. 5397--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\ACRlongpl</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-50079"></a> <span +class="ec-lmtt-10x-x-109">\ACRlongpl[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> +</p><!--l. 5399--><p class="noindent" > +</p><!--l. 5401--><p class="indent" > And for the full form: +</p><!--l. 5402--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\acrfull</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41072"></a> <span + id="dx1-50080"></a> <span class="ec-lmtt-10x-x-109">\acrfull[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -10966,35 +13392,58 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4403--><p class="noindent" > -This is equivalent to: <span class="marginpar"><span -class="ec-lmtt-10">\acrfullformat</span><span -class="ec-lmtt-10"> </span></span><a - id="dx1-41073"></a><span -class="ec-lmtt-10x-x-109">\acrfullformat</span><span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">{</span></span></span><span -class="ec-lmtt-10x-x-109">\acrlong</span><a - id="dx1-41074"></a><span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">}{</span></span></span><span -class="ec-lmtt-10x-x-109">\acrshort</span><a - id="dx1-41075"></a><span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">}</span></span></span>. +</p><!--l. 5404--><p class="noindent" > This defaults to <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span class="lmsy-10x-x-109">⟩ </span>(<span class="ec-lmtt-10x-x-109">\acronymfont</span><a - id="dx1-41076"></a><span + id="dx1-50081"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">short</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span>) regardless of the package -options. There are also analogous upper case variants: -</p><!--l. 4409--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +options. This format can be changed by redefining: +</p><!--l. 5408--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\acrfullformat</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-50082"></a> <span +class="ec-lmtt-10x-x-109">\acrfullformat{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">long</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">short</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 5410--><p class="noindent" > +For example, to change <span +class="ec-lmtt-10x-x-109">\acrfull </span>to produce <span +class="ec-lmtt-10x-x-109">\acronymfont{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">short</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}</span> +(<span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">long</span><span +class="lmsy-10x-x-109">⟩</span>) you can redefine <span +class="ec-lmtt-10x-x-109">\acrfullformat </span>as: + + + +</p> + <div class="verbatim" id="verbatim-148"> +\renewcommand{\acrfullformat}[2]{#2\space(#1)} +</div> +<!--l. 5416--><p class="nopar" > +</p><!--l. 5418--><p class="indent" > There are also analogous upper case variants: +</p><!--l. 5419--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Acrfull</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41077"></a> <span + id="dx1-50083"></a> <span class="ec-lmtt-10x-x-109">\Acrfull[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -11008,14 +13457,11 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> - - - -</p><!--l. 4411--><p class="noindent" > -</p><!--l. 4412--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5421--><p class="noindent" > +</p><!--l. 5422--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ACRfull</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41078"></a> <span + id="dx1-50084"></a> <span class="ec-lmtt-10x-x-109">\ACRfull[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">options</span><span @@ -11029,18 +13475,73 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4414--><p class="noindent" > -</p><!--l. 4416--><p class="indent" > If you find the above commands too cumbersome to write, you can use +</p><!--l. 5424--><p class="noindent" > +As before there are also plural versions: +</p><!--l. 5426--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\acrfullpl</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-50085"></a> <span +class="ec-lmtt-10x-x-109">\acrfullpl[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> +</p><!--l. 5428--><p class="noindent" > +</p><!--l. 5429--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\Acrfullpl</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-50086"></a> <span +class="ec-lmtt-10x-x-109">\Acrfullpl[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> +</p><!--l. 5431--><p class="noindent" > +</p><!--l. 5432--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\ACRfullpl</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-50087"></a> <span +class="ec-lmtt-10x-x-109">\ACRfullpl[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> +</p><!--l. 5434--><p class="noindent" > +</p><!--l. 5436--><p class="indent" > If you find the above commands too cumbersome to write, you can use the <span class="ec-lmss-10x-x-109">shortcuts</span><a - id="dx1-41079"></a> package option to activate the shorter command names listed + id="dx1-50088"></a> package option to activate the shorter command names listed in <a -href="#x1-410801">table 13.1</a>. +href="#x1-500891">table 13.1</a>. -</p><!--l. 4420--><p class="indent" > <a - id="x1-410801"></a></p><hr class="float" /><div class="float" +</p><!--l. 5440--><p class="indent" > <a + id="x1-500891"></a></p><hr class="float" /><div class="float" > @@ -11049,309 +13550,316 @@ href="#x1-410801">table 13.1</a>. ><tr style="vertical-align:baseline;" class="caption"><td class="id">Table 13.1: </td><td class="content">Synonyms provided by the package option <span class="ec-lmss-10x-x-109">shortcuts</span><a - id="dx1-41081"></a></td></tr></table></div><!--tex4ht:label?: x1-410801 --> -<div class="tabular"> <table id="TBL-6" class="tabular" + id="dx1-50090"></a></td></tr></table></div><!--tex4ht:label?: x1-500891 --> +<div class="tabular"> <table id="TBL-7" class="tabular" cellspacing="0" cellpadding="0" -><colgroup id="TBL-6-1g"><col -id="TBL-6-1" /><col -id="TBL-6-2" /></colgroup><tr - style="vertical-align:baseline;" id="TBL-6-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-1-1" +><colgroup id="TBL-7-1g"><col +id="TBL-7-1" /><col +id="TBL-7-2" /></colgroup><tr + style="vertical-align:baseline;" id="TBL-7-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-1-1" class="td11"> <span -class="ec-lmbx-10x-x-109">Shortcut Command </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-6-1-2" +class="ec-lmbx-10x-x-109">Shortcut Command </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-7-1-2" class="td11"> <span class="ec-lmbx-10x-x-109">Equivalent Command </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-6-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-2-1" + style="vertical-align:baseline;" id="TBL-7-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-2-1" class="td11"> <span class="ec-lmtt-10x-x-109">\acs</span><a - id="dx1-41082"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-2-2" + id="dx1-50091"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-2-2" class="td11"> <span class="ec-lmtt-10x-x-109">\acrshort</span><a - id="dx1-41083"></a> </td> + id="dx1-50092"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-6-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-3-1" + style="vertical-align:baseline;" id="TBL-7-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-3-1" class="td11"> <span class="ec-lmtt-10x-x-109">\Acs</span><a - id="dx1-41084"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-3-2" + id="dx1-50093"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-3-2" class="td11"> <span class="ec-lmtt-10x-x-109">\Acrshort</span><a - id="dx1-41085"></a> </td> + id="dx1-50094"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-6-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-4-1" + style="vertical-align:baseline;" id="TBL-7-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-4-1" class="td11"> <span class="ec-lmtt-10x-x-109">\acsp</span><a - id="dx1-41086"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-4-2" + id="dx1-50095"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-4-2" class="td11"> <span class="ec-lmtt-10x-x-109">\acrshortpl</span><a - id="dx1-41087"></a> </td> + id="dx1-50096"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-6-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-5-1" + style="vertical-align:baseline;" id="TBL-7-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-5-1" class="td11"> <span class="ec-lmtt-10x-x-109">\Acsp</span><a - id="dx1-41088"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-5-2" + id="dx1-50097"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-5-2" class="td11"> <span class="ec-lmtt-10x-x-109">\Acrshortpl</span><a - id="dx1-41089"></a> </td> + id="dx1-50098"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-6-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-6-1" + style="vertical-align:baseline;" id="TBL-7-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-6-1" class="td11"> <span class="ec-lmtt-10x-x-109">\acl</span><a - id="dx1-41090"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-6-2" + id="dx1-50099"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-6-2" class="td11"> <span class="ec-lmtt-10x-x-109">\acrlong</span><a - id="dx1-41091"></a> </td> + id="dx1-50100"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-6-7-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-7-1" + style="vertical-align:baseline;" id="TBL-7-7-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-7-1" class="td11"> <span class="ec-lmtt-10x-x-109">\Acl</span><a - id="dx1-41092"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-7-2" + id="dx1-50101"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-7-2" class="td11"> <span class="ec-lmtt-10x-x-109">\Acrlong</span><a - id="dx1-41093"></a> </td> + id="dx1-50102"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-6-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-8-1" + style="vertical-align:baseline;" id="TBL-7-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-8-1" class="td11"> <span class="ec-lmtt-10x-x-109">\aclp</span><a - id="dx1-41094"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-8-2" + id="dx1-50103"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-8-2" class="td11"> <span class="ec-lmtt-10x-x-109">\acrlongpl</span><a - id="dx1-41095"></a> </td> + id="dx1-50104"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-6-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-9-1" + style="vertical-align:baseline;" id="TBL-7-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-9-1" class="td11"> <span class="ec-lmtt-10x-x-109">\Aclp</span><a - id="dx1-41096"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-9-2" + id="dx1-50105"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-9-2" class="td11"> <span class="ec-lmtt-10x-x-109">\Acrlongpl</span><a - id="dx1-41097"></a> </td> + id="dx1-50106"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-6-10-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-10-1" + style="vertical-align:baseline;" id="TBL-7-10-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-10-1" class="td11"> <span class="ec-lmtt-10x-x-109">\acf</span><a - id="dx1-41098"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-10-2" + id="dx1-50107"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-10-2" class="td11"> <span class="ec-lmtt-10x-x-109">\acrfull</span><a - id="dx1-41099"></a> </td> + id="dx1-50108"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-6-11-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-11-1" + style="vertical-align:baseline;" id="TBL-7-11-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-11-1" class="td11"> <span class="ec-lmtt-10x-x-109">\Acf</span><a - id="dx1-41100"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-11-2" + id="dx1-50109"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-11-2" class="td11"> <span class="ec-lmtt-10x-x-109">\Acrfull</span><a - id="dx1-41101"></a> </td> + id="dx1-50110"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-6-12-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-12-1" + style="vertical-align:baseline;" id="TBL-7-12-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-12-1" class="td11"> <span class="ec-lmtt-10x-x-109">\acfp</span><a - id="dx1-41102"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-12-2" + id="dx1-50111"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-12-2" class="td11"> <span class="ec-lmtt-10x-x-109">\acrfullpl</span><a - id="dx1-41103"></a> </td> + id="dx1-50112"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-6-13-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-13-1" + style="vertical-align:baseline;" id="TBL-7-13-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-13-1" class="td11"> <span class="ec-lmtt-10x-x-109">\Acfp</span><a - id="dx1-41104"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-13-2" + id="dx1-50113"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-13-2" class="td11"> <span class="ec-lmtt-10x-x-109">\Acrfullpl</span><a - id="dx1-41105"></a> </td> + id="dx1-50114"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-6-14-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-14-1" + style="vertical-align:baseline;" id="TBL-7-14-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-14-1" class="td11"> <span class="ec-lmtt-10x-x-109">\ac</span><a - id="dx1-41106"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-14-2" + id="dx1-50115"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-14-2" class="td11"> <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-41107"></a> </td> + id="dx1-50116"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-6-15-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-15-1" + style="vertical-align:baseline;" id="TBL-7-15-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-15-1" class="td11"> <span class="ec-lmtt-10x-x-109">\Ac</span><a - id="dx1-41108"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-15-2" + id="dx1-50117"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-15-2" class="td11"> <span class="ec-lmtt-10x-x-109">\Gls</span><a - id="dx1-41109"></a> </td> + id="dx1-50118"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-6-16-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-16-1" + style="vertical-align:baseline;" id="TBL-7-16-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-16-1" class="td11"> <span class="ec-lmtt-10x-x-109">\acp</span><a - id="dx1-41110"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-16-2" + id="dx1-50119"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-16-2" class="td11"> <span class="ec-lmtt-10x-x-109">\glspl</span><a - id="dx1-41111"></a> </td> + id="dx1-50120"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-6-17-"><td style="white-space:nowrap; text-align:left;" id="TBL-6-17-1" + style="vertical-align:baseline;" id="TBL-7-17-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-17-1" class="td11"> <span class="ec-lmtt-10x-x-109">\Acp</span><a - id="dx1-41112"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-6-17-2" + id="dx1-50121"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-17-2" class="td11"> <span class="ec-lmtt-10x-x-109">\Glspl</span><a - id="dx1-41113"></a> </td></tr></table> + id="dx1-50122"></a> </td></tr></table> </div> </div><hr class="endfloat" /> -<!--l. 4446--><p class="indent" > It is also possible to access the long and short forms without +<!--l. 5466--><p class="indent" > It is also possible to access the long and short forms without adding information to the glossary using commands analogous to <span class="ec-lmtt-10x-x-109">\glsentrytext</span><a - id="dx1-41114"></a> (described in <a -href="#x1-340009">§9 </a><a -href="#x1-340009">Using Glossary Terms Without + id="dx1-50123"></a> (described in <a +href="#sec:glsnolink">§9 </a><a +href="#sec:glsnolink">Using Glossary Terms Without Links<!--tex4ht:ref: sec:glsnolink --></a>). -</p><!--l. 4450--><p class="indent" > The long form can be accessed using: -</p><!--l. 4451--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5470--><p class="indent" > The long form can be accessed using: +</p><!--l. 5471--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrylong</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41115"></a> <span + id="dx1-50124"></a> <span class="ec-lmtt-10x-x-109">\glsentrylong{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4453--><p class="noindent" > +</p><!--l. 5473--><p class="noindent" > or, with the first letter converted to upper case: -</p><!--l. 4455--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5475--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentrylong</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41116"></a> <span + id="dx1-50125"></a> <span class="ec-lmtt-10x-x-109">\Glsentrylong{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4457--><p class="noindent" > +</p><!--l. 5477--><p class="noindent" > Plural forms: -</p><!--l. 4459--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5479--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrylongpl</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41117"></a> <span + id="dx1-50126"></a> <span class="ec-lmtt-10x-x-109">\glsentrylongpl{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4461--><p class="noindent" > -</p><!--l. 4462--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5481--><p class="noindent" > +</p><!--l. 5482--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentrylongpl</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41118"></a> <span + id="dx1-50127"></a> <span class="ec-lmtt-10x-x-109">\Glsentrylongpl{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4464--><p class="noindent" > -</p><!--l. 4466--><p class="indent" > Similarly, to access the short form: -</p><!--l. 4467--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5484--><p class="noindent" > +</p><!--l. 5486--><p class="indent" > Similarly, to access the short form: +</p><!--l. 5487--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryshort</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41119"></a> <span + id="dx1-50128"></a> <span class="ec-lmtt-10x-x-109">\glsentryshort{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4469--><p class="noindent" > +</p><!--l. 5489--><p class="noindent" > or, with the first letter converted to upper case: -</p><!--l. 4471--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5491--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryshort</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41120"></a> <span + id="dx1-50129"></a> <span class="ec-lmtt-10x-x-109">\Glsentryshort{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4473--><p class="noindent" > +</p><!--l. 5493--><p class="noindent" > Plural forms: -</p><!--l. 4475--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5495--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryshortpl</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41121"></a> <span + id="dx1-50130"></a> <span class="ec-lmtt-10x-x-109">\glsentryshortpl{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4477--><p class="noindent" > -</p><!--l. 4478--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5497--><p class="noindent" > +</p><!--l. 5498--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryshortpl</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41122"></a> <span + id="dx1-50131"></a> <span class="ec-lmtt-10x-x-109">\Glsentryshortpl{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4480--><p class="noindent" > -</p><!--l. 4482--><p class="indent" > And the full form, <span +</p><!--l. 5500--><p class="noindent" > +</p><!--l. 5502--><p class="indent" > And the full form, <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span class="lmsy-10x-x-109">⟩ </span>(<span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">short</span><span class="lmsy-10x-x-109">⟩</span>), can be obtained using: -</p><!--l. 4484--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5504--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryfull</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41123"></a> <span + id="dx1-50132"></a> <span class="ec-lmtt-10x-x-109">\glsentryfull{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4486--><p class="noindent" > -</p><!--l. 4487--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5506--><p class="noindent" > +</p><!--l. 5507--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryfull</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41124"></a> <span + id="dx1-50133"></a> <span class="ec-lmtt-10x-x-109">\Glsentryfull{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4489--><p class="noindent" > -</p><!--l. 4490--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5509--><p class="noindent" > +</p><!--l. 5510--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryfullpl</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41125"></a> <span + id="dx1-50134"></a> <span class="ec-lmtt-10x-x-109">\glsentryfullpl{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4492--><p class="noindent" > -</p><!--l. 4493--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5512--><p class="noindent" > +</p><!--l. 5513--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\Glsentryfullpl</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-41126"></a> <span + id="dx1-50135"></a> <span class="ec-lmtt-10x-x-109">\Glsentryfullpl{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4495--><p class="noindent" > +</p><!--l. 5515--><p class="noindent" > +(These also use <span +class="ec-lmtt-10x-x-109">\acrfullformat</span><a + id="dx1-50136"></a>.) </p> <h3 class="sectionHead"><span class="titlemark">13.1</span>  <a - id="x1-4200013.1"></a>Predefined Acronym Styles</h3> -<!--l. 4500--><p class="noindent" >Some of the acronym-related package options may be combined. Listed + id="sec:predefinedacrstyles"></a>Predefined Acronym Styles</h3> +<!--l. 5521--><p class="noindent" >Some of the acronym-related package options may be combined. Listed below are the effects of different combinations. If you use an invalid -combination, you’ll get an error message. +combination, you’ll get an error message. If none of these styles suit your +requirements, see <a +href="#sec:customacronym">§13.3 </a><a +href="#sec:customacronym">Defining A Custom Acronym Style<!--tex4ht:ref: sec:customacronym --></a> to create your +own custom style. </p><dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">description</span><a - id="dx1-42001"></a><span + id="dx1-51001"></a><span class="ec-lmssbx-10x-x-109">,footnote</span><a - id="dx1-42002"></a> </dt><dd + id="dx1-51002"></a> </dt><dd class="description">When these two package options are used together, the <a - id="dx1-42003"></a><a + id="dx1-51003"></a><a href="#glo:firstuse">first use</a> displays the entry as: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">\firstacronymfont{</span><span @@ -11385,27 +13893,27 @@ class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>indicates the text supplied in the final optional argument to <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-42004"></a>, <span + id="dx1-51004"></a>, <span class="ec-lmtt-10x-x-109">\glspl</span><a - id="dx1-42005"></a> or their uppercase variants. + id="dx1-51005"></a> or their uppercase variants. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">dua</span><a - id="dx1-42006"></a> </dt><dd + id="dx1-51006"></a> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">dua</span><a - id="dx1-42007"></a> package option always makes <span + id="dx1-51007"></a> package option always makes <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-42008"></a> display the expanded form + id="dx1-51008"></a> display the expanded form and so may not be used with <span class="ec-lmss-10x-x-109">footnote</span><a - id="dx1-42009"></a>, <span + id="dx1-51009"></a>, <span class="ec-lmss-10x-x-109">smaller</span><a - id="dx1-42010"></a> or <span + id="dx1-51010"></a> or <span class="ec-lmss-10x-x-109">smallcaps</span><a - id="dx1-42011"></a>. Both + id="dx1-51011"></a>. Both <a - id="dx1-42012"></a><a + id="dx1-51012"></a><a href="#glo:firstuse">first use</a> and subsequent use displays the entry in the form: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span @@ -11417,14 +13925,14 @@ class="lmsy-10x-x-109">⟩</span> <br /><spacer type=vertical size=10></span> You can, however, access the short form using <span class="ec-lmtt-10x-x-109">\acrshort</span><a - id="dx1-42013"></a> and its + id="dx1-51013"></a> and its variants. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">description</span><a - id="dx1-42014"></a> </dt><dd + id="dx1-51014"></a> </dt><dd class="description">This package option displays the entry on <a - id="dx1-42015"></a><a + id="dx1-51015"></a><a href="#glo:firstuse">first use</a> as: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span @@ -11434,7 +13942,7 @@ class="lmsy-10x-x-109">⟩⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>(<span class="ec-lmtt-10x-x-109">\firstacronymfont</span><a - id="dx1-42016"></a><span + id="dx1-51016"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span @@ -11451,22 +13959,22 @@ class="ec-lmtt-10x-x-109">}</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span> - <br /><spacer type=vertical size=10></span> - <!--l. 4540--><p class="noindent" >Note that with this option, you need to specify the description using + <br /><spacer type=vertical size=10></span> + <!--l. 5563--><p class="noindent" >Note that with this option, you need to specify the description using the <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-42017"></a> key in the optional argument of <span + id="dx1-51017"></a> key in the optional argument of <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-42018"></a>. + id="dx1-51018"></a>. </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">footnote</span><a - id="dx1-42019"></a> </dt><dd + id="dx1-51019"></a> </dt><dd class="description">This package option displays the entry on <a - id="dx1-42020"></a><a + id="dx1-51020"></a><a href="#glo:firstuse">first use</a> as: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span @@ -11496,8 +14004,8 @@ class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span> <br /><spacer type=vertical size=10></span> Acronyms will be sorted according to the short form. - <!--l. 4555--><p class="noindent" >Note that on <a - id="dx1-42021"></a><a + <!--l. 5578--><p class="noindent" >Note that on <a + id="dx1-51021"></a><a href="#glo:firstuse">first use</a>, it is the long form in the footnote that links to the relevant glossary entry (where hyperlinks are enabled), whereas on subsequent use, the acronym links to the relevant glossary entry. @@ -11506,21 +14014,21 @@ href="#glo:firstuse">first use</a>, it is the long form in the footnote that lin </p> - <div class="verbatim" id="verbatim-127"> + <div class="verbatim" id="verbatim-149"> \let\acrfootnote\acrnolinkfootnote </div> - <!--l. 4561--><p class="nopar" > + <!--l. 5584--><p class="nopar" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">smallcaps</span><a - id="dx1-42022"></a> </dt><dd + id="dx1-51022"></a> </dt><dd class="description">If neither the <span class="ec-lmss-10x-x-109">footnote</span><a - id="dx1-42023"></a> nor <span + id="dx1-51023"></a> nor <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-42024"></a> options have been set, this + id="dx1-51024"></a> options have been set, this option displays the entry on <a - id="dx1-42025"></a><a + id="dx1-51025"></a><a href="#glo:firstuse">first use</a> as: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="lmsy-10x-x-109">⟨</span><span @@ -11529,7 +14037,7 @@ class="lmsy-10x-x-109">⟩⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>(<span class="ec-lmtt-10x-x-109">\firstacronymfont</span><a - id="dx1-42026"></a><span + id="dx1-51026"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span @@ -11549,28 +14057,30 @@ class="lmsy-10x-x-109">⟩</span> <br /><spacer type=vertical size=10></span> where <span class="ec-lmtt-10x-x-109">\acronymfont</span><a - id="dx1-42027"></a> is set to <span class="obeylines-h"><span class="verb"><span + id="dx1-51027"></a> is set to <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\textsc{#1}</span></span></span>. - <!--l. 4575--><p class="noindent" ><div class="important" title="Important Note"> Note that since the acronym is displayed using <span + <!--l. 5598--><p class="noindent" ><div class="important" title="Important Note"> Note that since the acronym is displayed using <span class="ec-lmtt-10x-x-109">\textsc</span><a - id="dx1-42028"></a>, - the short form, <span + id="dx1-51028"></a>, the short + form, <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩</span>, should be specified in lower case. + </p><!--l. 5604--><p class="noindent" >See also the <a +href="#boldsc">earlier note</a> regarding combining bold and smallcaps. </div> - </p><!--l. 4580--><p class="noindent" > + </p><!--l. 5606--><p class="noindent" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">smaller</span><a - id="dx1-42029"></a> </dt><dd + id="dx1-51029"></a> </dt><dd class="description">If neither the <span class="ec-lmss-10x-x-109">footnote</span><a - id="dx1-42030"></a> nor <span + id="dx1-51030"></a> nor <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-42031"></a> options have been set, this + id="dx1-51031"></a> options have been set, this option displays the entry on <a - id="dx1-42032"></a><a + id="dx1-51032"></a><a href="#glo:firstuse">first use</a> as: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="lmsy-10x-x-109">⟨</span><span @@ -11579,7 +14089,7 @@ class="lmsy-10x-x-109">⟩⟨</span><span class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩ </span>(<span class="ec-lmtt-10x-x-109">\firstacronymfont</span><a - id="dx1-42033"></a><span + id="dx1-51033"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span @@ -11589,7 +14099,7 @@ class="ec-lmtt-10x-x-109">}</span>) while subsequent use displays the entry as: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">\acronymfont</span><a - id="dx1-42034"></a><span + id="dx1-51034"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span @@ -11601,42 +14111,42 @@ class="lmsy-10x-x-109">⟩</span> <br /><spacer type=vertical size=10></span> where <span class="ec-lmtt-10x-x-109">\acronymfont</span><a - id="dx1-42035"></a> is set to + id="dx1-51035"></a> is set to <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\textsmaller{#1}</span></span></span>.<span class="footnote-mark"><a href="#fn1x15" id="fn1x15-bk"><sup class="textsuperscript">1</sup></a></span><a - id="x1-42036f1"></a> + id="x1-51036f1"></a> The entries will be sorted according to the short form. - <!--l. 4598--><p class="noindent" ><div class="important" title="Important Note"> Remember to load a package that defines <span + <!--l. 5624--><p class="noindent" ><div class="important" title="Important Note"> Remember to load a package that defines <span class="ec-lmtt-10x-x-109">\textsmaller</span><a - id="dx1-42040"></a> (such + id="dx1-51040"></a> (such as <span class="ec-lmss-10x-x-109">relsize</span><a - id="dx1-42041"></a>) if you want to use this option, unless you want to + id="dx1-51041"></a>) if you want to use this option, unless you want to redefine <span class="ec-lmtt-10x-x-109">\acronymfont</span><a - id="dx1-42042"></a> to use some other formatting command. + id="dx1-51042"></a> to use some other formatting command. </div> - </p><!--l. 4602--><p class="noindent" > + </p><!--l. 5628--><p class="noindent" > </p></dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">None of the above</span> </dt><dd class="description">If none of the package options <span class="ec-lmss-10x-x-109">smallcaps</span><a - id="dx1-42043"></a>, <span + id="dx1-51043"></a>, <span class="ec-lmss-10x-x-109">smaller</span><a - id="dx1-42044"></a>, + id="dx1-51044"></a>, <span class="ec-lmss-10x-x-109">footnote</span><a - id="dx1-42045"></a>, <span + id="dx1-51045"></a>, <span class="ec-lmss-10x-x-109">dua</span><a - id="dx1-42046"></a> or <span + id="dx1-51046"></a> or <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-42047"></a> are used, then on <a - id="dx1-42048"></a><a + id="dx1-51047"></a> are used, then on <a + id="dx1-51048"></a><a href="#glo:firstuse">first use</a> the entry is displayed as: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span @@ -11659,41 +14169,79 @@ class="ec-lmri-10x-x-109">insert</span><span class="lmsy-10x-x-109">⟩</span> <br /><spacer type=vertical size=10></span> Entries will be sorted according to the short form.</dd></dl> -<!--l. 4618--><p class="noindent" > +<!--l. 5644--><p class="noindent" > </p> -<!--l. 4618--><p class="noindent" ><a +<!--l. 5644--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">13.2</span>  <a - id="x1-4300013.2"></a>Displaying the List of Acronyms</h3> -<!--l. 4621--><p class="noindent" >The list of acronyms is just like any other type of glossary and can be -displayed on its own using <span + id="sec:disploa"></a>Displaying the List of Acronyms</h3> +<!--l. 5647--><p class="noindent" >The list of acronyms is just like any other type of glossary and can be +displayed on its own using </p><div class="alltt"> +<div class="obeylines-v"> +<span class="ec-lmtt-10x-x-109">\printglossary</span><a - id="dx1-43001"></a><span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">[type=\acronymtype]</span></span></span> or with -all the other glossaries using <span + id="dx1-52001"></a><span +class="ec-lmtt-10x-x-109">[type=\acronymtype</span><a + id="dx1-52002"></a><span +class="ec-lmtt-10x-x-109">]</span> +</div> +</div> or with all the other glossaries using <span class="ec-lmtt-10x-x-109">\printglossaries</span><a - id="dx1-43002"></a>. However, care must be -taken to choose a glossary style that’s appropriate to your acronym style. -The different acronym-related package options store different information -in the <span + id="dx1-52003"></a>. (If you use the +<span +class="ec-lmss-10x-x-109">acronym</span><a + id="dx1-52004"></a> package option you can also use <div class="alltt"> +<div class="obeylines-v"> +<span +class="ec-lmtt-10x-x-109">\printacronyms</span><a + id="dx1-52005"></a><span +class="ec-lmtt-10x-x-109">[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]</span> +</div> +</div> as a synonym for <div class="alltt"> +<div class="obeylines-v"> +<span +class="ec-lmtt-10x-x-109">\printglossary</span><a + id="dx1-52006"></a><span +class="ec-lmtt-10x-x-109">[type=\acronymtype</span><a + id="dx1-52007"></a><span +class="ec-lmtt-10x-x-109">,</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]</span> + + + +</div> +</div> See <a +href="#sec:pkgopts-acronym">§2.5 </a><a +href="#sec:pkgopts-acronym">Acronym Options<!--tex4ht:ref: sec:pkgopts-acronym --></a>.) +<!--l. 5664--><p class="indent" > However, care must be taken to choose a glossary style that’s +appropriate to your acronym style. The different acronym-related package +options store different information in the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-43003"></a>, <span + id="dx1-52008"></a>, <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-43004"></a> and <span + id="dx1-52009"></a> and <span class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-43005"></a> keys. -</p><!--l. 4630--><p class="indent" > <a -href="#x1-430132">Table 13.2</a> lists the package options that govern the acronym styles and + id="dx1-52010"></a> +keys. +</p><!--l. 5669--><p class="indent" > <a +href="#x1-520182">Table 13.2</a> lists the package options that govern the acronym styles and how the information is stored in the keys used when displaying the glossary. Note that the <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-43006"></a> package option uses the following + id="dx1-52011"></a> package option uses the following command in the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-43007"></a>: -</p><!--l. 4634--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="dx1-52012"></a>: +</p><!--l. 5673--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\acrnameformat</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-43008"></a> <span + id="dx1-52013"></a> <span class="ec-lmtt-10x-x-109">\acrnameformat{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span @@ -11703,26 +14251,26 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4636--><p class="noindent" > +</p><!--l. 5675--><p class="noindent" > This defaults to just <span class="ec-lmtt-10x-x-109">\acronymfont{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span>. -</p><!--l. 4639--><p class="indent" > For example, if I use the package options <span +</p><!--l. 5678--><p class="indent" > For example, if I use the package options <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-43009"></a> and <span + id="dx1-52014"></a> and <span class="ec-lmss-10x-x-109">footnote</span><a - id="dx1-43010"></a>, then + id="dx1-52015"></a>, then the name field will contain the abbreviation and the symbol field will contain the long form. If I then use the <span class="ec-lmss-10x-x-109">long4col</span><a - id="dx1-43011"></a> style, each entry in the list + id="dx1-52016"></a> style, each entry in the list of acronyms will appear in the form: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">\acronymfont</span><a - id="dx1-43012"></a><span + id="dx1-52017"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span @@ -11732,21 +14280,19 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">description</span><span class="lmsy-10x-x-109">⟩ ⟨</span><span class="ec-lmri-10x-x-109">long</span><span -class="lmsy-10x-x-109">⟩</span> - <br /><span -class="lmsy-10x-x-109">⟨</span><span +class="lmsy-10x-x-109">⟩ ⟨</span><span class="ec-lmri-10x-x-109">location list</span><span class="lmsy-10x-x-109">⟩</span> <br /><spacer type=vertical size=10></span> Alternatively, you can define your own custom style (see <a -href="#x1-5600016">§16 </a><a -href="#x1-5600016">Defining your +href="#sec:newglossarystyle">§16 </a><a +href="#sec:newglossarystyle">Defining your own glossary style<!--tex4ht:ref: sec:newglossarystyle --></a> for further details). -</p><!--l. 4651--><p class="indent" > <a - id="x1-430132"></a></p><hr class="float" /><div class="float" +</p><!--l. 5689--><p class="indent" > <a + id="x1-520182"></a></p><hr class="float" /><div class="float" > @@ -11755,75 +14301,75 @@ own glossary style<!--tex4ht:ref: sec:newglossarystyle --></a> for further detai ><tr style="vertical-align:baseline;" class="caption"><td class="id">Table 13.2: </td><td class="content">Package options governing <span class="ec-lmtt-10x-x-109">\newacronym </span>and how the -information is stored</td></tr></table></div><!--tex4ht:label?: x1-430132 --> +information is stored</td></tr></table></div><!--tex4ht:label?: x1-520182 --> <div class="center" > -<!--l. 4655--><p class="noindent" > +<!--l. 5693--><p class="noindent" > </p> -<div class="tabular"> <table id="TBL-7" class="tabular" +<div class="tabular"> <table id="TBL-8" class="tabular" cellspacing="0" cellpadding="0" -><colgroup id="TBL-7-1g"><col -id="TBL-7-1" /><col -id="TBL-7-2" /><col -id="TBL-7-3" /><col -id="TBL-7-4" /><col -id="TBL-7-5" /></colgroup><tr - style="vertical-align:baseline;" id="TBL-7-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-1-1" +><colgroup id="TBL-8-1g"><col +id="TBL-8-1" /><col +id="TBL-8-2" /><col +id="TBL-8-3" /><col +id="TBL-8-4" /><col +id="TBL-8-5" /></colgroup><tr + style="vertical-align:baseline;" id="TBL-8-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-8-1-1" class="td11"> <span -class="ec-lmbx-10x-x-109">Package Option </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-7-1-2" +class="ec-lmbx-10x-x-109">Package Option </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-1-2" class="td11"> <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-43014"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-1-3" + id="dx1-52019"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-1-3" class="td11"> <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-43015"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-1-4" + id="dx1-52020"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-1-4" class="td11"> <span class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-43016"></a> </td> + id="dx1-52021"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-7-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-2-1" + style="vertical-align:baseline;" id="TBL-8-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-8-2-1" class="td11"> <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-43017"></a>,<span + id="dx1-52022"></a>,<span class="ec-lmss-10x-x-109">footnote</span><a - id="dx1-43018"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-2-2" + id="dx1-52023"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-2-2" class="td11"> <span class="ec-lmtt-10x-x-109">\acronymfont</span><a - id="dx1-43019"></a><span + id="dx1-52024"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">} </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-7-2-3" -class="td11"> user supplied </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-2-4" +class="ec-lmtt-10x-x-109">} </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-2-3" +class="td11"> custom </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-2-4" class="td11"> <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span class="lmsy-10x-x-109">⟩ </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-7-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-3-1" + style="vertical-align:baseline;" id="TBL-8-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-8-3-1" class="td11"> <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-43020"></a>,<span + id="dx1-52025"></a>,<span class="ec-lmss-10x-x-109">dua</span><a - id="dx1-43021"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-3-2" + id="dx1-52026"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-3-2" class="td11"> <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span -class="lmsy-10x-x-109">⟩ </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-7-3-3" -class="td11"> user supplied </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-3-4" +class="lmsy-10x-x-109">⟩ </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-3-3" +class="td11"> custom </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-3-4" class="td11"> <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩ </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-7-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-4-1" + style="vertical-align:baseline;" id="TBL-8-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-8-4-1" class="td11"> <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-43022"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-4-2" + id="dx1-52027"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-4-2" class="td11"> <span class="ec-lmtt-10x-x-109">\acrnameformat</span><a - id="dx1-43023"></a><span + id="dx1-52028"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span @@ -11832,220 +14378,224 @@ class="ec-lmtt-10x-x-109">}{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">} </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-7-4-3" -class="td11"> user supplied </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-4-4" +class="ec-lmtt-10x-x-109">} </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-4-3" +class="td11"> custom </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-4-4" class="td11"> <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩ </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-7-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-5-1" + style="vertical-align:baseline;" id="TBL-8-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-8-5-1" class="td11"> <span class="ec-lmss-10x-x-109">footnote</span><a - id="dx1-43024"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-5-2" + id="dx1-52029"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-5-2" class="td11"> <span class="ec-lmtt-10x-x-109">\acronymfont</span><a - id="dx1-43025"></a><span + id="dx1-52030"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">} </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-7-5-3" +class="ec-lmtt-10x-x-109">} </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-5-3" class="td11"> <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span -class="lmsy-10x-x-109">⟩ </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-7-5-4" +class="lmsy-10x-x-109">⟩ </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-5-4" class="td11"> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-7-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-6-1" + style="vertical-align:baseline;" id="TBL-8-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-8-6-1" class="td11"> <span class="ec-lmss-10x-x-109">smallcaps</span><a - id="dx1-43026"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-6-2" + id="dx1-52031"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-6-2" class="td11"> <span class="ec-lmtt-10x-x-109">\acronymfont</span><a - id="dx1-43027"></a><span + id="dx1-52032"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">} </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-7-6-3" +class="ec-lmtt-10x-x-109">} </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-6-3" class="td11"> <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span -class="lmsy-10x-x-109">⟩ </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-7-6-4" +class="lmsy-10x-x-109">⟩ </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-6-4" class="td11"> <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩ </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-7-7-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-7-1" + style="vertical-align:baseline;" id="TBL-8-7-"><td style="white-space:nowrap; text-align:left;" id="TBL-8-7-1" class="td11"> <span class="ec-lmss-10x-x-109">smaller</span><a - id="dx1-43028"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-7-2" + id="dx1-52033"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-7-2" class="td11"> <span class="ec-lmtt-10x-x-109">\acronymfont</span><a - id="dx1-43029"></a><span + id="dx1-52034"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">} </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-7-7-3" +class="ec-lmtt-10x-x-109">} </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-7-3" class="td11"> <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span -class="lmsy-10x-x-109">⟩ </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-7-7-4" +class="lmsy-10x-x-109">⟩ </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-7-4" class="td11"> <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩ </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-7-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-8-1" + style="vertical-align:baseline;" id="TBL-8-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-8-8-1" class="td11"> <span class="ec-lmss-10x-x-109">dua</span><a - id="dx1-43030"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-8-2" + id="dx1-52035"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-8-2" class="td11"> <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span -class="lmsy-10x-x-109">⟩ </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-7-8-3" +class="lmsy-10x-x-109">⟩ </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-8-3" class="td11"> <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span -class="lmsy-10x-x-109">⟩ </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-7-8-4" +class="lmsy-10x-x-109">⟩ </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-8-4" class="td11"> <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span class="lmsy-10x-x-109">⟩ </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-7-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-7-9-1" -class="td11"> None of the above </td><td style="white-space:nowrap; text-align:left;" id="TBL-7-9-2" + style="vertical-align:baseline;" id="TBL-8-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-8-9-1" +class="td11"> None of the above </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-9-2" class="td11"> <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span -class="lmsy-10x-x-109">⟩ </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-7-9-3" +class="lmsy-10x-x-109">⟩ </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-9-3" class="td11"> <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span -class="lmsy-10x-x-109">⟩ </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-7-9-4" +class="lmsy-10x-x-109">⟩ </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-9-4" class="td11"> </td></tr></table> </div></div> </div><hr class="endfloat" /> -<!--l. 4696--><p class="noindent" ><a +<!--l. 5734--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">13.3</span>  <a - id="x1-4400013.3"></a>Defining A Custom Acronym Style</h3> -<!--l. 4699--><p class="noindent" >You may find that the predefined acronyms styles that come with the + id="sec:customacronym"></a>Defining A Custom Acronym Style</h3> +<!--l. 5737--><p class="noindent" >You may find that the predefined acronyms styles that come with the <span class="ec-lmss-10x-x-109">glossaries </span>package don’t suit your requirements. In this case you can define your own style. This is done by redefining the following commands: -</p><!--l. 4703--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5741--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\CustomAcronymFields</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-44001"></a> <span + id="dx1-53001"></a> <span class="ec-lmtt-10x-x-109">\CustomAcronymFields </span></div><hr> -</p><!--l. 4705--><p class="noindent" > +</p><!--l. 5743--><p class="noindent" > This command sets up the keys for <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-44002"></a> when you + id="dx1-53002"></a> when you define an acronym using <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-44003"></a>. Within the definition of + id="dx1-53003"></a>. Within the definition of <span class="ec-lmtt-10x-x-109">\CustomAcronymFields</span>, you may use <span class="ec-lmtt-10x-x-109">\the\glslongtok</span><a - id="dx1-44004"></a> to access + id="dx1-53004"></a> to access the long form, <span class="ec-lmtt-10x-x-109">\the\glsshorttok</span><a - id="dx1-44005"></a> to access the short form and + id="dx1-53005"></a> to access the short form and <span class="ec-lmtt-10x-x-109">\the\glslabeltok</span><a - id="dx1-44006"></a> to access the label. This command is typically used + id="dx1-53006"></a> to access the label. This command is typically used to set the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-44007"></a>, <span + id="dx1-53007"></a>, <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-44008"></a>, <span + id="dx1-53008"></a>, <span class="ec-lmss-10x-x-109">firstplural</span><a - id="dx1-44009"></a>, <span + id="dx1-53009"></a>, <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-44010"></a> and <span + id="dx1-53010"></a> and <span class="ec-lmss-10x-x-109">plural</span><a - id="dx1-44011"></a> keys. It may also + id="dx1-53011"></a> keys. It may also be used to set the <span class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-44012"></a> or <span + id="dx1-53012"></a> or <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-44013"></a> keys depending on your + id="dx1-53013"></a> keys depending on your requirements. -</p><!--l. 4716--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5754--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\SetCustomDisplayStyle</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-44014"></a> <span + id="dx1-53014"></a> <span class="ec-lmtt-10x-x-109">\SetCustomDisplayStyle{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">type</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4718--><p class="noindent" > -This is used to set up the display style for the glossary given by -<span +</p><!--l. 5756--><p class="noindent" > +This is used to set up the display style for the glossary given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">type</span><span -class="lmsy-10x-x-109">⟩</span>. This should typically just use <span -class="ec-lmtt-10x-x-109">\defglsdisplayfirst</span><a - id="dx1-44015"></a> and -<span -class="ec-lmtt-10x-x-109">\defglsdisplay</span><a - id="dx1-44016"></a>. -</p><!--l. 4723--><p class="indent" > Once you have redefined <span +class="lmsy-10x-x-109">⟩</span>. +This should typically just use <span +class="ec-lmtt-10x-x-109">\defglsentryfmt</span><a + id="dx1-53015"></a>. +</p><!--l. 5760--><p class="indent" > Once you have redefined <span class="ec-lmtt-10x-x-109">\CustomAcronymFields </span>and <span class="ec-lmtt-10x-x-109">\SetCustomDisplayStyle</span>, you must then switch to this style using -</p><!--l. 4725--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5762--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\SetCustomStyle</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-44017"></a> <span + id="dx1-53016"></a> <span class="ec-lmtt-10x-x-109">\SetCustomStyle </span></div><hr> -</p><!--l. 4727--><p class="noindent" > +</p><!--l. 5764--><p class="noindent" > Note that you may still use the <span class="ec-lmss-10x-x-109">shortcuts</span><a - id="dx1-44018"></a> package option with your custom + id="dx1-53017"></a> package option with your custom style. -</p><!--l. 4731--><p class="indent" > <div class="important" title="Important Note"> If you omit <span +</p><!--l. 5768--><p class="indent" > <div class="important" title="Important Note"> If you omit <span class="ec-lmtt-10x-x-109">\SetCustomStyle</span>, or use it before you redefine <span class="ec-lmtt-10x-x-109">\CustomAcronymFields </span>and <span class="ec-lmtt-10x-x-109">\SetCustomDisplayStyle</span>, your new style -won’t be correctly implemented. You must set up the custom style before -defining new acronyms. The acronyms must be defined using <span +won’t be correctly implemented. You must set up the custom style +before defining new acronyms. The acronyms must be defined using +<span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-44019"></a> -not <span + id="dx1-53018"></a> not <span class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-44020"></a>. </div> -</p><!--l. 4737--><p class="noindent" > -</p><!--l. 4739--><p class="indent" > As an example, suppose I want my acronym on <a - id="dx1-44021"></a><a -href="#glo:firstuse">first use</a> to have the -short form in the text and the long form with the description in a footnote. + id="dx1-53019"></a> if you want to use acronym styles. +</div> +</p><!--l. 5775--><p class="noindent" > +<a + id="x1-53020r18"></a> +</p><!--l. 5777--><p class="noindent" ><span +class="ec-lmbx-12">Example 18</span><span +class="ec-lmbx-12"> (Defining a Custom Acronym Style)</span><a + id="x1-53021"></a> +</p><!--l. 5778--><p class="indent" > Suppose I want my acronym on <a + id="dx1-53022"></a><a +href="#glo:firstuse">first use</a> to have the short form +in the text and the long form with the description in a footnote. Suppose also that I want the short form to be put in small caps in + + + the main body of the document, but I want it in normal capitals in the list of acronyms. In my list of acronyms, I want the long form as the name with the short form in brackets followed by the description. That is, in the text I want <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-44022"></a> on <a - id="dx1-44023"></a><a + id="dx1-53023"></a> on <a + id="dx1-53024"></a><a href="#glo:firstuse">first use</a> to display: - - - <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">\textsc</span><a - id="dx1-44024"></a><span + id="dx1-53025"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span @@ -12063,7 +14613,7 @@ class="ec-lmtt-10x-x-109">}</span></span> on subsequent use: <spacer type=vertical size=10><span class="obeylines-h"> <br /><span class="ec-lmtt-10x-x-109">\textsc</span><a - id="dx1-44025"></a><span + id="dx1-53026"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">abbrv</span><span @@ -12083,136 +14633,105 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">description</span><span class="lmsy-10x-x-109">⟩</span> <br /><spacer type=vertical size=10></span> -</p><!--l. 4760--><p class="indent" > First, I need to redefine <span +</p><!--l. 5799--><p class="indent" > First, I need to redefine <span class="ec-lmtt-10x-x-109">\CustomAcronymFields</span><a - id="dx1-44026"></a> so that <span + id="dx1-53027"></a> so that +<span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-44027"></a> -will correctly set the <span + id="dx1-53028"></a> will correctly set the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-44028"></a>, <span + id="dx1-53029"></a>, <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-44029"></a> and <span + id="dx1-53030"></a> and <span class="ec-lmss-10x-x-109">plural</span><a - id="dx1-44030"></a> keys. I want the long form to be -stored in the <span + id="dx1-53031"></a> keys. I want the +long form to be stored in the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-44031"></a> and the short form to be stored in <span + id="dx1-53032"></a> and the short form to be stored in <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-44032"></a>. In addition, I’m -going to set the <span + id="dx1-53033"></a>. +In addition, I’m going to set the <span class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-44033"></a> to the short form in upper case so that it will -appear in the list of acronyms. + id="dx1-53034"></a> to the short form in upper case so +that it will appear in the list of acronyms. (An alternative approach is to +define a custom glossary style that uses <span +class="ec-lmtt-10x-x-109">\glsentryshort</span><a + id="dx1-53035"></a> to access the +short form. See <a +href="#sec:newglossarystyle">§16 </a><a +href="#sec:newglossarystyle">Defining your own glossary style<!--tex4ht:ref: sec:newglossarystyle --></a> for further +details). </p> - <div class="verbatim" id="verbatim-128"> + <div class="verbatim" id="verbatim-150"> \renewcommand*{\CustomAcronymFields}{%  <br />  name={\the\glslongtok},% - <br />  symbol={\MakeUppercase{\the\glsshorttok}},% + <br />  symbol={\MakeTextUppercase{\the\glsshorttok}},%  <br />  text={\textsc{\the\glsshorttok}},%  <br />  plural={\textsc{\the\glsshorttok}\noexpand\acrpluralsuffix}%  <br />} </div> -<!--l. 4775--><p class="nopar" > -</p><!--l. 4777--><p class="indent" > When using <span +<!--l. 5816--><p class="nopar" > +</p><!--l. 5818--><p class="indent" > When using <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-44034"></a>, the short and long forms are stored in the + id="dx1-53036"></a>, the short and long forms are stored in the <span class="ec-lmss-10x-x-109">short</span><a - id="dx1-44035"></a> and <span + id="dx1-53037"></a> and <span class="ec-lmss-10x-x-109">long</span><a - id="dx1-44036"></a> keys, and the plural forms are stored in <span + id="dx1-53038"></a> keys, and the plural forms are stored in <span class="ec-lmss-10x-x-109">shortplural</span><a - id="dx1-44037"></a> and + id="dx1-53039"></a> and <span class="ec-lmss-10x-x-109">longplural</span><a - id="dx1-44038"></a>. So when I use <span -class="ec-lmtt-10x-x-109">\defglsdisplayfirst</span><a - id="dx1-44039"></a> and <span -class="ec-lmtt-10x-x-109">\defglsdisplay</span><a - id="dx1-44040"></a>, I -can use <span + id="dx1-53040"></a>. So when I use <span +class="ec-lmtt-10x-x-109">\defglsentryfmt</span><a + id="dx1-53041"></a>, I can use <span class="ec-lmtt-10x-x-109">\glsentrylong</span><a - id="dx1-44041"></a> to access the long form. Recall from <a -href="#x1-290006.1">§6.1 -</a><a -href="#x1-290006.1">Changing the format of the link text<!--tex4ht:ref: sec:glsdisplay --></a>, that the optional argument to -<span -class="ec-lmtt-10x-x-109">\defglsdisplayfirst</span><a - id="dx1-44042"></a> and <span -class="ec-lmtt-10x-x-109">\defglsdisplay</span><a - id="dx1-44043"></a> indicates the glossary type. -This is passed to <span + id="dx1-53042"></a> to +access the long form. Recall from <a +href="#sec:glsdisplay">§6.1 </a><a +href="#sec:glsdisplay">Changing the format of the link +text<!--tex4ht:ref: sec:glsdisplay --></a>, that the optional argument to <span +class="ec-lmtt-10x-x-109">\defglsentryfmt</span><a + id="dx1-53043"></a> indicates the +glossary type. This is passed to <span class="ec-lmtt-10x-x-109">\SetCustomDisplayStyle</span><a - id="dx1-44044"></a>. The mandatory argument sets -up the definition of <span -class="ec-lmtt-10x-x-109">\glsdisplayfirst</span><a - id="dx1-44045"></a> and <span -class="ec-lmtt-10x-x-109">\glsdisplay</span><a - id="dx1-44046"></a> for the given -glossary, where the first argument corresponds to the <span -class="ec-lmss-10x-x-109">first</span><a - id="dx1-44047"></a>, <span -class="ec-lmss-10x-x-109">firstplural</span><a - id="dx1-44048"></a>, <span -class="ec-lmss-10x-x-109">text</span><a - id="dx1-44049"></a> -or <span -class="ec-lmss-10x-x-109">plural</span><a - id="dx1-44050"></a>, as appropriate, the second argument corresponds to the -<span -class="ec-lmss-10x-x-109">description</span><a - id="dx1-44051"></a>, the third corresponds to the <span -class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-44052"></a> and the fourth argument is -the inserted text. + id="dx1-53044"></a>. </p> - <div class="verbatim" id="verbatim-129"> + <div class="verbatim" id="verbatim-151"> \renewcommand*{\SetCustomDisplayStyle}[1]{% - <br />  \defglsdisplayfirst[#1]{##1##4\protect\footnote{% - <br />    \glsentrylong{\glslabel}: ##2% - <br />  }} - <br />  \defglsdisplay[#1]{##1##4}% + <br />  \defglsentryfmt[#1]{\glsgenentryfmt + <br />    \ifglsused{\glslabel}% test if entry has been used + <br />    {}% + <br />    {\footnote{\glsentrylong{\glslabel}}}}%  <br />} </div> -<!--l. 4800--><p class="nopar" > -</p><!--l. 4802--><p class="indent" > Since we have a definition inside a definition, <span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">#1</span></span></span> refers to the argument -of <span -class="ec-lmtt-10x-x-109">\SetCustomDisplayStyle</span><a - id="dx1-44053"></a>, and <span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">##1</span></span></span>, …, <span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">##4</span></span></span>, refer to the arguments of -<span -class="ec-lmtt-10x-x-109">\glsdisplayfirst</span><a - id="dx1-44054"></a> and <span -class="ec-lmtt-10x-x-109">\glsdisplay</span><a - id="dx1-44055"></a>. -</p><!--l. 4807--><p class="indent" > Now that I’ve redefined <span +<!--l. 5832--><p class="nopar" > +</p><!--l. 5834--><p class="indent" > Now that I’ve redefined <span class="ec-lmtt-10x-x-109">\CustomAcronymFields</span><a - id="dx1-44056"></a> and + id="dx1-53045"></a> and <span class="ec-lmtt-10x-x-109">\SetCustomDisplayStyle</span><a - id="dx1-44057"></a>, I can set this style using + id="dx1-53046"></a>, I can set this style using </p> - <div class="verbatim" id="verbatim-130"> + <div class="verbatim" id="verbatim-152"> \SetCustomStyle </div> -<!--l. 4811--><p class="nopar" > and now I can define my acronyms: +<!--l. 5838--><p class="nopar" > and now I can define my acronyms: </p> - <div class="verbatim" id="verbatim-131"> + <div class="verbatim" id="verbatim-153"> \newacronym[description={set of tags for use in  <br />developing hypertext documents}]{html}{html}{Hyper  <br />Text Markup Language} @@ -12220,54 +14739,60 @@ class="ec-lmtt-10x-x-109">\SetCustomDisplayStyle</span><a  <br />layout of a document written in a markup language}]{css}  <br />{css}{Cascading Style Sheet} </div> -<!--l. 4821--><p class="nopar" > -</p><!--l. 4823--><p class="indent" > Note that since I’ve used the description in the main body of the text, I -need to switch off the sanitization otherwise any commands within the -description won’t get interpreted. Also I want to use the <span +<!--l. 5848--><p class="nopar" > +</p><!--l. 5850--><p class="indent" > If I want to use the <span class="ec-lmss-10x-x-109">hyperref</span><a - id="dx1-44058"></a> package, -but this will cause a problem on <a - id="dx1-44059"></a><a -href="#glo:firstuse">first use</a> as I’ll get nested hyperlinks, so I -need to switch off the hyperlinks on <a - id="dx1-44060"></a><a -href="#glo:firstuse">first use</a>. In addition, I want to use a -glossary style that displays the symbol. Therefore, in my preamble I -have: + id="dx1-53047"></a> package with this document, it can cause a +problem on <a + id="dx1-53048"></a><a +href="#glo:firstuse">first use</a> as I’ll get nested hyperlinks, so I need to switch off the +hyperlinks on <a + id="dx1-53049"></a><a +href="#glo:firstuse">first use</a> via the package option <span +class="ec-lmss-10x-x-109">hyperfirst=false</span><a + id="dx1-53050"></a>. In addition, +I want to use a glossary style that displays the symbol. Therefore, in my +preamble I have: </p> - <div class="verbatim" id="verbatim-132"> + <div class="verbatim" id="verbatim-154"> \usepackage[colorlinks]{hyperref}  <br />\usepackage - <br /> [acronym,         % create list of acronyms - <br />  nomain,          % don’t need main glossary for this example - <br />  style=tree,      % need a style that displays the symbol - <br />  hyperfirst=false,% don’t hyperlink first use - <br />  sanitize=none    % switch off sanitization as description - <br />                   % will be used in the main text + <br /> [acronym,        % create list of acronyms + <br />  nomain,         % don’t need main glossary for this example + <br />  style=tree,     % need a style that displays the symbol + <br />  hyperfirst=false% don’t hyperlink first use  <br /> ]{glossaries} </div> -<!--l. 4841--><p class="nopar" > -</p><!--l. 4843--><p class="indent" > Note that I haven’t used the <span +<!--l. 5865--><p class="nopar" > +</p><!--l. 5867--><p class="indent" > Note that I haven’t used the <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-44061"></a> or <span + id="dx1-53051"></a> or <span class="ec-lmss-10x-x-109">footnote</span><a - id="dx1-44062"></a> package options. -</p><!--l. 4846--><p class="noindent" > + id="dx1-53052"></a> package options. The +sample file <a +href="#x1-6028r7"><span +class="ec-lmtt-10x-x-109">sample-custom-acronym.tex</span></a> illustrates this example. +</p> +<div class="center" +> +<!--l. 5871--><p class="noindent" > +</p><!--l. 5871--><p class="noindent" >____________________________</p></div> +<!--l. 5873--><p class="noindent" > </p> -<!--l. 4846--><p class="noindent" ><a +<!--l. 5873--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">13.4</span>  <a - id="x1-4500013.4"></a>Upgrading From the glossary Package</h3> -<!--l. 4849--><p class="noindent" >Users of the obsolete <span + id="sec:oldacronym"></a>Upgrading From the glossary Package</h3> +<!--l. 5876--><p class="noindent" >Users of the obsolete <span class="ec-lmss-10x-x-109">glossary</span><a - id="dx1-45001"></a> package may recall that the syntax used to + id="dx1-54001"></a> package may recall that the syntax used to define new acronyms has changed with the replacement <span class="ec-lmss-10x-x-109">glossaries </span>package. In addition, the old <span class="ec-lmss-10x-x-109">glossary</span><a - id="dx1-45002"></a> package created the command <span + id="dx1-54002"></a> package created the command <span class="ec-lmtt-10x-x-109">\</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">acr-name</span><span @@ -12276,16 +14801,16 @@ when defining the acronym <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">acr-name</span><span class="lmsy-10x-x-109">⟩</span>. -</p><!--l. 4855--><p class="indent" > In order to facilitate migrating from the old package to the new one, the <span +</p><!--l. 5882--><p class="indent" > In order to facilitate migrating from the old package to the new one, the <span class="ec-lmss-10x-x-109">glossaries</span> package<span class="footnote-mark"><a href="#fn2x15" id="fn2x15-bk"><sup class="textsuperscript">2</sup></a></span><a - id="x1-45003f2"></a> + id="x1-54003f2"></a> provides the command: -</p><!--l. 4858--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5885--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\oldacronym</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-45004"></a> <span + id="dx1-54004"></a> <span class="ec-lmtt-10x-x-109">\oldacronym[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -12304,14 +14829,14 @@ class="ec-lmri-10x-x-109">key-val list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 4860--><p class="noindent" > +</p><!--l. 5887--><p class="noindent" > This uses the same syntax as the <span class="ec-lmss-10x-x-109">glossary</span><a - id="dx1-45005"></a> package’s method of defining -acronyms. It is equivalent to:<br -class="newline" /> <span + id="dx1-54005"></a> package’s method of defining +acronyms. It is equivalent to: <spacer type=vertical size=10><span class="obeylines-h"> + <br /><span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-45006"></a><span + id="dx1-54006"></a><span class="ec-lmtt-10x-x-109">[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">key-val list</span><span @@ -12328,17 +14853,18 @@ class="ec-lmtt-10x-x-109">}{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">long</span><span class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">}</span><br -class="newline" /> In addition, <span +class="ec-lmtt-10x-x-109">}</span> + <br /><spacer type=vertical size=10></span> +In addition, <span class="ec-lmtt-10x-x-109">\oldacronym</span><a - id="dx1-45007"></a> also defines the commands <span + id="dx1-54007"></a> also defines the commands <span class="ec-lmtt-10x-x-109">\</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>, which is equivalent to <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-45008"></a><span + id="dx1-54008"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -12349,9 +14875,12 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">*</span>, which is equivalent to + + + <span class="ec-lmtt-10x-x-109">\Gls</span><a - id="dx1-45009"></a><span + id="dx1-54009"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -12372,20 +14901,17 @@ class="ec-lmtt-10x-x-109">\</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩ </span>doesn’t allow you to use the - - - first optional argument of <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-45010"></a> or <span + id="dx1-54010"></a> or <span class="ec-lmtt-10x-x-109">\Gls</span><a - id="dx1-45011"></a> — you will need to explicitly use + id="dx1-54011"></a> — you will need to explicitly use <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-45012"></a> or <span + id="dx1-54012"></a> or <span class="ec-lmtt-10x-x-109">\Gls</span><a - id="dx1-45013"></a> to change the settings. -</p><!--l. 4875--><p class="indent" > <div class="important" title="Important Note"> Recall that, in general, <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span + id="dx1-54013"></a> to change the settings. +</p><!--l. 5904--><p class="indent" > <div class="important" title="Important Note"> Recall that, in general, <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> ignores spaces following command names consisting of alphabetical characters. This is also true for <span class="ec-lmtt-10x-x-109">\</span><span @@ -12394,22 +14920,28 @@ class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span> unless you additionally load the <span class="ec-lmss-10x-x-109">xspace</span><a - id="dx1-45014"></a> package. </div> -</p><!--l. 4880--><p class="noindent" > -</p><!--l. 4882--><p class="indent" > The <span + id="dx1-54014"></a> package, but be aware that there +are some issues with using <span +class="ec-lmss-10x-x-109">xspace</span><a + id="dx1-54015"></a>.<span class="footnote-mark"><a +href="#fn3x15" id="fn3x15-bk"><sup class="textsuperscript">3</sup></a></span></div> +</p><!--l. 5910--><p class="noindent" > +<a + id="x1-54016f3"></a> +</p><!--l. 5914--><p class="indent" > The <span class="ec-lmss-10x-x-109">glossaries </span>package doesn’t load the <span class="ec-lmss-10x-x-109">xspace</span><a - id="dx1-45015"></a> package since there are + id="dx1-54017"></a> package since there are both advantages and disadvantages to using <span class="ec-lmtt-10x-x-109">\xspace</span><a - id="dx1-45016"></a> in <span + id="dx1-54018"></a> in <span class="ec-lmtt-10x-x-109">\</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>. If you don’t use the <span class="ec-lmss-10x-x-109">xspace</span><a - id="dx1-45017"></a> package you need to explicitly force a space using <span class="obeylines-h"><span class="verb"><span + id="dx1-54019"></a> package you need to explicitly force a space using <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\␣</span></span></span> (backslash space) however you can follow <span class="ec-lmtt-10x-x-109">\</span><span @@ -12418,40 +14950,40 @@ class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩ </span>with additional text in square brackets (the final optional argument to <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-45018"></a>). If you use the <span + id="dx1-54020"></a>). If you use the <span class="ec-lmss-10x-x-109">xspace</span><a - id="dx1-45019"></a> + id="dx1-54021"></a> package you don’t need to escape the spaces but you can’t use the optional argument to insert text (you will have to explicitly use <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-45020"></a>). -</p><!--l. 4893--><p class="indent" > To illustrate this, suppose I define the acronym “abc” as follows: + id="dx1-54022"></a>). +</p><!--l. 5925--><p class="indent" > To illustrate this, suppose I define the acronym “abc” as follows: </p> - <div class="verbatim" id="verbatim-133"> + <div class="verbatim" id="verbatim-155"> \oldacronym{abc}{example acronym}{} </div> -<!--l. 4897--><p class="nopar" > This will create the command <span +<!--l. 5929--><p class="nopar" > This will create the command <span class="ec-lmtt-10x-x-109">\abc </span>and its starred version <span class="ec-lmtt-10x-x-109">\abc*</span>. <a -href="#x1-450233">Table 13.3</a> illustrates the effect of <span +href="#x1-540253">Table 13.3</a> illustrates the effect of <span class="ec-lmtt-10x-x-109">\abc </span>(on subsequent use) according to whether or not the <span class="ec-lmss-10x-x-109">xspace</span><a - id="dx1-45021"></a> package has been loaded. As can be seen from + id="dx1-54023"></a> package has been loaded. As can be seen from the final row in the table, the <span class="ec-lmss-10x-x-109">xspace</span><a - id="dx1-45022"></a> package prevents the optional + id="dx1-54024"></a> package prevents the optional argument from being recognised. -</p><!--l. 4905--><p class="indent" > <a - id="x1-450233"></a></p><hr class="float" /><div class="float" +</p><!--l. 5937--><p class="indent" > <a + id="x1-540253"></a></p><hr class="float" /><div class="float" > @@ -12460,55 +14992,55 @@ argument from being recognised. ><tr style="vertical-align:baseline;" class="caption"><td class="id">Table 13.3: </td><td class="content">The effect of using <span class="ec-lmss-10x-x-109">xspace </span>with <span -class="ec-lmtt-10x-x-109">\oldacronym</span></td></tr></table></div><!--tex4ht:label?: x1-450233 --> -<div class="tabular"> <table id="TBL-8" class="tabular" +class="ec-lmtt-10x-x-109">\oldacronym</span></td></tr></table></div><!--tex4ht:label?: x1-540253 --> +<div class="tabular"> <table id="TBL-9" class="tabular" cellspacing="0" cellpadding="0" -><colgroup id="TBL-8-1g"><col -id="TBL-8-1" /><col -id="TBL-8-2" /><col -id="TBL-8-3" /></colgroup><tr - style="vertical-align:baseline;" id="TBL-8-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-8-1-1" +><colgroup id="TBL-9-1g"><col +id="TBL-9-1" /><col +id="TBL-9-2" /><col +id="TBL-9-3" /></colgroup><tr + style="vertical-align:baseline;" id="TBL-9-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-1-1" class="td11"> <span -class="ec-lmbx-10x-x-109">Code </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-1-2" +class="ec-lmbx-10x-x-109">Code </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-9-1-2" class="td11"> <span class="ec-lmbx-10x-x-109">With </span><span -class="ec-lmssbx-10x-x-109">xspace </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-8-1-3" +class="ec-lmssbx-10x-x-109">xspace </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-9-1-3" class="td11"> <span class="ec-lmbx-10x-x-109">Without </span><span class="ec-lmssbx-10x-x-109">xspace </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-8-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-8-2-1" + style="vertical-align:baseline;" id="TBL-9-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-2-1" class="td11"> <span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">\abc.</span></span></span> </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-2-2" -class="td11"> abc. </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-2-3" +class="ec-lmtt-10x-x-109">\abc.</span></span></span> </td><td style="white-space:nowrap; text-align:left;" id="TBL-9-2-2" +class="td11"> abc. </td><td style="white-space:nowrap; text-align:left;" id="TBL-9-2-3" class="td11"> abc. </td> </tr><tr - style="vertical-align:baseline;" id="TBL-8-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-8-3-1" + style="vertical-align:baseline;" id="TBL-9-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-3-1" class="td11"> <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\abc</span><span -class="ec-lmtt-10x-x-109"> xyz</span></span></span> </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-3-2" -class="td11"> abc xyz </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-3-3" +class="ec-lmtt-10x-x-109"> xyz</span></span></span> </td><td style="white-space:nowrap; text-align:left;" id="TBL-9-3-2" +class="td11"> abc xyz </td><td style="white-space:nowrap; text-align:left;" id="TBL-9-3-3" class="td11"> abcxyz </td> </tr><tr - style="vertical-align:baseline;" id="TBL-8-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-8-4-1" + style="vertical-align:baseline;" id="TBL-9-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-4-1" class="td11"> <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\abc\</span><span -class="ec-lmtt-10x-x-109"> xyz</span></span></span> </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-4-2" -class="td11"> abc xyz </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-4-3" +class="ec-lmtt-10x-x-109"> xyz</span></span></span> </td><td style="white-space:nowrap; text-align:left;" id="TBL-9-4-2" +class="td11"> abc xyz </td><td style="white-space:nowrap; text-align:left;" id="TBL-9-4-3" class="td11"> abc xyz </td> </tr><tr - style="vertical-align:baseline;" id="TBL-8-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-8-5-1" + style="vertical-align:baseline;" id="TBL-9-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-5-1" class="td11"> <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\abc*</span><span -class="ec-lmtt-10x-x-109"> xyz</span></span></span> </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-5-2" -class="td11"> Abc xyz </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-5-3" +class="ec-lmtt-10x-x-109"> xyz</span></span></span> </td><td style="white-space:nowrap; text-align:left;" id="TBL-9-5-2" +class="td11"> Abc xyz </td><td style="white-space:nowrap; text-align:left;" id="TBL-9-5-3" class="td11"> Abc xyz </td> </tr><tr - style="vertical-align:baseline;" id="TBL-8-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-8-6-1" + style="vertical-align:baseline;" id="TBL-9-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-6-1" class="td11"> <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\abc[’s]</span><span -class="ec-lmtt-10x-x-109"> xyz</span></span></span> </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-6-2" -class="td11"> abc [’s] xyz </td><td style="white-space:nowrap; text-align:left;" id="TBL-8-6-3" +class="ec-lmtt-10x-x-109"> xyz</span></span></span> </td><td style="white-space:nowrap; text-align:left;" id="TBL-9-6-2" +class="td11"> abc [’s] xyz </td><td style="white-space:nowrap; text-align:left;" id="TBL-9-6-3" class="td11"> abc’s xyz </td></tr></table> </div> @@ -12518,108 +15050,108 @@ class="td11"> abc’s xyz </td></tr></table> -<!--l. 4925--><p class="noindent" ><a +<!--l. 5957--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">14</span>  <a - id="x1-4600014"></a>Unsetting and Resetting Entry Flags</h2> + id="sec:glsunset"></a>Unsetting and Resetting Entry Flags</h2> When using <span class="ec-lmtt-10x-x-109">\gls</span><a - id="dx1-46001"></a>, <span + id="dx1-55001"></a>, <span class="ec-lmtt-10x-x-109">\glspl</span><a - id="dx1-46002"></a> and their uppercase variants it is possible that + id="dx1-55002"></a> and their uppercase variants it is possible that you may want to use the value given by the <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-46003"></a> key, even though you have + id="dx1-55003"></a> key, even though you have already <a - id="dx1-46004"></a><a + id="dx1-55004"></a><a href="#glo:firstuse">used</a> the glossary entry. Conversely, you may want to use the value given by the <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-46005"></a> key, even though you haven’t used the + id="dx1-55005"></a> key, even though you haven’t used the glossary entry. The former can be achieved by one of the following commands: -<!--l. 4934--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 5966--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsreset</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-46006"></a> <span + id="dx1-55006"></a> <span class="ec-lmtt-10x-x-109">\glsreset{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4936--><p class="noindent" > -</p><!--l. 4937--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5968--><p class="noindent" > +</p><!--l. 5969--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glslocalreset</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-46007"></a> <span + id="dx1-55007"></a> <span class="ec-lmtt-10x-x-109">\glslocalreset{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4939--><p class="noindent" > +</p><!--l. 5971--><p class="noindent" > while the latter can be achieved by one of the following commands: -</p><!--l. 4941--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5973--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsunset</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-46008"></a> <span + id="dx1-55008"></a> <span class="ec-lmtt-10x-x-109">\glsunset{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4943--><p class="noindent" > -</p><!--l. 4944--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5975--><p class="noindent" > +</p><!--l. 5976--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glslocalunset</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-46009"></a> <span + id="dx1-55009"></a> <span class="ec-lmtt-10x-x-109">\glslocalunset{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4946--><p class="noindent" > +</p><!--l. 5978--><p class="noindent" > You can also reset or unset all entries for a given glossary or list of glossaries using: -</p><!--l. 4949--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5981--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsresetall</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-46010"></a> <span + id="dx1-55010"></a> <span class="ec-lmtt-10x-x-109">\glsresetall[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4951--><p class="noindent" > -</p><!--l. 4952--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5983--><p class="noindent" > +</p><!--l. 5984--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glslocalresetall</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-46011"></a> <span + id="dx1-55011"></a> <span class="ec-lmtt-10x-x-109">\glslocalresetall[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4954--><p class="noindent" > -</p><!--l. 4955--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5986--><p class="noindent" > +</p><!--l. 5987--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsunsetall</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-46012"></a> <span + id="dx1-55012"></a> <span class="ec-lmtt-10x-x-109">\glsunsetall[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4957--><p class="noindent" > -</p><!--l. 4958--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5989--><p class="noindent" > +</p><!--l. 5990--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glslocalunsetall</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-46013"></a> <span + id="dx1-55013"></a> <span class="ec-lmtt-10x-x-109">\glslocalunsetall[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary list</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">] </span></div><hr> -</p><!--l. 4960--><p class="noindent" > +</p><!--l. 5992--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary list</span><span @@ -12630,17 +15162,17 @@ in the main glossary and the list of acronyms: </p> - <div class="verbatim" id="verbatim-134"> + <div class="verbatim" id="verbatim-156"> \glsresetall[main,acronym] </div> -<!--l. 4967--><p class="nopar" > -</p><!--l. 4969--><p class="indent" > You can determine whether an entry’s <a - id="dx1-46014"></a><a +<!--l. 5999--><p class="nopar" > +</p><!--l. 6001--><p class="indent" > You can determine whether an entry’s <a + id="dx1-55014"></a><a href="#glo:firstuseflag">first use flag</a> is set using: -</p><!--l. 4970--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6002--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ifglsused</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-46015"></a> <span + id="dx1-55015"></a> <span class="ec-lmtt-10x-x-109">\ifglsused{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -12654,7 +15186,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 4972--><p class="noindent" > +</p><!--l. 6004--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -12672,33 +15204,37 @@ done. </p> <h2 class="chapterHead"><span class="titlemark">15</span>  <a - id="x1-4700015"></a>Glossary Styles</h2> -<!--l. 4980--><p class="noindent" >The <span -class="ec-lmss-10x-x-109">glossaries </span>package comes with some pre-defined glossary styles. Note -that the styles are suited to different types of glossaries: some styles ignore -the associated symbol; some styles are not designed for hierarchical entries, -so they display sub-entries in the same way as they display top level -entries; some styles are designed for homographs, so they ignore the -name for sub-entries. You should therefore pick a style that suits -your type of glossary. See <a -href="#x1-470041">table 15.1</a> for a summary of the available -styles. The predefined styles can accommodate numbered level 0 -(main) and level 1 entries. See the package options <span + id="sec:styles"></a>Glossary Styles</h2> +<!--l. 6013--><p class="noindent" >Glossaries vary from lists that simply contain a symbol with a terse +description to lists of terms or phrases with lengthy descriptions. +Some glossaries may have terms with associated symbols. Some +may have hierarchical entries. There is therefore no single style +that fits every type of glossary. The <span +class="ec-lmss-10x-x-109">glossaries </span>package comes with +a number of pre-defined glossary styles, and you need to choose +one that best suits your type of glossary. There is a summary of +available styles in <a +href="#x1-560041">table 15.1</a>. If none of them suit your document, you +can defined your own style (see <a +href="#sec:newglossarystyle">§16 </a><a +href="#sec:newglossarystyle">Defining your own glossary +style<!--tex4ht:ref: sec:newglossarystyle --></a>). +</p><!--l. 6024--><p class="indent" > The predefined styles can accommodate numbered level 0 (main) and +level 1 entries. See the package options <span class="ec-lmss-10x-x-109">entrycounter</span><a - id="dx1-47001"></a>, -<span + id="dx1-56001"></a>, <span class="ec-lmss-10x-x-109">counterwithin</span><a - id="dx1-47002"></a> and <span + id="dx1-56002"></a> and +<span class="ec-lmss-10x-x-109">subentrycounter</span><a - id="dx1-47003"></a> described in <a -href="#x1-150002.3">§2.3 </a><a -href="#x1-150002.3">Glossary Appearance -Options<!--tex4ht:ref: sec:pkgopts-printglos --></a>. + id="dx1-56003"></a> described in <a +href="#sec:pkgopts-printglos">§2.3 </a><a +href="#sec:pkgopts-printglos">Glossary Appearance Options<!--tex4ht:ref: sec:pkgopts-printglos --></a>. -</p><!--l. 4994--><p class="indent" > <a - id="x1-470041"></a></p><hr class="float" /><div class="float" +</p><!--l. 6030--><p class="indent" > <a + id="x1-560041"></a></p><hr class="float" /><div class="float" > @@ -12710,303 +15246,305 @@ anything that matches that doesn’t match any previously listed style (e.g. <span class="ec-lmtt-10x-x-109">long3col* </span>matches <span class="ec-lmss-10x-x-109">long3col</span><a - id="dx1-47005"></a>, <span + id="dx1-56005"></a>, <span class="ec-lmss-10x-x-109">long3colheader</span><a - id="dx1-47006"></a>, <span + id="dx1-56006"></a>, <span class="ec-lmss-10x-x-109">long3colborder</span><a - id="dx1-47007"></a> and + id="dx1-56007"></a> and <span class="ec-lmss-10x-x-109">long3colheaderborder</span><a - id="dx1-47008"></a>). A maximum level of 0 indicates a flat glossary + id="dx1-56008"></a>). A maximum level of 0 indicates a flat glossary (sub-entries are displayed in the same way as main entries). Where the maximum level is given as — there is no limit, but note that <a - id="dx1-47009"></a><a + id="dx1-56009"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-47010"></a></a> + id="dx1-56010"></a></a> imposes a limit of 2 sub-levels. If the homograph column is checked, then the name is not displayed for sub-entries. If the symbol column -is checked, then the symbol will be displayed.</td></tr></table></div><!--tex4ht:label?: x1-470041 --> -<div class="tabular"> <table id="TBL-9" class="tabular" +is checked, then the symbol will be displayed.</td></tr></table></div><!--tex4ht:label?: x1-560041 --> +<div class="tabular"> <table id="TBL-10" class="tabular" cellspacing="0" cellpadding="0" -><colgroup id="TBL-9-1g"><col -id="TBL-9-1" /><col -id="TBL-9-2" /><col -id="TBL-9-3" /><col -id="TBL-9-4" /></colgroup><tr - style="vertical-align:baseline;" id="TBL-9-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-1-1" +><colgroup id="TBL-10-1g"><col +id="TBL-10-1" /><col +id="TBL-10-2" /><col +id="TBL-10-3" /><col +id="TBL-10-4" /></colgroup><tr + style="vertical-align:baseline;" id="TBL-10-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-1-1" class="td11"> <span -class="ec-lmbx-10x-x-109">Style </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-1-2" +class="ec-lmbx-10x-x-109">Style </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-1-2" class="td11"> <span -class="ec-lmbx-10x-x-109">Maximum Level </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-1-3" +class="ec-lmbx-10x-x-109">Maximum Level </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-1-3" class="td11"> <span -class="ec-lmbx-10x-x-109">Homograph </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-1-4" +class="ec-lmbx-10x-x-109">Homograph </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-1-4" class="td11"> <span class="ec-lmbx-10x-x-109">Symbol </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-9-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-2-1" + style="vertical-align:baseline;" id="TBL-10-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-2-1" class="td11"> <span -class="ec-lmtt-10x-x-109">listdotted </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-2-2" -class="td11"> 0 </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-2-3" -class="td11"> </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-2-4" +class="ec-lmtt-10x-x-109">listdotted </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-2-2" +class="td11"> 0 </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-2-3" +class="td11"> </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-2-4" class="td11"> </td></tr><tr - style="vertical-align:baseline;" id="TBL-9-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-3-1" + style="vertical-align:baseline;" id="TBL-10-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-3-1" class="td11"> <span -class="ec-lmtt-10x-x-109">sublistdotted </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-3-2" -class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-3-3" -class="td11"> </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-3-4" +class="ec-lmtt-10x-x-109">sublistdotted </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-3-2" +class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-3-3" +class="td11"> </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-3-4" class="td11"></td> </tr><tr - style="vertical-align:baseline;" id="TBL-9-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-4-1" + style="vertical-align:baseline;" id="TBL-10-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-4-1" class="td11"> <span -class="ec-lmtt-10x-x-109">list* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-4-2" -class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-4-3" +class="ec-lmtt-10x-x-109">list* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-4-2" +class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-4-3" class="td11"> <span -class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-4-4" +class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-4-4" class="td11"> </td></tr><tr - style="vertical-align:baseline;" id="TBL-9-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-5-1" + style="vertical-align:baseline;" id="TBL-10-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-5-1" class="td11"> <span -class="ec-lmtt-10x-x-109">altlist* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-5-2" -class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-5-3" +class="ec-lmtt-10x-x-109">altlist* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-5-2" +class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-5-3" class="td11"> <span -class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-5-4" +class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-5-4" class="td11"> </td></tr><tr - style="vertical-align:baseline;" id="TBL-9-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-6-1" + style="vertical-align:baseline;" id="TBL-10-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-6-1" class="td11"> <span -class="ec-lmtt-10x-x-109">long*3col* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-6-2" -class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-6-3" +class="ec-lmtt-10x-x-109">long*3col* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-6-2" +class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-6-3" class="td11"> <span -class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-6-4" +class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-6-4" class="td11"> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-9-7-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-7-1" + style="vertical-align:baseline;" id="TBL-10-7-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-7-1" class="td11"> <span -class="ec-lmtt-10x-x-109">long4col* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-7-2" -class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-7-3" +class="ec-lmtt-10x-x-109">long4col* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-7-2" +class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-7-3" class="td11"> <span -class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-7-4" +class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-7-4" class="td11"> <span class="pzdr-x-x-109">✓ </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-9-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-8-1" + style="vertical-align:baseline;" id="TBL-10-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-8-1" class="td11"> <span -class="ec-lmtt-10x-x-109">altlong*4col* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-8-2" -class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-8-3" +class="ec-lmtt-10x-x-109">altlong*4col* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-8-2" +class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-8-3" class="td11"> <span -class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-8-4" +class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-8-4" class="td11"> <span class="pzdr-x-x-109">✓ </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-9-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-9-1" + style="vertical-align:baseline;" id="TBL-10-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-9-1" class="td11"> <span -class="ec-lmtt-10x-x-109">long* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-9-2" -class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-9-3" +class="ec-lmtt-10x-x-109">long* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-9-2" +class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-9-3" class="td11"> <span -class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-9-4" +class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-9-4" class="td11"> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-9-10-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-10-1" + style="vertical-align:baseline;" id="TBL-10-10-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-10-1" class="td11"> <span -class="ec-lmtt-10x-x-109">super*3col* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-10-2" -class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-10-3" +class="ec-lmtt-10x-x-109">super*3col* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-10-2" +class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-10-3" class="td11"> <span -class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-10-4" +class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-10-4" class="td11"> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-9-11-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-11-1" + style="vertical-align:baseline;" id="TBL-10-11-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-11-1" class="td11"> <span -class="ec-lmtt-10x-x-109">super4col* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-11-2" -class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-11-3" +class="ec-lmtt-10x-x-109">super4col* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-11-2" +class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-11-3" class="td11"> <span -class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-11-4" +class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-11-4" class="td11"> <span class="pzdr-x-x-109">✓ </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-9-12-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-12-1" + style="vertical-align:baseline;" id="TBL-10-12-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-12-1" class="td11"> <span -class="ec-lmtt-10x-x-109">altsuper*4col* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-12-2" -class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-12-3" +class="ec-lmtt-10x-x-109">altsuper*4col* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-12-2" +class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-12-3" class="td11"> <span -class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-12-4" +class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-12-4" class="td11"> <span class="pzdr-x-x-109">✓ </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-9-13-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-13-1" + style="vertical-align:baseline;" id="TBL-10-13-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-13-1" class="td11"> <span -class="ec-lmtt-10x-x-109">super* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-13-2" -class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-13-3" +class="ec-lmtt-10x-x-109">super* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-13-2" +class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-13-3" class="td11"> <span -class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-13-4" +class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-13-4" class="td11"> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-9-14-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-14-1" + style="vertical-align:baseline;" id="TBL-10-14-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-14-1" class="td11"> <span -class="ec-lmtt-10x-x-109">*index* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-14-2" -class="td11"> 2 </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-14-3" -class="td11"> </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-14-4" +class="ec-lmtt-10x-x-109">*index* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-14-2" +class="td11"> 2 </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-14-3" +class="td11"> </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-14-4" class="td11"> <span class="pzdr-x-x-109">✓ </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-9-15-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-15-1" + style="vertical-align:baseline;" id="TBL-10-15-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-15-1" class="td11"> <span -class="ec-lmtt-10x-x-109">treenoname* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-15-2" -class="td11"> — </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-15-3" +class="ec-lmtt-10x-x-109">treenoname* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-15-2" +class="td11"> — </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-15-3" class="td11"> <span -class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-15-4" +class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-15-4" class="td11"> <span class="pzdr-x-x-109">✓ </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-9-16-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-16-1" + style="vertical-align:baseline;" id="TBL-10-16-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-16-1" class="td11"> <span -class="ec-lmtt-10x-x-109">*tree* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-16-2" -class="td11"> — </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-16-3" -class="td11"> </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-16-4" +class="ec-lmtt-10x-x-109">*tree* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-16-2" +class="td11"> — </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-16-3" +class="td11"> </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-16-4" class="td11"> <span class="pzdr-x-x-109">✓ </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-9-17-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-17-1" + style="vertical-align:baseline;" id="TBL-10-17-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-17-1" class="td11"> <span -class="ec-lmtt-10x-x-109">*alttree* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-17-2" -class="td11"> — </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-17-3" -class="td11"> </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-17-4" +class="ec-lmtt-10x-x-109">*alttree* </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-17-2" +class="td11"> — </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-17-3" +class="td11"> </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-17-4" class="td11"> <span class="pzdr-x-x-109">✓ </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-9-18-"><td style="white-space:nowrap; text-align:left;" id="TBL-9-18-1" + style="vertical-align:baseline;" id="TBL-10-18-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-18-1" class="td11"> <span -class="ec-lmtt-10x-x-109">inline </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-18-2" -class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-9-18-3" +class="ec-lmtt-10x-x-109">inline </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-18-2" +class="td11"> 1 </td><td style="white-space:nowrap; text-align:center;" id="TBL-10-18-3" class="td11"> <span -class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-9-18-4" +class="pzdr-x-x-109">✓ </span></td><td style="white-space:nowrap; text-align:center;" id="TBL-10-18-4" class="td11"> </td></tr></table></div> </div><hr class="endfloat" /> -<!--l. 5034--><p class="indent" > The glossary style can be set using the <span +<!--l. 6070--><p class="indent" > The glossary style can be set using the <span class="ec-lmss-10x-x-109">style</span><a - id="dx1-47011"></a> key in the optional argument + id="dx1-56011"></a> key in the optional argument to <span class="ec-lmtt-10x-x-109">\printglossary</span><a - id="dx1-47012"></a> or using the command: -</p><!--l. 5036--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span -class="ec-lmtt-10">\glossarystyle</span><span + id="dx1-56012"></a> or using the command: +</p><!--l. 6072--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\setglossarystyle</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-47013"></a> <span -class="ec-lmtt-10x-x-109">\glossarystyle{</span><span + id="dx1-56013"></a> <span +class="ec-lmtt-10x-x-109">\setglossarystyle{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">style-name</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 5038--><p class="noindent" > +</p><!--l. 6074--><p class="noindent" > Some of the glossary styles may also be set using the <span class="ec-lmss-10x-x-109">style</span><a - id="dx1-47014"></a> package option, + id="dx1-56014"></a> package option, it depends if the package in which they are defined is automatically loaded by the <span class="ec-lmss-10x-x-109">glossaries </span>package. -</p><!--l. 5043--><p class="indent" > The tabular-like styles that allow multi-line descriptions +</p><!--l. 6079--><p class="indent" > The tabular-like styles that allow multi-line descriptions and page lists use the length <span class="marginpar"><span class="ec-lmtt-10">\glsdescwidth</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-47015"></a><span + id="dx1-56015"></a><span class="ec-lmtt-10x-x-109">\glsdescwidth</span> to set the width of the description column and the length <span class="marginpar"><span class="ec-lmtt-10">\glspagelistwidth</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-47016"></a><span + id="dx1-56016"></a><span class="ec-lmtt-10x-x-109">\glspagelistwidth </span>to set the width of the page list column.<span class="footnote-mark"><a href="#fn1x17" id="fn1x17-bk"><sup class="textsuperscript">1</sup></a></span><a - id="x1-47017f1"></a> + id="x1-56017f1"></a> These will need to be changed using <span class="ec-lmtt-10x-x-109">\setlength </span>if the glossary is too wide. Note that the <span class="ec-lmss-10x-x-109">long4col</span><a - id="dx1-47021"></a> and <span + id="dx1-56021"></a> and <span class="ec-lmss-10x-x-109">super4col</span><a - id="dx1-47022"></a> styles (and their header and + id="dx1-56022"></a> styles (and their header and border variations) don’t use these lengths as they are designed for single line entries. Instead you should use the analogous <span class="ec-lmss-10x-x-109">altlong4col</span><a - id="dx1-47023"></a> and + id="dx1-56023"></a> and <span class="ec-lmss-10x-x-109">altsuper4col</span><a - id="dx1-47024"></a> styles. If you want to explicitly create a line-break within a -multi-line description in a tabular-like style you should use <span + id="dx1-56024"></a> styles. If you want to explicitly create a line-break within a +multi-line description in a tabular-like style it’s better to use <span class="ec-lmtt-10x-x-109">\newline</span><a - id="dx1-47025"></a> + id="dx1-56025"></a> instead of <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\\</span></span></span>. -</p><!--l. 5061--><p class="indent" > Note that if you use the <span +</p><!--l. 6097--><p class="indent" > Note that if you use the <span class="ec-lmss-10x-x-109">style</span><a - id="dx1-47026"></a> key in the optional argument to + id="dx1-56026"></a> key in the optional argument to <span class="ec-lmtt-10x-x-109">\printglossary</span><a - id="dx1-47027"></a>, it will override any previous style settings for the given + id="dx1-56027"></a>, it will override any previous style settings for the given glossary, so if, for example, you do </p> - <div class="verbatim" id="verbatim-135"> + <div class="verbatim" id="verbatim-157"> \renewcommand*{\glsgroupskip}{}  <br />\printglossary[style=long] </div> -<!--l. 5068--><p class="nopar" > then the new definition of <span +<!--l. 6104--><p class="nopar" > then the new definition of <span class="ec-lmtt-10x-x-109">\glsgroupskip</span><a - id="dx1-47028"></a> will not have an affect for this + id="dx1-56028"></a> will not have an affect for this glossary, as <span class="ec-lmtt-10x-x-109">\glsgroupskip </span>is redefined by <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">style=long</span></span></span>. Likewise, <span -class="ec-lmtt-10x-x-109">\glossarystyle</span><a - id="dx1-47029"></a> will also override any previous style definitions, so, +class="ec-lmtt-10x-x-109">\setglossarystyle</span><a + id="dx1-56029"></a> will also override any previous style definitions, so, again </p> - <div class="verbatim" id="verbatim-136"> + <div class="verbatim" id="verbatim-158"> \renewcommand*{\glsgroupskip}{} - <br />\glossarystyle{long} + <br />\setglossarystyle{long} </div> -<!--l. 5076--><p class="nopar" > will reset <span +<!--l. 6112--><p class="nopar" > will reset <span class="ec-lmtt-10x-x-109">\glsgroupskip </span>back to its default definition for the named glossary style (<span class="ec-lmss-10x-x-109">long</span><a - id="dx1-47030"></a> in this case). If you want to modify the styles, either + id="dx1-56030"></a> in this case). If you want to modify the styles, either use <span class="ec-lmtt-10x-x-109">\newglossarystyle</span><a - id="dx1-47031"></a> (described in the next section) or make the + id="dx1-56031"></a> (described in the next section) or make the modifications after <span -class="ec-lmtt-10x-x-109">\glossarystyle</span><a - id="dx1-47032"></a>, e.g.: +class="ec-lmtt-10x-x-109">\setglossarystyle</span><a + id="dx1-56032"></a>, e.g.: </p> - <div class="verbatim" id="verbatim-137"> -\glossarystyle{long} + <div class="verbatim" id="verbatim-159"> +\setglossarystyle{long}  <br />\renewcommand*{\glsgroupskip}{} </div> -<!--l. 5085--><p class="nopar" > As from version 3.03, you can now use the package option <span +<!--l. 6121--><p class="nopar" > As from version 3.03, you can now use the package option <span class="ec-lmss-10x-x-109">nogroupskip</span><a - id="dx1-47033"></a> to -suppress the gap between groups for the default styles. -</p><!--l. 5090--><p class="indent" > All the styles except for the three- and four-column styles and the + id="dx1-56033"></a> to +suppress the gap between groups for the default styles instead of redefining +<span +class="ec-lmtt-10x-x-109">\glsgroupskip</span>. +</p><!--l. 6126--><p class="indent" > All the styles except for the three- and four-column styles and the <span class="ec-lmss-10x-x-109">listdotted</span><a - id="dx1-47034"></a> style use the command -</p><!--l. 5092--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="dx1-56034"></a> style use the command +</p><!--l. 6128--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glspostdescription</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-47035"></a> <span + id="dx1-56035"></a> <span class="ec-lmtt-10x-x-109">\glspostdescription </span></div><hr> -</p><!--l. 5094--><p class="noindent" > +</p><!--l. 6130--><p class="noindent" > after the description. This simply displays a full stop by default. To eliminate this full stop (or replace it with something else, say, a comma) you will need to redefine <span @@ -13014,58 +15552,58 @@ class="ec-lmtt-10x-x-109">\glspostdescription </span>before the glossary is displayed. Alternatively, you can suppress it for a given entry by placing <span class="ec-lmtt-10x-x-109">\nopostdesc</span><a - id="dx1-47036"></a> in the entry’s description. -</p><!--l. 5101--><p class="indent" > As from version 3.03 you can now use the package option <span + id="dx1-56036"></a> in the entry’s description. +</p><!--l. 6137--><p class="indent" > As from version 3.03 you can now use the package option <span class="ec-lmss-10x-x-109">nopostdot</span><a - id="dx1-47037"></a> to + id="dx1-56037"></a> to suppress this full stop. </p> <h3 class="sectionHead"><span class="titlemark">15.1</span>  <a - id="x1-4800015.1"></a>List Styles</h3> -<!--l. 5107--><p class="noindent" >The styles described in this section are all defined in the package + id="sec:liststyles"></a>List Styles</h3> +<!--l. 6143--><p class="noindent" >The styles described in this section are all defined in the package <span class="ec-lmss-10x-x-109">glossary-list</span><a - id="dx1-48001"></a>. Since they all use the <span + id="dx1-57001"></a>. Since they all use the <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-48002"></a><a - id="dx1-48003"></a> environment, they are + id="dx1-57002"></a><a + id="dx1-57003"></a> environment, they are governed by the same parameters as that environment. These styles all ignore the entry’s symbol. Note that these styles will automatically be available unless you use the <span class="ec-lmss-10x-x-109">nolist</span><a - id="dx1-48004"></a> or <span + id="dx1-57004"></a> or <span class="ec-lmss-10x-x-109">nostyles</span><a - id="dx1-48005"></a> package options. + id="dx1-57005"></a> package options. </p><dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">list</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">list</span><a - id="dx1-48006"></a> style uses the <span + id="dx1-57006"></a> style uses the <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-48007"></a><a - id="dx1-48008"></a> environment. The entry name - is placed in the optional argument of the <span + id="dx1-57007"></a><a + id="dx1-57008"></a> environment. The entry name is + placed in the optional argument of the <span class="ec-lmtt-10x-x-109">\item</span><a - id="dx1-48009"></a> command (so - it will appear in bold by default). The description follows, and - then the associated <a - id="dx1-48010"></a><a + id="dx1-57009"></a> command (so it + will usually appear in bold by default). The description follows, + and then the associated <a + id="dx1-57010"></a><a href="#glo:numberlist">number list<a - id="dx1-48011"></a></a> for that entry. The symbol is + id="dx1-57011"></a></a> for that entry. The symbol is ignored. If the entry has child entries, the description and number list follows (but not the name) for each child entry. Groups are separated using <span class="ec-lmtt-10x-x-109">\indexspace</span><a - id="dx1-48012"></a>. + id="dx1-57012"></a>. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">listgroup</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">listgroup</span><a - id="dx1-48013"></a> style is like <span + id="dx1-57013"></a> style is like <span class="ec-lmss-10x-x-109">list</span><a - id="dx1-48014"></a> but the glossary groups have + id="dx1-57014"></a> but the glossary groups have headings. @@ -13075,21 +15613,21 @@ class="ec-lmss-10x-x-109">list</span><a class="ec-lmssbx-10x-x-109">listhypergroup</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">listhypergroup</span><a - id="dx1-48015"></a> style is like <span + id="dx1-57015"></a> style is like <span class="ec-lmss-10x-x-109">listgroup</span><a - id="dx1-48016"></a> but has + id="dx1-57016"></a> but has a navigation line at the start of the glossary with links to each group that is present in the glossary. This requires an additional run through <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> to ensure the group information is up to date. In the navigation line, each group is separated by - <!--l. 5132--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 6168--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glshypernavsep</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-48017"></a> <span + id="dx1-57017"></a> <span class="ec-lmtt-10x-x-109">\glshypernavsep </span></div><hr> - </p><!--l. 5134--><p class="noindent" > + </p><!--l. 6170--><p class="noindent" > which defaults to a vertical bar with a space on either side. For example, to simply have a space separating each group, do: @@ -13097,18 +15635,18 @@ class="ec-lmtt-10x-x-109">\glshypernavsep </span></div><hr> </p> - <div class="verbatim" id="verbatim-138"> + <div class="verbatim" id="verbatim-160"> \renewcommand*{\glshypernavsep}{\space} </div> - <!--l. 5139--><p class="nopar" > - </p><!--l. 5141--><p class="noindent" >Note that the hyper-navigation line is now (as from version 1.14) set + <!--l. 6175--><p class="nopar" > + </p><!--l. 6177--><p class="noindent" >Note that the hyper-navigation line is now (as from version 1.14) set inside the optional argument to <span class="ec-lmtt-10x-x-109">\item</span><a - id="dx1-48018"></a> instead of after it to prevent a + id="dx1-57018"></a> instead of after it to prevent a spurious space at the start. This can be changed by redefining <span class="ec-lmtt-10x-x-109">\glossaryheader</span><a - id="dx1-48019"></a>, but note that this needs to be done <span + id="dx1-57019"></a>, but note that this needs to be done <span class="ec-lmri-10x-x-109">after </span>the glossary style has been set. </p></dd><dt class="description"> @@ -13116,61 +15654,61 @@ class="ec-lmri-10x-x-109">after </span>the class="ec-lmssbx-10x-x-109">altlist</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altlist</span><a - id="dx1-48020"></a> style is like <span + id="dx1-57020"></a> style is like <span class="ec-lmss-10x-x-109">list</span><a - id="dx1-48021"></a> but the description starts on the + id="dx1-57021"></a> but the description starts on the line following the name. (As with the <span class="ec-lmss-10x-x-109">list</span><a - id="dx1-48022"></a> style, the symbol + id="dx1-57022"></a> style, the symbol is ignored.) Each child entry starts a new line, but as with the <span class="ec-lmss-10x-x-109">list</span><a - id="dx1-48023"></a> style, the name associated with each child entry is + id="dx1-57023"></a> style, the name associated with each child entry is ignored. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">altlistgroup</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altlistgroup</span><a - id="dx1-48024"></a> style is like <span + id="dx1-57024"></a> style is like <span class="ec-lmss-10x-x-109">altlist</span><a - id="dx1-48025"></a> but the glossary groups have + id="dx1-57025"></a> but the glossary groups have headings. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">altlisthypergroup</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altlisthypergroup</span><a - id="dx1-48026"></a> style is like <span + id="dx1-57026"></a> style is like <span class="ec-lmss-10x-x-109">altlistgroup</span><a - id="dx1-48027"></a> but has a + id="dx1-57027"></a> but has a set of links to the glossary groups. The navigation line is the same as that for <span class="ec-lmss-10x-x-109">listhypergroup</span><a - id="dx1-48028"></a>, described above. + id="dx1-57028"></a>, described above. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">listdotted</span> </dt><dd class="description">This style uses the <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-48029"></a><a - id="dx1-48030"></a> + id="dx1-57029"></a><a + id="dx1-57030"></a> environment.<span class="footnote-mark"><a href="#fn2x17" id="fn2x17-bk"><sup class="textsuperscript">2</sup></a></span><a - id="x1-48031f2"></a> + id="x1-57031f2"></a> Each entry starts with <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\item[]</span></span></span>, followed by the name followed by a dotted line, followed by the description. Note that this style ignores both the <a - id="dx1-48032"></a><a + id="dx1-57032"></a><a href="#glo:numberlist">number list<a - id="dx1-48033"></a></a> and the symbol. The length - <!--l. 5166--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + id="dx1-57033"></a></a> and the symbol. The length + <!--l. 6202--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glslistdottedwidth</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-48034"></a> <span + id="dx1-57034"></a> <span class="ec-lmtt-10x-x-109">\glslistdottedwidth </span></div><hr> - </p><!--l. 5168--><p class="noindent" > + </p><!--l. 6204--><p class="noindent" > governs where the description should start. This is a flat style, so child entries are formatted in the same way as the parent entries. @@ -13182,85 +15720,85 @@ class="ec-lmtt-10x-x-109">\glslistdottedwidth </span></div><hr> class="ec-lmssbx-10x-x-109">sublistdotted</span> </dt><dd class="description">This is a variation on the <span class="ec-lmss-10x-x-109">listdotted</span><a - id="dx1-48035"></a> style designed for + id="dx1-57035"></a> style designed for hierarchical glossaries. The main entries have just the name displayed. The sub entries are displayed in the same manner as <span class="ec-lmss-10x-x-109">listdotted</span><a - id="dx1-48036"></a>.</dd></dl> -<!--l. 5179--><p class="noindent" > + id="dx1-57036"></a>.</dd></dl> +<!--l. 6215--><p class="noindent" > </p> -<!--l. 5179--><p class="noindent" ><a +<!--l. 6215--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">15.2</span>  <a - id="x1-4900015.2"></a>Longtable Styles</h3> -<!--l. 5182--><p class="noindent" >The styles described in this section are all defined in the package + id="sec:longstyles"></a>Longtable Styles</h3> +<!--l. 6218--><p class="noindent" >The styles described in this section are all defined in the package <span class="ec-lmss-10x-x-109">glossary-long</span><a - id="dx1-49001"></a>. Since they all use the <span + id="dx1-58001"></a>. Since they all use the <span class="ec-lmss-10x-x-109">longtable</span><a - id="dx1-49002"></a><a - id="dx1-49003"></a> environment, they are + id="dx1-58002"></a><a + id="dx1-58003"></a> environment, they are governed by the same parameters as that environment. Note that these styles will automatically be available unless you use the <span class="ec-lmss-10x-x-109">nolong</span><a - id="dx1-49004"></a> or + id="dx1-58004"></a> or <span class="ec-lmss-10x-x-109">nostyles</span><a - id="dx1-49005"></a> package options. These styles fully justify the description and + id="dx1-58005"></a> package options. These styles fully justify the description and page list columns. If you want ragged right formatting instead, use the analogous styles described in <a -href="#x1-5000015.3">§15.3 </a><a -href="#x1-5000015.3">Longtable Styles (Ragged +href="#sec:longraggedstyles">§15.3 </a><a +href="#sec:longraggedstyles">Longtable Styles (Ragged Right)<!--tex4ht:ref: sec:longraggedstyles --></a>. </p><dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">long</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">long</span><a - id="dx1-49006"></a> style uses the <span + id="dx1-58006"></a> style uses the <span class="ec-lmss-10x-x-109">longtable</span><a - id="dx1-49007"></a><a - id="dx1-49008"></a> environment (defined by the + id="dx1-58007"></a><a + id="dx1-58008"></a> environment (defined by the <span class="ec-lmss-10x-x-109">longtable</span><a - id="dx1-49009"></a> package). It has two columns: the first column contains + id="dx1-58009"></a> package). It has two columns: the first column contains the entry’s name and the second column contains the description followed by the <a - id="dx1-49010"></a><a + id="dx1-58010"></a><a href="#glo:numberlist">number list<a - id="dx1-49011"></a></a>. The entry’s symbol is ignored. + id="dx1-58011"></a></a>. The entry’s symbol is ignored. Sub groups are separated with a blank row. The width of the first column is governed by the widest entry in that column. The width of the second column is governed by the length <span class="ec-lmtt-10x-x-109">\glsdescwidth</span><a - id="dx1-49012"></a>. Child entries have a similar format to the parent + id="dx1-58012"></a>. Child entries have a similar format to the parent entries except that their name is suppressed. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">longborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">longborder</span><a - id="dx1-49013"></a> style is like <span + id="dx1-58013"></a> style is like <span class="ec-lmss-10x-x-109">long</span><a - id="dx1-49014"></a> but has horizontal and + id="dx1-58014"></a> but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">longheader</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">longheader</span><a - id="dx1-49015"></a> style is like <span + id="dx1-58015"></a> style is like <span class="ec-lmss-10x-x-109">long</span><a - id="dx1-49016"></a> but has a header row. + id="dx1-58016"></a> but has a header row. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">longheaderborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">longheaderborder</span><a - id="dx1-49017"></a> style is like <span + id="dx1-58017"></a> style is like <span class="ec-lmss-10x-x-109">longheader</span><a - id="dx1-49018"></a> but + id="dx1-58018"></a> but has horizontal and vertical lines around it. @@ -13270,176 +15808,176 @@ class="ec-lmss-10x-x-109">longheader</span><a class="ec-lmssbx-10x-x-109">long3col</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">long3col</span><a - id="dx1-49019"></a> style is like <span + id="dx1-58019"></a> style is like <span class="ec-lmss-10x-x-109">long</span><a - id="dx1-49020"></a> but has three columns. The first + id="dx1-58020"></a> but has three columns. The first column contains the entry’s name, the second column contains the description and the third column contains the <a - id="dx1-49021"></a><a + id="dx1-58021"></a><a href="#glo:numberlist">number list<a - id="dx1-49022"></a></a>. + id="dx1-58022"></a></a>. The entry’s symbol is ignored. The width of the first column is governed by the widest entry in that column, the width of the second column is governed by the length <span class="ec-lmtt-10x-x-109">\glsdescwidth</span><a - id="dx1-49023"></a>, + id="dx1-58023"></a>, and the width of the third column is governed by the length <span class="ec-lmtt-10x-x-109">\glspagelistwidth</span><a - id="dx1-49024"></a>. + id="dx1-58024"></a>. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">long3colborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">long3colborder</span><a - id="dx1-49025"></a> style is like the <span + id="dx1-58025"></a> style is like the <span class="ec-lmss-10x-x-109">long3col</span><a - id="dx1-49026"></a> style but + id="dx1-58026"></a> style but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">long3colheader</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">long3colheader</span><a - id="dx1-49027"></a> style is like <span + id="dx1-58027"></a> style is like <span class="ec-lmss-10x-x-109">long3col</span><a - id="dx1-49028"></a> but has a + id="dx1-58028"></a> but has a header row. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">long3colheaderborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">long3colheaderborder</span><a - id="dx1-49029"></a> style is like + id="dx1-58029"></a> style is like <span class="ec-lmss-10x-x-109">long3colheader</span><a - id="dx1-49030"></a> but has horizontal and vertical lines around it. + id="dx1-58030"></a> but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">long4col</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">long4col</span><a - id="dx1-49031"></a> style is like <span + id="dx1-58031"></a> style is like <span class="ec-lmss-10x-x-109">long3col</span><a - id="dx1-49032"></a> but has an additional + id="dx1-58032"></a> but has an additional column in which the entry’s associated symbol appears. This style is used for brief single line descriptions. The column widths are governed by the widest entry in the given column. Use <span class="ec-lmss-10x-x-109">altlong4col</span><a - id="dx1-49033"></a> for multi-line descriptions. + id="dx1-58033"></a> for multi-line descriptions. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">long4colborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">long4colborder</span><a - id="dx1-49034"></a> style is like the <span + id="dx1-58034"></a> style is like the <span class="ec-lmss-10x-x-109">long4col</span><a - id="dx1-49035"></a> style but + id="dx1-58035"></a> style but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">long4colheader</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">long4colheader</span><a - id="dx1-49036"></a> style is like <span + id="dx1-58036"></a> style is like <span class="ec-lmss-10x-x-109">long4col</span><a - id="dx1-49037"></a> but has a + id="dx1-58037"></a> but has a header row. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">long4colheaderborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">long4colheaderborder</span><a - id="dx1-49038"></a> style is like + id="dx1-58038"></a> style is like <span class="ec-lmss-10x-x-109">long4colheader</span><a - id="dx1-49039"></a> but has horizontal and vertical lines around it. + id="dx1-58039"></a> but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">altlong4col</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altlong4col</span><a - id="dx1-49040"></a> style is like <span + id="dx1-58040"></a> style is like <span class="ec-lmss-10x-x-109">long4col</span><a - id="dx1-49041"></a> but allows multi-line + id="dx1-58041"></a> but allows multi-line descriptions and page lists. The width of the description column is governed by the length <span class="ec-lmtt-10x-x-109">\glsdescwidth</span><a - id="dx1-49042"></a> and the + id="dx1-58042"></a> and the width of the page list column is governed by the length <span class="ec-lmtt-10x-x-109">\glspagelistwidth</span><a - id="dx1-49043"></a>. The widths of the name and symbol + id="dx1-58043"></a>. The widths of the name and symbol columns are governed by the widest entry in the given column. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">altlong4colborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altlong4colborder</span><a - id="dx1-49044"></a> style is like the <span + id="dx1-58044"></a> style is like the <span class="ec-lmss-10x-x-109">long4colborder</span><a - id="dx1-49045"></a> + id="dx1-58045"></a> but allows multi-line descriptions and page lists. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">altlong4colheader</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altlong4colheader</span><a - id="dx1-49046"></a> style is like <span + id="dx1-58046"></a> style is like <span class="ec-lmss-10x-x-109">long4colheader</span><a - id="dx1-49047"></a> + id="dx1-58047"></a> but allows multi-line descriptions and page lists. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">altlong4colheaderborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altlong4colheaderborder</span><a - id="dx1-49048"></a> style is like + id="dx1-58048"></a> style is like <span class="ec-lmss-10x-x-109">long4colheaderborder</span><a - id="dx1-49049"></a> but allows multi-line descriptions and page + id="dx1-58049"></a> but allows multi-line descriptions and page lists.</dd></dl> -<!--l. 5275--><p class="noindent" > +<!--l. 6311--><p class="noindent" > </p> -<!--l. 5275--><p class="noindent" ><a +<!--l. 6311--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">15.3</span>  <a - id="x1-5000015.3"></a>Longtable Styles (Ragged Right)</h3> -<!--l. 5278--><p class="noindent" >The styles described in this section are all defined in the package + id="sec:longraggedstyles"></a>Longtable Styles (Ragged Right)</h3> +<!--l. 6314--><p class="noindent" >The styles described in this section are all defined in the package <span class="ec-lmss-10x-x-109">glossary-longragged</span><a - id="dx1-50001"></a>. These styles are analogous to those defined in + id="dx1-59001"></a>. These styles are analogous to those defined in <span class="ec-lmss-10x-x-109">glossary-long</span><a - id="dx1-50002"></a> but the multiline columns are left justified instead of fully + id="dx1-59002"></a> but the multiline columns are left justified instead of fully justified. Since these styles all use the <span class="ec-lmss-10x-x-109">longtable</span><a - id="dx1-50003"></a><a - id="dx1-50004"></a> environment, they + id="dx1-59003"></a><a + id="dx1-59004"></a> environment, they are governed by the same parameters as that environment. The <span class="ec-lmss-10x-x-109">glossary-longragged</span><a - id="dx1-50005"></a> package additionally requires the <span + id="dx1-59005"></a> package additionally requires the <span class="ec-lmss-10x-x-109">array</span><a - id="dx1-50006"></a> package. + id="dx1-59006"></a> package. Note that these styles will only be available if you explicitly load <span class="ec-lmss-10x-x-109">glossary-longragged</span><a - id="dx1-50007"></a>: + id="dx1-59007"></a>: </p> - <div class="verbatim" id="verbatim-139"> + <div class="verbatim" id="verbatim-161"> \usepackage{glossaries}  <br />\usepackage{glossary-longragged} </div> -<!--l. 5290--><p class="nopar" > Note that you can’t set these styles using the <span +<!--l. 6326--><p class="nopar" > Note that you can’t set these styles using the <span class="ec-lmss-10x-x-109">style</span><a - id="dx1-50008"></a> package option since + id="dx1-59008"></a> package option since the styles aren’t defined until after the <span class="ec-lmss-10x-x-109">glossaries </span>package has been loaded. @@ -13448,68 +15986,68 @@ loaded. class="ec-lmssbx-10x-x-109">longragged</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">longragged</span><a - id="dx1-50009"></a> style has two columns: the first column + id="dx1-59009"></a> style has two columns: the first column contains the entry’s name and the second column contains the (left-justified) description followed by the <a - id="dx1-50010"></a><a + id="dx1-59010"></a><a href="#glo:numberlist">number list<a - id="dx1-50011"></a></a>. The + id="dx1-59011"></a></a>. The entry’s symbol is ignored. Sub groups are separated with a blank row. The width of the first column is governed by the widest entry in that column. The width of the second column is governed by the length <span class="ec-lmtt-10x-x-109">\glsdescwidth</span><a - id="dx1-50012"></a>. Child entries have a similar format + id="dx1-59012"></a>. Child entries have a similar format to the parent entries except that their name is suppressed. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">longraggedborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">longraggedborder</span><a - id="dx1-50013"></a> style is like <span + id="dx1-59013"></a> style is like <span class="ec-lmss-10x-x-109">longragged</span><a - id="dx1-50014"></a> but + id="dx1-59014"></a> but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">longraggedheader</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">longraggedheader</span><a - id="dx1-50015"></a> style is like <span + id="dx1-59015"></a> style is like <span class="ec-lmss-10x-x-109">longragged</span><a - id="dx1-50016"></a> but + id="dx1-59016"></a> but has a header row. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">longraggedheaderborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">longraggedheaderborder</span><a - id="dx1-50017"></a> style is like + id="dx1-59017"></a> style is like <span class="ec-lmss-10x-x-109">longraggedheader</span><a - id="dx1-50018"></a> but has horizontal and vertical lines around it. + id="dx1-59018"></a> but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">longragged3col</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">longragged3col</span><a - id="dx1-50019"></a> style is like <span + id="dx1-59019"></a> style is like <span class="ec-lmss-10x-x-109">longragged</span><a - id="dx1-50020"></a> but has + id="dx1-59020"></a> but has three columns. The first column contains the entry’s name, the second column contains the (left justified) description and the third column contains the (left justified) <a - id="dx1-50021"></a><a + id="dx1-59021"></a><a href="#glo:numberlist">number list<a - id="dx1-50022"></a></a>. The entry’s + id="dx1-59022"></a></a>. The entry’s symbol is ignored. The width of the first column is governed by the widest entry in that column, the width of the second column is governed by the length <span class="ec-lmtt-10x-x-109">\glsdescwidth</span><a - id="dx1-50023"></a>, and the width of the + id="dx1-59023"></a>, and the width of the third column is governed by the length <span class="ec-lmtt-10x-x-109">\glspagelistwidth</span><a - id="dx1-50024"></a>. + id="dx1-59024"></a>. @@ -13518,46 +16056,46 @@ class="ec-lmtt-10x-x-109">\glspagelistwidth</span><a class="ec-lmssbx-10x-x-109">longragged3colborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">longragged3colborder</span><a - id="dx1-50025"></a> style is like the + id="dx1-59025"></a> style is like the <span class="ec-lmss-10x-x-109">longragged3col</span><a - id="dx1-50026"></a> style but has horizontal and vertical lines around + id="dx1-59026"></a> style but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">longragged3colheader</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">longragged3colheader</span><a - id="dx1-50027"></a> style is like + id="dx1-59027"></a> style is like <span class="ec-lmss-10x-x-109">longragged3col</span><a - id="dx1-50028"></a> but has a header row. + id="dx1-59028"></a> but has a header row. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">longragged3colheaderborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">longragged3colheaderborder</span><a - id="dx1-50029"></a> style is + id="dx1-59029"></a> style is like <span class="ec-lmss-10x-x-109">longragged3colheader</span><a - id="dx1-50030"></a> but has horizontal and vertical lines + id="dx1-59030"></a> but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">altlongragged4col</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altlongragged4col</span><a - id="dx1-50031"></a> style is like <span + id="dx1-59031"></a> style is like <span class="ec-lmss-10x-x-109">longragged3col</span><a - id="dx1-50032"></a> + id="dx1-59032"></a> but has an additional column in which the entry’s associated symbol appears. The width of the description column is governed by the length <span class="ec-lmtt-10x-x-109">\glsdescwidth</span><a - id="dx1-50033"></a> and the width of the page list + id="dx1-59033"></a> and the width of the page list column is governed by the length <span class="ec-lmtt-10x-x-109">\glspagelistwidth</span><a - id="dx1-50034"></a>. The + id="dx1-59034"></a>. The widths of the name and symbol columns are governed by the widest entry in the given column. </dd><dt class="description"> @@ -13565,147 +16103,147 @@ class="ec-lmtt-10x-x-109">\glspagelistwidth</span><a class="ec-lmssbx-10x-x-109">altlongragged4colborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altlongragged4colborder</span><a - id="dx1-50035"></a> style is like the + id="dx1-59035"></a> style is like the <span class="ec-lmss-10x-x-109">altlongragged4col</span><a - id="dx1-50036"></a> but has horizontal and vertical lines around it. + id="dx1-59036"></a> but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">altlongragged4colheader</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altlongragged4colheader</span><a - id="dx1-50037"></a> style is like + id="dx1-59037"></a> style is like <span class="ec-lmss-10x-x-109">altlongragged4col</span><a - id="dx1-50038"></a> but has a header row. + id="dx1-59038"></a> but has a header row. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">altlongragged4colheaderborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altlongragged4colheaderborder</span><a - id="dx1-50039"></a> style is like <span + id="dx1-59039"></a> style is like <span class="ec-lmss-10x-x-109">altlongragged4colheader</span><a - id="dx1-50040"></a> + id="dx1-59040"></a> but has horizontal and vertical lines around it. </dd></dl> -<!--l. 5362--><p class="noindent" > +<!--l. 6398--><p class="noindent" > </p> -<!--l. 5362--><p class="noindent" ><a +<!--l. 6398--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">15.4</span>  <a - id="x1-5100015.4"></a>Supertabular Styles</h3> + id="sec:superstyles"></a>Supertabular Styles</h3> -<!--l. 5365--><p class="noindent" >The styles described in this section are all defined in the package +<!--l. 6401--><p class="noindent" >The styles described in this section are all defined in the package <span class="ec-lmss-10x-x-109">glossary-super</span><a - id="dx1-51001"></a>. Since they all use the <span + id="dx1-60001"></a>. Since they all use the <span class="ec-lmss-10x-x-109">supertabular</span><a - id="dx1-51002"></a><a - id="dx1-51003"></a> environment, they are + id="dx1-60002"></a><a + id="dx1-60003"></a> environment, they are governed by the same parameters as that environment. Note that these styles will automatically be available unless you use the <span class="ec-lmss-10x-x-109">nosuper</span><a - id="dx1-51004"></a> or + id="dx1-60004"></a> or <span class="ec-lmss-10x-x-109">nostyles</span><a - id="dx1-51005"></a> package options. In general, the <span + id="dx1-60005"></a> package options. In general, the <span class="ec-lmss-10x-x-109">longtable</span><a - id="dx1-51006"></a><a - id="dx1-51007"></a> environment is + id="dx1-60006"></a><a + id="dx1-60007"></a> environment is better, but there are some circumstances where it is better to use <span class="ec-lmss-10x-x-109">supertabular</span><a - id="dx1-51008"></a><a - id="dx1-51009"></a>.<span class="footnote-mark"><a + id="dx1-60008"></a><a + id="dx1-60009"></a>.<span class="footnote-mark"><a href="#fn3x17" id="fn3x17-bk"><sup class="textsuperscript">3</sup></a></span><a - id="x1-51010f3"></a> + id="x1-60010f3"></a> These styles fully justify the description and page list columns. If you want ragged right formatting instead, use the analogous styles described in <a -href="#x1-5200015.5">§15.5 +href="#sec:superraggedstyles">§15.5 </a><a -href="#x1-5200015.5">Supertabular Styles (Ragged Right)<!--tex4ht:ref: sec:superraggedstyles --></a>. +href="#sec:superraggedstyles">Supertabular Styles (Ragged Right)<!--tex4ht:ref: sec:superraggedstyles --></a>. </p><dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">super</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">super</span><a - id="dx1-51012"></a> style uses the <span + id="dx1-60012"></a> style uses the <span class="ec-lmss-10x-x-109">supertabular</span><a - id="dx1-51013"></a><a - id="dx1-51014"></a> environment (defined by + id="dx1-60013"></a><a + id="dx1-60014"></a> environment (defined by the <span class="ec-lmss-10x-x-109">supertabular</span><a - id="dx1-51015"></a> package). It has two columns: the first column + id="dx1-60015"></a> package). It has two columns: the first column contains the entry’s name and the second column contains the description followed by the <a - id="dx1-51016"></a><a + id="dx1-60016"></a><a href="#glo:numberlist">number list<a - id="dx1-51017"></a></a>. The entry’s symbol is + id="dx1-60017"></a></a>. The entry’s symbol is ignored. Sub groups are separated with a blank row. The width of the first column is governed by the widest entry in that column. The width of the second column is governed by the length <span class="ec-lmtt-10x-x-109">\glsdescwidth</span><a - id="dx1-51018"></a>. Child entries have a similar format to + id="dx1-60018"></a>. Child entries have a similar format to the parent entries except that their name is suppressed. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">superborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">superborder</span><a - id="dx1-51019"></a> style is like <span + id="dx1-60019"></a> style is like <span class="ec-lmss-10x-x-109">super</span><a - id="dx1-51020"></a> but has horizontal and + id="dx1-60020"></a> but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">superheader</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">superheader</span><a - id="dx1-51021"></a> style is like <span + id="dx1-60021"></a> style is like <span class="ec-lmss-10x-x-109">super</span><a - id="dx1-51022"></a> but has a header row. + id="dx1-60022"></a> but has a header row. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">superheaderborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">superheaderborder</span><a - id="dx1-51023"></a> style is like <span + id="dx1-60023"></a> style is like <span class="ec-lmss-10x-x-109">superheader</span><a - id="dx1-51024"></a> but + id="dx1-60024"></a> but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">super3col</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">super3col</span><a - id="dx1-51025"></a> style is like <span + id="dx1-60025"></a> style is like <span class="ec-lmss-10x-x-109">super</span><a - id="dx1-51026"></a> but has three columns. + id="dx1-60026"></a> but has three columns. The first column contains the entry’s name, the second column contains the description and the third column contains the <a - id="dx1-51027"></a><a + id="dx1-60027"></a><a href="#glo:numberlist">number list<a - id="dx1-51028"></a></a>. The entry’s symbol is ignored. The width of the + id="dx1-60028"></a></a>. The entry’s symbol is ignored. The width of the first column is governed by the widest entry in that column. The width of the second column is governed by the length <span class="ec-lmtt-10x-x-109">\glsdescwidth</span><a - id="dx1-51029"></a>. The width of the third column is governed by + id="dx1-60029"></a>. The width of the third column is governed by the length <span class="ec-lmtt-10x-x-109">\glspagelistwidth</span><a - id="dx1-51030"></a>. + id="dx1-60030"></a>. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">super3colborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">super3colborder</span><a - id="dx1-51031"></a> style is like the <span + id="dx1-60031"></a> style is like the <span class="ec-lmss-10x-x-109">super3col</span><a - id="dx1-51032"></a> style + id="dx1-60032"></a> style @@ -13715,78 +16253,78 @@ class="ec-lmss-10x-x-109">super3col</span><a class="ec-lmssbx-10x-x-109">super3colheader</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">super3colheader</span><a - id="dx1-51033"></a> style is like <span + id="dx1-60033"></a> style is like <span class="ec-lmss-10x-x-109">super3col</span><a - id="dx1-51034"></a> but has a + id="dx1-60034"></a> but has a header row. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">super3colheaderborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">super3colheaderborder</span><a - id="dx1-51035"></a> style is like the + id="dx1-60035"></a> style is like the <span class="ec-lmss-10x-x-109">super3colheader</span><a - id="dx1-51036"></a> style but has horizontal and vertical lines around + id="dx1-60036"></a> style but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">super4col</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">super4col</span><a - id="dx1-51037"></a> style is like <span + id="dx1-60037"></a> style is like <span class="ec-lmss-10x-x-109">super3col</span><a - id="dx1-51038"></a> but has an additional + id="dx1-60038"></a> but has an additional column in which the entry’s associated symbol appears. This style is designed for entries with brief single line descriptions. The column widths are governed by the widest entry in the given column. Use <span class="ec-lmss-10x-x-109">altsuper4col</span><a - id="dx1-51039"></a> for multi-line descriptions. + id="dx1-60039"></a> for multi-line descriptions. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">super4colborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">super4colborder</span><a - id="dx1-51040"></a> style is like the <span + id="dx1-60040"></a> style is like the <span class="ec-lmss-10x-x-109">super4col</span><a - id="dx1-51041"></a> style + id="dx1-60041"></a> style but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">super4colheader</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">super4colheader</span><a - id="dx1-51042"></a> style is like <span + id="dx1-60042"></a> style is like <span class="ec-lmss-10x-x-109">super4col</span><a - id="dx1-51043"></a> but has a + id="dx1-60043"></a> but has a header row. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">super4colheaderborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">super4colheaderborder</span><a - id="dx1-51044"></a> style is like the + id="dx1-60044"></a> style is like the <span class="ec-lmss-10x-x-109">super4colheader</span><a - id="dx1-51045"></a> style but has horizontal and vertical lines around + id="dx1-60045"></a> style but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">altsuper4col</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altsuper4col</span><a - id="dx1-51046"></a> style is like <span + id="dx1-60046"></a> style is like <span class="ec-lmss-10x-x-109">super4col</span><a - id="dx1-51047"></a> but allows + id="dx1-60047"></a> but allows multi-line descriptions and page lists. The width of the description column is governed by the length <span class="ec-lmtt-10x-x-109">\glsdescwidth</span><a - id="dx1-51048"></a> + id="dx1-60048"></a> and the width of the page list column is governed by the length <span class="ec-lmtt-10x-x-109">\glspagelistwidth</span><a - id="dx1-51049"></a>. The width of the name and symbol + id="dx1-60049"></a>. The width of the name and symbol columns is governed by the widest entry in the given column. </dd><dt class="description"> <span @@ -13794,19 +16332,19 @@ class="ec-lmssbx-10x-x-109">altsuper4colborder</span> </dt><dd class="description"> The <span class="ec-lmss-10x-x-109">altsuper4colborder</span><a - id="dx1-51050"></a> style is like the <span + id="dx1-60050"></a> style is like the <span class="ec-lmss-10x-x-109">super4colborder</span><a - id="dx1-51051"></a> style but + id="dx1-60051"></a> style but allows multi-line descriptions and page lists. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">altsuper4colheader</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altsuper4colheader</span><a - id="dx1-51052"></a> style is + id="dx1-60052"></a> style is like <span class="ec-lmss-10x-x-109">super4colheader</span><a - id="dx1-51053"></a> but allows multi-line descriptions and page + id="dx1-60053"></a> but allows multi-line descriptions and page lists. @@ -13816,48 +16354,48 @@ class="ec-lmss-10x-x-109">super4colheader</span><a class="ec-lmssbx-10x-x-109">altsuper4colheaderborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altsuper4colheaderborder</span><a - id="dx1-51054"></a> style is like + id="dx1-60054"></a> style is like <span class="ec-lmss-10x-x-109">super4colheaderborder</span><a - id="dx1-51055"></a> but allows multi-line descriptions and page + id="dx1-60055"></a> but allows multi-line descriptions and page lists.</dd></dl> -<!--l. 5461--><p class="noindent" > +<!--l. 6497--><p class="noindent" > </p> -<!--l. 5461--><p class="noindent" ><a +<!--l. 6497--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">15.5</span>  <a - id="x1-5200015.5"></a>Supertabular Styles (Ragged Right)</h3> -<!--l. 5464--><p class="noindent" >The styles described in this section are all defined in the package + id="sec:superraggedstyles"></a>Supertabular Styles (Ragged Right)</h3> +<!--l. 6500--><p class="noindent" >The styles described in this section are all defined in the package <span class="ec-lmss-10x-x-109">glossary-superragged</span><a - id="dx1-52001"></a>. These styles are analogous to those defined in + id="dx1-61001"></a>. These styles are analogous to those defined in <span class="ec-lmss-10x-x-109">glossary-super</span><a - id="dx1-52002"></a> but the multiline columns are left justified instead of fully + id="dx1-61002"></a> but the multiline columns are left justified instead of fully justified. Since these styles all use the <span class="ec-lmss-10x-x-109">supertabular</span><a - id="dx1-52003"></a><a - id="dx1-52004"></a> environment, they + id="dx1-61003"></a><a + id="dx1-61004"></a> environment, they are governed by the same parameters as that environment. The <span class="ec-lmss-10x-x-109">glossary-superragged</span><a - id="dx1-52005"></a> package additionally requires the <span + id="dx1-61005"></a> package additionally requires the <span class="ec-lmss-10x-x-109">array</span><a - id="dx1-52006"></a> package. + id="dx1-61006"></a> package. Note that these styles will only be available if you explicitly load <span class="ec-lmss-10x-x-109">glossary-superragged</span><a - id="dx1-52007"></a>: + id="dx1-61007"></a>: </p> - <div class="verbatim" id="verbatim-140"> + <div class="verbatim" id="verbatim-162"> \usepackage{glossaries}  <br />\usepackage{glossary-superragged} </div> -<!--l. 5476--><p class="nopar" > Note that you can’t set these styles using the <span +<!--l. 6512--><p class="nopar" > Note that you can’t set these styles using the <span class="ec-lmss-10x-x-109">style</span><a - id="dx1-52008"></a> package option since + id="dx1-61008"></a> package option since the styles aren’t defined until after the <span class="ec-lmss-10x-x-109">glossaries </span>package has been loaded. @@ -13866,24 +16404,24 @@ loaded. class="ec-lmssbx-10x-x-109">superragged</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">superragged</span><a - id="dx1-52009"></a> style uses the <span + id="dx1-61009"></a> style uses the <span class="ec-lmss-10x-x-109">supertabular</span><a - id="dx1-52010"></a><a - id="dx1-52011"></a> environment + id="dx1-61010"></a><a + id="dx1-61011"></a> environment (defined by the <span class="ec-lmss-10x-x-109">supertabular</span><a - id="dx1-52012"></a> package). It has two columns: the + id="dx1-61012"></a> package). It has two columns: the first column contains the entry’s name and the second column contains the (left justified) description followed by the <a - id="dx1-52013"></a><a + id="dx1-61013"></a><a href="#glo:numberlist">number list<a - id="dx1-52014"></a></a>. The entry’s symbol is ignored. Sub groups are separated + id="dx1-61014"></a></a>. The entry’s symbol is ignored. Sub groups are separated with a blank row. The width of the first column is governed by the widest entry in that column. The width of the second column is governed by the length <span class="ec-lmtt-10x-x-109">\glsdescwidth</span><a - id="dx1-52015"></a>. Child entries have a + id="dx1-61015"></a>. Child entries have a similar format to the parent entries except that their name is suppressed. </dd><dt class="description"> @@ -13891,51 +16429,51 @@ class="ec-lmtt-10x-x-109">\glsdescwidth</span><a class="ec-lmssbx-10x-x-109">superraggedborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">superraggedborder</span><a - id="dx1-52016"></a> style is like <span + id="dx1-61016"></a> style is like <span class="ec-lmss-10x-x-109">superragged</span><a - id="dx1-52017"></a> but + id="dx1-61017"></a> but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">superraggedheader</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">superraggedheader</span><a - id="dx1-52018"></a> style is like <span + id="dx1-61018"></a> style is like <span class="ec-lmss-10x-x-109">superragged</span><a - id="dx1-52019"></a> + id="dx1-61019"></a> but has a header row. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">superraggedheaderborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">superraggedheaderborder</span><a - id="dx1-52020"></a> style is like + id="dx1-61020"></a> style is like <span class="ec-lmss-10x-x-109">superraggedheader</span><a - id="dx1-52021"></a> but has horizontal and vertical lines around + id="dx1-61021"></a> but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">superragged3col</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">superragged3col</span><a - id="dx1-52022"></a> style is like <span + id="dx1-61022"></a> style is like <span class="ec-lmss-10x-x-109">superragged</span><a - id="dx1-52023"></a> but has + id="dx1-61023"></a> but has three columns. The first column contains the entry’s name, the second column contains the (left justified) description and the third column contains the (left justified) <a - id="dx1-52024"></a><a + id="dx1-61024"></a><a href="#glo:numberlist">number list<a - id="dx1-52025"></a></a>. The entry’s + id="dx1-61025"></a></a>. The entry’s symbol is ignored. The width of the first column is governed by the widest entry in that column. The width of the second column is governed by the length <span class="ec-lmtt-10x-x-109">\glsdescwidth</span><a - id="dx1-52026"></a>. The width of the third + id="dx1-61026"></a>. The width of the third column is governed by the length <span class="ec-lmtt-10x-x-109">\glspagelistwidth</span><a - id="dx1-52027"></a>. + id="dx1-61027"></a>. @@ -13944,39 +16482,39 @@ class="ec-lmtt-10x-x-109">\glspagelistwidth</span><a class="ec-lmssbx-10x-x-109">superragged3colborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">superragged3colborder</span><a - id="dx1-52028"></a> style is like the + id="dx1-61028"></a> style is like the <span class="ec-lmss-10x-x-109">superragged3col</span><a - id="dx1-52029"></a> style but has horizontal and vertical lines around + id="dx1-61029"></a> style but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">superragged3colheader</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">superragged3colheader</span><a - id="dx1-52030"></a> style is like + id="dx1-61030"></a> style is like <span class="ec-lmss-10x-x-109">superragged3col</span><a - id="dx1-52031"></a> but has a header row. + id="dx1-61031"></a> but has a header row. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">superragged3colheaderborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">superragged3colheaderborder</span><a - id="dx1-52032"></a> style + id="dx1-61032"></a> style is like <span class="ec-lmss-10x-x-109">superragged3colheader</span><a - id="dx1-52033"></a> but has horizontal and vertical lines + id="dx1-61033"></a> but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">altsuperragged4col</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altsuperragged4col</span><a - id="dx1-52034"></a> style is + id="dx1-61034"></a> style is like <span class="ec-lmss-10x-x-109">superragged3col</span><a - id="dx1-52035"></a> but has an additional column in which the + id="dx1-61035"></a> but has an additional column in which the entry’s associated symbol appears. The column widths for the name and symbol column are governed by the widest entry in the given column. @@ -13985,40 +16523,40 @@ class="ec-lmss-10x-x-109">superragged3col</span><a class="ec-lmssbx-10x-x-109">altsuperragged4colborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altsuperragged4colborder</span><a - id="dx1-52036"></a> style is like + id="dx1-61036"></a> style is like the <span class="ec-lmss-10x-x-109">altsuperragged4col</span><a - id="dx1-52037"></a> style but has horizontal and vertical lines + id="dx1-61037"></a> style but has horizontal and vertical lines around it. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">altsuperragged4colheader</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altsuperragged4colheader</span><a - id="dx1-52038"></a> style is like + id="dx1-61038"></a> style is like <span class="ec-lmss-10x-x-109">altsuperragged4col</span><a - id="dx1-52039"></a> but has a header row. + id="dx1-61039"></a> but has a header row. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">altsuperragged4colheaderborder</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">altsuperragged4colheaderborder</span><a - id="dx1-52040"></a> + id="dx1-61040"></a> style is like <span class="ec-lmss-10x-x-109">altsuperragged4colheader</span><a - id="dx1-52041"></a> but has horizontal and + id="dx1-61041"></a> but has horizontal and vertical lines around it. </dd></dl> -<!--l. 5549--><p class="noindent" > +<!--l. 6585--><p class="noindent" > </p> -<!--l. 5549--><p class="noindent" ><a +<!--l. 6585--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">15.6</span>  <a - id="x1-5300015.6"></a>Tree-Like Styles</h3> -<!--l. 5552--><p class="noindent" >The styles described in this section are all defined in the package + id="sec:treestyles"></a>Tree-Like Styles</h3> +<!--l. 6588--><p class="noindent" >The styles described in this section are all defined in the package <span class="ec-lmss-10x-x-109">glossary-tree</span><a - id="dx1-53001"></a>. These styles are designed for hierarchical glossaries but can + id="dx1-62001"></a>. These styles are designed for hierarchical glossaries but can also be used with glossaries that don’t have sub-entries. These styles will @@ -14026,16 +16564,16 @@ also be used with glossaries that don’t have sub-entries. These styles wil display the entry’s symbol if it exists. Note that these styles will automatically be available unless you use the <span class="ec-lmss-10x-x-109">notree</span><a - id="dx1-53002"></a> or <span + id="dx1-62002"></a> or <span class="ec-lmss-10x-x-109">nostyles</span><a - id="dx1-53003"></a> package + id="dx1-62003"></a> package options. </p><dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">index</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">index</span><a - id="dx1-53004"></a> style is similar to the way indices are usually + id="dx1-62004"></a> style is similar to the way indices are usually formatted in that it has a hierarchical structure up to three levels (the main level plus two sub-levels). The name is typeset in bold, and if the symbol is present it is set in parentheses after the @@ -14043,86 +16581,86 @@ class="ec-lmss-10x-x-109">index</span><a also include the name, the symbol in brackets (if present) and the description. Groups are separated using <span class="ec-lmtt-10x-x-109">\indexspace</span><a - id="dx1-53005"></a>. + id="dx1-62005"></a>. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">indexgroup</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">indexgroup</span><a - id="dx1-53006"></a> style is similar to the <span + id="dx1-62006"></a> style is similar to the <span class="ec-lmss-10x-x-109">index</span><a - id="dx1-53007"></a> style except + id="dx1-62007"></a> style except that each group has a heading. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">indexhypergroup</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">indexhypergroup</span><a - id="dx1-53008"></a> style is like <span + id="dx1-62008"></a> style is like <span class="ec-lmss-10x-x-109">indexgroup</span><a - id="dx1-53009"></a> but has + id="dx1-62009"></a> but has a set of links to the glossary groups. The navigation line is the same as that for <span class="ec-lmss-10x-x-109">listhypergroup</span><a - id="dx1-53010"></a>, described above. + id="dx1-62010"></a>, described above. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">tree</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">tree</span><a - id="dx1-53011"></a> style is similar to the <span + id="dx1-62011"></a> style is similar to the <span class="ec-lmss-10x-x-109">index</span><a - id="dx1-53012"></a> style except that it can have + id="dx1-62012"></a> style except that it can have arbitrary levels. (Note that <a - id="dx1-53013"></a><a + id="dx1-62013"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-53014"></a></a> is limited to three levels, + id="dx1-62014"></a></a> is limited to three levels, so you will need to use <a - id="dx1-53015"></a><a + id="dx1-62015"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-53016"></a></a> if you want more than three levels.) + id="dx1-62016"></a></a> if you want more than three levels.) Each sub-level is indented by <span class="marginpar"><span class="ec-lmtt-10">\glstreeindent</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-53017"></a><span + id="dx1-62017"></a><span class="ec-lmtt-10x-x-109">\glstreeindent</span>. Note that the name, symbol (if present) and description are placed in the same paragraph block. If you want the name to be apart from the description, use the <span class="ec-lmss-10x-x-109">alttree</span><a - id="dx1-53018"></a> style instead. (See + id="dx1-62018"></a> style instead. (See below.) </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">treegroup</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">treegroup</span><a - id="dx1-53019"></a> style is similar to the <span + id="dx1-62019"></a> style is similar to the <span class="ec-lmss-10x-x-109">tree</span><a - id="dx1-53020"></a> style except that + id="dx1-62020"></a> style except that each group has a heading. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">treehypergroup</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">treehypergroup</span><a - id="dx1-53021"></a> style is like <span + id="dx1-62021"></a> style is like <span class="ec-lmss-10x-x-109">treegroup</span><a - id="dx1-53022"></a> but has a + id="dx1-62022"></a> but has a set of links to the glossary groups. The navigation line is the same as that for <span class="ec-lmss-10x-x-109">listhypergroup</span><a - id="dx1-53023"></a>, described above. + id="dx1-62023"></a>, described above. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">treenoname</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">treenoname</span><a - id="dx1-53024"></a> style is like the <span + id="dx1-62024"></a> style is like the <span class="ec-lmss-10x-x-109">tree</span><a - id="dx1-53025"></a> style except that the + id="dx1-62025"></a> style except that the name for each sub-entry is ignored. @@ -14132,37 +16670,37 @@ class="ec-lmss-10x-x-109">tree</span><a class="ec-lmssbx-10x-x-109">treenonamegroup</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">treenonamegroup</span><a - id="dx1-53026"></a> style is similar to the + id="dx1-62026"></a> style is similar to the <span class="ec-lmss-10x-x-109">treenoname</span><a - id="dx1-53027"></a> style except that each group has a heading. + id="dx1-62027"></a> style except that each group has a heading. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">treenonamehypergroup</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">treenonamehypergroup</span><a - id="dx1-53028"></a> style is like + id="dx1-62028"></a> style is like <span class="ec-lmss-10x-x-109">treenonamegroup</span><a - id="dx1-53029"></a> but has a set of links to the glossary groups. The + id="dx1-62029"></a> but has a set of links to the glossary groups. The navigation line is the same as that for <span class="ec-lmss-10x-x-109">listhypergroup</span><a - id="dx1-53030"></a>, described + id="dx1-62030"></a>, described above. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">alttree</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">alttree</span><a - id="dx1-53031"></a> style is similar to the <span + id="dx1-62031"></a> style is similar to the <span class="ec-lmss-10x-x-109">tree</span><a - id="dx1-53032"></a> style except that the + id="dx1-62032"></a> style except that the indentation for each level is determined by the width of the text specified by - <!--l. 5612--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 6648--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glssetwidest</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-53033"></a> <span + id="dx1-62033"></a> <span class="ec-lmtt-10x-x-109">\glssetwidest[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">level</span><span @@ -14172,7 +16710,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> - </p><!--l. 5614--><p class="noindent" > + </p><!--l. 6650--><p class="noindent" > The optional argument <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">level</span><span @@ -14185,7 +16723,7 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">level</span><span class="lmsy-10x-x-109">⟩ </span>is omitted, 0 is assumed. - </p><!--l. 5621--><p class="noindent" >For each level, the name is placed to the left of the paragraph + </p><!--l. 6657--><p class="noindent" >For each level, the name is placed to the left of the paragraph block containing the symbol (optional) and the description. If the symbol is present, it is placed in parentheses before the description. @@ -14194,308 +16732,308 @@ class="lmsy-10x-x-109">⟩ </span>is omitted, 0 is class="ec-lmssbx-10x-x-109">alttreegroup</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">alttreegroup</span><a - id="dx1-53034"></a> is like the <span + id="dx1-62034"></a> is like the <span class="ec-lmss-10x-x-109">alttree</span><a - id="dx1-53035"></a> style except that each + id="dx1-62035"></a> style except that each group has a heading. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">alttreehypergroup</span> </dt><dd class="description">The <span class="ec-lmss-10x-x-109">alttreehypergroup</span><a - id="dx1-53036"></a> style is like <span + id="dx1-62036"></a> style is like <span class="ec-lmss-10x-x-109">alttreegroup</span><a - id="dx1-53037"></a> but has a + id="dx1-62037"></a> but has a set of links to the glossary groups. The navigation line is the same as that for <span class="ec-lmss-10x-x-109">listhypergroup</span><a - id="dx1-53038"></a>, described above. + id="dx1-62038"></a>, described above. </dd></dl> -<!--l. 5636--><p class="noindent" > +<!--l. 6672--><p class="noindent" > </p> -<!--l. 5636--><p class="noindent" ><a +<!--l. 6672--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">15.7</span>  <a - id="x1-5400015.7"></a>Multicols Style</h3> + id="sec:mcolstyles"></a>Multicols Style</h3> -<!--l. 5639--><p class="noindent" >The <span +<!--l. 6675--><p class="noindent" >The <span class="ec-lmss-10x-x-109">glossary-mcols</span><a - id="dx1-54001"></a> package provides tree-like styles that are in the <span + id="dx1-63001"></a> package provides tree-like styles that are in the <span class="ec-lmss-10x-x-109">multicols</span><a - id="dx1-54002"></a><a - id="dx1-54003"></a> + id="dx1-63002"></a><a + id="dx1-63003"></a> environment (defined by the <span class="ec-lmss-10x-x-109">multicol</span><a - id="dx1-54004"></a> package). The style names are as their + id="dx1-63004"></a> package). The style names are as their analogous tree styles (as defined in <a -href="#x1-5300015.6">§15.6 </a><a -href="#x1-5300015.6">Tree-Like Styles<!--tex4ht:ref: sec:treestyles --></a>) but are prefixed +href="#sec:treestyles">§15.6 </a><a +href="#sec:treestyles">Tree-Like Styles<!--tex4ht:ref: sec:treestyles --></a>) but are prefixed with “mcol”. For example, the <span class="ec-lmss-10x-x-109">mcolindex</span><a - id="dx1-54005"></a> style is essentially the <span + id="dx1-63005"></a> style is essentially the <span class="ec-lmss-10x-x-109">index</span><a - id="dx1-54006"></a> + id="dx1-63006"></a> style but put in a <span class="ec-lmss-10x-x-109">multicols</span><a - id="dx1-54007"></a><a - id="dx1-54008"></a> environment. For the complete list, see + id="dx1-63007"></a><a + id="dx1-63008"></a> environment. For the complete list, see <a -href="#x1-540122">table 15.2</a>. -</p><!--l. 5647--><p class="indent" > <div class="important" title="Important Note"> Note that <span +href="#x1-630122">table 15.2</a>. +</p><!--l. 6683--><p class="indent" > <div class="important" title="Important Note"> Note that <span class="ec-lmss-10x-x-109">glossary-mcols</span><a - id="dx1-54009"></a> is not loaded by <span + id="dx1-63009"></a> is not loaded by <span class="ec-lmss-10x-x-109">glossaries</span>. If you want to use any of the multicol styles in that package you need to load it explicitly with <span class="ec-lmtt-10x-x-109">\usepackage </span>and set the required glossary style using <span -class="ec-lmtt-10x-x-109">\glossarystyle</span><a - id="dx1-54010"></a>. </div> -</p><!--l. 5652--><p class="noindent" > -</p><!--l. 5654--><p class="indent" > The default number of columns is 2, but can be changed by redefining -</p><!--l. 5655--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10x-x-109">\setglossarystyle</span><a + id="dx1-63010"></a>. </div> +</p><!--l. 6688--><p class="noindent" > +</p><!--l. 6690--><p class="indent" > The default number of columns is 2, but can be changed by redefining +</p><!--l. 6691--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsmcols</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-54011"></a> <span + id="dx1-63011"></a> <span class="ec-lmtt-10x-x-109">\glsmcols </span></div><hr> -</p><!--l. 5657--><p class="noindent" > +</p><!--l. 6693--><p class="noindent" > to the required number. For example, for a three column glossary: </p> - <div class="verbatim" id="verbatim-141"> + <div class="verbatim" id="verbatim-163"> \usepackage{glossary-mcols}  <br />\renewcommand*{\glsmcols}{3} - <br />\glossarystyle{mcolindex} + <br />\setglossarystyle{mcolindex} </div> -<!--l. 5663--><p class="nopar" > +<!--l. 6699--><p class="nopar" > -</p><!--l. 5665--><p class="indent" > <a - id="x1-540122"></a></p><hr class="float" /><div class="float" +</p><!--l. 6701--><p class="indent" > <a + id="x1-630122"></a></p><hr class="float" /><div class="float" > <div class="caption"><table class="caption" ><tr style="vertical-align:baseline;" class="caption"><td class="id">Table 15.2: </td><td -class="content">Multicolumn Styles</td></tr></table></div><!--tex4ht:label?: x1-540122 --> -<div class="tabular"> <table id="TBL-10" class="tabular" +class="content">Multicolumn Styles</td></tr></table></div><!--tex4ht:label?: x1-630122 --> +<div class="tabular"> <table id="TBL-11" class="tabular" cellspacing="0" cellpadding="0" -><colgroup id="TBL-10-1g"><col -id="TBL-10-1" /><col -id="TBL-10-2" /></colgroup><tr - style="vertical-align:baseline;" id="TBL-10-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-1-1" +><colgroup id="TBL-11-1g"><col +id="TBL-11-1" /><col +id="TBL-11-2" /></colgroup><tr + style="vertical-align:baseline;" id="TBL-11-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-11-1-1" class="td11"> <span class="ec-lmssbx-10x-x-109">glossary-mcols</span><a - id="dx1-54013"></a> <span -class="ec-lmbx-10x-x-109">Style </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-10-1-2" + id="dx1-63013"></a> <span +class="ec-lmbx-10x-x-109">Style </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-11-1-2" class="td11"> <span class="ec-lmbx-10x-x-109">Analogous Tree Style </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-10-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-2-1" + style="vertical-align:baseline;" id="TBL-11-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-11-2-1" class="td11"> <span class="ec-lmss-10x-x-109">mcolindex</span><a - id="dx1-54014"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-10-2-2" + id="dx1-63014"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-11-2-2" class="td11"> <span class="ec-lmss-10x-x-109">index</span><a - id="dx1-54015"></a> </td></tr><tr - style="vertical-align:baseline;" id="TBL-10-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-3-1" + id="dx1-63015"></a> </td></tr><tr + style="vertical-align:baseline;" id="TBL-11-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-11-3-1" class="td11"> <span class="ec-lmss-10x-x-109">mcolindexgroup</span><a - id="dx1-54016"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-10-3-2" + id="dx1-63016"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-11-3-2" class="td11"> <span class="ec-lmss-10x-x-109">indexgroup</span><a - id="dx1-54017"></a></td> + id="dx1-63017"></a></td> </tr><tr - style="vertical-align:baseline;" id="TBL-10-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-4-1" + style="vertical-align:baseline;" id="TBL-11-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-11-4-1" class="td11"> <span class="ec-lmss-10x-x-109">mcolindexhypergroup</span><a - id="dx1-54018"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-10-4-2" + id="dx1-63018"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-11-4-2" class="td11"> <span class="ec-lmss-10x-x-109">indexhypergroup</span><a - id="dx1-54019"></a> </td> + id="dx1-63019"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-10-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-5-1" + style="vertical-align:baseline;" id="TBL-11-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-11-5-1" class="td11"> <span class="ec-lmss-10x-x-109">mcoltree</span><a - id="dx1-54020"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-10-5-2" + id="dx1-63020"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-11-5-2" class="td11"> <span class="ec-lmss-10x-x-109">tree</span><a - id="dx1-54021"></a> </td></tr><tr - style="vertical-align:baseline;" id="TBL-10-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-6-1" + id="dx1-63021"></a> </td></tr><tr + style="vertical-align:baseline;" id="TBL-11-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-11-6-1" class="td11"> <span class="ec-lmss-10x-x-109">mcoltreegroup</span><a - id="dx1-54022"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-10-6-2" + id="dx1-63022"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-11-6-2" class="td11"> <span class="ec-lmss-10x-x-109">treegroup</span><a - id="dx1-54023"></a></td> + id="dx1-63023"></a></td> </tr><tr - style="vertical-align:baseline;" id="TBL-10-7-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-7-1" + style="vertical-align:baseline;" id="TBL-11-7-"><td style="white-space:nowrap; text-align:left;" id="TBL-11-7-1" class="td11"> <span class="ec-lmss-10x-x-109">mcoltreehypergroup</span><a - id="dx1-54024"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-10-7-2" + id="dx1-63024"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-11-7-2" class="td11"> <span class="ec-lmss-10x-x-109">treehypergroup</span><a - id="dx1-54025"></a> </td> + id="dx1-63025"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-10-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-8-1" + style="vertical-align:baseline;" id="TBL-11-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-11-8-1" class="td11"> <span class="ec-lmss-10x-x-109">mcoltreenoname</span><a - id="dx1-54026"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-10-8-2" + id="dx1-63026"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-11-8-2" class="td11"> <span class="ec-lmss-10x-x-109">treenoname</span><a - id="dx1-54027"></a> </td> + id="dx1-63027"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-10-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-9-1" + style="vertical-align:baseline;" id="TBL-11-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-11-9-1" class="td11"> <span class="ec-lmss-10x-x-109">mcoltreenonamegroup</span><a - id="dx1-54028"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-10-9-2" + id="dx1-63028"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-11-9-2" class="td11"> <span class="ec-lmss-10x-x-109">treenonamegroup</span><a - id="dx1-54029"></a> </td> + id="dx1-63029"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-10-10-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-10-1" + style="vertical-align:baseline;" id="TBL-11-10-"><td style="white-space:nowrap; text-align:left;" id="TBL-11-10-1" class="td11"> <span class="ec-lmss-10x-x-109">mcoltreenonamehypergroup</span><a - id="dx1-54030"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-10-10-2" + id="dx1-63030"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-11-10-2" class="td11"> <span class="ec-lmss-10x-x-109">treenonamehypergroup</span><a - id="dx1-54031"></a> </td> + id="dx1-63031"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-10-11-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-11-1" + style="vertical-align:baseline;" id="TBL-11-11-"><td style="white-space:nowrap; text-align:left;" id="TBL-11-11-1" class="td11"> <span class="ec-lmss-10x-x-109">mcolalttree</span><a - id="dx1-54032"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-10-11-2" + id="dx1-63032"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-11-11-2" class="td11"> <span class="ec-lmss-10x-x-109">alttree</span><a - id="dx1-54033"></a> </td> + id="dx1-63033"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-10-12-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-12-1" + style="vertical-align:baseline;" id="TBL-11-12-"><td style="white-space:nowrap; text-align:left;" id="TBL-11-12-1" class="td11"> <span class="ec-lmss-10x-x-109">mcolalttreegroup</span><a - id="dx1-54034"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-10-12-2" + id="dx1-63034"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-11-12-2" class="td11"> <span class="ec-lmss-10x-x-109">alttreegroup</span><a - id="dx1-54035"></a> </td> + id="dx1-63035"></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-10-13-"><td style="white-space:nowrap; text-align:left;" id="TBL-10-13-1" + style="vertical-align:baseline;" id="TBL-11-13-"><td style="white-space:nowrap; text-align:left;" id="TBL-11-13-1" class="td11"> <span class="ec-lmss-10x-x-109">mcolalttreehypergroup</span><a - id="dx1-54036"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-10-13-2" + id="dx1-63036"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-11-13-2" class="td11"> <span class="ec-lmss-10x-x-109">alttreehypergroup</span><a - id="dx1-54037"></a> </td></tr></table></div> + id="dx1-63037"></a> </td></tr></table></div> </div><hr class="endfloat" /> -<!--l. 5689--><p class="noindent" ><a +<!--l. 6725--><p class="noindent" ><a href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">15.8</span>  <a - id="x1-5500015.8"></a>In-Line Style</h3> -<!--l. 5692--><p class="noindent" >This section covers the <span + id="sec:inline"></a>In-Line Style</h3> +<!--l. 6728--><p class="noindent" >This section covers the <span class="ec-lmss-10x-x-109">glossary-inline</span><a - id="dx1-55001"></a> package that supplies the <span + id="dx1-64001"></a> package that supplies the <span class="ec-lmss-10x-x-109">inline</span><a - id="dx1-55002"></a> style. + id="dx1-64002"></a> style. This is a style that is designed for in-line use (as opposed to block styles, such as lists or tables). This style doesn’t display the <a - id="dx1-55003"></a><a + id="dx1-64003"></a><a href="#glo:numberlist">number list<a - id="dx1-55004"></a></a>. -</p><!--l. 5697--><p class="indent" > You will most likely need to redefine <span + id="dx1-64004"></a></a>. +</p><!--l. 6733--><p class="indent" > You will most likely need to redefine <span class="ec-lmtt-10x-x-109">\glossarysection</span><a - id="dx1-55005"></a> with this style. + id="dx1-64005"></a> with this style. For example, suppose you are required to have your glossaries and list of acronyms in a footnote, you can do: </p> - <div class="verbatim" id="verbatim-142"> + <div class="verbatim" id="verbatim-164">  \usepackage{glossary-inline}  <br /> \renewcommand*{\glossarysection}[2][]{\textbf{#1}: } - <br /> \glossarystyle{inline} + <br /> \setglossarystyle{inline} </div> -<!--l. 5705--><p class="nopar" > -</p><!--l. 5707--><p class="indent" > <div class="important" title="Important Note"> Note that you need to include <span +<!--l. 6741--><p class="nopar" > +</p><!--l. 6743--><p class="indent" > <div class="important" title="Important Note"> Note that you need to include <span class="ec-lmss-10x-x-109">glossary-inline</span><a - id="dx1-55006"></a> with <span + id="dx1-64006"></a> with <span class="ec-lmtt-10x-x-109">\usepackage </span>as it’s not automatically included by the <span class="ec-lmss-10x-x-109">glossaries </span>package and then set the style using <span -class="ec-lmtt-10x-x-109">\glossarystyle</span><a - id="dx1-55007"></a>. </div> -</p><!--l. 5712--><p class="noindent" > -</p><!--l. 5714--><p class="indent" > Where you need to include your glossaries as a footnote you can +class="ec-lmtt-10x-x-109">\setglossarystyle</span><a + id="dx1-64007"></a>. </div> +</p><!--l. 6748--><p class="noindent" > +</p><!--l. 6750--><p class="indent" > Where you need to include your glossaries as a footnote you can do: </p> - <div class="verbatim" id="verbatim-143"> + <div class="verbatim" id="verbatim-165"> \footnote{\printglossaries} </div> -<!--l. 5717--><p class="nopar" > -</p><!--l. 5719--><p class="indent" > The <span +<!--l. 6753--><p class="nopar" > +</p><!--l. 6755--><p class="indent" > The <span class="ec-lmss-10x-x-109">inline</span><a - id="dx1-55008"></a> style is governed by the following: -</p><!--l. 5720--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="dx1-64008"></a> style is governed by the following: +</p><!--l. 6756--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsinlineseparator</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-55009"></a> <span + id="dx1-64009"></a> <span class="ec-lmtt-10x-x-109">\glsinlineseparator</span><a - id="dx1-55010"></a> </div><hr> -</p><!--l. 5722--><p class="noindent" > + id="dx1-64010"></a> </div><hr> +</p><!--l. 6758--><p class="noindent" > This defaults to “<span class="ec-lmtt-10x-x-109">; </span>” and is used between main (i.e. level 0) entries. -</p><!--l. 5725--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6761--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsinlinesubseparator</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-55011"></a> <span + id="dx1-64011"></a> <span class="ec-lmtt-10x-x-109">\glsinlinesubseparator</span><a - id="dx1-55012"></a> </div><hr> -</p><!--l. 5727--><p class="noindent" > + id="dx1-64012"></a> </div><hr> +</p><!--l. 6763--><p class="noindent" > This defaults to “<span class="ec-lmtt-10x-x-109">, </span>” and is used between sub-entries. -</p><!--l. 5730--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6766--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsinlineparentchildseparator</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-55013"></a> <span + id="dx1-64013"></a> <span class="ec-lmtt-10x-x-109">\glsinlineparentchildseparator</span><a - id="dx1-55014"></a> + id="dx1-64014"></a> </div><hr> -</p><!--l. 5732--><p class="noindent" > +</p><!--l. 6768--><p class="noindent" > This defaults to “<span class="ec-lmtt-10x-x-109">: </span>” and is used between a parent main entry and its first sub-entry. -</p><!--l. 5735--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6771--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glspostinline</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-55015"></a> <span + id="dx1-64015"></a> <span class="ec-lmtt-10x-x-109">\glspostinline</span><a - id="dx1-55016"></a> </div><hr> -</p><!--l. 5737--><p class="noindent" > + id="dx1-64016"></a> </div><hr> +</p><!--l. 6773--><p class="noindent" > This defaults to “<span class="ec-lmtt-10x-x-109">; </span>” and is used at the end of the glossary. </p> -<!--l. 5741--><p class="noindent" ><a +<!--l. 6777--><p class="noindent" ><a href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">16</span>  <a - id="x1-5600016"></a>Defining your own glossary style</h2> + id="sec:newglossarystyle"></a>Defining your own glossary style</h2> If the predefined styles don’t fit your requirements, you can define your own style using: -<!--l. 5746--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 6782--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\newglossarystyle</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56001"></a> <span + id="dx1-65001"></a> <span class="ec-lmtt-10x-x-109">\newglossarystyle{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span @@ -14506,128 +17044,164 @@ class="ec-lmri-10x-x-109">definitions</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 5748--><p class="noindent" > +</p><!--l. 6784--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">name</span><span class="lmsy-10x-x-109">⟩ </span>is the name of the new glossary style (to be used in <span -class="ec-lmtt-10x-x-109">\glossarystyle</span>). The second argument <span +class="ec-lmtt-10x-x-109">\setglossarystyle</span>). The second argument <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">definitions</span><span -class="lmsy-10x-x-109">⟩ </span>needs to redefine all -of the following: -</p><!--l. 5753--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="lmsy-10x-x-109">⟩ </span>needs to redefine +all of the following: +</p><!--l. 6789--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">theglossary</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56002"></a><a - id="dx1-56003"></a> <span + id="dx1-65002"></a><a + id="dx1-65003"></a> <span class="ec-lmss-10x-x-109">theglossary</span><a - id="dx1-56004"></a><a - id="dx1-56005"></a> </div><hr> -</p><!--l. 5755--><p class="noindent" > + id="dx1-65004"></a><a + id="dx1-65005"></a> </div><hr> +</p><!--l. 6791--><p class="noindent" > This environment defines how the main body of the glossary should be typeset. Note that this does not include the section heading, the glossary preamble (defined by <span class="ec-lmtt-10x-x-109">\glossarypreamble</span><a - id="dx1-56006"></a>) or the glossary postamble + id="dx1-65006"></a>) or the glossary postamble (defined by <span class="ec-lmtt-10x-x-109">\glossarypostamble</span><a - id="dx1-56007"></a>). For example, the <span + id="dx1-65007"></a>). For example, the <span class="ec-lmss-10x-x-109">list</span><a - id="dx1-56008"></a> style uses the + id="dx1-65008"></a> style uses the <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-56009"></a><a - id="dx1-56010"></a> environment, so the <span + id="dx1-65009"></a><a + id="dx1-65010"></a> environment, so the <span class="ec-lmss-10x-x-109">theglossary</span><a - id="dx1-56011"></a><a - id="dx1-56012"></a> environment is simply redefined + id="dx1-65011"></a><a + id="dx1-65012"></a> environment is simply redefined to begin and end the <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-56013"></a><a - id="dx1-56014"></a> environment. -</p><!--l. 5764--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="dx1-65013"></a><a + id="dx1-65014"></a> environment. +</p><!--l. 6800--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glossaryheader</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56015"></a> <span + id="dx1-65015"></a> <span class="ec-lmtt-10x-x-109">\glossaryheader </span></div><hr> -</p><!--l. 5766--><p class="noindent" > +</p><!--l. 6802--><p class="noindent" > This macro indicates what to do at the start of the main body of the glossary. Note that this is not the same as <span class="ec-lmtt-10x-x-109">\glossarypreamble</span><a - id="dx1-56016"></a>, which + id="dx1-65016"></a>, which should not be affected by changes in the glossary style. The <span class="ec-lmss-10x-x-109">list</span><a - id="dx1-56017"></a> + id="dx1-65017"></a> glossary style redefines <span class="ec-lmtt-10x-x-109">\glossaryheader</span><a - id="dx1-56018"></a> to do nothing, whereas the + id="dx1-65018"></a> to do nothing, whereas the <span class="ec-lmss-10x-x-109">longheader</span><a - id="dx1-56019"></a> glossary style redefines <span + id="dx1-65019"></a> glossary style redefines <span class="ec-lmtt-10x-x-109">\glossaryheader </span>to do a header row. -</p><!--l. 5774--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6810--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsgroupheading</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56020"></a> <span + id="dx1-65020"></a> <span class="ec-lmtt-10x-x-109">\glsgroupheading{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 5776--><p class="noindent" > +</p><!--l. 6812--><p class="noindent" > This macro indicates what to do at the start of each logical block within the main body of the glossary. If you use <a - id="dx1-56021"></a><a + id="dx1-65021"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-56022"></a></a> the glossary is + id="dx1-65022"></a></a> the glossary is sub-divided into a maximum of twenty-eight logical blocks that are determined by the first character of the <span class="ec-lmss-10x-x-109">sort</span><a - id="dx1-56023"></a> key (or <span + id="dx1-65023"></a> key (or <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-56024"></a> key if the <span + id="dx1-65024"></a> key if the <span class="ec-lmss-10x-x-109">sort</span><a - id="dx1-56025"></a> + id="dx1-65025"></a> key is omitted). The sub-divisions are in the following order: symbols, numbers, A, …, Z. If you use <a - id="dx1-56026"></a><a + id="dx1-65026"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-56027"></a></a>, the sub-divisions depend on the + id="dx1-65027"></a></a>, the sub-divisions depend on the language settings. -</p><!--l. 5787--><p class="indent" > Note that the argument to <span +</p><!--l. 6823--><p class="indent" > Note that the argument to <span class="ec-lmtt-10x-x-109">\glsgroupheading </span>is a label <span class="ec-lmri-10x-x-109">not </span>the group title. The group title can be obtained via -</p><!--l. 5790--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6826--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsgetgrouptitle</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56028"></a> <span + id="dx1-65028"></a> <span class="ec-lmtt-10x-x-109">\glsgetgrouptitle{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 5792--><p class="noindent" > +</p><!--l. 6828--><p class="noindent" > This obtains the title as follows: if <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩ </span>consists of a single non-active +character or <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩ </span>is equal to <span +class="ec-lmtt-10x-x-109">glssymbols </span>or <span +class="ec-lmtt-10x-x-109">glsnumbers </span>and +<span class="ec-lmtt-10x-x-109">\</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">groupname </span>exists, this is taken -to be the title, otherwise the title is just <span +class="ec-lmtt-10x-x-109">groupname </span>exists, this is taken to be the title, otherwise the title is +just <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. (The “symbols” group has the label <span +class="ec-lmtt-10x-x-109">glssymbols</span>, so the + + + +command <span +class="ec-lmtt-10x-x-109">\glssymbolsgroupname</span><a + id="dx1-65029"></a> is used, and the “numbers” group has +the label <span +class="ec-lmtt-10x-x-109">glsnumbers</span>, so the command <span +class="ec-lmtt-10x-x-109">\glsnumbersgrouptitle</span><a + id="dx1-65030"></a> is +used.) If you are using <a + id="dx1-65031"></a><a +href="#glo:xindy"><span +class="ec-lmtt-10x-x-109">xindy</span><a + id="dx1-65032"></a></a>, <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩ </span>may be an active character +(for example ø), in which case the title will be set to just <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span>. -</p><!--l. 5797--><p class="indent" > A navigation hypertarget can be created using -</p><!--l. 5798--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +You can redefine <span +class="ec-lmtt-10x-x-109">\glsgetgrouptitle </span>if this is unsuitable for your +document. +</p><!--l. 6842--><p class="indent" > A navigation hypertarget can be created using +</p><!--l. 6843--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsnavhypertarget</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56029"></a> <span + id="dx1-65033"></a> <span class="ec-lmtt-10x-x-109">\glsnavhypertarget{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -14637,143 +17211,152 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> - - - -</p><!--l. 5800--><p class="noindent" > +</p><!--l. 6845--><p class="noindent" > For further details about <span class="ec-lmtt-10x-x-109">\glsnavhypertarget</span>, see the documented code (<span class="ec-lmtt-10x-x-109">glossaries-code.pdf</span>). -</p><!--l. 5805--><p class="indent" > Most of the predefined glossary styles redefine <span +</p><!--l. 6850--><p class="indent" > Most of the predefined glossary styles redefine <span class="ec-lmtt-10x-x-109">\glsgroupheading</span> to simply ignore its argument. The <span class="ec-lmss-10x-x-109">listhypergroup</span><a - id="dx1-56030"></a> style redefines + id="dx1-65034"></a> style redefines <span class="ec-lmtt-10x-x-109">\glsgroupheading </span>as follows: </p> - <div class="verbatim" id="verbatim-144"> + <div class="verbatim" id="verbatim-166"> \renewcommand*{\glsgroupheading}[1]{%  <br />\item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]} </div> -<!--l. 5811--><p class="nopar" > See also <span +<!--l. 6856--><p class="nopar" > See also <span class="ec-lmtt-10x-x-109">\glsgroupskip </span>below. (Note that command definitions within <span class="ec-lmtt-10x-x-109">\newglossarystyle</span><a - id="dx1-56031"></a> must use <span class="obeylines-h"><span class="verb"><span + id="dx1-65035"></a> must use <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">##1</span></span></span> instead of <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">#1</span></span></span> etc.) -</p><!--l. 5815--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6860--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsgroupskip</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56032"></a> <span + id="dx1-65036"></a> <span class="ec-lmtt-10x-x-109">\glsgroupskip </span></div><hr> -</p><!--l. 5817--><p class="noindent" > +</p><!--l. 6862--><p class="noindent" > This macro determines what to do after one logical group but before the header for the next logical group. The <span class="ec-lmss-10x-x-109">list</span><a - id="dx1-56033"></a> glossary style simply redefines + id="dx1-65037"></a> glossary style simply redefines <span class="ec-lmtt-10x-x-109">\glsgroupskip </span>to be <span class="ec-lmtt-10x-x-109">\indexspace</span><a - id="dx1-56034"></a>, whereas the tabular-like styles redefine + id="dx1-65038"></a>, whereas the tabular-like styles redefine <span class="ec-lmtt-10x-x-109">\glsgroupskip </span>to produce a blank row. -</p><!--l. 5824--><p class="indent" > As from version 3.03, the package option <span +</p><!--l. 6869--><p class="indent" > As from version 3.03, the package option <span class="ec-lmss-10x-x-109">nogroupskip</span><a - id="dx1-56035"></a> can be used to + id="dx1-65039"></a> can be used to suppress this default gap for the predefined styles. -</p><!--l. 5827--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span -class="ec-lmtt-10">\glossaryentryfield</span><span +</p><!--l. 6872--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glossentry</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56036"></a> <span -class="ec-lmtt-10x-x-109">\glossaryentryfield{</span><span + id="dx1-65040"></a> <span +class="ec-lmtt-10x-x-109">\glossentry{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}{</span><span class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">formatted</span> -<span -class="ec-lmri-10x-x-109">name</span><span +class="ec-lmri-10x-x-109">number list</span><span class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">}{</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 6874--><p class="noindent" > +This macro indicates what to do for each level 0 glossary entry. The entry +label is given by <span class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">description</span><span -class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">} {</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩ </span>and the associated <a + id="dx1-65041"></a><a +href="#glo:numberlist">number list<a + id="dx1-65042"></a></a> is given by +<span class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">symbol</span><span +class="ec-lmri-10x-x-109">number list</span><span +class="lmsy-10x-x-109">⟩</span>. You can redefine <span +class="ec-lmtt-10x-x-109">\glossentry</span><a + id="dx1-65043"></a> to use commands +like <span +class="ec-lmtt-10x-x-109">\glossentryname</span><a + id="dx1-65044"></a><span +class="ec-lmtt-10x-x-109">{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">}{</span><span +class="ec-lmtt-10x-x-109">}</span>, <span +class="ec-lmtt-10x-x-109">\glossentrydesc</span><a + id="dx1-65045"></a><span +class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">number list</span><span +class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 5830--><p class="noindent" > -This macro indicates what to do for a given glossary entry. Note that +class="ec-lmtt-10x-x-109">} </span>and <span -class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">formatted name</span><span -class="lmsy-10x-x-109">⟩ </span>will always be in the form <span -class="ec-lmtt-10x-x-109">\glsnamefont</span><a - id="dx1-56037"></a><span +class="ec-lmtt-10x-x-109">\glossentrysymbol</span><a + id="dx1-65046"></a><span class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">name</span><span +class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">}</span>. This -allows the user to set a given font for the entry name, regardless of -the glossary style used. Note that <span +class="ec-lmtt-10x-x-109">} </span>to display the name, description and symbol +fields, or to access other fields, use commands like <span +class="ec-lmtt-10x-x-109">\glsentryuseri</span><a + id="dx1-65047"></a><span +class="ec-lmtt-10x-x-109">{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span -class="lmsy-10x-x-109">⟩ </span>is the label used when -the glossary entry was defined via either <span -class="ec-lmtt-10x-x-109">\newglossaryentry</span><a - id="dx1-56038"></a> or -<span -class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-56039"></a>. -</p><!--l. 5838--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}</span>. +(See <a +href="#sec:glsnolink">§9 </a><a +href="#sec:glsnolink">Using Glossary Terms Without Links<!--tex4ht:ref: sec:glsnolink --></a> for further details.) You can +also use the following commands: +</p><!--l. 6885--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentryitem</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56040"></a> <span + id="dx1-65048"></a> <span class="ec-lmtt-10x-x-109">\glsentryitem{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 5840--><p class="noindent" > +</p><!--l. 6887--><p class="noindent" > This macro will increment and display the associated counter for the main (level 0) entries if the <span class="ec-lmss-10x-x-109">entrycounter</span><a - id="dx1-56041"></a> or <span + id="dx1-65049"></a> or <span class="ec-lmss-10x-x-109">counterwithin</span><a - id="dx1-56042"></a> package options have -been used. This macro is typically called by <span -class="ec-lmtt-10x-x-109">\glossaryentryfield</span> + id="dx1-65050"></a> package options +have been used. This macro is typically called by <span +class="ec-lmtt-10x-x-109">\glossentry</span> before <span class="ec-lmtt-10x-x-109">\glstarget</span>. The format of the counter is controlled by the macro -</p><!--l. 5846--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6893--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glsentrycounterlabel</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56043"></a> <span + id="dx1-65051"></a> <span class="ec-lmtt-10x-x-109">\glsentrycounterlabel </span></div><hr> -</p><!--l. 5848--><p class="noindent" > -</p><!--l. 5850--><p class="indent" > Each time you use a glossary entry it creates a hyperlink (if hyperlinks +</p><!--l. 6895--><p class="noindent" > +</p><!--l. 6897--><p class="indent" > Each time you use a glossary entry it creates a hyperlink (if hyperlinks are enabled) to the relevant line in the glossary. Your new glossary style must therefore redefine <span -class="ec-lmtt-10x-x-109">\glossaryentryfield </span>to set the appropriate -target. This is done using -</p><!--l. 5855--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10x-x-109">\glossentry </span>to set the appropriate target. This is +done using +</p><!--l. 6902--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glstarget</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56044"></a> <span + id="dx1-65052"></a> <span class="ec-lmtt-10x-x-109">\glstarget{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -14783,46 +17366,46 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">text</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 5857--><p class="noindent" > +</p><!--l. 6904--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩ </span>is the entry’s label. Note that you don’t need to worry about -whether the <span -class="ec-lmss-10x-x-109">hyperref</span><a - id="dx1-56045"></a> package has been loaded, as <span -class="ec-lmtt-10x-x-109">\glstarget </span>won’t create +whether the <span +class="ec-lmss-10x-x-109">hyperref</span><a + id="dx1-65053"></a> package has been loaded, as <span +class="ec-lmtt-10x-x-109">\glstarget </span>won’t create a target if <span class="ec-lmtt-10x-x-109">\hypertarget </span>hasn’t been defined. -</p><!--l. 5863--><p class="indent" > For example, the <span +</p><!--l. 6910--><p class="indent" > For example, the <span class="ec-lmss-10x-x-109">list</span><a - id="dx1-56046"></a> style defines <span -class="ec-lmtt-10x-x-109">\glossaryentryfield </span>as follows: + id="dx1-65054"></a> style defines <span +class="ec-lmtt-10x-x-109">\glossentry </span>as follows: </p> - <div class="verbatim" id="verbatim-145"> -\renewcommand*{\glossaryentryfield}[5]{% - <br />\item[\glsentryitem{##1}\glstarget{##1}{##2}] - <br />  ##3\glspostdescription \space ##5} + <div class="verbatim" id="verbatim-167"> +  \renewcommand*{\glossentry}[2]{% + <br />    \item[\glsentryitem{##1}% + <br />          \glstarget{##1}{\glossentryname{##1}}] + <br />       \glossentrydesc{##1}\glspostdescription\space ##2} </div> -<!--l. 5869--><p class="nopar" > -</p><!--l. 5871--><p class="indent" > Note also that <span +<!--l. 6916--><p class="nopar" > +</p><!--l. 6918--><p class="indent" > Note also that <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">number list</span><span -class="lmsy-10x-x-109">⟩ </span>will always be of the form<br -class="newline" /> -</p><!--l. 5873--><p class="indent" > <hr><div title="Definition"><span +class="lmsy-10x-x-109">⟩ </span>will always be of the form +</p><!--l. 6920--><p class="indent" > <hr><div title="Definition"><span class="ec-lmtt-10x-x-109">\glossaryentrynumbers</span><a - id="dx1-56047"></a><span + id="dx1-65055"></a><span class="ec-lmtt-10x-x-109">{\relax</span><br class="newline" /><span class="ec-lmtt-10x-x-109">\setentrycounter</span><a - id="dx1-56048"></a><span + id="dx1-65056"></a><span class="ec-lmtt-10x-x-109">[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">Hprefix</span><span @@ -14841,19 +17424,19 @@ class="ec-lmri-10x-x-109">number(s)</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}}</span> </div><hr> -</p><!--l. 5875--><p class="noindent" > +</p><!--l. 6922--><p class="noindent" > where <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">number(s)</span><span class="lmsy-10x-x-109">⟩ </span>may contain <span class="ec-lmtt-10x-x-109">\delimN</span><a - id="dx1-56049"></a> (to delimit individual numbers) and/or + id="dx1-65057"></a> (to delimit individual numbers) and/or <span class="ec-lmtt-10x-x-109">\delimR</span><a - id="dx1-56050"></a> (to indicate a range of numbers). There may be multiple occurrences + id="dx1-65058"></a> (to indicate a range of numbers). There may be multiple occurrences of <span class="ec-lmtt-10x-x-109">\setentrycounter</span><a - id="dx1-56051"></a><span + id="dx1-65059"></a><span class="ec-lmtt-10x-x-109">[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">Hprefix</span><span @@ -14874,27 +17457,27 @@ class="ec-lmtt-10x-x-109">}</span>, but note that the entire number list is enclosed within the argument of <span class="ec-lmtt-10x-x-109">\glossaryentrynumbers</span><a - id="dx1-56052"></a>. The user can redefine this to change the way the + id="dx1-65060"></a>. The user can redefine this to change the way the entire number list is formatted, regardless of the glossary style. However the most common use of <span class="ec-lmtt-10x-x-109">\glossaryentrynumbers</span><a - id="dx1-56053"></a> is to provide a means of + id="dx1-65061"></a> is to provide a means of suppressing the number list altogether. (In fact, the <span class="ec-lmss-10x-x-109">nonumberlist</span><a - id="dx1-56054"></a> + id="dx1-65062"></a> option redefines <span class="ec-lmtt-10x-x-109">\glossaryentrynumbers</span><a - id="dx1-56055"></a> to ignore its argument.) + id="dx1-65063"></a> to ignore its argument.) Therefore, when you define a new glossary style, you don’t need to worry about whether the user has specified the <span class="ec-lmss-10x-x-109">nonumberlist</span><a - id="dx1-56056"></a> package + id="dx1-65064"></a> package option. -</p><!--l. 5892--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span -class="ec-lmtt-10">\glossarysubentryfield</span><span +</p><!--l. 6939--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\subglossentry</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56057"></a> <span -class="ec-lmtt-10x-x-109">\glossarysubentryfield{</span><span + id="dx1-65065"></a> <span +class="ec-lmtt-10x-x-109">\subglossentry{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">level</span><span class="lmsy-10x-x-109">⟩</span><span @@ -14904,108 +17487,97 @@ class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}{</span><span class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">formatted</span> -<span -class="ec-lmri-10x-x-109">name</span><span -class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">} {</span><span -class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">description</span><span -class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">}{</span><span -class="lmsy-10x-x-109">⟨</span><span -class="ec-lmri-10x-x-109">symbol</span><span -class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">}{</span><span -class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">number list</span><span class="lmsy-10x-x-109">⟩</span><span -class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 5895--><p class="noindent" > -This is new to version 1.17, and is used to display sub-entries. The first -argument, <span +class="ec-lmtt-10x-x-109">}</span> +</div><hr> +</p><!--l. 6941--><p class="noindent" > +This is used to display sub-entries. The first argument, <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">level</span><span -class="lmsy-10x-x-109">⟩</span>, indicates the sub-entry level. This must be an integer -from 1 (first sub-level) onwards. The remaining arguments are analogous to -those for <span -class="ec-lmtt-10x-x-109">\glossaryentryfield</span><a - id="dx1-56058"></a> described above. -</p><!--l. 5902--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="lmsy-10x-x-109">⟩</span>, indicates the +sub-entry level. This must be an integer from 1 (first sub-level) onwards. +The remaining arguments are analogous to those for <span +class="ec-lmtt-10x-x-109">\glossentry</span><a + id="dx1-65066"></a> +described above. +</p><!--l. 6948--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glssubentryitem</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56059"></a> <span + id="dx1-65067"></a> <span class="ec-lmtt-10x-x-109">\glssubentryitem{</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">} </span></div><hr> -</p><!--l. 5904--><p class="noindent" > +</p><!--l. 6950--><p class="noindent" > This macro will increment and display the associated counter for the level 1 entries if the <span class="ec-lmss-10x-x-109">subentrycounter</span><a - id="dx1-56060"></a> package options have been -used. This macro is typically called by <span -class="ec-lmtt-10x-x-109">\glossarysubentryfield</span> -before <span + id="dx1-65068"></a> package option has been used. This +macro is typically called by <span +class="ec-lmtt-10x-x-109">\subglossentry </span>before <span class="ec-lmtt-10x-x-109">\glstarget</span><a - id="dx1-56061"></a>. The format of the counter is controlled by the -macro -</p><!--l. 5910--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="dx1-65069"></a>. The +format of the counter is controlled by the macro +</p><!--l. 6956--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\glssubentrycounterlabel</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56062"></a> <span + id="dx1-65070"></a> <span class="ec-lmtt-10x-x-109">\glssubentrycounterlabel </span></div><hr> -</p><!--l. 5912--><p class="noindent" > +</p><!--l. 6958--><p class="noindent" > +</p><!--l. 6960--><p class="indent" > Note that <span +class="ec-lmtt-10x-x-109">\printglossary</span><a + id="dx1-65071"></a> (which <span +class="ec-lmtt-10x-x-109">\printglossaries</span><a + id="dx1-65072"></a> calls) sets -</p><!--l. 5914--><p class="indent" > Note that <span -class="ec-lmtt-10x-x-109">\printglossary</span><a - id="dx1-56063"></a> (which <span -class="ec-lmtt-10x-x-109">\printglossaries</span><a - id="dx1-56064"></a> calls) sets -</p><!--l. 5916--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6962--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\currentglossary</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-56065"></a> <span + id="dx1-65073"></a> <span class="ec-lmtt-10x-x-109">\currentglossary </span></div><hr> -</p><!--l. 5918--><p class="noindent" > +</p><!--l. 6964--><p class="noindent" > to the current glossary label, so it’s possible to create a glossary style that varies according to the glossary type. -</p><!--l. 5922--><p class="indent" > For further details of these commands, see “Displaying the glossary” in +</p><!--l. 6968--><p class="indent" > For further details of these commands, see “Displaying the glossary” in the documented code (<span class="ec-lmtt-10x-x-109">glossaries-code.pdf</span>). -</p> - <h3 class="sectionHead"><span class="titlemark">16.1</span>  <a - id="x1-5700016.1"></a>Example: creating a completely new style</h3> -<!--l. 5929--><p class="noindent" >If you want a completely new style, you will need to redefine all of the +<a + id="x1-65074r19"></a> +</p><!--l. 6972--><p class="noindent" ><span +class="ec-lmbx-12">Example 19</span><span +class="ec-lmbx-12"> (Creating a completely new style)</span><a + id="x1-65075"></a> +</p><!--l. 6974--><p class="indent" > If you want a completely new style, you will need to redefine all of the commands and the environment listed above. -</p><!--l. 5932--><p class="indent" > For example, suppose you want each entry to start with a bullet point. +</p><!--l. 6977--><p class="indent" > For example, suppose you want each entry to start with a bullet point. This means that the glossary should be placed in the <span class="ec-lmss-10x-x-109">itemize</span><a - id="dx1-57001"></a><a - id="dx1-57002"></a> environment, + id="dx1-65076"></a><a + id="dx1-65077"></a> environment, so <span class="ec-lmss-10x-x-109">theglossary</span><a - id="dx1-57003"></a><a - id="dx1-57004"></a> should start and end that environment. Let’s also + id="dx1-65078"></a><a + id="dx1-65079"></a> should start and end that environment. Let’s also suppose that you don’t want anything between the glossary groups (so <span class="ec-lmtt-10x-x-109">\glsgroupheading</span><a - id="dx1-57005"></a> and <span + id="dx1-65080"></a> and <span class="ec-lmtt-10x-x-109">\glsgroupskip</span><a - id="dx1-57006"></a> should do nothing) + id="dx1-65081"></a> should do nothing) and suppose you don’t want anything to appear immediately after <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\begin{theglossary}</span></span></span> (so <span class="ec-lmtt-10x-x-109">\glossaryheader</span><a - id="dx1-57007"></a> should do nothing). In + id="dx1-65082"></a> should do nothing). In addition, let’s suppose the symbol should appear in brackets after the name, followed by the description and last of all the <a - id="dx1-57008"></a><a + id="dx1-65083"></a><a href="#glo:numberlist">number list<a - id="dx1-57009"></a></a> should + id="dx1-65084"></a></a> should appear within square brackets at the end. Then you can create this new glossary style, called, say, <span class="ec-lmtt-10x-x-109">mylist</span>, as follows: @@ -15013,7 +17585,7 @@ class="ec-lmtt-10x-x-109">mylist</span>, as follows: </p> - <div class="verbatim" id="verbatim-146"> + <div class="verbatim" id="verbatim-168">  \newglossarystyle{mylist}{%  <br /> % put the glossary in the itemize environment:  <br /> \renewenvironment{theglossary}% @@ -15024,52 +17596,91 @@ class="ec-lmtt-10x-x-109">mylist</span>, as follows:  <br /> \renewcommand*{\glsgroupheading}[1]{}%  <br /> \renewcommand*{\glsgroupskip}{}%  <br /> % set how each entry should appear: - <br /> \renewcommand*{\glossaryentryfield}[5]{% + <br /> \renewcommand*{\glossentry}[2]{%  <br /> \item % bullet point - <br /> \glstarget{##1}{##2}% the entry name - <br /> \space (##4)% the symbol in brackets - <br /> \space ##3% the description - <br /> \space [##5]% the number list in square brackets + <br /> \glstarget{##1}{\glossentryname{##1}}% the entry name + <br /> \space (\glossentrysymbol{##1})% the symbol in brackets + <br /> \space \glossentrydesc{##1}% the description + <br /> \space [##2]% the number list in square brackets  <br /> }%  <br /> % set how sub-entries appear: - <br /> \renewcommand*{\glossarysubentryfield}[6]{% - <br />   \glossaryentryfield{##2}{##3}{##4}{##5}{##6}}% + <br /> \renewcommand*{\subglossentry}[3]{% + <br />   \glossentry{##2}{##3}}%  <br /> } </div> -<!--l. 5966--><p class="nopar" > Note that this style creates a flat glossary, where sub-entries are +<!--l. 7011--><p class="nopar" > Note that this style creates a flat glossary, where sub-entries are displayed in exactly the same way as the top level entries. It also hasn’t used <span class="ec-lmtt-10x-x-109">\glsentryitem</span><a - id="dx1-57010"></a> or <span + id="dx1-65085"></a> or <span class="ec-lmtt-10x-x-109">\glssubentryitem</span><a - id="dx1-57011"></a> so it won’t be + id="dx1-65086"></a> so it won’t be affected by the <span class="ec-lmss-10x-x-109">entrycounter</span><a - id="dx1-57012"></a>, <span + id="dx1-65087"></a>, <span class="ec-lmss-10x-x-109">counterwithin</span><a - id="dx1-57013"></a> or <span + id="dx1-65088"></a> or <span class="ec-lmss-10x-x-109">subentrycounter</span><a - id="dx1-57014"></a> package + id="dx1-65089"></a> package options. -</p><!--l. 5974--><p class="noindent" > -</p> -<!--l. 5974--><p class="noindent" ><a -href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">16.2</span>  <a - id="x1-5800016.2"></a>Example: creating a new glossary style based on an existing -style</h3> -<!--l. 5977--><p class="noindent" >If you want to define a new style that is a slightly modified version of an +</p><!--l. 7018--><p class="indent" > Variations: </p> + <ul class="itemize1"> + <li class="itemize">You might want the entry name to be capitalised, in which case + use <span +class="ec-lmtt-10x-x-109">\Glossentryname</span><a + id="dx1-65090"></a> instead of <span +class="ec-lmtt-10x-x-109">\glossentryname</span><a + id="dx1-65091"></a>. + </li> + <li class="itemize">You might want to check if the symbol hasn’t been set and omit the + parentheses if the symbol is absent. In this case you can use + <span +class="ec-lmtt-10x-x-109">\ifglshassymbol</span><a + id="dx1-65092"></a> (see <a +href="#sec:utilities">§17 </a><a +href="#sec:utilities">Utilities<!--tex4ht:ref: sec:utilities --></a>): + + + + <div class="verbatim" id="verbatim-169"> +  \renewcommand*{\glossentry}[2]{% +  <br /> \item % bullet point +  <br /> \glstarget{##1}{\glossentryname{##1}}% the entry name +  <br /> \ifglshassymbol{##1}% check if symbol exists +  <br /> {% +  <br />   \space (\glossentrysymbol{##1})% the symbol in brackets +  <br /> }% +  <br /> {}% no symbol so do nothing +  <br /> \space \glossentrydesc{##1}% the description +  <br /> \space [##2]% the number list in square brackets +  <br /> }% +</div> + <!--l. 7038--><p class="nopar" ></p></li></ul> +<div class="center" +> +<!--l. 7040--><p class="noindent" > +</p><!--l. 7040--><p class="noindent" >____________________________</p></div> +<a + id="x1-65093r20"></a> +<!--l. 7043--><p class="noindent" ><span +class="ec-lmbx-12">Example 20</span><span +class="ec-lmbx-12"> (Creating a new glossary style based on an</span> +<span +class="ec-lmbx-12">existing style)</span><a + id="x1-65094"></a> +</p><!--l. 7045--><p class="indent" > If you want to define a new style that is a slightly modified version of an existing style, you can use <span -class="ec-lmtt-10x-x-109">\glossarystyle</span><a - id="dx1-58001"></a> within the second argument of -<span +class="ec-lmtt-10x-x-109">\setglossarystyle</span><a + id="dx1-65095"></a> within the second +argument of <span class="ec-lmtt-10x-x-109">\newglossarystyle</span><a - id="dx1-58002"></a> followed by whatever alterations you require. -For example, suppose you want a style like the <span + id="dx1-65096"></a> followed by whatever alterations you +require. For example, suppose you want a style like the <span class="ec-lmss-10x-x-109">list</span><a - id="dx1-58003"></a> style but you + id="dx1-65097"></a> style but you don’t want the extra vertical space created by <span class="ec-lmtt-10x-x-109">\indexspace</span><a - id="dx1-58004"></a> between + id="dx1-65098"></a> between groups, then you can create a new glossary style called, say, <span class="ec-lmtt-10x-x-109">mylist </span>as follows: @@ -15077,46 +17688,54 @@ follows: </p> - <div class="verbatim" id="verbatim-147"> + <div class="verbatim" id="verbatim-170"> \newglossarystyle{mylist}{% - <br />\glossarystyle{list}% base this style on the list style + <br />\setglossarystyle{list}% base this style on the list style  <br />\renewcommand{\glsgroupskip}{}% make nothing happen  <br />                              % between groups  <br />} </div> -<!--l. 5991--><p class="nopar" > -</p><!--l. 5995--><p class="noindent" > -</p> -<!--l. 5995--><p class="noindent" ><a -href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">16.3</span>  <a - id="x1-5900016.3"></a>Example: creating a glossary style that uses the <span -class="ec-lmss-10x-x-109">user1</span>, …, <span -class="ec-lmss-10x-x-109">user6</span> -keys</h3> -<!--l. 5998--><p class="noindent" >Since <span -class="ec-lmtt-10x-x-109">\glossaryentryfield</span><a - id="dx1-59001"></a> and <span -class="ec-lmtt-10x-x-109">\glossarysubentryfield</span><a - id="dx1-59002"></a> provide the -label for the entry, it’s also possible to access the values of the generic user -keys, such as <span -class="ec-lmss-10x-x-109">user1</span><a - id="dx1-59003"></a>. For example, suppose each entry not only has an -associated symbol, but also units (stored in <span +<!--l. 7059--><p class="nopar" > (In this case, you can actually achieve the same effect using the <span +class="ec-lmss-10x-x-109">list</span><a + id="dx1-65099"></a> style in +combination with the package option <span +class="ec-lmss-10x-x-109">nogroupskip</span><a + id="dx1-65100"></a>.) </p> +<div class="center" +> +<!--l. 7063--><p class="noindent" > +</p><!--l. 7063--><p class="noindent" >____________________________</p></div> +<a + id="x1-65101r21"></a> +<!--l. 7067--><p class="noindent" ><span +class="ec-lmbx-12">Example 21</span><span +class="ec-lmbx-12"> (Example: creating a glossary style that uses</span> +<span +class="ec-lmbx-12">the </span><span +class="ec-lmssbx-10x-x-120">user1</span><a + id="dx1-65102"></a><span +class="ec-lmbx-12">, </span><span +class="ec-lmbx-12">…, </span><span +class="ec-lmssbx-10x-x-120">user6</span><a + id="dx1-65103"></a> <span +class="ec-lmbx-12">keys)</span><a + id="x1-65104"></a> +</p><!--l. 7069--><p class="indent" > Suppose each entry not only has an associated symbol, but also units +(stored in <span class="ec-lmss-10x-x-109">user1</span><a - id="dx1-59004"></a>) and dimension (stored in -<span + id="dx1-65105"></a>) and dimension (stored in <span class="ec-lmss-10x-x-109">user2</span><a - id="dx1-59005"></a>). Then you can define a glossary style that displays each entry in a -<span + id="dx1-65106"></a>). Then you can +define a glossary style that displays each entry in a <span class="ec-lmss-10x-x-109">longtable</span><a - id="dx1-59006"></a><a - id="dx1-59007"></a> as follows: + id="dx1-65107"></a><a + id="dx1-65108"></a> as +follows: </p> - <div class="verbatim" id="verbatim-148"> + <div class="verbatim" id="verbatim-171"> \newglossarystyle{long6col}{%  <br /> % put the glossary in a longtable environment:  <br /> \renewenvironment{theglossary}% @@ -15130,45 +17749,47 @@ class="ec-lmss-10x-x-109">longtable</span><a  <br /> % No heading between groups:  <br />  \renewcommand*{\glsgroupheading}[1]{}%  <br /> % Main (level 0) entries displayed in a row optionally numbered: - <br />  \renewcommand*{\glossaryentryfield}[5]{% + <br />  \renewcommand*{\glossentry}[2]{%  <br />    \glsentryitem{##1}% Entry number if required - <br />    \glstarget{##1}{##2}% Name - <br />    & ##3% Description - <br />    & ##4% Symbol + <br />    \glstarget{##1}{\glossentryname{##1}}% Name + <br />    & \glossentrydesc{##1}% Description + <br />    & \glossentrysymbol{##1}% Symbol  <br />    & \glsentryuseri{##1}% Units  <br />    & \glsentryuserii{##1}% Dimensions - <br />    & ##5% Page list - <br />    \\% end of row + <br />    & ##2% Page list + <br />    \tabularnewline % end of row  <br />  }%  <br /> % Similarly for sub-entries (no sub-entry numbers): - <br /> \renewcommand*{\glossarysubentryfield}[6]{% + <br /> \renewcommand*{\subglossentry}[3]{%  <br />    % ignoring first argument (sub-level) - <br />    \glstarget{##2}{##3}% Name - <br />    & ##4% Description - <br />    & ##5% Symbol + <br />    \glstarget{##2}{\glossentryname{##2}}% Name + <br />    & \glossentrydesc{##2}% Description + <br />    & \glossentrysymbol{##2}% Symbol  <br />    & \glsentryuseri{##2}% Units  <br />    & \glsentryuserii{##2}% Dimensions - <br />    & ##6% Page list - <br />    \\% end of row + <br />    & ##3% Page list + <br />    \tabularnewline % end of row  <br />  }%  <br /> % Nothing between groups:  <br /> \renewcommand*{\glsgroupskip}{}%  <br />} </div> -<!--l. 6043--><p class="nopar" > +<!--l. 7111--><p class="nopar" > </p> +<div class="center" +> +<!--l. 7112--><p class="noindent" > +</p><!--l. 7112--><p class="noindent" >____________________________</p></div> -</p> -<!--l. 6045--><p class="noindent" ><a -href="#top">Top</a></p><h2 class="chapterHead"><span class="titlemark">17</span>  <a - id="x1-6000017"></a>Utilities</h2> - This section describes some utility commands. Additional commands can + <h2 class="chapterHead"><span class="titlemark">17</span>  <a + id="sec:utilities"></a>Utilities</h2> +<!--l. 7117--><p class="noindent" >This section describes some utility commands. Additional commands can be found in the documented code (glossaries-code.pdf). -<!--l. 6051--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7120--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\forallglossaries</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-60001"></a> <span + id="dx1-66001"></a> <span class="ec-lmtt-10x-x-109">\forallglossaries[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary list</span><span @@ -15183,7 +17804,7 @@ class="ec-lmri-10x-x-109">body</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 6053--><p class="noindent" > +</p><!--l. 7122--><p class="noindent" > This iterates through <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary list</span><span @@ -15201,10 +17822,10 @@ class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary list</span><span class="lmsy-10x-x-109">⟩ </span>is omitted, the default is to iterate over all glossaries. -</p><!--l. 6061--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7130--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\forglsentries</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-60002"></a> <span + id="dx1-66002"></a> <span class="ec-lmtt-10x-x-109">\forglsentries[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary label</span><span @@ -15219,7 +17840,7 @@ class="ec-lmri-10x-x-109">body</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 6063--><p class="noindent" > +</p><!--l. 7132--><p class="noindent" > This iterates through all entries in the glossary given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary label</span><span @@ -15238,12 +17859,12 @@ class="ec-lmri-10x-x-109">glossary</span> class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩ </span>is omitted, <span class="ec-lmtt-10x-x-109">\glsdefaulttype</span><a - id="dx1-60003"></a> (usually the main glossary) is + id="dx1-66003"></a> (usually the main glossary) is used. -</p><!--l. 6070--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7139--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\forallglsentries</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-60004"></a> <span + id="dx1-66004"></a> <span class="ec-lmtt-10x-x-109">\forallglsentries[</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">glossary list</span><span @@ -15258,7 +17879,7 @@ class="ec-lmri-10x-x-109">body</span><span class="lmsy-10x-x-109">⟩</span><span class="ec-lmtt-10x-x-109">}</span> </div><hr> -</p><!--l. 6072--><p class="noindent" > +</p><!--l. 7141--><p class="noindent" > This is like <span class="ec-lmtt-10x-x-109">\forglsentries </span>but for each glossary in <span class="lmsy-10x-x-109">⟨</span><span @@ -15286,10 +17907,10 @@ class="ec-lmtt-10x-x-109">} </span>within class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">body</span><span class="lmsy-10x-x-109">⟩</span>.) -</p><!--l. 6080--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7149--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ifglossaryexists</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-60005"></a> <span + id="dx1-66005"></a> <span class="ec-lmtt-10x-x-109">\ifglossaryexists</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -15299,7 +17920,7 @@ class="lmsy-10x-x-109">⟩⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span> </div><hr> -</p><!--l. 6083--><p class="noindent" > +</p><!--l. 7152--><p class="noindent" > This checks if the glossary given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -15311,10 +17932,10 @@ performed, otherwise <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span>. -</p><!--l. 6087--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7156--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ifglsentryexists</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-60006"></a> <span + id="dx1-66006"></a> <span class="ec-lmtt-10x-x-109">\ifglsentryexists</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -15324,7 +17945,7 @@ class="lmsy-10x-x-109">⟩⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span> </div><hr> -</p><!--l. 6090--><p class="noindent" > +</p><!--l. 7159--><p class="noindent" > This checks if the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -15336,31 +17957,83 @@ class="ec-lmri-10x-x-109">part</span><span class="lmsy-10x-x-109">⟩ </span>is performed, otherwise <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">false part</span><span -class="lmsy-10x-x-109">⟩</span>. -</p><!--l. 6094--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="lmsy-10x-x-109">⟩</span>. (Note that <span +class="ec-lmtt-10x-x-109">\ifglsentryexists</span> +will always be true after the containing glossary has been displayed via +<span +class="ec-lmtt-10x-x-109">\printglossary</span><a + id="dx1-66007"></a> or <span +class="ec-lmtt-10x-x-109">\printglossaries</span><a + id="dx1-66008"></a> even if the entry is explicitly +defined later in the document. This is because the entry has to be defined +before it can be displayed in the glossary, see <a +href="#sec:techissues">§4.8.1 </a><a +href="#sec:techissues">Technical Issues<!--tex4ht:ref: sec:techissues --></a> for +further details.) + + + +</p><!--l. 7169--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsdoifexists</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-66009"></a> <span +class="ec-lmtt-10x-x-109">\glsdoifexists{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">code</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 7171--><p class="noindent" > +Does <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">code</span><span +class="lmsy-10x-x-109">⟩ </span>if the entry given by <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩ </span>exists. If it doesn’t exist, an error +is generated. (This command uses <span +class="ec-lmtt-10x-x-109">\ifglsentryexists</span>.) +</p><!--l. 7176--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsdoifnoexists</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-66010"></a> <span +class="ec-lmtt-10x-x-109">\glsdoifnoexists{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">code</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 7178--><p class="noindent" > +Does the reverse of <span +class="ec-lmtt-10x-x-109">\glsdoifexists</span>. (This command uses +<span +class="ec-lmtt-10x-x-109">\ifglsentryexists</span>.) +</p><!--l. 7182--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ifglsused</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-60007"></a> <span -class="ec-lmtt-10x-x-109">\ifglsentryexists</span><span + id="dx1-66011"></a> <span +class="ec-lmtt-10x-x-109">\ifglsused</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span class="lmsy-10x-x-109">⟩⟨</span><span class="ec-lmri-10x-x-109">true part</span><span class="lmsy-10x-x-109">⟩⟨</span><span class="ec-lmri-10x-x-109">false part</span><span -class="lmsy-10x-x-109">⟩</span> -</div><hr> -</p><!--l. 6097--><p class="noindent" > +class="lmsy-10x-x-109">⟩ </span></div><hr> +</p><!--l. 7185--><p class="noindent" > See <a -href="#x1-4600014">§14 </a><a -href="#x1-4600014">Unsetting and Resetting Entry Flags<!--tex4ht:ref: sec:glsunset --></a>. - - - -</p><!--l. 6100--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +href="#sec:glsunset">§14 </a><a +href="#sec:glsunset">Unsetting and Resetting Entry Flags<!--tex4ht:ref: sec:glsunset --></a>. +</p><!--l. 7188--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ifglshaschildren</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-60008"></a> <span + id="dx1-66012"></a> <span class="ec-lmtt-10x-x-109">\ifglshaschildren</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -15370,7 +18043,7 @@ class="lmsy-10x-x-109">⟩⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span> </div><hr> -</p><!--l. 6103--><p class="noindent" > +</p><!--l. 7191--><p class="noindent" > This checks if the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -15382,10 +18055,10 @@ class="lmsy-10x-x-109">⟩ </span>is performed, otherwise <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span>. -</p><!--l. 6108--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7196--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ec-lmtt-10">\ifglshasparent</span><span class="ec-lmtt-10"> </span></span><a - id="dx1-60009"></a> <span + id="dx1-66013"></a> <span class="ec-lmtt-10x-x-109">\ifglshasparent</span><span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -15395,7 +18068,7 @@ class="lmsy-10x-x-109">⟩⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span> </div><hr> -</p><!--l. 6111--><p class="noindent" > +</p><!--l. 7199--><p class="noindent" > This checks if the glossary entry given by <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">label</span><span @@ -15407,185 +18080,1039 @@ class="lmsy-10x-x-109">⟩ </span>is performed, otherwise <span class="lmsy-10x-x-109">⟨</span><span class="ec-lmri-10x-x-109">false part</span><span class="lmsy-10x-x-109">⟩</span>. +</p><!--l. 7204--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\ifglshassymbol</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-66014"></a> <span +class="ec-lmtt-10x-x-109">\ifglshassymbol{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">false part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}</span> +</div><hr> +</p><!--l. 7206--><p class="noindent" > +This checks if the glossary entry given by <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩ </span>has had the <span +class="ec-lmss-10x-x-109">symbol</span><a + id="dx1-66015"></a> field +set. If it has, <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true part</span><span +class="lmsy-10x-x-109">⟩ </span>is performed, otherwise <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">false part</span><span +class="lmsy-10x-x-109">⟩</span>. +</p><!--l. 7211--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\ifglshaslong</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-66016"></a> <span +class="ec-lmtt-10x-x-109">\ifglshaslong{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">false part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}</span> +</div><hr> +</p><!--l. 7213--><p class="noindent" > +This checks if the glossary entry given by <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩ </span>has had the <span +class="ec-lmss-10x-x-109">long</span><a + id="dx1-66017"></a> field set. +If it has, <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true part</span><span +class="lmsy-10x-x-109">⟩ </span>is performed, otherwise <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">false part</span><span +class="lmsy-10x-x-109">⟩</span>. This should be +true for any entry that has been defined via <span +class="ec-lmtt-10x-x-109">\newacronym</span><a + id="dx1-66018"></a>. +</p><!--l. 7219--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\ifglshasshort</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-66019"></a> <span +class="ec-lmtt-10x-x-109">\ifglshasshort{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">false part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}</span> +</div><hr> +</p><!--l. 7221--><p class="noindent" > +This checks if the glossary entry given by <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩ </span>has had the <span +class="ec-lmss-10x-x-109">short</span><a + id="dx1-66020"></a> field set. +If it has, <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true part</span><span +class="lmsy-10x-x-109">⟩ </span>is performed, otherwise <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">false part</span><span +class="lmsy-10x-x-109">⟩</span>. This should be +true for any entry that has been defined via <span +class="ec-lmtt-10x-x-109">\newacronym</span><a + id="dx1-66021"></a>. +</p><!--l. 7227--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\ifglshasdesc</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-66022"></a> <span +class="ec-lmtt-10x-x-109">\ifglshasdesc{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">false part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}</span> +</div><hr> +</p><!--l. 7229--><p class="noindent" > +This checks if the <span +class="ec-lmss-10x-x-109">description</span><a + id="dx1-66023"></a> field is non-empty for the entry given by +<span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. If it has, <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true part</span><span +class="lmsy-10x-x-109">⟩ </span>is performed, otherwise <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">false part</span><span +class="lmsy-10x-x-109">⟩</span>. Compare + + + +with: +</p><!--l. 7233--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\ifglsdescsuppressed</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-66024"></a> <span +class="ec-lmtt-10x-x-109">\ifglsdescsuppressed{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true</span> +<span +class="ec-lmri-10x-x-109">part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">false part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 7235--><p class="noindent" > +This checks if the <span +class="ec-lmss-10x-x-109">description</span><a + id="dx1-66025"></a> field has been set to just <span +class="ec-lmtt-10x-x-109">\nopostdesc</span><a + id="dx1-66026"></a> for the +entry given by <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. If it has, <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true part</span><span +class="lmsy-10x-x-109">⟩ </span>is performed, otherwise <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">false</span> +<span +class="ec-lmri-10x-x-109">part</span><span +class="lmsy-10x-x-109">⟩</span>. </p> <h2 class="chapterHead"><span class="titlemark">18</span>  <a - id="x1-6100018"></a>Accessibility Support</h2> -<!--l. 6117--><p class="noindent" >Limited accessibility support is provided by the accompanying + id="sec:prefix"></a>Prefixes or Determiners</h2> +<!--l. 7241--><p class="noindent" >The <span +class="ec-lmss-10x-x-109">glossaries-prefix</span><a + id="dx1-67001"></a> package provides additional keys that can be used as +prefixes. For example, if you want to specify determiners (such as “a”, “an” +or “the”). The <span +class="ec-lmss-10x-x-109">glossaries-prefix </span>package automatically loads the <span +class="ec-lmss-10x-x-109">glossaries</span> +package and has the same package options. +</p><!--l. 7248--><p class="indent" > The extra keys for <span +class="ec-lmtt-10x-x-109">\newglossaryentry</span><a + id="dx1-67002"></a> are as follows: + </p><dl class="description"><dt class="description"> +<span +class="ec-lmssbx-10x-x-109">prefix</span><a + id="dx1-67003"></a> </dt><dd +class="description">The prefix associated with the <span +class="ec-lmss-10x-x-109">text</span><a + id="dx1-67004"></a> key. This defaults to nothing. + </dd><dt class="description"> +<span +class="ec-lmssbx-10x-x-109">prefixplural</span><a + id="dx1-67005"></a> </dt><dd +class="description">The prefix associated with the <span +class="ec-lmss-10x-x-109">plural</span><a + id="dx1-67006"></a> key. This defaults to + nothing. + </dd><dt class="description"> +<span +class="ec-lmssbx-10x-x-109">prefixfirst</span><a + id="dx1-67007"></a> </dt><dd +class="description">The prefix associated with the <span +class="ec-lmss-10x-x-109">first</span><a + id="dx1-67008"></a> key. If omitted, this + defaults to the value of the <span +class="ec-lmss-10x-x-109">prefix</span><a + id="dx1-67009"></a> key. + </dd><dt class="description"> +<span +class="ec-lmssbx-10x-x-109">prefixfirstplural</span><a + id="dx1-67010"></a> </dt><dd +class="description">The prefix associated with the <span +class="ec-lmss-10x-x-109">firstplural</span><a + id="dx1-67011"></a> key. If + omitted, this defaults to the value of the <span +class="ec-lmss-10x-x-109">prefixplural</span><a + id="dx1-67012"></a> key.</dd></dl> +<a + id="x1-67013r22"></a> +<!--l. 7265--><p class="noindent" ><span +class="ec-lmbx-12">Example 22</span><span +class="ec-lmbx-12"> (Defining Determiners)</span><a + id="x1-67014"></a> +</p><!--l. 7266--><p class="indent" > Here’s the start of my example document: + + + +</p> + <div class="verbatim" id="verbatim-172"> +documentclass{article} + <br />\usepackage[colorlinks]{hyperref} + <br />\usepackage[toc,acronym]{glossaries-prefix} +</div> +<!--l. 7272--><p class="nopar" > Note that I’ve simply replaced <span +class="ec-lmss-10x-x-109">glossaries </span>from previous +sample documents with <span +class="ec-lmss-10x-x-109">glossaries-prefix</span>. Now for a sample +definition<span class="footnote-mark"><a +href="#fn1x20" id="fn1x20-bk"><sup class="textsuperscript">1</sup></a></span><a + id="x1-67015f1"></a>: + + + +</p> + <div class="verbatim" id="verbatim-173"> +\newglossaryentry{sample}{name={sample},% + <br />  description={an example},% + <br />  prefix={a~},% + <br />  prefixplural={the\space}% + <br />} +</div> +<!--l. 7284--><p class="nopar" > Note that I’ve had to explicitly insert a space after the prefix. This allows +for the possibility of prefixes that shouldn’t have a space, such +as: + + + +</p> + <div class="verbatim" id="verbatim-174"> +\newglossaryentry{oeil}{name={oeil}, + <br />  plural={yeux}, + <br />  description={eye}, + <br />  prefix={l’}, + <br />  prefixplural={les\space}} +</div> +<!--l. 7294--><p class="nopar" > Where a space is required at the end of the prefix, you must use +a spacing command, such as <span +class="ec-lmtt-10x-x-109">\space</span>, <span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\␣</span></span></span> (backslash space) or <span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">~</span></span></span> due +to the automatic spacing trimming performed in <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">key</span><span +class="lmsy-10x-x-109">⟩</span>=<span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">value</span><span +class="lmsy-10x-x-109">⟩</span> +options. +</p><!--l. 7300--><p class="indent" > The prefixes can also be used with acronyms. For example: + + + +</p> + <div class="verbatim" id="verbatim-175"> +\newacronym + <br /> [% + <br />   prefix={an\space},prefixfirst={a~}% + <br /> ]{svm}{SVM}{support vector machine} +</div> +<!--l. 7306--><p class="nopar" > </p> +<div class="center" +> +<!--l. 7307--><p class="noindent" > +</p><!--l. 7307--><p class="noindent" >____________________________</p></div> +<!--l. 7309--><p class="indent" > The <span +class="ec-lmss-10x-x-109">glossaries-prefix</span><a + id="dx1-67017"></a> package provides convenient commands to use these +prefixes with commands such as <span +class="ec-lmtt-10x-x-109">\gls</span><a + id="dx1-67018"></a>. Note that the prefix is not +considered part of the <a + id="dx1-67019"></a><a +href="#glo:linktext">link text<a + id="dx1-67020"></a></a>, so it’s not included in the hyperlink (where +hyperlinks are enabled). +</p><!--l. 7313--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\pgls</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67021"></a> <span +class="ec-lmtt-10x-x-109">\pgls[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> +</p><!--l. 7315--><p class="noindent" > +This is prepends the value of the <span +class="ec-lmss-10x-x-109">prefix</span><a + id="dx1-67022"></a> key (or <span +class="ec-lmss-10x-x-109">prefixfirst</span><a + id="dx1-67023"></a> key, on <a + id="dx1-67024"></a><a +href="#glo:firstuse">first use</a>) +in front of <span +class="ec-lmtt-10x-x-109">\gls[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]</span>. +</p><!--l. 7320--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\Pgls</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67025"></a> <span +class="ec-lmtt-10x-x-109">\Pgls[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> +</p><!--l. 7322--><p class="noindent" > +If the <span +class="ec-lmss-10x-x-109">prefix</span><a + id="dx1-67026"></a> key (or <span +class="ec-lmss-10x-x-109">prefixfirst</span><a + id="dx1-67027"></a>, on <a + id="dx1-67028"></a>first use) has been set, this displays the +value of that key with the first letter converted to upper case followed by +<span +class="ec-lmtt-10x-x-109">\gls[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]</span>. If that key hasn’t been set, this is +equivalent to <span +class="ec-lmtt-10x-x-109">\Gls</span><a + id="dx1-67029"></a><span +class="ec-lmtt-10x-x-109">[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]</span>. +</p><!--l. 7330--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\PGLS</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67030"></a> <span +class="ec-lmtt-10x-x-109">\PGLS[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> +</p><!--l. 7332--><p class="noindent" > +As <span +class="ec-lmtt-10x-x-109">\pgls </span>but converts the prefix to upper case and uses <span +class="ec-lmtt-10x-x-109">\GLS</span><a + id="dx1-67031"></a> instead of +<span +class="ec-lmtt-10x-x-109">\gls</span>. +</p><!--l. 7336--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\pglspl</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67032"></a> <span +class="ec-lmtt-10x-x-109">\pglspl[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> +</p><!--l. 7338--><p class="noindent" > +This is prepends the value of the <span +class="ec-lmss-10x-x-109">prefixplural</span><a + id="dx1-67033"></a> key (or <span +class="ec-lmss-10x-x-109">prefixfirstplural</span><a + id="dx1-67034"></a> key, on +<a + id="dx1-67035"></a><a +href="#glo:firstuse">first use</a>) in front of <span +class="ec-lmtt-10x-x-109">\glspl[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]</span>. +</p><!--l. 7343--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\Pglspl</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67036"></a> <span +class="ec-lmtt-10x-x-109">\Pglspl[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> +</p><!--l. 7345--><p class="noindent" > +If the <span +class="ec-lmss-10x-x-109">prefixplural</span><a + id="dx1-67037"></a> key (or <span +class="ec-lmss-10x-x-109">prefixfirstplural</span><a + id="dx1-67038"></a>, on <a + id="dx1-67039"></a>first use) has been set, this +displays the value of that key with the first letter converted to upper case +followed by <span +class="ec-lmtt-10x-x-109">\glspl[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]</span>. If that key hasn’t been +set, this is equivalent to <span +class="ec-lmtt-10x-x-109">\Glspl</span><a + id="dx1-67040"></a><span +class="ec-lmtt-10x-x-109">[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]</span>. +</p><!--l. 7353--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\PGLSpl</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67041"></a> <span +class="ec-lmtt-10x-x-109">\PGLSpl[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">options</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">]{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}[</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">insert</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">] </span></div><hr> + + + +</p><!--l. 7355--><p class="noindent" > +As <span +class="ec-lmtt-10x-x-109">\pglspl </span>but converts the prefix to upper case and uses <span +class="ec-lmtt-10x-x-109">\GLSpl</span><a + id="dx1-67042"></a> instead +of <span +class="ec-lmtt-10x-x-109">\glspl</span>. +<a + id="x1-67043r23"></a> +</p><!--l. 7359--><p class="noindent" ><span +class="ec-lmbx-12">Example 23</span><span +class="ec-lmbx-12"> (Using Prefixes)</span><a + id="x1-67044"></a> +</p><!--l. 7360--><p class="indent" > Continuing from Example <a +href="#x1-67013r22">22<!--tex4ht:ref: ex:determiners --></a>, now that I’ve defined my entries, I can +use them in the text via the above commands: + + + +</p> + <div class="verbatim" id="verbatim-176"> +First use: \pgls{svm}. Next use: \pgls{svm}. + <br />Singular: \pgls{sample}, \pgls{oeil}. + <br />Plural: \pglspl{sample}, \pglspl{oeil}. +</div> +<!--l. 7366--><p class="nopar" > which produces: + </p><div class="quote"> + <!--l. 7369--><p class="noindent" >First use: a support vector machine (SVM). Next use: an + SVM. Singular: a sample, l’oeil. Plural: the samples, les + yeux.</p></div> +<!--l. 7373--><p class="noindent" >For a complete document, see <a +href="#x1-6123r29"><span +class="ec-lmtt-10x-x-109">sample-prefix.tex</span></a>. </p> +<div class="center" +> +<!--l. 7374--><p class="noindent" > +</p><!--l. 7374--><p class="noindent" >____________________________</p></div> +<!--l. 7376--><p class="indent" > This package also provides the following commands: +</p><!--l. 7377--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\ifglshasprefix</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67045"></a> <span +class="ec-lmtt-10x-x-109">\ifglshasprefix{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">false part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}</span> +</div><hr> +</p><!--l. 7379--><p class="noindent" > +Does <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true part</span><span +class="lmsy-10x-x-109">⟩ </span>if the entry identified by <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩ </span>has a non-empty value for +the <span +class="ec-lmss-10x-x-109">prefix</span><a + id="dx1-67046"></a> key. +</p><!--l. 7383--><p class="indent" > This package also provides the following commands: +</p><!--l. 7384--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\ifglshasprefixplural</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67047"></a> <span +class="ec-lmtt-10x-x-109">\ifglshasprefixplural{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true</span> +<span +class="ec-lmri-10x-x-109">part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">false part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 7386--><p class="noindent" > +Does <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true part</span><span +class="lmsy-10x-x-109">⟩ </span>if the entry identified by <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩ </span>has a non-empty value for +the <span +class="ec-lmss-10x-x-109">prefixplural</span><a + id="dx1-67048"></a> key. +</p><!--l. 7390--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\ifglshasprefixfirst</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67049"></a> <span +class="ec-lmtt-10x-x-109">\ifglshasprefixfirst{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true</span> +<span +class="ec-lmri-10x-x-109">part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">false part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 7392--><p class="noindent" > +Does <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true part</span><span +class="lmsy-10x-x-109">⟩ </span>if the entry identified by <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩ </span>has a non-empty value for +the <span +class="ec-lmss-10x-x-109">prefixfirst</span><a + id="dx1-67050"></a> key. +</p><!--l. 7396--><p class="indent" > <span class="marginpar"><span +class="ec-lmtt-10">\ifglshasprefixfirstplural</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67051"></a> +</p><!--l. 7398--><p class="indent" > <hr><div title="Definition"><span +class="ec-lmtt-10x-x-109">\ifglshasprefixfirstplural{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">false part</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">}</span> +</div><hr> +</p><!--l. 7399--><p class="noindent" > +Does <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">true part</span><span +class="lmsy-10x-x-109">⟩ </span>if the entry identified by <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩ </span>has a non-empty value for +the <span +class="ec-lmss-10x-x-109">prefixfirstplural</span><a + id="dx1-67052"></a> key. +</p><!--l. 7403--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsentryprefix</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67053"></a> <span +class="ec-lmtt-10x-x-109">\glsentryprefix{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> + + + +</p><!--l. 7405--><p class="noindent" > +Displays the value of the <span +class="ec-lmss-10x-x-109">prefix</span><a + id="dx1-67054"></a> key for the entry given by <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. (No check +is performed to determine if the entry exists.) +</p><!--l. 7410--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsentryprefixfirst</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67055"></a> <span +class="ec-lmtt-10x-x-109">\glsentryprefixfirst{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 7412--><p class="noindent" > +Displays the value of the <span +class="ec-lmss-10x-x-109">prefixfirst</span><a + id="dx1-67056"></a> key for the entry given by <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. (No +check is performed to determine if the entry exists.) +</p><!--l. 7417--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\glsentryprefixplural</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67057"></a> <span +class="ec-lmtt-10x-x-109">\glsentryprefixplural{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 7419--><p class="noindent" > +Displays the value of the <span +class="ec-lmss-10x-x-109">prefixplural</span><a + id="dx1-67058"></a> key for the entry given by <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. (No +check is performed to determine if the entry exists.) +</p><!--l. 7424--><p class="indent" > <span class="marginpar"><span +class="ec-lmtt-10">\glsentryprefixfirstplural</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67059"></a> +</p><!--l. 7426--><p class="indent" > <hr><div title="Definition"><span +class="ec-lmtt-10x-x-109">\glsentryprefixfirstplural{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 7427--><p class="noindent" > +Displays the value of the <span +class="ec-lmss-10x-x-109">prefixfirstplural</span><a + id="dx1-67060"></a> key for the entry given by <span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span>. +(No check is performed to determine if the entry exists.) +</p><!--l. 7432--><p class="indent" > There are also variants that convert the first letter to upper +case<span class="footnote-mark"><a +href="#fn2x20" id="fn2x20-bk"><sup class="textsuperscript">2</sup></a></span><a + id="x1-67061f2"></a>: +</p><!--l. 7435--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\Glsentryprefix</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67062"></a> <span +class="ec-lmtt-10x-x-109">\Glsentryprefix{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 7437--><p class="noindent" > +</p><!--l. 7438--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\Glsentryprefixfirst</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67063"></a> <span +class="ec-lmtt-10x-x-109">\Glsentryprefixfirst{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 7440--><p class="noindent" > +</p><!--l. 7441--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ec-lmtt-10">\Glsentryprefixplural</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67064"></a> <span +class="ec-lmtt-10x-x-109">\Glsentryprefixplural{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 7443--><p class="noindent" > + + + +</p><!--l. 7446--><p class="indent" > <span class="marginpar"><span +class="ec-lmtt-10">\Glsentryprefixfirstplural</span><span +class="ec-lmtt-10"> </span></span><a + id="dx1-67065"></a> +</p><!--l. 7448--><p class="indent" > <hr><div title="Definition"><span +class="ec-lmtt-10x-x-109">\Glsentryprefixfirstplural{</span><span +class="lmsy-10x-x-109">⟨</span><span +class="ec-lmri-10x-x-109">label</span><span +class="lmsy-10x-x-109">⟩</span><span +class="ec-lmtt-10x-x-109">} </span></div><hr> +</p><!--l. 7449--><p class="noindent" > +<a + id="x1-67066r24"></a> +</p><!--l. 7451--><p class="noindent" ><span +class="ec-lmbx-12">Example 24</span><span +class="ec-lmbx-12"> (Adding Determiner to Glossary Style)</span><a + id="x1-67067"></a> +</p><!--l. 7452--><p class="indent" > You can use the above commands to define a new glossary style that uses +the determiner. For example, the following style is a slight modification of +the <span +class="ec-lmss-10x-x-109">list</span><a + id="dx1-67068"></a> style that inserts the prefix before the name: + + + +</p> + <div class="verbatim" id="verbatim-177"> +\newglossarystyle{plist}{% + <br />  \setglossarystyle{list}% + <br />  \renewcommand*{\glossentry}[2]{% + <br />    \item[\glsentryitem{##1}% + <br />          \Glsentryprefix{##1}% + <br />          \glstarget{##1}{\glossentryname{##1}}] + <br />       \glossentrydesc{##1}\glspostdescription\space ##2}% + <br />} +</div> +<!--l. 7465--><p class="nopar" > </p> +<div class="center" +> +<!--l. 7466--><p class="noindent" > +</p><!--l. 7466--><p class="noindent" >____________________________</p></div> + + + + <h2 class="chapterHead"><span class="titlemark">19</span>  <a + id="sec:accsupp"></a>Accessibility Support</h2> +<!--l. 7469--><p class="noindent" >Limited accessibility support is provided by the accompanying <span class="ec-lmss-10x-x-109">glossaries-accsupp</span><a - id="dx1-61001"></a> package, but note that this package is experimental and + id="dx1-68001"></a> package, but note that this package is experimental and it requires the <span class="ec-lmss-10x-x-109">accsupp</span><a - id="dx1-61002"></a> package which is also listed as experimental. This + id="dx1-68002"></a> package which is also listed as experimental. This package defines additional keys that may be used when defining glossary entries. The keys are as follows: </p><dl class="description"><dt class="description"> <span class="ec-lmssbx-10x-x-109">access</span><a - id="dx1-61003"></a> </dt><dd + id="dx1-68003"></a> </dt><dd class="description">The replacement text corresponding to the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-61004"></a> key. + id="dx1-68004"></a> key. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">textaccess</span><a - id="dx1-61005"></a> </dt><dd + id="dx1-68005"></a> </dt><dd class="description">The replacement text corresponding to the <span class="ec-lmss-10x-x-109">text</span><a - id="dx1-61006"></a> key. + id="dx1-68006"></a> key. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">firstaccess</span><a - id="dx1-61007"></a> </dt><dd + id="dx1-68007"></a> </dt><dd class="description">The replacement text corresponding to the <span class="ec-lmss-10x-x-109">first</span><a - id="dx1-61008"></a> key. + id="dx1-68008"></a> key. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">pluralaccess</span><a - id="dx1-61009"></a> </dt><dd + id="dx1-68009"></a> </dt><dd class="description">The replacement text corresponding to the <span class="ec-lmss-10x-x-109">plural</span><a - id="dx1-61010"></a> key. + id="dx1-68010"></a> key. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">firstpluralaccess</span><a - id="dx1-61011"></a> </dt><dd + id="dx1-68011"></a> </dt><dd class="description">The replacement text corresponding to the <span class="ec-lmss-10x-x-109">firstplural</span><a - id="dx1-61012"></a> + id="dx1-68012"></a> key. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">symbolaccess</span><a - id="dx1-61013"></a> </dt><dd + id="dx1-68013"></a> </dt><dd class="description">The replacement text corresponding to the <span class="ec-lmss-10x-x-109">symbol</span><a - id="dx1-61014"></a> key. + id="dx1-68014"></a> key. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">symbolpluralaccess</span><a - id="dx1-61015"></a> </dt><dd + id="dx1-68015"></a> </dt><dd class="description">The replacement text corresponding to the <span class="ec-lmss-10x-x-109">symbolplural</span><a - id="dx1-61016"></a> key. + id="dx1-68016"></a> key. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">descriptionaccess</span><a - id="dx1-61017"></a> </dt><dd + id="dx1-68017"></a> </dt><dd class="description">The replacement text corresponding to the <span class="ec-lmss-10x-x-109">description</span><a - id="dx1-61018"></a> key. + id="dx1-68018"></a> key. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">descriptionpluralaccess</span><a - id="dx1-61019"></a> </dt><dd + id="dx1-68019"></a> </dt><dd class="description">The replacement text corresponding to the <span class="ec-lmss-10x-x-109">descriptionplural</span><a - id="dx1-61020"></a> key. + id="dx1-68020"></a> key. </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">longaccess</span><a - id="dx1-61021"></a> </dt><dd + id="dx1-68021"></a> </dt><dd class="description">The replacement text corresponding to the <span class="ec-lmss-10x-x-109">long</span><a - id="dx1-61022"></a> key (used + id="dx1-68022"></a> key (used by <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-61023"></a>). + id="dx1-68023"></a>). </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">shortaccess</span><a - id="dx1-61024"></a> </dt><dd + id="dx1-68024"></a> </dt><dd class="description">The replacement text corresponding to the <span class="ec-lmss-10x-x-109">short</span><a - id="dx1-61025"></a> key (used + id="dx1-68025"></a> key (used by <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-61026"></a>). - - - + id="dx1-68026"></a>). </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">longpluralaccess</span><a - id="dx1-61027"></a> </dt><dd + id="dx1-68027"></a> </dt><dd class="description">The replacement text corresponding to the <span class="ec-lmss-10x-x-109">longplural</span><a - id="dx1-61028"></a> + id="dx1-68028"></a> key (used by <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-61029"></a>). + id="dx1-68029"></a>). + + + </dd><dt class="description"> <span class="ec-lmssbx-10x-x-109">shortpluralaccess</span><a - id="dx1-61030"></a> </dt><dd + id="dx1-68030"></a> </dt><dd class="description">The replacement text corresponding to the <span class="ec-lmss-10x-x-109">shortplural</span><a - id="dx1-61031"></a> key (used by <span + id="dx1-68031"></a> key (used by <span class="ec-lmtt-10x-x-109">\newacronym</span><a - id="dx1-61032"></a>). + id="dx1-68032"></a>). </dd></dl> -<!--l. 6164--><p class="noindent" >For example: +<!--l. 7516--><p class="noindent" >For example: </p> - <div class="verbatim" id="verbatim-149"> + <div class="verbatim" id="verbatim-178"> \newglossaryentry{tex}{name={\TeX},description={Document  <br />preparation language},access={TeX}} </div> -<!--l. 6168--><p class="nopar" > Now <span class="obeylines-h"><span class="verb"><span +<!--l. 7520--><p class="nopar" > Now <span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls{tex}</span></span></span> will be equivalent to </p> - <div class="verbatim" id="verbatim-150"> + <div class="verbatim" id="verbatim-179"> \BeginAccSupp{ActualText=TeX}\TeX\EndAccSupp{} </div> -<!--l. 6172--><p class="nopar" > The sample file <a -href="#x1-40001.1"><span +<!--l. 7524--><p class="nopar" > The sample file <a +href="#x1-6125r30"><span class="ec-lmtt-10x-x-109">sampleaccsupp.tex</span></a> illustrates the <span class="ec-lmss-10x-x-109">glossaries-accsupp</span><a - id="dx1-61033"></a> + id="dx1-68033"></a> package. -</p><!--l. 6176--><p class="indent" > See the documented code (<span +</p><!--l. 7528--><p class="indent" > See the documented code (<span class="ec-lmtt-10x-x-109">glossaries-code.pdf</span>) for further details. It is recommended that you also read the <span class="ec-lmss-10x-x-109">accsupp</span><a - id="dx1-61034"></a> documentation. + id="dx1-68034"></a> documentation. </p> - <h2 class="chapterHead"><span class="titlemark">19</span>  <a - id="x1-6200019"></a>Troubleshooting</h2> -<!--l. 6183--><p class="noindent" >The <span + <h2 class="chapterHead"><span class="titlemark">20</span>  <a + id="sec:trouble"></a>Troubleshooting</h2> +<!--l. 7535--><p class="noindent" >The <span class="ec-lmss-10x-x-109">glossaries </span>package comes with a minimal file called <span -class="ec-lmtt-10x-x-109">minimalgls.tex </span>which -can be used for testing. This should be located in the <span -class="ec-lmtt-10x-x-109">samples </span>subdirectory -(folder) of the <span -class="ec-lmss-10x-x-109">glossaries </span>documentation directory. The location varies according -to your operating system and <span class="TEX">T<span -class="E">E</span>X</span> installation. For example, on my Linux -partition it can be found in <span -class="ec-lmtt-10x-x-109">/usr/local/texlive/2008/texmf-dist</span> -<span -class="ec-lmtt-10x-x-109">/doc/latex/glossaries/</span>. Further information on debugging <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span -class="E">E</span>X</span></span> code -is available at <a +class="ec-lmtt-10x-x-109">minimalgls.tex</span> +which can be used for testing. This should be located in the +<span +class="ec-lmtt-10x-x-109">samples </span>subdirectory (folder) of the <span +class="ec-lmss-10x-x-109">glossaries </span>documentation +directory. The location varies according to your operating system and +<span class="TEX">T<span +class="E">E</span>X</span> installation. For example, on my Linux partition it can be found in +<span +class="ec-lmtt-10x-x-109">/usr/local/texlive/2013/texmf-dist/doc/latex/glossaries/</span>. +Further information on debugging <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span +class="E">E</span>X</span></span> code is available at +<a href="http://theoval.cmp.uea.ac.uk/~nlct/latex/minexample/" class="url" ><span class="ec-lmtt-10x-x-109">http://theoval.cmp.uea.ac.uk/~nlct/latex/minexample/</span></a>. -</p><!--l. 6193--><p class="indent" > Below is a list of the most frequently asked questions. For other queries, consult the +</p><!--l. 7546--><p class="indent" > Below is a list of the most frequently asked questions. For other queries, consult the <span class="ec-lmss-10x-x-109">glossaries </span>FAQ at <a href="http://www.dickimaw-books.com/faqs/glossariesfaq.html" class="url" ><span @@ -15595,174 +19122,195 @@ the comp.text.tex newsgroup, the <span class="LATEX">L<span class="A">A</span><s class="E">E</span>X</span></span> Community Forum (<a href="http://www.latex-community.org/" class="url" ><span -class="ec-lmtt-10x-x-109">http://www.latex-community.org/</span></a>) or Stack Exchange +class="ec-lmtt-10x-x-109">http://www.latex-community.org/</span></a>) or <span class="TEX">T<span +class="E">E</span>X</span> on StackExchange (<a href="http://tex.stackexchange.com/" class="url" ><span -class="ec-lmtt-10x-x-109">http://tex.stackexchange.com/</span></a>). I read all those three places and -respond to queries there far quicker than to email messages (my -inbox is always very cluttered). Bug reports can be submitted at +class="ec-lmtt-10x-x-109">http://tex.stackexchange.com/</span></a>). Bug reports can be submitted at <a href="http://www.dickimaw-books.com/bug-report.html" class="url" ><span class="ec-lmtt-10x-x-109">http://www.dickimaw-books.com/bug-report.html</span></a>. </p><ol class="enumerate1" > <li - class="enumerate" id="x1-62002x1"><span + class="enumerate" id="x1-69002x1"><span class="ec-lmbx-10x-x-109">Q. </span>I get the error message: - <div class="verbatim" id="verbatim-151"> + <div class="verbatim" id="verbatim-180"> + ! Undefined control sequence. +  <br />\in@ #1#2->\begingroup \def \in@@ +</div> + <!--l. 7561--><p class="nopar" > + </p><!--l. 7563--><p class="noindent" ><span +class="ec-lmbx-10x-x-109">A. </span>This error can occur if you have a fragile command in one of your + entry definitions. In most cases using <span +class="ec-lmtt-10x-x-109">\glsnoexpandfields </span>before + defining your entry should fix this, but there are still a few + fragile commands that will still cause this error even with + <span +class="ec-lmtt-10x-x-109">\glsnoexpandfields</span>. If this is the case put <span +class="ec-lmtt-10x-x-109">\protect </span>in front of the + fragile command. + </p></li> + <li + class="enumerate" id="x1-69004x2"><span +class="ec-lmbx-10x-x-109">Q. </span>I get the error message: + + + + <div class="verbatim" id="verbatim-181"> Missing \begin{document} </div> - <!--l. 6209--><p class="nopar" > - </p><!--l. 6211--><p class="noindent" ><span + <!--l. 7574--><p class="nopar" > + </p><!--l. 7576--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>Check you are using an up to date version of the <span class="ec-lmss-10x-x-109">xkeyval</span><a - id="dx1-62003"></a> + id="dx1-69005"></a> package. </p></li> <li - class="enumerate" id="x1-62005x2"><span + class="enumerate" id="x1-69007x3"><span class="ec-lmbx-10x-x-109">Q. </span>When I use <a - id="dx1-62006"></a><a + id="dx1-69008"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-62007"></a></a>, I get the following error message: + id="dx1-69009"></a></a>, I get the following error message: - <div class="verbatim" id="verbatim-152"> + <div class="verbatim" id="verbatim-182"> ERROR: CHAR: index 0 should be less than the length of  <br />the string </div> - <!--l. 6219--><p class="nopar" > - </p><!--l. 6221--><p class="noindent" ><span + <!--l. 7584--><p class="nopar" > + </p><!--l. 7586--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A.</span> <a - id="dx1-62008"></a><a + id="dx1-69010"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-62009"></a></a> discards all commands and braces from the sort string. If + id="dx1-69011"></a></a> discards all commands and braces from the sort string. If your sort string (either specified by the <span class="ec-lmss-10x-x-109">sort</span><a - id="dx1-62010"></a> key or the <span + id="dx1-69012"></a> key or the <span class="ec-lmss-10x-x-109">name</span><a - id="dx1-62011"></a> key) + id="dx1-69013"></a> key) only consists of commands, this will be treated by <a - id="dx1-62012"></a><span + id="dx1-69014"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-62013"></a> as an + id="dx1-69015"></a> as an empty sort string, which produces an error message in newer versions of <a - id="dx1-62014"></a><span + id="dx1-69016"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-62015"></a>. For example, the following will cause a + id="dx1-69017"></a>. For example, the following will cause a problem: </p> - <div class="verbatim" id="verbatim-153"> + <div class="verbatim" id="verbatim-183"> \newglossaryentry{alpha}{name={\ensuremath{\alpha}},  <br />  description=alpha} </div> - <!--l. 6230--><p class="nopar" > Either use a different sort key for the entry, for example: + <!--l. 7595--><p class="nopar" > Either use a different sort key for the entry, for example: </p> - <div class="verbatim" id="verbatim-154"> + <div class="verbatim" id="verbatim-184"> \newglossaryentry{alpha}{sort=alpha,  <br />  name={\ensuremath{\alpha}},  <br />  description=alpha} </div> - <!--l. 6236--><p class="nopar" > or, if all entries are like this, you may prefer to use the <span + <!--l. 7601--><p class="nopar" > or, if all entries are like this, you may prefer to use the <span class="ec-lmss-10x-x-109">sort=use</span><a - id="dx1-62016"></a> or + id="dx1-69018"></a> or <span class="ec-lmss-10x-x-109">sort=def</span><a - id="dx1-62017"></a> package options. See <a -href="#x1-160002.4">§2.4 </a><a -href="#x1-160002.4">Sorting Options<!--tex4ht:ref: sec:pkgopts-sort --></a> for further details + id="dx1-69019"></a> package options. See <a +href="#sec:pkgopts-sort">§2.4 </a><a +href="#sec:pkgopts-sort">Sorting Options<!--tex4ht:ref: sec:pkgopts-sort --></a> for further details of the <span class="ec-lmss-10x-x-109">sort</span><a - id="dx1-62018"></a> option. + id="dx1-69020"></a> option. </p></li> <li - class="enumerate" id="x1-62020x3"><span + class="enumerate" id="x1-69022x4"><span class="ec-lmbx-10x-x-109">Q. </span>I’ve used the <span class="ec-lmss-10x-x-109">smallcaps</span><a - id="dx1-62021"></a> option, but the acronyms are displayed in + id="dx1-69023"></a> option, but the acronyms are displayed in normal sized upper case letters. - <!--l. 6245--><p class="noindent" ><span + <!--l. 7610--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>The <span class="ec-lmss-10x-x-109">smallcaps</span><a - id="dx1-62022"></a> package option uses <span + id="dx1-69024"></a> package option uses <span class="ec-lmtt-10x-x-109">\textsc</span><a - id="dx1-62023"></a> to typeset + id="dx1-69025"></a> to typeset the acronyms. This command converts lower case letters to small capitals, while upper case letters remain their usual size. Therefore you need to specify the acronym in lower case letters. </p></li> <li - class="enumerate" id="x1-62025x4"><span + class="enumerate" id="x1-69027x5"><span class="ec-lmbx-10x-x-109">Q. </span>My acronyms won’t break across a line when they’re expanded. - <!--l. 6253--><p class="noindent" ><span + <!--l. 7618--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>PDF<span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> can break hyperlinks across a line, but <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> can’t. If you can’t use PDF<span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> then disable the <a - id="dx1-62026"></a><a + id="dx1-69028"></a><a href="#glo:firstuse">first use</a> links using the package option <span class="ec-lmss-10x-x-109">hyperfirst=false</span><a - id="dx1-62027"></a>. + id="dx1-69029"></a>. </p></li> <li - class="enumerate" id="x1-62029x5"><span + class="enumerate" id="x1-69031x6"><span class="ec-lmbx-10x-x-109">Q. </span>How do I change the font that the acronyms are displayed in? - <!--l. 6259--><p class="noindent" ><span + <!--l. 7624--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>The easiest way to do this is to specify the <span class="ec-lmss-10x-x-109">smaller</span><a - id="dx1-62030"></a> package option + id="dx1-69032"></a> package option and redefine <span class="ec-lmtt-10x-x-109">\acronymfont</span><a - id="dx1-62031"></a> to use the required typesetting command. + id="dx1-69033"></a> to use the required typesetting command. For example, suppose you would like the acronyms displayed in a sans-serif font, then you can do: </p> - <div class="verbatim" id="verbatim-155"> + <div class="verbatim" id="verbatim-185"> \usepackage[smaller]{glossaries}  <br />\renewcommand*{\acronymfont}[1]{\textsf{#1}} </div> - <!--l. 6266--><p class="nopar" > + <!--l. 7631--><p class="nopar" > </p></li> <li - class="enumerate" id="x1-62033x6"><span + class="enumerate" id="x1-69035x7"><span class="ec-lmbx-10x-x-109">Q. </span>How do I change the font that the acronyms are displayed in on <a - id="dx1-62034"></a><a + id="dx1-69036"></a><a href="#glo:firstuse">first use</a>? - <!--l. 6271--><p class="noindent" ><span + <!--l. 7636--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>The easiest way to do this is to specify the <span class="ec-lmss-10x-x-109">smaller</span><a - id="dx1-62035"></a> package option + id="dx1-69037"></a> package option and redefine <span class="ec-lmtt-10x-x-109">\firstacronymfont</span><a - id="dx1-62036"></a> to use the required command. Note + id="dx1-69038"></a> to use the required command. Note that if you don’t want the acronym on subsequent use to use <span class="ec-lmtt-10x-x-109">\textsmaller</span><a - id="dx1-62037"></a>, you will also need to redefine <span + id="dx1-69039"></a>, you will also need to redefine <span class="ec-lmtt-10x-x-109">\acronymfont</span><a - id="dx1-62038"></a>, as + id="dx1-69040"></a>, as above. For example to make the acronym emphasized on <a - id="dx1-62039"></a><a + id="dx1-69041"></a><a href="#glo:firstuse">first use</a>, but use the surrounding font for subsequent use, you can do: @@ -15770,188 +19318,118 @@ href="#glo:firstuse">first </p> - <div class="verbatim" id="verbatim-156"> + <div class="verbatim" id="verbatim-186"> \usepackage[smaller]{glossaries}  <br />\renewcommand*{\firstacronymfont}[1]{\emph{#1}}  <br />\renewcommand*{\acronymfont}[1]{#1} </div> - <!--l. 6281--><p class="nopar" > + <!--l. 7646--><p class="nopar" > </p></li> <li - class="enumerate" id="x1-62041x7"><span + class="enumerate" id="x1-69043x8"><span class="ec-lmbx-10x-x-109">Q. </span>I don’t have Perl installed, do I have to use <a - id="dx1-62042"></a><a + id="dx1-69044"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-62043"></a></a>? - <!--l. 6286--><p class="noindent" ><span + id="dx1-69045"></a></a>? + <!--l. 7651--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>No. Although it is strongly recommended, you don’t have to use <a - id="dx1-62044"></a><a + id="dx1-69046"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-62045"></a></a>. If you prefer a GUI application and have Java + id="dx1-69047"></a></a>. If you prefer a GUI application and have Java installed, you can use <a - id="dx1-62046"></a><a + id="dx1-69048"></a><a href="#glo:makeglossariesgui"><span class="ec-lmtt-10x-x-109">makeglossariesgui</span><a - id="dx1-62047"></a></a> instead. Otherwise you + id="dx1-69049"></a></a> instead. Otherwise you can just call <a - id="dx1-62048"></a><a + id="dx1-69050"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-62049"></a></a> explicitly (see <a -href="#x1-100001.3.3">§1.3.3 </a><a -href="#x1-100001.3.3">Using makeindex + id="dx1-69051"></a></a> explicitly (see <a +href="#sec:makeindexapp">§1.3.3 </a><a +href="#sec:makeindexapp">Using makeindex explicitly<!--tex4ht:ref: sec:makeindexapp --></a>). Note that you can’t use <a - id="dx1-62050"></a><a + id="dx1-69052"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-62051"></a></a> if you don’t have Perl + id="dx1-69053"></a></a> if you don’t have Perl installed. </p></li> <li - class="enumerate" id="x1-62053x8"><span + class="enumerate" id="x1-69055x9"><span class="ec-lmbx-10x-x-109">Q. </span>I’m used to using the <span class="ec-lmss-10x-x-109">glossary </span>package: are there any instructions on migrating from the <span class="ec-lmss-10x-x-109">glossary</span><a - id="dx1-62054"></a> package to the <span + id="dx1-69056"></a> package to the <span class="ec-lmss-10x-x-109">glossaries </span>package? - <!--l. 6297--><p class="noindent" ><span + <!--l. 7662--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>Read <a href="glossary2glossaries.html" >“Upgrading from the glossary package to the glossaries package”</a> which should be available from the same location as this document. </p></li> <li - class="enumerate" id="x1-62056x9"><span + class="enumerate" id="x1-69058x10"><span class="ec-lmbx-10x-x-109">Q. </span>I’m using <span class="ec-lmss-10x-x-109">babel</span><a - id="dx1-62057"></a> but the fixed names haven’t been translated. - <!--l. 6304--><p class="noindent" ><span + id="dx1-69059"></a> but the fixed names haven’t been translated. + <!--l. 7669--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>The <span class="ec-lmss-10x-x-109">glossaries </span>package currently only supports the following languages: Brazilian Portuguese, Danish, Dutch, English, French, German, Irish, Italian, Hungarian, Polish, Serbian and Spanish. If you want to add another language, send me the translations, and I’ll add them to the next version. - </p><!--l. 6310--><p class="noindent" >If you are using one of the above languages, but the text hasn’t been - translated, try adding the <span -class="ec-lmss-10x-x-109">translator</span><a - id="dx1-62058"></a> package with the required - languages explicitly (before you load the <span -class="ec-lmss-10x-x-109">glossaries </span>package). For - example: - - - -</p> - <div class="verbatim" id="verbatim-157"> - \usepackage[ngerman]{babel} -  <br />\usepackage[ngerman]{translator} -  <br />\usepackage{glossaries} -</div> - <!--l. 6318--><p class="nopar" > Alternatively, you can add the language as a global option to the - class file. Check the <span -class="ec-lmss-10x-x-109">translator </span>package documentation for further - details. + </p><!--l. 7675--><p class="noindent" >If you are using one of the above languages, but the text hasn’t been + translated, try using the <span +class="ec-lmss-10x-x-109">glossaries </span>package option <span +class="ec-lmss-10x-x-109">translate=babel</span><a + id="dx1-69060"></a>. + Also, try adding the language as a global option to the class + file. </p></li> <li - class="enumerate" id="x1-62060x10"><span -class="ec-lmbx-10x-x-109">Q. </span>My acronyms contain strange characters when I use commands - like <span -class="ec-lmtt-10x-x-109">\acrlong</span><a - id="dx1-62061"></a>. - <!--l. 6326--><p class="noindent" ><span -class="ec-lmbx-10x-x-109">A. </span>Switch off the sanitization: - - - -</p> - <div class="verbatim" id="verbatim-158"> - \usepackage[sanitize=none]{glossaries} -</div> - <!--l. 6329--><p class="nopar" > and protect fragile commands. - </p></li> - <li - class="enumerate" id="x1-62063x11"><span -class="ec-lmbx-10x-x-109">Q. </span>Weird characters appear when I use <span -class="ec-lmtt-10x-x-109">\glsentryname</span><a - id="dx1-62064"></a> or - <span -class="ec-lmtt-10x-x-109">\glsname</span><a - id="dx1-62065"></a>. - <!--l. 6335--><p class="noindent" ><span -class="ec-lmbx-10x-x-109">A. </span>Either use <span -class="ec-lmtt-10x-x-109">\glsentrytext</span><a - id="dx1-62066"></a> or <span -class="ec-lmtt-10x-x-109">\glstext</span><a - id="dx1-62067"></a>, respectively, or switch off - the sanitization for the <span -class="ec-lmss-10x-x-109">name</span><a - id="dx1-62068"></a> key: - - - -</p> - <div class="verbatim" id="verbatim-159"> - \usepackage[sanitize={name=false}]{glossaries} -</div> - <!--l. 6340--><p class="nopar" > and protect fragile commands. - </p></li> - <li - class="enumerate" id="x1-62070x12"><span -class="ec-lmbx-10x-x-109">Q. </span>Weird characters appear when I try to display an entry’s - description. - <!--l. 6346--><p class="noindent" ><span -class="ec-lmbx-10x-x-109">A. </span>Switch off the sanitization for the <span -class="ec-lmss-10x-x-109">description</span><a - id="dx1-62071"></a> key: - - - -</p> - <div class="verbatim" id="verbatim-160"> - \usepackage[sanitize={description=false}]{glossaries} -</div> - <!--l. 6350--><p class="nopar" > and protect fragile commands. - </p></li> - <li - class="enumerate" id="x1-62073x13"><span + class="enumerate" id="x1-69062x11"><span class="ec-lmbx-10x-x-109">Q. </span>My glossaries haven’t appeared. - <!--l. 6355--><p class="noindent" ><span + <!--l. 7682--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>Remember to do the following: </p> <ul class="itemize1"> <li class="itemize">Add <span class="ec-lmtt-10x-x-109">\makeglossaries</span><a - id="dx1-62074"></a> to the document preamble. + id="dx1-69063"></a> to the document preamble. + + + </li> <li class="itemize">Use either <span class="ec-lmtt-10x-x-109">\printglossary</span><a - id="dx1-62075"></a> for each glossary that has been + id="dx1-69064"></a> for each glossary that has been defined or <span class="ec-lmtt-10x-x-109">\printglossaries</span><a - id="dx1-62076"></a>. + id="dx1-69065"></a>. </li> <li class="itemize">Use the commands listed in <a -href="#x1-280006">§6 </a><a -href="#x1-280006">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a>, +href="#sec:glslink">§6 </a><a +href="#sec:glslink">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a>, <a -href="#x1-310007">§7 </a><a -href="#x1-310007">Adding an Entry to the Glossary Without Generating +href="#sec:glsadd">§7 </a><a +href="#sec:glsadd">Adding an Entry to the Glossary Without Generating Text<!--tex4ht:ref: sec:glsadd --></a> or <a -href="#x1-320008">§8 </a><a -href="#x1-320008">Cross-Referencing Entries<!--tex4ht:ref: sec:crossref --></a> for each entry that +href="#sec:crossref">§8 </a><a +href="#sec:crossref">Cross-Referencing Entries<!--tex4ht:ref: sec:crossref --></a> for each entry that you want to appear in the glossary. </li> <li class="itemize">Run <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> on your document, then run <a - id="dx1-62077"></a><a + id="dx1-69066"></a><a href="#glo:makeglossaries"><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-62078"></a></a>, then run <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span + id="dx1-69067"></a></a>, then run <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> on your document again. If you want the glossaries to appear in the table of contents, you will need an extra <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span @@ -15959,3809 +19437,4389 @@ class="E">E</span>X</span></span> run. If any of your entries cross-reference an entry that’s not referenced in the main body of the document, you will need to run <a - id="dx1-62079"></a><span + id="dx1-69068"></a><span class="ec-lmtt-10x-x-109">makeglossaries</span><a - id="dx1-62080"></a> (see <a -href="#x1-70001.3">§1.3 </a><a -href="#x1-70001.3">Generating the Associated + id="dx1-69069"></a> (see <a +href="#sec:makeglossaries">§1.3 </a><a +href="#sec:makeglossaries">Generating the Associated Glossary Files<!--tex4ht:ref: sec:makeglossaries --></a>) after the second <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> run, followed by another <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> run.</li></ul> - <!--l. 6375--><p class="noindent" >Check the log files (<span + <!--l. 7702--><p class="noindent" >Check the log files (<span class="ec-lmtt-10x-x-109">.log</span><a - id="dx1-62081"></a>, <span + id="dx1-69070"></a>, <span class="ec-lmtt-10x-x-109">.glg</span><a - id="dx1-62082"></a> etc) for any warnings. + id="dx1-69071"></a> etc) for any warnings. + </p></li> + <li + class="enumerate" id="x1-69073x12"><span +class="ec-lmbx-10x-x-109">Q. </span>Why is glossaries creating an empty <span +class="ec-lmtt-10x-x-109">.glo</span><a + id="dx1-69074"></a> file? + <!--l. 7707--><p class="noindent" ><span +class="ec-lmbx-10x-x-109">A. </span>Because you haven’t used any entries in the <span +class="ec-lmtt-10x-x-109">main </span>glossary + via commands such as <span +class="ec-lmtt-10x-x-109">\gls</span><a + id="dx1-69075"></a>. If you don’t want to use this + glossary, you can suppress its creation via the package option + <span +class="ec-lmss-10x-x-109">nomain</span><a + id="dx1-69076"></a>. </p></li> <li - class="enumerate" id="x1-62084x14"><span + class="enumerate" id="x1-69078x13"><span class="ec-lmbx-10x-x-109">Q. </span>It is possible to change the rules used to sort the glossary entries? - <!--l. 6381--><p class="noindent" ><span + <!--l. 7715--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>If it’s for an individual entry, then you can use the entry’s <span class="ec-lmss-10x-x-109">sort</span><a - id="dx1-62085"></a> key + id="dx1-69079"></a> key to sort it according to a different term. If it’s for the entire alphabet, then you will need to use <a - id="dx1-62086"></a><a + id="dx1-69080"></a><a href="#glo:xindy"><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-62087"></a></a> (instead of <a - id="dx1-62088"></a><a + id="dx1-69081"></a></a> (instead of <a + id="dx1-69082"></a><a href="#glo:makeindex"><span class="ec-lmtt-10x-x-109">makeindex</span><a - id="dx1-62089"></a></a>) and + id="dx1-69083"></a></a>) and use an appropriate <a - id="dx1-62090"></a><span + id="dx1-69084"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-62091"></a> language module. Writing <a - id="dx1-62092"></a><span + id="dx1-69085"></a> language module. Writing <a + id="dx1-69086"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-62093"></a> + id="dx1-69087"></a> modules or styles is beyond the scope of this manual. Further - - - information about <a - id="dx1-62094"></a><span + id="dx1-69088"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-62095"></a> can be found at the <a + id="dx1-69089"></a> can be found at the <a href="http://xindy.sourceforge.net/" >Xindy Web Site</a>. There is also a link to the <a - id="dx1-62096"></a><span + id="dx1-69090"></a><span class="ec-lmtt-10x-x-109">xindy</span><a - id="dx1-62097"></a> mailing list from that + id="dx1-69091"></a> mailing list from that site. - </p><!--l. 6391--><p class="noindent" >If you want to sort according to order of definition or order of + </p><!--l. 7725--><p class="noindent" >If you want to sort according to order of definition or order of use, use the <span class="ec-lmss-10x-x-109">sort</span><a - id="dx1-62098"></a> package option described in <a -href="#x1-160002.4">§2.4 </a><a -href="#x1-160002.4">Sorting + id="dx1-69092"></a> package option described in <a +href="#sec:pkgopts-sort">§2.4 </a><a +href="#sec:pkgopts-sort">Sorting Options<!--tex4ht:ref: sec:pkgopts-sort --></a>. </p></li> + + + <li - class="enumerate" id="x1-62100x15"><span + class="enumerate" id="x1-69094x14"><span class="ec-lmbx-10x-x-109">Q. </span>I get an error when using TeX4HT<a - id="dx1-62101"></a> with <span + id="dx1-69095"></a> with <span class="ec-lmss-10x-x-109">glossaries</span>. - <!--l. 6398--><p class="noindent" ><span + <!--l. 7732--><p class="noindent" ><span class="ec-lmbx-10x-x-109">A. </span>TeX4HT seems to have a problem with the glossary styles that use <span class="ec-lmtt-10x-x-109">\indexspace</span><a - id="dx1-62102"></a>. I don’t know enough about TeX4HT to find out + id="dx1-69096"></a>. I don’t know enough about TeX4HT to find out why. Either use a different glossary style or redefine the style command that uses <span class="ec-lmtt-10x-x-109">\indexspace</span>. For example, if you are using the <span class="ec-lmss-10x-x-109">list</span><a - id="dx1-62103"></a> style, try: + id="dx1-69097"></a> style, try: </p> - <div class="verbatim" id="verbatim-161"> + <div class="verbatim" id="verbatim-187"> \renewcommand*{\glsgroupskip}{} </div> - <!--l. 6405--><p class="nopar" > or + <!--l. 7739--><p class="nopar" > or - + </p> - <div class="verbatim" id="verbatim-162"> + <div class="verbatim" id="verbatim-188"> \renewcommand*{\glsgroupskip}{\item[]} </div> - <!--l. 6409--><p class="nopar" > + <!--l. 7743--><p class="nopar" > </p> </li></ol> - + - -<!--l. 6414--><p class="indent" > <a + +<!--l. 7747--><p class="indent" > <a id="likesection.2"></a><a - id="Q1-1-73"></a> - + id="sec:index"></a> + - + </p> <h2 class="likechapterHead"><a - id="x1-6300019"></a>Index</h2> + id="x1-7000020"></a>Index</h2> <!--l. 4--><p class="noindent" > <span class="ec-lmbx-10x-x-109">Symbols</span> </p> <div class="theindex"><span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\@gls@codepage</span></span></span>  <a -href="glossaries-user.html#dx1-11023" ><span +href="glossaries-user.html#dx1-13023" ><span class="ec-lmri-10x-x-109">1</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\@glsorder</span></span></span>  <a -href="glossaries-user.html#dx1-11019" ><span +href="glossaries-user.html#dx1-13019" ><span class="ec-lmri-10x-x-109">2</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\@istfilename</span></span></span>  <a -href="glossaries-user.html#dx1-11011" ><span +href="glossaries-user.html#dx1-13011" ><span class="ec-lmri-10x-x-109">3</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\@newglossary</span></span></span>  <a -href="glossaries-user.html#dx1-11005" ><span +href="glossaries-user.html#dx1-13005" ><span class="ec-lmri-10x-x-109">4</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\@xdylanguage</span></span></span>  <a -href="glossaries-user.html#dx1-11022" ><span +href="glossaries-user.html#dx1-13022" ><span class="ec-lmri-10x-x-109">5</span></a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">Xindy</span>  <a -href="glossaries-user.html#dx1-9002" >6</a> <br /></span> +href="glossaries-user.html#dx1-11002" >6</a> <br /></span> <p class="theindex"> <span class="ec-lmbx-10x-x-109">A</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Ac</span></span></span>  <a -href="glossaries-user.html#dx1-41108" >7</a> <br /></span> +href="glossaries-user.html#dx1-50117" >7</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\ac</span></span></span>  <a -href="glossaries-user.html#dx1-41106" >8</a> <br /></span> +href="glossaries-user.html#dx1-50115" >8</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">accsupp </span>package  <a -href="glossaries-user.html#dx1-61002" >9</a>, <a -href="glossaries-user.html#dx1-61034" >10</a> <br /></span> +href="glossaries-user.html#dx1-68002" >9</a>, <a +href="glossaries-user.html#dx1-68034" >10</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Acf</span></span></span>  <a -href="glossaries-user.html#dx1-41100" >11</a> <br /></span> +href="glossaries-user.html#dx1-50109" >11</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acf</span></span></span>  <a -href="glossaries-user.html#dx1-41098" >12</a> <br /></span> +href="glossaries-user.html#dx1-50107" >12</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Acfp</span></span></span>  <a -href="glossaries-user.html#dx1-41104" >13</a> <br /></span> +href="glossaries-user.html#dx1-50113" >13</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acfp</span></span></span>  <a -href="glossaries-user.html#dx1-41102" >14</a> <br /></span> +href="glossaries-user.html#dx1-50111" >14</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Acl</span></span></span>  <a -href="glossaries-user.html#dx1-41092" >15</a> <br /></span> +href="glossaries-user.html#dx1-50101" >15</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acl</span></span></span>  <a -href="glossaries-user.html#dx1-41090" >16</a> <br /></span> +href="glossaries-user.html#dx1-50099" >16</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Aclp</span></span></span>  <a -href="glossaries-user.html#dx1-41096" >17</a> <br /></span> +href="glossaries-user.html#dx1-50105" >17</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\aclp</span></span></span>  <a -href="glossaries-user.html#dx1-41094" >18</a> <br /></span> +href="glossaries-user.html#dx1-50103" >18</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Acp</span></span></span>  <a -href="glossaries-user.html#dx1-41112" >19</a> <br /></span> +href="glossaries-user.html#dx1-50121" >19</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acp</span></span></span>  <a -href="glossaries-user.html#dx1-41110" >20</a> <br /></span> +href="glossaries-user.html#dx1-50119" >20</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\ACRfull</span></span></span>  <a -href="glossaries-user.html#dx1-41078" ><span +href="glossaries-user.html#dx1-50084" ><span class="ec-lmri-10x-x-109">21</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Acrfull</span></span></span>  <a -href="glossaries-user.html#dx1-41077" ><span +href="glossaries-user.html#dx1-50083" ><span class="ec-lmri-10x-x-109">22</span></a>, <a -href="glossaries-user.html#dx1-41101" >23</a> <br /></span> +href="glossaries-user.html#dx1-50110" >23</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acrfull</span></span></span>  <a -href="glossaries-user.html#dx1-41072" ><span +href="glossaries-user.html#dx1-50080" ><span class="ec-lmri-10x-x-109">24</span></a>, <a -href="glossaries-user.html#dx1-41099" >25</a> <br /></span> +href="glossaries-user.html#dx1-50108" >25</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acrfullformat</span></span></span>  <a -href="glossaries-user.html#dx1-41073" ><span -class="ec-lmri-10x-x-109">26</span></a> <br /></span> +href="glossaries-user.html#dx1-50082" ><span +class="ec-lmri-10x-x-109">26</span></a>, <a +href="glossaries-user.html#dx1-50136" >27</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\ACRfullpl</span></span></span>  <a +href="glossaries-user.html#dx1-50087" ><span +class="ec-lmri-10x-x-109">28</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Acrfullpl</span></span></span>  <a -href="glossaries-user.html#dx1-41105" >27</a> <br /></span> +href="glossaries-user.html#dx1-50086" ><span +class="ec-lmri-10x-x-109">29</span></a>, <a +href="glossaries-user.html#dx1-50114" >30</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acrfullpl</span></span></span>  <a -href="glossaries-user.html#dx1-41103" >28</a> <br /></span> +href="glossaries-user.html#dx1-50085" ><span +class="ec-lmri-10x-x-109">31</span></a>, <a +href="glossaries-user.html#dx1-50112" >32</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\ACRlong</span></span></span>  <a -href="glossaries-user.html#dx1-41071" ><span -class="ec-lmri-10x-x-109">29</span></a> <br /></span> +href="glossaries-user.html#dx1-50076" ><span +class="ec-lmri-10x-x-109">33</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Acrlong</span></span></span>  <a -href="glossaries-user.html#dx1-41070" ><span -class="ec-lmri-10x-x-109">30</span></a>, <a -href="glossaries-user.html#dx1-41093" >31</a> <br /></span> +href="glossaries-user.html#dx1-50075" ><span +class="ec-lmri-10x-x-109">34</span></a>, <a +href="glossaries-user.html#dx1-50102" >35</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acrlong</span></span></span>  <a -href="glossaries-user.html#dx1-41069" ><span -class="ec-lmri-10x-x-109">32</span></a>, <a -href="glossaries-user.html#dx1-41074" >33</a>, <a -href="glossaries-user.html#dx1-41091" >34</a>, <a -href="glossaries-user.html#dx1-62061" >35</a> <br /></span> +href="glossaries-user.html#dx1-50074" ><span +class="ec-lmri-10x-x-109">36</span></a>, <a +href="glossaries-user.html#dx1-50100" >37</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\ACRlongpl</span></span></span>  <a +href="glossaries-user.html#dx1-50079" ><span +class="ec-lmri-10x-x-109">38</span></a> <br /></span> + + + <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Acrlongpl</span></span></span>  <a -href="glossaries-user.html#dx1-41097" >36</a> <br /></span> +href="glossaries-user.html#dx1-50078" ><span +class="ec-lmri-10x-x-109">39</span></a>, <a +href="glossaries-user.html#dx1-50106" >40</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acrlongpl</span></span></span>  <a -href="glossaries-user.html#dx1-41095" >37</a> <br /></span> - - - +href="glossaries-user.html#dx1-50077" ><span +class="ec-lmri-10x-x-109">41</span></a>, <a +href="glossaries-user.html#dx1-50104" >42</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acrnameformat</span></span></span>  <a -href="glossaries-user.html#dx1-43008" ><span -class="ec-lmri-10x-x-109">38</span></a>, <a -href="glossaries-user.html#dx1-43023" >39</a> <br /></span> +href="glossaries-user.html#dx1-52013" ><span +class="ec-lmri-10x-x-109">43</span></a>, <a +href="glossaries-user.html#dx1-52028" >44</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acronymfont</span></span></span>  <a -href="glossaries-user.html#dx1-17024" >40</a>, <a -href="glossaries-user.html#dx1-41051" ><span -class="ec-lmri-10x-x-109">41</span></a>, <a -href="glossaries-user.html#dx1-41076" >42</a>, <a -href="glossaries-user.html#dx1-42027" >43</a>, <a -href="glossaries-user.html#dx1-42034" >44</a>, <a -href="glossaries-user.html#dx1-42035" >45</a>, <a -href="glossaries-user.html#dx1-42042" >46</a>, <a -href="glossaries-user.html#dx1-43012" >47</a>, <a -href="glossaries-user.html#dx1-43019" >48</a>, <a -href="glossaries-user.html#dx1-43025" >49</a>, <a -href="glossaries-user.html#dx1-43027" >50</a>, <a -href="glossaries-user.html#dx1-43029" >51</a>, <a -href="glossaries-user.html#dx1-62031" >52</a>, <a -href="glossaries-user.html#dx1-62038" >53</a> <br /></span> +href="glossaries-user.html#dx1-19033" >45</a>, <a +href="glossaries-user.html#dx1-37129" >46</a>, <a +href="glossaries-user.html#dx1-37141" >47</a>, <a +href="glossaries-user.html#dx1-50053" ><span +class="ec-lmri-10x-x-109">48</span></a>, <a +href="glossaries-user.html#dx1-50081" >49</a>, <a +href="glossaries-user.html#dx1-51027" >50</a>, <a +href="glossaries-user.html#dx1-51034" >51</a>, <a +href="glossaries-user.html#dx1-51035" >52</a>, <a +href="glossaries-user.html#dx1-51042" >53</a>, <a +href="glossaries-user.html#dx1-52017" >54</a>, <a +href="glossaries-user.html#dx1-52024" >55</a>, <a +href="glossaries-user.html#dx1-52030" >56</a>, <a +href="glossaries-user.html#dx1-52032" >57</a>, <a +href="glossaries-user.html#dx1-52034" >58</a>, <a +href="glossaries-user.html#dx1-69033" >59</a>, <a +href="glossaries-user.html#dx1-69040" >60</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acronymname</span></span></span>  <a -href="glossaries-user.html#dx1-6015" >54</a> <br /></span> +href="glossaries-user.html#dx1-8017" >61</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acronymtype</span></span></span>  <a -href="glossaries-user.html#dx1-14029" >55</a>, <a -href="glossaries-user.html#dx1-17003" >56</a>, <a -href="glossaries-user.html#dx1-17010" >57</a>, <a -href="glossaries-user.html#dx1-31007" >58</a>, <a -href="glossaries-user.html#dx1-40013" ><span -class="ec-lmri-10x-x-109">59</span></a>, <a -href="glossaries-user.html#dx1-41004" >60</a>, <a -href="glossaries-user.html#dx1-41033" >61</a>, <a -href="glossaries-user.html#dx1-17005" >62</a>, <a -href="glossaries-user.html#dx1-25010" >63</a> <br /></span> +href="glossaries-user.html#dx1-15072" >62</a>, <a +href="glossaries-user.html#dx1-16040" >63</a>, <a +href="glossaries-user.html#dx1-19006" >64</a>, <a +href="glossaries-user.html#dx1-19014" >65</a>, <a +href="glossaries-user.html#dx1-40007" >66</a>, <a +href="glossaries-user.html#dx1-49013" ><span +class="ec-lmri-10x-x-109">67</span></a>, <a +href="glossaries-user.html#dx1-50004" >68</a>, <a +href="glossaries-user.html#dx1-50033" >69</a>, <a +href="glossaries-user.html#dx1-52002" >70</a>, <a +href="glossaries-user.html#dx1-52007" >71</a>, <a +href="glossaries-user.html#dx1-19008" >72</a>, <a +href="glossaries-user.html#dx1-31013" >73</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\ACRshort</span></span></span>  <a -href="glossaries-user.html#dx1-41068" ><span -class="ec-lmri-10x-x-109">64</span></a> <br /></span> +href="glossaries-user.html#dx1-50070" ><span +class="ec-lmri-10x-x-109">74</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Acrshort</span></span></span>  <a -href="glossaries-user.html#dx1-41067" ><span -class="ec-lmri-10x-x-109">65</span></a>, <a -href="glossaries-user.html#dx1-41085" >66</a> <br /></span> +href="glossaries-user.html#dx1-50069" ><span +class="ec-lmri-10x-x-109">75</span></a>, <a +href="glossaries-user.html#dx1-50094" >76</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acrshort</span></span></span>  <a -href="glossaries-user.html#dx1-41065" ><span -class="ec-lmri-10x-x-109">67</span></a>, <a -href="glossaries-user.html#dx1-41075" >68</a>, <a -href="glossaries-user.html#dx1-41083" >69</a>, <a -href="glossaries-user.html#dx1-42013" >70</a>, <a -href="glossaries-user.html#dx1-3004" >71</a> <br /></span> +href="glossaries-user.html#dx1-50067" ><span +class="ec-lmri-10x-x-109">77</span></a>, <a +href="glossaries-user.html#dx1-50092" >78</a>, <a +href="glossaries-user.html#dx1-51013" >79</a>, <a +href="glossaries-user.html#dx1-5004" >80</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\ACRshortpl</span></span></span>  <a +href="glossaries-user.html#dx1-50073" ><span +class="ec-lmri-10x-x-109">81</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Acrshortpl</span></span></span>  <a -href="glossaries-user.html#dx1-41089" >72</a> <br /></span> +href="glossaries-user.html#dx1-50072" ><span +class="ec-lmri-10x-x-109">82</span></a>, <a +href="glossaries-user.html#dx1-50098" >83</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acrshortpl</span></span></span>  <a -href="glossaries-user.html#dx1-41087" >73</a> <br /></span> +href="glossaries-user.html#dx1-50071" ><span +class="ec-lmri-10x-x-109">84</span></a>, <a +href="glossaries-user.html#dx1-50096" >85</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Acs</span></span></span>  <a -href="glossaries-user.html#dx1-41084" >74</a> <br /></span> +href="glossaries-user.html#dx1-50093" >86</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acs</span></span></span>  <a -href="glossaries-user.html#dx1-41082" >75</a> <br /></span> +href="glossaries-user.html#dx1-50091" >87</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Acsp</span></span></span>  <a -href="glossaries-user.html#dx1-41088" >76</a> <br /></span> +href="glossaries-user.html#dx1-50097" >88</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\acsp</span></span></span>  <a -href="glossaries-user.html#dx1-41086" >77</a> <br /></span> +href="glossaries-user.html#dx1-50095" >89</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\addcontentsline</span></span></span>  <a -href="glossaries-user.html#dx1-14007" >78</a> <br /></span> +href="glossaries-user.html#dx1-16007" >90</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\andname</span></span></span>  <a -href="glossaries-user.html#dx1-33011" >79</a> <br /></span> +href="glossaries-user.html#dx1-42011" >91</a> <br /></span> +<span class="index-item"><span +class="ec-lmtt-10x-x-109">arara</span>  <a +href="glossaries-user.html#dx1-9020" >92</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">array </span>package  <a -href="glossaries-user.html#dx1-50006" >80</a>, <a -href="glossaries-user.html#dx1-52006" >81</a> <br /></span> +href="glossaries-user.html#dx1-59006" >93</a>, <a +href="glossaries-user.html#dx1-61006" >94</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">B</span> <span class="index-item"><span class="ec-lmss-10x-x-109">babel </span>package  <a -href="glossaries-user.html#dx1-6001" >82</a>, <a -href="glossaries-user.html#dx1-6003" >83</a>, <a -href="glossaries-user.html#dx1-6009" >84</a>, <a -href="glossaries-user.html#dx1-6023" >85</a>, <a -href="glossaries-user.html#dx1-6028" >86</a>, <a -href="glossaries-user.html#dx1-6033" >87</a>, <a -href="glossaries-user.html#dx1-13043" >88</a>, <a -href="glossaries-user.html#dx1-13048" >89</a>, <a -href="glossaries-user.html#dx1-13053" >90</a>, <a -href="glossaries-user.html#dx1-13058" >91</a>, <a -href="glossaries-user.html#dx1-40017" >92</a>, <a -href="glossaries-user.html#dx1-62057" >93</a> <br /></span> +href="glossaries-user.html#dx1-8001" >95</a>, <a +href="glossaries-user.html#dx1-8003" >96</a>, <a +href="glossaries-user.html#dx1-8011" >97</a>, <a +href="glossaries-user.html#dx1-8025" >98</a>, <a +href="glossaries-user.html#dx1-8031" >99</a>, <a +href="glossaries-user.html#dx1-8035" >100</a>, <a +href="glossaries-user.html#dx1-15033" >101</a>, <a +href="glossaries-user.html#dx1-15038" >102</a>, <a +href="glossaries-user.html#dx1-15043" >103</a>, <a +href="glossaries-user.html#dx1-15045" >104</a>, <a +href="glossaries-user.html#dx1-15047" >105</a>, <a +href="glossaries-user.html#dx1-15052" >106</a>, <a +href="glossaries-user.html#dx1-15058" >107</a>, <a +href="glossaries-user.html#dx1-49019" >108</a>, <a +href="glossaries-user.html#dx1-69059" >109</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">beamer </span>package  <a -href="glossaries-user.html#dx1-6027" >94</a> <br /></span> +href="glossaries-user.html#dx1-8030" >110</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">C</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\chapter</span></span></span>  <a -href="glossaries-user.html#dx1-35028" >95</a> <br /></span> +href="glossaries-user.html#dx1-44028" >111</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\chapter*</span></span></span>  <a -href="glossaries-user.html#dx1-35026" >96</a> <br /></span> +href="glossaries-user.html#dx1-44026" >112</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\currentglossary</span></span></span>  <a -href="glossaries-user.html#dx1-56065" ><span -class="ec-lmri-10x-x-109">97</span></a> <br /></span> +href="glossaries-user.html#dx1-65073" ><span +class="ec-lmri-10x-x-109">113</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\CustomAcronymFields</span></span></span>  <a -href="glossaries-user.html#dx1-44001" ><span -class="ec-lmri-10x-x-109">98</span></a>, <a -href="glossaries-user.html#dx1-44026" >99</a>, <a -href="glossaries-user.html#dx1-44056" >100</a> <br /></span> +href="glossaries-user.html#dx1-53001" ><span +class="ec-lmri-10x-x-109">114</span></a>, <a +href="glossaries-user.html#dx1-53027" >115</a>, <a +href="glossaries-user.html#dx1-53045" >116</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">D</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">\defdisplay</span></span></span>  <a -href="glossaries-user.html#dx1-41008" >101</a> <br /></span> -<span class="index-item"><span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">\defdisplayfirst</span></span></span>  <a -href="glossaries-user.html#dx1-41007" >102</a> <br /></span> +class="ec-lmtt-10x-x-109">\DeclareAcronymList</span></span></span>  <a +href="glossaries-user.html#dx1-19021" ><span +class="ec-lmri-10x-x-109">117</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">\defglsdisplay</span></span></span>  <a -href="glossaries-user.html#dx1-29033" ><span -class="ec-lmri-10x-x-109">103</span></a>, <a -href="glossaries-user.html#dx1-44016" >104</a>, <a -href="glossaries-user.html#dx1-44040" >105</a>, <a -href="glossaries-user.html#dx1-44043" >106</a> <br /></span> +class="ec-lmtt-10x-x-109">\defglsentryfmt</span></span></span>  <a +href="glossaries-user.html#dx1-38040" ><span +class="ec-lmri-10x-x-109">118</span></a>, <a +href="glossaries-user.html#dx1-50007" >119</a>, <a +href="glossaries-user.html#dx1-53015" >120</a>, <a +href="glossaries-user.html#dx1-53041" >121</a>, <a +href="glossaries-user.html#dx1-53043" >122</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">\defglsdisplayfirst</span></span></span>  <a -href="glossaries-user.html#dx1-29034" ><span -class="ec-lmri-10x-x-109">107</span></a>, <a -href="glossaries-user.html#dx1-44015" >108</a>, <a -href="glossaries-user.html#dx1-44039" >109</a>, <a -href="glossaries-user.html#dx1-44042" >110</a> <br /></span> +class="ec-lmtt-10x-x-109">\DefineAcronymShortcuts</span></span></span>  <a +href="glossaries-user.html#dx1-19039" ><span +class="ec-lmri-10x-x-109">123</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\delimN</span></span></span>  <a -href="glossaries-user.html#dx1-56049" >111</a> <br /></span> +href="glossaries-user.html#dx1-65057" >124</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\delimR</span></span></span>  <a -href="glossaries-user.html#dx1-56050" >112</a> <br /></span> +href="glossaries-user.html#dx1-65058" >125</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">description </span>(environment)  <a -href="glossaries-user.html#dx1-48002" >113</a>, <a -href="glossaries-user.html#dx1-48007" >114</a>, <a -href="glossaries-user.html#dx1-48029" >115</a>, <a -href="glossaries-user.html#dx1-56009" >116</a>, <a -href="glossaries-user.html#dx1-56013" >117</a> <br /></span> +href="glossaries-user.html#dx1-57002" >126</a>, <a +href="glossaries-user.html#dx1-57007" >127</a>, <a +href="glossaries-user.html#dx1-57029" >128</a>, <a +href="glossaries-user.html#dx1-65009" >129</a>, <a +href="glossaries-user.html#dx1-65013" >130</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\descriptionname</span></span></span>  <a -href="glossaries-user.html#dx1-6018" >118</a> <br /></span> +href="glossaries-user.html#dx1-8020" >131</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">doc </span>package  <a -href="glossaries-user.html#dx1-7" >119</a>, <a -href="glossaries-user.html#dx1-8" >120</a>, <a -href="glossaries-user.html#dx1-12" >121</a> <br /></span> +href="glossaries-user.html#dx1-7" >132</a>, <a +href="glossaries-user.html#dx1-8" >133</a>, <a +href="glossaries-user.html#dx1-12" >134</a> <br /></span> + + + +<span class="index-item"><span +class="ec-lmtt-10x-x-109">document </span>(environment)  <a +href="glossaries-user.html#dx1-33003" >135</a>, <a +href="glossaries-user.html#dx1-34008" >136</a>, <a +href="glossaries-user.html#dx1-35001" >137</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">E</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\emph</span></span></span>  <a -href="glossaries-user.html#dx1-28046" >122</a> <br /></span> - - - +href="glossaries-user.html#dx1-37050" >138</a> <br /></span> <span class="index-item">entry location  <a -href="glossaries-user.html#dx1-2006" ><span -class="ec-lmbx-10x-x-109">123</span></a> <br /></span> +href="glossaries-user.html#dx1-4005" ><span +class="ec-lmbx-10x-x-109">139</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\entryname</span></span></span>  <a -href="glossaries-user.html#dx1-6017" >124</a> <br /></span> +href="glossaries-user.html#dx1-8019" >140</a> <br /></span> <span class="index-item">environments:<br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">description</span>  <a -href="glossaries-user.html#dx1-48003" >125</a>, <a -href="glossaries-user.html#dx1-48008" >126</a>, <a -href="glossaries-user.html#dx1-48030" >127</a>, <a -href="glossaries-user.html#dx1-56010" >128</a>, <a -href="glossaries-user.html#dx1-56014" >129</a> <br /></span> +href="glossaries-user.html#dx1-57003" >141</a>, <a +href="glossaries-user.html#dx1-57008" >142</a>, <a +href="glossaries-user.html#dx1-57030" >143</a>, <a +href="glossaries-user.html#dx1-65010" >144</a>, <a +href="glossaries-user.html#dx1-65014" >145</a> <br /></span> +<span class="index-subitem">    <span +class="ec-lmtt-10x-x-109">document</span>  <a +href="glossaries-user.html#dx1-33004" >146</a>, <a +href="glossaries-user.html#dx1-34009" >147</a>, <a +href="glossaries-user.html#dx1-35002" >148</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">equation</span>  <a -href="glossaries-user.html#dx1-4033" >130</a> <br /></span> +href="glossaries-user.html#dx1-6044" >149</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">itemize</span>  <a -href="glossaries-user.html#dx1-57002" >131</a> <br /></span> +href="glossaries-user.html#dx1-65077" >150</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longtable</span>  <a -href="glossaries-user.html#dx1-49003" >132</a>, <a -href="glossaries-user.html#dx1-49008" >133</a>, <a -href="glossaries-user.html#dx1-50004" >134</a>, <a -href="glossaries-user.html#dx1-51007" >135</a>, <a -href="glossaries-user.html#dx1-59007" >136</a>, <a -href="glossaries-user.html#dx1-35041" >137</a> <br /></span> +href="glossaries-user.html#dx1-58003" >151</a>, <a +href="glossaries-user.html#dx1-58008" >152</a>, <a +href="glossaries-user.html#dx1-59004" >153</a>, <a +href="glossaries-user.html#dx1-60007" >154</a>, <a +href="glossaries-user.html#dx1-65108" >155</a>, <a +href="glossaries-user.html#dx1-44044" >156</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">multicols</span>  <a -href="glossaries-user.html#dx1-54003" >138</a>, <a -href="glossaries-user.html#dx1-54008" >139</a> <br /></span> +href="glossaries-user.html#dx1-63003" >157</a>, <a +href="glossaries-user.html#dx1-63008" >158</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">supertabular</span>  <a -href="glossaries-user.html#dx1-51003" >140</a>, <a -href="glossaries-user.html#dx1-51009" >141</a>, <a -href="glossaries-user.html#dx1-51014" >142</a>, <a -href="glossaries-user.html#dx1-52004" >143</a>, <a -href="glossaries-user.html#dx1-52011" >144</a> <br /></span> +href="glossaries-user.html#dx1-60003" >159</a>, <a +href="glossaries-user.html#dx1-60009" >160</a>, <a +href="glossaries-user.html#dx1-60014" >161</a>, <a +href="glossaries-user.html#dx1-61004" >162</a>, <a +href="glossaries-user.html#dx1-61011" >163</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">theglossary</span>  <a -href="glossaries-user.html#dx1-56003" ><span -class="ec-lmri-10x-x-109">145</span></a>, <a -href="glossaries-user.html#dx1-56005" >146</a>, <a -href="glossaries-user.html#dx1-56012" >147</a>, <a -href="glossaries-user.html#dx1-57004" >148</a> <br /></span> +href="glossaries-user.html#dx1-65003" ><span +class="ec-lmri-10x-x-109">164</span></a>, <a +href="glossaries-user.html#dx1-65005" >165</a>, <a +href="glossaries-user.html#dx1-65012" >166</a>, <a +href="glossaries-user.html#dx1-65079" >167</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">equation </span>(environment)  <a -href="glossaries-user.html#dx1-4032" >149</a> <br /></span> +href="glossaries-user.html#dx1-6043" >168</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">etex </span>package  <a -href="glossaries-user.html#dx1-13029" >150</a> <br /></span> +href="glossaries-user.html#dx1-15019" >169</a> <br /></span> +<span class="index-item"><span +class="ec-lmss-10x-x-109">etoolbox </span>package  <a +href="glossaries-user.html#dx1-18033" >170</a>, <a +href="glossaries-user.html#dx1-38015" >171</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">F</span> <span class="index-item">file types<br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.alg</span>  <a -href="glossaries-user.html#dx1-7088" >151</a> <br /></span> +href="glossaries-user.html#dx1-9091" >172</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.aux</span>  <a -href="glossaries-user.html#dx1-8003" >152</a>, <a -href="glossaries-user.html#dx1-8012" >153</a>, <a -href="glossaries-user.html#dx1-37007" >154</a> <br /></span> +href="glossaries-user.html#dx1-10003" >173</a>, <a +href="glossaries-user.html#dx1-10013" >174</a>, <a +href="glossaries-user.html#dx1-46007" >175</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.glg</span>  <a -href="glossaries-user.html#dx1-7087" >155</a>, <a -href="glossaries-user.html#dx1-9023" >156</a>, <a -href="glossaries-user.html#dx1-10017" >157</a>, <a -href="glossaries-user.html#dx1-62082" >158</a> <br /></span> +href="glossaries-user.html#dx1-9090" >176</a>, <a +href="glossaries-user.html#dx1-11023" >177</a>, <a +href="glossaries-user.html#dx1-12017" >178</a>, <a +href="glossaries-user.html#dx1-69071" >179</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.glg2</span>  <a -href="glossaries-user.html#dx1-11" >159</a> <br /></span> +href="glossaries-user.html#dx1-11" >180</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.glo</span>  <a -href="glossaries-user.html#dx1-8013" >160</a>, <a -href="glossaries-user.html#dx1-9025" >161</a>, <a -href="glossaries-user.html#dx1-10019" >162</a>, <a -href="glossaries-user.html#dx1-19005" >163</a> <br /></span> +href="glossaries-user.html#dx1-10014" >181</a>, <a +href="glossaries-user.html#dx1-11025" >182</a>, <a +href="glossaries-user.html#dx1-12019" >183</a>, <a +href="glossaries-user.html#dx1-23005" >184</a>, <a +href="glossaries-user.html#dx1-69074" >185</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.gls</span>  <a -href="glossaries-user.html#dx1-9024" >164</a>, <a -href="glossaries-user.html#dx1-10018" >165</a>, <a -href="glossaries-user.html#dx1-19006" >166</a> <br /></span> +href="glossaries-user.html#dx1-11024" >186</a>, <a +href="glossaries-user.html#dx1-12018" >187</a>, <a +href="glossaries-user.html#dx1-23006" >188</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.ist</span>  <a -href="glossaries-user.html#dx1-10007" >167</a>, <a -href="glossaries-user.html#dx1-10010" >168</a>, <a -href="glossaries-user.html#dx1-11014" >169</a>, <a -href="glossaries-user.html#dx1-16031" >170</a>, <a -href="glossaries-user.html#dx1-18004" >171</a>, <a -href="glossaries-user.html#dx1-18016" >172</a> <br /></span> +href="glossaries-user.html#dx1-12007" >189</a>, <a +href="glossaries-user.html#dx1-12010" >190</a>, <a +href="glossaries-user.html#dx1-13014" >191</a>, <a +href="glossaries-user.html#dx1-18056" >192</a>, <a +href="glossaries-user.html#dx1-22004" >193</a>, <a +href="glossaries-user.html#dx1-22016" >194</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.log</span>  <a -href="glossaries-user.html#dx1-62081" >173</a> <br /></span> +href="glossaries-user.html#dx1-69070" >195</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.tex</span>  <a -href="glossaries-user.html#dx1-9016" >174</a>, <a -href="glossaries-user.html#dx1-10006" >175</a> <br /></span> +href="glossaries-user.html#dx1-11016" >196</a>, <a +href="glossaries-user.html#dx1-12006" >197</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">.xdy</span>  <a -href="glossaries-user.html#dx1-9019" >176</a>, <a -href="glossaries-user.html#dx1-9020" >177</a>, <a -href="glossaries-user.html#dx1-11017" >178</a>, <a -href="glossaries-user.html#dx1-16045" >179</a>, <a -href="glossaries-user.html#dx1-18007" >180</a>, <a -href="glossaries-user.html#dx1-18013" >181</a>, <a -href="glossaries-user.html#dx1-18020" >182</a>, <a -href="glossaries-user.html#dx1-36009" >183</a> <br /></span> +href="glossaries-user.html#dx1-11019" >198</a>, <a +href="glossaries-user.html#dx1-11020" >199</a>, <a +href="glossaries-user.html#dx1-13017" >200</a>, <a +href="glossaries-user.html#dx1-18070" >201</a>, <a +href="glossaries-user.html#dx1-22007" >202</a>, <a +href="glossaries-user.html#dx1-22013" >203</a>, <a +href="glossaries-user.html#dx1-22020" >204</a>, <a +href="glossaries-user.html#dx1-45009" >205</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">glo2</span>  <a -href="glossaries-user.html#dx1-10" >184</a> <br /></span> +href="glossaries-user.html#dx1-10" >206</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">gls2</span>  <a -href="glossaries-user.html#dx1-9" >185</a> <br /></span> +href="glossaries-user.html#dx1-9" >207</a> <br /></span> <span class="index-item">first use  <a -href="glossaries-user.html#dx1-2007" >186</a> <br /></span> +href="glossaries-user.html#dx1-4006" >208</a> <br /></span> <span class="index-subitem">    flag  <a -href="glossaries-user.html#dx1-2015" >187</a>, <a -href="glossaries-user.html#dx1-28092" >188</a> <br /></span> +href="glossaries-user.html#dx1-4014" >209</a>, <a +href="glossaries-user.html#dx1-37096" >210</a> <br /></span> <span class="index-subitem">    text  <a -href="glossaries-user.html#dx1-2017" >189</a> <br /></span> +href="glossaries-user.html#dx1-4016" >211</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\firstacronymfont</span></span></span>  <a -href="glossaries-user.html#dx1-41052" ><span -class="ec-lmri-10x-x-109">190</span></a>, <a -href="glossaries-user.html#dx1-42016" >191</a>, <a -href="glossaries-user.html#dx1-42026" >192</a>, <a -href="glossaries-user.html#dx1-42033" >193</a>, <a -href="glossaries-user.html#dx1-62036" >194</a> <br /></span> +href="glossaries-user.html#dx1-50054" ><span +class="ec-lmri-10x-x-109">212</span></a>, <a +href="glossaries-user.html#dx1-51016" >213</a>, <a +href="glossaries-user.html#dx1-51026" >214</a>, <a +href="glossaries-user.html#dx1-51033" >215</a>, <a +href="glossaries-user.html#dx1-69038" >216</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">flowfram </span>package  <a -href="glossaries-user.html#dx1-51011" >195</a> <br /></span> +href="glossaries-user.html#dx1-60011" >217</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">fmtcount </span>package  <a -href="glossaries-user.html#dx1-38032" >196</a> <br /></span> +href="glossaries-user.html#dx1-47039" >218</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\forallglossaries</span></span></span>  <a -href="glossaries-user.html#dx1-60001" ><span -class="ec-lmri-10x-x-109">197</span></a> <br /></span> +href="glossaries-user.html#dx1-66001" ><span +class="ec-lmri-10x-x-109">219</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\forallglsentries</span></span></span>  <a -href="glossaries-user.html#dx1-60004" ><span -class="ec-lmri-10x-x-109">198</span></a> <br /></span> +href="glossaries-user.html#dx1-66004" ><span +class="ec-lmri-10x-x-109">220</span></a> <br /></span> + + + <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\forglsentries</span></span></span>  <a -href="glossaries-user.html#dx1-60002" ><span -class="ec-lmri-10x-x-109">199</span></a> <br /></span> +href="glossaries-user.html#dx1-66002" ><span +class="ec-lmri-10x-x-109">221</span></a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">G</span> <span class="index-item"><span class="ec-lmss-10x-x-109">german </span>package  <a -href="glossaries-user.html#dx1-6008" >200</a> <br /></span> +href="glossaries-user.html#dx1-8010" >222</a> <br /></span> +<span class="index-item"><span +class="ec-lmss-10x-x-109">glossaries </span>package  <a +href="glossaries-user.html#dx1-16" >223</a>, <a +href="glossaries-user.html#dx1-8026" >224</a>, <a +href="glossaries-user.html#dx1-21001" >225</a>, <a +href="glossaries-user.html#dx1-21018" >226</a>, <a +href="glossaries-user.html#dx1-34007" >227</a>, <a +href="glossaries-user.html#dx1-37020" >228</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossaries-accsupp </span>package  <a -href="glossaries-user.html#dx1-4089" >201</a>, <a -href="glossaries-user.html#dx1-61001" >202</a>, <a -href="glossaries-user.html#dx1-61033" >203</a> <br /></span> - - - +href="glossaries-user.html#dx1-6126" >229</a>, <a +href="glossaries-user.html#dx1-23103" >230</a>, <a +href="glossaries-user.html#dx1-23128" >231</a>, <a +href="glossaries-user.html#dx1-68001" >232</a>, <a +href="glossaries-user.html#dx1-68033" >233</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossaries-babel </span>package  <a -href="glossaries-user.html#dx1-6031" >204</a>, <a -href="glossaries-user.html#dx1-13054" >205</a>, <a -href="glossaries-user.html#dx1-13060" >206</a> <br /></span> +href="glossaries-user.html#dx1-15039" >234</a>, <a +href="glossaries-user.html#dx1-15050" >235</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossaries-polyglossia </span>package  <a -href="glossaries-user.html#dx1-6034" >207</a>, <a -href="glossaries-user.html#dx1-13056" >208</a>, <a -href="glossaries-user.html#dx1-13061" >209</a> <br /></span> +href="glossaries-user.html#dx1-8036" >236</a>, <a +href="glossaries-user.html#dx1-15041" >237</a> <br /></span> +<span class="index-item"><span +class="ec-lmss-10x-x-109">glossaries-prefix </span>package  <a +href="glossaries-user.html#dx1-6124" >238</a>, <a +href="glossaries-user.html#dx1-23102" >239</a>, <a +href="glossaries-user.html#dx1-23127" >240</a>, <a +href="glossaries-user.html#dx1-67001" >241</a>, <a +href="glossaries-user.html#dx1-67017" >242</a> <br /></span> <span class="index-item">glossary counters:<br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">glossaryentry</span>  <a -href="glossaries-user.html#dx1-15004" ><span -class="ec-lmri-10x-x-109">210</span></a> <br /></span> +href="glossaries-user.html#dx1-17004" ><span +class="ec-lmri-10x-x-109">243</span></a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">glossarysubentry</span>  <a -href="glossaries-user.html#dx1-15024" ><span -class="ec-lmri-10x-x-109">211</span></a> <br /></span> +href="glossaries-user.html#dx1-17024" ><span +class="ec-lmri-10x-x-109">244</span></a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary </span>package  <a -href="glossaries-user.html#dx1-2" >212</a>, <a -href="glossaries-user.html#dx1-3005" >213</a>, <a -href="glossaries-user.html#dx1-45001" >214</a>, <a -href="glossaries-user.html#dx1-45002" >215</a>, <a -href="glossaries-user.html#dx1-45005" >216</a>, <a -href="glossaries-user.html#dx1-62054" >217</a> <br /></span> +href="glossaries-user.html#dx1-2" >245</a>, <a +href="glossaries-user.html#dx1-5005" >246</a>, <a +href="glossaries-user.html#dx1-54001" >247</a>, <a +href="glossaries-user.html#dx1-54002" >248</a>, <a +href="glossaries-user.html#dx1-54005" >249</a>, <a +href="glossaries-user.html#dx1-69056" >250</a> <br /></span> <span class="index-item">glossary styles:<br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlist</span>  <a -href="glossaries-user.html#dx1-48020" >218</a>, <a -href="glossaries-user.html#dx1-48025" >219</a> <br /></span> +href="glossaries-user.html#dx1-57020" >251</a>, <a +href="glossaries-user.html#dx1-57025" >252</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlistgroup</span>  <a -href="glossaries-user.html#dx1-48024" >220</a>, <a -href="glossaries-user.html#dx1-48027" >221</a> <br /></span> +href="glossaries-user.html#dx1-57024" >253</a>, <a +href="glossaries-user.html#dx1-57027" >254</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlisthypergroup</span>  <a -href="glossaries-user.html#dx1-48026" >222</a> <br /></span> +href="glossaries-user.html#dx1-57026" >255</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlong4col</span>  <a -href="glossaries-user.html#dx1-47023" >223</a>, <a -href="glossaries-user.html#dx1-49033" >224</a>, <a -href="glossaries-user.html#dx1-49040" >225</a> <br /></span> +href="glossaries-user.html#dx1-56023" >256</a>, <a +href="glossaries-user.html#dx1-58033" >257</a>, <a +href="glossaries-user.html#dx1-58040" >258</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlong4colborder</span>  <a -href="glossaries-user.html#dx1-49044" >226</a> <br /></span> +href="glossaries-user.html#dx1-58044" >259</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlong4colheader</span>  <a -href="glossaries-user.html#dx1-49046" >227</a> <br /></span> +href="glossaries-user.html#dx1-58046" >260</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlong4colheaderborder</span>  <a -href="glossaries-user.html#dx1-49048" >228</a> <br /></span> +href="glossaries-user.html#dx1-58048" >261</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlongragged4col</span>  <a -href="glossaries-user.html#dx1-50031" >229</a>, <a -href="glossaries-user.html#dx1-50036" >230</a>, <a -href="glossaries-user.html#dx1-50038" >231</a> <br /></span> +href="glossaries-user.html#dx1-59031" >262</a>, <a +href="glossaries-user.html#dx1-59036" >263</a>, <a +href="glossaries-user.html#dx1-59038" >264</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlongragged4colborder</span>  <a -href="glossaries-user.html#dx1-50035" >232</a> <br /></span> +href="glossaries-user.html#dx1-59035" >265</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlongragged4colheader</span>  <a -href="glossaries-user.html#dx1-50037" >233</a>, <a -href="glossaries-user.html#dx1-50040" >234</a> <br /></span> +href="glossaries-user.html#dx1-59037" >266</a>, <a +href="glossaries-user.html#dx1-59040" >267</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altlongragged4colheaderborder</span>  <a -href="glossaries-user.html#dx1-50039" >235</a> <br /></span> +href="glossaries-user.html#dx1-59039" >268</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altsuper4col</span>  <a -href="glossaries-user.html#dx1-47024" >236</a>, <a -href="glossaries-user.html#dx1-51039" >237</a>, <a -href="glossaries-user.html#dx1-51046" >238</a> <br /></span> +href="glossaries-user.html#dx1-56024" >269</a>, <a +href="glossaries-user.html#dx1-60039" >270</a>, <a +href="glossaries-user.html#dx1-60046" >271</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altsuper4colborder</span>  <a -href="glossaries-user.html#dx1-51050" >239</a> <br /></span> +href="glossaries-user.html#dx1-60050" >272</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altsuper4colheader</span>  <a -href="glossaries-user.html#dx1-51052" >240</a> <br /></span> +href="glossaries-user.html#dx1-60052" >273</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altsuper4colheaderborder</span>  <a -href="glossaries-user.html#dx1-51054" >241</a> <br /></span> +href="glossaries-user.html#dx1-60054" >274</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altsuperragged4col</span>  <a -href="glossaries-user.html#dx1-52034" >242</a>, <a -href="glossaries-user.html#dx1-52037" >243</a>, <a -href="glossaries-user.html#dx1-52039" >244</a> <br /></span> +href="glossaries-user.html#dx1-61034" >275</a>, <a +href="glossaries-user.html#dx1-61037" >276</a>, <a +href="glossaries-user.html#dx1-61039" >277</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altsuperragged4colborder</span>  <a -href="glossaries-user.html#dx1-52036" >245</a> <br /></span> +href="glossaries-user.html#dx1-61036" >278</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altsuperragged4colheader</span>  <a -href="glossaries-user.html#dx1-52038" >246</a>, <a -href="glossaries-user.html#dx1-52041" >247</a> <br /></span> +href="glossaries-user.html#dx1-61038" >279</a>, <a +href="glossaries-user.html#dx1-61041" >280</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">altsuperragged4colheaderborder</span>  <a -href="glossaries-user.html#dx1-52040" >248</a> <br /></span> +href="glossaries-user.html#dx1-61040" >281</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">alttree</span>  <a -href="glossaries-user.html#dx1-53018" >249</a>, <a -href="glossaries-user.html#dx1-53031" >250</a>, <a -href="glossaries-user.html#dx1-53035" >251</a>, <a -href="glossaries-user.html#dx1-54033" >252</a> <br /></span> +href="glossaries-user.html#dx1-62018" >282</a>, <a +href="glossaries-user.html#dx1-62031" >283</a>, <a +href="glossaries-user.html#dx1-62035" >284</a>, <a +href="glossaries-user.html#dx1-63033" >285</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">alttreegroup</span>  <a -href="glossaries-user.html#dx1-53034" >253</a>, <a -href="glossaries-user.html#dx1-53037" >254</a>, <a -href="glossaries-user.html#dx1-54035" >255</a> <br /></span> +href="glossaries-user.html#dx1-62034" >286</a>, <a +href="glossaries-user.html#dx1-62037" >287</a>, <a +href="glossaries-user.html#dx1-63035" >288</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">alttreehypergroup</span>  <a -href="glossaries-user.html#dx1-53036" >256</a>, <a -href="glossaries-user.html#dx1-54037" >257</a> <br /></span> +href="glossaries-user.html#dx1-62036" >289</a>, <a +href="glossaries-user.html#dx1-63037" >290</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">index</span>  <a -href="glossaries-user.html#dx1-53004" >258</a>, <a -href="glossaries-user.html#dx1-53007" >259</a>, <a -href="glossaries-user.html#dx1-53012" >260</a>, <a -href="glossaries-user.html#dx1-54006" >261</a>, <a -href="glossaries-user.html#dx1-54015" >262</a> <br /></span> +href="glossaries-user.html#dx1-62004" >291</a>, <a +href="glossaries-user.html#dx1-62007" >292</a>, <a +href="glossaries-user.html#dx1-62012" >293</a>, <a +href="glossaries-user.html#dx1-63006" >294</a>, <a +href="glossaries-user.html#dx1-63015" >295</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">indexgroup</span>  <a -href="glossaries-user.html#dx1-53006" >263</a>, <a -href="glossaries-user.html#dx1-53009" >264</a>, <a -href="glossaries-user.html#dx1-54017" >265</a> <br /></span> +href="glossaries-user.html#dx1-62006" >296</a>, <a +href="glossaries-user.html#dx1-62009" >297</a>, <a +href="glossaries-user.html#dx1-63017" >298</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">indexhypergroup</span>  <a -href="glossaries-user.html#dx1-53008" >266</a>, <a -href="glossaries-user.html#dx1-54019" >267</a> <br /></span> +href="glossaries-user.html#dx1-62008" >299</a>, <a +href="glossaries-user.html#dx1-63019" >300</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">inline</span>  <a -href="glossaries-user.html#dx1-4051" >268</a>, <a -href="glossaries-user.html#dx1-55002" >269</a>, <a -href="glossaries-user.html#dx1-55008" >270</a> <br /></span> +href="glossaries-user.html#dx1-6067" >301</a>, <a +href="glossaries-user.html#dx1-64002" >302</a>, <a +href="glossaries-user.html#dx1-64008" >303</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">list</span>  <a -href="glossaries-user.html#dx1-15041" >271</a>, <a -href="glossaries-user.html#dx1-48006" >272</a>, <a -href="glossaries-user.html#dx1-48014" >273</a>, <a -href="glossaries-user.html#dx1-48021" >274</a>, <a -href="glossaries-user.html#dx1-48022" >275</a>, <a -href="glossaries-user.html#dx1-48023" >276</a>, <a -href="glossaries-user.html#dx1-56008" >277</a>, <a -href="glossaries-user.html#dx1-56017" >278</a>, <a -href="glossaries-user.html#dx1-56033" >279</a>, <a -href="glossaries-user.html#dx1-56046" >280</a>, <a -href="glossaries-user.html#dx1-58003" >281</a>, <a -href="glossaries-user.html#dx1-62103" >282</a> <br /></span> +href="glossaries-user.html#dx1-17044" >304</a>, <a +href="glossaries-user.html#dx1-57006" >305</a>, <a +href="glossaries-user.html#dx1-57014" >306</a>, <a +href="glossaries-user.html#dx1-57021" >307</a>, <a +href="glossaries-user.html#dx1-57022" >308</a>, <a +href="glossaries-user.html#dx1-57023" >309</a>, <a +href="glossaries-user.html#dx1-65008" >310</a>, <a +href="glossaries-user.html#dx1-65017" >311</a>, <a +href="glossaries-user.html#dx1-65037" >312</a>, <a +href="glossaries-user.html#dx1-65054" >313</a>, <a +href="glossaries-user.html#dx1-65097" >314</a>, <a +href="glossaries-user.html#dx1-65099" >315</a>, <a +href="glossaries-user.html#dx1-67068" >316</a>, <a +href="glossaries-user.html#dx1-69097" >317</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">listdotted</span>  <a -href="glossaries-user.html#dx1-47034" >283</a>, <a -href="glossaries-user.html#dx1-48035" >284</a>, <a -href="glossaries-user.html#dx1-48036" >285</a> <br /></span> +href="glossaries-user.html#dx1-56034" >318</a>, <a +href="glossaries-user.html#dx1-57035" >319</a>, <a +href="glossaries-user.html#dx1-57036" >320</a> <br /></span> + + + <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">listgroup</span>  <a -href="glossaries-user.html#dx1-48013" >286</a>, <a -href="glossaries-user.html#dx1-48016" >287</a> <br /></span> +href="glossaries-user.html#dx1-57013" >321</a>, <a +href="glossaries-user.html#dx1-57016" >322</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">listhypergroup</span>  <a -href="glossaries-user.html#dx1-48015" >288</a>, <a -href="glossaries-user.html#dx1-48028" >289</a>, <a -href="glossaries-user.html#dx1-53010" >290</a>, <a -href="glossaries-user.html#dx1-53023" >291</a>, <a -href="glossaries-user.html#dx1-53030" >292</a>, <a -href="glossaries-user.html#dx1-53038" >293</a>, <a -href="glossaries-user.html#dx1-56030" >294</a> <br /></span> +href="glossaries-user.html#dx1-57015" >323</a>, <a +href="glossaries-user.html#dx1-57028" >324</a>, <a +href="glossaries-user.html#dx1-62010" >325</a>, <a +href="glossaries-user.html#dx1-62023" >326</a>, <a +href="glossaries-user.html#dx1-62030" >327</a>, <a +href="glossaries-user.html#dx1-62038" >328</a>, <a +href="glossaries-user.html#dx1-65034" >329</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long</span>  <a -href="glossaries-user.html#dx1-47030" >295</a>, <a -href="glossaries-user.html#dx1-49006" >296</a>, <a -href="glossaries-user.html#dx1-49014" >297</a>, <a -href="glossaries-user.html#dx1-49016" >298</a>, <a -href="glossaries-user.html#dx1-49020" >299</a> <br /></span> +href="glossaries-user.html#dx1-56030" >330</a>, <a +href="glossaries-user.html#dx1-58006" >331</a>, <a +href="glossaries-user.html#dx1-58014" >332</a>, <a +href="glossaries-user.html#dx1-58016" >333</a>, <a +href="glossaries-user.html#dx1-58020" >334</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long3col</span>  <a -href="glossaries-user.html#dx1-47005" >300</a>, <a -href="glossaries-user.html#dx1-49019" >301</a>, <a -href="glossaries-user.html#dx1-49026" >302</a>, <a -href="glossaries-user.html#dx1-49028" >303</a>, <a -href="glossaries-user.html#dx1-49032" >304</a> <br /></span> +href="glossaries-user.html#dx1-56005" >335</a>, <a +href="glossaries-user.html#dx1-58019" >336</a>, <a +href="glossaries-user.html#dx1-58026" >337</a>, <a +href="glossaries-user.html#dx1-58028" >338</a>, <a +href="glossaries-user.html#dx1-58032" >339</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long3colborder</span>  <a -href="glossaries-user.html#dx1-47007" >305</a>, <a -href="glossaries-user.html#dx1-49025" >306</a> <br /></span> +href="glossaries-user.html#dx1-56007" >340</a>, <a +href="glossaries-user.html#dx1-58025" >341</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long3colheader</span>  <a -href="glossaries-user.html#dx1-47006" >307</a>, <a -href="glossaries-user.html#dx1-49027" >308</a>, <a -href="glossaries-user.html#dx1-49030" >309</a> <br /></span> +href="glossaries-user.html#dx1-56006" >342</a>, <a +href="glossaries-user.html#dx1-58027" >343</a>, <a +href="glossaries-user.html#dx1-58030" >344</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long3colheaderborder</span>  <a -href="glossaries-user.html#dx1-47008" >310</a>, <a -href="glossaries-user.html#dx1-49029" >311</a> <br /></span> +href="glossaries-user.html#dx1-56008" >345</a>, <a +href="glossaries-user.html#dx1-58029" >346</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long4col</span>  <a -href="glossaries-user.html#dx1-43011" >312</a>, <a -href="glossaries-user.html#dx1-47021" >313</a>, <a -href="glossaries-user.html#dx1-49031" >314</a>, <a -href="glossaries-user.html#dx1-49035" >315</a>, <a -href="glossaries-user.html#dx1-49037" >316</a>, <a -href="glossaries-user.html#dx1-49041" >317</a> <br /></span> - - - +href="glossaries-user.html#dx1-52016" >347</a>, <a +href="glossaries-user.html#dx1-56021" >348</a>, <a +href="glossaries-user.html#dx1-58031" >349</a>, <a +href="glossaries-user.html#dx1-58035" >350</a>, <a +href="glossaries-user.html#dx1-58037" >351</a>, <a +href="glossaries-user.html#dx1-58041" >352</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long4colborder</span>  <a -href="glossaries-user.html#dx1-49034" >318</a>, <a -href="glossaries-user.html#dx1-49045" >319</a> <br /></span> +href="glossaries-user.html#dx1-58034" >353</a>, <a +href="glossaries-user.html#dx1-58045" >354</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long4colheader</span>  <a -href="glossaries-user.html#dx1-49036" >320</a>, <a -href="glossaries-user.html#dx1-49039" >321</a>, <a -href="glossaries-user.html#dx1-49047" >322</a> <br /></span> +href="glossaries-user.html#dx1-58036" >355</a>, <a +href="glossaries-user.html#dx1-58039" >356</a>, <a +href="glossaries-user.html#dx1-58047" >357</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">long4colheaderborder</span>  <a -href="glossaries-user.html#dx1-49038" >323</a>, <a -href="glossaries-user.html#dx1-49049" >324</a> <br /></span> +href="glossaries-user.html#dx1-58038" >358</a>, <a +href="glossaries-user.html#dx1-58049" >359</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longborder</span>  <a -href="glossaries-user.html#dx1-49013" >325</a> <br /></span> +href="glossaries-user.html#dx1-58013" >360</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longheader</span>  <a -href="glossaries-user.html#dx1-49015" >326</a>, <a -href="glossaries-user.html#dx1-49018" >327</a>, <a -href="glossaries-user.html#dx1-56019" >328</a> <br /></span> +href="glossaries-user.html#dx1-58015" >361</a>, <a +href="glossaries-user.html#dx1-58018" >362</a>, <a +href="glossaries-user.html#dx1-65019" >363</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longheaderborder</span>  <a -href="glossaries-user.html#dx1-49017" >329</a>, <a -href="glossaries-user.html#dx1-35039" >330</a> <br /></span> +href="glossaries-user.html#dx1-58017" >364</a>, <a +href="glossaries-user.html#dx1-44042" >365</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longragged</span>  <a -href="glossaries-user.html#dx1-50009" >331</a>, <a -href="glossaries-user.html#dx1-50014" >332</a>, <a -href="glossaries-user.html#dx1-50016" >333</a>, <a -href="glossaries-user.html#dx1-50020" >334</a> <br /></span> +href="glossaries-user.html#dx1-59009" >366</a>, <a +href="glossaries-user.html#dx1-59014" >367</a>, <a +href="glossaries-user.html#dx1-59016" >368</a>, <a +href="glossaries-user.html#dx1-59020" >369</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longragged3col</span>  <a -href="glossaries-user.html#dx1-50019" >335</a>, <a -href="glossaries-user.html#dx1-50026" >336</a>, <a -href="glossaries-user.html#dx1-50028" >337</a>, <a -href="glossaries-user.html#dx1-50032" >338</a> <br /></span> +href="glossaries-user.html#dx1-59019" >370</a>, <a +href="glossaries-user.html#dx1-59026" >371</a>, <a +href="glossaries-user.html#dx1-59028" >372</a>, <a +href="glossaries-user.html#dx1-59032" >373</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longragged3colborder</span>  <a -href="glossaries-user.html#dx1-50025" >339</a> <br /></span> +href="glossaries-user.html#dx1-59025" >374</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longragged3colheader</span>  <a -href="glossaries-user.html#dx1-50027" >340</a>, <a -href="glossaries-user.html#dx1-50030" >341</a> <br /></span> +href="glossaries-user.html#dx1-59027" >375</a>, <a +href="glossaries-user.html#dx1-59030" >376</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longragged3colheaderborder</span>  <a -href="glossaries-user.html#dx1-50029" >342</a> <br /></span> +href="glossaries-user.html#dx1-59029" >377</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longraggedborder</span>  <a -href="glossaries-user.html#dx1-50013" >343</a> <br /></span> +href="glossaries-user.html#dx1-59013" >378</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longraggedheader</span>  <a -href="glossaries-user.html#dx1-50015" >344</a>, <a -href="glossaries-user.html#dx1-50018" >345</a> <br /></span> +href="glossaries-user.html#dx1-59015" >379</a>, <a +href="glossaries-user.html#dx1-59018" >380</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">longraggedheaderborder</span>  <a -href="glossaries-user.html#dx1-50017" >346</a> <br /></span> +href="glossaries-user.html#dx1-59017" >381</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcolalttree</span>  <a -href="glossaries-user.html#dx1-54032" >347</a> <br /></span> +href="glossaries-user.html#dx1-63032" >382</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcolalttreegroup</span>  <a -href="glossaries-user.html#dx1-54034" >348</a> <br /></span> +href="glossaries-user.html#dx1-63034" >383</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcolalttreehypergroup</span>  <a -href="glossaries-user.html#dx1-54036" >349</a> <br /></span> +href="glossaries-user.html#dx1-63036" >384</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcolindex</span>  <a -href="glossaries-user.html#dx1-54005" >350</a>, <a -href="glossaries-user.html#dx1-54014" >351</a> <br /></span> +href="glossaries-user.html#dx1-63005" >385</a>, <a +href="glossaries-user.html#dx1-63014" >386</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcolindexgroup</span>  <a -href="glossaries-user.html#dx1-54016" >352</a> <br /></span> +href="glossaries-user.html#dx1-63016" >387</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcolindexhypergroup</span>  <a -href="glossaries-user.html#dx1-54018" >353</a> <br /></span> +href="glossaries-user.html#dx1-63018" >388</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcoltree</span>  <a -href="glossaries-user.html#dx1-54020" >354</a> <br /></span> +href="glossaries-user.html#dx1-63020" >389</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcoltreegroup</span>  <a -href="glossaries-user.html#dx1-54022" >355</a> <br /></span> +href="glossaries-user.html#dx1-63022" >390</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcoltreehypergroup</span>  <a -href="glossaries-user.html#dx1-54024" >356</a> <br /></span> +href="glossaries-user.html#dx1-63024" >391</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcoltreenoname</span>  <a -href="glossaries-user.html#dx1-54026" >357</a> <br /></span> +href="glossaries-user.html#dx1-63026" >392</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcoltreenonamegroup</span>  <a -href="glossaries-user.html#dx1-54028" >358</a> <br /></span> +href="glossaries-user.html#dx1-63028" >393</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">mcoltreenonamehypergroup</span>  <a -href="glossaries-user.html#dx1-54030" >359</a> <br /></span> +href="glossaries-user.html#dx1-63030" >394</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super</span>  <a -href="glossaries-user.html#dx1-51012" >360</a>, <a -href="glossaries-user.html#dx1-51020" >361</a>, <a -href="glossaries-user.html#dx1-51022" >362</a>, <a -href="glossaries-user.html#dx1-51026" >363</a> <br /></span> +href="glossaries-user.html#dx1-60012" >395</a>, <a +href="glossaries-user.html#dx1-60020" >396</a>, <a +href="glossaries-user.html#dx1-60022" >397</a>, <a +href="glossaries-user.html#dx1-60026" >398</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super3col</span>  <a -href="glossaries-user.html#dx1-51025" >364</a>, <a -href="glossaries-user.html#dx1-51032" >365</a>, <a -href="glossaries-user.html#dx1-51034" >366</a>, <a -href="glossaries-user.html#dx1-51038" >367</a> <br /></span> +href="glossaries-user.html#dx1-60025" >399</a>, <a +href="glossaries-user.html#dx1-60032" >400</a>, <a +href="glossaries-user.html#dx1-60034" >401</a>, <a +href="glossaries-user.html#dx1-60038" >402</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super3colborder</span>  <a -href="glossaries-user.html#dx1-51031" >368</a> <br /></span> +href="glossaries-user.html#dx1-60031" >403</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super3colheader</span>  <a -href="glossaries-user.html#dx1-51033" >369</a>, <a -href="glossaries-user.html#dx1-51036" >370</a> <br /></span> +href="glossaries-user.html#dx1-60033" >404</a>, <a +href="glossaries-user.html#dx1-60036" >405</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super3colheaderborder</span>  <a -href="glossaries-user.html#dx1-51035" >371</a> <br /></span> +href="glossaries-user.html#dx1-60035" >406</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super4col</span>  <a -href="glossaries-user.html#dx1-47022" >372</a>, <a -href="glossaries-user.html#dx1-51037" >373</a>, <a -href="glossaries-user.html#dx1-51041" >374</a>, <a -href="glossaries-user.html#dx1-51043" >375</a>, <a -href="glossaries-user.html#dx1-51047" >376</a> <br /></span> +href="glossaries-user.html#dx1-56022" >407</a>, <a +href="glossaries-user.html#dx1-60037" >408</a>, <a +href="glossaries-user.html#dx1-60041" >409</a>, <a +href="glossaries-user.html#dx1-60043" >410</a>, <a +href="glossaries-user.html#dx1-60047" >411</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super4colborder</span>  <a -href="glossaries-user.html#dx1-51040" >377</a>, <a -href="glossaries-user.html#dx1-51051" >378</a> <br /></span> +href="glossaries-user.html#dx1-60040" >412</a>, <a +href="glossaries-user.html#dx1-60051" >413</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super4colheader</span>  <a -href="glossaries-user.html#dx1-51042" >379</a>, <a -href="glossaries-user.html#dx1-51045" >380</a>, <a -href="glossaries-user.html#dx1-51053" >381</a> <br /></span> +href="glossaries-user.html#dx1-60042" >414</a>, <a +href="glossaries-user.html#dx1-60045" >415</a>, <a +href="glossaries-user.html#dx1-60053" >416</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">super4colheaderborder</span>  <a -href="glossaries-user.html#dx1-51044" >382</a>, <a -href="glossaries-user.html#dx1-51055" >383</a> <br /></span> +href="glossaries-user.html#dx1-60044" >417</a>, <a +href="glossaries-user.html#dx1-60055" >418</a> <br /></span> + + + <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superborder</span>  <a -href="glossaries-user.html#dx1-51019" >384</a> <br /></span> +href="glossaries-user.html#dx1-60019" >419</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superheader</span>  <a -href="glossaries-user.html#dx1-51021" >385</a>, <a -href="glossaries-user.html#dx1-51024" >386</a> <br /></span> +href="glossaries-user.html#dx1-60021" >420</a>, <a +href="glossaries-user.html#dx1-60024" >421</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superheaderborder</span>  <a -href="glossaries-user.html#dx1-35037" >387</a>, <a -href="glossaries-user.html#dx1-51023" >388</a> <br /></span> +href="glossaries-user.html#dx1-44040" >422</a>, <a +href="glossaries-user.html#dx1-60023" >423</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superragged</span>  <a -href="glossaries-user.html#dx1-52009" >389</a>, <a -href="glossaries-user.html#dx1-52017" >390</a>, <a -href="glossaries-user.html#dx1-52019" >391</a>, <a -href="glossaries-user.html#dx1-52023" >392</a> <br /></span> +href="glossaries-user.html#dx1-61009" >424</a>, <a +href="glossaries-user.html#dx1-61017" >425</a>, <a +href="glossaries-user.html#dx1-61019" >426</a>, <a +href="glossaries-user.html#dx1-61023" >427</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superragged3col</span>  <a -href="glossaries-user.html#dx1-52022" >393</a>, <a -href="glossaries-user.html#dx1-52029" >394</a>, <a -href="glossaries-user.html#dx1-52031" >395</a>, <a -href="glossaries-user.html#dx1-52035" >396</a> <br /></span> +href="glossaries-user.html#dx1-61022" >428</a>, <a +href="glossaries-user.html#dx1-61029" >429</a>, <a +href="glossaries-user.html#dx1-61031" >430</a>, <a +href="glossaries-user.html#dx1-61035" >431</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superragged3colborder</span>  <a -href="glossaries-user.html#dx1-52028" >397</a> <br /></span> +href="glossaries-user.html#dx1-61028" >432</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superragged3colheader</span>  <a -href="glossaries-user.html#dx1-52030" >398</a>, <a -href="glossaries-user.html#dx1-52033" >399</a> <br /></span> +href="glossaries-user.html#dx1-61030" >433</a>, <a +href="glossaries-user.html#dx1-61033" >434</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superragged3colheaderborder</span>  <a -href="glossaries-user.html#dx1-52032" >400</a> <br /></span> - - - +href="glossaries-user.html#dx1-61032" >435</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superraggedborder</span>  <a -href="glossaries-user.html#dx1-52016" >401</a> <br /></span> +href="glossaries-user.html#dx1-61016" >436</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superraggedheader</span>  <a -href="glossaries-user.html#dx1-52018" >402</a>, <a -href="glossaries-user.html#dx1-52021" >403</a> <br /></span> +href="glossaries-user.html#dx1-61018" >437</a>, <a +href="glossaries-user.html#dx1-61021" >438</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">superraggedheaderborder</span>  <a -href="glossaries-user.html#dx1-52020" >404</a> <br /></span> +href="glossaries-user.html#dx1-61020" >439</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">tree</span>  <a -href="glossaries-user.html#dx1-53011" >405</a>, <a -href="glossaries-user.html#dx1-53020" >406</a>, <a -href="glossaries-user.html#dx1-53025" >407</a>, <a -href="glossaries-user.html#dx1-53032" >408</a>, <a -href="glossaries-user.html#dx1-54021" >409</a> <br /></span> +href="glossaries-user.html#dx1-62011" >440</a>, <a +href="glossaries-user.html#dx1-62020" >441</a>, <a +href="glossaries-user.html#dx1-62025" >442</a>, <a +href="glossaries-user.html#dx1-62032" >443</a>, <a +href="glossaries-user.html#dx1-63021" >444</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">treegroup</span>  <a -href="glossaries-user.html#dx1-53019" >410</a>, <a -href="glossaries-user.html#dx1-53022" >411</a>, <a -href="glossaries-user.html#dx1-54023" >412</a> <br /></span> +href="glossaries-user.html#dx1-62019" >445</a>, <a +href="glossaries-user.html#dx1-62022" >446</a>, <a +href="glossaries-user.html#dx1-63023" >447</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">treehypergroup</span>  <a -href="glossaries-user.html#dx1-53021" >413</a>, <a -href="glossaries-user.html#dx1-54025" >414</a> <br /></span> +href="glossaries-user.html#dx1-62021" >448</a>, <a +href="glossaries-user.html#dx1-63025" >449</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">treenoname</span>  <a -href="glossaries-user.html#dx1-53024" >415</a>, <a -href="glossaries-user.html#dx1-53027" >416</a>, <a -href="glossaries-user.html#dx1-54027" >417</a> <br /></span> +href="glossaries-user.html#dx1-62024" >450</a>, <a +href="glossaries-user.html#dx1-62027" >451</a>, <a +href="glossaries-user.html#dx1-63027" >452</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">treenonamegroup</span>  <a -href="glossaries-user.html#dx1-53026" >418</a>, <a -href="glossaries-user.html#dx1-53029" >419</a>, <a -href="glossaries-user.html#dx1-54029" >420</a> <br /></span> +href="glossaries-user.html#dx1-62026" >453</a>, <a +href="glossaries-user.html#dx1-62029" >454</a>, <a +href="glossaries-user.html#dx1-63029" >455</a> <br /></span> <span class="index-subitem">    <span class="ec-lmtt-10x-x-109">treenonamehypergroup</span>  <a -href="glossaries-user.html#dx1-53028" >421</a>, <a -href="glossaries-user.html#dx1-54031" >422</a> <br /></span> +href="glossaries-user.html#dx1-62028" >456</a>, <a +href="glossaries-user.html#dx1-63031" >457</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary-inline </span>package  <a -href="glossaries-user.html#dx1-55001" >423</a>, <a -href="glossaries-user.html#dx1-55006" >424</a> <br /></span> +href="glossaries-user.html#dx1-64001" >458</a>, <a +href="glossaries-user.html#dx1-64006" >459</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary-list </span>package  <a -href="glossaries-user.html#dx1-15029" >425</a>, <a -href="glossaries-user.html#dx1-15040" >426</a>, <a -href="glossaries-user.html#dx1-35043" >427</a>, <a -href="glossaries-user.html#dx1-48001" >428</a> <br /></span> +href="glossaries-user.html#dx1-17029" >460</a>, <a +href="glossaries-user.html#dx1-17042" >461</a>, <a +href="glossaries-user.html#dx1-17043" >462</a>, <a +href="glossaries-user.html#dx1-44046" >463</a>, <a +href="glossaries-user.html#dx1-57001" >464</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary-long </span>package  <a -href="glossaries-user.html#dx1-15030" >429</a>, <a -href="glossaries-user.html#dx1-15034" >430</a>, <a -href="glossaries-user.html#dx1-35044" >431</a>, <a -href="glossaries-user.html#dx1-49001" >432</a>, <a -href="glossaries-user.html#dx1-50002" >433</a> <br /></span> +href="glossaries-user.html#dx1-17030" >465</a>, <a +href="glossaries-user.html#dx1-17034" >466</a>, <a +href="glossaries-user.html#dx1-17036" >467</a>, <a +href="glossaries-user.html#dx1-44047" >468</a>, <a +href="glossaries-user.html#dx1-58001" >469</a>, <a +href="glossaries-user.html#dx1-59002" >470</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary-longragged </span>package  <a -href="glossaries-user.html#dx1-50001" >434</a>, <a -href="glossaries-user.html#dx1-50005" >435</a>, <a -href="glossaries-user.html#dx1-50007" >436</a> <br /></span> +href="glossaries-user.html#dx1-59001" >471</a>, <a +href="glossaries-user.html#dx1-59005" >472</a>, <a +href="glossaries-user.html#dx1-59007" >473</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary-mcols </span>package  <a -href="glossaries-user.html#dx1-15046" >437</a>, <a -href="glossaries-user.html#dx1-54001" >438</a>, <a -href="glossaries-user.html#dx1-54009" >439</a>, <a -href="glossaries-user.html#dx1-54013" >440</a> <br /></span> +href="glossaries-user.html#dx1-17050" >474</a>, <a +href="glossaries-user.html#dx1-63001" >475</a>, <a +href="glossaries-user.html#dx1-63009" >476</a>, <a +href="glossaries-user.html#dx1-63013" >477</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary-super </span>package  <a -href="glossaries-user.html#dx1-15031" >441</a>, <a -href="glossaries-user.html#dx1-15037" >442</a>, <a -href="glossaries-user.html#dx1-35045" >443</a>, <a -href="glossaries-user.html#dx1-51001" >444</a>, <a -href="glossaries-user.html#dx1-52002" >445</a> <br /></span> +href="glossaries-user.html#dx1-17031" >478</a>, <a +href="glossaries-user.html#dx1-17038" >479</a>, <a +href="glossaries-user.html#dx1-17040" >480</a>, <a +href="glossaries-user.html#dx1-44048" >481</a>, <a +href="glossaries-user.html#dx1-60001" >482</a>, <a +href="glossaries-user.html#dx1-61002" >483</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary-superragged </span>package  <a -href="glossaries-user.html#dx1-52001" >446</a>, <a -href="glossaries-user.html#dx1-52005" >447</a>, <a -href="glossaries-user.html#dx1-52007" >448</a> <br /></span> +href="glossaries-user.html#dx1-61001" >484</a>, <a +href="glossaries-user.html#dx1-61005" >485</a>, <a +href="glossaries-user.html#dx1-61007" >486</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossary-tree </span>package  <a -href="glossaries-user.html#dx1-15032" >449</a>, <a -href="glossaries-user.html#dx1-15044" >450</a>, <a -href="glossaries-user.html#dx1-35046" >451</a>, <a -href="glossaries-user.html#dx1-53001" >452</a> <br /></span> +href="glossaries-user.html#dx1-17032" >487</a>, <a +href="glossaries-user.html#dx1-17047" >488</a>, <a +href="glossaries-user.html#dx1-17048" >489</a>, <a +href="glossaries-user.html#dx1-44049" >490</a>, <a +href="glossaries-user.html#dx1-62001" >491</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">glossaryentry </span>(counter)  <a -href="glossaries-user.html#dx1-15003" ><span -class="ec-lmri-10x-x-109">453</span></a> <br /></span> +href="glossaries-user.html#dx1-17003" ><span +class="ec-lmri-10x-x-109">492</span></a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">glossaryentry </span>counter  <a -href="glossaries-user.html#dx1-15014" >454</a>, <a -href="glossaries-user.html#dx1-15016" >455</a>, <a -href="glossaries-user.html#dx1-15019" >456</a> <br /></span> -<span class="index-item"><span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">\glossaryentryfield</span></span></span>  <a -href="glossaries-user.html#dx1-56036" ><span -class="ec-lmri-10x-x-109">457</span></a>, <a -href="glossaries-user.html#dx1-56058" >458</a>, <a -href="glossaries-user.html#dx1-59001" >459</a> <br /></span> +href="glossaries-user.html#dx1-17014" >493</a>, <a +href="glossaries-user.html#dx1-17015" >494</a>, <a +href="glossaries-user.html#dx1-17019" >495</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossaryentrynumbers</span></span></span>  <a -href="glossaries-user.html#dx1-56047" >460</a>, <a -href="glossaries-user.html#dx1-56052" >461</a>, <a -href="glossaries-user.html#dx1-56053" >462</a>, <a -href="glossaries-user.html#dx1-56055" >463</a> <br /></span> +href="glossaries-user.html#dx1-65055" >496</a>, <a +href="glossaries-user.html#dx1-65060" >497</a>, <a +href="glossaries-user.html#dx1-65061" >498</a>, <a +href="glossaries-user.html#dx1-65063" >499</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossaryheader</span></span></span>  <a -href="glossaries-user.html#dx1-48019" >464</a>, <a -href="glossaries-user.html#dx1-56015" ><span -class="ec-lmri-10x-x-109">465</span></a>, <a -href="glossaries-user.html#dx1-56018" >466</a>, <a -href="glossaries-user.html#dx1-57007" >467</a> <br /></span> -<span class="index-item"><span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">\glossarymark</span></span></span>  <a -href="glossaries-user.html#dx1-14013" ><span -class="ec-lmri-10x-x-109">468</span></a>, <a -href="glossaries-user.html#dx1-14019" >469</a>, <a -href="glossaries-user.html#dx1-35032" >470</a>, <a -href="glossaries-user.html#dx1-35033" >471</a> <br /></span> +href="glossaries-user.html#dx1-57019" >500</a>, <a +href="glossaries-user.html#dx1-65015" ><span +class="ec-lmri-10x-x-109">501</span></a>, <a +href="glossaries-user.html#dx1-65018" >502</a>, <a +href="glossaries-user.html#dx1-65082" >503</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossaryname</span></span></span>  <a -href="glossaries-user.html#dx1-6014" >472</a> <br /></span> +href="glossaries-user.html#dx1-8016" >504</a>, <a +href="glossaries-user.html#dx1-15046" >505</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossarypostamble</span></span></span>  <a -href="glossaries-user.html#dx1-35036" ><span -class="ec-lmri-10x-x-109">473</span></a>, <a -href="glossaries-user.html#dx1-56007" >474</a> <br /></span> +href="glossaries-user.html#dx1-39039" >506</a>, <a +href="glossaries-user.html#dx1-44037" ><span +class="ec-lmri-10x-x-109">507</span></a>, <a +href="glossaries-user.html#dx1-65007" >508</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossarypreamble</span></span></span>  <a -href="glossaries-user.html#dx1-15018" >475</a>, <a -href="glossaries-user.html#dx1-35034" ><span -class="ec-lmri-10x-x-109">476</span></a>, <a -href="glossaries-user.html#dx1-56006" >477</a>, <a -href="glossaries-user.html#dx1-56016" >478</a> <br /></span> +href="glossaries-user.html#dx1-17017" >509</a>, <a +href="glossaries-user.html#dx1-44035" ><span +class="ec-lmri-10x-x-109">510</span></a>, <a +href="glossaries-user.html#dx1-65006" >511</a>, <a +href="glossaries-user.html#dx1-65016" >512</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossarysection</span></span></span>  <a -href="glossaries-user.html#dx1-55005" >479</a> <br /></span> +href="glossaries-user.html#dx1-64005" >513</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glossarystyle</span></span></span>  <a -href="glossaries-user.html#dx1-15048" >480</a>, <a -href="glossaries-user.html#dx1-35021" >481</a>, <a -href="glossaries-user.html#dx1-47013" ><span -class="ec-lmri-10x-x-109">482</span></a>, <a -href="glossaries-user.html#dx1-47029" >483</a>, <a -href="glossaries-user.html#dx1-47032" >484</a>, <a -href="glossaries-user.html#dx1-54010" >485</a>, <a -href="glossaries-user.html#dx1-55007" >486</a>, <a -href="glossaries-user.html#dx1-58001" >487</a> <br /></span> +href="glossaries-user.html#dx1-44021" >514</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">glossarysubentry </span>(counter)  <a -href="glossaries-user.html#dx1-15023" ><span -class="ec-lmri-10x-x-109">488</span></a> <br /></span> -<span class="index-item"><span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">\glossarysubentryfield</span></span></span>  <a -href="glossaries-user.html#dx1-56057" ><span -class="ec-lmri-10x-x-109">489</span></a>, <a -href="glossaries-user.html#dx1-59002" >490</a> <br /></span> +href="glossaries-user.html#dx1-17023" ><span +class="ec-lmri-10x-x-109">515</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glossentry</span></span></span>  <a +href="glossaries-user.html#dx1-65040" ><span +class="ec-lmri-10x-x-109">516</span></a>, <a +href="glossaries-user.html#dx1-65043" >517</a>, <a +href="glossaries-user.html#dx1-65066" >518</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\Glossentrydesc</span></span></span>  <a +href="glossaries-user.html#dx1-43028" ><span +class="ec-lmri-10x-x-109">519</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glossentrydesc</span></span></span>  <a +href="glossaries-user.html#dx1-43027" ><span +class="ec-lmri-10x-x-109">520</span></a>, <a +href="glossaries-user.html#dx1-65045" >521</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\Glossentryname</span></span></span>  <a +href="glossaries-user.html#dx1-43010" ><span +class="ec-lmri-10x-x-109">522</span></a>, <a +href="glossaries-user.html#dx1-65090" >523</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glossentryname</span></span></span>  <a +href="glossaries-user.html#dx1-43009" ><span +class="ec-lmri-10x-x-109">524</span></a>, <a +href="glossaries-user.html#dx1-65044" >525</a>, <a +href="glossaries-user.html#dx1-65091" >526</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\Glossentrysymbol</span></span></span>  <a +href="glossaries-user.html#dx1-43034" ><span +class="ec-lmri-10x-x-109">527</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glossentrysymbol</span></span></span>  <a +href="glossaries-user.html#dx1-43033" ><span +class="ec-lmri-10x-x-109">528</span></a>, <a +href="glossaries-user.html#dx1-65046" >529</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLS</span></span></span>  <a -href="glossaries-user.html#dx1-2010" >491</a>, <a -href="glossaries-user.html#dx1-19067" >492</a>, <a -href="glossaries-user.html#dx1-28097" ><span -class="ec-lmri-10x-x-109">493</span></a> <br /></span> +href="glossaries-user.html#dx1-4009" >530</a>, <a +href="glossaries-user.html#dx1-23062" >531</a>, <a +href="glossaries-user.html#dx1-37101" ><span +class="ec-lmri-10x-x-109">532</span></a>, <a +href="glossaries-user.html#dx1-67031" >533</a> <br /></span> + + + <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Gls</span></span></span>  <a -href="glossaries-user.html#dx1-2009" >494</a>, <a -href="glossaries-user.html#dx1-5014" >495</a>, <a -href="glossaries-user.html#dx1-19066" >496</a>, <a -href="glossaries-user.html#dx1-19128" >497</a>, <a -href="glossaries-user.html#dx1-28096" ><span -class="ec-lmri-10x-x-109">498</span></a>, <a -href="glossaries-user.html#dx1-29018" >499</a>, <a -href="glossaries-user.html#dx1-41109" >500</a>, <a -href="glossaries-user.html#dx1-45009" >501</a>, <a -href="glossaries-user.html#dx1-45011" >502</a>, <a -href="glossaries-user.html#dx1-45013" >503</a> <br /></span> +href="glossaries-user.html#dx1-4008" >534</a>, <a +href="glossaries-user.html#dx1-7012" >535</a>, <a +href="glossaries-user.html#dx1-23061" >536</a>, <a +href="glossaries-user.html#dx1-23129" >537</a>, <a +href="glossaries-user.html#dx1-37100" ><span +class="ec-lmri-10x-x-109">538</span></a>, <a +href="glossaries-user.html#dx1-50118" >539</a>, <a +href="glossaries-user.html#dx1-54009" >540</a>, <a +href="glossaries-user.html#dx1-54011" >541</a>, <a +href="glossaries-user.html#dx1-54013" >542</a>, <a +href="glossaries-user.html#dx1-67029" >543</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls</span></span></span>  <a -href="glossaries-user.html#dx1-2008" >504</a>, <a -href="glossaries-user.html#dx1-2029" >505</a>, <a -href="glossaries-user.html#dx1-13068" >506</a>, <a -href="glossaries-user.html#dx1-19039" >507</a>, <a -href="glossaries-user.html#dx1-19043" >508</a>, <a -href="glossaries-user.html#dx1-19049" >509</a>, <a -href="glossaries-user.html#dx1-19051" >510</a>, <a -href="glossaries-user.html#dx1-19065" >511</a>, <a -href="glossaries-user.html#dx1-28031" >512</a>, <a -href="glossaries-user.html#dx1-28083" >513</a>, <a -href="glossaries-user.html#dx1-28086" ><span -class="ec-lmri-10x-x-109">514</span></a>, <a -href="glossaries-user.html#dx1-28111" >515</a>, <a -href="glossaries-user.html#dx1-28118" >516</a>, <a -href="glossaries-user.html#dx1-29003" >517</a>, <a -href="glossaries-user.html#dx1-29016" >518</a>, <a -href="glossaries-user.html#dx1-29030" >519</a>, <a -href="glossaries-user.html#dx1-29038" >520</a>, <a -href="glossaries-user.html#dx1-30004" >521</a>, <a -href="glossaries-user.html#dx1-30014" >522</a>, <a -href="glossaries-user.html#dx1-32004" >523</a>, <a -href="glossaries-user.html#dx1-41042" >524</a>, <a -href="glossaries-user.html#dx1-41107" >525</a>, <a -href="glossaries-user.html#dx1-42004" >526</a>, <a -href="glossaries-user.html#dx1-42008" >527</a>, <a -href="glossaries-user.html#dx1-44022" >528</a>, <a -href="glossaries-user.html#dx1-45008" >529</a>, <a -href="glossaries-user.html#dx1-45010" >530</a>, <a -href="glossaries-user.html#dx1-45012" >531</a>, <a -href="glossaries-user.html#dx1-45018" >532</a>, <a -href="glossaries-user.html#dx1-45020" >533</a>, <a -href="glossaries-user.html#dx1-46001" >534</a>, <a -href="glossaries-user.html#dx1-7070" >535</a>, <a -href="glossaries-user.html#dx1-32010" >536</a> <br /></span> +href="glossaries-user.html#dx1-4007" >544</a>, <a +href="glossaries-user.html#dx1-4028" >545</a>, <a +href="glossaries-user.html#dx1-15010" >546</a>, <a +href="glossaries-user.html#dx1-15071" >547</a>, <a +href="glossaries-user.html#dx1-23034" >548</a>, <a +href="glossaries-user.html#dx1-23038" >549</a>, <a +href="glossaries-user.html#dx1-23044" >550</a>, <a +href="glossaries-user.html#dx1-23046" >551</a>, <a +href="glossaries-user.html#dx1-23060" >552</a>, <a +href="glossaries-user.html#dx1-37035" >553</a>, <a +href="glossaries-user.html#dx1-37087" >554</a>, <a +href="glossaries-user.html#dx1-37090" ><span +class="ec-lmri-10x-x-109">555</span></a>, <a +href="glossaries-user.html#dx1-37115" >556</a>, <a +href="glossaries-user.html#dx1-37122" >557</a>, <a +href="glossaries-user.html#dx1-38003" >558</a>, <a +href="glossaries-user.html#dx1-38013" >559</a>, <a +href="glossaries-user.html#dx1-38037" >560</a>, <a +href="glossaries-user.html#dx1-38046" >561</a>, <a +href="glossaries-user.html#dx1-39004" >562</a>, <a +href="glossaries-user.html#dx1-39014" >563</a>, <a +href="glossaries-user.html#dx1-39036" >564</a>, <a +href="glossaries-user.html#dx1-41004" >565</a>, <a +href="glossaries-user.html#dx1-47023" >566</a>, <a +href="glossaries-user.html#dx1-50042" >567</a>, <a +href="glossaries-user.html#dx1-50116" >568</a>, <a +href="glossaries-user.html#dx1-51004" >569</a>, <a +href="glossaries-user.html#dx1-51008" >570</a>, <a +href="glossaries-user.html#dx1-53023" >571</a>, <a +href="glossaries-user.html#dx1-54008" >572</a>, <a +href="glossaries-user.html#dx1-54010" >573</a>, <a +href="glossaries-user.html#dx1-54012" >574</a>, <a +href="glossaries-user.html#dx1-54020" >575</a>, <a +href="glossaries-user.html#dx1-54022" >576</a>, <a +href="glossaries-user.html#dx1-55001" >577</a>, <a +href="glossaries-user.html#dx1-67018" >578</a>, <a +href="glossaries-user.html#dx1-69075" >579</a>, <a +href="glossaries-user.html#dx1-9073" >580</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\gls*</span></span></span>  <a -href="glossaries-user.html#dx1-13066" >537</a> <br /></span> +href="glossaries-user.html#dx1-15068" >581</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsadd</span></span></span>  <a -href="glossaries-user.html#dx1-31001" ><span -class="ec-lmri-10x-x-109">538</span></a> <br /></span> +href="glossaries-user.html#dx1-40001" ><span +class="ec-lmri-10x-x-109">582</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsaddall</span></span></span>  <a -href="glossaries-user.html#dx1-4023" >539</a>, <a -href="glossaries-user.html#dx1-31005" ><span -class="ec-lmri-10x-x-109">540</span></a> <br /></span> +href="glossaries-user.html#dx1-6033" >583</a>, <a +href="glossaries-user.html#dx1-40005" ><span +class="ec-lmri-10x-x-109">584</span></a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">\glsaddall </span>options<br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">types</span>  <a -href="glossaries-user.html#dx1-31006" >541</a> <br /></span> +href="glossaries-user.html#dx1-40006" >585</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsaddallunused</span></span></span>  <a +href="glossaries-user.html#dx1-40011" ><span +class="ec-lmri-10x-x-109">586</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsaddkey</span></span></span>  <a +href="glossaries-user.html#dx1-23101" >587</a>, <a +href="glossaries-user.html#dx1-24003" >588</a>, <a +href="glossaries-user.html#dx1-25001" >589</a>, <a +href="glossaries-user.html#dx1-26001" ><span +class="ec-lmri-10x-x-109">590</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GlsAddXdyAttribute</span></span></span>  <a -href="glossaries-user.html#dx1-28052" >542</a>, <a -href="glossaries-user.html#dx1-38017" ><span -class="ec-lmri-10x-x-109">543</span></a> <br /></span> +href="glossaries-user.html#dx1-37056" >591</a>, <a +href="glossaries-user.html#dx1-47017" ><span +class="ec-lmri-10x-x-109">592</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GlsAddXdyCounters</span></span></span>  <a -href="glossaries-user.html#dx1-38011" ><span -class="ec-lmri-10x-x-109">544</span></a>, <a -href="glossaries-user.html#dx1-38038" >545</a> <br /></span> +href="glossaries-user.html#dx1-47011" ><span +class="ec-lmri-10x-x-109">593</span></a>, <a +href="glossaries-user.html#dx1-47045" >594</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GlsAddXdyLocation</span></span></span>  <a -href="glossaries-user.html#dx1-38024" ><span -class="ec-lmri-10x-x-109">546</span></a>, <a -href="glossaries-user.html#dx1-38050" >547</a> <br /></span> +href="glossaries-user.html#dx1-47027" ><span +class="ec-lmri-10x-x-109">595</span></a>, <a +href="glossaries-user.html#dx1-47057" >596</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsautoprefix</span></span></span>  <a -href="glossaries-user.html#dx1-14032" ><span -class="ec-lmri-10x-x-109">548</span></a> <br /></span> - - - +href="glossaries-user.html#dx1-16043" ><span +class="ec-lmri-10x-x-109">597</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glscapscase</span></span></span>  <a +href="glossaries-user.html#dx1-38018" ><span +class="ec-lmri-10x-x-109">598</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsclearpage</span></span></span>  <a -href="glossaries-user.html#dx1-14016" >549</a> <br /></span> +href="glossaries-user.html#dx1-16015" ><span +class="ec-lmri-10x-x-109">599</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsclosebrace</span></span></span>  <a -href="glossaries-user.html#dx1-36013" ><span -class="ec-lmri-10x-x-109">550</span></a> <br /></span> +href="glossaries-user.html#dx1-45013" ><span +class="ec-lmri-10x-x-109">600</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glscustomtext</span></span></span>  <a +href="glossaries-user.html#dx1-38012" ><span +class="ec-lmri-10x-x-109">601</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GlsDeclareNoHyperList</span></span></span>  <a -href="glossaries-user.html#dx1-26003" >551</a>, <a -href="glossaries-user.html#dx1-28021" ><span -class="ec-lmri-10x-x-109">552</span></a>, <a -href="glossaries-user.html#dx1-28080" >553</a> <br /></span> +href="glossaries-user.html#dx1-15073" >602</a>, <a +href="glossaries-user.html#dx1-32003" >603</a>, <a +href="glossaries-user.html#dx1-37025" ><span +class="ec-lmri-10x-x-109">604</span></a>, <a +href="glossaries-user.html#dx1-37084" >605</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsdefaulttype</span></span></span>  <a -href="glossaries-user.html#dx1-25004" >554</a>, <a -href="glossaries-user.html#dx1-60003" >555</a>, <a -href="glossaries-user.html#dx1-17006" >556</a>, <a -href="glossaries-user.html#dx1-17008" >557</a>, <a -href="glossaries-user.html#dx1-25011" >558</a> <br /></span> +href="glossaries-user.html#dx1-31005" >606</a>, <a +href="glossaries-user.html#dx1-38041" >607</a>, <a +href="glossaries-user.html#dx1-66003" >608</a>, <a +href="glossaries-user.html#dx1-19009" >609</a>, <a +href="glossaries-user.html#dx1-19011" >610</a>, <a +href="glossaries-user.html#dx1-31014" >611</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLSdesc</span></span></span>  <a -href="glossaries-user.html#dx1-28166" ><span -class="ec-lmri-10x-x-109">559</span></a> <br /></span> +href="glossaries-user.html#dx1-37162" ><span +class="ec-lmri-10x-x-109">612</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsdesc</span></span></span>  <a -href="glossaries-user.html#dx1-28165" ><span -class="ec-lmri-10x-x-109">560</span></a> <br /></span> +href="glossaries-user.html#dx1-37161" ><span +class="ec-lmri-10x-x-109">613</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsdesc</span></span></span>  <a -href="glossaries-user.html#dx1-28158" ><span -class="ec-lmri-10x-x-109">561</span></a> <br /></span> +href="glossaries-user.html#dx1-37158" ><span +class="ec-lmri-10x-x-109">614</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsdescwidth</span></span></span>  <a -href="glossaries-user.html#dx1-47015" ><span -class="ec-lmri-10x-x-109">562</span></a>, <a -href="glossaries-user.html#dx1-49012" >563</a>, <a -href="glossaries-user.html#dx1-49023" >564</a>, <a -href="glossaries-user.html#dx1-49042" >565</a>, <a -href="glossaries-user.html#dx1-50012" >566</a>, <a -href="glossaries-user.html#dx1-50023" >567</a>, <a -href="glossaries-user.html#dx1-50033" >568</a>, <a -href="glossaries-user.html#dx1-51018" >569</a>, <a -href="glossaries-user.html#dx1-51029" >570</a>, <a -href="glossaries-user.html#dx1-51048" >571</a>, <a -href="glossaries-user.html#dx1-52015" >572</a>, <a -href="glossaries-user.html#dx1-52026" >573</a> <br /></span> +href="glossaries-user.html#dx1-56015" ><span +class="ec-lmri-10x-x-109">615</span></a>, <a +href="glossaries-user.html#dx1-58012" >616</a>, <a +href="glossaries-user.html#dx1-58023" >617</a>, <a +href="glossaries-user.html#dx1-58042" >618</a>, <a +href="glossaries-user.html#dx1-59012" >619</a>, <a +href="glossaries-user.html#dx1-59023" >620</a>, <a +href="glossaries-user.html#dx1-59033" >621</a>, <a +href="glossaries-user.html#dx1-60018" >622</a>, <a +href="glossaries-user.html#dx1-60029" >623</a>, <a +href="glossaries-user.html#dx1-60048" >624</a>, <a +href="glossaries-user.html#dx1-61015" >625</a>, <a +href="glossaries-user.html#dx1-61026" >626</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsdisablehyper</span></span></span>  <a -href="glossaries-user.html#dx1-30006" ><span -class="ec-lmri-10x-x-109">574</span></a> <br /></span> +href="glossaries-user.html#dx1-39006" ><span +class="ec-lmri-10x-x-109">627</span></a>, <a +href="glossaries-user.html#dx1-39031" >628</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsdisp</span></span></span>  <a -href="glossaries-user.html#dx1-2014" >575</a>, <a -href="glossaries-user.html#dx1-2022" >576</a>, <a -href="glossaries-user.html#dx1-19048" >577</a>, <a -href="glossaries-user.html#dx1-28038" >578</a>, <a -href="glossaries-user.html#dx1-28110" ><span -class="ec-lmri-10x-x-109">579</span></a>, <a -href="glossaries-user.html#dx1-29024" >580</a>, <a -href="glossaries-user.html#dx1-29032" >581</a>, <a -href="glossaries-user.html#dx1-30016" >582</a> <br /></span> +href="glossaries-user.html#dx1-4013" >629</a>, <a +href="glossaries-user.html#dx1-4021" >630</a>, <a +href="glossaries-user.html#dx1-23043" >631</a>, <a +href="glossaries-user.html#dx1-37042" >632</a>, <a +href="glossaries-user.html#dx1-37114" ><span +class="ec-lmri-10x-x-109">633</span></a>, <a +href="glossaries-user.html#dx1-38005" >634</a>, <a +href="glossaries-user.html#dx1-38039" >635</a>, <a +href="glossaries-user.html#dx1-39016" >636</a>, <a +href="glossaries-user.html#dx1-39037" >637</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsdisplay</span></span></span>  <a -href="glossaries-user.html#dx1-19029" >583</a>, <a -href="glossaries-user.html#dx1-19081" >584</a>, <a -href="glossaries-user.html#dx1-28108" >585</a>, <a -href="glossaries-user.html#dx1-28115" >586</a>, <a -href="glossaries-user.html#dx1-28121" >587</a>, <a -href="glossaries-user.html#dx1-29007" ><span -class="ec-lmri-10x-x-109">588</span></a>, <a -href="glossaries-user.html#dx1-44046" >589</a>, <a -href="glossaries-user.html#dx1-44055" >590</a> <br /></span> +href="glossaries-user.html#dx1-23073" >638</a>, <a +href="glossaries-user.html#dx1-37112" >639</a>, <a +href="glossaries-user.html#dx1-37119" >640</a>, <a +href="glossaries-user.html#dx1-37125" >641</a>, <a +href="glossaries-user.html#dx1-38008" >642</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsdisplayfirst</span></span></span>  <a -href="glossaries-user.html#dx1-19030" >591</a>, <a -href="glossaries-user.html#dx1-19082" >592</a>, <a -href="glossaries-user.html#dx1-28109" >593</a>, <a -href="glossaries-user.html#dx1-28116" >594</a>, <a -href="glossaries-user.html#dx1-28122" >595</a>, <a -href="glossaries-user.html#dx1-29005" ><span -class="ec-lmri-10x-x-109">596</span></a>, <a -href="glossaries-user.html#dx1-44045" >597</a>, <a -href="glossaries-user.html#dx1-44054" >598</a> <br /></span> +href="glossaries-user.html#dx1-23074" >643</a>, <a +href="glossaries-user.html#dx1-37113" >644</a>, <a +href="glossaries-user.html#dx1-37120" >645</a>, <a +href="glossaries-user.html#dx1-37126" >646</a>, <a +href="glossaries-user.html#dx1-38007" >647</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsdisplaynumberlist</span></span></span>  <a -href="glossaries-user.html#dx1-13074" >599</a>, <a -href="glossaries-user.html#dx1-34050" ><span -class="ec-lmri-10x-x-109">600</span></a> <br /></span> +href="glossaries-user.html#dx1-15079" >648</a>, <a +href="glossaries-user.html#dx1-43058" ><span +class="ec-lmri-10x-x-109">649</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsdoifexists</span></span></span>  <a +href="glossaries-user.html#dx1-66009" ><span +class="ec-lmri-10x-x-109">650</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsdoifnoexists</span></span></span>  <a +href="glossaries-user.html#dx1-66010" ><span +class="ec-lmri-10x-x-109">651</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsdosanitizesort</span></span></span>  <a +href="glossaries-user.html#dx1-18024" ><span +class="ec-lmri-10x-x-109">652</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsenablehyper</span></span></span>  <a -href="glossaries-user.html#dx1-30007" ><span -class="ec-lmri-10x-x-109">601</span></a> <br /></span> +href="glossaries-user.html#dx1-39007" ><span +class="ec-lmri-10x-x-109">653</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrycounterlabel</span></span></span>  <a -href="glossaries-user.html#dx1-56043" ><span -class="ec-lmri-10x-x-109">602</span></a> <br /></span> +href="glossaries-user.html#dx1-65051" ><span +class="ec-lmri-10x-x-109">654</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentrydesc</span></span></span>  <a -href="glossaries-user.html#dx1-34022" ><span -class="ec-lmri-10x-x-109">603</span></a> <br /></span> +href="glossaries-user.html#dx1-43026" ><span +class="ec-lmri-10x-x-109">655</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrydesc</span></span></span>  <a -href="glossaries-user.html#dx1-34021" ><span -class="ec-lmri-10x-x-109">604</span></a> <br /></span> +href="glossaries-user.html#dx1-43025" ><span +class="ec-lmri-10x-x-109">656</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentrydescplural</span></span></span>  <a -href="glossaries-user.html#dx1-34024" ><span -class="ec-lmri-10x-x-109">605</span></a> <br /></span> +href="glossaries-user.html#dx1-43030" ><span +class="ec-lmri-10x-x-109">657</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrydescplural</span></span></span>  <a -href="glossaries-user.html#dx1-34023" ><span -class="ec-lmri-10x-x-109">606</span></a> <br /></span> +href="glossaries-user.html#dx1-43029" ><span +class="ec-lmri-10x-x-109">658</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryfirst</span></span></span>  <a -href="glossaries-user.html#dx1-34014" ><span -class="ec-lmri-10x-x-109">607</span></a> <br /></span> +href="glossaries-user.html#dx1-43018" ><span +class="ec-lmri-10x-x-109">659</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryfirst</span></span></span>  <a -href="glossaries-user.html#dx1-34013" ><span -class="ec-lmri-10x-x-109">608</span></a> <br /></span> +href="glossaries-user.html#dx1-43017" ><span +class="ec-lmri-10x-x-109">660</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryfirstplural</span></span></span>  <a -href="glossaries-user.html#dx1-34018" ><span -class="ec-lmri-10x-x-109">609</span></a> <br /></span> +href="glossaries-user.html#dx1-43022" ><span +class="ec-lmri-10x-x-109">661</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryfirstplural</span></span></span>  <a -href="glossaries-user.html#dx1-34017" ><span -class="ec-lmri-10x-x-109">610</span></a> <br /></span> +href="glossaries-user.html#dx1-43021" ><span +class="ec-lmri-10x-x-109">662</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsentryfmt</span></span></span>  <a +href="glossaries-user.html#dx1-6121" >663</a>, <a +href="glossaries-user.html#dx1-38010" ><span +class="ec-lmri-10x-x-109">664</span></a>, <a +href="glossaries-user.html#dx1-38031" >665</a>, <a +href="glossaries-user.html#dx1-39022" >666</a>, <a +href="glossaries-user.html#dx1-39032" >667</a>, <a +href="glossaries-user.html#dx1-39038" >668</a> <br /></span> + + + <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryfull</span></span></span>  <a -href="glossaries-user.html#dx1-41124" ><span -class="ec-lmri-10x-x-109">611</span></a> <br /></span> +href="glossaries-user.html#dx1-50133" ><span +class="ec-lmri-10x-x-109">669</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryfull</span></span></span>  <a -href="glossaries-user.html#dx1-41123" ><span -class="ec-lmri-10x-x-109">612</span></a> <br /></span> +href="glossaries-user.html#dx1-50132" ><span +class="ec-lmri-10x-x-109">670</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryfullpl</span></span></span>  <a -href="glossaries-user.html#dx1-41126" ><span -class="ec-lmri-10x-x-109">613</span></a> <br /></span> +href="glossaries-user.html#dx1-50135" ><span +class="ec-lmri-10x-x-109">671</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryfullpl</span></span></span>  <a -href="glossaries-user.html#dx1-41125" ><span -class="ec-lmri-10x-x-109">614</span></a> <br /></span> +href="glossaries-user.html#dx1-50134" ><span +class="ec-lmri-10x-x-109">672</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryitem</span></span></span>  <a -href="glossaries-user.html#dx1-56040" ><span -class="ec-lmri-10x-x-109">615</span></a>, <a -href="glossaries-user.html#dx1-57010" >616</a> <br /></span> +href="glossaries-user.html#dx1-65048" ><span +class="ec-lmri-10x-x-109">673</span></a>, <a +href="glossaries-user.html#dx1-65085" >674</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentrylong</span></span></span>  <a -href="glossaries-user.html#dx1-41116" ><span -class="ec-lmri-10x-x-109">617</span></a> <br /></span> +href="glossaries-user.html#dx1-50125" ><span +class="ec-lmri-10x-x-109">675</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrylong</span></span></span>  <a -href="glossaries-user.html#dx1-41115" ><span -class="ec-lmri-10x-x-109">618</span></a>, <a -href="glossaries-user.html#dx1-44041" >619</a> <br /></span> +href="glossaries-user.html#dx1-50124" ><span +class="ec-lmri-10x-x-109">676</span></a>, <a +href="glossaries-user.html#dx1-53042" >677</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentrylongpl</span></span></span>  <a -href="glossaries-user.html#dx1-41118" ><span -class="ec-lmri-10x-x-109">620</span></a> <br /></span> +href="glossaries-user.html#dx1-50127" ><span +class="ec-lmri-10x-x-109">678</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrylongpl</span></span></span>  <a -href="glossaries-user.html#dx1-41117" ><span -class="ec-lmri-10x-x-109">621</span></a> <br /></span> +href="glossaries-user.html#dx1-50126" ><span +class="ec-lmri-10x-x-109">679</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryname</span></span></span>  <a -href="glossaries-user.html#dx1-34005" ><span -class="ec-lmri-10x-x-109">622</span></a> <br /></span> +href="glossaries-user.html#dx1-43007" ><span +class="ec-lmri-10x-x-109">680</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryname</span></span></span>  <a -href="glossaries-user.html#dx1-5022" >623</a>, <a -href="glossaries-user.html#dx1-34004" ><span -class="ec-lmri-10x-x-109">624</span></a>, <a -href="glossaries-user.html#dx1-62064" >625</a>, <a -href="glossaries-user.html#dx1-34044" >626</a> <br /></span> +href="glossaries-user.html#dx1-43006" ><span +class="ec-lmri-10x-x-109">681</span></a>, <a +href="glossaries-user.html#dx1-43052" >682</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrynumberlist</span></span></span>  <a -href="glossaries-user.html#dx1-13073" >627</a>, <a -href="glossaries-user.html#dx1-34049" ><span -class="ec-lmri-10x-x-109">628</span></a> <br /></span> +href="glossaries-user.html#dx1-15078" >683</a>, <a +href="glossaries-user.html#dx1-43057" ><span +class="ec-lmri-10x-x-109">684</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryplural</span></span></span>  <a -href="glossaries-user.html#dx1-34011" ><span -class="ec-lmri-10x-x-109">629</span></a> <br /></span> +href="glossaries-user.html#dx1-43015" ><span +class="ec-lmri-10x-x-109">685</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryplural</span></span></span>  <a -href="glossaries-user.html#dx1-34010" ><span -class="ec-lmri-10x-x-109">630</span></a> <br /></span> +href="glossaries-user.html#dx1-43014" ><span +class="ec-lmri-10x-x-109">686</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\Glsentryprefix</span></span></span>  <a +href="glossaries-user.html#dx1-67062" ><span +class="ec-lmri-10x-x-109">687</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsentryprefix</span></span></span>  <a +href="glossaries-user.html#dx1-67053" ><span +class="ec-lmri-10x-x-109">688</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\Glsentryprefixfirst</span></span></span>  <a +href="glossaries-user.html#dx1-67063" ><span +class="ec-lmri-10x-x-109">689</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsentryprefixfirst</span></span></span>  <a +href="glossaries-user.html#dx1-67055" ><span +class="ec-lmri-10x-x-109">690</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\Glsentryprefixfirstplural</span></span></span>  <a +href="glossaries-user.html#dx1-67065" ><span +class="ec-lmri-10x-x-109">691</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsentryprefixfirstplural</span></span></span>  <a +href="glossaries-user.html#dx1-67059" ><span +class="ec-lmri-10x-x-109">692</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\Glsentryprefixplural</span></span></span>  <a +href="glossaries-user.html#dx1-67064" ><span +class="ec-lmri-10x-x-109">693</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsentryprefixplural</span></span></span>  <a +href="glossaries-user.html#dx1-67057" ><span +class="ec-lmri-10x-x-109">694</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryshort</span></span></span>  <a -href="glossaries-user.html#dx1-41120" ><span -class="ec-lmri-10x-x-109">631</span></a> <br /></span> +href="glossaries-user.html#dx1-50129" ><span +class="ec-lmri-10x-x-109">695</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryshort</span></span></span>  <a -href="glossaries-user.html#dx1-41119" ><span -class="ec-lmri-10x-x-109">632</span></a> <br /></span> +href="glossaries-user.html#dx1-50128" ><span +class="ec-lmri-10x-x-109">696</span></a>, <a +href="glossaries-user.html#dx1-53035" >697</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryshortpl</span></span></span>  <a -href="glossaries-user.html#dx1-41122" ><span -class="ec-lmri-10x-x-109">633</span></a> <br /></span> +href="glossaries-user.html#dx1-50131" ><span +class="ec-lmri-10x-x-109">698</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryshortpl</span></span></span>  <a -href="glossaries-user.html#dx1-41121" ><span -class="ec-lmri-10x-x-109">634</span></a> <br /></span> +href="glossaries-user.html#dx1-50130" ><span +class="ec-lmri-10x-x-109">699</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentrysymbol</span></span></span>  <a -href="glossaries-user.html#dx1-34026" ><span -class="ec-lmri-10x-x-109">635</span></a> <br /></span> +href="glossaries-user.html#dx1-43032" ><span +class="ec-lmri-10x-x-109">700</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrysymbol</span></span></span>  <a -href="glossaries-user.html#dx1-34025" ><span -class="ec-lmri-10x-x-109">636</span></a> <br /></span> - - - +href="glossaries-user.html#dx1-38032" >701</a>, <a +href="glossaries-user.html#dx1-43031" ><span +class="ec-lmri-10x-x-109">702</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentrysymbolplural</span></span></span>  <a -href="glossaries-user.html#dx1-34028" ><span -class="ec-lmri-10x-x-109">637</span></a> <br /></span> +href="glossaries-user.html#dx1-43036" ><span +class="ec-lmri-10x-x-109">703</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrysymbolplural</span></span></span>  <a -href="glossaries-user.html#dx1-34027" ><span -class="ec-lmri-10x-x-109">638</span></a> <br /></span> +href="glossaries-user.html#dx1-43035" ><span +class="ec-lmri-10x-x-109">704</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentrytext</span></span></span>  <a -href="glossaries-user.html#dx1-34008" ><span -class="ec-lmri-10x-x-109">639</span></a> <br /></span> +href="glossaries-user.html#dx1-26005" >705</a>, <a +href="glossaries-user.html#dx1-43012" ><span +class="ec-lmri-10x-x-109">706</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentrytext</span></span></span>  <a -href="glossaries-user.html#dx1-5020" >640</a>, <a -href="glossaries-user.html#dx1-28011" >641</a>, <a -href="glossaries-user.html#dx1-33013" >642</a>, <a -href="glossaries-user.html#dx1-34007" ><span -class="ec-lmri-10x-x-109">643</span></a>, <a -href="glossaries-user.html#dx1-34042" >644</a>, <a -href="glossaries-user.html#dx1-41114" >645</a>, <a -href="glossaries-user.html#dx1-62066" >646</a> <br /></span> +href="glossaries-user.html#dx1-26004" >707</a>, <a +href="glossaries-user.html#dx1-37011" >708</a>, <a +href="glossaries-user.html#dx1-42013" >709</a>, <a +href="glossaries-user.html#dx1-43011" ><span +class="ec-lmri-10x-x-109">710</span></a>, <a +href="glossaries-user.html#dx1-43050" >711</a>, <a +href="glossaries-user.html#dx1-50123" >712</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryuseri</span></span></span>  <a -href="glossaries-user.html#dx1-34030" ><span -class="ec-lmri-10x-x-109">647</span></a> <br /></span> +href="glossaries-user.html#dx1-43038" ><span +class="ec-lmri-10x-x-109">713</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryuseri</span></span></span>  <a -href="glossaries-user.html#dx1-34029" ><span -class="ec-lmri-10x-x-109">648</span></a> <br /></span> +href="glossaries-user.html#dx1-43037" ><span +class="ec-lmri-10x-x-109">714</span></a>, <a +href="glossaries-user.html#dx1-65047" >715</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryuserii</span></span></span>  <a -href="glossaries-user.html#dx1-34032" ><span -class="ec-lmri-10x-x-109">649</span></a> <br /></span> +href="glossaries-user.html#dx1-43040" ><span +class="ec-lmri-10x-x-109">716</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryuserii</span></span></span>  <a -href="glossaries-user.html#dx1-34031" ><span -class="ec-lmri-10x-x-109">650</span></a> <br /></span> +href="glossaries-user.html#dx1-43039" ><span +class="ec-lmri-10x-x-109">717</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryuseriii</span></span></span>  <a -href="glossaries-user.html#dx1-34034" ><span -class="ec-lmri-10x-x-109">651</span></a> <br /></span> +href="glossaries-user.html#dx1-43042" ><span +class="ec-lmri-10x-x-109">718</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryuseriii</span></span></span>  <a -href="glossaries-user.html#dx1-34033" ><span -class="ec-lmri-10x-x-109">652</span></a> <br /></span> +href="glossaries-user.html#dx1-43041" ><span +class="ec-lmri-10x-x-109">719</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryuseriv</span></span></span>  <a -href="glossaries-user.html#dx1-34036" ><span -class="ec-lmri-10x-x-109">653</span></a> <br /></span> +href="glossaries-user.html#dx1-43044" ><span +class="ec-lmri-10x-x-109">720</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryuseriv</span></span></span>  <a -href="glossaries-user.html#dx1-34035" ><span -class="ec-lmri-10x-x-109">654</span></a> <br /></span> +href="glossaries-user.html#dx1-43043" ><span +class="ec-lmri-10x-x-109">721</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryuserv</span></span></span>  <a -href="glossaries-user.html#dx1-34038" ><span -class="ec-lmri-10x-x-109">655</span></a> <br /></span> +href="glossaries-user.html#dx1-43046" ><span +class="ec-lmri-10x-x-109">722</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryuserv</span></span></span>  <a -href="glossaries-user.html#dx1-34037" ><span -class="ec-lmri-10x-x-109">656</span></a> <br /></span> +href="glossaries-user.html#dx1-43045" ><span +class="ec-lmri-10x-x-109">723</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsentryuservi</span></span></span>  <a -href="glossaries-user.html#dx1-34040" ><span -class="ec-lmri-10x-x-109">657</span></a> <br /></span> +href="glossaries-user.html#dx1-43048" ><span +class="ec-lmri-10x-x-109">724</span></a> <br /></span> + + + <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsentryuservi</span></span></span>  <a -href="glossaries-user.html#dx1-34039" ><span -class="ec-lmri-10x-x-109">658</span></a> <br /></span> +href="glossaries-user.html#dx1-43047" ><span +class="ec-lmri-10x-x-109">725</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsexpandfields</span></span></span>  <a +href="glossaries-user.html#dx1-27022" ><span +class="ec-lmri-10x-x-109">726</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLSfirst</span></span></span>  <a -href="glossaries-user.html#dx1-28129" ><span -class="ec-lmri-10x-x-109">659</span></a> <br /></span> +href="glossaries-user.html#dx1-37135" ><span +class="ec-lmri-10x-x-109">727</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsfirst</span></span></span>  <a -href="glossaries-user.html#dx1-28128" ><span -class="ec-lmri-10x-x-109">660</span></a> <br /></span> +href="glossaries-user.html#dx1-37134" ><span +class="ec-lmri-10x-x-109">728</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsfirst</span></span></span>  <a -href="glossaries-user.html#dx1-28125" ><span -class="ec-lmri-10x-x-109">661</span></a> <br /></span> +href="glossaries-user.html#dx1-37131" ><span +class="ec-lmri-10x-x-109">729</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLSfirstplural</span></span></span>  <a -href="glossaries-user.html#dx1-28139" ><span -class="ec-lmri-10x-x-109">662</span></a> <br /></span> +href="glossaries-user.html#dx1-37147" ><span +class="ec-lmri-10x-x-109">730</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsfirstplural</span></span></span>  <a -href="glossaries-user.html#dx1-28138" ><span -class="ec-lmri-10x-x-109">663</span></a> <br /></span> +href="glossaries-user.html#dx1-37146" ><span +class="ec-lmri-10x-x-109">731</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsfirstplural</span></span></span>  <a -href="glossaries-user.html#dx1-28135" ><span -class="ec-lmri-10x-x-109">664</span></a> <br /></span> +href="glossaries-user.html#dx1-37143" ><span +class="ec-lmri-10x-x-109">732</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsgenentryfmt</span></span></span>  <a +href="glossaries-user.html#dx1-38020" ><span +class="ec-lmri-10x-x-109">733</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsgetgrouptitle</span></span></span>  <a -href="glossaries-user.html#dx1-56028" ><span -class="ec-lmri-10x-x-109">665</span></a> <br /></span> +href="glossaries-user.html#dx1-65028" ><span +class="ec-lmri-10x-x-109">734</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsglossarymark</span></span></span>  <a +href="glossaries-user.html#dx1-16013" ><span +class="ec-lmri-10x-x-109">735</span></a>, <a +href="glossaries-user.html#dx1-16020" >736</a>, <a +href="glossaries-user.html#dx1-44032" ><span +class="ec-lmri-10x-x-109">737</span></a>, <a +href="glossaries-user.html#dx1-44033" >738</a>, <a +href="glossaries-user.html#dx1-44034" >739</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsgroupheading</span></span></span>  <a -href="glossaries-user.html#dx1-56020" ><span -class="ec-lmri-10x-x-109">666</span></a>, <a -href="glossaries-user.html#dx1-57005" >667</a> <br /></span> +href="glossaries-user.html#dx1-65020" ><span +class="ec-lmri-10x-x-109">740</span></a>, <a +href="glossaries-user.html#dx1-65080" >741</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsgroupskip</span></span></span>  <a -href="glossaries-user.html#dx1-2001" >668</a>, <a -href="glossaries-user.html#dx1-47028" >669</a>, <a -href="glossaries-user.html#dx1-56032" ><span -class="ec-lmri-10x-x-109">670</span></a>, <a -href="glossaries-user.html#dx1-57006" >671</a> <br /></span> +href="glossaries-user.html#dx1-56028" >742</a>, <a +href="glossaries-user.html#dx1-65036" ><span +class="ec-lmri-10x-x-109">743</span></a>, <a +href="glossaries-user.html#dx1-65081" >744</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glshyperlink</span></span></span>  <a -href="glossaries-user.html#dx1-34003" >672</a>, <a -href="glossaries-user.html#dx1-34041" ><span -class="ec-lmri-10x-x-109">673</span></a> <br /></span> +href="glossaries-user.html#dx1-39033" >745</a>, <a +href="glossaries-user.html#dx1-43003" >746</a>, <a +href="glossaries-user.html#dx1-43049" ><span +class="ec-lmri-10x-x-109">747</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glshypernavsep</span></span></span>  <a -href="glossaries-user.html#dx1-48017" ><span -class="ec-lmri-10x-x-109">674</span></a> <br /></span> +href="glossaries-user.html#dx1-57017" ><span +class="ec-lmri-10x-x-109">748</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsIfListOfAcronyms</span></span></span>  <a +href="glossaries-user.html#dx1-19024" ><span +class="ec-lmri-10x-x-109">749</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsifplural</span></span></span>  <a +href="glossaries-user.html#dx1-38017" ><span +class="ec-lmri-10x-x-109">750</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsinlineparentchildseparator</span></span></span>  <a -href="glossaries-user.html#dx1-55013" ><span -class="ec-lmri-10x-x-109">675</span></a>, <a -href="glossaries-user.html#dx1-55014" >676</a> <br /></span> +href="glossaries-user.html#dx1-64013" ><span +class="ec-lmri-10x-x-109">751</span></a>, <a +href="glossaries-user.html#dx1-64014" >752</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsinlineseparator</span></span></span>  <a -href="glossaries-user.html#dx1-55009" ><span -class="ec-lmri-10x-x-109">677</span></a>, <a -href="glossaries-user.html#dx1-55010" >678</a> <br /></span> +href="glossaries-user.html#dx1-64009" ><span +class="ec-lmri-10x-x-109">753</span></a>, <a +href="glossaries-user.html#dx1-64010" >754</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsinlinesubseparator</span></span></span>  <a -href="glossaries-user.html#dx1-55011" ><span -class="ec-lmri-10x-x-109">679</span></a>, <a -href="glossaries-user.html#dx1-55012" >680</a> <br /></span> +href="glossaries-user.html#dx1-64011" ><span +class="ec-lmri-10x-x-109">755</span></a>, <a +href="glossaries-user.html#dx1-64012" >756</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsinsert</span></span></span>  <a +href="glossaries-user.html#dx1-38016" ><span +class="ec-lmri-10x-x-109">757</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glslabel</span></span></span>  <a -href="glossaries-user.html#dx1-29022" ><span -class="ec-lmri-10x-x-109">681</span></a> <br /></span> +href="glossaries-user.html#dx1-38011" ><span +class="ec-lmri-10x-x-109">758</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glslabeltok</span></span></span>  <a -href="glossaries-user.html#dx1-44006" >682</a> <br /></span> +href="glossaries-user.html#dx1-53006" >759</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glslink</span></span></span>  <a -href="glossaries-user.html#dx1-28036" ><span -class="ec-lmri-10x-x-109">683</span></a>, <a -href="glossaries-user.html#dx1-28098" >684</a>, <a -href="glossaries-user.html#dx1-28099" >685</a>, <a -href="glossaries-user.html#dx1-28106" >686</a>, <a -href="glossaries-user.html#dx1-29023" >687</a>, <a -href="glossaries-user.html#dx1-30003" >688</a>, <a -href="glossaries-user.html#dx1-30017" >689</a>, <a -href="glossaries-user.html#dx1-31002" >690</a>, <a -href="glossaries-user.html#dx1-31004" >691</a>, <a -href="glossaries-user.html#dx1-38009" >692</a> <br /></span> +href="glossaries-user.html#dx1-37040" ><span +class="ec-lmri-10x-x-109">760</span></a>, <a +href="glossaries-user.html#dx1-37102" >761</a>, <a +href="glossaries-user.html#dx1-37103" >762</a>, <a +href="glossaries-user.html#dx1-37110" >763</a>, <a +href="glossaries-user.html#dx1-38025" >764</a>, <a +href="glossaries-user.html#dx1-39003" >765</a>, <a +href="glossaries-user.html#dx1-39017" >766</a>, <a +href="glossaries-user.html#dx1-40002" >767</a>, <a +href="glossaries-user.html#dx1-40004" >768</a>, <a +href="glossaries-user.html#dx1-47009" >769</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">\glslink </span>options<br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">counter</span>  <a -href="glossaries-user.html#dx1-28076" >693</a>, <a -href="glossaries-user.html#dx1-38008" >694</a> <br /></span> +href="glossaries-user.html#dx1-37080" >770</a>, <a +href="glossaries-user.html#dx1-47008" >771</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">format</span>  <a -href="glossaries-user.html#dx1-28039" >695</a>, <a -href="glossaries-user.html#dx1-28051" >696</a>, <a -href="glossaries-user.html#dx1-34061" >697</a>, <a -href="glossaries-user.html#dx1-38012" >698</a>, <a -href="glossaries-user.html#dx1-38018" >699</a> <br /></span> +href="glossaries-user.html#dx1-37043" >772</a>, <a +href="glossaries-user.html#dx1-37055" >773</a>, <a +href="glossaries-user.html#dx1-43069" >774</a>, <a +href="glossaries-user.html#dx1-47012" >775</a>, <a +href="glossaries-user.html#dx1-47018" >776</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">hyper</span>  <a -href="glossaries-user.html#dx1-28024" >700</a>, <a -href="glossaries-user.html#dx1-28077" >701</a>, <a -href="glossaries-user.html#dx1-30005" >702</a>, <a -href="glossaries-user.html#dx1-31003" >703</a> <br /></span> +href="glossaries-user.html#dx1-37028" >777</a>, <a +href="glossaries-user.html#dx1-37081" >778</a>, <a +href="glossaries-user.html#dx1-39005" >779</a>, <a +href="glossaries-user.html#dx1-40003" >780</a> <br /></span> +<span class="index-subitem">    <span +class="ec-lmss-10x-x-109">local</span>  <a +href="glossaries-user.html#dx1-37085" >781</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glslink*</span></span></span>  <a -href="glossaries-user.html#dx1-28085" ><span -class="ec-lmri-10x-x-109">704</span></a> <br /></span> +href="glossaries-user.html#dx1-37089" ><span +class="ec-lmri-10x-x-109">782</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glslistdottedwidth</span></span></span>  <a -href="glossaries-user.html#dx1-48034" ><span -class="ec-lmri-10x-x-109">705</span></a> <br /></span> +href="glossaries-user.html#dx1-57034" ><span +class="ec-lmri-10x-x-109">783</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glslocalreset</span></span></span>  <a -href="glossaries-user.html#dx1-46007" ><span -class="ec-lmri-10x-x-109">706</span></a> <br /></span> +href="glossaries-user.html#dx1-55007" ><span +class="ec-lmri-10x-x-109">784</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glslocalresetall</span></span></span>  <a -href="glossaries-user.html#dx1-46011" ><span -class="ec-lmri-10x-x-109">707</span></a> <br /></span> +href="glossaries-user.html#dx1-55011" ><span +class="ec-lmri-10x-x-109">785</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glslocalunset</span></span></span>  <a -href="glossaries-user.html#dx1-46009" ><span -class="ec-lmri-10x-x-109">708</span></a> <br /></span> +href="glossaries-user.html#dx1-55009" ><span +class="ec-lmri-10x-x-109">786</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glslocalunsetall</span></span></span>  <a -href="glossaries-user.html#dx1-46013" ><span -class="ec-lmri-10x-x-109">709</span></a> <br /></span> - - - +href="glossaries-user.html#dx1-55013" ><span +class="ec-lmri-10x-x-109">787</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glslongtok</span></span></span>  <a -href="glossaries-user.html#dx1-44004" >710</a> <br /></span> +href="glossaries-user.html#dx1-53004" >788</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsmcols</span></span></span>  <a -href="glossaries-user.html#dx1-54011" ><span -class="ec-lmri-10x-x-109">711</span></a> <br /></span> +href="glossaries-user.html#dx1-63011" ><span +class="ec-lmri-10x-x-109">789</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsmoveentry</span></span></span>  <a -href="glossaries-user.html#dx1-26001" ><span -class="ec-lmri-10x-x-109">712</span></a> <br /></span> +href="glossaries-user.html#dx1-32001" ><span +class="ec-lmri-10x-x-109">790</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLSname</span></span></span>  <a -href="glossaries-user.html#dx1-28148" ><span -class="ec-lmri-10x-x-109">713</span></a> <br /></span> +href="glossaries-user.html#dx1-37152" ><span +class="ec-lmri-10x-x-109">791</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsname</span></span></span>  <a -href="glossaries-user.html#dx1-28147" ><span -class="ec-lmri-10x-x-109">714</span></a> <br /></span> +href="glossaries-user.html#dx1-37151" ><span +class="ec-lmri-10x-x-109">792</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsname</span></span></span>  <a -href="glossaries-user.html#dx1-5023" >715</a>, <a -href="glossaries-user.html#dx1-28140" ><span -class="ec-lmri-10x-x-109">716</span></a>, <a -href="glossaries-user.html#dx1-62065" >717</a> <br /></span> +href="glossaries-user.html#dx1-37148" ><span +class="ec-lmri-10x-x-109">793</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsnamefont</span></span></span>  <a -href="glossaries-user.html#dx1-35042" ><span -class="ec-lmri-10x-x-109">718</span></a>, <a -href="glossaries-user.html#dx1-56037" >719</a> <br /></span> +href="glossaries-user.html#dx1-44045" ><span +class="ec-lmri-10x-x-109">794</span></a>, <a +href="glossaries-user.html#dx1-50020" >795</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsnavhypertarget</span></span></span>  <a -href="glossaries-user.html#dx1-56029" ><span -class="ec-lmri-10x-x-109">720</span></a> <br /></span> +href="glossaries-user.html#dx1-65033" ><span +class="ec-lmri-10x-x-109">796</span></a> <br /></span> + + + +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsnoexpandfields</span></span></span>  <a +href="glossaries-user.html#dx1-27023" ><span +class="ec-lmri-10x-x-109">797</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsnumberformat</span></span></span>  <a -href="glossaries-user.html#dx1-38041" >721</a> <br /></span> +href="glossaries-user.html#dx1-47048" >798</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsnumbersgroupname</span></span></span>  <a -href="glossaries-user.html#dx1-6022" >722</a> <br /></span> +href="glossaries-user.html#dx1-8024" >799</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsnumbersgrouptitle</span></span></span>  <a +href="glossaries-user.html#dx1-65030" >800</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsnumlistlastsep</span></span></span>  <a -href="glossaries-user.html#dx1-34060" ><span -class="ec-lmri-10x-x-109">723</span></a> <br /></span> +href="glossaries-user.html#dx1-43068" ><span +class="ec-lmri-10x-x-109">801</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsnumlistsep</span></span></span>  <a -href="glossaries-user.html#dx1-34059" ><span -class="ec-lmri-10x-x-109">724</span></a> <br /></span> +href="glossaries-user.html#dx1-43067" ><span +class="ec-lmri-10x-x-109">802</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsopenbrace</span></span></span>  <a -href="glossaries-user.html#dx1-36012" ><span -class="ec-lmri-10x-x-109">725</span></a> <br /></span> +href="glossaries-user.html#dx1-45012" ><span +class="ec-lmri-10x-x-109">803</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glspagelistwidth</span></span></span>  <a -href="glossaries-user.html#dx1-47016" ><span -class="ec-lmri-10x-x-109">726</span></a>, <a -href="glossaries-user.html#dx1-49024" >727</a>, <a -href="glossaries-user.html#dx1-49043" >728</a>, <a -href="glossaries-user.html#dx1-50024" >729</a>, <a -href="glossaries-user.html#dx1-50034" >730</a>, <a -href="glossaries-user.html#dx1-51030" >731</a>, <a -href="glossaries-user.html#dx1-51049" >732</a>, <a -href="glossaries-user.html#dx1-52027" >733</a> <br /></span> +href="glossaries-user.html#dx1-56016" ><span +class="ec-lmri-10x-x-109">804</span></a>, <a +href="glossaries-user.html#dx1-58024" >805</a>, <a +href="glossaries-user.html#dx1-58043" >806</a>, <a +href="glossaries-user.html#dx1-59024" >807</a>, <a +href="glossaries-user.html#dx1-59034" >808</a>, <a +href="glossaries-user.html#dx1-60030" >809</a>, <a +href="glossaries-user.html#dx1-60049" >810</a>, <a +href="glossaries-user.html#dx1-61027" >811</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glspar</span></span></span>  <a -href="glossaries-user.html#dx1-19025" ><span -class="ec-lmri-10x-x-109">734</span></a> <br /></span> +href="glossaries-user.html#dx1-23028" ><span +class="ec-lmri-10x-x-109">812</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLSpl</span></span></span>  <a -href="glossaries-user.html#dx1-2013" >735</a>, <a -href="glossaries-user.html#dx1-19033" >736</a>, <a -href="glossaries-user.html#dx1-19047" >737</a>, <a -href="glossaries-user.html#dx1-19085" >738</a>, <a -href="glossaries-user.html#dx1-28102" ><span -class="ec-lmri-10x-x-109">739</span></a> <br /></span> +href="glossaries-user.html#dx1-4012" >813</a>, <a +href="glossaries-user.html#dx1-23042" >814</a>, <a +href="glossaries-user.html#dx1-23077" >815</a>, <a +href="glossaries-user.html#dx1-37106" ><span +class="ec-lmri-10x-x-109">816</span></a>, <a +href="glossaries-user.html#dx1-67042" >817</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glspl</span></span></span>  <a -href="glossaries-user.html#dx1-2012" >740</a>, <a -href="glossaries-user.html#dx1-19032" >741</a>, <a -href="glossaries-user.html#dx1-19046" >742</a>, <a -href="glossaries-user.html#dx1-19084" >743</a>, <a -href="glossaries-user.html#dx1-19129" >744</a>, <a -href="glossaries-user.html#dx1-28101" ><span -class="ec-lmri-10x-x-109">745</span></a>, <a -href="glossaries-user.html#dx1-41113" >746</a> <br /></span> +href="glossaries-user.html#dx1-4011" >818</a>, <a +href="glossaries-user.html#dx1-23041" >819</a>, <a +href="glossaries-user.html#dx1-23076" >820</a>, <a +href="glossaries-user.html#dx1-23130" >821</a>, <a +href="glossaries-user.html#dx1-37105" ><span +class="ec-lmri-10x-x-109">822</span></a>, <a +href="glossaries-user.html#dx1-50122" >823</a>, <a +href="glossaries-user.html#dx1-67040" >824</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glspl</span></span></span>  <a -href="glossaries-user.html#dx1-2011" >747</a>, <a -href="glossaries-user.html#dx1-19031" >748</a>, <a -href="glossaries-user.html#dx1-19045" >749</a>, <a -href="glossaries-user.html#dx1-19053" >750</a>, <a -href="glossaries-user.html#dx1-19059" >751</a>, <a -href="glossaries-user.html#dx1-19068" >752</a>, <a -href="glossaries-user.html#dx1-19070" >753</a>, <a -href="glossaries-user.html#dx1-19083" >754</a>, <a -href="glossaries-user.html#dx1-28032" >755</a>, <a -href="glossaries-user.html#dx1-28100" ><span -class="ec-lmri-10x-x-109">756</span></a>, <a -href="glossaries-user.html#dx1-29004" >757</a>, <a -href="glossaries-user.html#dx1-29017" >758</a>, <a -href="glossaries-user.html#dx1-29031" >759</a>, <a -href="glossaries-user.html#dx1-30015" >760</a>, <a -href="glossaries-user.html#dx1-41111" >761</a>, <a -href="glossaries-user.html#dx1-42005" >762</a>, <a -href="glossaries-user.html#dx1-46002" >763</a> <br /></span> +href="glossaries-user.html#dx1-4010" >825</a>, <a +href="glossaries-user.html#dx1-23040" >826</a>, <a +href="glossaries-user.html#dx1-23048" >827</a>, <a +href="glossaries-user.html#dx1-23054" >828</a>, <a +href="glossaries-user.html#dx1-23063" >829</a>, <a +href="glossaries-user.html#dx1-23065" >830</a>, <a +href="glossaries-user.html#dx1-23075" >831</a>, <a +href="glossaries-user.html#dx1-37036" >832</a>, <a +href="glossaries-user.html#dx1-37104" ><span +class="ec-lmri-10x-x-109">833</span></a>, <a +href="glossaries-user.html#dx1-38004" >834</a>, <a +href="glossaries-user.html#dx1-38014" >835</a>, <a +href="glossaries-user.html#dx1-38038" >836</a>, <a +href="glossaries-user.html#dx1-39015" >837</a>, <a +href="glossaries-user.html#dx1-50120" >838</a>, <a +href="glossaries-user.html#dx1-51005" >839</a>, <a +href="glossaries-user.html#dx1-55002" >840</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLSplural</span></span></span>  <a -href="glossaries-user.html#dx1-28134" ><span -class="ec-lmri-10x-x-109">764</span></a> <br /></span> +href="glossaries-user.html#dx1-37140" ><span +class="ec-lmri-10x-x-109">841</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsplural</span></span></span>  <a -href="glossaries-user.html#dx1-28133" ><span -class="ec-lmri-10x-x-109">765</span></a> <br /></span> +href="glossaries-user.html#dx1-37139" ><span +class="ec-lmri-10x-x-109">842</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsplural</span></span></span>  <a -href="glossaries-user.html#dx1-28130" ><span -class="ec-lmri-10x-x-109">766</span></a> <br /></span> +href="glossaries-user.html#dx1-37136" ><span +class="ec-lmri-10x-x-109">843</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glspluralsuffix</span></span></span>  <a -href="glossaries-user.html#dx1-19054" >767</a>, <a -href="glossaries-user.html#dx1-19056" >768</a>, <a -href="glossaries-user.html#dx1-19062" >769</a>, <a -href="glossaries-user.html#dx1-20001" ><span -class="ec-lmri-10x-x-109">770</span></a> <br /></span> +href="glossaries-user.html#dx1-23049" >844</a>, <a +href="glossaries-user.html#dx1-23051" >845</a>, <a +href="glossaries-user.html#dx1-23057" >846</a>, <a +href="glossaries-user.html#dx1-24001" ><span +class="ec-lmri-10x-x-109">847</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glspostdescription</span></span></span>  <a -href="glossaries-user.html#dx1-47035" ><span -class="ec-lmri-10x-x-109">771</span></a> <br /></span> +href="glossaries-user.html#dx1-56035" ><span +class="ec-lmri-10x-x-109">848</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glspostinline</span></span></span>  <a -href="glossaries-user.html#dx1-55015" ><span -class="ec-lmri-10x-x-109">772</span></a>, <a -href="glossaries-user.html#dx1-55016" >773</a> <br /></span> +href="glossaries-user.html#dx1-64015" ><span +class="ec-lmri-10x-x-109">849</span></a>, <a +href="glossaries-user.html#dx1-64016" >850</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glsprestandardsort</span></span></span>  <a +href="glossaries-user.html#dx1-18017" ><span +class="ec-lmri-10x-x-109">851</span></a>, <a +href="glossaries-user.html#dx1-23091" >852</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsquote</span></span></span>  <a -href="glossaries-user.html#dx1-36015" ><span -class="ec-lmri-10x-x-109">774</span></a> <br /></span> +href="glossaries-user.html#dx1-45015" ><span +class="ec-lmri-10x-x-109">853</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsrefentry</span></span></span>  <a -href="glossaries-user.html#dx1-4044" >775</a>, <a -href="glossaries-user.html#dx1-15005" ><span -class="ec-lmri-10x-x-109">776</span></a>, <a -href="glossaries-user.html#dx1-15026" >777</a> <br /></span> +href="glossaries-user.html#dx1-6059" >854</a>, <a +href="glossaries-user.html#dx1-17005" ><span +class="ec-lmri-10x-x-109">855</span></a>, <a +href="glossaries-user.html#dx1-17026" >856</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsreset</span></span></span>  <a -href="glossaries-user.html#dx1-41043" >778</a>, <a -href="glossaries-user.html#dx1-46006" ><span -class="ec-lmri-10x-x-109">779</span></a> <br /></span> +href="glossaries-user.html#dx1-50043" >857</a>, <a +href="glossaries-user.html#dx1-55006" ><span +class="ec-lmri-10x-x-109">858</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsresetall</span></span></span>  <a -href="glossaries-user.html#dx1-46010" ><span -class="ec-lmri-10x-x-109">780</span></a> <br /></span> +href="glossaries-user.html#dx1-55010" ><span +class="ec-lmri-10x-x-109">859</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsresetentrycounter</span></span></span>  <a -href="glossaries-user.html#dx1-15015" ><span -class="ec-lmri-10x-x-109">781</span></a> <br /></span> +href="glossaries-user.html#dx1-17018" ><span +class="ec-lmri-10x-x-109">860</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glssee</span></span></span>  <a -href="glossaries-user.html#dx1-15060" >782</a>, <a -href="glossaries-user.html#dx1-28057" >783</a>, <a -href="glossaries-user.html#dx1-32019" ><span -class="ec-lmri-10x-x-109">784</span></a>, <a -href="glossaries-user.html#dx1-32029" >785</a>, <a -href="glossaries-user.html#dx1-32035" >786</a>, <a -href="glossaries-user.html#dx1-3002" >787</a> <br /></span> +href="glossaries-user.html#dx1-17064" >861</a>, <a +href="glossaries-user.html#dx1-37061" >862</a>, <a +href="glossaries-user.html#dx1-41015" ><span +class="ec-lmri-10x-x-109">863</span></a>, <a +href="glossaries-user.html#dx1-41025" >864</a>, <a +href="glossaries-user.html#dx1-41031" >865</a>, <a +href="glossaries-user.html#dx1-5002" >866</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsseeformat</span></span></span>  <a -href="glossaries-user.html#dx1-2002" >788</a>, <a -href="glossaries-user.html#dx1-33002" ><span -class="ec-lmri-10x-x-109">789</span></a>, <a -href="glossaries-user.html#dx1-33018" >790</a> <br /></span> +href="glossaries-user.html#dx1-4001" >867</a>, <a +href="glossaries-user.html#dx1-42002" ><span +class="ec-lmri-10x-x-109">868</span></a>, <a +href="glossaries-user.html#dx1-42018" >869</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsseeitemformat</span></span></span>  <a -href="glossaries-user.html#dx1-33012" ><span -class="ec-lmri-10x-x-109">791</span></a> <br /></span> +href="glossaries-user.html#dx1-42012" ><span +class="ec-lmri-10x-x-109">870</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsseelastsep</span></span></span>  <a -href="glossaries-user.html#dx1-33010" ><span -class="ec-lmri-10x-x-109">792</span></a> <br /></span> +href="glossaries-user.html#dx1-42010" ><span +class="ec-lmri-10x-x-109">871</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsseelist</span></span></span>  <a -href="glossaries-user.html#dx1-2005" >793</a>, <a -href="glossaries-user.html#dx1-33019" >794</a> <br /></span> +href="glossaries-user.html#dx1-4004" >872</a>, <a +href="glossaries-user.html#dx1-42019" >873</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsseesep</span></span></span>  <a -href="glossaries-user.html#dx1-33009" ><span -class="ec-lmri-10x-x-109">795</span></a> <br /></span> +href="glossaries-user.html#dx1-42009" ><span +class="ec-lmri-10x-x-109">874</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsSetAlphaCompositor</span></span></span>  <a -href="glossaries-user.html#dx1-18030" ><span -class="ec-lmri-10x-x-109">796</span></a> <br /></span> +href="glossaries-user.html#dx1-22030" ><span +class="ec-lmri-10x-x-109">875</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsSetCompositor</span></span></span>  <a -href="glossaries-user.html#dx1-18027" ><span -class="ec-lmri-10x-x-109">797</span></a> <br /></span> +href="glossaries-user.html#dx1-22027" ><span +class="ec-lmri-10x-x-109">876</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glssetexpandfield</span></span></span>  <a +href="glossaries-user.html#dx1-27007" ><span +class="ec-lmri-10x-x-109">877</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glssetnoexpandfield</span></span></span>  <a +href="glossaries-user.html#dx1-27008" ><span +class="ec-lmri-10x-x-109">878</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsSetSuffixF</span></span></span>  <a -href="glossaries-user.html#dx1-27019" ><span -class="ec-lmri-10x-x-109">798</span></a> <br /></span> +href="glossaries-user.html#dx1-36019" ><span +class="ec-lmri-10x-x-109">879</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsSetSuffixFF</span></span></span>  <a -href="glossaries-user.html#dx1-27020" ><span -class="ec-lmri-10x-x-109">799</span></a> <br /></span> +href="glossaries-user.html#dx1-36020" ><span +class="ec-lmri-10x-x-109">880</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glssetwidest</span></span></span>  <a -href="glossaries-user.html#dx1-53033" ><span -class="ec-lmri-10x-x-109">800</span></a> <br /></span> +href="glossaries-user.html#dx1-62033" ><span +class="ec-lmri-10x-x-109">881</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GlsSetXdyCodePage</span></span></span>  <a -href="glossaries-user.html#dx1-7098" >801</a>, <a -href="glossaries-user.html#dx1-37013" ><span -class="ec-lmri-10x-x-109">802</span></a> <br /></span> +href="glossaries-user.html#dx1-9101" >882</a>, <a +href="glossaries-user.html#dx1-18076" >883</a>, <a +href="glossaries-user.html#dx1-46015" ><span +class="ec-lmri-10x-x-109">884</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GlsSetXdyFirstLetterAfterDigits</span></span></span>  <a -href="glossaries-user.html#dx1-39002" ><span -class="ec-lmri-10x-x-109">803</span></a> <br /></span> +href="glossaries-user.html#dx1-48002" ><span +class="ec-lmri-10x-x-109">885</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GlsSetXdyLanguage</span></span></span>  <a -href="glossaries-user.html#dx1-7097" >804</a>, <a -href="glossaries-user.html#dx1-37010" ><span -class="ec-lmri-10x-x-109">805</span></a> <br /></span> - - - +href="glossaries-user.html#dx1-9100" >886</a>, <a +href="glossaries-user.html#dx1-18075" >887</a>, <a +href="glossaries-user.html#dx1-21017" >888</a>, <a +href="glossaries-user.html#dx1-46012" ><span +class="ec-lmri-10x-x-109">889</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GlsSetXdyLocationClassOrder</span></span></span>  <a -href="glossaries-user.html#dx1-38051" ><span -class="ec-lmri-10x-x-109">806</span></a> <br /></span> +href="glossaries-user.html#dx1-47058" ><span +class="ec-lmri-10x-x-109">890</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GlsSetXdyMinRangeLength</span></span></span>  <a -href="glossaries-user.html#dx1-27012" >807</a>, <a -href="glossaries-user.html#dx1-38057" ><span -class="ec-lmri-10x-x-109">808</span></a> <br /></span> +href="glossaries-user.html#dx1-36012" >891</a>, <a +href="glossaries-user.html#dx1-47064" ><span +class="ec-lmri-10x-x-109">892</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsshorttok</span></span></span>  <a -href="glossaries-user.html#dx1-44005" >809</a> <br /></span> +href="glossaries-user.html#dx1-53005" >893</a> <br /></span> + + + +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\glssortnumberfmt</span></span></span>  <a +href="glossaries-user.html#dx1-18013" ><span +class="ec-lmri-10x-x-109">894</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glssubentrycounterlabel</span></span></span>  <a -href="glossaries-user.html#dx1-56062" ><span -class="ec-lmri-10x-x-109">810</span></a> <br /></span> +href="glossaries-user.html#dx1-65070" ><span +class="ec-lmri-10x-x-109">895</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glssubentryitem</span></span></span>  <a -href="glossaries-user.html#dx1-56059" ><span -class="ec-lmri-10x-x-109">811</span></a>, <a -href="glossaries-user.html#dx1-57011" >812</a> <br /></span> +href="glossaries-user.html#dx1-65067" ><span +class="ec-lmri-10x-x-109">896</span></a>, <a +href="glossaries-user.html#dx1-65086" >897</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLSsymbol</span></span></span>  <a -href="glossaries-user.html#dx1-28157" ><span -class="ec-lmri-10x-x-109">813</span></a> <br /></span> +href="glossaries-user.html#dx1-37157" ><span +class="ec-lmri-10x-x-109">898</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glssymbol</span></span></span>  <a -href="glossaries-user.html#dx1-28156" ><span -class="ec-lmri-10x-x-109">814</span></a> <br /></span> +href="glossaries-user.html#dx1-37156" ><span +class="ec-lmri-10x-x-109">899</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glssymbol</span></span></span>  <a -href="glossaries-user.html#dx1-28149" ><span -class="ec-lmri-10x-x-109">815</span></a> <br /></span> +href="glossaries-user.html#dx1-37153" ><span +class="ec-lmri-10x-x-109">900</span></a>, <a +href="glossaries-user.html#dx1-38033" >901</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glssymbolsgroupname</span></span></span>  <a -href="glossaries-user.html#dx1-6021" >816</a> <br /></span> +href="glossaries-user.html#dx1-8023" >902</a>, <a +href="glossaries-user.html#dx1-65029" >903</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glstarget</span></span></span>  <a -href="glossaries-user.html#dx1-56044" ><span -class="ec-lmri-10x-x-109">817</span></a>, <a -href="glossaries-user.html#dx1-56061" >818</a> <br /></span> +href="glossaries-user.html#dx1-65052" ><span +class="ec-lmri-10x-x-109">904</span></a>, <a +href="glossaries-user.html#dx1-65069" >905</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLStext</span></span></span>  <a -href="glossaries-user.html#dx1-28124" ><span -class="ec-lmri-10x-x-109">819</span></a> <br /></span> +href="glossaries-user.html#dx1-26008" >906</a>, <a +href="glossaries-user.html#dx1-37128" ><span +class="ec-lmri-10x-x-109">907</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glstext</span></span></span>  <a -href="glossaries-user.html#dx1-28123" ><span -class="ec-lmri-10x-x-109">820</span></a> <br /></span> +href="glossaries-user.html#dx1-26007" >908</a>, <a +href="glossaries-user.html#dx1-37127" ><span +class="ec-lmri-10x-x-109">909</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glstext</span></span></span>  <a -href="glossaries-user.html#dx1-5021" >821</a>, <a -href="glossaries-user.html#dx1-28117" ><span -class="ec-lmri-10x-x-109">822</span></a>, <a -href="glossaries-user.html#dx1-28131" >823</a>, <a -href="glossaries-user.html#dx1-28136" >824</a>, <a -href="glossaries-user.html#dx1-28141" >825</a>, <a -href="glossaries-user.html#dx1-28150" >826</a>, <a -href="glossaries-user.html#dx1-28159" >827</a>, <a -href="glossaries-user.html#dx1-28168" >828</a>, <a -href="glossaries-user.html#dx1-41062" >829</a>, <a -href="glossaries-user.html#dx1-41066" >830</a>, <a -href="glossaries-user.html#dx1-62067" >831</a> <br /></span> +href="glossaries-user.html#dx1-26006" >910</a>, <a +href="glossaries-user.html#dx1-37121" ><span +class="ec-lmri-10x-x-109">911</span></a>, <a +href="glossaries-user.html#dx1-37137" >912</a>, <a +href="glossaries-user.html#dx1-37144" >913</a>, <a +href="glossaries-user.html#dx1-37149" >914</a>, <a +href="glossaries-user.html#dx1-37154" >915</a>, <a +href="glossaries-user.html#dx1-37159" >916</a>, <a +href="glossaries-user.html#dx1-37164" >917</a>, <a +href="glossaries-user.html#dx1-38026" >918</a>, <a +href="glossaries-user.html#dx1-50064" >919</a>, <a +href="glossaries-user.html#dx1-50068" >920</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glstextformat</span></span></span>  <a -href="glossaries-user.html#dx1-28027" ><span -class="ec-lmri-10x-x-109">832</span></a>, <a -href="glossaries-user.html#dx1-29029" >833</a>, <a -href="glossaries-user.html#dx1-34001" >834</a> <br /></span> +href="glossaries-user.html#dx1-37031" ><span +class="ec-lmri-10x-x-109">921</span></a>, <a +href="glossaries-user.html#dx1-38036" >922</a>, <a +href="glossaries-user.html#dx1-43001" >923</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glstocfalse</span></span></span>  <a -href="glossaries-user.html#dx1-14003" ><span -class="ec-lmri-10x-x-109">835</span></a> <br /></span> +href="glossaries-user.html#dx1-16003" ><span +class="ec-lmri-10x-x-109">924</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glstoctrue</span></span></span>  <a -href="glossaries-user.html#dx1-14002" ><span -class="ec-lmri-10x-x-109">836</span></a> <br /></span> +href="glossaries-user.html#dx1-16002" ><span +class="ec-lmri-10x-x-109">925</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glstreeindent</span></span></span>  <a -href="glossaries-user.html#dx1-53017" ><span -class="ec-lmri-10x-x-109">837</span></a> <br /></span> +href="glossaries-user.html#dx1-62017" ><span +class="ec-lmri-10x-x-109">926</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsunset</span></span></span>  <a -href="glossaries-user.html#dx1-46008" ><span -class="ec-lmri-10x-x-109">838</span></a> <br /></span> +href="glossaries-user.html#dx1-55008" ><span +class="ec-lmri-10x-x-109">927</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsunsetall</span></span></span>  <a -href="glossaries-user.html#dx1-46012" ><span -class="ec-lmri-10x-x-109">839</span></a> <br /></span> +href="glossaries-user.html#dx1-39026" >928</a>, <a +href="glossaries-user.html#dx1-55012" ><span +class="ec-lmri-10x-x-109">929</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLSuseri</span></span></span>  <a -href="glossaries-user.html#dx1-28171" ><span -class="ec-lmri-10x-x-109">840</span></a> <br /></span> +href="glossaries-user.html#dx1-37167" ><span +class="ec-lmri-10x-x-109">930</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsuseri</span></span></span>  <a -href="glossaries-user.html#dx1-28170" ><span -class="ec-lmri-10x-x-109">841</span></a> <br /></span> +href="glossaries-user.html#dx1-37166" ><span +class="ec-lmri-10x-x-109">931</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsuseri</span></span></span>  <a -href="glossaries-user.html#dx1-28167" ><span -class="ec-lmri-10x-x-109">842</span></a> <br /></span> +href="glossaries-user.html#dx1-37163" ><span +class="ec-lmri-10x-x-109">932</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLSuserii</span></span></span>  <a -href="glossaries-user.html#dx1-28174" ><span -class="ec-lmri-10x-x-109">843</span></a> <br /></span> +href="glossaries-user.html#dx1-37170" ><span +class="ec-lmri-10x-x-109">933</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsuserii</span></span></span>  <a -href="glossaries-user.html#dx1-28173" ><span -class="ec-lmri-10x-x-109">844</span></a> <br /></span> +href="glossaries-user.html#dx1-37169" ><span +class="ec-lmri-10x-x-109">934</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsuserii</span></span></span>  <a -href="glossaries-user.html#dx1-28172" ><span -class="ec-lmri-10x-x-109">845</span></a> <br /></span> +href="glossaries-user.html#dx1-37168" ><span +class="ec-lmri-10x-x-109">935</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLSuseriii</span></span></span>  <a -href="glossaries-user.html#dx1-28177" ><span -class="ec-lmri-10x-x-109">846</span></a> <br /></span> +href="glossaries-user.html#dx1-37173" ><span +class="ec-lmri-10x-x-109">936</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsuseriii</span></span></span>  <a -href="glossaries-user.html#dx1-28176" ><span -class="ec-lmri-10x-x-109">847</span></a> <br /></span> +href="glossaries-user.html#dx1-37172" ><span +class="ec-lmri-10x-x-109">937</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsuseriii</span></span></span>  <a -href="glossaries-user.html#dx1-28175" ><span -class="ec-lmri-10x-x-109">848</span></a> <br /></span> +href="glossaries-user.html#dx1-37171" ><span +class="ec-lmri-10x-x-109">938</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLSuseriv</span></span></span>  <a -href="glossaries-user.html#dx1-28180" ><span -class="ec-lmri-10x-x-109">849</span></a> <br /></span> +href="glossaries-user.html#dx1-37176" ><span +class="ec-lmri-10x-x-109">939</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsuseriv</span></span></span>  <a -href="glossaries-user.html#dx1-28179" ><span -class="ec-lmri-10x-x-109">850</span></a> <br /></span> +href="glossaries-user.html#dx1-37175" ><span +class="ec-lmri-10x-x-109">940</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsuseriv</span></span></span>  <a -href="glossaries-user.html#dx1-28178" ><span -class="ec-lmri-10x-x-109">851</span></a> <br /></span> +href="glossaries-user.html#dx1-37174" ><span +class="ec-lmri-10x-x-109">941</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLSuserv</span></span></span>  <a -href="glossaries-user.html#dx1-28183" ><span -class="ec-lmri-10x-x-109">852</span></a> <br /></span> +href="glossaries-user.html#dx1-37179" ><span +class="ec-lmri-10x-x-109">942</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsuserv</span></span></span>  <a -href="glossaries-user.html#dx1-28182" ><span -class="ec-lmri-10x-x-109">853</span></a> <br /></span> +href="glossaries-user.html#dx1-37178" ><span +class="ec-lmri-10x-x-109">943</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsuserv</span></span></span>  <a -href="glossaries-user.html#dx1-28181" ><span -class="ec-lmri-10x-x-109">854</span></a> <br /></span> +href="glossaries-user.html#dx1-37177" ><span +class="ec-lmri-10x-x-109">944</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\GLSuservi</span></span></span>  <a -href="glossaries-user.html#dx1-28186" ><span -class="ec-lmri-10x-x-109">855</span></a> <br /></span> +href="glossaries-user.html#dx1-37182" ><span +class="ec-lmri-10x-x-109">945</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Glsuservi</span></span></span>  <a -href="glossaries-user.html#dx1-28185" ><span -class="ec-lmri-10x-x-109">856</span></a> <br /></span> +href="glossaries-user.html#dx1-37181" ><span +class="ec-lmri-10x-x-109">946</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\glsuservi</span></span></span>  <a -href="glossaries-user.html#dx1-28184" ><span -class="ec-lmri-10x-x-109">857</span></a> <br /></span> +href="glossaries-user.html#dx1-37180" ><span +class="ec-lmri-10x-x-109">947</span></a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">H</span> <span class="index-item"><span class="ec-lmss-10x-x-109">html </span>package  <a -href="glossaries-user.html#dx1-30002" >858</a> <br /></span> +href="glossaries-user.html#dx1-39002" >948</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\hyperbf</span></span></span>  <a -href="glossaries-user.html#dx1-28064" >859</a> <br /></span> +href="glossaries-user.html#dx1-37068" >949</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\hyperbsf</span></span></span>  <a -href="glossaries-user.html#dx1-28072" >860</a> <br /></span> - - - +href="glossaries-user.html#dx1-37076" >950</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\hyperemph</span></span></span>  <a -href="glossaries-user.html#dx1-28070" >861</a> <br /></span> +href="glossaries-user.html#dx1-37074" >951</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\hyperit</span></span></span>  <a -href="glossaries-user.html#dx1-28066" >862</a> <br /></span> +href="glossaries-user.html#dx1-37070" >952</a> <br /></span> + + + <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\hyperlink</span></span></span>  <a -href="glossaries-user.html#dx1-28071" >863</a>, <a -href="glossaries-user.html#dx1-28078" >864</a>, <a -href="glossaries-user.html#dx1-30008" >865</a> <br /></span> +href="glossaries-user.html#dx1-37075" >953</a>, <a +href="glossaries-user.html#dx1-37082" >954</a>, <a +href="glossaries-user.html#dx1-39008" >955</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\hypermd</span></span></span>  <a -href="glossaries-user.html#dx1-28065" >866</a> <br /></span> +href="glossaries-user.html#dx1-37069" >956</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\hyperpage</span></span></span>  <a -href="glossaries-user.html#dx1-28058" >867</a> <br /></span> +href="glossaries-user.html#dx1-37062" >957</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">hyperref </span>package  <a -href="glossaries-user.html#dx1-5" >868</a>, <a -href="glossaries-user.html#dx1-6" >869</a>, <a -href="glossaries-user.html#dx1-27023" >870</a>, <a -href="glossaries-user.html#dx1-28010" >871</a>, <a -href="glossaries-user.html#dx1-28014" >872</a>, <a -href="glossaries-user.html#dx1-28059" >873</a>, <a -href="glossaries-user.html#dx1-28105" >874</a>, <a -href="glossaries-user.html#dx1-30001" >875</a>, <a -href="glossaries-user.html#dx1-30010" >876</a>, <a -href="glossaries-user.html#dx1-34062" >877</a>, <a -href="glossaries-user.html#dx1-38030" >878</a>, <a -href="glossaries-user.html#dx1-38039" >879</a>, <a -href="glossaries-user.html#dx1-44058" >880</a>, <a -href="glossaries-user.html#dx1-56045" >881</a> <br /></span> +href="glossaries-user.html#dx1-5" >958</a>, <a +href="glossaries-user.html#dx1-6" >959</a>, <a +href="glossaries-user.html#dx1-13" >960</a>, <a +href="glossaries-user.html#dx1-36023" >961</a>, <a +href="glossaries-user.html#dx1-37010" >962</a>, <a +href="glossaries-user.html#dx1-37014" >963</a>, <a +href="glossaries-user.html#dx1-37017" >964</a>, <a +href="glossaries-user.html#dx1-37063" >965</a>, <a +href="glossaries-user.html#dx1-37109" >966</a>, <a +href="glossaries-user.html#dx1-39001" >967</a>, <a +href="glossaries-user.html#dx1-39010" >968</a>, <a +href="glossaries-user.html#dx1-43004" >969</a>, <a +href="glossaries-user.html#dx1-43005" >970</a>, <a +href="glossaries-user.html#dx1-43070" >971</a>, <a +href="glossaries-user.html#dx1-47035" >972</a>, <a +href="glossaries-user.html#dx1-47046" >973</a>, <a +href="glossaries-user.html#dx1-53047" >974</a>, <a +href="glossaries-user.html#dx1-65053" >975</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\hyperrm</span></span></span>  <a -href="glossaries-user.html#dx1-28061" >882</a>, <a -href="glossaries-user.html#dx1-38014" >883</a> <br /></span> +href="glossaries-user.html#dx1-37065" >976</a>, <a +href="glossaries-user.html#dx1-47014" >977</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\hypersc</span></span></span>  <a -href="glossaries-user.html#dx1-28069" >884</a> <br /></span> +href="glossaries-user.html#dx1-37073" >978</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\hypersf</span></span></span>  <a -href="glossaries-user.html#dx1-28062" >885</a> <br /></span> +href="glossaries-user.html#dx1-37066" >979</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\hypersl</span></span></span>  <a -href="glossaries-user.html#dx1-28067" >886</a> <br /></span> +href="glossaries-user.html#dx1-37071" >980</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\hypertarget</span></span></span>  <a -href="glossaries-user.html#dx1-30009" >887</a> <br /></span> +href="glossaries-user.html#dx1-39009" >981</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\hypertt</span></span></span>  <a -href="glossaries-user.html#dx1-28063" >888</a> <br /></span> +href="glossaries-user.html#dx1-37067" >982</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\hyperup</span></span></span>  <a -href="glossaries-user.html#dx1-28068" >889</a> <br /></span> +href="glossaries-user.html#dx1-37072" >983</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">I</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\ifglossaryexists</span></span></span>  <a -href="glossaries-user.html#dx1-60005" ><span -class="ec-lmri-10x-x-109">890</span></a> <br /></span> +href="glossaries-user.html#dx1-66005" ><span +class="ec-lmri-10x-x-109">984</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\ifglsdescsuppressed</span></span></span>  <a +href="glossaries-user.html#dx1-66024" ><span +class="ec-lmri-10x-x-109">985</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\ifglsentryexists</span></span></span>  <a -href="glossaries-user.html#dx1-60006" ><span -class="ec-lmri-10x-x-109">891</span></a> <br /></span> +href="glossaries-user.html#dx1-66006" ><span +class="ec-lmri-10x-x-109">986</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\ifglshaschildren</span></span></span>  <a -href="glossaries-user.html#dx1-60008" ><span -class="ec-lmri-10x-x-109">892</span></a> <br /></span> +href="glossaries-user.html#dx1-66012" ><span +class="ec-lmri-10x-x-109">987</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\ifglshasdesc</span></span></span>  <a +href="glossaries-user.html#dx1-66022" ><span +class="ec-lmri-10x-x-109">988</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\ifglshaslong</span></span></span>  <a +href="glossaries-user.html#dx1-66016" ><span +class="ec-lmri-10x-x-109">989</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\ifglshasparent</span></span></span>  <a -href="glossaries-user.html#dx1-60009" ><span -class="ec-lmri-10x-x-109">893</span></a> <br /></span> +href="glossaries-user.html#dx1-66013" ><span +class="ec-lmri-10x-x-109">990</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\ifglshasprefix</span></span></span>  <a +href="glossaries-user.html#dx1-67045" ><span +class="ec-lmri-10x-x-109">991</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\ifglshasprefixfirst</span></span></span>  <a +href="glossaries-user.html#dx1-67049" ><span +class="ec-lmri-10x-x-109">992</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\ifglshasprefixfirstplural</span></span></span>  <a +href="glossaries-user.html#dx1-67051" ><span +class="ec-lmri-10x-x-109">993</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\ifglshasprefixplural</span></span></span>  <a +href="glossaries-user.html#dx1-67047" ><span +class="ec-lmri-10x-x-109">994</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\ifglshasshort</span></span></span>  <a +href="glossaries-user.html#dx1-66019" ><span +class="ec-lmri-10x-x-109">995</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\ifglshassymbol</span></span></span>  <a +href="glossaries-user.html#dx1-65092" >996</a>, <a +href="glossaries-user.html#dx1-66014" ><span +class="ec-lmri-10x-x-109">997</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\ifglsucmark</span></span></span>  <a +href="glossaries-user.html#dx1-16027" ><span +class="ec-lmri-10x-x-109">998</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\ifglsused</span></span></span>  <a -href="glossaries-user.html#dx1-46015" ><span -class="ec-lmri-10x-x-109">894</span></a>, <a -href="glossaries-user.html#dx1-60007" ><span -class="ec-lmri-10x-x-109">895</span></a> <br /></span> +href="glossaries-user.html#dx1-38019" >999</a>, <a +href="glossaries-user.html#dx1-55015" ><span +class="ec-lmri-10x-x-109">1000</span></a>, <a +href="glossaries-user.html#dx1-66011" ><span +class="ec-lmri-10x-x-109">1001</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\index</span></span></span>  <a -href="glossaries-user.html#dx1-28042" >896</a>, <a -href="glossaries-user.html#dx1-28043" >897</a>, <a -href="glossaries-user.html#dx1-28044" >898</a>, <a -href="glossaries-user.html#dx1-28055" >899</a> <br /></span> +href="glossaries-user.html#dx1-37046" >1002</a>, <a +href="glossaries-user.html#dx1-37047" >1003</a>, <a +href="glossaries-user.html#dx1-37048" >1004</a>, <a +href="glossaries-user.html#dx1-37059" >1005</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\indexspace</span></span></span>  <a -href="glossaries-user.html#dx1-48012" >900</a>, <a -href="glossaries-user.html#dx1-53005" >901</a>, <a -href="glossaries-user.html#dx1-56034" >902</a>, <a -href="glossaries-user.html#dx1-58004" >903</a>, <a -href="glossaries-user.html#dx1-62102" >904</a> <br /></span> +href="glossaries-user.html#dx1-57012" >1006</a>, <a +href="glossaries-user.html#dx1-62005" >1007</a>, <a +href="glossaries-user.html#dx1-65038" >1008</a>, <a +href="glossaries-user.html#dx1-65098" >1009</a>, <a +href="glossaries-user.html#dx1-69096" >1010</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">inputenc </span>package  <a -href="glossaries-user.html#dx1-4056" >905</a>, <a -href="glossaries-user.html#dx1-5024" >906</a>, <a -href="glossaries-user.html#dx1-19130" >907</a>, <a -href="glossaries-user.html#dx1-37011" >908</a> <br /></span> +href="glossaries-user.html#dx1-6076" >1011</a>, <a +href="glossaries-user.html#dx1-7013" >1012</a>, <a +href="glossaries-user.html#dx1-23131" >1013</a>, <a +href="glossaries-user.html#dx1-46013" >1014</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\inputencodingname</span></span></span>  <a -href="glossaries-user.html#dx1-37012" >909</a> <br /></span> +href="glossaries-user.html#dx1-46014" >1015</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\item</span></span></span>  <a -href="glossaries-user.html#dx1-48009" >910</a>, <a -href="glossaries-user.html#dx1-48018" >911</a> <br /></span> +href="glossaries-user.html#dx1-57009" >1016</a>, <a +href="glossaries-user.html#dx1-57018" >1017</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">itemize </span>(environment)  <a -href="glossaries-user.html#dx1-57001" >912</a> <br /></span> +href="glossaries-user.html#dx1-65076" >1018</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">J</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\jobname</span></span></span>  <a -href="glossaries-user.html#dx1-18015" >913</a>, <a -href="glossaries-user.html#dx1-18019" >914</a> <br /></span> +href="glossaries-user.html#dx1-22015" >1019</a>, <a +href="glossaries-user.html#dx1-22019" >1020</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">L</span> +<span class="index-item"><span +class="ec-lmtt-10x-x-109">latex</span>  <a +href="glossaries-user.html#dx1-15" >1021</a>, <a +href="glossaries-user.html#dx1-37019" >1022</a> <br /></span> + + + +<span class="index-item"><span +class="ec-lmtt-10x-x-109">latexmk</span>  <a +href="glossaries-user.html#dx1-9019" >1023</a> <br /></span> <span class="index-item">link text  <a -href="glossaries-user.html#dx1-2028" ><span -class="ec-lmbx-10x-x-109">915</span></a>, <a -href="glossaries-user.html#dx1-28003" >916</a>, <a -href="glossaries-user.html#dx1-28013" >917</a>, <a -href="glossaries-user.html#dx1-28016" >918</a>, <a -href="glossaries-user.html#dx1-28019" >919</a>, <a -href="glossaries-user.html#dx1-28026" >920</a>, <a -href="glossaries-user.html#dx1-28029" >921</a>, <a -href="glossaries-user.html#dx1-28088" >922</a>, <a -href="glossaries-user.html#dx1-29002" >923</a>, <a -href="glossaries-user.html#dx1-29028" >924</a>, <a -href="glossaries-user.html#dx1-29041" >925</a> <br /></span> +href="glossaries-user.html#dx1-4027" ><span +class="ec-lmbx-10x-x-109">1024</span></a>, <a +href="glossaries-user.html#dx1-37003" >1025</a>, <a +href="glossaries-user.html#dx1-37013" >1026</a>, <a +href="glossaries-user.html#dx1-37016" >1027</a>, <a +href="glossaries-user.html#dx1-37023" >1028</a>, <a +href="glossaries-user.html#dx1-37030" >1029</a>, <a +href="glossaries-user.html#dx1-37033" >1030</a>, <a +href="glossaries-user.html#dx1-37092" >1031</a>, <a +href="glossaries-user.html#dx1-38002" >1032</a>, <a +href="glossaries-user.html#dx1-38035" >1033</a>, <a +href="glossaries-user.html#dx1-67020" >1034</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\loadglsentries</span></span></span>  <a -href="glossaries-user.html#dx1-25001" ><span -class="ec-lmri-10x-x-109">926</span></a>, <a -href="glossaries-user.html#dx1-41038" >927</a>, <a -href="glossaries-user.html#dx1-19004" >928</a> <br /></span> +href="glossaries-user.html#dx1-31001" ><span +class="ec-lmri-10x-x-109">1035</span></a>, <a +href="glossaries-user.html#dx1-50038" >1036</a>, <a +href="glossaries-user.html#dx1-23004" >1037</a> <br /></span> <span class="index-item">location list  <span class="ec-lmri-10x-x-109">see </span><a -href="glossaries-user.html#dx1-27005" >number list</a> <br /></span> +href="glossaries-user.html#dx1-36005" >number list</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\longnewglossaryentry</span></span></span>  <a +href="glossaries-user.html#dx1-23018" ><span +class="ec-lmri-10x-x-109">1039</span></a>, <a +href="glossaries-user.html#dx1-26003" >1040</a>, <a +href="glossaries-user.html#dx1-31003" >1041</a>, <a +href="glossaries-user.html#dx1-34010" >1042</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\longprovideglossaryentry</span></span></span>  <a +href="glossaries-user.html#dx1-23020" ><span +class="ec-lmri-10x-x-109">1043</span></a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">longtable </span>(environment)  <a -href="glossaries-user.html#dx1-49002" >930</a>, <a -href="glossaries-user.html#dx1-49007" >931</a>, <a -href="glossaries-user.html#dx1-50003" >932</a>, <a -href="glossaries-user.html#dx1-51006" >933</a>, <a -href="glossaries-user.html#dx1-59006" >934</a>, <a -href="glossaries-user.html#dx1-35040" >935</a> <br /></span> +href="glossaries-user.html#dx1-58002" >1044</a>, <a +href="glossaries-user.html#dx1-58007" >1045</a>, <a +href="glossaries-user.html#dx1-59003" >1046</a>, <a +href="glossaries-user.html#dx1-60006" >1047</a>, <a +href="glossaries-user.html#dx1-65107" >1048</a>, <a +href="glossaries-user.html#dx1-44043" >1049</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">longtable </span>package  <a -href="glossaries-user.html#dx1-15035" >936</a>, <a -href="glossaries-user.html#dx1-49009" >937</a> <br /></span> +href="glossaries-user.html#dx1-17035" >1050</a>, <a +href="glossaries-user.html#dx1-58009" >1051</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">M</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\makefirstuc</span></span></span>  <a -href="glossaries-user.html#dx1-29019" >938</a>, <a -href="glossaries-user.html#dx1-29021" >939</a>, <a -href="glossaries-user.html#dx1-42039" >940</a> <br /></span> - - - +href="glossaries-user.html#dx1-16025" >1052</a>, <a +href="glossaries-user.html#dx1-51039" >1053</a> <br /></span> <span class="index-item">makeglossaries  <a -href="glossaries-user.html#dx1-2032" ><span -class="ec-lmbx-10x-x-109">941</span></a> <br /></span> +href="glossaries-user.html#dx1-4031" ><span +class="ec-lmbx-10x-x-109">1054</span></a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">makeglossaries</span>  <a -href="glossaries-user.html#dx1-2039" >942</a>, <a -href="glossaries-user.html#dx1-3007" >943</a>, <a -href="glossaries-user.html#dx1-3014" >944</a>, <a -href="glossaries-user.html#dx1-4007" >945</a>, <a -href="glossaries-user.html#dx1-4017" >946</a>, <a -href="glossaries-user.html#dx1-4027" >947</a>, <a -href="glossaries-user.html#dx1-4039" >948</a>, <a -href="glossaries-user.html#dx1-4048" >949</a>, <a -href="glossaries-user.html#dx1-4058" >950</a>, <a -href="glossaries-user.html#dx1-4062" >951</a>, <a -href="glossaries-user.html#dx1-4064" >952</a>, <a -href="glossaries-user.html#dx1-4069" >953</a>, <a -href="glossaries-user.html#dx1-4073" >954</a>, <a -href="glossaries-user.html#dx1-4083" >955</a>, <a -href="glossaries-user.html#dx1-4086" >956</a>, <a -href="glossaries-user.html#dx1-5026" >957</a>, <a -href="glossaries-user.html#dx1-5030" >958</a>, <a -href="glossaries-user.html#dx1-7019" >959</a>, <a -href="glossaries-user.html#dx1-7026" >960</a>, <a -href="glossaries-user.html#dx1-7032" >961</a>, <a -href="glossaries-user.html#dx1-7038" >962</a>, <a -href="glossaries-user.html#dx1-7050" >963</a>, <a -href="glossaries-user.html#dx1-7054" >964</a>, <a -href="glossaries-user.html#dx1-7058" >965</a>, <a -href="glossaries-user.html#dx1-7064" >966</a>, <a -href="glossaries-user.html#dx1-7072" >967</a>, <a -href="glossaries-user.html#dx1-7078" >968</a>, <a -href="glossaries-user.html#dx1-7082" >969</a>, <a -href="glossaries-user.html#dx1-8002" >970</a>, <a -href="glossaries-user.html#dx1-8009" >971</a>, <a -href="glossaries-user.html#dx1-8011" >972</a>, <a -href="glossaries-user.html#dx1-8015" >973</a>, <a -href="glossaries-user.html#dx1-8017" >974</a>, <a -href="glossaries-user.html#dx1-8020" >975</a>, <a -href="glossaries-user.html#dx1-9009" >976</a>, <a -href="glossaries-user.html#dx1-9029" >977</a>, <a -href="glossaries-user.html#dx1-9033" >978</a>, <a -href="glossaries-user.html#dx1-9037" >979</a>, <a -href="glossaries-user.html#dx1-10023" >980</a>, <a -href="glossaries-user.html#dx1-10027" >981</a>, <a -href="glossaries-user.html#dx1-10031" >982</a>, <a -href="glossaries-user.html#dx1-15007" >983</a>, <a -href="glossaries-user.html#dx1-16017" >984</a>, <a -href="glossaries-user.html#dx1-16022" >985</a>, <a -href="glossaries-user.html#dx1-16026" >986</a>, <a -href="glossaries-user.html#dx1-16036" >987</a>, <a -href="glossaries-user.html#dx1-16040" >988</a>, <a -href="glossaries-user.html#dx1-19010" >989</a>, <a -href="glossaries-user.html#dx1-32006" >990</a>, <a -href="glossaries-user.html#dx1-34054" >991</a>, <a -href="glossaries-user.html#dx1-35003" >992</a>, <a -href="glossaries-user.html#dx1-37006" >993</a>, <a -href="glossaries-user.html#dx1-37018" >994</a>, <a -href="glossaries-user.html#dx1-37022" >995</a>, <a -href="glossaries-user.html#dx1-40009" >996</a>, <a -href="glossaries-user.html#dx1-62043" >997</a>, <a -href="glossaries-user.html#dx1-62045" >998</a>, <a -href="glossaries-user.html#dx1-62078" >999</a>, <a -href="glossaries-user.html#dx1-62080" >1000</a> <br /></span> +href="glossaries-user.html#dx1-4038" >1055</a>, <a +href="glossaries-user.html#dx1-5007" >1056</a>, <a +href="glossaries-user.html#dx1-5014" >1057</a>, <a +href="glossaries-user.html#dx1-6009" >1058</a>, <a +href="glossaries-user.html#dx1-6020" >1059</a>, <a +href="glossaries-user.html#dx1-6037" >1060</a>, <a +href="glossaries-user.html#dx1-6053" >1061</a>, <a +href="glossaries-user.html#dx1-6063" >1062</a>, <a +href="glossaries-user.html#dx1-6078" >1063</a>, <a +href="glossaries-user.html#dx1-6082" >1064</a>, <a +href="glossaries-user.html#dx1-6084" >1065</a>, <a +href="glossaries-user.html#dx1-6089" >1066</a>, <a +href="glossaries-user.html#dx1-6094" >1067</a>, <a +href="glossaries-user.html#dx1-6105" >1068</a>, <a +href="glossaries-user.html#dx1-6108" >1069</a>, <a +href="glossaries-user.html#dx1-6113" >1070</a>, <a +href="glossaries-user.html#dx1-7015" >1071</a>, <a +href="glossaries-user.html#dx1-7019" >1072</a>, <a +href="glossaries-user.html#dx1-9022" >1073</a>, <a +href="glossaries-user.html#dx1-9029" >1074</a>, <a +href="glossaries-user.html#dx1-9035" >1075</a>, <a +href="glossaries-user.html#dx1-9041" >1076</a>, <a +href="glossaries-user.html#dx1-9053" >1077</a>, <a +href="glossaries-user.html#dx1-9057" >1078</a>, <a +href="glossaries-user.html#dx1-9061" >1079</a>, <a +href="glossaries-user.html#dx1-9067" >1080</a>, <a +href="glossaries-user.html#dx1-9075" >1081</a>, <a +href="glossaries-user.html#dx1-9081" >1082</a>, <a +href="glossaries-user.html#dx1-9085" >1083</a>, <a +href="glossaries-user.html#dx1-10002" >1084</a>, <a +href="glossaries-user.html#dx1-10009" >1085</a>, <a +href="glossaries-user.html#dx1-10011" >1086</a>, <a +href="glossaries-user.html#dx1-10016" >1087</a>, <a +href="glossaries-user.html#dx1-10026" >1088</a>, <a +href="glossaries-user.html#dx1-10028" >1089</a>, <a +href="glossaries-user.html#dx1-10031" >1090</a>, <a +href="glossaries-user.html#dx1-11009" >1091</a>, <a +href="glossaries-user.html#dx1-11029" >1092</a>, <a +href="glossaries-user.html#dx1-11033" >1093</a>, <a +href="glossaries-user.html#dx1-11037" >1094</a>, <a +href="glossaries-user.html#dx1-12023" >1095</a>, <a +href="glossaries-user.html#dx1-12027" >1096</a>, <a +href="glossaries-user.html#dx1-12031" >1097</a>, <a +href="glossaries-user.html#dx1-15009" >1098</a>, <a +href="glossaries-user.html#dx1-17007" >1099</a>, <a +href="glossaries-user.html#dx1-18042" >1100</a>, <a +href="glossaries-user.html#dx1-18047" >1101</a>, <a +href="glossaries-user.html#dx1-18051" >1102</a>, <a +href="glossaries-user.html#dx1-18061" >1103</a>, <a +href="glossaries-user.html#dx1-18065" >1104</a>, <a +href="glossaries-user.html#dx1-23010" >1105</a>, <a +href="glossaries-user.html#dx1-41006" >1106</a>, <a +href="glossaries-user.html#dx1-43062" >1107</a>, <a +href="glossaries-user.html#dx1-44003" >1108</a>, <a +href="glossaries-user.html#dx1-46006" >1109</a>, <a +href="glossaries-user.html#dx1-46009" >1110</a>, <a +href="glossaries-user.html#dx1-46020" >1111</a>, <a +href="glossaries-user.html#dx1-46024" >1112</a>, <a +href="glossaries-user.html#dx1-49009" >1113</a>, <a +href="glossaries-user.html#dx1-69045" >1114</a>, <a +href="glossaries-user.html#dx1-69047" >1115</a>, <a +href="glossaries-user.html#dx1-69067" >1116</a>, <a +href="glossaries-user.html#dx1-69069" >1117</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\makeglossaries</span></span></span>  <a -href="glossaries-user.html#dx1-7024" >1001</a>, <a -href="glossaries-user.html#dx1-18001" ><span -class="ec-lmri-10x-x-109">1002</span></a>, <a -href="glossaries-user.html#dx1-19120" >1003</a>, <a -href="glossaries-user.html#dx1-27013" >1004</a>, <a -href="glossaries-user.html#dx1-27025" >1005</a>, <a -href="glossaries-user.html#dx1-32001" >1006</a>, <a -href="glossaries-user.html#dx1-32033" >1007</a>, <a -href="glossaries-user.html#dx1-35012" >1008</a>, <a -href="glossaries-user.html#dx1-38010" >1009</a>, <a -href="glossaries-user.html#dx1-38022" >1010</a>, <a -href="glossaries-user.html#dx1-38023" >1011</a>, <a -href="glossaries-user.html#dx1-38028" >1012</a>, <a -href="glossaries-user.html#dx1-38029" >1013</a>, <a -href="glossaries-user.html#dx1-38053" >1014</a>, <a -href="glossaries-user.html#dx1-38054" >1015</a>, <a -href="glossaries-user.html#dx1-38061" >1016</a>, <a -href="glossaries-user.html#dx1-38062" >1017</a>, <a -href="glossaries-user.html#dx1-39004" >1018</a>, <a -href="glossaries-user.html#dx1-39005" >1019</a>, <a -href="glossaries-user.html#dx1-40016" >1020</a>, <a -href="glossaries-user.html#dx1-62074" >1021</a> <br /></span> +href="glossaries-user.html#dx1-9027" >1118</a>, <a +href="glossaries-user.html#dx1-22001" ><span +class="ec-lmri-10x-x-109">1119</span></a>, <a +href="glossaries-user.html#dx1-23119" >1120</a>, <a +href="glossaries-user.html#dx1-36013" >1121</a>, <a +href="glossaries-user.html#dx1-36025" >1122</a>, <a +href="glossaries-user.html#dx1-41001" >1123</a>, <a +href="glossaries-user.html#dx1-41029" >1124</a>, <a +href="glossaries-user.html#dx1-44012" >1125</a>, <a +href="glossaries-user.html#dx1-47010" >1126</a>, <a +href="glossaries-user.html#dx1-47025" >1127</a>, <a +href="glossaries-user.html#dx1-47026" >1128</a>, <a +href="glossaries-user.html#dx1-47031" >1129</a>, <a +href="glossaries-user.html#dx1-47032" >1130</a>, <a +href="glossaries-user.html#dx1-47060" >1131</a>, <a +href="glossaries-user.html#dx1-47061" >1132</a>, <a +href="glossaries-user.html#dx1-47068" >1133</a>, <a +href="glossaries-user.html#dx1-47069" >1134</a>, <a +href="glossaries-user.html#dx1-48004" >1135</a>, <a +href="glossaries-user.html#dx1-48005" >1136</a>, <a +href="glossaries-user.html#dx1-49018" >1137</a>, <a +href="glossaries-user.html#dx1-69063" >1138</a> <br /></span> <span class="index-item">makeglossariesgui  <a -href="glossaries-user.html#dx1-2037" ><span -class="ec-lmbx-10x-x-109">1022</span></a> <br /></span> +href="glossaries-user.html#dx1-4036" ><span +class="ec-lmbx-10x-x-109">1139</span></a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">makeglossariesgui</span>  <a -href="glossaries-user.html#dx1-7048" >1023</a>, <a -href="glossaries-user.html#dx1-7052" >1024</a>, <a -href="glossaries-user.html#dx1-7056" >1025</a>, <a -href="glossaries-user.html#dx1-9011" >1026</a>, <a -href="glossaries-user.html#dx1-62047" >1027</a> <br /></span> +href="glossaries-user.html#dx1-9051" >1140</a>, <a +href="glossaries-user.html#dx1-9055" >1141</a>, <a +href="glossaries-user.html#dx1-9059" >1142</a>, <a +href="glossaries-user.html#dx1-11011" >1143</a>, <a +href="glossaries-user.html#dx1-69049" >1144</a> <br /></span> <span class="index-item">makeindex  <a -href="glossaries-user.html#dx1-2040" ><span -class="ec-lmbx-10x-x-109">1028</span></a> <br /></span> +href="glossaries-user.html#dx1-4039" ><span +class="ec-lmbx-10x-x-109">1145</span></a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">makeindex</span>  <a -href="glossaries-user.html#dx1-2024" >1029</a>, <a -href="glossaries-user.html#dx1-2036" >1030</a>, <a -href="glossaries-user.html#dx1-3010" >1031</a>, <a -href="glossaries-user.html#dx1-3016" >1032</a>, <a -href="glossaries-user.html#dx1-4009" >1033</a>, <a -href="glossaries-user.html#dx1-4011" >1034</a>, <a -href="glossaries-user.html#dx1-4015" >1035</a>, <a -href="glossaries-user.html#dx1-4025" >1036</a>, <a -href="glossaries-user.html#dx1-4037" >1037</a>, <a -href="glossaries-user.html#dx1-4050" >1038</a>, <a -href="glossaries-user.html#dx1-4055" >1039</a>, <a -href="glossaries-user.html#dx1-4077" >1040</a>, <a -href="glossaries-user.html#dx1-4088" >1041</a>, <a -href="glossaries-user.html#dx1-5004" >1042</a>, <a -href="glossaries-user.html#dx1-5008" >1043</a>, <a -href="glossaries-user.html#dx1-6039" >1044</a>, <a -href="glossaries-user.html#dx1-7005" >1045</a>, <a -href="glossaries-user.html#dx1-7009" >1046</a>, <a -href="glossaries-user.html#dx1-7013" >1047</a>, <a -href="glossaries-user.html#dx1-7021" >1048</a>, <a -href="glossaries-user.html#dx1-7028" >1049</a>, <a -href="glossaries-user.html#dx1-7034" >1050</a>, <a -href="glossaries-user.html#dx1-7040" >1051</a>, <a -href="glossaries-user.html#dx1-7044" >1052</a>, <a -href="glossaries-user.html#dx1-7060" >1053</a>, <a -href="glossaries-user.html#dx1-7066" >1054</a>, <a -href="glossaries-user.html#dx1-7074" >1055</a>, <a -href="glossaries-user.html#dx1-7086" >1056</a>, <a -href="glossaries-user.html#dx1-7091" >1057</a>, <a -href="glossaries-user.html#dx1-8007" >1058</a>, <a -href="glossaries-user.html#dx1-10002" >1059</a>, <a -href="glossaries-user.html#dx1-10005" >1060</a>, <a -href="glossaries-user.html#dx1-10009" >1061</a>, <a -href="glossaries-user.html#dx1-10013" >1062</a>, <a -href="glossaries-user.html#dx1-10016" >1063</a>, <a -href="glossaries-user.html#dx1-10025" >1064</a>, <a -href="glossaries-user.html#dx1-10029" >1065</a>, <a -href="glossaries-user.html#dx1-11004" >1066</a>, <a -href="glossaries-user.html#dx1-11013" >1067</a>, <a -href="glossaries-user.html#dx1-11025" >1068</a>, <a -href="glossaries-user.html#dx1-13033" >1069</a>, <a -href="glossaries-user.html#dx1-13038" >1070</a>, <a -href="glossaries-user.html#dx1-15009" >1071</a>, <a -href="glossaries-user.html#dx1-16020" >1072</a>, <a -href="glossaries-user.html#dx1-16024" >1073</a>, <a -href="glossaries-user.html#dx1-16028" >1074</a>, <a -href="glossaries-user.html#dx1-16044" >1075</a>, <a -href="glossaries-user.html#dx1-18003" >1076</a>, <a -href="glossaries-user.html#dx1-18011" >1077</a>, <a -href="glossaries-user.html#dx1-18018" >1078</a>, <a -href="glossaries-user.html#dx1-19012" >1079</a>, <a -href="glossaries-user.html#dx1-19089" >1080</a>, <a -href="glossaries-user.html#dx1-19133" >1081</a>, <a -href="glossaries-user.html#dx1-22005" >1082</a>, <a -href="glossaries-user.html#dx1-27007" >1083</a>, <a -href="glossaries-user.html#dx1-27016" >1084</a>, <a -href="glossaries-user.html#dx1-28005" >1085</a>, <a -href="glossaries-user.html#dx1-28041" >1086</a>, <a -href="glossaries-user.html#dx1-28050" >1087</a>, <a -href="glossaries-user.html#dx1-34058" >1088</a>, <a -href="glossaries-user.html#dx1-35005" >1089</a>, <a -href="glossaries-user.html#dx1-35009" >1090</a>, <a -href="glossaries-user.html#dx1-40005" >1091</a>, <a -href="glossaries-user.html#dx1-47010" >1092</a>, <a -href="glossaries-user.html#dx1-53014" >1093</a>, <a -href="glossaries-user.html#dx1-56022" >1094</a>, <a -href="glossaries-user.html#dx1-62049" >1095</a>, <a -href="glossaries-user.html#dx1-62089" >1096</a>, <a -href="glossaries-user.html#dx1-33005" >1097</a> <br /></span> -<span class="index-item"><span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">\MakeUppercase</span></span></span>  <a -href="glossaries-user.html#dx1-14020" >1098</a> <br /></span> +href="glossaries-user.html#dx1-4023" >1146</a>, <a +href="glossaries-user.html#dx1-4035" >1147</a>, <a +href="glossaries-user.html#dx1-5010" >1148</a>, <a +href="glossaries-user.html#dx1-5016" >1149</a>, <a +href="glossaries-user.html#dx1-6011" >1150</a>, <a +href="glossaries-user.html#dx1-6013" >1151</a>, <a +href="glossaries-user.html#dx1-6018" >1152</a>, <a +href="glossaries-user.html#dx1-6035" >1153</a>, <a +href="glossaries-user.html#dx1-6051" >1154</a>, <a +href="glossaries-user.html#dx1-6065" >1155</a>, <a +href="glossaries-user.html#dx1-6075" >1156</a>, <a +href="glossaries-user.html#dx1-6099" >1157</a>, <a +href="glossaries-user.html#dx1-6110" >1158</a>, <a +href="glossaries-user.html#dx1-7004" >1159</a>, <a +href="glossaries-user.html#dx1-7008" >1160</a>, <a +href="glossaries-user.html#dx1-8041" >1161</a>, <a +href="glossaries-user.html#dx1-9006" >1162</a>, <a +href="glossaries-user.html#dx1-9010" >1163</a>, <a +href="glossaries-user.html#dx1-9014" >1164</a>, <a +href="glossaries-user.html#dx1-9024" >1165</a>, <a +href="glossaries-user.html#dx1-9031" >1166</a>, <a +href="glossaries-user.html#dx1-9037" >1167</a>, <a +href="glossaries-user.html#dx1-9043" >1168</a>, <a +href="glossaries-user.html#dx1-9047" >1169</a>, <a +href="glossaries-user.html#dx1-9063" >1170</a>, <a +href="glossaries-user.html#dx1-9069" >1171</a>, <a +href="glossaries-user.html#dx1-9077" >1172</a>, <a +href="glossaries-user.html#dx1-9089" >1173</a>, <a +href="glossaries-user.html#dx1-9094" >1174</a>, <a +href="glossaries-user.html#dx1-10007" >1175</a>, <a +href="glossaries-user.html#dx1-10018" >1176</a>, <a +href="glossaries-user.html#dx1-10022" >1177</a>, <a +href="glossaries-user.html#dx1-12002" >1178</a>, <a +href="glossaries-user.html#dx1-12005" >1179</a>, <a +href="glossaries-user.html#dx1-12009" >1180</a>, <a +href="glossaries-user.html#dx1-12013" >1181</a>, <a +href="glossaries-user.html#dx1-12016" >1182</a>, <a +href="glossaries-user.html#dx1-12025" >1183</a>, <a +href="glossaries-user.html#dx1-12029" >1184</a>, <a +href="glossaries-user.html#dx1-13004" >1185</a>, <a +href="glossaries-user.html#dx1-13013" >1186</a>, <a +href="glossaries-user.html#dx1-13025" >1187</a>, <a +href="glossaries-user.html#dx1-15023" >1188</a>, <a +href="glossaries-user.html#dx1-15028" >1189</a>, <a +href="glossaries-user.html#dx1-17009" >1190</a>, <a +href="glossaries-user.html#dx1-18021" >1191</a>, <a +href="glossaries-user.html#dx1-18045" >1192</a>, <a +href="glossaries-user.html#dx1-18049" >1193</a>, <a +href="glossaries-user.html#dx1-18053" >1194</a>, <a +href="glossaries-user.html#dx1-18069" >1195</a>, <a +href="glossaries-user.html#dx1-22003" >1196</a>, <a +href="glossaries-user.html#dx1-22011" >1197</a>, <a +href="glossaries-user.html#dx1-22018" >1198</a>, <a +href="glossaries-user.html#dx1-23012" >1199</a>, <a +href="glossaries-user.html#dx1-23081" >1200</a>, <a +href="glossaries-user.html#dx1-23134" >1201</a>, <a +href="glossaries-user.html#dx1-28005" >1202</a>, <a +href="glossaries-user.html#dx1-36007" >1203</a>, <a +href="glossaries-user.html#dx1-36016" >1204</a>, <a +href="glossaries-user.html#dx1-37005" >1205</a>, <a +href="glossaries-user.html#dx1-37045" >1206</a>, <a +href="glossaries-user.html#dx1-37054" >1207</a>, <a +href="glossaries-user.html#dx1-43066" >1208</a>, <a +href="glossaries-user.html#dx1-44005" >1209</a>, <a +href="glossaries-user.html#dx1-44009" >1210</a>, <a +href="glossaries-user.html#dx1-49005" >1211</a>, <a +href="glossaries-user.html#dx1-56010" >1212</a>, <a +href="glossaries-user.html#dx1-62014" >1213</a>, <a +href="glossaries-user.html#dx1-65022" >1214</a>, <a +href="glossaries-user.html#dx1-69051" >1215</a>, <a +href="glossaries-user.html#dx1-69083" >1216</a>, <a +href="glossaries-user.html#dx1-42005" >1217</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\MakeTextUppercase</span></span></span>  <a +href="glossaries-user.html#dx1-16021" >1218</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">memoir </span>class  <a -href="glossaries-user.html#dx1-14014" >1099</a> <br /></span> +href="glossaries-user.html#dx1-16018" >1219</a>, <a +href="glossaries-user.html#dx1-16028" >1220</a>, <a +href="glossaries-user.html#dx1-16030" >1221</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\memUChead</span></span></span>  <a +href="glossaries-user.html#dx1-16031" >1222</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">mfirstuc </span>package  <a -href="glossaries-user.html#dx1-3" >1100</a>, <a -href="glossaries-user.html#dx1-4" >1101</a>, <a -href="glossaries-user.html#dx1-29020" >1102</a> <br /></span> +href="glossaries-user.html#dx1-3" >1223</a>, <a +href="glossaries-user.html#dx1-4" >1224</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\mfirstucMakeUppercase</span></span></span>  <a +href="glossaries-user.html#dx1-16023" >1225</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">multicol </span>package  <a -href="glossaries-user.html#dx1-54004" >1103</a> <br /></span> +href="glossaries-user.html#dx1-63004" >1226</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">multicols </span>(environment)  <a -href="glossaries-user.html#dx1-54002" >1104</a>, <a -href="glossaries-user.html#dx1-54007" >1105</a> <br /></span> +href="glossaries-user.html#dx1-63002" >1227</a>, <a +href="glossaries-user.html#dx1-63007" >1228</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">N</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\newacronym</span></span></span>  <a -href="glossaries-user.html#dx1-4020" >1106</a>, <a -href="glossaries-user.html#dx1-17009" >1107</a>, <a -href="glossaries-user.html#dx1-17015" >1108</a>, <a -href="glossaries-user.html#dx1-17017" >1109</a>, <a -href="glossaries-user.html#dx1-17019" >1110</a>, <a -href="glossaries-user.html#dx1-17021" >1111</a>, <a -href="glossaries-user.html#dx1-17026" >1112</a>, <a -href="glossaries-user.html#dx1-19100" >1113</a>, <a -href="glossaries-user.html#dx1-19123" >1114</a>, <a -href="glossaries-user.html#dx1-25006" >1115</a>, <a -href="glossaries-user.html#dx1-41002" ><span -class="ec-lmri-10x-x-109">1116</span></a>, <a -href="glossaries-user.html#dx1-41032" >1117</a>, <a -href="glossaries-user.html#dx1-41039" >1118</a>, <a -href="glossaries-user.html#dx1-41040" >1119</a>, <a -href="glossaries-user.html#dx1-42018" >1120</a>, <a -href="glossaries-user.html#dx1-44003" >1121</a>, <a -href="glossaries-user.html#dx1-44019" >1122</a>, <a -href="glossaries-user.html#dx1-44027" >1123</a>, <a -href="glossaries-user.html#dx1-44034" >1124</a>, <a -href="glossaries-user.html#dx1-45006" >1125</a>, <a -href="glossaries-user.html#dx1-56039" >1126</a>, <a -href="glossaries-user.html#dx1-61023" >1127</a>, <a -href="glossaries-user.html#dx1-61026" >1128</a>, <a -href="glossaries-user.html#dx1-61029" >1129</a>, <a -href="glossaries-user.html#dx1-61032" >1130</a>, <a -href="glossaries-user.html#dx1-19003" >1131</a> <br /></span> +href="glossaries-user.html#dx1-6026" >1229</a>, <a +href="glossaries-user.html#dx1-19013" >1230</a>, <a +href="glossaries-user.html#dx1-19026" >1231</a>, <a +href="glossaries-user.html#dx1-19028" >1232</a>, <a +href="glossaries-user.html#dx1-19030" >1233</a>, <a +href="glossaries-user.html#dx1-19035" >1234</a>, <a +href="glossaries-user.html#dx1-19037" >1235</a>, <a +href="glossaries-user.html#dx1-23094" >1236</a>, <a +href="glossaries-user.html#dx1-23122" >1237</a>, <a +href="glossaries-user.html#dx1-31009" >1238</a>, <a +href="glossaries-user.html#dx1-33002" >1239</a>, <a +href="glossaries-user.html#dx1-50002" ><span +class="ec-lmri-10x-x-109">1240</span></a>, <a +href="glossaries-user.html#dx1-50032" >1241</a>, <a +href="glossaries-user.html#dx1-50039" >1242</a>, <a +href="glossaries-user.html#dx1-50040" >1243</a>, <a +href="glossaries-user.html#dx1-51018" >1244</a>, <a +href="glossaries-user.html#dx1-53003" >1245</a>, <a +href="glossaries-user.html#dx1-53018" >1246</a>, <a +href="glossaries-user.html#dx1-53028" >1247</a>, <a +href="glossaries-user.html#dx1-53036" >1248</a>, <a +href="glossaries-user.html#dx1-54006" >1249</a>, <a +href="glossaries-user.html#dx1-66018" >1250</a>, <a +href="glossaries-user.html#dx1-66021" >1251</a>, <a +href="glossaries-user.html#dx1-68023" >1252</a>, <a +href="glossaries-user.html#dx1-68026" >1253</a>, <a +href="glossaries-user.html#dx1-68029" >1254</a>, <a +href="glossaries-user.html#dx1-68032" >1255</a>, <a +href="glossaries-user.html#dx1-23003" >1256</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\newdualentry</span></span></span>  <a -href="glossaries-user.html#dx1-31010" >1132</a> <br /></span> +href="glossaries-user.html#dx1-40015" >1257</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\newglossary</span></span></span>  <a -href="glossaries-user.html#dx1-9027" >1133</a>, <a -href="glossaries-user.html#dx1-10021" >1134</a>, <a -href="glossaries-user.html#dx1-13004" >1135</a>, <a -href="glossaries-user.html#dx1-38007" >1136</a>, <a -href="glossaries-user.html#dx1-38037" >1137</a>, <a -href="glossaries-user.html#dx1-40001" ><span -class="ec-lmri-10x-x-109">1138</span></a> <br /></span> +href="glossaries-user.html#dx1-11027" >1258</a>, <a +href="glossaries-user.html#dx1-12021" >1259</a>, <a +href="glossaries-user.html#dx1-15007" >1260</a>, <a +href="glossaries-user.html#dx1-47007" >1261</a>, <a +href="glossaries-user.html#dx1-47044" >1262</a>, <a +href="glossaries-user.html#dx1-49001" ><span +class="ec-lmri-10x-x-109">1263</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\newglossaryentry</span></span></span>  <a -href="glossaries-user.html#dx1-2021" >1139</a>, <a -href="glossaries-user.html#dx1-4019" >1140</a>, <a -href="glossaries-user.html#dx1-15059" >1141</a>, <a -href="glossaries-user.html#dx1-16004" >1142</a>, <a -href="glossaries-user.html#dx1-19017" ><span -class="ec-lmri-10x-x-109">1143</span></a>, <a -href="glossaries-user.html#dx1-19098" >1144</a>, <a -href="glossaries-user.html#dx1-19121" >1145</a>, <a -href="glossaries-user.html#dx1-25002" >1146</a>, <a -href="glossaries-user.html#dx1-25005" >1147</a>, <a -href="glossaries-user.html#dx1-28001" >1148</a>, <a -href="glossaries-user.html#dx1-28091" >1149</a>, <a -href="glossaries-user.html#dx1-41003" >1150</a>, <a -href="glossaries-user.html#dx1-41031" >1151</a>, <a -href="glossaries-user.html#dx1-41041" >1152</a>, <a -href="glossaries-user.html#dx1-44002" >1153</a>, <a -href="glossaries-user.html#dx1-44020" >1154</a>, <a -href="glossaries-user.html#dx1-56038" >1155</a>, <a -href="glossaries-user.html#dx1-19002" >1156</a> <br /></span> +href="glossaries-user.html#dx1-4020" >1264</a>, <a +href="glossaries-user.html#dx1-6025" >1265</a>, <a +href="glossaries-user.html#dx1-17063" >1266</a>, <a +href="glossaries-user.html#dx1-18004" >1267</a>, <a +href="glossaries-user.html#dx1-18027" >1268</a>, <a +href="glossaries-user.html#dx1-23017" ><span +class="ec-lmri-10x-x-109">1269</span></a>, <a +href="glossaries-user.html#dx1-23090" >1270</a>, <a +href="glossaries-user.html#dx1-23120" >1271</a>, <a +href="glossaries-user.html#dx1-26002" >1272</a>, <a +href="glossaries-user.html#dx1-31002" >1273</a>, <a +href="glossaries-user.html#dx1-31006" >1274</a>, <a +href="glossaries-user.html#dx1-33001" >1275</a>, <a +href="glossaries-user.html#dx1-37001" >1276</a>, <a +href="glossaries-user.html#dx1-37095" >1277</a>, <a +href="glossaries-user.html#dx1-50003" >1278</a>, <a +href="glossaries-user.html#dx1-50031" >1279</a>, <a +href="glossaries-user.html#dx1-50041" >1280</a>, <a +href="glossaries-user.html#dx1-53002" >1281</a>, <a +href="glossaries-user.html#dx1-53019" >1282</a>, <a +href="glossaries-user.html#dx1-67002" >1283</a>, <a +href="glossaries-user.html#dx1-23002" >1284</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">\newglossaryentry </span>options<br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">access</span>  <a -href="glossaries-user.html#dx1-61003" >1157</a> <br /></span> +href="glossaries-user.html#dx1-68003" >1285</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">description</span>  <a -href="glossaries-user.html#dx1-2047" >1158</a>, <a -href="glossaries-user.html#dx1-13009" >1159</a>, <a -href="glossaries-user.html#dx1-13013" >1160</a>, <a -href="glossaries-user.html#dx1-13019" >1161</a>, <a -href="glossaries-user.html#dx1-19018" >1162</a>, <a -href="glossaries-user.html#dx1-19023" >1163</a>, <a -href="glossaries-user.html#dx1-19034" >1164</a>, <a -href="glossaries-user.html#dx1-28160" >1165</a>, <a -href="glossaries-user.html#dx1-28161" >1166</a>, <a -href="glossaries-user.html#dx1-28164" >1167</a>, <a -href="glossaries-user.html#dx1-29012" >1168</a>, <a -href="glossaries-user.html#dx1-41009" >1169</a>, <a -href="glossaries-user.html#dx1-41015" >1170</a>, <a -href="glossaries-user.html#dx1-41016" >1171</a>, <a -href="glossaries-user.html#dx1-42017" >1172</a>, <a -href="glossaries-user.html#dx1-43004" >1173</a>, <a -href="glossaries-user.html#dx1-43015" >1174</a>, <a -href="glossaries-user.html#dx1-44013" >1175</a>, <a -href="glossaries-user.html#dx1-44051" >1176</a>, <a -href="glossaries-user.html#dx1-61018" >1177</a>, <a -href="glossaries-user.html#dx1-62071" >1178</a> <br /></span> +href="glossaries-user.html#dx1-23021" >1286</a>, <a +href="glossaries-user.html#dx1-23026" >1287</a>, <a +href="glossaries-user.html#dx1-23032" >1288</a>, <a +href="glossaries-user.html#dx1-27002" >1289</a>, <a +href="glossaries-user.html#dx1-27012" >1290</a>, <a +href="glossaries-user.html#dx1-37160" >1291</a>, <a +href="glossaries-user.html#dx1-50008" >1292</a>, <a +href="glossaries-user.html#dx1-50014" >1293</a>, <a +href="glossaries-user.html#dx1-50015" >1294</a>, <a +href="glossaries-user.html#dx1-51017" >1295</a>, <a +href="glossaries-user.html#dx1-52009" >1296</a>, <a +href="glossaries-user.html#dx1-52020" >1297</a>, <a +href="glossaries-user.html#dx1-53013" >1298</a>, <a +href="glossaries-user.html#dx1-66023" >1299</a>, <a +href="glossaries-user.html#dx1-66025" >1300</a>, <a +href="glossaries-user.html#dx1-68018" >1301</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">descriptionaccess</span>  <a -href="glossaries-user.html#dx1-61017" >1179</a> <br /></span> +href="glossaries-user.html#dx1-68017" >1302</a> <br /></span> + + + <span class="index-subitem">    <span class="ec-lmss-10x-x-109">descriptionplural</span>  <a -href="glossaries-user.html#dx1-19028" >1180</a>, <a -href="glossaries-user.html#dx1-29013" >1181</a>, <a -href="glossaries-user.html#dx1-61020" >1182</a> <br /></span> +href="glossaries-user.html#dx1-23031" >1303</a>, <a +href="glossaries-user.html#dx1-27003" >1304</a>, <a +href="glossaries-user.html#dx1-27013" >1305</a>, <a +href="glossaries-user.html#dx1-68020" >1306</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">descriptionpluralaccess</span>  <a -href="glossaries-user.html#dx1-61019" >1183</a> <br /></span> +href="glossaries-user.html#dx1-68019" >1307</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">first</span>  <a -href="glossaries-user.html#dx1-2019" >1184</a>, <a -href="glossaries-user.html#dx1-19041" >1185</a>, <a -href="glossaries-user.html#dx1-19061" >1186</a>, <a -href="glossaries-user.html#dx1-19063" >1187</a>, <a -href="glossaries-user.html#dx1-19064" >1188</a>, <a -href="glossaries-user.html#dx1-19072" >1189</a>, <a -href="glossaries-user.html#dx1-19075" >1190</a>, <a -href="glossaries-user.html#dx1-28033" >1191</a>, <a -href="glossaries-user.html#dx1-28090" >1192</a>, <a -href="glossaries-user.html#dx1-28094" >1193</a>, <a -href="glossaries-user.html#dx1-28112" >1194</a>, <a -href="glossaries-user.html#dx1-28126" >1195</a>, <a -href="glossaries-user.html#dx1-29010" >1196</a>, <a -href="glossaries-user.html#dx1-34016" >1197</a>, <a -href="glossaries-user.html#dx1-41005" >1198</a>, <a -href="glossaries-user.html#dx1-41029" >1199</a>, <a -href="glossaries-user.html#dx1-44008" >1200</a>, <a -href="glossaries-user.html#dx1-44047" >1201</a>, <a -href="glossaries-user.html#dx1-46003" >1202</a>, <a -href="glossaries-user.html#dx1-61008" >1203</a> <br /></span> +href="glossaries-user.html#dx1-4018" >1308</a>, <a +href="glossaries-user.html#dx1-23036" >1309</a>, <a +href="glossaries-user.html#dx1-23056" >1310</a>, <a +href="glossaries-user.html#dx1-23058" >1311</a>, <a +href="glossaries-user.html#dx1-23059" >1312</a>, <a +href="glossaries-user.html#dx1-23067" >1313</a>, <a +href="glossaries-user.html#dx1-23070" >1314</a>, <a +href="glossaries-user.html#dx1-37037" >1315</a>, <a +href="glossaries-user.html#dx1-37094" >1316</a>, <a +href="glossaries-user.html#dx1-37098" >1317</a>, <a +href="glossaries-user.html#dx1-37116" >1318</a>, <a +href="glossaries-user.html#dx1-37132" >1319</a>, <a +href="glossaries-user.html#dx1-38021" >1320</a>, <a +href="glossaries-user.html#dx1-43020" >1321</a>, <a +href="glossaries-user.html#dx1-50005" >1322</a>, <a +href="glossaries-user.html#dx1-50029" >1323</a>, <a +href="glossaries-user.html#dx1-53008" >1324</a>, <a +href="glossaries-user.html#dx1-55003" >1325</a>, <a +href="glossaries-user.html#dx1-67008" >1326</a>, <a +href="glossaries-user.html#dx1-68008" >1327</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">firstaccess</span>  <a -href="glossaries-user.html#dx1-61007" >1204</a> <br /></span> +href="glossaries-user.html#dx1-68007" >1328</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">firstplural</span>  <a -href="glossaries-user.html#dx1-2020" >1205</a>, <a -href="glossaries-user.html#dx1-19050" >1206</a>, <a -href="glossaries-user.html#dx1-19057" >1207</a>, <a -href="glossaries-user.html#dx1-19069" >1208</a>, <a -href="glossaries-user.html#dx1-19071" >1209</a>, <a -href="glossaries-user.html#dx1-19074" >1210</a>, <a -href="glossaries-user.html#dx1-20004" >1211</a>, <a -href="glossaries-user.html#dx1-28104" >1212</a>, <a -href="glossaries-user.html#dx1-28137" >1213</a>, <a -href="glossaries-user.html#dx1-29011" >1214</a>, <a -href="glossaries-user.html#dx1-34020" >1215</a>, <a -href="glossaries-user.html#dx1-44009" >1216</a>, <a -href="glossaries-user.html#dx1-44048" >1217</a>, <a -href="glossaries-user.html#dx1-61012" >1218</a> <br /></span> +href="glossaries-user.html#dx1-4019" >1329</a>, <a +href="glossaries-user.html#dx1-23045" >1330</a>, <a +href="glossaries-user.html#dx1-23052" >1331</a>, <a +href="glossaries-user.html#dx1-23064" >1332</a>, <a +href="glossaries-user.html#dx1-23066" >1333</a>, <a +href="glossaries-user.html#dx1-23069" >1334</a>, <a +href="glossaries-user.html#dx1-24005" >1335</a>, <a +href="glossaries-user.html#dx1-27011" >1336</a>, <a +href="glossaries-user.html#dx1-37108" >1337</a>, <a +href="glossaries-user.html#dx1-37145" >1338</a>, <a +href="glossaries-user.html#dx1-38024" >1339</a>, <a +href="glossaries-user.html#dx1-43024" >1340</a>, <a +href="glossaries-user.html#dx1-53009" >1341</a>, <a +href="glossaries-user.html#dx1-67011" >1342</a>, <a +href="glossaries-user.html#dx1-68012" >1343</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">firstpluralaccess</span>  <a -href="glossaries-user.html#dx1-61011" >1219</a> <br /></span> +href="glossaries-user.html#dx1-68011" >1344</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">format</span>  <a -href="glossaries-user.html#dx1-28073" >1220</a> <br /></span> -<span class="index-subitem">    <span -class="ec-lmss-10x-x-109">glslink</span>  <a -href="glossaries-user.html#dx1-28081" >1221</a> <br /></span> +href="glossaries-user.html#dx1-37077" >1345</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">long</span>  <a -href="glossaries-user.html#dx1-19124" >1222</a>, <a -href="glossaries-user.html#dx1-44036" >1223</a>, <a -href="glossaries-user.html#dx1-61022" >1224</a> <br /></span> +href="glossaries-user.html#dx1-23123" >1346</a>, <a +href="glossaries-user.html#dx1-53038" >1347</a>, <a +href="glossaries-user.html#dx1-66017" >1348</a>, <a +href="glossaries-user.html#dx1-68022" >1349</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">longaccess</span>  <a -href="glossaries-user.html#dx1-61021" >1225</a> <br /></span> +href="glossaries-user.html#dx1-68021" >1350</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">longplural</span>  <a -href="glossaries-user.html#dx1-19125" >1226</a>, <a -href="glossaries-user.html#dx1-41012" >1227</a>, <a -href="glossaries-user.html#dx1-44038" >1228</a>, <a -href="glossaries-user.html#dx1-61028" >1229</a> <br /></span> +href="glossaries-user.html#dx1-23124" >1351</a>, <a +href="glossaries-user.html#dx1-27020" >1352</a>, <a +href="glossaries-user.html#dx1-50011" >1353</a>, <a +href="glossaries-user.html#dx1-53040" >1354</a>, <a +href="glossaries-user.html#dx1-68028" >1355</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">longpluralaccess</span>  <a -href="glossaries-user.html#dx1-61027" >1230</a> <br /></span> +href="glossaries-user.html#dx1-68027" >1356</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">name</span>  <a -href="glossaries-user.html#dx1-2046" >1231</a>, <a -href="glossaries-user.html#dx1-5017" >1232</a>, <a -href="glossaries-user.html#dx1-13008" >1233</a>, <a -href="glossaries-user.html#dx1-13014" >1234</a>, <a -href="glossaries-user.html#dx1-13018" >1235</a>, <a -href="glossaries-user.html#dx1-13023" >1236</a>, <a -href="glossaries-user.html#dx1-13024" >1237</a>, <a -href="glossaries-user.html#dx1-16005" >1238</a>, <a -href="glossaries-user.html#dx1-19019" >1239</a>, <a -href="glossaries-user.html#dx1-19021" >1240</a>, <a -href="glossaries-user.html#dx1-19040" >1241</a>, <a -href="glossaries-user.html#dx1-19092" >1242</a>, <a -href="glossaries-user.html#dx1-19094" >1243</a>, <a -href="glossaries-user.html#dx1-24001" >1244</a>, <a -href="glossaries-user.html#dx1-28142" >1245</a>, <a -href="glossaries-user.html#dx1-28143" >1246</a>, <a -href="glossaries-user.html#dx1-28146" >1247</a>, <a -href="glossaries-user.html#dx1-34006" >1248</a>, <a -href="glossaries-user.html#dx1-43003" >1249</a>, <a -href="glossaries-user.html#dx1-43007" >1250</a>, <a -href="glossaries-user.html#dx1-43014" >1251</a>, <a -href="glossaries-user.html#dx1-44007" >1252</a>, <a -href="glossaries-user.html#dx1-44028" >1253</a>, <a -href="glossaries-user.html#dx1-44031" >1254</a>, <a -href="glossaries-user.html#dx1-56024" >1255</a>, <a -href="glossaries-user.html#dx1-61004" >1256</a>, <a -href="glossaries-user.html#dx1-62011" >1257</a>, <a -href="glossaries-user.html#dx1-62068" >1258</a>, <a -href="glossaries-user.html#dx1-33015" >1259</a>, <a -href="glossaries-user.html#dx1-34045" >1260</a> <br /></span> - - - +href="glossaries-user.html#dx1-18005" >1357</a>, <a +href="glossaries-user.html#dx1-18019" >1358</a>, <a +href="glossaries-user.html#dx1-18036" >1359</a>, <a +href="glossaries-user.html#dx1-23022" >1360</a>, <a +href="glossaries-user.html#dx1-23024" >1361</a>, <a +href="glossaries-user.html#dx1-23035" >1362</a>, <a +href="glossaries-user.html#dx1-23084" >1363</a>, <a +href="glossaries-user.html#dx1-23086" >1364</a>, <a +href="glossaries-user.html#dx1-27001" >1365</a>, <a +href="glossaries-user.html#dx1-30001" >1366</a>, <a +href="glossaries-user.html#dx1-37150" >1367</a>, <a +href="glossaries-user.html#dx1-43008" >1368</a>, <a +href="glossaries-user.html#dx1-52008" >1369</a>, <a +href="glossaries-user.html#dx1-52012" >1370</a>, <a +href="glossaries-user.html#dx1-52019" >1371</a>, <a +href="glossaries-user.html#dx1-53007" >1372</a>, <a +href="glossaries-user.html#dx1-53029" >1373</a>, <a +href="glossaries-user.html#dx1-53032" >1374</a>, <a +href="glossaries-user.html#dx1-65024" >1375</a>, <a +href="glossaries-user.html#dx1-68004" >1376</a>, <a +href="glossaries-user.html#dx1-69013" >1377</a>, <a +href="glossaries-user.html#dx1-42015" >1378</a>, <a +href="glossaries-user.html#dx1-43053" >1379</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nonumberlist</span>  <a -href="glossaries-user.html#dx1-19107" >1261</a> <br /></span> +href="glossaries-user.html#dx1-23104" >1380</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">parent</span>  <a -href="glossaries-user.html#dx1-19020" >1262</a>, <a -href="glossaries-user.html#dx1-19022" >1263</a>, <a -href="glossaries-user.html#dx1-19027" >1264</a>, <a -href="glossaries-user.html#dx1-23001" >1265</a> <br /></span> +href="glossaries-user.html#dx1-23023" >1381</a>, <a +href="glossaries-user.html#dx1-23025" >1382</a>, <a +href="glossaries-user.html#dx1-23030" >1383</a>, <a +href="glossaries-user.html#dx1-29001" >1384</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">plural</span>  <a -href="glossaries-user.html#dx1-19052" >1266</a>, <a -href="glossaries-user.html#dx1-19060" >1267</a>, <a -href="glossaries-user.html#dx1-19073" >1268</a>, <a -href="glossaries-user.html#dx1-20002" >1269</a>, <a -href="glossaries-user.html#dx1-20003" >1270</a>, <a -href="glossaries-user.html#dx1-24009" >1271</a>, <a -href="glossaries-user.html#dx1-28103" >1272</a>, <a -href="glossaries-user.html#dx1-28132" >1273</a>, <a -href="glossaries-user.html#dx1-29009" >1274</a>, <a -href="glossaries-user.html#dx1-34012" >1275</a>, <a -href="glossaries-user.html#dx1-44011" >1276</a>, <a -href="glossaries-user.html#dx1-44030" >1277</a>, <a -href="glossaries-user.html#dx1-44050" >1278</a>, <a -href="glossaries-user.html#dx1-61010" >1279</a> <br /></span> +href="glossaries-user.html#dx1-23047" >1385</a>, <a +href="glossaries-user.html#dx1-23055" >1386</a>, <a +href="glossaries-user.html#dx1-23068" >1387</a>, <a +href="glossaries-user.html#dx1-24002" >1388</a>, <a +href="glossaries-user.html#dx1-24004" >1389</a>, <a +href="glossaries-user.html#dx1-30009" >1390</a>, <a +href="glossaries-user.html#dx1-37107" >1391</a>, <a +href="glossaries-user.html#dx1-37138" >1392</a>, <a +href="glossaries-user.html#dx1-38023" >1393</a>, <a +href="glossaries-user.html#dx1-43016" >1394</a>, <a +href="glossaries-user.html#dx1-53011" >1395</a>, <a +href="glossaries-user.html#dx1-53031" >1396</a>, <a +href="glossaries-user.html#dx1-67006" >1397</a>, <a +href="glossaries-user.html#dx1-68010" >1398</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">pluralaccess</span>  <a -href="glossaries-user.html#dx1-61009" >1280</a> <br /></span> +href="glossaries-user.html#dx1-68009" >1399</a> <br /></span> +<span class="index-subitem">    <span +class="ec-lmss-10x-x-109">prefix</span>  <a +href="glossaries-user.html#dx1-67003" >1400</a>, <a +href="glossaries-user.html#dx1-67009" >1401</a>, <a +href="glossaries-user.html#dx1-67022" >1402</a>, <a +href="glossaries-user.html#dx1-67026" >1403</a>, <a +href="glossaries-user.html#dx1-67046" >1404</a>, <a +href="glossaries-user.html#dx1-67054" >1405</a>, <a +href="glossaries-user.html#dx1-67016" >1406</a> <br /></span> +<span class="index-subitem">    <span +class="ec-lmss-10x-x-109">prefixfirst</span>  <a +href="glossaries-user.html#dx1-67007" >1407</a>, <a +href="glossaries-user.html#dx1-67023" >1408</a>, <a +href="glossaries-user.html#dx1-67027" >1409</a>, <a +href="glossaries-user.html#dx1-67050" >1410</a>, <a +href="glossaries-user.html#dx1-67056" >1411</a> <br /></span> +<span class="index-subitem">    <span +class="ec-lmss-10x-x-109">prefixfirstplural</span>  <a +href="glossaries-user.html#dx1-67010" >1412</a>, <a +href="glossaries-user.html#dx1-67034" >1413</a>, <a +href="glossaries-user.html#dx1-67038" >1414</a>, <a +href="glossaries-user.html#dx1-67052" >1415</a>, <a +href="glossaries-user.html#dx1-67060" >1416</a> <br /></span> +<span class="index-subitem">    <span +class="ec-lmss-10x-x-109">prefixplural</span>  <a +href="glossaries-user.html#dx1-67005" >1417</a>, <a +href="glossaries-user.html#dx1-67012" >1418</a>, <a +href="glossaries-user.html#dx1-67033" >1419</a>, <a +href="glossaries-user.html#dx1-67037" >1420</a>, <a +href="glossaries-user.html#dx1-67048" >1421</a>, <a +href="glossaries-user.html#dx1-67058" >1422</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">see</span>  <a -href="glossaries-user.html#dx1-15058" >1281</a>, <a -href="glossaries-user.html#dx1-15062" >1282</a>, <a -href="glossaries-user.html#dx1-19114" >1283</a>, <a -href="glossaries-user.html#dx1-19115" >1284</a>, <a -href="glossaries-user.html#dx1-19122" >1285</a>, <a -href="glossaries-user.html#dx1-28056" >1286</a>, <a -href="glossaries-user.html#dx1-32013" >1287</a>, <a -href="glossaries-user.html#dx1-32014" >1288</a>, <a -href="glossaries-user.html#dx1-32016" >1289</a>, <a -href="glossaries-user.html#dx1-32028" >1290</a>, <a -href="glossaries-user.html#dx1-32034" >1291</a>, <a -href="glossaries-user.html#dx1-33001" >1292</a>, <a -href="glossaries-user.html#dx1-3003" >1293</a>, <a -href="glossaries-user.html#dx1-33008" >1294</a> <br /></span> +href="glossaries-user.html#dx1-17062" >1423</a>, <a +href="glossaries-user.html#dx1-17066" >1424</a>, <a +href="glossaries-user.html#dx1-23111" >1425</a>, <a +href="glossaries-user.html#dx1-23112" >1426</a>, <a +href="glossaries-user.html#dx1-23121" >1427</a>, <a +href="glossaries-user.html#dx1-37060" >1428</a>, <a +href="glossaries-user.html#dx1-41009" >1429</a>, <a +href="glossaries-user.html#dx1-41010" >1430</a>, <a +href="glossaries-user.html#dx1-41012" >1431</a>, <a +href="glossaries-user.html#dx1-41024" >1432</a>, <a +href="glossaries-user.html#dx1-41030" >1433</a>, <a +href="glossaries-user.html#dx1-42001" >1434</a>, <a +href="glossaries-user.html#dx1-5003" >1435</a>, <a +href="glossaries-user.html#dx1-42008" >1436</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">short</span>  <a -href="glossaries-user.html#dx1-19126" >1295</a>, <a -href="glossaries-user.html#dx1-44035" >1296</a>, <a -href="glossaries-user.html#dx1-61025" >1297</a> <br /></span> +href="glossaries-user.html#dx1-23125" >1437</a>, <a +href="glossaries-user.html#dx1-53037" >1438</a>, <a +href="glossaries-user.html#dx1-66020" >1439</a>, <a +href="glossaries-user.html#dx1-68025" >1440</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">shortaccess</span>  <a -href="glossaries-user.html#dx1-61024" >1298</a> <br /></span> +href="glossaries-user.html#dx1-68024" >1441</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">shortplural</span>  <a -href="glossaries-user.html#dx1-19127" >1299</a>, <a -href="glossaries-user.html#dx1-41011" >1300</a>, <a -href="glossaries-user.html#dx1-44037" >1301</a>, <a -href="glossaries-user.html#dx1-61031" >1302</a> <br /></span> +href="glossaries-user.html#dx1-23126" >1442</a>, <a +href="glossaries-user.html#dx1-27021" >1443</a>, <a +href="glossaries-user.html#dx1-50010" >1444</a>, <a +href="glossaries-user.html#dx1-53039" >1445</a>, <a +href="glossaries-user.html#dx1-68031" >1446</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">shortpluralaccess</span>  <a -href="glossaries-user.html#dx1-61030" >1303</a> <br /></span> +href="glossaries-user.html#dx1-68030" >1447</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">sort</span>  <a -href="glossaries-user.html#dx1-2049" >1304</a>, <a -href="glossaries-user.html#dx1-13011" >1305</a>, <a -href="glossaries-user.html#dx1-13017" >1306</a>, <a -href="glossaries-user.html#dx1-13021" >1307</a>, <a -href="glossaries-user.html#dx1-16003" >1308</a>, <a -href="glossaries-user.html#dx1-16006" >1309</a>, <a -href="glossaries-user.html#dx1-16008" >1310</a>, <a -href="glossaries-user.html#dx1-16010" >1311</a>, <a -href="glossaries-user.html#dx1-19087" >1312</a>, <a -href="glossaries-user.html#dx1-19093" >1313</a>, <a -href="glossaries-user.html#dx1-19097" >1314</a>, <a -href="glossaries-user.html#dx1-19131" >1315</a>, <a -href="glossaries-user.html#dx1-24005" >1316</a>, <a -href="glossaries-user.html#dx1-56023" >1317</a>, <a -href="glossaries-user.html#dx1-56025" >1318</a>, <a -href="glossaries-user.html#dx1-62010" >1319</a>, <a -href="glossaries-user.html#dx1-62085" >1320</a> <br /></span> +href="glossaries-user.html#dx1-4045" >1448</a>, <a +href="glossaries-user.html#dx1-18003" >1449</a>, <a +href="glossaries-user.html#dx1-18006" >1450</a>, <a +href="glossaries-user.html#dx1-18008" >1451</a>, <a +href="glossaries-user.html#dx1-18010" >1452</a>, <a +href="glossaries-user.html#dx1-18018" >1453</a>, <a +href="glossaries-user.html#dx1-23079" >1454</a>, <a +href="glossaries-user.html#dx1-23085" >1455</a>, <a +href="glossaries-user.html#dx1-23089" >1456</a>, <a +href="glossaries-user.html#dx1-23092" >1457</a>, <a +href="glossaries-user.html#dx1-23132" >1458</a>, <a +href="glossaries-user.html#dx1-27006" >1459</a>, <a +href="glossaries-user.html#dx1-27010" >1460</a>, <a +href="glossaries-user.html#dx1-30005" >1461</a>, <a +href="glossaries-user.html#dx1-65023" >1462</a>, <a +href="glossaries-user.html#dx1-65025" >1463</a>, <a +href="glossaries-user.html#dx1-69012" >1464</a>, <a +href="glossaries-user.html#dx1-69079" >1465</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">symbol</span>  <a -href="glossaries-user.html#dx1-2048" >1321</a>, <a -href="glossaries-user.html#dx1-13010" >1322</a>, <a -href="glossaries-user.html#dx1-13015" >1323</a>, <a -href="glossaries-user.html#dx1-13020" >1324</a>, <a -href="glossaries-user.html#dx1-19076" >1325</a>, <a -href="glossaries-user.html#dx1-19086" >1326</a>, <a -href="glossaries-user.html#dx1-28151" >1327</a>, <a -href="glossaries-user.html#dx1-28152" >1328</a>, <a -href="glossaries-user.html#dx1-28155" >1329</a>, <a -href="glossaries-user.html#dx1-29014" >1330</a>, <a -href="glossaries-user.html#dx1-29025" >1331</a>, <a -href="glossaries-user.html#dx1-29039" >1332</a>, <a -href="glossaries-user.html#dx1-43005" >1333</a>, <a -href="glossaries-user.html#dx1-43016" >1334</a>, <a -href="glossaries-user.html#dx1-44012" >1335</a>, <a -href="glossaries-user.html#dx1-44033" >1336</a>, <a -href="glossaries-user.html#dx1-44052" >1337</a>, <a -href="glossaries-user.html#dx1-61014" >1338</a> <br /></span> +href="glossaries-user.html#dx1-23071" >1466</a>, <a +href="glossaries-user.html#dx1-23078" >1467</a>, <a +href="glossaries-user.html#dx1-27004" >1468</a>, <a +href="glossaries-user.html#dx1-37155" >1469</a>, <a +href="glossaries-user.html#dx1-38029" >1470</a>, <a +href="glossaries-user.html#dx1-38047" >1471</a>, <a +href="glossaries-user.html#dx1-52010" >1472</a>, <a +href="glossaries-user.html#dx1-52021" >1473</a>, <a +href="glossaries-user.html#dx1-53012" >1474</a>, <a +href="glossaries-user.html#dx1-53034" >1475</a>, <a +href="glossaries-user.html#dx1-66015" >1476</a>, <a +href="glossaries-user.html#dx1-68014" >1477</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">symbolaccess</span>  <a -href="glossaries-user.html#dx1-61013" >1339</a> <br /></span> +href="glossaries-user.html#dx1-68013" >1478</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">symbolplural</span>  <a -href="glossaries-user.html#dx1-19080" >1340</a>, <a -href="glossaries-user.html#dx1-29015" >1341</a>, <a -href="glossaries-user.html#dx1-61016" >1342</a> <br /></span> +href="glossaries-user.html#dx1-23072" >1479</a>, <a +href="glossaries-user.html#dx1-27005" >1480</a>, <a +href="glossaries-user.html#dx1-68016" >1481</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">symbolpluralaccess</span>  <a -href="glossaries-user.html#dx1-61015" >1343</a> <br /></span> +href="glossaries-user.html#dx1-68015" >1482</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">text</span>  <a -href="glossaries-user.html#dx1-13022" >1344</a>, <a -href="glossaries-user.html#dx1-13025" >1345</a>, <a -href="glossaries-user.html#dx1-19038" >1346</a>, <a -href="glossaries-user.html#dx1-19044" >1347</a>, <a -href="glossaries-user.html#dx1-19055" >1348</a>, <a -href="glossaries-user.html#dx1-28034" >1349</a>, <a -href="glossaries-user.html#dx1-28089" >1350</a>, <a -href="glossaries-user.html#dx1-28093" >1351</a>, <a -href="glossaries-user.html#dx1-28113" >1352</a>, <a -href="glossaries-user.html#dx1-28119" >1353</a>, <a -href="glossaries-user.html#dx1-29008" >1354</a>, <a -href="glossaries-user.html#dx1-34009" >1355</a>, <a -href="glossaries-user.html#dx1-41006" >1356</a>, <a -href="glossaries-user.html#dx1-41030" >1357</a>, <a -href="glossaries-user.html#dx1-44010" >1358</a>, <a -href="glossaries-user.html#dx1-44029" >1359</a>, <a -href="glossaries-user.html#dx1-44032" >1360</a>, <a -href="glossaries-user.html#dx1-44049" >1361</a>, <a -href="glossaries-user.html#dx1-46005" >1362</a>, <a -href="glossaries-user.html#dx1-61006" >1363</a> <br /></span> +href="glossaries-user.html#dx1-23033" >1483</a>, <a +href="glossaries-user.html#dx1-23039" >1484</a>, <a +href="glossaries-user.html#dx1-23050" >1485</a>, <a +href="glossaries-user.html#dx1-37038" >1486</a>, <a +href="glossaries-user.html#dx1-37093" >1487</a>, <a +href="glossaries-user.html#dx1-37097" >1488</a>, <a +href="glossaries-user.html#dx1-37117" >1489</a>, <a +href="glossaries-user.html#dx1-37123" >1490</a>, <a +href="glossaries-user.html#dx1-38022" >1491</a>, <a +href="glossaries-user.html#dx1-43013" >1492</a>, <a +href="glossaries-user.html#dx1-50006" >1493</a>, <a +href="glossaries-user.html#dx1-50030" >1494</a>, <a +href="glossaries-user.html#dx1-53010" >1495</a>, <a +href="glossaries-user.html#dx1-53030" >1496</a>, <a +href="glossaries-user.html#dx1-53033" >1497</a>, <a +href="glossaries-user.html#dx1-55005" >1498</a>, <a +href="glossaries-user.html#dx1-67004" >1499</a>, <a +href="glossaries-user.html#dx1-68006" >1500</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">textaccess</span>  <a -href="glossaries-user.html#dx1-61005" >1364</a> <br /></span> +href="glossaries-user.html#dx1-68005" >1501</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">type</span>  <a -href="glossaries-user.html#dx1-19099" >1365</a>, <a -href="glossaries-user.html#dx1-25003" >1366</a> <br /></span> +href="glossaries-user.html#dx1-23093" >1502</a>, <a +href="glossaries-user.html#dx1-31004" >1503</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">user1</span>  <a -href="glossaries-user.html#dx1-1001" >1367</a>, <a -href="glossaries-user.html#dx1-19101" >1368</a>, <a -href="glossaries-user.html#dx1-28169" >1369</a>, <a -href="glossaries-user.html#x1-5900016.3" >1370</a>, <a -href="glossaries-user.html#dx1-59003" >1371</a>, <a -href="glossaries-user.html#dx1-59004" >1372</a> <br /></span> +href="glossaries-user.html#dx1-23095" >1504</a>, <a +href="glossaries-user.html#dx1-27014" >1505</a>, <a +href="glossaries-user.html#dx1-37165" >1506</a>, <a +href="glossaries-user.html#dx1-65102" >1507</a>, <a +href="glossaries-user.html#dx1-65105" >1508</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">user2</span>  <a -href="glossaries-user.html#dx1-19103" >1373</a>, <a -href="glossaries-user.html#dx1-59005" >1374</a> <br /></span> +href="glossaries-user.html#dx1-23097" >1509</a>, <a +href="glossaries-user.html#dx1-27015" >1510</a>, <a +href="glossaries-user.html#dx1-65106" >1511</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">user3</span>  <a -href="glossaries-user.html#dx1-19104" >1375</a> <br /></span> +href="glossaries-user.html#dx1-23098" >1512</a>, <a +href="glossaries-user.html#dx1-27016" >1513</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">user4</span>  <a -href="glossaries-user.html#dx1-19105" >1376</a> <br /></span> +href="glossaries-user.html#dx1-23099" >1514</a>, <a +href="glossaries-user.html#dx1-27017" >1515</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">user5</span>  <a -href="glossaries-user.html#dx1-19106" >1377</a> <br /></span> +href="glossaries-user.html#dx1-23100" >1516</a>, <a +href="glossaries-user.html#dx1-27018" >1517</a> <br /></span> + + + <span class="index-subitem">    <span class="ec-lmss-10x-x-109">user6</span>  <a -href="glossaries-user.html#dx1-1002" >1378</a>, <a -href="glossaries-user.html#dx1-19102" >1379</a>, <a -href="glossaries-user.html#x1-5900016.3" >1380</a> <br /></span> +href="glossaries-user.html#dx1-23096" >1518</a>, <a +href="glossaries-user.html#dx1-27019" >1519</a>, <a +href="glossaries-user.html#dx1-65103" >1520</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\newglossarystyle</span></span></span>  <a -href="glossaries-user.html#dx1-47031" >1381</a>, <a -href="glossaries-user.html#dx1-56001" ><span -class="ec-lmri-10x-x-109">1382</span></a>, <a -href="glossaries-user.html#dx1-56031" >1383</a>, <a -href="glossaries-user.html#dx1-58002" >1384</a> <br /></span> +href="glossaries-user.html#dx1-56031" >1521</a>, <a +href="glossaries-user.html#dx1-65001" ><span +class="ec-lmri-10x-x-109">1522</span></a>, <a +href="glossaries-user.html#dx1-65035" >1523</a>, <a +href="glossaries-user.html#dx1-65096" >1524</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\newline</span></span></span>  <a -href="glossaries-user.html#dx1-19026" >1385</a>, <a -href="glossaries-user.html#dx1-47025" >1386</a> <br /></span> +href="glossaries-user.html#dx1-23029" >1525</a>, <a +href="glossaries-user.html#dx1-56025" >1526</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">ngerman </span>package  <a -href="glossaries-user.html#dx1-6007" >1387</a>, <a -href="glossaries-user.html#dx1-36014" >1388</a> <br /></span> +href="glossaries-user.html#dx1-8009" >1527</a>, <a +href="glossaries-user.html#dx1-45014" >1528</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\nohyperpage</span></span></span>  <a -href="glossaries-user.html#dx1-27024" >1389</a> <br /></span> +href="glossaries-user.html#dx1-36024" >1529</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\noist</span></span></span>  <a -href="glossaries-user.html#dx1-4065" >1390</a>, <a -href="glossaries-user.html#dx1-18012" ><span -class="ec-lmri-10x-x-109">1391</span></a>, <a -href="glossaries-user.html#dx1-27014" >1392</a>, <a -href="glossaries-user.html#dx1-27026" >1393</a>, <a -href="glossaries-user.html#dx1-36020" >1394</a>, <a -href="glossaries-user.html#dx1-37016" >1395</a>, <a -href="glossaries-user.html#dx1-38021" >1396</a>, <a -href="glossaries-user.html#dx1-38027" >1397</a>, <a -href="glossaries-user.html#dx1-38052" >1398</a>, <a -href="glossaries-user.html#dx1-38060" >1399</a>, <a -href="glossaries-user.html#dx1-39003" >1400</a>, <a -href="glossaries-user.html#dx1-19016" >1401</a> <br /></span> +href="glossaries-user.html#dx1-6085" >1530</a>, <a +href="glossaries-user.html#dx1-22012" ><span +class="ec-lmri-10x-x-109">1531</span></a>, <a +href="glossaries-user.html#dx1-36014" >1532</a>, <a +href="glossaries-user.html#dx1-36026" >1533</a>, <a +href="glossaries-user.html#dx1-45020" >1534</a>, <a +href="glossaries-user.html#dx1-46018" >1535</a>, <a +href="glossaries-user.html#dx1-47024" >1536</a>, <a +href="glossaries-user.html#dx1-47030" >1537</a>, <a +href="glossaries-user.html#dx1-47059" >1538</a>, <a +href="glossaries-user.html#dx1-47067" >1539</a>, <a +href="glossaries-user.html#dx1-48003" >1540</a>, <a +href="glossaries-user.html#dx1-23016" >1541</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\nopostdesc</span></span></span>  <a -href="glossaries-user.html#dx1-19024" ><span -class="ec-lmri-10x-x-109">1402</span></a>, <a -href="glossaries-user.html#dx1-23002" >1403</a>, <a -href="glossaries-user.html#dx1-24002" >1404</a>, <a -href="glossaries-user.html#dx1-47036" >1405</a> <br /></span> +href="glossaries-user.html#dx1-23027" ><span +class="ec-lmri-10x-x-109">1542</span></a>, <a +href="glossaries-user.html#dx1-29004" >1543</a>, <a +href="glossaries-user.html#dx1-30002" >1544</a>, <a +href="glossaries-user.html#dx1-56036" >1545</a>, <a +href="glossaries-user.html#dx1-66026" >1546</a> <br /></span> <span class="index-item">number list  <a -href="glossaries-user.html#dx1-2031" >1406</a>, <a -href="glossaries-user.html#dx1-2042" ><span -class="ec-lmbx-10x-x-109">1407</span></a>, <a -href="glossaries-user.html#dx1-4022" >1408</a>, <a -href="glossaries-user.html#dx1-4035" >1409</a>, <a -href="glossaries-user.html#dx1-7080" >1410</a>, <a -href="glossaries-user.html#dx1-13071" >1411</a>, <a -href="glossaries-user.html#dx1-15053" >1412</a>, <a -href="glossaries-user.html#dx1-15056" >1413</a>, <a -href="glossaries-user.html#dx1-15067" >1414</a>, <a -href="glossaries-user.html#dx1-18025" >1415</a>, <a -href="glossaries-user.html#dx1-18033" >1416</a>, <a -href="glossaries-user.html#dx1-18035" >1417</a>, <a -href="glossaries-user.html#dx1-19109" >1418</a>, <a -href="glossaries-user.html#dx1-19112" >1419</a>, <a -href="glossaries-user.html#dx1-19117" >1420</a>, <a -href="glossaries-user.html#dx1-22003" >1421</a>, <a -href="glossaries-user.html#dx1-24004" >1422</a>, <a -href="glossaries-user.html#dx1-27002" >1423</a>, <a -href="glossaries-user.html#dx1-28009" >1424</a>, <a -href="glossaries-user.html#dx1-32022" >1425</a>, <a -href="glossaries-user.html#dx1-32024" >1426</a>, <a -href="glossaries-user.html#dx1-32026" >1427</a>, <a -href="glossaries-user.html#dx1-32031" >1428</a>, <a -href="glossaries-user.html#dx1-34052" >1429</a>, <a -href="glossaries-user.html#dx1-38003" >1430</a>, <a -href="glossaries-user.html#dx1-38045" >1431</a>, <a -href="glossaries-user.html#dx1-38056" >1432</a>, <a -href="glossaries-user.html#dx1-40003" >1433</a>, <a -href="glossaries-user.html#dx1-48011" >1434</a>, <a -href="glossaries-user.html#dx1-48033" >1435</a>, <a -href="glossaries-user.html#dx1-49011" >1436</a>, <a -href="glossaries-user.html#dx1-49022" >1437</a>, <a -href="glossaries-user.html#dx1-50011" >1438</a>, <a -href="glossaries-user.html#dx1-50022" >1439</a>, <a -href="glossaries-user.html#dx1-51017" >1440</a>, <a -href="glossaries-user.html#dx1-51028" >1441</a>, <a -href="glossaries-user.html#dx1-52014" >1442</a>, <a -href="glossaries-user.html#dx1-52025" >1443</a>, <a -href="glossaries-user.html#dx1-55004" >1444</a>, <a -href="glossaries-user.html#dx1-57009" >1445</a> <br /></span> +href="glossaries-user.html#dx1-4030" >1547</a>, <a +href="glossaries-user.html#dx1-4041" ><span +class="ec-lmbx-10x-x-109">1548</span></a>, <a +href="glossaries-user.html#dx1-6032" >1549</a>, <a +href="glossaries-user.html#dx1-6047" >1550</a>, <a +href="glossaries-user.html#dx1-6117" >1551</a>, <a +href="glossaries-user.html#dx1-9002" >1552</a>, <a +href="glossaries-user.html#dx1-9083" >1553</a>, <a +href="glossaries-user.html#dx1-15076" >1554</a>, <a +href="glossaries-user.html#dx1-17057" >1555</a>, <a +href="glossaries-user.html#dx1-17060" >1556</a>, <a +href="glossaries-user.html#dx1-17071" >1557</a>, <a +href="glossaries-user.html#dx1-22025" >1558</a>, <a +href="glossaries-user.html#dx1-22033" >1559</a>, <a +href="glossaries-user.html#dx1-22035" >1560</a>, <a +href="glossaries-user.html#dx1-23106" >1561</a>, <a +href="glossaries-user.html#dx1-23109" >1562</a>, <a +href="glossaries-user.html#dx1-23114" >1563</a>, <a +href="glossaries-user.html#dx1-23116" >1564</a>, <a +href="glossaries-user.html#dx1-28003" >1565</a>, <a +href="glossaries-user.html#dx1-30004" >1566</a>, <a +href="glossaries-user.html#dx1-36002" >1567</a>, <a +href="glossaries-user.html#dx1-37009" >1568</a>, <a +href="glossaries-user.html#dx1-40009" >1569</a>, <a +href="glossaries-user.html#dx1-41018" >1570</a>, <a +href="glossaries-user.html#dx1-41020" >1571</a>, <a +href="glossaries-user.html#dx1-41022" >1572</a>, <a +href="glossaries-user.html#dx1-41027" >1573</a>, <a +href="glossaries-user.html#dx1-43060" >1574</a>, <a +href="glossaries-user.html#dx1-47003" >1575</a>, <a +href="glossaries-user.html#dx1-47052" >1576</a>, <a +href="glossaries-user.html#dx1-47063" >1577</a>, <a +href="glossaries-user.html#dx1-49003" >1578</a>, <a +href="glossaries-user.html#dx1-57011" >1579</a>, <a +href="glossaries-user.html#dx1-57033" >1580</a>, <a +href="glossaries-user.html#dx1-58011" >1581</a>, <a +href="glossaries-user.html#dx1-58022" >1582</a>, <a +href="glossaries-user.html#dx1-59011" >1583</a>, <a +href="glossaries-user.html#dx1-59022" >1584</a>, <a +href="glossaries-user.html#dx1-60017" >1585</a>, <a +href="glossaries-user.html#dx1-60028" >1586</a>, <a +href="glossaries-user.html#dx1-61014" >1587</a>, <a +href="glossaries-user.html#dx1-61025" >1588</a>, <a +href="glossaries-user.html#dx1-64004" >1589</a>, <a +href="glossaries-user.html#dx1-65042" >1590</a>, <a +href="glossaries-user.html#dx1-65084" >1591</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\numberline</span></span></span>  <a -href="glossaries-user.html#dx1-14006" >1446</a> <br /></span> +href="glossaries-user.html#dx1-16006" >1592</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">O</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\oldacronym</span></span></span>  <a -href="glossaries-user.html#dx1-45004" ><span -class="ec-lmri-10x-x-109">1447</span></a>, <a -href="glossaries-user.html#dx1-45007" >1448</a> <br /></span> +href="glossaries-user.html#dx1-54004" ><span +class="ec-lmri-10x-x-109">1593</span></a>, <a +href="glossaries-user.html#dx1-54007" >1594</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">P</span> <span class="index-item">package options:<br /></span> - - - <span class="index-subitem">    <span class="ec-lmss-10x-x-109">acronym</span>  <a -href="glossaries-user.html#dx1-6016" >1449</a>, <a -href="glossaries-user.html#dx1-9022" >1450</a>, <a -href="glossaries-user.html#dx1-9026" >1451</a>, <a -href="glossaries-user.html#dx1-10014" >1452</a>, <a -href="glossaries-user.html#dx1-10020" >1453</a>, <a -href="glossaries-user.html#dx1-13003" >1454</a>, <a -href="glossaries-user.html#dx1-14030" >1455</a>, <a -href="glossaries-user.html#dx1-14031" >1456</a>, <a -href="glossaries-user.html#dx1-17001" >1457</a>, <a -href="glossaries-user.html#dx1-17002" >1458</a>, <a -href="glossaries-user.html#dx1-17013" >1459</a>, <a -href="glossaries-user.html#dx1-25007" >1460</a>, <a -href="glossaries-user.html#dx1-25008" >1461</a>, <a -href="glossaries-user.html#dx1-25013" >1462</a>, <a -href="glossaries-user.html#dx1-31009" >1463</a>, <a -href="glossaries-user.html#dx1-40011" >1464</a>, <a -href="glossaries-user.html#dx1-40012" >1465</a>, <a -href="glossaries-user.html#dx1-40014" >1466</a>, <a -href="glossaries-user.html#dx1-41034" >1467</a>, <a -href="glossaries-user.html#dx1-14028" >1468</a>, <a -href="glossaries-user.html#dx1-17007" >1469</a>, <a -href="glossaries-user.html#dx1-25012" >1470</a> <br /></span> +href="glossaries-user.html#dx1-8018" >1595</a>, <a +href="glossaries-user.html#dx1-11022" >1596</a>, <a +href="glossaries-user.html#dx1-11026" >1597</a>, <a +href="glossaries-user.html#dx1-12014" >1598</a>, <a +href="glossaries-user.html#dx1-12020" >1599</a>, <a +href="glossaries-user.html#dx1-14001" >1600</a>, <a +href="glossaries-user.html#dx1-14003" >1601</a>, <a +href="glossaries-user.html#dx1-15003" >1602</a>, <a +href="glossaries-user.html#dx1-16041" >1603</a>, <a +href="glossaries-user.html#dx1-16042" >1604</a>, <a +href="glossaries-user.html#dx1-19001" >1605</a>, <a +href="glossaries-user.html#dx1-19005" >1606</a>, <a +href="glossaries-user.html#dx1-19020" >1607</a>, <a +href="glossaries-user.html#dx1-21015" >1608</a>, <a +href="glossaries-user.html#dx1-31010" >1609</a>, <a +href="glossaries-user.html#dx1-31011" >1610</a>, <a +href="glossaries-user.html#dx1-31016" >1611</a>, <a +href="glossaries-user.html#dx1-40014" >1612</a>, <a +href="glossaries-user.html#dx1-49011" >1613</a>, <a +href="glossaries-user.html#dx1-49012" >1614</a>, <a +href="glossaries-user.html#dx1-49014" >1615</a>, <a +href="glossaries-user.html#dx1-50034" >1616</a>, <a +href="glossaries-user.html#dx1-52004" >1617</a>, <a +href="glossaries-user.html#dx1-16039" >1618</a>, <a +href="glossaries-user.html#dx1-19010" >1619</a>, <a +href="glossaries-user.html#dx1-31015" >1620</a> <br /></span> +<span class="index-subsubitem">        <span +class="ec-lmss-10x-x-109">true</span>  <a +href="glossaries-user.html#dx1-14002" >1621</a>, <a +href="glossaries-user.html#dx1-19017" >1622</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">acronymlists</span>  <a -href="glossaries-user.html#dx1-17011" >1471</a>, <a -href="glossaries-user.html#dx1-17012" >1472</a>, <a -href="glossaries-user.html#dx1-40015" >1473</a>, <a -href="glossaries-user.html#dx1-41035" >1474</a> <br /></span> +href="glossaries-user.html#dx1-19018" >1623</a>, <a +href="glossaries-user.html#dx1-19019" >1624</a>, <a +href="glossaries-user.html#dx1-19022" >1625</a>, <a +href="glossaries-user.html#dx1-49015" >1626</a>, <a +href="glossaries-user.html#dx1-50035" >1627</a> <br /></span> +<span class="index-subitem">    <span +class="ec-lmss-10x-x-109">acronyms</span>  <a +href="glossaries-user.html#dx1-15004" >1628</a>, <a +href="glossaries-user.html#dx1-19016" >1629</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">compatible-2.07</span>  <a -href="glossaries-user.html#dx1-18014" >1475</a> <br /></span> +href="glossaries-user.html#dx1-20009" >1630</a>, <a +href="glossaries-user.html#dx1-21012" >1631</a>, <a +href="glossaries-user.html#dx1-22014" >1632</a> <br /></span> +<span class="index-subitem">    <span +class="ec-lmss-10x-x-109">compatible-3.07</span>  <a +href="glossaries-user.html#dx1-19004" >1633</a>, <a +href="glossaries-user.html#dx1-20010" >1634</a>, <a +href="glossaries-user.html#dx1-38009" >1635</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">counter</span>  <a -href="glossaries-user.html#dx1-15064" >1476</a>, <a -href="glossaries-user.html#dx1-18026" >1477</a>, <a -href="glossaries-user.html#dx1-27004" >1478</a>, <a -href="glossaries-user.html#dx1-38006" >1479</a>, <a -href="glossaries-user.html#dx1-38036" >1480</a> <br /></span> +href="glossaries-user.html#dx1-17068" >1636</a>, <a +href="glossaries-user.html#dx1-22026" >1637</a>, <a +href="glossaries-user.html#dx1-36004" >1638</a>, <a +href="glossaries-user.html#dx1-47006" >1639</a>, <a +href="glossaries-user.html#dx1-47043" >1640</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">page</span>  <a -href="glossaries-user.html#dx1-15065" >1481</a> <br /></span> +href="glossaries-user.html#dx1-17069" >1641</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">counterwithin</span>  <a -href="glossaries-user.html#dx1-15012" >1482</a>, <a -href="glossaries-user.html#dx1-15017" >1483</a>, <a -href="glossaries-user.html#dx1-47002" >1484</a>, <a -href="glossaries-user.html#dx1-56042" >1485</a>, <a -href="glossaries-user.html#dx1-57013" >1486</a> <br /></span> +href="glossaries-user.html#dx1-17012" >1642</a>, <a +href="glossaries-user.html#dx1-17016" >1643</a>, <a +href="glossaries-user.html#dx1-56002" >1644</a>, <a +href="glossaries-user.html#dx1-65050" >1645</a>, <a +href="glossaries-user.html#dx1-65088" >1646</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">description</span>  <a -href="glossaries-user.html#dx1-17014" >1487</a>, <a -href="glossaries-user.html#dx1-41010" >1488</a>, <a -href="glossaries-user.html#dx1-41014" >1489</a>, <a -href="glossaries-user.html#dx1-41049" >1490</a>, <a -href="glossaries-user.html#dx1-42001" >1491</a>, <a -href="glossaries-user.html#dx1-42014" >1492</a>, <a -href="glossaries-user.html#dx1-42024" >1493</a>, <a -href="glossaries-user.html#dx1-42031" >1494</a>, <a -href="glossaries-user.html#dx1-42047" >1495</a>, <a -href="glossaries-user.html#dx1-43006" >1496</a>, <a -href="glossaries-user.html#dx1-43009" >1497</a>, <a -href="glossaries-user.html#dx1-43017" >1498</a>, <a -href="glossaries-user.html#dx1-43020" >1499</a>, <a -href="glossaries-user.html#dx1-43022" >1500</a>, <a -href="glossaries-user.html#dx1-44061" >1501</a> <br /></span> +href="glossaries-user.html#dx1-19025" >1647</a>, <a +href="glossaries-user.html#dx1-50009" >1648</a>, <a +href="glossaries-user.html#dx1-50013" >1649</a>, <a +href="glossaries-user.html#dx1-50051" >1650</a>, <a +href="glossaries-user.html#dx1-51001" >1651</a>, <a +href="glossaries-user.html#dx1-51014" >1652</a>, <a +href="glossaries-user.html#dx1-51024" >1653</a>, <a +href="glossaries-user.html#dx1-51031" >1654</a>, <a +href="glossaries-user.html#dx1-51047" >1655</a>, <a +href="glossaries-user.html#dx1-52011" >1656</a>, <a +href="glossaries-user.html#dx1-52014" >1657</a>, <a +href="glossaries-user.html#dx1-52022" >1658</a>, <a +href="glossaries-user.html#dx1-52025" >1659</a>, <a +href="glossaries-user.html#dx1-52027" >1660</a>, <a +href="glossaries-user.html#dx1-53051" >1661</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">dua</span>  <a -href="glossaries-user.html#dx1-17025" >1502</a>, <a -href="glossaries-user.html#dx1-41028" >1503</a>, <a -href="glossaries-user.html#dx1-42006" >1504</a>, <a -href="glossaries-user.html#dx1-42007" >1505</a>, <a -href="glossaries-user.html#dx1-42046" >1506</a>, <a -href="glossaries-user.html#dx1-43021" >1507</a>, <a -href="glossaries-user.html#dx1-43030" >1508</a> <br /></span> +href="glossaries-user.html#dx1-19036" >1662</a>, <a +href="glossaries-user.html#dx1-50028" >1663</a>, <a +href="glossaries-user.html#dx1-51006" >1664</a>, <a +href="glossaries-user.html#dx1-51007" >1665</a>, <a +href="glossaries-user.html#dx1-51046" >1666</a>, <a +href="glossaries-user.html#dx1-52026" >1667</a>, <a +href="glossaries-user.html#dx1-52035" >1668</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">entrycounter</span>  <a -href="glossaries-user.html#dx1-15001" >1509</a>, <a -href="glossaries-user.html#dx1-15025" >1510</a>, <a -href="glossaries-user.html#dx1-47001" >1511</a>, <a -href="glossaries-user.html#dx1-56041" >1512</a>, <a -href="glossaries-user.html#dx1-57012" >1513</a> <br /></span> +href="glossaries-user.html#dx1-17001" >1669</a>, <a +href="glossaries-user.html#dx1-17025" >1670</a>, <a +href="glossaries-user.html#dx1-56001" >1671</a>, <a +href="glossaries-user.html#dx1-65049" >1672</a>, <a +href="glossaries-user.html#dx1-65087" >1673</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-15002" >1514</a> <br /></span> +href="glossaries-user.html#dx1-17002" >1674</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">true</span>  <a -href="glossaries-user.html#dx1-15013" >1515</a> <br /></span> +href="glossaries-user.html#dx1-17013" >1675</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">footnote</span>  <a -href="glossaries-user.html#dx1-17016" >1516</a>, <a -href="glossaries-user.html#dx1-41017" >1517</a>, <a -href="glossaries-user.html#dx1-41036" >1518</a>, <a -href="glossaries-user.html#dx1-41050" >1519</a>, <a -href="glossaries-user.html#dx1-42002" >1520</a>, <a -href="glossaries-user.html#dx1-42009" >1521</a>, <a -href="glossaries-user.html#dx1-42019" >1522</a>, <a -href="glossaries-user.html#dx1-42023" >1523</a>, <a -href="glossaries-user.html#dx1-42030" >1524</a>, <a -href="glossaries-user.html#dx1-42045" >1525</a>, <a -href="glossaries-user.html#dx1-43010" >1526</a>, <a -href="glossaries-user.html#dx1-43018" >1527</a>, <a -href="glossaries-user.html#dx1-43024" >1528</a>, <a -href="glossaries-user.html#dx1-44062" >1529</a> <br /></span> +href="glossaries-user.html#dx1-19034" >1676</a>, <a +href="glossaries-user.html#dx1-50016" >1677</a>, <a +href="glossaries-user.html#dx1-50036" >1678</a>, <a +href="glossaries-user.html#dx1-50052" >1679</a>, <a +href="glossaries-user.html#dx1-51002" >1680</a>, <a +href="glossaries-user.html#dx1-51009" >1681</a>, <a +href="glossaries-user.html#dx1-51019" >1682</a>, <a +href="glossaries-user.html#dx1-51023" >1683</a>, <a +href="glossaries-user.html#dx1-51030" >1684</a>, <a +href="glossaries-user.html#dx1-51045" >1685</a>, <a +href="glossaries-user.html#dx1-52015" >1686</a>, <a +href="glossaries-user.html#dx1-52023" >1687</a>, <a +href="glossaries-user.html#dx1-52029" >1688</a>, <a +href="glossaries-user.html#dx1-53052" >1689</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">hyperfirst</span>  <a -href="glossaries-user.html#dx1-13062" >1530</a> <br /></span> +href="glossaries-user.html#dx1-15064" >1690</a>, <a +href="glossaries-user.html#dx1-39023" >1691</a>, <a +href="glossaries-user.html#dx1-39027" >1692</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-30012" >1531</a>, <a -href="glossaries-user.html#dx1-62027" >1532</a> <br /></span> +href="glossaries-user.html#dx1-15069" >1693</a>, <a +href="glossaries-user.html#dx1-39012" >1694</a>, <a +href="glossaries-user.html#dx1-39021" >1695</a>, <a +href="glossaries-user.html#dx1-53050" >1696</a>, <a +href="glossaries-user.html#dx1-69029" >1697</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">true</span>  <a -href="glossaries-user.html#dx1-13064" >1533</a> <br /></span> +href="glossaries-user.html#dx1-15066" >1698</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">makeindex</span>  <a -href="glossaries-user.html#dx1-16018" >1534</a> <br /></span> +href="glossaries-user.html#dx1-14004" >1699</a>, <a +href="glossaries-user.html#dx1-18043" >1700</a>, <a +href="glossaries-user.html#dx1-21005" >1701</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nogroupskip</span>  <a -href="glossaries-user.html#dx1-4018" >1535</a>, <a -href="glossaries-user.html#dx1-15070" >1536</a>, <a -href="glossaries-user.html#dx1-47033" >1537</a>, <a -href="glossaries-user.html#dx1-56035" >1538</a> <br /></span> +href="glossaries-user.html#dx1-6021" >1702</a>, <a +href="glossaries-user.html#dx1-17074" >1703</a>, <a +href="glossaries-user.html#dx1-56033" >1704</a>, <a +href="glossaries-user.html#dx1-65039" >1705</a>, <a +href="glossaries-user.html#dx1-65100" >1706</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-15071" >1539</a> <br /></span> +href="glossaries-user.html#dx1-17075" >1707</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nohypertypes</span>  <a -href="glossaries-user.html#dx1-13067" >1540</a>, <a -href="glossaries-user.html#dx1-26002" >1541</a>, <a -href="glossaries-user.html#dx1-28017" >1542</a>, <a -href="glossaries-user.html#dx1-28020" >1543</a>, <a -href="glossaries-user.html#dx1-28022" >1544</a>, <a -href="glossaries-user.html#dx1-28023" >1545</a>, <a -href="glossaries-user.html#dx1-28079" >1546</a> <br /></span> +href="glossaries-user.html#dx1-15070" >1708</a>, <a +href="glossaries-user.html#dx1-32002" >1709</a>, <a +href="glossaries-user.html#dx1-37021" >1710</a>, <a +href="glossaries-user.html#dx1-37024" >1711</a>, <a +href="glossaries-user.html#dx1-37026" >1712</a>, <a +href="glossaries-user.html#dx1-37027" >1713</a>, <a +href="glossaries-user.html#dx1-37083" >1714</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nolist</span>  <a -href="glossaries-user.html#dx1-15039" >1547</a>, <a -href="glossaries-user.html#dx1-48004" >1548</a> <br /></span> +href="glossaries-user.html#dx1-17041" >1715</a>, <a +href="glossaries-user.html#dx1-21008" >1716</a>, <a +href="glossaries-user.html#dx1-57004" >1717</a> <br /></span> + + + <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nolong</span>  <a -href="glossaries-user.html#dx1-15033" >1549</a>, <a -href="glossaries-user.html#dx1-49004" >1550</a>, <a -href="glossaries-user.html#dx1-47018" >1551</a> <br /></span> +href="glossaries-user.html#dx1-17033" >1718</a>, <a +href="glossaries-user.html#dx1-21006" >1719</a>, <a +href="glossaries-user.html#dx1-58004" >1720</a>, <a +href="glossaries-user.html#dx1-56018" >1721</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nomain</span>  <a -href="glossaries-user.html#dx1-13002" >1552</a>, <a -href="glossaries-user.html#dx1-40010" >1553</a> <br /></span> +href="glossaries-user.html#dx1-15002" >1722</a>, <a +href="glossaries-user.html#dx1-19015" >1723</a>, <a +href="glossaries-user.html#dx1-20004" >1724</a>, <a +href="glossaries-user.html#dx1-20008" >1725</a>, <a +href="glossaries-user.html#dx1-21011" >1726</a>, <a +href="glossaries-user.html#dx1-49010" >1727</a>, <a +href="glossaries-user.html#dx1-69076" >1728</a>, <a +href="glossaries-user.html#dx1-19012" >1729</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nonumberlist</span>  <a -href="glossaries-user.html#dx1-2044" >1554</a>, <a -href="glossaries-user.html#dx1-15051" >1555</a>, <a -href="glossaries-user.html#dx1-15057" >1556</a>, <a -href="glossaries-user.html#dx1-19110" >1557</a>, <a -href="glossaries-user.html#dx1-27003" >1558</a>, <a -href="glossaries-user.html#dx1-31008" >1559</a>, <a -href="glossaries-user.html#dx1-56054" >1560</a>, <a -href="glossaries-user.html#dx1-56056" >1561</a> <br /></span> +href="glossaries-user.html#dx1-4043" >1730</a>, <a +href="glossaries-user.html#dx1-17055" >1731</a>, <a +href="glossaries-user.html#dx1-17061" >1732</a>, <a +href="glossaries-user.html#dx1-23107" >1733</a>, <a +href="glossaries-user.html#dx1-36003" >1734</a>, <a +href="glossaries-user.html#dx1-40010" >1735</a>, <a +href="glossaries-user.html#dx1-65062" >1736</a>, <a +href="glossaries-user.html#dx1-65064" >1737</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nopostdot</span>  <a -href="glossaries-user.html#dx1-15068" >1562</a>, <a -href="glossaries-user.html#dx1-47037" >1563</a> <br /></span> +href="glossaries-user.html#dx1-17072" >1738</a>, <a +href="glossaries-user.html#dx1-56037" >1739</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-15069" >1564</a> <br /></span> +href="glossaries-user.html#dx1-17073" >1740</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nostyles</span>  <a -href="glossaries-user.html#dx1-15045" >1565</a>, <a -href="glossaries-user.html#dx1-48005" >1566</a>, <a -href="glossaries-user.html#dx1-49005" >1567</a>, <a -href="glossaries-user.html#dx1-51005" >1568</a>, <a -href="glossaries-user.html#dx1-53003" >1569</a>, <a -href="glossaries-user.html#dx1-47020" >1570</a> <br /></span> +href="glossaries-user.html#dx1-17049" >1741</a>, <a +href="glossaries-user.html#dx1-21010" >1742</a>, <a +href="glossaries-user.html#dx1-57005" >1743</a>, <a +href="glossaries-user.html#dx1-58005" >1744</a>, <a +href="glossaries-user.html#dx1-60005" >1745</a>, <a +href="glossaries-user.html#dx1-62003" >1746</a>, <a +href="glossaries-user.html#dx1-56020" >1747</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nosuper</span>  <a -href="glossaries-user.html#dx1-15036" >1571</a>, <a -href="glossaries-user.html#dx1-51004" >1572</a>, <a -href="glossaries-user.html#dx1-47019" >1573</a> <br /></span> +href="glossaries-user.html#dx1-17037" >1748</a>, <a +href="glossaries-user.html#dx1-21007" >1749</a>, <a +href="glossaries-user.html#dx1-60004" >1750</a>, <a +href="glossaries-user.html#dx1-56019" >1751</a> <br /></span> +<span class="index-subitem">    <span +class="ec-lmss-10x-x-109">notranslate</span>  <a +href="glossaries-user.html#dx1-15062" >1752</a>, <a +href="glossaries-user.html#dx1-21014" >1753</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">notree</span>  <a -href="glossaries-user.html#dx1-15043" >1574</a>, <a -href="glossaries-user.html#dx1-53002" >1575</a> <br /></span> +href="glossaries-user.html#dx1-17046" >1754</a>, <a +href="glossaries-user.html#dx1-21009" >1755</a>, <a +href="glossaries-user.html#dx1-62002" >1756</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nowarn</span>  <a -href="glossaries-user.html#dx1-13001" >1576</a>, <a -href="glossaries-user.html#dx1-26004" >1577</a> <br /></span> +href="glossaries-user.html#dx1-15001" >1757</a>, <a +href="glossaries-user.html#dx1-32004" >1758</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">numberedsection</span>  <a -href="glossaries-user.html#dx1-14021" >1578</a>, <a -href="glossaries-user.html#dx1-14022" >1579</a>, <a -href="glossaries-user.html#dx1-35023" >1580</a>, <a -href="glossaries-user.html#dx1-35024" >1581</a>, <a -href="glossaries-user.html#dx1-35031" >1582</a> <br /></span> +href="glossaries-user.html#dx1-16032" >1759</a>, <a +href="glossaries-user.html#dx1-16033" >1760</a>, <a +href="glossaries-user.html#dx1-44023" >1761</a>, <a +href="glossaries-user.html#dx1-44024" >1762</a>, <a +href="glossaries-user.html#dx1-44031" >1763</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">autolabel</span>  <a -href="glossaries-user.html#dx1-14025" >1583</a>, <a -href="glossaries-user.html#dx1-14026" >1584</a> <br /></span> +href="glossaries-user.html#dx1-16036" >1764</a>, <a +href="glossaries-user.html#dx1-16037" >1765</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-14023" >1585</a> <br /></span> +href="glossaries-user.html#dx1-16034" >1766</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">nolabel</span>  <a -href="glossaries-user.html#dx1-14024" >1586</a> <br /></span> +href="glossaries-user.html#dx1-16035" >1767</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">numberline</span>  <a -href="glossaries-user.html#dx1-14004" >1587</a>, <a -href="glossaries-user.html#dx1-14010" >1588</a> <br /></span> +href="glossaries-user.html#dx1-16004" >1768</a>, <a +href="glossaries-user.html#dx1-16010" >1769</a> <br /></span> +<span class="index-subitem">    <span +class="ec-lmss-10x-x-109">numbers</span>  <a +href="glossaries-user.html#dx1-15006" >1770</a>, <a +href="glossaries-user.html#dx1-20005" >1771</a>, <a +href="glossaries-user.html#dx1-49017" >1772</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">order</span>  <a -href="glossaries-user.html#dx1-16012" >1589</a>, <a -href="glossaries-user.html#dx1-16015" >1590</a> <br /></span> +href="glossaries-user.html#dx1-18037" >1773</a>, <a +href="glossaries-user.html#dx1-18040" >1774</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">letter</span>  <a -href="glossaries-user.html#dx1-4046" >1591</a>, <a -href="glossaries-user.html#dx1-7094" >1592</a>, <a -href="glossaries-user.html#dx1-16014" >1593</a> <br /></span> +href="glossaries-user.html#dx1-6061" >1775</a>, <a +href="glossaries-user.html#dx1-9097" >1776</a>, <a +href="glossaries-user.html#dx1-18039" >1777</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">word</span>  <a -href="glossaries-user.html#dx1-4045" >1594</a>, <a -href="glossaries-user.html#dx1-7095" >1595</a>, <a -href="glossaries-user.html#dx1-16013" >1596</a> <br /></span> +href="glossaries-user.html#dx1-6060" >1778</a>, <a +href="glossaries-user.html#dx1-9098" >1779</a>, <a +href="glossaries-user.html#dx1-18038" >1780</a> <br /></span> <span class="index-subitem">    <span -class="ec-lmss-10x-x-109">sanitize</span>  <a -href="glossaries-user.html#dx1-2051" >1597</a>, <a -href="glossaries-user.html#dx1-13005" >1598</a>, <a -href="glossaries-user.html#dx1-13012" >1599</a>, <a -href="glossaries-user.html#dx1-19037" >1600</a>, <a -href="glossaries-user.html#dx1-19079" >1601</a> <br /></span> +class="ec-lmss-10x-x-109">sanitizesort</span>  <a +href="glossaries-user.html#dx1-15011" >1781</a>, <a +href="glossaries-user.html#dx1-18025" >1782</a> <br /></span> +<span class="index-subsubitem">        <span +class="ec-lmss-10x-x-109">false</span>  <a +href="glossaries-user.html#dx1-15014" >1783</a>, <a +href="glossaries-user.html#dx1-18026" >1784</a> <br /></span> <span class="index-subsubitem">        <span -class="ec-lmss-10x-x-109">none</span>  <a -href="glossaries-user.html#dx1-13016" >1602</a> <br /></span> +class="ec-lmss-10x-x-109">true</span>  <a +href="glossaries-user.html#dx1-15015" >1785</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">savenumberlist</span>  <a -href="glossaries-user.html#dx1-13069" >1603</a>, <a -href="glossaries-user.html#dx1-34048" >1604</a> <br /></span> +href="glossaries-user.html#dx1-15074" >1786</a>, <a +href="glossaries-user.html#dx1-43056" >1787</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-13072" >1605</a> <br /></span> - - - +href="glossaries-user.html#dx1-15077" >1788</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">savewrites</span>  <a -href="glossaries-user.html#dx1-13026" >1606</a>, <a -href="glossaries-user.html#dx1-13028" >1607</a>, <a -href="glossaries-user.html#dx1-13036" >1608</a> <br /></span> +href="glossaries-user.html#dx1-15016" >1789</a>, <a +href="glossaries-user.html#dx1-15018" >1790</a>, <a +href="glossaries-user.html#dx1-15026" >1791</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-13027" >1609</a> <br /></span> +href="glossaries-user.html#dx1-15017" >1792</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">section</span>  <a -href="glossaries-user.html#dx1-14011" >1610</a>, <a -href="glossaries-user.html#dx1-35029" >1611</a> <br /></span> +href="glossaries-user.html#dx1-16011" >1793</a>, <a +href="glossaries-user.html#dx1-44029" >1794</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">seeautonumberlist</span>  <a -href="glossaries-user.html#dx1-15054" >1612</a>, <a -href="glossaries-user.html#dx1-15061" >1613</a>, <a -href="glossaries-user.html#dx1-19119" >1614</a>, <a -href="glossaries-user.html#dx1-32032" >1615</a> <br /></span> +href="glossaries-user.html#dx1-17058" >1795</a>, <a +href="glossaries-user.html#dx1-17065" >1796</a>, <a +href="glossaries-user.html#dx1-23118" >1797</a>, <a +href="glossaries-user.html#dx1-41028" >1798</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">shortcuts</span>  <a -href="glossaries-user.html#dx1-17027" >1616</a>, <a -href="glossaries-user.html#dx1-41079" >1617</a>, <a -href="glossaries-user.html#dx1-41081" >1618</a>, <a -href="glossaries-user.html#dx1-44018" >1619</a> <br /></span> +href="glossaries-user.html#dx1-19038" >1799</a>, <a +href="glossaries-user.html#dx1-50088" >1800</a>, <a +href="glossaries-user.html#dx1-50090" >1801</a>, <a +href="glossaries-user.html#dx1-53017" >1802</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">smallcaps</span>  <a -href="glossaries-user.html#dx1-17018" >1620</a>, <a -href="glossaries-user.html#dx1-41019" >1621</a>, <a -href="glossaries-user.html#dx1-41022" >1622</a>, <a -href="glossaries-user.html#dx1-41037" >1623</a>, <a -href="glossaries-user.html#dx1-41045" >1624</a>, <a -href="glossaries-user.html#dx1-41047" >1625</a>, <a -href="glossaries-user.html#dx1-41055" >1626</a>, <a -href="glossaries-user.html#dx1-41056" >1627</a>, <a -href="glossaries-user.html#dx1-42011" >1628</a>, <a -href="glossaries-user.html#dx1-42022" >1629</a>, <a -href="glossaries-user.html#dx1-42043" >1630</a>, <a -href="glossaries-user.html#dx1-43026" >1631</a>, <a -href="glossaries-user.html#dx1-62021" >1632</a>, <a -href="glossaries-user.html#dx1-62022" >1633</a> <br /></span> +href="glossaries-user.html#dx1-19027" >1803</a>, <a +href="glossaries-user.html#dx1-21019" >1804</a>, <a +href="glossaries-user.html#dx1-37130" >1805</a>, <a +href="glossaries-user.html#dx1-37142" >1806</a>, <a +href="glossaries-user.html#dx1-50018" >1807</a>, <a +href="glossaries-user.html#dx1-50022" >1808</a>, <a +href="glossaries-user.html#dx1-50037" >1809</a>, <a +href="glossaries-user.html#dx1-50047" >1810</a>, <a +href="glossaries-user.html#dx1-50049" >1811</a>, <a +href="glossaries-user.html#dx1-50057" >1812</a>, <a +href="glossaries-user.html#dx1-50058" >1813</a>, <a +href="glossaries-user.html#dx1-51011" >1814</a>, <a +href="glossaries-user.html#dx1-51022" >1815</a>, <a +href="glossaries-user.html#dx1-51043" >1816</a>, <a +href="glossaries-user.html#dx1-52031" >1817</a>, <a +href="glossaries-user.html#dx1-69023" >1818</a>, <a +href="glossaries-user.html#dx1-69024" >1819</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">smaller</span>  <a -href="glossaries-user.html#dx1-17020" >1634</a>, <a -href="glossaries-user.html#dx1-41021" >1635</a>, <a -href="glossaries-user.html#dx1-41048" >1636</a>, <a -href="glossaries-user.html#dx1-41054" >1637</a>, <a -href="glossaries-user.html#dx1-41058" >1638</a>, <a -href="glossaries-user.html#dx1-41061" >1639</a>, <a -href="glossaries-user.html#dx1-42010" >1640</a>, <a -href="glossaries-user.html#dx1-42029" >1641</a>, <a -href="glossaries-user.html#dx1-42044" >1642</a>, <a -href="glossaries-user.html#dx1-43028" >1643</a>, <a -href="glossaries-user.html#dx1-62030" >1644</a>, <a -href="glossaries-user.html#dx1-62035" >1645</a> <br /></span> +href="glossaries-user.html#dx1-19029" >1820</a>, <a +href="glossaries-user.html#dx1-50021" >1821</a>, <a +href="glossaries-user.html#dx1-50050" >1822</a>, <a +href="glossaries-user.html#dx1-50056" >1823</a>, <a +href="glossaries-user.html#dx1-50060" >1824</a>, <a +href="glossaries-user.html#dx1-50063" >1825</a>, <a +href="glossaries-user.html#dx1-51010" >1826</a>, <a +href="glossaries-user.html#dx1-51029" >1827</a>, <a +href="glossaries-user.html#dx1-51044" >1828</a>, <a +href="glossaries-user.html#dx1-52033" >1829</a>, <a +href="glossaries-user.html#dx1-69032" >1830</a>, <a +href="glossaries-user.html#dx1-69037" >1831</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">sort</span>  <a -href="glossaries-user.html#dx1-16001" >1646</a>, <a -href="glossaries-user.html#dx1-62018" >1647</a>, <a -href="glossaries-user.html#dx1-62098" >1648</a> <br /></span> +href="glossaries-user.html#dx1-18001" >1832</a>, <a +href="glossaries-user.html#dx1-69020" >1833</a>, <a +href="glossaries-user.html#dx1-69092" >1834</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">def</span>  <a -href="glossaries-user.html#dx1-16007" >1649</a>, <a -href="glossaries-user.html#dx1-19095" >1650</a>, <a -href="glossaries-user.html#dx1-24007" >1651</a>, <a -href="glossaries-user.html#dx1-62017" >1652</a> <br /></span> +href="glossaries-user.html#dx1-18007" >1835</a>, <a +href="glossaries-user.html#dx1-18011" >1836</a>, <a +href="glossaries-user.html#dx1-18014" >1837</a>, <a +href="glossaries-user.html#dx1-18028" >1838</a>, <a +href="glossaries-user.html#dx1-23087" >1839</a>, <a +href="glossaries-user.html#dx1-30007" >1840</a>, <a +href="glossaries-user.html#dx1-69019" >1841</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">standard</span>  <a -href="glossaries-user.html#dx1-16002" >1653</a>, <a -href="glossaries-user.html#dx1-16011" >1654</a> <br /></span> +href="glossaries-user.html#dx1-18002" >1842</a>, <a +href="glossaries-user.html#dx1-18016" >1843</a>, <a +href="glossaries-user.html#dx1-18032" >1844</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">use</span>  <a -href="glossaries-user.html#dx1-16009" >1655</a>, <a -href="glossaries-user.html#dx1-19096" >1656</a>, <a -href="glossaries-user.html#dx1-24006" >1657</a>, <a -href="glossaries-user.html#dx1-62016" >1658</a> <br /></span> +href="glossaries-user.html#dx1-18009" >1845</a>, <a +href="glossaries-user.html#dx1-18012" >1846</a>, <a +href="glossaries-user.html#dx1-18015" >1847</a>, <a +href="glossaries-user.html#dx1-18029" >1848</a>, <a +href="glossaries-user.html#dx1-23088" >1849</a>, <a +href="glossaries-user.html#dx1-30006" >1850</a>, <a +href="glossaries-user.html#dx1-69018" >1851</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">style</span>  <a -href="glossaries-user.html#dx1-15027" >1659</a>, <a -href="glossaries-user.html#dx1-15042" >1660</a>, <a -href="glossaries-user.html#dx1-15047" >1661</a>, <a -href="glossaries-user.html#dx1-35020" >1662</a>, <a -href="glossaries-user.html#dx1-47014" >1663</a>, <a -href="glossaries-user.html#dx1-50008" >1664</a>, <a -href="glossaries-user.html#dx1-52008" >1665</a> <br /></span> +href="glossaries-user.html#dx1-17027" >1852</a>, <a +href="glossaries-user.html#dx1-17045" >1853</a>, <a +href="glossaries-user.html#dx1-17051" >1854</a>, <a +href="glossaries-user.html#dx1-44020" >1855</a>, <a +href="glossaries-user.html#dx1-56014" >1856</a>, <a +href="glossaries-user.html#dx1-59008" >1857</a>, <a +href="glossaries-user.html#dx1-61008" >1858</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">list</span>  <a -href="glossaries-user.html#dx1-15028" >1666</a> <br /></span> +href="glossaries-user.html#dx1-17028" >1859</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">subentrycounter</span>  <a -href="glossaries-user.html#dx1-15021" >1667</a>, <a -href="glossaries-user.html#dx1-22001" >1668</a>, <a -href="glossaries-user.html#dx1-24008" >1669</a>, <a -href="glossaries-user.html#dx1-47003" >1670</a>, <a -href="glossaries-user.html#dx1-56060" >1671</a>, <a -href="glossaries-user.html#dx1-57014" >1672</a> <br /></span> +href="glossaries-user.html#dx1-17021" >1860</a>, <a +href="glossaries-user.html#dx1-28001" >1861</a>, <a +href="glossaries-user.html#dx1-30008" >1862</a>, <a +href="glossaries-user.html#dx1-56003" >1863</a>, <a +href="glossaries-user.html#dx1-65068" >1864</a>, <a +href="glossaries-user.html#dx1-65089" >1865</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-15022" >1673</a> <br /></span> +href="glossaries-user.html#dx1-17022" >1866</a> <br /></span> +<span class="index-subitem">    <span +class="ec-lmss-10x-x-109">symbols</span>  <a +href="glossaries-user.html#dx1-15005" >1867</a>, <a +href="glossaries-user.html#dx1-20001" >1868</a>, <a +href="glossaries-user.html#dx1-49016" >1869</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">toc</span>  <a -href="glossaries-user.html#dx1-14001" >1674</a>, <a -href="glossaries-user.html#dx1-14005" >1675</a>, <a -href="glossaries-user.html#dx1-14008" >1676</a>, <a -href="glossaries-user.html#dx1-14009" >1677</a>, <a -href="glossaries-user.html#dx1-35017" >1678</a> <br /></span> +href="glossaries-user.html#dx1-16001" >1870</a>, <a +href="glossaries-user.html#dx1-16005" >1871</a>, <a +href="glossaries-user.html#dx1-16008" >1872</a>, <a +href="glossaries-user.html#dx1-16009" >1873</a>, <a +href="glossaries-user.html#dx1-44017" >1874</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">translate</span>  <a -href="glossaries-user.html#dx1-13041" >1679</a> <br /></span> +href="glossaries-user.html#dx1-15031" >1875</a>, <a +href="glossaries-user.html#dx1-15054" >1876</a>, <a +href="glossaries-user.html#dx1-15056" >1877</a>, <a +href="glossaries-user.html#dx1-21013" >1878</a> <br /></span> + + + +<span class="index-subsubitem">        <span +class="ec-lmss-10x-x-109">babel</span>  <a +href="glossaries-user.html#dx1-8007" >1879</a>, <a +href="glossaries-user.html#dx1-8027" >1880</a>, <a +href="glossaries-user.html#dx1-8033" >1881</a>, <a +href="glossaries-user.html#dx1-15048" >1882</a>, <a +href="glossaries-user.html#dx1-15051" >1883</a>, <a +href="glossaries-user.html#dx1-69060" >1884</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-6030" >1680</a>, <a -href="glossaries-user.html#dx1-6035" >1681</a>, <a -href="glossaries-user.html#dx1-13046" >1682</a>, <a -href="glossaries-user.html#dx1-13057" >1683</a> <br /></span> +href="glossaries-user.html#dx1-8006" >1885</a>, <a +href="glossaries-user.html#dx1-8037" >1886</a>, <a +href="glossaries-user.html#dx1-15042" >1887</a>, <a +href="glossaries-user.html#dx1-15061" >1888</a>, <a +href="glossaries-user.html#dx1-15063" >1889</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">true</span>  <a -href="glossaries-user.html#dx1-13042" >1684</a>, <a -href="glossaries-user.html#dx1-13047" >1685</a> <br /></span> +href="glossaries-user.html#dx1-15032" >1890</a>, <a +href="glossaries-user.html#dx1-15053" >1891</a>, <a +href="glossaries-user.html#dx1-15055" >1892</a>, <a +href="glossaries-user.html#dx1-15057" >1893</a> <br /></span> +<span class="index-subitem">    <span +class="ec-lmss-10x-x-109">ucfirst</span>  <a +href="glossaries-user.html#dx1-16029" >1894</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">ucmark</span>  <a -href="glossaries-user.html#dx1-14015" >1686</a>, <a -href="glossaries-user.html#dx1-14017" >1687</a> <br /></span> +href="glossaries-user.html#dx1-16014" >1895</a>, <a +href="glossaries-user.html#dx1-16016" >1896</a> <br /></span> <span class="index-subsubitem">        <span class="ec-lmss-10x-x-109">false</span>  <a -href="glossaries-user.html#dx1-14018" >1688</a> <br /></span> +href="glossaries-user.html#dx1-16017" >1897</a> <br /></span> +<span class="index-subsubitem">        <span +class="ec-lmss-10x-x-109">true</span>  <a +href="glossaries-user.html#dx1-16019" >1898</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">xindy</span>  <a -href="glossaries-user.html#dx1-4084" >1689</a>, <a -href="glossaries-user.html#dx1-5011" >1690</a>, <a -href="glossaries-user.html#dx1-7096" >1691</a>, <a -href="glossaries-user.html#dx1-9005" >1692</a>, <a -href="glossaries-user.html#dx1-10003" >1693</a>, <a -href="glossaries-user.html#dx1-16032" >1694</a>, <a -href="glossaries-user.html#dx1-16046" >1695</a>, <a -href="glossaries-user.html#dx1-18031" >1696</a>, <a -href="glossaries-user.html#dx1-36003" >1697</a>, <a -href="glossaries-user.html#dx1-38001" >1698</a>, <a -href="glossaries-user.html#dx1-39001" >1699</a> <br /></span> +href="glossaries-user.html#dx1-6106" >1899</a>, <a +href="glossaries-user.html#dx1-7011" >1900</a>, <a +href="glossaries-user.html#dx1-9099" >1901</a>, <a +href="glossaries-user.html#dx1-11005" >1902</a>, <a +href="glossaries-user.html#dx1-12003" >1903</a>, <a +href="glossaries-user.html#dx1-18057" >1904</a>, <a +href="glossaries-user.html#dx1-18074" >1905</a>, <a +href="glossaries-user.html#dx1-21003" >1906</a>, <a +href="glossaries-user.html#dx1-21016" >1907</a>, <a +href="glossaries-user.html#dx1-22031" >1908</a>, <a +href="glossaries-user.html#dx1-45003" >1909</a>, <a +href="glossaries-user.html#dx1-47001" >1910</a>, <a +href="glossaries-user.html#dx1-48001" >1911</a> <br /></span> +<span class="index-subitem">    <span +class="ec-lmss-10x-x-109">xindygloss</span>  <a +href="glossaries-user.html#dx1-18073" >1912</a>, <a +href="glossaries-user.html#dx1-21004" >1913</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">page </span>counter  <a -href="glossaries-user.html#dx1-38040" >1700</a> <br /></span> +href="glossaries-user.html#dx1-47047" >1914</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\pagelistname</span></span></span>  <a -href="glossaries-user.html#dx1-6020" >1701</a> <br /></span> +href="glossaries-user.html#dx1-8022" >1915</a> <br /></span> +<span class="index-item"><span +class="ec-lmtt-10x-x-109">pdflatex</span>  <a +href="glossaries-user.html#dx1-14" >1916</a>, <a +href="glossaries-user.html#dx1-37018" >1917</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\PGLS</span></span></span>  <a +href="glossaries-user.html#dx1-67030" ><span +class="ec-lmri-10x-x-109">1918</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\Pgls</span></span></span>  <a +href="glossaries-user.html#dx1-67025" ><span +class="ec-lmri-10x-x-109">1919</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\pgls</span></span></span>  <a +href="glossaries-user.html#dx1-67021" ><span +class="ec-lmri-10x-x-109">1920</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\PGLSpl</span></span></span>  <a +href="glossaries-user.html#dx1-67041" ><span +class="ec-lmri-10x-x-109">1921</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\Pglspl</span></span></span>  <a +href="glossaries-user.html#dx1-67036" ><span +class="ec-lmri-10x-x-109">1922</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\pglspl</span></span></span>  <a +href="glossaries-user.html#dx1-67032" ><span +class="ec-lmri-10x-x-109">1923</span></a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">pod2man</span>  <a -href="glossaries-user.html#dx1-8018" >1702</a> <br /></span> +href="glossaries-user.html#dx1-10029" >1924</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">polyglossia </span>package  <a -href="glossaries-user.html#dx1-6002" >1703</a>, <a -href="glossaries-user.html#dx1-6032" >1704</a>, <a -href="glossaries-user.html#dx1-13044" >1705</a>, <a -href="glossaries-user.html#dx1-13055" >1706</a>, <a -href="glossaries-user.html#dx1-13059" >1707</a> <br /></span> +href="glossaries-user.html#dx1-8002" >1925</a>, <a +href="glossaries-user.html#dx1-8034" >1926</a>, <a +href="glossaries-user.html#dx1-15040" >1927</a>, <a +href="glossaries-user.html#dx1-15044" >1928</a>, <a +href="glossaries-user.html#dx1-15059" >1929</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\printacronyms</span></span></span>  <a +href="glossaries-user.html#dx1-19002" ><span +class="ec-lmri-10x-x-109">1930</span></a>, <a +href="glossaries-user.html#dx1-52005" >1931</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\printglossaries</span></span></span>  <a -href="glossaries-user.html#dx1-19008" >1708</a>, <a -href="glossaries-user.html#dx1-35001" ><span -class="ec-lmri-10x-x-109">1709</span></a>, <a -href="glossaries-user.html#dx1-43002" >1710</a>, <a -href="glossaries-user.html#dx1-56064" >1711</a>, <a -href="glossaries-user.html#dx1-62076" >1712</a> <br /></span> +href="glossaries-user.html#dx1-23008" >1932</a>, <a +href="glossaries-user.html#dx1-34006" >1933</a>, <a +href="glossaries-user.html#dx1-44001" ><span +class="ec-lmri-10x-x-109">1934</span></a>, <a +href="glossaries-user.html#dx1-52003" >1935</a>, <a +href="glossaries-user.html#dx1-65072" >1936</a>, <a +href="glossaries-user.html#dx1-66008" >1937</a>, <a +href="glossaries-user.html#dx1-69065" >1938</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\printglossary</span></span></span>  <a -href="glossaries-user.html#dx1-15050" >1713</a>, <a -href="glossaries-user.html#dx1-19007" >1714</a>, <a -href="glossaries-user.html#dx1-35013" ><span -class="ec-lmri-10x-x-109">1715</span></a>, <a -href="glossaries-user.html#dx1-43001" >1716</a>, <a -href="glossaries-user.html#dx1-47012" >1717</a>, <a -href="glossaries-user.html#dx1-47027" >1718</a>, <a -href="glossaries-user.html#dx1-56063" >1719</a>, <a -href="glossaries-user.html#dx1-62075" >1720</a> <br /></span> +href="glossaries-user.html#dx1-17054" >1939</a>, <a +href="glossaries-user.html#dx1-19003" >1940</a>, <a +href="glossaries-user.html#dx1-20003" >1941</a>, <a +href="glossaries-user.html#dx1-20007" >1942</a>, <a +href="glossaries-user.html#dx1-23007" >1943</a>, <a +href="glossaries-user.html#dx1-34005" >1944</a>, <a +href="glossaries-user.html#dx1-44013" ><span +class="ec-lmri-10x-x-109">1945</span></a>, <a +href="glossaries-user.html#dx1-52001" >1946</a>, <a +href="glossaries-user.html#dx1-52006" >1947</a>, <a +href="glossaries-user.html#dx1-56012" >1948</a>, <a +href="glossaries-user.html#dx1-56027" >1949</a>, <a +href="glossaries-user.html#dx1-65071" >1950</a>, <a +href="glossaries-user.html#dx1-66007" >1951</a>, <a +href="glossaries-user.html#dx1-69064" >1952</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">\printglossary </span>options<br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">nonumberlist</span>  <a -href="glossaries-user.html#dx1-35025" >1721</a> <br /></span> +href="glossaries-user.html#dx1-44025" >1953</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">numberedsection</span>  <a -href="glossaries-user.html#dx1-35022" >1722</a> <br /></span> +href="glossaries-user.html#dx1-44022" >1954</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">style</span>  <a -href="glossaries-user.html#dx1-15049" >1723</a>, <a -href="glossaries-user.html#dx1-35019" >1724</a>, <a -href="glossaries-user.html#dx1-47011" >1725</a>, <a -href="glossaries-user.html#dx1-47026" >1726</a> <br /></span> +href="glossaries-user.html#dx1-17053" >1955</a>, <a +href="glossaries-user.html#dx1-44019" >1956</a>, <a +href="glossaries-user.html#dx1-56011" >1957</a>, <a +href="glossaries-user.html#dx1-56026" >1958</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">title</span>  <a -href="glossaries-user.html#dx1-35015" >1727</a>, <a -href="glossaries-user.html#dx1-35018" >1728</a> <br /></span> +href="glossaries-user.html#dx1-44015" >1959</a>, <a +href="glossaries-user.html#dx1-44018" >1960</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">toctitle</span>  <a -href="glossaries-user.html#dx1-35016" >1729</a> <br /></span> +href="glossaries-user.html#dx1-44016" >1961</a> <br /></span> <span class="index-subitem">    <span class="ec-lmss-10x-x-109">type</span>  <a -href="glossaries-user.html#dx1-35014" >1730</a> <br /></span> +href="glossaries-user.html#dx1-44014" >1962</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\printnumbers</span></span></span>  <a +href="glossaries-user.html#dx1-20006" ><span +class="ec-lmri-10x-x-109">1963</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span -class="ec-lmtt-10x-x-109">\protect</span></span></span>  <a -href="glossaries-user.html#dx1-2050" >1731</a> <br /></span> +class="ec-lmtt-10x-x-109">\printsymbols</span></span></span>  <a +href="glossaries-user.html#dx1-20002" ><span +class="ec-lmri-10x-x-109">1964</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\provideglossaryentry</span></span></span>  <a +href="glossaries-user.html#dx1-23019" ><span +class="ec-lmri-10x-x-109">1965</span></a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">R</span> <span class="index-item"><span class="ec-lmss-10x-x-109">relsize </span>package  <a -href="glossaries-user.html#dx1-17022" >1732</a>, <a -href="glossaries-user.html#dx1-41027" >1733</a>, <a -href="glossaries-user.html#dx1-41060" >1734</a>, <a -href="glossaries-user.html#dx1-42041" >1735</a> <br /></span> +href="glossaries-user.html#dx1-19031" >1966</a>, <a +href="glossaries-user.html#dx1-50027" >1967</a>, <a +href="glossaries-user.html#dx1-50062" >1968</a>, <a +href="glossaries-user.html#dx1-51041" >1969</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\Roman</span></span></span>  <a -href="glossaries-user.html#dx1-38031" >1736</a> <br /></span> +href="glossaries-user.html#dx1-47036" >1970</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">S</span> - - - <span class="index-item">sanitize  <a -href="glossaries-user.html#dx1-2045" ><span -class="ec-lmbx-10x-x-109">1737</span></a>, <a -href="glossaries-user.html#dx1-5019" >1738</a>, <a -href="glossaries-user.html#dx1-13007" >1739</a>, <a -href="glossaries-user.html#dx1-19036" >1740</a>, <a -href="glossaries-user.html#dx1-19078" >1741</a>, <a -href="glossaries-user.html#dx1-28145" >1742</a>, <a -href="glossaries-user.html#dx1-28154" >1743</a>, <a -href="glossaries-user.html#dx1-28163" >1744</a>, <a -href="glossaries-user.html#dx1-29043" >1745</a>, <a -href="glossaries-user.html#dx1-32008" >1746</a>, <a -href="glossaries-user.html#dx1-33017" >1747</a>, <a -href="glossaries-user.html#dx1-34047" >1748</a> <br /></span> +href="glossaries-user.html#dx1-4044" ><span +class="ec-lmbx-10x-x-109">1971</span></a>, <a +href="glossaries-user.html#dx1-15013" >1972</a>, <a +href="glossaries-user.html#dx1-42017" >1973</a>, <a +href="glossaries-user.html#dx1-43055" >1974</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">scrwfile </span>package  <a -href="glossaries-user.html#dx1-13030" >1749</a> <br /></span> +href="glossaries-user.html#dx1-15020" >1975</a> <br /></span> + + + <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\section*</span></span></span>  <a -href="glossaries-user.html#dx1-35027" >1750</a> <br /></span> +href="glossaries-user.html#dx1-44027" >1976</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\seename</span></span></span>  <a -href="glossaries-user.html#dx1-2003" >1751</a>, <a -href="glossaries-user.html#dx1-32015" >1752</a>, <a -href="glossaries-user.html#dx1-32020" >1753</a>, <a -href="glossaries-user.html#dx1-33007" >1754</a> <br /></span> +href="glossaries-user.html#dx1-4002" >1977</a>, <a +href="glossaries-user.html#dx1-41011" >1978</a>, <a +href="glossaries-user.html#dx1-41016" >1979</a>, <a +href="glossaries-user.html#dx1-42007" >1980</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\SetAcronymLists</span></span></span>  <a +href="glossaries-user.html#dx1-19023" ><span +class="ec-lmri-10x-x-109">1981</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\setAlphaCompositor</span></span></span>  <a -href="glossaries-user.html#dx1-38049" >1755</a> <br /></span> +href="glossaries-user.html#dx1-47056" >1982</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\setCompositor</span></span></span>  <a -href="glossaries-user.html#dx1-38047" >1756</a> <br /></span> +href="glossaries-user.html#dx1-47054" >1983</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\SetCustomDisplayStyle</span></span></span>  <a -href="glossaries-user.html#dx1-44014" ><span -class="ec-lmri-10x-x-109">1757</span></a>, <a -href="glossaries-user.html#dx1-44044" >1758</a>, <a -href="glossaries-user.html#dx1-44053" >1759</a>, <a -href="glossaries-user.html#dx1-44057" >1760</a> <br /></span> +href="glossaries-user.html#dx1-53014" ><span +class="ec-lmri-10x-x-109">1984</span></a>, <a +href="glossaries-user.html#dx1-53044" >1985</a>, <a +href="glossaries-user.html#dx1-53046" >1986</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\SetCustomStyle</span></span></span>  <a -href="glossaries-user.html#dx1-44017" ><span -class="ec-lmri-10x-x-109">1761</span></a> <br /></span> +href="glossaries-user.html#dx1-53016" ><span +class="ec-lmri-10x-x-109">1987</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\setentrycounter</span></span></span>  <a -href="glossaries-user.html#dx1-56048" >1762</a>, <a -href="glossaries-user.html#dx1-56051" >1763</a> <br /></span> +href="glossaries-user.html#dx1-65056" >1988</a>, <a +href="glossaries-user.html#dx1-65059" >1989</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\setglossarypreamble</span></span></span>  <a -href="glossaries-user.html#dx1-15020" >1764</a>, <a -href="glossaries-user.html#dx1-35035" ><span -class="ec-lmri-10x-x-109">1765</span></a> <br /></span> +href="glossaries-user.html#dx1-17020" >1990</a>, <a +href="glossaries-user.html#dx1-44036" ><span +class="ec-lmri-10x-x-109">1991</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\setglossarysection</span></span></span>  <a -href="glossaries-user.html#dx1-14012" ><span -class="ec-lmri-10x-x-109">1766</span></a>, <a -href="glossaries-user.html#dx1-35030" >1767</a> <br /></span> +href="glossaries-user.html#dx1-16012" ><span +class="ec-lmri-10x-x-109">1992</span></a>, <a +href="glossaries-user.html#dx1-44030" >1993</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\setglossarystyle</span></span></span>  <a +href="glossaries-user.html#dx1-17052" >1994</a>, <a +href="glossaries-user.html#dx1-56013" ><span +class="ec-lmri-10x-x-109">1995</span></a>, <a +href="glossaries-user.html#dx1-56029" >1996</a>, <a +href="glossaries-user.html#dx1-56032" >1997</a>, <a +href="glossaries-user.html#dx1-63010" >1998</a>, <a +href="glossaries-user.html#dx1-64007" >1999</a>, <a +href="glossaries-user.html#dx1-65095" >2000</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\setStyleFile</span></span></span>  <a -href="glossaries-user.html#dx1-9021" >1768</a>, <a -href="glossaries-user.html#dx1-10011" >1769</a>, <a -href="glossaries-user.html#dx1-18023" ><span -class="ec-lmri-10x-x-109">1770</span></a> <br /></span> +href="glossaries-user.html#dx1-11021" >2001</a>, <a +href="glossaries-user.html#dx1-12011" >2002</a>, <a +href="glossaries-user.html#dx1-22023" ><span +class="ec-lmri-10x-x-109">2003</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\setupglossaries</span></span></span>  <a +href="glossaries-user.html#dx1-21002" ><span +class="ec-lmri-10x-x-109">2004</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\smaller</span></span></span>  <a -href="glossaries-user.html#dx1-42037" >1771</a> <br /></span> +href="glossaries-user.html#dx1-51037" >2005</a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ec-lmtt-10x-x-109">\subglossentry</span></span></span>  <a +href="glossaries-user.html#dx1-65065" ><span +class="ec-lmri-10x-x-109">2006</span></a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">supertabular </span>(environment)  <a -href="glossaries-user.html#dx1-51002" >1772</a>, <a -href="glossaries-user.html#dx1-51008" >1773</a>, <a -href="glossaries-user.html#dx1-51013" >1774</a>, <a -href="glossaries-user.html#dx1-52003" >1775</a>, <a -href="glossaries-user.html#dx1-52010" >1776</a> <br /></span> +href="glossaries-user.html#dx1-60002" >2007</a>, <a +href="glossaries-user.html#dx1-60008" >2008</a>, <a +href="glossaries-user.html#dx1-60013" >2009</a>, <a +href="glossaries-user.html#dx1-61003" >2010</a>, <a +href="glossaries-user.html#dx1-61010" >2011</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">supertabular </span>package  <a -href="glossaries-user.html#dx1-15038" >1777</a>, <a -href="glossaries-user.html#dx1-51015" >1778</a>, <a -href="glossaries-user.html#dx1-52012" >1779</a> <br /></span> +href="glossaries-user.html#dx1-17039" >2012</a>, <a +href="glossaries-user.html#dx1-60015" >2013</a>, <a +href="glossaries-user.html#dx1-61012" >2014</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\symbolname</span></span></span>  <a -href="glossaries-user.html#dx1-6019" >1780</a> <br /></span> +href="glossaries-user.html#dx1-8021" >2015</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">T</span> <span class="index-item">TeX4HT  <a -href="glossaries-user.html#dx1-62101" >1781</a> <br /></span> +href="glossaries-user.html#dx1-69095" >2016</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\textbf</span></span></span>  <a -href="glossaries-user.html#dx1-28045" >1782</a> <br /></span> +href="glossaries-user.html#dx1-37049" >2017</a> <br /></span> +<span class="index-item"><span +class="ec-lmss-10x-x-109">textcase </span>package  <a +href="glossaries-user.html#dx1-16024" >2018</a>, <a +href="glossaries-user.html#dx1-16026" >2019</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\textrm</span></span></span>  <a -href="glossaries-user.html#dx1-38013" >1783</a> <br /></span> +href="glossaries-user.html#dx1-47013" >2020</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\textsc</span></span></span>  <a -href="glossaries-user.html#dx1-41020" >1784</a>, <a -href="glossaries-user.html#dx1-41024" >1785</a>, <a -href="glossaries-user.html#dx1-41057" >1786</a>, <a -href="glossaries-user.html#dx1-42028" >1787</a>, <a -href="glossaries-user.html#dx1-44024" >1788</a>, <a -href="glossaries-user.html#dx1-44025" >1789</a>, <a -href="glossaries-user.html#dx1-62023" >1790</a> <br /></span> +href="glossaries-user.html#dx1-50019" >2021</a>, <a +href="glossaries-user.html#dx1-50024" >2022</a>, <a +href="glossaries-user.html#dx1-50059" >2023</a>, <a +href="glossaries-user.html#dx1-51028" >2024</a>, <a +href="glossaries-user.html#dx1-53025" >2025</a>, <a +href="glossaries-user.html#dx1-53026" >2026</a>, <a +href="glossaries-user.html#dx1-69025" >2027</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\textsmaller</span></span></span>  <a -href="glossaries-user.html#dx1-17023" >1791</a>, <a -href="glossaries-user.html#dx1-41023" >1792</a>, <a -href="glossaries-user.html#dx1-41025" >1793</a>, <a -href="glossaries-user.html#dx1-41026" >1794</a>, <a -href="glossaries-user.html#dx1-42040" >1795</a>, <a -href="glossaries-user.html#dx1-62037" >1796</a>, <a -href="glossaries-user.html#dx1-42038" >1797</a> <br /></span> +href="glossaries-user.html#dx1-19032" >2028</a>, <a +href="glossaries-user.html#dx1-50023" >2029</a>, <a +href="glossaries-user.html#dx1-50025" >2030</a>, <a +href="glossaries-user.html#dx1-50026" >2031</a>, <a +href="glossaries-user.html#dx1-51040" >2032</a>, <a +href="glossaries-user.html#dx1-69039" >2033</a>, <a +href="glossaries-user.html#dx1-51038" >2034</a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">theglossary </span>(environment)  <a -href="glossaries-user.html#dx1-56002" ><span -class="ec-lmri-10x-x-109">1798</span></a>, <a -href="glossaries-user.html#dx1-56004" >1799</a>, <a -href="glossaries-user.html#dx1-56011" >1800</a>, <a -href="glossaries-user.html#dx1-57003" >1801</a> <br /></span> +href="glossaries-user.html#dx1-65002" ><span +class="ec-lmri-10x-x-109">2035</span></a>, <a +href="glossaries-user.html#dx1-65004" >2036</a>, <a +href="glossaries-user.html#dx1-65011" >2037</a>, <a +href="glossaries-user.html#dx1-65078" >2038</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\thepage</span></span></span>  <a -href="glossaries-user.html#dx1-38033" >1802</a> <br /></span> +href="glossaries-user.html#dx1-47040" >2039</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">translator </span>package  <a -href="glossaries-user.html#dx1-6004" >1803</a>, <a -href="glossaries-user.html#dx1-6005" >1804</a>, <a -href="glossaries-user.html#dx1-6006" >1805</a>, <a -href="glossaries-user.html#dx1-6010" >1806</a>, <a -href="glossaries-user.html#dx1-6012" >1807</a>, <a -href="glossaries-user.html#dx1-6024" >1808</a>, <a -href="glossaries-user.html#dx1-6025" >1809</a>, <a -href="glossaries-user.html#dx1-6026" >1810</a>, <a -href="glossaries-user.html#dx1-6029" >1811</a>, <a -href="glossaries-user.html#dx1-13045" >1812</a>, <a -href="glossaries-user.html#dx1-13049" >1813</a>, <a -href="glossaries-user.html#dx1-13050" >1814</a>, <a -href="glossaries-user.html#dx1-13051" >1815</a>, <a -href="glossaries-user.html#dx1-13052" >1816</a>, <a -href="glossaries-user.html#dx1-40018" >1817</a>, <a -href="glossaries-user.html#dx1-62058" >1818</a> <br /></span> +href="glossaries-user.html#dx1-8004" >2040</a>, <a +href="glossaries-user.html#dx1-8005" >2041</a>, <a +href="glossaries-user.html#dx1-8008" >2042</a>, <a +href="glossaries-user.html#dx1-8012" >2043</a>, <a +href="glossaries-user.html#dx1-8014" >2044</a>, <a +href="glossaries-user.html#dx1-8028" >2045</a>, <a +href="glossaries-user.html#dx1-8029" >2046</a>, <a +href="glossaries-user.html#dx1-8032" >2047</a>, <a +href="glossaries-user.html#dx1-15034" >2048</a>, <a +href="glossaries-user.html#dx1-15035" >2049</a>, <a +href="glossaries-user.html#dx1-15036" >2050</a>, <a +href="glossaries-user.html#dx1-15037" >2051</a>, <a +href="glossaries-user.html#dx1-15049" >2052</a>, <a +href="glossaries-user.html#dx1-15060" >2053</a>, <a +href="glossaries-user.html#dx1-49020" >2054</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">W</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\write18</span></span></span>  <a -href="glossaries-user.html#dx1-13031" >1819</a> <br /></span> +href="glossaries-user.html#dx1-15021" >2055</a> <br /></span> </p><p class="theindex"> <span class="ec-lmbx-10x-x-109">X</span> <span class="index-item">xindy  <a -href="glossaries-user.html#dx1-2052" ><span -class="ec-lmbx-10x-x-109">1820</span></a> <br /></span> +href="glossaries-user.html#dx1-4046" ><span +class="ec-lmbx-10x-x-109">2056</span></a> <br /></span> <span class="index-item"><span class="ec-lmtt-10x-x-109">xindy</span>  <a -href="glossaries-user.html#dx1-2026" >1821</a>, <a -href="glossaries-user.html#dx1-2034" >1822</a>, <a -href="glossaries-user.html#dx1-3012" >1823</a>, <a -href="glossaries-user.html#dx1-3018" >1824</a>, <a -href="glossaries-user.html#dx1-3020" >1825</a>, <a -href="glossaries-user.html#dx1-3022" >1826</a>, <a -href="glossaries-user.html#dx1-4053" >1827</a>, <a -href="glossaries-user.html#dx1-4060" >1828</a>, <a -href="glossaries-user.html#dx1-4067" >1829</a>, <a -href="glossaries-user.html#dx1-4071" >1830</a>, <a -href="glossaries-user.html#dx1-4075" >1831</a>, <a -href="glossaries-user.html#dx1-4079" >1832</a>, <a -href="glossaries-user.html#dx1-4081" >1833</a>, <a -href="glossaries-user.html#dx1-5002" >1834</a>, <a -href="glossaries-user.html#dx1-5006" >1835</a>, <a -href="glossaries-user.html#dx1-5010" >1836</a>, <a -href="glossaries-user.html#dx1-5028" >1837</a>, <a -href="glossaries-user.html#dx1-5032" >1838</a>, <a -href="glossaries-user.html#dx1-6037" >1839</a>, <a -href="glossaries-user.html#dx1-6041" >1840</a>, <a -href="glossaries-user.html#dx1-7007" >1841</a>, <a -href="glossaries-user.html#dx1-7011" >1842</a>, <a -href="glossaries-user.html#dx1-7015" >1843</a>, <a -href="glossaries-user.html#dx1-7017" >1844</a>, <a -href="glossaries-user.html#dx1-7023" >1845</a>, <a -href="glossaries-user.html#dx1-7030" >1846</a>, <a -href="glossaries-user.html#dx1-7036" >1847</a>, <a -href="glossaries-user.html#dx1-7042" >1848</a>, <a -href="glossaries-user.html#dx1-7046" >1849</a>, <a -href="glossaries-user.html#dx1-7062" >1850</a>, <a -href="glossaries-user.html#dx1-7068" >1851</a>, <a -href="glossaries-user.html#dx1-7076" >1852</a>, <a -href="glossaries-user.html#dx1-7084" >1853</a>, <a -href="glossaries-user.html#dx1-7093" >1854</a>, <a -href="glossaries-user.html#dx1-8005" >1855</a>, <a -href="glossaries-user.html#dx1-9004" >1856</a>, <a -href="glossaries-user.html#dx1-9007" >1857</a>, <a -href="glossaries-user.html#dx1-9013" >1858</a>, <a -href="glossaries-user.html#dx1-9015" >1859</a>, <a -href="glossaries-user.html#dx1-9018" >1860</a>, <a -href="glossaries-user.html#dx1-9031" >1861</a>, <a -href="glossaries-user.html#dx1-9035" >1862</a>, <a -href="glossaries-user.html#dx1-11002" >1863</a>, <a -href="glossaries-user.html#dx1-11016" >1864</a>, <a -href="glossaries-user.html#dx1-11021" >1865</a>, <a -href="glossaries-user.html#dx1-13035" >1866</a>, <a -href="glossaries-user.html#dx1-13040" >1867</a>, <a -href="glossaries-user.html#dx1-15011" >1868</a>, <a -href="glossaries-user.html#dx1-16030" >1869</a>, <a -href="glossaries-user.html#dx1-16034" >1870</a>, <a -href="glossaries-user.html#dx1-16038" >1871</a>, <a -href="glossaries-user.html#dx1-16042" >1872</a>, <a -href="glossaries-user.html#dx1-16048" >1873</a>, <a -href="glossaries-user.html#dx1-18006" >1874</a>, <a -href="glossaries-user.html#dx1-18009" >1875</a>, <a -href="glossaries-user.html#dx1-18022" >1876</a>, <a -href="glossaries-user.html#dx1-18029" >1877</a>, <a -href="glossaries-user.html#dx1-19014" >1878</a>, <a -href="glossaries-user.html#dx1-19091" >1879</a>, <a -href="glossaries-user.html#dx1-19135" >1880</a>, <a -href="glossaries-user.html#dx1-27009" >1881</a>, <a -href="glossaries-user.html#dx1-27011" >1882</a>, <a -href="glossaries-user.html#dx1-27018" >1883</a>, <a -href="glossaries-user.html#dx1-27022" >1884</a>, <a -href="glossaries-user.html#dx1-28007" >1885</a>, <a -href="glossaries-user.html#dx1-28048" >1886</a>, <a -href="glossaries-user.html#dx1-28054" >1887</a>, <a -href="glossaries-user.html#dx1-28075" >1888</a>, <a -href="glossaries-user.html#dx1-34056" >1889</a>, <a -href="glossaries-user.html#dx1-35007" >1890</a>, <a -href="glossaries-user.html#dx1-35011" >1891</a>, <a -href="glossaries-user.html#dx1-36002" >1892</a>, <a -href="glossaries-user.html#dx1-36005" >1893</a>, <a -href="glossaries-user.html#dx1-36008" >1894</a>, <a -href="glossaries-user.html#dx1-36011" >1895</a>, <a -href="glossaries-user.html#dx1-36017" >1896</a>, <a -href="glossaries-user.html#dx1-36019" >1897</a>, <a -href="glossaries-user.html#dx1-36022" >1898</a>, <a -href="glossaries-user.html#dx1-36024" >1899</a>, <a -href="glossaries-user.html#dx1-37002" >1900</a>, <a -href="glossaries-user.html#dx1-37004" >1901</a>, <a -href="glossaries-user.html#dx1-37009" >1902</a>, <a -href="glossaries-user.html#dx1-37015" >1903</a>, <a -href="glossaries-user.html#dx1-37020" >1904</a>, <a -href="glossaries-user.html#dx1-38005" >1905</a>, <a -href="glossaries-user.html#dx1-38016" >1906</a>, <a -href="glossaries-user.html#dx1-38020" >1907</a>, <a -href="glossaries-user.html#dx1-38026" >1908</a>, <a -href="glossaries-user.html#dx1-38035" >1909</a>, <a -href="glossaries-user.html#dx1-38043" >1910</a>, <a -href="glossaries-user.html#dx1-38059" >1911</a>, <a -href="glossaries-user.html#dx1-40007" >1912</a>, <a -href="glossaries-user.html#dx1-53016" >1913</a>, <a -href="glossaries-user.html#dx1-56027" >1914</a>, <a -href="glossaries-user.html#dx1-62007" >1915</a>, <a -href="glossaries-user.html#dx1-62009" >1916</a>, <a -href="glossaries-user.html#dx1-62013" >1917</a>, <a -href="glossaries-user.html#dx1-62015" >1918</a>, <a -href="glossaries-user.html#dx1-62051" >1919</a>, <a -href="glossaries-user.html#dx1-62087" >1920</a>, <a -href="glossaries-user.html#dx1-62091" >1921</a>, <a -href="glossaries-user.html#dx1-62093" >1922</a>, <a -href="glossaries-user.html#dx1-62095" >1923</a>, <a -href="glossaries-user.html#dx1-62097" >1924</a> <br /></span> +href="glossaries-user.html#dx1-4025" >2057</a>, <a +href="glossaries-user.html#dx1-4033" >2058</a>, <a +href="glossaries-user.html#dx1-5012" >2059</a>, <a +href="glossaries-user.html#dx1-5018" >2060</a>, <a +href="glossaries-user.html#dx1-5020" >2061</a>, <a +href="glossaries-user.html#dx1-5022" >2062</a>, <a +href="glossaries-user.html#dx1-6073" >2063</a>, <a +href="glossaries-user.html#dx1-6080" >2064</a>, <a +href="glossaries-user.html#dx1-6087" >2065</a>, <a +href="glossaries-user.html#dx1-6092" >2066</a>, <a +href="glossaries-user.html#dx1-6097" >2067</a>, <a +href="glossaries-user.html#dx1-6101" >2068</a>, <a +href="glossaries-user.html#dx1-6103" >2069</a>, <a +href="glossaries-user.html#dx1-7002" >2070</a>, <a +href="glossaries-user.html#dx1-7006" >2071</a>, <a +href="glossaries-user.html#dx1-7010" >2072</a>, <a +href="glossaries-user.html#dx1-7017" >2073</a>, <a +href="glossaries-user.html#dx1-7021" >2074</a>, <a +href="glossaries-user.html#dx1-8039" >2075</a>, <a +href="glossaries-user.html#dx1-8043" >2076</a>, <a +href="glossaries-user.html#dx1-9008" >2077</a>, <a +href="glossaries-user.html#dx1-9012" >2078</a>, <a +href="glossaries-user.html#dx1-9016" >2079</a>, <a +href="glossaries-user.html#dx1-9018" >2080</a>, <a +href="glossaries-user.html#dx1-9026" >2081</a>, <a +href="glossaries-user.html#dx1-9033" >2082</a>, <a +href="glossaries-user.html#dx1-9039" >2083</a>, <a +href="glossaries-user.html#dx1-9045" >2084</a>, <a +href="glossaries-user.html#dx1-9049" >2085</a>, <a +href="glossaries-user.html#dx1-9065" >2086</a>, <a +href="glossaries-user.html#dx1-9071" >2087</a>, <a +href="glossaries-user.html#dx1-9079" >2088</a>, <a +href="glossaries-user.html#dx1-9087" >2089</a>, <a +href="glossaries-user.html#dx1-9096" >2090</a>, <a +href="glossaries-user.html#dx1-10005" >2091</a>, <a +href="glossaries-user.html#dx1-10020" >2092</a>, <a +href="glossaries-user.html#dx1-10024" >2093</a>, <a +href="glossaries-user.html#dx1-11004" >2094</a>, <a +href="glossaries-user.html#dx1-11007" >2095</a>, <a +href="glossaries-user.html#dx1-11013" >2096</a>, <a +href="glossaries-user.html#dx1-11015" >2097</a>, <a +href="glossaries-user.html#dx1-11018" >2098</a>, <a +href="glossaries-user.html#dx1-11031" >2099</a>, <a +href="glossaries-user.html#dx1-11035" >2100</a>, <a +href="glossaries-user.html#dx1-13002" >2101</a>, <a +href="glossaries-user.html#dx1-13016" >2102</a>, <a +href="glossaries-user.html#dx1-13021" >2103</a>, <a +href="glossaries-user.html#dx1-15025" >2104</a>, <a +href="glossaries-user.html#dx1-15030" >2105</a>, <a +href="glossaries-user.html#dx1-17011" >2106</a>, <a +href="glossaries-user.html#dx1-18023" >2107</a>, <a +href="glossaries-user.html#dx1-18055" >2108</a>, <a +href="glossaries-user.html#dx1-18059" >2109</a>, <a +href="glossaries-user.html#dx1-18063" >2110</a>, <a +href="glossaries-user.html#dx1-18067" >2111</a>, <a +href="glossaries-user.html#dx1-18072" >2112</a>, <a +href="glossaries-user.html#dx1-22006" >2113</a>, <a +href="glossaries-user.html#dx1-22009" >2114</a>, <a +href="glossaries-user.html#dx1-22022" >2115</a>, <a +href="glossaries-user.html#dx1-22029" >2116</a>, <a +href="glossaries-user.html#dx1-23014" >2117</a>, <a +href="glossaries-user.html#dx1-23083" >2118</a>, <a +href="glossaries-user.html#dx1-23136" >2119</a>, <a +href="glossaries-user.html#dx1-36009" >2120</a>, <a +href="glossaries-user.html#dx1-36011" >2121</a>, <a +href="glossaries-user.html#dx1-36018" >2122</a>, <a +href="glossaries-user.html#dx1-36022" >2123</a>, <a +href="glossaries-user.html#dx1-37007" >2124</a>, <a +href="glossaries-user.html#dx1-37052" >2125</a>, <a +href="glossaries-user.html#dx1-37058" >2126</a>, <a +href="glossaries-user.html#dx1-37079" >2127</a>, <a +href="glossaries-user.html#dx1-43064" >2128</a>, <a +href="glossaries-user.html#dx1-44007" >2129</a>, <a +href="glossaries-user.html#dx1-44011" >2130</a>, <a +href="glossaries-user.html#dx1-45002" >2131</a>, <a +href="glossaries-user.html#dx1-45005" >2132</a>, <a +href="glossaries-user.html#dx1-45008" >2133</a>, <a +href="glossaries-user.html#dx1-45011" >2134</a>, <a +href="glossaries-user.html#dx1-45017" >2135</a>, <a +href="glossaries-user.html#dx1-45019" >2136</a>, <a +href="glossaries-user.html#dx1-45022" >2137</a>, <a +href="glossaries-user.html#dx1-45024" >2138</a>, <a +href="glossaries-user.html#dx1-45026" >2139</a>, <a +href="glossaries-user.html#dx1-45028" >2140</a>, <a +href="glossaries-user.html#dx1-46002" >2141</a>, <a +href="glossaries-user.html#dx1-46004" >2142</a>, <a +href="glossaries-user.html#dx1-46011" >2143</a>, <a +href="glossaries-user.html#dx1-46017" >2144</a>, <a +href="glossaries-user.html#dx1-46022" >2145</a>, <a +href="glossaries-user.html#dx1-47005" >2146</a>, <a +href="glossaries-user.html#dx1-47016" >2147</a>, <a +href="glossaries-user.html#dx1-47022" >2148</a>, <a +href="glossaries-user.html#dx1-47029" >2149</a>, <a +href="glossaries-user.html#dx1-47042" >2150</a>, <a +href="glossaries-user.html#dx1-47050" >2151</a>, <a +href="glossaries-user.html#dx1-47066" >2152</a>, <a +href="glossaries-user.html#dx1-49007" >2153</a>, <a +href="glossaries-user.html#dx1-62016" >2154</a>, <a +href="glossaries-user.html#dx1-65027" >2155</a>, <a +href="glossaries-user.html#dx1-65032" >2156</a>, <a +href="glossaries-user.html#dx1-69009" >2157</a>, <a +href="glossaries-user.html#dx1-69011" >2158</a>, <a +href="glossaries-user.html#dx1-69015" >2159</a>, <a +href="glossaries-user.html#dx1-69017" >2160</a>, <a +href="glossaries-user.html#dx1-69053" >2161</a>, <a +href="glossaries-user.html#dx1-69081" >2162</a>, <a +href="glossaries-user.html#dx1-69085" >2163</a>, <a +href="glossaries-user.html#dx1-69087" >2164</a>, <a +href="glossaries-user.html#dx1-69089" >2165</a>, <a +href="glossaries-user.html#dx1-69091" >2166</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">xkeyval </span>package  <a -href="glossaries-user.html#dx1-4003" >1925</a>, <a -href="glossaries-user.html#dx1-62003" >1926</a> <br /></span> +href="glossaries-user.html#dx1-6005" >2167</a>, <a +href="glossaries-user.html#dx1-69005" >2168</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\xmakefirstuc</span></span></span>  <a -href="glossaries-user.html#dx1-2004" >1927</a> <br /></span> +href="glossaries-user.html#dx1-4003" >2169</a> <br /></span> + + + <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ec-lmtt-10x-x-109">\xspace</span></span></span>  <a -href="glossaries-user.html#dx1-45016" >1928</a> <br /></span> - - - +href="glossaries-user.html#dx1-54018" >2170</a> <br /></span> <span class="index-item"><span class="ec-lmss-10x-x-109">xspace </span>package  <a -href="glossaries-user.html#dx1-45014" >1929</a>, <a -href="glossaries-user.html#dx1-45015" >1930</a>, <a -href="glossaries-user.html#dx1-45017" >1931</a>, <a -href="glossaries-user.html#dx1-45019" >1932</a>, <a -href="glossaries-user.html#dx1-45021" >1933</a>, <a -href="glossaries-user.html#dx1-45022" >1934</a> <br /></span> +href="glossaries-user.html#dx1-54014" >2171</a>, <a +href="glossaries-user.html#dx1-54015" >2172</a>, <a +href="glossaries-user.html#dx1-54017" >2173</a>, <a +href="glossaries-user.html#dx1-54019" >2174</a>, <a +href="glossaries-user.html#dx1-54021" >2175</a>, <a +href="glossaries-user.html#dx1-54023" >2176</a>, <a +href="glossaries-user.html#dx1-54024" >2177</a> <br /></span> </p></div> - <div class="footnotes"><!--l. 338--><p class="indent" > <span class="footnote-mark"><a + + + + <div class="footnotes"><!--l. 392--><p class="indent" > <span class="footnote-mark"><a href="#fn1x3-bk" id="fn1x3"> <sup class="textsuperscript">1</sup></a></span><span class="ec-lmr-9">That is, if the term has been referenced using any of the commands described</span> <span class="ec-lmr-9">in </span><a -href="#x1-280006"><span -class="ec-lmr-9">§6 </span></a><a -href="#x1-280006"><span +href="#sec:glslink"><span +class="ec-lmr-9">§6 </span></a><a +href="#sec:glslink"><span class="ec-lmr-9">Links to Glossary Entries</span><!--tex4ht:ref: sec:glslink --></a> <span class="ec-lmr-9">and </span><a -href="#x1-310007"><span -class="ec-lmr-9">§7 </span></a><a -href="#x1-310007"><span +href="#sec:glsadd"><span +class="ec-lmr-9">§7 </span></a><a +href="#sec:glsadd"><span class="ec-lmr-9">Adding an Entry to the Glossary</span> <span class="ec-lmr-9">Without Generating Text</span><!--tex4ht:ref: sec:glsadd --></a> <span class="ec-lmr-9">or via </span><span class="ec-lmtt-9">\glssee</span><a - id="dx1-3002"></a> <span + id="dx1-5002"></a> <span class="ec-lmr-9">(or the </span><span class="ec-lmss-9">see</span><a - id="dx1-3003"></a> <span + id="dx1-5003"></a> <span class="ec-lmr-9">key) or commands such as</span> <span class="ec-lmtt-9">\acrshort</span><a - id="dx1-3004"></a><span -class="ec-lmr-9">.</span></p><!--l. 1062--><p class="indent" > <span class="footnote-mark"><a + id="dx1-5004"></a><span +class="ec-lmr-9">.</span></p><!--l. 460--><p class="indent" > <span class="footnote-mark"><a href="#fn2x3-bk" id="fn2x3"> <sup class="textsuperscript">2</sup></a></span><span +class="ec-lmr-9">Note that although I’ve written </span><span +class="ec-lmtt-9">latex </span><span +class="ec-lmr-9">in this section, it’s better to use </span><span +class="ec-lmtt-9">pdflatex</span><span +class="ec-lmr-9">,</span> + <span +class="ec-lmr-9">where possible, for the reasons given </span><a +href="#pdflatexnote"><span +class="ec-lmr-9">earlier</span></a><span +class="ec-lmr-9">.</span></p><!--l. 1175--><p class="indent" > <span class="footnote-mark"><a +href="#fn3x3-bk" id="fn3x3"> +<sup class="textsuperscript">3</sup></a></span><span class="ec-lmr-9">As from v3.01 </span><span class="ec-lmtt-9">\gls</span><a - id="dx1-7070"></a> <span -class="ec-lmr-9">is no longer fragile and doesn’t need protecting.</span></p><!--l. 1579--><p class="noindent" ><span class="footnote-mark"><a + id="dx1-9073"></a> <span +class="ec-lmr-9">is no longer fragile and doesn’t need protecting.</span></p><!--l. 1277--><p class="indent" > <span class="footnote-mark"><a +href="#fn4x3-bk" id="fn4x3"> +<sup class="textsuperscript">4</sup></a></span><span +class="ec-lmr-9">Apparently MiKTeX has an alternative </span><span +class="ec-lmtt-9">makeglossaries.exe </span><span +class="ec-lmr-9">but I don’t know how</span> + <span +class="ec-lmr-9">using this differs from using </span><span +class="ec-lmtt-9">makeglossaries.bat</span><span +class="ec-lmr-9">.</span></p><!--l. 1748--><p class="noindent" ><span class="footnote-mark"><a href="#fn1x4-bk" id="fn1x4"> <sup class="textsuperscript">1</sup></a></span><span +class="ec-lmr-9">Actually it uses </span><span +class="ec-lmtt-9">\mfirstucMakeUppercase</span><a + id="dx1-16023"></a> <span +class="ec-lmr-9">which is set to </span><span +class="ec-lmss-9">textcase</span><a + id="dx1-16024"></a><span +class="ec-lmr-9">’s</span> + <span +class="ec-lmtt-9">\MakeTextUppercase </span><span +class="ec-lmr-9">by the </span><span +class="ec-lmss-9">glossaries </span><span +class="ec-lmr-9">package. This makes it consistent with</span> + <span +class="ec-lmtt-9">\makefirstuc</span><a + id="dx1-16025"></a><span +class="ec-lmr-9">. (The </span><span +class="ec-lmss-9">textcase</span><a + id="dx1-16026"></a> <span +class="ec-lmr-9">package is automatically loaded by </span><span +class="ec-lmss-9">glossaries</span><span +class="ec-lmr-9">.)</span></p> +<!--l. 1777--><p class="noindent" ><span class="footnote-mark"><a +href="#fn2x4-bk" id="fn2x4"> +<sup class="textsuperscript">2</sup></a></span><span class="ec-lmr-9">if the </span><span class="ec-lmss-9">acronym</span><a - id="dx1-14028"></a> <span + id="dx1-16039"></a> <span class="ec-lmr-9">option is used, otherwise the list of acronyms is the main</span> <span -class="ec-lmr-9">glossary</span></p><!--l. 1852--><p class="noindent" ><span class="footnote-mark"><a -href="#fn2x4-bk" id="fn2x4"> -<sup class="textsuperscript">2</sup></a></span><span +class="ec-lmr-9">glossary</span></p><!--l. 2206--><p class="noindent" ><span class="footnote-mark"><a +href="#fn3x4-bk" id="fn3x4"> +<sup class="textsuperscript">3</sup></a></span><span class="ec-lmr-9">Actually it sets </span><span class="ec-lmtt-9">\acronymtype</span><a - id="dx1-17005"></a> <span + id="dx1-19008"></a> <span class="ec-lmr-9">to </span><span class="ec-lmtt-9">\glsdefaulttype</span><a - id="dx1-17006"></a> <span + id="dx1-19009"></a> <span class="ec-lmr-9">if the </span><span class="ec-lmss-9">acronym</span><a - id="dx1-17007"></a> <span + id="dx1-19010"></a> <span class="ec-lmr-9">package option is</span> <span class="ec-lmr-9">not used, but </span><span class="ec-lmtt-9">\glsdefaulttype</span><a - id="dx1-17008"></a> <span + id="dx1-19011"></a> <span class="ec-lmr-9">usually has the value </span><span -class="ec-lmtt-9">main</span><span -class="ec-lmr-9">.</span></p><!--l. 1990--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmtt-9">main </span><span +class="ec-lmr-9">unless the </span><span +class="ec-lmss-9">nomain</span><a + id="dx1-19012"></a> <span +class="ec-lmr-9">option</span> + <span +class="ec-lmr-9">has been used.</span></p><!--l. 2454--><p class="indent" > <span class="footnote-mark"><a href="#fn1x6-bk" id="fn1x6"> <sup class="textsuperscript">1</sup></a></span><span class="ec-lmr-9">The only preamble restriction on </span><span class="ec-lmtt-9">\newglossaryentry</span><a - id="dx1-19002"></a> <span + id="dx1-23002"></a> <span class="ec-lmr-9">and </span><span class="ec-lmtt-9">\newacronym</span><a - id="dx1-19003"></a> <span + id="dx1-23003"></a> <span class="ec-lmr-9">was</span> <span class="ec-lmr-9">removed in version 1.13, but the restriction remains for </span><span class="ec-lmtt-9">\loadglsentries</span><a - id="dx1-19004"></a><span -class="ec-lmr-9">.</span></p><!--l. 2005--><p class="indent" > <span class="footnote-mark"><a + id="dx1-23004"></a><span +class="ec-lmr-9">. See </span><a +href="#sec:docdefs"><span +class="ec-lmr-9">§4.8</span> + </a><a +href="#sec:docdefs"><span +class="ec-lmr-9">Drawbacks With Defining Entries in the Document Environment</span><!--tex4ht:ref: sec:docdefs --></a> <span +class="ec-lmr-9">for a discussion of</span> + <span +class="ec-lmr-9">the problems with defining entries within the document instead of in the</span> + <span +class="ec-lmr-9">preamble.</span></p><!--l. 2469--><p class="indent" > <span class="footnote-mark"><a href="#fn2x6-bk" id="fn2x6"> <sup class="textsuperscript">2</sup></a></span><span class="ec-lmr-9">Except possibly the style file but then you’ll need to use </span><span class="ec-lmtt-9">\noist</span><a - id="dx1-19016"></a> <span + id="dx1-23016"></a> <span class="ec-lmr-9">to prevent your</span> <span -class="ec-lmr-9">changes from being overwritten.</span></p><!--l. 2430--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9">changes from being overwritten.</span></p><!--l. 3095--><p class="indent" > <span class="footnote-mark"><a href="#fn3x6-bk" id="fn3x6"> <sup class="textsuperscript">3</sup></a></span><span class="ec-lmr-9">This is because </span><span class="ec-lmtt-9">\acronymtype</span><a - id="dx1-25010"></a> <span + id="dx1-31013"></a> <span class="ec-lmr-9">is set to </span><span class="ec-lmtt-9">\glsdefaulttype</span><a - id="dx1-25011"></a> <span + id="dx1-31014"></a> <span class="ec-lmr-9">if the </span><span class="ec-lmss-9">acronym</span><a - id="dx1-25012"></a> <span + id="dx1-31015"></a> <span class="ec-lmr-9">package</span> <span -class="ec-lmr-9">option is not used.</span></p><!--l. 3193--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9">option is not used.</span></p><!--l. 3840--><p class="indent" > <span class="footnote-mark"><a href="#fn1x8-bk" id="fn1x8"> <sup class="textsuperscript">1</sup></a></span><span -class="ec-lmtt-9">main </span><span -class="ec-lmr-9">for the main (default) glossary, </span><span -class="ec-lmtt-9">\acronymtype </span><span -class="ec-lmr-9">for the list of acronyms, or the</span> - <span -class="ec-lmr-9">name supplied in the first mandatory argument to </span><span -class="ec-lmtt-9">\newglossary </span><span -class="ec-lmr-9">for additional</span> +class="ec-lmtt-9">\glsdisplayfirst</span><a + id="dx1-38007"></a> <span +class="ec-lmr-9">and </span><span +class="ec-lmtt-9">\glsdisplay</span><a + id="dx1-38008"></a> <span +class="ec-lmr-9">are now deprecated. Backwards compatibility</span> <span -class="ec-lmr-9">glossaries.</span></p><!--l. 3360--><p class="noindent" ><span class="footnote-mark"><a +class="ec-lmr-9">should be preserved but you may need to use the </span><span +class="ec-lmss-9">compatible-3.07</span><a + id="dx1-38009"></a> <span +class="ec-lmr-9">option</span></p><!--l. 4275--><p class="indent" > <span class="footnote-mark"><a href="#fn1x10-bk" id="fn1x10"> -<sup class="textsuperscript">1</sup></a></span><span -class="ec-lmr-9">As from v3.01, </span><span -class="ec-lmtt-9">\gls</span><a - id="dx1-32010"></a> <span -class="ec-lmr-9">is no longer fragile.</span></p><!--l. 3443--><p class="indent" > <span class="footnote-mark"><a -href="#fn2x10-bk" id="fn2x10"> -<sup class="textsuperscript">2</sup></a></span><a - id="dx1-33004"></a><a +<sup class="textsuperscript">1</sup></a></span><a + id="dx1-42004"></a><a href="#glo:makeindex"><span class="ec-lmtt-9">makeindex</span><a - id="dx1-33005"></a></a> <span + id="dx1-42005"></a></a> <span class="ec-lmr-9">will always assign a location number, even if it’s not needed, so it needs</span> <span -class="ec-lmr-9">to be discarded.</span></p><!--l. 3448--><p class="indent" > <span class="footnote-mark"><a -href="#fn3x10-bk" id="fn3x10"> -<sup class="textsuperscript">3</sup></a></span><span +class="ec-lmr-9">to be discarded.</span></p><!--l. 4280--><p class="indent" > <span class="footnote-mark"><a +href="#fn2x10-bk" id="fn2x10"> +<sup class="textsuperscript">2</sup></a></span><span class="ec-lmr-9">If you redefine </span><span class="ec-lmtt-9">\glsseeformat</span><span class="ec-lmr-9">, keep the default value of the optional argument as</span> <span class="ec-lmtt-9">\seename</span><a - id="dx1-33007"></a> <span + id="dx1-42007"></a> <span class="ec-lmr-9">as both </span><span class="ec-lmss-9">see</span><a - id="dx1-33008"></a> <span + id="dx1-42008"></a> <span class="ec-lmr-9">and </span><span class="ec-lmtt-9">\glssee </span><span class="ec-lmr-9">explicitly write </span><span class="ec-lmtt-9">[\seename] </span><span class="ec-lmr-9">in the output file if no</span> <span -class="ec-lmr-9">optional argument is given.</span></p><!--l. 3473--><p class="indent" > <span class="footnote-mark"><a -href="#fn4x10-bk" id="fn4x10"> -<sup class="textsuperscript">4</sup></a></span><span +class="ec-lmr-9">optional argument is given.</span></p><!--l. 4305--><p class="indent" > <span class="footnote-mark"><a +href="#fn3x10-bk" id="fn3x10"> +<sup class="textsuperscript">3</sup></a></span><span class="ec-lmr-9">In versions before 3.0, </span><span class="ec-lmtt-9">\glsentryname </span><span -class="ec-lmr-9">was used, but this can cause problems when</span> +class="ec-lmr-9">was used, but this could cause problems</span> <span -class="ec-lmr-9">the </span><span +class="ec-lmr-9">when the </span><span class="ec-lmss-9">name</span><a - id="dx1-33015"></a> <span -class="ec-lmr-9">key is</span> <a - id="dx1-33016"></a><a + id="dx1-42015"></a> <span +class="ec-lmr-9">key was</span> <a + id="dx1-42016"></a><a href="#glo:sanitize"><span class="ec-lmr-9">sanitized</span><a - id="dx1-33017"></a></a><span -class="ec-lmr-9">.</span></p><!--l. 3627--><p class="indent" > <span class="footnote-mark"><a + id="dx1-42017"></a></a><span +class="ec-lmr-9">.</span></p><!--l. 4555--><p class="indent" > <span class="footnote-mark"><a href="#fn1x11-bk" id="fn1x11"> <sup class="textsuperscript">1</sup></a></span><span class="ec-lmr-9">versions before 3.0 used </span><span class="ec-lmtt-9">\glsentryname</span><a - id="dx1-34044"></a> <span -class="ec-lmr-9">as the default, but this can cause problems</span> + id="dx1-43052"></a> <span +class="ec-lmr-9">as the default, but this could cause</span> <span -class="ec-lmr-9">when </span><span +class="ec-lmr-9">problems when </span><span class="ec-lmss-9">name</span><a - id="dx1-34045"></a> <span -class="ec-lmr-9">has been</span> <a - id="dx1-34046"></a><a + id="dx1-43053"></a> <span +class="ec-lmr-9">had been</span> <a + id="dx1-43054"></a><a href="#glo:sanitize"><span class="ec-lmr-9">sanitized</span><a - id="dx1-34047"></a></a><span -class="ec-lmr-9">.</span></p><!--l. 3778--><p class="indent" > <span class="footnote-mark"><a + id="dx1-43055"></a></a><span +class="ec-lmr-9">.</span></p><!--l. 4710--><p class="indent" > <span class="footnote-mark"><a href="#fn1x12-bk" id="fn1x12"> <sup class="textsuperscript">1</sup></a></span><span class="ec-lmr-9">you can’t use the </span><span class="ec-lmss-9">longheaderborder</span><a - id="dx1-35039"></a> <span + id="dx1-44042"></a> <span class="ec-lmr-9">style for this example as you can’t use the</span> <span class="ec-lmss-9">longtable</span><a - id="dx1-35040"></a><a - id="dx1-35041"></a> <span -class="ec-lmr-9">environment in two column mode.</span></p><!--l. 4075--><p class="indent" > <span class="footnote-mark"><a + id="dx1-44043"></a><a + id="dx1-44044"></a> <span +class="ec-lmr-9">environment in two column mode.</span></p><!--l. 5028--><p class="indent" > <span class="footnote-mark"><a href="#fn1x13-bk" id="fn1x13"> <sup class="textsuperscript">1</sup></a></span><span class="ec-lmr-9">see </span><span class="ec-lmtt-9">\setCompositor</span><a - id="dx1-38047"></a> <span + id="dx1-47054"></a> <span class="ec-lmr-9">described in </span><a -href="#x1-180003"><span -class="ec-lmr-9">§3 </span></a><a -href="#x1-180003"><span -class="ec-lmr-9">Setting Up</span><!--tex4ht:ref: sec:setup --></a></p><!--l. 4081--><p class="indent" > <span class="footnote-mark"><a +href="#sec:setup"><span +class="ec-lmr-9">§3 </span></a><a +href="#sec:setup"><span +class="ec-lmr-9">Setting Up</span><!--tex4ht:ref: sec:setup --></a></p><!--l. 5034--><p class="indent" > <span class="footnote-mark"><a href="#fn2x13-bk" id="fn2x13"> <sup class="textsuperscript">2</sup></a></span><span class="ec-lmr-9">see </span><span class="ec-lmtt-9">\setAlphaCompositor</span><a - id="dx1-38049"></a> <span + id="dx1-47056"></a> <span class="ec-lmr-9">described in </span><a -href="#x1-180003"><span -class="ec-lmr-9">§3 </span></a><a -href="#x1-180003"><span -class="ec-lmr-9">Setting Up</span><!--tex4ht:ref: sec:setup --></a></p><!--l. 4595--><p class="noindent" ><span class="footnote-mark"><a +href="#sec:setup"><span +class="ec-lmr-9">§3 </span></a><a +href="#sec:setup"><span +class="ec-lmr-9">Setting Up</span><!--tex4ht:ref: sec:setup --></a></p><!--l. 5621--><p class="noindent" ><span class="footnote-mark"><a href="#fn1x15-bk" id="fn1x15"> <sup class="textsuperscript">1</sup></a></span><span -class="ec-lmr-9">not that this was change from using </span><span +class="ec-lmr-9">Note that this was changed from using </span><span class="ec-lmtt-9">\smaller</span><a - id="dx1-42037"></a> <span + id="dx1-51037"></a> <span class="ec-lmr-9">to </span><span class="ec-lmtt-9">\textsmaller</span><a - id="dx1-42038"></a> <span + id="dx1-51038"></a> <span class="ec-lmr-9">as declarations</span> <span class="ec-lmr-9">cause a problem for </span><span class="ec-lmtt-9">\makefirstuc</span><a - id="dx1-42039"></a><span -class="ec-lmr-9">.</span></p><!--l. 4856--><p class="indent" > <span class="footnote-mark"><a + id="dx1-51039"></a><span +class="ec-lmr-9">.</span></p><!--l. 5883--><p class="indent" > <span class="footnote-mark"><a href="#fn2x15-bk" id="fn2x15"> <sup class="textsuperscript">2</sup></a></span><span -class="ec-lmr-9">as from version 1.18</span></p><!--l. 5050--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9">as from version 1.18</span></p><!--l. 5912--><p class="indent" > <span class="footnote-mark"><a +href="#fn3x15-bk" id="fn3x15"> +<sup class="textsuperscript">3</sup></a></span><span +class="ec-lmr-9">See David Carlisle’s explanation in </span><a +href="http://tex.stackexchange.com/questions/86565/drawbacks-of-xspace" class="url" ><span +class="ec-lmtt-9">http://tex.stackexchange.com/questions/86565/drawbacks-of-xspace</span></a></p><!--l. 6086--><p class="indent" > <span class="footnote-mark"><a href="#fn1x17-bk" id="fn1x17"> <sup class="textsuperscript">1</sup></a></span><span -class="ec-lmr-9">these lengths will not be available if you use both the </span><span +class="ec-lmr-9">These lengths will not be available if you use both the </span><span class="ec-lmss-9">nolong</span><a - id="dx1-47018"></a> <span + id="dx1-56018"></a> <span class="ec-lmr-9">and </span><span class="ec-lmss-9">nosuper</span><a - id="dx1-47019"></a> <span + id="dx1-56019"></a> <span class="ec-lmr-9">package</span> <span class="ec-lmr-9">options or if you use the </span><span class="ec-lmss-9">nostyles</span><a - id="dx1-47020"></a> <span + id="dx1-56020"></a> <span class="ec-lmr-9">package option unless you explicitly load the</span> <span -class="ec-lmr-9">relevant package.</span></p><!--l. 5162--><p class="noindent" ><span class="footnote-mark"><a +class="ec-lmr-9">relevant package.</span></p><!--l. 6198--><p class="noindent" ><span class="footnote-mark"><a href="#fn2x17-bk" id="fn2x17"> <sup class="textsuperscript">2</sup></a></span><span class="ec-lmr-9">This style was supplied by Axel</span><span -class="ec-lmr-9"> Menzel.</span></p><!--l. 5373--><p class="indent" > <span class="footnote-mark"><a +class="ec-lmr-9"> Menzel.</span></p><!--l. 6409--><p class="indent" > <span class="footnote-mark"><a href="#fn3x17-bk" id="fn3x17"> <sup class="textsuperscript">3</sup></a></span><span class="ec-lmr-9">e.g.</span><span class="ec-lmr-9"> with the </span><span class="ec-lmss-9">flowfram</span><a - id="dx1-51011"></a> <span -class="ec-lmr-9">package.</span></p> </div> + id="dx1-60011"></a> <span +class="ec-lmr-9">package.</span></p><!--l. 7277--><p class="indent" > <span class="footnote-mark"><a +href="#fn1x20-bk" id="fn1x20"> +<sup class="textsuperscript">1</sup></a></span><span +class="ec-lmr-9">Single letter words, such as “a” and “I” should typically not appear at the end of a</span> + <span +class="ec-lmr-9">line, hence the non-breakable space after “a” in the </span><span +class="ec-lmss-9">prefix</span><a + id="dx1-67016"></a> <span +class="ec-lmr-9">field.</span></p><!--l. 7434--><p class="indent" > <span class="footnote-mark"><a +href="#fn2x20-bk" id="fn2x20"> +<sup class="textsuperscript">2</sup></a></span><span +class="ec-lmr-9">The earlier caveats about initial non-Latin characters apply.</span></p> </div> + + + </body></html> - + diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf Binary files differindex 5aebfd9c5c6..fb96955fd80 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex index 7a79a1ae440..eed1cd7749d 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex @@ -8,6 +8,7 @@ \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} \usepackage{lmodern} +\usepackage{fourier} \ifpdf \usepackage{mathpazo} \usepackage[scaled=.88]{helvet} @@ -20,12 +21,12 @@ pdftitle={User Manual for glossaries.sty}, pdfkeywords={LaTeX,package,glossary,acronyms}]{hyperref} \usepackage{xr-hyper} -\usepackage[xindy,nonumberlist,seeautonumberlist,toc,style=altlist]{glossaries} +\usepackage[xindy,nonumberlist,seeautonumberlist,toc,nogroupskip,style=altlist]{glossaries} \usepackage{glossary-inline} \pagestyle{headings} -\renewcommand*{\glsgroupskip}{} +\glsnoexpandfields \renewcommand*{\glsseeformat}[3][\seename]{% (\xmakefirstuc{#1} \glsseelist{#2}.)% @@ -39,9 +40,10 @@ \+\>nonumberlist,\\ seeautonumberlist,\\ toc,\\ - style=altlist]\{glossaries\} + style=altlist,\\ + nogroupskip]\{glossaries\} \end{tabbing} -\cs{renewcommand*}\{\ics{glsgroupskip}\}\{\}\newline +\cs{glsnoexpandfields}\newline \cs{renewcommand*}\{\ics{glsseeformat}\}[3][\ics{seename}]\{\% \newline (\ics{xmakefirstuc}\{\#1\} \ics{glsseelist}\{\#2\}.)\} \end{ttfamily} @@ -51,9 +53,9 @@ \else % Need an extra line break in the html version % (Don't have time to fiddle with cfg files!) - \renewcommand*{\glossaryentryfield}[5]{% - \item[\glsentryitem{#1}\glstarget{#1}{#2}]\mbox{}\newline - #3\glspostdescription\space #5\newline}% + \renewcommand*{\glossentry}[2]{% + \item[\glsentryitem{#1}\glstarget{#1}{\glossentryname{#1}}]\mbox{}\newline + \glossentrydesc{#1}\glspostdescription\space #2\newline}% \fi \makeglossaries @@ -65,62 +67,71 @@ \IndexPrologue{\chapter*{\indexname} \markboth{\indexname}{\indexname}} -\newglossaryentry{indexingapp}% +\longnewglossaryentry{indexingapp}% { name={Indexing application}, - text={indexing application}, - description={an application (piece of software) separate from + text={indexing application} +}% +{% + An application (piece of software) separate from \TeX/\LaTeX\ that collates and sorts information that has an associated page reference. Generally the information is an index entry but in this case the information is a glossary entry. There are two main indexing applications that are used with \TeX: - \protect\gls{makeindex} and \protect\gls{xindy}. These are both - \gls{cli} applications} + \gls{makeindex} and \gls{xindy}. These are both + \gls{cli} applications. } -\newglossaryentry{cli} +\longnewglossaryentry{cli} { name={Command Line Interface (CLI)}, first={command line interface (CLI)}, - text={CLI}, - description={an application that doesn't have a graphical user + text={CLI} +} +{% + An application that doesn't have a graphical user interface. That is, an application that doesn't have any windows, buttons or menus and can be run in a command prompt or terminal (see - \url{http://www.dickimaw-books.com/latex/novices/html/terminal.html})} + \url{http://www.dickimaw-books.com/latex/novices/html/terminal.html}). } -\newglossaryentry{xindy}{ -name={\appfmt{xindy}\index{xindy|htextbf}}, -sort={xindy}, -text={\protect\app{xindy}}, -description={A flexible \protect\gls{indexingapp} with multilingual -support written in Perl} +\longnewglossaryentry{xindy}{% + name={\appfmt{xindy}\index{xindy|htextbf}}, + sort={xindy}, + text={\protect\app{xindy}} +}% +{% + A flexible \gls{indexingapp} with multilingual + support written in Perl. } \newglossaryentry{makeindex}{% name={\appfmt{makeindex}\index{makeindex|htextbf}},% sort={makeindex},% text={\protect\app{makeindex}},% -description={An \protect\gls{indexingapp}}, +description={An \gls{indexingapp}}, } \newglossaryentry{makeglossaries}{% name={\appfmt{makeglossaries}\index{makeglossaries|htextbf}},% sort={makeglossaries},% text={\protect\app{makeglossaries}},% -description={A \styfmt{glossaries} custom designed Perl script interface -to \gls{xindy} and \gls{makeindex}} +description={A custom designed Perl script interface +to \gls{xindy} and \gls{makeindex} provided with the \styfmt{glossaries} +package} } -\newglossaryentry{makeglossariesgui}{% +\longnewglossaryentry{makeglossariesgui}{% name={\appfmt{makeglossariesgui}\index{makeglossariesgui|htextbf}},% sort={makeglossariesgui},% -text={\protect\app{makeglossariesgui}},% -description={A Java GUI alternative to \gls{makeglossaries} that -also provides diagnostic tools. Home page: -\url{http://www.dickimaw-books.com/apps/makeglossariesgui/}. Also -available on CTAN} +text={\protect\app{makeglossariesgui}}% +}% +{% + A Java GUI alternative to \gls{makeglossaries} that + also provides diagnostic tools. Home page: + \url{http://www.dickimaw-books.com/apps/makeglossariesgui/}. Also + available on CTAN. } \newglossaryentry{numberlist}{% @@ -160,25 +171,29 @@ or may not be a hyperlink to the glossary} \let\glsd\glsuseri \let\glsation\glsuserii -\newglossaryentry{firstuse}{% +\longnewglossaryentry{firstuse}{% name={First use\ifirstuse}, sort={first use},% text={first use},% -user1={first used}, -description={The first time a glossary entry is used (from the start of the document or after a reset) with one of the -following commands: \ics{gls}, \ics{Gls}, \ics{GLS}, \ics{glspl}, -\ics{Glspl}, \ics{GLSpl} or \ics{glsdisp}. -\glsseeformat{firstuseflag,firstusetext}{}\nopostdesc}% +user1={first used}} +{% + The first time a glossary entry is used (from the start of the + document or after a reset) with one of the + following commands: \ics{gls}, \ics{Gls}, \ics{GLS}, \ics{glspl}, + \ics{Glspl}, \ics{GLSpl} or \ics{glsdisp}. + \glsseeformat{firstuseflag,firstusetext}{} } -\newglossaryentry{firstuseflag}{% +\longnewglossaryentry{firstuseflag}{% name={First use flag\ifirstuseflag}, sort={first use flag},% -text={first use flag},% -description={A conditional that determines whether or not the entry -has been used according to the rules of \gls{firstuse}. Commands -to unset or reset this conditional are described in -\sectionref{sec:glsunset}}% +text={first use flag}% +} +{% + A conditional that determines whether or not the entry + has been used according to the rules of \gls{firstuse}. Commands + to unset or reset this conditional are described in + \sectionref{sec:glsunset}. } \newglossaryentry{firstusetext}{% @@ -191,28 +206,24 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \ics{glsdisp}.)\nopostdesc}% } -\newglossaryentry{sanitize}{% +\longnewglossaryentry{sanitize}{% name={Sanitize\itermdef{sanitize}},% sort={sanitize}, text={\protect\term{sanitize}},% user1={sanitized\protect\iterm{sanitize}},% -user2={sanitization\protect\iterm{sanitize}}, -description={Converts command names into character sequences. That is, a command called, -say, \cs{foo}, is converted into the sequence of characters: -\cs{}, \texttt{f}, \texttt{o}, \texttt{o}. Depending on the font, -the backslash character may appear as a dash when used in the -main document text, so \cs{foo} will appear as: ---foo. -\glspar -When \TeX\ writes information to a file, fragile -commands must be protected. The \gloskey{name}, \gloskey{description}, -\gloskey{symbol} and \gloskey{sort} keys all have their values written to a file, -which means that care must be taken if those values contain fragile -commands. There are two approaches: 1) the fragile commands must be -protected using \ics{protect}; 2) the values are sanitized. -Sanitizing the values gets rid of the inconvenience of having to -protect fragile commands, but at the expense of no longer being able -to use those values in the document. Sanitization is governed by the -package option \pkgopt{sanitize} described in \sectionref{sec:pkgopts-general}} +user2={sanitization\protect\iterm{sanitize}}% +}% +{% + Converts command names into character sequences. That is, a command called, + say, \cs{foo}, is converted into the sequence of characters: + \cs{}, \texttt{f}, \texttt{o}, \texttt{o}. Depending on the font, + the backslash character may appear as a dash when used in the + main document text, so \cs{foo} will appear as: ---foo. + + Earlier versions of \styfmt{glossaries} used this technique to write + information to the files used by the indexing applications to + prevent problems caused by fragile commands. Now, this is only used + for the \gloskey{sort} key. } \ifpdf @@ -246,7 +257,17 @@ package option \pkgopt{sanitize} described in \sectionref{sec:pkgopts-general}} \newcommand*{\glostyle}[1]{\textsf{#1}\index{glossary styles:>#1={\protect\ttfamily#1}|main}} -\newcommand*{\samplefile}[1]{\hyperref[ex:sample#1]{\texttt{sample#1.tex}}} +\newcounter{sample} +\newcommand{\exitem}[2][sample]{% + \item[\texttt{#1#2.tex}]% + \refstepcounter{sample}\label{ex:#1#2}} + +\newenvironment{samplelist}% +{\begin{description}}% +{\end{description}} + +\newcommand*{\samplefile}[2][sample]{% + \hyperref[ex:#1#2]{\texttt{#1#2.tex}}} \ifpdf \newcommand*{\htmldoc}[2]{\qt{#1}} @@ -258,13 +279,31 @@ package option \pkgopt{sanitize} described in \sectionref{sec:pkgopts-general}} \MakeShortVerb{"} \DeleteShortVerb{\|} - \title{User Manual for glossaries.sty v3.07} + \title{User Manual for glossaries.sty v4.0} \author{Nicola L.C. Talbot\\% \url{http://www.dickimaw-books.com/}} - \date{2013-07-05} + \date{2013-11-14} \maketitle +\begin{important} +Documents have varied styles when it comes to presenting glossaries +or lists of terms or notation. People have their own preferences and +to a large extent this is determined by the kind of information that +needs to go in the glossary. They may just have symbols with +terse descriptions or they may have long technical words with +complicated descriptions. The \styfmt{glossaries} package is +flexible enough to accommodate such varied requirements, but this +flexibility comes at a price: a~big manual. + +\grimace\ If you're freaking out at the size of this manual, start with +\texttt{glossariesbegin.pdf} (\qt{The glossaries package: a guide +for beginnners}). You should find it in the same directory as this +document or try \texttt{texdoc glossariesbegin.pdf}. Once you've got +to grips with the basics, then come back to this manual to find out +how to adjust the settings. +\end{important} + \noindent The \styfmt{glossaries} bundle comes with the following documentation: \begin{description} @@ -290,7 +329,7 @@ letter}{mfirstuc-manual}. \item[\url{glossaries-code.pdf}] Advanced users wishing to know more about the inner workings of all the packages provided in the \styfmt{glossaries} bundle should read -\qt{Documented Code for glossaries v3.07}. +\qt{Documented Code for glossaries v4.0}. This includes the documented code for the \sty{mfirstuc} package. \item[INSTALL] Installation instructions. @@ -307,17 +346,32 @@ If you use \sty{hyperref} and \styfmt{glossaries}, you must load also be loaded before \styfmt{glossaries}. (If \sty{doc} is loaded, the file extensions for the default main glossary are changed to \filetype{gls2}, \filetype{glo2} and \filetype{.glg2} to avoid -conflict with \sty{doc}'s changes glossary.) +conflict with \sty{doc}'s changes +glossary.)\hypertarget{pdflatexnote}{}% + +If you are using \sty{hyperref}, it's best to use \app{pdflatex} +rather than \app{latex} (DVI format) as \appfmt{pdflatex} deals with +hyperlinks much better. If you use the DVI format, you will +encounter problems where you have long hyperlinks or hyperlinks in +subscripts or superscripts. This is an issue with the DVI format not +with \sty{glossaries}. \end{important} -Other documents that describe using \styfmt{glossaries} include: +Other documents that describe using the \styfmt{glossaries} package include: \href{http://www.dickimaw-books.com/latex/thesis/}{Using LaTeX to Write a PhD Thesis} and \href{http://www.latex-community.org/know-how/latex/55-latex-general/263-glossaries-nomenclature-lists-of-symbols-and-acronyms}{Glossaries, Nomenclature, Lists of Symbols and Acronyms}. \clearpage +\pdfbookmark[0]{Contents}{contents} \tableofcontents +\clearpage +\pdfbookmark[0]{List of Examples}{examples} +\listofexamples +\clearpage +\pdfbookmark[0]{List of Tables}{tables} +\listoftables \clearpage \printglossaries @@ -335,7 +389,7 @@ terms. Only those terms used\footnote{That is, if the term has been referenced using any of the commands described in \sectionref{sec:glslink} and \sectionref{sec:glsadd} or via \ics{glssee} (or the \gloskey{see} key) or commands such as -\ics{acrshort}.} in the document will be added to the glossary. +\ics{acrshort}.}\ in the document will be added to the glossary. \textbf{This package replaces the \sty{glossary} package which is now obsolete.} Please see the document \qtdocref{Upgrading from the @@ -361,10 +415,10 @@ reason you don't want to use \gls*{makeglossaries}, you can call \end{important} This document uses the \styfmt{glossaries} package. For example, when viewing the PDF version of this document in a -hyperlinked-enabled PDF viewer (such as Adobe Reader) if -you click on the word ``\gls{xindy}'' you'll be taken to the entry +hyperlinked-enabled PDF viewer (such as Adobe Reader or Okular) if +you click on the word \qt{\gls{xindy}} you'll be taken to the entry in the glossary where there's a brief description of -what ``\gls*{xindy}'' is. +what \qt{\gls*{xindy}} is. The remainder of this introductory section covers the following: \begin{itemize} @@ -394,19 +448,18 @@ For example, in a \begin{prompt} texdoc -l glossaries \end{prompt} -This should display the full pathname of the file -\texttt{glossaries-code.pdf}. View the contents of that directory and -see if it contains the \texttt{samples} subdirectory. - -If you can't find the sample files, they are available in the -subdirectory \texttt{doc/latex/glossaries/samples/} in the -\texttt{glossaries.tds.zip} archive which can be downloaded from -\href{http://tug.ctan.org/tex-archive/macros/latex/contrib/glossaries/}{CTAN}. - - -The sample documents are as follows: -\begin{description} -\item[minimalgls.tex]\label{ex:minimalgls} This document is a +This should display a list of all the files in the glossaries +documentation directory with their full pathnames. + +If you can't find the sample files on your computer, they are also available +from your nearest CTAN mirror at +\url{http://mirror.ctan.org/macros/latex/contrib/glossaries/samples/}. + +The sample documents are as follows\footnote{Note that although I've written +\texttt{latex} in this section, it's better to use \texttt{pdflatex}, where +possible, for the reasons given \hyperlink{pdflatexnote}{earlier}.}: +\begin{samplelist} +\exitem[minimal]{gls} This document is a minimal working example. You can test your installation using this file. To create the complete document you will need to do the following steps: @@ -420,7 +473,13 @@ latex minimalgls your text editor or front-end. This will create the required associated files but you will not see the glossary. If you use PDF\LaTeX\ you will also get warnings about non-existent - references. These warnings may be ignored on the first run. + references that look something like: +\begin{verbatim} +pdfTeX warning (dest): name{glo:aca} has been +referenced but does not exist, +replaced by a fixed one +\end{verbatim} + These warnings may be ignored on the first run. If you get a \verb"Missing \begin{document}" error, then it's most likely that your version of \sty{xkeyval} is @@ -457,7 +516,7 @@ You should now have a complete document. The number following each entry in the glossary is the location number. By default, this is the page number where the entry was referenced. -\item[sample4col.tex]\label{ex:sample4col} This document illustrates +\exitem{4col} This document illustrates a four column glossary where the entries have a symbol in addition to the name and description. To create the complete document, you need to do: @@ -472,7 +531,7 @@ As before, if you don't have Perl installed, you will need to use gap created at the start of each group. This can be suppressed using the \pkgopt{nogroupskip} package option. -\item[sampleAcr.tex]\label{ex:sampleAcr} This document has some +\exitem{Acr} This document has some sample acronyms. It also adds the glossary to the table of contents, so an extra run through \LaTeX\ is required to ensure the document is up to date: @@ -483,7 +542,7 @@ latex sampleAcr latex sampleAcr \end{prompt} -\item[sampleAcrDesc.tex]\label{ex:sampleAcrDesc} This is similar to +\exitem{AcrDesc} This is similar to the previous example, except that the acronyms have an associated description. As with the previous example, the glossary is added to the table of contents, so an extra run through \LaTeX\ is required: @@ -494,7 +553,7 @@ latex sampleAcrDesc latex sampleAcrDesc \end{prompt} -\item[sampleDesc.tex]\label{ex:sampleDesc} This is similar to the +\exitem{Desc} This is similar to the previous example, except that it defines the acronyms using \ics{newglossaryentry} instead of \ics{newacronym}. As with the previous example, the glossary is added to the table of contents, so @@ -506,7 +565,16 @@ latex sampleDesc latex sampleDesc \end{prompt} -\item[sample-custom-acronym.tex]\label{ex:sample-custom-acronym} +\exitem{-FnDesc} This example +defines a custom display format that puts the description in a +footnote on first use. +\begin{prompt} +latex sample-FnDesc +makeglossaries sample-FnDesc +latex sample-FnDesc +\end{prompt} + +\exitem{-custom-acronym} This document illustrates how to define your own acronym style if the predefined styles don't suit your requirements. \begin{prompt} @@ -515,7 +583,7 @@ makeglossaries sample-custom-acronym latex sample-custom-acronym \end{prompt} -\item[sample-crossref.tex]\label{ex:sample-crossref} +\exitem{-crossref} This document illustrates how to cross-reference entries in the glossary. \begin{prompt} @@ -524,7 +592,7 @@ makeglossaries sample-crossref latex sample-crossref \end{prompt} -\item[sampleDB.tex]\label{ex:sampleDB} This document illustrates how +\exitem{DB} This document illustrates how to load external files containing the glossary definitions. It also illustrates how to define a new glossary type. This document has the \gls{numberlist} suppressed and uses \ics{glsaddall} to add all @@ -540,17 +608,17 @@ The glossary definitions are stored in the accompanying files don't have Perl installed, you will need to use \gls{makeindex} twice instead of a single call to \gls{makeglossaries}: \begin{enumerate} -\item Create the main glossary: +\item Create the main glossary (all on one line): \begin{prompt} makeindex -s sampleDB.ist -t sampleDB.glg -o sampleDB.gls sampleDB.glo \end{prompt} -\item Create the secondary glossary: +\item Create the secondary glossary (all on one line): \begin{prompt} makeindex -s sampleDB.ist -t sampleDB.nlg -o sampleDB.not sampleDB.ntn \end{prompt} \end{enumerate} -\item[sampleEq.tex]\label{ex:sampleEq} This document illustrates how +\exitem{Eq} This document illustrates how to change the location to something other than the page number. In this case, the \texttt{equation} counter is used since all glossary entries appear inside an \env{equation} environment. To create @@ -561,7 +629,7 @@ makeglossaries sampleEq latex sampleEq \end{prompt} -\item[sampleEqPg.tex]\label{ex:sampleEqPg} This is similar to the +\exitem{EqPg} This is similar to the previous example, but the \glspl{numberlist} are a mixture of page numbers and equation numbers. This example adds the glossary to the table of contents, so an extra \LaTeX\ run is @@ -573,7 +641,7 @@ latex sampleEqPg latex sampleEqPg \end{prompt} -\item[sampleSec.tex]\label{ex:sampleSec} This document also +\exitem{Sec} This document also illustrates how to change the location to something other than the page number. In this case, the \texttt{section} counter is used. This example adds the glossary to the table of contents, so an extra @@ -585,7 +653,7 @@ latex sampleSec latex sampleSec \end{prompt} -\item[sampleNtn.tex]\label{ex:sampleNtn} This document illustrates +\exitem{Ntn} This document illustrates how to create an additional glossary type. This example adds the glossary to the table of contents, so an extra \LaTeX\ run is required: @@ -599,17 +667,17 @@ Note that if you don't have Perl installed, you will need to use \gls{makeindex} twice instead of a single call to \gls{makeglossaries}: \begin{enumerate} -\item Create the main glossary: +\item Create the main glossary (all on one line): \begin{prompt} makeindex -s sampleNtn.ist -t sampleNtn.glg -o sampleNtn.gls sampleNtn.glo \end{prompt} -\item Create the secondary glossary: +\item Create the secondary glossary (all on one line): \begin{prompt} makeindex -s sampleNtn.ist -t sampleNtn.nlg -o sampleNtn.not sampleNtn.ntn \end{prompt} \end{enumerate} -\item[sample.tex]\label{ex:sample} This document illustrates some of +\exitem{} This document illustrates some of the basics, including how to create child entries that use the same name as the parent entry. This example adds the glossary to the table of contents and it also uses \ics{glsrefentry}, so an extra \LaTeX\ @@ -627,11 +695,11 @@ that this will only have an effect if you use you will need to use the \texttt{-l} switch to indicate letter ordering.) -\item[sample-inline.tex]\label{ex:sample-inline} This document is +\exitem{-inline} This document is like \texttt{sample.tex}, above, but uses the \glostyle{inline} glossary style to put the glossary in a footnote. -\item[sampletree.tex]\label{ex:sampletree} This document illustrates +\exitem{tree} This document illustrates a hierarchical glossary structure where child entries have different names to their corresponding parent entry. To create the document do: @@ -641,7 +709,7 @@ makeglossaries sampletree latex sampletree \end{prompt} -\item[sample-dual.tex]\label{ex:sample-dual} This document +\exitem{-dual} This document illustrates how to define an entry that both appears in the list of acronyms and in the main glossary. To create the document do: \begin{prompt} @@ -650,7 +718,7 @@ makeglossaries sample-dual latex sample-dual \end{prompt} -\item[sample-langdict]\label{ex:sample-langdict} This document +\exitem{-langdict} This document illustrates how to use the glossaries package to create English to French and French to English dictionaries. To create the document do: @@ -660,7 +728,7 @@ makeglossaries sample-langdict latex sample-langdict \end{prompt} -\item[samplexdy.tex]\label{ex:samplexdy} This document illustrates +\exitem{xdy} This document illustrates how to use the \styfmt{glossaries} package with \gls{xindy} instead of \gls{makeindex}. The document uses UTF8 encoding (with the \sty{inputenc} package). The encoding is picked up by @@ -702,7 +770,7 @@ otherwise, if you are using \texttt{samplexdy-mc.xdy}, then do xindy -I xindy -M samplexdy-mc -t samplexdy.glg -o samplexdy.gls samplexdy.glo \end{prompt} -\item[samplexdy2.tex]\label{ex:samplexdy2} This document illustrates +\exitem{xdy2} This document illustrates how to use the \styfmt{glossaries} package where the location numbers don't follow a standard format. This example will only work with \gls{xindy}. To create the document do: @@ -711,13 +779,14 @@ pdflatex samplexdy2 makeglossaries samplexdy2 pdflatex samplexdy2 \end{prompt} -If you can't use \gls{makeglossaries} then you need to do: +If you can't use \gls{makeglossaries} then you need to do (all on +one line): \begin{prompt} xindy -L english -C utf8 -I xindy -M samplexdy2 -t samplexdy2.glg -o samplexdy2.gls samplexdy2.glo \end{prompt} See \sectionref{sec:xindyloc} for further details. -\item[sampleutf8.tex]\label{ex:sampleutf8} This is another example +\exitem{utf8} This is another example that uses \gls{xindy}. Unlike \gls{makeindex}, \gls{xindy} can cope with accented or non-Latin characters. This document uses UTF8 encoding. To create the document do: @@ -749,14 +818,75 @@ follows (no line breaks): makeindex -s sampleutf8.ist -t sampleutf8.glg -o sampleutf8.gls sampleutf8.glo \end{prompt} -\item[sampleaccsupp.tex]\label{ex:sampleaccsupp} This document +\exitem{-index} This document uses +the \styfmt{glossaries} package to create both a glossary and an +index. This requires two \gls{makeglossaries} calls to ensure the +document is up to date: +\begin{prompt} +latex sample-index +makeglossaries sample-index +latex sample-index +makeglossaries sample-index +latex sample-index +\end{prompt} + +\exitem{-newkeys} This document illustrates how add custom keys. + +\exitem{-numberlist} This document illustrates how to reference the +\gls{numberlist} in the document text. This requires an additional +\LaTeX\ run: +\begin{prompt} +latex sample-numberlist +makeglossaries sample-numberlist +latex sample-numberlist +latex sample-numberlist +\end{prompt} + +\exitem{People} This document illustrates how you can hook into the +standard sort mechanism to adjust the way the sort key is set. This +requires an additional run to ensure the table of contents is +up-to-date: +\begin{prompt} +latex samplePeople +makeglossaries samplePeople +latex samplePeople +latex samplePeople +\end{prompt} + +\exitem{Sort} This is another document that illustrates how to hook +into the standard sort mechanism. An additional run is required to +ensure the table of contents is up-to-date: +\begin{prompt} +latex sampleSort +makeglossaries sampleSort +latex sampleSort +latex sampleSort +\end{prompt} + +\exitem{-nomathhyper} This document illustrates how to selective +enable and disable entry hyperlinks in \ics{glsentryfmt}. + +\exitem{-entryfmt} This document illustrates how to change the +way an entry is displayed in the text. + +\exitem{-prefix} This document illustrates the use of the +\sty{glossaries-prefix} package. An additional run is required to +ensure the table of contents is up-to-date: +\begin{prompt} +latex sample-prefix +makeglossaries sample-prefix +latex sample-prefix +latex sample-prefix +\end{prompt} + +\exitem{accsupp} This document uses the experimental \sty{glossaries-accsupp} package. The symbol is set to the replacement text. Note that some PDF viewers don't use the accessibility support. Information about the \styfmt{glossaries-accsupp} package can be found in \sectionref{sec:accsupp}. -\end{description} +\end{samplelist} \section{Multi-Lingual Support} @@ -781,10 +911,9 @@ If you want to use \gls*{xindy}, remember to use the \begin{important} Note that although an accented character, such as é, looks like a plain character in your tex file, it's actually a macro and can therefore -cause problems. +cause expansion problems. You may need to switch off the field +expansions with \cs{glsnoexpandfields}. -\begin{enumerate} -\item If you use an accented (or other expandable) character at the start of an entry name, you must place it in a group, or it will cause a problem for commands that convert the first letter to uppercase @@ -793,15 +922,6 @@ a problem for commands that convert the first letter to uppercase \newglossaryentry{elite}{name={{é}lite}, description={select group or class}} \end{verbatim} - -\item If you use an accented (or other expandable) character in an -entry name and you haven't switched off the \gloskey{name} key -\glsation{sanitize}, you must use commands like -\ics{glsentrytext} or \ics{glstext} instead of \ics{glsentryname} or -\ics{glsname} or you will end up with strange looking characters in -your document. - -\end{enumerate} \end{important} If you use the \sty{inputenc} package, \gls{makeglossaries} @@ -820,7 +940,9 @@ me the relevant translations either via email or via However you must load \sty{babel} or \sty{polyglossia} \emph{before} \styfmt{glossaries} to enable this. Note that if \sty{babel} is loaded and the \sty{translator} package is detected on \TeX's path, then the -\sty{translator} package will be loaded automatically. However, +\sty{translator} package will be loaded automatically, unless you +use the \pkgopt[false]{translate} or \pkgopt[babel]{translate} +package options. However, it may not pick up on the required languages so, if the predefined text is not translated, you may need to explicitly load the \sty{translator} package with the required languages. For example: @@ -912,13 +1034,12 @@ this option. Due to the varied nature of glossaries, it's likely that the predefined translations may not be appropriate. If you are using the -\sty{babel} package and do not have the \sty{translator} package -installed, you need to be familiar with the advice given in +\sty{babel} package and the \sty{glossaries} package option \pkgopt[babel]{translate}, you need to be familiar with the advice given in \urlref{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=latexwords}{changing -the words babel uses}. If you have the \sty{translator} package -installed, then you can provide your own dictionary with the -necessary modifications (using \cs{deftranslation}) and load it -using \cs{usedictionary}. +the words babel uses}. If you are using the \sty{translator} +package, then you can provide your own dictionary with the necessary +modifications (using \cs{deftranslation}) and load it using +\cs{usedictionary}. \begin{important} Note that the dictionaries are loaded at the beginning of the @@ -953,33 +1074,17 @@ can be found by \TeX.) If you want to share your custom dictionary, you can upload it to \href{http://www.ctan.org/}{CTAN}. If you are using \sty{babel} and don't want to use the -\sty{translator} interface, you can suppress it using the package -option \pkgopt[false]{translate}, and either load -\sty{glossaries-babel} after \styfmt{glossaries} or specify you're own -translations. For example: +\sty{translator} interface, you can use the package +option \pkgopt[babel]{translate}. For example: \begin{verbatim} \documentclass[british]{article} \usepackage{babel} -\usepackage[translate=false]{glossaries} -\usepackage{glossaries-babel} -\end{verbatim} -or: -\begin{verbatim} -\documentclass[british]{article} - -\usepackage{babel} -\usepackage[translate=false]{glossaries} +\usepackage[translate=babel]{glossaries} \addto\captionsbritish{% \renewcommand*{\glossaryname}{List of Terms}% \renewcommand*{\acronymname}{List of Acronyms}% - \renewcommand*{\entryname}{Notation}% - \renewcommand*{\descriptionname}{Description}% - \renewcommand*{\symbolname}{Symbol}% - \renewcommand*{\pagelistname}{Page List}% - \renewcommand*{\glssymbolsgroupname}{Symbols}% - \renewcommand*{\glsnumbersgroupname}{Numbers}% } \end{verbatim} @@ -996,7 +1101,7 @@ details. \section{Generating the Associated Glossary Files} \label{sec:makeglossaries} -In order to generate a sorted glossary with compact \glspl{locationlist}, +In order to generate a sorted glossary with compact \glspl{numberlist}, it is necessary to use an external \gls{indexingapp} as an intermediate step. It is this application that creates the file containing the code that typesets the glossary. If this step is @@ -1011,6 +1116,14 @@ recommended if you're not writing in English. Commands that only have an effect when \gls*{xindy} is used are described in \sectionref{sec:xindy}. +\begin{important} +This is a multi-stage process, but there are methods of automating +document compilation using applications such as \app{latexmk} and +\app{arara}. See +\url{http://www.dickimaw-books.com/latex/thesis/html/build.html} for +more information. +\end{important} + The \styfmt{glossaries} package comes with the Perl script \gls{makeglossaries} which will run \gls{makeindex} or \gls{xindy} on all the glossary files using a customized style file (which is @@ -1106,7 +1219,11 @@ Community's} Know How section describes how to do this for TeXnicCenter, and the thread \href{http://groups.google.com/group/comp.text.tex/browse_thread/thread/edd83831b81b0759?hl=en}{\qt{Executing Glossaries' makeindex from a WinEdt macro}} on the \texttt{comp.text.tex} newsgroup -describes how to do it for WinEdt. For other editors see the editor's +describes how to do it for WinEdt. \href{http://www.dickimaw-books.com/latex/thesis/html/build.html}{Section +1.1 (Building Your Document)} +of \urlfootref{http://www.dickimaw-books.com/latex/thesis/}{\qt{Using \LaTeX\ to Write a PhD Thesis}} describes how to do it +for TeXWorks. +For other editors see the editor's user manual for further details. If any problems occur, remember to check the transcript files @@ -1155,13 +1272,20 @@ perl makeglossaries myDoc \end{prompt} There is a batch file called \texttt{makeglossaries.bat} which does this for Windows users, but you must have Perl installed to be able -to use it. You can specify in which directory the \filetype{.aux}, +to use it.\footnote{Apparently MiKTeX has an alternative +\texttt{makeglossaries.exe} but I don't know how using this differs +from using \texttt{makeglossaries.bat}.} You can specify in which directory the \filetype{.aux}, \filetype{.glo} etc files are located using the \texttt{-d} switch. For example: \begin{prompt} pdflatex -output-directory myTmpDir myDoc makeglossaries -d myTmpDir myDoc \end{prompt} +Note that \gls*{makeglossaries} assumes by default that +\gls*{makeindex}\slash\gls*{xindy} is on your operating system's +path. If this isn't the case, you can specify the full pathname +using \texttt{-m} \meta{path/to/makeindex} for \gls*{makeindex} +or \texttt{-x} \meta{path/to/xindy} for \gls*{xindy}. The \gls{makeglossaries} script contains POD (Plain Old Documentation). If you want, you can create a man page for @@ -1173,18 +1297,17 @@ resulting file onto the man path. Alternatively do \begin{important} When upgrading the \styfmt{glossaries} package, make sure you also upgrade your version of \gls{makeglossaries}. The current version is -2.07. +2.09. \end{important} \subsection{Using xindy explicitly} \label{sec:xindyapp} \Gls{xindy} comes with TeXLive, but not with MiKTeX. However MikTeX -users can install it. There is -\href{http://www.latex-community.org/forum/viewtopic.php?f=51&t=5383}{a -thread} in the Makeindex section of the -\urlfootref{http://www.latex-community.org/}{\LaTeX\ Community} that -describes how to do this. +users can install it. See +\href{http://tex.stackexchange.com/questions/71167/how-to-use-xindy-with-miktex}{How +to use Xindy with MikTeX} on +\urlfootref{http://www.stackexchange.com/}{\TeX\ on StackExchange}. If you want to use \gls{xindy} to process the glossary files, you must make sure you have used the @@ -1193,8 +1316,8 @@ files, you must make sure you have used the \usepackage[xindy]{glossaries} \end{verbatim} This is required regardless of whether you use \gls{xindy} -explicitly or whether it's called implicitly via -\gls{makeglossaries} or \gls{makeglossariesgui}. This causes the glossary +explicitly or whether it's called implicitly via applications such +as \gls{makeglossaries} or \gls{makeglossariesgui}. This causes the glossary entries to be written in raw \gls*{xindy} format, so you need to use \texttt{-I xindy} \emph{not} \texttt{-I tex}. @@ -1354,7 +1477,18 @@ if \gls{makeindex} should be used. \chapter{Package Options} \label{sec:pkgopts} -This section describes the available \styfmt{glossaries} package options. +This section describes the available \styfmt{glossaries} package +options. You may omit the \texttt{=true} for boolean options. (For +example, \pkgopt{acronym} is equivalent to \pkgopt[true]{acronym}). + +\begin{important} +Note that \meta{key}=\meta{value} options can't be passed via the +document class options. (This includes options where the +\meta{value} part may be omitted, such as \pkgopt{acronym}.) This is +a general limitation not restricted to the \styfmt{glossaries} +package. Options that aren't \meta{key}=\meta{value} (such as +\pkgopt{makeindex}) may be passed via the document class options. +\end{important} \section{General Options} \label{sec:pkgopts-general} @@ -1364,47 +1498,53 @@ This section describes the available \styfmt{glossaries} package options. the \styfmt{glossaries} package. \item[\pkgopt{nomain}] This suppresses the creation of the main -glossary. Note that if you use this option, you must create another -glossary in which to put all your entries (either via the -\pkgopt{acronym} package option described in -\sectionref{sec:pkgopts-acronym} or via \ics{newglossary} described -in \sectionref{sec:newglossary}). - -\item[\pkgopt{sanitize}] This is a -\meta{key}=\meta{value} option whose value is also a -\meta{key}=\meta{value} list. By default, the \styfmt{glossaries} -package \glspl{sanitize} the values of the \gloskey{name}, -\gloskey{description}, \gloskey{symbol} and \gloskey{sort} keys used when defining a -new glossary entry. This means that you can use fragile commands in -those keys, but it may lead to unexpected results if you try to -display these values within the document text. This sanitization can -be switched off using the \pkgopt{sanitize} package option. -For example, to switch off the sanitization -for the \gloskey{description} and \gloskey{name} keys, but not for -the \gloskey{symbol} key, do: -\begin{verbatim} -\usepackage[sanitize={name=false,description=false,% -symbol=true}]{glossaries} -\end{verbatim} -You can use \pkgopt[none]{sanitize} as a shortcut for\newline -\pkgoptfmt{sanitize=\{name=false,description=false,symbol=false\}}. -Note that this shortcut doesn't change the \gloskey{sort} -sanitization. That one needs to be switched off explicitly: -\begin{verbatim} -\usepackage[sanitize=none,sanitize={sort=false}]{glossaries} -\end{verbatim} +glossary and associated \texttt{.glo} file, if unrequired. Note that +if you use this option, you must create another glossary in which to +put all your entries (either via the \pkgopt{acronym} (or +\pkgopt{acronyms}) package option described in +\sectionref{sec:pkgopts-acronym} or via the \pkgopt{symbols} or +\pkgopt{numbers} options described in \sectionref{sec:pkgopts-other} +or via \ics{newglossary} described in \sectionref{sec:newglossary}). -\begin{important}% -\textbf{Note}: this sanitization only applies to the \gloskey{name}, -\gloskey{description}, \gloskey{symbol} and \gloskey{sort} keys. It doesn't apply -to any of the other keys so fragile commands contained in the value of -the other keys must always be protected using \cs{protect}. -Since the value of the \gloskey{text} key is obtained from the -\gloskey{name} key, you will still need to protect fragile commands -in the \gloskey{name} key if you don't use the \gloskey{text} key. +\begin{important} +If you don't use the main glossary and you don't use this option, +\gls{makeglossaries} will produce the following warning: +\begin{alltt} +Warning: File '\emph{filename}.glo' is empty. +Have you used any entries defined in glossary +'main'? +Remember to use package option 'nomain' if +you don't want to use the main glossary. +\end{alltt} +If you did actually want to use the main glossary and you see this +warning, check that you have referenced the entries in that glossary +via commands such as \ics{gls}. \end{important} -\item[\pkgopt{savewrites}] This is a boolean option to minimises the +\item[\pkgopt{sanitizesort}] This is a boolean option that +determines whether or not to \gls{sanitize} the sort value when +writing to the external glossary file. For example, suppose you +define an entry as follows: +\begin{verbatim} +\newglossaryentry{hash}{name={\#},sort={#}, + description={hash symbol}} +\end{verbatim} +The sort value (\verb|#|) must be sanitized before writing it to the +glossary file, otherwise \LaTeX\ will try to interpret it as a +parameter reference. If, on the other hand, you want the sort value +expanded, you need to switch off the sanitization. For example, +suppose you do: +\begin{verbatim} +\newcommand{\mysortvalue}{AAA} +\newglossaryentry{sample}{name={sample},sort={\mysortvalue}, + description={an example}} +\end{verbatim} +and you actually want \cs{mysortvalue} expanded, so that the entry +is sorted according to \texttt{AAA}, then use the package option +\pkgopt[false]{sanitizesort}. (The default is +\pkgopt[true]{sanitizesort}.) + +\item[\pkgopt{savewrites}] This is a boolean option to minimise the number of write registers used by the \styfmt{glossaries} package. (Default is \pkgopt[false]{savewrites}.) There are only a limited number of write registers, and if you have a large number of @@ -1436,10 +1576,7 @@ document to avoid rewriting the files. For example: \end{verbatim} \end{important} -\item[\pkgopt{translate}] This is a boolean option. The default is -\pkgoptval{true}{translate} if \sty{babel}, \sty{polyglossia} or -\sty{translator} have been loaded, otherwise the default value is -\pkgoptval{false}{translate}. +\item[\pkgopt{translate}] This can take the following values: \begin{description} \item[{\pkgopt[true]{translate}}] If \sty{babel} has been loaded @@ -1455,18 +1592,52 @@ document to avoid rewriting the files. For example: will be loaded. \item[{\pkgopt[false]{translate}}] Don't provide translations, even - if \sty{babel} or \sty{polyglossia} has been loaded. You can - then provide you're own translations or explicitly load - \sty{glossaries-babel} or \sty{glossaries-polyglossia}. + if \sty{babel} or \sty{polyglossia} has been loaded. + (Note that \sty{babel} provides the command \ics{glossaryname} + so that will still be translated if you have loaded \sty{babel}.) + + \item[{\pkgopt[babel]{translate}}] Don't load the \sty{translator} +package. Instead load \sty{glossaries-babel}. + +\begin{important} +I recommend you use \pkgopt[babel]{translate} if you have any +problems with the translations or with PDF bookmarks, but to maintain backward +compatibility, if \sty{babel} has been loaded the default is +\pkgopt[true]{translate}. +\end{important} + \end{description} + If \pkgopt{translate} is specified without a value, + \pkgopt[true]{translate} is assumed. If \pkgopt{translate} isn't +specified, \pkgopt[true]{translate} is assumed if \sty{babel}, +\sty{polyglossia} or \sty{translator} have been loaded. Otherwise +\pkgopt[false]{translate} is assumed. + See \sectionref{sec:fixednames} for further details. +\item[\pkgopt{notranslate}] This is equivalent to +\pkgopt[false]{translate} and may be passed via the document class +options. + \item[\pkgopt{hyperfirst}] This is a boolean option that specifies whether each term has a hyperlink on \firstuse. The default is \pkgopt[true]{hyperfirst} (terms on \gls{firstuse} have a hyperlink, unless explicitly suppressed using starred versions of commands -such as \ics{gls*}). +such as \ics{gls*}). Note that this applies to all glossary types. +It may be that you only want to apply this to just the acronyms +(where the first use explains the meaning of the acronym) but not +for ordinary glossary entries (where the first use is identical to +subsequent uses). In this case, you can use \pkgopt[false]{hyperfirst} and +apply \cs{glsunsetall} to all the regular (non-acronym) glossaries. +For example: +\begin{verbatim} +\usepackage[acronym,hyperfirst=false]{glossaries} +% acronym and glossary entry definitions + +% at the end of the preamble +\glsunsetall[main] +\end{verbatim} \item[\pkgopt{nohypertypes}] Use this option if you have multiple glossaries and you want to suppress the entry hyperlinks for a @@ -1479,7 +1650,11 @@ value in braces if it contains any commas. Example: \newglossary[nlg]{notation}{not}{ntn}{Notation} \end{verbatim} The values must be fully expanded, so \textbf{don't} try -\verb|nohypertypes=\acronymtype|. +\texttt{nohypertypes\discretionary{}{}{}=\ics{acronymtype}}. You may also use +\begin{definition} +\ics{GlsDeclareNoHyperList}\marg{list} +\end{definition} +instead or additionally. See \sectionref{sec:glslink} for further details. \item[\pkgopt{savenumberlist}] This is a boolean option that @@ -1537,32 +1712,55 @@ You can change this value later in the document using where \meta{name} is the sectional unit. The start of each glossary adds information to the page header via -\begin{definition}[\DescribeMacro{\glossarymark}] -\cs{glossarymark}\marg{glossary title} +\begin{definition}[\DescribeMacro{\glsglossarymark}] +\cs{glsglossarymark}\marg{glossary title} \end{definition} -This defaults to \cs{@mkboth} unless \cls{memoir} is loaded, but you may +This defaults to \cs{@mkboth}, but you may need to redefine it. For example, to only change the right header: \begin{verbatim} -\renewcommand{\glossarymark}[1]{\markright{#1}} +\renewcommand{\glsglossarymark}[1]{\markright{#1}} \end{verbatim} or to prevent it from changing the headers: \begin{verbatim} -\renewcommand{\glossarymark}[1]{} +\renewcommand{\glsglossarymark}[1]{} \end{verbatim} -If you want \cs{glossarymark} to use \cs{MakeUppercase} in the header, use the +If you want \cs{glsglossarymark} to use \cs{MakeUppercase} in the header, use the \pkgopt{ucmark} option described below. Occasionally you may find that another package defines \linebreak\cs{cleardoublepage} when it is not required. This may cause an unwanted blank page to appear before each glossary. This can -be fixed by redefining \ics{glsclearpage}: +be fixed by redefining \DescribeMacro\glsclearpage\cs{glsclearpage}: \begin{verbatim} \renewcommand*{\glsclearpage}{\clearpage} \end{verbatim} -\item[\pkgopt{ucmark}] This is a boolean option (default: \pkgopt[false]{ucmark}). If -set, \ics{glossarymark} is defined to use \ics{MakeUppercase}. +\item[\pkgopt{ucmark}] This is a boolean option (default: +\pkgopt[false]{ucmark}, unless \cls{memoir} has been loaded, in +which case it defaults to \pkgopt[true]{ucmark}). If +set, \ics{glsglossarymark} uses +\ics{MakeTextUppercase}\footnote{Actually it uses +\ics{mfirstucMakeUppercase} which is set to \sty{textcase}'s \cs{MakeTextUppercase} +by the +\styfmt{glossaries} package. This makes it consistent with +\ics{makefirstuc}. (The \sty{textcase} package is automatically +loaded by \styfmt{glossaries}.)}. +You can test whether this option has been set or not using +\begin{definition}[\DescribeMacro\ifglsucmark] +\cs{ifglsucmark} \meta{true part}\cs{else} \meta{false part}\cs{fi} +\end{definition} +For example: +\begin{verbatim} +\renewcommand{\glsglossarymark}[1]{% + \ifglsucmark + \markright{\MakeTextUppercase{#1}}% + \else + \markright{#1}% + \fi} +\end{verbatim} +If \cls{memoir} has been loaded and \pkgopt{ucfirst} is set, then +\cls{memoir}'s \ics{memUChead} is used. \item[\pkgopt{numberedsection}] The glossaries are placed in unnumbered sectional units by default, @@ -1651,22 +1849,27 @@ option will automatically set \pkgopt[true]{entrycounter} and the \ctr{glossaryentry} counter will be reset every time \meta{value} is incremented. -\DescribeMacro{\glsresetentrycounter} + \begin{important} The \ctr{glossaryentry} counter isn't automatically reset at the start of each glossary, except when glossary section numbering is on and the counter used by \pkgopt{counterwithin} is the same as the -counter used in the glossary's sectioning command. If you want the -counter reset at the start of each glossary, you can redefine -\ics{glossarypreamble} to use \cs{glsresetentrycounter}, which sets -\ctr{glossaryentry} to zero: +counter used in the glossary's sectioning command. +\end{important} + +If you want the counter reset at the start of each glossary, you can +redefine \ics{glossarypreamble} to use +\begin{definition}[\DescribeMacro{\glsresetentrycounter}] +\cs{glsresetentrycounter} +\end{definition} +which sets \ctr{glossaryentry} to zero: \begin{verbatim} \renewcommand{\glossarypreamble}{% \glsresetentrycounter } \end{verbatim} -or if you want a different preamble per glossary, use -\ics{setglossarypreamble}. For example: +or if you are using \ics{setglossarypreamble}, add it to each +glossary preamble, as required. For example: \begin{verbatim} \setglossarypreamble[acronym]{% \glsresetentrycounter @@ -1677,7 +1880,6 @@ or if you want a different preamble per glossary, use The preamble text here for the main glossary. } \end{verbatim} -\end{important} \item[\pkgopt{subentrycounter}] This is a boolean option. (Default is \pkgopt[false]{subentrycounter}.) If set, each level~1 @@ -1694,28 +1896,35 @@ associated with the sub-entry. (Default is \pkgopt[list]{style}.) Its value should be the name of the glossary style to use. This key may only be used for styles defined in \sty{glossary-list}, \sty{glossary-long}, -\sty{glossary-super} or \sty{glossary-tree}. (See -\sectionref{sec:styles}.) +\sty{glossary-super} or \sty{glossary-tree}. Alternatively, you can +set the style using +\begin{definition} +\cs{setglossarystyle}\marg{style name} +\end{definition} +(See \sectionref{sec:styles} for further details.) \item[\pkgopt{nolong}] This prevents the \styfmt{glossaries} package from automatically loading \sty{glossary-long} (which means that the \sty{longtable} package also won't be loaded). This reduces overhead by not defining unwanted styles and commands. Note that if you use this option, you won't be able to use any of the -glossary styles defined in the \styfmt{glossary-long} package. +glossary styles defined in the \styfmt{glossary-long} package (unless +you explicitly load \sty{glossary-long}). \item[\pkgopt{nosuper}] This prevents the \styfmt{glossaries} package from automatically loading \sty{glossary-super} (which means that the \sty{supertabular} package also won't be loaded). This reduces overhead by not defining unwanted styles and commands. Note that if you use this option, you won't be able to use any of the -glossary styles defined in the \styfmt{glossary-super} package. +glossary styles defined in the \styfmt{glossary-super} package +(unless you explicitly load \sty{glossary-super}). \item[\pkgopt{nolist}] This prevents the \styfmt{glossaries} package from automatically loading \sty{glossary-list}. This reduces overhead by not defining unwanted styles. Note that if you use this option, you won't be able to use any of the -glossary styles defined in the \styfmt{glossary-list} package. +glossary styles defined in the \styfmt{glossary-list} package +(unless you explicitly load \sty{glossary-list}). Note that since the default style is \glostyle{list}, you will also need to use the \pkgopt{style} option to set the style to something else. @@ -1724,19 +1933,20 @@ something else. from automatically loading \sty{glossary-tree}. This reduces overhead by not defining unwanted styles. Note that if you use this option, you won't be able to use any of the -glossary styles defined in the \styfmt{glossary-tree} package. +glossary styles defined in the \styfmt{glossary-tree} package +(unless you explicitly load \sty{glossary-tree}). \item[\pkgopt{nostyles}] This prevents all the predefined styles from being loaded. If you use this option, you need to load a glossary style package (such as \sty{glossary-mcols}). Also if you use this option, you can't use the \pkgopt{style} package option. -Instead you must either use \ics{glossarystyle}\marg{style} or the +Instead you must either use \ics{setglossarystyle}\marg{style} or the \gloskey[printglossary]{style} key in the optional argument to \ics{printglossary}. Example: \begin{verbatim} \usepackage[nostyles]{glossaries} \usepackage{glossary-mcols} -\glossarystyle{mcoltree} +\setglossarystyle{mcoltree} \end{verbatim} \item[\pkgopt{nonumberlist}] This option will suppress the @@ -1791,9 +2001,133 @@ which they were defined (the \gloskey{sort} key in \item \pkgoptval{use}{sort} : entries are sorted according to the order in which they are used in the document (the \gloskey{sort} key in \cs{newglossaryentry} is ignored). + +Both \pkgopt[def]{sort} and \pkgopt[use]{sort} set the sort key to a +six digit number via +\begin{definition}[\DescribeMacro\glssortnumberfmt] +\cs{glssortnumberfmt}\marg{number} +\end{definition} +(padded with leading zeros, where necessary). This can be +redefined, if required, before the entries are defined (in the +case of \pkgopt[def]{sort}) or before the entries are used +(in the case of \pkgopt[use]{sort}). \end{itemize} -The default is \pkgopt[standard]{sort}. +The default is \pkgopt[standard]{sort}. When the standard sort +option is in use, you can hook into the sort mechanism by +redefining: +\begin{definition}[\DescribeMacro{\glsprestandardsort}] +\cs{glsprestandardsort}\marg{sort cs}\marg{type}\marg{label} +\end{definition} +where \meta{sort cs} is a temporary control sequence that stores the +sort value (which was either explicitly set via the \gloskey{sort} +key or implicitly set via the \gloskey{name} key) before any escaping of the +\gls{makeindex}\slash\gls{xindy} special characters is performed. +By default \cs{glsprestandardsort} just does: +\begin{definition}[\DescribeMacro{\glsdosanitizesort}] +\cs{glsdosanitizesort} +\end{definition} +which sanitizes \meta{sort cs} if the \pkgopt{sanitizesort} package option +is set (or does nothing if the package option \pkgopt[false]{sanitizesort} is used). + +The other arguments, \meta{type} and \meta{label}, are the +glossary type and the entry label for the current entry. Note that +\meta{type} will always be a control sequence, but \meta{label} will +be in the form used in the first argument of \ics{newglossaryentry}. + +\begin{important} +Redefining \cs{glsprestandardsort} won't affect any entries that +have already been defined and will have no effect at all if you +are using \pkgopt[def]{sort} or \pkgopt[use]{sort}. +\end{important} + +\begin{example}{Mixing Alphabetical and Order of Definition Sorting}{ex:diffsorts} +Suppose I have three glossaries: \texttt{main}, +\texttt{acronym} and \texttt{notation}, and let's suppose +I want the \texttt{main} and \texttt{acronym} glossaries to be +sorted alphabetically, but the \texttt{notation} type should be +sorted in order of definition. I can set the sort to standard +(which is the default, but can be explicitly set via the +package option \pkgopt[standard]{sort}), and I can either define +all my \texttt{main} and \texttt{acronym} entries, then +redefine \cs{glsprestandardsort} to set \meta{sort cs} to +an incremented integer, and then define all my +\texttt{notation} entries. Alternatively, I can redefine +\cs{glsprestandardsort} to check for the glossary type and only +modify \meta{sort cs} if \meta{type} is \texttt{notation}. + +The first option can be achieved as follows: +\begin{verbatim} +\newcounter{sortcount} + +\renewcommand{\glsprestandardsort}[3]{% + \stepcounter{sortcount}% + \edef#1{\glssortnumberfmt{\arabic{sortcount}}}% +} +\end{verbatim} +The second option can be achieved as follows: +\begin{verbatim} +\newcounter{sortcount} + +\renewcommand{\glsprestandardsort}[3]{% + \ifdefstring{#2}{notation}% + {% + \stepcounter{sortcount}% + \edef#1{\glssortnumberfmt{\arabic{sortcount}}}% + }% + {% + \glsdosanitizesort + }% +} +\end{verbatim} +(\cs{ifdefstring} is defined by the \sty{etoolbox} package.) +For a complete document, see the sample file \samplefile{Sort}. +\end{example} + +\begin{example}{Customizing Standard Sort}{ex:customsort} +Suppose you want a glossary of people and you want the names listed +as \meta{first-name} \meta{surname} in the glossary, but you want the names +sorted by \meta{surname}, \meta{first-name}. You can do this by +defining a command called, say, +\cs{name}\marg{first-name}\marg{surname} that you can use in the +\gloskey{name} key when you define the entry, but hook into the +standard sort mechanism to temporarily redefine \cs{name} while the +sort value is being set. + +First, define two commands to set the person's name: +\begin{verbatim} +\newcommand{\sortname}[2]{#2, #1} +\newcommand{\textname}[2]{#1 #2} +\end{verbatim} +and \cs{name} needs to be initialised to \cs{textname}: +\begin{verbatim} +\let\name\textname +\end{verbatim} +Now redefine \cs{glsprestandardsort} so that it temporarily sets +\cs{name} to \cs{sortname} and expands the sort value, then sets +\cs{name} to \cs{textname} so that the person's name appears as +\meta{first-name} \meta{surname} in the text: +\begin{verbatim} +\renewcommand{\glsprestandardsort}[3]{% + \let\name\sortname + \edef#1{\expandafter\expandonce\expandafter{#1}}% + \let\name\textname + \glsdosanitizesort +} +\end{verbatim} +(The somewhat complicate use of \cs{expandafter} etc helps to +protect fragile commands, but care is still needed.) + +Now the entries can be defined: +\begin{verbatim} +\newglossaryentry{joebloggs}{name={\name{Joe}{Bloggs}}, + description={some information about Joe Bloggs}} + +\newglossaryentry{johnsmith}{name={\name{John}{Smith}}, + description={some information about John Smith}} +\end{verbatim} +For a complete document, see the sample file \samplefile{People}. +\end{example} \item[\pkgopt{order}] This may take two values: \pkgoptval{word}{order} or \pkgoptval{letter}{order}. The default @@ -1819,7 +2153,7 @@ call \gls*{xindy}. If you don't use \gls*{makeglossaries}, you need to remember to use \gls*{xindy} not \gls{makeindex}. The indexing style file will been given a \filetype{.xdy} extension. -The \pkgopt{xindy} package option may additionally have a value that +This package option may additionally have a value that is a \meta{key}=\meta{value} comma-separated list to override the language and codepage. For example: \begin{verbatim} @@ -1830,8 +2164,17 @@ glossary. This defaults to true, but can be suppressed. For example: \begin{verbatim} \usepackage[xindy={glsnumbers=false}]{glossaries} \end{verbatim} -See \sectionref{sec:xindy} for further details on using \gls{xindy} -with the \styfmt{glossaries} package. +If no value is supplied to this package option (either simply +writing \texttt{xindy} or writing \verb|xindy={}|) then the +language, codepage and number group settings are unchanged. See +\sectionref{sec:xindy} for further details on using \gls{xindy} with +the \styfmt{glossaries} package. + +\item[\pkgopt{xindygloss}] This is equivalent to +\verb|xindy={}| (that is, the \pkgopt{xindy} option without any value +supplied) and may be used as a document class option. The language +and code page can be set via \ics{GlsSetXdyLanguage} and +\ics{GlsSetXdyCodePage} (see \sectionref{sec:langenc}.) \end{description} @@ -1844,16 +2187,36 @@ label \texttt{acronym}. This is equivalent to: \begin{verbatim} \newglossary[alg]{acronym}{acr}{acn}{\acronymname} \end{verbatim} +It will also define +\begin{definition}[\DescribeMacro\printacronyms] +\cs{printacronyms}\oarg{options} +\end{definition} +that's equivalent to +\begin{alltt} +\ics{printglossary}[type=acronym,\meta{options}] +\end{alltt} +(unless that command is already defined before the beginning of the +document or the package option \pkgopt{compatible-3.07} is used). + If the \pkgopt{acronym} package option is used, \ics{acronymtype} is set to \texttt{acronym} otherwise it is set to \texttt{main}.\footnote{Actually it sets \ics{acronymtype} to \ics{glsdefaulttype} if the \pkgopt{acronym} package option is not used, but \ics{glsdefaulttype} usually has the value -\texttt{main}.} +\texttt{main} unless the \pkgopt{nomain} option has been used.} Entries that are defined using \ics{newacronym} are placed in the glossary whose label is given by \ics{acronymtype}, unless another glossary is explicitly specified. +\begin{important} +Remember to use the \pkgopt{nomain} package option if you're only +interested in using this \texttt{acronym} glossary. +\end{important} + +\item[\pkgopt{acronyms}] This is equivalent to +\pkgopt[true]{acronym} and may be used in the document class option +list. + \item[\pkgopt{acronymlists}] By default, only the \cs{acronymtype} glossary is considered to be a list of acronyms. If you have other lists of acronyms, you can specify them as a comma-separated list @@ -1869,39 +2232,138 @@ so you can add glossaries you haven't defined yet. For example: \usepackage[acronym,acronymlists={main,acronym2}]{glossaries} \newglossary[alg2]{acronym2}{acr2}{acn2}{Statistical Acronyms} \end{verbatim} +You can use +\begin{definition}[\DescribeMacro\DeclareAcronymList] +\cs{DeclareAcronymList}\marg{list} +\end{definition} +instead of or in addition to the \pkgopt{acronymlists} option. +This will add the glossaries given in \meta{list} to the list of glossaries +that are identified as lists of acronyms. To replace the list of acronym lists +use with a new list use: +\begin{definition}[\DescribeMacro\SetAcronymLists] +\cs{SetAcronymLists}\marg{list} +\end{definition} -\item[\pkgopt{description}] This option changes the definition of -\ics{newacronym} to allow a description. This option has no effect if -you defined your own custom acronym style. See -\sectionref{sec:acronyms} for further details. +You can determine if a glossary has been identified as being a list +of acronyms using: +\begin{definition}[\DescribeMacro\glsIfListOfAcronyms] +\cs{glsIfListOfAcronyms}\marg{label}\marg{true part}\marg{false part} +\end{definition} -\item[\pkgopt{footnote}] This option changes the definition of -\ics{newacronym} and the way that acronyms are displayed. This -option has no effect if you defined your own custom acronym style. See +\item[\pkgopt{description}] This option changes the definition of +\ics{newacronym} to allow a description. This option may have no effect if +you define your own custom acronym style. See \sectionref{sec:acronyms} for further details. \item[\pkgopt{smallcaps}] This option changes the definition of \ics{newacronym} and the way that acronyms are displayed. This -option may have no effect if you defined your own custom acronym +option may have no effect if you define your own custom acronym style. See \sectionref{sec:acronyms} for further details. \item[\pkgopt{smaller}] This option changes the definition of -\ics{newacronym} and the way that acronyms are displayed. If you use -this option, you will need to include the \sty{relsize} package or -otherwise define \ics{textsmaller} or redefine \ics{acronymfont}. -This option may have no effect if you defined your own custom acronym +\ics{newacronym} and the way that acronyms are displayed. +\begin{important} +If you use this option, you will need to include the \sty{relsize} +package or otherwise define \ics{textsmaller} or redefine +\ics{acronymfont}. +\end{important} +This option may have no effect if you define your own custom acronym style. See \sectionref{sec:acronyms} for further details. +\item[\pkgopt{footnote}] This option changes the definition of +\ics{newacronym} and the way that acronyms are displayed. This +option has no effect if you define your own custom acronym style. See +\sectionref{sec:acronyms} for further details. + \item[\pkgopt{dua}] This option changes the definition of \ics{newacronym} so that acronyms are always expanded. This -option has no effect if you defined your own custom acronym style. +option may have no effect if you define your own custom acronym style. See \sectionref{sec:acronyms} for further details. \item[\pkgopt{shortcuts}] This option provides shortcut commands for acronyms. See \sectionref{sec:acronyms} for further details. +Alternatively you can use: +\begin{definition}[\DescribeMacro\DefineAcronymShortcuts] +\cs{DefineAcronymShortcuts} +\end{definition} + +\end{description} + +\section{Other Options} +\label{sec:pkgopts-other} + +Other available options that don't fit any of the above categories +are: +\begin{description} +\item[\pkgopt{symbols}] This option defines a new glossary type with +the label \texttt{symbols} via +\begin{verbatim} +\newglossary[slg]{symbols}{sls}{slo}{\glssymbolsgroupname} +\end{verbatim} +It also defines +\begin{definition}[\DescribeMacro\printsymbols] +\cs{printsymbols}\oarg{options} +\end{definition} +which is a synonym for +\ics{printglossary}\texttt{[type=symbols,\meta{options}]}. + +\begin{important} +Remember to use the \pkgopt{nomain} package option if you're only +interested in using this \texttt{symbols} glossary. +\end{important} + +\item[\pkgopt{numbers}] This option defines a new glossary type with +the label \texttt{numbers} via +\begin{verbatim} +\newglossary[nlg]{numbers}{nls}{nlo}{\glsnumbersgroupname} +\end{verbatim} +It also defines +\begin{definition}[\DescribeMacro\printnumbers] +\cs{printnumbers}\oarg{options} +\end{definition} +which is a synonym for +\ics{printglossary}\texttt{[type=numbers,\meta{options}]}. + +\begin{important} +Remember to use the \pkgopt{nomain} package option if you're only +interested in using this \texttt{numbers} glossary. +\end{important} + +\item[\pkgopt{compatible-2.07}] Compatibility mode for old documents +created using version 2.07 or below. + +\item[\pkgopt{compatible-3.07}] Compatibility mode for old documents +created using version 3.07 or below. \end{description} +\section{Setting Options After Package Loaded} + +Some of the options described above may also be set after the +\sty{glossaries} package has been loaded using +\begin{definition}[\DescribeMacro{\setupglossaries}] +\cs{setupglossaries}\marg{key-val list} +\end{definition} +The following package options \textbf{can't} be used in +\cs{setupglossaries}: \pkgopt{xindy}, \pkgopt{xindygloss}, \pkgopt{makeindex}, +\pkgopt{nolong}, \pkgopt{nosuper}, \pkgopt{nolist}, +\pkgopt{notree}, \pkgopt{nostyles}, \pkgopt{nomain}, +\pkgopt{compatible-2.07}, \pkgopt{translate}, \pkgopt{notranslate}, +\pkgopt{acronym}. These options have to be set while the package is +loading, except for the \pkgopt{xindy} sub-options which can be set +using commands like \ics{GlsSetXdyLanguage} (see +\sectionref{sec:xindy} for further details). + +\begin{important} +I recommend you use this command as soon as possible after loading +\sty{glossaries} otherwise you might end up using it too late for +the change to take effect. For example, if you try changing the +acronym styles (such as \pkgopt{smallcaps}) after you have started +defining your acronyms, you are likely to get unexpected results. If +you try changing the sort option after you have started to define +entries, you may get unexpected results. +\end{important} + \chapter{Setting Up} \label{sec:setup} @@ -1912,8 +2374,8 @@ The command must be placed in the preamble in order to create the customised \gls{makeindex} (\filetype{.ist}) or \gls{xindy} (\filetype{.xdy}) style file and to ensure that glossary entries are written to the -appropriate output files. If you omit \cs{makeglossaries} none of -the glossaries will be created. +appropriate output files. \textbf{If you omit \cs{makeglossaries} none of +the glossaries will be created.} \begin{important} Note that some of the commands provided by the \styfmt{glossaries} @@ -1987,7 +2449,9 @@ All glossary entries must be defined before they are used, so it is better to define them in the preamble to ensure this.\footnote{The only preamble restriction on \ics{newglossaryentry} and \ics{newacronym} was removed in version 1.13, but the restriction -remains for \ics{loadglsentries}.} However only those entries that +remains for \ics{loadglsentries}. See \sectionref{sec:docdefs} for +a discussion of the problems with defining entries within the +document instead of in the preamble.} However only those entries that occur in the document (using any of the commands described in \sectionref{sec:glslink}, \sectionref{sec:glsadd} or \sectionref{sec:crossref}) will appear in the glossary. Each time an @@ -2007,10 +2471,47 @@ overwritten.} See New glossary entries are defined using the command: \begin{definition}[\DescribeMacro{\newglossaryentry}] -\cs{newglossaryentry}\marg{label}\marg{key-val list} +\cs{newglossaryentry}\marg{label}\marg{key=value list} +\end{definition} +This is a short command, so values in \meta{key-val list} can't +contain any paragraph breaks. If you have a long description that +needs to span multiple paragraphs, use +\begin{definition}[\DescribeMacro{\longnewglossaryentry}] +\cs{longnewglossaryentry}\marg{label}\marg{key=value +list}\marg{long description} +\end{definition} +instead. Note that, unlike \cs{newglossaryentry}, the command +\cs{longnewglossaryentry} may only be used in the preamble. +Be careful of unwanted spaces. \cs{longnewglossaryentry} +will remove trailing spaces in the description (via \cs{unskip}) +but won't remove leading spaces (otherwise it would interfere with +commands like \cs{Glsentrydesc}). + +There are also commands that will only define the entry if it +hasn't already been defined: +\begin{definition}[\DescribeMacro\provideglossaryentry] +\cs{provideglossaryentry}\marg{label}\marg{key=value list} +\end{definition} +and\par +\DescribeMacro\longprovideglossaryentry +\begin{definition} +\cs{longprovideglossaryentry}\marg{label}\marg{key=value +list}\marg{long description} \end{definition} -The first argument, \meta{label}, must be a unique label with which -to identify this entry. The second argument, \meta{key-val list}, is +(These are both preamble-only commands.) + +For all the above commands, the first argument, \meta{label}, must be +a~unique label with which to identify this entry. This can't contain +any non-expandable commands or active characters. + +\begin{important} +Note that although an accented character or other non-Latin +character, such as \'e or \th, looks like a plain character in your +\texttt{.tex} file, it's actually a macro (an active character) and +can therefore can't be used in the label. +\end{important} + +The second argument, \meta{key=value list}, is a \meta{key}=\meta{value} list that supplies the relevant information about this entry. There are two required fields: \gloskey{description} and either \gloskey{name} or \gloskey{parent}. @@ -2034,6 +2535,7 @@ break in the description use \begin{definition}[\DescribeMacro{\glspar}] \cs{glspar} \end{definition} +or, better, use \cs{longnewglossaryentry}. However, note that not all glossary styles support multi-line descriptions. If you are using one of the tabular-like glossary styles that permit multi-line descriptions, use \ics{newline} @@ -2044,13 +2546,8 @@ the parent entry must be defined before its sub-entries. See \sectionref{sec:subentries} for further details. \item[{\gloskey{descriptionplural}}] The plural form of the -description (as passed to \ics{glsdisplay} and \ics{glsdisplayfirst} -by \ics{glspl}, \ics{Glspl} and \ics{GLSpl}). If omitted, the value -is set to the same as the \gloskey{description} key. (Note that if -you want the description to appear in the main body of the document, -you must switch off the description \glsation{sanitize} using the -\pkgopt{sanitize} package option described in -\sectionref{sec:pkgopts-general}.) +description, if required. If omitted, the value +is set to the same as the \gloskey{description} key. \item[{\gloskey{text}}] How this entry will appear in the document text when using \ics{gls} (or one of its uppercase variants). If this @@ -2088,10 +2585,6 @@ used the \gloskey{first} key. \item[{\gloskey{symbol}}] This field is provided to allow the user to specify an associated symbol. If omitted, the value is set to \cs{relax}. Note that not all glossary styles display the symbol. -(If you want the symbol to appear in the main body of the document, -you must switch off the symbol \glsation{sanitize} using the -\pkgopt{sanitize} package option described in -\sectionref{sec:pkgopts-general}.) \item[{\gloskey{symbolplural}}] This is the plural form of the symbol (as passed to \ics{glsdisplay} and \ics{glsdisplayfirst} @@ -2104,8 +2597,9 @@ by the \gloskey{name} field. In general, it's best to use the \gloskey{sort} key if the \gloskey{name} contains commands (e.g.\ \verb|\ensuremath{\alpha}|). Note that the package options \pkgopt[def]{sort} and \pkgopt[use]{sort} override the -\gloskey{sort} key in \ics{newglossaryentry} (see -\sectionref{sec:pkgopts-sort}). +\gloskey{sort} key in \ics{newglossaryentry} and redefining +\ics{glsprestandardsort} can also be used to override the +\gloskey{sort} key (see \sectionref{sec:pkgopts-sort}). \item[{\gloskey{type}}] This specifies the label of the glossary in which this entry belongs. If omitted, the default glossary is @@ -2115,11 +2609,15 @@ assumed unless \ics{newacronym} is used (see \item[{\gloskey{user1}, \ldots, \gloskey{user6}% \igloskey{user2}\igloskey{user3}\igloskey{user4}\igloskey{user5}}] Six keys provided for any additional information the user may want -to specify. (For example an associated dimension or an alternative -plural or some other grammatical construct.) +to specify. (For example, an associated dimension or an alternative +plural or some other grammatical construct.) Alternatively, you can +add new keys using \ics{glsaddkey} (see \sectionref{sec:addkey}). +Other keys are also provided by the \sty{glossaries-prefix} +(\sectionref{sec:prefix}) and \sty{glossaries-accsupp} +(\sectionref{sec:accsupp}) packages. \item[{\gloskey{nonumberlist}}] A boolean key. If the value is -missing or is "true", this will suppress the \gls{numberlist} just for +missing or is \texttt{true}, this will suppress the \gls{numberlist} just for this entry. Conversely, if you have used the package option \pkgopt{nonumberlist}, you can activate the \gls*{numberlist} just for this entry with \gloskey{nonumberlist=false}. @@ -2131,9 +2629,10 @@ glossary, but will not automatically add the cross-referenced entry. The referenced entry should be supplied as the value to this key. If you want to override the \qt{see} tag, you can supply the new tag in square brackets before the label. For example -\verb|see=[see also]{anotherlabel}|. Note that if you have +\verb|see=[see also]{anotherlabel}|. \textbf{Note that if you have suppressed the \gls{numberlist}, the cross-referencing information -won't appear in the glossary. You can override this for individual +won't appear in the glossary, as it forms part of the +\gls*{numberlist}.} You can override this for individual glossary entries using \gloskey{nonumberlist=false} (see above). Alternatively, you can use the \pkgopt{seeautonumberlist} package option. For further details, see \sectionref{sec:crossref}. @@ -2147,9 +2646,13 @@ option. For further details, see \sectionref{sec:crossref}. The following keys are reserved for \ics{newacronym} (see \sectionref{sec:acronyms}): \gloskey{long}, \gloskey{longplural}, -\gloskey{short} and \gloskey{shortplural}. +\gloskey{short} and \gloskey{shortplural}. Additional keys are +provided by the \sty{glossaries-prefix} (\sectionref{sec:prefix}) +and the \sty{glossaries-accsupp} (\sectionref{sec:accsupp}) packages. +You can also define your own custom keys (see +\sectionref{sec:addkey}). -Note that if the name starts with an accented letter or non-Roman +Note that if the name starts with an accented letter or other non-Latin character, you must group the character, otherwise it will cause a problem for commands like \ics{Gls} and \ics{Glspl}. For example: @@ -2208,7 +2711,8 @@ define an easy to remember synonym. For example: \let\glsaltpl\glsuseri \end{verbatim} Then you don't have to remember which key you used to store the -alternative plural. +second plural. Alternatively, you can define your own keys using +\ics{glsaddkey}, described in \sectionref{sec:addkey}. If you are using a language that usually forms plurals by appending a different letter, or sequence of letters, you can @@ -2254,6 +2758,157 @@ Jane \glsd{play} in the park yesterday. Peter and Jane \glsd{run} in the park last week. \end{verbatim} +Alternatively, you can define your own keys using +\ics{glsaddkey}, described below in \sectionref{sec:addkey}. + +\section{Additional Keys} +\label{sec:addkey} + +You can now also define your own custom keys using: +\begin{definition}[\DescribeMacro\glsaddkey] +\cs{glsaddkey}\marg{key}% +\marg{default value}% +\marg{no link cs}% +\marg{no link ucfirst cs}% +\marg{link cs}% +\marg{link ucfirst cs}% +\marg{link allcaps cs} +\end{definition} +where: +\begin{description} +\item[\meta{key}] is the new key to use in \ics{newglossaryentry} +(or similar commands such as \ics{longnewglossaryentry}); +\item[\meta{default value}] is the default value to use if this key +isn't used in an entry definition (this may reference the current +entry label via \cs{glslabel}, but you will have to switch on +expansion via the starred version of \cs{glsaddkey}); +\item[\meta{no link cs}] is the control sequence to use analogous +to commands like \ics{glsentrytext}; +\item[\meta{no link ucfirst cs}] is the control sequence to use analogous +to commands like \ics{Glsentrytext}; +\item[\meta{link cs}] is the control sequence to use analogous +to commands like \ics{glstext}; +\item[\meta{link ucfirst cs}] is the control sequence to use analogous +to commands like \ics{Glstext}; +\item[\meta{link allcaps cs}] is the control sequence to use analogous +to commands like \ics{GLStext}. +\end{description} +The starred version of \cs{glsaddkey} switches on expansion for this +key. The unstarred version doesn't override the current expansion +setting. + +\begin{example}{Defining Custom Keys}{ex:addkey} +Suppose I want to define two new keys, \texttt{ed} and \texttt{ing}, +that default to the entry text followed by \qt{ed} and \qt{ing}, +respectively. The default value will need expanding in both cases, so +I need to use the starred form: +\begin{verbatim} + % Define "ed" key: + \glsaddkey* + {ed}% key + {\glsentrytext{\glslabel}ed}% default value + {\glsentryed}% command analogous to \glsentrytext + {\Glsentryed}% command analogous to \Glsentrytext + {\glsed}% command analogous to \glstext + {\Glsed}% command analogous to \Glstext + {\GLSed}% command analogous to \GLStext + + % Define "ing" key: + \glsaddkey* + {ing}% key + {\glsentrytext{\glslabel}ing}% default value + {\glsentrying}% command analogous to \glsentrytext + {\Glsentrying}% command analogous to \Glsentrytext + {\glsing}% command analogous to \glstext + {\Glsing}% command analogous to \Glstext + {\GLSing}% command analogous to \GLStext +\end{verbatim} +Now I can define some entries: +\begin{verbatim} + % No need to override defaults for this entry: + + \newglossaryentry{jump}{name={jump},description={}} + + % Need to override defaults on these entries: + + \newglossaryentry{run}{name={run},% + ed={ran},% + ing={running},% + description={}} + + \newglossaryentry{waddle}{name={waddle},% + ed={waddled},% + ing={waddling},% + description={}} +\end{verbatim} + +These entries can later be used in the document: +\begin{verbatim} +The dog \glsed{jump} over the duck. + +The duck was \glsing{waddle} round the dog. + +The dog \glsed{run} away from the duck. +\end{verbatim} +For a complete document, see the sample file \samplefile{-newkeys}. +\end{example} + +\section{Expansion} +\label{sec:expansion} + +When you define new glossary entries expansion is performed by +default, except for the \gloskey{name}, \gloskey{description}, +\gloskey{descriptionplural}, \gloskey{symbol}, \gloskey{symbolplural} +and \gloskey{sort} keys (these keys all have expansion suppressed via +\cs{glssetnoexpandfield}). + +You can switch expansion on or off for individual keys using +\begin{definition}[\DescribeMacro\glssetexpandfield] +\cs{glssetexpandfield}\marg{field} +\end{definition} +or +\begin{definition}[\DescribeMacro\glssetnoexpandfield] +\cs{glssetnoexpandfield}\marg{field} +\end{definition} +respectively, where \meta{field} is the field tag corresponding to +the key. In most cases, this is the same as the name of the key +except for those listed in \tableref{tab:fieldmap}. + +\begin{table}[htbp] +\caption{Key to Field Mappings} +\label{tab:fieldmap} +\centering +\begin{tabular}{ll} +\bfseries Key & \bfseries Field\\ +\gloskey{sort} & \ttfamily sortvalue\\ +\gloskey{firstplural} & \ttfamily firstpl\\ +\gloskey{description} & \ttfamily desc\\ +\gloskey{descriptionplural} & \ttfamily descplural\\ +\gloskey{user1} & \ttfamily useri\\ +\gloskey{user2} & \ttfamily userii\\ +\gloskey{user3} & \ttfamily useriii\\ +\gloskey{user4} & \ttfamily useriv\\ +\gloskey{user5} & \ttfamily userv\\ +\gloskey{user6} & \ttfamily uservi\\ +\gloskey{longplural} & \ttfamily longpl\\ +\gloskey{shortplural} & \ttfamily shortpl +\end{tabular} +\end{table} + +Any keys that haven't had the expansion explicitly set using +\cs{glssetexpandfield} or \cs{glssetnoexpandfield} are governed by +\begin{definition}[\DescribeMacro\glsexpandfields] +\cs{glsexpandfields} +\end{definition} +and +\begin{definition}[\DescribeMacro\glsnoexpandfields] +\cs{glsnoexpandfields} +\end{definition} + +If your entries contain any fragile commands, I recommend you switch +off expansion via \cs{glsnoexpandfields}. (This should be used +before you define the entries.) + \section{Sub-Entries} \label{sec:subentries} @@ -2284,7 +2939,11 @@ restriction on the maximum sub-entry depth. To arrange a glossary with hierarchical categories, you need to first define the category and then define the sub-entries using the relevant category entry as the value of the \gloskey{parent} key. -For example, suppose I want a glossary of mathematical symbols that + +\begin{example}{Hierarchical Categories---Greek and Roman +Mathematical Symbols}{ex:hierarchical} + +Suppose I want a glossary of mathematical symbols that are divided into Greek letters and Roman letters. Then I can define the categories as follows: \begin{verbatim} @@ -2311,7 +2970,8 @@ parent=greekletter} description={Euler's constant}, parent=romanletter} \end{verbatim} - +For a complete document, see the sample file \samplefile{tree}. +\end{example} \subsection{Homographs} \label{sec:homographs} @@ -2346,7 +3006,8 @@ added to the parent's \gls{numberlist}, whereas if I reference any of the child entries, the location will be added to the child entry's number list. Note also that since the sub-entries have the same name, the \gloskey{sort} key is required unless you are using -the \pkgopt[use]{sort} or \pkgopt[def]{sort} package options. You +the \pkgopt[use]{sort} or \pkgopt[def]{sort} package options (see +\sectionref{sec:pkgopts-sort}). You can use the \pkgopt{subentrycounter} package option to automatically number the first-level child entries. See \sectionref{sec:pkgopts-printglos} for further details. @@ -2382,13 +3043,16 @@ file and use: \cs{loadglsentries}\oarg{type}\marg{filename} \end{definition} where \meta{filename} is the name of the file containing all the -\ics{newglossaryentry} commands. The optional argument +\ics{newglossaryentry} or \ics{longnewglossaryentry} commands. +The optional argument \meta{type} is the name of the glossary to which those entries should belong, for those entries where the \gloskey{type} key has been omitted (or, more specifically, for those entries whose type has been specified by \ics{glsdefaulttype}, which is what -\ics{newglossaryentry} uses by default). For example, suppose I have -a file called \texttt{myentries.tex} which contains: +\ics{newglossaryentry} uses by default). + +\begin{example}{Loading Entries from Another File}{ex:loadgls} +Suppose I have a file called \texttt{myentries.tex} which contains: \begin{verbatim} \newglossaryentry{perl}{type=main, name={Perl}, @@ -2409,6 +3073,7 @@ then this will add the entries \texttt{tex} and \texttt{html} to the glossary whose type is given by \texttt{languages}, but the entry \texttt{perl} will be added to the main glossary, since it explicitly sets the type to \texttt{main}. +\end{example} \textbf{Note:} if you use \ics{newacronym} (see \sectionref{sec:acronyms}) the type is set as @@ -2446,7 +3111,7 @@ and do: \item Temporarily change \cs{acronymtype} to the target glossary: \begin{verbatim} \let\orgacronymtype\acronymtype -\def\acronymtype{altacronym} +\renewcommand{\acronymtype}{altacronym} \loadglsentries{myacronyms} \let\acronymtype\orgacronymtype \end{verbatim} @@ -2473,7 +3138,7 @@ Note that no check is performed to determine the existence of the target glossary. This means that you can, for example, move an entry to an undefined glossary so you can use the entry in the document text but not have it listed in any of the glossaries. -(Maybe you have an acronym so common it doesn't need listing.) +(Maybe you have an acronym that is so common it doesn't need listing.) \begin{important} If you move an entry to an undefined glossary and you have @@ -2486,6 +3151,68 @@ results may occur if you move an entry to a different glossary from its parent or children. \end{important} +\section{Drawbacks With Defining Entries in the Document Environment} +\label{sec:docdefs} + +Originally, \ics{newglossaryentry} (and \ics{newacronym}) could only be +used in the preamble. I reluctantly removed this restriction in version 1.13, +but there are issues with defining commands in the \env{document} +environment instead of the preamble. + +\subsection{Technical Issues} +\label{sec:techissues} + +\begin{enumerate} + \item If you define an entry mid-way through your document, but +subsequently shuffle sections around, you could end up using an +entry before it has been defined. + + \item Entry information is required when the glossary is displayed +using \ics{printglossary} or \ics{printglossaries}. When either of these +commands occur at the start of the document, the entry details are +being looked up before the entry has been defined. +\end{enumerate} + +To overcome these problems, \sty{glossaries} v4.0 modifies the +definition of \cs{newglossaryentry} at the beginning of the +\env{document} environment so that the definitions are written to an +external file (\cs{jobname}.\texttt{glsdefs}) which is then read in +at the start of the document on the next run. The entry will then +only be defined if it doesn't already exist. This means that the +entry can now be looked up in the glossary, even if the glossary +occurs at the beginning of the document. + +There are drawbacks to this mechanism: if you modify an entry +definition, you need a second run to see the effect of your +modification; this method requires an extra \cs{newwrite}, which may exceed +\TeX's maximum allocation; if you have very long entries, you could +find unexpected line breaks have been written to the temporary file. + +The last reason is why \ics{longnewglossaryentry} has the +preamble-only restriction, which I don't intend to lift. + +\subsection{Good Practice Issues} +\label{sec:goodpractice} + +The above section covers technical issues that can cause your document to have +compilation errors or produce incorrect output. This section +focuses on good writing practice. The main reason cited by users +wanting to define entries within the \env{document} environment rather +than in the preamble is that they want to write the definition as +they type in their document text. This suggests a \qt{stream of +consciousness} style of writing that may be acceptable in certain +literary genres but is inappropriate for factual documents. + +When you write technical documents, regardless of whether it's a PhD +thesis or an article for a~journal or proceedings, you must plan what you write +in advance. If you plan in advance, you should have a fairly good +idea of the type of terminology that your document will contain, +so while you are planning, create a new file with all your entry +definitions. If while you're writing your document, you remember +another term you need, then you can switch over to your definition file and +add it. Most text editors have the ability to have more than one +file open at a time. + \chapter{Number lists} \label{sec:numberlists} @@ -2496,8 +3223,7 @@ been used (using any of the commands described in list can be suppressed using the \pkgopt{nonumberlist} package option, or an alternative counter can be set as the default using the \pkgopt{counter} package option. The number list is also -referred to as the location list\index{location list|see{number -list}}. +referred to as the location list\index{location list|see{number list}}. Both \gls{makeindex} and \gls{xindy} concatenate a sequence of 3 or more consecutive pages into a range. With @@ -2572,7 +3298,7 @@ The above warning is particularly important if you are using the \styfmt{glossaries} package in conjunction with the \sty{hyperref} package. Instead, use one of the commands listed in \sectionref{sec:glsnolink} (such as \ics{glsentrytext}) or provide an -alternative via the optional argument to the sectioning/caption +alternative via the optional argument to the sectioning\slash caption command. Examples: \begin{verbatim} \chapter{An overview of \glsentrytext{perl}} @@ -2587,6 +3313,21 @@ hyperlinked term, such as \gls{linktext}, you can click on the word or phrase and it will take you to a brief description in this document's glossary. +\begin{important} +If you use the \sty{hyperref} package, I strongly recommend you use +\app{pdflatex} rather than \app{latex} to compile your document, if +possible. The DVI format of \LaTeX\ has limitations with the +hyperlinks that can cause a problem when used with the +\sty{glossaries} package. Firstly, the DVI format can't break a +hyperlink across a line whereas PDF\LaTeX\ can. This means that long +glossary entries (for example, the full form of an acronym) won't be +able to break across a line with the DVI format. Secondly, the DVI +format doesn't correctly size hyperlinks in subscripts or +superscripts. This means that if you define a term that may be used +as a subscript or superscript, if you use the DVI format, it won't +come out the correct size. +\end{important} + It may be that you only want terms in a certain glossary to have links, but not for another glossary. In which case, you can use the package option \pkgopt{nohypertypes} to identify the glossary lists @@ -2770,7 +3511,7 @@ that either has been listed in the package option \ics{GlsDeclareNoHyperList} in which case the default is \texttt{hyper=false}. -\item[\gloskey{glslink}{local}] This is a boolean key that only +\item[{\gloskey[glslink]{local}}] This is a boolean key that only makes a different when used with commands that change the entry's \gls{firstuseflag} (such as \ics{gls}). If \texttt{local=true}, the change to the \gls*{firstuseflag} will be @@ -2899,6 +3640,12 @@ There are also analogous commands: As before, these commands also have a starred version that disable the hyperlink. +\begin{important} +When used with acronyms, these commands don't use \ics{acronymfont}. +For example, if you use the \pkgopt{smallcaps} package option, +\cs{gls} will use small caps but \cs{glstext} won't. +\end{important} + The command: \begin{definition}[\DescribeMacro{\glsfirst}] \cs{glsfirst}\oarg{options}\marg{label}\oarg{insert} @@ -2937,6 +3684,12 @@ There are also analogous commands: As before, these commands also have a starred version that disable the hyperlink. +\begin{important} +When used with acronyms, these commands don't use \ics{acronymfont}. +For example, if you use the \pkgopt{smallcaps} package option, +\cs{glspl} will use small caps but \cs{glsplural} won't. +\end{important} + The command: \begin{definition}[\DescribeMacro{\glsfirstplural}] \cs{glsfirstplural}\oarg{options}\marg{label}\oarg{insert} @@ -2963,10 +3716,7 @@ The command: is similar to \ics{glstext} except that it always uses the value of the \gloskey{name} key. Again, \meta{insert} is always appended to the end of the link text and does not mark the entry as having been -used. Note: if you want to use this command and the \gloskey{name} -key contains commands, you will have to disable the -\glsation{sanitize} of the \gloskey{name} key and -protect fragile commands. +used. There are also analogous commands: \begin{definition}[\DescribeMacro{\Glsname}] @@ -2985,10 +3735,7 @@ The command: is similar to \ics{glstext} except that it always uses the value of the \gloskey{symbol} key. Again, \meta{insert} is always appended to the end of the link text and does not mark the entry as having been -used. Note: if you want to use this command and the \gloskey{symbol} -key contains commands, you will have to disable the -\glsation{sanitize} of the \gloskey{symbol} key and -protect fragile commands. +used. There are also analogous commands: \begin{definition}[\DescribeMacro{\Glssymbol}] @@ -3007,10 +3754,7 @@ The command: is similar to \ics{glstext} except that it always uses the value of the \gloskey{description} key. Again, \meta{insert} is always appended to the end of the link text and does not mark the entry as -having been used. Note: if you want to use this command and the -\gloskey{description} key contains commands, you will have to -disable the \glsation{sanitize} of the -\gloskey{description} key and protect fragile commands. +having been used. There are also analogous commands: \begin{definition}[\DescribeMacro{\Glsdesc}] @@ -3090,60 +3834,67 @@ the hyperlink. Similarly for the other user keys: \label{sec:glsdisplay} The format of the \gls{linktext} for \ics{gls}, \ics{glspl} -and their uppercase variants is governed by two commands: -\begin{definition}[\DescribeMacro{\glsdisplayfirst}] -\cs{glsdisplayfirst}\marg{first/first plural}\marg{description}\marg{symbol}\marg{insert} -\end{definition} -which is used the -\glslink{firstuse}{first time} a glossary entry is used in the text and -\begin{definition}[\DescribeMacro{\glsdisplay}] -\cs{glsdisplay}\marg{text/plural}\marg{description}\marg{symbol}\marg{insert} -\end{definition} -which is used subsequently. -Both commands take four arguments: the first is either the singular or -plural form given by the \gloskey{text}, \gloskey{plural}, -\gloskey{first} or \gloskey{firstplural} keys (set when the term was -defined) depending on context; the second argument is the term's -description (as supplied by the \gloskey{description} or -\gloskey{descriptionplural} keys); the third -argument is the symbol associated with the term (as supplied by the -\gloskey{symbol} or \gloskey{symbolplural} keys) and the fourth argument is the additional text -supplied in the final optional argument to \ics{gls} or -\ics{glspl} (or their uppercase variants). The default definitions -of \cs{glsdisplay} and \cs{glsdisplayfirst} simply -print the first argument immediately followed by the fourth argument. -The remaining arguments are ignored. - -\begin{important} -Care needs to be taken when redefining \cs{glsdisplay} and -\cs{glsdisplayfirst} as commands like \ics{Gls} will expand the -displayed text before applying \ics{makefirstuc}. If you want to use -formatting commands, it's best to define a robust version that deals -with all the formatting. For example, suppose you want -the text to appear in bold italic, it's best to do something like: -\begin{verbatim} -\DeclareRobustCommand{\textbfit}[1]{\emph{\bfseries -#1}} -\renewcommand{\glsdisplay}[4]{\textbfit{#1#4}} -\end{verbatim} -See the \sty{mfirstuc} documentation for further details on the -limitations of \ics{makefirstuc}. -\end{important} +and their uppercase variants and also for \ics{glsdisp} is governed +by\footnote{\ics{glsdisplayfirst} and \ics{glsdisplay} are now +deprecated. Backwards compatibility should be preserved but +you may need to use the \pkgopt{compatible-3.07} option}: +\begin{definition}[\DescribeMacro{\glsentryfmt}] +\cs{glsentryfmt} +\end{definition} +If you want to redefine this command, you may use the following +commands within its definition: -If required, you can access the label for the given entry via \begin{definition}[\DescribeMacro{\glslabel}] \cs{glslabel} \end{definition} -so it is possible to use this label in the definition of -\cs{glsdisplay} or \cs{glsdisplayfirst} to supply additional -information using any of the commands described in -\sectionref{sec:glsnolink}, if required. +This is the label of the entry being referenced. + +\begin{definition}[\DescribeMacro{\glscustomtext}] +\cs{glscustomtext} +\end{definition} +This is the custom text supplied in \cs{glsdisp}. It's always empty +for \ics{gls}, \ics{glspl} and their uppercase variants. (You can +use \sty{etoolbox}'s \cs{ifdefempty} to determine if +\cs{glscustomtext} is empty.) + +\begin{definition}[\DescribeMacro{\glsinsert}] +\cs{glsinsert} +\end{definition} +The custom text supplied in the final optional argument to \cs{gls}, +\cs{glspl} and their uppercase variants. + +\begin{definition}[\DescribeMacro{\glsifplural}] +\cs{glsifplural}\marg{true text}\marg{false text} +\end{definition} +If \cs{glspl}, \cs{Glspl} or \cs{GLSpl} was used, this command does +\meta{true text} otherwise it does \meta{false text}. + +\begin{definition}[\DescribeMacro{\glscapscase}] +\cs{glscapscase}\marg{no case}\marg{first uc}\marg{all caps} +\end{definition} +If \cs{gls}, \cs{glspl} or \cs{glsdisp} were used, this does \meta{no +case}. If \cs{Gls} or \cs{Glspl} were used, this does \meta{first +uc}. If \cs{GLS} or \cs{GLSpl} were used, this does \meta{all caps}. -Note that \cs{glsdisplay} and \cs{glsdisplayfirst} are not used -by \ics{glslink}. If you want to supply your own link text, you -need to use \ics{glsdisp} instead. +Note that you can also use commands such as \ics{ifglsused} within +the definition of \cs{glsentryfmt} (see \sectionref{sec:glsunset}). -For example, suppose you want a glossary of measurements and +If you only want to make minor modifications to \cs{glsentryfmt}, +you can use +\begin{definition}[\DescribeMacro{\glsgenentryfmt}] +\cs{glsgenentryfmt} +\end{definition} +This uses the above commands to display just the \gloskey{first}, +\gloskey{text}, \gloskey{plural} or \gloskey{firstplural} keys +(or the custom text) with the insert text appended. + +\begin{important} +Note that \cs{glsentryfmt} is not used by \ics{glslink} or any of +the other commands, such as \ics{glstext}. +\end{important} + +\begin{example}{Custom Entry Display in Text}{ex:customfmt} +Suppose you want a glossary of measurements and units, you can use the \gloskey{symbol} key to store the unit: \begin{verbatim} \newglossaryentry{distance}{name=distance, @@ -3152,54 +3903,52 @@ symbol={km}} \end{verbatim} and now suppose you want \verb|\gls{distance}| to produce \qt{distance (km)} on \firstuse, then you can redefine -\cs{glsdisplayfirst} as follows: +\ics{glsentryfmt} as follows: \begin{verbatim} -\renewcommand{\glsdisplayfirst}[4]{#1#4 (#3)} +\renewcommand*{\glsentryfmt}{% + \glsgenentryfmt + \ifglsused{\glslabel}{}{\space (\glsentrysymbol{\glslabel})}% +} \end{verbatim} -Note that the additional text is placed after \verb|#1|, so -\verb|\gls{distance}['s]| will produce \qt{distance's (km)} -rather than \qt{distance (km)'s} which looks a bit odd (even though -it may be in the context of \qt{the distance (km) is measured between -the two points} --- but in this instance it would be better not to -use a contraction). + +(Note that I've used \ics{glsentrysymbol} rather than \ics{glssymbol} +to avoid nested hyperlinks.) Note also that all of the \gls{linktext} will be formatted according to \ics{glstextformat} (described earlier). So if you do, say: \begin{verbatim} \renewcommand{\glstextformat}[1]{\textbf{#1}} -\renewcommand{\glsdisplayfirst}[4]{#1#4 (#3)} +\renewcommand*{\glsentryfmt}{% + \glsgenentryfmt + \ifglsused{\glslabel}{}{\space(\glsentrysymbol{\glslabel})}% +} \end{verbatim} then \verb|\gls{distance}| will produce \qt{\textbf{distance (km)}}. -If you have multiple glossaries, changing \cs{glsdisplayfirst} and -\cs{glsdisplay} will change the way entries for all of the -glossaries appear when using the commands \ics{gls}, \ics{glspl}, their -uppercase variants and \ics{glsdisp}. If you only +For a complete document, see the sample file \samplefile{-entryfmt}. +\end{example} + +If you have multiple glossaries, changing \cs{glsentryfmt} will change the +way entries for all of the glossaries appear when using the commands +\ics{gls}, \ics{glspl}, their uppercase variants and \ics{glsdisp}. +If you only want the change to affect entries for a given glossary, then you need to use -\begin{definition}[\DescribeMacro{\defglsdisplay}] -\cs{defglsdisplay}\oarg{type}\marg{definition} -\end{definition} -and -\begin{definition}[\DescribeMacro{\defglsdisplayfirst}] -\cs{defglsdisplayfirst}\oarg{type}\marg{definition} +\begin{definition}[\DescribeMacro{\defglsentryfmt}] +\cs{defglsentryfmt}\oarg{type}\marg{definition} \end{definition} -instead of redefining \cs{glsdisplay} and \cs{glsdisplayfirst}. +instead of redefining \cs{glsentryfmt}. The optional first argument +\meta{type} is the glossary type. This defaults to +\ics{glsdefaulttype} if omitted. The second argument is the +entry format definition. -Both \cs{defglsdisplay} and \cs{defglsdisplayfirst} take two arguments: -the first (which is optional) is the glossary's label\footnote{\texttt{main} for the main -(default) glossary, \cs{acronymtype} for the list of acronyms, or the -name supplied in the first mandatory argument to \cs{newglossary} for -additional glossaries.} and the second is how the term should be -displayed when it is invoked using commands \cs{gls}, -\cs{glspl}, their uppercase variants and \cs{glsdisp}. This is similar to the way \cs{glsdisplayfirst} was -redefined above. - -For example, suppose you have created a new glossary called +\begin{example}{Custom Format for Particular Glossary}{ex:defglsentryfmt} +Suppose you have created a new glossary called \texttt{notation} and you want to change the way the entry is displayed on \firstuse\ so that it includes the symbol, you can do: \begin{verbatim} -\defglsdisplayfirst[notation]{#1#4 (denoted #3)} +\defglsentryfmt[notation]{\glsgenentryfmt + \ifglsused{\glslabel}{}{\space(denoted \glsentrysymbol{\glslabel})}} \end{verbatim} Now suppose you have defined an entry as follows: \begin{verbatim} @@ -3211,13 +3960,11 @@ Now suppose you have defined an entry as follows: \end{verbatim} The \glslink{firstuse}{first time} you reference this entry it will be displayed as: \qt{set (denoted $S$)} (assuming \ics{gls} was used). +\end{example} Remember that if you use the \gloskey{symbol} key, you need to use a glossary style that displays the symbol, as many of the styles -ignore it. In addition, if you want either the description or symbol -to appear in the \gls{linktext}, you will have to disable the -\glsation{sanitize} of these keys and protect fragile -commands. +ignore it. \section{Enabling and disabling hyperlinks to glossary entries} \label{sec:disablehyperlinks} @@ -3244,6 +3991,90 @@ option \pkgopt[false]{hyperfirst}. Note that this option only affects commands that recognise the \firstuseflag, for example \ics{gls}, \ics{glspl} and \ics{glsdisp} but not \ics{glslink}. +\begin{example}{First Use With Hyperlinked Footnote Description}{ex:hyperdesc} +Suppose I want the \gls*{firstuse} to have a hyperlink to the +description in a footnote instead of hyperlinking to the relevant +place in the glossary. First I need to disable the hyperlinks on +first use via the package option \pkgopt[false]{hyperfirst}: +\begin{verbatim} +\usepackage[hyperfirst=false]{glossaries} +\end{verbatim} +Now I need to redefine \ics{glsentryfmt} (see +\sectionref{sec:glsdisplay}): +\begin{verbatim} +\renewcommand*{\glsentryfmt}{% + \glsgenentryfmt + \ifglsused{\glslabel}{}{\footnote{\glsentrydesc{\glslabel}}}% +} +\end{verbatim} + +Now the first use won't have hyperlinked text, but will be followed +by a footnote. +See the sample file \samplefile{-FnDesc} for a complete document. +\end{example} + +Note that the \pkgopt{hyperfirst} option applies to all defined glossaries. It +may be that you only want to disable the hyperlinks on +\gls{firstuse} for glossaries that have a different form on +\gls*{firstuse}. This can be achieved by noting that since the +entries that require hyperlinking for all instances have identical +first and subsequent text, they can be unset via \ics{glsunsetall} +(see \sectionref{sec:glsunset}) so that the \pkgopt{hyperfirst} +option doesn't get applied. + +\begin{example}{Suppressing Hyperlinks on First Use Just For +Acronyms}{ex:hyperfirst} +Suppose I want to suppress the hyperlink on \gls{firstuse} for +acronyms but not for entries in the main glossary. I~can load +the \styfmt{glossaries} package using: +\begin{verbatim} +\usepackage[hyperfirst=false,acronym]{glossaries} +\end{verbatim} +Once all glossary entries have been defined I~then do: +\begin{verbatim} +\glsunsetall[main] +\end{verbatim} + +\end{example} + +For more complex requirements, you might find it easier to switch +off all hyperlinks via \ics{glsdisablehyper} and put the hyperlinks +(where required) within the definition of \ics{glsentryfmt} (see +\sectionref{sec:glsdisplay}) via \ics{glshyperlink} (see +\sectionref{sec:glsnolink}). + +\begin{example}{Only Hyperlink in Text Mode Not Math +Mode}{ex:nomathhyper} +This is a bit of a contrived example, but suppose, for some reason, +I only want commands like \ics{gls} and \ics{glsdisp} to have +hyperlinks when used in text mode, but not in math mode. I~can do +this by disabling all hyperlinks and redefining \ics{glsentryfmt}: +\begin{verbatim} +\glsdisablehyper +\renewcommand*{\glsentryfmt}{% + \ifmmode + \glsgenentryfmt + \else + % Temporarily enable hyperlinks: + \glsenablehyper + \glshyperlink[\glsgenentryfmt]{\glslabel}% + % Disable hyperlinks again + \glsdisablehyper + \fi +} +\end{verbatim} +To ensure the target exists, the hyperlinks must be enabled again +when the glossary is displayed: +\begin{verbatim} +\renewcommand{\glossarypreamble}{\glsenablehyper} +\renewcommand{\glossarypostamble}{\glsdisablehyper} +\end{verbatim} +(The redefinition of \ics{glossarypostamble} is only necessary if +the glossary is displayed at the start of the document instead of at +the end.) +See the sample file \samplefile{-nomathhyper} for a complete +document. +\end{example} \chapter{Adding an Entry to the Glossary Without Generating Text} \label{sec:glsadd} @@ -3283,13 +4114,24 @@ do: \begin{important} Note that \cs{glsadd} and \cs{glsaddall} add the current location to -the number list. In the case of \cs{glsaddall}, all entries in the +the \gls{numberlist}. In the case of \cs{glsaddall}, all entries in the glossary will have the same location in the number list. If you want to use \cs{glsaddall}, it's best to suppress the number list with the \pkgopt{nonumberlist} package option. (See sections~\ref{sec:pkgopts-printglos} and~\ref{sec:numberlists}.) \end{important} +There is now a variation of \cs{glsaddall} that skips any entries +that have already been used: +\begin{definition}[\DescribeMacro\glsaddallunused] +\cs{glsaddallunused}\oarg{list} +\end{definition} +This command uses \cs{glsadd}\texttt{[format=@gobble]} which will +ignore this location in the number list. The optional argument +\meta{list} is a comma-separated list of glossary types. If omitted, +it defaults to the list of all defined glossaries. + +\begin{example}{Dual Entries}{ex:dual} The sample file \samplefile{-dual} makes use of \cs{glsadd} to allow for an entry that should appear both in the main glossary and in the list of acronyms. This example sets up the list of acronyms @@ -3302,11 +4144,11 @@ entries: \begin{verbatim} \newcommand*{\newdualentry}[5][]{% \newglossaryentry{main-#2}{name={#4},% - text={#3\protect\glsadd{#2}},% + text={#3\glsadd{#2}},% description={#5},% #1 }% - \newacronym{#2}{#3\protect\glsadd{main-#2}}{#4} + \newacronym{#2}{#3\glsadd{main-#2}}{#4}% } \end{verbatim} This has the following syntax: @@ -3322,6 +4164,7 @@ You can then define a new dual entry: \end{verbatim} Now you can reference the acronym with \verb|\gls{svm}| or you can reference the entry in the main glossary with \verb|\gls{main-svm}|. +\end{example} \chapter{Cross-Referencing Entries} \label{sec:crossref} @@ -3354,17 +4197,6 @@ makeglossaries filename latex filename \end{verbatim} -\begin{important} -If you switch off the description -\glsation{sanitize}, you must protect fragile -commands:\footnote{As from v3.01, \ics{gls} is no longer fragile.} -\begin{verbatim} -\newglossaryentry{apple}{name=apple, -description={firm, round fruit. See also -\protect\gls{pear}}} -\end{verbatim} -\end{important} - \item As described in \sectionref{sec:newglosentry}, you can use the \gloskey{see} key when you define the entry. For example: \begin{verbatim} @@ -3469,8 +4301,8 @@ is displayed using: \cs{glsseeitemformat}\marg{label} \end{definition} This defaults to \ics{glsentrytext}\marg{label}.\footnote{In -versions before 3.0, \cs{glsentryname} was used, but this can cause -problems when the \gloskey{name} key is \glsd{sanitize}.} For example, to +versions before 3.0, \cs{glsentryname} was used, but this could cause +problems when the \gloskey{name} key was \glsd{sanitize}.} For example, to make the cross-referenced list use small caps: \begin{verbatim} \renewcommand{\glsseeitemformat}[1]{% @@ -3497,6 +4329,15 @@ adding any information to the glossary. They don't use \ics{glstextformat}, they don't have any optional arguments, they don't affect the \firstuseflag\ and, apart from \ics{glshyperlink}, they don't produce hyperlinks. + +\begin{important} +Commands that aren't expandable will be ignored by PDF bookmarks, so +you will need to provide an alternative via \sty{hyperref}'s +\cs{texorpdfstring} if you want to use them in sectioning commands. +(This isn't specific to the \styfmt{glossaries} package.) See the +\sty{hyperref} documentation for further details. +\end{important} + \begin{definition}[\DescribeMacro{\glsentryname}] \cs{glsentryname}\marg{label} \end{definition} @@ -3506,6 +4347,28 @@ they don't produce hyperlinks. These commands display the name of the glossary entry given by \meta{label}, as specified by the \gloskey{name} key. \cs{Glsentryname} makes the first letter uppercase. +Neither of these commands check for the existence of \meta{label}. +The first form \cs{glsentryname} is expandable (unless the name +contains unexpandable commands). + +\begin{definition}[\DescribeMacro{\glossentryname}] +\cs{glossentryname}\marg{label} +\end{definition} +This is like \cs{glsnamefont}\{\cs{glsentryname\marg{label}}\} +but also checks for the existence of \meta{label}. This command is +not expandable. It's used in the predefined glossary styles, so if +you want to change the way the name is formatted in the glossary, +you can redefine \cs{glsnamefont} to use the required fonts. For +example: +\begin{verbatim} +\renewcommand*{\glsnamefont}[1]{\textmd{\sffamily #1}} +\end{verbatim} +\begin{definition}[\DescribeMacro{\Glossentryname}] +\cs{Glossentryname}\marg{label} +\end{definition} +This is like \cs{glossentryname} but makes the first letter of the +name uppercase. + \begin{definition}[\DescribeMacro{\glsentrytext}] \cs{glsentrytext}\marg{label} \end{definition} @@ -3515,6 +4378,10 @@ These commands display the name of the glossary entry given by These commands display the subsequent use text for the glossary entry given by \meta{label}, as specified by the \gloskey{text} key. \cs{Glsentrytext} makes the first letter uppercase. +The first form is expandable (unless the text contains unexpandable +commands). The second form is not expandable. Neither checks for the +existence of \meta{label}. + \begin{definition}[\DescribeMacro{\glsentryplural}] \cs{glsentryplural}\marg{label} \end{definition} @@ -3525,6 +4392,10 @@ These commands display the subsequent use plural text for the glossary entry given by \meta{label}, as specified by the \gloskey{plural} key. \cs{Glsentryplural} makes the first letter uppercase. +The first form is expandable (unless the value of that key contains unexpandable +commands). The second form is not expandable. Neither checks for the +existence of \meta{label}. + \begin{definition}[\DescribeMacro{\glsentryfirst}] \cs{glsentryfirst}\marg{label} \end{definition} @@ -3534,6 +4405,10 @@ uppercase. These commands display the \firstusetext\ for the glossary entry given by \meta{label}, as specified by the \gloskey{first} key. \cs{Glsentryfirst} makes the first letter uppercase. +The first form is expandable (unless the value of that key contains unexpandable +commands). The second form is not expandable. Neither checks for the +existence of \meta{label}. + \begin{definition}[\DescribeMacro{\glsentryfirstplural}] \cs{glsentryfirstplural}\marg{label} \end{definition} @@ -3544,6 +4419,10 @@ These commands display the plural form of the \firstusetext\ for the glossary entry given by \meta{label}, as specified by the \gloskey{firstplural} key. \cs{Glsentryfirstplural} makes the first letter uppercase. +The first form is expandable (unless the value of that key contains unexpandable +commands). The second form is not expandable. Neither checks for the +existence of \meta{label}. + \begin{definition}[\DescribeMacro{\glsentrydesc}] \cs{glsentrydesc}\marg{label} \end{definition} @@ -3552,6 +4431,23 @@ letter uppercase. \end{definition} These commands display the description for the glossary entry given by \meta{label}. \cs{Glsentrydesc} makes the first letter uppercase. +The first form is expandable (unless the value of that key contains unexpandable +commands). The second form is not expandable. Neither checks for the +existence of \meta{label}. + +\begin{definition}[\DescribeMacro{\glossentrydesc}] +\cs{glossentrydesc}\marg{label} +\end{definition} +This is like \cs{glsentrydesc}\marg{label} +but also checks for the existence of \meta{label}. This command is +not expandable. It's used in the predefined glossary styles to +display the description. +\begin{definition}[\DescribeMacro{\Glossentrydesc}] +\cs{Glossentrydesc}\marg{label} +\end{definition} +This is like \cs{glossentrydesc} but converts the first letter to +uppercase. This command is not expandable. + \begin{definition}[\DescribeMacro{\glsentrydescplural}] \cs{glsentrydescplural}\marg{label} \end{definition} @@ -3561,6 +4457,11 @@ by \meta{label}. \cs{Glsentrydesc} makes the first letter uppercase. These commands display the plural description for the glossary entry given by \meta{label}. \cs{Glsentrydescplural} makes the first letter uppercase. +The first form is expandable (unless the value of that key contains unexpandable +commands). The second form is not expandable. Neither checks for the +existence of \meta{label}. + + \begin{definition}[\DescribeMacro{\glsentrysymbol}] \cs{glsentrysymbol}\marg{label} \end{definition} @@ -3569,6 +4470,23 @@ letter uppercase. \end{definition} These commands display the symbol for the glossary entry given by \meta{label}. \cs{Glsentrysymbol} makes the first letter uppercase. +The first form is expandable (unless the value of that key contains unexpandable +commands). The second form is not expandable. Neither checks for the +existence of \meta{label}. + +\begin{definition}[\DescribeMacro{\glossentrysymbol}] +\cs{glossentrysymbol}\marg{label} +\end{definition} +This is like \cs{glsentrysymbol}\marg{label} +but also checks for the existence of \meta{label}. This command is +not expandable. It's used in the predefined glossary styles to +display the symbol. +\begin{definition}[\DescribeMacro{\Glossentrysymbol}] +\cs{Glossentrysymbol}\marg{label} +\end{definition} +This is like \cs{glossentrysymbol} but converts the first letter to +uppercase. This command is not expandable. + \begin{definition}[\DescribeMacro{\glsentrysymbolplural}] \cs{glsentrysymbolplural}\marg{label} \end{definition} @@ -3578,6 +4496,10 @@ These commands display the symbol for the glossary entry given by These commands display the plural symbol for the glossary entry given by \meta{label}. \cs{Glsentrysymbolplural} makes the first letter uppercase. +The first form is expandable (unless the value of that key contains unexpandable +commands). The second form is not expandable. Neither checks for the +existence of \meta{label}. + \begin{definition}[\DescribeMacro{\glsentryuseri}] \cs{glsentryuseri}\marg{label} \end{definition} @@ -3616,6 +4538,12 @@ letter uppercase. \end{definition} These commands display the value of the user keys for the glossary entry given by \meta{label}. +The lower case forms are expandable (unless the value of the key +contains unexpandable commands). The commands beginning with an +uppercase letter convert the first letter of the required value to +uppercase and are not expandable. None of these commands check for +the existence of \meta{label}. + \begin{definition}[\DescribeMacro{\glshyperlink}] \cs{glshyperlink}\oarg{link text}\marg{label} \end{definition} @@ -3623,8 +4551,8 @@ This command provides a hyperlink to the glossary entry given by \meta{label} \textbf{but does not add any information to the glossary file}. The link text is given by \ics{glsentrytext}\marg{label} by default\footnote{versions before -3.0 used \ics{glsentryname} as the default, but this can cause -problems when \gloskey{name} has been \glsd{sanitize}.}, but can be +3.0 used \ics{glsentryname} as the default, but this could cause +problems when \gloskey{name} had been \glsd{sanitize}.}, but can be overridden using the optional argument. \begin{important} If you use \cs{glshyperlink}, you need to ensure that the relevant @@ -3682,7 +4610,7 @@ used the Perl script \gls{makeglossaries} or have directly used \gls{makeindex} or \gls{xindy} (as described in \sectionref{sec:makeglossaries}). If the glossary still does not appear after you re-\LaTeX\ your document, check the -\gls*{makeindex}/\gls*{xindy} log files to see if there is a problem. +\gls*{makeindex}\slash\gls*{xindy} log files to see if there is a problem. Remember that you also need to use the command \ics{makeglossaries} in the preamble to enable the glossaries. @@ -3733,9 +4661,12 @@ By default, the glossary is started either by \ics{chapter*} or by This can be overridden by the \pkgopt{section} package option or the \linebreak\ics{setglossarysection} command. Numbered sectional units can be obtained using the \pkgopt{numberedsection} package option. Each -glossary sets the page header via the command \ics{glossarymark}. If -this mechanism is unsuitable for your chosen class file or page -style package, you will need to redefine \ics{glossarymark}. Further +glossary sets the page header via the command +\begin{definition}[\DescribeMacro\glsglossarymark] +\ics{glsglossarymark}\marg{title} +\end{definition} +If this mechanism is unsuitable for your chosen class file or page +style package, you will need to redefine \ics{glsglossarymark}. Further information about these options and commands is given in \sectionref{sec:pkgopts-sec}. @@ -3766,13 +4697,14 @@ indicate primary definitions.} This will print the given preamble text for the main glossary, but not have any preamble text for any other glossaries. -There is an analogous command called +There is an analogous command to \cs{glossarypreamble} called \begin{definition}[\DescribeMacro{\glossarypostamble}] \cs{glossarypostamble} \end{definition} which is placed at the end of each glossary. -For example: suppose you are using the \glostyle{superheaderborder} +\begin{example}{Switch to Two Column Mode for Glossary}{ex:twocolumn} +Suppose you are using the \glostyle{superheaderborder} style\footnote{you can't use the \glostyle{longheaderborder} style for this example as you can't use the \env{longtable} environment in two column mode.}, and you want the glossary to be in two columns, @@ -3782,12 +4714,14 @@ you could do: \renewcommand*{\glossarysection}[2][]{% \twocolumn[{\chapter*{#2}}]% \setlength\glsdescwidth{0.6\linewidth}% - \glossarymark{\glossarytoctitle}% + \glsglossarymark{\glossarytoctitle}% } \renewcommand*{\glossarypostamble}{\onecolumn} \end{verbatim} +\end{example} + Within each glossary, each entry name is formatted according to \begin{definition}[\DescribeMacro{\glsnamefont}] \cs{glsnamefont}\marg{name} @@ -3804,12 +4738,14 @@ will appear in the normal font. The hierarchical glossary styles (defined in the \sty{glossary-tree} style file) also set the name in bold. -For example, suppose you want all the entry names to appear in -medium weight small caps, then you can do: +\begin{example}{Changing the Font Used to Display Entry Names in the +Glossary}{ex:glsnamefont} +Suppose you want all the entry names to appear in +medium weight small caps in your glossaries, then you can do: \begin{verbatim} \renewcommand{\glsnamefont}[1]{\textsc{\mdseries #1}} \end{verbatim} - +\end{example} \chapter{Xindy} \label{sec:xindy} @@ -3856,7 +4792,10 @@ available through the \LaTeX\ commands provided by the style file. In which case, you must use \ics{noist} to prevent the style file from being overwritten by the \styfmt{glossaries} package. For additional information about \gls*{xindy}, read the -\gls*{xindy} documentation. +\gls*{xindy} documentation. I'm sorry I can't provide any assistance +with writing \gls*{xindy} style files. If you need help, I recommend +you ask on the \gls*{xindy} mailing list +(\url{http://xindy.sourceforge.net/mailing-list.html}). \section{Language and Encodings} \label{sec:langenc} @@ -3866,10 +4805,10 @@ and encoding used (unless you have written your own custom \gls*{xindy} style file that defines the relevant alphabet and sort rules). If you use \gls{makeglossaries}, this information is obtained from the document's auxiliary -(\filetype{.aux}) file. The \styfmt{glossaries} package attempts to -find the root language, but in the event that it gets it wrong or if -\gls*{xindy} doesn't support that language, then you can -specify the language using: +(\filetype{.aux}) file. The \gls{makeglossaries} script attempts to +find the root language given your document settings, but in the +event that it gets it wrong or if \gls*{xindy} doesn't support +that language, then you can specify the required language using: \begin{definition}[\DescribeMacro{\GlsSetXdyLanguage}] \cs{GlsSetXdyLanguage}\oarg{glossary type}\marg{language} \end{definition} @@ -3941,8 +4880,10 @@ attribute, you need to add it using: \cs{GlsAddXdyAttribute}\marg{name} \end{definition} where \meta{name} is the name of the attribute, as used in -the \gloskey[glslink]{format} key. For example, suppose I want a -bold, italic, hyperlinked location. I first need to define a +the \gloskey[glslink]{format} key. + +\begin{example}{Custom Font for Displaying a Location}{ex:hyperbfit} +Suppose I want a bold, italic, hyperlinked location. I first need to define a command that will do this: \begin{verbatim} \newcommand*{\hyperbfit}[1]{\textit{\hyperbf{#1}}} @@ -3952,6 +4893,13 @@ attribute: \begin{verbatim} \GlsAddXdyAttribute{hyperbfit} \end{verbatim} +Now I can use it in the optional argument of commands like +\ics{gls}: +\begin{verbatim} +Here is a \gls[format=hyperbfit]{sample} entry. +\end{verbatim} +(where \texttt{sample} is the label of the required entry). +\end{example} \begin{important} Note that \cs{GlsAddXdyAttribute} has no effect if \ics{noist} is @@ -3978,8 +4926,9 @@ used or if \ics{makeglossaries} is omitted. \cs{GlsAddXdyLocation} must be used before \ics{makeglossaries}. \end{important} -For example, suppose I decide to use a somewhat eccentric numbering -system for sections that redefines \cs{thesection} as follows: +\begin{example}{Custom Numbering System for Locations}{ex:customloc} +Suppose I decide to use a somewhat eccentric numbering +system for sections where I redefine \cs{thesection} as follows: \begin{verbatim} \renewcommand*{\thesection}{[\thechapter]\arabic{section}} \end{verbatim} @@ -4015,17 +4964,19 @@ zero, it's a good idea to add an extra location to catch this: "arabic-numbers" :sep "]" "arabic-numbers" } \end{verbatim} -The above example is illustrated in the accompanying sample file +This example is illustrated in the sample file \samplefile{xdy2}. +\end{example} -Another example: suppose you want the page numbers written as words -rather than digits and you use the \sty{fmtcount} package to -do this. You can redefine \ics{thepage} as follows: +\begin{example}{Locations as Words not Digits}{ex:fmtcount} +Suppose I want the page numbers written as words +rather than digits and I~use the \sty{fmtcount} package to +do this. I~can redefine \ics{thepage} as follows: \begin{verbatim} \renewcommand*{\thepage}{\Numberstring{page}} \end{verbatim} This gets expanded to \verb|\protect \Numberstringnum |\marg{n} -where \meta{n} is the Arabic page number. This means that you need to +where \meta{n} is the Arabic page number. This means that I~need to define a new location that has that form: \begin{verbatim} \GlsAddXdyLocation{Numberstring}{:sep "\string\protect\space @@ -4036,7 +4987,8 @@ Note that it's necessary to use \cs{space} to indicate that spaces also appear in the format, since, unlike \TeX, \gls{xindy} doesn't ignore spaces after control sequences. -\cs{GlsAddXdyLocation}\marg{name}\marg{definition} will define commands +Note that \cs{GlsAddXdyLocation}\marg{name}\marg{definition} will define +commands in the form: \begin{definition} \cs{glsX}\meta{counter}"X"\meta{name}\marg{Hprefix}\marg{location} \end{definition} @@ -4053,7 +5005,7 @@ uses the default \ics{glsnumberformat} and a custom \cs{hyperbfit} format. A new \gls{xindy} location called \texttt{Numberstring}, as illustrated above, is defined to make the page numbers appear as \qt{One}, \qt{Two}, etc. In order for the location numbers to -hyperlink to the relevant pages, I need to redefine the necessary +hyperlink to the relevant pages, I~need to redefine the necessary \cs{glsX}\meta{counter}"X"\meta{format} commands: \begin{verbatim} \renewcommand{\glsXpageXglsnumberformat}[2]{% @@ -4066,6 +5018,7 @@ hyperlink to the relevant pages, I need to redefine the necessary \newcommand{\linkpagenumber}[3]{\hyperlink{page.#3}{#1#2{#3}}} \end{verbatim} +\end{example} In the \gls{numberlist}, the locations are sorted according to type. The default ordering is: \texttt{roman-page-numbers} (e.g.\ @@ -4112,8 +5065,10 @@ Note that \cs{GlsSetXdyLocationClassOrder} has no effect if If a \gls{numberlist} consists of a sequence of consecutive numbers, the range will be concatenated. The number of consecutive locations that causes a range formation -defaults to 2, but can be changed using: -\begin{definition}[\DescribeMacro{\GlsSetXdyMinRangeLength}] +defaults to 2, but can be changed using:\newpage + +\DescribeMacro{\GlsSetXdyMinRangeLength} +\begin{definition} \cs{GlsSetXdyMinRangeLength}\marg{n} \end{definition} For example: @@ -4124,7 +5079,7 @@ The argument may also be the keyword \texttt{none}, to indicate that there should be no range formations. See the \gls{xindy} manual for further details on range formations. -\begin{important} +\begin{important}\raggedright Note that \cs{GlsSetXdyMinRangeLength} has no effect if \ics{noist} is used or if \ics{makeglossaries} is omitted. \cs{GlsSetXdyMinRangeLength} must be used before @@ -4163,7 +5118,6 @@ Note that \cs{GlsSetXdyFirstLetterAfterDigits} has no effect if \ics{makeglossaries}.\par \end{important} - \chapter{Defining New Glossaries} \label{sec:newglossary} @@ -4202,15 +5156,27 @@ the main glossary as your list of acronyms, you need to declare it as a list of acronyms using the package option \pkgopt{acronymlists}. +The \pkgopt{symbols} package option creates a new glossary with the +label \texttt{symbols} using: +\begin{verbatim} +\newglossary[slg]{symbols}{sls}{slo}{\glssymbolsgroupname} +\end{verbatim} +and the \pkgopt{numbers} package option creates a new glossary with +the label \texttt{numbers} using: +\begin{verbatim} +\newglossary[nlg]{numbers}{nls}{nlo}{\glsnumbersgroupname} +\end{verbatim} + \begin{important} All glossaries must be defined before \ics{makeglossaries} to ensure that the relevant output files are opened. See \sectionref{sec:fixednames} if you want to redefine \cs{glossaryname}, especially if you are using \sty{babel} or \sty{translator}. +(Similarly for \cs{glssymbolsgroupname} and +\cs{glsnumbersgroupname}.) \end{important} - \chapter{Acronyms} \label{sec:acronyms} @@ -4220,15 +5186,14 @@ term is \glsd{firstuse} in the document. This provides a useful means to define acronyms. For convenience, the \styfmt{glossaries} package defines the command: \begin{definition}[\DescribeMacro{\newacronym}] -\cs{newacronym}\oarg{key-val -list}\marg{label}\marg{abbrv}\marg{long} +\cs{newacronym}\oarg{key-val list}\marg{label}\marg{abbrv}\marg{long} \end{definition} This uses \ics{newglossaryentry} to create an entry with the given label in the glossary given by \ics{acronymtype}. Amongst other things, it sets up the \gloskey{first} and \gloskey{text} keys and, -depending on the acronym style, may also use \ics{defdisplayfirst} -and \ics{defdisplay} (see \sectionref{sec:glsdisplay}). +depending on the acronym style, may also use \ics{defglsentryfmt} +(see \sectionref{sec:glsdisplay}). The optional argument \marg{key-val list} allows you to specify keys such as \gloskey{description} (when used with the @@ -4270,12 +5235,24 @@ characters into small capitals and leaves upper case characters as they are. Therefore, you need to have lower case characters in \meta{abbrv} for this option to have an effect.) +\hypertarget{boldsc}{}% +\begin{important}% +Some fonts don't support bold smallcaps, so you may need to redefine +\ics{glsnamefont} (see \sectionref{sec:printglossary}) to switch to +medium weight if you are using a glossary style that displays entry +names in bold. +\end{important} + \item[\pkgopt{smaller}] This is similar to \pkgopt{smallcaps}, except that \ics{textsmaller} is used instead of \ics{textsc}. Note that the \styfmt{glossaries} package doesn't define \ics{textsmaller} nor does it load any -package that does so. If you use this option, you must make sure +package that does so. + +\begin{important} +If you use this option, you must make sure \ics{textsmaller} is defined (for example by loading \sty{relsize}). +\end{important} \item[\pkgopt{dua}] This option will set both the \gloskey{first} and \gloskey{text} @@ -4288,16 +5265,16 @@ If you want to define your own custom acronym style, see \begin{important} If you try using \ics{newglossaryentry} for entries in a designated list of acronyms in combination with any of the above named package -options you are likely to get unexpected results such as empty +options you may get unexpected results such as empty brackets or empty footnotes. -If you don't intend to use \ics{newacronym} you should skip this section] +If you don't intend to use \ics{newacronym} you should skip this section and not use the above package options. \end{important} As mentioned in \sectionref{sec:pkgopts-sec}, the command \ics{acronymtype} is the name of the glossary in which the acronyms -should appear. If the \pkgopt{acronym} package option has been used, +should appear by default. If the \pkgopt{acronym} package option has been used, this will be \texttt{acronym}, otherwise it will be \texttt{main}. The acronyms can then be used in exactly the same way as any other glossary entry. If you want more than one list of acronyms, you must @@ -4318,7 +5295,8 @@ Since \ics{newacronym} uses \ics{newglossaryentry}, you can use commands like \ics{gls} and \ics{glsreset} as with any other glossary entry. -For example, the following defines the acronym IDN: +\begin{example}{Defining an Acronym}{ex:newacronym} +The following defines the acronym IDN: \begin{verbatim} \newacronym{idn}{IDN}{identification number} \end{verbatim} @@ -4332,6 +5310,7 @@ characters for the shortened form: Now \verb|\gls{idn}| will produce \qt{identification number (\textsc{idn})} on \firstuse\ and \qt{\textsc{IDN}} on subsequent uses. +\end{example} If you use any of the package options \pkgopt{smallcaps}, \pkgopt{smaller}, \pkgopt{description} or \pkgopt{footnote}, the @@ -4362,7 +5341,7 @@ emphasized on subsequent use, do: \end{verbatim} (Note that it is for this reason that the \sty{relsize} package is not automatically loaded when selecting the \pkgopt{smaller} package -option.) +option as it may not actually be required.) There are commands analogous to \ics{glstext} (described in \sectionref{sec:glslink}) that allow you to access just the short @@ -4383,7 +5362,18 @@ also analogous upper case variants: \begin{definition}[\DescribeMacro{\ACRshort}] \cs{ACRshort}\oarg{options}\marg{label}\oarg{insert} \end{definition} +There are also plural versions: +\begin{definition}[\DescribeMacro\acrshortpl] +\cs{acrshortpl}\oarg{options}\marg{label}\oarg{insert} +\end{definition} +\begin{definition}[\DescribeMacro\Acrshortpl] +\cs{Acrshortpl}\oarg{options}\marg{label}\oarg{insert} +\end{definition} +\begin{definition}[\DescribeMacro\ACRshortpl] +\cs{ACRshortpl}\oarg{options}\marg{label}\oarg{insert} +\end{definition} +Similarly for the long form: \begin{definition}[\DescribeMacro{\acrlong}] \cs{acrlong}\oarg{options}\marg{label}\oarg{insert} \end{definition} @@ -4397,21 +5387,51 @@ variants: \begin{definition}[\DescribeMacro{\ACRlong}] \cs{ACRlong}\oarg{options}\marg{label}\oarg{insert} \end{definition} +Again there are also plural versions: +\begin{definition}[\DescribeMacro{\acrlongpl}] +\cs{acrlongpl}\oarg{options}\marg{label}\oarg{insert} +\end{definition} +\begin{definition}[\DescribeMacro{\Acrlongpl}] +\cs{Acrlongpl}\oarg{options}\marg{label}\oarg{insert} +\end{definition} +\begin{definition}[\DescribeMacro{\ACRlongpl}] +\cs{ACRlongpl}\oarg{options}\marg{label}\oarg{insert} +\end{definition} +And for the full form: \begin{definition}[\DescribeMacro{\acrfull}] \cs{acrfull}\oarg{options}\marg{label}\oarg{insert} \end{definition} -This is equivalent to: -\DescribeMacro{\acrfullformat}\cs{acrfullformat}"{"\ics{acrlong}"}{"\ics{acrshort}"}". This defaults to \meta{long} (\ics{acronymfont}\marg{short}) -regardless of the package options. There are also analogous upper -case variants: +regardless of the package options. This format can be changed by +redefining: +\begin{definition}[\DescribeMacro\acrfullformat] +\cs{acrfullformat}\marg{long}\marg{short} +\end{definition} +For example, to change \cs{acrfull} to produce +\cs{acronymfont}\marg{short} (\meta{long}) +you can redefine \cs{acrfullformat} as: +\begin{verbatim} +\renewcommand{\acrfullformat}[2]{#2\space(#1)} +\end{verbatim} + +There are also analogous upper case variants: \begin{definition}[\DescribeMacro{\Acrfull}] \cs{Acrfull}\oarg{options}\marg{label}\oarg{insert} \end{definition} \begin{definition}[\DescribeMacro{\ACRfull}] \cs{ACRfull}\oarg{options}\marg{label}\oarg{insert} \end{definition} +As before there are also plural versions: +\begin{definition}[\DescribeMacro\acrfullpl] +\cs{acrfullpl}\oarg{options}\marg{label}\oarg{insert} +\end{definition} +\begin{definition}[\DescribeMacro\Acrfullpl] +\cs{Acrfullpl}\oarg{options}\marg{label}\oarg{insert} +\end{definition} +\begin{definition}[\DescribeMacro\ACRfullpl] +\cs{ACRfullpl}\oarg{options}\marg{label}\oarg{insert} +\end{definition} If you find the above commands too cumbersome to write, you can use the \pkgopt{shortcuts} package option to activate the shorter @@ -4493,6 +5513,7 @@ using: \begin{definition}[\DescribeMacro{\Glsentryfullpl}] \cs{Glsentryfullpl}\marg{label} \end{definition} +(These also use \ics{acrfullformat}.) \section{Predefined Acronym Styles} \label{sec:predefinedacrstyles} @@ -4500,6 +5521,8 @@ using: Some of the acronym-related package options may be combined. Listed below are the effects of different combinations. If you use an invalid combination, you'll get an error message. +If none of these styles suit your requirements, see +\sectionref{sec:customacronym} to create your own custom style. \begin{description} \item[\pkgopt{description},\pkgopt{footnote}]\ifpdf\mbox{}\par\fi @@ -4577,6 +5600,9 @@ Note that since the acronym is displayed using \ics{textsc}, the short form, \meta{abbrv}, should be specified in lower case. \ifpdf(Recall that "\textsc{abc}" produces \textsc{abc} whereas "\textsc{ABC}" produces \textsc{ABC}.)\fi + +See also the \hyperlink{boldsc}{earlier note} regarding combining +bold and smallcaps. \end{important} \item[\pkgopt{smaller}]\ifpdf\mbox{}\par\fi @@ -4590,7 +5616,7 @@ while subsequent use displays the entry as: \ics{acronymfont}\marg{abbrv}\meta{insert} \end{display} where \ics{acronymfont} is set to -\verb|\textsmaller{#1}|.\footnote{not that this was change from +\verb|\textsmaller{#1}|.\footnote{Note that this was changed from using \ics{smaller} to \ics{textsmaller} as declarations cause a problem for \ics{makefirstuc}.} The entries will be sorted according to the short form. @@ -4620,12 +5646,25 @@ Entries will be sorted according to the short form. The list of acronyms is just like any other type of glossary and can be displayed on its own using -\ics{printglossary}"[type=\acronymtype]" or with all the other -glossaries using \ics{printglossaries}. However, care must be taken -to choose a glossary style that's appropriate to your acronym style. -The different acronym-related package options store different -information in the \gloskey{name}, \gloskey{description} and -\gloskey{symbol} keys. +\begin{alltt} +\ics{printglossary}[type=\ics{acronymtype}] +\end{alltt} +or with all the other +glossaries using \ics{printglossaries}. (If you use the +\pkgopt{acronym} package option you can also use +\begin{alltt} +\ics{printacronyms}\oarg{options} +\end{alltt} +as a synonym for +\begin{alltt} +\ics{printglossary}[type=\ics{acronymtype},\meta{options}] +\end{alltt} +See \sectionref{sec:pkgopts-acronym}.) + +However, care must be taken to choose a glossary style that's +appropriate to your acronym style. The different acronym-related +package options store different information in the \gloskey{name}, +\gloskey{description} and \gloskey{symbol} keys. \Tableref{tab:acronymsettings} lists the package options that govern the acronym styles and how the information is stored in the keys @@ -4642,8 +5681,7 @@ and the symbol field will contain the long form. If I then use the \glostyle{long4col} style, each entry in the list of acronyms will appear in the form: \begin{display} -\ics{acronymfont}\marg{abbrv} \meta{description} \meta{long} -\meta{location list} +\ics{acronymfont}\marg{abbrv} \meta{description} \meta{long} \meta{location list} \end{display} Alternatively, you can define your own custom style (see \sectionref{sec:newglossarystyle} for further details). @@ -4660,15 +5698,15 @@ information is stored} \gloskey{symbol}\\ \pkgopt{description},\pkgopt{footnote} & \ics{acronymfont}\marg{abbrv} & -user supplied & +custom & \meta{long}\\ \pkgopt{description},\pkgopt{dua} & \meta{long} & -user supplied & +custom & \meta{abbrv}\\ \pkgopt{description} & \ics{acrnameformat}\marg{abbrv}\marg{long} & -user supplied & +custom & \meta{abbrv}\\ \pkgopt{footnote} & \ics{acronymfont}\marg{abbrv} & @@ -4717,8 +5755,7 @@ may also be used to set the \gloskey{symbol} or \cs{SetCustomDisplayStyle}\marg{type} \end{definition} This is used to set up the display style for the glossary given by -\meta{type}. This should typically just use \ics{defglsdisplayfirst} -and \ics{defglsdisplay}. +\meta{type}. This should typically just use \ics{defglsentryfmt}. Once you have redefined \cs{CustomAcronymFields} and \linebreak\cs{SetCustomDisplayStyle}, you must then switch to this style using @@ -4733,10 +5770,12 @@ If you omit \cs{SetCustomStyle}, or use it before you redefine \cs{CustomAcronymFields} and \cs{SetCustomDisplayStyle}, your new style won't be correctly implemented. You must set up the custom style before defining new acronyms. The acronyms must be defined using -\ics{newacronym} not \ics{newglossaryentry}. +\ics{newacronym} not \ics{newglossaryentry} if you want to use +acronym styles. \end{important} -As an example, suppose I want my acronym on \gls{firstuse} to have the +\begin{example}{Defining a Custom Acronym Style}{ex:customacrstyle} +Suppose I want my acronym on \gls{firstuse} to have the short form in the text and the long form with the description in a footnote. Suppose also that I want the short form to be put in small caps in the main body of the document, but I want it in normal @@ -4758,17 +5797,19 @@ form: \end{display} First, I need to redefine \ics{CustomAcronymFields} so that -\ics{newacronym} will correctly set the \gloskey{name}, +\linebreak\ics{newacronym} will correctly set the \gloskey{name}, \gloskey{text} and \gloskey{plural} keys. I want the long form to be stored in the \gloskey{name} and the short form to be stored in \gloskey{text}. In addition, I'm going to set the \gloskey{symbol} to the short form in upper case so that it will appear in the list -of acronyms. +of acronyms. (An alternative approach is to define a custom glossary +style that uses \ics{glsentryshort} to access the short form. See +\sectionref{sec:newglossarystyle} for further details). \begin{verbatim} \renewcommand*{\CustomAcronymFields}{% name={\the\glslongtok},% - symbol={\MakeUppercase{\the\glsshorttok}},% + symbol={\MakeTextUppercase{\the\glsshorttok}},% text={\textsc{\the\glsshorttok}},% plural={\textsc{\the\glsshorttok}\noexpand\acrpluralsuffix}% } @@ -4777,33 +5818,19 @@ of acronyms. When using \ics{newacronym}, the short and long forms are stored in the \gloskey{short} and \gloskey{long} keys, and the plural forms are stored in \gloskey{shortplural} and \gloskey{longplural}. -So when I use \ics{defglsdisplayfirst} -and \ics{defglsdisplay}, I can use \ics{glsentrylong} to access +So when I use \ics{defglsentryfmt}, I can use \ics{glsentrylong} to access the long form. Recall from \sectionref{sec:glsdisplay}, that the -optional argument to \ics{defglsdisplayfirst} and \ics{defglsdisplay} -indicates the glossary type. This is passed to -\ics{SetCustomDisplayStyle}. The mandatory argument sets up the -definition of \ics{glsdisplayfirst} and \ics{glsdisplay} for the -given glossary, where the first argument corresponds to the -\gloskey{first}, \gloskey{firstplural}, \gloskey{text} or -\gloskey{plural}, as appropriate, the second argument corresponds to -the \gloskey{description}, the third corresponds to the -\gloskey{symbol} and the fourth argument is the inserted text. - +optional argument to \ics{defglsentryfmt} indicates the glossary type. +This is passed to \ics{SetCustomDisplayStyle}. \begin{verbatim} \renewcommand*{\SetCustomDisplayStyle}[1]{% - \defglsdisplayfirst[#1]{##1##4\protect\footnote{% - \glsentrylong{\glslabel}: ##2% - }} - \defglsdisplay[#1]{##1##4}% + \defglsentryfmt[#1]{\glsgenentryfmt + \ifglsused{\glslabel}% test if entry has been used + {}% + {\footnote{\glsentrylong{\glslabel}}}}% } \end{verbatim} -Since we have a definition inside a definition, \verb|#1| refers to -the argument of \ics{SetCustomDisplayStyle}, and \verb|##1|, \ldots, -\verb|##4|, refer to the arguments of \ics{glsdisplayfirst} and -\ics{glsdisplay}. - Now that I've redefined \ics{CustomAcronymFields} and \linebreak\ics{SetCustomDisplayStyle}, I can set this style using \begin{verbatim} @@ -4820,28 +5847,28 @@ layout of a document written in a markup language}]{css} {css}{Cascading Style Sheet} \end{verbatim} -Note that since I've used the description in the main body of the -text, I need to switch off the sanitization otherwise any commands -within the description won't get interpreted. Also I want to use the -\sty{hyperref} package, but this will cause a problem on \gls{firstuse} -as I'll get nested hyperlinks, so I need to switch off the -hyperlinks on \gls{firstuse}. In addition, I want to use a glossary style -that displays the symbol. Therefore, in my preamble I have: +If I want to use the \sty{hyperref} package with this document, +it can cause a problem on \gls{firstuse} as I'll get nested +hyperlinks, so I need to switch off the hyperlinks on \gls{firstuse} +via the package option \pkgopt[false]{hyperfirst}. In addition, I +want to use a glossary style that displays the symbol. Therefore, in +my preamble I have: \begin{verbatim} \usepackage[colorlinks]{hyperref} \usepackage - [acronym, % create list of acronyms - nomain, % don't need main glossary for this example - style=tree, % need a style that displays the symbol - hyperfirst=false,% don't hyperlink first use - sanitize=none % switch off sanitization as description - % will be used in the main text + [acronym, % create list of acronyms + nomain, % don't need main glossary for this example + style=tree, % need a style that displays the symbol + hyperfirst=false% don't hyperlink first use ]{glossaries} \end{verbatim} Note that I haven't used the \pkgopt{description} or \pkgopt{footnote} package options. +The sample file \samplefile{-custom-acronym} illustrates this +example. +\end{example} \section{Upgrading From the glossary Package} \label{sec:oldacronym} @@ -4859,8 +5886,10 @@ provides the command: \cs{oldacronym}\oarg{label}\marg{abbrv}\marg{long}\marg{key-val list} \end{definition} This uses the same syntax as the \sty{glossary} package's -method of defining acronyms. It is equivalent to:\\[10pt] -\ics{newacronym}\oarg{key-val list}\marg{label}\marg{abbrv}\marg{long}\\[10pt] +method of defining acronyms. It is equivalent to: +\begin{display} +\ics{newacronym}\oarg{key-val list}\marg{label}\marg{abbrv}\marg{long} +\end{display} In addition, \ics{oldacronym} also defines the commands \cs{}\meta{label}, which is equivalent to \ics{gls}\marg{label}, and \cs{}\meta{label}\texttt{*}, which is equivalent to @@ -4876,8 +5905,11 @@ settings. Recall that, in general, \LaTeX\ ignores spaces following command names consisting of alphabetical characters. This is also true for \cs{}\meta{label} unless you additionally load the -\sty{xspace} package. +\sty{xspace} package, but be aware that there are some issues with +using \sty{xspace}.\footnotemark \end{important} +\footnotetext{See David Carlisle's explanation in +\url{http://tex.stackexchange.com/questions/86565/drawbacks-of-xspace}} The \styfmt{glossaries} package doesn't load the \sty{xspace} package since there are both advantages and disadvantages to using @@ -4977,15 +6009,19 @@ entry has been used, \meta{true part} will be done, otherwise \chapter{Glossary Styles} \label{sec:styles} -The \styfmt{glossaries} package comes with some pre-defined -glossary styles. Note that the styles are suited to different -types of glossaries: some styles ignore the associated -symbol; some styles are not designed for hierarchical entries, -so they display sub-entries in the same way as they display top -level entries; some styles are designed for homographs, so they -ignore the name for sub-entries. You should therefore pick a style -that suits your type of glossary. See \tableref{tab:styles} for -a summary of the available styles. The predefined styles can + +Glossaries vary from lists that simply contain a symbol with a terse +description to lists of terms or phrases with lengthy descriptions. +Some glossaries may have terms with associated symbols. Some may +have hierarchical entries. There is therefore no single style +that fits every type of glossary. The \styfmt{glossaries} package +comes with a number of pre-defined glossary styles, and you need to +choose one that best suits your type of glossary. There is a summary +of available styles in \tableref{tab:styles}. If none of them suit +your document, you can defined your own style +(see \sectionref{sec:newglossarystyle}). + +The predefined styles can accommodate numbered level~0 (main) and level~1 entries. See the package options \pkgopt{entrycounter}, \pkgopt{counterwithin} and \pkgopt{subentrycounter} described in @@ -5033,8 +6069,8 @@ be displayed.} The glossary style can be set using the \gloskey[printglossary]{style} key in the optional argument to \ics{printglossary} or using the command: -\begin{definition}[\DescribeMacro{\glossarystyle}] -\cs{glossarystyle}\marg{style-name} +\begin{definition}[\DescribeMacro{\setglossarystyle}] +\cs{setglossarystyle}\marg{style-name} \end{definition} Some of the glossary styles may also be set using the \pkgopt{style} package option, it depends if the package in which they are defined @@ -5044,7 +6080,7 @@ The tabular-like styles that allow multi-line descriptions and page lists use the length \DescribeMacro{\glsdescwidth}\cs{glsdescwidth} to set the width of the description column and the length \DescribeMacro{\glspagelistwidth}\cs{glspagelistwidth} to set the -width of the page list column.\footnote{these lengths will not be +width of the page list column.\footnote{These lengths will not be available if you use both the \pkgopt{nolong} and \pkgopt{nosuper} package options or if you use the \pkgopt{nostyles} package option unless you explicitly load the relevant package.} @@ -5055,7 +6091,7 @@ don't use these lengths as they are designed for single line entries. Instead you should use the analogous \glostyle{altlong4col} and \glostyle{altsuper4col} styles. If you want to explicitly create a line-break within a multi-line description in -a tabular-like style you should use \ics{newline} instead of +a tabular-like style it's better to use \ics{newline} instead of \verb|\\|. Note that if you use the \gloskey[printglossary]{style} key in the @@ -5068,24 +6104,24 @@ you do \end{verbatim} then the new definition of \ics{glsgroupskip} will not have an affect for this glossary, as \cs{glsgroupskip} is redefined by -\verb|style=long|. Likewise, \ics{glossarystyle} will also +\verb|style=long|. Likewise, \ics{setglossarystyle} will also override any previous style definitions, so, again \begin{verbatim} \renewcommand*{\glsgroupskip}{} -\glossarystyle{long} +\setglossarystyle{long} \end{verbatim} will reset \cs{glsgroupskip} back to its default definition for the named glossary style (\glostyle{long} in this case). If you want to modify the styles, either use \ics{newglossarystyle} (described in the next section) or make the modifications after -\ics{glossarystyle}, e.g.: +\ics{setglossarystyle}, e.g.: \begin{verbatim} -\glossarystyle{long} +\setglossarystyle{long} \renewcommand*{\glsgroupskip}{} \end{verbatim} As from version 3.03, you can now use the package option \pkgopt{nogroupskip} to suppress the gap between groups for the -default styles. +default styles instead of redefining \cs{glsgroupskip}. All the styles except for the three- and four-column styles and the \glostyle{listdotted} style use the command @@ -5114,7 +6150,7 @@ these styles will automatically be available unless you use the \begin{description} \item[list] The \glostyle{list} style uses the \env{description} environment. The entry name is placed in the optional argument of -the \ics{item} command (so it will appear in bold by default). The +the \ics{item} command (so it will usually appear in bold by default). The description follows, and then the associated \gls{numberlist} for that entry. The symbol is ignored. If the entry has child entries, the description and number list follows (but not the name) for each @@ -5648,7 +6684,7 @@ For the complete list, see \tableref{tab:mcols}. Note that \sty{glossary-mcols} is not loaded by \styfmt{glossaries}. If you want to use any of the multicol styles in that package you need to load it explicitly with \cs{usepackage} and set the required glossary -style using \ics{glossarystyle}. +style using \ics{setglossarystyle}. \end{important} The default number of columns is 2, but can be changed by redefining @@ -5659,7 +6695,7 @@ to the required number. For example, for a three column glossary: \begin{verbatim} \usepackage{glossary-mcols} \renewcommand*{\glsmcols}{3} -\glossarystyle{mcolindex} +\setglossarystyle{mcolindex} \end{verbatim} \begin{table}[htbp] @@ -5701,14 +6737,14 @@ glossaries and list of acronyms in a footnote, you can do: \usepackage{glossary-inline} \renewcommand*{\glossarysection}[2][]{\textbf{#1}: } - \glossarystyle{inline} + \setglossarystyle{inline} \end{verbatim} \begin{important} Note that you need to include \sty{glossary-inline} with \cs{usepackage} as it's not automatically included by the \styfmt{glossaries} package and then set the style using -\ics{glossarystyle}. +\ics{setglossarystyle}. \end{important} Where you need to include your glossaries as a footnote you can do: @@ -5747,7 +6783,7 @@ define your own style using: \cs{newglossarystyle}\marg{name}\marg{definitions} \end{definition} where \meta{name} is the name of the new glossary style (to be -used in \cs{glossarystyle}). The second argument \meta{definitions} +used in \cs{setglossarystyle}). The second argument \meta{definitions} needs to redefine all of the following: \begin{definition}[\DescribeEnv{theglossary}] @@ -5790,9 +6826,18 @@ via \begin{definition}[\DescribeMacro{\glsgetgrouptitle}] \cs{glsgetgrouptitle}\marg{label} \end{definition} -This obtains the title as follows: if +This obtains the title as follows: if \meta{label} consists of a +single non-active character or \meta{label} is equal to +\texttt{glssymbols} or \texttt{glsnumbers} and \cs{}\meta{label}\texttt{groupname} exists, this is taken to be the -title, otherwise the title is just \meta{label}. +title, otherwise the title is just \meta{label}. (The \qt{symbols} +group has the label \texttt{glssymbols}, so the command +\ics{glssymbolsgroupname} is used, and the \qt{numbers} group has the +label \texttt{glsnumbers}, so the command \ics{glsnumbersgrouptitle} +is used.) If you are using \gls{xindy}, \meta{label} may be an +active character (for example \o), in which case the title will be +set to just \meta{label}. You can redefine \cs{glsgetgrouptitle} if +this is unsuitable for your document. A navigation hypertarget can be created using \begin{definition}[\DescribeMacro{\glsnavhypertarget}] @@ -5824,16 +6869,18 @@ produce a blank row. As from version 3.03, the package option \pkgopt{nogroupskip} can be used to suppress this default gap for the predefined styles. -\begin{definition}[\DescribeMacro{\glossaryentryfield}] -\cs{glossaryentryfield}\marg{label}\marg{formatted name}\marg{description} -\marg{symbol}\marg{number list} +\begin{definition}[\DescribeMacro{\glossentry}] +\cs{glossentry}\marg{label}\marg{number list} \end{definition} -This macro indicates what to do for a given glossary entry. -Note that \meta{formatted name} will always be in the form -\ics{glsnamefont}\marg{name}. This allows the user to set a given -font for the entry name, regardless of the glossary style used. -Note that \meta{label} is the label used when the glossary entry -was defined via either \ics{newglossaryentry} or \ics{newacronym}. +This macro indicates what to do for each level~0 glossary entry. +The entry label is given by \meta{label} and the associated +\gls{numberlist} is given by \meta{number list}. You can redefine +\ics{glossentry} to use commands like \ics{glossentryname}\marg{label}, +\ics{glossentrydesc}\marg{label} and \ics{glossentrysymbol}\marg{label} +to display the name, description and symbol fields, or to access +other fields, use commands like \ics{glsentryuseri}\marg{label}. +(See \sectionref{sec:glsnolink} for further details.) You can also +use the following commands: \begin{definition}[\DescribeMacro{\glsentryitem}] \cs{glsentryitem}\marg{label} @@ -5841,7 +6888,7 @@ was defined via either \ics{newglossaryentry} or \ics{newacronym}. This macro will increment and display the associated counter for the main (level~0) entries if the \pkgopt{entrycounter} or \pkgopt{counterwithin} package options have been used. This macro -is typically called by \cs{glossaryentryfield} before \cs{glstarget}. +is typically called by \cs{glossentry} before \cs{glstarget}. The format of the counter is controlled by the macro \begin{definition}[\DescribeMacro{\glsentrycounterlabel}] \cs{glsentrycounterlabel} @@ -5850,7 +6897,7 @@ The format of the counter is controlled by the macro Each time you use a glossary entry it creates a hyperlink (if hyperlinks are enabled) to the relevant line in the glossary. Your new glossary style must therefore redefine -\cs{glossaryentryfield} to set the appropriate target. This +\cs{glossentry} to set the appropriate target. This is done using \begin{definition}[\DescribeMacro{\glstarget}] \cs{glstarget}\marg{label}\marg{text} @@ -5860,15 +6907,15 @@ don't need to worry about whether the \sty{hyperref} package has been loaded, as \cs{glstarget} won't create a target if \cs{hypertarget} hasn't been defined. -For example, the -\glostyle{list} style defines \cs{glossaryentryfield} as follows: +For example, the \glostyle{list} style defines \cs{glossentry} as follows: \begin{verbatim} -\renewcommand*{\glossaryentryfield}[5]{% -\item[\glsentryitem{##1}\glstarget{##1}{##2}] - ##3\glspostdescription \space ##5} + \renewcommand*{\glossentry}[2]{% + \item[\glsentryitem{##1}% + \glstarget{##1}{\glossentryname{##1}}] + \glossentrydesc{##1}\glspostdescription\space ##2} \end{verbatim} -Note also that \meta{number list} will always be of the form\\ +Note also that \meta{number list} will always be of the form \begin{definition} \ics{glossaryentrynumbers}\{\cs{relax}\\ \ics{setentrycounter}\oarg{Hprefix}\marg{counter name}\meta{format cmd}\marg{number(s)}\} @@ -5889,22 +6936,21 @@ Therefore, when you define a new glossary style, you don't need to worry about whether the user has specified the \pkgopt{nonumberlist} package option. -\begin{definition}[\DescribeMacro{\glossarysubentryfield}] -\cs{glossarysubentryfield}\marg{level}\marg{label}\marg{formatted name} -\marg{description}\marg{symbol}\marg{number list} +\begin{definition}[\DescribeMacro{\subglossentry}] +\cs{subglossentry}\marg{level}\marg{label}\marg{number list} \end{definition} -This is new to version 1.17, and is used to display sub-entries. +This is used to display sub-entries. The first argument, \meta{level}, indicates the sub-entry level. This must be an integer from 1 (first sub-level) onwards. The remaining arguments are analogous to those for -\ics{glossaryentryfield} described above. +\ics{glossentry} described above. \begin{definition}[\DescribeMacro{\glssubentryitem}] \cs{glssubentryitem}\marg{label} \end{definition} This macro will increment and display the associated counter for the -level~1 entries if the \pkgopt{subentrycounter} package options have -been used. This macro is typically called by \cs{glossarysubentryfield} +level~1 entries if the \pkgopt{subentrycounter} package option has +been used. This macro is typically called by \cs{subglossentry} before \ics{glstarget}. The format of the counter is controlled by the macro \begin{definition}[\DescribeMacro{\glssubentrycounterlabel}] @@ -5923,8 +6969,7 @@ For further details of these commands, see \ifpdf section~\ref*{sec:code:printglos} \fi \qt{Displaying the glossary} in the documented code (\texttt{glossaries-code.pdf}). -\section{Example: creating a completely new style} -\label{sec:exnewstyle} +\begin{example}{Creating a completely new style}{sec:exnewstyle} If you want a completely new style, you will need to redefine all of the commands and the environment listed above. @@ -5952,16 +6997,16 @@ at the end. Then you can create this new glossary style, called, say, \renewcommand*{\glsgroupheading}[1]{}% \renewcommand*{\glsgroupskip}{}% % set how each entry should appear: - \renewcommand*{\glossaryentryfield}[5]{% + \renewcommand*{\glossentry}[2]{% \item % bullet point - \glstarget{##1}{##2}% the entry name - \space (##4)% the symbol in brackets - \space ##3% the description - \space [##5]% the number list in square brackets + \glstarget{##1}{\glossentryname{##1}}% the entry name + \space (\glossentrysymbol{##1})% the symbol in brackets + \space \glossentrydesc{##1}% the description + \space [##2]% the number list in square brackets }% % set how sub-entries appear: - \renewcommand*{\glossarysubentryfield}[6]{% - \glossaryentryfield{##2}{##3}{##4}{##5}{##6}}% + \renewcommand*{\subglossentry}[3]{% + \glossentry{##2}{##3}}% } \end{verbatim} Note that this style creates a flat glossary, where sub-entries @@ -5970,12 +7015,35 @@ It also hasn't used \ics{glsentryitem} or \ics{glssubentryitem} so it won't be affected by the \pkgopt{entrycounter}, \pkgopt{counterwithin} or \pkgopt{subentrycounter} package options. -\section{Example: creating a new glossary style based on an -existing style} -\label{sec:exadaptstyle} +Variations: +\begin{itemize} +\item You might want the entry name to be capitalised, in +which case use \ics{Glossentryname} instead of \ics{glossentryname}. + +\item You might want to check if the symbol hasn't been set and omit +the parentheses if the symbol is absent. In this case you can use +\ics{ifglshassymbol} (see \sectionref{sec:utilities}): +\begin{verbatim} + \renewcommand*{\glossentry}[2]{% + \item % bullet point + \glstarget{##1}{\glossentryname{##1}}% the entry name + \ifglshassymbol{##1}% check if symbol exists + {% + \space (\glossentrysymbol{##1})% the symbol in brackets + }% + {}% no symbol so do nothing + \space \glossentrydesc{##1}% the description + \space [##2]% the number list in square brackets + }% +\end{verbatim} +\end{itemize} +\end{example} + +\begin{example}{Creating a new glossary style based on an +existing style}{sec:exadaptstyle} If you want to define a new style that is a slightly modified -version of an existing style, you can use \ics{glossarystyle} +version of an existing style, you can use \ics{setglossarystyle} within the second argument of \ics{newglossarystyle} followed by whatever alterations you require. For example, suppose you want a style like the \glostyle{list} style but you don't want the extra @@ -5984,21 +7052,21 @@ can create a new glossary style called, say, \texttt{mylist} as follows: \begin{verbatim} \newglossarystyle{mylist}{% -\glossarystyle{list}% base this style on the list style +\setglossarystyle{list}% base this style on the list style \renewcommand{\glsgroupskip}{}% make nothing happen % between groups } \end{verbatim} +(In this case, you can actually achieve the same effect using the +\glostyle{list} style in combination with the package option +\pkgopt{nogroupskip}.) +\end{example} -\section{Example: creating a glossary style that uses the +\begin{example}{Example: creating a glossary style that uses the \texorpdfstring{\gloskey{user1}}{user1}, \ldots, -\texorpdfstring{\gloskey{user6}}{user6} keys} -\label{sec:exuserstyle} +\texorpdfstring{\gloskey{user6}}{user6} keys}{sec:exuserstyle} -Since \ics{glossaryentryfield} and \ics{glossarysubentryfield} -provide the label for the entry, it's also possible to access -the values of the generic user keys, such as \gloskey{user1}. For -example, suppose each entry not only has an associated symbol, +Suppose each entry not only has an associated symbol, but also units (stored in \gloskey{user1}) and dimension (stored in \gloskey{user2}). Then you can define a glossary style that displays each entry in a \env{longtable} as follows: @@ -6016,31 +7084,32 @@ that displays each entry in a \env{longtable} as follows: % No heading between groups: \renewcommand*{\glsgroupheading}[1]{}% % Main (level 0) entries displayed in a row optionally numbered: - \renewcommand*{\glossaryentryfield}[5]{% + \renewcommand*{\glossentry}[2]{% \glsentryitem{##1}% Entry number if required - \glstarget{##1}{##2}% Name - & ##3% Description - & ##4% Symbol + \glstarget{##1}{\glossentryname{##1}}% Name + & \glossentrydesc{##1}% Description + & \glossentrysymbol{##1}% Symbol & \glsentryuseri{##1}% Units & \glsentryuserii{##1}% Dimensions - & ##5% Page list - \\% end of row + & ##2% Page list + \tabularnewline % end of row }% % Similarly for sub-entries (no sub-entry numbers): - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand*{\subglossentry}[3]{% % ignoring first argument (sub-level) - \glstarget{##2}{##3}% Name - & ##4% Description - & ##5% Symbol + \glstarget{##2}{\glossentryname{##2}}% Name + & \glossentrydesc{##2}% Description + & \glossentrysymbol{##2}% Symbol & \glsentryuseri{##2}% Units & \glsentryuserii{##2}% Dimensions - & ##6% Page list - \\% end of row + & ##3% Page list + \tabularnewline % end of row }% % Nothing between groups: \renewcommand*{\glsgroupskip}{}% } \end{verbatim} +\end{example} \chapter{Utilities} \label{sec:utilities} @@ -6090,9 +7159,28 @@ part}} \end{definition} This checks if the glossary entry given by \meta{label} exists. If it does \meta{true part} is performed, otherwise \meta{false part}. +(Note that \cs{ifglsentryexists} will always be true after the +containing glossary has been displayed via \ics{printglossary} +or \ics{printglossaries} even if the entry is explicitly defined +later in the document. This is because the entry has to be defined +before it can be displayed in the glossary, see \sectionref{sec:techissues} for +further details.) + +\begin{definition}[\DescribeMacro{\glsdoifexists}] +\cs{glsdoifexists}\marg{label}\marg{code} +\end{definition} +Does \meta{code} if the entry given by \meta{label} exists. If it +doesn't exist, an error is generated. (This command uses +\cs{ifglsentryexists}.) + +\begin{definition}[\DescribeMacro{\glsdoifnoexists}] +\cs{glsdoifnoexists}\marg{label}\marg{code} +\end{definition} +Does the reverse of \cs{glsdoifexists}. (This command uses +\cs{ifglsentryexists}.) \begin{definition}[\DescribeMacro{\ifglsused}] -\cs{ifglsentryexists}{\meta{label}}{\meta{true part}}{\meta{false +\cs{ifglsused}{\meta{label}}{\meta{true part}}{\meta{false part}} \end{definition} See \sectionref{sec:glsunset}. @@ -6113,6 +7201,270 @@ This checks if the glossary entry given by \meta{label} has a parent entry. If it does, \meta{true part} is performed, otherwise \meta{false part}. +\begin{definition}[\DescribeMacro{\ifglshassymbol}] +\cs{ifglshassymbol}\marg{label}\marg{true part}\marg{false part} +\end{definition} +This checks if the glossary entry given by \meta{label} has had the +\gloskey{symbol} field set. If it has, \meta{true part} is performed, +otherwise \meta{false part}. + +\begin{definition}[\DescribeMacro{\ifglshaslong}] +\cs{ifglshaslong}\marg{label}\marg{true part}\marg{false part} +\end{definition} +This checks if the glossary entry given by \meta{label} has had the +\gloskey{long} field set. If it has, \meta{true part} is performed, +otherwise \meta{false part}. This should be true for any entry that +has been defined via \ics{newacronym}. + +\begin{definition}[\DescribeMacro{\ifglshasshort}] +\cs{ifglshasshort}\marg{label}\marg{true part}\marg{false part} +\end{definition} +This checks if the glossary entry given by \meta{label} has had the +\gloskey{short} field set. If it has, \meta{true part} is performed, +otherwise \meta{false part}. This should be true for any entry that +has been defined via \ics{newacronym}. + +\begin{definition}[\DescribeMacro{\ifglshasdesc}] +\cs{ifglshasdesc}\marg{label}\marg{true part}\marg{false part} +\end{definition} +This checks if the \gloskey{description} field is non-empty for +the entry given by \meta{label}. If it has, \meta{true part} is +performed, otherwise \meta{false part}. Compare with: +\begin{definition}[\DescribeMacro{\ifglsdescsuppressed}] +\cs{ifglsdescsuppressed}\marg{label}\marg{true part}\marg{false part} +\end{definition} +This checks if the \gloskey{description} field has been set to just +\ics{nopostdesc} for the entry given by \meta{label}. If it has, +\meta{true part} is performed, otherwise \meta{false part}. + +\chapter{Prefixes or Determiners}\label{sec:prefix} +The \sty{glossaries-prefix} package provides +additional keys that can be used as prefixes. For example, if you +want to specify determiners (such +as \qt{a}, \qt{an} or \qt{the}). The \styfmt{glossaries-prefix} +package automatically loads the \styfmt{glossaries} package and has +the same package options. + +The extra keys for \ics{newglossaryentry} are as follows: +\begin{description} +\item[\gloskey{prefix}] The prefix associated with the +\gloskey{text} key. This defaults to nothing. + +\item[\gloskey{prefixplural}] The prefix associated with the +\gloskey{plural} key. This defaults to nothing. + +\item[\gloskey{prefixfirst}] The prefix associated with the +\gloskey{first} key. If omitted, this defaults to the value of the +\gloskey{prefix} key. + +\item[\gloskey{prefixfirstplural}] The prefix associated with the +\gloskey{firstplural} key. If omitted, this defaults to the value of +the \gloskey{prefixplural} key. +\end{description} + +\begin{example}{Defining Determiners}{ex:determiners} +Here's the start of my example document: +\begin{verbatim} +documentclass{article} + +\usepackage[colorlinks]{hyperref} +\usepackage[toc,acronym]{glossaries-prefix} +\end{verbatim} +Note that I've simply replaced \styfmt{glossaries} from previous +sample documents with \styfmt{glossaries-prefix}. Now for a sample +definition\footnote{Single letter words, such as \qt{a} and \qt{I} +should typically not appear at the end of a line, hence the +non-breakable space after \qt{a} in the \gloskey{prefix} field.}: +\begin{verbatim} +\newglossaryentry{sample}{name={sample},% + description={an example},% + prefix={a~},% + prefixplural={the\space}% +} +\end{verbatim} +Note that I've had to explicitly insert a~space after the prefix. +This allows for the possibility of prefixes that shouldn't have a~space, +such as: +\begin{verbatim} +\newglossaryentry{oeil}{name={oeil}, + plural={yeux}, + description={eye}, + prefix={l'}, + prefixplural={les\space}} +\end{verbatim} +Where a space is required at the end of the prefix, you must use +a~spacing command, such as \cs{space}, \verb*|\ | (backslash space) or +\verb|~| due to the automatic spacing trimming performed in +\meta{key}=\meta{value} options. + +The prefixes can also be used with acronyms. For example: +\begin{verbatim} +\newacronym + [% + prefix={an\space},prefixfirst={a~}% + ]{svm}{SVM}{support vector machine} +\end{verbatim} +\end{example} + +The \sty{glossaries-prefix} package provides convenient commands to +use these prefixes with commands such as \ics{gls}. Note that the +prefix is not considered part of the \gls{linktext}, so it's not +included in the hyperlink (where hyperlinks are enabled). +\begin{definition}[\DescribeMacro\pgls] +\cs{pgls}\oarg{options}\marg{label}\oarg{insert} +\end{definition} +This is prepends the value of the \gloskey{prefix} key (or +\gloskey{prefixfirst} key, on \gls{firstuse}) in front of +\cs{gls}\oarg{options}\marg{label}\oarg{insert}. + +\begin{definition}[\DescribeMacro\Pgls] +\cs{Pgls}\oarg{options}\marg{label}\oarg{insert} +\end{definition} +If the \gloskey{prefix} key (or \gloskey{prefixfirst}, on +\gls*{firstuse}) has been set, this displays the value of that key +with the first letter converted to upper case followed by +\cs{gls}\oarg{options}\marg{label}\oarg{insert}. If that key hasn't +been set, this is equivalent to +\ics{Gls}\oarg{options}\marg{label}\oarg{insert}. + +\begin{definition}[\DescribeMacro\PGLS] +\cs{PGLS}\oarg{options}\marg{label}\oarg{insert} +\end{definition} +As \cs{pgls} but converts the prefix to upper case and uses +\ics{GLS} instead of \cs{gls}. + +\begin{definition}[\DescribeMacro\pglspl] +\cs{pglspl}\oarg{options}\marg{label}\oarg{insert} +\end{definition} +This is prepends the value of the \gloskey{prefixplural} key (or +\gloskey{prefixfirstplural} key, on \gls{firstuse}) in front of +\cs{glspl}\oarg{options}\marg{label}\oarg{insert}. + +\begin{definition}[\DescribeMacro\Pglspl] +\cs{Pglspl}\oarg{options}\marg{label}\oarg{insert} +\end{definition} +If the \gloskey{prefixplural} key (or \gloskey{prefixfirstplural}, on +\gls*{firstuse}) has been set, this displays the value of that key +with the first letter converted to upper case followed by +\cs{glspl}\oarg{options}\marg{label}\oarg{insert}. If that key hasn't +been set, this is equivalent to +\ics{Glspl}\oarg{options}\marg{label}\oarg{insert}. + +\begin{definition}[\DescribeMacro\PGLSpl] +\cs{PGLSpl}\oarg{options}\marg{label}\oarg{insert} +\end{definition} +As \cs{pglspl} but converts the prefix to upper case and uses +\ics{GLSpl} instead of \cs{glspl}. + +\begin{example}{Using Prefixes}{ex:prefixes} +Continuing from Example~\ref{ex:determiners}, now that I've defined +my entries, I~can use them in the text via the above commands: +\begin{verbatim} +First use: \pgls{svm}. Next use: \pgls{svm}. +Singular: \pgls{sample}, \pgls{oeil}. +Plural: \pglspl{sample}, \pglspl{oeil}. +\end{verbatim} +which produces: +\begin{quote} +First use: a~support vector machine (SVM). Next +use: an SVM. +Singular: a~sample, l'oeil. Plural: the samples, les yeux. +\end{quote} +For a complete document, see \samplefile{-prefix}. +\end{example} + +This package also provides the following commands: +\begin{definition}[\DescribeMacro\ifglshasprefix] +\cs{ifglshasprefix}\marg{label}\marg{true part}\marg{false part} +\end{definition} +Does \meta{true part} if the entry identified by \meta{label} has a +non-empty value for the \gloskey{prefix} key. + +This package also provides the following commands: +\begin{definition}[\DescribeMacro\ifglshasprefixplural] +\cs{ifglshasprefixplural}\marg{label}\marg{true part}\marg{false part} +\end{definition} +Does \meta{true part} if the entry identified by \meta{label} has a +non-empty value for the \gloskey{prefixplural} key. + +\begin{definition}[\DescribeMacro\ifglshasprefixfirst] +\cs{ifglshasprefixfirst}\marg{label}\marg{true part}\marg{false part} +\end{definition} +Does \meta{true part} if the entry identified by \meta{label} has a +non-empty value for the \gloskey{prefixfirst} key. + +\DescribeMacro\ifglshasprefixfirstplural +\begin{definition} +\cs{ifglshasprefixfirstplural}\marg{label}\marg{true part}\marg{false part} +\end{definition} +Does \meta{true part} if the entry identified by \meta{label} has a +non-empty value for the \gloskey{prefixfirstplural} key. + +\begin{definition}[\DescribeMacro\glsentryprefix] +\cs{glsentryprefix}\marg{label} +\end{definition} +Displays the value of the \gloskey{prefix} key for the entry given +by \meta{label}. (No check is performed to determine if the entry +exists.) + +\begin{definition}[\DescribeMacro\glsentryprefixfirst] +\cs{glsentryprefixfirst}\marg{label} +\end{definition} +Displays the value of the \gloskey{prefixfirst} key for the entry given +by \meta{label}. (No check is performed to determine if the entry +exists.) + +\begin{definition}[\DescribeMacro\glsentryprefixplural] +\cs{glsentryprefixplural}\marg{label} +\end{definition} +Displays the value of the \gloskey{prefixplural} key for the entry given +by \meta{label}. (No check is performed to determine if the entry +exists.) + +\DescribeMacro\glsentryprefixfirstplural +\begin{definition} +\cs{glsentryprefixfirstplural}\marg{label} +\end{definition} +Displays the value of the \gloskey{prefixfirstplural} key for the entry given +by \meta{label}. (No check is performed to determine if the entry +exists.) + +There are also variants that convert the first letter to upper +case\footnote{The earlier caveats about initial non-Latin characters +apply.}: +\begin{definition}[\DescribeMacro\Glsentryprefix] +\cs{Glsentryprefix}\marg{label} +\end{definition} +\begin{definition}[\DescribeMacro\Glsentryprefixfirst] +\cs{Glsentryprefixfirst}\marg{label} +\end{definition} +\begin{definition}[\DescribeMacro\Glsentryprefixplural] +\cs{Glsentryprefixplural}\marg{label} +\end{definition} + +\pagebreak +\DescribeMacro\Glsentryprefixfirstplural +\begin{definition} +\cs{Glsentryprefixfirstplural}\marg{label} +\end{definition} + +\begin{example}{Adding Determiner to Glossary Style}{ex:plist} +You can use the above commands to define a new glossary style that +uses the determiner. For example, the following style is a slight +modification of the \glostyle{list} style that inserts the prefix +before the name: +\begin{verbatim} +\newglossarystyle{plist}{% + \setglossarystyle{list}% + \renewcommand*{\glossentry}[2]{% + \item[\glsentryitem{##1}% + \Glsentryprefix{##1}% + \glstarget{##1}{\glossentryname{##1}}] + \glossentrydesc{##1}\glspostdescription\space ##2}% +} +\end{verbatim} +\end{example} + \chapter{Accessibility Support}\label{sec:accsupp} Limited accessibility support is provided by the accompanying \sty{glossaries-accsupp} package, but note that this package is @@ -6186,7 +7538,8 @@ should be located in the \texttt{samples} subdirectory (folder) of the \styfmt{glossaries} documentation directory. The location varies according to your operating system and \TeX\ installation. For example, on my Linux partition it can be found in -\texttt{/usr/local/texlive/2008/texmf-dist\linebreak/doc/latex/glossaries/}. +\texttt{\slash usr\slash local\slash texlive\slash 2013\slash +texmf-dist\slash doc\slash latex\slash glossaries/}. Further information on debugging \LaTeX\ code is available at \url{http://theoval.cmp.uea.ac.uk/~nlct/latex/minexample/}. @@ -6195,16 +7548,28 @@ queries, consult the \styfmt{glossaries} FAQ at \url{http://www.dickimaw-books.com/faqs/glossariesfaq.html}. If that doesn't help, try posting your query to somewhere like the comp.text.tex newsgroup, the \LaTeX\ Community Forum -(\url{http://www.latex-community.org/}) or Stack Exchange -(\url{http://tex.stackexchange.com/}). I read all those three places -and respond to queries there far quicker than to email messages (my -inbox is always very cluttered). +(\url{http://www.latex-community.org/}) or \TeX\ on StackExchange +(\url{http://tex.stackexchange.com/}). Bug reports can be submitted at \url{http://www.dickimaw-books.com/bug-report.html}. \begin{enumerate} \item \textbf{Q.} I get the error message: \begin{verbatim} +! Undefined control sequence. +\in@ #1#2->\begingroup \def \in@@ +\end{verbatim} + +\textbf{A.} This error can occur if you have a fragile command in +one of your entry definitions. +In most cases using \cs{glsnoexpandfields} before defining your +entry should fix this, but there are still a few fragile commands +that will still cause this error even with \cs{glsnoexpandfields}. +If this is the case put \cs{protect} in front of the fragile +command. + +\item \textbf{Q.} I get the error message: +\begin{verbatim} Missing \begin{document} \end{verbatim} @@ -6307,48 +7672,10 @@ English, French, German, Irish, Italian, Hungarian, Polish, Serbian and Spanish. If you want to add another language, send me the translations, and I'll add them to the next version. -If you are using one of the above languages, but the text hasn't been -translated, try adding the \sty{translator} package with the -required languages explicitly (before you load the \styfmt{glossaries} -package). For example: -\begin{verbatim} -\usepackage[ngerman]{babel} -\usepackage[ngerman]{translator} -\usepackage{glossaries} -\end{verbatim} -Alternatively, you can add the language as a global option -to the class file. Check the \styfmt{translator} package documentation -for further details. - -\item \textbf{Q.} My acronyms contain strange characters when I use commands -like \ics{acrlong}. - -\textbf{A.} Switch off the sanitization: -\begin{verbatim} -\usepackage[sanitize=none]{glossaries} -\end{verbatim} -and protect fragile commands. - -\item \textbf{Q.} Weird characters appear when I use -\ics{glsentryname} or \ics{glsname}. - -\textbf{A.} Either use \ics{glsentrytext} or \ics{glstext}, -respectively, or switch off the sanitization for the \gloskey{name} -key: -\begin{verbatim} -\usepackage[sanitize={name=false}]{glossaries} -\end{verbatim} -and protect fragile commands. - -\item \textbf{Q.} Weird characters appear when I try to display an -entry's description. - -\textbf{A.} Switch off the sanitization for the \gloskey{description} -key: -\begin{verbatim} -\usepackage[sanitize={description=false}]{glossaries} -\end{verbatim} -and protect fragile commands. +If you are using one of the above languages, but the text hasn't +been translated, try using the \styfmt{glossaries} package option +\pkgopt[babel]{translate}. Also, try adding the language as a +global option to the class file. \item \textbf{Q.} My glossaries haven't appeared. @@ -6375,6 +7702,13 @@ second \LaTeX\ run, followed by another \LaTeX\ run. Check the log files (\filetype{.log}, \filetype{.glg} etc) for any warnings. +\item \textbf{Q.} Why is glossaries creating an empty \filetype{.glo} file? + +\textbf{A.} Because you haven't used any entries in the +\texttt{main} glossary via commands such as \ics{gls}. +If you don't want to use this glossary, you can suppress its +creation via the package option \pkgopt{nomain}. + \item \textbf{Q.} It is possible to change the rules used to sort the glossary entries? @@ -6410,8 +7744,6 @@ or \end{enumerate} - -\clearpage\phantomsection -\addcontentsline{toc}{chapter}{Index}\PrintIndex +\PrintIndex \end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries.pdf b/Master/texmf-dist/doc/latex/glossaries/glossaries.pdf Binary files differdeleted file mode 100644 index 1ba614b31a2..00000000000 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html index 52b4c8e3a26..e3af7e1e0f7 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html +++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html @@ -10,7 +10,7 @@ <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" /> <!-- xhtml,fn-in,css-in,uni-html4,utf8 --> <meta name="src" content="glossariesbegin.tex" /> -<meta name="date" content="2013-07-05 21:47:00" /> +<meta name="date" content="2013-11-14 14:05:00" /> <style type="text/css"> <!-- @@ -168,7 +168,7 @@ beginners</h2> <div class="author" ><span class="futr8t-x-x-144">Nicola L.C. Talbot</span></div><br /> <div class="date" ><span -class="futr8t-x-x-144">2013-07-05</span></div> +class="futr8t-x-x-144">2013-11-14</span></div> </div> <div class="abstract" diff --git a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf Binary files differindex cd7f400b282..633068fc80c 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex index e4185ea0026..08b81abc291 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex +++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex @@ -13,7 +13,7 @@ \title{The glossaries package: a guide for beginners} \author{Nicola L.C. Talbot} -\date{2013-07-05} +\date{2013-11-14} \newcommand*{\igloskey}[2][newglossaryentry]{\icsopt{#1}{#2}} \newcommand*{\gloskey}[2][newglossaryentry]{\csopt{#1}{#2}} diff --git a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html index 7ebb9464515..5ca68ec9f1e 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html +++ b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html @@ -10,7 +10,7 @@ <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)" /> <!-- xhtml,fn-in,css-in,uni-html4,utf8 --> <meta name="src" content="glossary2glossaries.tex" /> -<meta name="date" content="2013-07-05 21:47:00" /> +<meta name="date" content="2013-11-14 14:05:00" /> <style type="text/css"> <!-- @@ -193,7 +193,7 @@ package to the glossaries package</h2> <div class="author" ><span class="futr8t-x-x-144">Nicola L.C. Talbot</span></div><br /> <div class="date" ><span -class="futr8t-x-x-144">2013-07-05</span></div> +class="futr8t-x-x-144">2013-11-14</span></div> </div> <div class="abstract" @@ -258,6 +258,8 @@ href="#x1-160008" id="QQ2-1-17">Displaying the glossary</a></span> href="#x1-170009" id="QQ2-1-18">Processing Your Document</a></span> <br /> <span class="sectionToc" >10 <a href="#x1-1800010" id="QQ2-1-19">Troubleshooting</a></span> +<br /> <span class="sectionToc" ><a +href="#Q1-1-20">Index</a></span> </div> <!--l. 49--><p class="noindent" > </p> @@ -295,9 +297,9 @@ class="ectt-1095">xindy</span><a id="dx1-2004"></a> to sort the glossary. Using <span class="ectt-1095">xindy</span><a id="dx1-2005"></a> - means that: + means that: <ul class="itemize2"> <li class="itemize">there is much better support for terms containing accented or non-Latin characters; @@ -1771,7 +1773,7 @@ class="ectt-1095">notation</span>, and you had de class="ecss-1095">toctitle</span><a id="dx1-16007"></a> key: - + </p> <div class="verbatim" id="verbatim-19"> \printglossary[type=notation,toctitle=Notation] @@ -1831,7 +1833,11 @@ href="#top">Top</a></p><h3 class="sectionHead"><span class="titlemark">10 </spa <!--l. 646--><p class="noindent" >Please check the <a href="http://www.dickimaw-books.com/faqs/glossariesfaq.html" >FAQ</a> for the <span class="ecss-1095">glossaries </span>package if you have any problems. -</p><!--l. 2--><p class="noindent" > + + +</p><!--l. 650--><p class="indent" > <a + id="likesection.1"></a><a + id="Q1-1-20"></a> </p> <!--l. 2--><p class="noindent" ><a href="#top">Top</a></p><h3 class="likesectionHead"><a @@ -1839,8 +1845,6 @@ href="#top">Top</a></p><h3 class="likesectionHead"><a <!--l. 4--><p class="noindent" > <span class="futb8t-x-x-109">A</span> </p> - - <div class="theindex"><span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1095">\acl</span></span></span>  <a href="glossary2glossaries.html#dx1-13014" ><span class="underline">1</span></a> <br /></span> @@ -1953,6 +1957,8 @@ href="glossary2glossaries.html#dx1-15015" ><span class="underline">50</span></a> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1095">\glsreset</span></span></span>  <a href="glossary2glossaries.html#dx1-15002" ><span class="underline">51</span></a> <br /></span> + + <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1095">\glsresetall</span></span></span>  <a href="glossary2glossaries.html#dx1-15008" ><span class="underline">52</span></a> <br /></span> @@ -1974,8 +1980,6 @@ href="glossary2glossaries.html#dx1-14002" ><span class="underline">57</span></a> href="glossary2glossaries.html#dx1-14003" ><span class="underline">58</span></a> <br /></span> </p><p class="theindex"> <span class="futb8t-x-x-109">M</span> - - <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1095">\makeacronym</span></span></span>  <a href="glossary2glossaries.html#dx1-5002" ><span class="underline">59</span></a> <br /></span> @@ -2078,6 +2082,8 @@ class="futb8t-x-x-109">R</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1095">\resetacronym</span></span></span>  <a href="glossary2glossaries.html#dx1-15001" ><span class="underline">109</span></a> <br /></span> + + <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1095">\resetallacronyms</span></span></span>  <a href="glossary2glossaries.html#dx1-15007" ><span class="underline">110</span></a> <br /></span> @@ -2100,8 +2106,6 @@ class="ectt-1095">\storeglosentry </span>options<br /></span> <span class="index-subitem">    <span class="ecss-1095">format</span>  <a href="glossary2glossaries.html#dx1-6013" >119</a> <br /></span> - - <span class="index-subitem">    <span class="ecss-1095">number</span>  <a href="glossary2glossaries.html#dx1-6014" >120</a> <br /></span> @@ -2214,6 +2218,6 @@ class="futr8t-x-x-90">document.</span></p> </body></html> - + diff --git a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf Binary files differindex 798f883ccf1..671a168d037 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex index 33873a1ebdd..9b07960a259 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex +++ b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex @@ -21,7 +21,7 @@ \title{Upgrading from the glossary package to the glossaries package} \author{Nicola L.C. Talbot} -\date{2013-07-05} +\date{2013-11-14} \newenvironment{oldway}{% \begin{labelledbox}{\styfmt{glossary}}\ttfamily\obeylines diff --git a/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.html b/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.html Binary files differindex 02ca68001ff..ac5e542e74d 100644 --- a/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.html +++ b/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.html diff --git a/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.pdf b/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.pdf Binary files differindex 6c8d1db279e..6e101f6d6fa 100644 --- a/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.tex b/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.tex index 989d7d8dcb3..e81c39df6b4 100644 --- a/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.tex +++ b/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.tex @@ -13,12 +13,12 @@ pdfkeywords={LaTeX,package,uppercase}]{hyperref} \begin{document} - \title{mfirstuc.sty v1.05: uppercasing first letter} + \title{mfirstuc.sty v1.08: uppercasing first letter} \author{Nicola L.C. Talbot\\[10pt] Dickimaw Books\\ \url{http://www.dickimaw-books.com/}} - \date{2012-05-21} + \date{2013-11-04} \maketitle The \styfmt{glossaries} bundle is supplied with the package @@ -100,13 +100,21 @@ object in its argument. It does not fully expand the entire argument. \end{important} -If you want to use an alternative command to convert to uppercase, -for example \cs{MakeTextUppercase},\footnote{defined in the -\styfmt{textcase} package} you can redefine \cs{glsmakefirstuc}. +If you use \styfmt{mfirstuc} without the \sty{glossaries} package, +the standard \cs{MakeUppercase} command is used. If used with +\sty{glossaries}, \ics{MakeTextUppercase} (defined by \sty{textcase} +the package) is used instead. If you are using \styfmt{mfirstuc} +without the \styfmt{glossaries} package and want to use +\ics{MakeTextUppercase} instead, you can redefine +\begin{definition}[\DescribeMacro\glsmakefirstuc] +\cs{glsmakefirstuc}\marg{text} +\end{definition} For example: \begin{verbatim} \renewcommand{\glsmakefirstuc}[1]{\MakeTextUppercase #1} \end{verbatim} +Remember to also load \sty{textcase} (\styfmt{glossaries} loads this +automatically). New to mfirstuc v1.06: \begin{definition}[\DescribeMacro{\capitalisewords}] @@ -124,6 +132,20 @@ on \meta{text}. This is a short cut for \cs{expandafter}\cs{capitalisewords}\cs{expandafter}\marg{text}. +\begin{important} +If you are using \sty{hyperref} and want to use \cs{capitalisewords} +or \ics{makefirstuc} (or \cs{xcapitalisewords}\slash\cs{xmakefirstuc}) +in a section heading, the PDF bookmarks won't be able to use the command +as it's not expandable, so you will get a warning that looks like: +\begin{verbatim} +Package hyperref Warning: Token not allowed in a PDF string (PDFDocEncoding): +(hyperref) removing `\capitalisewords' +\end{verbatim} +If you want to provide an alternative for the PDF bookmark, you can +use \sty{hyperref}'s \ics{texorpdfstring} command. See the +\sty{hyperref} manual for further details. +\end{important} + Examples: \begin{enumerate} \item diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/README-samples b/Master/texmf-dist/doc/latex/glossaries/samples/README-samples new file mode 100644 index 00000000000..508aa54f981 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/README-samples @@ -0,0 +1,52 @@ +These are sample files illustrating the use of the glossaries +package. If you are new to this package, start with minimalgls.tex +to check you have glossaries correctly installed and to check that +you understand how to use it. + +1. Run minimalgls.tex through LaTeX ("compile the document") either +by typing + + latex minimalgls + +in a terminal or by using the relevant button or menu item in your +text editor or front-end. This will create the required associated +files but you will not see the glossary. If you use PDFLaTeX you +will also get warnings about non-existent references that look +something like: + +pdfTeX warning (dest): name{glo:aca} has been referenced but does +not exist, +replaced by a fixed one + +These warnings may be ignored on the first run. + +If you get a "Missing \begin{document}" error, then it's most likely +that your version of xkeyval.sty is out of date. Check the log file +for a warning of that nature. If this is the case, please update +your TeX distribution. + +2. Run makeglossaries on the document. This can be done on a +terminal either by typing + + makeglossaries minimalgls + +or by typing + + perl makeglossaries minimalgls + +If you don't have Perl installed you will need to run makeindex +directly: + + makeindex -s minimalgls.ist -t minimalgls.glg -o minimalgls.gls minimalgls.glo + +Another alternative is to use the Java application makeglossariesgui +(http://ctan.org/pkg/makeglossariesgui) which has diagnostic tools +to help determine what has gone wrong if there's a problem. + +3. Repeat step 1. Your document minimalgls.pdf should now have a +glossary. + +If the above seems complicated, you can automate the process using +tools such as latexmk or arara. See +http://www.dickimaw-books.com/latex/thesis/html/build.html for +further details. diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf Binary files differindex 2e65e9f41e3..e0f22a08124 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex index d2e575aaec8..91b70b8bc02 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex @@ -22,15 +22,29 @@ % A further run through LaTeX will be required to ensure that % the table of contents is up to date if the toc option % is used. + % Alternatively, if you use arara, you can add the following + % directives in your document: + % + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + \documentclass{article} \listfiles \usepackage[colorlinks]{hyperref} - \usepackage{glossaries} % acronym will go in main glossary - %\usepackage[acronym]{glossaries} % make a separate list of acronyms + %\usepackage{glossaries} % acronym will go in main glossary + \usepackage[acronym]{glossaries} % make a separate list of acronyms \makeglossaries +\longnewglossaryentry{par}{name={par}}% +{% + A long description with a paragraph break. + + This is the next paragraph. +} + \newglossaryentry{sample}{name={sample}, description={a sample entry}} @@ -43,5 +57,8 @@ A \gls{sample} entry and \gls{aca}. Second use: \gls{aca}. Plurals: \glspl{sample}. Reset acronym\glsreset{aca}. First use: \glspl{aca}. Second use: \glspl{aca}. +If you want paragraph breaks in the description use +\verb|\longnewglossaryentry|, as with entry \gls{par}. + \printglossaries \end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf Binary files differnew file mode 100644 index 00000000000..f83b5970852 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.tex new file mode 100644 index 00000000000..e4c5d87d3d8 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.tex @@ -0,0 +1,29 @@ + % This file is public domain + % If you are using arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } +\documentclass{report} + +\usepackage[colorlinks]{hyperref} +\usepackage[hyperfirst=false]{glossaries} + +\makeglossaries + +\renewcommand*{\glsentryfmt}{% + \glsgenentryfmt + \ifglsused{\glslabel}{}{\footnote{\glsentrydesc{\glslabel}}}% +} + +\newglossaryentry{sample}{name={sample},description={an example +description}} + +\begin{document} +\chapter{Sample Chapter} + +First use: \gls{sample}. + +Next use: \gls{sample}. + +\printglossaries +\end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf Binary files differindex e466ab412b7..330c13f5c8a 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex index 29effbe6085..8aaca674dad 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex @@ -1,3 +1,8 @@ + % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{article} \usepackage[colorlinks]{hyperref} @@ -21,8 +26,10 @@ a \gls{pear}}} \newglossaryentry{fruit}{name=fruit, description={sweet, fleshy product of plant containing seed}} +\glssee{fruit}{pear,apple,banana} \begin{document} +\gls{pear}, \gls{apple} and \gls{banana}. \printglossaries diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf Binary files differindex 692b6f6ded3..06ee48a0913 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex index a0de228a23f..c6a9c5d8612 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex @@ -1,13 +1,15 @@ % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{report} \usepackage[colorlinks]{hyperref} \usepackage[acronym, % create list of acronyms nomain, % don't need main glossary for this example style=tree, % need a style that displays the symbol - hyperfirst=false,% don't hyperlink first use - sanitize=none % switch off sanitization as description - % will be used in the main text + hyperfirst=false% don't hyperlink first use ]{glossaries} \makeglossaries @@ -19,7 +21,7 @@ % document the short form will be displayed in small caps, but in % the list of acronyms the short form is displayed in normal % capitals. To ensure this, the short form should be written in - % lower case when the acronym is defined, and \MakeUppercase is + % lower case when the acronym is defined, and \MakeTextUppercase is % used when it's displayed in the list of acronyms. % In the list of acronyms, the long form is used as the name, the @@ -28,28 +30,14 @@ \renewcommand*{\CustomAcronymFields}{% name={\the\glslongtok},% - symbol={\MakeUppercase{\the\glsshorttok}},% + symbol={\MakeTextUppercase{\the\glsshorttok}},% text={\textsc{\the\glsshorttok}},% plural={\textsc{\the\glsshorttok}\noexpand\acrpluralsuffix}% } \renewcommand*{\SetCustomDisplayStyle}[1]{% - % ##1 corresponds to the 'first' key - % ##2 corresponds to the 'description' key - % ##3 corresponds to the 'symbol' key - % ##4 is the inserted text given by the final optional argument to - % commands like \gls - % The short form can be obtained via \glsentryshort{\glslabel} - % The plural short form can be obtained via - % \glsentryshortplural{\glslabel} - % The long form can be obtained via \glsentrylong{\glslabel} - % The plural long form can be obtained via - % \glsentrylongplural{\glslabel} - \defglsdisplayfirst[#1]{##1##4\protect\footnote{% - \glsentrylong{\glslabel}: ##2}}% - % ##1 corresponds to the 'text' key - % the rest as above - \defglsdisplay[#1]{##1##4}% + \defglsentryfmt[#1]{\glsgenentryfmt + \ifglsused{\glslabel}{}{\footnote{\glsentrylong{\glslabel}}}}% } % Now set the custom acronym style (to override the default style) diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf Binary files differindex b67bb0e45a0..2c3fc72edd7 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex index 0da681150ed..0015f9385a7 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex @@ -1,4 +1,8 @@ % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{article} \usepackage[acronym]{glossaries} @@ -7,11 +11,11 @@ \newcommand*{\newdualentry}[5][]{% \newglossaryentry{main-#2}{name={#4},% - text={#3\protect\glsadd{#2}},% + text={#3\glsadd{#2}},% description={#5},% #1 }% - \newacronym{#2}{#3\protect\glsadd{main-#2}}{#4} + \newacronym{#2}{#3\glsadd{main-#2}}{#4} } \newdualentry{svm}% label diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf Binary files differnew file mode 100644 index 00000000000..f08d62b9e7b --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.tex new file mode 100644 index 00000000000..a057805db1a --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.tex @@ -0,0 +1,28 @@ + % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } +\documentclass{article} + +\usepackage[colorlinks]{hyperref} +\usepackage[style=tree]{glossaries} + +\makeglossaries + +\renewcommand*{\glsentryfmt}{% + \glsgenentryfmt + \ifglsused{\glslabel}{}{\space (\glsentrysymbol{\glslabel})}% +} + +\newglossaryentry{distance}{name=distance, +description={The length between two points}, +symbol={km}} + +\begin{document} + +First use: \gls{distance}. Next use: \gls{distance}. + +\printglossaries + +\end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf Binary files differnew file mode 100644 index 00000000000..ec58ceee2c1 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.tex new file mode 100644 index 00000000000..c33ca87c160 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.tex @@ -0,0 +1,60 @@ + % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } +\documentclass{report} + +\usepackage[colorlinks]{hyperref} +\usepackage[toc]{glossaries} +\usepackage{glossary-mcols} + +\newglossary[ilg]{index}{ind}{idx}{\indexname} + +\makeglossaries + +\newcommand*{\newterm}[2][]{% + \newglossaryentry{#2}{type={index},name={#2},description={\nopostdesc},#1}% +} + + +\newterm[plural={stegosauruses}]{stegosaurus} +\newterm[plural={triceratopses}]{triceratops} +\newterm[plural={apatosauruses}]{apatosaurus} + +\newterm[name={dinosaur}]{ind-dinosaur} +\newterm[name={Triassic}]{ind-triassic} + + +\newglossaryentry{dinosaur}% +{% + name={dinosaur\glsadd{ind-dinosaur}},% + description={One of a group of dinosauria}% +} + +\newglossaryentry{Triassic}% +{% + name={Triassic\glsadd{ind-triassic}},% + description={The first period of the Mesozoic Era} +} + +\begin{document} +\tableofcontents + +\chapter{Dinosaurs} + +\Glspl{dinosaur} are now extinct. They first appeared during the +\gls{Triassic} period. Examples of \glspl{dinosaur} include the +\gls{triceratops}, the \gls{apatosaurus} and the \gls{stegosaurus}. + +\renewcommand*{\glsnamefont}[1]{\textbf{\makefirstuc{#1}}} + +\printglossary[style=long,nogroupskip] + +\renewcommand*{\glsnamefont}[1]{\textmd{#1}} + +\printglossary[type=index,style=mcolindexgroup] + +\end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf Binary files differnew file mode 100644 index 00000000000..82734c9a991 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.tex index 88ae07a23a1..08a4198aa51 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.tex @@ -1,4 +1,9 @@ % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } \documentclass[a4paper]{report} \usepackage[plainpages=false,colorlinks]{hyperref} @@ -8,7 +13,7 @@ \renewcommand*{\glossarysection}[2][]{\textbf{#1}: } \renewcommand{\glsnamefont}[1]{\textsc{#1}} -\glossarystyle{inline} +\setglossarystyle{inline} \makeglossaries diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf Binary files differnew file mode 100644 index 00000000000..c8fa4a5fc6c --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.tex index f7675f8b6c6..94ff5659ae0 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.tex @@ -1,3 +1,8 @@ + % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass[english,french]{article} \usepackage[utf8]{inputenc} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.pdf Binary files differnew file mode 100644 index 00000000000..1dec2b40193 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.tex index 71f35e1acbc..22522a04942 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.tex @@ -1,3 +1,6 @@ + % This file is public domain + % If you want to use arara, you need the following directive: + % arara: pdflatex: { synctex: on } \documentclass{article} \usepackage{mfirstuc} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf Binary files differnew file mode 100644 index 00000000000..88e358ab486 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.tex new file mode 100644 index 00000000000..6a3f3d5af26 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.tex @@ -0,0 +1,56 @@ + % This file is public domain + % If you are using arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } +\documentclass{article} + +\usepackage[colorlinks]{hyperref} +\usepackage[nopostdot,nogroupskip]{glossaries} + +\glsaddkey*% star version needed as default value needs expanding + {ed}% key + {\glsentrytext{\glslabel}ed}% default value + {\glsentryed}% command analogous to \glsentrytext + {\Glsentryed}% command analogous to \Glsentrytext + {\glsed}% command analogous to \glstext + {\Glsed}% command analogous to \Glstext + {\GLSed}% command analogous to \GLStext + +\glsaddkey* + {ing}% key + {\glsentrytext{\glslabel}ing}% default value + {\glsentrying}% command analogous to \glsentrytext + {\Glsentrying}% command analogous to \Glsentrytext + {\glsing}% command analogous to \glstext + {\Glsing}% command analogous to \Glstext + {\GLSing}% command analogous to \GLStext + +\makeglossaries + +\newglossaryentry{jump}{name={jump},description={}} + +\newglossaryentry{run}{name={run},% + ed={ran},% + ing={running}, + description={}} + +\newglossaryentry{waddle}{name={waddle},% + ed={waddled},% + ing={waddling},% + description={}} + +\begin{document} + +This is a sample document illustrating how to add new glossary entry +keys. + +The dog \glsed{jump} over the duck. + +The duck was \glsing{waddle} round the dog. + +The dog \glsed{run} away from the duck. + +\printglossaries + +\end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf Binary files differnew file mode 100644 index 00000000000..c6b29209d6a --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.tex new file mode 100644 index 00000000000..c1efc549d07 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.tex @@ -0,0 +1,47 @@ + % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } +\documentclass{report} + +\usepackage[colorlinks]{hyperref} +\usepackage{glossaries} + +\makeglossaries + + % switch off hyperlinks: +\glsdisablehyper + + % redefine \glsentryfmt so that it adds a hyperlink + % if not in math mode +\renewcommand*{\glsentryfmt}{% + \ifmmode + \glsgenentryfmt + \else + % Temporarily enable hyperlinks: + \glsenablehyper + \glshyperlink[\glsgenentryfmt]{\glslabel}% + % Disable hyperlinks again + \glsdisablehyper + \fi +} + +\renewcommand{\glossarypreamble}{\glsenablehyper} +\renewcommand{\glossarypostamble}{\glsdisablehyper} + + % define a sample entry: +\newglossaryentry{x}{name={x},description={sample entry}} + +\begin{document} +\chapter{Sample} +In text mode: \gls{x}. Inline maths: $\gls{x}$. Displayed +maths: +\[ + \gls{x} +\] + +Back to text mode again: \gls{x}. + +\printglossaries +\end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf Binary files differnew file mode 100644 index 00000000000..0a1393e507b --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.tex index 32a4bd86cd0..24b93edb498 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.tex @@ -1,3 +1,9 @@ + % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } \documentclass{report} \usepackage[colorlinks]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf Binary files differnew file mode 100644 index 00000000000..1f751257d72 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.tex new file mode 100644 index 00000000000..ab1260cc727 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.tex @@ -0,0 +1,73 @@ + % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } + +\documentclass{article} + +\usepackage[colorlinks]{hyperref} +\usepackage[toc,acronym]{glossaries-prefix} + +\makeglossaries + +\newglossaryentry{sample}{name={sample}, + description={an example}, + prefix={a~}, + prefixplural={the\space}% +} + +\newglossaryentry{oeil}{name={oeil}, + plural={yeux}, + description={eye}, + prefix={l'}, + prefixplural={les\space}} + +\newacronym + [% + prefix={an\space},prefixfirst={a~}% + ]{svm}{SVM}{support vector machine} + +\newglossarystyle{plist}{% + \setglossarystyle{list}% + \renewcommand*{\glossentry}[2]{% + \item[\glsentryitem{##1}% + \Glsentryprefix{##1}% + \glstarget{##1}{\glossentryname{##1}}] + \glossentrydesc{##1}\glspostdescription\space ##2}% +} + +\begin{document} + +\tableofcontents + +\section{Sample} + +First use: \pgls{sample}, \pgls{svm}, \pgls{oeil}. Next use: \pgls{sample}, \pgls{svm}, \pgls{oeil}. + +Reset. \glsresetall + +First use: \pglspl{sample}, \pglspl{svm}, \pglspl{oeil}. Next use: +\pglspl{sample}, \pglspl{svm}, \pglspl{oeil}. + +Reset. \glsresetall + +First use: \Pgls{sample}, \Pgls{svm}. Next use: \Pgls{sample}, \Pgls{svm}. + +Reset. \glsresetall + +First use: \Pglspl{sample}, \Pglspl{svm}. Next use: \Pglspl{sample}, \Pglspl{svm}. + +Reset. \glsresetall + +First use: \PGLS{sample}, \PGLS{svm}. Next use: \PGLS{sample}, \PGLS{svm}. + +Reset. \glsresetall + +First use: \PGLSpl{sample}, \PGLSpl{svm}. Next use: \PGLSpl{sample}, \PGLSpl{svm}. + +\printglossary[style=plist] + +\printacronyms +\end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf Binary files differnew file mode 100644 index 00000000000..1e05192921b --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.tex new file mode 100644 index 00000000000..d65b46f0f3a --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.tex @@ -0,0 +1,17 @@ + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } +\documentclass{article} +\usepackage{siunitx} +\usepackage[style=long4col]{glossaries} +\makeglossaries +\newglossaryentry{ohm}{% + name=ohm, + symbol={\si{\ohm}}, + description=unit of electrical resistance% +} +\begin{document} +\glsaddallunused +\printglossaries +\end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf Binary files differindex aa6dde8642f..f8efe8420fa 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex index 8cbe6d42068..7f7a616e109 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex @@ -1,4 +1,9 @@ % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } \documentclass[a4paper]{report} \usepackage[plainpages=false,colorlinks]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf Binary files differindex 4cfdbfd3745..4a74fc9589f 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex index 846a5056571..1f6125dc1d9 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex @@ -1,4 +1,8 @@ % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass[a4paper]{article} \usepackage[style=long4colheaderborder]{glossaries} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf Binary files differindex 76f1490b3fb..5068fd13644 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex index 9dcd5f69e84..048cb7ab44f 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex @@ -1,4 +1,9 @@ % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } \documentclass[a4paper]{report} \usepackage[colorlinks,plainpages=false]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf Binary files differindex 33ce9b8a39f..968ca13ec3e 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex index e57550ce872..70905f05b3e 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex @@ -1,4 +1,9 @@ % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } \documentclass[a4paper]{report} \usepackage[colorlinks,plainpages=false]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf Binary files differindex a1fc0b0f59a..5dc3ff4a686 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex index a19501afad7..cbcd1723b9c 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex @@ -1,4 +1,8 @@ % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{article} \usepackage[colorlinks,plainpages=false]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf Binary files differindex 3b084ece857..924a7d43a55 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex index c1a3aadc015..4f69d980a03 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex @@ -1,13 +1,18 @@ % This file is public domain % % See also sampleAcrDesc.tex + % + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } \documentclass[a4paper]{report} \usepackage[colorlinks,plainpages=false]{hyperref} \usepackage[style=altlist, % use altlist style - toc, % add the glossary to the table of contents - sanitize={description=false}% don't sanitize description + toc % add the glossary to the table of contents ]{glossaries} \makeglossaries @@ -16,10 +21,8 @@ % how the entry name should appear in the glossary name={Support vector machine (SVM)}, % how the description should appear in the glossary - % since I have used sanitize={description=false} - % I have to protect fragile commands description={Statistical pattern recognition -technique~\protect\cite{svm}}, +technique~\cite{svm}}, % how the entry should appear in the document text text={svm}, % how the entry should appear the first time it is diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf Binary files differindex 21c26d4f161..303b4eddeb8 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex index 9cee73eade9..715bdc504d3 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex @@ -3,7 +3,7 @@ \usepackage{amsmath} \usepackage[colorlinks]{hyperref} -\usepackage[toc,ucmark,style=long3colheader,counter=equation]{glossaries} +\usepackage[xindy,toc,ucmark,style=long3colheader,counter=equation]{glossaries} \makeglossaries diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf Binary files differindex 14365f86aa0..1371a16d0ae 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex index 63af21a2bc9..d00d89ccaff 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex @@ -14,6 +14,13 @@ % (Note that this problem is avoided if the page numbering is % reset after the glossary. For example, if the glossary has % roman numbering and the subsequent pages have arabic numbering) + % + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass[a4paper,12pt]{report} \usepackage{amsmath} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf Binary files differindex 6b551a3a015..b8dc7693ec1 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex index cd682b4e230..ad1312c1881 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex @@ -1,9 +1,14 @@ % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } \documentclass{report} \usepackage[plainpages=false,colorlinks]{hyperref} \usepackage{html} -\usepackage[toc,savewrites,xindy]{glossaries} +\usepackage[toc,xindy]{glossaries} % Define a new glossary type called notation \newglossary[nlg]{notation}{not}{ntn}{Notation} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf Binary files differnew file mode 100644 index 00000000000..c22f64b2e70 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.tex b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.tex new file mode 100644 index 00000000000..bda4a4bd258 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.tex @@ -0,0 +1,57 @@ + % This file is public domain + % If you are using arara, you need the following directives: + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } +\documentclass{report} + +\usepackage[colorlinks]{hyperref} +\usepackage[toc]{glossaries} + +\makeglossaries + +\newcommand{\sortname}[2]{#2, #1} +\newcommand{\textname}[2]{#1 #2} + + % Syntax: \name{first name}{surname} + \let\name\textname + +\renewcommand{\glsprestandardsort}[3]{% + \let\name\sortname + \edef#1{\expandafter\expandonce\expandafter{#1}}% + \let\name\textname + \glsdosanitizesort +} + +\newglossaryentry{joebloggs}{name={\name{Joe}{Bloggs}},description={\nopostdesc}} + +\newglossaryentry{johnsmith}{name={\name{John}{Smith}},description={\nopostdesc}} + +\newglossaryentry{zoeadams}{name={\name{Zo\'e}{Adams}},description={\nopostdesc}} + +\newglossaryentry{maryadams}{name={\name{Mary}{Adams}},description={\nopostdesc}} + +\begin{document} +\tableofcontents + +\chapter{\glsentrytext{joebloggs}} + +\gls{joebloggs} was a fairly ordinary person. + +\chapter{\glsentrytext{johnsmith}} + +\gls{johnsmith} was great friends with \gls{joebloggs}. + +\chapter{\glsentrytext{maryadams}} + +\gls{maryadams} worked with \gls{johnsmith} but never met +\gls{joebloggs}. + +\chapter{\glsentrytext{zoeadams}} + +\gls{zoeadams} was \gls{maryadams}['s] sister. +\printglossaries + +\end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf Binary files differindex e02779b103f..72e6deced22 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex index e6d5a11cce0..f9e56966716 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex @@ -1,4 +1,9 @@ % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } \documentclass{report} \usepackage[plainpages=false,colorlinks]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf Binary files differnew file mode 100644 index 00000000000..70b4731d157 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.tex new file mode 100644 index 00000000000..3ea8ec5add6 --- /dev/null +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.tex @@ -0,0 +1,101 @@ + % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } +\documentclass{report} + +\usepackage[plainpages=false,colorlinks]{hyperref} +\usepackage[toc,acronym]{glossaries} + + % Define a new glossary type called notation +\newglossary[nlg]{notation}{not}{ntn}{Notation} + +\makeglossaries + +\newcounter{sortcount} + +\renewcommand{\glsprestandardsort}[3]{% + \ifdefstring{#2}{notation}% + {% + \stepcounter{sortcount}% + \edef#1{\glssortnumberfmt{\arabic{sortcount}}}% + }% + {% + \glsdosanitizesort + }% +} + + % Notation definitions + +\newglossaryentry{not:set}{type=notation, % glossary type +name={$\mathcal{S}$}, +text={\mathcal{S}}, +description={A set}} + +\newglossaryentry{not:emptyset}{type=notation, +name={$\emptyset$}, +text={\emptyset}, +description={The empty set}} + +\newglossaryentry{not:card}{type=notation, +name={$|\mathcal{S}|$}, +text={|\mathcal{S}|}, +description={cardinality of $\mathcal{S}$}} + + % Main glossary definitions + +\newglossaryentry{gls:set}{name=set, +description={A collection of distinct objects}} + +\newglossaryentry{gls:card}{name=cardinality, +description={The number of elements in the specified set}} + + % Acronym definitions + +\newacronym{zfc}{ZFC}{Zermelo-Fraenkel set theory} + +\newacronym{ad}{AD}{axiom of determinacy} + +\newacronym{nf}{NF}{new foundations} + +\begin{document} +\title{Sample Document using the glossaries Package} +\author{Nicola Talbot} +\pagenumbering{alph} +\maketitle + +\begin{abstract} + %stop hyperref complaining about duplicate page identifiers: +\pagenumbering{Alph} +This is a sample document illustrating the use of the +\textsf{glossaries} package. In this example, a new glossary type +called \texttt{notation} is defined, so that the document can have a +separate glossary of terms, list of acronyms and index of notation. +\end{abstract} + +\pagenumbering{roman} +\tableofcontents + +\printglossaries + +\chapter{Introduction} +\pagenumbering{arabic} + +\Glspl{gls:set} are denoted by a calligraphic font +e.g.\ $\gls{not:set}$. + +The \gls{gls:card} of a set $\mathcal{S}$ is denoted +$\gls{not:card}$. The empty set is denoted +$\gls{not:emptyset}$. + +Here are some acronyms: \gls{nf}, \gls{zfc} and \gls{ad}. + +\chapter{Another Chapter} + +Another mention of the empty set $\gls{not:emptyset}$. + +Here are the acronyms again: \gls{nf}, \gls{zfc} and \gls{ad}. + +\end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf Binary files differindex 227e50e110e..78e0f868e3a 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex index b22b08fbe5d..342902d8e55 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex @@ -1,7 +1,13 @@ % This file is public domain -\documentclass{article} + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } +\documentclass[a4paper]{article} -\usepackage[acronym,smallcaps]{glossaries-accsupp} +\usepackage[margin=0.5in]{geometry} +\usepackage{booktabs} +\usepackage[acronym]{glossaries-accsupp} \makeglossaries @@ -11,16 +17,27 @@ \newacronym{eg}{e.g.}{for example} -\begin{document} -\gls{dr}~Jones. -\gls{dr}~Jones. - -\Gls{eg}, \gls{eg}, \acrshort{eg}, \acrlong{eg}, \acrfull{eg}. +\newcommand*{\samplerow}[1]{% + \gls{#1} & \gls{#1} & \acrshort{#1} & \acrlong{#1}\\ + \glsreset{#1}\Gls{#1} & \Gls{#1} & \Acrshort{#1} & \Acrlong{#1}\\ + \glsreset{#1}\GLS{#1} & \GLS{#1} & \ACRshort{#1} & \ACRlong{#1}\\ +} -\Acrshort{eg}, \ACRshort{eg}. \Acrlong{eg}, \ACRlong{eg}. -\Acrfull{eg}, \ACRfull{eg}. +\begin{document} -\gls{svm}. \gls{svm}, \acrshort{svm}, \acrlong{svm}, \acrfull{svm}. +\begin{center} +\begin{tabular}{lllll} +\toprule +\bfseries First & \bfseries Next & \bfseries Short & \bfseries Long +\\\midrule +\samplerow{dr} +\midrule +\samplerow{eg} +\midrule +\samplerow{svm} +\bottomrule +\end{tabular} +\end{center} \printglossaries \end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf Binary files differindex 3c90543a477..698712dca9a 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex index fd7099e1dbf..45faef90cdc 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex @@ -1,4 +1,8 @@ % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{article} \usepackage[acronym,footnote,acronymlists={main,acronym2}]{glossaries} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf Binary files differindex 10b3ab04b5d..83144e1d79d 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex index 98d667d7ca9..59f8ecd4904 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex @@ -1,4 +1,8 @@ % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{report} \usepackage[colorlinks]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf Binary files differindex 8acf6eacb7f..7f7e7557312 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex index e249fee0214..fc01afc87e6 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex @@ -1,4 +1,8 @@ % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{article} \usepackage[utf8]{inputenc} @@ -7,6 +11,9 @@ \makeglossaries + % Note that because the é is the first letter of the + % name, it needs to be grouped or it will cause a + % problem for \makefirstuc due to expansion issues. \newglossaryentry{elite}{name={{é}lite}, description={select group or class}} @@ -19,6 +26,8 @@ description=large deer} \newglossaryentry{mannerly}{name=mannerly, description=polite} + % The Å“ is not the first letter, so it doesn't need to + % be grouped. \newglossaryentry{manoeuvre}{name={manÅ“uvre}, description=planned and controlled movement} @@ -36,7 +45,6 @@ description={canal from mouth to stomach}} description=man-eating giant} \begin{document} -\null % ensure that the first run produces some output \glsaddall \printglossaries diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf Binary files differdeleted file mode 100644 index b79a8c4392c..00000000000 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf Binary files differindex 94c94944c82..47899d9da0f 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex index ec94891df1b..2c7182eec36 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex @@ -18,6 +18,10 @@ % % xindy -L english -C utf8 -I xindy -M samplexdy -t samplexdy.glg -o samplexdy.gls samplexdy.glo % + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{article} \usepackage[utf8]{inputenc} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf Binary files differindex fef8d06422d..ed47e7a1c1c 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex index d6d12d8087d..1321e3ff94c 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex @@ -9,6 +9,10 @@ % % This sample file won't work with makeindex % + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{report} \usepackage[utf8]{inputenc} @@ -49,6 +53,7 @@ the glossaries package. \part{First Part} \chapter{Sample Chapter} +This example document has an eccentric section numbering system. \section{First Section} diff --git a/Master/texmf-dist/scripts/glossaries/makeglossaries b/Master/texmf-dist/scripts/glossaries/makeglossaries index 811848b5437..fc1082e176d 100755 --- a/Master/texmf-dist/scripts/glossaries/makeglossaries +++ b/Master/texmf-dist/scripts/glossaries/makeglossaries @@ -2,7 +2,7 @@ # File : makeglossaries # Author : Nicola Talbot -# Version : 2.07 (2013/06/17) +# Version : 2.09 (2013/11/12) # Description: simple Perl script that calls makeindex or xindy. # Intended for use with "glossaries.sty" (saves having to remember # all the various switches) @@ -27,9 +27,13 @@ # glossary-super.sty, glossaries.perl. # Also makeglossaries and makeglossaries. -my $version="2.07 (2013-06-17)"; +my $version="2.09 (2013-11-12)"; # History: +# v2.09 (2013-11-12): +# * added check for -q switch when issuing warnings. +# v2.08 (2013-10-14): +# * added -x and -m options # v2.07 (2013-06-17): # * added check for success on chdir if -d used # * added dialect map @@ -84,8 +88,9 @@ use strict; # v2.01 added the following line use warnings; # v2.05 added $opt_d +# v2.08 added $opt_x and $opt_m use vars qw($opt_q $opt_t $opt_o $opt_s $opt_p $opt_g $opt_c $opt_r - $opt_l $opt_i $opt_L $opt_n $opt_C $opt_d); + $opt_l $opt_i $opt_L $opt_n $opt_C $opt_d $opt_x $opt_m); $Getopt::Std::STANDARD_HELP_VERSION = 1; @@ -94,7 +99,7 @@ $Getopt::Std::STANDARD_HELP_VERSION = 1; # .tex file) # v1.5 added -n (print the command that would be issued but # don't actually run the command) -getopts('s:o:t:p:L:C:ilqrcgnd:'); +getopts('s:o:t:p:L:C:ilqrcgnd:x:m:'); unless ($#ARGV == 0) { @@ -208,6 +213,11 @@ unless ($istfile) "Did you remember to use \\makeglossaries?\n"; } +# v2.08 added $xindyapp and $makeindexapp +# By default assume they are on the operating system's path +my $xindyapp = ($opt_x ? $opt_x :'xindy'); +my $makeindexapp = ($opt_m ? $opt_m :'makeindex'); + # v1.5 save the general xindy switches my $xdyopts = ''; @@ -371,12 +381,12 @@ if ($ext) if ($usexindy) { &xindy("$name.$ext", $outfile, $transcript,$istfile, - $thislang, $thiscodepage, $xdyopts, $opt_q, $opt_n); + $thislang, $thiscodepage, $xdyopts, $opt_q, $opt_n, $xindyapp); } else { &makeindex("$name.$ext",$outfile,$transcript,$istfile, - $mkidxopts,$opt_q, $opt_n); + $mkidxopts,$opt_q, $opt_n, $makeindexapp); } } else @@ -406,15 +416,16 @@ else # v1.6 added file existance test unless (-e $inputfile) { + # v2.09 suppress warning if -q switch in use print "Warning: File '$inputfile' doesn't exist.\n", - "*** Skipping glossary '$type'. ***\n"; + "*** Skipping glossary '$type'. ***\n" unless ($opt_q); next; } unless (-r $inputfile) { print "Warning: No read access for '$inputfile' $!\n", - "*** Skipping glossary '$type'. ***\n"; + "*** Skipping glossary '$type'. ***\n" unless ($opt_q); next; } @@ -444,7 +455,8 @@ else "don't want to use the main glossary.\n"; } - warn $message; + # v2.09 suppress warning if -q switch in use + warn $message unless $opt_q; # Write warning to transcript file. @@ -480,12 +492,12 @@ else { &xindy($inputfile,$outfile,$transcript,$istfile, $language{$type},$codepage{$type}, - $xdyopts,$opt_q,$opt_n); + $xdyopts,$opt_q,$opt_n, $xindyapp); } else { &makeindex($inputfile,$outfile,$transcript, - $istfile,$mkidxopts,$opt_q,$opt_n); + $istfile,$mkidxopts,$opt_q,$opt_n, $makeindexapp); } } } @@ -661,15 +673,16 @@ sub run_app{ return ($status, $warnings, $errno); } +# v2.08 added $app parameter sub makeindex{ - my($in,$out,$trans,$ist,$rest,$quiet,$dontexec) = @_; + my($in,$out,$trans,$ist,$rest,$quiet,$dontexec,$app) = @_; my $args = "$rest -s \"$ist\" -t \"$trans\" -o \"$out\" \"$in\""; # v2.01 replaced code with call to &run_app my ($status, $warnings, $errno) - = &run_app('makeindex', $args, $trans, $quiet, $dontexec); + = &run_app($app, $args, $trans, $quiet, $dontexec); return if ($dontexec); @@ -695,9 +708,10 @@ sub makeindex{ } } +# v2.08 added $app parameter sub xindy{ my($in,$out,$trans,$ist,$language,$codepage,$rest,$quiet, - $dontexec) = @_; + $dontexec, $app) = @_; my($args, $langparam, $main, $retry); my($module); @@ -787,7 +801,7 @@ sub xindy{ # v2.01 replaced code with call to &run_app my ($status, $warnings, $errno) - = &run_app('xindy', $args, $trans, $quiet, $dontexec); + = &run_app($app, $args, $trans, $quiet, $dontexec); return if ($dontexec); @@ -935,30 +949,35 @@ sub xindy{ sub HELP_MESSAGE{ print "\nSyntax : makeglossaries [options] <filename>\n\n"; print "For use with the glossaries package to pass relevant\n"; - print "files to makeindex or xindy\n\n"; + print "files to makeindex or xindy.\n\n"; print "<filename>\tBase name of glossary file(s). This should\n"; print "\t\tbe the name of your main LaTeX document without any\n"; print "\t\textension.\n"; - print "\n General Options:\n"; + print "\nGeneral Options:\n\n"; print "-o <gls>\tUse <gls> as the output file.\n"; - print "-q\t\tQuiet mode\n"; - print "-s <sty>\tEmploy <sty> as the style file\n"; - print "-t <log>\tEmploy <log> as the transcript file\n"; - print "-d <directory>\tRun xindy/makeindex in <directory>\n"; + print "-q\t\tQuiet mode.\n"; + print "-s <sty>\tEmploy <sty> as the style file.\n"; + print "-t <log>\tEmploy <log> as the transcript file.\n"; + print "-d <directory>\tDirectory in which the .aux, .glo etc files are located.\n", + "\t\t(Default is the directory in which <filename> resides.)\n"; print "-n\t\tPrint the command that would normally be executed,\n", - "\t\tbut don't execute it\n"; + "\t\tbut don't execute it.\n"; - print "\n Xindy Options:\n"; + print "\nXindy Options:\n\n"; print "-L <language>\tUse <language>.\n"; - - print "\n Makeindex Options:\n"; - print "-c\t\tCompress intermediate blanks\n"; - print "-g\t\tEmploy German word ordering\n"; - print "-l\t\tLetter ordering\n"; - print "-p <num>\tSet the starting page number to be <num>\n"; - print "-r\t\tDisable implicit page range formation\n"; - print "\nSee makeindex documentation for further details on these "; - print "options\n"; + print "-x <file>\tFull path to xindy executable.\n", + "\t\t(Default assumes xindy is on the operating system's path.)\n"; + + print "\nMakeindex Options:\n"; + print "(See makeindex documentation for further details on these "; + print "options.)\n\n"; + print "-c\t\tCompress intermediate blanks.\n"; + print "-g\t\tEmploy German word ordering.\n"; + print "-l\t\tLetter ordering.\n"; + print "-p <num>\tSet the starting page number to be <num>.\n"; + print "-r\t\tDisable implicit page range formation.\n"; + print "-m <file>\tFull path to makeindex executable.\n", + "\t\t(Default assumes makeindex is on the operating system's path.)\n"; } sub VERSION_MESSAGE{ @@ -977,7 +996,8 @@ makeglossaries - Calls makeindex/xindy for LaTeX documents using glossaries pac B<makeglossaries> [B<-o> I<file>] [B<-q>] [B<-s> I<file>] [B<-t> I<file>] [B<-L> I<language>] [B<-c>] [B<-g>] [B<-l>] -[B<-p> I<num>] [B<-r>] [B<--version>] [B<--help>] I<filename> +[B<-p> I<num>] [B<-r>] [B<-d> I<aux dir>] [B<-m> I<file>] [B<-x> I<file>] +[B<--version>] [B<--help>] I<filename> =head1 DESCRIPTION @@ -1039,6 +1059,21 @@ Sets the starting page number to be I<num> (B<makeindex> only). Disable implicit page range formation (B<makeindex> only). +=item B<-d> I<aux dir> + +Specify the directory the .aux, .glo etc files are located. +Defaults to the parent directory of the base file I<filename>. + +=item B<-m> I<file> + +Specify the full path name for B<makeindex> to I<file> in the +event that B<makeindex> isn't on the operating system's path. + +=item B<-x> I<file> + +Specify the full path name for B<xindy> to I<file> in the +event that B<xindy> isn't on the operating system's path. + =item B<--version> Prints version number and exits. diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx index c3d0d7ef498..c5b4d894614 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx @@ -1,5 +1,5 @@ %\iffalse -% glossaries.dtx generated using makedtx version 0.94b (c) Nicola Talbot +% glossaries.dtx generated using makedtx version 1.1 (c) Nicola Talbot % Command line args: % -macrocode ".*\.perl" % -macrocode ".*\.tex" @@ -11,9 +11,10 @@ % -comment ".*\.tex" % -comment ".*\.xdy" % -src "glossaries.sty\Z=>glossaries.sty" +% -src "glossaries-prefix.sty\Z=>glossaries-prefix.sty" % -src "mfirstuc.sty\Z=>mfirstuc.sty" % -src "(glossary-.+)\.(sty)\Z=>\1.\2" -% -src "(glossaries-compatible-207)\.(sty)\Z=>\1.\2" +% -src "(glossaries-compatible-.+)\.(sty)\Z=>\1.\2" % -src "(glossaries-accsupp)\.(sty)\Z=>\1.\2" % -src "(glossaries-babel)\.(sty)\Z=>\1.\2" % -src "(glossaries-polyglossia)\.(sty)\Z=>\1.\2" @@ -27,7 +28,7 @@ % -author "Nicola Talbot" % -codetitle "Main Package Code" % glossaries -% Created on 2013/7/5 21:47 +% Created on 2013/11/14 14:05 %\fi %\iffalse %<*package> @@ -61,8 +62,6 @@ glossaries-manual.tex is a stub file used by makedtx to create glossaries.dtx \fi -\RecordChanges - \usepackage{alltt} \usepackage{pifont} \usepackage[utf8]{inputenc} @@ -75,6 +74,8 @@ glossaries.dtx pdfkeywords={LaTeX,package,glossary,acronyms}]{hyperref} \usepackage[toc]{glossaries} +\RecordChanges + \makeglossaries \renewcommand*{\main}[1]{\hyperpage{#1}} @@ -136,7 +137,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \setcounter{IndexColumns}{2} -\CheckSum{14003} +\CheckSum{16315} \newcommand*{\ifirstuse}{\iterm{first use}} \newcommand*{\firstuse}{\gls{firstuse}} @@ -164,12 +165,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of %\MakeShortVerb{"} %\DeleteShortVerb{\|} % -% \title{Documented Code For glossaries v3.07} +% \title{Documented Code For glossaries v4.0} % \author{Nicola L.C. Talbot\\[10pt] %Dickimaw Books\\ %\url{http://www.dickimaw-books.com/}} % -% \date{2013-07-05} +% \date{2013-11-14} % \maketitle % %This is the documented code for the \styfmt{glossaries} package. @@ -185,7 +186,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of %glossaries package}. % %\item[\url{glossaries-user.pdf}] -%For the main user guide, read \qt{glossaries.sty v3.07: +%For the main user guide, read \qt{glossaries.sty v4.0: %\LaTeX2e\ Package to Assist Generating Glossaries}. % %\item[\url{mfirstuc-manual.pdf}] @@ -211,9 +212,9 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of % \printglossaries % \phantomsection % \addcontentsline{toc}{section}{Change History}% +% \raggedright % \PrintChanges -% \clearpage\phantomsection -% \addcontentsline{toc}{section}{Index}\PrintIndex +% \PrintIndex %} % % @@ -229,13 +230,22 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of % This package requires \LaTeXe. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2013/07/05 v3.07 (NLCT)] +\ProvidesPackage{glossaries}[2013/11/14 v4.0 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} +% \end{macrocode} +%\changes{3.11a}{2013-10-15}{Now requires textcase} +% The \sty{textcase} package has much better case changing handling, +% so use \cs{MakeTextUppercase} instead of \cs{MakeUppercase} +% \begin{macrocode} +\RequirePackage{textcase} +\renewcommand*{\mfirstucMakeUppercase}{\MakeTextUppercase}% +% \end{macrocode} +% \begin{macrocode} \RequirePackage{xfor} % \end{macrocode} %\changes{3.04}{2012-11-18}{added datatool-base as a required @@ -269,12 +279,9 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of {% \@ifclassloaded{nlctdoc}{\@gls@docloadedtrue}{\@gls@docloadedfalse}% } -% \end{macrocode} -%\end{macro} -% \begin{macrocode} \if@gls@docloaded % \end{macrocode} -% It has been loaded, so some modifications need to be made to +% \cs{doc} has been loaded, so some modifications need to be made to % ensure both packages can work together. %\begin{macro}{\glsorg@glossary} %\changes{3.04}{2012-11-18}{new} @@ -283,7 +290,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \newcommand{\glsorg@glossary}{% \@bsphack \begingroup - \@sanitize \glsorg@wrglossary + \@sanitize \endgroup\@esphack } % \end{macrocode} %\end{macro} @@ -298,8 +305,17 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of } % \end{macrocode} %\end{macro} +%\changes{3.09a}{2013-10-09}{Add a fix for \cs{RecordChanges}} +% \begin{macrocode} + \renewcommand*{\RecordChanges}{% + \newwrite\@glossaryfile + \immediate\openout\@glossaryfile=\jobname.glo + \def\glsorg@glossary{\@bsphack\begingroup\@sanitize\glsorg@wrglossary}% + \typeout{Writing glossary file \jobname .glo}% + } +% \end{macrocode} +%\end{macro} %\begin{macro}{\changes} -%\changes{3.04}{2012-11-18}{new} % Now we need to redefine \cs{changes} so that it uses the original % definition of \cs{glossary}. % \begin{macrocode} @@ -452,7 +468,8 @@ false,nolabel,autolabel}[nolabel]{% % \autoref{sec:code:styles}. % \begin{macrocode} \define@key{glossaries.sty}{style}{% -\renewcommand*{\@glossary@default@style}{#1}} + \renewcommand*{\@glossary@default@style}{#1}% +} % \end{macrocode} %\end{option} % @@ -630,11 +647,20 @@ false,nolabel,autolabel}[nolabel]{% % %\begin{option}{ucmark} % Boolean option to determine whether or not to use -% \ics{MakeUppercase} in definition of \ics{glossarymark} +% use upper case in definition of \ics{glsglossarymark} %\changes{3.02}{2012/05/21}{new} % \begin{macrocode} \define@boolkey{glossaries.sty}[gls]{ucmark}[true]{} -\glsucmarkfalse +% \end{macrocode} +%\changes{3.13a}{2013-11-05}{added check for memoir} +% \begin{macrocode} +\@ifclassloaded{memoir} +{% + \glsucmarktrue +}% +{% + \glsucmarkfalse +} % \end{macrocode} %\end{option} % @@ -691,6 +717,22 @@ false,nolabel,autolabel}[nolabel]{% } % \end{macrocode} %\end{option} +% +%\begin{macro}{\glsprestandardsort} +%\changes{3.13a}{2013-11-05}{new} +%\begin{definition} +%\cs{glsprestandardsort}\marg{sort cs}\marg{type}\marg{label} +%\end{definition} +% Allow user to hook into sort mechanism. The first argument +% \meta{sort cs} is the temporary control sequence containing the +% sort value before it has been sanitized and had +% \gls{makeindex}\slash\gls{xindy} special characters escaped. +% \begin{macrocode} +\newcommand*{\glsprestandardsort}[3]{% + \glsdosanitizesort +} +% \end{macrocode} +%\end{macro} %\begin{macro}{\@gls@setupsort@standard} %\changes{3.0}{2011/04/02}{new} % Set up the macros for default sorting. @@ -707,6 +749,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Sort according to sort key (\cs{@glo@sort}) if provided otherwise % sort according to the entry's name (\cs{@glo@name}). +% (First argument glossary type, second argument entry label.) % \begin{macrocode} \def\@gls@defsort##1##2{% \ifx\@glo@sort\@glsdefaultsort @@ -714,8 +757,11 @@ false,nolabel,autolabel}[nolabel]{% \fi % \end{macrocode} %\changes{3.03}{2012/09/21}{used \cs{@gls@sanitizesort}} +%\changes{3.13a}{2013-11-05}{moved \cs{@gls@santizesort} to +%\cs{glsprestandardsort}} % \begin{macrocode} - \@gls@sanitizesort + \let\glsdosanitizesort\@gls@sanitizesort + \glsprestandardsort{\@glo@sort}{##1}{##2}% \expandafter\protected@xdef\csname glo@##2@sort\endcsname{\@glo@sort}% }% % \end{macrocode} @@ -897,6 +943,50 @@ false,nolabel,autolabel}[nolabel]{% % or not to define a separate glossary for acronyms. % \begin{macrocode} \define@boolkey{glossaries.sty}[gls]{acronym}[true]{% + \ifglsacronym + \renewcommand{\@gls@do@acronymsdef}{% + \DeclareAcronymList{acronym}% + \newglossary[alg]{acronym}{acr}{acn}{\acronymname}% + \renewcommand*{\acronymtype}{acronym}% + }% + \else + \let\@gls@do@acronymsdef\relax + \fi +} +% \end{macrocode} +%\end{option} +%\begin{macro}{\printacronyms} +% Define \cs{printacronyms} at the start of the document if +% \pkgopt{acronym} is set and compatibility mode isn't on and +% \cs{printacronyms} hasn't already been defined. +% \begin{macrocode} +\AtBeginDocument{% + \ifglsacronym + \ifbool{glscompatible-3.07}% + {}% + {% + \providecommand*{\printacronyms}[1][]{% + \printglossary[type=\acronymtype,#1]}% + }% + \fi +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@gls@do@acronymsdef} +% Set default value +% \begin{macrocode} +\newcommand*{\@gls@do@acronymsdef}{} +% \end{macrocode} +%\end{macro} +% +%\begin{option}{acronyms} +%\changes{3.14a}{2013-11-12}{new} +% Provide a synonym for \pkgopt[true]{acronym} that can be passed +% via the document class options. +% \begin{macrocode} +\DeclareOptionX{acronyms}{% + \glsacronymtrue \DeclareAcronymList{acronym}% } % \end{macrocode} @@ -934,7 +1024,9 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} %\end{macro} %\begin{macro}{\glsIfListOfAcronyms} -%\cs{glsIfListOfAcronyms}\marg{label}\marg{true part}\marg{false part}\\[10pt] +%\begin{definition} +%\cs{glsIfListOfAcronyms}\marg{label}\marg{true part}\marg{false part} +%\end{definition} % Determines if the glossary with the given label has been identified % as being a list of acronyms. % \begin{macrocode} @@ -994,9 +1086,11 @@ false,nolabel,autolabel}[nolabel]{% %\end{macro} %\begin{option}{acronymlists} %\changes{2.04}{2009 November 10}{new}% +%\changes{3.11a}{2013-10-15}{replaced \cs{@addtoacronymlists} with +%\cs{DeclareAcronymList}} % \begin{macrocode} \define@key{glossaries.sty}{acronymlists}{% - \@addtoacronymlists{#1}% + \DeclareAcronymList{#1}% } % \end{macrocode} %\end{option} @@ -1052,52 +1146,137 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} %\end{option} % -% The glossary keys whose values are written to another file (i.e.\ -% \gloskey{sort}, \gloskey{name}, \gloskey{description} and -% \gloskey{symbol}) need to be sanitized, otherwise fragile -% commands would not be able to be used in -% \ics{newglossaryentry}. However, strange results will occur -% if you then use those fields in the document. As these fields -% are not normally used in the document, but are by default only -% used in the glossary, the default is to sanitize them. If however -% you want to use these values in the document (either by redefining -% commands like \ics{glsdisplay} or by using commands like -% \ics{glsentrydesc}) you will have to switch off the -% sanitization using the \pkgopt{sanitize} package option, but -% you will then have to use \ics{protect} to protect fragile -% commands when defining new glossary entries. -% The \pkgopt{sanitize} option -% takes a key-value list as its value, which can be used to -% switch individual values on and off. For example: -%\begin{verbatim} -%\usepackage[sanitize={description,name,symbol=false}]{glossaries} -%\end{verbatim} -%will switch off the sanitization for the \gloskey{symbol} key, but -% switch it on for the \gloskey{description} and \gloskey{name} keys. -% This would mean that you can use fragile commands in the -%description and name when defining a new glossary entry, but not -% for the symbol. +%\begin{macro}{\GlossariesWarning} +% Prints a warning message. +% \begin{macrocode} +\newcommand*{\GlossariesWarning}[1]{% + \PackageWarning{glossaries}{#1}% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\GlossariesWarningNoLine} +% Prints a warning message without the line number. +% \begin{macrocode} +\newcommand*{\GlossariesWarningNoLine}[1]{% + \PackageWarningNoLine{glossaries}{#1}% +} +% \end{macrocode} +%\end{macro} +% Define package option to suppress warnings +% \begin{macrocode} +\DeclareOptionX{nowarn}{% + \renewcommand*{\GlossariesWarning}[1]{}% + \renewcommand*{\GlossariesWarningNoLine}[1]{}% +} +% \end{macrocode} +% As from version 3.08a, the only information written to the external +% glossary files are the label and sort values. Therefore, now, the +% only sanitize option that makes sense is the one for the sort key. +% so the sanitize option is now deprecated and there is only a +% sanitizesort option. % -% The default values are defined as: %\begin{macro}{\@gls@sanitizedesc} % \begin{macrocode} -\newcommand*{\@gls@sanitizedesc}{\@onelevel@sanitize\@glo@desc} +\newcommand*{\@gls@sanitizedesc}{% +} +%\end{macro} +% +%\begin{macro}{\glssetexpandfield} +%\changes{3.13a}{2013-11-05}{new} +%\begin{definition} +%\cs{glssetexpandfield}\marg{field} +%\end{definition} +% Sets field to always expand. +% \begin{macrocode} +\newcommand*{\glssetexpandfield}[1]{% + \csdef{gls@assign@#1@field}##1##2{% + \@@gls@expand@field{##1}{#1}{##2}% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glssetnoexpandfield} +%\changes{3.13a}{2013-11-05}{new} +%\begin{definition} +%\cs{glssetnoexpandfield}\marg{field} +%\end{definition} +% Sets field to never expand. +% \begin{macrocode} +\newcommand*{\glssetnoexpandfield}[1]{% + \csdef{gls@assign@#1@field}##1##2{% + \@@gls@noexpand@field{##1}{#1}{##2}% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\gls@assign@type@field} +%\changes{3.10a}{2013-09-28}{new} +%\changes{3.13a}{2013-11-05}{changed to use \cs{glssetexpandfield}} +% The type must always be expandable. +% \begin{macrocode} +\glssetexpandfield{type} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\gls@assign@desc@field} +%\changes{3.08a}{2013-09-28}{new} +%\changes{3.13a}{2013-11-05}{changed to use \cs{glssetnoexpandfield}} +% The description is not expanded by default: +% \begin{macrocode} +\glssetnoexpandfield{desc} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\gls@assign@descplural@field} +%\changes{3.08a}{2013-09-28}{new} +%\changes{3.13a}{2013-11-05}{changed to use \cs{glssetnoexpandfield}} +% \begin{macrocode} +\glssetnoexpandfield{descplural} % \end{macrocode} %\end{macro} %\begin{macro}{\@gls@sanitizename} % \begin{macrocode} -\newcommand*{\@gls@sanitizename}{\@onelevel@sanitize\@glo@name} +\newcommand*{\@gls@sanitizename}{} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\gls@assign@name@field} +%\changes{3.13a}{2013-11-05}{changed to use \cs{glssetnoexpandfield}} +% Don't expand name by default. +% \begin{macrocode} +\glssetnoexpandfield{name} % \end{macrocode} %\end{macro} %\begin{macro}{\@gls@sanitizesymbol} % \begin{macrocode} -\newcommand*{\@gls@sanitizesymbol}{\@onelevel@sanitize\@glo@symbol} +\newcommand*{\@gls@sanitizesymbol}{} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@gls@assign@symbol@field} +%\changes{3.13a}{2013-11-05}{changed to use \cs{glssetnoexpandfield}} +% Don't expand symbol by default. +% \begin{macrocode} +\glssetnoexpandfield{symbol} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@gls@assign@symbolplural@field} +%\changes{3.13a}{2013-11-05}{changed to use \cs{glssetnoexpandfield}} +%\changes{3.09a}{2013-10-09}{new} +% \begin{macrocode} +\glssetnoexpandfield{symbolplural} % \end{macrocode} %\end{macro} +% +% Sanitizing stuff: %\begin{macro}{\@gls@sanitizesort} %\changes{3.03}{2012/09/21}{new} % \begin{macrocode} -\newcommand*{\@gls@sanitizesort}{\@onelevel@sanitize\@glo@sort} +\newcommand*{\@gls@sanitizesort}{% + \ifglssanitizesort + \@onelevel@sanitize\@glo@sort + \else + \fi +} % \end{macrocode} %\end{macro} % @@ -1106,74 +1285,133 @@ false,nolabel,autolabel}[nolabel]{% % These are all boolean keys. If they are not given a value, assume % \texttt{true}. % -% Firstly the \gloskey{description}. If set, it will redefine -% \cs{@gls@sanitizedesc} to use \cs{@onelevel@sanitize}, -% otherwise \cs{@gls@sanitizedesc} will do nothing. % \begin{macrocode} \define@boolkey[gls]{sanitize}{description}[true]{% -\ifgls@sanitize@description - \renewcommand*{\@gls@sanitizedesc}{\@onelevel@sanitize\@glo@desc}% -\else - \renewcommand*{\@gls@sanitizedesc}{}% -\fi + \GlossariesWarning{sanitize={description} package option deprecated}% + \ifgls@sanitize@description + \glssetnoexpandfield{desc}% + \glssetnoexpandfield{descplural}% + \else + \glssetexpandfield{desc}% + \glssetexpandfield{descplural}% + \fi } % \end{macrocode} -% Similarly for the \gloskey{name} key: % \begin{macrocode} \define@boolkey[gls]{sanitize}{name}[true]{% -\ifgls@sanitize@name - \renewcommand*{\@gls@sanitizename}{\@onelevel@sanitize\@glo@name}% -\else - \renewcommand*{\@gls@sanitizename}{}% -\fi} + \GlossariesWarning{sanitize={name} package option +deprecated}% + \ifgls@sanitize@name + \glssetnoexpandfield{name}% + \else + \glssetexpandfield{name}% + \fi +} % \end{macrocode} -% and for the \gloskey{symbol} key: % \begin{macrocode} \define@boolkey[gls]{sanitize}{symbol}[true]{% -\ifgls@sanitize@symbol - \renewcommand*{\@gls@sanitizesymbol}{% -\@onelevel@sanitize\@glo@symbol}% -\else - \renewcommand*{\@gls@sanitizesymbol}{}% -\fi} + \GlossariesWarning{sanitize={symbol} package option +deprecated}% + \ifgls@sanitize@symbol + \glssetnoexpandfield{symbol}% + \glssetnoexpandfield{symbolplural}% + \else + \glssetexpandfield{symbol}% + \glssetexpandfield{symbolplural}% + \fi +} % \end{macrocode} -% and for the \gloskey{sort} key: +% +%\begin{option}{sanitizesort} % \begin{macrocode} -\define@boolkey[gls]{sanitize}{sort}[true]{% -\ifgls@sanitize@sort - \renewcommand*{\@gls@sanitizesort}{% -\@onelevel@sanitize\@glo@sort}% -\else - \renewcommand*{\@gls@sanitizesort}{}% -\fi} +\define@boolkey{glossaries.sty}[gls]{sanitizesort}[true]{% + \ifglssanitizesort + \glssetnoexpandfield{sortvalue}% + \else + \glssetexpandfield{sortvalue}% + \fi +} % \end{macrocode} +% Default setting: +% \begin{macrocode} +\glssanitizesorttrue +\glssetnoexpandfield{sortvalue}% +% \end{macrocode} +%\end{option} % +% \begin{macrocode} +\define@choicekey{sanitize}{sort}{true,false}[true]{% + \setbool{glssanitizesort}{#1}% + \ifglssanitizesort + \glssetnoexpandfield{sortvalue}% + \else + \glssetexpandfield{sortvalue}% + \fi + \GlossariesWarning{sanitize={sort} package option + deprecated. Use sanitizesort instead}% +} +% \end{macrocode} % %\begin{option}{sanitize} -% Now define the \pkgopt{sanitize} option. It can either take -% a key-val list as its value, or it can take the keyword -% \texttt{none}, which is equivalent to \texttt{description=false, -% symbol=false, name=false}: % \begin{macrocode} \define@key{glossaries.sty}{sanitize}[description=true,symbol=true, name=true]{% -\ifthenelse{\equal{#1}{none}}% -{% - \renewcommand*{\@gls@sanitizedesc}{}% - \renewcommand*{\@gls@sanitizename}{}% - \renewcommand*{\@gls@sanitizesymbol}{}% -}% -{% - \setkeys[gls]{sanitize}{#1}}% + \ifthenelse{\equal{#1}{none}}% + {% + \GlossariesWarning{sanitize package option deprecated}% + }% + {% + \setkeys[gls]{sanitize}{#1}% + }% +} +% \end{macrocode} +%\end{option} +% +%\begin{macro}{\ifglstranslate} +% As from version 3.13a, the \pkgopt{translator} package option is a +% choice rather than boolean option so now need to define +% conditional: +% \begin{macrocode} +\newif\ifglstranslate +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@gls@notranslatorhook} +%\changes{3.13a}{2013-11-05}{new} +% \begin{macrocode} +\newcommand*\@gls@notranslatorhook{} +% \end{macrocode} +%\end{macro} +% +%\begin{option}{notranslate} +%\changes{3.14a}{2013-11-12}{new} +% Provide a synonym for \pkgopt[false]{translate} that can be passed +% via the document class. +% \begin{macrocode} +\DeclareOptionX{notranslate}{% + \glstranslatefalse + \let\@gls@notranslatorhook\relax } % \end{macrocode} %\end{option} +% %\begin{option}{translate} %\changes{1.1}{2008 Feb 22}{translate option added} % Define \pkgopt{translate} option. If false don't set up % multi-lingual support. % \begin{macrocode} -\define@boolkey{glossaries.sty}[gls]{translate}[true]{} +\define@choicekey{glossaries.sty}{translate}[\val\nr]% + {true,false,babel}[true]% + {% + \ifcase\nr\relax + \glstranslatetrue + \or + \glstranslatefalse + \let\@gls@notranslatorhook\relax + \or + \glstranslatefalse + \def\@gls@notranslatorhook{\RequirePackage{glossaries-babel}}% + \fi + } % \end{macrocode} %\end{option} % Set the default value: @@ -1208,12 +1446,23 @@ name=true]{% % \end{macrocode} %\end{option} % +%\begin{macro}{\@gls@setacrstyle} +% Keep track of whether an acronym style has been set (for the +% benefit of \cs{setupglossaries}): +% \begin{macrocode} +\newcommand*{\@gls@setacrstyle}{} +% \end{macrocode} +%\end{macro} %\begin{option}{footnote} % Set the long form of the acronym in footnote on first use. % \begin{macrocode} \define@boolkey{glossaries.sty}[glsacr]{footnote}[true]{% -\ifthenelse{\boolean{glsacrdescription}}{}% -{\renewcommand*{\@gls@sanitizedesc}{}}% + \ifbool{glsacrdescription}% + {}% + {% + \renewcommand*{\@gls@sanitizedesc}{}% + }% + \renewcommand*{\@gls@setacrstyle}{\SetAcronymStyle}% } % \end{macrocode} %\end{option} @@ -1224,6 +1473,7 @@ name=true]{% % \begin{macrocode} \define@boolkey{glossaries.sty}[glsacr]{description}[true]{% \renewcommand*{\@gls@sanitizesymbol}{}% + \renewcommand*{\@gls@setacrstyle}{\SetAcronymStyle}% } % \end{macrocode} %\end{option} @@ -1232,6 +1482,7 @@ name=true]{% % \begin{macrocode} \define@boolkey{glossaries.sty}[glsacr]{smallcaps}[true]{% \renewcommand*{\@gls@sanitizesymbol}{}% + \renewcommand*{\@gls@setacrstyle}{\SetAcronymStyle}% } % \end{macrocode} %\end{option} @@ -1242,6 +1493,7 @@ name=true]{% % \begin{macrocode} \define@boolkey{glossaries.sty}[glsacr]{smaller}[true]{% \renewcommand*{\@gls@sanitizesymbol}{}% + \renewcommand*{\@gls@setacrstyle}{\SetAcronymStyle}% } % \end{macrocode} %\end{option} @@ -1251,6 +1503,7 @@ name=true]{% % \begin{macrocode} \define@boolkey{glossaries.sty}[glsacr]{dua}[true]{% \renewcommand*{\@gls@sanitizesymbol}{}% + \renewcommand*{\@gls@setacrstyle}{\SetAcronymStyle}% } % \end{macrocode} %\end{option} @@ -1346,6 +1599,7 @@ name=true]{% % \end{macrocode} %\end{macro} % +%\begin{option}{xindy} % Define package option to specify that \app{xindy} will be % used to sort the glossaries: % \begin{macrocode} @@ -1354,48 +1608,90 @@ name=true]{% \setkeys[gls]{xindy}{#1}% } % \end{macrocode} +%\end{option} +% +%\begin{option}{xindygloss} +%\changes{3.14a}{2013-11-12}{new} +% Provide a synonym for \pkgopt[]{xindy} that can be passed via the +% document class options. +% \begin{macrocode} +\DeclareOptionX{xindygloss}{% + \glsxindytrue +} +% \end{macrocode} +%\end{option} % %\begin{option}{savewrites} %\changes{3.0}{2011/04/02}{new} % The \pkgopt{savewrites} package option is provided to save on % the number of write registers. % \begin{macrocode} -\define@boolkey{glossaries.sty}[gls]{savewrites}[true]{} +\define@boolkey{glossaries.sty}[gls]{savewrites}[true]{% + \ifglssavewrites + \renewcommand*{\glswritefiles}{\@glswritefiles}% + \else + \let\glswritefiles\relax + \fi +} % \end{macrocode} %\end{option} % Set default: % \begin{macrocode} \glssavewritesfalse +\let\glswritefiles\relax % \end{macrocode} % -%\begin{macro}{\GlossariesWarning} -% Prints a warning message. +%\begin{option}{compatible-3.07} +%\changes{3.11a}{2013-10-15}{cnew} % \begin{macrocode} -\newcommand*{\GlossariesWarning}[1]{% - \PackageWarning{glossaries}{#1}% -} +\define@boolkey{glossaries.sty}[gls]{compatible-3.07}[true]{} +\boolfalse{glscompatible-3.07} % \end{macrocode} -%\end{macro} -%\begin{macro}{\GlossariesWarningNoLine} -% Prints a warning message without the line number. +%\end{option} +% +%\begin{option}{compatible-2.07} +%\changes{3.0}{2011/04/02}{compatible-2.07 option added} % \begin{macrocode} -\newcommand*{\GlossariesWarningNoLine}[1]{% - \PackageWarningNoLine{glossaries}{#1}% -} +\define@boolkey{glossaries.sty}[gls]{compatible-2.07}[true]{% % \end{macrocode} -%\end{macro} -% Define package option to suppress warnings +% Also set 3.07 compatibility if this option is set. +%\changes{3.14a}{2013-11-12}{added check for 2.07 before setting 3.07 +%compatibility} % \begin{macrocode} -\DeclareOptionX{nowarn}{% - \renewcommand*{\GlossariesWarning}[1]{}% - \renewcommand*{\GlossariesWarningNoLine}[1]{}% + \ifbool{glscompatible-2.07}% + {% + \booltrue{glscompatible-3.07}% + }% + {}% } +\boolfalse{glscompatible-2.07} % \end{macrocode} -%\begin{option}{compatible-2.07} -%\changes{3.0}{2011/04/02}{compatible-2.07 option added} +%\end{option} +% +%\begin{option}{symbols} +% Create a \qt{symbols} glossary type +%\changes{3.11a}{2013-10-15}{new} % \begin{macrocode} -\define@boolkey{glossaries.sty}[gls]{compatible-2.07}[true]{} -\csname glscompatible-2.07false\endcsname +\newcommand{\@gls@do@symbolsdef}{} +\DeclareOptionX{symbols}{% + \renewcommand{\@gls@do@symbolsdef}{% + \newglossary[slg]{symbols}{sls}{slo}{\glssymbolsgroupname}% + \newcommand*{\printsymbols}[1][]{\printglossary[type=symbols,#1]}% + }% +} +% \end{macrocode} +%\end{option} +%\begin{option}{numbers} +% Create a \qt{symbols} glossary type +%\changes{3.11a}{2013-10-15}{new} +% \begin{macrocode} +\newcommand{\@gls@do@numbersdef}{} +\DeclareOptionX{numbers}{% + \renewcommand{\@gls@do@numbersdef}{% + \newglossary[nlg]{numbers}{nls}{nlo}{\glsnumbersgroupname}% + \newcommand*{\printnumbers}[1][]{\printglossary[type=numbers,#1]}% + }% +} % \end{macrocode} %\end{option} % @@ -1404,6 +1700,48 @@ name=true]{% % \begin{macrocode} \ProcessOptionsX % \end{macrocode} +% Load backward compatibility stuff: +% \begin{macrocode} +\RequirePackage{glossaries-compatible-307} +% \end{macrocode} +% +%\begin{macro}{\setupglossaries} +%\changes{3.11a}{2013-10-15}{new} +% Provide way to set options after package has been loaded. However, +% some options must be set before \cs{ProcessOptionsX}, so they have +% to be disabled: +% \begin{macrocode} +\disable@keys{glossaries.sty}{compatible-2.07,% + xindy,xindygloss,makeindex,% + acronym,translate,notranslate,nolong,nosuper,notree,nostyles,nomain} +% \end{macrocode} +%Now define \cs{setupglossaries}: +% \begin{macrocode} +\newcommand*{\setupglossaries}[1]{% + \renewcommand*{\@gls@setacrstyle}{}% + \ifglsacrshortcuts + \def\@gls@setupshortcuts{\glsacrshortcutstrue}% + \else + \def\@gls@setupshortcuts{% + \ifglsacrshortcuts + \DefineAcronymSynonyms + \fi + }% + \fi + \glsacrshortcutsfalse + \let\@gls@do@numbersdef\relax + \let\@gls@do@symbolssdef\relax + \let\@gls@do@acronymsdef\relax + \setkeys{glossaries.sty}{#1}% + \@gls@setacrstyle + \@gls@setupshortcuts + \@gls@do@acronymsdef + \@gls@do@numbersdef + \@gls@do@symbolssdef +} +% \end{macrocode} +%\end{macro} +% % If \isty{babel} package is loaded, check to see if % \isty{translator} is installed, but only if translation is % required. @@ -1432,7 +1770,6 @@ name=true]{% } \fi % \end{macrocode} -% % If chapters are defined and the user has requested the % section counter as a package option, \cs{@chapter} will % be modified so @@ -1474,12 +1811,13 @@ name=true]{% % must be disabled after \ics{makeglossaries}. % \begin{macrocode} \newcommand*{\@onlypremakeg}[1]{% -\ifx\@gls@onlypremakeg\@empty - \def\@gls@onlypremakeg{#1}% -\else - \expandafter\toks@\expandafter{\@gls@onlypremakeg}% - \edef\@gls@onlypremakeg{\the\toks@,\noexpand#1}% -\fi} + \ifx\@gls@onlypremakeg\@empty + \def\@gls@onlypremakeg{#1}% + \else + \expandafter\toks@\expandafter{\@gls@onlypremakeg}% + \edef\@gls@onlypremakeg{\the\toks@,\noexpand#1}% + \fi +} % \end{macrocode} %\end{macro} %\begin{macro}{\@disable@onlypremakeg} @@ -1614,7 +1952,7 @@ name=true]{% % \isty{babel} captions, otherwise load \isty{translator} % dictionary. %\changes{1.1}{2008 Feb 22}{Added support for translator package} -%\changes{1.15}{2008 August 15}{Added 'glssettoctitle} +%\changes{1.15}{2008 August 15}{Added \cs{glssettoctitle}} % \begin{macrocode} \@ifpackageloaded{translator}{% \usedictionary{glossaries-dictionary}% @@ -1677,6 +2015,11 @@ name=true]{% \@ifpackageloaded{babel}{% \RequirePackage{glossaries-babel}}{}% }} +\else +% \end{macrocode} +%\changes{3.13a}{2013-11-05}{added cs{@gls@nottranslatorhook} to else clause} +% \begin{macrocode} + \@gls@notranslatorhook \fi % \end{macrocode} %\begin{macro}{\nopostdesc} @@ -1699,6 +2042,12 @@ name=true]{% } % \end{macrocode} %\end{macro} +%\begin{macro}{\@no@post@desc} +% Used for comparison purposes. +% \begin{macrocode} +\newcommand*{\@no@post@desc}{\nopostdesc} +% \end{macrocode} +%\end{macro} %\begin{macro}{\glspar} % Provide means of having a paragraph break in glossary entries % \begin{macrocode} @@ -1923,7 +2272,7 @@ name=true]{% \ifglossaryexists{#1}{% \csgdef{@glossarypreamble@#1}{#2}% }{% - \PackageWarning{glossaries}{% + \GlossariesWarning{% Glossary `#1' is not defined% }% }% @@ -1957,8 +2306,10 @@ name=true]{% % style.) If \ics{phantomsection} % is defined, it uses \cs{\@p@glossarysection}, otherwise it % uses \cs{@glossarysection}. -%\changes{1.05}{2007 Aug 10}{added '@mkboth to 'glossarysection} -%\changes{2.02}{2009 July 13}{changed '@mkboth to 'glossarymark} +%\changes{1.05}{2007 Aug 10}{added \cs{@mkboth} to +%\cs{glossarysection}} +%\changes{2.02}{2009 July 13}{changed \cs{@mkboth} to +%\cs{glossarymark}} %\changes{3.0}{2011/04/02}{replaced \cs{@ifundefined} with %\cs{ifcsundef}} % \begin{macrocode} @@ -1971,55 +2322,65 @@ name=true]{% {% \@p@glossarysection{#1}{#2}% }% - \glossarymark{\glossarytoctitle}% +% \end{macrocode} +%\changes{3.13a}{2013-11-05}{changed \cs{glossarymark} to \cs{glsglossarymark}} +% \begin{macrocode} + \glsglossarymark{\glossarytoctitle}% } % \end{macrocode} %\end{macro} -%\begin{macro}{\glossarymark} +%\begin{macro}{\glsglossarymark} %\changes{2.02}{2009 July 13}{New} %\changes{2.03}{2009 Sep 23}{Added check to see if it's already %defined} -% Sets the header mark for the glossary. Takes the glossary short -% (TOC) title as the argument. %\changes{3.0}{2011/04/02}{replaced \cs{@ifundefined} with %\cs{ifcsundef}} +%\changes{3.11a}{2013-10-15}{replaced \cs{MakeUppercase} with +%\cs{mfirstucMakeUppercase}} +%\changes{3.13a}{2013-11-05}{renamed \cs{glossarymark} to +%\cs{glsglossarymark} to avoid conflict with memoir} +% Sets the header mark for the glossary. Takes the glossary short +% (TOC) title as the argument. % \begin{macrocode} \ifcsundef{glossarymark}% {% - \ifglsucmark - \newcommand{\glossarymark}[1]{% - \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}% - } - \else - \newcommand{\glossarymark}[1]{\@mkboth{#1}{#1}} - \fi + \newcommand{\glsglossarymark}[1]{\glossarymark{#1}} }% {% - \GlossariesWarning{overriding \string\glossarymark}% - \@ifclassloaded{memoir}% - { - \ifglsucmark - \renewcommand{\glossarymark}[1]{% - \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}% - } - \else - \renewcommand{\glossarymark}[1]{% + \@ifclassloaded{memoir} + {% + \newcommand{\glsglossarymark}[1]{% + \ifglsucmark \markboth{\memUChead{#1}}{\memUChead{#1}}% - } - \fi - } - { - \ifglsucmark - \renewcommand{\glossarymark}[1]{% - \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}% - } - \else - \renewcommand{\glossarymark}[1]{\@mkboth{#1}{#1}} - \fi + \else + \markboth{#1}{#1}% + \fi + } + }% + {% + \newcommand{\glsglossarymark}[1]{% + \ifglsucmark + \@mkboth{\mfirstucMakeUppercase{#1}}{\mfirstucMakeUppercase{#1}}% + \else + \@mkboth{#1}{#1}% + \fi + } } } % \end{macrocode} %\end{macro} +%\begin{macro}{\glossarymark} +% Provided for backward compatibility: +% \begin{macrocode} +\providecommand{\glossarymark}[1]{% + \ifglsucmark + \@mkboth{\mfirstucMakeUppercase{#1}}{\mfirstucMakeUppercase{#1}}% + \else + \@mkboth{#1}{#1}% + \fi +} +% \end{macrocode} +%\end{macro} % % The required sectional unit is given by \cs{@@glossarysec} % which was defined by the \pkgopt{section} package option. The @@ -2041,13 +2402,14 @@ name=true]{% %\changes{1.1}{2008 Feb 22}{numbered sections and auto label added} % \begin{macrocode} \newcommand*{\@glossarysection}[2]{% -\ifx\@@glossarysecstar\@empty - \csname\@@glossarysec\endcsname{#2}% -\else - \csname\@@glossarysec\endcsname*{#2}% - \@gls@toc{#1}{\@@glossarysec}% -\fi -\@@glossaryseclabel} + \ifx\@@glossarysecstar\@empty + \csname\@@glossarysec\endcsname{#2}% + \else + \csname\@@glossarysec\endcsname*{#2}% + \@gls@toc{#1}{\@@glossarysec}% + \fi + \@@glossaryseclabel +} % \end{macrocode} %\end{macro} % @@ -2060,15 +2422,16 @@ name=true]{% %\changes{1.1}{2008 Feb 22}{numbered sections and auto label added} % \begin{macrocode} \newcommand*{\@p@glossarysection}[2]{% -\glsclearpage -\phantomsection -\ifx\@@glossarysecstar\@empty - \csname\@@glossarysec\endcsname{#2}% -\else - \@gls@toc{#1}{\@@glossarysec}% - \csname\@@glossarysec\endcsname*{#2}% -\fi -\@@glossaryseclabel} + \glsclearpage + \phantomsection + \ifx\@@glossarysecstar\@empty + \csname\@@glossarysec\endcsname{#2}% + \else + \@gls@toc{#1}{\@@glossarysec}% + \csname\@@glossarysec\endcsname*{#2}% + \fi + \@@glossaryseclabel +} % \end{macrocode} %\end{macro} % @@ -2124,13 +2487,14 @@ name=true]{% %\changes{1.1}{2008 Feb 22}{numberline added} % \begin{macrocode} \newcommand*{\@gls@toc}[2]{% -\ifglstoc - \ifglsnumberline - \addcontentsline{toc}{#2}{\numberline{}#1}% - \else - \addcontentsline{toc}{#2}{#1}% + \ifglstoc + \ifglsnumberline + \addcontentsline{toc}{#2}{\numberline{}#1}% + \else + \addcontentsline{toc}{#2}{#1}% + \fi \fi -\fi} +} % \end{macrocode} %\end{macro} % @@ -2689,13 +3053,14 @@ name=true]{% \renewcommand*{\gls@codepage}{#1}% } % \end{macrocode} -%\changes{}{}{} +%\changes{3.07}{2013-07-05}{Added check for fontspec} % Suggested by egreg: % \begin{macrocode} -\AtBeginDocument{ - \ifx\gls@codepage\@empty - \@ifpackageloaded{fontspec}{\def\gls@codepage{utf8}}{} -\fi} + \AtBeginDocument{% + \ifx\gls@codepage\@empty + \@ifpackageloaded{fontspec}{\def\gls@codepage{utf8}}{}% + \fi + } \else \newcommand*{\GlsSetXdyCodePage}[1]{% \glsnoxindywarning\GlsSetXdyCodePage} @@ -2758,10 +3123,14 @@ name=true]{% % control sequence which will be set to the entry label in the % current iteration. %\changes{2.01}{2009 May 30}{replaced \cs{ifthenelse} with \cs{ifx}} +%\changes{3.11a}{2013-10-15}{replaced \cs{ifx} with \cs{ifdefempty}} % \begin{macrocode} \newcommand*{\forglsentries}[3][\glsdefaulttype]{% \edef\@@glo@list{\csname glolist@#1\endcsname}% - \@for#2:=\@@glo@list\do{\ifx#2\@empty\else#3\fi}% + \@for#2:=\@@glo@list\do + {% + \ifdefempty{#2}{}{#3}% + }% } % \end{macrocode} %\end{macro} @@ -2774,8 +3143,11 @@ name=true]{% % is given by \cs{@@this@glo@}. % \begin{macrocode} \newcommand*{\forallglsentries}[3][\@glo@types]{% -\expandafter\forallglossaries\expandafter[#1]{\@@this@glo@}{% -\forglsentries[\@@this@glo@]{#2}{#3}}} + \expandafter\forallglossaries\expandafter[#1]{\@@this@glo@}% + {% + \forglsentries[\@@this@glo@]{#2}{#3}% + }% +} % \end{macrocode} %\end{macro} % @@ -2793,8 +3165,10 @@ name=true]{% %\end{macro} % %\begin{macro}{\ifglsentryexists} -% To check to see if a glossary entry has been defined use:\\[10pt] -% \cs{ifglsentryexists}\marg{label}\marg{true text}\marg{false text}\\[10pt] +% To check to see if a glossary entry has been defined use: +%\begin{definition} +% \cs{ifglsentryexists}\marg{label}\marg{true text}\marg{false text} +%\end{definition} %where \meta{label} is the entry's label. %\changes{3.0}{2011/04/02}{replaced \cs{@ifundefined} with %\cs{ifcsundef}} @@ -2807,13 +3181,17 @@ name=true]{% % %\begin{macro}{\ifglsused} % To determine if given glossary entry has been -% used in the document text yet use:\\[10pt] -% \cs{ifglsused}\marg{label}\marg{true text}\marg{false text}\\[10pt] +% used in the document text yet use: +%\begin{definition} +% \cs{ifglsused}\marg{label}\marg{true text}\marg{false text} +%\end{definition} % where \meta{label} is the entry's label. % If true it will do \meta{true text} % otherwise it will do \meta{false text}. +%\changes{3.11a}{2013-10-15}{replaced \cs{ifthenelse} with +%\cs{ifbool}} % \begin{macrocode} -\newcommand*{\ifglsused}[3]{\ifthenelse{\boolean{glo@#1@flag}}{#2}{#3}} +\newcommand*{\ifglsused}[3]{\ifbool{glo@#1@flag}{#2}{#3}} % \end{macrocode} %\end{macro} %The following two commands will cause an error if the given @@ -2884,6 +3262,92 @@ name=true]{% % \end{macrocode} %\end{macro} % +%\begin{macro}{\ifglshasdesc} +%\cs{ifglshasdesc}\marg{label}\marg{true part}\marg{false part} +%\changes{3.08a}{2013-09-28}{new} +%\changes{3.11a}{2013-10-15}{replaced \cs{ifdefempty} with +%\cs{ifcsempty}} +% \begin{macrocode} +\newcommand*{\ifglshasdesc}[3]{% + \ifcsempty{glo@#1@desc}% + {#3}% + {#2}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\ifglsdescsuppressed} +%\cs{ifglsdescsuppressed}\marg{label}\marg{true part}\marg{false part} +%\changes{3.08a}{2013-09-28}{new} +% Does \meta{true part} if the description is just \cs{nopostdesc} +% otherwise does \meta{false part}. +% \begin{macrocode} +\newcommand*{\ifglsdescsuppressed}[3]{% + \ifcsequal{glos@#1@desc}{@no@post@desc}% + {#2}% + {#3}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\ifglshassymbol} +%\cs{ifglshassymbol}\marg{label}\marg{true part}\marg{false part} +%\changes{3.08a}{2013-09-28}{new} +%\changes{3.09a}{2013-10-09}{changed test to check for +%\cs{@gls@default@symbol}} +%\changes{3.11a}{2013-10-15}{replaced \cs{ifdefempty} with +%\cs{ifcsempty}} +% \begin{macrocode} +\newcommand*{\ifglshassymbol}[3]{% + \ifcsempty{glo@#1@symbol}% + {#3}% + {% + \expandafter\ifx\csname glo@#1@symbol\endcsname\@gls@default@value + #3% + \else + #2% + \fi + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\ifglshaslong} +%\cs{ifglshaslong}\marg{label}\marg{true part}\marg{false part} +%\changes{3.11a}{2013-10-15}{new} +% \begin{macrocode} +\newcommand*{\ifglshaslong}[3]{% + \ifcsempty{glo@#1@long}% + {#3}% + {% + \expandafter\ifx\csname glo@#1@long\endcsname\@gls@default@value + #3% + \else + #2% + \fi + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\ifglshasshort} +%\cs{ifglshasshort}\marg{label}\marg{true part}\marg{false part} +%\changes{3.11a}{2013-10-15}{new} +% \begin{macrocode} +\newcommand*{\ifglshasshort}[3]{% + \ifcsempty{glo@#1@short}% + {#3}% + {% + \expandafter\ifx\csname glo@#1@short\endcsname\@gls@default@value + #3% + \else + #2% + \fi + }% +} +% \end{macrocode} +%\end{macro} +% %\subsection{Defining new glossaries}\label{sec:newglos} % A comma-separated list of glossary names is stored % in \cs{@glo@types}. When a new glossary type @@ -2896,9 +3360,45 @@ name=true]{% % \end{macrocode} %\end{macro} % +%\begin{macro}{\@gls@provide@newglossary} +%\changes{3.10a}{2013-10-13}{new} +% If the user removes the glossary package from their document, +% ensure the next run doesn't throw a load of undefined control +% sequence errors when the aux file is parsed. +% \begin{macrocode} +\newcommand*\@gls@provide@newglossary{% + \protected@write\@auxout{}{\string\providecommand\string\@newglossary[4]{}}% +% \end{macrocode} +% Only need to do this once. +% \begin{macrocode} + \let\@gls@provide@newglossary\relax +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\defglsentryfmt} +%\changes{3.11a}{2013-10-15}{new} +% Allow different glossaries to have different display styles. +% \begin{macrocode} +\newcommand*{\defglsentryfmt}[2][\glsdefaulttype]{% + \csgdef{gls@#1@entryfmt}{#2}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\gls@doentryfmt} +%\changes{3.11a}{2013-10-15}{new} +% \begin{macrocode} +\newcommand*{\gls@doentryfmt}[1]{\csuse{gls@#1@entryfmt}} +% \end{macrocode} +%\end{macro} +% % A new glossary type is defined using \cs{newglossary}. -% Syntax:\\[10pt]\cs{newglossary}\oarg{log-ext}\marg{name}\marg{in-ext}\marg{out-ext}% -%\marg{title}\oarg{counter}\\[10pt]% +% Syntax: +%\begin{definition} +%\cs{newglossary}\oarg{log-ext}\marg{name}\marg{in-ext}\marg{out-ext}% +%\marg{title}\oarg{counter} +%\end{definition} % where \meta{log-ext} is the extension of the \app{makeindex} % transcript file, \meta{in-ext} is the extension of the glossary % input file (read in by \ics{printglossary} and created by @@ -2915,17 +3415,20 @@ name=true]{% %\begin{macro}{\newglossary} % \begin{macrocode} \newcommand*{\newglossary}[5][glg]{% -\ifglossaryexists{#2}{% - \PackageError{glossaries}{Glossary type `#2' already exists}{% - You can't define a new glossary called `#2' because it already - exists}% -}{% + \ifglossaryexists{#2}% + {% + \PackageError{glossaries}{Glossary type `#2' already exists}{% + You can't define a new glossary called `#2' because it already + exists}% + }% + {% % \end{macrocode} % Check if default has been set % \begin{macrocode} - \ifx\glsdefaulttype\relax + \ifundef\glsdefaulttype + {% \gdef\glsdefaulttype{#2}% - \fi + }{}% % \end{macrocode} % Add this to the list of glossary types: % \begin{macrocode} @@ -2943,12 +3446,16 @@ name=true]{% \expandafter\def\csname @glotype@#2@in\endcsname{#3}% \expandafter\def\csname @glotype@#2@out\endcsname{#4}% \expandafter\def\csname @glotype@#2@title\endcsname{#5}% +% \end{macrocode} +%\changes{3.10a}{2013-10-13}{added \cs{@gls@provide@newglossary}} +% \begin{macrocode} + \@gls@provide@newglossary \protected@write\@auxout{}{\string\@newglossary{#2}{#1}{#3}{#4}}% % \end{macrocode} % How to display this entry in the document text (uses -% \cs{glsdisplay} and \cs{glsdisplayfirst} by -% default). These can be redefined by the user later if required -% (see \ics{defglsdisplay} and \ics{defglsdisplayfirst}). These +% \cs{glsentry} by +% default). This can be redefined by the user later if required +% (see \ics{defglsentry}). This % may already have been defined if this has been specified as % a list of acronyms. %\changes{2.04}{2009 November 10}{added check to determine if @@ -2956,17 +3463,12 @@ name=true]{% % have been defined.} %\changes{3.0}{2011/04/02}{replaced \cs{@ifundefined} with %\cs{ifcsundef}} +%\changes{3.11a}{2013-10-15}{replaced \cs{glsdisplay} and +%\cs{glsdisplayfirst} with \cs{glsentryfmt}} % \begin{macrocode} - \ifcsundef{gls@#2@display}% + \ifcsundef{gls@#2@entryfmt}% {% - \expandafter\gdef\csname gls@#2@display\endcsname{\glsdisplay}% - }% - {}% - \ifcsundef{gls@#2@displayfirst}% - {% - \expandafter\gdef\csname gls@#2@displayfirst\endcsname{% - \glsdisplayfirst - }% + \defglsentryfmt[#2]{\glsentryfmt}% }% {}% % \end{macrocode} @@ -3031,7 +3533,8 @@ name=true]{% %\begin{macro}{\@gls@getcounter} % \begin{macrocode} \newcommand*{\@gls@getcounter}[1]{% -\csname @glotype@#1@counter\endcsname} + \csname @glotype@#1@counter\endcsname +} % \end{macrocode} %\end{macro} % @@ -3040,6 +3543,16 @@ name=true]{% % \begin{macrocode} \glsdefmain % \end{macrocode} +% Define the \qt{acronym} glossaries if required. +% \begin{macrocode} +\@gls@do@acronymsdef +% \end{macrocode} +% Define the \qt{symbols} and \qt{numbers} glossaries if required. +% \begin{macrocode} +\@gls@do@symbolsdef +\@gls@do@numbersdef +% \end{macrocode} +% % %\subsection{Defining new entries}\label{sec:newentry} % New glossary entries are defined using \cs{newglossaryentry}. @@ -3068,20 +3581,10 @@ name=true]{% %\begin{key}{description} % The \gloskey{description} key is usually only used in % the glossary, but can be made to appear in the text by redefining -% \ics{glsdisplay} and \ics{glsdisplayfirst} (or -% using \ics{defglsdisplay} and \ics{defglsdisplayfirst}), however, -% you will have to disable the sanitize option (using the -% \pkgopt{sanitize} package option, -% "sanitize={description=false}", and protect fragile -% commands). The \gloskey{description} key is required when -% defining a new glossary entry. (Be careful not to make the -% description too long, because \app{makeindex} has a limited -% buffer. \cs{@glo@desc} is defined to be a short command -% to discourage lengthy descriptions -% for this reason. If you do have a very long description, or if -% you require paragraph breaks, define a separate command that -% contains the description, and use it as the value to the -% \gloskey{description} key.) +% \ics{glsentryfmt} or using \ics{defglsentryfmt}. The +% \gloskey{description} key is required when +% defining a new glossary entry. If a long description is required, +% use \ics{longnewglossaryentry} instead of \ics{newglossaryentry}. % \begin{macrocode} \define@key{glossentry}{description}{% \def\@glo@desc{#1}% @@ -3103,7 +3606,8 @@ name=true]{% % not for use in the document). The \gloskey{sort} key is optional % when defining a new glossary entry. If omitted, the value % is given by \meta{name} \meta{description}. -%\changes{1.18}{2009 January 14}{moved sanitization to 'newglossaryentry} +%\changes{1.18}{2009 January 14}{moved sanitization to +%\cs{newglossaryentry}} % \begin{macrocode} \define@key{glossentry}{sort}{% \def\@glo@sort{#1}} @@ -3155,6 +3659,12 @@ name=true]{% } % \end{macrocode} %\end{key} +%\begin{macro}{\@gls@default@value} +%\changes{3.09a}{2013-10-09}{new} +% \begin{macrocode} +\newcommand*{\@gls@default@value}{\relax} +% \end{macrocode} +%\end{macro} % %\begin{key}{symbol} % The \gloskey{symbol} key is ignored by most of the predefined @@ -3162,12 +3672,10 @@ name=true]{% % It is provided for glossary styles that require an associated % symbol, as well as a name and description. To make this value % appear in the glossary, you need to redefine -% \ics{glossaryentryfield} so that it uses its fourth parameter. +% \ics{glossentry}. % If you want this value to appear in the text when the term is used % by commands like \ics{gls}, you will need to change -% \ics{glsdisplay} and \ics{glsdisplayfirst} (either -% explicitly for all glossaries or via \ics{defglsdisplay} -% and \ics{defglsdisplayfirst} for individual glossaries). +% \ics{glsentryfmt} (or use for \ics{defglsentryfmt} individual glossaries). % \begin{macrocode} \define@key{glossentry}{symbol}{% \def\@glo@symbol{#1}% @@ -3219,14 +3727,28 @@ name=true]{% % The \gloskey{see} key specifies a list of cross-references % \changes{1.17}{2008 December 26}{new} % \changes{3.0}{2011/04/02}{added \cs{@glo@seeautonumberlist}} +%\changes{3.13a}{2013-11-05}{added \cs{gls@checkseeallowed}} % \begin{macrocode} \define@key{glossentry}{see}{% + \gls@checkseeallowed \def\@glo@see{#1}% \@glo@seeautonumberlist } % \end{macrocode} %\end{key} % +%\begin{macro}{\gls@checkseeallowed} +%\changes{3.13a}{2013-11-05}{new} +% \begin{macrocode} +\newcommand*{\gls@checkseeallowed}{% + \PackageError{glossaries}% + {`see' key may only be used after \string\makeglossaries}% + {You must use \string\makeglossaries\space before defining + any entries that have a `see' key}% +} +% \end{macrocode} +%\end{macro} +% %\begin{key}{parent} % The \gloskey{parent} key specifies the parent entry, if % required. @@ -3354,11 +3876,29 @@ name=true]{% haven't specified the entry name}} % \end{macrocode} %\end{macro} +%\begin{macro}{\@glsnodesc} +% \changes{3.10a}{2013-10-13}{new} +% Define command to generate error if \gloskey{description} key is missing. +% \begin{macrocode} +\newcommand*\@glsnodesc{% + \PackageError{glossaries} + {% + description key required in \string\newglossaryentry\space + for entry `\@glo@label'% + }% + {% + You haven't specified the entry description% + }% +}% +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\@glsdefaultplural} -% Define command to set default plural. % \changes{1.17}{2008 December 26}{new} +%\changes{3.10a}{2013-10-13}{Obsolete} +% Now obsolete. Don't use. % \begin{macrocode} -\newcommand*{\@glsdefaultplural}{\@glo@text\glspluralsuffix} +\newcommand*{\@glsdefaultplural}{} % \end{macrocode} %\end{macro} % @@ -3398,6 +3938,131 @@ name=true]{% % \end{macrocode} %\end{macro} % +%\begin{macro}{\@gls@noexpand@field} +% \begin{macrocode} +\newcommand{\@@gls@noexpand@field}[3]{% + \expandafter\global\expandafter + \let\csname glo@#1@#2\endcsname#3% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@gls@noexpand@fields} +% \begin{macrocode} +\newcommand{\@gls@noexpand@fields}[4]{% + \ifcsdef{gls@assign@#3@field} + {% + \ifdefequal{#4}{\@gls@default@value}% + {% + \edef\@gls@value{\expandonce{#1}}% + \csuse{gls@assign@#3@field}{#2}{\@gls@value}% + }% + {% + \csuse{gls@assign@#3@field}{#2}{#4}% + }% + }% + {% + \ifdefequal{#4}{\@gls@default@value}% + {% + \edef\@gls@value{\expandonce{#1}}% +% \end{macrocode} +%\changes{3.11a}{2013-10-15}{Fixed bug \texttt{expand} replaced with +%\texttt{noexpand}} +% \begin{macrocode} + \@@gls@noexpand@field{#2}{#3}{\@gls@value}% + }% + {% + \@@gls@noexpand@field{#2}{#3}{#4}% + }% + }% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@@gls@expand@field} +% \begin{macrocode} +\newcommand{\@@gls@expand@field}[3]{% + \expandafter + \protected@xdef\csname glo@#1@#2\endcsname{#3}% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{@gls@expand@fields} +% \begin{macrocode} +\newcommand{\@gls@expand@fields}[4]{% + \ifcsdef{gls@assign@#3@field} + {% + \ifdefequal{#4}{\@gls@default@value}% + {% + \edef\@gls@value{\expandonce{#1}}% + \csuse{gls@assign@#3@field}{#2}{\@gls@value}% + }% + {% + \expandafter\@gls@startswithexpandonce#4\relax\relax\gls@endcheck + {% + \@@gls@expand@field{#2}{#3}{#4}% + }% + {% + \csuse{gls@assign@#3@field}{#2}{#4}% + }% + }% + }% + {% + \ifdefequal{#4}{\@gls@default@value}% + {% + \@@gls@expand@field{#2}{#3}{#1}% + }% + {% + \@@gls@expand@field{#2}{#3}{#4}% + }% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@gls@startswithexpandonce} +% \begin{macrocode} +\def\@gls@expandonce{\expandonce} +\def\@gls@startswithexpandonce#1#2\gls@endcheck#3#4{% + \def\@gls@tmp{#1}% + \ifdefequal{\@gls@expandonce}{\@gls@tmp}{#3}{#4}% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\gls@assign@field} +%\begin{definition} +%\cs{gls@assign@field}\marg{def value}\marg{glossary type}\marg{field}\marg{tmp +%cs} +%\end{definition} +% Assigns an entry field. Expansion performed by default (except for +% name, symbol and description where backward compatibility required). +% If \meta{tmp cs} is \meta{@gls@default@value}, \meta{def value} is +% used instead. +%\changes{3.08a}{2013-09-28}{new} +% \begin{macrocode} +\let\gls@assign@field\@gls@expand@fields +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glsexpandfields} +%\changes{3.08a}{2013-09-28}{new} +% Fully expand values when assigning fields (except for specific +% fields that are overridden by \cs{glssetnoexpandfield}). +% \begin{macrocode} +\newcommand*{\glsexpandfields}{% + \let\gls@assign@field\@gls@expand@fields +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glsnoexpandfields} +%\changes{3.08a}{2013-09-28}{new} +% Don't expand values when assigning fields (except for specific +% fields that are overridden by \cs{glssetexpandfield}). +% \begin{macrocode} +\newcommand*{\glsnoexpandfields}{% + \let\gls@assign@field\@gls@noexpand@fields +} +% \end{macrocode} +%\end{macro} +% +% %\begin{macro}{\newglossaryentry} % Define \cs{newglossaryentry}% % \marg{label} \marg{key-val list}. @@ -3413,73 +4078,408 @@ name=true]{% % \begin{macrocode} \glsdoifnoexists{#1}% {% + \gls@defglossaryentry{#1}{#2}% + }% +} % \end{macrocode} -% Store label +%\end{macro} +% +%\begin{macro}{\provideglossaryentry} +% Like \cs{newglossaryentry} but does nothing if the entry has +% already been defined. +%\changes{3.14a}{2013-11-12}{new} % \begin{macrocode} - \def\@glo@label{#1}% +\newrobustcmd{\provideglossaryentry}[2]{% + \ifglsentryexists{#1}% + {}% + {% + \gls@defglossaryentry{#1}{#2}% + }% +} +\@onlypreamble{\provideglossaryentry} % \end{macrocode} -% Set up defaults. If the \gloskey{name} or \gloskey{description} -% keys are omitted, an error will be generated. +%\end{macro} +% +%\begin{macro}{\new@glossaryentry} +%\changes{3.10a}{2013-10-13}{new} +% For use in document environment. % \begin{macrocode} - \let\@glo@name\@glsnoname +\newrobustcmd{\new@glossaryentry}[2]{% + \ifundef\@gls@deffile + {% + \global\newwrite\@gls@deffile + \immediate\openout\@gls@deffile=\jobname.glsdefs + }% + {}% + \ifglsentryexists{#1}{}% + {% + \gls@defglossaryentry{#1}{#2}% + }% + \@gls@writedef{#1}% +} +\AtBeginDocument +{ + \makeatletter + \InputIfFileExists{\jobname.glsdefs}{}{}% + \makeatother + \let\newglossaryentry\new@glossaryentry +} +\AtEndDocument{\ifdef\@gls@deffile{\closeout\@gls@deffile}{}} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@gls@writedef} +%\changes{3.10a}{2013-10-13}{new} +% Writes glossary entry definition to \cs{@gls@deffile}. +% \begin{macrocode} +\newcommand*{\@gls@writedef}[1]{% + \immediate\write\@gls@deffile + {% + \string\ifglsentryexists{#1}{}\expandafter\@gobble\string\%^^J% + \expandafter\@gobble\string\{\expandafter\@gobble\string\%^^J% + \string\gls@defglossaryentry{#1}\expandafter\@gobble\string\%^^J% + \expandafter\@gobble\string\{\expandafter\@gobble\string\%% + }% % \end{macrocode} -%\changes{1.08}{2007 Oct 13}{Fixed error message to say ``description -%key'' rather than ``desc key''} +% Write key value information: % \begin{macrocode} - \def\@glo@desc{% - \PackageError{glossaries} - {% - description key required in \string\newglossaryentry\space - for entry `\@glo@label'% + \@for\@gls@map:=\@gls@keymap\do + {% + \edef\glo@value{\expandafter\expandonce + \csname glo@#1@\expandafter\@secondoftwo\@gls@map\endcsname}% + \@onelevel@sanitize\glo@value + \immediate\write\@gls@deffile + {% + \expandafter\@firstoftwo\@gls@map + =\expandafter\@gobble\string\{\glo@value\expandafter\@gobble\string\},% + \expandafter\@gobble\string\%% + }% + }% +% \end{macrocode} +% Provide hook: +% \begin{macrocode} + \glswritedefhook + \immediate\write\@gls@deffile + {% + \expandafter\@gobble\string\%^^J% + \expandafter\@gobble\string\}\expandafter\@gobble\string\%^^J% + \expandafter\@gobble\string\}\expandafter\@gobble\string\%% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@gls@keymap} +%\changes{3.10a}{2013-10-13}{new} +% List of entry definition key names and corresponding tag in +% control sequence used to store the value. +% \begin{macrocode} +\newcommand*{\@gls@keymap}{% + {name}{name},% + {sort}{sortvalue},% unescaped sort value + {type}{type},% + {first}{first},% + {firstplural}{firstpl},% + {text}{text},% + {plural}{plural},% + {description}{desc},% + {descriptionplural}{descplural},% + {symbol}{symbol},% + {symbolplural}{symbolplural},% + {user1}{useri},% + {user2}{userii},% + {user3}{useriii},% + {user4}{useriv},% + {user5}{userv},% + {user6}{uservi},% + {long}{long},% + {longplural}{longpl},% + {short}{short},% + {shortplural}{shortpl},% + {counter}{counter},% + {parent}{parent}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsaddkey} +%\begin{definition} +%\cs{glsaddkey}\marg{key}\marg{default value}\marg{no link cs}\marg{no link ucfirst +%cs}\marg{link cs}\marg{link ucfirst cs}\marg{link allcaps cs} +%\end{definition} +%\changes{3.12a}{2013-10-16}{new} +% Allow user to add their own custom keys. +% \begin{macrocode} +\newcommand*{\glsaddkey}{\@ifstar\@sglsaddkey\@glsaddkey} +% \end{macrocode} +% Starred version switches on expansion for this key. +% \begin{macrocode} +\newcommand*{\@sglsaddkey}[1]{% + \key@ifundefined{glossentry}{#1}% + {% + \expandafter\newcommand\expandafter*\expandafter + {\csname gls@assign@#1@field\endcsname}[2]{% + \@@gls@expand@field{##1}{#1}{##2}% + }% + }% + {}% + \@glsaddkey{#1}% +} +% \end{macrocode} +% Unstarred version doesn't override default expansion. +% \begin{macrocode} +\newcommand*{\@glsaddkey}[7]{% +% \end{macrocode} +% Check the specified key doesn't already exist. +% \begin{macrocode} + \key@ifundefined{glossentry}{#1}% + {% +% \end{macrocode} +% Set up the key. +% \begin{macrocode} + \define@key{glossentry}{#1}{\csdef{@glo@#1}{##1}}% + \appto\@gls@keymap{,{#1}{#1}}% +% \end{macrocode} +% Set the default value. +% \begin{macrocode} + \appto\@newglossaryentryprehook{\csdef{@glo@#1}{#2}}% +% \end{macrocode} +% Assignment code. +% \begin{macrocode} + \appto\@newglossaryentryposthook{% + \letcs{\@glo@tmp}{@glo@#1}% + \gls@assign@field{#2}{\@glo@label}{#1}{\@glo@tmp}% + }% +% \end{macrocode} +% Define the no-link commands. +% \begin{macrocode} + \newcommand*{#3}[1]{\csuse{glo@##1@#1}}% + \newcommand*{#4}[1]{% + \letcs{\@glo@text}{glo@##1@#1}% + \xmakefirstuc\@glo@text + }% +% \end{macrocode} +% Now for the commands with links. First the version with no case +% change: +% \begin{macrocode} + \ifcsdef{@gls@user@#1@}% + {% + \PackageError{glossaries}% + {Can't define `\string#5' as helper command + `\expandafter\string\csname @gls@user@#1@\endcsname' already exists}% + {}% + }% + {% + \newrobustcmd*{#5}{\@ifstar{\csuse{@sgls@user@#1}}{\csuse{@gls@user@#1}}}% + \expandafter\newcommand\expandafter*\expandafter + {\csname @sgls@user@#1\endcsname}[1][]{% + \csuse{@gls@user@#1}[hyper=false,##1]% + }% + \expandafter\newcommand\expandafter*\expandafter + {\csname @gls@user@#1\endcsname}[2][]{% + \new@ifnextchar[% + {\csuse{@gls@user@#1@}{##1}{##2}}% + {\csuse{@gls@user@#1@}{##1}{##2}[]}}% + \csdef{@gls@user@#1@}##1##2[##3]{% + \glsdoifexists{##2}% + {% + \edef\@glo@type{\glsentrytype{##2}}% + \@gls@link[##1]{##2}{#3{##2}##3}% + }% }% - {% - You haven't specified the entry description% + }% +% \end{macrocode} +% Next the version with the first letter converted to upper case: +% \begin{macrocode} + \ifcsdef{@Gls@user@#1@}% + {% + \PackageError{glossaries}% + {Can't define `\string#6' as helper command + `\expandafter\string\csname @Gls@user@#1@\endcsname' already exists}% + {}% + }% + {% + \newrobustcmd*{#6}{\@ifstar{\csuse{@sGls@user@#1}}{\csuse{@Gls@user@#1}}}% + \expandafter\newcommand\expandafter*\expandafter + {\csname @sGls@user@#1\endcsname}[1][]{% + \csuse{@Gls@user@#1}[hyper=false,##1]% + }% + \expandafter\newcommand\expandafter*\expandafter + {\csname @Gls@user@#1\endcsname}[2][]{% + \new@ifnextchar[% + {\csuse{@Gls@user@#1@}{##1}{##2}}% + {\csuse{@Gls@user@#1@}{##1}{##2}[]}}% + \csdef{@Gls@user@#1@}##1##2[##3]{% + \glsdoifexists{##2}% + {% + \edef\@glo@type{\glsentrytype{##2}}% + \@gls@link[##1]{##2}{#4{##2}##3}% + }% + }% + }% +% \end{macrocode} +% Finally the all caps version: +% \begin{macrocode} + \ifcsdef{@GLS@user@#1@}% + {% + \PackageError{glossaries}% + {Can't define `\string#7' as helper command + `\expandafter\string\csname @GLS@user@#1@\endcsname' already exists}% + {}% + }% + {% + \newrobustcmd*{#7}{\@ifstar{\csuse{@sGLS@user@#1}}{\csuse{@GLS@user@#1}}}% + \expandafter\newcommand\expandafter*\expandafter + {\csname @sGLS@user@#1\endcsname}[1][]{% + \csuse{@GLS@user@#1}[hyper=false,##1]% + }% + \expandafter\newcommand\expandafter*\expandafter + {\csname @GLS@user@#1\endcsname}[2][]{% + \new@ifnextchar[% + {\csuse{@GLS@user@#1@}{##1}{##2}}% + {\csuse{@GLS@user@#1@}{##1}{##2}[]}}% + \csdef{@GLS@user@#1@}##1##2[##3]{% + \glsdoifexists{##2}% + {% + \edef\@glo@type{\glsentrytype{##2}}% + \@gls@link[##1]{##2}{\mfirstucMakeUppercase{#3{##2}##3}}% + }% }% }% + }% + {% + \PackageError{glossaries}{Key `#1' already exists}{}% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glswritedefhook} +%\changes{3.10a}{2013-10-13}{new} +% \begin{macrocode} +\newcommand*{\glswritedefhook}{} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\gls@assign@desc} +%\changes{3.11a}{2013-10-15}{new} +% \begin{macrocode} +\newcommand*{\gls@assign@desc}[1]{% + \gls@assign@field{}{#1}{desc}{\@glo@desc}% + \gls@assign@field{\@glo@desc}{#1}{descplural}{\@glo@descplural}% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\longnewglossaryentry} +%\changes{3.11a}{2013-10-15}{new} +% \begin{macrocode} +\newcommand{\longnewglossaryentry}[3]{% + \glsdoifnoexists{#1}% + {% + \bgroup + \let\@org@newglossaryentryprehook\@newglossaryentryprehook + \long\def\@newglossaryentryprehook{% + \long\def\@glo@desc{#3\leavevmode\unskip\nopostdesc}% + \@org@newglossaryentryprehook + }% + \renewcommand*{\gls@assign@desc}[1]{% + \global\cslet{glo@#1@desc}{\@glo@desc}% + \global\cslet{glo@#1@descplural}{\@glo@desc}% + } + \gls@defglossaryentry{#1}{#2}% + \egroup + } +} +% \end{macrocode} +% Only allowed in the preamble. (Otherwise a long description could +% cause problems when writing the entry definition to the temporary +% file.) +% \begin{macrocode} +\@onlypreamble{\longnewglossaryentry} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\longprovideglossaryentry} +%\changes{3.14a}{2013-11-12}{new} +% As the above but only defines the entry if it doesn't already +% exist. +% \begin{macrocode} +\newcommand{\longprovideglossaryentry}[3]{% + \ifglsentryexists{#1}{}% + {\longnewglossaryentry{#1}{#2}{#3}}% +} +\@onlypreamble{\longprovideglossaryentry} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\gls@defglossaryentry} +%\begin{definition} +%\cs{gls@defglossaryentry}\marg{label}\marg{key-val list} +%\end{definition} +% Defines a new entry without checking if it already exists. +%\changes{3.10a}{2013-10-13}{new} +% \begin{macrocode} +\newcommand{\gls@defglossaryentry}[2]{% +% \end{macrocode} +% Store label +% \begin{macrocode} + \def\@glo@label{#1}% +% \end{macrocode} +% \changes{3.12a}{2013-10-16}{added \cs{glslabel}} +% Provide a means for user define keys to reference the label: +% \begin{macrocode} + \let\glslabel\@glo@label +% \end{macrocode} +% Set up defaults. If the \gloskey{name} or \gloskey{description} +% keys are omitted, an error will be generated. +% \begin{macrocode} + \let\@glo@name\@glsnoname + \let\@glo@desc\@glsnodesc % \end{macrocode} % \changes{1.12}{2008 Mar 8}{descriptionplural support added} % \begin{macrocode} - \def\@glo@descplural{\@glo@desc}% + \let\@glo@descplural\@gls@default@value % \end{macrocode} % \begin{macrocode} - \def\@glo@type{\glsdefaulttype}% - \def\@glo@symbol{\relax}% + \let\@glo@type\@gls@default@value + \let\@glo@symbol\@gls@default@value % \end{macrocode} % \changes{1.12}{2008 Mar 8}{symbolplural support added} % \begin{macrocode} - \def\@glo@symbolplural{\@glo@symbol}% + \let\@glo@symbolplural\@gls@default@value % \end{macrocode} % \begin{macrocode} - \def\@glo@text{\@glo@name}% + \let\@glo@text\@gls@default@value % \end{macrocode} % \begin{macrocode} - \let\@glo@plural\@glsdefaultplural + \let\@glo@plural\@gls@default@value % \end{macrocode} % \changes{1.13}{2008 May 10}{Changed default first value} % Using \cs{let} instead of \cs{def} to make later comparison % avoid expansion issues. (Thanks to Ulrich~Diez for suggesting % this.) % \changes{1.16}{2008 August 27}{Changed def to let} +%\changes{3.10a}{2013-10-13}{Changed to using \cs{@gls@default@value}} % \begin{macrocode} - \let\@glo@first\relax + \let\@glo@first\@gls@default@value % \end{macrocode} % \changes{1.12}{2008 Mar 8}{Changed default first plural to be first % key with s appended (was text key with s appended)} % \changes{1.13}{2008 May 10}{Changed default firstplural value} % \begin{macrocode} - \let\@glo@firstplural\relax + \let\@glo@firstplural\@gls@default@value % \end{macrocode} % Set the default sort: +%\changes{3.10a}{2013-10-13}{Changed to using \cs{@gls@default@value}} %\changes{1.05}{2007 Aug 10}{Changed the default value of the sort % key to just the value of the name key}% %\changes{1.18}{2009 January 14}{Changed default value of sort -% to '@glsdefaultsort} +% to \cs{@glsdefaultsort}} % \begin{macrocode} - \let\@glo@sort\@glsdefaultsort + \let\@glo@sort\@gls@default@value % \end{macrocode} % Set the default counter: % \begin{macrocode} - \def\@glo@counter{\@gls@getcounter{\@glo@type}}% + \let\@glo@counter\@gls@default@value % \end{macrocode} %\changes{1.17}{2008 December 26}{added see key} % \begin{macrocode} @@ -3517,6 +4517,23 @@ name=true]{% % \begin{macrocode} \setkeys{glossentry}{#2}% % \end{macrocode} +%\changes{3.14a}{2013-11-12}{added check for existence of default glossary} +% Check there is a default glossary. +% \begin{macrocode} + \ifundef\glsdefaulttype + {% + \PackageError{glossaries}% + {No default glossary type (have you used `nomain'?)}% + {If you use package option `nomain' you must define + a new glossary before you can define entries}% + }% + {}% +% \end{macrocode} +% Assign type. This must be fully expandable +% \begin{macrocode} + \gls@assign@field{\glsdefaulttype}{#1}{type}{\@glo@type}% + \edef\@glo@type{\glsentrytype{#1}}% +% \end{macrocode} % Check to see if this glossary type has been defined, if it has, % add this label to the relevant list, otherwise generate an error. %\changes{3.0}{2011/04/02}{replaced \cs{@ifundefined} with @@ -3525,7 +4542,7 @@ name=true]{% \ifcsundef{glolist@\@glo@type}% {% \PackageError{glossaries}% - {Glossary type '\@glo@type' has not been defined}% + {Glossary type `\@glo@type' has not been defined}% {You need to define a new glossary type, before making entries in it}% }% @@ -3580,7 +4597,7 @@ name=true]{% % \end{macrocode} % If name and plural haven't been specified, use same as the parent % \begin{macrocode} - \ifx\@glo@plural\@glsdefaultplural + \ifx\@glo@plural\@gls@default@value \expandafter\let\expandafter\@glo@plural \csname glo@\@glo@parent @plural\endcsname \fi @@ -3609,64 +4626,60 @@ name=true]{% % \begin{macrocode} \expandafter\xdef\csname glo@#1@level\endcsname{\number\gls@level}% % \end{macrocode} -% Check if \gloskey{first} and \gloskey{firstplural} have been use. -% If \gloskey{firstplural} hasn't been specified, but \gloskey{first} -% has been specified, then form \gloskey{firstplural} by appending -% \cs{glspluralsuffix} to value of \gloskey{first} key, otherwise -% obtain the value from the \gloskey{plural} key. -% \changes{1.16}{2008 August 27}{Changed if to ifx} -% This now uses \cs{ifx} instead of \cs{if} to avoid expansion -% issues. (Thanks to Ulrich~Diez for suggesting this.) -% \begin{macrocode} - \ifx\relax\@glo@firstplural - \ifx\relax\@glo@first - \def\@glo@firstplural{\@glo@plural}% - \def\@glo@first{\@glo@text}% - \else - \def\@glo@firstplural{\@glo@first\glspluralsuffix}% - \fi +% Define commands associated with this entry: +% \begin{macrocode} + \gls@assign@field{\@glo@name}{#1}{sortvalue}{\@glo@sort}% + \letcs\@glo@sort{glo@#1@sortvalue}% + \gls@assign@field{\@glo@name}{#1}{text}{\@glo@text}% + \expandafter\gls@assign@field\expandafter + {\csname glo@#1@text\endcsname\glspluralsuffix}% + {#1}{plural}{\@glo@plural}% + \expandafter\gls@assign@field\expandafter + {\csname glo@#1@text\endcsname}% + {#1}{first}{\@glo@first}% +% \end{macrocode} +%\changes{3.14a}{2013-11-12}{set the default for firstplural to be the value +%of plural} +%\changes{4.0}{2013-11-14}{added check for first key} +% If \gloskey{first} has been specified, make the default by appending +% \cs{glspluralsuffix}, otherwise make the default the value of the +% \gloskey{plural} key. +% \begin{macrocode} + \ifx\@glo@first\@gls@default@value + \expandafter\gls@assign@field\expandafter + {\csname glo@#1@plural\endcsname}% + {#1}{firstpl}{\@glo@firstplural}% \else - \ifx\relax\@glo@first - \def\@glo@first{\@glo@text}% - \fi + \expandafter\gls@assign@field\expandafter + {\csname glo@#1@first\endcsname\glspluralsuffix}% + {#1}{firstpl}{\@glo@firstplural}% \fi % \end{macrocode} -% Define commands associated with this entry: +%\changes{3.11a}{2013-10-15}{Fixed default counter if none supplied} % \begin{macrocode} - \expandafter - \protected@xdef\csname glo@#1@text\endcsname{\@glo@text}% - \expandafter - \protected@xdef\csname glo@#1@plural\endcsname{\@glo@plural}% - \expandafter - \protected@xdef\csname glo@#1@first\endcsname{\@glo@first}% - \expandafter - \protected@xdef\csname glo@#1@firstpl\endcsname{\@glo@firstplural}% - \expandafter - \protected@xdef\csname glo@#1@type\endcsname{\@glo@type}% - \expandafter - \protected@xdef\csname glo@#1@counter\endcsname{\@glo@counter}% - \expandafter - \protected@xdef\csname glo@#1@useri\endcsname{\@glo@useri}% - \expandafter - \protected@xdef\csname glo@#1@userii\endcsname{\@glo@userii}% - \expandafter - \protected@xdef\csname glo@#1@useriii\endcsname{\@glo@useriii}% - \expandafter - \protected@xdef\csname glo@#1@useriv\endcsname{\@glo@useriv}% - \expandafter - \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}% + \ifcsundef{@glotype@\@glo@type @counter}% + {% + \def\@glo@defaultcounter{\glscounter}% + }% + {% + \letcs\@glo@defaultcounter{@glotype@\@glo@type @counter}% + }% + \gls@assign@field{\@glo@defaultcounter}{#1}{counter}{\@glo@counter}% + \gls@assign@field{}{#1}{useri}{\@glo@useri}% + \gls@assign@field{}{#1}{userii}{\@glo@userii}% + \gls@assign@field{}{#1}{useriii}{\@glo@useriii}% + \gls@assign@field{}{#1}{useriv}{\@glo@useriv}% + \gls@assign@field{}{#1}{userv}{\@glo@userv}% + \gls@assign@field{}{#1}{uservi}{\@glo@uservi}% + \gls@assign@field{}{#1}{short}{\@glo@short}% + \gls@assign@field{}{#1}{shortpl}{\@glo@shortpl}% + \gls@assign@field{}{#1}{long}{\@glo@long}% + \gls@assign@field{}{#1}{longpl}{\@glo@longpl}% + \ifx\@glo@name\@glsnoname + \@glsnoname + \let\@gloname\@gls@default@value + \fi + \gls@assign@field{}{#1}{name}{\@glo@name}% % \end{macrocode} %\changes{3.02}{2012/05/21}{added numberlist element} % Set default numberlist if not defined: @@ -3680,32 +4693,36 @@ name=true]{% % The smaller and smallcaps options set the description to % \cs{@glo@first}. Need to check for this, otherwise it won't get % expanded if the description gets sanitized. -%\changes{1.15}{2008 August 15}{check for '@glo@first in description}% +%\changes{1.15}{2008 August 15}{check for \cs{@glo@first} in description}% % \begin{macrocode} \def\@glo@@desc{\@glo@first}% \ifx\@glo@desc\@glo@@desc \let\@glo@desc\@glo@first \fi - \@gls@sanitizedesc - \expandafter\protected@xdef\csname glo@#1@desc\endcsname{\@glo@desc}% - \expandafter\protected@xdef\csname glo@#1@descplural\endcsname{\@glo@descplural}% + \ifx\@glo@desc\@glsnodesc + \@glsnodesc + \let\@glodesc\@gls@default@value + \fi + \gls@assign@desc{#1}% % \end{macrocode} %\changes{1.18}{2009 January 14}{moved sort sanitization to -% 'newglossaryentry} +% \cs{newglossaryentry}} %\changes{3.0}{2011/04/02}{added \cs{@gls@defsort}} % Set the sort key for this entry: % \begin{macrocode} \@gls@defsort{\@glo@type}{#1}% % \end{macrocode} -%\changes{1.15}{2008 August 15}{check for '@glo@text in symbol}% +%\changes{1.15}{2008 August 15}{check for \cs{@glo@text} in symbol}% % \begin{macrocode} \def\@glo@@symbol{\@glo@text}% \ifx\@glo@symbol\@glo@@symbol \let\@glo@symbol\@glo@text \fi - \@gls@sanitizesymbol - \expandafter\protected@xdef\csname glo@#1@symbol\endcsname{\@glo@symbol}% - \expandafter\protected@xdef\csname glo@#1@symbolplural\endcsname{\@glo@symbolplural}% + \gls@assign@field{\relax}{#1}{symbol}{\@glo@symbol}% + \expandafter + \gls@assign@field\expandafter + {\csname glo@#1@symbol\endcsname} + {#1}{symbolplural}{\@glo@symbolplural}% % \end{macrocode} % Define an associated boolean variable to determine whether this % entry has been used yet (needs to be defined globally): @@ -3730,7 +4747,6 @@ name=true]{% \noexpand\expandafter\noexpand\@glssee\noexpand\@glo@list{#1}}% \@do@glssee \fi - }% % \end{macrocode} % Determine and store main part of the entry's index format. %\changes{1.17}{2008 December 26}{Stored main part of entry @@ -3745,7 +4761,7 @@ name=true]{% } % \end{macrocode} %\changes{1.13}{2008 May 10}{Removed restriction on only using -% 'newglossaryentry in the preamble} +% \cs{newglossaryentry} in the preamble} %\end{macro} %\begin{macro}{\@newglossaryentryprehook} % Allow extra information to be added to glossary entries: @@ -3785,11 +4801,12 @@ name=true]{% % the glossary. (This enables the \sty{glossaries-accsupp} package % to use \cs{accsuppglossaryentryfield} instead.) %\changes{2.04}{2009 November 10}{new} +%\changes{3.08a}{2013-09-28}{switched to \cs{glossentry}} % \begin{macrocode} \ifglsxindy - \newcommand*{\@glossaryentryfield}{\string\\glossaryentryfield} + \newcommand*{\@glossaryentryfield}{\string\\glossentry} \else - \newcommand*{\@glossaryentryfield}{\string\glossaryentryfield} + \newcommand*{\@glossaryentryfield}{\string\glossentry} \fi % \end{macrocode} %\end{macro} @@ -3799,18 +4816,22 @@ name=true]{% % the glossary. (This enables the \sty{glossaries-accsupp} package % to use \cs{accsuppglossarysubentryfield} instead.) %\changes{2.04}{2009 November 10}{new} +%\changes{3.08a}{2013-09-28}{switched to \cs{subglossentry}} % \begin{macrocode} \ifglsxindy \newcommand*{\@glossarysubentryfield}{% - \string\\glossarysubentryfield} + \string\\subglossentry} \else \newcommand*{\@glossarysubentryfield}{% - \string\glossarysubentryfield} + \string\subglossentry} \fi % \end{macrocode} %\end{macro} % %\begin{macro}{\@glo@storeentry} +%\begin{definition} +%\cs{@glo@storeentry}\marg{label} +%\end{definition} %\changes{1.17}{2008 December 26}{new} % Determine the format to write the entry in the glossary % output (\filetype{.glo}) file. @@ -3821,100 +4842,81 @@ name=true]{% % \begin{macrocode} \newcommand{\@glo@storeentry}[1]{% % \end{macrocode} -% Get the sort string and escape any special characters -% \begin{macrocode} -\protected@edef\@glo@sort{\csname glo@#1@sort\endcsname}% -\@gls@checkmkidxchars\@glo@sort -% \end{macrocode} -% Same again for the name string. -% \begin{macrocode} -\protected@edef\@@glo@name{\csname glo@#1@name\endcsname}% -\@gls@checkmkidxchars\@@glo@name -% \end{macrocode} -% Add the font command. (The backslash needs to be escaped for -% \app{xindy}.) +% Escape special characters in the label: % \begin{macrocode} -\ifglsxindy - \protected@edef\@glo@name{\string\\glsnamefont{\@@glo@name}}% -\else - \protected@edef\@glo@name{\string\glsnamefont{\@@glo@name}}% -\fi + \def\@glo@label{#1}% + \@gls@checkmkidxchars\@glo@label % \end{macrocode} -% Get the description string and escape any special characters -% \begin{macrocode} -\protected@edef\@glo@desc{\csname glo@#1@desc\endcsname}% -\@gls@checkmkidxchars\@glo@desc -% \end{macrocode} -% Same again for the symbol +% Get the sort string and escape any special characters % \begin{macrocode} -\protected@edef\@glo@symbol{\csname glo@#1@symbol\endcsname}% -\@gls@checkmkidxchars\@glo@symbol + \protected@edef\@glo@sort{\csname glo@#1@sort\endcsname}% + \@gls@checkmkidxchars\@glo@sort % \end{macrocode} +% Same again for the name string. +%\changes{3.08a}{2013-09-28}{no longer need to check for special characters +%in any of the fields other than sort} % Escape any special characters in the prefix % \begin{macrocode} -\@gls@checkmkidxchars\@glo@prefix + \@gls@checkmkidxchars\@glo@prefix % \end{macrocode} % Get the parent, if one exists % \begin{macrocode} -\edef\@glo@parent{\csname glo@#1@parent\endcsname}% + \edef\@glo@parent{\csname glo@#1@parent\endcsname}% % \end{macrocode} % Write the information to the glossary file. % \begin{macrocode} -\ifglsxindy + \ifglsxindy % \end{macrocode} % Store using \app{xindy} syntax. % \begin{macrocode} - \ifx\@glo@parent\@empty + \ifx\@glo@parent\@empty % \end{macrocode} % Entry doesn't have a parent +%\changes{3.08a}{2013-09-28}{updated for \cs{glossentry}} % \begin{macrocode} - \expandafter\protected@xdef\csname glo@#1@index\endcsname{% - (\string"\@glo@sort\string" % - \string"\@glo@prefix\@glossaryentryfield{#1}{\@glo@name - }{\@glo@desc}{\@glo@symbol}\string") % - }% - \else + \expandafter\protected@xdef\csname glo@#1@index\endcsname{% + (\string"\@glo@sort\string" % + \string"\@glo@prefix\@glossaryentryfield{\@glo@label}\string") % + }% + \else % \end{macrocode} % Entry has a parent % \begin{macrocode} - \expandafter\protected@xdef\csname glo@#1@index\endcsname{% - \csname glo@\@glo@parent @index\endcsname - (\string"\@glo@sort\string" % - \string"\@glo@prefix\@glossarysubentryfield% - {\csname glo@#1@level\endcsname}{#1}{\@glo@name - }{\@glo@desc}{\@glo@symbol}\string") % - }% - \fi -\else + \expandafter\protected@xdef\csname glo@#1@index\endcsname{% + \csname glo@\@glo@parent @index\endcsname + (\string"\@glo@sort\string" % + \string"\@glo@prefix\@glossarysubentryfield + {\csname glo@#1@level\endcsname}{\@glo@label}\string") % + }% + \fi + \else % \end{macrocode} % Store using \app{makeindex} syntax. % \begin{macrocode} - \ifx\@glo@parent\@empty + \ifx\@glo@parent\@empty % \end{macrocode} % Sanitize \cs{@glo@prefix} % \begin{macrocode} - \@onelevel@sanitize\@glo@prefix + \@onelevel@sanitize\@glo@prefix % \end{macrocode} % Entry doesn't have a parent % \begin{macrocode} - \expandafter\protected@xdef\csname glo@#1@index\endcsname{% - \@glo@sort\@gls@actualchar\@glo@prefix - \@glossaryentryfield{#1}{\@glo@name}{\@glo@desc - }{\@glo@symbol}% - }% - \else + \expandafter\protected@xdef\csname glo@#1@index\endcsname{% + \@glo@sort\@gls@actualchar\@glo@prefix + \@glossaryentryfield{\@glo@label}% + }% + \else % \end{macrocode} % Entry has a parent % \begin{macrocode} - \expandafter\protected@xdef\csname glo@#1@index\endcsname{% - \csname glo@\@glo@parent @index\endcsname\@gls@levelchar - \@glo@sort\@gls@actualchar\@glo@prefix - \@glossarysubentryfield - {\csname glo@#1@level\endcsname}{#1}{\@glo@name}{\@glo@desc - }{\@glo@symbol}% - }% + \expandafter\protected@xdef\csname glo@#1@index\endcsname{% + \csname glo@\@glo@parent @index\endcsname\@gls@levelchar + \@glo@sort\@gls@actualchar\@glo@prefix + \@glossarysubentryfield + {\csname glo@#1@level\endcsname}{\@glo@label}% + }% + \fi \fi -\fi } % \end{macrocode} %\end{macro} @@ -3924,42 +4926,88 @@ name=true]{% %\cs{ifglo@}\meta{label}\texttt{@flag} which determines % whether or not the entry has been used (see also % \ics{ifglsused} defined below). These flags can -% be set and unset using the following macros: +% be set and unset using the following macros, but first we need to +% know if we're in \sty{amsmath}'s \env{align} environment's +% measuring pass. +% +%\begin{macro}{\gls@ifnotmeasuring} +%\changes{3.08a}{2013-09-28}{new} +% \begin{macrocode} +\AtBeginDocument{% + \@ifpackageloaded{amsmath}% + {\let\gls@ifnotmeasuring\@gls@ifnotmeasuring}% + {}% +} +\newcommand*{\@gls@ifnotmeasuring}[1]{% + \ifmeasuring@ + \else + #1% + \fi +} +\newcommand*\gls@ifnotmeasuring[1]{#1} +% \end{macrocode} +%\end{macro} % +%\begin{macro}{\glsreset} % The command \cs{glsreset}\marg{label} can be used % to set the entry flag to indicate that it hasn't been used yet. The % required argument is the entry label. -%\begin{macro}{\glsreset} % \begin{macrocode} \newcommand*{\glsreset}[1]{% -\glsdoifexists{#1}{% -\expandafter\global\csname glo@#1@flagfalse\endcsname}} + \gls@ifnotmeasuring + {% + \glsdoifexists{#1}% + {% + \expandafter\global\csname glo@#1@flagfalse\endcsname + }% + }% +} % \end{macrocode} %\end{macro} -% As above, but with only a local effect: +% %\begin{macro}{\glslocalreset} +% As above, but with only a local effect: % \begin{macrocode} \newcommand*{\glslocalreset}[1]{% -\glsdoifexists{#1}{% -\expandafter\let\csname ifglo@#1@flag\endcsname\iffalse}} + \gls@ifnotmeasuring + {% + \glsdoifexists{#1}% + {% + \expandafter\let\csname ifglo@#1@flag\endcsname\iffalse + }% + }% +} % \end{macrocode} %\end{macro} +%\begin{macro}{\glsunset} % The command \cs{glsunset}\marg{label} can be used to % set the entry flag to indicate that it has been used. The required % argument is the entry label. -%\begin{macro}{\glsunset} % \begin{macrocode} \newcommand*{\glsunset}[1]{% -\glsdoifexists{#1}{% -\expandafter\global\csname glo@#1@flagtrue\endcsname}} + \gls@ifnotmeasuring + {% + \glsdoifexists{#1}% + {% + \expandafter\global\csname glo@#1@flagtrue\endcsname + }% + }% +} % \end{macrocode} %\end{macro} -% As above, but with only a local effect: +% %\begin{macro}{\glslocalunset} +% As above, but with only a local effect: % \begin{macrocode} \newcommand*{\glslocalunset}[1]{% -\glsdoifexists{#1}{% -\expandafter\let\csname ifglo@#1@flag\endcsname\iftrue}} + \gls@ifnotmeasuring + {% + \glsdoifexists{#1}% + {% + \expandafter\let\csname ifglo@#1@flag\endcsname\iftrue + }% + }% +} % \end{macrocode} %\end{macro} % Reset all entries for the named glossaries (supplied in a @@ -3968,16 +5016,22 @@ name=true]{% %\begin{macro}{\glsresetall} % \begin{macrocode} \newcommand*{\glsresetall}[1][\@glo@types]{% -\forallglsentries[#1]{\@glsentry}{% -\glsreset{\@glsentry}}} + \forallglsentries[#1]{\@glsentry}% + {% + \glsreset{\@glsentry}% + }% +} % \end{macrocode} %\end{macro} % As above, but with only a local effect: %\begin{macro}{\glslocalresetall} % \begin{macrocode} \newcommand*{\glslocalresetall}[1][\@glo@types]{% -\forallglsentries[#1]{\@glsentry}{% -\glslocalreset{\@glsentry}}} + \forallglsentries[#1]{\@glsentry}% + {% + \glslocalreset{\@glsentry}% + }% +} % \end{macrocode} %\end{macro} % Unset all entries for the named glossaries (supplied in a @@ -3986,16 +5040,22 @@ name=true]{% %\begin{macro}{\glsunsetall} % \begin{macrocode} \newcommand*{\glsunsetall}[1][\@glo@types]{% -\forallglsentries[#1]{\@glsentry}{% -\glsunset{\@glsentry}}} + \forallglsentries[#1]{\@glsentry}% + {% + \glsunset{\@glsentry}% + }% +} % \end{macrocode} %\end{macro} % As above, but with only a local effect: %\begin{macro}{\glslocalunsetall} % \begin{macrocode} \newcommand*{\glslocalunsetall}[1][\@glo@types]{% -\forallglsentries[#1]{\@glsentry}{% -\glslocalunset{\@glsentry}}} + \forallglsentries[#1]{\@glsentry}% + {% + \glslocalunset{\@glsentry}% + }% +} % \end{macrocode} %\end{macro} % @@ -4018,9 +5078,10 @@ name=true]{% %\begin{macro}{\loadglsentries} % \begin{macrocode} \newcommand*{\loadglsentries}[2][\@gls@default]{% -\let\@gls@default\glsdefaulttype -\def\glsdefaulttype{#1}\input{#2}% -\let\glsdefaulttype\@gls@default} + \let\@gls@default\glsdefaulttype + \def\glsdefaulttype{#1}\input{#2}% + \let\glsdefaulttype\@gls@default +} % \end{macrocode} %\end{macro} % \cs{loadglsentries} can only be used in the preamble: @@ -4041,83 +5102,468 @@ name=true]{% % subsequent use). Any formatting commands (such as \cs{textbf} % is governed by \ics{glstextformat}. By default this just % displays the \term{link text} ``as is''. -%\changes{1.04}{2007 Aug 3}{Added 'glstextformat}% +%\changes{1.04}{2007 Aug 3}{Added \cs{glstextformat}}% %\begin{macro}{\glstextformat} % \begin{macrocode} \newcommand*{\glstextformat}[1]{#1} % \end{macrocode} %\end{macro} % -% The first time an entry is used, the way in which it is -% displayed is governed by \cs{glsdisplayfirst}. This -% takes four parameters: \verb|#1| will be the value -% of the entry's \gloskey{first} or \gloskey{firstplural} key, -% \verb|#2| will be the value of the entry's \gloskey{description} -% key, \verb|#3| will be the value of the entry's \gloskey{symbol} -% key and \verb|#4| is additional text supplied by the final optional -% argument to commands like \ics{gls} and \ics{glspl}. -% The default is to display the first parameter followed by the -% additional text. +%\begin{macro}{\glsentryfmt} +% As from version 3.11a, the way in which an entry is displayed is now +% governed by \cs{glsentryfmt}. This doesn't take any arguments. The +% required information is set by commands like \cs{gls}. +% To ensure backward compatibility, the default use the old +% \cs{glsdisplay} and \cs{glsdisplayfirst} style of commands +% \begin{macrocode} +\newcommand*{\glsentryfmt}{% + \@@gls@default@entryfmt\glsdisplayfirst\glsdisplay +} +% \end{macrocode} +% Format that provides backwards compatibility: +% \begin{macrocode} +\newcommand*{\@@gls@default@entryfmt}[2]{% + \ifdefempty\glscustomtext + {% + \glsifplural + {% +% \end{macrocode} +% Plural form +% \begin{macrocode} + \glscapscase + {% +% \end{macrocode} +% Don't adjust case +% \begin{macrocode} + \ifglsused\glslabel + {% +% \end{macrocode} +% Subsequent use +% \begin{macrocode} + #2{\glsentryplural{\glslabel}}% + {\glsentrydescplural{\glslabel}}% + {\glsentrysymbolplural{\glslabel}}{\glsinsert}% + }% + {% +% \end{macrocode} +% First use +% \begin{macrocode} + #1{\glsentryfirstplural{\glslabel}}% + {\glsentrydescplural{\glslabel}}% + {\glsentrysymbolplural{\glslabel}}{\glsinsert}% + }% + }% + {% +% \end{macrocode} +% Make first letter upper case +% \begin{macrocode} + \ifglsused\glslabel + {% +% \end{macrocode} +% Subsequent use. (Expansion was used in version 3.07 and below +% in case the name wasn't the first thing to be displayed, but now +% the user can sort out the upper casing in \ics{defglsentryfmt}, +% which avoids the issues caused by fragile commands.) +% \begin{macrocode} + \ifbool{glscompatible-3.07}% + {% + \protected@edef\@glo@etext{% + #2{\glsentryplural{\glslabel}}% + {\glsentrydescplural{\glslabel}}% + {\glsentrysymbolplural{\glslabel}}{\glsinsert}}% + \xmakefirstuc\@glo@etext + }% + {% + #2{\Glsentryplural{\glslabel}}% + {\glsentrydescplural{\glslabel}}% + {\glsentrysymbolplural{\glslabel}}{\glsinsert}% + }% + }% + {% +% \end{macrocode} +% First use +% \begin{macrocode} + \ifbool{glscompatible-3.07}% + {% + \protected@edef\@glo@etext{% + #1{\glsentryfirstplural{\glslabel}}% + {\glsentrydescplural{\glslabel}}% + {\glsentrysymbolplural{\glslabel}}{\glsinsert}}% + \xmakefirstuc\@glo@etext + }% + {% + #1{\Glsentryfirstplural{\glslabel}}% + {\glsentrydescplural{\glslabel}}% + {\glsentrysymbolplural{\glslabel}}{\glsinsert}% + }% + }% + }% + {% +% \end{macrocode} +% Make all upper case +% \begin{macrocode} + \ifglsused\glslabel + {% +% \end{macrocode} +% Subsequent use +% \begin{macrocode} + \mfirstucMakeUppercase{#2{\glsentryplural{\glslabel}}% + {\glsentrydescplural{\glslabel}}% + {\glsentrysymbolplural{\glslabel}}{\glsinsert}}% + }% + {% +% \end{macrocode} +% First use +% \begin{macrocode} + \mfirstucMakeUppercase{#1{\glsentryfirstplural{\glslabel}}% + {\glsentrydescplural{\glslabel}}% + {\glsentrysymbolplural{\glslabel}}{\glsinsert}}% + }% + }% + }% + {% +% \end{macrocode} +% Singular form +% \begin{macrocode} + \glscapscase + {% +% \end{macrocode} +% Don't adjust case +% \begin{macrocode} + \ifglsused\glslabel + {% +% \end{macrocode} +% Subsequent use +% \begin{macrocode} + #2{\glsentrytext{\glslabel}}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{\glsinsert}% + }% + {% +% \end{macrocode} +% First use +% \begin{macrocode} + #1{\glsentryfirst{\glslabel}}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{\glsinsert}% + }% + }% + {% +% \end{macrocode} +% Make first letter upper case +% \begin{macrocode} + \ifglsused\glslabel + {% +% \end{macrocode} +% Subsequent use +% \begin{macrocode} + \ifbool{glscompatible-3.07}% + {% + \protected@edef\@glo@etext{% + #2{\glsentrytext{\glslabel}}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{\glsinsert}}% + \xmakefirstuc\@glo@etext + }% + {% + #2{\Glsentrytext{\glslabel}}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{\glsinsert}% + }% + }% + {% +% \end{macrocode} +% First use +% \begin{macrocode} + \ifbool{glscompatible-3.07}% + {% + \protected@edef\@glo@etext{% + #1{\glsentryfirst{\glslabel}}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{\glsinsert}}% + \xmakefirstuc\@glo@etext + }% + {% + #1{\Glsentryfirst{\glslabel}}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{\glsinsert}% + }% + }% + }% + {% +% \end{macrocode} +% Make all upper case +% \begin{macrocode} + \ifglsused\glslabel + {% +% \end{macrocode} +% Subsequent use +% \begin{macrocode} + \mfirstucMakeUppercase{#2{\glsentrytext{\glslabel}}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{\glsinsert}}% + }% + {% +% \end{macrocode} +% First use +% \begin{macrocode} + \mfirstucMakeUppercase{#1{\glsentryfirst{\glslabel}}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{\glsinsert}}% + }% + }% + }% + }% + {% +% \end{macrocode} +% Custom text provided in \cs{glsdisp} +% \begin{macrocode} + \ifglsused{\glslabel}% + {% +% \end{macrocode} +% Subsequent use +% \begin{macrocode} + #2{\glscustomtext}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{}% + }% + {% +% \end{macrocode} +% First use +% \begin{macrocode} + #1{\glscustomtext}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{}% + }% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsgenentryfmt} +% Define a generic format that just uses the first, text, plural or +% first plural keys (or the custom text) with the insert text appended. +%\changes{3.11a}{2013-10-15}{new} +% \begin{macrocode} +\newcommand*{\glsgenentryfmt}{% + \ifdefempty\glscustomtext + {% + \glsifplural + {% +% \end{macrocode} +% Plural form +% \begin{macrocode} + \glscapscase + {% +% \end{macrocode} +% Don't adjust case +% \begin{macrocode} + \ifglsused\glslabel + {% +% \end{macrocode} +% Subsequent use +% \begin{macrocode} + \glsentryplural{\glslabel}\glsinsert + }% + {% +% \end{macrocode} +% First use +% \begin{macrocode} + \glsentryfirstplural{\glslabel}\glsinsert + }% + }% + {% +% \end{macrocode} +% Make first letter upper case +% \begin{macrocode} + \ifglsused\glslabel + {% +% \end{macrocode} +% Subsequent use. +% \begin{macrocode} + \Glsentryplural{\glslabel}\glsinsert + }% + {% +% \end{macrocode} +% First use +% \begin{macrocode} + \Glsentryfirstplural{\glslabel}\glsinsert + }% + }% + {% +% \end{macrocode} +% Make all upper case +% \begin{macrocode} + \ifglsused\glslabel + {% +% \end{macrocode} +% Subsequent use +% \begin{macrocode} + \mfirstucMakeUppercase + {\glsentryplural{\glslabel}\glsinsert}% + }% + {% +% \end{macrocode} +% First use +% \begin{macrocode} + \mfirstucMakeUppercase + {\glsentryfirstplural{\glslabel}\glsinsert}% + }% + }% + }% + {% +% \end{macrocode} +% Singular form +% \begin{macrocode} + \glscapscase + {% +% \end{macrocode} +% Don't adjust case +% \begin{macrocode} + \ifglsused\glslabel + {% +% \end{macrocode} +% Subsequent use +% \begin{macrocode} + \glsentrytext{\glslabel}\glsinsert + }% + {% +% \end{macrocode} +% First use +% \begin{macrocode} + \glsentryfirst{\glslabel}\glsinsert + }% + }% + {% +% \end{macrocode} +% Make first letter upper case +% \begin{macrocode} + \ifglsused\glslabel + {% +% \end{macrocode} +% Subsequent use +% \begin{macrocode} + \Glsentrytext{\glslabel}\glsinsert + }% + {% +% \end{macrocode} +% First use +% \begin{macrocode} + \Glsentryfirst{\glslabel}\glsinsert + }% + }% + {% +% \end{macrocode} +% Make all upper case +% \begin{macrocode} + \ifglsused\glslabel + {% +% \end{macrocode} +% Subsequent use +% \begin{macrocode} + \mfirstucMakeUppercase{\glsentrytext{\glslabel}\glsinsert}% + }% + {% +% \end{macrocode} +% First use +% \begin{macrocode} + \mfirstucMakeUppercase{\glsentryfirst{\glslabel}\glsinsert}% + }% + }% + }% + }% + {% +% \end{macrocode} +% Custom text provided in \cs{glsdisp}. (The insert is most likely +% to be empty at this point.) +% \begin{macrocode} + \glscustomtext\glsinsert + }% +} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\glsdisplayfirst} +% Deprecated. Kept for backward compatibility. +%\changes{3.11a}{2013-10-15}{obsoleted} % \begin{macrocode} \newcommand*{\glsdisplayfirst}[4]{#1#4} % \end{macrocode} %\end{macro} % -% After the first use, the entry is displayed according to -% the format of \cs{glsdisplay}. Again, it takes four -% parameters: \verb|#1| will be the value of the -% entry's \gloskey{text} or \gloskey{plural} key, -% \verb|#2| will be the value of the entry's \gloskey{description} -% key, \verb|#3| will be the value of the entry's \gloskey{symbol} -% key and \verb|#4| is additional text supplied by the final optional -% argument to commands like \ics{gls} and \ics{glspl}. %\begin{macro}{\glsdisplay} +% Deprecated. Kept for backward compatibility. +%\changes{3.11a}{2013-10-15}{obsoleted} % \begin{macrocode} \newcommand*{\glsdisplay}[4]{#1#4} % \end{macrocode} %\end{macro} % -% When a new glossary is created it uses \cs{glsdisplayfirst} -% and \cs{glsdisplay} as the default way of displaying its -% entry in the text. This can be changed for the entries belonging -% to an individual glossary using -% \ics{defglsdisplay} and \ics{defglsdisplayfirst}. -%\\[10pt] -% \cs{defglsdisplay}\oarg{type}\marg{definition}\\[10pt]% -% The glossary type is given by \meta{type} (the default glossary -% if omitted) and -% \meta{definition} should have at most \verb|#1|, \verb|#2|, -% \verb|#3| and \verb|#4|. These represent the same arguments -% as those described for \ics{glsdisplay}. %\begin{macro}{\defglsdisplay} +%\changes{3.11a}{2013-10-15}{obsoleted} +% Deprecated. Kept for backward compatibility. % \begin{macrocode} \newcommand*{\defglsdisplay}[2][\glsdefaulttype]{% -\expandafter\def\csname gls@#1@display\endcsname##1##2##3##4{#2}} + \GlossariesWarning{\string\defglsdisplay\space is now obsolete.^^J + Use \string\defglsentryfmt\space instead}% + \expandafter\def\csname gls@#1@display\endcsname##1##2##3##4{#2}% + \edef\@gls@doentrydef{% + \noexpand\defglsentryfmt[#1]{% + \noexpand\ifcsdef{gls@#1@displayfirst}% + {% + \noexpand\@@gls@default@entryfmt + {\noexpand\csuse{gls@#1@displayfirst}} + {\noexpand\csuse{gls@#1@display}}% + }% + {% + \noexpand\@@gls@default@entryfmt + {\noexpand\glsdisplayfirst} + {\noexpand\csuse{gls@#1@display}}% + }% + }% + }% + \@gls@doentrydef +} % \end{macrocode} %\end{macro} -%\vskip5pt -% \cs{defglsdisplayfirst}\oarg{type}\marg{definition}\\[10pt]% -% The glossary type is given by \meta{type} (the default glossary -% if omitted) and -% \meta{definition} should have at most \verb|#1|, \verb|#2|, -% \verb|#3| and \verb|#4|. These represent the same arguments -% as those described for \ics{glsdisplayfirst}. +% %\begin{macro}{\defglsdisplayfirst} +% Deprecated. Kept for backward compatibility. +%\changes{3.11a}{2013-10-15}{obsoleted} % \begin{macrocode} \newcommand*{\defglsdisplayfirst}[2][\glsdefaulttype]{% -\expandafter\def\csname gls@#1@displayfirst\endcsname##1##2##3##4{#2}} + \GlossariesWarning{\string\defglsdisplayfirst\space is now obsolete.^^J + Use \string\defglsentryfmt\space instead}% + \expandafter\def\csname gls@#1@displayfirst\endcsname##1##2##3##4{#2}% + \edef\@gls@doentrydef{% + \noexpand\defglsentryfmt[#1]{% + \noexpand\ifcsdef{gls@#1@display}% + {% + \noexpand\@@gls@default@entryfmt + {\noexpand\csuse{gls@#1@displayfirst}} + {\noexpand\csuse{gls@#1@display}}% + }% + {% + \noexpand\@@gls@default@entryfmt + {\noexpand\csuse{gls@#1@displayfirst}}% + {\noexpand\glsdisplay} + }% + }% + }% + \@gls@doentrydef +} % \end{macrocode} %\end{macro} % %\subsubsection{Links to glossary entries} % The links to glossary entries all have a first optional % argument that can be used to change the format and counter -% of the associated entry number. Except for \cs{glslink}, +% of the associated entry number. Except for \cs{glslink} +% and \cs{glsdisp}, % the commands like \cs{gls} have a final optional % argument that can be used to insert additional text in the % link (this will usually be appended, but can be redefined using -% \ics{defglsdisplay} and \ics{defglsdisplayfirst}). +% \ics{defentryfmt}). % It goes against the \LaTeX\ norm to have an optional % argument after the mandatory arguments, but it makes more % sense to write, say, \verb|\gls{label}['s]| rather than, say, @@ -4191,7 +5637,8 @@ name=true]{% %\changes{3.01}{2011/04/12}{made robust} % \begin{macrocode} \newrobustcmd*{\glslink}{% -\@ifstar\@sgls@link\@gls@@link} + \@ifstar\@sgls@link\@gls@@link +} % \end{macrocode} %\end{macro} %\begin{macro}{\@sgls@link} @@ -4227,7 +5674,7 @@ name=true]{% %\end{macro} %\begin{macro}{\@gls@link} %\changes{1.07}{2007 Sep 13}{fixed bug caused by \cs{theglsentrycounter} setting the page number too soon} -%\changes{1.15}{2008 August 15}{added 'glslabel} +%\changes{1.15}{2008 August 15}{added \cs{glslabel}} % \begin{macrocode} \def\@gls@link[#1]#2#3{% % \end{macrocode} @@ -4275,7 +5722,10 @@ name=true]{% \ifKV@glslink@hyper \@glslink{\glolinkprefix#2}{\glstextformat{#3}}% \else - \glstextformat{#3}\relax +% \end{macrocode} +%\changes{3.13a}{2013-11-05}{removed \cs{relax}} +% \begin{macrocode} + \glstextformat{#3}% \fi } % \end{macrocode} @@ -4458,31 +5908,31 @@ name=true]{% %\begin{macro}{\@gls@checkmkidxchars} % \begin{macrocode} \newcommand{\@gls@checkmkidxchars}[1]{% -\ifglsxindy - \@gls@escbsdq{#1}% -\else - \def\@gls@checkedmkidx{}% - \expandafter\@gls@checkquote#1\@nil""\null - \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% - \def\@gls@checkedmkidx{}% - \expandafter\@gls@checkescquote#1\@nil\"\"\null - \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% - \def\@gls@checkedmkidx{}% - \expandafter\@gls@checkescactual#1\@nil\?\?\null - \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% - \def\@gls@checkedmkidx{}% - \expandafter\@gls@checkactual#1\@nil??\null - \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% - \def\@gls@checkedmkidx{}% - \expandafter\@gls@checkbar#1\@nil||\null - \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% - \def\@gls@checkedmkidx{}% - \expandafter\@gls@checkescbar#1\@nil\|\|\null - \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% - \def\@gls@checkedmkidx{}% - \expandafter\@gls@checklevel#1\@nil!!\null - \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% -\fi + \ifglsxindy + \@gls@escbsdq{#1}% + \else + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkquote#1\@nil""\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkescquote#1\@nil\"\"\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkescactual#1\@nil\?\?\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkactual#1\@nil??\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkbar#1\@nil||\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkescbar#1\@nil\|\|\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checklevel#1\@nil!!\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \fi } % \end{macrocode} %\end{macro} @@ -4504,55 +5954,57 @@ name=true]{% % special character\mkidxspch. % \begin{macrocode} \def\@gls@checkquote#1"#2"#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@checkquote{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\@gls@quotechar\@gls@quotechar\@gls@quotechar}% - \def\@@gls@checkquote{\@gls@checkquote#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\@gls@quotechar}% - \ifx\null#3\null - \def\@@gls@checkquote{\@gls@checkquote#2""\null}% - \else - \def\@@gls@checkquote{\@gls@checkquote#2"#3\null}% - \fi -\fi -\@@gls@checkquote} + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@checkquote{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\@gls@quotechar\@gls@quotechar\@gls@quotechar}% + \def\@@gls@checkquote{\@gls@checkquote#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\@gls@quotechar}% + \ifx\null#3\null + \def\@@gls@checkquote{\@gls@checkquote#2""\null}% + \else + \def\@@gls@checkquote{\@gls@checkquote#2"#3\null}% + \fi + \fi + \@@gls@checkquote +} % \end{macrocode} %\end{macro} %\begin{macro}{\@gls@checkescquote} % Do the same for \verb|\"|: % \begin{macrocode} \def\@gls@checkescquote#1\"#2\"#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@checkescquote{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\string\"\@gls@quotechar - \@gls@quotechar\string\"\@gls@quotechar}% - \def\@@gls@checkescquote{\@gls@checkescquote#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\string\"\@gls@quotechar}% - \ifx\null#3\null - \def\@@gls@checkescquote{\@gls@checkescquote#2\"\"\null}% - \else - \def\@@gls@checkescquote{\@gls@checkescquote#2\"#3\null}% - \fi -\fi -\@@gls@checkescquote} + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@checkescquote{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\string\"\@gls@quotechar + \@gls@quotechar\string\"\@gls@quotechar}% + \def\@@gls@checkescquote{\@gls@checkescquote#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\string\"\@gls@quotechar}% + \ifx\null#3\null + \def\@@gls@checkescquote{\@gls@checkescquote#2\"\"\null}% + \else + \def\@@gls@checkescquote{\@gls@checkescquote#2\"#3\null}% + \fi + \fi +\@@gls@checkescquote +} % \end{macrocode} %\end{macro} %\begin{macro}{\@gls@checkescactual} @@ -4560,165 +6012,171 @@ name=true]{% % \app{makeindex}'s special character): % \begin{macrocode} \def\@gls@checkescactual#1\?#2\?#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@checkescactual{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\string\"\@gls@actualchar + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@checkescactual{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\string\"\@gls@actualchar + \@gls@quotechar\string\"\@gls@actualchar}% + \def\@@gls@checkescactual{\@gls@checkescactual#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ \@gls@quotechar\string\"\@gls@actualchar}% - \def\@@gls@checkescactual{\@gls@checkescactual#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\string\"\@gls@actualchar}% - \ifx\null#3\null - \def\@@gls@checkescactual{\@gls@checkescactual#2\?\?\null}% - \else - \def\@@gls@checkescactual{\@gls@checkescactual#2\?#3\null}% - \fi -\fi -\@@gls@checkescactual} + \ifx\null#3\null + \def\@@gls@checkescactual{\@gls@checkescactual#2\?\?\null}% + \else + \def\@@gls@checkescactual{\@gls@checkescactual#2\?#3\null}% + \fi + \fi +\@@gls@checkescactual +} % \end{macrocode} %\end{macro} %\begin{macro}{\@gls@checkescbar} % Similarly for \verb"\|": % \begin{macrocode} \def\@gls@checkescbar#1\|#2\|#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@checkescbar{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\string\"\@gls@encapchar - \@gls@quotechar\string\"\@gls@encapchar}% - \def\@@gls@checkescbar{\@gls@checkescbar#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\string\"\@gls@encapchar}% - \ifx\null#3\null - \def\@@gls@checkescbar{\@gls@checkescbar#2\|\|\null}% - \else - \def\@@gls@checkescbar{\@gls@checkescbar#2\|#3\null}% - \fi -\fi -\@@gls@checkescbar} + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@checkescbar{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\string\"\@gls@encapchar + \@gls@quotechar\string\"\@gls@encapchar}% + \def\@@gls@checkescbar{\@gls@checkescbar#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\string\"\@gls@encapchar}% + \ifx\null#3\null + \def\@@gls@checkescbar{\@gls@checkescbar#2\|\|\null}% + \else + \def\@@gls@checkescbar{\@gls@checkescbar#2\|#3\null}% + \fi + \fi +\@@gls@checkescbar +} % \end{macrocode} %\end{macro} %\begin{macro}{\@gls@checkesclevel} % Similarly for \verb"\!": % \begin{macrocode} \def\@gls@checkesclevel#1\!#2\!#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@checkesclevel{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\string\"\@gls@levelchar - \@gls@quotechar\string\"\@gls@levelchar}% - \def\@@gls@checkesclevel{\@gls@checkesclevel#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\string\"\@gls@levelchar}% - \ifx\null#3\null - \def\@@gls@checkesclevel{\@gls@checkesclevel#2\!\!\null}% - \else - \def\@@gls@checkesclevel{\@gls@checkesclevel#2\!#3\null}% - \fi -\fi -\@@gls@checkesclevel} + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@checkesclevel{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\string\"\@gls@levelchar + \@gls@quotechar\string\"\@gls@levelchar}% + \def\@@gls@checkesclevel{\@gls@checkesclevel#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\string\"\@gls@levelchar}% + \ifx\null#3\null + \def\@@gls@checkesclevel{\@gls@checkesclevel#2\!\!\null}% + \else + \def\@@gls@checkesclevel{\@gls@checkesclevel#2\!#3\null}% + \fi + \fi +\@@gls@checkesclevel +} % \end{macrocode} %\end{macro} %\begin{macro}{\@gls@checkbar} % and for \verb"|": % \begin{macrocode} \def\@gls@checkbar#1|#2|#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@checkbar{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\@gls@encapchar\@gls@quotechar\@gls@encapchar}% - \def\@@gls@checkbar{\@gls@checkbar#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\@gls@encapchar}% - \ifx\null#3\null - \def\@@gls@checkbar{\@gls@checkbar#2||\null}% - \else - \def\@@gls@checkbar{\@gls@checkbar#2|#3\null}% - \fi -\fi -\@@gls@checkbar} + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@checkbar{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\@gls@encapchar\@gls@quotechar\@gls@encapchar}% + \def\@@gls@checkbar{\@gls@checkbar#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\@gls@encapchar}% + \ifx\null#3\null + \def\@@gls@checkbar{\@gls@checkbar#2||\null}% + \else + \def\@@gls@checkbar{\@gls@checkbar#2|#3\null}% + \fi + \fi + \@@gls@checkbar +} % \end{macrocode} %\end{macro} %\begin{macro}{\@gls@checklevel} % and for \verb"!": % \begin{macrocode} \def\@gls@checklevel#1!#2!#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@checklevel{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\@gls@levelchar\@gls@quotechar\@gls@levelchar}% - \def\@@gls@checklevel{\@gls@checklevel#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\@gls@levelchar}% - \ifx\null#3\null - \def\@@gls@checklevel{\@gls@checklevel#2!!\null}% - \else - \def\@@gls@checklevel{\@gls@checklevel#2!#3\null}% - \fi -\fi -\@@gls@checklevel} + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@checklevel{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\@gls@levelchar\@gls@quotechar\@gls@levelchar}% + \def\@@gls@checklevel{\@gls@checklevel#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\@gls@levelchar}% + \ifx\null#3\null + \def\@@gls@checklevel{\@gls@checklevel#2!!\null}% + \else + \def\@@gls@checklevel{\@gls@checklevel#2!#3\null}% + \fi + \fi + \@@gls@checklevel +} % \end{macrocode} %\end{macro} %\begin{macro}{\@gls@checkactual} % and for \verb"?": % \begin{macrocode} \def\@gls@checkactual#1?#2?#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@checkactual{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\@gls@actualchar\@gls@quotechar\@gls@actualchar}% - \def\@@gls@checkactual{\@gls@checkactual#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\@gls@actualchar}% - \ifx\null#3\null - \def\@@gls@checkactual{\@gls@checkactual#2??\null}% - \else - \def\@@gls@checkactual{\@gls@checkactual#2?#3\null}% - \fi -\fi -\@@gls@checkactual} + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@checkactual{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\@gls@actualchar\@gls@quotechar\@gls@actualchar}% + \def\@@gls@checkactual{\@gls@checkactual#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\@gls@actualchar}% + \ifx\null#3\null + \def\@@gls@checkactual{\@gls@checkactual#2??\null}% + \else + \def\@@gls@checkactual{\@gls@checkactual#2?#3\null}% + \fi + \fi + \@@gls@checkactual +} % \end{macrocode} %\end{macro} % @@ -4726,27 +6184,27 @@ name=true]{% % As before but for use with \app{xindy} % \begin{macrocode} \def\@gls@xdycheckquote#1"#2"#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@xdycheckquote{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \string\"\string\"}% - \def\@@gls@xdycheckquote{\@gls@xdycheckquote#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \string\"}% - \ifx\null#3\null - \def\@@gls@xdycheckquote{\@gls@xdycheckquote#2""\null}% - \else - \def\@@gls@xdycheckquote{\@gls@xdycheckquote#2"#3\null}% - \fi -\fi -\@@gls@xdycheckquote + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@xdycheckquote{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \string\"\string\"}% + \def\@@gls@xdycheckquote{\@gls@xdycheckquote#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \string\"}% + \ifx\null#3\null + \def\@@gls@xdycheckquote{\@gls@xdycheckquote#2""\null}% + \else + \def\@@gls@xdycheckquote{\@gls@xdycheckquote#2"#3\null}% + \fi + \fi + \@@gls@xdycheckquote } % \end{macrocode} %\end{macro} @@ -4813,8 +6271,9 @@ name=true]{% } % \end{macrocode} %\end{macro} -%\changes{1.12}{2008 Mar 8}{added check for 'hypertarget separate -% to 'hyperlink (memoir defines 'hyperlink but not 'hypertarget)} +%\changes{1.12}{2008 Mar 8}{added check for \cs{hypertarget} separate +% to \cs{hyperlink} (memoir defines \cs{hyperlink} but not +% \cs{hypertarget})} %\begin{macro}{\@glstarget} % If \ics{hypertarget} is not defined, \cs{@glstarget} % ignores its first argument and just does the second argument, @@ -4822,8 +6281,7 @@ name=true]{% %\changes{1.16}{2008 August 27}{raised the hypertarget so the target text doesn't % scroll off the top of the page} % \begin{macrocode} -\newlength\gls@tmplen -\ifcsundef{hypertarget}% +\newlength\gls@tmplen \ifcsundef{hypertarget}% {% \gdef\@glstarget#1#2{#2}% }% @@ -4841,8 +6299,9 @@ name=true]{% %\begin{macro}{\glsdisablehyper} % \begin{macrocode} \newcommand{\glsdisablehyper}{% -\renewcommand*\@glslink[2]{##2}% -\renewcommand*\@glstarget[2]{##2}} + \renewcommand*\@glslink[2]{##2}% + \renewcommand*\@glstarget[2]{##2}% +} % \end{macrocode} %\end{macro} % Glossary hyperlinks can be enabled using \cs{glsenablehyper} @@ -4857,8 +6316,17 @@ name=true]{% % \end{macrocode} %\end{macro} % -%Syntax:\\[10pt] -% \cs{gls}\oarg{options}\marg{label}\oarg{insert text}\\[10pt] +% Provide some convenience commands if not already defined: +% \begin{macrocode} +\providecommand{\@firstofthree}[3]{#1} +\providecommand{\@secondofthree}[3]{#2} +\providecommand{\@thirdofthree}[3]{#3} +% \end{macrocode} +% +%Syntax: +%\begin{definition} +% \cs{gls}\oarg{options}\marg{label}\oarg{insert text} +%\end{definition} % Link to glossary entry using singular form. The link text % is taken from the value of the \gloskey{text} or \gloskey{first} % keys used when the entry was defined. @@ -4909,27 +6377,29 @@ name=true]{% \def\@gls@link@opts{#1}% \def\@gls@link@label{#2}% % \end{macrocode} +%\changes{3.11a}{2013-10-15}{add \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glscustomtext} and \cs{glsinsert}} +% \begin{macrocode} + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@firstofthree + \let\glscustomtext\@empty + \def\glsinsert{#3}% +% \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{change to using \cs{glsentryfmt} style +%commands} % \begin{macrocode} - \ifglsused{#2}% - {% - \def\@glo@text{% - \csname gls@\@glo@type @display\endcsname - {\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% - }% - {% - \def\@glo@text{% - \csname gls@\@glo@type @displayfirst\endcsname - {\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% - }% + \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}% % \end{macrocode} % Call \cs{@gls@link}. % If \pkgopt{footnote} package option has been used and the glossary % type is \cs{acronymtype}, suppress % hyperlink for first use. Likewise if the \pkgopt[false]{hyperfirst} % package option is used. -%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to +%\changes{1.16}{2008 August 27}{Test glossary type is +%\cs{acronymtype} in addition to %checking if footnote option has been used} %\changes{2.03}{2009 Sep 23}{Added check for hyperfirst} %\changes{2.04}{2009 November 10}{Changed test to check if glossary type @@ -5001,38 +6471,38 @@ name=true]{% \def\@gls@link@label{#2}% \def\glslabel{#2}% % \end{macrocode} +%\changes{3.11a}{2013-10-15}{add \cs{glsifplural}, +% \cs{glscapscase}, \cs{glscustomtext} and \cs{glsinsert}} +% \begin{macrocode} + \let\glsifplural\@secondoftwo + \let\glscapscase\@secondofthree + \let\glscustomtext\@empty + \def\glsinsert{#3}% +% \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{change to using \cs{glsentryfmt} style +%commands} % \begin{macrocode} - \ifglsused{#2}% - {% - \protected@edef\@glo@text{% - \csname gls@\@glo@type @display\endcsname - {\glsentrytext{#2}}{\glsentrydesc{#2}}% - {\glsentrysymbol{#2}}{#3}}% - }% - {% - \protected@edef\@glo@text{% - \csname gls@\@glo@type @displayfirst\endcsname - {\glsentryfirst{#2}}{\glsentrydesc{#2}}% - {\glsentrysymbol{#2}}{#3}}% - }% + \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}% % \end{macrocode} % Call \cs{@gls@link} % If \pkgopt{footnote} package option has been used and the glossary % type is \cs{acronymtype}, suppress % hyperlink for first use. Likewise if the \pkgopt[false]{hyperfirst} % package option is used. -%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to +%\changes{1.16}{2008 August 27}{Test glossary type is +%\cs{acronymtype} in addition to %checking if footnote option has been used} %\changes{2.03}{2009 Sep 23}{Added check for hyperfirst} %\changes{2.04}{2009 November 10}{Changed test to check if glossary type %has been identified as a list of acronyms} +%\changes{3.11a}{2013-10-15}{removed \cs{makefirstuc} (now dealt +%with in \cs{glsentryfmt})} % \begin{macrocode} \ifglsused{#2}% {% - \@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}}% + \@gls@link[#1]{#2}{\@glo@text}% }% {% \gls@checkisacronymlist\@glo@type @@ -5042,12 +6512,10 @@ name=true]{% \OR \NOT\boolean{glshyperfirst}% }% {% - \@gls@link[#1,hyper=false]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}}% + \@gls@link[#1,hyper=false]{#2}{\@glo@text}% }% {% - \@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}}% + \@gls@link[#1]{#2}{\@glo@text}% }% }% % \end{macrocode} @@ -5095,37 +6563,39 @@ name=true]{% \def\@gls@link@opts{#1}% \def\@gls@link@label{#2}% % \end{macrocode} +%\changes{3.11a}{2013-10-15}{add \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glscustomtext} and \cs{glsinsert}} +% \begin{macrocode} + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@thirdofthree + \let\glscustomtext\@empty + \def\glsinsert{#3}% +% \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}). +%\changes{3.11a}{2013-10-15}{change to using \cs{glsentryfmt} style +%commands} % \begin{macrocode} - \ifglsused{#2}% - {% - \def\@glo@text{% - \csname gls@\@glo@type @display\endcsname - {\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}% - }% - }% - {% - \def\@glo@text{% - \csname gls@\@glo@type @displayfirst\endcsname - {\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}% - }% - }% + \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}% % \end{macrocode} % Call \cs{@gls@link} % If \pkgopt{footnote} package option has been used and the glossary % type is \cs{acronymtype}, suppress % hyperlink for first use. Likewise if the \pkgopt[false]{hyperfirst} % package option is used. -%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to +%\changes{1.16}{2008 August 27}{Test glossary type is +%\cs{acronymtype} in addition to %checking if footnote option has been used} %\changes{2.03}{2009 Sep 23}{Added check for hyperfirst} %\changes{2.04}{2009 November 10}{Changed test to check if glossary type %has been identified as a list of acronyms} +%\changes{3.11a}{2013-10-15}{removed \cs{MakeUppercase} (now moved +%to \cs{glsentryfmt})} % \begin{macrocode} \ifglsused{#2}% {% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% + \@gls@link[#1]{#2}{\@glo@text}% }% {% \gls@checkisacronymlist\@glo@type @@ -5133,10 +6603,10 @@ name=true]{% {% \(\boolean{@glsisacronymlist}\AND \boolean{glsacrfootnote}\) \OR \NOT\boolean{glshyperfirst}}{% - \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}% + \@gls@link[#1,hyper=false]{#2}{\@glo@text}% }% {% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% + \@gls@link[#1]{#2}{\@glo@text}% }% }% % \end{macrocode} @@ -5184,31 +6654,31 @@ name=true]{% \def\@gls@link@opts{#1}% \def\@gls@link@label{#2}% % \end{macrocode} +%\changes{3.11a}{2013-10-15}{add \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glscustomtext} and \cs{glsinsert}} +% \begin{macrocode} + \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@firstofthree + \let\glscustomtext\@empty + \def\glsinsert{#3}% % Determine what the link text should be (this is stored in % \cs{@glo@text}) -%\changes{1.12}{2008 Mar 8}{now uses 'glsentrydescplural and -% 'glsentrysymbolplural instead of 'glsentrydesc and 'glsentrysymbol} +%\changes{1.12}{2008 Mar 8}{now uses \cs{glsentrydescplural} and +% \cs{glsentrysymbolplural} instead of \cs{glsentrydesc} and +% \cs{glsentrysymbol}} +%\changes{3.11a}{2013-10-15}{change to using \cs{glsentryfmt} style +%commands} % \begin{macrocode} - \ifglsused{#2}% - {% - \def\@glo@text{% - \csname gls@\@glo@type @display\endcsname - {\glsentryplural{#2}}{\glsentrydescplural{#2}}% - {\glsentrysymbolplural{#2}}{#3}}% - }% - {% - \def\@glo@text{% - \csname gls@\@glo@type @displayfirst\endcsname - {\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}% - {\glsentrysymbolplural{#2}}{#3}}% - }% + \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}% % \end{macrocode} % Call \cs{@gls@link}. % If \pkgopt{footnote} package option has been used and the glossary % type is \cs{acronymtype}, suppress % hyperlink for first use. Likewise if the \pkgopt[false]{hyperfirst} % package option is used. -%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to +%\changes{1.16}{2008 August 27}{Test glossary type is +%\cs{acronymtype} in addition to %checking if footnote option has been used} %\changes{2.03}{2009 Sep 23}{Added check for hyperfirst} %\changes{2.04}{2009 November 10}{Changed test to check if glossary type @@ -5280,41 +6750,42 @@ name=true]{% \def\@gls@link@label{#2}% \def\glslabel{#2}% % \end{macrocode} +%\changes{3.11a}{2013-10-15}{add \cs{glsifplural}, +% \cs{glscapscase}, \cs{glscustomtext} and \cs{glsinsert}} +% \begin{macrocode} + \let\glsifplural\@firstoftwo + \let\glscapscase\@secondofthree + \let\glscustomtext\@empty + \def\glsinsert{#3}% +% \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}). This needs to be expanded so that the % \cs{@glo@text} can be passed to \cs{xmakefirstuc}. -%\changes{1.12}{2008 Mar 8}{now uses 'glsentrydescplural and -% 'glsentrysymbolplural instead of 'glsentrydesc and 'glsentrysymbol} +%\changes{1.12}{2008 Mar 8}{now uses \cs{glsentrydescplural} and +% \cs{glsentrysymbolplural} instead of \cs{glsentrydesc} and +% \cs{glsentrysymbol}} +%\changes{3.11a}{2013-10-15}{change to using \cs{glsentryfmt} style +%commands} % \begin{macrocode} - \ifglsused{#2}% - {% - \protected@edef\@glo@text{% - \csname gls@\@glo@type @display\endcsname - {\glsentryplural{#2}}{\glsentrydescplural{#2}}% - {\glsentrysymbolplural{#2}}{#3}}% - }% - {% - \protected@edef\@glo@text{% - \csname gls@\@glo@type @displayfirst\endcsname - {\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}% - {\glsentrysymbolplural{#2}}{#3}}% - }% + \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}% % \end{macrocode} % Call \cs{@gls@link}. % If \pkgopt{footnote} package option has been used and the glossary % type is \cs{acronymtype}, suppress % hyperlink for first use. Likewise if the \pkgopt[false]{hyperfirst} % package option is used. -%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to +%\changes{1.16}{2008 August 27}{Test glossary type is +%\cs{acronymtype} in addition to %checking if footnote option has been used} %\changes{2.03}{2009 Sep 23}{Added check for hyperfirst} %\changes{2.04}{2009 November 10}{Changed test to check if glossary type %has been identified as a list of acronyms} +%\changes{3.11a}{2013-10-15}{removed \cs{makefirstuc} (now dealt +%with in \cs{glsentryfmt})} % \begin{macrocode} \ifglsused{#2}% {% - \@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}}% + \@gls@link[#1]{#2}{\@glo@text}% }% {% \gls@checkisacronymlist\@glo@type @@ -5324,12 +6795,10 @@ name=true]{% \OR \NOT\boolean{glshyperfirst}% }% {% - \@gls@link[#1,hyper=false]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}}% + \@gls@link[#1,hyper=false]{#2}{\@glo@text}% }% {% - \@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}}% + \@gls@link[#1]{#2}{\@glo@text}% }% }% % \end{macrocode} @@ -5377,41 +6846,42 @@ name=true]{% \def\@gls@link@opts{#1}% \def\@gls@link@label{#2}% % \end{macrocode} +%\changes{3.11a}{2013-10-15}{add \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glscustomtext} and \cs{glsinsert}} +% \begin{macrocode} + \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@thirdofthree + \let\glscustomtext\@empty + \def\glsinsert{#3}% +% \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) -%\changes{1.12}{2008 Mar 8}{now uses 'glsentrydescplural and -% 'glsentrysymbolplural instead of 'glsentrydesc and 'glsentrysymbol} +%\changes{1.12}{2008 Mar 8}{now uses \cs{glsentrydescplural} and +% \cs{glsentrysymbolplural} instead of \cs{glsentrydesc} and +% \cs{glsentrysymbol}} +%\changes{3.11a}{2013-10-15}{change to using \cs{glsentryfmt} style +%commands} % \begin{macrocode} - \ifglsused{#2}% - {% - \def\@glo@text{% - \csname gls@\@glo@type @display\endcsname - {\glsentryplural{#2}}{\glsentrydescplural{#2}}% - {\glsentrysymbolplural{#2}}{#3}% - }% - }% - {% - \def\@glo@text{% - \csname gls@\@glo@type @displayfirst\endcsname - {\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}% - {\glsentrysymbolplural{#2}}{#3}% - }% - }% + \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}% % \end{macrocode} % Call \cs{@gls@link}. % If \pkgopt{footnote} package option has been used and the glossary % type is \cs{acronymtype}, suppress % hyperlink for first use. Likewise if the \pkgopt[false]{hyperfirst} % package option is used. -%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to +%\changes{1.16}{2008 August 27}{Test glossary type is +%\cs{acronymtype} in addition to %checking if footnote option has been used} %\changes{2.03}{2009 Sep 23}{Added check for hyperfirst} %\changes{2.04}{2009 November 10}{Changed test to check if glossary type %has been identified as a list of acronyms} +%\changes{3.11a}{2013-10-15}{removed \cs{MakeUppercase} as now dealt +%with in \cs{glsentryfmt}} % \begin{macrocode} \ifglsused{#2}% {% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% + \@gls@link[#1]{#2}{\@glo@text}% }% {% \gls@checkisacronymlist\@glo@type @@ -5421,10 +6891,10 @@ name=true]{% \OR \NOT\boolean{glshyperfirst}% }% {% - \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}% + \@gls@link[#1,hyper=false]{#2}{\@glo@text}% }% {% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% + \@gls@link[#1]{#2}{\@glo@text}% }% }% % \end{macrocode} @@ -5474,27 +6944,29 @@ name=true]{% \def\@gls@link@opts{#1}% \def\@gls@link@label{#2}% % \end{macrocode} +%\changes{3.11a}{2013-10-15}{add \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glscustomtext} and \cs{glsinsert}} +% \begin{macrocode} + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@firstofthree + \def\glscustomtext{#3}% + \def\glsinsert{}% +% \end{macrocode} % Determine what the link text should be (this is stored in % \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{change to using \cs{glsentryfmt} style +%commands} % \begin{macrocode} - \ifglsused{#2}% - {% - \def\@glo@text{% - \csname gls@\@glo@type @display\endcsname - {#3}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{}}% - }% - {% - \def\@glo@text{% - \csname gls@\@glo@type @displayfirst\endcsname - {#3}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{}}% - }% + \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}% % \end{macrocode} % Call \cs{@gls@link}. % If \pkgopt{footnote} package option has been used and the glossary % type is \cs{acronymtype}, suppress % hyperlink for first use. Likewise if the \pkgopt[false]{hyperfirst} % package option is used. -%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to +%\changes{1.16}{2008 August 27}{Test glossary type is +%\cs{acronymtype} in addition to %checking if footnote option has been used} %\changes{2.03}{2009 Sep 23}{Added check for hyperfirst} %\changes{2.04}{2009 November 10}{Changed test to check if glossary type @@ -5546,25 +7018,21 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@glstext}[2][]{% -\new@ifnextchar[{\@glstext@{#1}{#2}}{\@glstext@{#1}{#2}[]}} + \new@ifnextchar[{\@glstext@{#1}{#2}}{\@glstext@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@glstext@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('glstext shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentrytext{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentrytext}} % \begin{macrocode} -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \@gls@link[#1]{#2}{\glsentrytext{#2}#3}% + }% } % \end{macrocode} % @@ -5583,25 +7051,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@GLStext}[2][]{% -\new@ifnextchar[{\@GLStext@{#1}{#2}}{\@GLStext@{#1}{#2}[]}} + \new@ifnextchar[{\@GLStext@{#1}{#2}}{\@GLStext@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@GLStext@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('GLStext shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentrytext{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} % \begin{macrocode} -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrytext{#2}#3}}% + }% } % \end{macrocode} % @@ -5621,26 +7084,21 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@Glstext}[2][]{% -\new@ifnextchar[{\@Glstext@{#1}{#2}}{\@Glstext@{#1}{#2}[]}} + \new@ifnextchar[{\@Glstext@{#1}{#2}}{\@Glstext@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@Glstext@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('Glstext shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentrytext{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{Changed to just use \cs{Glsentrytext}} % \begin{macrocode} -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \@gls@link[#1]{#2}{\Glsentrytext{#2}#3}% + }% } % \end{macrocode} % @@ -5661,25 +7119,21 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@glsfirst}[2][]{% -\new@ifnextchar[{\@glsfirst@{#1}{#2}}{\@glsfirst@{#1}{#2}[]}} + \new@ifnextchar[{\@glsfirst@{#1}{#2}}{\@glsfirst@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@glsfirst@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('glsfirst shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryfirst{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryfirst}} % \begin{macrocode} -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \@gls@link[#1]{#2}{\glsentryfirst{#2}#3}% + }% } % \end{macrocode} % @@ -5698,26 +7152,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@Glsfirst}[2][]{% -\new@ifnextchar[{\@Glsfirst@{#1}{#2}}{\@Glsfirst@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsfirst@{#1}{#2}}{\@Glsfirst@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@Glsfirst@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('Glsfirst shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryfirst{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{Glsentryfirst}} % \begin{macrocode} -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \@gls@link[#1]{#2}{\Glsentryfirst{#2}#3}}% } % \end{macrocode} % @@ -5736,25 +7184,22 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@GLSfirst}[2][]{% -\new@ifnextchar[{\@GLSfirst@{#1}{#2}}{\@GLSfirst@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSfirst@{#1}{#2}}{\@GLSfirst@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@GLSfirst@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('GLSfirst shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryfirst{#2}}% -% \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryfirst}} % \begin{macrocode} -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryfirst{#2}#3}}% + }% } % \end{macrocode} % @@ -5774,25 +7219,21 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@glsplural}[2][]{% -\new@ifnextchar[{\@glsplural@{#1}{#2}}{\@glsplural@{#1}{#2}[]}} + \new@ifnextchar[{\@glsplural@{#1}{#2}}{\@glsplural@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@glsplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('glsplural shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryplural{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryplural}} % \begin{macrocode} -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \@gls@link[#1]{#2}{\glsentryplural{#2}#3}% + }% } % \end{macrocode} % @@ -5811,26 +7252,21 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@Glsplural}[2][]{% -\new@ifnextchar[{\@Glsplural@{#1}{#2}}{\@Glsplural@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsplural@{#1}{#2}}{\@Glsplural@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@Glsplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('Glsplural shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryplural{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{Glsentryplural}} % \begin{macrocode} -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \@gls@link[#1]{#2}{\Glsentryplural{#2}#3}% + }% } % \end{macrocode} % @@ -5850,25 +7286,21 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@GLSplural}[2][]{% -\new@ifnextchar[{\@GLSplural@{#1}{#2}}{\@GLSplural@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSplural@{#1}{#2}}{\@GLSplural@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@GLSplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('GLSplural shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryplural{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryplural}} % \begin{macrocode} -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryplural{#2}#3}}% + }% } % \end{macrocode} % @@ -5889,25 +7321,22 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@glsfirstplural}[2][]{% -\new@ifnextchar[{\@glsfirstplural@{#1}{#2}}{\@glsfirstplural@{#1}{#2}[]}} + \new@ifnextchar[{\@glsfirstplural@{#1}{#2}}{\@glsfirstplural@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@glsfirstplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('glsfirstplural shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryfirstplural{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use +%\cs{glsentryfirstplural}} % \begin{macrocode} -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \@gls@link[#1]{#2}{\glsentryfirstplural{#2}#3}% + }% } % \end{macrocode} % @@ -5927,26 +7356,22 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@Glsfirstplural}[2][]{% -\new@ifnextchar[{\@Glsfirstplural@{#1}{#2}}{\@Glsfirstplural@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsfirstplural@{#1}{#2}}{\@Glsfirstplural@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@Glsfirstplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('Glsfirstplural shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryfirstplural{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use +%\cs{Glsentryfirstplural}} % \begin{macrocode} -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \@gls@link[#1]{#2}{\Glsentryfirstplural{#2}#3}% + }% } % \end{macrocode} % @@ -5966,25 +7391,22 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@GLSfirstplural}[2][]{% -\new@ifnextchar[{\@GLSfirstplural@{#1}{#2}}{\@GLSfirstplural@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSfirstplural@{#1}{#2}}{\@GLSfirstplural@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@GLSfirstplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('GLSfirstplural shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryfirstplural{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use +%\cs{glsentryfirstplural}} % \begin{macrocode} -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryfirstplural{#2}#3}}% + }% } % \end{macrocode} % @@ -6005,25 +7427,21 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@glsname}[2][]{% -\new@ifnextchar[{\@glsname@{#1}{#2}}{\@glsname@{#1}{#2}[]}} + \new@ifnextchar[{\@glsname@{#1}{#2}}{\@glsname@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@glsname@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('glsname shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryname{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryname}} % \begin{macrocode} -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \@gls@link[#1]{#2}{\glsentryname{#2}#3}% + }% } % \end{macrocode} % @@ -6043,26 +7461,21 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@Glsname}[2][]{% -\new@ifnextchar[{\@Glsname@{#1}{#2}}{\@Glsname@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsname@{#1}{#2}}{\@Glsname@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@Glsname@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('glsname shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryname{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{Glsentryname}} % \begin{macrocode} -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \@gls@link[#1]{#2}{\Glsentryname{#2}#3}% + }% } % \end{macrocode} % @@ -6082,25 +7495,21 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@GLSname}[2][]{% -\new@ifnextchar[{\@GLSname@{#1}{#2}}{\@GLSname@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSname@{#1}{#2}}{\@GLSname@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@GLSname@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('GLSname shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryname{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryname}} % \begin{macrocode} -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryname{#2}#3}}% + }% } % \end{macrocode} % @@ -6121,25 +7530,21 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@glsdesc}[2][]{% -\new@ifnextchar[{\@glsdesc@{#1}{#2}}{\@glsdesc@{#1}{#2}[]}} + \new@ifnextchar[{\@glsdesc@{#1}{#2}}{\@glsdesc@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@glsdesc@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('glsdesc shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentrydesc{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentrydesc}} % \begin{macrocode} -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \@gls@link[#1]{#2}{\glsentrydesc{#2}#3}% + }% } % \end{macrocode} % @@ -6159,26 +7564,21 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@Glsdesc}[2][]{% -\new@ifnextchar[{\@Glsdesc@{#1}{#2}}{\@Glsdesc@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsdesc@{#1}{#2}}{\@Glsdesc@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@Glsdesc@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('Glsdesc shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentrydesc{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{Glsentrydesc}} % \begin{macrocode} -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \@gls@link[#1]{#2}{\Glsentrydesc{#2}#3}% + }% } % \end{macrocode} % @@ -6198,25 +7598,21 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@GLSdesc}[2][]{% -\new@ifnextchar[{\@GLSdesc@{#1}{#2}}{\@GLSdesc@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSdesc@{#1}{#2}}{\@GLSdesc@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@GLSdesc@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('GLSdesc shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentrydesc{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentrydesc}} % \begin{macrocode} -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrydesc{#2}#3}}% + }% } % \end{macrocode} % @@ -6237,23 +7633,22 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@glsdescplural}[2][]{% -\new@ifnextchar[{\@glsdescplural@{#1}{#2}}{\@glsdescplural@{#1}{#2}[]}} + \new@ifnextchar[{\@glsdescplural@{#1}{#2}}{\@glsdescplural@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@glsdescplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentrydescplural{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use +%\cs{glsentrydescplural}} % \begin{macrocode} -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \@gls@link[#1]{#2}{\glsentrydescplural{#2}#3}% + }% } % \end{macrocode} % @@ -6273,24 +7668,22 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@Glsdescplural}[2][]{% -\new@ifnextchar[{\@Glsdescplural@{#1}{#2}}{\@Glsdescplural@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsdescplural@{#1}{#2}}{\@Glsdescplural@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@Glsdescplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentrydescplural{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use +%\cs{Glsentrydescplural}} % \begin{macrocode} -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \@gls@link[#1]{#2}{\Glsentrydescplural{#2}#3}% + }% } % \end{macrocode} % @@ -6310,23 +7703,22 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@GLSdescplural}[2][]{% -\new@ifnextchar[{\@GLSdescplural@{#1}{#2}}{\@GLSdescplural@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSdescplural@{#1}{#2}}{\@GLSdescplural@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@GLSdescplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentrydescplural{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use +%\cs{glsentrydescplural}} % \begin{macrocode} -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrydescplural{#2}#3}}% + }% } % \end{macrocode} % @@ -6347,25 +7739,21 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@glssymbol}[2][]{% -\new@ifnextchar[{\@glssymbol@{#1}{#2}}{\@glssymbol@{#1}{#2}[]}} + \new@ifnextchar[{\@glssymbol@{#1}{#2}}{\@glssymbol@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@glssymbol@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('glssymbol shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentrysymbol{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentrysymbol}} % \begin{macrocode} -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \@gls@link[#1]{#2}{\glsentrysymbol{#2}#3}% + }% } % \end{macrocode} % @@ -6385,26 +7773,21 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@Glssymbol}[2][]{% -\new@ifnextchar[{\@Glssymbol@{#1}{#2}}{\@Glssymbol@{#1}{#2}[]}} + \new@ifnextchar[{\@Glssymbol@{#1}{#2}}{\@Glssymbol@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@Glssymbol@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('Glssymbol shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentrysymbol{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{Glsentrysymbol}} % \begin{macrocode} -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \@gls@link[#1]{#2}{\Glsentrysymbol{#2}#3}% + }% } % \end{macrocode} % @@ -6424,25 +7807,21 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@GLSsymbol}[2][]{% -\new@ifnextchar[{\@GLSsymbol@{#1}{#2}}{\@GLSsymbol@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSsymbol@{#1}{#2}}{\@GLSsymbol@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@GLSsymbol@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('GLSsymbol shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentrysymbol{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentrysymbol}} % \begin{macrocode} -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrysymbol{#2}#3}}% + }% } % \end{macrocode} % @@ -6463,25 +7842,22 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@glssymbolplural}[2][]{% -\new@ifnextchar[{\@glssymbolplural@{#1}{#2}}{\@glssymbolplural@{#1}{#2}[]}} + \new@ifnextchar[{\@glssymbolplural@{#1}{#2}}{\@glssymbolplural@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@glssymbolplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \changes{1.12}{2008 Mar 8}{fixed bug ('glssymbolplural shouldn't use -% 'gls@\meta{type}@display)} -% \begin{macrocode} -\protected@edef\@glo@text{\glsentrysymbolplural{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use +%\cs{glsentrysymbolplural}} % \begin{macrocode} -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \@gls@link[#1]{#2}{\glsentrysymbolplural{#2}#3}% + }% } % \end{macrocode} % @@ -6501,24 +7877,22 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@Glssymbolplural}[2][]{% -\new@ifnextchar[{\@Glssymbolplural@{#1}{#2}}{\@Glssymbolplural@{#1}{#2}[]}} + \new@ifnextchar[{\@Glssymbolplural@{#1}{#2}}{\@Glssymbolplural@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@Glssymbolplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentrysymbolplural{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use +%\cs{Glsentrysymbolplural}} % \begin{macrocode} -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \@gls@link[#1]{#2}{\Glsentrysymbolplural{#2}#3}% + }% } % \end{macrocode} % @@ -6538,23 +7912,21 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@GLSsymbolplural}[2][]{% -\new@ifnextchar[{\@GLSsymbolplural@{#1}{#2}}{\@GLSsymbolplural@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSsymbolplural@{#1}{#2}}{\@GLSsymbolplural@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@GLSsymbolplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentrysymbolplural{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Call \cs{@gls@link} -% \changes{1.13}{2008 May 10}{fixed bug that ignores 3rd parameter} +% \changes{1.13}{2008 May 10}{fixed bug that ignored 3rd parameter} +%\changes{3.11a}{2013-10-15}{changed to just use +%\cs{glsentrysymbolplural}} % \begin{macrocode} -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrysymbolplural{#2}#3}}% + }% } % \end{macrocode} % @@ -6575,22 +7947,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@glsuseri}[2][]{% -\new@ifnextchar[{\@glsuseri@{#1}{#2}}{\@glsuseri@{#1}{#2}[]}} + \new@ifnextchar[{\@glsuseri@{#1}{#2}}{\@glsuseri@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@glsuseri@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuseri{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryuseri}} % \begin{macrocode} -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \@gls@link[#1]{#2}{\glsentryuseri{#2}#3}% + }% } % \end{macrocode} % @@ -6610,23 +7980,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@Glsuseri}[2][]{% -\new@ifnextchar[{\@Glsuseri@{#1}{#2}}{\@Glsuseri@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsuseri@{#1}{#2}}{\@Glsuseri@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@Glsuseri@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuseri{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{Glsentryuseri}} % \begin{macrocode} -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \@gls@link[#1]{#2}{\Glsentryuseri{#2}#3}% + }% } % \end{macrocode} % @@ -6646,22 +8013,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@GLSuseri}[2][]{% -\new@ifnextchar[{\@GLSuseri@{#1}{#2}}{\@GLSuseri@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSuseri@{#1}{#2}}{\@GLSuseri@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@GLSuseri@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuseri{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryuseri}} % \begin{macrocode} -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuseri{#2}#3}}% + }% } % \end{macrocode} % @@ -6682,22 +8047,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@glsuserii}[2][]{% -\new@ifnextchar[{\@glsuserii@{#1}{#2}}{\@glsuserii@{#1}{#2}[]}} + \new@ifnextchar[{\@glsuserii@{#1}{#2}}{\@glsuserii@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@glsuserii@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuserii{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryuserii}} % \begin{macrocode} -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \@gls@link[#1]{#2}{\glsentryuserii{#2}#3}% + }% } % \end{macrocode} % @@ -6717,23 +8080,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@Glsuserii}[2][]{% -\new@ifnextchar[{\@Glsuserii@{#1}{#2}}{\@Glsuserii@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsuserii@{#1}{#2}}{\@Glsuserii@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@Glsuserii@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuserii{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{Glsentryuserii}} % \begin{macrocode} -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \@gls@link[#1]{#2}{\Glsentryuserii{#2}#3}% + }% } % \end{macrocode} % @@ -6753,22 +8113,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@GLSuserii}[2][]{% -\new@ifnextchar[{\@GLSuserii@{#1}{#2}}{\@GLSuserii@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSuserii@{#1}{#2}}{\@GLSuserii@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@GLSuserii@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuserii{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryuserii}} % \begin{macrocode} -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuserii{#2}#3}}% + }% } % \end{macrocode} % @@ -6789,22 +8147,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@glsuseriii}[2][]{% -\new@ifnextchar[{\@glsuseriii@{#1}{#2}}{\@glsuseriii@{#1}{#2}[]}} + \new@ifnextchar[{\@glsuseriii@{#1}{#2}}{\@glsuseriii@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@glsuseriii@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuseriii{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryuseriii}} % \begin{macrocode} -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \@gls@link[#1]{#2}{\glsentryuseriii{#2}#3}% + }% } % \end{macrocode} % @@ -6824,23 +8180,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@Glsuseriii}[2][]{% -\new@ifnextchar[{\@Glsuseriii@{#1}{#2}}{\@Glsuseriii@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsuseriii@{#1}{#2}}{\@Glsuseriii@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@Glsuseriii@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuseriii{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{Glsentryuseriii}} % \begin{macrocode} -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \@gls@link[#1]{#2}{\Glsentryuseriii{#2}#3}% + }% } % \end{macrocode} % @@ -6860,22 +8213,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@GLSuseriii}[2][]{% -\new@ifnextchar[{\@GLSuseriii@{#1}{#2}}{\@GLSuseriii@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSuseriii@{#1}{#2}}{\@GLSuseriii@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@GLSuseriii@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuseriii{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryuseriii}} % \begin{macrocode} -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuseriii{#2}#3}}% + }% } % \end{macrocode} % @@ -6896,22 +8247,19 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@glsuseriv}[2][]{% -\new@ifnextchar[{\@glsuseriv@{#1}{#2}}{\@glsuseriv@{#1}{#2}[]}} + \new@ifnextchar[{\@glsuseriv@{#1}{#2}}{\@glsuseriv@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@glsuseriv@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuseriv{#2}}% -% \end{macrocode} + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % Call \cs{@gls@link} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryuseriv}} % \begin{macrocode} -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \@gls@link[#1]{#2}{\glsentryuseriv{#2}#3}% + }% } % \end{macrocode} % @@ -6931,23 +8279,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@Glsuseriv}[2][]{% -\new@ifnextchar[{\@Glsuseriv@{#1}{#2}}{\@Glsuseriv@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsuseriv@{#1}{#2}}{\@Glsuseriv@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@Glsuseriv@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuseriv{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{Glsentryuseriv}} % \begin{macrocode} -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \@gls@link[#1]{#2}{\Glsentryuseriv{#2}#3}% + }% } % \end{macrocode} % @@ -6967,22 +8312,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@GLSuseriv}[2][]{% -\new@ifnextchar[{\@GLSuseriv@{#1}{#2}}{\@GLSuseriv@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSuseriv@{#1}{#2}}{\@GLSuseriv@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@GLSuseriv@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuseriv{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryuseriv}} % \begin{macrocode} -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuseriv{#2}#3}}% + }% } % \end{macrocode} % @@ -7003,22 +8346,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@glsuserv}[2][]{% -\new@ifnextchar[{\@glsuserv@{#1}{#2}}{\@glsuserv@{#1}{#2}[]}} + \new@ifnextchar[{\@glsuserv@{#1}{#2}}{\@glsuserv@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@glsuserv@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuserv{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryuserv}} % \begin{macrocode} -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \@gls@link[#1]{#2}{\glsentryuserv{#2}#3}% + }% } % \end{macrocode} % @@ -7043,18 +8384,15 @@ name=true]{% % Read in the final optional argument: % \begin{macrocode} \def\@Glsuserv@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuserv{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{Glsentryuserv}} % \begin{macrocode} -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \@gls@link[#1]{#2}{\Glsentryuserv{#2}#3}% + }% } % \end{macrocode} % @@ -7079,17 +8417,15 @@ name=true]{% % Read in the final optional argument: % \begin{macrocode} \def\@GLSuserv@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuserv{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryuserv}} % \begin{macrocode} -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuserv{#2}#3}}% + }% } % \end{macrocode} % @@ -7110,22 +8446,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@glsuservi}[2][]{% -\new@ifnextchar[{\@glsuservi@{#1}{#2}}{\@glsuservi@{#1}{#2}[]}} + \new@ifnextchar[{\@glsuservi@{#1}{#2}}{\@glsuservi@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@glsuservi@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuservi{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryuservi}} % Call \cs{@gls@link} % \begin{macrocode} -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \@gls@link[#1]{#2}{\glsentryuservi{#2}#3}% + }% } % \end{macrocode} % @@ -7145,23 +8479,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@Glsuservi}[2][]{% -\new@ifnextchar[{\@Glsuservi@{#1}{#2}}{\@Glsuservi@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsuservi@{#1}{#2}}{\@Glsuservi@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@Glsuservi@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuservi{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} % Call \cs{@gls@link} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{Glsentryuservi}} % \begin{macrocode} -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \@gls@link[#1]{#2}{\Glsentryuservi{#2}#3}% + }% } % \end{macrocode} % @@ -7181,22 +8512,20 @@ name=true]{% % a final optional argument % \begin{macrocode} \newcommand*{\@GLSuservi}[2][]{% -\new@ifnextchar[{\@GLSuservi@{#1}{#2}}{\@GLSuservi@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSuservi@{#1}{#2}}{\@GLSuservi@{#1}{#2}[]}} % \end{macrocode} % Read in the final optional argument: % \begin{macrocode} \def\@GLSuservi@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) -% \begin{macrocode} -\protected@edef\@glo@text{\glsentryuservi{#2}}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} +%\changes{3.11a}{2013-10-15}{changed to just use \cs{glsentryuservi}} % Call \cs{@gls@link} % \begin{macrocode} -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuservi{#2}#3}}% + }% } % \end{macrocode} % @@ -7228,14 +8557,20 @@ name=true]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \protected@edef\@glo@text{\glsentryshort{#2}}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@firstofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glsentryshort{#2}}#3% + }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -7267,17 +8602,20 @@ name=true]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \protected@edef\@glo@text{\glsentryshort{#2}}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@secondofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\Glsentryshort{#2}}#3% + }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}% - {% - \acronymfont{\expandafter\makefirstuc\expandafter{\@glo@text}}#3% - }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -7309,14 +8647,20 @@ name=true]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \protected@edef\@glo@text{\glsentryshort{#2}}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@thirdofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \mfirstucMakeUppercase{\acronymfont{\glsentryshort{#2}}#3}% + }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}{\acronymfont{\MakeUppercase{\@glo@text#3}}}% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -7349,14 +8693,20 @@ name=true]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \protected@edef\@glo@text{\glsentryshortpl{#2}}% + \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@firstofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glsentryshortpl{#2}}#3% + }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -7388,17 +8738,20 @@ name=true]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \protected@edef\@glo@text{\glsentryshortpl{#2}}% + \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@secondofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\Glsentryshortpl{#2}}#3% + }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}% - {% - \acronymfont{\expandafter\makefirstuc\expandafter{\@glo@text}}#3% - }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -7430,14 +8783,20 @@ name=true]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \protected@edef\@glo@text{\glsentryshortpl{#2}}% + \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@thirdofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \mfirstucMakeUppercase{\acronymfont{\glsentryshortpl{#2}}#3}% + }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}{\acronymfont{\MakeUppercase{\@glo@text#3}}}% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -7469,14 +8828,20 @@ name=true]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \protected@edef\@glo@text{\glsentrylong{#2}}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@firstofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glsentrylong{#2}}#3% + }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}{\@glo@text#3}% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -7508,17 +8873,20 @@ name=true]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \protected@edef\@glo@text{\glsentrylong{#2}}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@secondofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\Glsentrylong{#2}}#3% + }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}% - {% - \expandafter\makefirstuc\expandafter{\@glo@text}#3% - }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -7550,14 +8918,20 @@ name=true]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \protected@edef\@glo@text{\glsentrylong{#2}}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@thirdofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \mfirstucMakeUppercase{\acronymfont{\glsentrylong{#2}}#3}% + }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -7590,14 +8964,20 @@ name=true]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \protected@edef\@glo@text{\glsentrylongpl{#2}}% + \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@firstofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glsentrylongpl{#2}}#3% + }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}{\@glo@text#3}% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -7629,17 +9009,20 @@ name=true]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \protected@edef\@glo@text{\glsentrylongpl{#2}}% + \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@secondofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\Glsentrylongpl{#2}}#3% + }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}% - {% - \expandafter\makefirstuc\expandafter{\@glo@text}#3% - }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -7671,14 +9054,20 @@ name=true]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \protected@edef\@glo@text{\glsentrylongpl{#2}}% + \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@thirdofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \mfirstucMakeUppercase{\acronymfont{\glsentrylongpl{#2}}#3}% + }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -7702,10 +9091,12 @@ name=true]{% % \end{macrocode} %\end{macro} %\begin{macro}{\Glsentryname} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentryname}[1]{% -\protected@edef\@glo@text{\csname glo@#1@name\endcsname}% -\expandafter\makefirstuc\expandafter{\@glo@text}} +\newrobustcmd*{\Glsentryname}[1]{% + \protected@edef\@glo@text{\csname glo@#1@name\endcsname}% + \expandafter\makefirstuc\expandafter{\@glo@text}% +} % \end{macrocode} %\end{macro} % @@ -7721,10 +9112,12 @@ name=true]{% % \end{macrocode} %\end{macro} %\begin{macro}{\Glsentrydesc} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentrydesc}[1]{% -\protected@edef\@glo@text{\csname glo@#1@desc\endcsname}% -\expandafter\makefirstuc\expandafter{\@glo@text}} +\newrobustcmd*{\Glsentrydesc}[1]{% + \protected@edef\@glo@text{\csname glo@#1@desc\endcsname}% + \expandafter\makefirstuc\expandafter{\@glo@text}% +} % \end{macrocode} %\end{macro} % Plural form: @@ -7732,13 +9125,14 @@ name=true]{% %\changes{1.12}{2008 Mar 8}{New} % \begin{macrocode} \newcommand*{\glsentrydescplural}[1]{% -\csname glo@#1@descplural\endcsname} + \csname glo@#1@descplural\endcsname} % \end{macrocode} %\end{macro} %\begin{macro}{\Glsentrydescplural} %\changes{1.12}{2008 Mar 8}{New} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentrydescplural}[1]{% +\newrobustcmd*{\Glsentrydescplural}[1]{% \protected@edef\@glo@text{\csname glo@#1@descplural\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} @@ -7753,9 +9147,10 @@ name=true]{% % \end{macrocode} %\end{macro} %\begin{macro}{\Glsentrytext} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentrytext}[1]{% -\protected@edef\@glo@text{\csname glo@#1@text\endcsname}% +\newrobustcmd*{\Glsentrytext}[1]{% + \protected@edef\@glo@text{\csname glo@#1@text\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} %\end{macro} @@ -7767,8 +9162,9 @@ name=true]{% % \end{macrocode} %\end{macro} %\begin{macro}{\Glsentryplural} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentryplural}[1]{% +\newrobustcmd*{\Glsentryplural}[1]{% \protected@edef\@glo@text{\csname glo@#1@plural\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} @@ -7785,8 +9181,9 @@ name=true]{% % \end{macrocode} %\end{macro} %\begin{macro}{\Glsentrysymbol} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentrysymbol}[1]{% +\newrobustcmd*{\Glsentrysymbol}[1]{% \protected@edef\@glo@text{\csname glo@#1@symbol\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} @@ -7796,13 +9193,14 @@ name=true]{% %\changes{1.12}{2008 Mar 8}{New} % \begin{macrocode} \newcommand*{\glsentrysymbolplural}[1]{% -\csname glo@#1@symbolplural\endcsname} + \csname glo@#1@symbolplural\endcsname} % \end{macrocode} %\end{macro} %\begin{macro}{\Glsentrysymbolplural} %\changes{1.12}{2008 Mar 8}{New} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentrysymbolplural}[1]{% +\newrobustcmd*{\Glsentrysymbolplural}[1]{% \protected@edef\@glo@text{\csname glo@#1@symbolplural\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} @@ -7817,8 +9215,9 @@ name=true]{% % \end{macrocode} %\end{macro} %\begin{macro}{\Glsentryfirst} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentryfirst}[1]{% +\newrobustcmd*{\Glsentryfirst}[1]{% \protected@edef\@glo@text{\csname glo@#1@first\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} @@ -7829,12 +9228,13 @@ name=true]{% %\begin{macro}{\glsentryfirstplural} % \begin{macrocode} \newcommand*{\glsentryfirstplural}[1]{% -\csname glo@#1@firstpl\endcsname} + \csname glo@#1@firstpl\endcsname} % \end{macrocode} %\end{macro} %\begin{macro}{\Glsentryfirstplural} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentryfirstplural}[1]{% +\newrobustcmd*{\Glsentryfirstplural}[1]{% \protected@edef\@glo@text{\csname glo@#1@firstpl\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} @@ -7869,8 +9269,9 @@ name=true]{% %\end{macro} %\begin{macro}{\Glsentryuseri} %\changes{2.04}{2009 November 10}{new} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentryuseri}[1]{% +\newrobustcmd*{\Glsentryuseri}[1]{% \protected@edef\@glo@text{\csname glo@#1@useri\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} @@ -7887,8 +9288,9 @@ name=true]{% %\end{macro} %\begin{macro}{\Glsentryuserii} %\changes{2.04}{2009 November 10}{new} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentryuserii}[1]{% +\newrobustcmd*{\Glsentryuserii}[1]{% \protected@edef\@glo@text{\csname glo@#1@userii\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} @@ -7905,8 +9307,9 @@ name=true]{% %\end{macro} %\begin{macro}{\Glsentryuseriii} %\changes{2.04}{2009 November 10}{new} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentryuseriii}[1]{% +\newrobustcmd*{\Glsentryuseriii}[1]{% \protected@edef\@glo@text{\csname glo@#1@useriii\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} @@ -7923,8 +9326,9 @@ name=true]{% %\end{macro} %\begin{macro}{\Glsentryuseriv} %\changes{2.04}{2009 November 10}{new} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentryuseriv}[1]{% +\newrobustcmd*{\Glsentryuseriv}[1]{% \protected@edef\@glo@text{\csname glo@#1@useriv\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} @@ -7941,8 +9345,9 @@ name=true]{% %\end{macro} %\begin{macro}{\Glsentryuserv} %\changes{2.04}{2009 November 10}{new} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentryuserv}[1]{% +\newrobustcmd*{\Glsentryuserv}[1]{% \protected@edef\@glo@text{\csname glo@#1@userv\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} @@ -7959,8 +9364,9 @@ name=true]{% %\end{macro} %\begin{macro}{\Glsentryuservi} %\changes{2.04}{2009 November 10}{new} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentryuservi}[1]{% +\newrobustcmd*{\Glsentryuservi}[1]{% \protected@edef\@glo@text{\csname glo@#1@uservi\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} @@ -7977,8 +9383,9 @@ name=true]{% %\end{macro} %\begin{macro}{\Glsentryshort} %\changes{3.0}{2011/04/02}{new} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentryshort}[1]{% +\newrobustcmd*{\Glsentryshort}[1]{% \protected@edef\@glo@text{\csname glo@#1@short\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} @@ -7995,8 +9402,9 @@ name=true]{% %\end{macro} %\begin{macro}{\Glsentryshortpl} %\changes{3.0}{2011/04/02}{new} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentryshortpl}[1]{% +\newrobustcmd*{\Glsentryshortpl}[1]{% \protected@edef\@glo@text{\csname glo@#1@shortpl\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} @@ -8013,9 +9421,10 @@ name=true]{% %\end{macro} %\begin{macro}{\Glsentrylong} %\changes{3.0}{2011/04/02}{new} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentrylong}[1]{% -\protected@edef\@glo@text{\csname glo@#1@long\endcsname}% +\newrobustcmd*{\Glsentrylong}[1]{% + \protected@edef\@glo@text{\csname glo@#1@long\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} %\end{macro} @@ -8031,8 +9440,9 @@ name=true]{% %\end{macro} %\begin{macro}{\Glsentrylongpl} %\changes{3.0}{2011/04/02}{new} +%\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} -\newcommand*{\Glsentrylongpl}[1]{% +\newrobustcmd*{\Glsentrylongpl}[1]{% \protected@edef\@glo@text{\csname glo@#1@longpl\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} % \end{macrocode} @@ -8040,34 +9450,40 @@ name=true]{% % % Short cut macros to access full form: %\begin{macro}{\glsentryfull} +%\changes{3.13a}{2013-11-05}{changed to use \cs{acrfullformat}} % \begin{macrocode} \newcommand*{\glsentryfull}[1]{% - \glsentrylong{#1}\space(\glsentryshort{#1})% + \acrfullformat{\glsentrylong{#1}}{\glsentryshort{#1}}% } % \end{macrocode} %\end{macro} %\begin{macro}{\Glsentryfull} +%\changes{3.09a}{2013-10-09}{made robust} %\changes{3.02}{2012/05/21}{fixed bug (replaced \cs{glsentryshortpl} %with \cs{glsentryshort})} +%\changes{3.13a}{2013-11-05}{changed to use \cs{acrfullformat}} % \begin{macrocode} -\newcommand*{\Glsentryfull}[1]{% - \Glsentrylong{#1}\space(\glsentryshort{#1})% +\newrobustcmd*{\Glsentryfull}[1]{% + \acrfullformat{\Glsentrylong{#1}}{\glsentryshort{#1}}% } % \end{macrocode} %\end{macro} %\begin{macro}{\glsentryfullpl} %\changes{3.02}{2012/05/21}{fixed bug (replaced \cs{glsentryshort} %with \cs{glsentryshortpl})} +%\changes{3.13a}{2013-11-05}{changed to use \cs{acrfullformat}} % \begin{macrocode} \newcommand*{\glsentryfullpl}[1]{% - \glsentrylongpl{#1}\space(\glsentryshortpl{#1})% + \acrfullformat{\glsentrylongpl{#1}}{\glsentryshortpl{#1}}% } % \end{macrocode} %\end{macro} %\begin{macro}{\Glsentryfullpl} +%\changes{3.09a}{2013-10-09}{made robust} +%\changes{3.13a}{2013-11-05}{changed to use \cs{acrfullformat}} % \begin{macrocode} -\newcommand*{\Glsentryfullpl}[1]{% - \Glsentrylongpl{#1}\space(\glsentryshortpl{#1})% +\newrobustcmd*{\Glsentryfullpl}[1]{% + \acrfullformat{\Glsentrylongpl{#1}}{\glsentryshortpl{#1}}% } % \end{macrocode} %\end{macro} @@ -8090,8 +9506,7 @@ name=true]{% % Formats the number list for the given entry label. % Doesn't work with hyperref. % \begin{macrocode} -\@ifpackageloaded{hyperref} -{% +\@ifpackageloaded{hyperref} {% \newcommand*{\glsdisplaynumberlist}[1]{% \GlossariesWarning {% @@ -8185,8 +9600,10 @@ name=true]{% % \begin{macrocode} \define@key{glossadd}{types}{\def\@glo@type{#1}} % \end{macrocode} -%\vskip5pt -%\cs{glsadd}\oarg{options}\marg{label}\\[10pt] +% +%\begin{definition} +%\cs{glsadd}\oarg{options}\marg{label} +%\end{definition} % Add a term to the glossary without generating any link text. % The optional argument indicates which counter to use, % and how to format it (using a key-value list) @@ -8213,8 +9630,10 @@ name=true]{% } % \end{macrocode} %\end{macro} -%\vskip5pt -%\cs{glsaddall}\oarg{option list}\\[10pt] +% +%\begin{definition} +%\cs{glsaddall}\oarg{option list} +%\end{definition} % Add all terms defined for the listed glossaries (without displaying % any text). If \gloskey[glsaddall]{types} key is omitted, apply to all % glossary types. @@ -8222,10 +9641,30 @@ name=true]{% %\changes{3.01}{2011/04/12}{made robust} % \begin{macrocode} \newrobustcmd*{\glsaddall}[1][]{% -\edef\@glo@type{\@glo@types}% -\setkeys{glossadd}{#1}% -\forallglsentries[\@glo@type]{\@glo@entry}{% -\glsadd[#1]{\@glo@entry}}% + \edef\@glo@type{\@glo@types}% + \setkeys{glossadd}{#1}% + \forallglsentries[\@glo@type]{\@glo@entry}{% + \glsadd[#1]{\@glo@entry}% + }% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glsaddallunused} +%\begin{definition} +%\cs{glsaddallunused}\oarg{glossary type} +%\end{definition} +% Add all used terms defined for the listed glossaries (without displaying +% any text). If optional argument is omitted, apply to all +% glossary types. This should typically go at the end of the +% document. +%\changes{3.08a}{2013-09-28}{new} +%\changes{3.13a}{2013-11-05}{set default to \cs{@glo@types}} +% \begin{macrocode} +\newrobustcmd*{\glsaddallunused}[1][\@glo@types]{% + \forallglsentries[#1]{\@glo@entry}% + {% + \ifglsused{\@glo@entry}{}{\glsadd[format=@gobble]{\@glo@entry}}% + }% } % \end{macrocode} %\end{macro} @@ -8326,7 +9765,8 @@ name=true]{% %\begin{macro}{\writeist} %\changes{1.17}{2008 December 26}{added xindy support} -%\changes{1.01}{2007 May 17}{Added spaces after 'delimN and 'delimR in ist file}% +%\changes{1.01}{2007 May 17}{Added spaces after \cs{delimN} and +%\cs{delimR} in ist file}% %\changes{3.0}{2011/04/02}{modified to support new format} % \begin{macrocode} \ifglsxindy @@ -8747,6 +10187,13 @@ name=true]{% % \begin{macrocode} \newcommand*{\makeglossaries}{% % \end{macrocode} +%\changes{3.10a}{2013-10-13}{Added providecommand code to aux file} +% If the user removes the glossary package from their document, +% ensure the next run doesn't throw a load of undefined control +% sequence errors when the aux file is parsed. +% \begin{macrocode} + \protected@write\@auxout{}{\string\providecommand\string\@glsorder[1]{}} + \protected@write\@auxout{}{\string\providecommand\string\@istfilename[1]{}} % Write the name of the style file to the aux file % (needed by \app{makeglossaries}) % \begin{macrocode} @@ -8779,6 +10226,10 @@ name=true]{% % \begin{macrocode} \@disable@onlypremakeg % \end{macrocode} +% Allow \gloskey{see} key: +% \begin{macrocode} + \let\gls@checkseeallowed\relax +% \end{macrocode} % Suppress warning about no \cs{makeglossaries} % \begin{macrocode} \let\warn@nomakeglossaries\relax @@ -8841,51 +10292,50 @@ name=true]{% \glswritefiles } % \end{macrocode} -%\begin{macro}{\glswritefiles} +%\begin{macro}{\@glswritefiles} % Only write the files if \pkgopt[true]{savewrites} +%\changes{3.14a}{2013-11-12}{renamed \cs{glswritefiles} to +%\cs{@glswritefiles} and used ``savewrites'' option to set +%\cs{glswritefiles}} % \begin{macrocode} -\ifglssavewrites - \newcommand*{\glswritefiles}{% +\newcommand*{\@glswritefiles}{% % \end{macrocode} % Iterate through all the glossaries %\changes{3.01}{2011/04/12}{added check for empty glossaries} %\changes{3.02}{2012/05/21}{added check for existence of token % in case \cs{makeglossaries has been omitted}} % \begin{macrocode} - \forallglossaries{\@glo@type}{% + \forallglossaries{\@glo@type}{% % \end{macrocode} % Check for empty glossaries (patch provided by Patrick H\"acker) % \begin{macrocode} - \ifcsundef{glo@\@glo@type @filetok}% - {% - \def\gls@tmp{}% - }% - {% - \edef\gls@tmp{\expandafter\the - \csname glo@\@glo@type @filetok\endcsname}% - }% - \ifx\gls@tmp\@empty - \ifx\@glo@type\glsdefaulttype - \GlossariesWarningNoLine{Glossary `\@glo@type' has no - entries.^^JRemember to use package option `nomain' if + \ifcsundef{glo@\@glo@type @filetok}% + {% + \def\gls@tmp{}% + }% + {% + \edef\gls@tmp{\expandafter\the + \csname glo@\@glo@type @filetok\endcsname}% + }% + \ifx\gls@tmp\@empty + \ifx\@glo@type\glsdefaulttype + \GlossariesWarningNoLine{Glossary `\@glo@type' has no + entries.^^JRemember to use package option `nomain' if you - don't want to^^Juse the main glossary}% - \else - \GlossariesWarningNoLine{Glossary `\@glo@type' has no - entries}% - \fi - \else - \@glsopenfile{\glswrite}{\@glo@type}% - \immediate\write\glswrite{% - \expandafter\the - \csname glo@\@glo@type @filetok\endcsname}% - \immediate\closeout\glswrite - \fi - }% - } -\else - \let\glswritefiles\relax -\fi + don't want to^^Juse the main glossary}% + \else + \GlossariesWarningNoLine{Glossary `\@glo@type' has no + entries}% + \fi + \else + \@glsopenfile{\glswrite}{\@glo@type}% + \immediate\write\glswrite{% + \expandafter\the + \csname glo@\@glo@type @filetok\endcsname}% + \immediate\closeout\glswrite + \fi + }% +} % \end{macrocode} %\end{macro} % @@ -9214,8 +10664,9 @@ you %\begin{macro}{\glssee} %\cs{glssee}\marg{label}\marg{cross-ref list} %\changes{1.17}{2008 December 26}{new} +%\changes{3.08a}{2013-09-28}{made robust} % \begin{macrocode} -\newcommand*{\glssee}[3][\seename]{% +\DeclareRobustCommand*{\glssee}[3][\seename]{% \@do@seeglossary{#2}{[#1]{#3}}} \newcommand*{\@glssee}[3][\seename]{% \glssee[#1]{#3}{#2}} @@ -9224,17 +10675,20 @@ you % %\begin{macro}{\glsseeformat} %\changes{1.17}{2008 December 26}{new} +%\changes{3.08a}{2013-09-28}{made robust} % The first argument specifies what tag to use (e.g.\ ``see''), % the second argument is a comma-separated list of labels. % The final argument (the location) is ignored. % \begin{macrocode} -\newcommand*{\glsseeformat}[3][\seename]{\emph{#1} \glsseelist{#2}} +\DeclareRobustCommand*{\glsseeformat}[3][\seename]{% + \emph{#1} \glsseelist{#2}} % \end{macrocode} %\end{macro} %\begin{macro}{\glsseelist} %\cs{glsseelist}\marg{list} formats list of entry labels. +%\changes{3.08a}{2013-09-28}{made robust} % \begin{macrocode} -\newcommand*{\glsseelist}[1]{% +\DeclareRobustCommand*{\glsseelist}[1]{% % \end{macrocode} % If there is only one item in the list, set the last separator % to do nothing. @@ -9288,8 +10742,9 @@ you % cross-referencing list. %\changes{3.0}{2011/04/02}{hyperlink uses \cs{glsseeitemformat} instead %of \cs{glsentryname}} +%\changes{3.08a}{2013-09-28}{made robust} % \begin{macrocode} -\newcommand*{\glsseeitem}[1]{\glshyperlink[\glsseeitemformat{#1}]{#1}} +\DeclareRobustCommand*{\glsseeitem}[1]{\glshyperlink[\glsseeitemformat{#1}]{#1}} % \end{macrocode} %\end{macro} %\begin{macro}{\glsseeitemformat} @@ -9345,7 +10800,8 @@ you %\begin{macro}{\printglossary} %\changes{1.17}{2008 December 26}{added print language to aux file} %\changes{1.15}{2008 August 15}{changed the way the TOC title is set} -%\changes{1.17}{2008 December 26}{added check to determine if 'printglossary is already +%\changes{1.17}{2008 December 26}{added check to determine if +%\cs{printglossary} is already % defined} % The TOC title needs to be processed in a different manner % to the main title in case the \sty{translator} and \sty{hyperref} packages @@ -9432,15 +10888,16 @@ you \@glossarystyle % \end{macrocode} %\changes{3.02}{2012/05/21}{add a way to fetch current entry label} -% added a way to fetch the current entry label: +% added a way to fetch the current entry label (v3.08 updated for +% new \cs{glossentry} and \cs{subglossentry}): % \begin{macrocode} - \let\gls@org@glossaryentryfield\glossaryentryfield - \let\gls@org@glossarysubentryfield\glossarysubentryfield - \renewcommand{\glossaryentryfield}[1]{% + \let\gls@org@glossaryentryfield\glossentry + \let\gls@org@glossarysubentryfield\subglossentry + \renewcommand{\glossentry}[1]{% \gdef\glscurrententrylabel{##1}% \gls@org@glossaryentryfield{##1}% }% - \renewcommand{\glossarysubentryfield}[2]{% + \renewcommand{\subglossentry}[2]{% \gdef\glscurrententrylabel{##2}% \gls@org@glossarysubentryfield{##1}{##2}% }% @@ -9476,6 +10933,14 @@ you {% \edef\@do@auxoutstuff{% \noexpand\AtEndDocument{% +% \end{macrocode} +%\changes{3.10a}{2013-10-13}{Added providecommand code to aux file} +% If the user removes the glossary package from their document, +% ensure the next run doesn't throw a load of undefined control +% sequence errors when the aux file is parsed. +% \begin{macrocode} + \noexpand\immediate\noexpand\write\@auxout{% + \string\providecommand\string\@xdylanguage[2]{}}% \noexpand\immediate\noexpand\write\@auxout{% \string\@xdylanguage{\@glo@type}{\@xdy@main@language}}% }% @@ -9485,6 +10950,8 @@ you \edef\@do@auxoutstuff{% \noexpand\AtEndDocument{% \noexpand\immediate\noexpand\write\@auxout{% + \string\providecommand\string\@xdylanguage[2]{}}% + \noexpand\immediate\noexpand\write\@auxout{% \string\@xdylanguage{\@glo@type}{\csname @xdy@\@glo@type @language\endcsname}}% }% @@ -9493,6 +10960,14 @@ you \@do@auxoutstuff \edef\@do@auxoutstuff{% \noexpand\AtEndDocument{% +% \end{macrocode} +%\changes{3.10a}{2013-10-13}{Added providecommand code to aux file} +% If the user removes the glossary package from their document, +% ensure the next run doesn't throw a load of undefined control +% sequence errors when the aux file is parsed. +% \begin{macrocode} + \noexpand\immediate\noexpand\write\@auxout{% + \string\providecommand\string\@gls@codepage[2]{}}% \noexpand\immediate\noexpand\write\@auxout{% \string\@gls@codepage{\@glo@type}{\gls@codepage}}% }% @@ -9566,11 +11041,13 @@ you {Glossary style `#1' undefined}{}% }% {% - \def\@glossarystyle{\csname @glsstyle@#1\endcsname}% + \def\@glossarystyle{\setglossentrycompatibility + \csname @glsstyle@#1\endcsname}% }% } % \end{macrocode} -% \changes{1.14}{2008 June 17}{added numberedsection key to 'printglossary} +% \changes{1.14}{2008 June 17}{added numberedsection key to +% \cs{printglossary}} % The \gloskey[printglossary]{numberedsection} key determines if this % glossary should be in a numbered section. % \begin{macrocode} @@ -9587,7 +11064,17 @@ false,nolabel,autolabel}[nolabel]{% \renewcommand*{\@@glossaryseclabel}{\label{\glsautoprefix\@glo@type}}% \fi} % \end{macrocode} -% \changes{1.14}{2008 June 17}{added nonumberlist key to 'printglossary} +% +%\changes{3.08a}{2013-09-28}{added nogroupskip key to \cs{printglossary}} +% The \gloskey[printglossary]{nogroupskip} key determines whether or +% not there should be a vertical gap between glossary groups. +% \begin{macrocode} +\define@choicekey{printgloss}{nogroupskip}{true,false}[true]{% + \csuse{glsnogroupskip#1}% +} +% \end{macrocode} +% \changes{1.14}{2008 June 17}{added nonumberlist key to +% \cs{printglossary}} % The \gloskey[printglossary]{nonumberlist} key determines if this % glossary should have a number list. % \begin{macrocode} @@ -9857,17 +11344,154 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} %\end{macro} % +% As from version 3.08, glossary information is now written to the +% external files using \ics{glossentry} and \ics{subglossentry} +% instead of \cs{glossaryentryfield} and \cs{glossarysubentryfield}. +% The default definition provides backward compatibility for +% glossary styles that use the old forms. +%\begin{macro}{\compatibleglossentry} +%\changes{3.08a}{2013-09-28}{new} +%\begin{definition} +% \cs{glossentry}\marg{label}\marg{page-list} +%\end{definition} +% \begin{macrocode} +\providecommand*{\compatibleglossentry}[2]{% + \toks@{#2}% + \protected@edef\@do@glossentry{\noexpand\glossaryentryfield{#1}% + {\noexpand\glsnamefont + {\expandafter\expandonce\csname glo@#1@name\endcsname}}% + {\expandafter\expandonce\csname glo@#1@desc\endcsname}% + {\expandafter\expandonce\csname glo@#1@symbol\endcsname}% + {\the\toks@}% + }% + \@do@glossentry +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glossentryname} +%\changes{3.08a}{2013-09-28}{new} +% \begin{macrocode} +\newcommand*{\glossentryname}[1]{% + \glsdoifexists{#1}% + {% + \letcs{\glo@name}{glo@#1@name}% + \expandafter\glsnamefont\expandafter{\glo@name}% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Glossentryname} +%\changes{3.08a}{2013-09-28}{new} +% \begin{macrocode} +\newcommand*{\Glossentryname}[1]{% + \glsdoifexists{#1}% + {% + \glsnamefont{\Glsentryname{#1}}% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glossentrydesc} +%\changes{3.08a}{2013-09-28}{new} +% \begin{macrocode} +\newcommand*{\glossentrydesc}[1]{% + \glsdoifexists{#1}% + {% + \glsentrydesc{#1}% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Glossentrydesc} +%\changes{3.08a}{2013-09-28}{new} +% \begin{macrocode} +\newcommand*{\Glossentrydesc}[1]{% + \glsdoifexists{#1}% + {% + \Glsentrydesc{#1}% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glossentrysymbol} +%\changes{3.08a}{2013-09-28}{new} +% \begin{macrocode} +\newcommand*{\glossentrysymbol}[1]{% + \glsdoifexists{#1}% + {% + \glsentrysymbol{#1}% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Glossentrysymbol} +%\changes{3.08a}{2013-09-28}{new} +% \begin{macrocode} +\newcommand*{\Glossentrysymbol}[1]{% + \glsdoifexists{#1}% + {% + \Glsentrysymbol{#1}% + }% +} +% \end{macrocode} +%\end{macro} +% +% +%\begin{macro}{\compatiblesubglossentry} +%\changes{3.08a}{2013-09-28}{new} +%\begin{definition} +% \cs{subglossentry}\marg{level}\marg{label}\marg{page-list} +%\end{definition} +% \begin{macrocode} +\providecommand*{\compatiblesubglossentry}[3]{% + \toks@{#3}% + \protected@edef\@do@subglossentry{\noexpand\glossarysubentryfield{\number#1}% + {#2}% + {\noexpand\glsnamefont + {\expandafter\expandonce\csname glo@#2@name\endcsname}}% + {\expandafter\expandonce\csname glo@#2@desc\endcsname}% + {\expandafter\expandonce\csname glo@#2@symbol\endcsname}% + {\the\toks@}% + }% + \@do@subglossentry +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\setglossentrycompatibility} +%\changes{3.08a}{2013-09-28}{new} +% \begin{macrocode} +\newcommand*{\setglossentrycompatibility}{% + \let\glossentry\compatibleglossentry + \let\subglossentry\compatiblesubglossentry +} +\setglossentrycompatibility +% \end{macrocode} +%\end{macro} +% +% %\begin{macro}{\glossaryentryfield} % \cs{glossaryentryfield}\marg{label}\marg{name}\marg{description}\marg{symbol}\marg{page-list}\\[10pt] -% This command governs how each entry row should be formatted -% in the glossary. Glossary styles need to redefine this command. -% Most of the predefined styles ignore \meta{symbol}. +% This command formerly governed how each entry row should be formatted +% in the glossary. Now deprecated. +%\changes{3.08a}{2013-09-28}{deprecated} % \begin{macrocode} -\newcommand*{\glossaryentryfield}[5]{% -\noindent\textbf{\glstarget{#1}{#2}} #4 #3. #5\par} +\newcommand{\glossaryentryfield}[5]{% + \GlossariesWarning + {Deprecated use of \string\glossaryentryfield.^^J + I recommend you change to \string\glossentry.^^J + If you've just upgraded, try removing your gls auxiliary + files^^J and recompile}% + \noindent\textbf{\glstarget{#1}{#2}} #4 #3. #5\par} % \end{macrocode} %\end{macro} -%\begin{macro}{\glossaryentryfield} +%\begin{macro}{\glossarysubentryfield} % \cs{glossarysubentryfield}\marg{level}\marg{label}\marg{name}\marg{description}\marg{symbol}\marg{page-list}\\[10pt] % This command governs how each subentry should be formatted % in the glossary. Glossary styles need to redefine this command. @@ -9876,7 +11500,12 @@ false,nolabel,autolabel}[nolabel]{% % be greater than or equal to 1.) % \begin{macrocode} \newcommand*{\glossarysubentryfield}[6]{% -\glstarget{#2}{\strut}#4. #6\par} + \GlossariesWarning + {Deprecated use of \string\glossarysubentryfield.^^J + I recommend you change to \string\subglossentry.^^J + If you've just upgraded, try removing your gls auxiliary + files^^J and recompile}% + \glstarget{#2}{\strut}#4. #6\par} % \end{macrocode} %\end{macro} % @@ -9923,8 +11552,10 @@ false,nolabel,autolabel}[nolabel]{% % modify the translation control sequences \cs{glsgetgrouptitle} % and \cs{glsgetgrouplabel} so that the label is translated % into the required title (and vice-versa). -%\\[10pt] -%\cs{glsgetgrouptitle}\marg{label}\\[10pt] +% +%\begin{definition} +%\cs{glsgetgrouptitle}\marg{label} +%\end{definition} % This command produces the title for the glossary group % whose label is given by \meta{label}. By default, the group % labelled \texttt{glssymbols} produces @@ -9934,17 +11565,52 @@ false,nolabel,autolabel}[nolabel]{% % As mentioned above, the group labels are: \texttt{glssymbols}, \texttt{glsnumbers}, % \texttt{A}, \ldots, \texttt{Z}\@. If you want to redefine % the group titles, you will need to redefine this command. +% Languages other than English may produce labels that are +% non-expandable, so we need to check for that otherwise it will +% create a \qt{missing \cs{endcsname} inserted} error. %\begin{macro}{\glsgetgrouptitle} %\changes{3.0}{2011/04/02}{replaced \cs{@ifundefined} with %\cs{ifcsundef}} +%\changes{3.11a}{2013-10-15}{Added check in case non-Latin alphabet +%in use} % \begin{macrocode} \newcommand*{\glsgetgrouptitle}[1]{% - \ifcsundef{#1groupname}{#1}{\csname #1groupname\endcsname}% + \@gls@getgrouptitle{#1}{\@gls@grptitle}% + \@gls@grptitle } % \end{macrocode} %\end{macro} -%\vskip5pt -%\cs{glsgetgrouplabel}\marg{title}\\[10pt] +%\begin{macro}{\@gls@getgrouptitle} +% Gets the group title specified by the label (first argument) and +% stores in the second argument, which must be a control sequence. +% \begin{macrocode} +\newcommand*{\@gls@getgrouptitle}[2]{% +% \end{macrocode} +% Even if the argument appears to be a single letter, it won't be +% considered a single letter by \cs{dtl@ifsingle} if it's an active +% character. +% \begin{macrocode} + \dtl@ifsingle{#1}% + {% + \ifcsundef{#1groupname}{\def#2{#1}}{\letcs#2{#1groupname}}% + }% + {% + \ifboolexpr{test{\ifstrequal{#1}{glssymbols}} + or test{\ifstrequal{#1}{glsnumbers}}}% + {% + \ifcsundef{#1groupname}{\def#2{#1}}{\letcs#2{#1groupname}}% + }% + {% + \def#2{#1}% + }% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{definition} +%\cs{glsgetgrouplabel}\marg{title} +%\end{definition} %This command does the reverse to the previous command. The % argument is the group title, and it produces the group label. % Note that if you redefine \cs{glsgetgrouptitle}, you @@ -9980,7 +11646,21 @@ false,nolabel,autolabel}[nolabel]{% %\end{macro} % % The current glossary style can be set using -% \cs{glossarystyle}\marg{style}. +% \cs{setglossarystyle}\marg{style}. +%\begin{macro}{\setglossarystyle} +%\changes{3.08a}{2013-09-28}{new} +% \begin{macrocode} +\newcommand*{\setglossarystyle}[1]{% + \ifcsundef{@glsstyle@#1}% + {% + \PackageError{glossaries}{Glossary style `#1' undefined}{}% + }% + {% + \csname @glsstyle@#1\endcsname + }% +} +% \end{macrocode} +%\end{macro} %\begin{macro}{\glossarystyle} %\changes{3.0}{2011/04/02}{replaced \cs{@ifundefined} with %\cs{ifcsundef}} @@ -9991,7 +11671,19 @@ false,nolabel,autolabel}[nolabel]{% \PackageError{glossaries}{Glossary style `#1' undefined}{}% }% {% + \GlossariesWarning + {Deprecated command \string\glossarystyle.^^J + I recommend you switch to \string\setglossarystyle\space unless + you want to maintain backward compatibility}% + \setglossentrycompatibility \csname @glsstyle@#1\endcsname +% \end{macrocode} +%\changes{3.13a}{2013-11-05}{fixed bug caused by using \cs{ifdef} instead of +%\cs{ifcsdef}} +% \begin{macrocode} + \ifcsdef{@glscompstyle@#1}% + {\setglossentrycompatibility\csuse{@glscompstyle@#1}}% + {}% }% } % \end{macrocode} @@ -10009,7 +11701,7 @@ false,nolabel,autolabel}[nolabel]{% % \ics{glossarypostamble}, as % the user should be able to switch between styles without affecting % the pre- and postambles. -%\changes{1.17}{2008 December 26}{made 'newglossarystyle long} +%\changes{1.17}{2008 December 26}{made \cs{newglossarystyle} long} %\changes{3.0}{2011/04/02}{replaced \cs{@ifundefined} with %\cs{ifcsundef}} % \begin{macrocode} @@ -10228,17 +11920,6 @@ false,nolabel,autolabel}[nolabel]{% %\end{macro} % %\subsection{Acronyms}\label{sec:acronym} -%If the \pkgopt{acronym} package option is used, a -% new glossary called "acronym" is created -% \begin{macrocode} -\ifglsacronym - \newglossary[alg]{acronym}{acr}{acn}{\acronymname} -% \end{macrocode} -%and \ics{acronymtype} is set to the name of this new glossary. -% \begin{macrocode} - \renewcommand*{\acronymtype}{acronym} -\fi -% \end{macrocode} %\begin{macro}{\oldacronym} %\cs{oldacronym}\oarg{label}\marg{abbrv}\marg{long}\marg{key-val list}\\[10pt] % This emulates the way the old \isty{glossary} package defined @@ -10307,7 +11988,7 @@ false,nolabel,autolabel}[nolabel]{% \newcommand{\newacronym}[4][]{} % \end{macrocode} %\changes{1.13}{2008 May 10}{Removed restriction on only using -% 'newacronym in the preamble} +% \cs{newacronym} in the preamble} %\end{macro} % Set up some convenient short cuts. These need to be changed if % \cs{newacronym} is changed (or if the \gloskey{description} key @@ -10327,6 +12008,14 @@ false,nolabel,autolabel}[nolabel]{% \newcommand*{\acrpluralsuffix}{\glspluralsuffix} % \end{macrocode} %\end{macro} +% If \sty{garamondx} has been loaded, need to use \cs{textulc} +% instead of \cs{textup}. +%\begin{macro}{\glstextup} +%\changes{3.09a}{2013-10-09}{new} +% \begin{macrocode} +\newrobustcmd*{\glstextup}[1]{\ifdef\textulc{\textulc{#1}}{\textup{#1}}} +% \end{macrocode} +%\end{macro} % % The following are defined for compatibility with version 2.07 and % earlier. @@ -10586,10 +12275,10 @@ false,nolabel,autolabel}[nolabel]{% %\begin{macro}{\SetDefaultAcronymDisplayStyle} % Sets the default acronym display style for given glossary. %\changes{2.04}{2009 November 10}{new} +%\changes{3.11a}{2013-10-15}{changed to use \cs{defglsentryfmt}} % \begin{macrocode} \newcommand*{\SetDefaultAcronymDisplayStyle}[1]{% - \defglsdisplay[#1]{##1##4}% - \defglsdisplayfirst[#1]{##1##4}% + \defglsentryfmt[#1]{\glsgenentryfmt}% } % \end{macrocode} %\end{macro} @@ -10607,22 +12296,37 @@ false,nolabel,autolabel}[nolabel]{% sort={\the\glsshorttok},% text={\the\glsshorttok},% first={\acrfullformat{\the\glslongtok}{\the\glsshorttok}},% - plural={\the\glsshorttok\noexpand\acrpluralsuffix},% - firstplural={\acrfullformat{\noexpand\@glo@longpl}% - {\noexpand\@glo@shortpl}},% + plural={\noexpand\expandonce\noexpand\@glo@shortpl},% + firstplural={\acrfullformat{\noexpand\expandonce\noexpand\@glo@longpl}% + {\noexpand\expandonce\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},% + descriptionplural={\noexpand\expandonce\noexpand\@glo@longpl},% % \end{macrocode} % Remaining options specified by the user: % \begin{macrocode} \the\glskeylisttok }% }% + \let\@org@gls@assign@firstpl\gls@assign@firstpl + \let\@org@gls@assign@plural\gls@assign@plural + \let\@org@gls@assign@descplural\gls@assign@descplural + \def\gls@assign@firstpl##1##2{% + \@@gls@expand@field{##1}{firstpl}{##2}% + }% + \def\gls@assign@plural##1##2{% + \@@gls@expand@field{##1}{plural}{##2}% + }% + \def\gls@assign@descplural##1##2{% + \@@gls@expand@field{##1}{descplural}{##2}% + }% \@do@newglossaryentry + \let\gls@assign@firstpl\@org@gls@assign@firstpl + \let\gls@assign@plural\@org@gls@assign@plural + \let\gls@assign@symbolplural\@org@gls@assign@symbolplural } % \end{macrocode} %\end{macro} @@ -10693,38 +12397,69 @@ false,nolabel,autolabel}[nolabel]{% % description and footnote combination. %\changes{2.04}{2009 November 10}{new} %\changes{3.0}{2011/04/02}{expanded options link options} +%\changes{3.11a}{2013-10-15}{updated to use \cs{defglsentryfmt}} % \begin{macrocode} \newcommand*{\SetDescriptionFootnoteAcronymDisplayStyle}[1]{% - \defglsdisplayfirst[#1]{% - \firstacronymfont{##1}##4% - \expandafter\protect\expandafter\acrfootnote\expandafter - {\@gls@link@opts}{\@gls@link@label}{##3}% + \defglsentryfmt[#1]{% + \ifglsused{\glslabel}% + {% + \acronymfont{\glsgenentryfmt}% + }% + {% + \firstacronymfont{\glsgenentryfmt}% + \ifglshassymbol{\glslabel}% + {% + \expandafter\protect\expandafter\acrfootnote\expandafter + {\@gls@link@opts}{\@gls@link@label}% + {% + \glsifplural + {\glsentrysymbolplural{\glslabel}}% + {\glsentrysymbol{\glslabel}}% + }% + }% + }% }% - \defglsdisplay[#1]{\acronymfont{##1}##4}% } % \end{macrocode} %\end{macro} %\begin{macro}{\DescriptionFootnoteNewAcronymDef} % \begin{macrocode} \newcommand*{\DescriptionFootnoteNewAcronymDef}{% - \edef\@do@newglossaryentry{% - \noexpand\newglossaryentry{\the\glslabeltok}% - {% - type=\acronymtype,% - name={\noexpand\acronymfont{\the\glsshorttok}},% - 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 - }% + \edef\@do@newglossaryentry{% + \noexpand\newglossaryentry{\the\glslabeltok}% + {% + type=\acronymtype,% + name={\noexpand\acronymfont{\the\glsshorttok}},% + sort={\the\glsshorttok},% + first={\the\glsshorttok},% + firstplural={\noexpand\expandonce\noexpand\@glo@shortpl},% + text={\the\glsshorttok},% + plural={\noexpand\expandonce\noexpand\@glo@shortpl},% + short={\the\glsshorttok},% + shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},% + long={\the\glslongtok},% + longplural={\the\glslongtok\noexpand\acrpluralsuffix},% + symbol={\the\glslongtok},% + symbolplural={\noexpand\expandonce\noexpand\@glo@longpl},% + \the\glskeylisttok }% - \@do@newglossaryentry + }% + \let\@org@gls@assign@firstpl\gls@assign@firstpl + \let\@org@gls@assign@plural\gls@assign@plural + \let\@org@gls@assign@symbolplural\gls@assign@symbolplural + \def\gls@assign@firstpl##1##2{% + \@@gls@expand@field{##1}{firstpl}{##2}% + }% + \def\gls@assign@plural##1##2{% + \@@gls@expand@field{##1}{plural}{##2}% + }% + \def\gls@assign@symbolplural##1##2{% + \@@gls@expand@field{##1}{symbolplural}{##2}% + }% + \@do@newglossaryentry + \let\gls@assign@plural\@org@gls@assign@plural + \let\gls@assign@firstpl\@org@gls@assign@firstpl + \let\gls@assign@symbolplural\@org@gls@assign@symbolplural } % \end{macrocode} %\end{macro} @@ -10755,8 +12490,8 @@ false,nolabel,autolabel}[nolabel]{% % If \pkgopt{footnote} package option is specified, set the first % use to append the long form (stored in \gloskey{symbol}) as a % footnote. -%\changes{1.12}{2008 Mar 8}{Added 'protect before 'footnote -% and 'glslink} +%\changes{1.12}{2008 Mar 8}{Added \cs{protect} before \cs{footnote} +% and \cs{glslink}} % \begin{macrocode} \@for\@gls@type:=\@glsacronymlists\do{% \SetDescriptionFootnoteAcronymDisplayStyle{\@gls@type}% @@ -10765,13 +12500,16 @@ false,nolabel,autolabel}[nolabel]{% % Redefine \ics{acronymfont} if small caps required. The plural suffix % is set in an upright font so that it remains in normal lower case, % otherwise it looks as though it's part of the acronym. -%\changes{1.19}{2009 Mar 2}{changed 'acronymfont to use 'textsmaller instead -%of 'smaller} +%\changes{1.19}{2009 Mar 2}{changed \cs{acronymfont} to use +%\cs{textsmaller} instead +%of \cs{smaller}} % \begin{macrocode} \ifglsacrsmallcaps \renewcommand*{\acronymfont}[1]{\textsc{##1}}% +% \end{macrocode} +% \begin{macrocode} \renewcommand*{\acrpluralsuffix}{% - \textup{\glspluralsuffix}}% + \glstextup{\glspluralsuffix}}% \else \ifglsacrsmaller \renewcommand*{\acronymfont}[1]{\textsmaller{##1}}% @@ -10792,10 +12530,10 @@ false,nolabel,autolabel}[nolabel]{% % Sets the acronym display style for given glossary with % description and dua combination. %\changes{2.04}{2009 November 10}{new} +%\changes{3.11a}{2013-10-15}{updated to use \cs{defglsentryfmt}} % \begin{macrocode} \newcommand*{\SetDescriptionDUAAcronymDisplayStyle}[1]{% - \defglsdisplay[#1]{##1##4}% - \defglsdisplayfirst[#1]{##1##4}% + \defglsentryfmt[#1]{\glsgenentryfmt}% } % \end{macrocode} %\end{macro} @@ -10809,17 +12547,34 @@ false,nolabel,autolabel}[nolabel]{% name={\the\glslongtok},% sort={\the\glslongtok}, text={\the\glslongtok},% - plural={\the\glslongtok\noexpand\acrpluralsuffix},% + first={\the\glslongtok},% + plural={\noexpand\expandonce\noexpand\@glo@longpl},% + firstplural={\noexpand\expandonce\noexpand\@glo@longpl},% short={\the\glsshorttok},% shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},% long={\the\glslongtok},% longplural={\the\glslongtok\noexpand\acrpluralsuffix},% symbol={\the\glsshorttok},% - symbolplural={\the\glsshorttok\noexpand\acrpluralsuffix},% + symbolplural={\noexpand\expandonce\noexpand\@glo@shortpl},% \the\glskeylisttok }% }% + \let\@org@gls@assign@firstpl\gls@assign@firstpl + \let\@org@gls@assign@plural\gls@assign@plural + \let\@org@gls@assign@symbolplural\gls@assign@symbolplural + \def\gls@assign@firstpl##1##2{% + \@@gls@expand@field{##1}{firstpl}{##2}% + }% + \def\gls@assign@plural##1##2{% + \@@gls@expand@field{##1}{plural}{##2}% + }% + \def\gls@assign@symbolplural##1##2{% + \@@gls@expand@field{##1}{symbolplural}{##2}% + }% \@do@newglossaryentry + \let\gls@assign@firstpl\@org@gls@assign@firstpl + \let\gls@assign@plural\@org@gls@assign@plural + \let\gls@assign@symbolplural\@org@gls@assign@symbolplural } % \end{macrocode} %\end{macro} @@ -10868,11 +12623,39 @@ false,nolabel,autolabel}[nolabel]{% % the description setting (but not \pkgopt{footnote} or \pkgopt{dua}). %\changes{2.04}{2009 November 10}{new} %\changes{3.07}{2013-07-05}{now using \cs{glsdoparenifnotempty}} +%\changes{3.11a}{2013-10-15}{updated to use \cs{defglsentryfmt}} % \begin{macrocode} \newcommand*{\SetDescriptionAcronymDisplayStyle}[1]{% - \defglsdisplayfirst[#1]{% - ##1##4\glsdoparenifnotempty{##3}{\protect\firstacronymfont}}% - \defglsdisplay[#1]{\acronymfont{##1}##4}% + \defglsentryfmt[#1]{% + \ifglsused{\glslabel}% + {% +% \end{macrocode} +% Move the inserted text outside of \cs{acronymfont} +% \begin{macrocode} + \let\gls@org@insert\glsinsert + \let\glsinsert\@empty + \acronymfont{\glsgenentryfmt}\gls@org@insert + }% + {% + \glsgenentryfmt + \ifglshassymbol{\glslabel}% + {% + \glsifplural + {% + \def\@glo@symbol{\glsentrysymbolplural{\glslabel}}% + }% + {% + \def\@glo@symbol{\glsentrysymbol{\glslabel}}% + }% + \space(\protect\firstacronymfont + {\glscapscase + {\@glo@symbol} + {\@glo@symbol} + {\mfirstucMakeUppercase{\@glo@symbol}}})% + }% + {}% + }% + }% } % \end{macrocode} %\end{macro} @@ -10887,18 +12670,33 @@ false,nolabel,autolabel}[nolabel]{% \acrnameformat{\the\glsshorttok}{\the\glslongtok}},% sort={\the\glsshorttok},% first={\the\glslongtok},% - firstplural={\the\glslongtok\noexpand\acrpluralsuffix},% + firstplural={\noexpand\expandonce\noexpand\@glo@longpl},% text={\the\glsshorttok},% - plural={\the\glsshorttok\noexpand\acrpluralsuffix},% + plural={\noexpand\expandonce\noexpand\@glo@shortpl},% short={\the\glsshorttok},% shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},% long={\the\glslongtok},% longplural={\the\glslongtok\noexpand\acrpluralsuffix},% symbol={\noexpand\@glo@text},% - symbolplural={\noexpand\@glo@plural},% + symbolplural={\noexpand\expandonce\noexpand\@glo@shortpl},% \the\glskeylisttok}% }% + \let\@org@gls@assign@firstpl\gls@assign@firstpl + \let\@org@gls@assign@plural\gls@assign@plural + \let\@org@gls@assign@symbolplural\gls@assign@symbolplural + \def\gls@assign@firstpl##1##2{% + \@@gls@expand@field{##1}{firstpl}{##2}% + }% + \def\gls@assign@plural##1##2{% + \@@gls@expand@field{##1}{plural}{##2}% + }% + \def\gls@assign@symbolplural##1##2{% + \@@gls@expand@field{##1}{symbolplural}{##2}% + }% \@do@newglossaryentry + \let\gls@assign@firstpl\@org@gls@assign@firstpl + \let\gls@assign@plural\@org@gls@assign@plural + \let\gls@assign@symbolplural\@org@gls@assign@symbolplural } % \end{macrocode} %\end{macro} @@ -10936,13 +12734,14 @@ false,nolabel,autolabel}[nolabel]{% % Redefine \ics{acronymfont} if small caps required. The plural suffix % is set in an upright font so that it remains in normal lower case, % otherwise it looks as though it's part of the acronym. -%\changes{1.19}{2009 Mar 2}{changed 'acronymfont to use 'textsmaller instead -%of 'smaller} +%\changes{1.19}{2009 Mar 2}{changed \cs{acronymfont} to use +%\cs{textsmaller} instead +%of \cs{smaller}} % \begin{macrocode} \ifglsacrsmallcaps \renewcommand{\acronymfont}[1]{\textsc{##1}} \renewcommand*{\acrpluralsuffix}{% - \textup{\glspluralsuffix}}% + \glstextup{\glspluralsuffix}}% \else \ifglsacrsmaller \renewcommand*{\acronymfont}[1]{\textsmaller{##1}}% @@ -10956,14 +12755,37 @@ false,nolabel,autolabel}[nolabel]{% % Sets the acronym display style for given glossary with % footnote setting (but not \pkgopt{description} or \pkgopt{dua}). %\changes{2.04}{2009 November 10}{new} +%\changes{3.11a}{2013-10-15}{updated to use \cs{defglsentryfmt}} % \begin{macrocode} \newcommand*{\SetFootnoteAcronymDisplayStyle}[1]{% - \defglsdisplayfirst[#1]{% - \firstacronymfont{##1}##4% - \expandafter\protect\expandafter\acrfootnote\expandafter - {\@gls@link@opts}{\@gls@link@label}{##2}% + \defglsentryfmt[#1]{% +% \end{macrocode} +% Move the inserted text outside of \cs{acronymfont} +% \begin{macrocode} + \let\gls@org@insert\glsinsert + \let\glsinsert\@empty + \ifglsused{\glslabel}% + {% + \acronymfont{\glsgenentryfmt}\gls@org@insert + }% + {% + \firstacronymfont{\glsgenentryfmt}\gls@org@insert + \ifglshaslong{\glslabel}% + {% + \expandafter\protect\expandafter\acrfootnote\expandafter + {\@gls@link@opts}{\@gls@link@label}% + {% + \glsifplural + {\glsentrylongpl{\glslabel}}% + {\glsentrylong{\glslabel}}% + }% + }% +% \end{macrocode} +%\changes{3.13a}{2013-11-05}{fixed missing argument bug} +% \begin{macrocode} + {}% + }% }% - \defglsdisplay[#1]{\acronymfont{##1}##4}% } % \end{macrocode} %\end{macro} @@ -10977,17 +12799,34 @@ false,nolabel,autolabel}[nolabel]{% name={\noexpand\acronymfont{\the\glsshorttok}},% sort={\the\glsshorttok},% text={\the\glsshorttok},% - plural={\the\glsshorttok\noexpand\acrpluralsuffix},% + plural={\noexpand\expandonce\noexpand\@glo@shortpl},% + first={\the\glsshorttok},% + firstplural={\noexpand\expandonce\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},% + descriptionplural={\noexpand\expandonce\noexpand\@glo@longpl},% \the\glskeylisttok }% }% + \let\@org@gls@assign@plural\gls@assign@plural + \let\@org@gls@assign@firstpl\gls@assign@firstpl + \let\@org@gls@assign@descplural\gls@assign@descplural + \def\gls@assign@firstpl##1##2{% + \@@gls@expand@field{##1}{firstpl}{##2}% + }% + \def\gls@assign@plural##1##2{% + \@@gls@expand@field{##1}{plural}{##2}% + }% + \def\gls@assign@descplural##1##2{% + \@@gls@expand@field{##1}{descplural}{##2}% + }% \@do@newglossaryentry + \let\gls@assign@plural\@org@gls@assign@plural + \let\gls@assign@firstpl\@org@gls@assign@firstpl + \let\gls@assign@descplural\@org@gls@assign@descplural } % \end{macrocode} %\end{macro} @@ -11014,8 +12853,8 @@ false,nolabel,autolabel}[nolabel]{% }% % \end{macrocode} % Set display -%\changes{1.12}{2008 Mar 8}{Added 'protect before 'footnote and -% 'glslink} +%\changes{1.12}{2008 Mar 8}{Added \cs{protect} before \cs{footnote} and +% \cs{glslink}} % \begin{macrocode} \@for\@gls@type:=\@glsacronymlists\do{% \SetFootnoteAcronymDisplayStyle{\@gls@type}% @@ -11024,13 +12863,14 @@ false,nolabel,autolabel}[nolabel]{% % Redefine \ics{acronymfont} if small caps required. The plural suffix % is set in an upright font so that it remains in normal lower case, % otherwise it looks as though it's part of the acronym. -%\changes{1.19}{2009 Mar 2}{changed 'acronymfont to use 'textsmaller instead -%of 'smaller} +%\changes{1.19}{2009 Mar 2}{changed \cs{acronymfont} to use +%\cs{textsmaller} instead +%of \cs{smaller}} % \begin{macrocode} \ifglsacrsmallcaps \renewcommand*{\acronymfont}[1]{\textsc{##1}}% \renewcommand*{\acrpluralsuffix}{% - \textup{\glspluralsuffix}}% + \glstextup{\glspluralsuffix}}% \else \ifglsacrsmaller \renewcommand*{\acronymfont}[1]{\textsmaller{##1}}% @@ -11057,7 +12897,7 @@ false,nolabel,autolabel}[nolabel]{% \ifdefempty\gls@tmp {}% {% - \if\gls@tmp\relax + \ifx\gls@tmp\@gls@default@value \else \space (#2{#1})% \fi @@ -11071,10 +12911,39 @@ false,nolabel,autolabel}[nolabel]{% % footnote nor description is required, but smallcaps or smaller % specified. %\changes{2.04}{2009 November 10}{new} +%\changes{3.11a}{2013-10-15}{updated to use \cs{defglsentryfmt}} % \begin{macrocode} \newcommand*{\SetSmallAcronymDisplayStyle}[1]{% - \defglsdisplayfirst[#1]{##1##4\glsdoparenifnotempty{##3}{\protect\firstacronymfont}} - \defglsdisplay[#1]{\acronymfont{##1}##4}% + \defglsentryfmt[#1]{% +% \end{macrocode} +% Move the inserted text outside of \cs{acronymfont} +% \begin{macrocode} + \let\gls@org@insert\glsinsert + \let\glsinsert\@empty + \ifglsused{\glslabel}% + {% + \acronymfont{\glsgenentryfmt}\gls@org@insert + }% + {% + \glsgenentryfmt + \ifglshassymbol{\glslabel}% + {% + \glsifplural + {% + \def\@glo@symbol{\glsentrysymbolplural{\glslabel}}% + }% + {% + \def\@glo@symbol{\glsentrysymbol{\glslabel}}% + }% + \space + (\glscapscase + {\firstacronymfont{\@glo@symbol}}% + {\firstacronymfont{\@glo@symbol}}% + {\firstacronymfont{\mfirstucMakeUppercase{\@glo@symbol}}})% + }% + {}% + }% + }% } % \end{macrocode} %\end{macro} @@ -11088,31 +12957,51 @@ false,nolabel,autolabel}[nolabel]{% type=\acronymtype,% name={\noexpand\acronymfont{\the\glsshorttok}},% sort={\the\glsshorttok},% - text={\noexpand\@glo@symbol},% + text={\the\glsshorttok},% % \end{macrocode} % Default to the short plural. % \begin{macrocode} - plural={\noexpand\@glo@shortpl},% + plural={\noexpand\expandonce\noexpand\@glo@shortpl},% first={\the\glslongtok},% % \end{macrocode} % Default to the long plural. % \begin{macrocode} - firstplural={\noexpand\@glo@longpl},% + firstplural={\noexpand\expandonce\noexpand\@glo@longpl},% short={\the\glsshorttok},% shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},% long={\the\glslongtok},% longplural={\the\glslongtok\noexpand\acrpluralsuffix},% description={\noexpand\@glo@first},% - descriptionplural={\noexpand\@glo@firstplural},% + descriptionplural={\noexpand\expandonce\noexpand\@glo@longpl},% symbol={\the\glsshorttok},% % \end{macrocode} % Default to the short plural. % \begin{macrocode} - symbolplural={\noexpand\@glo@shortpl},% + symbolplural={\noexpand\expandonce\noexpand\@glo@shortpl},% \the\glskeylisttok }% }% + \let\@org@gls@assign@firstpl\gls@assign@firstpl + \let\@org@gls@assign@plural\gls@assign@plural + \let\@org@gls@assign@descplural\gls@assign@descplural + \let\@org@gls@assign@symbolplural\gls@assign@symbolplural + \def\gls@assign@firstpl##1##2{% + \@@gls@expand@field{##1}{firstpl}{##2}% + }% + \def\gls@assign@plural##1##2{% + \@@gls@expand@field{##1}{plural}{##2}% + }% + \def\gls@assign@descplural##1##2{% + \@@gls@expand@field{##1}{descplural}{##2}% + }% + \def\gls@assign@symbolplural##1##2{% + \@@gls@expand@field{##1}{symbolplural}{##2}% + }% \@do@newglossaryentry + \let\gls@assign@firstpl\@org@gls@assign@firstpl + \let\gls@assign@plural\@org@gls@assign@plural + \let\gls@assign@descplural\@org@gls@assign@descplural + \let\gls@assign@symbolplural\@org@gls@assign@symbolplural } % \end{macrocode} %\end{macro} @@ -11147,13 +13036,14 @@ false,nolabel,autolabel}[nolabel]{% % Redefine \ics{acronymfont} if small caps required. The plural suffix % is set in an upright font so that it remains in normal lower case, % otherwise it looks as though it's part of the acronym. -%\changes{1.19}{2009 Mar 2}{changed 'acronymfont to use 'textsmaller instead -%of 'smaller} +%\changes{1.19}{2009 Mar 2}{changed \cs{acronymfont} to use +%\cs{textsmaller} instead +%of \cs{smaller}} % \begin{macrocode} \ifglsacrsmallcaps \renewcommand*{\acronymfont}[1]{\textsc{##1}} \renewcommand*{\acrpluralsuffix}{% - \textup{\glspluralsuffix}}% + \glstextup{\glspluralsuffix}}% \else \renewcommand*{\acronymfont}[1]{\textsmaller{##1}} \fi @@ -11177,10 +13067,10 @@ false,nolabel,autolabel}[nolabel]{% % Sets the acronym display style for given glossary with dua % setting. %\changes{2.04}{2009 November 10}{new} +%\changes{3.11a}{2013-10-15}{updated to use \cs{defglsentryfmt}} % \begin{macrocode} \newcommand*{\SetDUADisplayStyle}[1]{% - \defglsdisplay[#1]{##1##4}% - \defglsdisplayfirst[#1]{##1##4}% + \defglsentryfmt[#1]{\glsgenentryfmt}% } % \end{macrocode} %\end{macro} @@ -11193,18 +13083,41 @@ false,nolabel,autolabel}[nolabel]{% type=\acronymtype,% name={\the\glsshorttok},% text={\the\glslongtok},% - plural={\the\glslongtok\noexpand\acrpluralsuffix},% + first={\the\glslongtok},% + plural={\noexpand\expandonce\noexpand\@glo@longpl},% + firstplural={\noexpand\expandonce\noexpand\@glo@longpl},% short={\the\glsshorttok},% shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},% long={\the\glslongtok},% longplural={\the\glslongtok\noexpand\acrpluralsuffix},% description={\the\glslongtok},% + descriptionplural={\noexpand\expandonce\noexpand\@glo@longpl},% symbol={\the\glsshorttok},% - symbolplural={\the\glsshorttok\noexpand\acrpluralsuffix},% + symbolplural={\noexpand\expandonce\noexpand\@glo@shortpl},% \the\glskeylisttok }% }% + \let\@org@gls@assign@firstpl\gls@assign@firstpl + \let\@org@gls@assign@plural\gls@assign@plural + \let\@org@gls@assign@symbolplural\gls@assign@symbolplural + \let\@org@gls@assign@descplural\gls@assign@descplural + \def\gls@assign@firstpl##1##2{% + \@@gls@expand@field{##1}{firstpl}{##2}% + }% + \def\gls@assign@plural##1##2{% + \@@gls@expand@field{##1}{plural}{##2}% + }% + \def\gls@assign@symbolplural##1##2{% + \@@gls@expand@field{##1}{symbolplural}{##2}% + }% + \def\gls@assign@descplural##1##2{% + \@@gls@expand@field{##1}{descplural}{##2}% + }% \@do@newglossaryentry + \let\gls@assign@firstpl\@org@gls@assign@firstpl + \let\gls@assign@plural\@org@gls@assign@plural + \let\gls@assign@symbolplural\@org@gls@assign@symbolplural + \let\gls@assign@descplural\@org@gls@assign@descplural } % \end{macrocode} %\end{macro} @@ -11283,10 +13196,10 @@ false,nolabel,autolabel}[nolabel]{% %\begin{macro}{\SetCustomDisplayStyle} % Sets the acronym display style. %\changes{2.06}{2010 June 14}{new} +%\changes{3.11a}{2013-10-15}{updated to use \cs{defglsentryfmt}} % \begin{macrocode} \newcommand*{\SetCustomDisplayStyle}[1]{% - \defglsdisplay[#1]{##1##4}% - \defglsdisplayfirst[#1]{##1##4}% + \defglsentryfmt[#1]{\glsgenentryfmt}% } % \end{macrocode} %\end{macro} @@ -11298,7 +13211,8 @@ false,nolabel,autolabel}[nolabel]{% description={\the\glslongtok},% first={\noexpand\acrfullformat{\the\glslongtok}{\the\glsshorttok}},% firstplural={\noexpand\acrfullformat - {\the\glslongtok\noexpand\acrpluralsuffix}{\the\glsshorttok}}% + {\noexpand\glsentrylongpl{\the\glslabeltok}}% + {\noexpand\glsentryshortpl{\the\glslabeltok}}}% text={\the\glsshorttok},% plural={\the\glsshorttok\noexpand\acrpluralsuffix}% } @@ -11505,7 +13419,7 @@ false,nolabel,autolabel}[nolabel]{% % \begin{macrocode} \ifx\@glossary@default@style\relax \else - \glossarystyle{\@glossary@default@style} + \setglossarystyle{\@glossary@default@style} \fi % \end{macrocode} % @@ -11751,6 +13665,30 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} %\end{macro} % +%\begin{macro}{\showgloshort} +%\changes{3.11a}{2013-10-15}{new} +%\begin{definition} +%\cs{showgloshort}\marg{label} +%\end{definition} +% \begin{macrocode} +\newcommand*{\showgloshort}[1]{% + \expandafter\show\csname glo@#1@short\endcsname +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\showglolong} +%\changes{3.11a}{2013-10-15}{new} +%\begin{definition} +%\cs{showglolong}\marg{label} +%\end{definition} +% \begin{macrocode} +\newcommand*{\showglolong}[1]{% + \expandafter\show\csname glo@#1@long\endcsname +} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\showgloindex} %\changes{3.0}{2011/04/02}{new} %\begin{definition} @@ -11897,6 +13835,449 @@ false,nolabel,autolabel}[nolabel]{% %\fi %\iffalse % \begin{macrocode} +%<*glossaries-prefix.sty> +% \end{macrocode} +%\fi +%\section{Prefix Support (glossaries-prefix Code)} +%\label{sec:code:accsupp} +%\changes{3.14a}{2013-11-12}{new} +% This package provides a means of adding prefixes to your glossary +% entries. For example, you may want to use ``a +% \cs{gls}\marg{label}'' on first use but use ``an +% \cs{gls}\marg{label}'' on subsequent use. +% \begin{macrocode} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{glossaries-prefix}[2013/11/14 v4.0 (NLCT)] +% \end{macrocode} +% Pass all options to \sty{glossaries}: +% \begin{macrocode} +\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}} +% \end{macrocode} +% Process options: +% \begin{macrocode} +\ProcessOptions +% \end{macrocode} +% Load \sty{glossaries}: +% \begin{macrocode} +\RequirePackage{glossaries} +% \end{macrocode} +% Add the new keys: +% \begin{macrocode} +\define@key{glossentry}{prefixfirst}{\def\@glo@entryprefixfirst{#1}}% +\define@key{glossentry}{prefixfirstplural}{\def\@glo@entryprefixfirstplural{#1}}% +\define@key{glossentry}{prefix}{\def\@glo@entryprefix{#1}}% +\define@key{glossentry}{prefixplural}{\def\@glo@entryprefixplural{#1}}% +% \end{macrocode} +% Add them to \ics{@gls@keymap}: +% \begin{macrocode} +\appto\@gls@keymap{,% + {prefixfirst}{prefixfirst},% + {prefixfirstplural}{prefixfirstplural},% + {prefix}{prefix},% + {prefixplural}{prefixplural}% + } +% \end{macrocode} +% Set the default values: +% \begin{macrocode} +\appto\@newglossaryentryprehook{% + \def\@glo@entryprefix{}% + \def\@glo@entryprefixplural{}% + \let\@glo@entryprefixfirst\@gls@default@value + \let\@glo@entryprefixfirstplural\@gls@default@value +} +% \end{macrocode} +% Set the assignment code: +% \begin{macrocode} +\appto\@newglossaryentryposthook{% + \gls@assign@field{}{\@glo@label}{prefix}{\@glo@entryprefix}% + \gls@assign@field{}{\@glo@label}{prefixplural}{\@glo@entryprefixplural}% +% \end{macrocode} +% If \gloskey{prefixfirst} has not been supplied, make it the same +% as \gloskey{prefix}. +% \begin{macrocode} + \expandafter\gls@assign@field\expandafter + {\csname glo@\@glo@label @prefix\endcsname}{\@glo@label}{prefixfirst}% + {\@glo@entryprefixfirst}% +% \end{macrocode} +% If \gloskey{prefixfirstplural} has not been supplied, make it the same +% as \gloskey{prefixplural}. +% \begin{macrocode} + \expandafter\gls@assign@field\expandafter + {\csname glo@\@glo@label @prefixplural\endcsname}{\@glo@label}% + {prefixfirstplural}{\@glo@entryprefixfirstplural}% +} +% \end{macrocode} +% +% Define commands to access these fields: +%\begin{macro}{\glsentryprefixfirst} +% \begin{macrocode} +\newcommand*{\glsentryprefixfirst}[1]{\csuse{glo@#1@prefixfirst}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glsentryprefixfirstplural} +% \begin{macrocode} +\newcommand*{\glsentryprefixfirstplural}[1]{\csuse{glo@#1@prefixfirstplural}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glsentryprefix} +% \begin{macrocode} +\newcommand*{\glsentryprefix}[1]{\csuse{glo@#1@prefix}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\glsentryprefixplural} +% \begin{macrocode} +\newcommand*{\glsentryprefixplural}[1]{\csuse{glo@#1@prefixplural}} +% \end{macrocode} +%\end{macro} +% +% Now for the initial upper case variants: +%\begin{macro}{\Glsentryprefixfirst} +% \begin{macrocode} +\newrobustcmd*{\Glsentryprefixfirst}[1]{% + \protected@edef\@glo@text{\csname glo@#1@prefixfirst\endcsname}% + \xmakefirstuc\@glo@text +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\Glsentryprefixfirstplural} +% \begin{macrocode} +\newrobustcmd*{\Glsentryprefixfirstplural}[1]{% + \protected@edef\@glo@text{\csname glo@#1@prefixfirstplural\endcsname}% + \xmakefirstuc\@glo@text +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\Glsentryprefix} +% \begin{macrocode} +\newrobustcmd*{\Glsentryprefix}[1]{% + \protected@edef\@glo@text{\csname glo@#1@prefix\endcsname}% + \xmakefirstuc\@glo@text +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\Glsentryprefixplural} +% \begin{macrocode} +\newrobustcmd*{\Glsentryprefixplural}[1]{% + \protected@edef\@glo@text{\csname glo@#1@prefixplural\endcsname}% + \xmakefirstuc\@glo@text +} +% \end{macrocode} +%\end{macro} +% +% Define commands to determine if the prefix keys have been set: +%\begin{macro}{\ifglshasprefix} +% \begin{macrocode} +\newcommand*{\ifglshasprefix}[3]{% + \ifcsempty{glo@#1@prefix}% + {#3}% + {#2}% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\ifglshasprefixplural} +% \begin{macrocode} +\newcommand*{\ifglshasprefixplural}[3]{% + \ifcsempty{glo@#1@prefixplural}% + {#3}% + {#2}% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\ifglshasprefixfirst} +% \begin{macrocode} +\newcommand*{\ifglshasprefixfirst}[3]{% + \ifcsempty{glo@#1@prefixfirst}% + {#3}% + {#2}% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\ifglshasprefixfirstplural} +% \begin{macrocode} +\newcommand*{\ifglshasprefixfirstplural}[3]{% + \ifcsempty{glo@#1@prefixfirstplural}% + {#3}% + {#2}% +} +% \end{macrocode} +%\end{macro} +% +% Define commands that insert the prefix before commands like \ics{gls}: +%\begin{macro}{\pgls} +% \begin{macrocode} +\newrobustcmd{\pgls}{\@ifstar\@spgls\@pgls} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@spgls} +% Starred version. +% \begin{macrocode} +\newcommand*{\@spgls}[2][]{\@pgls@{hyper=false,#1}{#2}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@pgls} +% Unstarred version. +% \begin{macrocode} +\newcommand*{\@pgls}[2][]{% + \new@ifnextchar[% + {\@pgls@{#1}{#2}}% + {\@pgls@{#1}{#2}[]}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@pgls@} +% Read in the final optional argument: +% \begin{macrocode} +\def\@pgls@#1#2[#3]{% + \glsdoifexists{#2}% + {% + \ifglsused{#2}% + {% + \glsentryprefix{#2}% + }% + {% + \glsentryprefixfirst{#2}% + }% + \@gls@{#1}{#2}[#3]% + }% +} +% \end{macrocode} +%\end{macro} +% +% Similarly for the plural version: +%\begin{macro}{\pglspl} +% \begin{macrocode} +\newrobustcmd{\pglspl}{\@ifstar\@spglspl\@pglspl} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@spglspl} +% Starred version. +% \begin{macrocode} +\newcommand*{\@spglspl}[2][]{\@pglspl@{hyper=false,#1}{#2}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@pglspl} +% Unstarred version. +% \begin{macrocode} +\newcommand*{\@pglspl}[2][]{% + \new@ifnextchar[% + {\@pglspl@{#1}{#2}}% + {\@pglspl@{#1}{#2}[]}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@pglspl@} +% Read in the final optional argument: +% \begin{macrocode} +\def\@pglspl@#1#2[#3]{% + \glsdoifexists{#2}% + {% + \ifglsused{#2}% + {% + \glsentryprefixplural{#2}% + }% + {% + \glsentryprefixfirstplural{#2}% + }% + \@glspl@{#1}{#2}[#3]% + }% +} +% \end{macrocode} +%\end{macro} +% +% Now for the first letter upper case versions: +%\begin{macro}{\Pgls} +% \begin{macrocode} +\newrobustcmd{\Pgls}{\@ifstar\@sPgls\@Pgls} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@sPgls} +% Starred version. +% \begin{macrocode} +\newcommand*{\@sPgls}[2][]{\@Pgls@{hyper=false,#1}{#2}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@Pgls} +% Unstarred version. +% \begin{macrocode} +\newcommand*{\@Pgls}[2][]{% + \new@ifnextchar[% + {\@Pgls@{#1}{#2}}% + {\@Pgls@{#1}{#2}[]}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@Pgls@} +% Read in the final optional argument: +% \begin{macrocode} +\def\@Pgls@#1#2[#3]{% + \glsdoifexists{#2}% + {% + \ifglsused{#2}% + {% + \ifglshasprefix{#2}% + {% + \Glsentryprefix{#2}% + \@gls@{#1}{#2}[#3]% + }% + {\@Gls@{#1}{#2}[#3]}% + }% + {% + \ifglshasprefixfirst{#2}% + {% + \Glsentryprefixfirst{#2}% + \@gls@{#1}{#2}[#3]% + }% + {\@Gls@{#1}{#2}[#3]}% + }% + }% +} +% \end{macrocode} +%\end{macro} +% +% Similarly for the plural version: +%\begin{macro}{\Pglspl} +% \begin{macrocode} +\newrobustcmd{\Pglspl}{\@ifstar\@sPglspl\@Pglspl} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@sPglspl} +% Starred version. +% \begin{macrocode} +\newcommand*{\@sPglspl}[2][]{\@Pglspl@{hyper=false,#1}{#2}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@Pglspl} +% Unstarred version. +% \begin{macrocode} +\newcommand*{\@Pglspl}[2][]{% + \new@ifnextchar[% + {\@Pglspl@{#1}{#2}}% + {\@Pglspl@{#1}{#2}[]}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@Pglspl@} +% Read in the final optional argument: +% \begin{macrocode} +\def\@Pglspl@#1#2[#3]{% + \glsdoifexists{#2}% + {% + \ifglsused{#2}% + {% + \ifglshasprefixplural{#2}% + {% + \Glsentryprefixplural{#2}% + \@glspl@{#1}{#2}[#3]% + }% + {\@Glspl@{#1}{#2}[#3]}% + }% + {% + \ifglshasprefixfirstplural{#2}% + {% + \Glsentryprefixfirstplural{#2}% + \@glspl@{#1}{#2}[#3]% + }% + {\@Glspl@{#1}{#2}[#3]}% + }% + }% +} +% \end{macrocode} +%\end{macro} +% +% Finally the all upper case versions: +%\begin{macro}{\PGLS} +% \begin{macrocode} +\newrobustcmd{\PGLS}{\@ifstar\@sPGLS\@PGLS} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@sPGLS} +% Starred version. +% \begin{macrocode} +\newcommand*{\@sPGLS}[2][]{\@PGLS@{hyper=false,#1}{#2}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@PGLS} +% Unstarred version. +% \begin{macrocode} +\newcommand*{\@PGLS}[2][]{% + \new@ifnextchar[% + {\@PGLS@{#1}{#2}}% + {\@PGLS@{#1}{#2}[]}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@PGLS@} +% Read in the final optional argument: +% \begin{macrocode} +\def\@PGLS@#1#2[#3]{% + \glsdoifexists{#2}% + {% + \ifglsused{#2}% + {% + \mfirstucMakeUppercase{\glsentryprefix{#2}}% + }% + {% + \mfirstucMakeUppercase{\glsentryprefixfirst{#2}}% + }% + \@GLS@{#1}{#2}[#3]% + }% +} +% \end{macrocode} +%\end{macro} +% +% Plural version: +%\begin{macro}{\PGLSpl} +% \begin{macrocode} +\newrobustcmd{\PGLSpl}{\@ifstar\@sPGLSpl\@PGLSpl} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@sPGLSpl} +% Starred version. +% \begin{macrocode} +\newcommand*{\@sPGLSpl}[2][]{\@PGLSpl@{hyper=false,#1}{#2}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\@PGLSpl} +% Unstarred version. +% \begin{macrocode} +\newcommand*{\@PGLSpl}[2][]{% + \new@ifnextchar[% + {\@PGLSpl@{#1}{#2}}% + {\@PGLSpl@{#1}{#2}[]}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@PGLSpl@} +% Read in the final optional argument: +% \begin{macrocode} +\def\@PGLSpl@#1#2[#3]{% + \glsdoifexists{#2}% + {% + \ifglsused{#2}% + {% + \mfirstucMakeUppercase{\glsentryprefixplural{#2}}% + }% + {% + \mfirstucMakeUppercase{\glsentryprefixfirstplural{#2}}% + }% + \@GLSpl@{#1}{#2}[#3]% + }% +} +% \end{macrocode} +%\end{macro} +%\iffalse +% \begin{macrocode} +%</glossaries-prefix.sty> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} %<*mfirstuc.sty> % \end{macrocode} %\fi @@ -11904,7 +14285,7 @@ false,nolabel,autolabel}[nolabel]{% %\label{sec:code:mfirstuc} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{mfirstuc}[2012/05/21 v1.06 (NLCT)] +\ProvidesPackage{mfirstuc}[2013/11/04 v1.08 (NLCT)] % \end{macrocode} % Requires \sty{etoolbox}:\changes{1.06}{2012/05/21}{now requires % etoolbox} @@ -11912,8 +14293,10 @@ false,nolabel,autolabel}[nolabel]{% \RequirePackage{etoolbox} % \end{macrocode} %\begin{macro}{\makefirstuc} -% Syntax:\\ -% \cs{makefirstuc}\marg{text}\\ +% Syntax: +%\begin{definition} +% \cs{makefirstuc}\marg{text} +%\end{definition} % Makes the first letter uppercase, but will % skip initial control sequences if they are followed by a group % and make the first thing in the group uppercase, unless the group @@ -11922,11 +14305,12 @@ false,nolabel,autolabel}[nolabel]{% % \verb|\makefirstuc{\ae bc}| will produce: \AE bc, but % \verb|\makefirstuc{\emph{abc}}| will produce \emph{Abc}. % This is required by \ics{Gls} and \ics{Glspl}. +%\changes{1.08}{2013-11-04}{made robust} % \begin{macrocode} \newif\if@glscs \newtoks\@glsmfirst \newtoks\@glsmrest -\def\makefirstuc#1{% +\newrobustcmd*{\makefirstuc}[1]{% \def\gls@argi{#1}% \ifx\gls@argi\@empty % \end{macrocode} @@ -11980,10 +14364,20 @@ false,nolabel,autolabel}[nolabel]{% \fi } % \end{macrocode} +%\begin{macro}{\@gls@makefirstuc} % Make first thing upper case: % \begin{macrocode} -\def\@gls@makefirstuc#1{\MakeUppercase #1} +\def\@gls@makefirstuc#1{\mfirstucMakeUppercase #1} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\mfirstucMakeUppercase} +% Allow user to replace \cs{MakeUppercase} with another case +% changing command. +% \begin{macrocode} +\newcommand*{\mfirstucMakeUppercase}{\MakeUppercase} % \end{macrocode} +%\end{macro} %\begin{macro}{\glsmakefirstuc} %\changes{1.05}{2011/04/02}{new} % Provide a user command to make it easier to customise. @@ -12015,11 +14409,11 @@ false,nolabel,autolabel}[nolabel]{% % Capitalise each word in the argument. Words are considered to be % separated by plain spaces (i.e.\ non-breakable spaces won't be % considered a word break). +%\changes{1.08}{2013-11-04}{made robust} % \begin{macrocode} -\newcommand*{\capitalisewords}[1]{% +\newrobustcmd*{\capitalisewords}[1]{% \def\gls@add@space{}% \mfu@capitalisewords#1 \@nil\mfu@endcap - %\gls@add@space\makefirstuc{##1}\def\gls@add@space{ }% } % \end{macrocode} %\end{macro} @@ -12065,7 +14459,7 @@ false,nolabel,autolabel}[nolabel]{% %\label{sec:code:hypernav} % Package Definition: % \begin{macrocode} -\ProvidesPackage{glossary-hypernav}[2007/07/04 v1.01 (NLCT)] +\ProvidesPackage{glossary-hypernav}[2013/11/14 v4.0 (NLCT)] % \end{macrocode} % % The commands defined in this package are provided to @@ -12189,7 +14583,12 @@ false,nolabel,autolabel}[nolabel]{% }% \@for\@gls@tmp:=\@gls@list\do{% \@gls@between - \glsnavhyperlink{\@gls@tmp}{\glsgetgrouptitle{\@gls@tmp}}% +% \end{macrocode} +%\changes{3.11a}{2013-10-15}{switched to using +%\cs{@gls@getgrouptitle}} +% \begin{macrocode} + \@gls@getgrouptitle{\@gls@tmp}{\@gls@grptitle}% + \glsnavhyperlink{\@gls@tmp}{\@gls@grptitle}% \let\@gls@between\glshypernavsep% }% } @@ -12228,7 +14627,7 @@ false,nolabel,autolabel}[nolabel]{% % This defines an in-line style where the entries are % comma-separated with just the name and description displayed. % \begin{macrocode} -\ProvidesPackage{glossary-inline}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-inline}[2013/11/14 v4.0 (NLCT)] % \end{macrocode} % %\begin{style}{inline} @@ -12237,7 +14636,7 @@ false,nolabel,autolabel}[nolabel]{% \newglossarystyle{inline}{% % \end{macrocode} % Start of glossary sets up first empty separator between entries. -% (This is then changed by \cs{glossaryentryfield}) +% (This is then changed by \cs{glossentry}) % \begin{macrocode} \renewenvironment{theglossary}% {% @@ -12258,20 +14657,31 @@ false,nolabel,autolabel}[nolabel]{% \renewcommand*{\glsgroupheading}[1]{}% % \end{macrocode} % Just display separator followed by name and description: +%\changes{3.08a}{2013-08-30}{updated inline style to use +%\cs{glossentry} and \cs{subglossentry}} % \begin{macrocode} - \renewcommand{\glossaryentryfield}[5]{% + \renewcommand{\glossentry}[2]{% \glsinlinedopostchild \gls@inlinesep - \def\glo@desc{##3}% - \def\@no@post@desc{\nopostdesc}% - \glsentryitem{##1}\glsinlinenameformat{##1}{##2}% - \ifx\glo@desc\@no@post@desc - \glsinlineemptydescformat{##4}{##5}% - \else - \ifstrempty{##3}% - {\glsinlineemptydescformat{##4}{##5}}% - {\glsinlinedescformat{##3}{##4}{##5}}% - \fi + \glsentryitem{##1}% + \glsinlinenameformat{##1}{% + \glossentryname{##1}% + }% + \ifglsdescsuppressed{##1}% + {% + \glsinlineemptydescformat + {% + \glossentrysymbol{##1}% + }% + {% + ##2% + }% + }% + {% + \ifglshasdesc{##1}% + {\glsinlinedescformat{\glossentrydesc{##1}}{\glossentrysymbol{##1}}{##2}}% + {\glsinlineemptydescformat{\glossentrysymbol{##1}}{##2}}% + }% \ifglshaschildren{##1}% {% \glsresetsubentrycounter @@ -12285,10 +14695,12 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Sub-entries display description: % \begin{macrocode} - \renewcommand{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% \gls@inlinesubsep% - \glsinlinesubnameformat{##2}{##3}% - \glssubentryitem{##2}\glsinlinesubdescformat{##4}{##5}{##6}% + \glsinlinesubnameformat{##2}{% + \glossentryname{##2}}% + \glssubentryitem{##2}% + \glsinlinesubdescformat{\glossentrydesc{##2}}{\glossentrysymbol{##2}}{##3}% \def\gls@inlinesubsep{\glsinlinesubseparator}% }% % \end{macrocode} @@ -12330,7 +14742,7 @@ false,nolabel,autolabel}[nolabel]{% %\end{macro} % %\begin{macro}{\glsinlinepostchild} -%\changes{}{}{new} +%\changes{3.03}{2012/09/21}{new} % Hook to use between child and next entry % \begin{macrocode} \newcommand*{\glsinlinepostchild}{} @@ -12339,14 +14751,14 @@ false,nolabel,autolabel}[nolabel]{% % %\begin{macro}{\glspostinline} % Terminator for inline glossary. -%\changes{}{}{replaced ``.'' with \cs{glspostdescription}} +%\changes{3.03}{2012/09/21}{replaced ``.'' with \cs{glspostdescription}} % \begin{macrocode} \newcommand*{\glspostinline}{\glspostdescription\space} % \end{macrocode} %\end{macro} % %\begin{macro}{\glsinlinenameformat} -%\changes{}{}{new} +%\changes{3.03}{2012/09/21}{new} % Formats the name of the entry (first argument label, second % argument name): % \begin{macrocode} @@ -12355,7 +14767,7 @@ false,nolabel,autolabel}[nolabel]{% %\end{macro} % %\begin{macro}{\glsinlinedescformat} -%\changes{}{}{new} +%\changes{3.03}{2012/09/21}{new} % Formats the entry's description, symbol and location list: % \begin{macrocode} \newcommand*{\glsinlinedescformat}[3]{\space#1} @@ -12363,7 +14775,7 @@ false,nolabel,autolabel}[nolabel]{% %\end{macro} % %\begin{macro}{\glsinlineemptydescformat} -%\changes{}{}{new} +%\changes{3.03}{2012/09/21}{new} % Formats the entry's symbol and location list when the description % is empty: % \begin{macrocode} @@ -12372,7 +14784,7 @@ false,nolabel,autolabel}[nolabel]{% %\end{macro} % %\begin{macro}{\glsinlinesubnameformat} -%\changes{}{}{new} +%\changes{3.03}{2012/09/21}{new} % Formats the name of the subentry (first argument label, second % argument name): % \begin{macrocode} @@ -12381,7 +14793,7 @@ false,nolabel,autolabel}[nolabel]{% %\end{macro} % %\begin{macro}{\glsinlinesubdescformat} -%\changes{}{}{new} +%\changes{3.03}{2012/09/21}{new} % Formats the subentry's description, symbol and location list: % \begin{macrocode} \newcommand*{\glsinlinesubdescformat}[3]{#1} @@ -12406,7 +14818,7 @@ false,nolabel,autolabel}[nolabel]{% % \ics{item} command, it will appear in a bold font by % default. % \begin{macrocode} -\ProvidesPackage{glossary-list}[2012/11/11 v3.04 (NLCT)] +\ProvidesPackage{glossary-list}[2013/11/14 v4.0 (NLCT)] % \end{macrocode} %\begin{style}{list} % The \glostyle{list} glossary style @@ -12434,16 +14846,20 @@ false,nolabel,autolabel}[nolabel]{% \renewcommand*{\glsgroupheading}[1]{}% % \end{macrocode} % Main (level 0) entries start a new item in the list: +%\changes{3.08a}{2013-08-30}{updated list style to use +%\cs{glossentry} and \cs{subglossentry}} % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% - \item[\glsentryitem{##1}\glstarget{##1}{##2}] - ##3\glspostdescription\space ##5}% + \renewcommand*{\glossentry}[2]{% + \item[\glsentryitem{##1}% + \glstarget{##1}{\glossentryname{##1}}] + \glossentrydesc{##1}\glspostdescription\space ##2}% % \end{macrocode} % Sub-entries continue on the same line: % \begin{macrocode} - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand*{\subglossentry}[3]{% \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6.}% + \glstarget{##2}{\strut}% + \glossentrydesc{##2}\glspostdescription\space ##3.}% % \end{macrocode} % Add vertical space between groups: %\changes{3.03}{2012/09/21}{added check for glsnogroupskip} @@ -12462,7 +14878,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the \glostyle{list} style: % \begin{macrocode} - \glossarystyle{list}% + \setglossarystyle{list}% % \end{macrocode} % Each group has a heading: % \begin{macrocode} @@ -12479,7 +14895,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the \glostyle{list} style: % \begin{macrocode} - \glossarystyle{list}% + \setglossarystyle{list}% % \end{macrocode} % Add navigation links at the start of the environment: % \begin{macrocode} @@ -12503,13 +14919,16 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the \glostyle{list} style: % \begin{macrocode} - \glossarystyle{list}% + \setglossarystyle{list}% % \end{macrocode} % Main (level 0) entries start a new item in the list with a % line break after the entry name: +%\changes{3.08a}{2013-08-30}{updated altlist style to use +%\cs{glossentry} and \cs{subglossentry}} % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% - \item[\glsentryitem{##1}\glstarget{##1}{##2}]% + \renewcommand*{\glossentry}[2]{% + \item[\glsentryitem{##1}% + \glstarget{##1}{\glossentryname{##1}}]% % \end{macrocode} %\changes{3.04}{2012-11-11}{replaced \cs{newline} with paragraph break} % Version 3.04 changed \cs{newline} to the following paragraph break @@ -12517,14 +14936,14 @@ false,nolabel,autolabel}[nolabel]{% % a page break occurring at this point. % \begin{macrocode} \mbox{}\par\nobreak\@afterheading - ##3\glspostdescription\space ##5}% + \glossentrydesc{##1}\glspostdescription\space ##2}% % \end{macrocode} % Sub-entries start a new paragraph: % \begin{macrocode} - \renewcommand{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% \par \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription\space ##3}% } % \end{macrocode} %\end{style} @@ -12537,7 +14956,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the \glostyle{altlist} style: % \begin{macrocode} - \glossarystyle{altlist}% + \setglossarystyle{altlist}% % \end{macrocode} % Each group has a heading: % \begin{macrocode} @@ -12554,7 +14973,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the \glostyle{altlist} style: % \begin{macrocode} - \glossarystyle{altlist}% + \setglossarystyle{altlist}% % \end{macrocode} % Add navigation links at the start of the environment: % \begin{macrocode} @@ -12581,22 +15000,25 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the \glostyle{list} style: % \begin{macrocode} - \glossarystyle{list}% + \setglossarystyle{list}% % \end{macrocode} % Each main (level 0) entry starts a new item: +%\changes{3.08a}{2013-08-30}{updated listdotted style to use +%\cs{glossentry} and \cs{subglossentry}} % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% + \renewcommand*{\glossentry}[2]{% \item[]\makebox[\glslistdottedwidth][l]{% - \glsentryitem{##1}\glstarget{##1}{##2}% - \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##3}% + \glsentryitem{##1}% + \glstarget{##1}{\glossentryname{##1}}% + \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}\glossentrydesc{##1}}% % \end{macrocode} % Sub entries have the same format as main entries: % \begin{macrocode} - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand*{\subglossentry}[3]{% \item[]\makebox[\glslistdottedwidth][l]{% \glssubentryitem{##2}% - \glstarget{##2}{##3}% - \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##4}% + \glstarget{##2}{\glossentryname{##2}}% + \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}\glossentrydesc{##2}}% } % \end{macrocode} %\end{style} @@ -12616,12 +15038,12 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the \glostyle{listdotted} style: % \begin{macrocode} - \glossarystyle{listdotted}% + \setglossarystyle{listdotted}% % \end{macrocode} % Main (level 0) entries just display the name: % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% - \item[\glsentryitem{##1}\glstarget{##1}{##2}]}% + \renewcommand*{\glossentry}[2]{% + \item[\glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}}]}% } % \end{macrocode} %\end{style} @@ -12640,7 +15062,7 @@ false,nolabel,autolabel}[nolabel]{% % The glossary styles defined in the \isty{glossary-long} package % used the \env{longtable} environment in the glossary. % \begin{macrocode} -\ProvidesPackage{glossary-long}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-long}[2013/11/14 v4.0 (NLCT)] % \end{macrocode} % Requires the \isty{longtable} package: % \begin{macrocode} @@ -12693,21 +15115,30 @@ false,nolabel,autolabel}[nolabel]{% \renewcommand*{\glsgroupheading}[1]{}% % \end{macrocode} % Main (level 0) entries displayed in a row: +%\changes{3.08a}{2013-09-28}{updated to use \cs{glossentry} and +%\cs{subglossentry}} +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription\space ##2\tabularnewline + }% % \end{macrocode} % Sub entries displayed on the following row without the name: % \begin{macrocode} - \renewcommand*{\glossarysubentryfield}[6]{% - & + \renewcommand{\subglossentry}[3]{% + & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}% + \glstarget{##2}{\strut}\glosentrydesc{##2}\glspostdescription\space + ##3\tabularnewline + }% % \end{macrocode} % Blank row between groups: %\changes{3.03}{2012/09/21}{added check for glsnogroupskip} +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \\\fi}% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & +\tabularnewline\fi}% } % \end{macrocode} %\end{style} @@ -12720,7 +15151,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{long} style: % \begin{macrocode} - \glossarystyle{long}% + \setglossarystyle{long}% % \end{macrocode} % Use \env{longtable} with two columns with vertical lines % between each column: @@ -12743,12 +15174,13 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{long} style: % \begin{macrocode} - \glossarystyle{long}% + \setglossarystyle{long}% % \end{macrocode} % Set the table's header: +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} \renewcommand*{\glossaryheader}{% - \bfseries \entryname & \bfseries \descriptionname\\\endhead}% + \bfseries \entryname & \bfseries \descriptionname\tabularnewline\endhead}% } % \end{macrocode} %\end{style} @@ -12761,12 +15193,14 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{longborder} style: % \begin{macrocode} - \glossarystyle{longborder}% + \setglossarystyle{longborder}% % \end{macrocode} % Set the table's header and add horizontal line to table's foot: +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} \renewcommand*{\glossaryheader}{% - \hline\bfseries \entryname & \bfseries \descriptionname\\\hline + \hline\bfseries \entryname & \bfseries + \descriptionname\tabularnewline\hline \endhead \hline\endfoot}% } @@ -12794,22 +15228,28 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Main (level 0) entries on a row (name in first column, % description in second column, page list in last column): +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\\}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & ##2\tabularnewline + }% % \end{macrocode} % Sub-entries on a separate row (no name, description in % second column, page list in third column): % \begin{macrocode} - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##6\\}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + ##3\tabularnewline + }% % \end{macrocode} % Blank row between groups: %\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\\\fi}% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & &\tabularnewline\fi}% } % \end{macrocode} %\end{style} @@ -12822,7 +15262,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{long3col} style: % \begin{macrocode} - \glossarystyle{long3col}% + \setglossarystyle{long3col}% % \end{macrocode} % Use a \env{longtable} with 3 columns with vertical lines % around them: @@ -12845,13 +15285,14 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{long3col} style: % \begin{macrocode} - \glossarystyle{long3col}% + \setglossarystyle{long3col}% % \end{macrocode} % Set the table's header: +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} \renewcommand*{\glossaryheader}{% \bfseries\entryname&\bfseries\descriptionname& - \bfseries\pagelistname\\\endhead}% + \bfseries\pagelistname\tabularnewline\endhead}% } % \end{macrocode} %\end{style} @@ -12863,14 +15304,15 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{long3colborder} style: % \begin{macrocode} - \glossarystyle{long3colborder}% + \setglossarystyle{long3colborder}% % \end{macrocode} % Set the table's header and add horizontal line at table's foot: +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} \renewcommand*{\glossaryheader}{% \hline \bfseries\entryname&\bfseries\descriptionname& - \bfseries\pagelistname\\\hline\endhead + \bfseries\pagelistname\tabularnewline\hline\endhead \hline\endfoot}% } % \end{macrocode} @@ -12899,22 +15341,30 @@ false,nolabel,autolabel}[nolabel]{% % Main (level 0) entries on a single row (name in first column, % description in second column, symbol in third column, page list % in last column): +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\\}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & + \glossentrysymbol{##1} & + ##2\tabularnewline + }% % \end{macrocode} % Sub entries on a single row with no name (description in second % column, symbol in third column, page list in last column): % \begin{macrocode} - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##5 & ##6\\}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + \glossentrysymbol{##2} & ##3\tabularnewline + }% % \end{macrocode} % Blank row between groups: %\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\\\fi}% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & & &\tabularnewline\fi}% } % \end{macrocode} %\end{style} @@ -12927,14 +15377,15 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{long4col} style: % \begin{macrocode} - \glossarystyle{long4col}% + \setglossarystyle{long4col}% % \end{macrocode} % Table has a header: +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} \renewcommand*{\glossaryheader}{% \bfseries\entryname&\bfseries\descriptionname& \bfseries \symbolname& - \bfseries\pagelistname\\\endhead}% + \bfseries\pagelistname\tabularnewline\endhead}% } % \end{macrocode} %\end{style} @@ -12947,7 +15398,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{long4col} style: % \begin{macrocode} - \glossarystyle{long4col}% + \setglossarystyle{long4col}% % \end{macrocode} % Use a \env{longtable} with 4 columns surrounded by vertical % lines: @@ -12971,7 +15422,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{long4col} style: % \begin{macrocode} - \glossarystyle{long4col}% + \setglossarystyle{long4col}% % \end{macrocode} % Use a \env{longtable} with 4 columns surrounded by vertical % lines: @@ -12985,7 +15436,8 @@ false,nolabel,autolabel}[nolabel]{% \renewcommand*{\glossaryheader}{% \hline\bfseries\entryname&\bfseries\descriptionname& \bfseries \symbolname& - \bfseries\pagelistname\\\hline\endhead\hline\endfoot}% + \bfseries\pagelistname\tabularnewline\hline\endhead + \hline\endfoot}% } % \end{macrocode} %\end{style} @@ -12998,7 +15450,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{long4col} style: % \begin{macrocode} - \glossarystyle{long4col}% + \setglossarystyle{long4col}% % \end{macrocode} % Use a \env{longtable} with 4 columns where the second and % last columns may have multiple lines in each row: @@ -13018,7 +15470,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{long4colheader} style: % \begin{macrocode} - \glossarystyle{long4colheader}% + \setglossarystyle{long4colheader}% % \end{macrocode} % Use a \env{longtable} with 4 columns where the second and % last columns may have multiple lines in each row: @@ -13038,7 +15490,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{long4colborder} style: % \begin{macrocode} - \glossarystyle{long4colborder}% + \setglossarystyle{long4colborder}% % \end{macrocode} % Use a \env{longtable} with 4 columns where the second and % last columns may have multiple lines in each row: @@ -13058,7 +15510,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{long4colheaderborder} style: % \begin{macrocode} - \glossarystyle{long4colheaderborder}% + \setglossarystyle{long4colheaderborder}% % \end{macrocode} % Use a \env{longtable} with 4 columns where the second and % last columns may have multiple lines in each row: @@ -13085,7 +15537,7 @@ false,nolabel,autolabel}[nolabel]{% % used the \env{longtable} environment in the glossary and use % ragged right formatting for the multiline columns. % \begin{macrocode} -\ProvidesPackage{glossary-longragged}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-longragged}[2013/11/14 v4.0 (NLCT)] % \end{macrocode} % Requires the \isty{array} package: % \begin{macrocode} @@ -13139,18 +15591,24 @@ false,nolabel,autolabel}[nolabel]{% \renewcommand*{\glsgroupheading}[1]{}% % \end{macrocode} % Main (level 0) entries displayed in a row: +%\changes{3.08a}{2013-09-28}{updated to use \cs{glossentry} and +%\cs{subglossentry}} % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5% - \tabularnewline}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription\space ##2% + \tabularnewline + }% % \end{macrocode} % Sub entries displayed on the following row without the name: % \begin{macrocode} - \renewcommand*{\glossarysubentryfield}[6]{% - & + \renewcommand{\subglossentry}[3]{% + & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6% - \tabularnewline}% + \glstarget{##2}{\strut}\glossentrydesc{##2}% + \glspostdescription\space ##3% + \tabularnewline + }% % \end{macrocode} % Blank row between groups: %\changes{3.03}{2012/09/21}{added check for glsnogroupskip} @@ -13168,7 +15626,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{longragged} style: % \begin{macrocode} - \glossarystyle{longragged}% + \setglossarystyle{longragged}% % \end{macrocode} % Use \env{longtable} with two columns with vertical lines % between each column: @@ -13192,7 +15650,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{longragged} style: % \begin{macrocode} - \glossarystyle{longragged}% + \setglossarystyle{longragged}% % \end{macrocode} % Set the table's header: % \begin{macrocode} @@ -13211,7 +15669,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{longraggedborder} style: % \begin{macrocode} - \glossarystyle{longraggedborder}% + \setglossarystyle{longraggedborder}% % \end{macrocode} % Set the table's header and add horizontal line to table's foot: % \begin{macrocode} @@ -13246,22 +15704,29 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Main (level 0) entries on a row (name in first column, % description in second column, page list in last column): +%\changes{3.08a}{2013-09-28}{updated to use \cs{glossentry} and +%\cs{subglossentry}} % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\tabularnewline}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & ##2\tabularnewline + }% % \end{macrocode} % Sub-entries on a separate row (no name, description in % second column, page list in third column): % \begin{macrocode} - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##6\tabularnewline}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + ##3\tabularnewline + }% % \end{macrocode} % Blank row between groups: %\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\tabularnewline\fi}% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & &\tabularnewline\fi}% } % \end{macrocode} %\end{style} @@ -13274,7 +15739,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{longragged3col} style: % \begin{macrocode} - \glossarystyle{longragged3col}% + \setglossarystyle{longragged3col}% % \end{macrocode} % Use a \env{longtable} with 3 columns with vertical lines % around them: @@ -13298,7 +15763,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{longragged3col} style: % \begin{macrocode} - \glossarystyle{longragged3col}% + \setglossarystyle{longragged3col}% % \end{macrocode} % Set the table's header: % \begin{macrocode} @@ -13316,7 +15781,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{longragged3colborder} style: % \begin{macrocode} - \glossarystyle{longragged3colborder}% + \setglossarystyle{longragged3colborder}% % \end{macrocode} % Set the table's header and add horizontal line at table's foot: % \begin{macrocode} @@ -13356,22 +15821,30 @@ false,nolabel,autolabel}[nolabel]{% % Main (level 0) entries on a single row (name in first column, % description in second column, symbol in third column, page list % in last column): +%\changes{3.08a}{2013-09-28}{updated to use \cs{glossentry} and +%\cs{subglossentry}} % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & \glossentrydesc{##1} & + ##2\tabularnewline + }% % \end{macrocode} % Sub entries on a single row with no name (description in second % column, symbol in third column, page list in last column): % \begin{macrocode} - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + \glossentrysymbol{##2} & ##3\tabularnewline + }% % \end{macrocode} % Blank row between groups: %\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\tabularnewline\fi}% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & & &\tabularnewline\fi}% } % \end{macrocode} %\end{style} @@ -13384,7 +15857,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{altlongragged4col} style: % \begin{macrocode} - \glossarystyle{altlongragged4col}% + \setglossarystyle{altlongragged4col}% % \end{macrocode} % Use a \env{longtable} with 4 columns where the second and % last columns may have multiple lines in each row: @@ -13412,7 +15885,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{altlongragged4col} style: % \begin{macrocode} - \glossarystyle{altlongragged4col}% + \setglossarystyle{altlongragged4col}% % \end{macrocode} % Use a \env{longtable} with 4 columns where the second and % last columns may have multiple lines in each row: @@ -13437,7 +15910,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{altlongragged4col} style: % \begin{macrocode} - \glossarystyle{altlongragged4col}% + \setglossarystyle{altlongragged4col}% % \end{macrocode} % Use a \env{longtable} with 4 columns where the second and % last columns may have multiple lines in each row: @@ -13473,7 +15946,7 @@ false,nolabel,autolabel}[nolabel]{% %use the \sty{multicol} package. These use the tree-like glossary %styles in a multicol environment. % \begin{macrocode} -\ProvidesPackage{glossary-mcols}[2013/04/21 v3.05 (NLCT)] +\ProvidesPackage{glossary-mcols}[2013/11/14 v4.0 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -13496,7 +15969,7 @@ false,nolabel,autolabel}[nolabel]{% % the glossary style.) % \begin{macrocode} \newglossarystyle{mcolindex}{% - \glossarystyle{index}% + \setglossarystyle{index}% \renewenvironment{theglossary}% {% % \end{macrocode} @@ -13515,7 +15988,7 @@ false,nolabel,autolabel}[nolabel]{% % As \glostyle{mcolindex} but has headings: % \begin{macrocode} \newglossarystyle{mcolindexgroup}{% - \glossarystyle{mcolindex}% + \setglossarystyle{mcolindex}% \renewcommand*{\glsgroupheading}[1]{% \item\textbf{\glsgetgrouptitle{##1}}\indexspace}% } @@ -13530,7 +16003,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{mcolindex} style: % \begin{macrocode} - \glossarystyle{mcolindex}% + \setglossarystyle{mcolindex}% % \end{macrocode} % Put navigation links to the groups at the start of the glossary: % \begin{macrocode} @@ -13552,7 +16025,7 @@ false,nolabel,autolabel}[nolabel]{% % glossary in multiple columns. % \begin{macrocode} \newglossarystyle{mcoltree}{% - \glossarystyle{tree}% + \setglossarystyle{tree}% \renewenvironment{theglossary}% {% % \end{macrocode} @@ -13575,7 +16048,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{mcoltree} style: % \begin{macrocode} - \glossarystyle{mcoltree}% + \setglossarystyle{mcoltree}% % \end{macrocode} % Each group has a heading (in bold) followed by a vertical gap): % \begin{macrocode} @@ -13595,7 +16068,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{mcoltree} style: % \begin{macrocode} - \glossarystyle{mcoltree}% + \setglossarystyle{mcoltree}% % \end{macrocode} % Put navigation links to the groups at the start of the % \env{theglossary} environment: @@ -13619,7 +16092,7 @@ false,nolabel,autolabel}[nolabel]{% % glossary in multiple columns. % \begin{macrocode} \newglossarystyle{mcoltreenoname}{% - \glossarystyle{treenoname}% + \setglossarystyle{treenoname}% \renewenvironment{theglossary}% {% % \end{macrocode} @@ -13642,7 +16115,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{mcoltreenoname} style: % \begin{macrocode} - \glossarystyle{mcoltreenoname}% + \setglossarystyle{mcoltreenoname}% % \end{macrocode} % Give each group a heading: % \begin{macrocode} @@ -13662,7 +16135,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{mcoltreenoname} style: % \begin{macrocode} - \glossarystyle{mcoltreenoname}% + \setglossarystyle{mcoltreenoname}% % \end{macrocode} % Put navigation links to the groups at the start of the % \env{theglossary} environment: @@ -13686,7 +16159,7 @@ false,nolabel,autolabel}[nolabel]{% % glossary in multiple columns. % \begin{macrocode} \newglossarystyle{mcolalttree}{% - \glossarystyle{alttree}% + \setglossarystyle{alttree}% \renewenvironment{theglossary}% {% % \end{macrocode} @@ -13709,7 +16182,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{mcolalttree} style: % \begin{macrocode} - \glossarystyle{mcolalttree}% + \setglossarystyle{mcolalttree}% % \end{macrocode} % Give each group a heading. % \begin{macrocode} @@ -13731,7 +16204,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{mcolalttree} style: % \begin{macrocode} - \glossarystyle{mcolalttree}% + \setglossarystyle{mcolalttree}% % \end{macrocode} % Put the navigation links in the header % \begin{macrocode} @@ -13769,7 +16242,7 @@ false,nolabel,autolabel}[nolabel]{% % The glossary styles defined in the \isty{glossary-super} package % use the \env{supertabular} environment. % \begin{macrocode} -\ProvidesPackage{glossary-super}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-super}[2013/11/14 v4.0 (NLCT)] % \end{macrocode} % Requires the \isty{supertabular} package: % \begin{macrocode} @@ -13826,22 +16299,28 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Main (level 0) entries put in a row (name in first column, % description and page list in second column): +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription\space ##2\tabularnewline + }% % \end{macrocode} % Sub entries put in a row (no name, description and page list % in second column): % \begin{macrocode} - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}% + \glstarget{##2}{\strut}\glosentrydesc{##2}\glspostdescription\space + ##3\tabularnewline + }% % \end{macrocode} % Blank row between groups: %\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \\\fi}% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & \tabularnewline\fi}% } % \end{macrocode} %\end{style} @@ -13854,7 +16333,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{super} style: % \begin{macrocode} - \glossarystyle{super}% + \setglossarystyle{super}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % two columns and a horizontal line in the head and tail: @@ -13875,13 +16354,15 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{super} style: % \begin{macrocode} - \glossarystyle{super}% + \setglossarystyle{super}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % two columns, a header and no tail: +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} \renewenvironment{theglossary}% - {\tablehead{\bfseries \entryname & \bfseries \descriptionname\\}% + {\tablehead{\bfseries \entryname & + \bfseries\descriptionname\tabularnewline}% \tabletail{}% \begin{supertabular}{lp{\glsdescwidth}}}% {\end{supertabular}}% @@ -13897,15 +16378,16 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{super} style: % \begin{macrocode} - \glossarystyle{super}% + \setglossarystyle{super}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % two columns, a header and horizontal lines above and below the % table: +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} \renewenvironment{theglossary}% {\tablehead{\hline\bfseries \entryname & - \bfseries \descriptionname\\\hline}% + \bfseries \descriptionname\tabularnewline\hline}% \tabletail{\hline} \begin{supertabular}{|l|p{\glsdescwidth}|}}% {\end{supertabular}}% @@ -13937,22 +16419,28 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Main (level 0) entries on a row (name in first column, % description in second column, page list in last column): +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\\}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & ##2\tabularnewline + }% % \end{macrocode} % Sub entries on a row (no name, description in second column, % page list in last column): % \begin{macrocode} - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##6\\}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + ##3\tabularnewline + }% % \end{macrocode} % Blank row between groups: %\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\\\fi}% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & &\tabularnewline\fi}% } % \end{macrocode} %\end{style} @@ -13965,7 +16453,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{super3col} style: % \begin{macrocode} - \glossarystyle{super3col}% + \setglossarystyle{super3col}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % three columns and a horizontal line in the head and tail: @@ -13986,14 +16474,15 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{super3col} style: % \begin{macrocode} - \glossarystyle{super3col}% + \setglossarystyle{super3col}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % three columns, a header and no tail: +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} \renewenvironment{theglossary}% {\tablehead{\bfseries\entryname&\bfseries\descriptionname& - \bfseries\pagelistname\\}\tabletail{}% + \bfseries\pagelistname\tabularnewline}\tabletail{}% \begin{supertabular}{lp{\glsdescwidth}p{\glspagelistwidth}}}% {\end{supertabular}}% } @@ -14008,7 +16497,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{super3colborder} style: % \begin{macrocode} - \glossarystyle{super3colborder}% + \setglossarystyle{super3colborder}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % three columns, a header with horizontal lines and a horizontal @@ -14017,7 +16506,7 @@ false,nolabel,autolabel}[nolabel]{% \renewenvironment{theglossary}% {\tablehead{\hline \bfseries\entryname&\bfseries\descriptionname& - \bfseries\pagelistname\\\hline}% + \bfseries\pagelistname\tabularnewline\hline}% \tabletail{\hline}% \begin{supertabular}{|l|p{\glsdescwidth}|p{\glspagelistwidth}|}}% {\end{supertabular}}% @@ -14052,22 +16541,29 @@ false,nolabel,autolabel}[nolabel]{% % Main (level 0) entries on a row with the name in the first % column, description in second column, symbol in third column % and page list in last column: +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\\}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & + \glossentrysymbol{##1} & ##3\tabularnewline + }% % \end{macrocode} % Sub entries on a row with no name, the description in the second % column, symbol in third column and page list in last column: % \begin{macrocode} - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##5 & ##6\\}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + \glossentrysymbol{##2} & ##3\tabularnewline + }% % \end{macrocode} % Blank row between groups: %\changes{3.03}{2012/09/21}{added check for glsnogroupskip} % \begin{macrocode} - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\\\fi}% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & & &\tabularnewline\fi}% } % \end{macrocode} %\end{style} @@ -14080,15 +16576,16 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{super4col} style: % \begin{macrocode} - \glossarystyle{super4col}% + \setglossarystyle{super4col}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % four columns, a header and no tail: +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} \renewenvironment{theglossary}% {\tablehead{\bfseries\entryname&\bfseries\descriptionname& \bfseries\symbolname & - \bfseries\pagelistname\\}% + \bfseries\pagelistname\tabularnewline}% \tabletail{}% \begin{supertabular}{llll}}% {\end{supertabular}}% @@ -14104,7 +16601,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{super4col} style: % \begin{macrocode} - \glossarystyle{super4col}% + \setglossarystyle{super4col}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % four columns and a horizontal line in the head and tail: @@ -14125,16 +16622,18 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{super4col} style: % \begin{macrocode} - \glossarystyle{super4col}% + \setglossarystyle{super4col}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % four columns and a header bordered by horizontal lines and % a horizontal line in the tail: +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} \renewenvironment{theglossary}% {\tablehead{\hline\bfseries\entryname&\bfseries\descriptionname& \bfseries\symbolname & - \bfseries\pagelistname\\\hline}\tabletail{\hline}% + \bfseries\pagelistname\tabularnewline\hline}% + \tabletail{\hline}% \begin{supertabular}{|l|l|l|l|}}% {\end{supertabular}}% } @@ -14149,7 +16648,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{super4col} style: % \begin{macrocode} - \glossarystyle{super4col}% + \setglossarystyle{super4col}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % four columns and no head or tail: @@ -14170,15 +16669,16 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{super4colheader} style: % \begin{macrocode} - \glossarystyle{super4colheader}% + \setglossarystyle{super4colheader}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % four columns, a header and no tail: +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} \renewenvironment{theglossary}% {\tablehead{\bfseries\entryname&\bfseries\descriptionname& \bfseries\symbolname & - \bfseries\pagelistname\\}\tabletail{}% + \bfseries\pagelistname\tabularnewline}\tabletail{}% \begin{supertabular}{lp{\glsdescwidth}lp{\glspagelistwidth}}}% {\end{supertabular}}% } @@ -14193,7 +16693,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{super4colborder} style: % \begin{macrocode} - \glossarystyle{super4colborder}% + \setglossarystyle{super4colborder}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % four columns and a horizontal line in the head and tail: @@ -14215,18 +16715,19 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{super4colheaderborder} style: % \begin{macrocode} - \glossarystyle{super4colheaderborder}% + \setglossarystyle{super4colheaderborder}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % four columns and a header bordered by horizontal lines and % a horizontal line in the tail: +%\changes{3.13a}{2013-11-05}{switched to \cs{tabularnewline}} % \begin{macrocode} \renewenvironment{theglossary}% {\tablehead{\hline \bfseries\entryname & \bfseries\descriptionname & \bfseries\symbolname & - \bfseries\pagelistname\\\hline}% + \bfseries\pagelistname\tabularnewline\hline}% \tabletail{\hline}% \begin{supertabular}% {|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}% @@ -14250,7 +16751,7 @@ false,nolabel,autolabel}[nolabel]{% % are like those provided by the \isty{glossary-super} package, % except that the multiline columns have ragged right justification. % \begin{macrocode} -\ProvidesPackage{glossary-superragged}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-superragged}[2013/11/14 v4.0 (NLCT)] % \end{macrocode} % Requires the \isty{array} package: % \begin{macrocode} @@ -14306,19 +16807,25 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Main (level 0) entries put in a row (name in first column, % description and page list in second column): +%\changes{3.08a}{2013-09-28}{updated to use \cs{glossentry} and +%\cs{subglossentry}} % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5% - \tabularnewline}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription\space ##2% + \tabularnewline + }% % \end{macrocode} % Sub entries put in a row (no name, description and page list % in second column): % \begin{macrocode} - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6% - \tabularnewline}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription\space + ##3% + \tabularnewline + }% % \end{macrocode} % Blank row between groups: %\changes{3.03}{2012/09/21}{added check for glsnogroupskip} @@ -14336,7 +16843,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{superragged} style: % \begin{macrocode} - \glossarystyle{superragged}% + \setglossarystyle{superragged}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % two columns and a horizontal line in the head and tail: @@ -14357,7 +16864,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{superragged} style: % \begin{macrocode} - \glossarystyle{superragged}% + \setglossarystyle{superragged}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % two columns, a header and no tail: @@ -14380,7 +16887,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{super} style: % \begin{macrocode} - \glossarystyle{superragged}% + \setglossarystyle{superragged}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % two columns, a header and horizontal lines above and below the @@ -14422,16 +16929,21 @@ false,nolabel,autolabel}[nolabel]{% % Main (level 0) entries on a row (name in first column, % description in second column, page list in last column): % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\tabularnewline}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & + ##2\tabularnewline + }% % \end{macrocode} % Sub entries on a row (no name, description in second column, % page list in last column): % \begin{macrocode} - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##6\tabularnewline}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + ##3\tabularnewline + }% % \end{macrocode} % Blank row between groups: %\changes{3.03}{2012/09/21}{added check for glsnogroupskip} @@ -14449,7 +16961,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{superragged3col} style: % \begin{macrocode} - \glossarystyle{superragged3col}% + \setglossarystyle{superragged3col}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % three columns and a horizontal line in the head and tail: @@ -14471,7 +16983,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{superragged3col} style: % \begin{macrocode} - \glossarystyle{superragged3col}% + \setglossarystyle{superragged3col}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % three columns, a header and no tail: @@ -14494,7 +17006,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{superragged3colborder} style: % \begin{macrocode} - \glossarystyle{superragged3colborder}% + \setglossarystyle{superragged3colborder}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % three columns, a header with horizontal lines and a horizontal @@ -14541,15 +17053,21 @@ false,nolabel,autolabel}[nolabel]{% % column, description in second column, symbol in third column % and page list in last column: % \begin{macrocode} - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & + \glossentrysymbol{##1} & ##2\tabularnewline + }% % \end{macrocode} -% Sub entries on a row with no name, the description in the second% column, symbol in third column and page list in last column: +% Sub entries on a row with no name, the description in the second +% column, symbol in third column and page list in last column: % \begin{macrocode} - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + \glossentrysymbol{##2} & ##3\tabularnewline + }% % \end{macrocode} % Blank row between groups: %\changes{3.03}{2012/09/21}{added check for glsnogroupskip} @@ -14567,7 +17085,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{altsuperragged4col} style: % \begin{macrocode} - \glossarystyle{altsuperragged4col}% + \setglossarystyle{altsuperragged4col}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % four columns, a header and no tail: @@ -14591,7 +17109,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{altsuperragged4col} style: % \begin{macrocode} - \glossarystyle{altsuper4col}% + \setglossarystyle{altsuper4col}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % four columns and a horizontal line in the head and tail: @@ -14614,7 +17132,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{altsuperragged4col} style: % \begin{macrocode} - \glossarystyle{altsuperragged4col}% + \setglossarystyle{altsuperragged4col}% % \end{macrocode} % Put the glossary in a \env{supertabular} environment with % four columns and a header bordered by horizontal lines and @@ -14649,7 +17167,7 @@ false,nolabel,autolabel}[nolabel]{% % that have a tree-like structure. These are designed for % hierarchical glossaries. % \begin{macrocode} -\ProvidesPackage{glossary-tree}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-tree}[2013/11/14 v4.0 (NLCT)] % \end{macrocode} % %\begin{style}{index} @@ -14671,7 +17189,10 @@ false,nolabel,autolabel}[nolabel]{% {\setlength{\parindent}{0pt}% \setlength{\parskip}{0pt plus 0.3pt}% \let\item\@idxitem}% - {}% +% \end{macrocode} +%\changes{3.08a}{2013-09-28}{added paragraph break at end of environment} +% \begin{macrocode} + {\par}% % \end{macrocode} % Do nothing at the start of the environment: % \begin{macrocode} @@ -14684,23 +17205,23 @@ false,nolabel,autolabel}[nolabel]{% % Main (level 0) entry starts a new item with the name in bold % followed by the symbol in brackets (if it exists), the description % and the page list. +%\changes{3.08a}{2013-09-28}{updated to use \cs{glossentry} and +%\cs{subglossentry}} % \begin{macrocode} -\renewcommand*{\glossaryentryfield}[5]{% -\item\glsentryitem{##1}\textbf{\glstarget{##1}{##2}}% - \ifx\relax##4\relax - \else - \space(##4)% - \fi - \space ##3\glspostdescription \space ##5}% + \renewcommand*{\glossentry}[2]{% + \item\glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}% + \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}% + \space \glossentrydesc{##1}\glspostdescription\space ##2% + }% % \end{macrocode} % Sub entries: level 1 entries use \ics{subitem}, levels greater % than~1 use \ics{subsubitem}. The level ("##1") shouldn't be 0, -% as that's catered by \cs{glossaryentryfield}, but for completeness, +% as that's catered by \cs{glossentry}, but for completeness, % if the level is 0, \ics{item} is used. The name is put in bold, % followed by the symbol in brackets (if it exists), the description % and the page list. % \begin{macrocode} - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% \ifcase##1\relax % level 0 \item @@ -14712,12 +17233,10 @@ false,nolabel,autolabel}[nolabel]{% % all other levels \subsubitem \fi - \textbf{\glstarget{##2}{##3}}% - \ifx\relax##5\relax - \else - \space(##5)% - \fi - \space##4\glspostdescription\space ##6}% + \textbf{\glstarget{##2}{\glossentryname{##2}}}% + \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}% + \space\glossentrydesc{##2}\glspostdescription\space ##3% + }% % \end{macrocode} % Vertical gap between groups is the same as that used by indices: %\changes{3.03}{2012/09/21}{added check for glsnogroupskip} @@ -14734,7 +17253,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{index} style: % \begin{macrocode} - \glossarystyle{index}% + \setglossarystyle{index}% % \end{macrocode} % Add a heading for each group. This puts the group's title in % bold followed by a vertical gap. @@ -14753,7 +17272,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{index} style: % \begin{macrocode} - \glossarystyle{index}% + \setglossarystyle{index}% % \end{macrocode} % Put navigation links to the groups at the start of the glossary: % \begin{macrocode} @@ -14794,34 +17313,32 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Main (level 0) entries: name in bold, followed by symbol in % brackets (if it exists), the description and the page list: +%\changes{3.08a}{2013-09-28}{updated to use \cs{glossentry} and +%\cs{subglossentry}} % \begin{macrocode} - \renewcommand{\glossaryentryfield}[5]{% + \renewcommand{\glossentry}[2]{% \hangindent0pt\relax \parindent0pt\relax - \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}% - \ifx\relax##4\relax - \else - \space(##4)% - \fi - \space ##3\glspostdescription \space ##5\par}% + \glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}% + \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}% + \space\glossentrydesc{##1}\glspostdescription\space##2\par + }% % \end{macrocode} % Sub entries: level \meta{n} is indented by \meta{n} times % \ics{glstreeindent}. The name is in bold, followed by the % symbol in brackets (if it exists), the description and the % page list. % \begin{macrocode} - \renewcommand{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% \hangindent##1\glstreeindent\relax \parindent##1\glstreeindent\relax \ifnum##1=1\relax \glssubentryitem{##2}% \fi - \textbf{\glstarget{##2}{##3}}% - \ifx\relax##5\relax - \else - \space(##5)% - \fi - \space##4\glspostdescription\space ##6\par}% + \textbf{\glstarget{##2}{\glossentryname{##2}}}% + \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}% + \space\glossentrydesc{##2}\glspostdescription\space ##3\par + }% % \end{macrocode} % Vertical gap between groups is the same as that used by % indices: @@ -14839,7 +17356,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{tree} style: % \begin{macrocode} - \glossarystyle{tree}% + \setglossarystyle{tree}% % \end{macrocode} % Each group has a heading (in bold) followed by a vertical gap): % \begin{macrocode} @@ -14858,7 +17375,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{tree} style: % \begin{macrocode} - \glossarystyle{tree}% + \setglossarystyle{tree}% % \end{macrocode} % Put navigation links to the groups at the start of the % \env{theglossary} environment: @@ -14906,34 +17423,33 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % No group headings: % \begin{macrocode} -\renewcommand*{\glsgroupheading}[1]{}% + \renewcommand*{\glsgroupheading}[1]{}% % \end{macrocode} % Main (level 0) entries: the name is in bold, followed by the % symbol in brackets (if it exists), the description and the % page list. % \begin{macrocode} - \renewcommand{\glossaryentryfield}[5]{% + \renewcommand{\glossentry}[2]{% \hangindent0pt\relax \parindent0pt\relax - \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}% - \ifx\relax##4\relax - \else - \space(##4)% - \fi - \space ##3\glspostdescription \space ##5\par}% + \glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}% + \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}% + \space\glossentrydesc{##1}\glspostdescription\space##2\par + }% % \end{macrocode} % Sub entries: level \meta{n} is indented by \meta{n} times % \ics{glstreeindent}. The name and symbol are omitted. The % description followed by the page list are displayed. % \begin{macrocode} - \renewcommand{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% \hangindent##1\glstreeindent\relax \parindent##1\glstreeindent\relax \ifnum##1=1\relax \glssubentryitem{##2}% \fi \glstarget{##2}{\strut}% - ##4\glspostdescription\space ##6\par}% + \glossentrydesc{##2}\glspostdescription\space##3\par + }% % \end{macrocode} % Vertical gap between groups is the same as that used by indices: %\changes{3.03}{2012/09/21}{added check for glsnogroupskip} @@ -14951,7 +17467,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{treenoname} style: % \begin{macrocode} - \glossarystyle{treenoname}% + \setglossarystyle{treenoname}% % \end{macrocode} % Give each group a heading: % \begin{macrocode} @@ -14970,7 +17486,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{treenoname} style: % \begin{macrocode} - \glossarystyle{treenoname}% + \setglossarystyle{treenoname}% % \end{macrocode} % Put navigation links to the groups at the start of the % \env{theglossary} environment: @@ -15029,8 +17545,10 @@ false,nolabel,autolabel}[nolabel]{% \renewcommand*{\glsgroupheading}[1]{}% % \end{macrocode} % Redefine the way that the level~0 entries are displayed. +%\changes{3.08a}{2013-09-28}{updated to use \cs{glossentry} and +%\cs{subglossentry}} % \begin{macrocode} - \renewcommand{\glossaryentryfield}[5]{% + \renewcommand{\glossentry}[2]{% % \end{macrocode} % If the level hasn't changed, keep the same settings, otherwise % change \cs{glstreeindent} accordingly. @@ -15052,20 +17570,17 @@ false,nolabel,autolabel}[nolabel]{% % Put the name to the left of the paragraph block. % \begin{macrocode} \makebox[0pt][r]{\makebox[\glstreeindent][l]{% - \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}}}% + \glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}}}% % \end{macrocode} % If the symbol is missing, ignore it, otherwise put it in % brackets. % \begin{macrocode} - \ifx\relax##4\relax - \else - (##4)\space - \fi + \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}% % \end{macrocode} % Do the description followed by the description terminator and % location list. % \begin{macrocode} - ##3\glspostdescription \space ##5\par + \glossentrydesc{##1}\glspostdescription \space ##2\par % \end{macrocode} % Set the previous level to 0. % \begin{macrocode} @@ -15074,7 +17589,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Redefine the way sub-entries are displayed. % \begin{macrocode} - \renewcommand{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% % \end{macrocode} % Increment and display the sub-entry counter if this is a level~1 % entry and the sub-entry counter is in use. @@ -15136,20 +17651,17 @@ false,nolabel,autolabel}[nolabel]{% % Put the name to the left of the paragraph block % \begin{macrocode} \makebox[0pt][r]{\makebox[\gls@tmplen][l]{% - \textbf{\glstarget{##2}{##3}}}}% + \textbf{\glstarget{##2}{\glossentryname{##2}}}}}% % \end{macrocode} % If the symbol is missing, ignore it, otherwise put it in % brackets. % \begin{macrocode} - \ifx##5\relax\relax - \else - (##5)\space - \fi + \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}% % \end{macrocode} % Do the description followed by the description terminator and % location list. % \begin{macrocode} - ##4\glspostdescription\space ##6\par + \glossentrydesc{##2}\glspostdescription\space ##3\par % \end{macrocode} % Set the previous level macro to the current level. % \begin{macrocode} @@ -15172,7 +17684,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{alttree} style: % \begin{macrocode} - \glossarystyle{alttree}% + \setglossarystyle{alttree}% % \end{macrocode} % Give each group a heading. % \begin{macrocode} @@ -15194,7 +17706,7 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} % Base it on the glostyle{alttree} style: % \begin{macrocode} - \glossarystyle{alttree}% + \setglossarystyle{alttree}% % \end{macrocode} % Put the navigation links in the header % \begin{macrocode} @@ -15589,6 +18101,806 @@ false,nolabel,autolabel}[nolabel]{% %\fi %\iffalse % \begin{macrocode} +%<*glossaries-compatible-307.sty> +% \end{macrocode} +%\fi +% Compatibility macros. +% \begin{macrocode} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{glossaries-compatible-307}[2013/11/14 v4.0 (NLCT)] +% \end{macrocode} +% +% Compatibility macros for predefined glossary styles: +%\begin{macro}{\compatglossarystyle} +% Defines a compatibility glossary style. +% \begin{macrocode} +\newcommand{\compatglossarystyle}[2]{% + \ifcsundef{@glscompstyle@#1}% + {% + \csdef{@glscompstyle@#1}{#2}% + }% + {% + \PackageError{glossaries}{Glossary compatibility style `#1' is already defined}{}% + }% +} +% \end{macrocode} +%\end{macro} +% Backward compatible \glostyle{inline} style. +% \begin{macrocode} +\compatglossarystyle{inline}{% + \renewcommand{\glossaryentryfield}[5]{% + \glsinlinedopostchild + \gls@inlinesep + \def\glo@desc{##3}% + \def\@no@post@desc{\nopostdesc}% + \glsentryitem{##1}\glsinlinenameformat{##1}{##2}% + \ifx\glo@desc\@no@post@desc + \glsinlineemptydescformat{##4}{##5}% + \else + \ifstrempty{##3}% + {\glsinlineemptydescformat{##4}{##5}}% + {\glsinlinedescformat{##3}{##4}{##5}}% + \fi + \ifglshaschildren{##1}% + {% + \glsresetsubentrycounter + \glsinlineparentchildseparator + \def\gls@inlinesubsep{}% + \def\gls@inlinepostchild{\glsinlinepostchild}% + }% + {}% + \def\gls@inlinesep{\glsinlineseparator}% + }% +% \end{macrocode} +% Sub-entries display description: +% \begin{macrocode} + \renewcommand{\glossarysubentryfield}[6]{% + \gls@inlinesubsep% + \glsinlinesubnameformat{##2}{##3}% + \glssubentryitem{##2}\glsinlinesubdescformat{##4}{##5}{##6}% + \def\gls@inlinesubsep{\glsinlinesubseparator}% + }% +} +% \end{macrocode} +% Backward compatible \glostyle{list} style. +% \begin{macrocode} +\compatglossarystyle{list}{% + \renewcommand*{\glossaryentryfield}[5]{% + \item[\glsentryitem{##1}\glstarget{##1}{##2}] + ##3\glspostdescription\space ##5}% +% \end{macrocode} +% Sub-entries continue on the same line: +% \begin{macrocode} + \renewcommand*{\glossarysubentryfield}[6]{% + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4\glspostdescription\space ##6.}% +} +% \end{macrocode} +% Backward compatible \glostyle{listgroup} style. +% \begin{macrocode} +\compatglossarystyle{listgroup}{% + \csuse{@glscompstyle@list}% +}% +% \end{macrocode} +% Backward compatible \glostyle{listhypergroup} style. +% \begin{macrocode} +\compatglossarystyle{listhypergroup}{% + \csuse{@glscompstyle@list}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altlist} style. +% \begin{macrocode} +\compatglossarystyle{altlist}{% + \renewcommand*{\glossaryentryfield}[5]{% + \item[\glsentryitem{##1}\glstarget{##1}{##2}]% + \mbox{}\par\nobreak\@afterheading + ##3\glspostdescription\space ##5}% + \renewcommand{\glossarysubentryfield}[6]{% + \par + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4\glspostdescription\space ##6}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altlistgroup} style. +% \begin{macrocode} +\compatglossarystyle{altlistgroup}{% + \csuse{@glscompstyle@altlist}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altlisthypergroup} style. +% \begin{macrocode} +\compatglossarystyle{altlisthypergroup}{% + \csuse{@glscompstyle@altlist}% +}% +% \end{macrocode} +% Backward compatible \glostyle{listdotted} style. +% \begin{macrocode} +\compatglossarystyle{listdotted}{% + \renewcommand*{\glossaryentryfield}[5]{% + \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]{% + \glssubentryitem{##2}% + \glstarget{##2}{##3}% + \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##4}% +}% +% \end{macrocode} +% Backward compatible \glostyle{sublistdotted} style. +% \begin{macrocode} +\compatglossarystyle{sublistdotted}{% + \csuse{@glscompstyle@listdotted}% + \renewcommand*{\glossaryentryfield}[5]{% + \item[\glsentryitem{##1}\glstarget{##1}{##2}]}% +}% +% \end{macrocode} +% Backward compatible \glostyle{long} style. +% \begin{macrocode} +\compatglossarystyle{long}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}% +}% +% \end{macrocode} +% Backward compatible \glostyle{longborder} style. +% \begin{macrocode} +\compatglossarystyle{longborder}{% + \csuse{@glscompstyle@long}% +}% +% \end{macrocode} +% Backward compatible \glostyle{longheader} style. +% \begin{macrocode} +\compatglossarystyle{longheader}{% + \csuse{@glscompstyle@long}% +}% +% \end{macrocode} +% Backward compatible \glostyle{longheaderborder} style. +% \begin{macrocode} +\compatglossarystyle{longheaderborder}{% + \csuse{@glscompstyle@long}% +}% +% \end{macrocode} +% Backward compatible \glostyle{long3col} style. +% \begin{macrocode} +\compatglossarystyle{long3col}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\\}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4 & ##6\\}% +}% +% \end{macrocode} +% Backward compatible \glostyle{long3colborder} style. +% \begin{macrocode} +\compatglossarystyle{long3colborder}{% + \csuse{@glscompstyle@long3col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{long3colheader} style. +% \begin{macrocode} +\compatglossarystyle{long3colheader}{% + \csuse{@glscompstyle@long3col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{long3colheaderborder} style. +% \begin{macrocode} +\compatglossarystyle{long3colheaderborder}{% + \csuse{@glscompstyle@long3col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{long4col} style. +% \begin{macrocode} +\compatglossarystyle{long4col}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\\}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4 & ##5 & ##6\\}% +}% +% \end{macrocode} +% Backward compatible \glostyle{long4colheader} style. +% \begin{macrocode} +\compatglossarystyle{long4colheader}{% + \csuse{@glscompstyle@long4col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{long4colborder} style. +% \begin{macrocode} +\compatglossarystyle{long4colborder}{% + \csuse{@glscompstyle@long4col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{long4colheaderborder} style. +% \begin{macrocode} +\compatglossarystyle{long4colheaderborder}{% + \csuse{@glscompstyle@long4col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altlong4col} style. +% \begin{macrocode} +\compatglossarystyle{altlong4col}{% + \csuse{@glscompstyle@long4col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altlong4colheader} style. +% \begin{macrocode} +\compatglossarystyle{altlong4colheader}{% + \csuse{@glscompstyle@long4col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altlong4colborder} style. +% \begin{macrocode} +\compatglossarystyle{altlong4colborder}{% + \csuse{@glscompstyle@long4col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altlong4colheaderborder} style. +% \begin{macrocode} +\compatglossarystyle{altlong4colheaderborder}{% + \csuse{@glscompstyle@long4col}% +}% +% \end{macrocode} +% +% Backward compatible \glostyle{long} style. +% \begin{macrocode} +\compatglossarystyle{longragged}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5% + \tabularnewline}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4\glspostdescription\space ##6% + \tabularnewline}% +}% +% \end{macrocode} +% Backward compatible \glostyle{longraggedborder} style. +% \begin{macrocode} +\compatglossarystyle{longraggedborder}{% + \csuse{@glscompstyle@longragged}% +}% +% \end{macrocode} +% Backward compatible \glostyle{longraggedheader} style. +% \begin{macrocode} +\compatglossarystyle{longraggedheader}{% + \csuse{@glscompstyle@longragged}% +}% +% \end{macrocode} +% Backward compatible \glostyle{longraggedheaderborder} style. +% \begin{macrocode} +\compatglossarystyle{longraggedheaderborder}{% + \csuse{@glscompstyle@longragged}% +}% +% \end{macrocode} +% Backward compatible \glostyle{longragged3col} style. +% \begin{macrocode} +\compatglossarystyle{longragged3col}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\tabularnewline}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4 & ##6\tabularnewline}% +}% +% \end{macrocode} +% Backward compatible \glostyle{longragged3colborder} style. +% \begin{macrocode} +\compatglossarystyle{longragged3colborder}{% + \csuse{@glscompstyle@longragged3col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{longragged3colheader} style. +% \begin{macrocode} +\compatglossarystyle{longragged3colheader}{% + \csuse{@glscompstyle@longragged3col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{longragged3colheaderborder} style. +% \begin{macrocode} +\compatglossarystyle{longragged3colheaderborder}{% + \csuse{@glscompstyle@longragged3col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altlongragged4col} style. +% \begin{macrocode} +\compatglossarystyle{altlongragged4col}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altlongragged4colheader} style. +% \begin{macrocode} +\compatglossarystyle{altlongragged4colheader}{% + \csuse{@glscompstyle@altlong4col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altlongragged4colborder} style. +% \begin{macrocode} +\compatglossarystyle{altlongragged4colborder}{% + \csuse{@glscompstyle@altlong4col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altlongragged4colheaderborder} style. +% \begin{macrocode} +\compatglossarystyle{altlongragged4colheaderborder}{% + \csuse{@glscompstyle@altlong4col}% +}% +% \end{macrocode} +% +% Backward compatible \glostyle{index} style. +% \begin{macrocode} +\compatglossarystyle{index}{% + \renewcommand*{\glossaryentryfield}[5]{% + \item\glsentryitem{##1}\textbf{\glstarget{##1}{##2}}% + \ifx\relax##4\relax + \else + \space(##4)% + \fi + \space ##3\glspostdescription \space ##5}% + \renewcommand*{\glossarysubentryfield}[6]{% + \ifcase##1\relax + % level 0 + \item + \or + % level 1 + \subitem + \glssubentryitem{##2}% + \else + % all other levels + \subsubitem + \fi + \textbf{\glstarget{##2}{##3}}% + \ifx\relax##5\relax + \else + \space(##5)% + \fi + \space##4\glspostdescription\space ##6}% +}% +% \end{macrocode} +% Backward compatible \glostyle{indexgroup} style. +% \begin{macrocode} +\compatglossarystyle{indexgroup}{% + \csuse{@glscompstyle@index}% +}% +% \end{macrocode} +% Backward compatible \glostyle{indexhypergroup} style. +% \begin{macrocode} +\compatglossarystyle{indexhypergroup}{% + \csuse{@glscompstyle@index}% +}% +% \end{macrocode} +% Backward compatible \glostyle{tree} style. +% \begin{macrocode} +\compatglossarystyle{tree}{% + \renewcommand{\glossaryentryfield}[5]{% + \hangindent0pt\relax + \parindent0pt\relax + \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}% + \ifx\relax##4\relax + \else + \space(##4)% + \fi + \space ##3\glspostdescription \space ##5\par}% + \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 + \space(##5)% + \fi + \space##4\glspostdescription\space ##6\par}% +}% +% \end{macrocode} +% Backward compatible \glostyle{treegroup} style. +% \begin{macrocode} +\compatglossarystyle{treegroup}{% + \csuse{@glscompstyle@tree}% +}% +% \end{macrocode} +% Backward compatible \glostyle{treehypergroup} style. +% \begin{macrocode} +\compatglossarystyle{treehypergroup}{% + \csuse{@glscompstyle@tree}% +}% +% \end{macrocode} +% Backward compatible \glostyle{treenoname} style. +% \begin{macrocode} +\compatglossarystyle{treenoname}{% + \renewcommand{\glossaryentryfield}[5]{% + \hangindent0pt\relax + \parindent0pt\relax + \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}% + \ifx\relax##4\relax + \else + \space(##4)% + \fi + \space ##3\glspostdescription \space ##5\par}% + \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}% +}% +% \end{macrocode} +% Backward compatible \glostyle{treenonamegroup} style. +% \begin{macrocode} +\compatglossarystyle{treenonamegroup}{% + \csuse{@glscompstyle@treenoname}% +}% +% \end{macrocode} +% Backward compatible \glostyle{treenonamehypergroup} style. +% \begin{macrocode} +\compatglossarystyle{treenonamehypergroup}{% + \csuse{@glscompstyle@treenoname}% +}% +% \end{macrocode} +% Backward compatible \glostyle{alttree} style. +% \begin{macrocode} +\compatglossarystyle{alttree}{% + \renewcommand{\glossaryentryfield}[5]{% + \ifnum\@gls@prevlevel=0\relax + \else + \settowidth{\glstreeindent}{\textbf{\@glswidestname\space}}% + \hangindent\glstreeindent + \parindent\glstreeindent + \fi + \makebox[0pt][r]{\makebox[\glstreeindent][l]{% + \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}}}% + \ifx\relax##4\relax + \else + (##4)\space + \fi + ##3\glspostdescription \space ##5\par + \def\@gls@prevlevel{0}% + }% + \renewcommand{\glossarysubentryfield}[6]{% + \ifnum##1=1\relax + \glssubentryitem{##2}% + \fi + \ifnum\@gls@prevlevel=##1\relax + \else + \@ifundefined{@glswidestname\romannumeral##1}{% + \settowidth{\gls@tmplen}{\textbf{\@glswidestname\space}}}{% + \settowidth{\gls@tmplen}{\textbf{% + \csname @glswidestname\romannumeral##1\endcsname\space}}}% + \ifnum\@gls@prevlevel<##1\relax + \setlength\glstreeindent\gls@tmplen + \addtolength\glstreeindent\parindent + \parindent\glstreeindent + \else + \@ifundefined{@glswidestname\romannumeral\@gls@prevlevel}{% + \settowidth{\glstreeindent}{\textbf{% + \@glswidestname\space}}}{% + \settowidth{\glstreeindent}{\textbf{% + \csname @glswidestname\romannumeral\@gls@prevlevel + \endcsname\space}}}% + \addtolength\parindent{-\glstreeindent}% + \setlength\glstreeindent\parindent + \fi + \fi + \hangindent\glstreeindent + \makebox[0pt][r]{\makebox[\gls@tmplen][l]{% + \textbf{\glstarget{##2}{##3}}}}% + \ifx##5\relax\relax + \else + (##5)\space + \fi + ##4\glspostdescription\space ##6\par + \def\@gls@prevlevel{##1}% + }% +}% +% \end{macrocode} +% Backward compatible \glostyle{alttreegroup} style. +% \begin{macrocode} +\compatglossarystyle{alttreegroup}{% + \csuse{@glscompstyle@alttree}% +}% +% \end{macrocode} +% Backward compatible \glostyle{alttreehypergroup} style. +% \begin{macrocode} +\compatglossarystyle{alttreehypergroup}{% + \csuse{@glscompstyle@alttree}% +}% +% \end{macrocode} +% +% Backward compatible \glostyle{mcolindex} style. +% \begin{macrocode} +\compatglossarystyle{mcolindex}{% + \csuse{@glscompstyle@index}% +}% +% \end{macrocode} +% Backward compatible \glostyle{mcolindexgroup} style. +% \begin{macrocode} +\compatglossarystyle{mcolindexgroup}{% + \csuse{@glscompstyle@index}% +}% +% \end{macrocode} +% Backward compatible \glostyle{mcolindexhypergroup} style. +% \begin{macrocode} +\compatglossarystyle{mcolindexhypergroup}{% + \csuse{@glscompstyle@index}% +}% +% \end{macrocode} +% Backward compatible \glostyle{mcoltree} style. +% \begin{macrocode} +\compatglossarystyle{mcoltree}{% + \csuse{@glscompstyle@tree}% +}% +% \end{macrocode} +% Backward compatible \glostyle{mcoltreegroup} style. +% \begin{macrocode} +\compatglossarystyle{mcolindextreegroup}{% + \csuse{@glscompstyle@tree}% +}% +% \end{macrocode} +% Backward compatible \glostyle{mcoltreehypergroup} style. +% \begin{macrocode} +\compatglossarystyle{mcolindextreehypergroup}{% + \csuse{@glscompstyle@tree}% +}% +% \end{macrocode} +% Backward compatible \glostyle{mcoltreenoname} style. +% \begin{macrocode} +\compatglossarystyle{mcoltreenoname}{% + \csuse{@glscompstyle@tree}% +}% +% \end{macrocode} +% Backward compatible \glostyle{mcoltreenonamegroup} style. +% \begin{macrocode} +\compatglossarystyle{mcoltreenonamegroup}{% + \csuse{@glscompstyle@tree}% +}% +% \end{macrocode} +% Backward compatible \glostyle{mcoltreenonamehypergroup} style. +% \begin{macrocode} +\compatglossarystyle{mcoltreenonamehypergroup}{% + \csuse{@glscompstyle@tree}% +}% +% \end{macrocode} +% Backward compatible \glostyle{mcolalttree} style. +% \begin{macrocode} +\compatglossarystyle{mcolalttree}{% + \csuse{@glscompstyle@alttree}% +}% +% \end{macrocode} +% Backward compatible \glostyle{mcolalttreegroup} style. +% \begin{macrocode} +\compatglossarystyle{mcolalttreegroup}{% + \csuse{@glscompstyle@alttree}% +}% +% \end{macrocode} +% Backward compatible \glostyle{mcolalttreehypergroup} style. +% \begin{macrocode} +\compatglossarystyle{mcolalttreehypergroup}{% + \csuse{@glscompstyle@alttree}% +}% +% \end{macrocode} + +% Backward compatible \glostyle{superragged} style. +% \begin{macrocode} +\compatglossarystyle{superragged}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5% + \tabularnewline}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4\glspostdescription\space ##6% + \tabularnewline}% +}% +% \end{macrocode} +% Backward compatible \glostyle{superraggedborder} style. +% \begin{macrocode} +\compatglossarystyle{superraggedborder}{% + \csuse{@glscompstyle@superragged}% +}% +% \end{macrocode} +% Backward compatible \glostyle{superraggedheader} style. +% \begin{macrocode} +\compatglossarystyle{superraggedheader}{% + \csuse{@glscompstyle@superragged}% +}% +% \end{macrocode} +% Backward compatible \glostyle{superraggedheaderborder} style. +% \begin{macrocode} +\compatglossarystyle{superraggedheaderborder}{% + \csuse{@glscompstyle@superragged}% +}% +% \end{macrocode} +% Backward compatible \glostyle{superragged3col} style. +% \begin{macrocode} +\compatglossarystyle{superragged3col}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\tabularnewline}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4 & ##6\tabularnewline}% +}% +% \end{macrocode} +% Backward compatible \glostyle{superragged3colborder} style. +% \begin{macrocode} +\compatglossarystyle{superragged3colborder}{% + \csuse{@glscompstyle@superragged3col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{superragged3colheader} style. +% \begin{macrocode} +\compatglossarystyle{superragged3colheader}{% + \csuse{@glscompstyle@superragged3col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{superragged3colheaderborder} style. +% \begin{macrocode} +\compatglossarystyle{superragged3colheaderborder}{% + \csuse{@glscompstyle@superragged3col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altsuperragged4col} style. +% \begin{macrocode} +\compatglossarystyle{altsuperragged4col}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altsuperragged4colheader} style. +% \begin{macrocode} +\compatglossarystyle{altsuperragged4colheader}{% + \csuse{@glscompstyle@altsuperragged4col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altsuperragged4colborder} style. +% \begin{macrocode} +\compatglossarystyle{altsuperragged4colborder}{% + \csuse{@glscompstyle@altsuperragged4col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altsuperragged4colheaderborder} style. +% \begin{macrocode} +\compatglossarystyle{altsuperragged4colheaderborder}{% + \csuse{@glscompstyle@altsuperragged4col}% +}% +% \end{macrocode} +% +% Backward compatible \glostyle{super} style. +% \begin{macrocode} +\compatglossarystyle{super}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}% +}% +% \end{macrocode} +% Backward compatible \glostyle{superborder} style. +% \begin{macrocode} +\compatglossarystyle{superborder}{% + \csuse{@glscompstyle@super}% +}% +% \end{macrocode} +% Backward compatible \glostyle{superheader} style. +% \begin{macrocode} +\compatglossarystyle{superheader}{% + \csuse{@glscompstyle@super}% +}% +% \end{macrocode} +% Backward compatible \glostyle{superheaderborder} style. +% \begin{macrocode} +\compatglossarystyle{superheaderborder}{% + \csuse{@glscompstyle@super}% +}% +% \end{macrocode} +% Backward compatible \glostyle{super3col} style. +% \begin{macrocode} +\compatglossarystyle{super3col}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\\}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4 & ##6\\}% +}% +% \end{macrocode} +% Backward compatible \glostyle{super3colborder} style. +% \begin{macrocode} +\compatglossarystyle{super3colborder}{% + \csuse{@glscompstyle@super3col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{super3colheader} style. +% \begin{macrocode} +\compatglossarystyle{super3colheader}{% + \csuse{@glscompstyle@super3col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{super3colheaderborder} style. +% \begin{macrocode} +\compatglossarystyle{super3colheaderborder}{% + \csuse{@glscompstyle@super3col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{super4col} style. +% \begin{macrocode} +\compatglossarystyle{super4col}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\\}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4 & ##5 & ##6\\}% +}% +% \end{macrocode} +% Backward compatible \glostyle{super4colheader} style. +% \begin{macrocode} +\compatglossarystyle{super4colheader}{% + \csuse{@glscompstyle@super4col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{super4colborder} style. +% \begin{macrocode} +\compatglossarystyle{super4colborder}{% + \csuse{@glscompstyle@super4col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{super4colheaderborder} style. +% \begin{macrocode} +\compatglossarystyle{super4colheaderborder}{% + \csuse{@glscompstyle@super4col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altsuper4col} style. +% \begin{macrocode} +\compatglossarystyle{altsuper4col}{% + \csuse{@glscompstyle@super4col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altsuper4colheader} style. +% \begin{macrocode} +\compatglossarystyle{altsuper4colheader}{% + \csuse{@glscompstyle@super4col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altsuper4colborder} style. +% \begin{macrocode} +\compatglossarystyle{altsuper4colborder}{% + \csuse{@glscompstyle@super4col}% +}% +% \end{macrocode} +% Backward compatible \glostyle{altsuper4colheaderborder} style. +% \begin{macrocode} +\compatglossarystyle{altsuper4colheaderborder}{% + \csuse{@glscompstyle@super4col}% +}% +% \end{macrocode} +%\iffalse +% \begin{macrocode} +%</glossaries-compatible-307.sty> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} %<*glossaries-accsupp.sty> % \end{macrocode} %\fi @@ -15605,7 +18917,7 @@ false,nolabel,autolabel}[nolabel]{% % but will only be updated when \texttt{glossaries-accsupp.sty} is % modified. % \begin{macrocode} -\ProvidesPackage{glossaries-accsupp}[2011/04/02 v3.0 (NLCT) +\ProvidesPackage{glossaries-accsupp}[2013/11/14 v4.0 (NLCT) Experimental glossaries accessibility] % \end{macrocode} % Pass all options to \sty{glossaries}: @@ -15616,6 +18928,37 @@ false,nolabel,autolabel}[nolabel]{% % \begin{macrocode} \ProcessOptions % \end{macrocode} +% Override style compatibility macros: +% \begin{macrocode} +\newcommand*{\compatibleglossentry}[2]{% + \toks@{#2}% + \protected@edef\@do@glossentry{% + \noexpand\accsuppglossaryentryfield{#1}% + {\noexpand\glsnamefont + {\expandafter\expandonce\csname glo@#1@name\endcsname}}% + {\expandafter\expandonce\csname glo@#1@desc\endcsname}% + {\expandafter\expandonce\csname glo@#1@symbol\endcsname}% + {\the\toks@}% + }% + \@do@glossentry +} +% \end{macrocode} +% +% \begin{macrocode} +\newcommand*{\compatiblesubglossentry}[3]{% + \toks@{#3}% + \protected@edef\@do@subglossentry{% + \noexpand\accsuppglossarysubentryfield{\number#1}% + {#2}% + {\noexpand\glsnamefont + {\expandafter\expandonce\csname glo@#2@name\endcsname}}% + {\expandafter\expandonce\csname glo@#2@desc\endcsname}% + {\expandafter\expandonce\csname glo@#2@symbol\endcsname}% + {\the\toks@}% + }% + \@do@subglossentry +} +% \end{macrocode} % Required packages: % \begin{macrocode} \RequirePackage{glossaries} @@ -15738,6 +19081,25 @@ false,nolabel,autolabel}[nolabel]{% % explicitly put in the value, e.g., % "user1={\glsaccsupp{inches}{in}}". % +% Append these new keys to \cs{@gls@keymap}: +% \begin{macrocode} +\appto\@gls@keymap{,% + {access}{access},% + {textaccess}{textaccess},% + {firstaccess}{firstaccess},% + {pluralaccess}{pluralaccess},% + {firstpluralaccess}{firstpluralaccess},% + {symbolaccess}{symbolaccess},% + {symbolpluralaccess}{symbolpluralaccess},% + {descaccess}{descaccess},% + {descpluralaccess}{descpluralaccess},% + {shortaccess}{shortaccess},% + {shortpluralaccess}{shortpluralaccess},% + {longaccess}{longaccess},% + {longpluralaccess}{longpluralaccess}% +} +% \end{macrocode} +% %\begin{macro}{\@gls@noaccess} % Indicates that no replacement text has been provided. % \begin{macrocode} @@ -16152,360 +19514,237 @@ false,nolabel,autolabel}[nolabel]{% % \end{macrocode} %\end{macro} % -%\begin{macro}{\@gls@} -% Redefine \cs{@gls@} to change the way the link text is defined +%\begin{macro}{\@@gls@default@entryfmt} +% Redefine the default entry format to use accessibility information % \begin{macrocode} -\def\@gls@#1#2[#3]{% - \glsdoifexists{#2}% +\renewcommand*{\@@gls@default@entryfmt}[2]{% + \ifdefempty\glscustomtext {% - \edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Save options in \cs{@gls@link@opts} and label in \cs{@gls@link@label} -% \begin{macrocode} - \def\@gls@link@opts{#1}% - \def\@gls@link@label{#2}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}). This is no longer expanded. -% \begin{macrocode} - \ifglsused{#2}% + \glsifplural {% - \def\@glo@text{\csname gls@\@glo@type @display\endcsname - {\glstextaccessdisplay{\glsentrytext{#2}}{#2}}% - {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}% - {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}% - {#3}}% - }% - {% - \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname - {\glsfirstaccessdisplay{\glsentryfirst{#2}}{#2}}% - {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}% - {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}% - {#3}}% - }% % \end{macrocode} -% Call \cs{@gls@link}. -% If \pkgopt{footnote} package option has been used, suppress -% hyperlink for first use. +% Plural form % \begin{macrocode} - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{\@glo@text}% - }% - {% - \gls@checkisacronymlist\@glo@type - \ifthenelse{\(\boolean{@glsisacronymlist}\AND - \boolean{glsacrfootnote}\) \OR\NOT\boolean{glshyperfirst}}% - {% - \@gls@link[#1,hyper=false]{#2}{\@glo@text}% - }% + \glscapscase {% - \@gls@link[#1]{#2}{\@glo@text}% - }% - }% % \end{macrocode} -% Indicate that this entry has now been used +% Don't adjust case % \begin{macrocode} - \glsunset{#2}% - }% -} + \ifglsused\glslabel + {% % \end{macrocode} -%\end{macro} -% -%\begin{macro}{\@Gls@} +% Subsequent use % \begin{macrocode} -\def\@Gls@#1#2[#3]{% - \glsdoifexists{#2}% - {% - \edef\@glo@type{\glsentrytype{#2}}% + #2{\glspluralaccessdisplay + {\glsentryplural{\glslabel}}{\glslabel}}% + {\glsdescriptionpluralaccessdisplay + {\glsentrydescplural{\glslabel}}{\glslabel}}% + {\glssymbolpluralaccessdisplay + {\glsentrysymbolplural{\glslabel}}{\glslabel}} + {\glsinsert}% + }% + {% % \end{macrocode} -% Save options in \cs{@gls@link@opts} and label in \cs{@gls@link@label} +% First use % \begin{macrocode} - \def\@gls@link@opts{#1}% - \def\@gls@link@label{#2}% + #1{\glsfirstpluralaccessdisplay + {\glsentryfirstplural{\glslabel}}{\glslabel}}% + {\glsdescriptionpluralaccessdisplay + {\glsentrydescplural{\glslabel}}{\glslabel}}% + {\glssymbolpluralaccessdisplay + {\glsentrysymbolplural{\glslabel}}{\glslabel}}% + {\glsinsert}% + }% + }% + {% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}). The first character of the entry text is -% converted to uppercase before passing to -% \cs{gls@}\meta{type}"@display" or -% \cs{gls@}\meta{type}"@displayfirst" +% Make first letter upper case % \begin{macrocode} - \ifglsused{#2}% - {% - \def\@glo@text{\csname gls@\@glo@type @display\endcsname - {\glstextaccessdisplay{\Glsentrytext{#2}}{#2}}% - {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}% - {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}% - {#3}}% - }% - {% - \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname - {\glsfirstaccessdisplay{\Glsentryfirst{#2}}{#2}}% - {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}% - {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}% - {#3}}% - }% + \ifglsused\glslabel + {% % \end{macrocode} -% Call \cs{@gls@link}. -% If \pkgopt{footnote} package option has been used, suppress -% hyperlink for first use. +% Subsequent use. % \begin{macrocode} - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{\@glo@text}% - }% - {% - \gls@checkisacronymlist\@glo@type - \ifthenelse{\(\boolean{@glsisacronymlist}\AND - \boolean{glsacrfootnote}\) \OR\NOT\boolean{glshyperfirst}}% - {% - \@gls@link[#1,hyper=false]{#2}{\@glo@text}% - }% - {% - \@gls@link[#1]{#2}{\@glo@text}% - }% - }% + #2{\glspluralaccessdisplay + {\Glsentryplural{\glslabel}}{\glslabel}}% + {\glsdescriptionpluralaccessdisplay + {\glsentrydescplural{\glslabel}}{\glslabel}}% + {\glssymbolpluralaccessdisplay + {\glsentrysymbolplural{\glslabel}}{\glslabel}}% + {\glsinsert}% + }% + {% % \end{macrocode} -% Indicate that this entry has now been used +% First use % \begin{macrocode} - \glsunset{#2}% - }% -} + #1{\glsfirstpluralaccessdisplay + {\Glsentryfirstplural{\glslabel}}{\glslabel}}% + {\glsdescriptionpluralaccessdisplay + {\glsentrydescplural{\glslabel}}{\glslabel}}% + {\glssymbolpluralaccessdisplay + {\glsentrysymbolplural{\glslabel}}{\glslabel}}% + {\glsinsert}% + }% + }% + {% % \end{macrocode} -%\end{macro} -% -%\begin{macro}{\@GLS@} +% Make all upper case % \begin{macrocode} -\def\@GLS@#1#2[#3]{% - \glsdoifexists{#2}{% - \edef\@glo@type{\glsentrytype{#2}}% + \ifglsused\glslabel + {% % \end{macrocode} -% Save options in \cs{@gls@link@opts} and label in \cs{@gls@link@label} +% Subsequent use % \begin{macrocode} - \def\@gls@link@opts{#1}% - \def\@gls@link@label{#2}% + \MakeUppercase{% + #2{\glspluralaccessdisplay + {\glsentryplural{\glslabel}}{\glslabel}}% + {\glsdescriptionpluralaccessdisplay + {\glsentrydescplural{\glslabel}}{\glslabel}}% + {\glssymbolpluralaccessdisplay + {\glsentrysymbolplural{\glslabel}}{\glslabel}}% + {\glsinsert}}% + }% + {% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}). +% First use % \begin{macrocode} - \ifglsused{#2}% - {% - \def\@glo@text{\csname gls@\@glo@type @display\endcsname - {\glstextaccessdisplay{\glsentrytext{#2}}{#2}}% - {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}% - {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}% - {#3}}% + \MakeUppercase{% + #1{\glsfirstpluralaccessdisplay + {\glsentryfirstplural{\glslabel}}{\glslabel}}% + {\glsdescriptionpluralaccessdisplay + {\glsentrydescplural{\glslabel}}{\glslabel}}% + {\glssymbolpluralaccessdisplay + {\glsentrysymbolplural{\glslabel}}{\glslabel}}% + {\glsinsert}}% + }% + }% }% {% - \edef\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname - {\glsfirstaccessdisplay{\glsentryfirst{#2}}{#2}}% - {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}% - {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}% - {#3}}% - }% % \end{macrocode} -% Call \cs{@gls@link} -% If \pkgopt{footnote} package option has been used, suppress -% hyperlink for first use. -%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to -%checking if footnote option has been used} +% Singular form % \begin{macrocode} - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% - }% - {% - \gls@checkisacronymlist\@glo@type - \ifthenelse{\(\boolean{@glsisacronymlist}\AND - \boolean{glsacrfootnote}\) \OR\NOT\boolean{glshyperfirst}}{% - \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}% - }% + \glscapscase {% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% - }% - }% % \end{macrocode} -% Indicate that this entry has now been used +% Don't adjust case % \begin{macrocode} - \glsunset{#2}% - }% -} -% \end{macrocode} -%\end{macro} -% -%\begin{macro}{\@gls@pl@} -% \begin{macrocode} -\def\@glspl@#1#2[#3]{% - \glsdoifexists{#2}% - {% - \edef\@glo@type{\glsentrytype{#2}}% -% \end{macrocode} -% Save options in \cs{@gls@link@opts} and label in \cs{@gls@link@label} -% \begin{macrocode} - \def\@gls@link@opts{#1}% - \def\@gls@link@label{#2}% + \ifglsused\glslabel + {% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +% Subsequent use % \begin{macrocode} - \ifglsused{#2}% - {% - \def\@glo@text{\csname gls@\@glo@type @display\endcsname - {\glspluralaccessdisplay{\glsentryplural{#2}}{#2}}% - {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}% - {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}% - {#3}}% - }% - {% - \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname - {\glsfirstpluralaccessdisplay{\glsentryfirstplural{#2}}{#2}}% - {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}% - {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}% - {#3}}% - }% + #2{\glstextaccessdisplay + {\glsentrytext{\glslabel}}{\glslabel}}% + {\glsdescriptionaccessdisplay + {\glsentrydesc{\glslabel}}{\glslabel}}% + {\glssymbolaccessdisplay + {\glsentrysymbol{\glslabel}}{\glslabel}}% + {\glsinsert}% + }% + {% % \end{macrocode} -% Call \cs{@gls@link} -% If \pkgopt{footnote} package option has been used, suppress -% hyperlink for first use. -%\changes{1.16}{2008 August 27}{Test glossary type is 'acronymtype in addition to -%checking if footnote option has been used} +% First use % \begin{macrocode} - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{\@glo@text}% - }% - {% - \gls@checkisacronymlist\@glo@type - \ifthenelse{\(\boolean{@glsisacronymlist}\AND - \boolean{glsacrfootnote}\) \OR\NOT\boolean{glshyperfirst}}% - {% - \@gls@link[#1,hyper=false]{#2}{\@glo@text}% + #1{\glsfirstaccessdisplay + {\glsentryfirst{\glslabel}}{\glslabel}}% + {\glsdescriptionaccessdisplay + {\glsentrydesc{\glslabel}}{\glslabel}}% + {\glssymbolaccessdisplay + {\glsentrysymbol{\glslabel}}{\glslabel}}% + {\glsinsert}% + }% }% {% - \@gls@link[#1]{#2}{\@glo@text}% - }% - }% -% \end{macrocode} -% Indicate that this entry has now been used -% \begin{macrocode} - \glsunset{#2}% - }% -} % \end{macrocode} -%\end{macro} -% -%\begin{macro}{\@Glspl@} +% Make first letter upper case % \begin{macrocode} -\def\@Glspl@#1#2[#3]{% - \glsdoifexists{#2}% - {% - \edef\@glo@type{\glsentrytype{#2}}% + \ifglsused\glslabel + {% % \end{macrocode} -% Save options in \cs{@gls@link@opts} and label in \cs{@gls@link@label} +% Subsequent use % \begin{macrocode} - \def\@gls@link@opts{#1}% - \def\@gls@link@label{#2}% -% \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}). -% \begin{macrocode} - \ifglsused{#2}% - {% - \def\@glo@text{\csname gls@\@glo@type @display\endcsname - {\glspluralaccessdisplay{\Glsentryplural{#2}}{#2}}% - {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}% - {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}% - {#3}}% - }% - {% - \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname - {\glsfirstpluralaccessdisplay{\Glsentryfirstplural{#2}}{#2}}% - {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}% - {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}% - {#3}}% - }% + #2{\glstextaccessdisplay + {\Glsentrytext{\glslabel}}{\glslabel}}% + {\glsdescriptionaccessdisplay + {\glsentrydesc{\glslabel}}{\glslabel}}% + {\glssymbolaccessdisplay + {\glsentrysymbol{\glslabel}}{\glslabel}}% + {\glsinsert}% + }% + {% % \end{macrocode} -% Call \cs{@gls@link} -% If \pkgopt{footnote} package option has been used, suppress -% hyperlink for first use. +% First use % \begin{macrocode} - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{\@glo@text}% - }% - {% - \ifthenelse{\equal{\@glo@type}{\acronymtype}\and - \boolean{glsacrfootnote}}% - {% - \@gls@link[#1,hyper=false]{#2}{\@glo@text}% + #1{\glsfirstaccessdisplay + {\Glsentryfirst{\glslabel}}{\glslabel}}% + {\glsdescriptionaccessdisplay + {\glsentrydesc{\glslabel}}{\glslabel}}% + {\glssymbolaccessdisplay + {\glsentrysymbol{\glslabel}}{\glslabel}}% + {\glsinsert}% + }% }% {% - \@gls@link[#1]{#2}{\@glo@text}% - }% - }% % \end{macrocode} -% Indicate that this entry has now been used +% Make all upper case % \begin{macrocode} - \glsunset{#2}% - }% -} + \ifglsused\glslabel + {% % \end{macrocode} -%\end{macro} -% -%\begin{macro}{\@GLSpl@} +% Subsequent use % \begin{macrocode} -\def\@GLSpl@#1#2[#3]{% - \glsdoifexists{#2}% - {% - \edef\@glo@type{\glsentrytype{#2}}% + \MakeUppercase{% + #2{\glstextaccessdisplay + {\glsentrytext{\glslabel}}{\glslabel}}% + {\glsdescriptionaccessdisplay + {\glsentrydesc{\glslabel}}{\glslabel}}% + {\glssymbolaccessdisplay + {\glsentrysymbol{\glslabel}}{\glslabel}}% + {\glsinsert}}% + }% + {% % \end{macrocode} -% Save options in \cs{@gls@link@opts} and label in \cs{@gls@link@label} +% First use % \begin{macrocode} - \def\@gls@link@opts{#1}% - \def\@gls@link@label{#2}% + \MakeUppercase{% + #1{\glsfirstaccessdisplay + {\glsentryfirst{\glslabel}}{\glslabel}}% + {\glsdescriptionaccessdisplay + {\glsentrydesc{\glslabel}}{\glslabel}}% + {\glssymbolaccessdisplay + {\glsentrysymbol{\glslabel}}{\glslabel}}% + {\glsinsert}}% + }% + }% + }% + }% + {% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +% Custom text provided in \cs{glsdisp} % \begin{macrocode} - \ifglsused{#2}% - {% - \def\@glo@text{\csname gls@\@glo@type @display\endcsname - {\glspluralaccessdisplay{\glsentryplural{#2}}{#2}}% - {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}% - {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}% - {#3}}% - }% + \ifglsused{\glslabel}% {% - \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname - {\glsfirstpluralaccessdisplay{\glsentryfirstplural{#2}}{#2}}% - {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}% - {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}% - {#3}}% - }% % \end{macrocode} -% Call \cs{@gls@link} -% If \pkgopt{footnote} package option has been used, suppress -% hyperlink for first use. +% Subsequent use % \begin{macrocode} - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% + #2{\glscustomtext}% + {\glsdescriptionaccessdisplay + {\glsentrydesc{\glslabel}}{\glslabel}}% + {\glssymbolaccessdisplay + {\glsentrysymbol{\glslabel}}{\glslabel}}% + {\glsinsert}% }% {% - \gls@checkisacronymlist\@glo@type - \ifthenelse{\(\boolean{@glsisacronymlist}\AND - \boolean{glsacrfootnote}\)\OR\NOT\boolean{glshyperfirst}}% - {% - \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}% - }% - {% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% - }% - }% % \end{macrocode} -% Indicate that this entry has now been used +% First use % \begin{macrocode} - \glsunset{#2}% + #1{\glscustomtext}% + {\glsdescriptionaccessdisplay + {\glsentrydesc{\glslabel}}{\glslabel}}% + {\glssymbolaccessdisplay + {\glsentrysymbol{\glslabel}}{\glslabel}}% + {\glsinsert}% + }% }% } % \end{macrocode} @@ -16518,16 +19757,20 @@ false,nolabel,autolabel}[nolabel]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \def\@glo@text{% - \glsshortaccessdisplay{\glsentryshort{#2}}{#2}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@firstofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glsshortaccessdisplay{\glsentryshort{#2}}{#2}}#3% }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -16540,16 +19783,20 @@ false,nolabel,autolabel}[nolabel]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \def\@glo@text{% - \glsshortaccessdisplay{\Glsentryshort{#2}}{#2}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@secondofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glsshortaccessdisplay{\Glsentryshort{#2}}{#2}}#3% }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -16562,16 +19809,21 @@ false,nolabel,autolabel}[nolabel]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \def\@glo@text{% - \glsshortaccessdisplay{\MakeUppercase{\glsentryshort{#2}}}{#2}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@thirdofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glsshortaccessdisplay + {\MakeUppercase{\glsentryshort{#2}}}{#2}}#3% }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}{\acronymfont{\@glo@text#3}}% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -16584,16 +19836,20 @@ false,nolabel,autolabel}[nolabel]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \def\@glo@text{% - \glslongaccessdisplay{\glsentrylong{#2}}{#2}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@firstofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glslongaccessdisplay{\glsentrylong{#2}}{#2}}#3% }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}{\@glo@text#3}% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -16606,16 +19862,20 @@ false,nolabel,autolabel}[nolabel]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \def\@glo@text{% - \glslongaccessdisplay{\Glsentrylong{#2}}{#2}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@firstofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glslongaccessdisplay{\Glsentrylong{#2}}{#2}}#3% }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}{\@glo@text#3}% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} @@ -16628,47 +19888,94 @@ false,nolabel,autolabel}[nolabel]{% {% \edef\@glo@type{\glsentrytype{#2}}% % \end{macrocode} -% Determine what the link text should be (this is stored in -% \cs{@glo@text}) +%\changes{3.11a}{2013-10-15}{added \cs{glslabel}, \cs{glsifplural}, +% \cs{glscapscase}, \cs{glsinsert} and \cs{glscustomtext}} % \begin{macrocode} - \def\@glo@text{% - \glslongaccessdisplay{\MakeUppercase{\glsentrylong{#2}}}{#2}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@firstofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glslongaccessdisplay{% + \MakeUppercase{\glsentrylong{#2}}}{#2}#3}% }% % \end{macrocode} % Call \cs{@gls@link} % \begin{macrocode} - \@gls@link[#1]{#2}{\@glo@text#3}% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } % \end{macrocode} %\end{macro} % %\subsection{Displaying the Glossary} -% Entries within the glossary or list of acronyms are now formatted -% via \cs{accsuppglossaryentryfield} and +%\changes{3.08a}{2013-09-28}{removed definition of \cs{@glossaryentryfield}} +%\changes{3.08a}{2013-09-28}{removed definition of \cs{@glossarysubentryfield}} +% +% We need to redefine the way the glossary entries are formatted to +% include the accessibility support. The predefined glossary styles +% use \ics{glossentryname}, \ics{glossentrydesc} and +% \ics{glossentrysymbol}, but we need to provide compatibility with +% earlier versions in case users have defined their own styles using +% \cs{accsuppglossaryentryfield} and % \cs{accsuppglossarysubentryfield}. -%\begin{macro}{\@glossaryentryfield} +% +% Now redefine \cs{glossentryname}, \cs{glossentrydesc} and +% \cs{glossentrysymbol} etc so they use the accessibility stuff. % \begin{macrocode} -\ifglsxindy - \renewcommand*{\@glossaryentryfield}{% - \string\\accsuppglossaryentryfield} -\else - \renewcommand*{\@glossaryentryfield}{% - \string\accsuppglossaryentryfield} -\fi +\renewcommand*{\glossentryname}[1]{% + \glsdoifexists{#1}% + {% + \glsnamefont{\glsnameaccessdisplay{\glsentryname{#1}}{#1}}% + }% +} % \end{macrocode} -%\end{macro} -%\begin{macro}{\@glossarysubentryfield} +% % \begin{macrocode} -\ifglsxindy - \renewcommand*{\@glossarysubentryfield}{% - \string\\accsuppglossarysubentryfield} -\else - \renewcommand*{\@glossarysubentryfield}{% - \string\accsuppglossarysubentryfield} -\fi +\renewcommand*{\glossentryname}[1]{% + \glsdoifexists{#1}% + {% + \glsnamefont{\glsnameaccessdisplay{\Glsentryname{#1}}{#1}}% + }% +} % \end{macrocode} -%\end{macro} +% +% \begin{macrocode} +\renewcommand*{\glossentrydesc}[1]{% + \glsdoifexists{#1}% + {% + \glsdescriptionaccessdisplay{\glsentrydesc{#1}}{#1}% + }% +} +% \end{macrocode} +% +% \begin{macrocode} +\renewcommand*{\Glossentrydesc}[1]{% + \glsdoifexists{#1}% + {% + \glsdescriptionaccessdisplay{\Glsentrydesc{#1}}{#1}% + }% +} +% \end{macrocode} +% +% \begin{macrocode} +\renewcommand*{\glossentrysymbol}[1]{% + \glsdoifexists{#1}% + {% + \glssymbolaccessdisplay{\glsentrysymbol{#1}}{#1}% + }% +} +% \end{macrocode} +% +% \begin{macrocode} +\renewcommand*{\Glossentrysymbol}[1]{% + \glsdoifexists{#1}% + {% + \glssymbolaccessdisplay{\Glsentrysymbol{#1}}{#1}% + }% +} +% \end{macrocode} +% %\begin{macro}{\accsuppglossaryentryfield} % \begin{macrocode} \newcommand*{\accsuppglossaryentryfield}[5]{% @@ -16682,7 +19989,7 @@ false,nolabel,autolabel}[nolabel]{% %\begin{macro}{\accsuppglossarysubentryfield} % \begin{macrocode} \newcommand*{\accsuppglossarysubentryfield}[6]{% - \glossaryentryfield{#1}{#2}% + \glossarysubentryfield{#1}{#2}% {\glsnameaccessdisplay{#3}{#2}}% {\glsdescriptionaccessdisplay{#4}{#2}}% {\glssymbolaccessdisplay{#5}{#2}}{#6}% @@ -16993,7 +20300,7 @@ false,nolabel,autolabel}[nolabel]{% % support is required, but the \isty{translator} package is not loaded. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-babel}[2009/04/16 v1.2 (NLCT)] +\ProvidesPackage{glossaries-babel}[2013/11/14 v4.0 (NLCT)] % \end{macrocode} % English: % \begin{macrocode} @@ -17308,7 +20615,7 @@ false,nolabel,autolabel}[nolabel]{% %\subsection{Polyglossia Captions} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-polyglossia}[2009/11/09 v1.0 (NLCT)] +\ProvidesPackage{glossaries-polyglossia}[2013/11/14 v4.0 (NLCT)] % \end{macrocode} % English: % \begin{macrocode} @@ -17846,15 +21153,29 @@ false,nolabel,autolabel}[nolabel]{% % A further run through LaTeX will be required to ensure that % the table of contents is up to date if the toc option % is used. + % Alternatively, if you use arara, you can add the following + % directives in your document: + % + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + \documentclass{article} \listfiles \usepackage[colorlinks]{hyperref} - \usepackage{glossaries} % acronym will go in main glossary - %\usepackage[acronym]{glossaries} % make a separate list of acronyms + %\usepackage{glossaries} % acronym will go in main glossary + \usepackage[acronym]{glossaries} % make a separate list of acronyms \makeglossaries +\longnewglossaryentry{par}{name={par}}% +{% + A long description with a paragraph break. + + This is the next paragraph. +} + \newglossaryentry{sample}{name={sample}, description={a sample entry}} @@ -17869,6 +21190,9 @@ A \gls{sample} entry and \gls{aca}. Second use: \gls{aca}. Plurals: \glspl{sample}. Reset acronym\glsreset{aca}. First use: \glspl{aca}. Second use: \glspl{aca}. +If you want paragraph breaks in the description use +\verb|\longnewglossaryentry|, as with entry \gls{par}. + \printglossaries \end{document} % \end{macrocode} @@ -17885,6 +21209,11 @@ First use: \glspl{aca}. Second use: \glspl{aca}. %\fi %\iffalse % \begin{macrocode} + % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{article} \usepackage[colorlinks]{hyperref} @@ -17908,10 +21237,10 @@ a \gls{pear}}} \newglossaryentry{fruit}{name=fruit, description={sweet, fleshy product of plant containing seed}} -% \glssee{fruit}{pear,apple,banana} +\glssee{fruit}{pear,apple,banana} \begin{document} -%\gls{pear}, \gls{apple} and \gls{banana}. +\gls{pear}, \gls{apple} and \gls{banana}. \printglossaries @@ -17931,15 +21260,17 @@ description={sweet, fleshy product of plant containing seed}} %\iffalse % \begin{macrocode} % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{report} \usepackage[colorlinks]{hyperref} \usepackage[acronym, % create list of acronyms nomain, % don't need main glossary for this example style=tree, % need a style that displays the symbol - hyperfirst=false,% don't hyperlink first use - sanitize=none % switch off sanitization as description - % will be used in the main text + hyperfirst=false% don't hyperlink first use ]{glossaries} \makeglossaries @@ -17951,7 +21282,7 @@ description={sweet, fleshy product of plant containing seed}} % document the short form will be displayed in small caps, but in % the list of acronyms the short form is displayed in normal % capitals. To ensure this, the short form should be written in - % lower case when the acronym is defined, and \MakeUppercase is + % lower case when the acronym is defined, and \MakeTextUppercase is % used when it's displayed in the list of acronyms. % In the list of acronyms, the long form is used as the name, the @@ -17960,28 +21291,14 @@ description={sweet, fleshy product of plant containing seed}} \renewcommand*{\CustomAcronymFields}{% name={\the\glslongtok},% - symbol={\MakeUppercase{\the\glsshorttok}},% + symbol={\MakeTextUppercase{\the\glsshorttok}},% text={\textsc{\the\glsshorttok}},% plural={\textsc{\the\glsshorttok}\noexpand\acrpluralsuffix}% } \renewcommand*{\SetCustomDisplayStyle}[1]{% - % ##1 corresponds to the 'first' key - % ##2 corresponds to the 'description' key - % ##3 corresponds to the 'symbol' key - % ##4 is the inserted text given by the final optional argument to - % commands like \gls - % The short form can be obtained via \glsentryshort{\glslabel} - % The plural short form can be obtained via - % \glsentryshortplural{\glslabel} - % The long form can be obtained via \glsentrylong{\glslabel} - % The plural long form can be obtained via - % \glsentrylongplural{\glslabel} - \defglsdisplayfirst[#1]{##1##4\protect\footnote{% - \glsentrylong{\glslabel}: ##2}}% - % ##1 corresponds to the 'text' key - % the rest as above - \defglsdisplay[#1]{##1##4}% + \defglsentryfmt[#1]{\glsgenentryfmt + \ifglsused{\glslabel}{}{\footnote{\glsentrylong{\glslabel}}}}% } % Now set the custom acronym style (to override the default style) @@ -18020,6 +21337,10 @@ Sheet} %\iffalse % \begin{macrocode} % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{article} \usepackage[acronym]{glossaries} @@ -18028,11 +21349,11 @@ Sheet} \newcommand*{\newdualentry}[5][]{% \newglossaryentry{main-#2}{name={#4},% - text={#3\protect\glsadd{#2}},% + text={#3\glsadd{#2}},% description={#5},% #1 }% - \newacronym{#2}{#3\protect\glsadd{main-#2}}{#4} + \newacronym{#2}{#3\glsadd{main-#2}}{#4} } \newdualentry{svm}% label @@ -18057,12 +21378,178 @@ Sheet} %\fi %\iffalse % \begin{macrocode} +%<*sample-entryfmt.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} + % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } +\documentclass{article} + +\usepackage[colorlinks]{hyperref} +\usepackage[style=tree]{glossaries} + +\makeglossaries + +\renewcommand*{\glsentryfmt}{% + \glsgenentryfmt + \ifglsused{\glslabel}{}{\space (\glsentrysymbol{\glslabel})}% +} + +\newglossaryentry{distance}{name=distance, +description={The length between two points}, +symbol={km}} + +\begin{document} + +First use: \gls{distance}. Next use: \gls{distance}. + +\printglossaries + +\end{document} +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</sample-entryfmt.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*sample-FnDesc.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} + % This file is public domain + % If you are using arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } +\documentclass{report} + +\usepackage[colorlinks]{hyperref} +\usepackage[hyperfirst=false]{glossaries} + +\makeglossaries + +\renewcommand*{\glsentryfmt}{% + \glsgenentryfmt + \ifglsused{\glslabel}{}{\footnote{\glsentrydesc{\glslabel}}}% +} + +\newglossaryentry{sample}{name={sample},description={an example +description}} + +\begin{document} +\chapter{Sample Chapter} + +First use: \gls{sample}. + +Next use: \gls{sample}. + +\printglossaries +\end{document} +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</sample-FnDesc.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*sample-index.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} + % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } +\documentclass{report} + +\usepackage[colorlinks]{hyperref} +\usepackage[toc]{glossaries} +\usepackage{glossary-mcols} + +\newglossary[ilg]{index}{ind}{idx}{\indexname} + +\makeglossaries + +\newcommand*{\newterm}[2][]{% + \newglossaryentry{#2}{type={index},name={#2},description={\nopostdesc},#1}% +} + +% define terms for the index + +\newterm[plural={stegosauruses}]{stegosaurus} +\newterm[plural={triceratopses}]{triceratops} +\newterm[plural={apatosauruses}]{apatosaurus} + +\newterm[name={dinosaur}]{ind-dinosaur} +\newterm[name={Triassic}]{ind-triassic} + +% define terms for the main glossary + +\newglossaryentry{dinosaur}% +{% + name={dinosaur\glsadd{ind-dinosaur}},% + description={One of a group of dinosauria}% +} + +\newglossaryentry{Triassic}% +{% + name={Triassic\glsadd{ind-triassic}},% + description={The first period of the Mesozoic Era} +} + +\begin{document} +\tableofcontents + +\chapter{Dinosaurs} + +\Glspl{dinosaur} are now extinct. They first appeared during the +\gls{Triassic} period. Examples of \glspl{dinosaur} include the +\gls{triceratops}, the \gls{apatosaurus} and the \gls{stegosaurus}. + +\renewcommand*{\glsnamefont}[1]{\textbf{\makefirstuc{#1}}} + +\printglossary[style=long,nogroupskip] + +\renewcommand*{\glsnamefont}[1]{\textmd{#1}} + +\printglossary[type=index,style=mcolindexgroup] + +\end{document} +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</sample-index.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} %<*sample-inline.tex> % \end{macrocode} %\fi %\iffalse % \begin{macrocode} % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } \documentclass[a4paper]{report} \usepackage[plainpages=false,colorlinks]{hyperref} @@ -18072,7 +21559,7 @@ Sheet} \renewcommand*{\glossarysection}[2][]{\textbf{#1}: } \renewcommand{\glsnamefont}[1]{\textsc{#1}} -\glossarystyle{inline} +\setglossarystyle{inline} \makeglossaries @@ -18219,6 +21706,11 @@ There are two types of ordering: word ordering (which places %\fi %\iffalse % \begin{macrocode} + % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass[english,french]{article} \usepackage[utf8]{inputenc} @@ -18267,6 +21759,9 @@ Le \gls{fr-cat} s'est repos\'e sur la \gls{fr-mat}. %\fi %\iffalse % \begin{macrocode} + % This file is public domain + % If you want to use arara, you need the following directive: + % arara: pdflatex: { synctex: on } \documentclass{article} \usepackage{mfirstuc} @@ -18306,11 +21801,149 @@ Le \gls{fr-cat} s'est repos\'e sur la \gls{fr-mat}. %\fi %\iffalse % \begin{macrocode} +%<*sample-newkeys.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} + % This file is public domain + % If you are using arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } +\documentclass{article} + +\usepackage[colorlinks]{hyperref} +\usepackage[nopostdot,nogroupskip]{glossaries} + +\glsaddkey*% star version needed as default value needs expanding + {ed}% key + {\glsentrytext{\glslabel}ed}% default value + {\glsentryed}% command analogous to \glsentrytext + {\Glsentryed}% command analogous to \Glsentrytext + {\glsed}% command analogous to \glstext + {\Glsed}% command analogous to \Glstext + {\GLSed}% command analogous to \GLStext + +\glsaddkey* + {ing}% key + {\glsentrytext{\glslabel}ing}% default value + {\glsentrying}% command analogous to \glsentrytext + {\Glsentrying}% command analogous to \Glsentrytext + {\glsing}% command analogous to \glstext + {\Glsing}% command analogous to \Glstext + {\GLSing}% command analogous to \GLStext + + +\makeglossaries + +\newglossaryentry{jump}{name={jump},description={}} + +\newglossaryentry{run}{name={run},% + ed={ran},% + ing={running}, + description={}} + +\newglossaryentry{waddle}{name={waddle},% + ed={waddled},% + ing={waddling},% + description={}} + +\begin{document} + +This is a sample document illustrating how to add new glossary entry +keys. + +The dog \glsed{jump} over the duck. + +The duck was \glsing{waddle} round the dog. + +The dog \glsed{run} away from the duck. + +\printglossaries + +\end{document} +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</sample-newkeys.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*sample-nomathhyper.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} + % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } +\documentclass{report} + +\usepackage[colorlinks]{hyperref} +\usepackage{glossaries} + +\makeglossaries + + % switch off hyperlinks: +\glsdisablehyper + + % redefine \glsentryfmt so that it adds a hyperlink + % if not in math mode +\renewcommand*{\glsentryfmt}{% + \ifmmode + \glsgenentryfmt + \else + % Temporarily enable hyperlinks: + \glsenablehyper + \glshyperlink[\glsgenentryfmt]{\glslabel}% + % Disable hyperlinks again + \glsdisablehyper + \fi +} + +\renewcommand{\glossarypreamble}{\glsenablehyper} +\renewcommand{\glossarypostamble}{\glsdisablehyper} + + % define a sample entry: +\newglossaryentry{x}{name={x},description={sample entry}} + +\begin{document} +\chapter{Sample} +In text mode: \gls{x}. Inline maths: $\gls{x}$. Displayed +maths: +\[ + \gls{x} +\] + +Back to text mode again: \gls{x}. + +\printglossaries +\end{document} +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</sample-nomathhyper.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} %<*sample-numberlist.tex> % \end{macrocode} %\fi %\iffalse % \begin{macrocode} + % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } \documentclass{report} \usepackage[colorlinks]{hyperref} @@ -18354,12 +21987,139 @@ Here's some more information about \glspl{sample}. %\fi %\iffalse % \begin{macrocode} +%<*sample-prefix.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} + % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } + +\documentclass{article} + +\usepackage[colorlinks]{hyperref} +\usepackage[toc,acronym]{glossaries-prefix} + +\makeglossaries + +\newglossaryentry{sample}{name={sample}, + description={an example}, + prefix={a~}, + prefixplural={the\space}% +} + +\newglossaryentry{oeil}{name={oeil}, + plural={yeux}, + description={eye}, + prefix={l'}, + prefixplural={les\space}} + +\newacronym + [% + prefix={an\space},prefixfirst={a~}% + ]{svm}{SVM}{support vector machine} + +\newglossarystyle{plist}{% + \setglossarystyle{list}% + \renewcommand*{\glossentry}[2]{% + \item[\glsentryitem{##1}% + \Glsentryprefix{##1}% + \glstarget{##1}{\glossentryname{##1}}] + \glossentrydesc{##1}\glspostdescription\space ##2}% +} + +\begin{document} + +\tableofcontents + +\section{Sample} + +First use: \pgls{sample}, \pgls{svm}, \pgls{oeil}. Next use: \pgls{sample}, \pgls{svm}, \pgls{oeil}. + +Reset. \glsresetall + +First use: \pglspl{sample}, \pglspl{svm}, \pglspl{oeil}. Next use: +\pglspl{sample}, \pglspl{svm}, \pglspl{oeil}. + +Reset. \glsresetall + +First use: \Pgls{sample}, \Pgls{svm}. Next use: \Pgls{sample}, \Pgls{svm}. + +Reset. \glsresetall + +First use: \Pglspl{sample}, \Pglspl{svm}. Next use: \Pglspl{sample}, \Pglspl{svm}. + +Reset. \glsresetall + +First use: \PGLS{sample}, \PGLS{svm}. Next use: \PGLS{sample}, \PGLS{svm}. + +Reset. \glsresetall + +First use: \PGLSpl{sample}, \PGLSpl{svm}. Next use: \PGLSpl{sample}, \PGLSpl{svm}. + +\printglossary[style=plist] + +\printacronyms +\end{document} +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</sample-prefix.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%<*sample-si.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } +\documentclass{article} +\usepackage{siunitx} +\usepackage[style=long4col]{glossaries} +% +\makeglossaries +% +\newglossaryentry{ohm}{% + name=ohm, + symbol={\si{\ohm}}, + description=unit of electrical resistance% +} +% +\begin{document} +\glsaddallunused +% +\printglossaries +\end{document} +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</sample-si.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} %<*sample.tex> % \end{macrocode} %\fi %\iffalse % \begin{macrocode} % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } \documentclass[a4paper]{report} \usepackage[plainpages=false,colorlinks]{hyperref} @@ -18509,6 +22269,10 @@ There are two types of ordering: word ordering (which places %\iffalse % \begin{macrocode} % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass[a4paper]{article} \usepackage[style=long4colheaderborder]{glossaries} @@ -18548,9 +22312,15 @@ measured in kilograms. %\iffalse % \begin{macrocode} % This file is public domain -\documentclass{article} + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } +\documentclass[a4paper]{article} -\usepackage[acronym,smallcaps]{glossaries-accsupp} +\usepackage[margin=0.5in]{geometry} +\usepackage{booktabs} +\usepackage[acronym]{glossaries-accsupp} \makeglossaries @@ -18560,16 +22330,28 @@ measured in kilograms. \newacronym{eg}{e.g.}{for example} -\begin{document} -\gls{dr}~Jones. -\gls{dr}~Jones. +\newcommand*{\samplerow}[1]{% + \gls{#1} & \gls{#1} & \acrshort{#1} & \acrlong{#1}\\ + \glsreset{#1}\Gls{#1} & \Gls{#1} & \Acrshort{#1} & \Acrlong{#1}\\ + \glsreset{#1}\GLS{#1} & \GLS{#1} & \ACRshort{#1} & \ACRlong{#1}\\ +} -\Gls{eg}, \gls{eg}, \acrshort{eg}, \acrlong{eg}, \acrfull{eg}. +\begin{document} -\Acrshort{eg}, \ACRshort{eg}. \Acrlong{eg}, \ACRlong{eg}. -\Acrfull{eg}, \ACRfull{eg}. +\begin{center} +\begin{tabular}{lllll} +\toprule +\bfseries First & \bfseries Next & \bfseries Short & \bfseries Long +\\\midrule +\samplerow{dr} +\midrule +\samplerow{eg} +\midrule +\samplerow{svm} +\bottomrule +\end{tabular} +\end{center} -\gls{svm}. \gls{svm}, \acrshort{svm}, \acrlong{svm}, \acrfull{svm}. \printglossaries \end{document} @@ -18588,6 +22370,11 @@ measured in kilograms. %\iffalse % \begin{macrocode} % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } \documentclass[a4paper]{report} \usepackage[colorlinks,plainpages=false]{hyperref} @@ -18683,6 +22470,11 @@ You don't need to worry about makeindex's special characters: %\iffalse % \begin{macrocode} % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } \documentclass[a4paper]{report} \usepackage[colorlinks,plainpages=false]{hyperref} @@ -18766,6 +22558,10 @@ one \gls[format=hyperbf]{svm}. %\iffalse % \begin{macrocode} % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{article} \usepackage[acronym,footnote,acronymlists={main,acronym2}]{glossaries} @@ -18815,6 +22611,10 @@ one \gls[format=hyperbf]{svm}. %\iffalse % \begin{macrocode} % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{article} \usepackage[colorlinks,plainpages=false]{hyperref} @@ -18851,13 +22651,18 @@ one \gls[format=hyperbf]{svm}. % This file is public domain % % See also sampleAcrDesc.tex + % + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } \documentclass[a4paper]{report} \usepackage[colorlinks,plainpages=false]{hyperref} \usepackage[style=altlist, % use altlist style - toc, % add the glossary to the table of contents - sanitize={description=false}% don't sanitize description + toc % add the glossary to the table of contents ]{glossaries} \makeglossaries @@ -18866,10 +22671,8 @@ one \gls[format=hyperbf]{svm}. % how the entry name should appear in the glossary name={Support vector machine (SVM)}, % how the description should appear in the glossary - % since I have used sanitize={description=false} - % I have to protect fragile commands description={Statistical pattern recognition -technique~\protect\cite{svm}}, +technique~\cite{svm}}, % how the entry should appear in the document text text={svm}, % how the entry should appear the first time it is @@ -18935,7 +22738,7 @@ one \gls[format=hyperbf]{svm}. \usepackage{amsmath} \usepackage[colorlinks]{hyperref} -\usepackage[toc,ucmark,style=long3colheader,counter=equation]{glossaries} +\usepackage[xindy,toc,ucmark,style=long3colheader,counter=equation]{glossaries} \makeglossaries @@ -19199,6 +23002,13 @@ Bessel functions $Z_\nu$ are solutions of % (Note that this problem is avoided if the page numbering is % reset after the glossary. For example, if the glossary has % roman numbering and the subsequent pages have arabic numbering) + % + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass[a4paper,12pt]{report} \usepackage{amsmath} @@ -19486,11 +23296,16 @@ Bessel functions $Z_\nu(z)$ are solutions of %\iffalse % \begin{macrocode} % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } \documentclass{report} \usepackage[plainpages=false,colorlinks]{hyperref} \usepackage{html} -\usepackage[toc,savewrites,xindy]{glossaries} +\usepackage[toc,xindy]{glossaries} % Define a new glossary type called notation \newglossary[nlg]{notation}{not}{ntn}{Notation} @@ -19577,12 +23392,88 @@ The factorial symbol: \gls{not:fact}. %\fi %\iffalse % \begin{macrocode} +%<*samplePeople.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} + % This file is public domain + % If you are using arara, you need the following directives: + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } +\documentclass{report} + +\usepackage[colorlinks]{hyperref} +\usepackage[toc]{glossaries} + +\makeglossaries + +\newcommand{\sortname}[2]{#2, #1} +\newcommand{\textname}[2]{#1 #2} + + % Syntax: \name{first name}{surname} + \let\name\textname + +\renewcommand{\glsprestandardsort}[3]{% + \let\name\sortname + \edef#1{\expandafter\expandonce\expandafter{#1}}% + \let\name\textname + \glsdosanitizesort +} + +\newglossaryentry{joebloggs}{name={\name{Joe}{Bloggs}},description={\nopostdesc}} + +\newglossaryentry{johnsmith}{name={\name{John}{Smith}},description={\nopostdesc}} + +\newglossaryentry{zoeadams}{name={\name{Zo\'e}{Adams}},description={\nopostdesc}} + +\newglossaryentry{maryadams}{name={\name{Mary}{Adams}},description={\nopostdesc}} + +\begin{document} +\tableofcontents + +\chapter{\glsentrytext{joebloggs}} + +\gls{joebloggs} was a fairly ordinary person. + +\chapter{\glsentrytext{johnsmith}} + +\gls{johnsmith} was great friends with \gls{joebloggs}. + +\chapter{\glsentrytext{maryadams}} + +\gls{maryadams} worked with \gls{johnsmith} but never met +\gls{joebloggs}. + +\chapter{\glsentrytext{zoeadams}} + +\gls{zoeadams} was \gls{maryadams}['s] sister. +\printglossaries + +\end{document} +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</samplePeople.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} %<*sampleSec.tex> % \end{macrocode} %\fi %\iffalse % \begin{macrocode} % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } \documentclass{report} \usepackage[plainpages=false,colorlinks]{hyperref} @@ -19650,12 +23541,132 @@ Another \gls{ident} entry. %\fi %\iffalse % \begin{macrocode} +%<*sampleSort.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} + % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } + % arara: pdflatex: { synctex: on } +\documentclass{report} + +\usepackage[plainpages=false,colorlinks]{hyperref} +\usepackage[toc,acronym]{glossaries} + + % Define a new glossary type called notation +\newglossary[nlg]{notation}{not}{ntn}{Notation} + +\makeglossaries + +\newcounter{sortcount} + +\renewcommand{\glsprestandardsort}[3]{% + \ifdefstring{#2}{notation}% + {% + \stepcounter{sortcount}% + \edef#1{\glssortnumberfmt{\arabic{sortcount}}}% + }% + {% + \glsdosanitizesort + }% +} + + % Notation definitions + +\newglossaryentry{not:set}{type=notation, % glossary type +name={$\mathcal{S}$}, +text={\mathcal{S}}, +description={A set}} + +\newglossaryentry{not:emptyset}{type=notation, +name={$\emptyset$}, +text={\emptyset}, +description={The empty set}} + +\newglossaryentry{not:card}{type=notation, +name={$|\mathcal{S}|$}, +text={|\mathcal{S}|}, +description={cardinality of $\mathcal{S}$}} + + % Main glossary definitions + +\newglossaryentry{gls:set}{name=set, +description={A collection of distinct objects}} + +\newglossaryentry{gls:card}{name=cardinality, +description={The number of elements in the specified set}} + + % Acronym definitions + +\newacronym{zfc}{ZFC}{Zermelo-Fraenkel set theory} + +\newacronym{ad}{AD}{axiom of determinacy} + +\newacronym{nf}{NF}{new foundations} + +\begin{document} +\title{Sample Document using the glossaries Package} +\author{Nicola Talbot} +\pagenumbering{alph} +\maketitle + +\begin{abstract} + %stop hyperref complaining about duplicate page identifiers: +\pagenumbering{Alph} +This is a sample document illustrating the use of the +\textsf{glossaries} package. In this example, a new glossary type +called \texttt{notation} is defined, so that the document can have a +separate glossary of terms, list of acronyms and index of notation. +\end{abstract} + + +\pagenumbering{roman} +\tableofcontents + +\printglossaries + +\chapter{Introduction} +\pagenumbering{arabic} + +\Glspl{gls:set} are denoted by a calligraphic font +e.g.\ $\gls{not:set}$. + +The \gls{gls:card} of a set $\mathcal{S}$ is denoted +$\gls{not:card}$. The empty set is denoted +$\gls{not:emptyset}$. + +Here are some acronyms: \gls{nf}, \gls{zfc} and \gls{ad}. + +\chapter{Another Chapter} + +Another mention of the empty set $\gls{not:emptyset}$. + +Here are the acronyms again: \gls{nf}, \gls{zfc} and \gls{ad}. + +\end{document} +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</sampleSort.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} %<*sampletree.tex> % \end{macrocode} %\fi %\iffalse % \begin{macrocode} % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{report} \usepackage[colorlinks]{hyperref} @@ -19735,6 +23746,10 @@ The letter \gls{C} represents Euler's constant. %\iffalse % \begin{macrocode} % This file is public domain + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{article} \usepackage[utf8]{inputenc} @@ -19743,9 +23758,9 @@ The letter \gls{C} represents Euler's constant. \makeglossaries -% Note that because the é is the first letter of the -% name, it needs to be grouped or it will cause a -% problem for \makefirstuc due to expansion issues. + % Note that because the é is the first letter of the + % name, it needs to be grouped or it will cause a + % problem for \makefirstuc due to expansion issues. \newglossaryentry{elite}{name={{é}lite}, description={select group or class}} @@ -19758,8 +23773,8 @@ description=large deer} \newglossaryentry{mannerly}{name=mannerly, description=polite} -% The Å“ is not the first letter, so it doesn't need to -% be grouped. + % The Å“ is not the first letter, so it doesn't need to + % be grouped. \newglossaryentry{manoeuvre}{name={manÅ“uvre}, description=planned and controlled movement} @@ -19777,7 +23792,6 @@ description={canal from mouth to stomach}} description=man-eating giant} \begin{document} -\null % ensure that the first run produces some output \glsaddall \printglossaries @@ -20070,6 +24084,10 @@ This page discusses \gls{mcnemar} who introduced % % xindy -L english -C utf8 -I xindy -M samplexdy -t samplexdy.glg -o samplexdy.gls samplexdy.glo % + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{article} \usepackage[utf8]{inputenc} @@ -20332,6 +24350,10 @@ This page discusses \gls{mcnemar} who introduced % % This sample file won't work with makeindex % + % If you want to use arara, you need the following directives: + % arara: pdflatex: { synctex: on } + % arara: makeglossaries + % arara: pdflatex: { synctex: on } \documentclass{report} \usepackage[utf8]{inputenc} @@ -20372,6 +24394,7 @@ the glossaries package. \part{First Part} \chapter{Sample Chapter} +This example document has an eccentric section numbering system. \section{First Section} diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins index d374e0f50cd..c337a6f6a95 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.ins +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.ins @@ -1,4 +1,4 @@ -% glossaries.ins generated using makedtx version 0.94b 2013/7/5 21:47 +% glossaries.ins generated using makedtx version 1.1 2013/11/14 14:05 \input docstrip \preamble @@ -18,7 +18,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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. + This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl. \endpreamble @@ -26,6 +26,8 @@ \generate{\file{glossaries.sty}{\usepreamble\defaultpreamble \usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries.sty,package}} +\file{glossaries-prefix.sty}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-prefix.sty,package}} \file{mfirstuc.sty}{\usepreamble\defaultpreamble \usepostamble\defaultpostamble\from{glossaries.dtx}{mfirstuc.sty,package}} \file{glossary-hypernav.sty}{\usepreamble\defaultpreamble @@ -48,6 +50,8 @@ \usepostamble\defaultpostamble\from{glossaries.dtx}{glossary-tree.sty,package}} \file{glossaries-compatible-207.sty}{\usepreamble\defaultpreamble \usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-compatible-207.sty,package}} +\file{glossaries-compatible-307.sty}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-compatible-307.sty,package}} \file{glossaries-accsupp.sty}{\usepreamble\defaultpreamble \usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-accsupp.sty,package}} \file{glossaries-babel.sty}{\usepreamble\defaultpreamble @@ -82,10 +86,17 @@ \file{sample-crossref.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-crossref.tex}} \file{sample-custom-acronym.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-custom-acronym.tex}} \file{sample-dual.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-dual.tex}} +\file{sample-entryfmt.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-entryfmt.tex}} +\file{sample-FnDesc.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-FnDesc.tex}} +\file{sample-index.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-index.tex}} \file{sample-inline.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-inline.tex}} \file{sample-langdict.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-langdict.tex}} \file{sample-mfirstuc.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-mfirstuc.tex}} +\file{sample-newkeys.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-newkeys.tex}} +\file{sample-nomathhyper.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-nomathhyper.tex}} \file{sample-numberlist.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-numberlist.tex}} +\file{sample-prefix.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-prefix.tex}} +\file{sample-si.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-si.tex}} \file{sample.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample.tex}} \file{sample4col.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample4col.tex}} \file{sampleaccsupp.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleaccsupp.tex}} @@ -97,7 +108,9 @@ \file{sampleEq.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleEq.tex}} \file{sampleEqPg.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleEqPg.tex}} \file{sampleNtn.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleNtn.tex}} +\file{samplePeople.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{samplePeople.tex}} \file{sampleSec.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleSec.tex}} +\file{sampleSort.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleSort.tex}} \file{sampletree.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampletree.tex}} \file{sampleutf8.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleutf8.tex}} \file{samplexdy-compatible207.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{samplexdy-compatible207.tex}} 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 707e3480053..1daab6e2276 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-babel}[2009/04/16 v1.2 (NLCT)] +\ProvidesPackage{glossaries-babel}[2013/11/14 v4.0 (NLCT)] \@ifundefined{captionsenglish}{}{% \addto\captionsenglish{% \renewcommand*{\glossaryname}{Glossary}% diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty index 8b55a688b2e..f98a7e05bb0 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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-307.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty new file mode 100644 index 00000000000..3d6ad8267d8 --- /dev/null +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty @@ -0,0 +1,546 @@ +%% +%% This is file `glossaries-compatible-307.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries.dtx (with options: `glossaries-compatible-307.sty,package') +%% +%% glossaries.dtx +%% Copyright 2013 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, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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-307}[2013/11/14 v4.0 (NLCT)] +\newcommand{\compatglossarystyle}[2]{% + \ifcsundef{@glscompstyle@#1}% + {% + \csdef{@glscompstyle@#1}{#2}% + }% + {% + \PackageError{glossaries}{Glossary compatibility style `#1' is already defined}{}% + }% +} +\compatglossarystyle{inline}{% + \renewcommand{\glossaryentryfield}[5]{% + \glsinlinedopostchild + \gls@inlinesep + \def\glo@desc{##3}% + \def\@no@post@desc{\nopostdesc}% + \glsentryitem{##1}\glsinlinenameformat{##1}{##2}% + \ifx\glo@desc\@no@post@desc + \glsinlineemptydescformat{##4}{##5}% + \else + \ifstrempty{##3}% + {\glsinlineemptydescformat{##4}{##5}}% + {\glsinlinedescformat{##3}{##4}{##5}}% + \fi + \ifglshaschildren{##1}% + {% + \glsresetsubentrycounter + \glsinlineparentchildseparator + \def\gls@inlinesubsep{}% + \def\gls@inlinepostchild{\glsinlinepostchild}% + }% + {}% + \def\gls@inlinesep{\glsinlineseparator}% + }% + \renewcommand{\glossarysubentryfield}[6]{% + \gls@inlinesubsep% + \glsinlinesubnameformat{##2}{##3}% + \glssubentryitem{##2}\glsinlinesubdescformat{##4}{##5}{##6}% + \def\gls@inlinesubsep{\glsinlinesubseparator}% + }% +} +\compatglossarystyle{list}{% + \renewcommand*{\glossaryentryfield}[5]{% + \item[\glsentryitem{##1}\glstarget{##1}{##2}] + ##3\glspostdescription\space ##5}% + \renewcommand*{\glossarysubentryfield}[6]{% + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4\glspostdescription\space ##6.}% +} +\compatglossarystyle{listgroup}{% + \csuse{@glscompstyle@list}% +}% +\compatglossarystyle{listhypergroup}{% + \csuse{@glscompstyle@list}% +}% +\compatglossarystyle{altlist}{% + \renewcommand*{\glossaryentryfield}[5]{% + \item[\glsentryitem{##1}\glstarget{##1}{##2}]% + \mbox{}\par\nobreak\@afterheading + ##3\glspostdescription\space ##5}% + \renewcommand{\glossarysubentryfield}[6]{% + \par + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4\glspostdescription\space ##6}% +}% +\compatglossarystyle{altlistgroup}{% + \csuse{@glscompstyle@altlist}% +}% +\compatglossarystyle{altlisthypergroup}{% + \csuse{@glscompstyle@altlist}% +}% +\compatglossarystyle{listdotted}{% + \renewcommand*{\glossaryentryfield}[5]{% + \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]{% + \glssubentryitem{##2}% + \glstarget{##2}{##3}% + \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##4}% +}% +\compatglossarystyle{sublistdotted}{% + \csuse{@glscompstyle@listdotted}% + \renewcommand*{\glossaryentryfield}[5]{% + \item[\glsentryitem{##1}\glstarget{##1}{##2}]}% +}% +\compatglossarystyle{long}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}% +}% +\compatglossarystyle{longborder}{% + \csuse{@glscompstyle@long}% +}% +\compatglossarystyle{longheader}{% + \csuse{@glscompstyle@long}% +}% +\compatglossarystyle{longheaderborder}{% + \csuse{@glscompstyle@long}% +}% +\compatglossarystyle{long3col}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\\}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4 & ##6\\}% +}% +\compatglossarystyle{long3colborder}{% + \csuse{@glscompstyle@long3col}% +}% +\compatglossarystyle{long3colheader}{% + \csuse{@glscompstyle@long3col}% +}% +\compatglossarystyle{long3colheaderborder}{% + \csuse{@glscompstyle@long3col}% +}% +\compatglossarystyle{long4col}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\\}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4 & ##5 & ##6\\}% +}% +\compatglossarystyle{long4colheader}{% + \csuse{@glscompstyle@long4col}% +}% +\compatglossarystyle{long4colborder}{% + \csuse{@glscompstyle@long4col}% +}% +\compatglossarystyle{long4colheaderborder}{% + \csuse{@glscompstyle@long4col}% +}% +\compatglossarystyle{altlong4col}{% + \csuse{@glscompstyle@long4col}% +}% +\compatglossarystyle{altlong4colheader}{% + \csuse{@glscompstyle@long4col}% +}% +\compatglossarystyle{altlong4colborder}{% + \csuse{@glscompstyle@long4col}% +}% +\compatglossarystyle{altlong4colheaderborder}{% + \csuse{@glscompstyle@long4col}% +}% +\compatglossarystyle{longragged}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5% + \tabularnewline}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4\glspostdescription\space ##6% + \tabularnewline}% +}% +\compatglossarystyle{longraggedborder}{% + \csuse{@glscompstyle@longragged}% +}% +\compatglossarystyle{longraggedheader}{% + \csuse{@glscompstyle@longragged}% +}% +\compatglossarystyle{longraggedheaderborder}{% + \csuse{@glscompstyle@longragged}% +}% +\compatglossarystyle{longragged3col}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\tabularnewline}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4 & ##6\tabularnewline}% +}% +\compatglossarystyle{longragged3colborder}{% + \csuse{@glscompstyle@longragged3col}% +}% +\compatglossarystyle{longragged3colheader}{% + \csuse{@glscompstyle@longragged3col}% +}% +\compatglossarystyle{longragged3colheaderborder}{% + \csuse{@glscompstyle@longragged3col}% +}% +\compatglossarystyle{altlongragged4col}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}% +}% +\compatglossarystyle{altlongragged4colheader}{% + \csuse{@glscompstyle@altlong4col}% +}% +\compatglossarystyle{altlongragged4colborder}{% + \csuse{@glscompstyle@altlong4col}% +}% +\compatglossarystyle{altlongragged4colheaderborder}{% + \csuse{@glscompstyle@altlong4col}% +}% +\compatglossarystyle{index}{% + \renewcommand*{\glossaryentryfield}[5]{% + \item\glsentryitem{##1}\textbf{\glstarget{##1}{##2}}% + \ifx\relax##4\relax + \else + \space(##4)% + \fi + \space ##3\glspostdescription \space ##5}% + \renewcommand*{\glossarysubentryfield}[6]{% + \ifcase##1\relax + % level 0 + \item + \or + % level 1 + \subitem + \glssubentryitem{##2}% + \else + % all other levels + \subsubitem + \fi + \textbf{\glstarget{##2}{##3}}% + \ifx\relax##5\relax + \else + \space(##5)% + \fi + \space##4\glspostdescription\space ##6}% +}% +\compatglossarystyle{indexgroup}{% + \csuse{@glscompstyle@index}% +}% +\compatglossarystyle{indexhypergroup}{% + \csuse{@glscompstyle@index}% +}% +\compatglossarystyle{tree}{% + \renewcommand{\glossaryentryfield}[5]{% + \hangindent0pt\relax + \parindent0pt\relax + \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}% + \ifx\relax##4\relax + \else + \space(##4)% + \fi + \space ##3\glspostdescription \space ##5\par}% + \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 + \space(##5)% + \fi + \space##4\glspostdescription\space ##6\par}% +}% +\compatglossarystyle{treegroup}{% + \csuse{@glscompstyle@tree}% +}% +\compatglossarystyle{treehypergroup}{% + \csuse{@glscompstyle@tree}% +}% +\compatglossarystyle{treenoname}{% + \renewcommand{\glossaryentryfield}[5]{% + \hangindent0pt\relax + \parindent0pt\relax + \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}% + \ifx\relax##4\relax + \else + \space(##4)% + \fi + \space ##3\glspostdescription \space ##5\par}% + \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}% +}% +\compatglossarystyle{treenonamegroup}{% + \csuse{@glscompstyle@treenoname}% +}% +\compatglossarystyle{treenonamehypergroup}{% + \csuse{@glscompstyle@treenoname}% +}% +\compatglossarystyle{alttree}{% + \renewcommand{\glossaryentryfield}[5]{% + \ifnum\@gls@prevlevel=0\relax + \else + \settowidth{\glstreeindent}{\textbf{\@glswidestname\space}}% + \hangindent\glstreeindent + \parindent\glstreeindent + \fi + \makebox[0pt][r]{\makebox[\glstreeindent][l]{% + \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}}}% + \ifx\relax##4\relax + \else + (##4)\space + \fi + ##3\glspostdescription \space ##5\par + \def\@gls@prevlevel{0}% + }% + \renewcommand{\glossarysubentryfield}[6]{% + \ifnum##1=1\relax + \glssubentryitem{##2}% + \fi + \ifnum\@gls@prevlevel=##1\relax + \else + \@ifundefined{@glswidestname\romannumeral##1}{% + \settowidth{\gls@tmplen}{\textbf{\@glswidestname\space}}}{% + \settowidth{\gls@tmplen}{\textbf{% + \csname @glswidestname\romannumeral##1\endcsname\space}}}% + \ifnum\@gls@prevlevel<##1\relax + \setlength\glstreeindent\gls@tmplen + \addtolength\glstreeindent\parindent + \parindent\glstreeindent + \else + \@ifundefined{@glswidestname\romannumeral\@gls@prevlevel}{% + \settowidth{\glstreeindent}{\textbf{% + \@glswidestname\space}}}{% + \settowidth{\glstreeindent}{\textbf{% + \csname @glswidestname\romannumeral\@gls@prevlevel + \endcsname\space}}}% + \addtolength\parindent{-\glstreeindent}% + \setlength\glstreeindent\parindent + \fi + \fi + \hangindent\glstreeindent + \makebox[0pt][r]{\makebox[\gls@tmplen][l]{% + \textbf{\glstarget{##2}{##3}}}}% + \ifx##5\relax\relax + \else + (##5)\space + \fi + ##4\glspostdescription\space ##6\par + \def\@gls@prevlevel{##1}% + }% +}% +\compatglossarystyle{alttreegroup}{% + \csuse{@glscompstyle@alttree}% +}% +\compatglossarystyle{alttreehypergroup}{% + \csuse{@glscompstyle@alttree}% +}% +\compatglossarystyle{mcolindex}{% + \csuse{@glscompstyle@index}% +}% +\compatglossarystyle{mcolindexgroup}{% + \csuse{@glscompstyle@index}% +}% +\compatglossarystyle{mcolindexhypergroup}{% + \csuse{@glscompstyle@index}% +}% +\compatglossarystyle{mcoltree}{% + \csuse{@glscompstyle@tree}% +}% +\compatglossarystyle{mcolindextreegroup}{% + \csuse{@glscompstyle@tree}% +}% +\compatglossarystyle{mcolindextreehypergroup}{% + \csuse{@glscompstyle@tree}% +}% +\compatglossarystyle{mcoltreenoname}{% + \csuse{@glscompstyle@tree}% +}% +\compatglossarystyle{mcoltreenonamegroup}{% + \csuse{@glscompstyle@tree}% +}% +\compatglossarystyle{mcoltreenonamehypergroup}{% + \csuse{@glscompstyle@tree}% +}% +\compatglossarystyle{mcolalttree}{% + \csuse{@glscompstyle@alttree}% +}% +\compatglossarystyle{mcolalttreegroup}{% + \csuse{@glscompstyle@alttree}% +}% +\compatglossarystyle{mcolalttreehypergroup}{% + \csuse{@glscompstyle@alttree}% +}% + +\compatglossarystyle{superragged}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5% + \tabularnewline}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4\glspostdescription\space ##6% + \tabularnewline}% +}% +\compatglossarystyle{superraggedborder}{% + \csuse{@glscompstyle@superragged}% +}% +\compatglossarystyle{superraggedheader}{% + \csuse{@glscompstyle@superragged}% +}% +\compatglossarystyle{superraggedheaderborder}{% + \csuse{@glscompstyle@superragged}% +}% +\compatglossarystyle{superragged3col}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\tabularnewline}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4 & ##6\tabularnewline}% +}% +\compatglossarystyle{superragged3colborder}{% + \csuse{@glscompstyle@superragged3col}% +}% +\compatglossarystyle{superragged3colheader}{% + \csuse{@glscompstyle@superragged3col}% +}% +\compatglossarystyle{superragged3colheaderborder}{% + \csuse{@glscompstyle@superragged3col}% +}% +\compatglossarystyle{altsuperragged4col}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}% +}% +\compatglossarystyle{altsuperragged4colheader}{% + \csuse{@glscompstyle@altsuperragged4col}% +}% +\compatglossarystyle{altsuperragged4colborder}{% + \csuse{@glscompstyle@altsuperragged4col}% +}% +\compatglossarystyle{altsuperragged4colheaderborder}{% + \csuse{@glscompstyle@altsuperragged4col}% +}% +\compatglossarystyle{super}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}% +}% +\compatglossarystyle{superborder}{% + \csuse{@glscompstyle@super}% +}% +\compatglossarystyle{superheader}{% + \csuse{@glscompstyle@super}% +}% +\compatglossarystyle{superheaderborder}{% + \csuse{@glscompstyle@super}% +}% +\compatglossarystyle{super3col}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\\}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4 & ##6\\}% +}% +\compatglossarystyle{super3colborder}{% + \csuse{@glscompstyle@super3col}% +}% +\compatglossarystyle{super3colheader}{% + \csuse{@glscompstyle@super3col}% +}% +\compatglossarystyle{super3colheaderborder}{% + \csuse{@glscompstyle@super3col}% +}% +\compatglossarystyle{super4col}{% + \renewcommand*{\glossaryentryfield}[5]{% + \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\\}% + \renewcommand*{\glossarysubentryfield}[6]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}##4 & ##5 & ##6\\}% +}% +\compatglossarystyle{super4colheader}{% + \csuse{@glscompstyle@super4col}% +}% +\compatglossarystyle{super4colborder}{% + \csuse{@glscompstyle@super4col}% +}% +\compatglossarystyle{super4colheaderborder}{% + \csuse{@glscompstyle@super4col}% +}% +\compatglossarystyle{altsuper4col}{% + \csuse{@glscompstyle@super4col}% +}% +\compatglossarystyle{altsuper4colheader}{% + \csuse{@glscompstyle@super4col}% +}% +\compatglossarystyle{altsuper4colborder}{% + \csuse{@glscompstyle@super4col}% +}% +\compatglossarystyle{altsuper4colheaderborder}{% + \csuse{@glscompstyle@super4col}% +}% +\endinput +%% +%% End of file `glossaries-compatible-307.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 6668d69bdd8..3c4f4ba4b66 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl. %% %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-polyglossia}[2009/11/09 v1.0 (NLCT)] +\ProvidesPackage{glossaries-polyglossia}[2013/11/14 v4.0 (NLCT)] \@ifundefined{captionsenglish}{}{% \expandafter\toks@\expandafter{\captionsenglish \renewcommand*{\glossaryname}{\textenglish{Glossary}}% diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty index dc53b167230..2df06584c5d 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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,10 +39,12 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2013/07/05 v3.07 (NLCT)] +\ProvidesPackage{glossaries}[2013/11/14 v4.0 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} +\RequirePackage{textcase} +\renewcommand*{\mfirstucMakeUppercase}{\MakeTextUppercase}% \RequirePackage{xfor} \RequirePackage{datatool-base} \RequirePackage{amsgen} @@ -59,7 +61,7 @@ \newcommand{\glsorg@glossary}{% \@bsphack \begingroup - \@sanitize \glsorg@wrglossary + \@sanitize \endgroup\@esphack } \newcommand{\glsorg@wrglossary}[1]{% \protected@write\@glossaryfile{}{% @@ -67,6 +69,12 @@ \endgroup \@esphack } + \renewcommand*{\RecordChanges}{% + \newwrite\@glossaryfile + \immediate\openout\@glossaryfile=\jobname.glo + \def\glsorg@glossary{\@bsphack\begingroup\@sanitize\glsorg@wrglossary}% + \typeout{Writing glossary file \jobname .glo}% + } \let\glsorg@changes\changes \renewcommand{\changes}[3]{% \begingroup @@ -112,7 +120,8 @@ false,nolabel,autolabel}[nolabel]{% } \newcommand*{\@glossary@default@style}{list} \define@key{glossaries.sty}{style}{% -\renewcommand*{\@glossary@default@style}{#1}} + \renewcommand*{\@glossary@default@style}{#1}% +} \newcommand*{\glossaryentrynumbers}[1]{#1\gls@save@numberlist{#1}} \DeclareOptionX{nonumberlist}{% \renewcommand*{\glossaryentrynumbers}[1]{\gls@save@numberlist{#1}}% @@ -150,7 +159,13 @@ false,nolabel,autolabel}[nolabel]{% \define@boolkey{glossaries.sty}[gls]{nogroupskip}[true]{} \glsnogroupskipfalse \define@boolkey{glossaries.sty}[gls]{ucmark}[true]{} -\glsucmarkfalse +\@ifclassloaded{memoir} +{% + \glsucmarktrue +}% +{% + \glsucmarkfalse +} \define@boolkey{glossaries.sty}[gls]{entrycounter}[true]{} \glsentrycounterfalse \define@key{glossaries.sty}{counterwithin}{% @@ -163,6 +178,9 @@ false,nolabel,autolabel}[nolabel]{% \define@choicekey{glossaries.sty}{sort}{standard,def,use}{% \csname @gls@setupsort@#1\endcsname } +\newcommand*{\glsprestandardsort}[3]{% + \glsdosanitizesort +} \newcommand*{\@gls@setupsort@standard}{% \def\do@glo@storeentry{\@glo@storeentry}% \def\@gls@defsortcount##1{}% @@ -170,7 +188,8 @@ false,nolabel,autolabel}[nolabel]{% \ifx\@glo@sort\@glsdefaultsort \let\@glo@sort\@glo@name \fi - \@gls@sanitizesort + \let\glsdosanitizesort\@gls@sanitizesort + \glsprestandardsort{\@glo@sort}{##1}{##2}% \expandafter\protected@xdef\csname glo@##2@sort\endcsname{\@glo@sort}% }% \def\@gls@setsort##1{}% @@ -240,6 +259,29 @@ false,nolabel,autolabel}[nolabel]{% \renewcommand*{\glsdefmain}{}% } \define@boolkey{glossaries.sty}[gls]{acronym}[true]{% + \ifglsacronym + \renewcommand{\@gls@do@acronymsdef}{% + \DeclareAcronymList{acronym}% + \newglossary[alg]{acronym}{acr}{acn}{\acronymname}% + \renewcommand*{\acronymtype}{acronym}% + }% + \else + \let\@gls@do@acronymsdef\relax + \fi +} +\AtBeginDocument{% + \ifglsacronym + \ifbool{glscompatible-3.07}% + {}% + {% + \providecommand*{\printacronyms}[1][]{% + \printglossary[type=\acronymtype,#1]}% + }% + \fi +} +\newcommand*{\@gls@do@acronymsdef}{} +\DeclareOptionX{acronyms}{% + \glsacronymtrue \DeclareAcronymList{acronym}% } \newcommand*{\@glsacronymlists}{} @@ -277,7 +319,7 @@ false,nolabel,autolabel}[nolabel]{% \renewcommand*{\@glsacronymlists}{#1}% } \define@key{glossaries.sty}{acronymlists}{% - \@addtoacronymlists{#1}% + \DeclareAcronymList{#1}% } \newcommand{\glscounter}{page} \define@key{glossaries.sty}{counter}{% @@ -296,49 +338,120 @@ false,nolabel,autolabel}[nolabel]{% \define@key{glossaries.sty}{nohypertypes}{% \GlsDeclareNoHyperList{#1}% } -\newcommand*{\@gls@sanitizedesc}{\@onelevel@sanitize\@glo@desc} -\newcommand*{\@gls@sanitizename}{\@onelevel@sanitize\@glo@name} -\newcommand*{\@gls@sanitizesymbol}{\@onelevel@sanitize\@glo@symbol} -\newcommand*{\@gls@sanitizesort}{\@onelevel@sanitize\@glo@sort} +\newcommand*{\GlossariesWarning}[1]{% + \PackageWarning{glossaries}{#1}% +} +\newcommand*{\GlossariesWarningNoLine}[1]{% + \PackageWarningNoLine{glossaries}{#1}% +} +\DeclareOptionX{nowarn}{% + \renewcommand*{\GlossariesWarning}[1]{}% + \renewcommand*{\GlossariesWarningNoLine}[1]{}% +} +\newcommand*{\@gls@sanitizedesc}{% +} +\newcommand*{\glssetexpandfield}[1]{% + \csdef{gls@assign@#1@field}##1##2{% + \@@gls@expand@field{##1}{#1}{##2}% + }% +} +\newcommand*{\glssetnoexpandfield}[1]{% + \csdef{gls@assign@#1@field}##1##2{% + \@@gls@noexpand@field{##1}{#1}{##2}% + }% +} +\glssetexpandfield{type} +\glssetnoexpandfield{desc} +\glssetnoexpandfield{descplural} +\newcommand*{\@gls@sanitizename}{} +\glssetnoexpandfield{name} +\newcommand*{\@gls@sanitizesymbol}{} +\glssetnoexpandfield{symbol} +\glssetnoexpandfield{symbolplural} +\newcommand*{\@gls@sanitizesort}{% + \ifglssanitizesort + \@onelevel@sanitize\@glo@sort + \else + \fi +} \define@boolkey[gls]{sanitize}{description}[true]{% -\ifgls@sanitize@description - \renewcommand*{\@gls@sanitizedesc}{\@onelevel@sanitize\@glo@desc}% -\else - \renewcommand*{\@gls@sanitizedesc}{}% -\fi + \GlossariesWarning{sanitize={description} package option deprecated}% + \ifgls@sanitize@description + \glssetnoexpandfield{desc}% + \glssetnoexpandfield{descplural}% + \else + \glssetexpandfield{desc}% + \glssetexpandfield{descplural}% + \fi } \define@boolkey[gls]{sanitize}{name}[true]{% -\ifgls@sanitize@name - \renewcommand*{\@gls@sanitizename}{\@onelevel@sanitize\@glo@name}% -\else - \renewcommand*{\@gls@sanitizename}{}% -\fi} + \GlossariesWarning{sanitize={name} package option +deprecated}% + \ifgls@sanitize@name + \glssetnoexpandfield{name}% + \else + \glssetexpandfield{name}% + \fi +} \define@boolkey[gls]{sanitize}{symbol}[true]{% -\ifgls@sanitize@symbol - \renewcommand*{\@gls@sanitizesymbol}{% -\@onelevel@sanitize\@glo@symbol}% -\else - \renewcommand*{\@gls@sanitizesymbol}{}% -\fi} -\define@boolkey[gls]{sanitize}{sort}[true]{% -\ifgls@sanitize@sort - \renewcommand*{\@gls@sanitizesort}{% -\@onelevel@sanitize\@glo@sort}% -\else - \renewcommand*{\@gls@sanitizesort}{}% -\fi} + \GlossariesWarning{sanitize={symbol} package option +deprecated}% + \ifgls@sanitize@symbol + \glssetnoexpandfield{symbol}% + \glssetnoexpandfield{symbolplural}% + \else + \glssetexpandfield{symbol}% + \glssetexpandfield{symbolplural}% + \fi +} +\define@boolkey{glossaries.sty}[gls]{sanitizesort}[true]{% + \ifglssanitizesort + \glssetnoexpandfield{sortvalue}% + \else + \glssetexpandfield{sortvalue}% + \fi +} +\glssanitizesorttrue +\glssetnoexpandfield{sortvalue}% +\define@choicekey{sanitize}{sort}{true,false}[true]{% + \setbool{glssanitizesort}{#1}% + \ifglssanitizesort + \glssetnoexpandfield{sortvalue}% + \else + \glssetexpandfield{sortvalue}% + \fi + \GlossariesWarning{sanitize={sort} package option + deprecated. Use sanitizesort instead}% +} \define@key{glossaries.sty}{sanitize}[description=true,symbol=true, name=true]{% -\ifthenelse{\equal{#1}{none}}% -{% - \renewcommand*{\@gls@sanitizedesc}{}% - \renewcommand*{\@gls@sanitizename}{}% - \renewcommand*{\@gls@sanitizesymbol}{}% -}% -{% - \setkeys[gls]{sanitize}{#1}}% + \ifthenelse{\equal{#1}{none}}% + {% + \GlossariesWarning{sanitize package option deprecated}% + }% + {% + \setkeys[gls]{sanitize}{#1}% + }% } -\define@boolkey{glossaries.sty}[gls]{translate}[true]{} +\newif\ifglstranslate +\newcommand*\@gls@notranslatorhook{} +\DeclareOptionX{notranslate}{% + \glstranslatefalse + \let\@gls@notranslatorhook\relax +} +\define@choicekey{glossaries.sty}{translate}[\val\nr]% + {true,false,babel}[true]% + {% + \ifcase\nr\relax + \glstranslatetrue + \or + \glstranslatefalse + \let\@gls@notranslatorhook\relax + \or + \glstranslatefalse + \def\@gls@notranslatorhook{\RequirePackage{glossaries-babel}}% + \fi + } \glstranslatefalse \@ifpackageloaded{translator}% {\glstranslatetrue}% @@ -353,21 +466,30 @@ name=true]{% \glsindexonlyfirstfalse \define@boolkey{glossaries.sty}[gls]{hyperfirst}[true]{} \glshyperfirsttrue +\newcommand*{\@gls@setacrstyle}{} \define@boolkey{glossaries.sty}[glsacr]{footnote}[true]{% -\ifthenelse{\boolean{glsacrdescription}}{}% -{\renewcommand*{\@gls@sanitizedesc}{}}% + \ifbool{glsacrdescription}% + {}% + {% + \renewcommand*{\@gls@sanitizedesc}{}% + }% + \renewcommand*{\@gls@setacrstyle}{\SetAcronymStyle}% } \define@boolkey{glossaries.sty}[glsacr]{description}[true]{% \renewcommand*{\@gls@sanitizesymbol}{}% + \renewcommand*{\@gls@setacrstyle}{\SetAcronymStyle}% } \define@boolkey{glossaries.sty}[glsacr]{smallcaps}[true]{% \renewcommand*{\@gls@sanitizesymbol}{}% + \renewcommand*{\@gls@setacrstyle}{\SetAcronymStyle}% } \define@boolkey{glossaries.sty}[glsacr]{smaller}[true]{% \renewcommand*{\@gls@sanitizesymbol}{}% + \renewcommand*{\@gls@setacrstyle}{\SetAcronymStyle}% } \define@boolkey{glossaries.sty}[glsacr]{dua}[true]{% \renewcommand*{\@gls@sanitizesymbol}{}% + \renewcommand*{\@gls@setacrstyle}{\SetAcronymStyle}% } \define@boolkey{glossaries.sty}[glsacr]{shortcuts}[true]{} \newcommand*{\glsorder}{word} @@ -390,21 +512,69 @@ name=true]{% \glsxindytrue \setkeys[gls]{xindy}{#1}% } -\define@boolkey{glossaries.sty}[gls]{savewrites}[true]{} +\DeclareOptionX{xindygloss}{% + \glsxindytrue +} +\define@boolkey{glossaries.sty}[gls]{savewrites}[true]{% + \ifglssavewrites + \renewcommand*{\glswritefiles}{\@glswritefiles}% + \else + \let\glswritefiles\relax + \fi +} \glssavewritesfalse -\newcommand*{\GlossariesWarning}[1]{% - \PackageWarning{glossaries}{#1}% +\let\glswritefiles\relax +\define@boolkey{glossaries.sty}[gls]{compatible-3.07}[true]{} +\boolfalse{glscompatible-3.07} +\define@boolkey{glossaries.sty}[gls]{compatible-2.07}[true]{% + \ifbool{glscompatible-2.07}% + {% + \booltrue{glscompatible-3.07}% + }% + {}% } -\newcommand*{\GlossariesWarningNoLine}[1]{% - \PackageWarningNoLine{glossaries}{#1}% +\boolfalse{glscompatible-2.07} +\newcommand{\@gls@do@symbolsdef}{} +\DeclareOptionX{symbols}{% + \renewcommand{\@gls@do@symbolsdef}{% + \newglossary[slg]{symbols}{sls}{slo}{\glssymbolsgroupname}% + \newcommand*{\printsymbols}[1][]{\printglossary[type=symbols,#1]}% + }% } -\DeclareOptionX{nowarn}{% - \renewcommand*{\GlossariesWarning}[1]{}% - \renewcommand*{\GlossariesWarningNoLine}[1]{}% +\newcommand{\@gls@do@numbersdef}{} +\DeclareOptionX{numbers}{% + \renewcommand{\@gls@do@numbersdef}{% + \newglossary[nlg]{numbers}{nls}{nlo}{\glsnumbersgroupname}% + \newcommand*{\printnumbers}[1][]{\printglossary[type=numbers,#1]}% + }% } -\define@boolkey{glossaries.sty}[gls]{compatible-2.07}[true]{} -\csname glscompatible-2.07false\endcsname \ProcessOptionsX +\RequirePackage{glossaries-compatible-307} +\disable@keys{glossaries.sty}{compatible-2.07,% + xindy,xindygloss,makeindex,% + acronym,translate,notranslate,nolong,nosuper,notree,nostyles,nomain} +\newcommand*{\setupglossaries}[1]{% + \renewcommand*{\@gls@setacrstyle}{}% + \ifglsacrshortcuts + \def\@gls@setupshortcuts{\glsacrshortcutstrue}% + \else + \def\@gls@setupshortcuts{% + \ifglsacrshortcuts + \DefineAcronymSynonyms + \fi + }% + \fi + \glsacrshortcutsfalse + \let\@gls@do@numbersdef\relax + \let\@gls@do@symbolssdef\relax + \let\@gls@do@acronymsdef\relax + \setkeys{glossaries.sty}{#1}% + \@gls@setacrstyle + \@gls@setupshortcuts + \@gls@do@acronymsdef + \@gls@do@numbersdef + \@gls@do@symbolssdef +} \ifglstranslate \@ifpackageloaded{polyglossia}% {% @@ -433,12 +603,13 @@ name=true]{% {} \newcommand*{\@gls@onlypremakeg}{} \newcommand*{\@onlypremakeg}[1]{% -\ifx\@gls@onlypremakeg\@empty - \def\@gls@onlypremakeg{#1}% -\else - \expandafter\toks@\expandafter{\@gls@onlypremakeg}% - \edef\@gls@onlypremakeg{\the\toks@,\noexpand#1}% -\fi} + \ifx\@gls@onlypremakeg\@empty + \def\@gls@onlypremakeg{#1}% + \else + \expandafter\toks@\expandafter{\@gls@onlypremakeg}% + \edef\@gls@onlypremakeg{\the\toks@,\noexpand#1}% + \fi +} \newcommand*{\@disable@onlypremakeg}{% \@for\@thiscs:=\@gls@onlypremakeg\do{% \expandafter\@disable@premakecs\@thiscs% @@ -530,6 +701,8 @@ name=true]{% \@ifpackageloaded{babel}{% \RequirePackage{glossaries-babel}}{}% }} +\else + \@gls@notranslatorhook \fi \DeclareRobustCommand*{\nopostdesc}{} \newcommand*{\@nopostdesc}{% @@ -537,6 +710,7 @@ name=true]{% \def\glspostdescription{% \let\glspostdescription\org@glspostdescription}% } +\newcommand*{\@no@post@desc}{\nopostdesc} \newcommand{\glspar}{\par} \ifglsxindy \newcommand{\setStyleFile}[1]{% @@ -589,7 +763,7 @@ name=true]{% \ifglossaryexists{#1}{% \csgdef{@glossarypreamble@#1}{#2}% }{% - \PackageWarning{glossaries}{% + \GlossariesWarning{% Glossary `#1' is not defined% }% }% @@ -604,62 +778,62 @@ name=true]{% {% \@p@glossarysection{#1}{#2}% }% - \glossarymark{\glossarytoctitle}% + \glsglossarymark{\glossarytoctitle}% } \ifcsundef{glossarymark}% {% - \ifglsucmark - \newcommand{\glossarymark}[1]{% - \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}% - } - \else - \newcommand{\glossarymark}[1]{\@mkboth{#1}{#1}} - \fi + \newcommand{\glsglossarymark}[1]{\glossarymark{#1}} }% {% - \GlossariesWarning{overriding \string\glossarymark}% - \@ifclassloaded{memoir}% - { - \ifglsucmark - \renewcommand{\glossarymark}[1]{% - \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}% - } - \else - \renewcommand{\glossarymark}[1]{% + \@ifclassloaded{memoir} + {% + \newcommand{\glsglossarymark}[1]{% + \ifglsucmark \markboth{\memUChead{#1}}{\memUChead{#1}}% - } - \fi - } - { - \ifglsucmark - \renewcommand{\glossarymark}[1]{% - \@mkboth{\MakeUppercase{#1}}{\MakeUppercase{#1}}% - } - \else - \renewcommand{\glossarymark}[1]{\@mkboth{#1}{#1}} - \fi + \else + \markboth{#1}{#1}% + \fi + } + }% + {% + \newcommand{\glsglossarymark}[1]{% + \ifglsucmark + \@mkboth{\mfirstucMakeUppercase{#1}}{\mfirstucMakeUppercase{#1}}% + \else + \@mkboth{#1}{#1}% + \fi + } } } +\providecommand{\glossarymark}[1]{% + \ifglsucmark + \@mkboth{\mfirstucMakeUppercase{#1}}{\mfirstucMakeUppercase{#1}}% + \else + \@mkboth{#1}{#1}% + \fi +} \newcommand*{\setglossarysection}[1]{% \setkeys{glossaries.sty}{section=#1}} \newcommand*{\@glossarysection}[2]{% -\ifx\@@glossarysecstar\@empty - \csname\@@glossarysec\endcsname{#2}% -\else - \csname\@@glossarysec\endcsname*{#2}% - \@gls@toc{#1}{\@@glossarysec}% -\fi -\@@glossaryseclabel} + \ifx\@@glossarysecstar\@empty + \csname\@@glossarysec\endcsname{#2}% + \else + \csname\@@glossarysec\endcsname*{#2}% + \@gls@toc{#1}{\@@glossarysec}% + \fi + \@@glossaryseclabel +} \newcommand*{\@p@glossarysection}[2]{% -\glsclearpage -\phantomsection -\ifx\@@glossarysecstar\@empty - \csname\@@glossarysec\endcsname{#2}% -\else - \@gls@toc{#1}{\@@glossarysec}% - \csname\@@glossarysec\endcsname*{#2}% -\fi -\@@glossaryseclabel} + \glsclearpage + \phantomsection + \ifx\@@glossarysecstar\@empty + \csname\@@glossarysec\endcsname{#2}% + \else + \@gls@toc{#1}{\@@glossarysec}% + \csname\@@glossarysec\endcsname*{#2}% + \fi + \@@glossaryseclabel +} \newcommand*{\gls@doclearpage}{% \ifthenelse{\equal{\@@glossarysec}{chapter}}% {% @@ -685,13 +859,14 @@ name=true]{% } \newcommand*{\glsclearpage}{\gls@doclearpage} \newcommand*{\@gls@toc}[2]{% -\ifglstoc - \ifglsnumberline - \addcontentsline{toc}{#2}{\numberline{}#1}% - \else - \addcontentsline{toc}{#2}{#1}% + \ifglstoc + \ifglsnumberline + \addcontentsline{toc}{#2}{\numberline{}#1}% + \else + \addcontentsline{toc}{#2}{#1}% + \fi \fi -\fi} +} \newcommand*{\glsnoxindywarning}[1]{% \GlossariesWarning{Not in xindy mode --- ignoring \string#1}% } @@ -964,10 +1139,11 @@ name=true]{% \newcommand*{\GlsSetXdyCodePage}[1]{% \renewcommand*{\gls@codepage}{#1}% } -\AtBeginDocument{ - \ifx\gls@codepage\@empty - \@ifpackageloaded{fontspec}{\def\gls@codepage{utf8}}{} -\fi} + \AtBeginDocument{% + \ifx\gls@codepage\@empty + \@ifpackageloaded{fontspec}{\def\gls@codepage{utf8}}{}% + \fi + } \else \newcommand*{\GlsSetXdyCodePage}[1]{% \glsnoxindywarning\GlsSetXdyCodePage} @@ -995,18 +1171,24 @@ name=true]{% } \newcommand*{\forglsentries}[3][\glsdefaulttype]{% \edef\@@glo@list{\csname glolist@#1\endcsname}% - \@for#2:=\@@glo@list\do{\ifx#2\@empty\else#3\fi}% + \@for#2:=\@@glo@list\do + {% + \ifdefempty{#2}{}{#3}% + }% } \newcommand*{\forallglsentries}[3][\@glo@types]{% -\expandafter\forallglossaries\expandafter[#1]{\@@this@glo@}{% -\forglsentries[\@@this@glo@]{#2}{#3}}} + \expandafter\forallglossaries\expandafter[#1]{\@@this@glo@}% + {% + \forglsentries[\@@this@glo@]{#2}{#3}% + }% +} \newcommand{\ifglossaryexists}[3]{% \ifcsundef{@glotype@#1@out}{#3}{#2}% } \newcommand{\ifglsentryexists}[3]{% \ifcsundef{glo@#1@name}{#3}{#2}% } -\newcommand*{\ifglsused}[3]{\ifthenelse{\boolean{glo@#1@flag}}{#2}{#3}} +\newcommand*{\ifglsused}[3]{\ifbool{glo@#1@flag}{#2}{#3}} \newcommand{\glsdoifexists}[2]{% \ifglsentryexists{#1}{#2}{% \PackageError{glossaries}{Glossary entry `#1' has not been @@ -1042,32 +1224,80 @@ name=true]{% \ifcsempty{glo@#1@parent}{#3}{#2}% }% } +\newcommand*{\ifglshasdesc}[3]{% + \ifcsempty{glo@#1@desc}% + {#3}% + {#2}% +} +\newcommand*{\ifglsdescsuppressed}[3]{% + \ifcsequal{glos@#1@desc}{@no@post@desc}% + {#2}% + {#3}% +} +\newcommand*{\ifglshassymbol}[3]{% + \ifcsempty{glo@#1@symbol}% + {#3}% + {% + \expandafter\ifx\csname glo@#1@symbol\endcsname\@gls@default@value + #3% + \else + #2% + \fi + }% +} +\newcommand*{\ifglshaslong}[3]{% + \ifcsempty{glo@#1@long}% + {#3}% + {% + \expandafter\ifx\csname glo@#1@long\endcsname\@gls@default@value + #3% + \else + #2% + \fi + }% +} +\newcommand*{\ifglshasshort}[3]{% + \ifcsempty{glo@#1@short}% + {#3}% + {% + \expandafter\ifx\csname glo@#1@short\endcsname\@gls@default@value + #3% + \else + #2% + \fi + }% +} \newcommand*{\@glo@types}{,} +\newcommand*\@gls@provide@newglossary{% + \protected@write\@auxout{}{\string\providecommand\string\@newglossary[4]{}}% + \let\@gls@provide@newglossary\relax +} +\newcommand*{\defglsentryfmt}[2][\glsdefaulttype]{% + \csgdef{gls@#1@entryfmt}{#2}% +} +\newcommand*{\gls@doentryfmt}[1]{\csuse{gls@#1@entryfmt}} \newcommand*{\newglossary}[5][glg]{% -\ifglossaryexists{#2}{% - \PackageError{glossaries}{Glossary type `#2' already exists}{% - You can't define a new glossary called `#2' because it already - exists}% -}{% - \ifx\glsdefaulttype\relax + \ifglossaryexists{#2}% + {% + \PackageError{glossaries}{Glossary type `#2' already exists}{% + You can't define a new glossary called `#2' because it already + exists}% + }% + {% + \ifundef\glsdefaulttype + {% \gdef\glsdefaulttype{#2}% - \fi + }{}% \toks@{#2}\edef\@glo@types{\@glo@types\the\toks@,}% \expandafter\gdef\csname glolist@#2\endcsname{,}% \expandafter\def\csname @glotype@#2@in\endcsname{#3}% \expandafter\def\csname @glotype@#2@out\endcsname{#4}% \expandafter\def\csname @glotype@#2@title\endcsname{#5}% + \@gls@provide@newglossary \protected@write\@auxout{}{\string\@newglossary{#2}{#1}{#3}{#4}}% - \ifcsundef{gls@#2@display}% + \ifcsundef{gls@#2@entryfmt}% {% - \expandafter\gdef\csname gls@#2@display\endcsname{\glsdisplay}% - }% - {}% - \ifcsundef{gls@#2@displayfirst}% - {% - \expandafter\gdef\csname gls@#2@displayfirst\endcsname{% - \glsdisplayfirst - }% + \defglsentryfmt[#2]{\glsentryfmt}% }% {}% \@gls@defsortcount{#2}% @@ -1087,8 +1317,12 @@ name=true]{% \fi } \newcommand*{\@gls@getcounter}[1]{% -\csname @glotype@#1@counter\endcsname} + \csname @glotype@#1@counter\endcsname +} \glsdefmain +\@gls@do@acronymsdef +\@gls@do@symbolsdef +\@gls@do@numbersdef \define@key{glossentry}{name}{% \def\@glo@name{#1}% } @@ -1112,6 +1346,7 @@ name=true]{% \define@key{glossentry}{firstplural}{% \def\@glo@firstplural{#1}% } +\newcommand*{\@gls@default@value}{\relax} \define@key{glossentry}{symbol}{% \def\@glo@symbol{#1}% } @@ -1135,9 +1370,16 @@ name=true]{% }% } \define@key{glossentry}{see}{% + \gls@checkseeallowed \def\@glo@see{#1}% \@glo@seeautonumberlist } +\newcommand*{\gls@checkseeallowed}{% + \PackageError{glossaries}% + {`see' key may only be used after \string\makeglossaries}% + {You must use \string\makeglossaries\space before defining + any entries that have a `see' key}% +} \define@key{glossentry}{parent}{% \def\@glo@parent{#1}} \define@choicekey{glossentry}{nonumberlist}[\val\nr]{true,false}[true]{% @@ -1181,7 +1423,17 @@ name=true]{% \PackageError{glossaries}{name key required in \string\newglossaryentry\space for entry `\@glo@label'}{You haven't specified the entry name}} -\newcommand*{\@glsdefaultplural}{\@glo@text\glspluralsuffix} +\newcommand*\@glsnodesc{% + \PackageError{glossaries} + {% + description key required in \string\newglossaryentry\space + for entry `\@glo@label'% + }% + {% + You haven't specified the entry description% + }% +}% +\newcommand*{\@glsdefaultplural}{} \newcommand*{\@gls@missingnumberlist}[1]{% ??% \ifglssavenumberlist @@ -1198,31 +1450,318 @@ name=true]{% } \newcommand*{\@glsdefaultsort}{\@glo@name} \newcount\gls@level +\newcommand{\@@gls@noexpand@field}[3]{% + \expandafter\global\expandafter + \let\csname glo@#1@#2\endcsname#3% +} +\newcommand{\@gls@noexpand@fields}[4]{% + \ifcsdef{gls@assign@#3@field} + {% + \ifdefequal{#4}{\@gls@default@value}% + {% + \edef\@gls@value{\expandonce{#1}}% + \csuse{gls@assign@#3@field}{#2}{\@gls@value}% + }% + {% + \csuse{gls@assign@#3@field}{#2}{#4}% + }% + }% + {% + \ifdefequal{#4}{\@gls@default@value}% + {% + \edef\@gls@value{\expandonce{#1}}% + \@@gls@noexpand@field{#2}{#3}{\@gls@value}% + }% + {% + \@@gls@noexpand@field{#2}{#3}{#4}% + }% + }% +} +\newcommand{\@@gls@expand@field}[3]{% + \expandafter + \protected@xdef\csname glo@#1@#2\endcsname{#3}% +} +\newcommand{\@gls@expand@fields}[4]{% + \ifcsdef{gls@assign@#3@field} + {% + \ifdefequal{#4}{\@gls@default@value}% + {% + \edef\@gls@value{\expandonce{#1}}% + \csuse{gls@assign@#3@field}{#2}{\@gls@value}% + }% + {% + \expandafter\@gls@startswithexpandonce#4\relax\relax\gls@endcheck + {% + \@@gls@expand@field{#2}{#3}{#4}% + }% + {% + \csuse{gls@assign@#3@field}{#2}{#4}% + }% + }% + }% + {% + \ifdefequal{#4}{\@gls@default@value}% + {% + \@@gls@expand@field{#2}{#3}{#1}% + }% + {% + \@@gls@expand@field{#2}{#3}{#4}% + }% + }% +} +\def\@gls@expandonce{\expandonce} +\def\@gls@startswithexpandonce#1#2\gls@endcheck#3#4{% + \def\@gls@tmp{#1}% + \ifdefequal{\@gls@expandonce}{\@gls@tmp}{#3}{#4}% +} +\let\gls@assign@field\@gls@expand@fields +\newcommand*{\glsexpandfields}{% + \let\gls@assign@field\@gls@expand@fields +} +\newcommand*{\glsnoexpandfields}{% + \let\gls@assign@field\@gls@noexpand@fields +} \newrobustcmd{\newglossaryentry}[2]{% \glsdoifnoexists{#1}% {% - \def\@glo@label{#1}% - \let\@glo@name\@glsnoname - \def\@glo@desc{% - \PackageError{glossaries} - {% - description key required in \string\newglossaryentry\space - for entry `\@glo@label'% + \gls@defglossaryentry{#1}{#2}% + }% +} +\newrobustcmd{\provideglossaryentry}[2]{% + \ifglsentryexists{#1}% + {}% + {% + \gls@defglossaryentry{#1}{#2}% + }% +} +\@onlypreamble{\provideglossaryentry} +\newrobustcmd{\new@glossaryentry}[2]{% + \ifundef\@gls@deffile + {% + \global\newwrite\@gls@deffile + \immediate\openout\@gls@deffile=\jobname.glsdefs + }% + {}% + \ifglsentryexists{#1}{}% + {% + \gls@defglossaryentry{#1}{#2}% + }% + \@gls@writedef{#1}% +} +\AtBeginDocument +{ + \makeatletter + \InputIfFileExists{\jobname.glsdefs}{}{}% + \makeatother + \let\newglossaryentry\new@glossaryentry +} +\AtEndDocument{\ifdef\@gls@deffile{\closeout\@gls@deffile}{}} +\newcommand*{\@gls@writedef}[1]{% + \immediate\write\@gls@deffile + {% + \string\ifglsentryexists{#1}{}\expandafter\@gobble\string\%^^J% + \expandafter\@gobble\string\{\expandafter\@gobble\string\%^^J% + \string\gls@defglossaryentry{#1}\expandafter\@gobble\string\%^^J% + \expandafter\@gobble\string\{\expandafter\@gobble\string\%% + }% + \@for\@gls@map:=\@gls@keymap\do + {% + \edef\glo@value{\expandafter\expandonce + \csname glo@#1@\expandafter\@secondoftwo\@gls@map\endcsname}% + \@onelevel@sanitize\glo@value + \immediate\write\@gls@deffile + {% + \expandafter\@firstoftwo\@gls@map + =\expandafter\@gobble\string\{\glo@value\expandafter\@gobble\string\},% + \expandafter\@gobble\string\%% + }% + }% + \glswritedefhook + \immediate\write\@gls@deffile + {% + \expandafter\@gobble\string\%^^J% + \expandafter\@gobble\string\}\expandafter\@gobble\string\%^^J% + \expandafter\@gobble\string\}\expandafter\@gobble\string\%% + }% +} +\newcommand*{\@gls@keymap}{% + {name}{name},% + {sort}{sortvalue},% unescaped sort value + {type}{type},% + {first}{first},% + {firstplural}{firstpl},% + {text}{text},% + {plural}{plural},% + {description}{desc},% + {descriptionplural}{descplural},% + {symbol}{symbol},% + {symbolplural}{symbolplural},% + {user1}{useri},% + {user2}{userii},% + {user3}{useriii},% + {user4}{useriv},% + {user5}{userv},% + {user6}{uservi},% + {long}{long},% + {longplural}{longpl},% + {short}{short},% + {shortplural}{shortpl},% + {counter}{counter},% + {parent}{parent}% +} +\newcommand*{\glsaddkey}{\@ifstar\@sglsaddkey\@glsaddkey} +\newcommand*{\@sglsaddkey}[1]{% + \key@ifundefined{glossentry}{#1}% + {% + \expandafter\newcommand\expandafter*\expandafter + {\csname gls@assign@#1@field\endcsname}[2]{% + \@@gls@expand@field{##1}{#1}{##2}% + }% + }% + {}% + \@glsaddkey{#1}% +} +\newcommand*{\@glsaddkey}[7]{% + \key@ifundefined{glossentry}{#1}% + {% + \define@key{glossentry}{#1}{\csdef{@glo@#1}{##1}}% + \appto\@gls@keymap{,{#1}{#1}}% + \appto\@newglossaryentryprehook{\csdef{@glo@#1}{#2}}% + \appto\@newglossaryentryposthook{% + \letcs{\@glo@tmp}{@glo@#1}% + \gls@assign@field{#2}{\@glo@label}{#1}{\@glo@tmp}% + }% + \newcommand*{#3}[1]{\csuse{glo@##1@#1}}% + \newcommand*{#4}[1]{% + \letcs{\@glo@text}{glo@##1@#1}% + \xmakefirstuc\@glo@text + }% + \ifcsdef{@gls@user@#1@}% + {% + \PackageError{glossaries}% + {Can't define `\string#5' as helper command + `\expandafter\string\csname @gls@user@#1@\endcsname' already exists}% + {}% + }% + {% + \newrobustcmd*{#5}{\@ifstar{\csuse{@sgls@user@#1}}{\csuse{@gls@user@#1}}}% + \expandafter\newcommand\expandafter*\expandafter + {\csname @sgls@user@#1\endcsname}[1][]{% + \csuse{@gls@user@#1}[hyper=false,##1]% + }% + \expandafter\newcommand\expandafter*\expandafter + {\csname @gls@user@#1\endcsname}[2][]{% + \new@ifnextchar[% + {\csuse{@gls@user@#1@}{##1}{##2}}% + {\csuse{@gls@user@#1@}{##1}{##2}[]}}% + \csdef{@gls@user@#1@}##1##2[##3]{% + \glsdoifexists{##2}% + {% + \edef\@glo@type{\glsentrytype{##2}}% + \@gls@link[##1]{##2}{#3{##2}##3}% + }% }% - {% - You haven't specified the entry description% + }% + \ifcsdef{@Gls@user@#1@}% + {% + \PackageError{glossaries}% + {Can't define `\string#6' as helper command + `\expandafter\string\csname @Gls@user@#1@\endcsname' already exists}% + {}% + }% + {% + \newrobustcmd*{#6}{\@ifstar{\csuse{@sGls@user@#1}}{\csuse{@Gls@user@#1}}}% + \expandafter\newcommand\expandafter*\expandafter + {\csname @sGls@user@#1\endcsname}[1][]{% + \csuse{@Gls@user@#1}[hyper=false,##1]% + }% + \expandafter\newcommand\expandafter*\expandafter + {\csname @Gls@user@#1\endcsname}[2][]{% + \new@ifnextchar[% + {\csuse{@Gls@user@#1@}{##1}{##2}}% + {\csuse{@Gls@user@#1@}{##1}{##2}[]}}% + \csdef{@Gls@user@#1@}##1##2[##3]{% + \glsdoifexists{##2}% + {% + \edef\@glo@type{\glsentrytype{##2}}% + \@gls@link[##1]{##2}{#4{##2}##3}% + }% }% }% - \def\@glo@descplural{\@glo@desc}% - \def\@glo@type{\glsdefaulttype}% - \def\@glo@symbol{\relax}% - \def\@glo@symbolplural{\@glo@symbol}% - \def\@glo@text{\@glo@name}% - \let\@glo@plural\@glsdefaultplural - \let\@glo@first\relax - \let\@glo@firstplural\relax - \let\@glo@sort\@glsdefaultsort - \def\@glo@counter{\@gls@getcounter{\@glo@type}}% + \ifcsdef{@GLS@user@#1@}% + {% + \PackageError{glossaries}% + {Can't define `\string#7' as helper command + `\expandafter\string\csname @GLS@user@#1@\endcsname' already exists}% + {}% + }% + {% + \newrobustcmd*{#7}{\@ifstar{\csuse{@sGLS@user@#1}}{\csuse{@GLS@user@#1}}}% + \expandafter\newcommand\expandafter*\expandafter + {\csname @sGLS@user@#1\endcsname}[1][]{% + \csuse{@GLS@user@#1}[hyper=false,##1]% + }% + \expandafter\newcommand\expandafter*\expandafter + {\csname @GLS@user@#1\endcsname}[2][]{% + \new@ifnextchar[% + {\csuse{@GLS@user@#1@}{##1}{##2}}% + {\csuse{@GLS@user@#1@}{##1}{##2}[]}}% + \csdef{@GLS@user@#1@}##1##2[##3]{% + \glsdoifexists{##2}% + {% + \edef\@glo@type{\glsentrytype{##2}}% + \@gls@link[##1]{##2}{\mfirstucMakeUppercase{#3{##2}##3}}% + }% + }% + }% + }% + {% + \PackageError{glossaries}{Key `#1' already exists}{}% + }% +} +\newcommand*{\glswritedefhook}{} +\newcommand*{\gls@assign@desc}[1]{% + \gls@assign@field{}{#1}{desc}{\@glo@desc}% + \gls@assign@field{\@glo@desc}{#1}{descplural}{\@glo@descplural}% +} +\newcommand{\longnewglossaryentry}[3]{% + \glsdoifnoexists{#1}% + {% + \bgroup + \let\@org@newglossaryentryprehook\@newglossaryentryprehook + \long\def\@newglossaryentryprehook{% + \long\def\@glo@desc{#3\leavevmode\unskip\nopostdesc}% + \@org@newglossaryentryprehook + }% + \renewcommand*{\gls@assign@desc}[1]{% + \global\cslet{glo@#1@desc}{\@glo@desc}% + \global\cslet{glo@#1@descplural}{\@glo@desc}% + } + \gls@defglossaryentry{#1}{#2}% + \egroup + } +} +\@onlypreamble{\longnewglossaryentry} +\newcommand{\longprovideglossaryentry}[3]{% + \ifglsentryexists{#1}{}% + {\longnewglossaryentry{#1}{#2}{#3}}% +} +\@onlypreamble{\longprovideglossaryentry} +\newcommand{\gls@defglossaryentry}[2]{% + \def\@glo@label{#1}% + \let\glslabel\@glo@label + \let\@glo@name\@glsnoname + \let\@glo@desc\@glsnodesc + \let\@glo@descplural\@gls@default@value + \let\@glo@type\@gls@default@value + \let\@glo@symbol\@gls@default@value + \let\@glo@symbolplural\@gls@default@value + \let\@glo@text\@gls@default@value + \let\@glo@plural\@gls@default@value + \let\@glo@first\@gls@default@value + \let\@glo@firstplural\@gls@default@value + \let\@glo@sort\@gls@default@value + \let\@glo@counter\@gls@default@value \def\@glo@see{}% \def\@glo@parent{}% \def\@glo@prefix{}% @@ -1238,10 +1777,20 @@ name=true]{% \def\@glo@longpl{}% \@newglossaryentryprehook \setkeys{glossentry}{#2}% + \ifundef\glsdefaulttype + {% + \PackageError{glossaries}% + {No default glossary type (have you used `nomain'?)}% + {If you use package option `nomain' you must define + a new glossary before you can define entries}% + }% + {}% + \gls@assign@field{\glsdefaulttype}{#1}{type}{\@glo@type}% + \edef\@glo@type{\glsentrytype{#1}}% \ifcsundef{glolist@\@glo@type}% {% \PackageError{glossaries}% - {Glossary type '\@glo@type' has not been defined}% + {Glossary type `\@glo@type' has not been defined}% {You need to define a new glossary type, before making entries in it}% }% @@ -1268,7 +1817,7 @@ name=true]{% \ifx\@glo@name\@glsnoname \expandafter\let\expandafter\@glo@name \csname glo@\@glo@parent @name\endcsname - \ifx\@glo@plural\@glsdefaultplural + \ifx\@glo@plural\@gls@default@value \expandafter\let\expandafter\@glo@plural \csname glo@\@glo@parent @plural\endcsname \fi @@ -1289,52 +1838,47 @@ name=true]{% }% \fi \expandafter\xdef\csname glo@#1@level\endcsname{\number\gls@level}% - \ifx\relax\@glo@firstplural - \ifx\relax\@glo@first - \def\@glo@firstplural{\@glo@plural}% - \def\@glo@first{\@glo@text}% - \else - \def\@glo@firstplural{\@glo@first\glspluralsuffix}% - \fi + \gls@assign@field{\@glo@name}{#1}{sortvalue}{\@glo@sort}% + \letcs\@glo@sort{glo@#1@sortvalue}% + \gls@assign@field{\@glo@name}{#1}{text}{\@glo@text}% + \expandafter\gls@assign@field\expandafter + {\csname glo@#1@text\endcsname\glspluralsuffix}% + {#1}{plural}{\@glo@plural}% + \expandafter\gls@assign@field\expandafter + {\csname glo@#1@text\endcsname}% + {#1}{first}{\@glo@first}% + \ifx\@glo@first\@gls@default@value + \expandafter\gls@assign@field\expandafter + {\csname glo@#1@plural\endcsname}% + {#1}{firstpl}{\@glo@firstplural}% \else - \ifx\relax\@glo@first - \def\@glo@first{\@glo@text}% - \fi + \expandafter\gls@assign@field\expandafter + {\csname glo@#1@first\endcsname\glspluralsuffix}% + {#1}{firstpl}{\@glo@firstplural}% \fi - \expandafter - \protected@xdef\csname glo@#1@text\endcsname{\@glo@text}% - \expandafter - \protected@xdef\csname glo@#1@plural\endcsname{\@glo@plural}% - \expandafter - \protected@xdef\csname glo@#1@first\endcsname{\@glo@first}% - \expandafter - \protected@xdef\csname glo@#1@firstpl\endcsname{\@glo@firstplural}% - \expandafter - \protected@xdef\csname glo@#1@type\endcsname{\@glo@type}% - \expandafter - \protected@xdef\csname glo@#1@counter\endcsname{\@glo@counter}% - \expandafter - \protected@xdef\csname glo@#1@useri\endcsname{\@glo@useri}% - \expandafter - \protected@xdef\csname glo@#1@userii\endcsname{\@glo@userii}% - \expandafter - \protected@xdef\csname glo@#1@useriii\endcsname{\@glo@useriii}% - \expandafter - \protected@xdef\csname glo@#1@useriv\endcsname{\@glo@useriv}% - \expandafter - \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}% + \ifcsundef{@glotype@\@glo@type @counter}% + {% + \def\@glo@defaultcounter{\glscounter}% + }% + {% + \letcs\@glo@defaultcounter{@glotype@\@glo@type @counter}% + }% + \gls@assign@field{\@glo@defaultcounter}{#1}{counter}{\@glo@counter}% + \gls@assign@field{}{#1}{useri}{\@glo@useri}% + \gls@assign@field{}{#1}{userii}{\@glo@userii}% + \gls@assign@field{}{#1}{useriii}{\@glo@useriii}% + \gls@assign@field{}{#1}{useriv}{\@glo@useriv}% + \gls@assign@field{}{#1}{userv}{\@glo@userv}% + \gls@assign@field{}{#1}{uservi}{\@glo@uservi}% + \gls@assign@field{}{#1}{short}{\@glo@short}% + \gls@assign@field{}{#1}{shortpl}{\@glo@shortpl}% + \gls@assign@field{}{#1}{long}{\@glo@long}% + \gls@assign@field{}{#1}{longpl}{\@glo@longpl}% + \ifx\@glo@name\@glsnoname + \@glsnoname + \let\@gloname\@gls@default@value + \fi + \gls@assign@field{}{#1}{name}{\@glo@name}% \ifcsundef{glo@#1@numberlist}% {% \csxdef{glo@#1@numberlist}{\noexpand\@gls@missingnumberlist{\@glo@label}}% @@ -1344,17 +1888,21 @@ name=true]{% \ifx\@glo@desc\@glo@@desc \let\@glo@desc\@glo@first \fi - \@gls@sanitizedesc - \expandafter\protected@xdef\csname glo@#1@desc\endcsname{\@glo@desc}% - \expandafter\protected@xdef\csname glo@#1@descplural\endcsname{\@glo@descplural}% + \ifx\@glo@desc\@glsnodesc + \@glsnodesc + \let\@glodesc\@gls@default@value + \fi + \gls@assign@desc{#1}% \@gls@defsort{\@glo@type}{#1}% \def\@glo@@symbol{\@glo@text}% \ifx\@glo@symbol\@glo@@symbol \let\@glo@symbol\@glo@text \fi - \@gls@sanitizesymbol - \expandafter\protected@xdef\csname glo@#1@symbol\endcsname{\@glo@symbol}% - \expandafter\protected@xdef\csname glo@#1@symbolplural\endcsname{\@glo@symbolplural}% + \gls@assign@field{\relax}{#1}{symbol}{\@glo@symbol}% + \expandafter + \gls@assign@field\expandafter + {\csname glo@#1@symbol\endcsname} + {#1}{symbolplural}{\@glo@symbolplural}% \expandafter\gdef\csname glo@#1@flagfalse\endcsname{% \expandafter\global\expandafter \let\csname ifglo@#1@flag\endcsname\iffalse @@ -1372,7 +1920,6 @@ name=true]{% \noexpand\expandafter\noexpand\@glssee\noexpand\@glo@list{#1}}% \@do@glssee \fi - }% \do@glo@storeentry{#1}% \@newglossaryentryposthook } @@ -1389,104 +1936,395 @@ name=true]{% \csdef{glo@#1@type}{#2}% } \ifglsxindy - \newcommand*{\@glossaryentryfield}{\string\\glossaryentryfield} + \newcommand*{\@glossaryentryfield}{\string\\glossentry} \else - \newcommand*{\@glossaryentryfield}{\string\glossaryentryfield} + \newcommand*{\@glossaryentryfield}{\string\glossentry} \fi \ifglsxindy \newcommand*{\@glossarysubentryfield}{% - \string\\glossarysubentryfield} + \string\\subglossentry} \else \newcommand*{\@glossarysubentryfield}{% - \string\glossarysubentryfield} + \string\subglossentry} \fi \newcommand{\@glo@storeentry}[1]{% -\protected@edef\@glo@sort{\csname glo@#1@sort\endcsname}% -\@gls@checkmkidxchars\@glo@sort -\protected@edef\@@glo@name{\csname glo@#1@name\endcsname}% -\@gls@checkmkidxchars\@@glo@name -\ifglsxindy - \protected@edef\@glo@name{\string\\glsnamefont{\@@glo@name}}% -\else - \protected@edef\@glo@name{\string\glsnamefont{\@@glo@name}}% -\fi -\protected@edef\@glo@desc{\csname glo@#1@desc\endcsname}% -\@gls@checkmkidxchars\@glo@desc -\protected@edef\@glo@symbol{\csname glo@#1@symbol\endcsname}% -\@gls@checkmkidxchars\@glo@symbol -\@gls@checkmkidxchars\@glo@prefix -\edef\@glo@parent{\csname glo@#1@parent\endcsname}% -\ifglsxindy - \ifx\@glo@parent\@empty - \expandafter\protected@xdef\csname glo@#1@index\endcsname{% - (\string"\@glo@sort\string" % - \string"\@glo@prefix\@glossaryentryfield{#1}{\@glo@name - }{\@glo@desc}{\@glo@symbol}\string") % - }% + \def\@glo@label{#1}% + \@gls@checkmkidxchars\@glo@label + \protected@edef\@glo@sort{\csname glo@#1@sort\endcsname}% + \@gls@checkmkidxchars\@glo@sort + \@gls@checkmkidxchars\@glo@prefix + \edef\@glo@parent{\csname glo@#1@parent\endcsname}% + \ifglsxindy + \ifx\@glo@parent\@empty + \expandafter\protected@xdef\csname glo@#1@index\endcsname{% + (\string"\@glo@sort\string" % + \string"\@glo@prefix\@glossaryentryfield{\@glo@label}\string") % + }% + \else + \expandafter\protected@xdef\csname glo@#1@index\endcsname{% + \csname glo@\@glo@parent @index\endcsname + (\string"\@glo@sort\string" % + \string"\@glo@prefix\@glossarysubentryfield + {\csname glo@#1@level\endcsname}{\@glo@label}\string") % + }% + \fi \else - \expandafter\protected@xdef\csname glo@#1@index\endcsname{% - \csname glo@\@glo@parent @index\endcsname - (\string"\@glo@sort\string" % - \string"\@glo@prefix\@glossarysubentryfield% - {\csname glo@#1@level\endcsname}{#1}{\@glo@name - }{\@glo@desc}{\@glo@symbol}\string") % - }% + \ifx\@glo@parent\@empty + \@onelevel@sanitize\@glo@prefix + \expandafter\protected@xdef\csname glo@#1@index\endcsname{% + \@glo@sort\@gls@actualchar\@glo@prefix + \@glossaryentryfield{\@glo@label}% + }% + \else + \expandafter\protected@xdef\csname glo@#1@index\endcsname{% + \csname glo@\@glo@parent @index\endcsname\@gls@levelchar + \@glo@sort\@gls@actualchar\@glo@prefix + \@glossarysubentryfield + {\csname glo@#1@level\endcsname}{\@glo@label}% + }% + \fi \fi -\else - \ifx\@glo@parent\@empty - \@onelevel@sanitize\@glo@prefix - \expandafter\protected@xdef\csname glo@#1@index\endcsname{% - \@glo@sort\@gls@actualchar\@glo@prefix - \@glossaryentryfield{#1}{\@glo@name}{\@glo@desc - }{\@glo@symbol}% - }% +} +\AtBeginDocument{% + \@ifpackageloaded{amsmath}% + {\let\gls@ifnotmeasuring\@gls@ifnotmeasuring}% + {}% +} +\newcommand*{\@gls@ifnotmeasuring}[1]{% + \ifmeasuring@ \else - \expandafter\protected@xdef\csname glo@#1@index\endcsname{% - \csname glo@\@glo@parent @index\endcsname\@gls@levelchar - \@glo@sort\@gls@actualchar\@glo@prefix - \@glossarysubentryfield - {\csname glo@#1@level\endcsname}{#1}{\@glo@name}{\@glo@desc - }{\@glo@symbol}% - }% + #1% \fi -\fi } +\newcommand*\gls@ifnotmeasuring[1]{#1} \newcommand*{\glsreset}[1]{% -\glsdoifexists{#1}{% -\expandafter\global\csname glo@#1@flagfalse\endcsname}} + \gls@ifnotmeasuring + {% + \glsdoifexists{#1}% + {% + \expandafter\global\csname glo@#1@flagfalse\endcsname + }% + }% +} \newcommand*{\glslocalreset}[1]{% -\glsdoifexists{#1}{% -\expandafter\let\csname ifglo@#1@flag\endcsname\iffalse}} + \gls@ifnotmeasuring + {% + \glsdoifexists{#1}% + {% + \expandafter\let\csname ifglo@#1@flag\endcsname\iffalse + }% + }% +} \newcommand*{\glsunset}[1]{% -\glsdoifexists{#1}{% -\expandafter\global\csname glo@#1@flagtrue\endcsname}} + \gls@ifnotmeasuring + {% + \glsdoifexists{#1}% + {% + \expandafter\global\csname glo@#1@flagtrue\endcsname + }% + }% +} \newcommand*{\glslocalunset}[1]{% -\glsdoifexists{#1}{% -\expandafter\let\csname ifglo@#1@flag\endcsname\iftrue}} + \gls@ifnotmeasuring + {% + \glsdoifexists{#1}% + {% + \expandafter\let\csname ifglo@#1@flag\endcsname\iftrue + }% + }% +} \newcommand*{\glsresetall}[1][\@glo@types]{% -\forallglsentries[#1]{\@glsentry}{% -\glsreset{\@glsentry}}} + \forallglsentries[#1]{\@glsentry}% + {% + \glsreset{\@glsentry}% + }% +} \newcommand*{\glslocalresetall}[1][\@glo@types]{% -\forallglsentries[#1]{\@glsentry}{% -\glslocalreset{\@glsentry}}} + \forallglsentries[#1]{\@glsentry}% + {% + \glslocalreset{\@glsentry}% + }% +} \newcommand*{\glsunsetall}[1][\@glo@types]{% -\forallglsentries[#1]{\@glsentry}{% -\glsunset{\@glsentry}}} + \forallglsentries[#1]{\@glsentry}% + {% + \glsunset{\@glsentry}% + }% +} \newcommand*{\glslocalunsetall}[1][\@glo@types]{% -\forallglsentries[#1]{\@glsentry}{% -\glslocalunset{\@glsentry}}} + \forallglsentries[#1]{\@glsentry}% + {% + \glslocalunset{\@glsentry}% + }% +} \newcommand*{\loadglsentries}[2][\@gls@default]{% -\let\@gls@default\glsdefaulttype -\def\glsdefaulttype{#1}\input{#2}% -\let\glsdefaulttype\@gls@default} + \let\@gls@default\glsdefaulttype + \def\glsdefaulttype{#1}\input{#2}% + \let\glsdefaulttype\@gls@default +} \@onlypreamble{\loadglsentries} \newcommand*{\glstextformat}[1]{#1} +\newcommand*{\glsentryfmt}{% + \@@gls@default@entryfmt\glsdisplayfirst\glsdisplay +} +\newcommand*{\@@gls@default@entryfmt}[2]{% + \ifdefempty\glscustomtext + {% + \glsifplural + {% + \glscapscase + {% + \ifglsused\glslabel + {% + #2{\glsentryplural{\glslabel}}% + {\glsentrydescplural{\glslabel}}% + {\glsentrysymbolplural{\glslabel}}{\glsinsert}% + }% + {% + #1{\glsentryfirstplural{\glslabel}}% + {\glsentrydescplural{\glslabel}}% + {\glsentrysymbolplural{\glslabel}}{\glsinsert}% + }% + }% + {% + \ifglsused\glslabel + {% + \ifbool{glscompatible-3.07}% + {% + \protected@edef\@glo@etext{% + #2{\glsentryplural{\glslabel}}% + {\glsentrydescplural{\glslabel}}% + {\glsentrysymbolplural{\glslabel}}{\glsinsert}}% + \xmakefirstuc\@glo@etext + }% + {% + #2{\Glsentryplural{\glslabel}}% + {\glsentrydescplural{\glslabel}}% + {\glsentrysymbolplural{\glslabel}}{\glsinsert}% + }% + }% + {% + \ifbool{glscompatible-3.07}% + {% + \protected@edef\@glo@etext{% + #1{\glsentryfirstplural{\glslabel}}% + {\glsentrydescplural{\glslabel}}% + {\glsentrysymbolplural{\glslabel}}{\glsinsert}}% + \xmakefirstuc\@glo@etext + }% + {% + #1{\Glsentryfirstplural{\glslabel}}% + {\glsentrydescplural{\glslabel}}% + {\glsentrysymbolplural{\glslabel}}{\glsinsert}% + }% + }% + }% + {% + \ifglsused\glslabel + {% + \mfirstucMakeUppercase{#2{\glsentryplural{\glslabel}}% + {\glsentrydescplural{\glslabel}}% + {\glsentrysymbolplural{\glslabel}}{\glsinsert}}% + }% + {% + \mfirstucMakeUppercase{#1{\glsentryfirstplural{\glslabel}}% + {\glsentrydescplural{\glslabel}}% + {\glsentrysymbolplural{\glslabel}}{\glsinsert}}% + }% + }% + }% + {% + \glscapscase + {% + \ifglsused\glslabel + {% + #2{\glsentrytext{\glslabel}}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{\glsinsert}% + }% + {% + #1{\glsentryfirst{\glslabel}}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{\glsinsert}% + }% + }% + {% + \ifglsused\glslabel + {% + \ifbool{glscompatible-3.07}% + {% + \protected@edef\@glo@etext{% + #2{\glsentrytext{\glslabel}}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{\glsinsert}}% + \xmakefirstuc\@glo@etext + }% + {% + #2{\Glsentrytext{\glslabel}}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{\glsinsert}% + }% + }% + {% + \ifbool{glscompatible-3.07}% + {% + \protected@edef\@glo@etext{% + #1{\glsentryfirst{\glslabel}}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{\glsinsert}}% + \xmakefirstuc\@glo@etext + }% + {% + #1{\Glsentryfirst{\glslabel}}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{\glsinsert}% + }% + }% + }% + {% + \ifglsused\glslabel + {% + \mfirstucMakeUppercase{#2{\glsentrytext{\glslabel}}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{\glsinsert}}% + }% + {% + \mfirstucMakeUppercase{#1{\glsentryfirst{\glslabel}}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{\glsinsert}}% + }% + }% + }% + }% + {% + \ifglsused{\glslabel}% + {% + #2{\glscustomtext}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{}% + }% + {% + #1{\glscustomtext}% + {\glsentrydesc{\glslabel}}% + {\glsentrysymbol{\glslabel}}{}% + }% + }% +} +\newcommand*{\glsgenentryfmt}{% + \ifdefempty\glscustomtext + {% + \glsifplural + {% + \glscapscase + {% + \ifglsused\glslabel + {% + \glsentryplural{\glslabel}\glsinsert + }% + {% + \glsentryfirstplural{\glslabel}\glsinsert + }% + }% + {% + \ifglsused\glslabel + {% + \Glsentryplural{\glslabel}\glsinsert + }% + {% + \Glsentryfirstplural{\glslabel}\glsinsert + }% + }% + {% + \ifglsused\glslabel + {% + \mfirstucMakeUppercase + {\glsentryplural{\glslabel}\glsinsert}% + }% + {% + \mfirstucMakeUppercase + {\glsentryfirstplural{\glslabel}\glsinsert}% + }% + }% + }% + {% + \glscapscase + {% + \ifglsused\glslabel + {% + \glsentrytext{\glslabel}\glsinsert + }% + {% + \glsentryfirst{\glslabel}\glsinsert + }% + }% + {% + \ifglsused\glslabel + {% + \Glsentrytext{\glslabel}\glsinsert + }% + {% + \Glsentryfirst{\glslabel}\glsinsert + }% + }% + {% + \ifglsused\glslabel + {% + \mfirstucMakeUppercase{\glsentrytext{\glslabel}\glsinsert}% + }% + {% + \mfirstucMakeUppercase{\glsentryfirst{\glslabel}\glsinsert}% + }% + }% + }% + }% + {% + \glscustomtext\glsinsert + }% +} \newcommand*{\glsdisplayfirst}[4]{#1#4} \newcommand*{\glsdisplay}[4]{#1#4} \newcommand*{\defglsdisplay}[2][\glsdefaulttype]{% -\expandafter\def\csname gls@#1@display\endcsname##1##2##3##4{#2}} + \GlossariesWarning{\string\defglsdisplay\space is now obsolete.^^J + Use \string\defglsentryfmt\space instead}% + \expandafter\def\csname gls@#1@display\endcsname##1##2##3##4{#2}% + \edef\@gls@doentrydef{% + \noexpand\defglsentryfmt[#1]{% + \noexpand\ifcsdef{gls@#1@displayfirst}% + {% + \noexpand\@@gls@default@entryfmt + {\noexpand\csuse{gls@#1@displayfirst}} + {\noexpand\csuse{gls@#1@display}}% + }% + {% + \noexpand\@@gls@default@entryfmt + {\noexpand\glsdisplayfirst} + {\noexpand\csuse{gls@#1@display}}% + }% + }% + }% + \@gls@doentrydef +} \newcommand*{\defglsdisplayfirst}[2][\glsdefaulttype]{% -\expandafter\def\csname gls@#1@displayfirst\endcsname##1##2##3##4{#2}} + \GlossariesWarning{\string\defglsdisplayfirst\space is now obsolete.^^J + Use \string\defglsentryfmt\space instead}% + \expandafter\def\csname gls@#1@displayfirst\endcsname##1##2##3##4{#2}% + \edef\@gls@doentrydef{% + \noexpand\defglsentryfmt[#1]{% + \noexpand\ifcsdef{gls@#1@display}% + {% + \noexpand\@@gls@default@entryfmt + {\noexpand\csuse{gls@#1@displayfirst}} + {\noexpand\csuse{gls@#1@display}}% + }% + {% + \noexpand\@@gls@default@entryfmt + {\noexpand\csuse{gls@#1@displayfirst}}% + {\noexpand\glsdisplay} + }% + }% + }% + \@gls@doentrydef +} \define@key{glslink}{counter}{% \ifcsundef{c@#1}% {% @@ -1506,7 +2344,8 @@ name=true]{% \define@boolkey{glslink}{hyper}[true]{} \define@boolkey{glslink}{local}[true]{} \newrobustcmd*{\glslink}{% -\@ifstar\@sgls@link\@gls@@link} + \@ifstar\@sgls@link\@gls@@link +} \newcommand*{\@sgls@link}[1][]{\@gls@@link[hyper=false,#1]} \newcommand*{\@gls@@link}[3][]{% \ifglsentryexists{#2}% @@ -1540,7 +2379,7 @@ name=true]{% \ifKV@glslink@hyper \@glslink{\glolinkprefix#2}{\glstextformat{#3}}% \else - \glstextformat{#3}\relax + \glstextformat{#3}% \fi } \newcommand*{\glolinkprefix}{glo:} @@ -1642,236 +2481,244 @@ name=true]{% \let#1=\gls@xdystring } \newcommand{\@gls@checkmkidxchars}[1]{% -\ifglsxindy - \@gls@escbsdq{#1}% -\else - \def\@gls@checkedmkidx{}% - \expandafter\@gls@checkquote#1\@nil""\null - \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% - \def\@gls@checkedmkidx{}% - \expandafter\@gls@checkescquote#1\@nil\"\"\null - \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% - \def\@gls@checkedmkidx{}% - \expandafter\@gls@checkescactual#1\@nil\?\?\null - \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% - \def\@gls@checkedmkidx{}% - \expandafter\@gls@checkactual#1\@nil??\null - \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% - \def\@gls@checkedmkidx{}% - \expandafter\@gls@checkbar#1\@nil||\null - \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% - \def\@gls@checkedmkidx{}% - \expandafter\@gls@checkescbar#1\@nil\|\|\null - \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% - \def\@gls@checkedmkidx{}% - \expandafter\@gls@checklevel#1\@nil!!\null - \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% -\fi + \ifglsxindy + \@gls@escbsdq{#1}% + \else + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkquote#1\@nil""\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkescquote#1\@nil\"\"\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkescactual#1\@nil\?\?\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkactual#1\@nil??\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkbar#1\@nil||\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checkescbar#1\@nil\|\|\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \def\@gls@checkedmkidx{}% + \expandafter\@gls@checklevel#1\@nil!!\null + \expandafter\@gls@updatechecked\@gls@checkedmkidx{#1}% + \fi } \def\@gls@updatechecked#1\@nil#2{\def#2{#1}} \newtoks\@gls@tmpb \def\@gls@checkquote#1"#2"#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@checkquote{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\@gls@quotechar\@gls@quotechar\@gls@quotechar}% - \def\@@gls@checkquote{\@gls@checkquote#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\@gls@quotechar}% - \ifx\null#3\null - \def\@@gls@checkquote{\@gls@checkquote#2""\null}% - \else - \def\@@gls@checkquote{\@gls@checkquote#2"#3\null}% - \fi -\fi -\@@gls@checkquote} + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@checkquote{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\@gls@quotechar\@gls@quotechar\@gls@quotechar}% + \def\@@gls@checkquote{\@gls@checkquote#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\@gls@quotechar}% + \ifx\null#3\null + \def\@@gls@checkquote{\@gls@checkquote#2""\null}% + \else + \def\@@gls@checkquote{\@gls@checkquote#2"#3\null}% + \fi + \fi + \@@gls@checkquote +} \def\@gls@checkescquote#1\"#2\"#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@checkescquote{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\string\"\@gls@quotechar - \@gls@quotechar\string\"\@gls@quotechar}% - \def\@@gls@checkescquote{\@gls@checkescquote#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\string\"\@gls@quotechar}% - \ifx\null#3\null - \def\@@gls@checkescquote{\@gls@checkescquote#2\"\"\null}% - \else - \def\@@gls@checkescquote{\@gls@checkescquote#2\"#3\null}% - \fi -\fi -\@@gls@checkescquote} + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@checkescquote{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\string\"\@gls@quotechar + \@gls@quotechar\string\"\@gls@quotechar}% + \def\@@gls@checkescquote{\@gls@checkescquote#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\string\"\@gls@quotechar}% + \ifx\null#3\null + \def\@@gls@checkescquote{\@gls@checkescquote#2\"\"\null}% + \else + \def\@@gls@checkescquote{\@gls@checkescquote#2\"#3\null}% + \fi + \fi +\@@gls@checkescquote +} \def\@gls@checkescactual#1\?#2\?#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@checkescactual{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\string\"\@gls@actualchar + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@checkescactual{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\string\"\@gls@actualchar + \@gls@quotechar\string\"\@gls@actualchar}% + \def\@@gls@checkescactual{\@gls@checkescactual#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ \@gls@quotechar\string\"\@gls@actualchar}% - \def\@@gls@checkescactual{\@gls@checkescactual#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\string\"\@gls@actualchar}% - \ifx\null#3\null - \def\@@gls@checkescactual{\@gls@checkescactual#2\?\?\null}% - \else - \def\@@gls@checkescactual{\@gls@checkescactual#2\?#3\null}% - \fi -\fi -\@@gls@checkescactual} + \ifx\null#3\null + \def\@@gls@checkescactual{\@gls@checkescactual#2\?\?\null}% + \else + \def\@@gls@checkescactual{\@gls@checkescactual#2\?#3\null}% + \fi + \fi +\@@gls@checkescactual +} \def\@gls@checkescbar#1\|#2\|#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@checkescbar{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\string\"\@gls@encapchar - \@gls@quotechar\string\"\@gls@encapchar}% - \def\@@gls@checkescbar{\@gls@checkescbar#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\string\"\@gls@encapchar}% - \ifx\null#3\null - \def\@@gls@checkescbar{\@gls@checkescbar#2\|\|\null}% - \else - \def\@@gls@checkescbar{\@gls@checkescbar#2\|#3\null}% - \fi -\fi -\@@gls@checkescbar} + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@checkescbar{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\string\"\@gls@encapchar + \@gls@quotechar\string\"\@gls@encapchar}% + \def\@@gls@checkescbar{\@gls@checkescbar#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\string\"\@gls@encapchar}% + \ifx\null#3\null + \def\@@gls@checkescbar{\@gls@checkescbar#2\|\|\null}% + \else + \def\@@gls@checkescbar{\@gls@checkescbar#2\|#3\null}% + \fi + \fi +\@@gls@checkescbar +} \def\@gls@checkesclevel#1\!#2\!#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@checkesclevel{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\string\"\@gls@levelchar - \@gls@quotechar\string\"\@gls@levelchar}% - \def\@@gls@checkesclevel{\@gls@checkesclevel#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\string\"\@gls@levelchar}% - \ifx\null#3\null - \def\@@gls@checkesclevel{\@gls@checkesclevel#2\!\!\null}% - \else - \def\@@gls@checkesclevel{\@gls@checkesclevel#2\!#3\null}% - \fi -\fi -\@@gls@checkesclevel} + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@checkesclevel{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\string\"\@gls@levelchar + \@gls@quotechar\string\"\@gls@levelchar}% + \def\@@gls@checkesclevel{\@gls@checkesclevel#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\string\"\@gls@levelchar}% + \ifx\null#3\null + \def\@@gls@checkesclevel{\@gls@checkesclevel#2\!\!\null}% + \else + \def\@@gls@checkesclevel{\@gls@checkesclevel#2\!#3\null}% + \fi + \fi +\@@gls@checkesclevel +} \def\@gls@checkbar#1|#2|#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@checkbar{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\@gls@encapchar\@gls@quotechar\@gls@encapchar}% - \def\@@gls@checkbar{\@gls@checkbar#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\@gls@encapchar}% - \ifx\null#3\null - \def\@@gls@checkbar{\@gls@checkbar#2||\null}% - \else - \def\@@gls@checkbar{\@gls@checkbar#2|#3\null}% - \fi -\fi -\@@gls@checkbar} + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@checkbar{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\@gls@encapchar\@gls@quotechar\@gls@encapchar}% + \def\@@gls@checkbar{\@gls@checkbar#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\@gls@encapchar}% + \ifx\null#3\null + \def\@@gls@checkbar{\@gls@checkbar#2||\null}% + \else + \def\@@gls@checkbar{\@gls@checkbar#2|#3\null}% + \fi + \fi + \@@gls@checkbar +} \def\@gls@checklevel#1!#2!#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@checklevel{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\@gls@levelchar\@gls@quotechar\@gls@levelchar}% - \def\@@gls@checklevel{\@gls@checklevel#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\@gls@levelchar}% - \ifx\null#3\null - \def\@@gls@checklevel{\@gls@checklevel#2!!\null}% - \else - \def\@@gls@checklevel{\@gls@checklevel#2!#3\null}% - \fi -\fi -\@@gls@checklevel} + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@checklevel{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\@gls@levelchar\@gls@quotechar\@gls@levelchar}% + \def\@@gls@checklevel{\@gls@checklevel#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\@gls@levelchar}% + \ifx\null#3\null + \def\@@gls@checklevel{\@gls@checklevel#2!!\null}% + \else + \def\@@gls@checklevel{\@gls@checklevel#2!#3\null}% + \fi + \fi + \@@gls@checklevel +} \def\@gls@checkactual#1?#2?#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@checkactual{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\@gls@actualchar\@gls@quotechar\@gls@actualchar}% - \def\@@gls@checkactual{\@gls@checkactual#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \@gls@quotechar\@gls@actualchar}% - \ifx\null#3\null - \def\@@gls@checkactual{\@gls@checkactual#2??\null}% - \else - \def\@@gls@checkactual{\@gls@checkactual#2?#3\null}% - \fi -\fi -\@@gls@checkactual} + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@checkactual{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\@gls@actualchar\@gls@quotechar\@gls@actualchar}% + \def\@@gls@checkactual{\@gls@checkactual#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \@gls@quotechar\@gls@actualchar}% + \ifx\null#3\null + \def\@@gls@checkactual{\@gls@checkactual#2??\null}% + \else + \def\@@gls@checkactual{\@gls@checkactual#2?#3\null}% + \fi + \fi + \@@gls@checkactual +} \def\@gls@xdycheckquote#1"#2"#3\null{% -\@gls@tmpb=\expandafter{\@gls@checkedmkidx}% -\toks@={#1}% -\ifx\null#2\null - \ifx\null#3\null - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% - \def\@@gls@xdycheckquote{\relax}% - \else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \string\"\string\"}% - \def\@@gls@xdycheckquote{\@gls@xdycheckquote#3\null}% - \fi -\else - \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ - \string\"}% - \ifx\null#3\null - \def\@@gls@xdycheckquote{\@gls@xdycheckquote#2""\null}% - \else - \def\@@gls@xdycheckquote{\@gls@xdycheckquote#2"#3\null}% - \fi -\fi -\@@gls@xdycheckquote + \@gls@tmpb=\expandafter{\@gls@checkedmkidx}% + \toks@={#1}% + \ifx\null#2\null + \ifx\null#3\null + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@}% + \def\@@gls@xdycheckquote{\relax}% + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \string\"\string\"}% + \def\@@gls@xdycheckquote{\@gls@xdycheckquote#3\null}% + \fi + \else + \edef\@gls@checkedmkidx{\the\@gls@tmpb\the\toks@ + \string\"}% + \ifx\null#3\null + \def\@@gls@xdycheckquote{\@gls@xdycheckquote#2""\null}% + \else + \def\@@gls@xdycheckquote{\@gls@xdycheckquote#2"#3\null}% + \fi + \fi + \@@gls@xdycheckquote } \edef\def@gls@xdycheckbackslash{% \noexpand\def\noexpand\@gls@xdycheckbackslash##1\@backslashchar @@ -1916,8 +2763,7 @@ name=true]{% {% \gdef\@glslink#1#2{\hyperlink{#1}{#2}}% } -\newlength\gls@tmplen -\ifcsundef{hypertarget}% +\newlength\gls@tmplen \ifcsundef{hypertarget}% {% \gdef\@glstarget#1#2{#2}% }% @@ -1928,13 +2774,17 @@ name=true]{% }% } \newcommand{\glsdisablehyper}{% -\renewcommand*\@glslink[2]{##2}% -\renewcommand*\@glstarget[2]{##2}} + \renewcommand*\@glslink[2]{##2}% + \renewcommand*\@glstarget[2]{##2}% +} \newcommand{\glsenablehyper}{% \renewcommand*\@glslink[2]{\hyperlink{##1}{##2}}% \renewcommand*\@glstarget[2]{% \settoheight{\gls@tmplen}{##2}% \raisebox{\gls@tmplen}{\hypertarget{##1}{}}##2}} +\providecommand{\@firstofthree}[3]{#1} +\providecommand{\@secondofthree}[3]{#2} +\providecommand{\@thirdofthree}[3]{#3} \newrobustcmd*{\gls}{\@ifstar\@sgls\@gls} \newcommand*{\@sgls}[1][]{\@gls[hyper=false,#1]} \newcommand*{\@gls}[2][]{% @@ -1946,17 +2796,12 @@ name=true]{% \edef\@glo@type{\glsentrytype{#2}}% \def\@gls@link@opts{#1}% \def\@gls@link@label{#2}% - \ifglsused{#2}% - {% - \def\@glo@text{% - \csname gls@\@glo@type @display\endcsname - {\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% - }% - {% - \def\@glo@text{% - \csname gls@\@glo@type @displayfirst\endcsname - {\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}}% - }% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@firstofthree + \let\glscustomtext\@empty + \def\glsinsert{#3}% + \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}% \ifglsused{#2}% {% \@gls@link[#1]{#2}{\@glo@text}% @@ -1993,23 +2838,14 @@ name=true]{% \def\@gls@link@opts{#1}% \def\@gls@link@label{#2}% \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@secondofthree + \let\glscustomtext\@empty + \def\glsinsert{#3}% + \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}% \ifglsused{#2}% {% - \protected@edef\@glo@text{% - \csname gls@\@glo@type @display\endcsname - {\glsentrytext{#2}}{\glsentrydesc{#2}}% - {\glsentrysymbol{#2}}{#3}}% - }% - {% - \protected@edef\@glo@text{% - \csname gls@\@glo@type @displayfirst\endcsname - {\glsentryfirst{#2}}{\glsentrydesc{#2}}% - {\glsentrysymbol{#2}}{#3}}% - }% - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}}% + \@gls@link[#1]{#2}{\@glo@text}% }% {% \gls@checkisacronymlist\@glo@type @@ -2019,12 +2855,10 @@ name=true]{% \OR \NOT\boolean{glshyperfirst}% }% {% - \@gls@link[#1,hyper=false]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}}% + \@gls@link[#1,hyper=false]{#2}{\@glo@text}% }% {% - \@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}}% + \@gls@link[#1]{#2}{\@glo@text}% }% }% \ifKV@glslink@local @@ -2045,22 +2879,15 @@ name=true]{% \edef\@glo@type{\glsentrytype{#2}}% \def\@gls@link@opts{#1}% \def\@gls@link@label{#2}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@thirdofthree + \let\glscustomtext\@empty + \def\glsinsert{#3}% + \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}% \ifglsused{#2}% {% - \def\@glo@text{% - \csname gls@\@glo@type @display\endcsname - {\glsentrytext{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}% - }% - }% - {% - \def\@glo@text{% - \csname gls@\@glo@type @displayfirst\endcsname - {\glsentryfirst{#2}}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{#3}% - }% - }% - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% + \@gls@link[#1]{#2}{\@glo@text}% }% {% \gls@checkisacronymlist\@glo@type @@ -2068,10 +2895,10 @@ name=true]{% {% \(\boolean{@glsisacronymlist}\AND \boolean{glsacrfootnote}\) \OR \NOT\boolean{glshyperfirst}}{% - \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}% + \@gls@link[#1,hyper=false]{#2}{\@glo@text}% }% {% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% + \@gls@link[#1]{#2}{\@glo@text}% }% }% \ifKV@glslink@local @@ -2092,19 +2919,12 @@ name=true]{% \edef\@glo@type{\glsentrytype{#2}}% \def\@gls@link@opts{#1}% \def\@gls@link@label{#2}% - \ifglsused{#2}% - {% - \def\@glo@text{% - \csname gls@\@glo@type @display\endcsname - {\glsentryplural{#2}}{\glsentrydescplural{#2}}% - {\glsentrysymbolplural{#2}}{#3}}% - }% - {% - \def\@glo@text{% - \csname gls@\@glo@type @displayfirst\endcsname - {\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}% - {\glsentrysymbolplural{#2}}{#3}}% - }% + \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@firstofthree + \let\glscustomtext\@empty + \def\glsinsert{#3}% + \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}% \ifglsused{#2}% {% \@gls@link[#1]{#2}{\@glo@text}% @@ -2142,23 +2962,14 @@ name=true]{% \def\@gls@link@opts{#1}% \def\@gls@link@label{#2}% \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@secondofthree + \let\glscustomtext\@empty + \def\glsinsert{#3}% + \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}% \ifglsused{#2}% {% - \protected@edef\@glo@text{% - \csname gls@\@glo@type @display\endcsname - {\glsentryplural{#2}}{\glsentrydescplural{#2}}% - {\glsentrysymbolplural{#2}}{#3}}% - }% - {% - \protected@edef\@glo@text{% - \csname gls@\@glo@type @displayfirst\endcsname - {\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}% - {\glsentrysymbolplural{#2}}{#3}}% - }% - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}}% + \@gls@link[#1]{#2}{\@glo@text}% }% {% \gls@checkisacronymlist\@glo@type @@ -2168,12 +2979,10 @@ name=true]{% \OR \NOT\boolean{glshyperfirst}% }% {% - \@gls@link[#1,hyper=false]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}}% + \@gls@link[#1,hyper=false]{#2}{\@glo@text}% }% {% - \@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}}% + \@gls@link[#1]{#2}{\@glo@text}% }% }% \ifKV@glslink@local @@ -2194,24 +3003,15 @@ name=true]{% \edef\@glo@type{\glsentrytype{#2}}% \def\@gls@link@opts{#1}% \def\@gls@link@label{#2}% + \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@thirdofthree + \let\glscustomtext\@empty + \def\glsinsert{#3}% + \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}% \ifglsused{#2}% {% - \def\@glo@text{% - \csname gls@\@glo@type @display\endcsname - {\glsentryplural{#2}}{\glsentrydescplural{#2}}% - {\glsentrysymbolplural{#2}}{#3}% - }% - }% - {% - \def\@glo@text{% - \csname gls@\@glo@type @displayfirst\endcsname - {\glsentryfirstplural{#2}}{\glsentrydescplural{#2}}% - {\glsentrysymbolplural{#2}}{#3}% - }% - }% - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% + \@gls@link[#1]{#2}{\@glo@text}% }% {% \gls@checkisacronymlist\@glo@type @@ -2221,10 +3021,10 @@ name=true]{% \OR \NOT\boolean{glshyperfirst}% }% {% - \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}% + \@gls@link[#1,hyper=false]{#2}{\@glo@text}% }% {% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% + \@gls@link[#1]{#2}{\@glo@text}% }% }% \ifKV@glslink@local @@ -2241,17 +3041,12 @@ name=true]{% \edef\@glo@type{\glsentrytype{#2}}% \def\@gls@link@opts{#1}% \def\@gls@link@label{#2}% - \ifglsused{#2}% - {% - \def\@glo@text{% - \csname gls@\@glo@type @display\endcsname - {#3}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{}}% - }% - {% - \def\@glo@text{% - \csname gls@\@glo@type @displayfirst\endcsname - {#3}{\glsentrydesc{#2}}{\glsentrysymbol{#2}}{}}% - }% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@firstofthree + \def\glscustomtext{#3}% + \def\glsinsert{}% + \def\@glo@text{\csname gls@\@glo@type @entryfmt\endcsname}% \ifglsused{#2}% {% \@gls@link[#1]{#2}{\@glo@text}% @@ -2277,467 +3072,496 @@ name=true]{% \newrobustcmd*{\glstext}{\@ifstar\@sglstext\@glstext} \newcommand*{\@sglstext}[1][]{\@glstext[hyper=false,#1]} \newcommand*{\@glstext}[2][]{% -\new@ifnextchar[{\@glstext@{#1}{#2}}{\@glstext@{#1}{#2}[]}} + \new@ifnextchar[{\@glstext@{#1}{#2}}{\@glstext@{#1}{#2}[]}} \def\@glstext@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentrytext{#2}}% -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\glsentrytext{#2}#3}% + }% } \newrobustcmd*{\GLStext}{\@ifstar\@sGLStext\@GLStext} \newcommand*{\@sGLStext}[1][]{\@GLStext[hyper=false,#1]} \newcommand*{\@GLStext}[2][]{% -\new@ifnextchar[{\@GLStext@{#1}{#2}}{\@GLStext@{#1}{#2}[]}} + \new@ifnextchar[{\@GLStext@{#1}{#2}}{\@GLStext@{#1}{#2}[]}} \def\@GLStext@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentrytext{#2}}% -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrytext{#2}#3}}% + }% } \newrobustcmd*{\Glstext}{\@ifstar\@sGlstext\@Glstext} \newcommand*{\@sGlstext}[1][]{\@Glstext[hyper=false,#1]} \newcommand*{\@Glstext}[2][]{% -\new@ifnextchar[{\@Glstext@{#1}{#2}}{\@Glstext@{#1}{#2}[]}} + \new@ifnextchar[{\@Glstext@{#1}{#2}}{\@Glstext@{#1}{#2}[]}} \def\@Glstext@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentrytext{#2}}% -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\Glsentrytext{#2}#3}% + }% } \newrobustcmd*{\glsfirst}{\@ifstar\@sglsfirst\@glsfirst} \newcommand*{\@sglsfirst}[1][]{\@glsfirst[hyper=false,#1]} \newcommand*{\@glsfirst}[2][]{% -\new@ifnextchar[{\@glsfirst@{#1}{#2}}{\@glsfirst@{#1}{#2}[]}} + \new@ifnextchar[{\@glsfirst@{#1}{#2}}{\@glsfirst@{#1}{#2}[]}} \def\@glsfirst@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryfirst{#2}}% -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\glsentryfirst{#2}#3}% + }% } \newrobustcmd*{\Glsfirst}{\@ifstar\@sGlsfirst\@Glsfirst} \newcommand*{\@sGlsfirst}[1][]{\@Glsfirst[hyper=false,#1]} \newcommand*{\@Glsfirst}[2][]{% -\new@ifnextchar[{\@Glsfirst@{#1}{#2}}{\@Glsfirst@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsfirst@{#1}{#2}}{\@Glsfirst@{#1}{#2}[]}} \def\@Glsfirst@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryfirst{#2}}% -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\Glsentryfirst{#2}#3}}% } \newrobustcmd*{\GLSfirst}{\@ifstar\@sGLSfirst\@GLSfirst} \newcommand*{\@sGLSfirst}[1][]{\@GLSfirst[hyper=false,#1]} \newcommand*{\@GLSfirst}[2][]{% -\new@ifnextchar[{\@GLSfirst@{#1}{#2}}{\@GLSfirst@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSfirst@{#1}{#2}}{\@GLSfirst@{#1}{#2}[]}} \def\@GLSfirst@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryfirst{#2}}% -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryfirst{#2}#3}}% + }% } \newrobustcmd*{\glsplural}{\@ifstar\@sglsplural\@glsplural} \newcommand*{\@sglsplural}[1][]{\@glsplural[hyper=false,#1]} \newcommand*{\@glsplural}[2][]{% -\new@ifnextchar[{\@glsplural@{#1}{#2}}{\@glsplural@{#1}{#2}[]}} + \new@ifnextchar[{\@glsplural@{#1}{#2}}{\@glsplural@{#1}{#2}[]}} \def\@glsplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryplural{#2}}% -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\glsentryplural{#2}#3}% + }% } \newrobustcmd*{\Glsplural}{\@ifstar\@sGlsplural\@Glsplural} \newcommand*{\@sGlsplural}[1][]{\@Glsplural[hyper=false,#1]} \newcommand*{\@Glsplural}[2][]{% -\new@ifnextchar[{\@Glsplural@{#1}{#2}}{\@Glsplural@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsplural@{#1}{#2}}{\@Glsplural@{#1}{#2}[]}} \def\@Glsplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryplural{#2}}% -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\Glsentryplural{#2}#3}% + }% } \newrobustcmd*{\GLSplural}{\@ifstar\@sGLSplural\@GLSplural} \newcommand*{\@sGLSplural}[1][]{\@GLSplural[hyper=false,#1]} \newcommand*{\@GLSplural}[2][]{% -\new@ifnextchar[{\@GLSplural@{#1}{#2}}{\@GLSplural@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSplural@{#1}{#2}}{\@GLSplural@{#1}{#2}[]}} \def\@GLSplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryplural{#2}}% -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryplural{#2}#3}}% + }% } \newrobustcmd*{\glsfirstplural}{\@ifstar\@sglsfirstplural\@glsfirstplural} \newcommand*{\@sglsfirstplural}[1][]{\@glsfirstplural[hyper=false,#1]} \newcommand*{\@glsfirstplural}[2][]{% -\new@ifnextchar[{\@glsfirstplural@{#1}{#2}}{\@glsfirstplural@{#1}{#2}[]}} + \new@ifnextchar[{\@glsfirstplural@{#1}{#2}}{\@glsfirstplural@{#1}{#2}[]}} \def\@glsfirstplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryfirstplural{#2}}% -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\glsentryfirstplural{#2}#3}% + }% } \newrobustcmd*{\Glsfirstplural}{\@ifstar\@sGlsfirstplural\@Glsfirstplural} \newcommand*{\@sGlsfirstplural}[1][]{\@Glsfirstplural[hyper=false,#1]} \newcommand*{\@Glsfirstplural}[2][]{% -\new@ifnextchar[{\@Glsfirstplural@{#1}{#2}}{\@Glsfirstplural@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsfirstplural@{#1}{#2}}{\@Glsfirstplural@{#1}{#2}[]}} \def\@Glsfirstplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryfirstplural{#2}}% -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\Glsentryfirstplural{#2}#3}% + }% } \newrobustcmd*{\GLSfirstplural}{\@ifstar\@sGLSfirstplural\@GLSfirstplural} \newcommand*{\@sGLSfirstplural}[1][]{\@GLSfirstplural[hyper=false,#1]} \newcommand*{\@GLSfirstplural}[2][]{% -\new@ifnextchar[{\@GLSfirstplural@{#1}{#2}}{\@GLSfirstplural@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSfirstplural@{#1}{#2}}{\@GLSfirstplural@{#1}{#2}[]}} \def\@GLSfirstplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryfirstplural{#2}}% -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryfirstplural{#2}#3}}% + }% } \newrobustcmd*{\glsname}{\@ifstar\@sglsname\@glsname} \newcommand*{\@sglsname}[1][]{\@glsname[hyper=false,#1]} \newcommand*{\@glsname}[2][]{% -\new@ifnextchar[{\@glsname@{#1}{#2}}{\@glsname@{#1}{#2}[]}} + \new@ifnextchar[{\@glsname@{#1}{#2}}{\@glsname@{#1}{#2}[]}} \def\@glsname@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryname{#2}}% -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\glsentryname{#2}#3}% + }% } \newrobustcmd*{\Glsname}{\@ifstar\@sGlsname\@Glsname} \newcommand*{\@sGlsname}[1][]{\@Glsname[hyper=false,#1]} \newcommand*{\@Glsname}[2][]{% -\new@ifnextchar[{\@Glsname@{#1}{#2}}{\@Glsname@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsname@{#1}{#2}}{\@Glsname@{#1}{#2}[]}} \def\@Glsname@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryname{#2}}% -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\Glsentryname{#2}#3}% + }% } \newrobustcmd*{\GLSname}{\@ifstar\@sGLSname\@GLSname} \newcommand*{\@sGLSname}[1][]{\@GLSname[hyper=false,#1]} \newcommand*{\@GLSname}[2][]{% -\new@ifnextchar[{\@GLSname@{#1}{#2}}{\@GLSname@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSname@{#1}{#2}}{\@GLSname@{#1}{#2}[]}} \def\@GLSname@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryname{#2}}% -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryname{#2}#3}}% + }% } \newrobustcmd*{\glsdesc}{\@ifstar\@sglsdesc\@glsdesc} \newcommand*{\@sglsdesc}[1][]{\@glsdesc[hyper=false,#1]} \newcommand*{\@glsdesc}[2][]{% -\new@ifnextchar[{\@glsdesc@{#1}{#2}}{\@glsdesc@{#1}{#2}[]}} + \new@ifnextchar[{\@glsdesc@{#1}{#2}}{\@glsdesc@{#1}{#2}[]}} \def\@glsdesc@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentrydesc{#2}}% -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\glsentrydesc{#2}#3}% + }% } \newrobustcmd*{\Glsdesc}{\@ifstar\@sGlsdesc\@Glsdesc} \newcommand*{\@sGlsdesc}[1][]{\@Glsdesc[hyper=false,#1]} \newcommand*{\@Glsdesc}[2][]{% -\new@ifnextchar[{\@Glsdesc@{#1}{#2}}{\@Glsdesc@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsdesc@{#1}{#2}}{\@Glsdesc@{#1}{#2}[]}} \def\@Glsdesc@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentrydesc{#2}}% -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\Glsentrydesc{#2}#3}% + }% } \newrobustcmd*{\GLSdesc}{\@ifstar\@sGLSdesc\@GLSdesc} \newcommand*{\@sGLSdesc}[1][]{\@GLSdesc[hyper=false,#1]} \newcommand*{\@GLSdesc}[2][]{% -\new@ifnextchar[{\@GLSdesc@{#1}{#2}}{\@GLSdesc@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSdesc@{#1}{#2}}{\@GLSdesc@{#1}{#2}[]}} \def\@GLSdesc@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentrydesc{#2}}% -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrydesc{#2}#3}}% + }% } \newrobustcmd*{\glsdescplural}{\@ifstar\@sglsdescplural\@glsdescplural} \newcommand*{\@sglsdescplural}[1][]{\@glsdescplural[hyper=false,#1]} \newcommand*{\@glsdescplural}[2][]{% -\new@ifnextchar[{\@glsdescplural@{#1}{#2}}{\@glsdescplural@{#1}{#2}[]}} + \new@ifnextchar[{\@glsdescplural@{#1}{#2}}{\@glsdescplural@{#1}{#2}[]}} \def\@glsdescplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentrydescplural{#2}}% -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\glsentrydescplural{#2}#3}% + }% } \newrobustcmd*{\Glsdescplural}{\@ifstar\@sGlsdescplural\@Glsdescplural} \newcommand*{\@sGlsdescplural}[1][]{\@Glsdescplural[hyper=false,#1]} \newcommand*{\@Glsdescplural}[2][]{% -\new@ifnextchar[{\@Glsdescplural@{#1}{#2}}{\@Glsdescplural@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsdescplural@{#1}{#2}}{\@Glsdescplural@{#1}{#2}[]}} \def\@Glsdescplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentrydescplural{#2}}% -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\Glsentrydescplural{#2}#3}% + }% } \newrobustcmd*{\GLSdescplural}{\@ifstar\@sGLSdescplural\@GLSdescplural} \newcommand*{\@sGLSdescplural}[1][]{\@GLSdescplural[hyper=false,#1]} \newcommand*{\@GLSdescplural}[2][]{% -\new@ifnextchar[{\@GLSdescplural@{#1}{#2}}{\@GLSdescplural@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSdescplural@{#1}{#2}}{\@GLSdescplural@{#1}{#2}[]}} \def\@GLSdescplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentrydescplural{#2}}% -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrydescplural{#2}#3}}% + }% } \newrobustcmd*{\glssymbol}{\@ifstar\@sglssymbol\@glssymbol} \newcommand*{\@sglssymbol}[1][]{\@glssymbol[hyper=false,#1]} \newcommand*{\@glssymbol}[2][]{% -\new@ifnextchar[{\@glssymbol@{#1}{#2}}{\@glssymbol@{#1}{#2}[]}} + \new@ifnextchar[{\@glssymbol@{#1}{#2}}{\@glssymbol@{#1}{#2}[]}} \def\@glssymbol@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentrysymbol{#2}}% -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\glsentrysymbol{#2}#3}% + }% } \newrobustcmd*{\Glssymbol}{\@ifstar\@sGlssymbol\@Glssymbol} \newcommand*{\@sGlssymbol}[1][]{\@Glssymbol[hyper=false,#1]} \newcommand*{\@Glssymbol}[2][]{% -\new@ifnextchar[{\@Glssymbol@{#1}{#2}}{\@Glssymbol@{#1}{#2}[]}} + \new@ifnextchar[{\@Glssymbol@{#1}{#2}}{\@Glssymbol@{#1}{#2}[]}} \def\@Glssymbol@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentrysymbol{#2}}% -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\Glsentrysymbol{#2}#3}% + }% } \newrobustcmd*{\GLSsymbol}{\@ifstar\@sGLSsymbol\@GLSsymbol} \newcommand*{\@sGLSsymbol}[1][]{\@GLSsymbol[hyper=false,#1]} \newcommand*{\@GLSsymbol}[2][]{% -\new@ifnextchar[{\@GLSsymbol@{#1}{#2}}{\@GLSsymbol@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSsymbol@{#1}{#2}}{\@GLSsymbol@{#1}{#2}[]}} \def\@GLSsymbol@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentrysymbol{#2}}% -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrysymbol{#2}#3}}% + }% } \newrobustcmd*{\glssymbolplural}{\@ifstar\@sglssymbolplural\@glssymbolplural} \newcommand*{\@sglssymbolplural}[1][]{\@glssymbolplural[hyper=false,#1]} \newcommand*{\@glssymbolplural}[2][]{% -\new@ifnextchar[{\@glssymbolplural@{#1}{#2}}{\@glssymbolplural@{#1}{#2}[]}} + \new@ifnextchar[{\@glssymbolplural@{#1}{#2}}{\@glssymbolplural@{#1}{#2}[]}} \def\@glssymbolplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentrysymbolplural{#2}}% -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\glsentrysymbolplural{#2}#3}% + }% } \newrobustcmd*{\Glssymbolplural}{\@ifstar\@sGlssymbolplural\@Glssymbolplural} \newcommand*{\@sGlssymbolplural}[1][]{\@Glssymbolplural[hyper=false,#1]} \newcommand*{\@Glssymbolplural}[2][]{% -\new@ifnextchar[{\@Glssymbolplural@{#1}{#2}}{\@Glssymbolplural@{#1}{#2}[]}} + \new@ifnextchar[{\@Glssymbolplural@{#1}{#2}}{\@Glssymbolplural@{#1}{#2}[]}} \def\@Glssymbolplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentrysymbolplural{#2}}% -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\Glsentrysymbolplural{#2}#3}% + }% } \newrobustcmd*{\GLSsymbolplural}{\@ifstar\@sGLSsymbolplural\@GLSsymbolplural} \newcommand*{\@sGLSsymbolplural}[1][]{\@GLSsymbolplural[hyper=false,#1]} \newcommand*{\@GLSsymbolplural}[2][]{% -\new@ifnextchar[{\@GLSsymbolplural@{#1}{#2}}{\@GLSsymbolplural@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSsymbolplural@{#1}{#2}}{\@GLSsymbolplural@{#1}{#2}[]}} \def\@GLSsymbolplural@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentrysymbolplural{#2}}% -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentrysymbolplural{#2}#3}}% + }% } \newrobustcmd*{\glsuseri}{\@ifstar\@sglsuseri\@glsuseri} \newcommand*{\@sglsuseri}[1][]{\@glsuseri[hyper=false,#1]} \newcommand*{\@glsuseri}[2][]{% -\new@ifnextchar[{\@glsuseri@{#1}{#2}}{\@glsuseri@{#1}{#2}[]}} + \new@ifnextchar[{\@glsuseri@{#1}{#2}}{\@glsuseri@{#1}{#2}[]}} \def\@glsuseri@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuseri{#2}}% -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\glsentryuseri{#2}#3}% + }% } \newrobustcmd*{\Glsuseri}{\@ifstar\@sGlsuseri\@Glsuseri} \newcommand*{\@sGlsuseri}[1][]{\@Glsuseri[hyper=false,#1]} \newcommand*{\@Glsuseri}[2][]{% -\new@ifnextchar[{\@Glsuseri@{#1}{#2}}{\@Glsuseri@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsuseri@{#1}{#2}}{\@Glsuseri@{#1}{#2}[]}} \def\@Glsuseri@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuseri{#2}}% -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\Glsentryuseri{#2}#3}% + }% } \newrobustcmd*{\GLSuseri}{\@ifstar\@sGLSuseri\@GLSuseri} \newcommand*{\@sGLSuseri}[1][]{\@GLSuseri[hyper=false,#1]} \newcommand*{\@GLSuseri}[2][]{% -\new@ifnextchar[{\@GLSuseri@{#1}{#2}}{\@GLSuseri@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSuseri@{#1}{#2}}{\@GLSuseri@{#1}{#2}[]}} \def\@GLSuseri@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuseri{#2}}% -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuseri{#2}#3}}% + }% } \newrobustcmd*{\glsuserii}{\@ifstar\@sglsuserii\@glsuserii} \newcommand*{\@sglsuserii}[1][]{\@glsuserii[hyper=false,#1]} \newcommand*{\@glsuserii}[2][]{% -\new@ifnextchar[{\@glsuserii@{#1}{#2}}{\@glsuserii@{#1}{#2}[]}} + \new@ifnextchar[{\@glsuserii@{#1}{#2}}{\@glsuserii@{#1}{#2}[]}} \def\@glsuserii@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuserii{#2}}% -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\glsentryuserii{#2}#3}% + }% } \newrobustcmd*{\Glsuserii}{\@ifstar\@sGlsuserii\@Glsuserii} \newcommand*{\@sGlsuserii}[1][]{\@Glsuserii[hyper=false,#1]} \newcommand*{\@Glsuserii}[2][]{% -\new@ifnextchar[{\@Glsuserii@{#1}{#2}}{\@Glsuserii@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsuserii@{#1}{#2}}{\@Glsuserii@{#1}{#2}[]}} \def\@Glsuserii@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuserii{#2}}% -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\Glsentryuserii{#2}#3}% + }% } \newrobustcmd*{\GLSuserii}{\@ifstar\@sGLSuserii\@GLSuserii} \newcommand*{\@sGLSuserii}[1][]{\@GLSuserii[hyper=false,#1]} \newcommand*{\@GLSuserii}[2][]{% -\new@ifnextchar[{\@GLSuserii@{#1}{#2}}{\@GLSuserii@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSuserii@{#1}{#2}}{\@GLSuserii@{#1}{#2}[]}} \def\@GLSuserii@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuserii{#2}}% -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuserii{#2}#3}}% + }% } \newrobustcmd*{\glsuseriii}{\@ifstar\@sglsuseriii\@glsuseriii} \newcommand*{\@sglsuseriii}[1][]{\@glsuseriii[hyper=false,#1]} \newcommand*{\@glsuseriii}[2][]{% -\new@ifnextchar[{\@glsuseriii@{#1}{#2}}{\@glsuseriii@{#1}{#2}[]}} + \new@ifnextchar[{\@glsuseriii@{#1}{#2}}{\@glsuseriii@{#1}{#2}[]}} \def\@glsuseriii@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuseriii{#2}}% -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\glsentryuseriii{#2}#3}% + }% } \newrobustcmd*{\Glsuseriii}{\@ifstar\@sGlsuseriii\@Glsuseriii} \newcommand*{\@sGlsuseriii}[1][]{\@Glsuseriii[hyper=false,#1]} \newcommand*{\@Glsuseriii}[2][]{% -\new@ifnextchar[{\@Glsuseriii@{#1}{#2}}{\@Glsuseriii@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsuseriii@{#1}{#2}}{\@Glsuseriii@{#1}{#2}[]}} \def\@Glsuseriii@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuseriii{#2}}% -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\Glsentryuseriii{#2}#3}% + }% } \newrobustcmd*{\GLSuseriii}{\@ifstar\@sGLSuseriii\@GLSuseriii} \newcommand*{\@sGLSuseriii}[1][]{\@GLSuseriii[hyper=false,#1]} \newcommand*{\@GLSuseriii}[2][]{% -\new@ifnextchar[{\@GLSuseriii@{#1}{#2}}{\@GLSuseriii@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSuseriii@{#1}{#2}}{\@GLSuseriii@{#1}{#2}[]}} \def\@GLSuseriii@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuseriii{#2}}% -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuseriii{#2}#3}}% + }% } \newrobustcmd*{\glsuseriv}{\@ifstar\@sglsuseriv\@glsuseriv} \newcommand*{\@sglsuseriv}[1][]{\@glsuseriv[hyper=false,#1]} \newcommand*{\@glsuseriv}[2][]{% -\new@ifnextchar[{\@glsuseriv@{#1}{#2}}{\@glsuseriv@{#1}{#2}[]}} + \new@ifnextchar[{\@glsuseriv@{#1}{#2}}{\@glsuseriv@{#1}{#2}[]}} \def\@glsuseriv@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuseriv{#2}}% -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\glsentryuseriv{#2}#3}% + }% } \newrobustcmd*{\Glsuseriv}{\@ifstar\@sGlsuseriv\@Glsuseriv} \newcommand*{\@sGlsuseriv}[1][]{\@Glsuseriv[hyper=false,#1]} \newcommand*{\@Glsuseriv}[2][]{% -\new@ifnextchar[{\@Glsuseriv@{#1}{#2}}{\@Glsuseriv@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsuseriv@{#1}{#2}}{\@Glsuseriv@{#1}{#2}[]}} \def\@Glsuseriv@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuseriv{#2}}% -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\Glsentryuseriv{#2}#3}% + }% } \newrobustcmd*{\GLSuseriv}{\@ifstar\@sGLSuseriv\@GLSuseriv} \newcommand*{\@sGLSuseriv}[1][]{\@GLSuseriv[hyper=false,#1]} \newcommand*{\@GLSuseriv}[2][]{% -\new@ifnextchar[{\@GLSuseriv@{#1}{#2}}{\@GLSuseriv@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSuseriv@{#1}{#2}}{\@GLSuseriv@{#1}{#2}[]}} \def\@GLSuseriv@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuseriv{#2}}% -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuseriv{#2}#3}}% + }% } \newrobustcmd*{\glsuserv}{\@ifstar\@sglsuserv\@glsuserv} \newcommand*{\@sglsuserv}[1][]{\@glsuserv[hyper=false,#1]} \newcommand*{\@glsuserv}[2][]{% -\new@ifnextchar[{\@glsuserv@{#1}{#2}}{\@glsuserv@{#1}{#2}[]}} + \new@ifnextchar[{\@glsuserv@{#1}{#2}}{\@glsuserv@{#1}{#2}[]}} \def\@glsuserv@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuserv{#2}}% -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\glsentryuserv{#2}#3}% + }% } \newrobustcmd*{\Glsuserv}{\@ifstar\@sGlsuserv\@Glsuserv} \newcommand*{\@sGlsuserv}[1][]{\@Glsuserv[hyper=false,#1]} \newcommand*{\@Glsuserv}[2][]{% \new@ifnextchar[{\@Glsuserv@{#1}{#2}}{\@Glsuserv@{#1}{#2}[]}} \def\@Glsuserv@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuserv{#2}}% -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\Glsentryuserv{#2}#3}% + }% } \newrobustcmd*{\GLSuserv}{\@ifstar\@sGLSuserv\@GLSuserv} \newcommand*{\@sGLSuserv}[1][]{\@GLSuserv[hyper=false,#1]} \newcommand*{\@GLSuserv}[2][]{% \new@ifnextchar[{\@GLSuserv@{#1}{#2}}{\@GLSuserv@{#1}{#2}[]}} \def\@GLSuserv@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuserv{#2}}% -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuserv{#2}#3}}% + }% } \newrobustcmd*{\glsuservi}{\@ifstar\@sglsuservi\@glsuservi} \newcommand*{\@sglsuservi}[1][]{\@glsuservi[hyper=false,#1]} \newcommand*{\@glsuservi}[2][]{% -\new@ifnextchar[{\@glsuservi@{#1}{#2}}{\@glsuservi@{#1}{#2}[]}} + \new@ifnextchar[{\@glsuservi@{#1}{#2}}{\@glsuservi@{#1}{#2}[]}} \def\@glsuservi@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuservi{#2}}% -\@gls@link[#1]{#2}{\@glo@text#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\glsentryuservi{#2}#3}% + }% } \newrobustcmd*{\Glsuservi}{\@ifstar\@sGlsuservi\@Glsuservi} \newcommand*{\@sGlsuservi}[1][]{\@Glsuservi[hyper=false,#1]} \newcommand*{\@Glsuservi}[2][]{% -\new@ifnextchar[{\@Glsuservi@{#1}{#2}}{\@Glsuservi@{#1}{#2}[]}} + \new@ifnextchar[{\@Glsuservi@{#1}{#2}}{\@Glsuservi@{#1}{#2}[]}} \def\@Glsuservi@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuservi{#2}}% -\@gls@link[#1]{#2}{% - \expandafter\makefirstuc\expandafter{\@glo@text}#3}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\Glsentryuservi{#2}#3}% + }% } \newrobustcmd*{\GLSuservi}{\@ifstar\@sGLSuservi\@GLSuservi} \newcommand*{\@sGLSuservi}[1][]{\@GLSuservi[hyper=false,#1]} \newcommand*{\@GLSuservi}[2][]{% -\new@ifnextchar[{\@GLSuservi@{#1}{#2}}{\@GLSuservi@{#1}{#2}[]}} + \new@ifnextchar[{\@GLSuservi@{#1}{#2}}{\@GLSuservi@{#1}{#2}[]}} \def\@GLSuservi@#1#2[#3]{% -\glsdoifexists{#2}{\edef\@glo@type{\glsentrytype{#2}}% -\protected@edef\@glo@text{\glsentryuservi{#2}}% -\@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% -}% + \glsdoifexists{#2}% + {% + \edef\@glo@type{\glsentrytype{#2}}% + \@gls@link[#1]{#2}{\mfirstucMakeUppercase{\glsentryuservi{#2}#3}}% + }% } \newrobustcmd*{\acrshort}{\@ifstar\s@acrshort\ns@acrshort} \newcommand*{\s@acrshort}[2][]{% @@ -2751,8 +3575,14 @@ name=true]{% \glsdoifexists{#2}% {% \edef\@glo@type{\glsentrytype{#2}}% - \protected@edef\@glo@text{\glsentryshort{#2}}% - \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@firstofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glsentryshort{#2}}#3% + }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \newrobustcmd*{\Acrshort}{\@ifstar\s@Acrshort\ns@Acrshort} @@ -2767,11 +3597,14 @@ name=true]{% \glsdoifexists{#2}% {% \edef\@glo@type{\glsentrytype{#2}}% - \protected@edef\@glo@text{\glsentryshort{#2}}% - \@gls@link[#1]{#2}% - {% - \acronymfont{\expandafter\makefirstuc\expandafter{\@glo@text}}#3% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@secondofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\Glsentryshort{#2}}#3% }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \newrobustcmd*{\ACRshort}{\@ifstar\s@ACRshort\ns@ACRshort} @@ -2786,8 +3619,14 @@ name=true]{% \glsdoifexists{#2}% {% \edef\@glo@type{\glsentrytype{#2}}% - \protected@edef\@glo@text{\glsentryshort{#2}}% - \@gls@link[#1]{#2}{\acronymfont{\MakeUppercase{\@glo@text#3}}}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@thirdofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \mfirstucMakeUppercase{\acronymfont{\glsentryshort{#2}}#3}% + }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \newrobustcmd*{\acrshortpl}{\@ifstar\s@acrshortpl\ns@acrshortpl} @@ -2802,8 +3641,14 @@ name=true]{% \glsdoifexists{#2}% {% \edef\@glo@type{\glsentrytype{#2}}% - \protected@edef\@glo@text{\glsentryshortpl{#2}}% - \@gls@link[#1]{#2}{\acronymfont{\@glo@text}#3}% + \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@firstofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glsentryshortpl{#2}}#3% + }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \newrobustcmd*{\Acrshortpl}{\@ifstar\s@Acrshortpl\ns@Acrshortpl} @@ -2818,11 +3663,14 @@ name=true]{% \glsdoifexists{#2}% {% \edef\@glo@type{\glsentrytype{#2}}% - \protected@edef\@glo@text{\glsentryshortpl{#2}}% - \@gls@link[#1]{#2}% - {% - \acronymfont{\expandafter\makefirstuc\expandafter{\@glo@text}}#3% + \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@secondofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\Glsentryshortpl{#2}}#3% }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \newrobustcmd*{\ACRshortpl}{\@ifstar\s@ACRshortpl\ns@ACRshortpl} @@ -2837,8 +3685,14 @@ name=true]{% \glsdoifexists{#2}% {% \edef\@glo@type{\glsentrytype{#2}}% - \protected@edef\@glo@text{\glsentryshortpl{#2}}% - \@gls@link[#1]{#2}{\acronymfont{\MakeUppercase{\@glo@text#3}}}% + \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@thirdofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \mfirstucMakeUppercase{\acronymfont{\glsentryshortpl{#2}}#3}% + }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \newrobustcmd*{\acrlong}{\@ifstar\s@acrlong\ns@acrlong} @@ -2853,8 +3707,14 @@ name=true]{% \glsdoifexists{#2}% {% \edef\@glo@type{\glsentrytype{#2}}% - \protected@edef\@glo@text{\glsentrylong{#2}}% - \@gls@link[#1]{#2}{\@glo@text#3}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@firstofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glsentrylong{#2}}#3% + }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \newrobustcmd*{\Acrlong}{\@ifstar\s@Acrlong\ns@Acrlong} @@ -2869,11 +3729,14 @@ name=true]{% \glsdoifexists{#2}% {% \edef\@glo@type{\glsentrytype{#2}}% - \protected@edef\@glo@text{\glsentrylong{#2}}% - \@gls@link[#1]{#2}% - {% - \expandafter\makefirstuc\expandafter{\@glo@text}#3% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@secondofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\Glsentrylong{#2}}#3% }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \newrobustcmd*{\ACRlong}{\@ifstar\s@ACRlong\ns@ACRlong} @@ -2888,8 +3751,14 @@ name=true]{% \glsdoifexists{#2}% {% \edef\@glo@type{\glsentrytype{#2}}% - \protected@edef\@glo@text{\glsentrylong{#2}}% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@thirdofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \mfirstucMakeUppercase{\acronymfont{\glsentrylong{#2}}#3}% + }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \newrobustcmd*{\acrlongpl}{\@ifstar\s@acrlongpl\ns@acrlongpl} @@ -2904,8 +3773,14 @@ name=true]{% \glsdoifexists{#2}% {% \edef\@glo@type{\glsentrytype{#2}}% - \protected@edef\@glo@text{\glsentrylongpl{#2}}% - \@gls@link[#1]{#2}{\@glo@text#3}% + \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@firstofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glsentrylongpl{#2}}#3% + }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \newrobustcmd*{\Acrlongpl}{\@ifstar\s@Acrlongpl\ns@Acrlongpl} @@ -2920,11 +3795,14 @@ name=true]{% \glsdoifexists{#2}% {% \edef\@glo@type{\glsentrytype{#2}}% - \protected@edef\@glo@text{\glsentrylongpl{#2}}% - \@gls@link[#1]{#2}% - {% - \expandafter\makefirstuc\expandafter{\@glo@text}#3% + \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@secondofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\Glsentrylongpl{#2}}#3% }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \newrobustcmd*{\ACRlongpl}{\@ifstar\s@ACRlongpl\ns@ACRlongpl} @@ -2939,102 +3817,110 @@ name=true]{% \glsdoifexists{#2}% {% \edef\@glo@type{\glsentrytype{#2}}% - \protected@edef\@glo@text{\glsentrylongpl{#2}}% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text#3}}% + \def\glslabel{#2}% + \let\glsifplural\@firstoftwo + \let\glscapscase\@thirdofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \mfirstucMakeUppercase{\acronymfont{\glsentrylongpl{#2}}#3}% + }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \newcommand*{\glsentryname}[1]{\csname glo@#1@name\endcsname} -\newcommand*{\Glsentryname}[1]{% -\protected@edef\@glo@text{\csname glo@#1@name\endcsname}% -\expandafter\makefirstuc\expandafter{\@glo@text}} +\newrobustcmd*{\Glsentryname}[1]{% + \protected@edef\@glo@text{\csname glo@#1@name\endcsname}% + \expandafter\makefirstuc\expandafter{\@glo@text}% +} \newcommand*{\glsentrydesc}[1]{\csname glo@#1@desc\endcsname} -\newcommand*{\Glsentrydesc}[1]{% -\protected@edef\@glo@text{\csname glo@#1@desc\endcsname}% -\expandafter\makefirstuc\expandafter{\@glo@text}} +\newrobustcmd*{\Glsentrydesc}[1]{% + \protected@edef\@glo@text{\csname glo@#1@desc\endcsname}% + \expandafter\makefirstuc\expandafter{\@glo@text}% +} \newcommand*{\glsentrydescplural}[1]{% -\csname glo@#1@descplural\endcsname} -\newcommand*{\Glsentrydescplural}[1]{% + \csname glo@#1@descplural\endcsname} +\newrobustcmd*{\Glsentrydescplural}[1]{% \protected@edef\@glo@text{\csname glo@#1@descplural\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentrytext}[1]{\csname glo@#1@text\endcsname} -\newcommand*{\Glsentrytext}[1]{% -\protected@edef\@glo@text{\csname glo@#1@text\endcsname}% +\newrobustcmd*{\Glsentrytext}[1]{% + \protected@edef\@glo@text{\csname glo@#1@text\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentryplural}[1]{\csname glo@#1@plural\endcsname} -\newcommand*{\Glsentryplural}[1]{% +\newrobustcmd*{\Glsentryplural}[1]{% \protected@edef\@glo@text{\csname glo@#1@plural\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentrysymbol}[1]{\csname glo@#1@symbol\endcsname} -\newcommand*{\Glsentrysymbol}[1]{% +\newrobustcmd*{\Glsentrysymbol}[1]{% \protected@edef\@glo@text{\csname glo@#1@symbol\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentrysymbolplural}[1]{% -\csname glo@#1@symbolplural\endcsname} -\newcommand*{\Glsentrysymbolplural}[1]{% + \csname glo@#1@symbolplural\endcsname} +\newrobustcmd*{\Glsentrysymbolplural}[1]{% \protected@edef\@glo@text{\csname glo@#1@symbolplural\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentryfirst}[1]{\csname glo@#1@first\endcsname} -\newcommand*{\Glsentryfirst}[1]{% +\newrobustcmd*{\Glsentryfirst}[1]{% \protected@edef\@glo@text{\csname glo@#1@first\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentryfirstplural}[1]{% -\csname glo@#1@firstpl\endcsname} -\newcommand*{\Glsentryfirstplural}[1]{% + \csname glo@#1@firstpl\endcsname} +\newrobustcmd*{\Glsentryfirstplural}[1]{% \protected@edef\@glo@text{\csname glo@#1@firstpl\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentrytype}[1]{\csname glo@#1@type\endcsname} \newcommand*{\glsentrysort}[1]{\csname glo@#1@sort\endcsname} \newcommand*{\glsentryuseri}[1]{\csname glo@#1@useri\endcsname} -\newcommand*{\Glsentryuseri}[1]{% +\newrobustcmd*{\Glsentryuseri}[1]{% \protected@edef\@glo@text{\csname glo@#1@useri\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentryuserii}[1]{\csname glo@#1@userii\endcsname} -\newcommand*{\Glsentryuserii}[1]{% +\newrobustcmd*{\Glsentryuserii}[1]{% \protected@edef\@glo@text{\csname glo@#1@userii\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentryuseriii}[1]{\csname glo@#1@useriii\endcsname} -\newcommand*{\Glsentryuseriii}[1]{% +\newrobustcmd*{\Glsentryuseriii}[1]{% \protected@edef\@glo@text{\csname glo@#1@useriii\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentryuseriv}[1]{\csname glo@#1@useriv\endcsname} -\newcommand*{\Glsentryuseriv}[1]{% +\newrobustcmd*{\Glsentryuseriv}[1]{% \protected@edef\@glo@text{\csname glo@#1@useriv\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentryuserv}[1]{\csname glo@#1@userv\endcsname} -\newcommand*{\Glsentryuserv}[1]{% +\newrobustcmd*{\Glsentryuserv}[1]{% \protected@edef\@glo@text{\csname glo@#1@userv\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentryuservi}[1]{\csname glo@#1@uservi\endcsname} -\newcommand*{\Glsentryuservi}[1]{% +\newrobustcmd*{\Glsentryuservi}[1]{% \protected@edef\@glo@text{\csname glo@#1@uservi\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentryshort}[1]{\csname glo@#1@short\endcsname} -\newcommand*{\Glsentryshort}[1]{% +\newrobustcmd*{\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]{% +\newrobustcmd*{\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}% +\newrobustcmd*{\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]{% +\newrobustcmd*{\Glsentrylongpl}[1]{% \protected@edef\@glo@text{\csname glo@#1@longpl\endcsname}% \expandafter\makefirstuc\expandafter{\@glo@text}} \newcommand*{\glsentryfull}[1]{% - \glsentrylong{#1}\space(\glsentryshort{#1})% + \acrfullformat{\glsentrylong{#1}}{\glsentryshort{#1}}% } -\newcommand*{\Glsentryfull}[1]{% - \Glsentrylong{#1}\space(\glsentryshort{#1})% +\newrobustcmd*{\Glsentryfull}[1]{% + \acrfullformat{\Glsentrylong{#1}}{\glsentryshort{#1}}% } \newcommand*{\glsentryfullpl}[1]{% - \glsentrylongpl{#1}\space(\glsentryshortpl{#1})% + \acrfullformat{\glsentrylongpl{#1}}{\glsentryshortpl{#1}}% } -\newcommand*{\Glsentryfullpl}[1]{% - \Glsentrylongpl{#1}\space(\glsentryshortpl{#1})% +\newrobustcmd*{\Glsentryfullpl}[1]{% + \acrfullformat{\Glsentrylongpl{#1}}{\glsentryshortpl{#1}}% } \newcommand*{\glsentrynumberlist}[1]{% \glsdoifexists{#1}% @@ -3042,8 +3928,7 @@ name=true]{% \csname glo@#1@numberlist\endcsname }% } -\@ifpackageloaded{hyperref} -{% +\@ifpackageloaded{hyperref} {% \newcommand*{\glsdisplaynumberlist}[1]{% \GlossariesWarning {% @@ -3107,10 +3992,17 @@ name=true]{% }% } \newrobustcmd*{\glsaddall}[1][]{% -\edef\@glo@type{\@glo@types}% -\setkeys{glossadd}{#1}% -\forallglsentries[\@glo@type]{\@glo@entry}{% -\glsadd[#1]{\@glo@entry}}% + \edef\@glo@type{\@glo@types}% + \setkeys{glossadd}{#1}% + \forallglsentries[\@glo@type]{\@glo@entry}{% + \glsadd[#1]{\@glo@entry}% + }% +} +\newrobustcmd*{\glsaddallunused}[1][\@glo@types]{% + \forallglsentries[#1]{\@glo@entry}% + {% + \ifglsused{\@glo@entry}{}{\glsadd[format=@gobble]{\@glo@entry}}% + }% } \edef\glsopenbrace{\expandafter\@gobble\string\{} \edef\glsclosebrace{\expandafter\@gobble\string\}} @@ -3372,6 +4264,8 @@ name=true]{% hasn't been used,^^Jthe glossaries will not be updated}% } \newcommand*{\makeglossaries}{% + \protected@write\@auxout{}{\string\providecommand\string\@glsorder[1]{}} + \protected@write\@auxout{}{\string\providecommand\string\@istfilename[1]{}} \protected@write\@auxout{}{\string\@istfilename{\istfilename}}% \protected@write\@auxout{}{\string\@glsorder{\glsorder}} \@for\@glo@type:=\@glo@types\do{% @@ -3387,6 +4281,7 @@ name=true]{% \let\makeglossary\relax \let\makeglossaries\relax \@disable@onlypremakeg + \let\gls@checkseeallowed\relax \let\warn@nomakeglossaries\relax \ifglssavenumberlist \edef\@gls@dodeflistparser{\noexpand\DeclareListParser @@ -3404,39 +4299,35 @@ name=true]{% \AtEndDocument{% \glswritefiles } -\ifglssavewrites - \newcommand*{\glswritefiles}{% - \forallglossaries{\@glo@type}{% - \ifcsundef{glo@\@glo@type @filetok}% - {% - \def\gls@tmp{}% - }% - {% - \edef\gls@tmp{\expandafter\the - \csname glo@\@glo@type @filetok\endcsname}% - }% - \ifx\gls@tmp\@empty - \ifx\@glo@type\glsdefaulttype - \GlossariesWarningNoLine{Glossary `\@glo@type' has no - entries.^^JRemember to use package option `nomain' if +\newcommand*{\@glswritefiles}{% + \forallglossaries{\@glo@type}{% + \ifcsundef{glo@\@glo@type @filetok}% + {% + \def\gls@tmp{}% + }% + {% + \edef\gls@tmp{\expandafter\the + \csname glo@\@glo@type @filetok\endcsname}% + }% + \ifx\gls@tmp\@empty + \ifx\@glo@type\glsdefaulttype + \GlossariesWarningNoLine{Glossary `\@glo@type' has no + entries.^^JRemember to use package option `nomain' if you - don't want to^^Juse the main glossary}% - \else - \GlossariesWarningNoLine{Glossary `\@glo@type' has no - entries}% - \fi - \else - \@glsopenfile{\glswrite}{\@glo@type}% - \immediate\write\glswrite{% - \expandafter\the - \csname glo@\@glo@type @filetok\endcsname}% - \immediate\closeout\glswrite - \fi - }% - } -\else - \let\glswritefiles\relax -\fi + don't want to^^Juse the main glossary}% + \else + \GlossariesWarningNoLine{Glossary `\@glo@type' has no + entries}% + \fi + \else + \@glsopenfile{\glswrite}{\@glo@type}% + \immediate\write\glswrite{% + \expandafter\the + \csname glo@\@glo@type @filetok\endcsname}% + \immediate\closeout\glswrite + \fi + }% +} \renewcommand*{\glossary}[1][\glsdefaulttype]{% \@glossary[#1]% } @@ -3583,12 +4474,13 @@ you \def#1{{#2#3}}% \fi } -\newcommand*{\glssee}[3][\seename]{% +\DeclareRobustCommand*{\glssee}[3][\seename]{% \@do@seeglossary{#2}{[#1]{#3}}} \newcommand*{\@glssee}[3][\seename]{% \glssee[#1]{#3}{#2}} -\newcommand*{\glsseeformat}[3][\seename]{\emph{#1} \glsseelist{#2}} -\newcommand*{\glsseelist}[1]{% +\DeclareRobustCommand*{\glsseeformat}[3][\seename]{% + \emph{#1} \glsseelist{#2}} +\DeclareRobustCommand*{\glsseelist}[1]{% \let\@gls@dolast\relax \let\@gls@donext\relax \@for\@gls@thislabel:=#1\do{% @@ -3604,7 +4496,7 @@ you } \newcommand*{\glsseelastsep}{\space\andname\space} \newcommand*{\glsseesep}{, } -\newcommand*{\glsseeitem}[1]{\glshyperlink[\glsseeitemformat{#1}]{#1}} +\DeclareRobustCommand*{\glsseeitem}[1]{\glshyperlink[\glsseeitemformat{#1}]{#1}} \newcommand*{\glsseeitemformat}[1]{\glsentrytext{#1}} \newcommand*{\gls@save@numberlist}[1]{% \ifglssavenumberlist @@ -3648,13 +4540,13 @@ you \let\nopostdesc\@nopostdesc \gls@dotoctitle \@glossarystyle - \let\gls@org@glossaryentryfield\glossaryentryfield - \let\gls@org@glossarysubentryfield\glossarysubentryfield - \renewcommand{\glossaryentryfield}[1]{% + \let\gls@org@glossaryentryfield\glossentry + \let\gls@org@glossarysubentryfield\subglossentry + \renewcommand{\glossentry}[1]{% \gdef\glscurrententrylabel{##1}% \gls@org@glossaryentryfield{##1}% }% - \renewcommand{\glossarysubentryfield}[2]{% + \renewcommand{\subglossentry}[2]{% \gdef\glscurrententrylabel{##2}% \gls@org@glossarysubentryfield{##1}{##2}% }% @@ -3669,6 +4561,8 @@ you \edef\@do@auxoutstuff{% \noexpand\AtEndDocument{% \noexpand\immediate\noexpand\write\@auxout{% + \string\providecommand\string\@xdylanguage[2]{}}% + \noexpand\immediate\noexpand\write\@auxout{% \string\@xdylanguage{\@glo@type}{\@xdy@main@language}}% }% }% @@ -3677,6 +4571,8 @@ you \edef\@do@auxoutstuff{% \noexpand\AtEndDocument{% \noexpand\immediate\noexpand\write\@auxout{% + \string\providecommand\string\@xdylanguage[2]{}}% + \noexpand\immediate\noexpand\write\@auxout{% \string\@xdylanguage{\@glo@type}{\csname @xdy@\@glo@type @language\endcsname}}% }% @@ -3686,6 +4582,8 @@ you \edef\@do@auxoutstuff{% \noexpand\AtEndDocument{% \noexpand\immediate\noexpand\write\@auxout{% + \string\providecommand\string\@gls@codepage[2]{}}% + \noexpand\immediate\noexpand\write\@auxout{% \string\@gls@codepage{\@glo@type}{\gls@codepage}}% }% }% @@ -3714,7 +4612,8 @@ you {Glossary style `#1' undefined}{}% }% {% - \def\@glossarystyle{\csname @glsstyle@#1\endcsname}% + \def\@glossarystyle{\setglossentrycompatibility + \csname @glsstyle@#1\endcsname}% }% } \define@choicekey{printgloss}{numberedsection}[\val\nr]{% @@ -3729,6 +4628,9 @@ false,nolabel,autolabel}[nolabel]{% \renewcommand*{\@@glossarysecstar}{}% \renewcommand*{\@@glossaryseclabel}{\label{\glsautoprefix\@glo@type}}% \fi} +\define@choicekey{printgloss}{nogroupskip}{true,false}[true]{% + \csuse{glsnogroupskip#1}% +} \define@boolkey{printgloss}[gls]{nonumberlist}[true]{% \ifglsnonumberlist \def\glossaryentrynumbers##1{}% @@ -3837,14 +4739,106 @@ false,nolabel,autolabel}[nolabel]{% } \newcommand*{\glossaryheader}{} \newcommand*{\glstarget}[2]{\@glstarget{\glolinkprefix#1}{#2}} -\newcommand*{\glossaryentryfield}[5]{% -\noindent\textbf{\glstarget{#1}{#2}} #4 #3. #5\par} +\providecommand*{\compatibleglossentry}[2]{% + \toks@{#2}% + \protected@edef\@do@glossentry{\noexpand\glossaryentryfield{#1}% + {\noexpand\glsnamefont + {\expandafter\expandonce\csname glo@#1@name\endcsname}}% + {\expandafter\expandonce\csname glo@#1@desc\endcsname}% + {\expandafter\expandonce\csname glo@#1@symbol\endcsname}% + {\the\toks@}% + }% + \@do@glossentry +} +\newcommand*{\glossentryname}[1]{% + \glsdoifexists{#1}% + {% + \letcs{\glo@name}{glo@#1@name}% + \expandafter\glsnamefont\expandafter{\glo@name}% + }% +} +\newcommand*{\Glossentryname}[1]{% + \glsdoifexists{#1}% + {% + \glsnamefont{\Glsentryname{#1}}% + }% +} +\newcommand*{\glossentrydesc}[1]{% + \glsdoifexists{#1}% + {% + \glsentrydesc{#1}% + }% +} +\newcommand*{\Glossentrydesc}[1]{% + \glsdoifexists{#1}% + {% + \Glsentrydesc{#1}% + }% +} +\newcommand*{\glossentrysymbol}[1]{% + \glsdoifexists{#1}% + {% + \glsentrysymbol{#1}% + }% +} +\newcommand*{\Glossentrysymbol}[1]{% + \glsdoifexists{#1}% + {% + \Glsentrysymbol{#1}% + }% +} +\providecommand*{\compatiblesubglossentry}[3]{% + \toks@{#3}% + \protected@edef\@do@subglossentry{\noexpand\glossarysubentryfield{\number#1}% + {#2}% + {\noexpand\glsnamefont + {\expandafter\expandonce\csname glo@#2@name\endcsname}}% + {\expandafter\expandonce\csname glo@#2@desc\endcsname}% + {\expandafter\expandonce\csname glo@#2@symbol\endcsname}% + {\the\toks@}% + }% + \@do@subglossentry +} +\newcommand*{\setglossentrycompatibility}{% + \let\glossentry\compatibleglossentry + \let\subglossentry\compatiblesubglossentry +} +\setglossentrycompatibility +\newcommand{\glossaryentryfield}[5]{% + \GlossariesWarning + {Deprecated use of \string\glossaryentryfield.^^J + I recommend you change to \string\glossentry.^^J + If you've just upgraded, try removing your gls auxiliary + files^^J and recompile}% + \noindent\textbf{\glstarget{#1}{#2}} #4 #3. #5\par} \newcommand*{\glossarysubentryfield}[6]{% -\glstarget{#2}{\strut}#4. #6\par} + \GlossariesWarning + {Deprecated use of \string\glossarysubentryfield.^^J + I recommend you change to \string\subglossentry.^^J + If you've just upgraded, try removing your gls auxiliary + files^^J and recompile}% + \glstarget{#2}{\strut}#4. #6\par} \newcommand*{\glsgroupskip}{} \newcommand*{\glsgroupheading}[1]{} \newcommand*{\glsgetgrouptitle}[1]{% - \ifcsundef{#1groupname}{#1}{\csname #1groupname\endcsname}% + \@gls@getgrouptitle{#1}{\@gls@grptitle}% + \@gls@grptitle +} +\newcommand*{\@gls@getgrouptitle}[2]{% + \dtl@ifsingle{#1}% + {% + \ifcsundef{#1groupname}{\def#2{#1}}{\letcs#2{#1groupname}}% + }% + {% + \ifboolexpr{test{\ifstrequal{#1}{glssymbols}} + or test{\ifstrequal{#1}{glsnumbers}}}% + {% + \ifcsundef{#1groupname}{\def#2{#1}}{\letcs#2{#1groupname}}% + }% + {% + \def#2{#1}% + }% + }% } \newcommand*{\glsgetgrouplabel}[1]{% \ifthenelse{\equal{#1}{\glssymbolsgroupname}}{glssymbols}{% @@ -3858,13 +4852,30 @@ false,nolabel,autolabel}[nolabel]{% \fi \def\glsentrycounter{#2}% } +\newcommand*{\setglossarystyle}[1]{% + \ifcsundef{@glsstyle@#1}% + {% + \PackageError{glossaries}{Glossary style `#1' undefined}{}% + }% + {% + \csname @glsstyle@#1\endcsname + }% +} \newcommand*{\glossarystyle}[1]{% \ifcsundef{@glsstyle@#1}% {% \PackageError{glossaries}{Glossary style `#1' undefined}{}% }% {% + \GlossariesWarning + {Deprecated command \string\glossarystyle.^^J + I recommend you switch to \string\setglossarystyle\space unless + you want to maintain backward compatibility}% + \setglossentrycompatibility \csname @glsstyle@#1\endcsname + \ifcsdef{@glscompstyle@#1}% + {\setglossentrycompatibility\csuse{@glscompstyle@#1}}% + {}% }% } \newcommand{\newglossarystyle}[2]{% @@ -3952,10 +4963,6 @@ false,nolabel,autolabel}[nolabel]{% \newcommand*{\hyperup}[1]{\textup{\glshypernumber{#1}}} \newcommand*{\hypersc}[1]{\textsc{\glshypernumber{#1}}} \newcommand*{\hyperemph}[1]{\emph{\glshypernumber{#1}}} -\ifglsacronym - \newglossary[alg]{acronym}{acr}{acn}{\acronymname} - \renewcommand*{\acronymtype}{acronym} -\fi \newcommand{\oldacronym}[4][\gls@label]{% \def\gls@label{#2}% \newacronym[#4]{#1}{#2}{#3}% @@ -3974,6 +4981,7 @@ false,nolabel,autolabel}[nolabel]{% } \newcommand{\newacronym}[4][]{} \newcommand*{\acrpluralsuffix}{\glspluralsuffix} +\newrobustcmd*{\glstextup}[1]{\ifdef\textulc{\textulc{#1}}{\textup{#1}}} \newcommand*{\glsshortkey}{short} \newcommand*{\glsshortpluralkey}{shortplural} \newcommand*{\glslongkey}{long} @@ -4075,8 +5083,7 @@ false,nolabel,autolabel}[nolabel]{% \newtoks\glslongtok \newcommand*{\newacronymhook}{} \newcommand*{\SetDefaultAcronymDisplayStyle}[1]{% - \defglsdisplay[#1]{##1##4}% - \defglsdisplayfirst[#1]{##1##4}% + \defglsentryfmt[#1]{\glsgenentryfmt}% } \newcommand*{\DefaultNewAcronymDef}{% \edef\@do@newglossaryentry{% @@ -4087,19 +5094,34 @@ false,nolabel,autolabel}[nolabel]{% sort={\the\glsshorttok},% text={\the\glsshorttok},% first={\acrfullformat{\the\glslongtok}{\the\glsshorttok}},% - plural={\the\glsshorttok\noexpand\acrpluralsuffix},% - firstplural={\acrfullformat{\noexpand\@glo@longpl}% - {\noexpand\@glo@shortpl}},% + plural={\noexpand\expandonce\noexpand\@glo@shortpl},% + firstplural={\acrfullformat{\noexpand\expandonce\noexpand\@glo@longpl}% + {\noexpand\expandonce\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},% + descriptionplural={\noexpand\expandonce\noexpand\@glo@longpl},% \the\glskeylisttok }% }% + \let\@org@gls@assign@firstpl\gls@assign@firstpl + \let\@org@gls@assign@plural\gls@assign@plural + \let\@org@gls@assign@descplural\gls@assign@descplural + \def\gls@assign@firstpl##1##2{% + \@@gls@expand@field{##1}{firstpl}{##2}% + }% + \def\gls@assign@plural##1##2{% + \@@gls@expand@field{##1}{plural}{##2}% + }% + \def\gls@assign@descplural##1##2{% + \@@gls@expand@field{##1}{descplural}{##2}% + }% \@do@newglossaryentry + \let\gls@assign@firstpl\@org@gls@assign@firstpl + \let\gls@assign@plural\@org@gls@assign@plural + \let\gls@assign@symbolplural\@org@gls@assign@symbolplural } \newcommand*{\SetDefaultAcronymStyle}{% \@for\@gls@type:=\@glsacronymlists\do{% @@ -4129,32 +5151,62 @@ false,nolabel,autolabel}[nolabel]{% \footnote{#3}% } \newcommand*{\SetDescriptionFootnoteAcronymDisplayStyle}[1]{% - \defglsdisplayfirst[#1]{% - \firstacronymfont{##1}##4% - \expandafter\protect\expandafter\acrfootnote\expandafter - {\@gls@link@opts}{\@gls@link@label}{##3}% + \defglsentryfmt[#1]{% + \ifglsused{\glslabel}% + {% + \acronymfont{\glsgenentryfmt}% + }% + {% + \firstacronymfont{\glsgenentryfmt}% + \ifglshassymbol{\glslabel}% + {% + \expandafter\protect\expandafter\acrfootnote\expandafter + {\@gls@link@opts}{\@gls@link@label}% + {% + \glsifplural + {\glsentrysymbolplural{\glslabel}}% + {\glsentrysymbol{\glslabel}}% + }% + }% + }% }% - \defglsdisplay[#1]{\acronymfont{##1}##4}% } \newcommand*{\DescriptionFootnoteNewAcronymDef}{% - \edef\@do@newglossaryentry{% - \noexpand\newglossaryentry{\the\glslabeltok}% - {% - type=\acronymtype,% - name={\noexpand\acronymfont{\the\glsshorttok}},% - 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 - }% + \edef\@do@newglossaryentry{% + \noexpand\newglossaryentry{\the\glslabeltok}% + {% + type=\acronymtype,% + name={\noexpand\acronymfont{\the\glsshorttok}},% + sort={\the\glsshorttok},% + first={\the\glsshorttok},% + firstplural={\noexpand\expandonce\noexpand\@glo@shortpl},% + text={\the\glsshorttok},% + plural={\noexpand\expandonce\noexpand\@glo@shortpl},% + short={\the\glsshorttok},% + shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},% + long={\the\glslongtok},% + longplural={\the\glslongtok\noexpand\acrpluralsuffix},% + symbol={\the\glslongtok},% + symbolplural={\noexpand\expandonce\noexpand\@glo@longpl},% + \the\glskeylisttok }% - \@do@newglossaryentry + }% + \let\@org@gls@assign@firstpl\gls@assign@firstpl + \let\@org@gls@assign@plural\gls@assign@plural + \let\@org@gls@assign@symbolplural\gls@assign@symbolplural + \def\gls@assign@firstpl##1##2{% + \@@gls@expand@field{##1}{firstpl}{##2}% + }% + \def\gls@assign@plural##1##2{% + \@@gls@expand@field{##1}{plural}{##2}% + }% + \def\gls@assign@symbolplural##1##2{% + \@@gls@expand@field{##1}{symbolplural}{##2}% + }% + \@do@newglossaryentry + \let\gls@assign@plural\@org@gls@assign@plural + \let\gls@assign@firstpl\@org@gls@assign@firstpl + \let\gls@assign@symbolplural\@org@gls@assign@symbolplural } \newcommand*{\SetDescriptionFootnoteAcronymStyle}{% \renewcommand{\newacronym}[4][]{% @@ -4177,7 +5229,7 @@ false,nolabel,autolabel}[nolabel]{% \ifglsacrsmallcaps \renewcommand*{\acronymfont}[1]{\textsc{##1}}% \renewcommand*{\acrpluralsuffix}{% - \textup{\glspluralsuffix}}% + \glstextup{\glspluralsuffix}}% \else \ifglsacrsmaller \renewcommand*{\acronymfont}[1]{\textsmaller{##1}}% @@ -4189,8 +5241,7 @@ false,nolabel,autolabel}[nolabel]{% \fi }% \newcommand*{\SetDescriptionDUAAcronymDisplayStyle}[1]{% - \defglsdisplay[#1]{##1##4}% - \defglsdisplayfirst[#1]{##1##4}% + \defglsentryfmt[#1]{\glsgenentryfmt}% } \newcommand*{\DescriptionDUANewAcronymDef}{% \edef\@do@newglossaryentry{% @@ -4200,17 +5251,34 @@ false,nolabel,autolabel}[nolabel]{% name={\the\glslongtok},% sort={\the\glslongtok}, text={\the\glslongtok},% - plural={\the\glslongtok\noexpand\acrpluralsuffix},% + first={\the\glslongtok},% + plural={\noexpand\expandonce\noexpand\@glo@longpl},% + firstplural={\noexpand\expandonce\noexpand\@glo@longpl},% short={\the\glsshorttok},% shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},% long={\the\glslongtok},% longplural={\the\glslongtok\noexpand\acrpluralsuffix},% symbol={\the\glsshorttok},% - symbolplural={\the\glsshorttok\noexpand\acrpluralsuffix},% + symbolplural={\noexpand\expandonce\noexpand\@glo@shortpl},% \the\glskeylisttok }% }% + \let\@org@gls@assign@firstpl\gls@assign@firstpl + \let\@org@gls@assign@plural\gls@assign@plural + \let\@org@gls@assign@symbolplural\gls@assign@symbolplural + \def\gls@assign@firstpl##1##2{% + \@@gls@expand@field{##1}{firstpl}{##2}% + }% + \def\gls@assign@plural##1##2{% + \@@gls@expand@field{##1}{plural}{##2}% + }% + \def\gls@assign@symbolplural##1##2{% + \@@gls@expand@field{##1}{symbolplural}{##2}% + }% \@do@newglossaryentry + \let\gls@assign@firstpl\@org@gls@assign@firstpl + \let\gls@assign@plural\@org@gls@assign@plural + \let\gls@assign@symbolplural\@org@gls@assign@symbolplural } \newcommand*{\SetDescriptionDUAAcronymStyle}{% \ifglsacrsmallcaps @@ -4241,9 +5309,33 @@ false,nolabel,autolabel}[nolabel]{% }% }% \newcommand*{\SetDescriptionAcronymDisplayStyle}[1]{% - \defglsdisplayfirst[#1]{% - ##1##4\glsdoparenifnotempty{##3}{\protect\firstacronymfont}}% - \defglsdisplay[#1]{\acronymfont{##1}##4}% + \defglsentryfmt[#1]{% + \ifglsused{\glslabel}% + {% + \let\gls@org@insert\glsinsert + \let\glsinsert\@empty + \acronymfont{\glsgenentryfmt}\gls@org@insert + }% + {% + \glsgenentryfmt + \ifglshassymbol{\glslabel}% + {% + \glsifplural + {% + \def\@glo@symbol{\glsentrysymbolplural{\glslabel}}% + }% + {% + \def\@glo@symbol{\glsentrysymbol{\glslabel}}% + }% + \space(\protect\firstacronymfont + {\glscapscase + {\@glo@symbol} + {\@glo@symbol} + {\mfirstucMakeUppercase{\@glo@symbol}}})% + }% + {}% + }% + }% } \newcommand*{\DescriptionNewAcronymDef}{% \edef\@do@newglossaryentry{% @@ -4254,18 +5346,33 @@ false,nolabel,autolabel}[nolabel]{% \acrnameformat{\the\glsshorttok}{\the\glslongtok}},% sort={\the\glsshorttok},% first={\the\glslongtok},% - firstplural={\the\glslongtok\noexpand\acrpluralsuffix},% + firstplural={\noexpand\expandonce\noexpand\@glo@longpl},% text={\the\glsshorttok},% - plural={\the\glsshorttok\noexpand\acrpluralsuffix},% + plural={\noexpand\expandonce\noexpand\@glo@shortpl},% short={\the\glsshorttok},% shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},% long={\the\glslongtok},% longplural={\the\glslongtok\noexpand\acrpluralsuffix},% symbol={\noexpand\@glo@text},% - symbolplural={\noexpand\@glo@plural},% + symbolplural={\noexpand\expandonce\noexpand\@glo@shortpl},% \the\glskeylisttok}% }% + \let\@org@gls@assign@firstpl\gls@assign@firstpl + \let\@org@gls@assign@plural\gls@assign@plural + \let\@org@gls@assign@symbolplural\gls@assign@symbolplural + \def\gls@assign@firstpl##1##2{% + \@@gls@expand@field{##1}{firstpl}{##2}% + }% + \def\gls@assign@plural##1##2{% + \@@gls@expand@field{##1}{plural}{##2}% + }% + \def\gls@assign@symbolplural##1##2{% + \@@gls@expand@field{##1}{symbolplural}{##2}% + }% \@do@newglossaryentry + \let\gls@assign@firstpl\@org@gls@assign@firstpl + \let\gls@assign@plural\@org@gls@assign@plural + \let\gls@assign@symbolplural\@org@gls@assign@symbolplural } \newcommand*{\SetDescriptionAcronymStyle}{% \renewcommand{\newacronym}[4][]{% @@ -4288,7 +5395,7 @@ false,nolabel,autolabel}[nolabel]{% \ifglsacrsmallcaps \renewcommand{\acronymfont}[1]{\textsc{##1}} \renewcommand*{\acrpluralsuffix}{% - \textup{\glspluralsuffix}}% + \glstextup{\glspluralsuffix}}% \else \ifglsacrsmaller \renewcommand*{\acronymfont}[1]{\textsmaller{##1}}% @@ -4296,12 +5403,28 @@ false,nolabel,autolabel}[nolabel]{% \fi }% \newcommand*{\SetFootnoteAcronymDisplayStyle}[1]{% - \defglsdisplayfirst[#1]{% - \firstacronymfont{##1}##4% - \expandafter\protect\expandafter\acrfootnote\expandafter - {\@gls@link@opts}{\@gls@link@label}{##2}% + \defglsentryfmt[#1]{% + \let\gls@org@insert\glsinsert + \let\glsinsert\@empty + \ifglsused{\glslabel}% + {% + \acronymfont{\glsgenentryfmt}\gls@org@insert + }% + {% + \firstacronymfont{\glsgenentryfmt}\gls@org@insert + \ifglshaslong{\glslabel}% + {% + \expandafter\protect\expandafter\acrfootnote\expandafter + {\@gls@link@opts}{\@gls@link@label}% + {% + \glsifplural + {\glsentrylongpl{\glslabel}}% + {\glsentrylong{\glslabel}}% + }% + }% + {}% + }% }% - \defglsdisplay[#1]{\acronymfont{##1}##4}% } \newcommand*{\FootnoteNewAcronymDef}{% \edef\@do@newglossaryentry{% @@ -4311,17 +5434,34 @@ false,nolabel,autolabel}[nolabel]{% name={\noexpand\acronymfont{\the\glsshorttok}},% sort={\the\glsshorttok},% text={\the\glsshorttok},% - plural={\the\glsshorttok\noexpand\acrpluralsuffix},% + plural={\noexpand\expandonce\noexpand\@glo@shortpl},% + first={\the\glsshorttok},% + firstplural={\noexpand\expandonce\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},% + descriptionplural={\noexpand\expandonce\noexpand\@glo@longpl},% \the\glskeylisttok }% }% + \let\@org@gls@assign@plural\gls@assign@plural + \let\@org@gls@assign@firstpl\gls@assign@firstpl + \let\@org@gls@assign@descplural\gls@assign@descplural + \def\gls@assign@firstpl##1##2{% + \@@gls@expand@field{##1}{firstpl}{##2}% + }% + \def\gls@assign@plural##1##2{% + \@@gls@expand@field{##1}{plural}{##2}% + }% + \def\gls@assign@descplural##1##2{% + \@@gls@expand@field{##1}{descplural}{##2}% + }% \@do@newglossaryentry + \let\gls@assign@plural\@org@gls@assign@plural + \let\gls@assign@firstpl\@org@gls@assign@firstpl + \let\gls@assign@descplural\@org@gls@assign@descplural } \newcommand*{\SetFootnoteAcronymStyle}{% \renewcommand{\newacronym}[4][]{% @@ -4344,7 +5484,7 @@ false,nolabel,autolabel}[nolabel]{% \ifglsacrsmallcaps \renewcommand*{\acronymfont}[1]{\textsc{##1}}% \renewcommand*{\acrpluralsuffix}{% - \textup{\glspluralsuffix}}% + \glstextup{\glspluralsuffix}}% \else \ifglsacrsmaller \renewcommand*{\acronymfont}[1]{\textsmaller{##1}}% @@ -4360,15 +5500,40 @@ false,nolabel,autolabel}[nolabel]{% \ifdefempty\gls@tmp {}% {% - \if\gls@tmp\relax + \ifx\gls@tmp\@gls@default@value \else \space (#2{#1})% \fi }% } \newcommand*{\SetSmallAcronymDisplayStyle}[1]{% - \defglsdisplayfirst[#1]{##1##4\glsdoparenifnotempty{##3}{\protect\firstacronymfont}} - \defglsdisplay[#1]{\acronymfont{##1}##4}% + \defglsentryfmt[#1]{% + \let\gls@org@insert\glsinsert + \let\glsinsert\@empty + \ifglsused{\glslabel}% + {% + \acronymfont{\glsgenentryfmt}\gls@org@insert + }% + {% + \glsgenentryfmt + \ifglshassymbol{\glslabel}% + {% + \glsifplural + {% + \def\@glo@symbol{\glsentrysymbolplural{\glslabel}}% + }% + {% + \def\@glo@symbol{\glsentrysymbol{\glslabel}}% + }% + \space + (\glscapscase + {\firstacronymfont{\@glo@symbol}}% + {\firstacronymfont{\@glo@symbol}}% + {\firstacronymfont{\mfirstucMakeUppercase{\@glo@symbol}}})% + }% + {}% + }% + }% } \newcommand*{\SmallNewAcronymDef}{% \edef\@do@newglossaryentry{% @@ -4377,22 +5542,42 @@ false,nolabel,autolabel}[nolabel]{% type=\acronymtype,% name={\noexpand\acronymfont{\the\glsshorttok}},% sort={\the\glsshorttok},% - text={\noexpand\@glo@symbol},% - plural={\noexpand\@glo@shortpl},% + text={\the\glsshorttok},% + plural={\noexpand\expandonce\noexpand\@glo@shortpl},% first={\the\glslongtok},% - firstplural={\noexpand\@glo@longpl},% + firstplural={\noexpand\expandonce\noexpand\@glo@longpl},% short={\the\glsshorttok},% shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},% long={\the\glslongtok},% longplural={\the\glslongtok\noexpand\acrpluralsuffix},% description={\noexpand\@glo@first},% - descriptionplural={\noexpand\@glo@firstplural},% + descriptionplural={\noexpand\expandonce\noexpand\@glo@longpl},% symbol={\the\glsshorttok},% - symbolplural={\noexpand\@glo@shortpl},% + symbolplural={\noexpand\expandonce\noexpand\@glo@shortpl},% \the\glskeylisttok }% }% + \let\@org@gls@assign@firstpl\gls@assign@firstpl + \let\@org@gls@assign@plural\gls@assign@plural + \let\@org@gls@assign@descplural\gls@assign@descplural + \let\@org@gls@assign@symbolplural\gls@assign@symbolplural + \def\gls@assign@firstpl##1##2{% + \@@gls@expand@field{##1}{firstpl}{##2}% + }% + \def\gls@assign@plural##1##2{% + \@@gls@expand@field{##1}{plural}{##2}% + }% + \def\gls@assign@descplural##1##2{% + \@@gls@expand@field{##1}{descplural}{##2}% + }% + \def\gls@assign@symbolplural##1##2{% + \@@gls@expand@field{##1}{symbolplural}{##2}% + }% \@do@newglossaryentry + \let\gls@assign@firstpl\@org@gls@assign@firstpl + \let\gls@assign@plural\@org@gls@assign@plural + \let\gls@assign@descplural\@org@gls@assign@descplural + \let\gls@assign@symbolplural\@org@gls@assign@symbolplural } \newcommand*{\SetSmallAcronymStyle}{% \renewcommand{\newacronym}[4][]{% @@ -4415,7 +5600,7 @@ false,nolabel,autolabel}[nolabel]{% \ifglsacrsmallcaps \renewcommand*{\acronymfont}[1]{\textsc{##1}} \renewcommand*{\acrpluralsuffix}{% - \textup{\glspluralsuffix}}% + \glstextup{\glspluralsuffix}}% \else \renewcommand*{\acronymfont}[1]{\textsmaller{##1}} \fi @@ -4430,8 +5615,7 @@ false,nolabel,autolabel}[nolabel]{% \fi }% \newcommand*{\SetDUADisplayStyle}[1]{% - \defglsdisplay[#1]{##1##4}% - \defglsdisplayfirst[#1]{##1##4}% + \defglsentryfmt[#1]{\glsgenentryfmt}% } \newcommand*{\DUANewAcronymDef}{% \edef\@do@newglossaryentry{% @@ -4440,18 +5624,41 @@ false,nolabel,autolabel}[nolabel]{% type=\acronymtype,% name={\the\glsshorttok},% text={\the\glslongtok},% - plural={\the\glslongtok\noexpand\acrpluralsuffix},% + first={\the\glslongtok},% + plural={\noexpand\expandonce\noexpand\@glo@longpl},% + firstplural={\noexpand\expandonce\noexpand\@glo@longpl},% short={\the\glsshorttok},% shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},% long={\the\glslongtok},% longplural={\the\glslongtok\noexpand\acrpluralsuffix},% description={\the\glslongtok},% + descriptionplural={\noexpand\expandonce\noexpand\@glo@longpl},% symbol={\the\glsshorttok},% - symbolplural={\the\glsshorttok\noexpand\acrpluralsuffix},% + symbolplural={\noexpand\expandonce\noexpand\@glo@shortpl},% \the\glskeylisttok }% }% + \let\@org@gls@assign@firstpl\gls@assign@firstpl + \let\@org@gls@assign@plural\gls@assign@plural + \let\@org@gls@assign@symbolplural\gls@assign@symbolplural + \let\@org@gls@assign@descplural\gls@assign@descplural + \def\gls@assign@firstpl##1##2{% + \@@gls@expand@field{##1}{firstpl}{##2}% + }% + \def\gls@assign@plural##1##2{% + \@@gls@expand@field{##1}{plural}{##2}% + }% + \def\gls@assign@symbolplural##1##2{% + \@@gls@expand@field{##1}{symbolplural}{##2}% + }% + \def\gls@assign@descplural##1##2{% + \@@gls@expand@field{##1}{descplural}{##2}% + }% \@do@newglossaryentry + \let\gls@assign@firstpl\@org@gls@assign@firstpl + \let\gls@assign@plural\@org@gls@assign@plural + \let\gls@assign@symbolplural\@org@gls@assign@symbolplural + \let\gls@assign@descplural\@org@gls@assign@descplural } \newcommand*{\SetDUAStyle}{% \renewcommand{\newacronym}[4][]{% @@ -4503,15 +5710,15 @@ false,nolabel,autolabel}[nolabel]{% } \SetAcronymStyle \newcommand*{\SetCustomDisplayStyle}[1]{% - \defglsdisplay[#1]{##1##4}% - \defglsdisplayfirst[#1]{##1##4}% + \defglsentryfmt[#1]{\glsgenentryfmt}% } \newcommand*{\CustomAcronymFields}{% name={\the\glsshorttok},% description={\the\glslongtok},% first={\noexpand\acrfullformat{\the\glslongtok}{\the\glsshorttok}},% firstplural={\noexpand\acrfullformat - {\the\glslongtok\noexpand\acrpluralsuffix}{\the\glsshorttok}}% + {\noexpand\glsentrylongpl{\the\glslabeltok}}% + {\noexpand\glsentryshortpl{\the\glslabeltok}}}% text={\the\glsshorttok},% plural={\the\glsshorttok\noexpand\acrpluralsuffix}% } @@ -4581,7 +5788,7 @@ false,nolabel,autolabel}[nolabel]{% \@gls@loadtree \ifx\@glossary@default@style\relax \else - \glossarystyle{\@glossary@default@style} + \setglossarystyle{\@glossary@default@style} \fi \newcommand*{\showgloparent}[1]{% \expandafter\show\csname glo@#1@parent\endcsname @@ -4643,6 +5850,12 @@ false,nolabel,autolabel}[nolabel]{% \newcommand*{\showglosymbolplural}[1]{% \expandafter\show\csname glo@#1@symbolplural\endcsname } +\newcommand*{\showgloshort}[1]{% + \expandafter\show\csname glo@#1@short\endcsname +} +\newcommand*{\showglolong}[1]{% + \expandafter\show\csname glo@#1@long\endcsname +} \newcommand*{\showgloindex}[1]{% \expandafter\show\csname glo@#1@index\endcsname } diff --git a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty index d3434bb6568..1f8f9d6eb79 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/mfirstuc.sty @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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,12 +39,12 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{mfirstuc}[2012/05/21 v1.06 (NLCT)] +\ProvidesPackage{mfirstuc}[2013/11/04 v1.08 (NLCT)] \RequirePackage{etoolbox} \newif\if@glscs \newtoks\@glsmfirst \newtoks\@glsmrest -\def\makefirstuc#1{% +\newrobustcmd*{\makefirstuc}[1]{% \def\gls@argi{#1}% \ifx\gls@argi\@empty \else @@ -84,16 +84,16 @@ \@glscsfalse \fi } -\def\@gls@makefirstuc#1{\MakeUppercase #1} +\def\@gls@makefirstuc#1{\mfirstucMakeUppercase #1} +\newcommand*{\mfirstucMakeUppercase}{\MakeUppercase} \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]{% \expandafter\makefirstuc\expandafter{#1}} -\newcommand*{\capitalisewords}[1]{% +\newrobustcmd*{\capitalisewords}[1]{% \def\gls@add@space{}% \mfu@capitalisewords#1 \@nil\mfu@endcap - %\gls@add@space\makefirstuc{##1}\def\gls@add@space{ }% } \def\mfu@capitalisewords#1 #2\mfu@endcap{% \def\mfu@cap@first{#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 144911fab7f..cf9b5b93e8e 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 @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 ebd9683464c..ec0f382b3a6 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 @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 5204fc76096..d496ada3cbb 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 @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 d4936216654..c66296ef022 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 @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 7d15db257b4..a0a76d10f4e 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 @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 d31b0835be5..3c9f35887ba 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 @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 0bc25f9a50b..be984033699 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 @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 de91e4eaa07..0af3819cf2b 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 @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 4287d819359..1715371500f 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 @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 5d040548c93..5100cee0431 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 @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 72215c69060..699f3e54738 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 @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 3a436df9ace..3d1ed290e9b 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 @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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 5588e541771..06879015604 100644 --- a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty +++ b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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,10 +39,35 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-accsupp}[2011/04/02 v3.0 (NLCT) +\ProvidesPackage{glossaries-accsupp}[2013/11/14 v4.0 (NLCT) Experimental glossaries accessibility] \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}} \ProcessOptions +\newcommand*{\compatibleglossentry}[2]{% + \toks@{#2}% + \protected@edef\@do@glossentry{% + \noexpand\accsuppglossaryentryfield{#1}% + {\noexpand\glsnamefont + {\expandafter\expandonce\csname glo@#1@name\endcsname}}% + {\expandafter\expandonce\csname glo@#1@desc\endcsname}% + {\expandafter\expandonce\csname glo@#1@symbol\endcsname}% + {\the\toks@}% + }% + \@do@glossentry +} +\newcommand*{\compatiblesubglossentry}[3]{% + \toks@{#3}% + \protected@edef\@do@subglossentry{% + \noexpand\accsuppglossarysubentryfield{\number#1}% + {#2}% + {\noexpand\glsnamefont + {\expandafter\expandonce\csname glo@#2@name\endcsname}}% + {\expandafter\expandonce\csname glo@#2@desc\endcsname}% + {\expandafter\expandonce\csname glo@#2@symbol\endcsname}% + {\the\toks@}% + }% + \@do@subglossentry +} \RequirePackage{glossaries} \RequirePackage{accsupp} \define@key{glossentry}{access}{% @@ -84,6 +109,21 @@ \define@key{glossentry}{longpluralaccess}{% \def\@glo@longpluralaccess{#1}% } +\appto\@gls@keymap{,% + {access}{access},% + {textaccess}{textaccess},% + {firstaccess}{firstaccess},% + {pluralaccess}{pluralaccess},% + {firstpluralaccess}{firstpluralaccess},% + {symbolaccess}{symbolaccess},% + {symbolpluralaccess}{symbolpluralaccess},% + {descaccess}{descaccess},% + {descpluralaccess}{descpluralaccess},% + {shortaccess}{shortaccess},% + {shortpluralaccess}{shortpluralaccess},% + {longaccess}{longaccess},% + {longpluralaccess}{longpluralaccess}% +} \def\@gls@noaccess{\relax} \let\@gls@oldnewglossaryentryprehook\@newglossaryentryprehook \renewcommand*{\@newglossaryentryprehook}{% @@ -305,311 +345,289 @@ \csname gls#1accessdisplay\endcsname{#2}{#3}% }% } -\def\@gls@#1#2[#3]{% - \glsdoifexists{#2}% +\renewcommand*{\@@gls@default@entryfmt}[2]{% + \ifdefempty\glscustomtext {% - \edef\@glo@type{\glsentrytype{#2}}% - \def\@gls@link@opts{#1}% - \def\@gls@link@label{#2}% - \ifglsused{#2}% + \glsifplural {% - \def\@glo@text{\csname gls@\@glo@type @display\endcsname - {\glstextaccessdisplay{\glsentrytext{#2}}{#2}}% - {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}% - {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}% - {#3}}% - }% - {% - \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname - {\glsfirstaccessdisplay{\glsentryfirst{#2}}{#2}}% - {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}% - {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}% - {#3}}% - }% - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{\@glo@text}% - }% - {% - \gls@checkisacronymlist\@glo@type - \ifthenelse{\(\boolean{@glsisacronymlist}\AND - \boolean{glsacrfootnote}\) \OR\NOT\boolean{glshyperfirst}}% + \glscapscase {% - \@gls@link[#1,hyper=false]{#2}{\@glo@text}% + \ifglsused\glslabel + {% + #2{\glspluralaccessdisplay + {\glsentryplural{\glslabel}}{\glslabel}}% + {\glsdescriptionpluralaccessdisplay + {\glsentrydescplural{\glslabel}}{\glslabel}}% + {\glssymbolpluralaccessdisplay + {\glsentrysymbolplural{\glslabel}}{\glslabel}} + {\glsinsert}% + }% + {% + #1{\glsfirstpluralaccessdisplay + {\glsentryfirstplural{\glslabel}}{\glslabel}}% + {\glsdescriptionpluralaccessdisplay + {\glsentrydescplural{\glslabel}}{\glslabel}}% + {\glssymbolpluralaccessdisplay + {\glsentrysymbolplural{\glslabel}}{\glslabel}}% + {\glsinsert}% + }% }% {% - \@gls@link[#1]{#2}{\@glo@text}% - }% - }% - \glsunset{#2}% - }% -} -\def\@Gls@#1#2[#3]{% - \glsdoifexists{#2}% - {% - \edef\@glo@type{\glsentrytype{#2}}% - \def\@gls@link@opts{#1}% - \def\@gls@link@label{#2}% - \ifglsused{#2}% - {% - \def\@glo@text{\csname gls@\@glo@type @display\endcsname - {\glstextaccessdisplay{\Glsentrytext{#2}}{#2}}% - {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}% - {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}% - {#3}}% - }% - {% - \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname - {\glsfirstaccessdisplay{\Glsentryfirst{#2}}{#2}}% - {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}% - {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}% - {#3}}% - }% - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{\@glo@text}% - }% - {% - \gls@checkisacronymlist\@glo@type - \ifthenelse{\(\boolean{@glsisacronymlist}\AND - \boolean{glsacrfootnote}\) \OR\NOT\boolean{glshyperfirst}}% - {% - \@gls@link[#1,hyper=false]{#2}{\@glo@text}% - }% - {% - \@gls@link[#1]{#2}{\@glo@text}% - }% - }% - \glsunset{#2}% - }% -} -\def\@GLS@#1#2[#3]{% - \glsdoifexists{#2}{% - \edef\@glo@type{\glsentrytype{#2}}% - \def\@gls@link@opts{#1}% - \def\@gls@link@label{#2}% - \ifglsused{#2}% - {% - \def\@glo@text{\csname gls@\@glo@type @display\endcsname - {\glstextaccessdisplay{\glsentrytext{#2}}{#2}}% - {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}% - {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}% - {#3}}% - }% - {% - \edef\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname - {\glsfirstaccessdisplay{\glsentryfirst{#2}}{#2}}% - {\glsdescriptionaccessdisplay{\glsentrydesc{#2}}{#2}}% - {\glssymbolaccessdisplay{\glsentrysymbol{#2}}{#2}}% - {#3}}% - }% - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% - }% - {% - \gls@checkisacronymlist\@glo@type - \ifthenelse{\(\boolean{@glsisacronymlist}\AND - \boolean{glsacrfootnote}\) \OR\NOT\boolean{glshyperfirst}}{% - \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}% + \ifglsused\glslabel + {% + #2{\glspluralaccessdisplay + {\Glsentryplural{\glslabel}}{\glslabel}}% + {\glsdescriptionpluralaccessdisplay + {\glsentrydescplural{\glslabel}}{\glslabel}}% + {\glssymbolpluralaccessdisplay + {\glsentrysymbolplural{\glslabel}}{\glslabel}}% + {\glsinsert}% + }% + {% + #1{\glsfirstpluralaccessdisplay + {\Glsentryfirstplural{\glslabel}}{\glslabel}}% + {\glsdescriptionpluralaccessdisplay + {\glsentrydescplural{\glslabel}}{\glslabel}}% + {\glssymbolpluralaccessdisplay + {\glsentrysymbolplural{\glslabel}}{\glslabel}}% + {\glsinsert}% + }% }% {% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% + \ifglsused\glslabel + {% + \MakeUppercase{% + #2{\glspluralaccessdisplay + {\glsentryplural{\glslabel}}{\glslabel}}% + {\glsdescriptionpluralaccessdisplay + {\glsentrydescplural{\glslabel}}{\glslabel}}% + {\glssymbolpluralaccessdisplay + {\glsentrysymbolplural{\glslabel}}{\glslabel}}% + {\glsinsert}}% + }% + {% + \MakeUppercase{% + #1{\glsfirstpluralaccessdisplay + {\glsentryfirstplural{\glslabel}}{\glslabel}}% + {\glsdescriptionpluralaccessdisplay + {\glsentrydescplural{\glslabel}}{\glslabel}}% + {\glssymbolpluralaccessdisplay + {\glsentrysymbolplural{\glslabel}}{\glslabel}}% + {\glsinsert}}% + }% }% }% - \glsunset{#2}% - }% -} -\def\@glspl@#1#2[#3]{% - \glsdoifexists{#2}% - {% - \edef\@glo@type{\glsentrytype{#2}}% - \def\@gls@link@opts{#1}% - \def\@gls@link@label{#2}% - \ifglsused{#2}% - {% - \def\@glo@text{\csname gls@\@glo@type @display\endcsname - {\glspluralaccessdisplay{\glsentryplural{#2}}{#2}}% - {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}% - {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}% - {#3}}% - }% - {% - \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname - {\glsfirstpluralaccessdisplay{\glsentryfirstplural{#2}}{#2}}% - {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}% - {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}% - {#3}}% - }% - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{\@glo@text}% - }% {% - \gls@checkisacronymlist\@glo@type - \ifthenelse{\(\boolean{@glsisacronymlist}\AND - \boolean{glsacrfootnote}\) \OR\NOT\boolean{glshyperfirst}}% - {% - \@gls@link[#1,hyper=false]{#2}{\@glo@text}% - }% + \glscapscase {% - \@gls@link[#1]{#2}{\@glo@text}% + \ifglsused\glslabel + {% + #2{\glstextaccessdisplay + {\glsentrytext{\glslabel}}{\glslabel}}% + {\glsdescriptionaccessdisplay + {\glsentrydesc{\glslabel}}{\glslabel}}% + {\glssymbolaccessdisplay + {\glsentrysymbol{\glslabel}}{\glslabel}}% + {\glsinsert}% + }% + {% + #1{\glsfirstaccessdisplay + {\glsentryfirst{\glslabel}}{\glslabel}}% + {\glsdescriptionaccessdisplay + {\glsentrydesc{\glslabel}}{\glslabel}}% + {\glssymbolaccessdisplay + {\glsentrysymbol{\glslabel}}{\glslabel}}% + {\glsinsert}% + }% }% - }% - \glsunset{#2}% - }% -} -\def\@Glspl@#1#2[#3]{% - \glsdoifexists{#2}% - {% - \edef\@glo@type{\glsentrytype{#2}}% - \def\@gls@link@opts{#1}% - \def\@gls@link@label{#2}% - \ifglsused{#2}% - {% - \def\@glo@text{\csname gls@\@glo@type @display\endcsname - {\glspluralaccessdisplay{\Glsentryplural{#2}}{#2}}% - {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}% - {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}% - {#3}}% - }% - {% - \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname - {\glsfirstpluralaccessdisplay{\Glsentryfirstplural{#2}}{#2}}% - {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}% - {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}% - {#3}}% - }% - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{\@glo@text}% - }% - {% - \ifthenelse{\equal{\@glo@type}{\acronymtype}\and - \boolean{glsacrfootnote}}% {% - \@gls@link[#1,hyper=false]{#2}{\@glo@text}% + \ifglsused\glslabel + {% + #2{\glstextaccessdisplay + {\Glsentrytext{\glslabel}}{\glslabel}}% + {\glsdescriptionaccessdisplay + {\glsentrydesc{\glslabel}}{\glslabel}}% + {\glssymbolaccessdisplay + {\glsentrysymbol{\glslabel}}{\glslabel}}% + {\glsinsert}% + }% + {% + #1{\glsfirstaccessdisplay + {\Glsentryfirst{\glslabel}}{\glslabel}}% + {\glsdescriptionaccessdisplay + {\glsentrydesc{\glslabel}}{\glslabel}}% + {\glssymbolaccessdisplay + {\glsentrysymbol{\glslabel}}{\glslabel}}% + {\glsinsert}% + }% }% {% - \@gls@link[#1]{#2}{\@glo@text}% + \ifglsused\glslabel + {% + \MakeUppercase{% + #2{\glstextaccessdisplay + {\glsentrytext{\glslabel}}{\glslabel}}% + {\glsdescriptionaccessdisplay + {\glsentrydesc{\glslabel}}{\glslabel}}% + {\glssymbolaccessdisplay + {\glsentrysymbol{\glslabel}}{\glslabel}}% + {\glsinsert}}% + }% + {% + \MakeUppercase{% + #1{\glsfirstaccessdisplay + {\glsentryfirst{\glslabel}}{\glslabel}}% + {\glsdescriptionaccessdisplay + {\glsentrydesc{\glslabel}}{\glslabel}}% + {\glssymbolaccessdisplay + {\glsentrysymbol{\glslabel}}{\glslabel}}% + {\glsinsert}}% + }% }% }% - \glsunset{#2}% }% -} -\def\@GLSpl@#1#2[#3]{% - \glsdoifexists{#2}% {% - \edef\@glo@type{\glsentrytype{#2}}% - \def\@gls@link@opts{#1}% - \def\@gls@link@label{#2}% - \ifglsused{#2}% + \ifglsused{\glslabel}% {% - \def\@glo@text{\csname gls@\@glo@type @display\endcsname - {\glspluralaccessdisplay{\glsentryplural{#2}}{#2}}% - {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}% - {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}% - {#3}}% + #2{\glscustomtext}% + {\glsdescriptionaccessdisplay + {\glsentrydesc{\glslabel}}{\glslabel}}% + {\glssymbolaccessdisplay + {\glsentrysymbol{\glslabel}}{\glslabel}}% + {\glsinsert}% }% {% - \def\@glo@text{\csname gls@\@glo@type @displayfirst\endcsname - {\glsfirstpluralaccessdisplay{\glsentryfirstplural{#2}}{#2}}% - {\glsdescriptionpluralaccessdisplay{\glsentrydescplural{#2}}{#2}}% - {\glssymbolpluralaccessdisplay{\glsentrysymbolplural{#2}}{#2}}% - {#3}}% + #1{\glscustomtext}% + {\glsdescriptionaccessdisplay + {\glsentrydesc{\glslabel}}{\glslabel}}% + {\glssymbolaccessdisplay + {\glsentrysymbol{\glslabel}}{\glslabel}}% + {\glsinsert}% }% - \ifglsused{#2}% - {% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% - }% - {% - \gls@checkisacronymlist\@glo@type - \ifthenelse{\(\boolean{@glsisacronymlist}\AND - \boolean{glsacrfootnote}\)\OR\NOT\boolean{glshyperfirst}}% - {% - \@gls@link[#1,hyper=false]{#2}{\MakeUppercase{\@glo@text}}% - }% - {% - \@gls@link[#1]{#2}{\MakeUppercase{\@glo@text}}% - }% - }% - \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\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@firstofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glsshortaccessdisplay{\glsentryshort{#2}}{#2}}#3% + }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \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\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@secondofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glsshortaccessdisplay{\Glsentryshort{#2}}{#2}}#3% + }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \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\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@thirdofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glsshortaccessdisplay + {\MakeUppercase{\glsentryshort{#2}}}{#2}}#3% + }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \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\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@firstofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glslongaccessdisplay{\glsentrylong{#2}}{#2}}#3% + }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \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\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@firstofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glslongaccessdisplay{\Glsentrylong{#2}}{#2}}#3% + }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% }% } \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}% + \def\glslabel{#2}% + \let\glsifplural\@secondoftwo + \let\glscapscase\@firstofthree + \let\glsinsert\@empty + \def\glscustomtext{% + \acronymfont{\glslongaccessdisplay{% + \MakeUppercase{\glsentrylong{#2}}}{#2}#3}% + }% + \@gls@link[#1]{#2}{\csname gls@\@glo@type @entryfmt\endcsname}% + }% +} +\renewcommand*{\glossentryname}[1]{% + \glsdoifexists{#1}% + {% + \glsnamefont{\glsnameaccessdisplay{\glsentryname{#1}}{#1}}% + }% +} +\renewcommand*{\glossentryname}[1]{% + \glsdoifexists{#1}% + {% + \glsnamefont{\glsnameaccessdisplay{\Glsentryname{#1}}{#1}}% + }% +} +\renewcommand*{\glossentrydesc}[1]{% + \glsdoifexists{#1}% + {% + \glsdescriptionaccessdisplay{\glsentrydesc{#1}}{#1}% + }% +} +\renewcommand*{\Glossentrydesc}[1]{% + \glsdoifexists{#1}% + {% + \glsdescriptionaccessdisplay{\Glsentrydesc{#1}}{#1}% + }% +} +\renewcommand*{\glossentrysymbol}[1]{% + \glsdoifexists{#1}% + {% + \glssymbolaccessdisplay{\glsentrysymbol{#1}}{#1}% + }% +} +\renewcommand*{\Glossentrysymbol}[1]{% + \glsdoifexists{#1}% + {% + \glssymbolaccessdisplay{\Glsentrysymbol{#1}}{#1}% }% } -\ifglsxindy - \renewcommand*{\@glossaryentryfield}{% - \string\\accsuppglossaryentryfield} -\else - \renewcommand*{\@glossaryentryfield}{% - \string\accsuppglossaryentryfield} -\fi -\ifglsxindy - \renewcommand*{\@glossarysubentryfield}{% - \string\\accsuppglossarysubentryfield} -\else - \renewcommand*{\@glossarysubentryfield}{% - \string\accsuppglossarysubentryfield} -\fi \newcommand*{\accsuppglossaryentryfield}[5]{% \glossaryentryfield{#1}% {\glsnameaccessdisplay{#2}{#1}}% @@ -617,7 +635,7 @@ {\glssymbolaccessdisplay{#4}{#1}}{#5}% } \newcommand*{\accsuppglossarysubentryfield}[6]{% - \glossaryentryfield{#1}{#2}% + \glossarysubentryfield{#1}{#2}% {\glsnameaccessdisplay{#3}{#2}}% {\glsdescriptionaccessdisplay{#4}{#2}}% {\glssymbolaccessdisplay{#5}{#2}}{#6}% 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 af113655e2d..ac0b7612d9c 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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-hypernav}[2007/07/04 v1.01 (NLCT)] +\ProvidesPackage{glossary-hypernav}[2013/11/14 v4.0 (NLCT)] \newcommand*{\glsnavhyperlink}[3][\@glo@type]{% \edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}% \@glslink{glsn:#1@#2}{#3}} @@ -80,7 +80,8 @@ }% \@for\@gls@tmp:=\@gls@list\do{% \@gls@between - \glsnavhyperlink{\@gls@tmp}{\glsgetgrouptitle{\@gls@tmp}}% + \@gls@getgrouptitle{\@gls@tmp}{\@gls@grptitle}% + \glsnavhyperlink{\@gls@tmp}{\@gls@grptitle}% \let\@gls@between\glshypernavsep% }% } diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty index d5891c47288..776345d8bb0 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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-inline}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-inline}[2013/11/14 v4.0 (NLCT)] \newglossarystyle{inline}{% \renewenvironment{theglossary}% {% @@ -49,19 +49,28 @@ {\glspostinline}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand{\glossaryentryfield}[5]{% + \renewcommand{\glossentry}[2]{% \glsinlinedopostchild \gls@inlinesep - \def\glo@desc{##3}% - \def\@no@post@desc{\nopostdesc}% - \glsentryitem{##1}\glsinlinenameformat{##1}{##2}% - \ifx\glo@desc\@no@post@desc - \glsinlineemptydescformat{##4}{##5}% - \else - \ifstrempty{##3}% - {\glsinlineemptydescformat{##4}{##5}}% - {\glsinlinedescformat{##3}{##4}{##5}}% - \fi + \glsentryitem{##1}% + \glsinlinenameformat{##1}{% + \glossentryname{##1}% + }% + \ifglsdescsuppressed{##1}% + {% + \glsinlineemptydescformat + {% + \glossentrysymbol{##1}% + }% + {% + ##2% + }% + }% + {% + \ifglshasdesc{##1}% + {\glsinlinedescformat{\glossentrydesc{##1}}{\glossentrysymbol{##1}}{##2}}% + {\glsinlineemptydescformat{\glossentrysymbol{##1}}{##2}}% + }% \ifglshaschildren{##1}% {% \glsresetsubentrycounter @@ -72,10 +81,12 @@ {}% \def\gls@inlinesep{\glsinlineseparator}% }% - \renewcommand{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% \gls@inlinesubsep% - \glsinlinesubnameformat{##2}{##3}% - \glssubentryitem{##2}\glsinlinesubdescformat{##4}{##5}{##6}% + \glsinlinesubnameformat{##2}{% + \glossentryname{##2}}% + \glssubentryitem{##2}% + \glsinlinesubdescformat{\glossentrydesc{##2}}{\glossentrysymbol{##2}}{##3}% \def\gls@inlinesubsep{\glsinlinesubseparator}% }% \renewcommand*{\glsgroupskip}{}% 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 d5f0030baa6..9fbe8f418ff 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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,67 +38,71 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-list}[2012/11/11 v3.04 (NLCT)] +\ProvidesPackage{glossary-list}[2013/11/14 v4.0 (NLCT)] \newglossarystyle{list}{% \renewenvironment{theglossary}% {\begin{description}}{\end{description}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \item[\glsentryitem{##1}\glstarget{##1}{##2}] - ##3\glspostdescription\space ##5}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand*{\glossentry}[2]{% + \item[\glsentryitem{##1}% + \glstarget{##1}{\glossentryname{##1}}] + \glossentrydesc{##1}\glspostdescription\space ##2}% + \renewcommand*{\subglossentry}[3]{% \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6.}% + \glstarget{##2}{\strut}% + \glossentrydesc{##2}\glspostdescription\space ##3.}% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}% } \newglossarystyle{listgroup}{% - \glossarystyle{list}% + \setglossarystyle{list}% \renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}} \newglossarystyle{listhypergroup}{% - \glossarystyle{list}% + \setglossarystyle{list}% \renewcommand*{\glossaryheader}{% \item[\glsnavigation]}% \renewcommand*{\glsgroupheading}[1]{% \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}} \newglossarystyle{altlist}{% - \glossarystyle{list}% - \renewcommand*{\glossaryentryfield}[5]{% - \item[\glsentryitem{##1}\glstarget{##1}{##2}]% + \setglossarystyle{list}% + \renewcommand*{\glossentry}[2]{% + \item[\glsentryitem{##1}% + \glstarget{##1}{\glossentryname{##1}}]% \mbox{}\par\nobreak\@afterheading - ##3\glspostdescription\space ##5}% - \renewcommand{\glossarysubentryfield}[6]{% + \glossentrydesc{##1}\glspostdescription\space ##2}% + \renewcommand{\subglossentry}[3]{% \par \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription\space ##3}% } \newglossarystyle{altlistgroup}{% - \glossarystyle{altlist}% + \setglossarystyle{altlist}% \renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}} \newglossarystyle{altlisthypergroup}{% - \glossarystyle{altlist}% + \setglossarystyle{altlist}% \renewcommand*{\glossaryheader}{% \item[\glsnavigation]}% \renewcommand*{\glsgroupheading}[1]{% \item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}} \newglossarystyle{listdotted}{% - \glossarystyle{list}% - \renewcommand*{\glossaryentryfield}[5]{% + \setglossarystyle{list}% + \renewcommand*{\glossentry}[2]{% \item[]\makebox[\glslistdottedwidth][l]{% - \glsentryitem{##1}\glstarget{##1}{##2}% - \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##3}% - \renewcommand*{\glossarysubentryfield}[6]{% + \glsentryitem{##1}% + \glstarget{##1}{\glossentryname{##1}}% + \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}\glossentrydesc{##1}}% + \renewcommand*{\subglossentry}[3]{% \item[]\makebox[\glslistdottedwidth][l]{% \glssubentryitem{##2}% - \glstarget{##2}{##3}% - \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}##4}% + \glstarget{##2}{\glossentryname{##2}}% + \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}\glossentrydesc{##2}}% } \newlength\glslistdottedwidth \setlength{\glslistdottedwidth}{.5\hsize} \newglossarystyle{sublistdotted}{% - \glossarystyle{listdotted}% - \renewcommand*{\glossaryentryfield}[5]{% - \item[\glsentryitem{##1}\glstarget{##1}{##2}]}% + \setglossarystyle{listdotted}% + \renewcommand*{\glossentry}[2]{% + \item[\glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}}]}% } \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 1c9442650b6..84e43034e24 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-long}[2013/11/14 v4.0 (NLCT)] \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth @@ -54,29 +54,35 @@ {\end{longtable}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription\space ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}% - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \\\fi}% + \glstarget{##2}{\strut}\glosentrydesc{##2}\glspostdescription\space + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & +\tabularnewline\fi}% } \newglossarystyle{longborder}{% - \glossarystyle{long}% + \setglossarystyle{long}% \renewenvironment{theglossary}{% \begin{longtable}{|l|p{\glsdescwidth}|}}{\end{longtable}}% \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } \newglossarystyle{longheader}{% - \glossarystyle{long}% + \setglossarystyle{long}% \renewcommand*{\glossaryheader}{% - \bfseries \entryname & \bfseries \descriptionname\\\endhead}% + \bfseries \entryname & \bfseries \descriptionname\tabularnewline\endhead}% } \newglossarystyle{longheaderborder}{% - \glossarystyle{longborder}% + \setglossarystyle{longborder}% \renewcommand*{\glossaryheader}{% - \hline\bfseries \entryname & \bfseries \descriptionname\\\hline + \hline\bfseries \entryname & \bfseries + \descriptionname\tabularnewline\hline \endhead \hline\endfoot}% } @@ -86,33 +92,38 @@ {\end{longtable}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\\}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##6\\}% - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\\\fi}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & &\tabularnewline\fi}% } \newglossarystyle{long3colborder}{% - \glossarystyle{long3col}% + \setglossarystyle{long3col}% \renewenvironment{theglossary}% {\begin{longtable}{|l|p{\glsdescwidth}|p{\glspagelistwidth}|}}% {\end{longtable}}% \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } \newglossarystyle{long3colheader}{% - \glossarystyle{long3col}% + \setglossarystyle{long3col}% \renewcommand*{\glossaryheader}{% \bfseries\entryname&\bfseries\descriptionname& - \bfseries\pagelistname\\\endhead}% + \bfseries\pagelistname\tabularnewline\endhead}% } \newglossarystyle{long3colheaderborder}{% - \glossarystyle{long3colborder}% + \setglossarystyle{long3colborder}% \renewcommand*{\glossaryheader}{% \hline \bfseries\entryname&\bfseries\descriptionname& - \bfseries\pagelistname\\\hline\endhead + \bfseries\pagelistname\tabularnewline\hline\endhead \hline\endfoot}% } \newglossarystyle{long4col}{% @@ -121,58 +132,66 @@ {\end{longtable}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\\}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & + \glossentrysymbol{##1} & + ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##5 & ##6\\}% - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\\\fi}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + \glossentrysymbol{##2} & ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & & &\tabularnewline\fi}% } \newglossarystyle{long4colheader}{% - \glossarystyle{long4col}% + \setglossarystyle{long4col}% \renewcommand*{\glossaryheader}{% \bfseries\entryname&\bfseries\descriptionname& \bfseries \symbolname& - \bfseries\pagelistname\\\endhead}% + \bfseries\pagelistname\tabularnewline\endhead}% } \newglossarystyle{long4colborder}{% - \glossarystyle{long4col}% + \setglossarystyle{long4col}% \renewenvironment{theglossary}% {\begin{longtable}{|l|l|l|l|}}% {\end{longtable}}% \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } \newglossarystyle{long4colheaderborder}{% - \glossarystyle{long4col}% + \setglossarystyle{long4col}% \renewenvironment{theglossary}% {\begin{longtable}{|l|l|l|l|}}% {\end{longtable}}% \renewcommand*{\glossaryheader}{% \hline\bfseries\entryname&\bfseries\descriptionname& \bfseries \symbolname& - \bfseries\pagelistname\\\hline\endhead\hline\endfoot}% + \bfseries\pagelistname\tabularnewline\hline\endhead + \hline\endfoot}% } \newglossarystyle{altlong4col}{% - \glossarystyle{long4col}% + \setglossarystyle{long4col}% \renewenvironment{theglossary}% {\begin{longtable}{lp{\glsdescwidth}lp{\glspagelistwidth}}}% {\end{longtable}}% } \newglossarystyle{altlong4colheader}{% - \glossarystyle{long4colheader}% + \setglossarystyle{long4colheader}% \renewenvironment{theglossary}% {\begin{longtable}{lp{\glsdescwidth}lp{\glspagelistwidth}}}% {\end{longtable}}% } \newglossarystyle{altlong4colborder}{% - \glossarystyle{long4colborder}% + \setglossarystyle{long4colborder}% \renewenvironment{theglossary}% {\begin{longtable}{|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}% {\end{longtable}}% } \newglossarystyle{altlong4colheaderborder}{% - \glossarystyle{long4colheaderborder}% + \setglossarystyle{long4colheaderborder}% \renewenvironment{theglossary}% {\begin{longtable}{|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}% {\end{longtable}}% 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 b910fe34ce8..e156963e5e3 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-longragged}[2013/11/14 v4.0 (NLCT)] \RequirePackage{array} \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% @@ -55,31 +55,35 @@ {\end{longtable}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5% - \tabularnewline}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription\space ##2% + \tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6% - \tabularnewline}% + \glstarget{##2}{\strut}\glossentrydesc{##2}% + \glspostdescription\space ##3% + \tabularnewline + }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \tabularnewline\fi}% } \newglossarystyle{longraggedborder}{% - \glossarystyle{longragged}% + \setglossarystyle{longragged}% \renewenvironment{theglossary}{% \begin{longtable}{|l|>{\raggedright}p{\glsdescwidth}|}}% {\end{longtable}}% \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } \newglossarystyle{longraggedheader}{% - \glossarystyle{longragged}% + \setglossarystyle{longragged}% \renewcommand*{\glossaryheader}{% \bfseries \entryname & \bfseries \descriptionname \tabularnewline\endhead}% } \newglossarystyle{longraggedheaderborder}{% - \glossarystyle{longraggedborder}% + \setglossarystyle{longraggedborder}% \renewcommand*{\glossaryheader}{% \hline\bfseries \entryname & \bfseries \descriptionname \tabularnewline\hline @@ -93,16 +97,21 @@ {\end{longtable}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\tabularnewline}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##6\tabularnewline}% - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\tabularnewline\fi}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & &\tabularnewline\fi}% } \newglossarystyle{longragged3colborder}{% - \glossarystyle{longragged3col}% + \setglossarystyle{longragged3col}% \renewenvironment{theglossary}% {\begin{longtable}{|l|>{\raggedright}p{\glsdescwidth}|% >{\raggedright}p{\glspagelistwidth}|}}% @@ -110,13 +119,13 @@ \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } \newglossarystyle{longragged3colheader}{% - \glossarystyle{longragged3col}% + \setglossarystyle{longragged3col}% \renewcommand*{\glossaryheader}{% \bfseries\entryname&\bfseries\descriptionname& \bfseries\pagelistname\tabularnewline\endhead}% } \newglossarystyle{longragged3colheaderborder}{% - \glossarystyle{longragged3colborder}% + \setglossarystyle{longragged3colborder}% \renewcommand*{\glossaryheader}{% \hline \bfseries\entryname&\bfseries\descriptionname& @@ -130,16 +139,22 @@ {\end{longtable}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & \glossentrydesc{##1} & + ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}% - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\tabularnewline\fi}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + \glossentrysymbol{##2} & ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & & &\tabularnewline\fi}% } \newglossarystyle{altlongragged4colheader}{% - \glossarystyle{altlongragged4col}% + \setglossarystyle{altlongragged4col}% \renewenvironment{theglossary}% {\begin{longtable}{l>{\raggedright}p{\glsdescwidth}l% >{\raggedright}p{\glspagelistwidth}}}% @@ -150,7 +165,7 @@ \bfseries\pagelistname\tabularnewline\endhead}% } \newglossarystyle{altlongragged4colborder}{% - \glossarystyle{altlongragged4col}% + \setglossarystyle{altlongragged4col}% \renewenvironment{theglossary}% {\begin{longtable}{|l|>{\raggedright}p{\glsdescwidth}|l|% >{\raggedright}p{\glspagelistwidth}|}}% @@ -158,7 +173,7 @@ \renewcommand*{\glossaryheader}{\hline\endhead\hline\endfoot}% } \newglossarystyle{altlongragged4colheaderborder}{% - \glossarystyle{altlongragged4col}% + \setglossarystyle{altlongragged4col}% \renewenvironment{theglossary}% {\begin{longtable}{|l|>{\raggedright}p{\glsdescwidth}|l|% >{\raggedright}p{\glspagelistwidth}|}}% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty index 745374ad9b9..53c5e6fb2bd 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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,12 +38,12 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-mcols}[2013/04/21 v3.05 (NLCT)] +\ProvidesPackage{glossary-mcols}[2013/11/14 v4.0 (NLCT)] \RequirePackage{multicol} \RequirePackage{glossary-tree} \newcommand*{\glsmcols}{2} \newglossarystyle{mcolindex}{% - \glossarystyle{index}% + \setglossarystyle{index}% \renewenvironment{theglossary}% {% \begin{multicols}{\glsmcols} @@ -53,12 +53,12 @@ {\end{multicols}}% } \newglossarystyle{mcolindexgroup}{% - \glossarystyle{mcolindex}% + \setglossarystyle{mcolindex}% \renewcommand*{\glsgroupheading}[1]{% \item\textbf{\glsgetgrouptitle{##1}}\indexspace}% } \newglossarystyle{mcolindexhypergroup}{% - \glossarystyle{mcolindex}% + \setglossarystyle{mcolindex}% \renewcommand*{\glossaryheader}{% \item\textbf{\glsnavigation}\indexspace}% \renewcommand*{\glsgroupheading}[1]{% @@ -66,7 +66,7 @@ \indexspace}% } \newglossarystyle{mcoltree}{% - \glossarystyle{tree}% + \setglossarystyle{tree}% \renewenvironment{theglossary}% {% \begin{multicols}{\glsmcols} @@ -76,12 +76,12 @@ {\end{multicols}}% } \newglossarystyle{mcoltreegroup}{% - \glossarystyle{mcoltree}% + \setglossarystyle{mcoltree}% \renewcommand{\glsgroupheading}[1]{\par \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}% } \newglossarystyle{mcoltreehypergroup}{% - \glossarystyle{mcoltree}% + \setglossarystyle{mcoltree}% \renewcommand*{\glossaryheader}{% \par\noindent\textbf{\glsnavigation}\par\indexspace}% \renewcommand*{\glsgroupheading}[1]{% @@ -90,7 +90,7 @@ \indexspace}% } \newglossarystyle{mcoltreenoname}{% - \glossarystyle{treenoname}% + \setglossarystyle{treenoname}% \renewenvironment{theglossary}% {% \begin{multicols}{\glsmcols} @@ -100,12 +100,12 @@ {\end{multicols}}% } \newglossarystyle{mcoltreenonamegroup}{% - \glossarystyle{mcoltreenoname}% + \setglossarystyle{mcoltreenoname}% \renewcommand{\glsgroupheading}[1]{\par \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}% } \newglossarystyle{mcoltreenonamehypergroup}{% - \glossarystyle{mcoltreenoname}% + \setglossarystyle{mcoltreenoname}% \renewcommand*{\glossaryheader}{% \par\noindent\textbf{\glsnavigation}\par\indexspace}% \renewcommand*{\glsgroupheading}[1]{% @@ -114,7 +114,7 @@ \indexspace}% } \newglossarystyle{mcolalttree}{% - \glossarystyle{alttree}% + \setglossarystyle{alttree}% \renewenvironment{theglossary}% {% \begin{multicols}{\glsmcols} @@ -124,7 +124,7 @@ {\par\end{multicols}}% } \newglossarystyle{mcolalttreegroup}{% - \glossarystyle{mcolalttree}% + \setglossarystyle{mcolalttree}% \renewcommand{\glsgroupheading}[1]{\par \def\@gls@prevlevel{-1}% \hangindent0pt\relax @@ -132,7 +132,7 @@ \textbf{\glsgetgrouptitle{##1}}\par\indexspace}% } \newglossarystyle{mcolalttreehypergroup}{% - \glossarystyle{mcolalttree}% + \setglossarystyle{mcolalttree}% \renewcommand*{\glossaryheader}{% \par \def\@gls@prevlevel{-1}% 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 bca74c30ce7..8b193f3c457 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-super}[2013/11/14 v4.0 (NLCT)] \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth @@ -55,34 +55,40 @@ {\end{supertabular}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5\\}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription\space ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6\\}% - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \\\fi}% + \glstarget{##2}{\strut}\glosentrydesc{##2}\glspostdescription\space + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & \tabularnewline\fi}% } \newglossarystyle{superborder}{% - \glossarystyle{super}% + \setglossarystyle{super}% \renewenvironment{theglossary}% {\tablehead{\hline}\tabletail{\hline}% \begin{supertabular}{|l|p{\glsdescwidth}|}}% {\end{supertabular}}% } \newglossarystyle{superheader}{% - \glossarystyle{super}% + \setglossarystyle{super}% \renewenvironment{theglossary}% - {\tablehead{\bfseries \entryname & \bfseries \descriptionname\\}% + {\tablehead{\bfseries \entryname & + \bfseries\descriptionname\tabularnewline}% \tabletail{}% \begin{supertabular}{lp{\glsdescwidth}}}% {\end{supertabular}}% } \newglossarystyle{superheaderborder}{% - \glossarystyle{super}% + \setglossarystyle{super}% \renewenvironment{theglossary}% {\tablehead{\hline\bfseries \entryname & - \bfseries \descriptionname\\\hline}% + \bfseries \descriptionname\tabularnewline\hline}% \tabletail{\hline} \begin{supertabular}{|l|p{\glsdescwidth}|}}% {\end{supertabular}}% @@ -94,35 +100,40 @@ {\end{supertabular}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\\}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##6\\}% - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\\\fi}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & &\tabularnewline\fi}% } \newglossarystyle{super3colborder}{% - \glossarystyle{super3col}% + \setglossarystyle{super3col}% \renewenvironment{theglossary}% {\tablehead{\hline}\tabletail{\hline}% \begin{supertabular}{|l|p{\glsdescwidth}|p{\glspagelistwidth}|}}% {\end{supertabular}}% } \newglossarystyle{super3colheader}{% - \glossarystyle{super3col}% + \setglossarystyle{super3col}% \renewenvironment{theglossary}% {\tablehead{\bfseries\entryname&\bfseries\descriptionname& - \bfseries\pagelistname\\}\tabletail{}% + \bfseries\pagelistname\tabularnewline}\tabletail{}% \begin{supertabular}{lp{\glsdescwidth}p{\glspagelistwidth}}}% {\end{supertabular}}% } \newglossarystyle{super3colheaderborder}{% - \glossarystyle{super3colborder}% + \setglossarystyle{super3colborder}% \renewenvironment{theglossary}% {\tablehead{\hline \bfseries\entryname&\bfseries\descriptionname& - \bfseries\pagelistname\\\hline}% + \bfseries\pagelistname\tabularnewline\hline}% \tabletail{\hline}% \begin{supertabular}{|l|p{\glsdescwidth}|p{\glspagelistwidth}|}}% {\end{supertabular}}% @@ -134,58 +145,65 @@ \end{supertabular}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\\}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & + \glossentrysymbol{##1} & ##3\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##5 & ##6\\}% - \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\\\fi}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + \glossentrysymbol{##2} & ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & & &\tabularnewline\fi}% } \newglossarystyle{super4colheader}{% - \glossarystyle{super4col}% + \setglossarystyle{super4col}% \renewenvironment{theglossary}% {\tablehead{\bfseries\entryname&\bfseries\descriptionname& \bfseries\symbolname & - \bfseries\pagelistname\\}% + \bfseries\pagelistname\tabularnewline}% \tabletail{}% \begin{supertabular}{llll}}% {\end{supertabular}}% } \newglossarystyle{super4colborder}{% - \glossarystyle{super4col}% + \setglossarystyle{super4col}% \renewenvironment{theglossary}% {\tablehead{\hline}\tabletail{\hline}% \begin{supertabular}{|l|l|l|l|}}% {\end{supertabular}}% } \newglossarystyle{super4colheaderborder}{% - \glossarystyle{super4col}% + \setglossarystyle{super4col}% \renewenvironment{theglossary}% {\tablehead{\hline\bfseries\entryname&\bfseries\descriptionname& \bfseries\symbolname & - \bfseries\pagelistname\\\hline}\tabletail{\hline}% + \bfseries\pagelistname\tabularnewline\hline}% + \tabletail{\hline}% \begin{supertabular}{|l|l|l|l|}}% {\end{supertabular}}% } \newglossarystyle{altsuper4col}{% - \glossarystyle{super4col}% + \setglossarystyle{super4col}% \renewenvironment{theglossary}% {\tablehead{}\tabletail{}% \begin{supertabular}{lp{\glsdescwidth}lp{\glspagelistwidth}}}% {\end{supertabular}}% } \newglossarystyle{altsuper4colheader}{% - \glossarystyle{super4colheader}% + \setglossarystyle{super4colheader}% \renewenvironment{theglossary}% {\tablehead{\bfseries\entryname&\bfseries\descriptionname& \bfseries\symbolname & - \bfseries\pagelistname\\}\tabletail{}% + \bfseries\pagelistname\tabularnewline}\tabletail{}% \begin{supertabular}{lp{\glsdescwidth}lp{\glspagelistwidth}}}% {\end{supertabular}}% } \newglossarystyle{altsuper4colborder}{% - \glossarystyle{super4colborder}% + \setglossarystyle{super4colborder}% \renewenvironment{theglossary}% {\tablehead{\hline}\tabletail{\hline}% \begin{supertabular}% @@ -193,13 +211,13 @@ {\end{supertabular}}% } \newglossarystyle{altsuper4colheaderborder}{% - \glossarystyle{super4colheaderborder}% + \setglossarystyle{super4colheaderborder}% \renewenvironment{theglossary}% {\tablehead{\hline \bfseries\entryname & \bfseries\descriptionname & \bfseries\symbolname & - \bfseries\pagelistname\\\hline}% + \bfseries\pagelistname\tabularnewline\hline}% \tabletail{\hline}% \begin{supertabular}% {|l|p{\glsdescwidth}|l|p{\glspagelistwidth}|}}% 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 3d522a6b620..b9c4943dc77 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-superragged}[2013/11/14 v4.0 (NLCT)] \RequirePackage{array} \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% @@ -56,25 +56,29 @@ {\end{supertabular}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3\glspostdescription\space ##5% - \tabularnewline}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription\space ##2% + \tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4\glspostdescription\space ##6% - \tabularnewline}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription\space + ##3% + \tabularnewline + }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & \tabularnewline\fi}% } \newglossarystyle{superraggedborder}{% - \glossarystyle{superragged}% + \setglossarystyle{superragged}% \renewenvironment{theglossary}% {\tablehead{\hline}\tabletail{\hline}% \begin{supertabular}{|l|>{\raggedright}p{\glsdescwidth}|}}% {\end{supertabular}}% } \newglossarystyle{superraggedheader}{% - \glossarystyle{superragged}% + \setglossarystyle{superragged}% \renewenvironment{theglossary}% {\tablehead{\bfseries \entryname & \bfseries \descriptionname \tabularnewline}% @@ -83,7 +87,7 @@ {\end{supertabular}}% } \newglossarystyle{superraggedheaderborder}{% - \glossarystyle{superragged}% + \setglossarystyle{superragged}% \renewenvironment{theglossary}% {\tablehead{\hline\bfseries \entryname & \bfseries \descriptionname\tabularnewline\hline}% @@ -99,16 +103,21 @@ {\end{supertabular}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##5\tabularnewline}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & + ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##6\tabularnewline}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + ##3\tabularnewline + }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & &\tabularnewline\fi}% } \newglossarystyle{superragged3colborder}{% - \glossarystyle{superragged3col}% + \setglossarystyle{superragged3col}% \renewenvironment{theglossary}% {\tablehead{\hline}\tabletail{\hline}% \begin{supertabular}{|l|>{\raggedright}p{\glsdescwidth}|% @@ -116,7 +125,7 @@ {\end{supertabular}}% } \newglossarystyle{superragged3colheader}{% - \glossarystyle{superragged3col}% + \setglossarystyle{superragged3col}% \renewenvironment{theglossary}% {\tablehead{\bfseries\entryname&\bfseries\descriptionname& \bfseries\pagelistname\tabularnewline}\tabletail{}% @@ -125,7 +134,7 @@ {\end{supertabular}}% } \newglossarystyle{superragged3colheaderborder}{% - \glossarystyle{superragged3colborder}% + \setglossarystyle{superragged3colborder}% \renewenvironment{theglossary}% {\tablehead{\hline \bfseries\entryname&\bfseries\descriptionname& @@ -143,16 +152,21 @@ {\end{supertabular}}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand*{\glossaryentryfield}[5]{% - \glsentryitem{##1}\glstarget{##1}{##2} & ##3 & ##4 & ##5\tabularnewline}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1} & + \glossentrysymbol{##1} & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% & \glssubentryitem{##2}% - \glstarget{##2}{\strut}##4 & ##5 & ##6\tabularnewline}% + \glstarget{##2}{\strut}\glossentrydesc{##2} & + \glossentrysymbol{##2} & ##3\tabularnewline + }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & &\tabularnewline\fi}% } \newglossarystyle{altsuperragged4colheader}{% - \glossarystyle{altsuperragged4col}% + \setglossarystyle{altsuperragged4col}% \renewenvironment{theglossary}% {\tablehead{\bfseries\entryname&\bfseries\descriptionname& \bfseries\symbolname & @@ -162,7 +176,7 @@ {\end{supertabular}}% } \newglossarystyle{altsuperragged4colborder}{% - \glossarystyle{altsuper4col}% + \setglossarystyle{altsuper4col}% \renewenvironment{theglossary}% {\tablehead{\hline}\tabletail{\hline}% \begin{supertabular}% @@ -171,7 +185,7 @@ {\end{supertabular}}% } \newglossarystyle{altsuperragged4colheaderborder}{% - \glossarystyle{altsuperragged4col}% + \setglossarystyle{altsuperragged4col}% \renewenvironment{theglossary}% {\tablehead{\hline \bfseries\entryname & 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 166e8fe74de..35a971b8936 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty @@ -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-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-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-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-numberlist.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, mfirstuc.perl. +%% This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, 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-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.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,23 +38,21 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-tree}[2012/09/21 v3.03 (NLCT)] +\ProvidesPackage{glossary-tree}[2013/11/14 v4.0 (NLCT)] \newglossarystyle{index}{% \renewenvironment{theglossary}% {\setlength{\parindent}{0pt}% \setlength{\parskip}{0pt plus 0.3pt}% \let\item\@idxitem}% - {}% + {\par}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% -\renewcommand*{\glossaryentryfield}[5]{% -\item\glsentryitem{##1}\textbf{\glstarget{##1}{##2}}% - \ifx\relax##4\relax - \else - \space(##4)% - \fi - \space ##3\glspostdescription \space ##5}% - \renewcommand*{\glossarysubentryfield}[6]{% + \renewcommand*{\glossentry}[2]{% + \item\glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}% + \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}% + \space \glossentrydesc{##1}\glspostdescription\space ##2% + }% + \renewcommand{\subglossentry}[3]{% \ifcase##1\relax % level 0 \item @@ -66,20 +64,18 @@ % all other levels \subsubitem \fi - \textbf{\glstarget{##2}{##3}}% - \ifx\relax##5\relax - \else - \space(##5)% - \fi - \space##4\glspostdescription\space ##6}% + \textbf{\glstarget{##2}{\glossentryname{##2}}}% + \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}% + \space\glossentrydesc{##2}\glspostdescription\space ##3% + }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}} \newglossarystyle{indexgroup}{% - \glossarystyle{index}% + \setglossarystyle{index}% \renewcommand*{\glsgroupheading}[1]{% \item\textbf{\glsgetgrouptitle{##1}}\indexspace}% } \newglossarystyle{indexhypergroup}{% - \glossarystyle{index}% + \setglossarystyle{index}% \renewcommand*{\glossaryheader}{% \item\textbf{\glsnavigation}\indexspace}% \renewcommand*{\glsgroupheading}[1]{% @@ -93,35 +89,31 @@ {}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand{\glossaryentryfield}[5]{% + \renewcommand{\glossentry}[2]{% \hangindent0pt\relax \parindent0pt\relax - \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}% - \ifx\relax##4\relax - \else - \space(##4)% - \fi - \space ##3\glspostdescription \space ##5\par}% - \renewcommand{\glossarysubentryfield}[6]{% + \glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}% + \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}% + \space\glossentrydesc{##1}\glspostdescription\space##2\par + }% + \renewcommand{\subglossentry}[3]{% \hangindent##1\glstreeindent\relax \parindent##1\glstreeindent\relax \ifnum##1=1\relax \glssubentryitem{##2}% \fi - \textbf{\glstarget{##2}{##3}}% - \ifx\relax##5\relax - \else - \space(##5)% - \fi - \space##4\glspostdescription\space ##6\par}% + \textbf{\glstarget{##2}{\glossentryname{##2}}}% + \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}% + \space\glossentrydesc{##2}\glspostdescription\space ##3\par + }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}} \newglossarystyle{treegroup}{% - \glossarystyle{tree}% + \setglossarystyle{tree}% \renewcommand{\glsgroupheading}[1]{\par \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}% } \newglossarystyle{treehypergroup}{% - \glossarystyle{tree}% + \setglossarystyle{tree}% \renewcommand*{\glossaryheader}{% \par\noindent\textbf{\glsnavigation}\par\indexspace}% \renewcommand*{\glsgroupheading}[1]{% @@ -137,33 +129,32 @@ \setlength{\parskip}{0pt plus 0.3pt}}% {}% \renewcommand*{\glossaryheader}{}% -\renewcommand*{\glsgroupheading}[1]{}% - \renewcommand{\glossaryentryfield}[5]{% + \renewcommand*{\glsgroupheading}[1]{}% + \renewcommand{\glossentry}[2]{% \hangindent0pt\relax \parindent0pt\relax - \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}% - \ifx\relax##4\relax - \else - \space(##4)% - \fi - \space ##3\glspostdescription \space ##5\par}% - \renewcommand{\glossarysubentryfield}[6]{% + \glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}% + \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}% + \space\glossentrydesc{##1}\glspostdescription\space##2\par + }% + \renewcommand{\subglossentry}[3]{% \hangindent##1\glstreeindent\relax \parindent##1\glstreeindent\relax \ifnum##1=1\relax \glssubentryitem{##2}% \fi \glstarget{##2}{\strut}% - ##4\glspostdescription\space ##6\par}% + \glossentrydesc{##2}\glspostdescription\space##3\par + }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}% } \newglossarystyle{treenonamegroup}{% - \glossarystyle{treenoname}% + \setglossarystyle{treenoname}% \renewcommand{\glsgroupheading}[1]{\par \noindent\textbf{\glsgetgrouptitle{##1}}\par\indexspace}% } \newglossarystyle{treenonamehypergroup}{% - \glossarystyle{treenoname}% + \setglossarystyle{treenoname}% \renewcommand*{\glossaryheader}{% \par\noindent\textbf{\glsnavigation}\par\indexspace}% \renewcommand*{\glsgroupheading}[1]{% @@ -183,7 +174,7 @@ {\par}% \renewcommand*{\glossaryheader}{}% \renewcommand*{\glsgroupheading}[1]{}% - \renewcommand{\glossaryentryfield}[5]{% + \renewcommand{\glossentry}[2]{% \ifnum\@gls@prevlevel=0\relax \else \settowidth{\glstreeindent}{\textbf{\@glswidestname\space}}% @@ -191,15 +182,12 @@ \parindent\glstreeindent \fi \makebox[0pt][r]{\makebox[\glstreeindent][l]{% - \glsentryitem{##1}\textbf{\glstarget{##1}{##2}}}}% - \ifx\relax##4\relax - \else - (##4)\space - \fi - ##3\glspostdescription \space ##5\par + \glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}}}% + \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}% + \glossentrydesc{##1}\glspostdescription \space ##2\par \def\@gls@prevlevel{0}% }% - \renewcommand{\glossarysubentryfield}[6]{% + \renewcommand{\subglossentry}[3]{% \ifnum##1=1\relax \glssubentryitem{##2}% \fi @@ -226,18 +214,15 @@ \fi \hangindent\glstreeindent \makebox[0pt][r]{\makebox[\gls@tmplen][l]{% - \textbf{\glstarget{##2}{##3}}}}% - \ifx##5\relax\relax - \else - (##5)\space - \fi - ##4\glspostdescription\space ##6\par + \textbf{\glstarget{##2}{\glossentryname{##2}}}}}% + \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}% + \glossentrydesc{##2}\glspostdescription\space ##3\par \def\@gls@prevlevel{##1}% }% \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}% } \newglossarystyle{alttreegroup}{% - \glossarystyle{alttree}% + \setglossarystyle{alttree}% \renewcommand{\glsgroupheading}[1]{\par \def\@gls@prevlevel{-1}% \hangindent0pt\relax @@ -245,7 +230,7 @@ \textbf{\glsgetgrouptitle{##1}}\par\indexspace}% } \newglossarystyle{alttreehypergroup}{% - \glossarystyle{alttree}% + \setglossarystyle{alttree}% \renewcommand*{\glossaryheader}{% \par \def\@gls@prevlevel{-1}% |