diff options
author | Karl Berry <karl@freefriends.org> | 2016-04-25 21:49:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-04-25 21:49:55 +0000 |
commit | ad6971d5fe287aa59138369c498a8037d6832589 (patch) | |
tree | 33e9afe811868f334669aa822eb3d3cdc8aa7961 /Master | |
parent | bcd63dd9814f27dfadde30f6a94c2c376ea0a9fd (diff) |
glossaries-extra (25apr16)
git-svn-id: svn://tug.org/texlive/trunk@40746 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
39 files changed, 4043 insertions, 1870 deletions
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES b/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES index 9786c6224aa..102b011f716 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES +++ b/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES @@ -1,3 +1,12 @@ +1.02 (2016-04-25): + + * Added \ifglsxtrinsertinside + + * Added \glsfmtlong, \glsfmtlongpl, \Glsfmtlong, \Glsfmtlongpl, + \glsfmtfull, \glsfmtfullpl, \Glsfmtfull, \Glsfmtfullpl + + * Added package glossaries-extra-stylemods.sty + 1.01 (2016-02-02): * Added retainfirstuseperiod attribute diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/README b/Master/texmf-dist/doc/latex/glossaries-extra/README index 4fd7b6e657c..544da1c48ec 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/README +++ b/Master/texmf-dist/doc/latex/glossaries-extra/README @@ -1,6 +1,6 @@ -LaTeX Package : glossaries-extra v1.01 +LaTeX Package : glossaries-extra v1.02 -Last Modified : 2016-02-02 +Last Modified : 2016-04-25 Author : Nicola Talbot diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf Binary files differindex 934c01f58d8..0da78b59675 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.html b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.html index 9edaecb5e93..a71de620d39 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.html +++ b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.html @@ -10,7 +10,7 @@ <meta name="originator" content="TeX4ht (http://www.tug.org/tex4ht/)" /> <!-- xhtml,fn-in,css-in,uni-html4,utf8 --> <meta name="src" content="glossaries-extra-manual.tex" /> -<meta name="date" content="2016-02-02 12:31:00" /> +<meta name="date" content="2016-04-25 13:07:00" /> <style type="text/css"> <!-- @@ -31,6 +31,11 @@ .ectt-1200{ font-family: monospace;} .ectt-1200{ font-family: monospace;} .ectt-1200{ font-family: monospace;} +.ectt-1200{ font-family: monospace;} +.ectt-1200{ font-family: monospace;} +.ectt-1200{ font-family: monospace;} +.ecbx-1000{ font-weight: bold;} +.ecbx-1000{ font-weight: bold;} .ecbx-1000{ font-weight: bold;} .ecbx-1000{ font-weight: bold;} .ecbx-1000{ font-weight: bold;} @@ -43,6 +48,9 @@ .ecbx-1000{ font-weight: bold;} .ecbx-1000{ font-weight: bold;} .ecbx-1000{ font-weight: bold;} +.ecbx-1000{ font-weight: bold;} +.ecss-1000{ font-family: sans-serif;} +.ecss-1000{ font-family: sans-serif;} .ecss-1000{ font-family: sans-serif;} .ecss-1000{ font-family: sans-serif;} .ecss-1000{ font-family: sans-serif;} @@ -55,6 +63,8 @@ .ecss-1000{ font-family: sans-serif;} .ecss-1000{ font-family: sans-serif;} .ecss-1000{ font-family: sans-serif;} +.ecss-1000{ font-family: sans-serif;} +.ectt-1000{ font-family: monospace;} .ectt-1000{ font-family: monospace;} .ectt-1000{ font-family: monospace;} .ectt-1000{ font-family: monospace;} @@ -67,6 +77,25 @@ .ectt-1000{ font-family: monospace;} .ectt-1000{ font-family: monospace;} .ectt-1000{ font-family: monospace;} +.ectt-1000{ font-family: monospace;} +.ectt-1000{ font-family: monospace;} +.ecrm-0900{font-size:90%;} +.ecrm-0800{font-size:80%;} +.ecss-0800{font-size:80%; font-family: sans-serif;} +.ecss-0800{ font-family: sans-serif;} +.ecss-0800{ font-family: sans-serif;} +.ecss-0800{ font-family: sans-serif;} +.ecss-0800{ font-family: sans-serif;} +.ecss-0800{ font-family: sans-serif;} +.ecss-0800{ font-family: sans-serif;} +.ecss-0800{ font-family: sans-serif;} +.ecss-0800{ font-family: sans-serif;} +.ecss-0800{ font-family: sans-serif;} +.ecss-0800{ font-family: sans-serif;} +.ecss-0800{ font-family: sans-serif;} +.ecss-0800{ font-family: sans-serif;} +.ecss-0800{ font-family: sans-serif;} +.ecss-0800{ font-family: sans-serif;} .ectt-0900{font-size:90%; font-family: monospace;} .ectt-0900{ font-family: monospace;} .ectt-0900{ font-family: monospace;} @@ -79,6 +108,9 @@ .ectt-0900{ font-family: monospace;} .ectt-0900{ font-family: monospace;} .ectt-0900{ font-family: monospace;} +.ectt-0900{ font-family: monospace;} +.ectt-0900{ font-family: monospace;} +.ectt-0900{ font-family: monospace;} .ecti-1000{ font-style: italic;} .ecti-1000{ font-style: italic;} .ecti-1000{ font-style: italic;} @@ -91,6 +123,11 @@ .ecti-1000{ font-style: italic;} .ecti-1000{ font-style: italic;} .ecti-1000{ font-style: italic;} +.ecti-1000{ font-style: italic;} +.ecti-1000{ font-style: italic;} +.ecti-1000{ font-style: italic;} +.ecsx-1000{ font-weight: bold;} +.ecsx-1000{ font-weight: bold;} .ecsx-1000{ font-weight: bold;} .ecsx-1000{ font-weight: bold;} .ecsx-1000{ font-weight: bold;} @@ -103,6 +140,10 @@ .ecsx-1000{ font-weight: bold;} .ecsx-1000{ font-weight: bold;} .ecsx-1000{ font-weight: bold;} +.ecsx-1000{ font-weight: bold;} +.ecit-1000{ font-style: italic; font-family: monospace;} +.ecit-1000{ font-style: italic; font-family: monospace;} +.ecit-1000{ font-style: italic; font-family: monospace;} .ecit-1000{ font-style: italic; font-family: monospace;} .ecit-1000{ font-style: italic; font-family: monospace;} .ecit-1000{ font-style: italic; font-family: monospace;} @@ -272,7 +313,7 @@ a span.HoLogo-TeX span.HoLogo-e{text-decoration:none;} > <!--l. 149--><p class="noindent" > </p><!--l. 149--><p class="noindent" ><span -class="ecrm-1728">glossaries-extra.sty v1.01: an extension to the</span> +class="ecrm-1728">glossaries-extra.sty v1.02: an extension to the</span> <span class="ecrm-1728">glossaries package</span> </p> @@ -296,7 +337,7 @@ href="http://www.dickimaw-books.com/" class="url" ><span class="ectt-1200">http://www.dickimaw-books.com/</span></a></td></tr></table> </div> <!--l. 149--><p class="noindent" ><span -class="ecrm-1200">2016-02-02</span></p></div> +class="ecrm-1200">2016-04-25</span></p></div> <div class="abstract" > @@ -408,7 +449,7 @@ href="#sec:predefnonregabbrvstyles" id="QQ2-1-19">Predefined Abbreviation Styles <br />  <span class="sectionToc" >2.5 <a href="#sec:newabbrvstyle" id="QQ2-1-20">Defining New Abbreviation Styles</a></span> <br /> <span class="chapterToc" >3 <a -href="#sec:headtitle" id="QQ2-1-21">Entries in Sectioning Titles, Headers and Contents</a></span> +href="#sec:headtitle" id="QQ2-1-21">Entries in Sectioning Titles, Headers, Captions and Contents</a></span> <br /> <span class="chapterToc" >4 <a href="#sec:categories" id="QQ2-1-22">Categories</a></span> <br /> <span class="chapterToc" >5 <a @@ -444,21 +485,24 @@ manual and those users who want more features (which necessarily adds to the package weight and manual size). </p><!--l. 190--><p class="indent" > The <span class="ecss-1000">glossaries-extra </span>package is an attempt to provide a compromise for this -conflict. Version 4.21 of the <span +conflict. Version 4.22 of the <span class="ecss-1000">glossaries </span>package is the last version to incorporate new -features. Future versions of <span -class="ecss-1000">glossaries </span>will just be bug fixes. New features will instead -be added to <span +features.<span class="footnote-mark"><a +href="#fn1x1" id="fn1x1-bk"><sup class="textsuperscript">1.1</sup></a></span><a + id="x1-2002f1"></a> +Future versions of <span +class="ecss-1000">glossaries </span>will just be bug fixes. New features will instead be added +to <span class="ecss-1000">glossaries-extra</span>. This means that the base <span -class="ecss-1000">glossaries </span>package won’t -increase in terms of package loading time and allocation of resources, but those users -who do want extra features available will have more of a chance of getting their -feature requests accepted. +class="ecss-1000">glossaries </span>package won’t increase in terms +of package loading time and allocation of resources, but those users who do want +extra features available will have more of a chance of getting their feature requests +accepted. </p> -<!--l. 201--><p class="noindent" ><a +<!--l. 204--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">1.1 </span> <a id="sec:defaults"></a>Package Defaults</h3> -<!--l. 204--><p class="noindent" >I’m not happy with some of the default settings assumed by the <span +<!--l. 207--><p class="noindent" >I’m not happy with some of the default settings assumed by the <span class="ecss-1000">glossaries</span><a id="dx1-3001"></a> package, and, judging from code I’ve seen, other users also seem unhappy with them, as @@ -469,7 +513,7 @@ but since <span class="ecss-1000">glossaries-extra </span>is a separate package, I have decided to implement some of these commonly-used options by default. You can switch them back if they’re not appropriate. -</p><!--l. 214--><p class="indent" > The new defaults are: </p> +</p><!--l. 217--><p class="indent" > The new defaults are: </p> <ul class="itemize1"> <li class="itemize"><span class="ecss-1000">toc=true</span><a @@ -522,7 +566,7 @@ class="ecss-1000">babel</span><a -<!--l. 238--><p class="indent" > Examples: +<!--l. 241--><p class="indent" > Examples: </p><ol class="enumerate1" > <li class="enumerate" id="x1-3018x1"> @@ -533,7 +577,7 @@ class="ecss-1000">babel</span><a \documentclass{article}  <br />\usepackage{glossaries-extra} </div> - <!--l. 244--><p class="nopar" > This is like: + <!--l. 247--><p class="nopar" > This is like: @@ -543,7 +587,7 @@ class="ecss-1000">babel</span><a  <br />\usepackage[toc,nopostdot]{glossaries}  <br />\usepackage{glossaries-extra} </div> - <!--l. 250--><p class="nopar" > + <!--l. 253--><p class="nopar" > </p></li> <li class="enumerate" id="x1-3020x2"> @@ -555,7 +599,7 @@ class="ecss-1000">babel</span><a  <br />\usepackage{babel}  <br />\usepackage{glossaries-extra} </div> - <!--l. 257--><p class="nopar" > This is like: + <!--l. 260--><p class="nopar" > This is like: @@ -566,7 +610,7 @@ class="ecss-1000">babel</span><a  <br />\usepackage[toc,nopostdot,translate=babel]{glossaries}  <br />\usepackage{glossaries-extra} </div> - <!--l. 264--><p class="nopar" > + <!--l. 267--><p class="nopar" > </p></li> <li class="enumerate" id="x1-3022x3"> @@ -577,7 +621,7 @@ class="ecss-1000">babel</span><a \documentclass{memoir}  <br />\usepackage{glossaries-extra} </div> - <!--l. 270--><p class="nopar" > This is like: + <!--l. 273--><p class="nopar" > This is like: @@ -587,7 +631,7 @@ class="ecss-1000">babel</span><a  <br />\usepackage[toc,nopostdot,noredefwarn]{glossaries}  <br />\usepackage{glossaries-extra} </div> - <!--l. 276--><p class="nopar" > <span + <!--l. 279--><p class="nopar" > <span class="ecti-1000">However</span> @@ -598,7 +642,7 @@ class="ecti-1000">However</span>  <br />\usepackage{glossaries}  <br />\usepackage{glossaries-extra} </div> - <!--l. 282--><p class="nopar" > This is like: + <!--l. 285--><p class="nopar" > This is like: @@ -608,20 +652,20 @@ class="ecti-1000">However</span>  <br />\usepackage[toc,nopostdot]{glossaries}  <br />\usepackage{glossaries-extra} </div> - <!--l. 288--><p class="nopar" > Since by the time <span + <!--l. 291--><p class="nopar" > Since by the time <span class="ecss-1000">glossaries-extra </span>has been loaded, <span class="ecss-1000">glossaries</span><a id="dx1-3023"></a> has already redefined <span class="ecss-1000">memoir</span><a id="dx1-3024"></a>’s glossary-related commands.</p></li></ol> -<!--l. 294--><p class="indent" > Another noticeable change is that by default <span +<!--l. 297--><p class="indent" > Another noticeable change is that by default <span class="ectt-1000">\printglossary </span>will now display information text in the document if the external glossary file doesn’t exist. This is explanatory text to help new users who can’t work out what to do next to complete the document build. Once the document is set up correctly and the external files have been generated, this text will disappear. -</p><!--l. 301--><p class="indent" > This change is mostly likely to be noticed by users with one or more +</p><!--l. 304--><p class="indent" > This change is mostly likely to be noticed by users with one or more redundant empty glossaries who ignore transcript messages, explicitly use <a id="dx1-3025"></a><a @@ -651,14 +695,14 @@ following:  <br />\printglossaries  <br />\end{document} </div> -<!--l. 325--><p class="nopar" > The above document will only display the list of acronyms at the place where +<!--l. 328--><p class="nopar" > The above document will only display the list of acronyms at the place where <span class="ectt-1000">\printglossaries</span><a id="dx1-3029"></a> occurs. However it will also attempt to input the <span class="ectt-1000">.gls </span>file associated with the <span class="ectt-1000">main </span>glossary. -</p><!--l. 331--><p class="indent" > If you use <a +</p><!--l. 334--><p class="indent" > If you use <a id="dx1-3030"></a><a href="#glo:makeglossaries"><span class="ectt-1000">makeglossaries</span></a>, you’ll get the warning message: @@ -672,7 +716,7 @@ Warning: File ’test.glo’ is empty.  <br />Remember to use package option ’nomain’ if you  <br />don’t want to use the main glossary. </div> -<!--l. 337--><p class="nopar" > (where the original file is called <span +<!--l. 340--><p class="nopar" > (where the original file is called <span class="ectt-1000">test.tex</span>) but if you simply call <a id="dx1-3031"></a><a href="#glo:makeindex"><span @@ -688,14 +732,14 @@ transcript file will always contain the message: <div class="verbatim" id="verbatim-11"> No file test.gls. </div> -<!--l. 344--><p class="nopar" > This doesn’t occur with <a +<!--l. 347--><p class="nopar" > This doesn’t occur with <a id="dx1-3032"></a><a href="#glo:makeglossaries"><span class="ectt-1000">makeglossaries</span></a> as it will create the <span class="ectt-1000">.gls </span>file containing the single command <span class="ectt-1000">\null</span>. -</p><!--l. 348--><p class="indent" > If you simply change from <span +</p><!--l. 351--><p class="indent" > If you simply change from <span class="ecss-1000">glossaries</span><a id="dx1-3033"></a> to <span class="ecss-1000">glossaries-extra </span>in this document, you’ll find @@ -707,7 +751,7 @@ class="ectt-1000">.acr </span>file with <a id="dx1-3035"></a><a href="#glo:makeindex"><span class="ectt-1000">makeindex</span></a>. -</p><!--l. 353--><p class="indent" > The transcript file will still contain the message about the missing <span +</p><!--l. 356--><p class="indent" > The transcript file will still contain the message about the missing <span class="ectt-1000">.gls</span>, but now you’ll also see information in the actual PDF document. The simplest remedy is to follow the advice inserted into the document at that point, which is to add the @@ -729,13 +773,13 @@ class="ecss-1000">nomain</span><a  <br />\printglossaries  <br />\end{document} </div> -<!--l. 375--><p class="nopar" > -</p><!--l. 378--><p class="noindent" > +<!--l. 378--><p class="nopar" > +</p><!--l. 381--><p class="noindent" > </p> -<!--l. 378--><p class="noindent" ><a +<!--l. 381--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">1.2 </span> <a id="sec:pkgopts"></a>New or Modified Package Options</h3> -<!--l. 381--><p class="noindent" >If you haven’t already loaded <span +<!--l. 384--><p class="noindent" >If you haven’t already loaded <span class="ecss-1000">glossaries</span><a id="dx1-4001"></a>, you can use any of the package options provided by <span @@ -755,7 +799,7 @@ remember that not all of the <span class="ecss-1000">glossaries</span><a id="dx1-4006"></a> package options may be used in that command. -</p><!--l. 389--><p class="indent" > In addition to those options recognised by <span +</p><!--l. 392--><p class="indent" > In addition to those options recognised by <span class="ecss-1000">glossaries</span><a id="dx1-4007"></a>, there are some new ones provided by <span @@ -767,7 +811,7 @@ class="ecsx-1000">accsupp</span><a class="description">Load the <span class="ecss-1000">glossaries-accsupp</span><a id="dx1-4009"></a> package (if not already loaded). - <!--l. 396--><p class="noindent" >If you want to define styles that can interface with the accessibility support + <!--l. 399--><p class="noindent" >If you want to define styles that can interface with the accessibility support provided by <span class="ecss-1000">glossaries-accsupp</span><a id="dx1-4010"></a> use the <span @@ -796,7 +840,7 @@ href="#sec:accsupp">Accessibility Support<!--tex4ht:ref: sec:accsupp --></a> for - </p><!--l. 406--><p class="noindent" >Note that the <span + </p><!--l. 409--><p class="noindent" >Note that the <span class="ecss-1000">accsupp</span><a id="dx1-4014"></a> option can only be used as a package option (not through <span @@ -808,46 +852,62 @@ class="ecss-1000">glossaries-accsupp</span><a class="ecss-1000">glossaries-extra </span>if it’s required. </p></dd><dt class="description"> <span -class="ecsx-1000">undefaction</span><a +class="ecsx-1000">stylemods</span><a id="dx1-4017"></a> </dt><dd class="description">This is a ⟨<span class="ecti-1000">key</span>⟩=⟨<span +class="ecti-1000">value</span>⟩ option used to load the <span +class="ecss-1000">glossaries-extra-stylemods</span><a + id="dx1-4018"></a> + package. The value may be a comma-separated list of options to pass to + that package. (Remember to group ⟨<span +class="ecti-1000">value</span>⟩ if it contains any commas.) The + value may be omitted if no options need to be passed. See <a +href="#sec:glosstylemods">§1.3.6 </a><a +href="#sec:glosstylemods">Glossary + Style Modifications<!--tex4ht:ref: sec:glosstylemods --></a> for further details. + </dd><dt class="description"> +<span +class="ecsx-1000">undefaction</span><a + id="dx1-4019"></a> </dt><dd +class="description">This is a ⟨<span +class="ecti-1000">key</span>⟩=⟨<span class="ecti-1000">value</span>⟩ option, which has two allowed values: <span class="ecss-1000">warn</span> and <span class="ecss-1000">error</span>. This indicates what to do if an undefined glossary entry is referenced. The default behaviour is <span class="ecss-1000">undefaction=error</span><a - id="dx1-4018"></a>, which produces an + id="dx1-4020"></a>, which produces an error message (the default for <span class="ecss-1000">glossaries</span><a - id="dx1-4019"></a>). You can switch this to a warning + id="dx1-4021"></a>). You can switch this to a warning message (and ?? appearing in the text) with <span class="ecss-1000">undefaction=warn</span><a - id="dx1-4020"></a>. + id="dx1-4022"></a>. </dd><dt class="description"> <span class="ecsx-1000">docdef</span><a - id="dx1-4021"></a> </dt><dd + id="dx1-4023"></a> </dt><dd class="description">This is a boolean option, which indicates whether or not it’s permitted for the command <span class="ectt-1000">\newglossaryentry</span><a - id="dx1-4022"></a> to be used in the <span + id="dx1-4024"></a> to be used in the <span class="ecss-1000">document</span><a - id="dx1-4023"></a><a - id="dx1-4024"></a> + id="dx1-4025"></a><a + id="dx1-4026"></a> environment. The <span class="ecss-1000">glossaries</span><a - id="dx1-4025"></a> package allows <span + id="dx1-4027"></a> package allows <span class="ectt-1000">\newglossaryentry </span>within the <span class="ecss-1000">document</span><a - id="dx1-4026"></a><a - id="dx1-4027"></a> environment (when used with <a id="dx1-4028"></a><a + id="dx1-4029"></a> environment (when used with <a + id="dx1-4030"></a><a href="#glo:makeindex"><span class="ectt-1000">makeindex</span></a> or <a - id="dx1-4029"></a><a + id="dx1-4031"></a><a href="#glo:xindy"><span class="ectt-1000">xindy</span></a>) but the user manual warns against this usage. By default the <span @@ -856,19 +916,19 @@ class="ecss-1000">glossaries-extra </span>package class="ecti-1000">prohibits </span>this, only allowing definitions within the preamble. If you are really determined to define entries in the <span class="ecss-1000">document</span><a - id="dx1-4030"></a><a - id="dx1-4031"></a> environment, despite + id="dx1-4032"></a><a + id="dx1-4033"></a> environment, despite all the associated drawbacks, you can restore this with <span class="ecss-1000">docdef=true</span><a - id="dx1-4032"></a>. Note + id="dx1-4034"></a>. Note that this doesn’t change the prohibitions that the <span class="ecss-1000">glossaries</span><a - id="dx1-4033"></a> package has + id="dx1-4035"></a> package has in certain circumstances (for example, when using “option 1”). See the <span class="ecss-1000">glossaries</span><a - id="dx1-4034"></a> user manual for further details. - <!--l. 435--><p class="noindent" >This option affects commands that internally use <span + id="dx1-4036"></a> user manual for further details. + <!--l. 446--><p class="noindent" >This option affects commands that internally use <span class="ectt-1000">\newglossaryentry</span>, such as <span class="ectt-1000">\newabbreviation</span>, but not the “on-the-fly” commands described @@ -878,7 +938,7 @@ href="#sec:onthefly">On-the-Fly Document Definitions<!--tex4ht:ref: sec:onthefly </p></dd><dt class="description"> <span class="ecsx-1000">nomissingglstext</span><a - id="dx1-4035"></a> </dt><dd + id="dx1-4037"></a> </dt><dd class="description">This is a boolean option. If true, this will suppress the warning text that will appear in the document if the external glossary files haven’t been generated due to an incomplete document build. However, @@ -887,7 +947,7 @@ class="description">This is a boolean option. If true, this will suppre </dd><dt class="description"> <span class="ecsx-1000">indexcrossrefs</span><a - id="dx1-4036"></a> </dt><dd + id="dx1-4038"></a> </dt><dd class="description">This is a boolean option. If <span class="ecss-1000">true</span>, this will automatically index any cross-referenced entries that haven’t been marked as used at the end @@ -895,36 +955,36 @@ class="ecss-1000">true</span>, this will automatically index build time, especially if you have defined a large number of entries, so this defaults to <span class="ecss-1000">false</span>, but it will be automatically switched on if you use the + + + <span class="ecss-1000">see</span><a - id="dx1-4037"></a> key in any entries. To force it off, even if you use the <span + id="dx1-4039"></a> key in any entries. To force it off, even if you use the <span class="ecss-1000">see</span><a - id="dx1-4038"></a>, you need to + id="dx1-4040"></a>, you need to explicitly set <span class="ecss-1000">indexcrossrefs</span><a - id="dx1-4039"></a> to <span + id="dx1-4041"></a> to <span class="ecss-1000">false</span>. </dd><dt class="description"> <span class="ecsx-1000">abbreviations</span><a - id="dx1-4040"></a> </dt><dd + id="dx1-4042"></a> </dt><dd class="description">This option has no value and can’t be cancelled. If used, it will automatically create a new glossary with the label <span class="ectt-1000">abbreviations </span>and redefines <span class="ectt-1000">\glsxtrabbrvtype </span>to this label. In addition, it defines a shortcut command - - - - <!--l. 461--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 472--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\printabbreviations</span><span class="ectt-0900"> </span></span><a - id="dx1-4041"></a> <span + id="dx1-4043"></a> <span class="ectt-1000">\printabbreviations[</span>⟨<span class="ecit-1000">options</span>⟩<span class="ectt-1000">] </span></div><hr> - </p><!--l. 463--><p class="noindent" > + </p><!--l. 474--><p class="noindent" > which is equivalent to </p><div class="alltt"> <div class="obeylines-v"> <span @@ -933,48 +993,48 @@ class="ecit-1000">options</span>⟩<span class="ectt-1000">]</span> </div> </div> The title of the new glossary is given by - <!--l. 469--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 480--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\abbreviationsname</span><span class="ectt-0900"> </span></span><a - id="dx1-4042"></a> <span + id="dx1-4044"></a> <span class="ectt-1000">\abbreviationsname </span></div><hr> - </p><!--l. 471--><p class="noindent" > + </p><!--l. 482--><p class="noindent" > If this command is already defined, it’s left unchanged. Otherwise it’s defined to “Abbreviations” if <span class="ecss-1000">babel</span><a - id="dx1-4043"></a> hasn’t been loaded or <span + id="dx1-4045"></a> hasn’t been loaded or <span class="ectt-1000">\acronymname </span>if <span class="ecss-1000">babel</span><a - id="dx1-4044"></a> has been loaded. However, if you’re using <span + id="dx1-4046"></a> has been loaded. However, if you’re using <span class="ecss-1000">babel</span><a - id="dx1-4045"></a> it’s likely you + id="dx1-4047"></a> it’s likely you will need to change this. (See <a href="#sec:lang">§10 </a><a href="#sec:lang">Multi-Lingual Support<!--tex4ht:ref: sec:lang --></a> for further details.) - </p><!--l. 478--><p class="noindent" ><div class="important" title="Important Note"> If you don’t use the <span + </p><!--l. 489--><p class="noindent" ><div class="important" title="Important Note"> If you don’t use the <span class="ecss-1000">abbreviations</span><a - id="dx1-4046"></a> package option, the <span + id="dx1-4048"></a> package option, the <span class="ectt-1000">\abbreviationsname</span> command won’t be defined (unless it’s defined by an included language file). </div> - </p><!--l. 482--><p class="noindent" > - </p><!--l. 484--><p class="noindent" >If the <span + </p><!--l. 493--><p class="noindent" > + </p><!--l. 495--><p class="noindent" >If the <span class="ecss-1000">abbreviations</span><a - id="dx1-4047"></a> option is used and the <span + id="dx1-4049"></a> option is used and the <span class="ecss-1000">acronym</span><a - id="dx1-4048"></a> option provided by the + id="dx1-4050"></a> option provided by the <span class="ecss-1000">glossaries</span><a - id="dx1-4049"></a> package hasn’t been used, then <span + id="dx1-4051"></a> package hasn’t been used, then <span class="ectt-1000">\acronymtype</span><a - id="dx1-4050"></a> will be set to + id="dx1-4052"></a> will be set to <span class="ectt-1000">\glsxtrabbrvtype</span><a - id="dx1-4051"></a> so that acronyms defined with <span + id="dx1-4053"></a> so that acronyms defined with <span class="ectt-1000">\newacronym</span><a - id="dx1-4052"></a> can be added + id="dx1-4054"></a> can be added to the list of abbreviations. If you want acronyms in the <span class="ectt-1000">main </span>glossary and other abbreviations in the <span @@ -989,26 +1049,26 @@ class="ectt-1000">main</span>: <div class="verbatim" id="verbatim-13"> \renewcommand*{\acronymtype}{main} </div> - <!--l. 494--><p class="nopar" > - </p><!--l. 496--><p class="noindent" >Note that there are no analogous options to the <span + <!--l. 505--><p class="nopar" > + </p><!--l. 507--><p class="noindent" >Note that there are no analogous options to the <span class="ecss-1000">glossaries</span><a - id="dx1-4053"></a> package’s <span + id="dx1-4055"></a> package’s <span class="ecss-1000">acronymlists</span><a - id="dx1-4054"></a> + id="dx1-4056"></a> option (or associated commands) as the abbreviation mechanism is handled differently with <span class="ecss-1000">glossaries-extra</span>. </p></dd><dt class="description"> <span class="ecsx-1000">symbols</span><a - id="dx1-4055"></a> </dt><dd + id="dx1-4057"></a> </dt><dd class="description">This is passed to <span class="ecss-1000">glossaries</span><a - id="dx1-4056"></a> but will additionally define - <!--l. 503--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + id="dx1-4058"></a> but will additionally define + <!--l. 514--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrnewsymbol</span><span class="ectt-0900"> </span></span><a - id="dx1-4057"></a> <span + id="dx1-4059"></a> <span class="ectt-1000">\glsxtrnewsymbol[</span>⟨<span class="ecit-1000">options</span>⟩<span class="ectt-1000">]{</span>⟨<span @@ -1017,7 +1077,7 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">symbol</span>⟩<span class="ectt-1000">}</span> </div><hr> - </p><!--l. 505--><p class="noindent" > + </p><!--l. 516--><p class="noindent" > which is equivalent to </p><div class="alltt"> <div class="obeylines-v"> <span @@ -1035,27 +1095,27 @@ class="ectt-1000">}</span> </div> </div> Note that the <span class="ecss-1000">sort</span><a - id="dx1-4058"></a> key is set to the ⟨<span + id="dx1-4060"></a> key is set to the ⟨<span class="ecti-1000">label</span>⟩ not the ⟨<span class="ecti-1000">symbol</span>⟩ as the symbol will likely contain commands. </dd><dt class="description"> <span class="ecsx-1000">numbers</span><a - id="dx1-4059"></a> </dt><dd + id="dx1-4061"></a> </dt><dd class="description">This is passed to <span class="ecss-1000">glossaries</span><a - id="dx1-4060"></a> but will additionally define - <!--l. 516--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + id="dx1-4062"></a> but will additionally define + <!--l. 527--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrnewnumber</span><span class="ectt-0900"> </span></span><a - id="dx1-4061"></a> <span + id="dx1-4063"></a> <span class="ectt-1000">\glsxtrnewnumber[</span>⟨<span class="ecit-1000">options</span>⟩<span class="ectt-1000">]{</span>⟨<span class="ecit-1000">number</span>⟩<span class="ectt-1000">} </span></div><hr> - </p><!--l. 518--><p class="noindent" > + </p><!--l. 529--><p class="noindent" > which is equivalent to </p><div class="alltt"> <div class="obeylines-v"> <span @@ -1075,10 +1135,10 @@ class="ectt-1000">}</span> </dd><dt class="description"> <span class="ecsx-1000">shortcuts</span><a - id="dx1-4062"></a> </dt><dd + id="dx1-4064"></a> </dt><dd class="description">Unlike the <span class="ecss-1000">glossaries</span><a - id="dx1-4063"></a> package option of the same name, this option isn’t + id="dx1-4065"></a> package option of the same name, this option isn’t boolean but has multiple values: @@ -1086,19 +1146,19 @@ class="ecss-1000">glossaries</span><a <ul class="itemize1"> <li class="itemize"><span class="ecss-1000">shortcuts=acronyms</span><a - id="dx1-4064"></a> (or <span + id="dx1-4066"></a> (or <span class="ecss-1000">shortcuts=acro</span><a - id="dx1-4065"></a>): set the shortcuts provided + id="dx1-4067"></a>): set the shortcuts provided by the <span class="ecss-1000">glossaries</span><a - id="dx1-4066"></a> package for acronyms (such as <span + id="dx1-4068"></a> package for acronyms (such as <span class="ectt-1000">\ac</span>). </li> <li class="itemize"><span class="ecss-1000">shortcuts=abbreviations</span><a - id="dx1-4067"></a> (or <span + id="dx1-4069"></a> (or <span class="ecss-1000">shortcuts=abbr</span><a - id="dx1-4068"></a>): + id="dx1-4070"></a>): set the abbreviation shortcuts provided by <span class="ecss-1000">glossaries-extra</span>. (See <a href="#sec:abbrshortcuts">§2.3 @@ -1106,78 +1166,78 @@ href="#sec:abbrshortcuts">§2.3 href="#sec:abbrshortcuts">Shortcut Commands<!--tex4ht:ref: sec:abbrshortcuts --></a>.) These settings don’t switch on the acronym shortcuts provided by the <span class="ecss-1000">glossaries</span><a - id="dx1-4069"></a> package. + id="dx1-4071"></a> package. </li> <li class="itemize"><span class="ecss-1000">shortcuts=other</span><a - id="dx1-4070"></a>: set the “other” shortcut commands, but not the shortcut + id="dx1-4072"></a>: set the “other” shortcut commands, but not the shortcut commands for abbreviations or the acronym shortcuts provided by <span class="ecss-1000">glossaries</span><a - id="dx1-4071"></a>. The “other” shortcuts are: + id="dx1-4073"></a>. The “other” shortcuts are: <ul class="itemize2"> <li class="itemize"><span class="ectt-1000">\newentry</span><a - id="dx1-4072"></a> equivalent to <span + id="dx1-4074"></a> equivalent to <span class="ectt-1000">\newglossaryentry</span><a - id="dx1-4073"></a> + id="dx1-4075"></a> </li> <li class="itemize"><span class="ectt-1000">\newsym</span><a - id="dx1-4074"></a> equivalent to <span + id="dx1-4076"></a> equivalent to <span class="ectt-1000">\glsxtrnewsymbol</span><a - id="dx1-4075"></a> (see the <span + id="dx1-4077"></a> (see the <span class="ecss-1000">symbols</span><a - id="dx1-4076"></a> + id="dx1-4078"></a> option). </li> <li class="itemize"><span class="ectt-1000">\newnum</span><a - id="dx1-4077"></a> equivalent to <span + id="dx1-4079"></a> equivalent to <span class="ectt-1000">\glsxtrnewnumber</span><a - id="dx1-4078"></a> (see the <span + id="dx1-4080"></a> (see the <span class="ecss-1000">numbers</span><a - id="dx1-4079"></a> + id="dx1-4081"></a> option).</li></ul> </li> <li class="itemize"><span class="ecss-1000">shortcuts=all</span><a - id="dx1-4080"></a> (or <span + id="dx1-4082"></a> (or <span class="ecss-1000">shortcuts=true</span><a - id="dx1-4081"></a>): define all the shortcut commands. + id="dx1-4083"></a>): define all the shortcut commands. </li> <li class="itemize"><span class="ecss-1000">shortcuts=none</span><a - id="dx1-4082"></a> (or <span + id="dx1-4084"></a> (or <span class="ecss-1000">shortcuts=false</span><a - id="dx1-4083"></a>): don’t define any of the shortcut + id="dx1-4085"></a>): don’t define any of the shortcut commands (default).</li></ul> - <!--l. 557--><p class="noindent" >Note that multiple invocations of the <span + <!--l. 568--><p class="noindent" >Note that multiple invocations of the <span class="ecss-1000">shortcuts</span><a - id="dx1-4084"></a> option <span + id="dx1-4086"></a> option <span class="ecti-1000">within the same option</span> <span class="ecti-1000">list </span>will override each other.</p></dd></dl> -<!--l. 561--><p class="indent" > After the <span +<!--l. 572--><p class="indent" > After the <span class="ecss-1000">glossaries-extra </span>package has been loaded, you can set available options using -</p><!--l. 563--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 574--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glossariesextrasetup</span><span class="ectt-0900"> </span></span><a - id="dx1-4085"></a> <span + id="dx1-4087"></a> <span class="ectt-1000">\glossariesextrasetup{</span>⟨<span class="ecit-1000">options</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 565--><p class="noindent" > +</p><!--l. 576--><p class="noindent" > The <span class="ecss-1000">abbreviations</span><a - id="dx1-4086"></a> option may only be used in the preamble. -</p><!--l. 568--><p class="noindent" > + id="dx1-4088"></a> option may only be used in the preamble. +</p><!--l. 579--><p class="noindent" > </p> -<!--l. 568--><p class="noindent" ><a +<!--l. 579--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">1.3 </span> <a id="sec:modifications"></a>Modifications to Existing Commands or Styles</h3> -<!--l. 571--><p class="noindent" >The commands used by <span +<!--l. 582--><p class="noindent" >The commands used by <span class="ecss-1000">glossaries</span><a id="dx1-5001"></a> to automatically produce an error if an entry is undefined (such as <span @@ -1186,7 +1246,7 @@ class="ectt-1000">\glsdoifexists</span><a class="ecss-1000">undefaction</span><a id="dx1-5003"></a> option into account. -</p><!--l. 575--><p class="indent" > The <span +</p><!--l. 586--><p class="indent" > The <span class="ectt-1000">\newglossaryentry </span>command has a new key called <span class="ecss-1000">category</span><a id="dx1-5004"></a>, which sets the @@ -1198,7 +1258,7 @@ further information about categories. -</p><!--l. 581--><p class="indent" > The <span +</p><!--l. 592--><p class="indent" > The <span class="ectt-1000">\newterm</span><a id="dx1-5005"></a> command (defined through the <span class="ecss-1000">index</span><a @@ -1213,12 +1273,12 @@ class="ecss-1000">glossaries-extra</span>. (See <a href="#sec:abbreviations">§2 </a><a href="#sec:abbreviations">Abbreviations<!--tex4ht:ref: sec:abbreviations --></a>.) -</p><!--l. 587--><p class="noindent" > +</p><!--l. 598--><p class="noindent" > </p> -<!--l. 587--><p class="noindent" ><a +<!--l. 598--><p class="noindent" ><a href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><span class="titlemark">1.3.1 </span> <a id="sec:wrglossary"></a>Entry Indexing</h4> -<!--l. 590--><p class="noindent" >The <span +<!--l. 601--><p class="noindent" >The <span class="ecss-1000">glossaries-extra </span>package provides an extra key for commands like <span class="ectt-1000">\gls </span>and <span @@ -1251,22 +1311,22 @@ class="ectt-1000">\glsadd</span><a class="ectt-1000">\glsaddall</span><a id="dx1-6009"></a>) since the whole purpose of that command is to index an entry. -</p><!--l. 605--><p class="indent" > There is a new hook that’s used each time indexing information is written to the +</p><!--l. 616--><p class="indent" > There is a new hook that’s used each time indexing information is written to the external glossary files: -</p><!--l. 607--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 618--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrdowrglossaryhook</span><span class="ectt-0900"> </span></span><a id="dx1-6010"></a> <span class="ectt-1000">\glsxtrdowrglossaryhook{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 609--><p class="noindent" > +</p><!--l. 620--><p class="noindent" > where ⟨<span class="ecti-1000">label</span>⟩ is the entry’s label. This does nothing by default but may be redefined. (See, for example, the accompanying sample file <span class="ectt-1000">sample-indexhook.tex</span>, which uses this hook to determine which entries haven’t been indexed.) -</p><!--l. 616--><p class="indent" > The value of the <span +</p><!--l. 627--><p class="indent" > The value of the <span class="ecss-1000">see</span><a id="dx1-6011"></a> key is now saved as a field. This isn’t the case with <span class="ecss-1000">glossaries</span><a @@ -1294,19 +1354,19 @@ class="ecss-1000">document</span><a id="dx1-6019"></a><a id="dx1-6020"></a> environment on the next run. -</p><!--l. 629--><p class="indent" > This modification allows <span +</p><!--l. 640--><p class="indent" > This modification allows <span class="ecss-1000">glossaries-extra </span>to provide -</p><!--l. 630--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 641--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtraddallcrossrefs</span><span class="ectt-0900"> </span></span><a id="dx1-6021"></a> <span class="ectt-1000">\glsxtraddallcrossrefs </span></div><hr> -</p><!--l. 632--><p class="noindent" > +</p><!--l. 643--><p class="noindent" > which is used at the end of the document to automatically add any unused cross-references unless the package option <span class="ecss-1000">indexcrossrefs</span><a id="dx1-6022"></a> was set to false. -</p><!--l. 637--><p class="indent" > As a by-product of this enhancement, the <span +</p><!--l. 648--><p class="indent" > As a by-product of this enhancement, the <span class="ecss-1000">see</span><a id="dx1-6023"></a> key will now work for entries defined in the document environment, but it’s still best to define entries in the @@ -1318,12 +1378,12 @@ class="ectt-1000">\makeglossaries</span>. -</p><!--l. 643--><p class="noindent" > +</p><!--l. 654--><p class="noindent" > </p> -<!--l. 643--><p class="noindent" ><a +<!--l. 654--><p class="noindent" ><a href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><span class="titlemark">1.3.2 </span> <a id="sec:entryfmtmods"></a>Entry Display Style Modifications</h4> -<!--l. 646--><p class="noindent" >Recall from the <span +<!--l. 657--><p class="noindent" >Recall from the <span class="ecss-1000">glossaries</span><a id="dx1-7001"></a> package that commands such as <span class="ectt-1000">\gls </span>display text at @@ -1335,7 +1395,7 @@ whether or not it actually has a hyperlink. The actual text and the way it’s displayed depends on the command used (such as <span class="ectt-1000">\gls</span>) and the entry format. -</p><!--l. 653--><p class="indent" > The default entry format (<span +</p><!--l. 664--><p class="indent" > The default entry format (<span class="ectt-1000">\glsentryfmt</span><a id="dx1-7003"></a>) used in the <a id="dx1-7004"></a>link-text by commands like @@ -1401,9 +1461,9 @@ href="#sec:abbrstyle">§2.2 </a><a href="#sec:abbrstyle">Abbreviation Styles<!--tex4ht:ref: sec:abbrstyle --></a>). </li></ul> -<!--l. 683--><p class="indent" > This means that entries with a short form can be treated as regular entries rather +<!--l. 694--><p class="indent" > This means that entries with a short form can be treated as regular entries rather than abbreviations if it’s more appropriate for the desired style. -</p><!--l. 687--><p class="indent" > The <span +</p><!--l. 698--><p class="indent" > The <span class="ectt-1000">\glspostlinkhook </span>provided by the <span class="ecss-1000">glossaries</span><a id="dx1-7020"></a> package to insert information @@ -1412,17 +1472,17 @@ after the <a class="ectt-1000">\gls </span>and <span class="ectt-1000">\glstext </span>is redefined to -</p><!--l. 690--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 701--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrpostlinkhook</span><span class="ectt-0900"> </span></span><a id="dx1-7022"></a> <span class="ectt-1000">\glsxtrpostlinkhook </span></div><hr> -</p><!--l. 692--><p class="noindent" > +</p><!--l. 703--><p class="noindent" > This command will discard a following full stop (period) if the <span class="ecss-1000">discardperiod</span><a id="dx1-7023"></a> attribute is set to “true” for the current entry’s category. It will also do -</p><!--l. 696--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 707--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrpostlink</span><span class="ectt-0900"> </span></span><a id="dx1-7024"></a> <span @@ -1430,16 +1490,16 @@ class="ectt-1000">\glsxtrpostlink </span></div><hr> -</p><!--l. 698--><p class="noindent" > +</p><!--l. 709--><p class="noindent" > if a full stop hasn’t be discarded and -</p><!--l. 700--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 711--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrpostlinkendsentence</span><span class="ectt-0900"> </span></span><a id="dx1-7025"></a> <span class="ectt-1000">\glsxtrpostlinkendsentence </span></div><hr> -</p><!--l. 702--><p class="noindent" > +</p><!--l. 713--><p class="noindent" > if a full stop has been discarded. -</p><!--l. 705--><p class="indent" > By default <span +</p><!--l. 716--><p class="indent" > By default <span class="ectt-1000">\glsxtrpostlink </span>just does <span class="ectt-1000">\glsxtrpostlink</span>⟨<span class="ecti-1000">category</span>⟩<a @@ -1451,7 +1511,7 @@ class="ecss-1000">general</span><a id="dx1-7027"></a> category, <span class="ectt-1000">\glsxtrpostlinkgeneral </span>if it has been defined.) -</p><!--l. 710--><p class="indent" > The sentence-ending hook is slightly more complicated. If the command +</p><!--l. 721--><p class="indent" > The sentence-ending hook is slightly more complicated. If the command <span class="ectt-1000">\glsxtrpostlink</span>⟨<span class="ecti-1000">category</span>⟩<a @@ -1466,21 +1526,21 @@ with a full stop, a redundant following full stop will be discarded and the spac adjusted (in case the entry is in uppercase) unless the entry is followed by additional material, in which case the following full stop is no longer redundant and needs to be reinserted. -</p><!--l. 722--><p class="indent" > There are some convenient commands you might want to use when customizing +</p><!--l. 733--><p class="indent" > There are some convenient commands you might want to use when customizing the post-<a id="dx1-7030"></a><a href="#glo:linktext">link-text</a> category hooks: -</p><!--l. 724--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 735--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrpostlinkAddDescOnFirstUse</span><span class="ectt-0900"> </span></span><a id="dx1-7031"></a> <span class="ectt-1000">\glsxtrpostlinkAddDescOnFirstUse</span> </div><hr> -</p><!--l. 726--><p class="noindent" > +</p><!--l. 737--><p class="noindent" > This will add the description in parentheses on <a id="dx1-7032"></a><a href="#glo:firstuse">first use</a>. -</p><!--l. 729--><p class="indent" > For example, suppose you want to append the description in parentheses on <a +</p><!--l. 740--><p class="indent" > For example, suppose you want to append the description in parentheses on <a id="dx1-7033"></a>first use for entries in the <span class="ecss-1000">symbol</span><a @@ -1494,18 +1554,18 @@ class="ecss-1000">symbol</span><a  <br />  \glsxtrpostlinkAddDescOnFirstUse  <br />} </div> -<!--l. 736--><p class="nopar" > -</p><!--l. 738--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 747--><p class="nopar" > +</p><!--l. 749--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrpostlinkAddSymbolOnFirstUse</span><span class="ectt-0900"> </span></span><a id="dx1-7035"></a> <span class="ectt-1000">\glsxtrpostlinkAddSymbolOnFirstUse</span> </div><hr> -</p><!--l. 740--><p class="noindent" > +</p><!--l. 751--><p class="noindent" > This will append the symbol (if defined) in parentheses on <a id="dx1-7036"></a><a href="#glo:firstuse">first use</a>. -</p><!--l. 744--><p class="indent" > If you want to provide your own custom format be aware that you can’t use +</p><!--l. 755--><p class="indent" > If you want to provide your own custom format be aware that you can’t use <span class="ectt-1000">\ifglsused</span><a id="dx1-7037"></a> within the post-<a @@ -1514,7 +1574,7 @@ href="#glo:linktext">link-text</a> hook as by this point the <a id="dx1-7039"></a><a href="#glo:firstuseflag">first use flag</a> will have been unset. Instead you can use -</p><!--l. 747--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 758--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrifwasfirstuse</span><span class="ectt-0900"> </span></span><a id="dx1-7040"></a> <span @@ -1523,7 +1583,7 @@ class="ecit-1000">true</span>⟩<span class="ectt-1000">}{</span>⟨<span class="ecit-1000">false</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 749--><p class="noindent" > +</p><!--l. 760--><p class="noindent" > This will do ⟨<span class="ecti-1000">true</span>⟩ if the last used entry was the <a id="dx1-7041"></a>first use for that entry, otherwise it @@ -1535,7 +1595,7 @@ locally set by commands like <span class="ectt-1000">\gls</span>, so don’t rely on it outside of the post-<a id="dx1-7043"></a>link-text hook. -</p><!--l. 757--><p class="indent" > <div class="important" title="Important Note"> Note that commands like <span +</p><!--l. 768--><p class="indent" > <div class="important" title="Important Note"> Note that commands like <span class="ectt-1000">\glsfirst</span><a id="dx1-7044"></a> and <span class="ectt-1000">\glsxtrfull</span><a @@ -1549,14 +1609,21 @@ class="ectt-1000">\@firstoftwo</span>. (Although, depending on the styles in use match the text produced by <span class="ectt-1000">\gls</span><a id="dx1-7048"></a>-like commands on <a - id="dx1-7049"></a>first use.) </div> -</p><!--l. 763--><p class="noindent" > -</p><!--l. 765--><p class="indent" > For example, if you want to place the description in a footnote after the <a - id="dx1-7050"></a>link-text + id="dx1-7049"></a>first use.) However, the +<span +class="ecss-1000">postfootnote</span><a + id="dx1-7050"></a> style alters <span +class="ectt-1000">\glsxtrfull </span>so that it fakes non-<a + id="dx1-7051"></a>first use otherwise +the inline full format would include the footnote, which is inappropriate. +</div> +</p><!--l. 777--><p class="noindent" > +</p><!--l. 779--><p class="indent" > For example, if you want to place the description in a footnote after the <a + id="dx1-7052"></a>link-text on <a - id="dx1-7051"></a>first use for the <span + id="dx1-7053"></a>first use for the <span class="ecss-1000">general</span><a - id="dx1-7052"></a> category: + id="dx1-7054"></a> category: @@ -1566,26 +1633,26 @@ class="ecss-1000">general</span><a  <br />  \glsxtrifwasfirstuse{\footnote{\glsentrydesc{\glslabel}}}{}%  <br />} </div> -<!--l. 771--><p class="nopar" > -</p><!--l. 773--><p class="indent" > The <span +<!--l. 785--><p class="nopar" > +</p><!--l. 787--><p class="indent" > The <span class="ecss-1000">postfootnote</span><a - id="dx1-7053"></a> abbreviation style uses the post-<a - id="dx1-7054"></a><a + id="dx1-7055"></a> abbreviation style uses the post-<a + id="dx1-7056"></a><a href="#glo:linktext">link-text</a> hook to place the footnote after trailing punctuation characters. -</p><!--l. 777--><p class="indent" > You can set the default options used by <span +</p><!--l. 791--><p class="indent" > You can set the default options used by <span class="ectt-1000">\glslink</span><a - id="dx1-7055"></a>, <span + id="dx1-7057"></a>, <span class="ectt-1000">\gls</span><a - id="dx1-7056"></a> etc with: -</p><!--l. 779--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="dx1-7058"></a> etc with: +</p><!--l. 793--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrSetDefaultGlsOpts</span><span class="ectt-0900"> </span></span><a - id="dx1-7057"></a> <span + id="dx1-7059"></a> <span class="ectt-1000">\GlsXtrSetDefaultGlsOpts{</span>⟨<span class="ecit-1000">options</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 781--><p class="noindent" > +</p><!--l. 795--><p class="noindent" > For example, if you mostly don’t want to index entries then you can do: @@ -1594,23 +1661,23 @@ For example, if you mostly don’t want to index entries then you can do: <div class="verbatim" id="verbatim-16"> \GlsXtrSetDefaultGlsOpts{noindex} </div> -<!--l. 786--><p class="nopar" > and then use, for example, <span class="obeylines-h"><span class="verb"><span +<!--l. 800--><p class="nopar" > and then use, for example, <span class="obeylines-h"><span class="verb"><span class="ectt-1000">\gls[noindex=false]{sample}</span></span></span> when you actually want the location added to the <a - id="dx1-7058"></a><a + id="dx1-7060"></a><a href="#glo:numberlist">number list</a>. These defaults may be overridden by other settings (such as category attributes) in addition to any settings passed in the option argument of commands like <span class="ectt-1000">\glslink </span>and <span class="ectt-1000">\gls</span>. -</p><!--l. 793--><p class="indent" > Note that if you don’t want <span +</p><!--l. 807--><p class="indent" > Note that if you don’t want <span class="ecti-1000">any </span>indexing, just omit <span class="ectt-1000">\makeglossaries </span>and <span class="ectt-1000">\printglossaries </span>(or analogous commands). -</p><!--l. 797--><p class="indent" > Commands like <span +</p><!--l. 811--><p class="indent" > Commands like <span class="ectt-1000">\gls</span><a - id="dx1-7059"></a> have star (<span + id="dx1-7061"></a> have star (<span class="ectt-1000">*</span>) and plus (<span class="ectt-1000">+</span>) modifiers as a short cut for <span @@ -1618,28 +1685,28 @@ class="ectt-1000">hyper=false </span>and <span class="ectt-1000">hyper=true</span>. The <span class="ecss-1000">glossaries-extra </span>package provides a way to add a third modifier, if required, using -</p><!--l. 801--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 815--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrSetAltModifier</span><span class="ectt-0900"> </span></span><a - id="dx1-7060"></a> <span + id="dx1-7062"></a> <span class="ectt-1000">\GlsXtrSetAltModifier{</span>⟨<span class="ecit-1000">char</span>⟩<span class="ectt-1000">}{</span>⟨<span class="ecit-1000">options</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 803--><p class="noindent" > +</p><!--l. 817--><p class="noindent" > where ⟨<span class="ecti-1000">char</span>⟩ is the character used as the modifier and ⟨<span class="ecti-1000">options</span>⟩ is the default set of options (which may be overridden). Note that ⟨<span class="ecti-1000">char</span>⟩ must be a single character (not a UTF-8 character, unless you are using <span class="HoLogo-XeLaTeX"><span class="HoLogo-Xe">X<span class="HoLogo-e">Ǝ</span></span><span class="HoLogo-LaTeX">L<span class="HoLogo-a">A</span><span class="HoLogo-TeX">T<span class="HoLogo-e">E</span>X</span></span></span> or Lua<span class="HoLogo-LaTeX">L<span class="HoLogo-a">A</span><span class="HoLogo-TeX">T<span class="HoLogo-e">E</span>X</span></span>). -</p><!--l. 810--><p class="indent" > <div class="important" title="Important Note"> When choosing the character ⟨<span +</p><!--l. 824--><p class="indent" > <div class="important" title="Important Note"> When choosing the character ⟨<span class="ecti-1000">char</span>⟩ take care of any changes in category code. </div> -</p><!--l. 813--><p class="noindent" > -</p><!--l. 815--><p class="indent" > Example: +</p><!--l. 827--><p class="noindent" > +</p><!--l. 829--><p class="indent" > Example: @@ -1647,7 +1714,7 @@ class="ecti-1000">char</span>⟩ take care of any changes in category code. <div class="verbatim" id="verbatim-17"> \GlsXtrSetAltModifier{!}{noindex} </div> -<!--l. 818--><p class="nopar" > This means that <span class="obeylines-h"><span class="verb"><span +<!--l. 832--><p class="nopar" > This means that <span class="obeylines-h"><span class="verb"><span class="ectt-1000">\gls!{sample}</span></span></span> will be equivalent to <span class="obeylines-h"><span class="verb"><span class="ectt-1000">\gls[noindex]{sample}</span></span></span>. It’s not possible to mix modifiers. For example, if you want to do @@ -1658,18 +1725,18 @@ not possible to mix modifiers. For example, if you want to do <div class="verbatim" id="verbatim-18"> \gls[noindex,hyper=false]{sample} </div> -<!--l. 824--><p class="nopar" > you can use <span class="obeylines-h"><span class="verb"><span +<!--l. 838--><p class="nopar" > you can use <span class="obeylines-h"><span class="verb"><span class="ectt-1000">\gls*[noindex]{sample}</span></span></span> or <span class="obeylines-h"><span class="verb"><span class="ectt-1000">\gls![hyper=false]{sample}</span></span></span> but you can’t combine the <span class="ectt-1000">* </span>and <span class="ectt-1000">! </span>modifiers. -</p><!--l. 829--><p class="noindent" > +</p><!--l. 843--><p class="noindent" > </p> -<!--l. 829--><p class="noindent" ><a +<!--l. 843--><p class="noindent" ><a href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><span class="titlemark">1.3.3 </span> <a id="sec:entrycountmods"></a>Entry Counting Modifications</h4> -<!--l. 832--><p class="noindent" >The <span +<!--l. 846--><p class="noindent" >The <span class="ectt-1000">\glsenableentrycount</span><a id="dx1-8001"></a> command is modified to allow for the <span class="ecss-1000">entrycount</span><a @@ -1680,7 +1747,7 @@ class="ectt-1000">\glsenableentrycount</span>, but you also need to set the appr href="#sec:categories">§4 </a><a href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a>). -</p><!--l. 838--><p class="indent" > For example, instead of just doing: +</p><!--l. 852--><p class="indent" > For example, instead of just doing: @@ -1688,7 +1755,7 @@ href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a>). <div class="verbatim" id="verbatim-19"> \glsenableentrycount </div> -<!--l. 841--><p class="nopar" > you now need to do: +<!--l. 855--><p class="nopar" > you now need to do: @@ -1697,20 +1764,20 @@ href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a>). \glsenableentrycount  <br />\glssetcategoryattribute{abbreviation}{entrycount}{1} </div> -<!--l. 846--><p class="nopar" > This will enable the entry counting for entries in the <span +<!--l. 860--><p class="nopar" > This will enable the entry counting for entries in the <span class="ecss-1000">abbreviation</span><a id="dx1-8003"></a> category, but any entries assigned to other categories will be unchanged. -</p><!--l. 851--><p class="indent" > Further information about entry counting, including the new per-unit feature, is +</p><!--l. 865--><p class="indent" > Further information about entry counting, including the new per-unit feature, is described in <a href="#sec:entrycount">§5 </a><a href="#sec:entrycount">Entry Counting<!--tex4ht:ref: sec:entrycount --></a>. -</p><!--l. 854--><p class="noindent" > +</p><!--l. 868--><p class="noindent" > </p> -<!--l. 854--><p class="noindent" ><a +<!--l. 868--><p class="noindent" ><a href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><span class="titlemark">1.3.4 </span> <a id="sec:nested"></a>Nested Links</h4> -<!--l. 857--><p class="noindent" >Complications arise when you use <span +<!--l. 871--><p class="noindent" >Complications arise when you use <span class="ectt-1000">\gls</span><a id="dx1-9001"></a> in the value of the <span class="ecss-1000">name</span><a @@ -1723,7 +1790,7 @@ fields, if set). This tends to occur with abbreviations that extend other abbrev For example, SHTML is an abbreviation for SSI enabled HTML, where SSI is an abbreviation for Server Side Includes and HTML is an abbreviation for Hypertext Markup Language. -</p><!--l. 865--><p class="indent" > Things can go wrong if we try the following with the <span +</p><!--l. 879--><p class="indent" > Things can go wrong if we try the following with the <span class="ecss-1000">glossaries</span><a id="dx1-9005"></a> package: @@ -1735,11 +1802,12 @@ class="ecss-1000">glossaries</span><a  <br />\newacronym{html}{HTML}{Hypertext Markup Language}  <br />\newacronym{shtml}{S\gls{html}}{\gls{ssi} enabled \gls{html}} </div> -<!--l. 871--><p class="nopar" > -</p><!--l. 873--><p class="indent" > The main problems are: +<!--l. 885--><p class="nopar" > +</p><!--l. 887--><p class="indent" > The main problems are: </p><ol class="enumerate1" > <li - class="enumerate" id="x1-9007x1">The first letter upper casing commands, such as <span + class="enumerate" id="x1-9007x1"><a + id="itm:nestedfirstucprob"></a> The first letter upper casing commands, such as <span class="ectt-1000">\Gls</span><a id="dx1-9008"></a>, won’t work for the <span @@ -1754,7 +1822,7 @@ href="#glo:firstuse">first use</a> if the long form is displayed before the shor <div class="verbatim" id="verbatim-22"> \gls{\uppercase ssi} enabled \gls{html} </div> - <!--l. 881--><p class="nopar" > which just doesn’t work. Grouping the <span class="obeylines-h"><span class="verb"><span + <!--l. 895--><p class="nopar" > which just doesn’t work. Grouping the <span class="obeylines-h"><span class="verb"><span class="ectt-1000">\gls{ssi}</span></span></span> doesn’t work either as this will effectively try to do @@ -1764,7 +1832,7 @@ class="ectt-1000">\gls{ssi}</span></span></span> doesn’t work either as th <div class="verbatim" id="verbatim-23"> \uppercase{\gls{ssi}} enabled \gls{html} </div> - <!--l. 886--><p class="nopar" > This will upper case the label <span + <!--l. 900--><p class="nopar" > This will upper case the label <span class="ectt-1000">ssi </span>so the entry won’t be recognised. This problem will also occur if you use the all capitals version, such as <span @@ -1781,7 +1849,14 @@ class="ectt-1000">\glsentryshort</span><a contexts that require this, such as PDF bookmarks. </li> <li - class="enumerate" id="x1-9016x3">The <span + class="enumerate" id="x1-9016x3"><a + id="itm:nestedsortprob"></a> The nested commands may end up in the <span +class="ecss-1000">sort</span><a + id="dx1-9017"></a> key, which will confuse the + indexing. + </li> + <li + class="enumerate" id="x1-9019x4">The <span class="ectt-1000">shtml </span>entry produces inconsistent results depending on whether the <span class="ectt-1000">ssi </span>or <span @@ -1796,15 +1871,15 @@ class="ectt-1000">shtml</span>. For example: <div class="verbatim" id="verbatim-24"> This section discusses \gls{ssi}, \gls{html} and \gls{shtml}. </div> - <!--l. 902--><p class="nopar" > This produces: + <!--l. 919--><p class="nopar" > This produces: </p><div class="quote"> - <!--l. 905--><p class="noindent" >This section discusses server side includes (SSI), hypertext + <!--l. 922--><p class="noindent" >This section discusses server side includes (SSI), hypertext markup language (HTML) and SSI enabled HTML (SHTML).</p></div> - <!--l. 908--><p class="noindent" >So the <a - id="dx1-9017"></a><a + <!--l. 925--><p class="noindent" >So the <a + id="dx1-9020"></a><a href="#glo:firstuse">first use</a> of the <span class="ectt-1000">shtml </span>entry produces “SSI enabled HTML (SHTML)”. - </p><!--l. 911--><p class="noindent" >Now let’s suppose the <span + </p><!--l. 928--><p class="noindent" >Now let’s suppose the <span class="ectt-1000">html </span>entry is used before the <span class="ectt-1000">shtml </span>but the <span class="ectt-1000">ssi </span>entry is @@ -1818,17 +1893,17 @@ class="ectt-1000">shtml </span>entry, for example: The sample files are either \gls{html} or \gls{shtml}, but let’s  <br />first discuss \gls{ssi}. </div> - <!--l. 917--><p class="nopar" > This produces: + <!--l. 934--><p class="nopar" > This produces: </p><div class="quote"> - <!--l. 920--><p class="noindent" >The sample files are either hypertext markup language (HTML) + <!--l. 937--><p class="noindent" >The sample files are either hypertext markup language (HTML) or server side includes (SSI) enabled HTML (SHTML), but let’s first discuss SSI.</p></div> - <!--l. 925--><p class="noindent" >So the <a - id="dx1-9018"></a><a + <!--l. 942--><p class="noindent" >So the <a + id="dx1-9021"></a><a href="#glo:firstuse">first use</a> of the <span class="ectt-1000">shtml </span>entry now produces “server side includes (SSI) enabled HTML (SHTML)”, which looks a bit strange. - </p><!--l. 929--><p class="noindent" >Now let’s suppose the <span + </p><!--l. 946--><p class="noindent" >Now let’s suppose the <span class="ectt-1000">shtml </span>entry is used before (or without) the other two entries: @@ -1838,19 +1913,20 @@ class="ectt-1000">shtml </span>entry is used before (or without) the other two <div class="verbatim" id="verbatim-26"> This article is an introduction to \gls{shtml}. </div> - <!--l. 933--><p class="nopar" > This produces: + <!--l. 950--><p class="nopar" > This produces: </p><div class="quote"> - <!--l. 936--><p class="noindent" >This article is an introduction to server side includes (SSI) + <!--l. 953--><p class="noindent" >This article is an introduction to server side includes (SSI) enabled hypertext markup language (HTML) (SHTML).</p></div> - <!--l. 939--><p class="noindent" >So the <a - id="dx1-9019"></a><a + <!--l. 956--><p class="noindent" >So the <a + id="dx1-9022"></a><a href="#glo:firstuse">first use</a> of the <span class="ectt-1000">shtml </span>entry now produces “server side includes (SSI) enabled hypertext markup language (HTML) (SHTML)”, which is even more strange. - </p><!--l. 943--><p class="noindent" >This is all aggravated by setting the style using <span -class="ectt-1000">\setacronymstyle</span>. For - example: + </p><!--l. 960--><p class="noindent" >This is all aggravated by setting the style using the <span +class="ecss-1000">glossaries </span>package’s + <span +class="ectt-1000">\setacronymstyle</span>. For example: @@ -1858,19 +1934,19 @@ class="ectt-1000">\setacronymstyle</span>. For <div class="verbatim" id="verbatim-27"> \setacronymstyle{long-short} </div> - <!--l. 947--><p class="nopar" > as this references the label through the use of <span + <!--l. 965--><p class="nopar" > as this references the label through the use of <span class="ectt-1000">\glslabel </span>when displaying the long and short forms, but this value changes with each use of <span class="ectt-1000">\gls</span>, so instead of displaying “(SHTML)” at the end of the <a - id="dx1-9020"></a><a + id="dx1-9023"></a><a href="#glo:firstuse">first use</a>, it now displays “(HTML)”, since <span class="ectt-1000">\glslabel </span>has been changed to <span class="ectt-1000">html </span>by <span class="obeylines-h"><span class="verb"><span class="ectt-1000">\gls{html}</span></span></span>. - </p><!--l. 955--><p class="noindent" >Another oddity occurs if you reset the <span + </p><!--l. 973--><p class="noindent" >Another oddity occurs if you reset the <span class="ectt-1000">html </span>entry between uses of the <span class="ectt-1000">shtml</span> entry. For example: @@ -1881,23 +1957,23 @@ class="ectt-1000">shtml</span> <div class="verbatim" id="verbatim-28"> \gls{shtml} ... \glsreset{html}\gls{shtml} </div> - <!--l. 959--><p class="nopar" > The next use of <span + <!--l. 977--><p class="nopar" > The next use of <span class="ectt-1000">shtml </span>produces “Shypertext markup language (HTML)”, which is downright weird. - </p><!--l. 963--><p class="noindent" >Even without this, the short form has nested formatting commands, which + </p><!--l. 981--><p class="noindent" >Even without this, the short form has nested formatting commands, which amount to <span class="obeylines-h"><span class="verb"><span class="ectt-1000">\acronymfont{S\acronymfont{HTML}}</span></span></span>. This may not be a problem for some styles, but if you use one of the “sm” styles (that use <span class="ectt-1000">\textsmaller</span><a - id="dx1-9021"></a>), + id="dx1-9024"></a>), this will produce an odd result. </p></li> <li - class="enumerate" id="x1-9023x4">Each time the <span + class="enumerate" id="x1-9026x5">Each time the <span class="ectt-1000">shtml </span>entry is used, the <span class="ectt-1000">html </span>entry will also be indexed and marked as used, and on <a - id="dx1-9024"></a><a + id="dx1-9027"></a><a href="#glo:firstuse">first use</a> this will happen to both the <span class="ectt-1000">ssi </span>and <span class="ectt-1000">html</span> @@ -1905,22 +1981,22 @@ class="ectt-1000">html</span> helpful to the reader. </li> <li - class="enumerate" id="x1-9026x5">If <span + class="enumerate" id="x1-9029x6">If <span class="ecss-1000">hyperref</span><a - id="dx1-9027"></a> is in use, you’ll get nested hyperlinks and there’s no consistent + id="dx1-9030"></a> is in use, you’ll get nested hyperlinks and there’s no consistent way of dealing with this across the available PDF viewers. If on the <a - id="dx1-9028"></a>first use case, the user clicks on the “HTML” part of the “SSI enabled + id="dx1-9031"></a>first use case, the user clicks on the “HTML” part of the “SSI enabled HTML (SHTML)” link, they may be directed to the HTML entry in the glossary or they may be directed to the SHTML entry in the glossary. </li></ol> -<!--l. 984--><p class="indent" > For these reasons it’s better to use the simple expandable commands +<!--l. 1002--><p class="indent" > For these reasons it’s better to use the simple expandable commands like <span class="ectt-1000">\glsentrytext</span><a - id="dx1-9029"></a> or <span + id="dx1-9032"></a> or <span class="ectt-1000">\glsentryshort</span><a - id="dx1-9030"></a> in the definition of other entries + id="dx1-9033"></a> in the definition of other entries (although that doesn’t fix the first problem). Alternatively use something like: @@ -1932,9 +2008,9 @@ like:  <br /> [description={\acrshort{ssi} enabled \acrshort{html}}]  <br /> {shtml}{SHTML}{SSI enabled HTML} </div> -<!--l. 992--><p class="nopar" > with <span +<!--l. 1010--><p class="nopar" > with <span class="ecss-1000">glossaries</span><a - id="dx1-9031"></a> or: + id="dx1-9034"></a> or: @@ -1944,30 +2020,47 @@ class="ecss-1000">glossaries</span><a  <br /> [description={\glsxtrshort{ssi} enabled \glsxtrshort{html}}]  <br /> {shtml}{SHTML}{SSI enabled HTML} </div> -<!--l. 998--><p class="nopar" > with <span +<!--l. 1016--><p class="nopar" > with <span class="ecss-1000">glossaries-extra</span>. This fixes all the above listed problems (as long as you don’t use <span class="ectt-1000">\glsdesc</span><a - id="dx1-9032"></a>). Note that replacing <span + id="dx1-9035"></a>). Note that replacing <span class="ectt-1000">\gls </span>with <span class="ectt-1000">\acrshort </span>in the original example may fix the <a - id="dx1-9033"></a><a + id="dx1-9036"></a><a href="#glo:firstuse">first use</a> issue, but it doesn’t fix any of the other problems listed above. -</p><!--l. 1005--><p class="indent" > However if you’re really determined to use <span +</p><!--l. 1023--><p class="indent" > If it’s simply that you want to use the abbreviation font, you can use +<span +class="ectt-1000">\glsabbrvfont</span>: + + + +</p> + <div class="verbatim" id="verbatim-31"> +\setabbreviationstyle{long-short-sc} + <br />\newabbreviation{ssi}{ssi}{server-side includes} + <br />\newabbreviation{html}{html}{hypertext markup language} + <br />\newabbreviation{shtml}{shtml}{\glsabbrvfont{ssi} enabled + <br />\glsabbrvfont{html}} +</div> +<!--l. 1032--><p class="nopar" > This will pick up the font style setting of the outer entry (shtml, in the above case). +This isn’t a problem in the above example as all the abbreviations use the same +style. +</p><!--l. 1037--><p class="indent" > However if you’re really determined to use <span class="ectt-1000">\gls</span><a - id="dx1-9034"></a> in a field that may be included + id="dx1-9037"></a> in a field that may be included within some <a - id="dx1-9035"></a><a + id="dx1-9038"></a><a href="#glo:linktext">link-text</a>, <span class="ecss-1000">glossaries-extra </span>patches internals used by the linking commands so that if <span class="ectt-1000">\gls </span>(or plural or case changing variants) occurs in the <a - id="dx1-9036"></a>link-text it will + id="dx1-9039"></a>link-text it will behave as though you used <span class="ectt-1000">\glstext</span><a - id="dx1-9037"></a><span + id="dx1-9040"></a><span class="ectt-1000">[hyper=false,noindex] </span>instead. Grouping is also added so that, for example, when <span class="obeylines-h"><span class="verb"><span class="ectt-1000">\gls{shtml}</span></span></span> is used for the first time the long @@ -1976,30 +2069,36 @@ form </p> - <div class="verbatim" id="verbatim-31"> + <div class="verbatim" id="verbatim-32"> \gls{ssi} enabled \gls{html} </div> -<!--l. 1016--><p class="nopar" > is treated as +<!--l. 1048--><p class="nopar" > is treated as </p> - <div class="verbatim" id="verbatim-32"> + <div class="verbatim" id="verbatim-33"> {\glstext[hyper=false,noindex]{ssi}} enabled  <br />{\glstext[hyper=false,noindex]{html}} </div> -<!--l. 1021--><p class="nopar" > This overcomes the last three problems listed above, but still doesn’t fix the first -two. -</p><!--l. 1025--><p class="indent" > Additionally, any instance of the long form commands, such as <span +<!--l. 1053--><p class="nopar" > This overcomes the last three problems listed above, but still doesn’t fix the first +two. Problem <a +href="#itm:nestedsortprob">3<!--tex4ht:ref: itm:nestedsortprob --></a> usually won’t be an issue as most abbreviation styles set the <span +class="ecss-1000">sort</span><a + id="dx1-9041"></a> key +to the short form, so using these commands in the long form but not the short +form will only affect entries with a style that sorts according to the long +form. +</p><!--l. 1061--><p class="indent" > Additionally, any instance of the long form commands, such as <span class="ectt-1000">\glsxtrlong</span><a - id="dx1-9038"></a> or + id="dx1-9042"></a> or <span class="ectt-1000">\acrlong</span><a - id="dx1-9039"></a> will be temporarily redefined to just use </p><div class="alltt"> + id="dx1-9043"></a> will be temporarily redefined to just use </p><div class="alltt"> <div class="obeylines-v"> <span class="ectt-1000">{\glsentrylong</span><a - id="dx1-9040"></a><span + id="dx1-9044"></a><span class="ectt-1000">{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">}</span>⟨<span @@ -2009,11 +2108,11 @@ class="ectt-1000">}</span> </div> (or case-changing versions). Similarly the short form commands, such as <span class="ectt-1000">\glsxtrshort</span><a - id="dx1-9041"></a> or <span + id="dx1-9045"></a> or <span class="ectt-1000">\acrshort</span><a - id="dx1-9042"></a> will use <span + id="dx1-9046"></a> will use <span class="ectt-1000">\glsentryshort</span><a - id="dx1-9043"></a> in the argument of either + id="dx1-9047"></a> in the argument of either <span class="ectt-1000">\glsabbrvfont </span>(for <span class="ectt-1000">\glsxtrshort</span>) or <span @@ -2024,72 +2123,79 @@ class="ectt-1000">shtml </span>entry had instead been defined as: - <div class="verbatim" id="verbatim-33"> + <div class="verbatim" id="verbatim-34"> \newacronym{shtml}{SHTML}{\acrshort{ssi} enabled \acrshort{html}} </div> -<!--l. 1038--><p class="nopar" > then (using the <span +<!--l. 1074--><p class="nopar" > then (using the <span class="ecss-1000">long-short</span><a - id="dx1-9044"></a> style) the <a - id="dx1-9045"></a><a + id="dx1-9048"></a> style) the <a + id="dx1-9049"></a><a href="#glo:firstuse">first use</a> will be like </p> - <div class="verbatim" id="verbatim-34"> + <div class="verbatim" id="verbatim-35"> {\acronymfont{\glsentryshort{ssi}}} enabled  <br />{\acronymfont{\glsentryshort{html}}} (SHTML) </div> -<!--l. 1044--><p class="nopar" > whereas if the entry is defined as: +<!--l. 1080--><p class="nopar" > whereas if the entry is defined as: </p> - <div class="verbatim" id="verbatim-35"> + <div class="verbatim" id="verbatim-36"> \newabbreviation{shtml}{SHTML}{\glsxtrshort{ssi} enabled  <br />\glsxtrshort{html}} </div> -<!--l. 1049--><p class="nopar" > then the <a - id="dx1-9046"></a><a +<!--l. 1085--><p class="nopar" > then the <a + id="dx1-9050"></a><a href="#glo:firstuse">first use</a> will be like: </p> - <div class="verbatim" id="verbatim-36"> + <div class="verbatim" id="verbatim-37"> {\glsabbrvfont{\glsentryshort{ssi}}} enabled  <br />{\glsabbrvfont{\glsentryshort{html}}} (SHTML) </div> -<!--l. 1054--><p class="nopar" > Note that the first optional argument of <span +<!--l. 1090--><p class="nopar" > Note that the first optional argument of <span class="ectt-1000">\acrshort </span>or <span class="ectt-1000">\glsxtrshort </span>is ignored in this context. (The final optional argument will be inserted, if present.) The abbreviation style that governs <span class="ectt-1000">\glsabbrvfont</span><a - id="dx1-9047"></a> will be set for <span + id="dx1-9051"></a> will be set for <span class="ectt-1000">\glsxtrshort</span><a - id="dx1-9048"></a>. Note + id="dx1-9052"></a>. Note that <span class="ectt-1000">\acrshort </span>doesn’t set the abbreviation style. -</p><!--l. 1062--><p class="indent" > <div class="important" title="Important Note"> If you use any of the case-changing commands, such as <span +</p><!--l. 1098--><p class="indent" > <div class="important" title="Important Note"> If you use any of the case-changing commands, such as <span class="ectt-1000">\Gls</span><a - id="dx1-9049"></a> or <span + id="dx1-9053"></a> or <span class="ectt-1000">\Glstext</span><a - id="dx1-9050"></a>, (either + id="dx1-9054"></a>, (either all caps or first letter upper casing) don’t use any of the linking commands, such as <span class="ectt-1000">\gls</span><a - id="dx1-9051"></a> or <span + id="dx1-9055"></a> or <span class="ectt-1000">\glstext</span><a - id="dx1-9052"></a>, in the definition of entries for any of the fields that may be used + id="dx1-9056"></a>, in the definition of entries for any of the fields that may be used by those case-changing commands. </div> -</p><!--l. 1068--><p class="noindent" > -</p><!--l. 1070--><p class="noindent" > +</p><!--l. 1104--><p class="noindent" > +</p><!--l. 1106--><p class="indent" > You can, with care, protect against issue <a +href="#itm:nestedfirstucprob">1<!--tex4ht:ref: itm:nestedfirstucprob --></a> by inserting an empty group at the +start if the long form starts with a command that breaks the first letter uppercasing +commands like <span +class="ectt-1000">\Gls</span>, but you still won’t be able to use the all caps commands, such +as <span +class="ectt-1000">\GLS</span>. +</p><!--l. 1112--><p class="noindent" > </p> -<!--l. 1070--><p class="noindent" ><a +<!--l. 1112--><p class="noindent" ><a href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><span class="titlemark">1.3.5 </span> <a id="sec:acronymmods"></a>Acronym Style Modifications</h4> -<!--l. 1073--><p class="noindent" >The <span +<!--l. 1115--><p class="noindent" >The <span class="ecss-1000">glossaries-extra </span>package provides a new way of dealing with abbreviations and redefines <span class="ectt-1000">\newacronym</span><a @@ -2101,25 +2207,25 @@ to restore the generic acronym function provided by <span class="ecss-1000">glossaries</span><a id="dx1-10002"></a> you need to use -</p><!--l. 1078--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1120--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\RestoreAcronyms</span><span class="ectt-0900"> </span></span><a id="dx1-10003"></a> <span class="ectt-1000">\RestoreAcronyms </span></div><hr> -</p><!--l. 1080--><p class="noindent" > +</p><!--l. 1122--><p class="noindent" > but be careful using this if you also want abbreviations as they will clash if you attempt to use them in the same glossary as generic acronyms from the <span class="ecss-1000">glossaries</span><a id="dx1-10004"></a> package. -</p><!--l. 1085--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1127--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsacspace</span><span class="ectt-0900"> </span></span><a id="dx1-10005"></a> <span class="ectt-1000">\glsacspace{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 1087--><p class="noindent" > +</p><!--l. 1129--><p class="noindent" > The space command <span class="ectt-1000">\glsacspace </span>used by the <span class="ecss-1000">long-sp-short</span><a @@ -2127,56 +2233,56 @@ class="ecss-1000">long-sp-short</span><a by <span class="ecss-1000">glossaries</span><a id="dx1-10007"></a> is modified so that it uses -</p><!--l. 1091--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1133--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsacspacemax</span><span class="ectt-0900"> </span></span><a id="dx1-10008"></a> <span class="ectt-1000">\glsacspacemax </span></div><hr> -</p><!--l. 1093--><p class="noindent" > +</p><!--l. 1135--><p class="noindent" > instead of the hard-coded 3em. This is a command not a length and so can be changed using <span class="ectt-1000">\renewcommand</span>. -</p><!--l. 1097--><p class="indent" > The <a +</p><!--l. 1139--><p class="indent" > The <a id="dx1-10009"></a><a href="#glo:firstuse">first use</a> acronym font command -</p><!--l. 1098--><p class="indent" > <hr><div title="Definition"> <span +</p><!--l. 1140--><p class="indent" > <hr><div title="Definition"> <span class="ectt-1000">\firstacronymfont{</span>⟨<span class="ecit-1000">text</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 1100--><p class="noindent" > + + + +</p><!--l. 1142--><p class="noindent" > is redefined to use the <a id="dx1-10010"></a>first use abbreviation font command <span class="ectt-1000">\glsfirstabbrvfont</span><a id="dx1-10011"></a>. This will be reset if you use <span class="ectt-1000">\RestoreAcronyms</span>. -</p><!--l. 1105--><p class="indent" > The subsequent use acronym font command - - - -</p><!--l. 1106--><p class="indent" > <hr><div title="Definition"> <span +</p><!--l. 1147--><p class="indent" > The subsequent use acronym font command +</p><!--l. 1148--><p class="indent" > <hr><div title="Definition"> <span class="ectt-1000">\acronymfont{</span>⟨<span class="ecit-1000">text</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 1108--><p class="noindent" > +</p><!--l. 1150--><p class="noindent" > is redefined to use the subsequent use abbreviation font command <span class="ectt-1000">\glsabbrvfont</span><a id="dx1-10012"></a>. This will be reset if you use <span class="ectt-1000">\RestoreAcronyms</span>. -</p><!--l. 1113--><p class="noindent" > +</p><!--l. 1155--><p class="noindent" > </p> -<!--l. 1113--><p class="noindent" ><a +<!--l. 1155--><p class="noindent" ><a href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><span class="titlemark">1.3.6 </span> <a id="sec:glosstylemods"></a>Glossary Style Modifications</h4> -<!--l. 1116--><p class="noindent" >The default value of <span +<!--l. 1158--><p class="noindent" >The default value of <span class="ectt-1000">\glslistdottedwidth</span><a id="dx1-11001"></a> is changed so that it’s set at the start of the document (if it hasn’t been changed in the preamble). This should take into account situations where <span class="ectt-1000">\hsize </span>isn’t set until the start of the document. -</p><!--l. 1121--><p class="indent" > The commands <span +</p><!--l. 1163--><p class="indent" > The commands <span class="ectt-1000">\glossentryname</span><a id="dx1-11002"></a> and <span class="ectt-1000">\glossentrydesc</span><a @@ -2190,48 +2296,48 @@ href="#sec:categories">§4 </a><a href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a>). This means you can make simple case-changing modifications to the name and description without defining a new glossary style. -</p><!--l. 1127--><p class="indent" > There is a hook after <span +</p><!--l. 1169--><p class="indent" > There is a hook after <span class="ectt-1000">\glossentryname</span><a id="dx1-11006"></a> and <span class="ectt-1000">\Glossentryname</span><a id="dx1-11007"></a>: -</p><!--l. 1129--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1171--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrpostnamehook</span><span class="ectt-0900"> </span></span><a id="dx1-11008"></a> <span class="ectt-1000">\glsxtrpostnamehook{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 1131--><p class="noindent" > +</p><!--l. 1173--><p class="noindent" > By default this checks the <span class="ecss-1000">indexname</span><a id="dx1-11009"></a> attribute. If the attribute exists for the category to which the label belongs, then the name is automatically indexed using -</p><!--l. 1136--><p class="indent" > <hr><div title="Definition"><span +</p><!--l. 1178--><p class="indent" > <hr><div title="Definition"><span class="ectt-1000">\glsxtrdoautoindexname</span><a id="dx1-11010"></a><span class="ectt-1000">{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">}{indexname} </span></div><hr> -</p><!--l. 1137--><p class="noindent" > +</p><!--l. 1179--><p class="noindent" > See <a href="#sec:autoindex">§6 </a><a href="#sec:autoindex">Auto-Indexing<!--tex4ht:ref: sec:autoindex --></a> for further details. -</p><!--l. 1140--><p class="indent" > The post-description code used within the glossary is modified so that it also +</p><!--l. 1182--><p class="indent" > The post-description code used within the glossary is modified so that it also does -</p><!--l. 1142--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1184--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrpostdescription</span><span class="ectt-0900"> </span></span><a id="dx1-11011"></a> <span class="ectt-1000">\glsxtrpostdescription </span></div><hr> -</p><!--l. 1144--><p class="noindent" > +</p><!--l. 1186--><p class="noindent" > This occurs before the original <span class="ectt-1000">\glspostdescription</span>, so if the <span class="ecss-1000">nopostdot=false</span><a id="dx1-11012"></a> option is used, it will be inserted before the terminating full stop. -</p><!--l. 1149--><p class="indent" > This new command will do <span +</p><!--l. 1191--><p class="indent" > This new command will do <span class="ectt-1000">\glsxtrpostdesc</span>⟨<span class="ecit-1000">category</span>⟩ if it exists, where ⟨<span @@ -2244,18 +2350,21 @@ class="ecss-1000">general</span><a class="ectt-1000">\glsxtrpostdescacronym </span>for entries with the category set to <span class="ecss-1000">acronym</span><a id="dx1-11014"></a>. -</p><!--l. 1156--><p class="indent" > Since both <span +</p><!--l. 1198--><p class="indent" > Since both <span class="ectt-1000">\glossentry </span>and <span class="ectt-1000">\subglossentry </span>set -</p><!--l. 1157--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1199--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glscurrententrylabel</span><span class="ectt-0900"> </span></span><a id="dx1-11015"></a> <span class="ectt-1000">\glscurrententrylabel </span></div><hr> -</p><!--l. 1159--><p class="noindent" > +</p><!--l. 1201--><p class="noindent" > to the label for the current entry, you can use this within the definition of these post-description hooks if you need to reference the label. -</p><!--l. 1164--><p class="indent" > For example, suppose you want to insert the plural form in brackets after the + + + +</p><!--l. 1206--><p class="indent" > For example, suppose you want to insert the plural form in brackets after the description in the glossary, but only for entries in the <span class="ecss-1000">general</span><a id="dx1-11016"></a> category, then you could @@ -2264,14 +2373,14 @@ do: </p> - <div class="verbatim" id="verbatim-37"> + <div class="verbatim" id="verbatim-38"> \renewcommand{\glsxtrpostdescgeneral}{\space  <br /> (plural: \glsentryplural{\glscurrententrylabel})} </div> -<!--l. 1170--><p class="nopar" > This means you don’t have to define a custom glossary style, which you may find +<!--l. 1212--><p class="nopar" > This means you don’t have to define a custom glossary style, which you may find more complicated. (It also allows more flexibility if you decide to change the underlying glossary style.) -</p><!--l. 1175--><p class="indent" > <div class="important" title="Important Note"> This feature can’t be used for glossary styles that ignore <span +</p><!--l. 1217--><p class="indent" > <div class="important" title="Important Note"> This feature can’t be used for glossary styles that ignore <span class="ectt-1000">\glspostdescription </span>or if you redefine <span class="ectt-1000">\glspostdescription </span>without including <span @@ -2281,16 +2390,110 @@ class="ectt-1000">\glspostdescription </span>to do nothing instead of using the <span class="ecss-1000">nopostdot</span><a id="dx1-11017"></a> option to suppress the terminating full stop.) </div> -</p><!--l. 1182--><p class="noindent" > +</p><!--l. 1224--><p class="noindent" > +</p><!--l. 1226--><p class="indent" > As from v1.02, <span +class="ecss-1000">glossaries-extra </span>now includes the package <span +class="ecss-1000">glossaries-extra-stylemods</span><a + id="dx1-11018"></a> +that will redefine the predefined styles to include the post-description hook (for those +that are missing it). You will need to make sure the styles have already been defined +before loading <span +class="ecss-1000">glossaries-extra</span><a + id="dx1-11019"></a>. For example: + + + +</p> + <div class="verbatim" id="verbatim-39"> +\usepackage{glossaries-extra} + <br />\usepackage{glossary-longragged} + <br />\usepackage{glossaries-extra-stylemods} +</div> +<!--l. 1235--><p class="nopar" > Alternatively you can load <span +class="ectt-1000">glossary-</span>⟨<span +class="ecti-1000">name</span>⟩<span +class="ectt-1000">.sty </span>at the same time by passing ⟨<span +class="ecti-1000">name</span>⟩ +as a package option to <span +class="ecss-1000">glossaries-extra-stylemods</span><a + id="dx1-11020"></a>. For example: </p> -<!--l. 1184--><p class="indent" > </div> -</p><!--l. 1184--><p class="noindent" ><a + <div class="verbatim" id="verbatim-40"> +\usepackage{glossaries-extra} + <br />\usepackage[longragged]{glossaries-extra-stylemods} +</div> +<!--l. 1243--><p class="nopar" > Another option is to use the <span +class="ecss-1000">stylemods</span><a + id="dx1-11021"></a> key when you load <span +class="ecss-1000">glossaries-extra</span>. You can +omit a value if you only want to use the predefined styles that are automatically +loaded by <span +class="ecss-1000">glossaries </span>(for example, the <span +class="ecss-1000">long3col</span><a + id="dx1-11022"></a> style): + + + +</p> + <div class="verbatim" id="verbatim-41"> +\usepackage[style=long3col,stylemods]{glossaries-extra} +</div> +<!--l. 1250--><p class="nopar" > Or the value of <span +class="ecss-1000">stylemods</span><a + id="dx1-11023"></a> may be a comma-separated list of the style package +identifiers. For example: + + + +</p> + <div class="verbatim" id="verbatim-42"> +\usepackage[style=mcoltree,stylemods=mcols]{glossaries-extra} +</div> +<!--l. 1255--><p class="nopar" > Remember to group the value if it contains any commas: + + + +</p> + <div class="verbatim" id="verbatim-43"> +\usepackage[stylemods={mcols,longbooktabs}]{glossaries-extra} +</div> +<!--l. 1259--><p class="nopar" > +</p><!--l. 1261--><p class="indent" > Note that the <span +class="ecss-1000">inline</span><a + id="dx1-11024"></a> style is dealt with slightly differently. The original definition +provided by the <span +class="ecss-1000">glossary-inline</span><a + id="dx1-11025"></a> package uses <span +class="ectt-1000">\glspostdescription </span>at the end of the +glossary (not after each entry description) within the definition of <span +class="ectt-1000">\glspostinline</span>. +The style modification changes this so that <span +class="ectt-1000">\glspostinline </span>just does a full stop +followed by space factor adjustment, and the description <span +class="ectt-1000">\glsinlinedescformat </span>and +sub-entry description formats <span +class="ectt-1000">\glsinlinesubdescformat </span>are redefined to include +<span +class="ectt-1000">\glsxtrpostdescription </span>(not <span +class="ectt-1000">\glspostdescription</span>). This means that the +modified <span +class="ecss-1000">inline</span><a + id="dx1-11026"></a> style isn’t affected by the <span +class="ecss-1000">nopostdot</span><a + id="dx1-11027"></a> option, but the post-description +category hook can still be used. + + + +</p> +<!--l. 1275--><p class="indent" > </div> +</p><!--l. 1275--><p class="noindent" ><a href="#top">Top</a><div class="chapter"><h2 class="chapterHead">2. <a id="sec:abbreviations"></a>Abbreviations</h2> -</p><!--l. 1187--><p class="indent" > Abbreviations include acronyms (words formed from initial letters, such as +</p><!--l. 1278--><p class="indent" > Abbreviations include acronyms (words formed from initial letters, such as “laser”), initialisms (initial letters of a phrase, such as “html”, that aren’t pronounced as words) and contractions (where parts of words are omitted, often replaced by an apostrophe, such as “don’t”). The “acronym” code provided by the <span @@ -2305,10 +2508,10 @@ to be <span class="ecti-1000">described </span>for readers unfamiliar with the term). They are therefore more like a regular term, which may or may not require a description in the glossary. -</p><!--l. 1199--><p class="indent" > The <span +</p><!--l. 1290--><p class="indent" > The <span class="ecss-1000">glossaries-extra </span>package corrects this misnomer, and provides better abbreviation handling, with -</p><!--l. 1201--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1292--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\newabbreviation</span><span class="ectt-0900"> </span></span><a id="dx1-12003"></a> <span @@ -2322,8 +2525,8 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">long</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 1203--><p class="noindent" > -</p><!--l. 1205--><p class="indent" > This sets the <span +</p><!--l. 1294--><p class="noindent" > +</p><!--l. 1296--><p class="indent" > This sets the <span class="ecss-1000">category</span><a id="dx1-12004"></a> key to <span class="ectt-1000">abbreviation </span>by default, but that value may be @@ -2343,7 +2546,7 @@ class="ecti-1000">short</span>⟩ (without appending the plural suffix). Se href="#sec:categories">§4 </a><a href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a> for further details. -</p><!--l. 1215--><p class="indent" > See <a +</p><!--l. 1306--><p class="indent" > See <a href="#sec:nested">§1.3.4 </a><a href="#sec:nested">Nested Links<!--tex4ht:ref: sec:nested --></a> regarding the pitfalls of using commands like <span class="ectt-1000">\gls</span><a @@ -2353,10 +2556,10 @@ class="ectt-1000">\glsxtrshort</span><a id="dx1-12009"></a> within ⟨<span class="ecti-1000">short</span>⟩ or ⟨<span class="ecti-1000">long</span>⟩. -</p><!--l. 1219--><p class="indent" > <div class="important" title="Important Note"> Make sure that you set the category attributes before defining new abbreviations +</p><!--l. 1310--><p class="indent" > <div class="important" title="Important Note"> Make sure that you set the category attributes before defining new abbreviations or they may not be correctly applied. </div> -</p><!--l. 1222--><p class="noindent" > -</p><!--l. 1224--><p class="indent" > The <span +</p><!--l. 1313--><p class="noindent" > +</p><!--l. 1315--><p class="indent" > The <span class="ectt-1000">\newacronym</span><a id="dx1-12010"></a> command provided by the <span class="ecss-1000">glossaries</span><a @@ -2376,17 +2579,17 @@ class="ectt-1000">\setacronymstyle</span><a class="ectt-1000">\newacronymstyle</span><a id="dx1-12015"></a>) you need to use -</p><!--l. 1231--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1322--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\RestoreAcronyms</span><span class="ectt-0900"> </span></span><a id="dx1-12016"></a> <span class="ectt-1000">\RestoreAcronyms </span></div><hr> -</p><!--l. 1233--><p class="noindent" > +</p><!--l. 1324--><p class="noindent" > However, if you do this take care not to mix acronyms with other types of entries within the same glossary. (You may also need to redefine <span class="ectt-1000">\acronymtype</span><a id="dx1-12017"></a>.) -</p><!--l. 1238--><p class="indent" > The <span +</p><!--l. 1329--><p class="indent" > The <span class="ectt-1000">\newabbreviation </span>command is superficially similar to the <span class="ecss-1000">glossaries</span><a id="dx1-12018"></a> @@ -2406,32 +2609,32 @@ styles provided by the <span class="ecss-1000">glossaries</span><a id="dx1-12023"></a> package, although they may produce similar results.) -</p><!--l. 1247--><p class="indent" > The short form is displayed within commands like <span +</p><!--l. 1338--><p class="indent" > The short form is displayed within commands like <span class="ectt-1000">\gls </span>using -</p><!--l. 1248--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1339--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsfirstabbrvfont</span><span class="ectt-0900"> </span></span><a id="dx1-12024"></a> <span class="ectt-1000">\glsfirstabbrvfont{</span>⟨<span class="ecit-1000">short-form</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 1250--><p class="noindent" > +</p><!--l. 1341--><p class="noindent" > on <a id="dx1-12025"></a><a href="#glo:firstuse">first use</a> and -</p><!--l. 1252--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1343--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsabbrvfont</span><span class="ectt-0900"> </span></span><a id="dx1-12026"></a> <span class="ectt-1000">\glsabbrvfont{</span>⟨<span class="ecit-1000">short-form</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 1254--><p class="noindent" > +</p><!--l. 1345--><p class="noindent" > for subsequent use. -</p><!--l. 1257--><p class="indent" > <div class="important" title="Important Note"> These commands (<span +</p><!--l. 1348--><p class="indent" > <div class="important" title="Important Note"> These commands (<span class="ectt-1000">\glsfirstabbrvfont </span>and <span class="ectt-1000">\glsabbrvfont</span>) are reset by the abbreviation styles and whenever an abbreviation is used by commands like <span @@ -2440,19 +2643,19 @@ class="ectt-1000">\gls</span> class="ectt-1000">\glsentryshort</span><a id="dx1-12027"></a>) so don’t try redefining them outside of an abbreviation style. </div> -</p><!--l. 1263--><p class="noindent" > -</p><!--l. 1265--><p class="indent" > If you use the <span +</p><!--l. 1354--><p class="noindent" > +</p><!--l. 1356--><p class="indent" > If you use the <span class="ecss-1000">long-short</span><a id="dx1-12028"></a> style, <span class="ectt-1000">\glsabbrvfont </span>is redefine to use -</p><!--l. 1267--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1358--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsabbrvdefaultfont</span><span class="ectt-0900"> </span></span><a id="dx1-12029"></a> <span class="ectt-1000">\glsabbrvdefaultfont{</span>⟨<span class="ecit-1000">text</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 1269--><p class="noindent" > +</p><!--l. 1360--><p class="noindent" > whereas the <span class="ecss-1000">long-short-sc</span><a id="dx1-12030"></a> style redefines <span @@ -2464,9 +2667,9 @@ class="ectt-1000">\glsabbrvdefaultfont </span>and use one of the base styles, su class="ecss-1000">long-short</span><a id="dx1-12031"></a>, or define a new style in a similar manner to the “sc”, “sm” or “em” styles. -</p><!--l. 1277--><p class="indent" > All predefined abbreviation styles redefine <span +</p><!--l. 1368--><p class="indent" > All predefined abbreviation styles redefine <span class="ectt-1000">\glsfirstabbrvfont </span>to use -</p><!--l. 1279--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1370--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsfirstabbrvdefaultfont</span><span class="ectt-0900"> </span></span><a id="dx1-12032"></a> <span @@ -2474,24 +2677,24 @@ class="ectt-1000">\glsfirstabbrvdefaultfont{</span>⟨<span class="ecit-1000">short-form</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 1281--><p class="noindent" > +</p><!--l. 1372--><p class="noindent" > By default, this just does <span class="ectt-1000">\glsabbrvfont{</span>⟨<span class="ecti-1000">short-form</span>⟩<span class="ectt-1000">} </span>so the <a id="dx1-12033"></a>first use format matches the subsequence use format for the short form. -</p><!--l. 1286--><p class="indent" > The commands that display the full form for abbreviations use <span +</p><!--l. 1377--><p class="indent" > The commands that display the full form for abbreviations use <span class="ectt-1000">\glsfirstabbrvfont</span> to display the short form and -</p><!--l. 1288--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1379--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsfirstlongfont</span><span class="ectt-0900"> </span></span><a id="dx1-12034"></a> <span class="ectt-1000">\glsfirstlongfont{</span>⟨<span class="ecit-1000">long-form</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 1290--><p class="noindent" > +</p><!--l. 1381--><p class="noindent" > to display the long form. As with <span class="ectt-1000">\glsabbrvfont</span><a id="dx1-12035"></a>, this command is changed by all @@ -2499,7 +2702,7 @@ styles. Currently all predefined abbreviation styles provided by <span class="ecss-1000">glossaries-extra</span> redefine <span class="ectt-1000">\glsfirstlongfont </span>to use -</p><!--l. 1295--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1386--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsfirstlongdefaultfont</span><span class="ectt-0900"> </span></span><a id="dx1-12036"></a> <span @@ -2507,58 +2710,85 @@ class="ectt-1000">\glsfirstlongdefaultfont{</span>⟨<span class="ecit-1000">long-form</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 1297--><p class="noindent" > +</p><!--l. 1388--><p class="noindent" > You can redefine this command if you want to change the font used by the long form on <a id="dx1-12037"></a>first use for all your abbreviations, or you can define your own abbreviation style that provides a different format for only those abbreviations defined with that style. -</p><!--l. 1303--><p class="indent" > There are two types of full forms. The display full form, which is used on <a - id="dx1-12038"></a>first use +</p><!--l. 1394--><p class="indent" > Note that by default inserted material (provided in the final optional argument of +commands like <span +class="ectt-1000">\gls</span>), is placed outside the font command in the predefined styles. To +move it inside, use: +</p><!--l. 1397--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ectt-0900">\glsxtrinsertinsidetrue</span><span +class="ectt-0900"> </span></span><a + id="dx1-12038"></a> <span +class="ectt-1000">\glsxtrinsertinsidetrue </span></div><hr> +</p><!--l. 1399--><p class="noindent" > +This applies to all the predefined styles. For example: + + + +</p> + <div class="verbatim" id="verbatim-44"> +\setabbreviationstyle{long-short} + <br />\renewcommand*{\glsfirstlongdefaultfont}[1]{\emph{#1}} + <br />\glsxtrinsertinsidetrue +</div> +<!--l. 1405--><p class="nopar" > This will make the long form and in the inserted text emphasized, whereas the +default (without <span +class="ectt-1000">\glsxtrinsertinsidetrue</span>) would place the inserted text outside of +the emphasized font. +</p><!--l. 1410--><p class="indent" > Note that for some styles, such as the <span +class="ecss-1000">short-long</span><a + id="dx1-12039"></a>, the inserted text would be +placed inside the font command for the short form (rather than the long form in the +above example). +</p><!--l. 1414--><p class="indent" > There are two types of full forms. The display full form, which is used on <a + id="dx1-12040"></a><a +href="#glo:firstuse">first use</a> by commands like <span class="ectt-1000">\gls</span><a - id="dx1-12039"></a> and the inline full form, which is used by commands like + id="dx1-12041"></a> and the inline full form, which is used by commands like <span class="ectt-1000">\glsxtrfull</span><a - id="dx1-12040"></a>. For some of the abbreviation styles, such as <span + id="dx1-12042"></a>. For some of the abbreviation styles, such as <span class="ecss-1000">long-short</span><a - id="dx1-12041"></a>, the display and + id="dx1-12043"></a>, the display and inline forms are the same. In the case of styles such as <span class="ecss-1000">short</span><a - id="dx1-12042"></a> or <span + id="dx1-12044"></a> or <span class="ecss-1000">footnote</span><a - id="dx1-12043"></a>, the display + id="dx1-12045"></a>, the display and inline full forms are different. -</p><!--l. 1310--><p class="indent" > These formatting commands aren’t stored in the <span +</p><!--l. 1421--><p class="indent" > These formatting commands aren’t stored in the <span class="ecss-1000">short</span><a - id="dx1-12044"></a>, <span + id="dx1-12046"></a>, <span class="ecss-1000">shortplural</span><a - id="dx1-12045"></a>, <span + id="dx1-12047"></a>, <span class="ecss-1000">long</span><a - id="dx1-12046"></a> or + id="dx1-12048"></a> or <span class="ecss-1000">longplural</span><a - id="dx1-12047"></a> fields, which means they won’t be used within commands like - - - + id="dx1-12049"></a> fields, which means they won’t be used within commands like <span class="ectt-1000">\glsentryshort </span>(but they are used within commands like <span class="ectt-1000">\glsxtrshort </span>and <span class="ectt-1000">\glsfmtshort</span>). Note that <span class="ectt-1000">\glsxtrlong</span><a - id="dx1-12048"></a> and the case-changing variants don’t use + id="dx1-12050"></a> and the case-changing variants don’t use <span class="ectt-1000">\glsfirstlongfont</span>. </p> -<!--l. 1318--><p class="noindent" ><a +<!--l. 1429--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">2.1 </span> <a id="sec:tagging"></a>Tagging Initials</h3> -<!--l. 1321--><p class="noindent" >If you would like to tag the initial letters in the long form such that those letters are +<!--l. 1432--><p class="noindent" >If you would like to tag the initial letters in the long form such that those letters are underlined in the glossary but not in the main part of the document, you can use -</p><!--l. 1324--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1435--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrEnableInitialTagging</span><span class="ectt-0900"> </span></span><a id="dx1-13001"></a> <span @@ -2568,9 +2798,9 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">cs</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 1326--><p class="noindent" > +</p><!--l. 1437--><p class="noindent" > before you define your abbreviations. -</p><!--l. 1329--><p class="indent" > This command (robustly) defines ⟨<span +</p><!--l. 1440--><p class="indent" > This command (robustly) defines ⟨<span class="ecti-1000">cs</span>⟩ (a control sequence) to accept a single argument, which is the letter (or letters) that needs to be tagged. The normal behaviour of this command within the document is to simply do its argument, but in @@ -2578,30 +2808,33 @@ the glossary it’s activated for those categories that have the <span class="ecss-1000">tagging</span><a id="dx1-13002"></a> attribute set to “true”. For those cases it will use -</p><!--l. 1336--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1447--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrtagfont</span><span class="ectt-0900"> </span></span><a id="dx1-13003"></a> <span class="ectt-1000">\glsxtrtagfont{</span>⟨<span class="ecit-1000">text</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 1338--><p class="noindent" > +</p><!--l. 1449--><p class="noindent" > This command defaults to <span class="ectt-1000">\underline</span><a id="dx1-13004"></a><span class="ectt-1000">{</span>⟨<span class="ecti-1000">text</span>⟩<span class="ectt-1000">} </span>but may be redefined as required. -</p><!--l. 1342--><p class="indent" > The control sequence ⟨<span +</p><!--l. 1453--><p class="indent" > The control sequence ⟨<span class="ecti-1000">cs</span>⟩ can’t already be defined when used with the unstarred version of <span class="ectt-1000">\GlsXtrEnableInitialTagging </span>for safety reasons. The starred version will overwrite any previous definition of ⟨<span class="ecti-1000">cs</span>⟩. As with redefining any commands, ensure that you don’t redefine something important. In fact, just + + + forget the existence of the starred version and let’s pretend I didn’t mention it. -</p><!--l. 1351--><p class="indent" > The first argument of <span +</p><!--l. 1462--><p class="indent" > The first argument of <span class="ectt-1000">\GlsXtrEnableInitialTagging </span>is a comma-separated list of category names. The <span class="ecss-1000">tagging</span><a @@ -2610,7 +2843,7 @@ categories. You can later set this attribute for other categories (see <a href="#sec:categories">§4 </a><a href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a>) but this must be done before the glossary is displayed. -</p><!--l. 1358--><p class="indent" > The accompanying sample file <span +</p><!--l. 1469--><p class="indent" > The accompanying sample file <span class="ectt-1000">sample-mixtures.tex </span>uses initial tagging for both the <span class="ecss-1000">acronym</span><a @@ -2621,17 +2854,17 @@ class="ecss-1000">abbreviation</span><a </p> - <div class="verbatim" id="verbatim-38"> + <div class="verbatim" id="verbatim-45"> \GlsXtrEnableInitialTagging{acronym,abbreviation}{\itag} </div> -<!--l. 1363--><p class="nopar" > This defines the command <span +<!--l. 1474--><p class="nopar" > This defines the command <span class="ectt-1000">\itag </span>which can be used in the definitions. For example: </p> - <div class="verbatim" id="verbatim-39"> + <div class="verbatim" id="verbatim-46"> \newacronym  <br /> [description={a system for detecting the location and  <br /> speed of ships, aircraft, etc, through the use of radio @@ -2643,17 +2876,17 @@ example:  <br />\newabbreviation{xml}{XML}  <br /> {e\itag{x}tensible \itag{m}arkup \itag{l}anguage} </div> -<!--l. 1378--><p class="nopar" > The underlining of the tagged letters only occurs in the glossary and then only for +<!--l. 1489--><p class="nopar" > The underlining of the tagged letters only occurs in the glossary and then only for entries with the <span class="ecss-1000">tagging</span><a id="dx1-13008"></a> attribute set. -</p><!--l. 1383--><p class="noindent" > +</p><!--l. 1494--><p class="noindent" > </p> -<!--l. 1383--><p class="noindent" ><a +<!--l. 1494--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">2.2 </span> <a id="sec:abbrstyle"></a>Abbreviation Styles</h3> -<!--l. 1386--><p class="noindent" >The abbreviation style must be set before abbreviations are defined using: -</p><!--l. 1388--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 1497--><p class="noindent" >The abbreviation style must be set before abbreviations are defined using: +</p><!--l. 1499--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\setabbreviationstyle</span><span class="ectt-0900"> </span></span><a id="dx1-14001"></a> <span @@ -2663,7 +2896,7 @@ class="ectt-1000">]{</span>⟨<span class="ecit-1000">style-name</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 1390--><p class="noindent" > +</p><!--l. 1501--><p class="noindent" > where ⟨<span class="ecti-1000">style-name</span>⟩ is the name of the style and ⟨<span class="ecti-1000">category</span>⟩ is the category label @@ -2682,11 +2915,11 @@ class="ecss-1000">regular</span><a id="dx1-14004"></a> attribute to <span class="ectt-1000">true</span>. -</p><!--l. 1401--><p class="indent" > <div class="important" title="Important Note"> If you want to apply different styles to groups of abbreviations, assign a +</p><!--l. 1512--><p class="indent" > <div class="important" title="Important Note"> If you want to apply different styles to groups of abbreviations, assign a different category to each group and set the style for the given category. </div> -</p><!--l. 1405--><p class="noindent" > -</p><!--l. 1407--><p class="indent" > Note that <span +</p><!--l. 1516--><p class="noindent" > +</p><!--l. 1518--><p class="indent" > Note that <span class="ectt-1000">\setacronymstyle</span><a id="dx1-14005"></a> is disabled by <span class="ecss-1000">glossaries-extra</span>. Use </p><div class="alltt"> @@ -2704,7 +2937,7 @@ class="ectt-1000">\RestoreAcronyms </span>(see <a href="#sec:acronymmods">§1.3.5 </a><a href="#sec:acronymmods">Acronym Style Modifications<!--tex4ht:ref: sec:acronymmods --></a>). -<!--l. 1415--><p class="indent" > Abbreviations can be used with the standard <span +<!--l. 1526--><p class="indent" > Abbreviations can be used with the standard <span class="ecss-1000">glossaries</span><a id="dx1-14006"></a> commands, such as <span class="ectt-1000">\gls</span><a @@ -2715,7 +2948,7 @@ class="ectt-1000">\acrshort</span><a class="ectt-1000">\acronymfont</span><a id="dx1-14009"></a>). The short form can be produced with: -</p><!--l. 1419--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1530--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrshort</span><span class="ectt-0900"> </span></span><a id="dx1-14010"></a> <span @@ -2726,12 +2959,12 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1421--><p class="noindent" > +</p><!--l. 1532--><p class="noindent" > (Use this instead of <span class="ectt-1000">\acrshort</span><a id="dx1-14011"></a>.) -</p><!--l. 1424--><p class="indent" > The long form can be produced with -</p><!--l. 1425--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1535--><p class="indent" > The long form can be produced with +</p><!--l. 1536--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrlong</span><span class="ectt-0900"> </span></span><a id="dx1-14012"></a> <span @@ -2742,13 +2975,13 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1427--><p class="noindent" > +</p><!--l. 1538--><p class="noindent" > (Use this instead of <span class="ectt-1000">\acrlong</span><a id="dx1-14013"></a>.) -</p><!--l. 1430--><p class="indent" > The <span +</p><!--l. 1541--><p class="indent" > The <span class="ecti-1000">inline </span>full form can be produced with -</p><!--l. 1431--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1542--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrfull</span><span class="ectt-0900"> </span></span><a id="dx1-14014"></a> <span @@ -2759,11 +2992,11 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1433--><p class="noindent" > +</p><!--l. 1544--><p class="noindent" > (This this instead of <span class="ectt-1000">\acrfull</span><a id="dx1-14015"></a>.) -</p><!--l. 1436--><p class="indent" > As mentioned earlier, the inline full form may not necessarily match the format +</p><!--l. 1547--><p class="indent" > As mentioned earlier, the inline full form may not necessarily match the format used on <a id="dx1-14016"></a><a href="#glo:firstuse">first use</a> with <span @@ -2773,20 +3006,20 @@ class="ecss-1000">short</span><a on <a id="dx1-14018"></a>first use, but the full form will display the long form followed by the short form in parentheses. -</p><!--l. 1442--><p class="indent" > <div class="important" title="Important Note"> If you want to use an abbreviation in a chapter or section title, use the +</p><!--l. 1553--><p class="indent" > <div class="important" title="Important Note"> If you want to use an abbreviation in a chapter or section title, use the commands described in <a href="#sec:headtitle">§3 </a><a -href="#sec:headtitle">Entries in Sectioning Titles, Headers and Contents<!--tex4ht:ref: sec:headtitle --></a> -instead. </div> -</p><!--l. 1446--><p class="noindent" > -</p><!--l. 1448--><p class="indent" > The arguments ⟨<span +href="#sec:headtitle">Entries in Sectioning Titles, Headers, Captions and +Contents<!--tex4ht:ref: sec:headtitle --></a> instead. </div> +</p><!--l. 1557--><p class="noindent" > +</p><!--l. 1559--><p class="indent" > The arguments ⟨<span class="ecti-1000">options</span>⟩, ⟨<span class="ecti-1000">label</span>⟩ and ⟨<span class="ecti-1000">insert</span>⟩ are the same as for commands such as <span class="ectt-1000">\glstext</span>. There are also analogous case-changing commands: -</p><!--l. 1452--><p class="indent" > First letter upper case short form: -</p><!--l. 1453--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1563--><p class="indent" > First letter upper case short form: +</p><!--l. 1564--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsxtrshort</span><span class="ectt-0900"> </span></span><a id="dx1-14019"></a> <span @@ -2797,9 +3030,9 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1455--><p class="noindent" > -</p><!--l. 1457--><p class="indent" > First letter upper case long form: -</p><!--l. 1458--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1566--><p class="noindent" > +</p><!--l. 1568--><p class="indent" > First letter upper case long form: +</p><!--l. 1569--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsxtrlong</span><span class="ectt-0900"> </span></span><a id="dx1-14020"></a> <span @@ -2810,9 +3043,9 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1460--><p class="noindent" > -</p><!--l. 1462--><p class="indent" > First letter upper case inline full form: -</p><!--l. 1463--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1571--><p class="noindent" > +</p><!--l. 1573--><p class="indent" > First letter upper case inline full form: +</p><!--l. 1574--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsxtrfull</span><span class="ectt-0900"> </span></span><a id="dx1-14021"></a> <span @@ -2823,9 +3056,9 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1465--><p class="noindent" > -</p><!--l. 1467--><p class="indent" > All upper case short form: -</p><!--l. 1468--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1576--><p class="noindent" > +</p><!--l. 1578--><p class="indent" > All upper case short form: +</p><!--l. 1579--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsxtrshort</span><span class="ectt-0900"> </span></span><a id="dx1-14022"></a> <span @@ -2836,9 +3069,9 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1470--><p class="noindent" > -</p><!--l. 1472--><p class="indent" > All upper case long form: -</p><!--l. 1473--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1581--><p class="noindent" > +</p><!--l. 1583--><p class="indent" > All upper case long form: +</p><!--l. 1584--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsxtrlong</span><span class="ectt-0900"> </span></span><a id="dx1-14023"></a> <span @@ -2852,9 +3085,9 @@ class="ectt-1000">] </span></div><hr> -</p><!--l. 1475--><p class="noindent" > -</p><!--l. 1477--><p class="indent" > All upper case inline full form: -</p><!--l. 1478--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1586--><p class="noindent" > +</p><!--l. 1588--><p class="indent" > All upper case inline full form: +</p><!--l. 1589--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GLSxtrfull</span><span class="ectt-0900"> </span></span><a id="dx1-14024"></a> <span @@ -2865,10 +3098,10 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1480--><p class="noindent" > -</p><!--l. 1482--><p class="indent" > Plural forms are also available. -</p><!--l. 1484--><p class="indent" > Short form plurals: -</p><!--l. 1485--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1591--><p class="noindent" > +</p><!--l. 1593--><p class="indent" > Plural forms are also available. +</p><!--l. 1595--><p class="indent" > Short form plurals: +</p><!--l. 1596--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrshortpl</span><span class="ectt-0900"> </span></span><a id="dx1-14025"></a> <span @@ -2879,8 +3112,8 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1487--><p class="noindent" > -</p><!--l. 1488--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1598--><p class="noindent" > +</p><!--l. 1599--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsxtrshortpl</span><span class="ectt-0900"> </span></span><a id="dx1-14026"></a> <span @@ -2891,8 +3124,8 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1490--><p class="noindent" > -</p><!--l. 1491--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1601--><p class="noindent" > +</p><!--l. 1602--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GLSxtrshortpl</span><span class="ectt-0900"> </span></span><a id="dx1-14027"></a> <span @@ -2903,9 +3136,9 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1493--><p class="noindent" > -</p><!--l. 1495--><p class="indent" > Long form plurals: -</p><!--l. 1496--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1604--><p class="noindent" > +</p><!--l. 1606--><p class="indent" > Long form plurals: +</p><!--l. 1607--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrlongpl</span><span class="ectt-0900"> </span></span><a id="dx1-14028"></a> <span @@ -2916,8 +3149,8 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1498--><p class="noindent" > -</p><!--l. 1499--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1609--><p class="noindent" > +</p><!--l. 1610--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsxtrlongpl</span><span class="ectt-0900"> </span></span><a id="dx1-14029"></a> <span @@ -2928,8 +3161,8 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1501--><p class="noindent" > -</p><!--l. 1502--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1612--><p class="noindent" > +</p><!--l. 1613--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GLSxtrlongpl</span><span class="ectt-0900"> </span></span><a id="dx1-14030"></a> <span @@ -2940,9 +3173,9 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1504--><p class="noindent" > -</p><!--l. 1506--><p class="indent" > Full form plurals: -</p><!--l. 1507--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1615--><p class="noindent" > +</p><!--l. 1617--><p class="indent" > Full form plurals: +</p><!--l. 1618--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrfullpl</span><span class="ectt-0900"> </span></span><a id="dx1-14031"></a> <span @@ -2953,8 +3186,8 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1509--><p class="noindent" > -</p><!--l. 1510--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1620--><p class="noindent" > +</p><!--l. 1621--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsxtrfullpl</span><span class="ectt-0900"> </span></span><a id="dx1-14032"></a> <span @@ -2965,8 +3198,8 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1512--><p class="noindent" > -</p><!--l. 1513--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1623--><p class="noindent" > +</p><!--l. 1624--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GLSxtrfullpl</span><span class="ectt-0900"> </span></span><a id="dx1-14033"></a> <span @@ -2977,8 +3210,8 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 1515--><p class="noindent" > -</p><!--l. 1517--><p class="indent" > <div class="important" title="Important Note"> Be careful about using <span +</p><!--l. 1626--><p class="noindent" > +</p><!--l. 1628--><p class="indent" > <div class="important" title="Important Note"> Be careful about using <span class="ectt-1000">\glsentryfull</span>, <span class="ectt-1000">\Glsentryfull</span>, <span class="ectt-1000">\glsentryfullpl </span>and @@ -2990,16 +3223,16 @@ class="ectt-1000">\glsxtrfull</span><a id="dx1-14034"></a> instead. Similarly for <span class="ectt-1000">\glsentryshort </span>etc. </div> -</p><!--l. 1523--><p class="noindent" > +</p><!--l. 1634--><p class="noindent" > -</p><!--l. 1525--><p class="noindent" > +</p><!--l. 1636--><p class="noindent" > </p> -<!--l. 1525--><p class="noindent" ><a +<!--l. 1636--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">2.3 </span> <a id="sec:abbrshortcuts"></a>Shortcut Commands</h3> -<!--l. 1528--><p class="noindent" >The abbreviation shortcut commands can be enabled using the package option +<!--l. 1639--><p class="noindent" >The abbreviation shortcut commands can be enabled using the package option <span class="ecss-1000">shortcuts=abbreviation</span><a id="dx1-15001"></a> (or <span @@ -3012,7 +3245,7 @@ href="#tab:abbrshortcuts">table 2.1</a>. -<!--l. 1533--><p class="indent" > <a +<!--l. 1644--><p class="indent" > <a id="tab:abbrshortcuts"></a></p><hr class="float" /><div class="float" > @@ -3204,10 +3437,10 @@ class="ectt-1000">\newabbreviation</span><a </div><hr class="endfloat" /> </div> -<!--l. 1563--><p class="noindent" ><a +<!--l. 1674--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">2.4 </span> <a id="sec:predefabbrvstyles"></a>Predefined Abbreviation Styles</h3> -<!--l. 1566--><p class="noindent" >There are two types of abbreviation styles: those that treat the abbreviation as a +<!--l. 1677--><p class="noindent" >There are two types of abbreviation styles: those that treat the abbreviation as a regular entry (so that <span class="ectt-1000">\gls</span><a id="dx1-16001"></a> uses <span @@ -3218,7 +3451,7 @@ class="ectt-1000">\gls</span><a id="dx1-16003"></a> uses <span class="ectt-1000">\glsxtrgenabbrvfmt</span><a id="dx1-16004"></a>). -</p><!--l. 1571--><p class="indent" > The regular entry abbreviation styles set the <span +</p><!--l. 1682--><p class="indent" > The regular entry abbreviation styles set the <span class="ecss-1000">regular</span><a id="dx1-16005"></a> attribute to “true” for the category assigned to each abbreviation with that style. This means that on <a @@ -3242,7 +3475,7 @@ class="ecss-1000">long</span><a <span class="ectt-1000">\glsxtrshort</span><a id="dx1-16013"></a>. -</p><!--l. 1580--><p class="indent" > The other abbreviation styles don’t modify the <span +</p><!--l. 1691--><p class="indent" > The other abbreviation styles don’t modify the <span class="ecss-1000">regular</span><a id="dx1-16014"></a> attribute. The <span class="ecss-1000">first</span><a @@ -3261,14 +3494,14 @@ format (through commands like <span class="ectt-1000">\glsxtrfullformat</span><a id="dx1-16019"></a> that are defined by the style). -</p><!--l. 1588--><p class="indent" > In both cases, the <a +</p><!--l. 1699--><p class="indent" > In both cases, the <a id="dx1-16020"></a>first use of <span class="ectt-1000">\gls</span><a id="dx1-16021"></a> may not match the text produced by <span class="ectt-1000">\glsfirst</span><a id="dx1-16022"></a> (and likewise for the plural and case-changing versions). -</p><!--l. 1592--><p class="indent" > <div class="important" title="Important Note"> For the “sc” styles that use <span +</p><!--l. 1703--><p class="indent" > <div class="important" title="Important Note"> For the “sc” styles that use <span class="ectt-1000">\textsc</span><a id="dx1-16023"></a>, be careful about your choice of fonts as some only have limited support. For example, you may not be able to combine bold @@ -3277,40 +3510,40 @@ class="ecss-1000">fontenc</span><a id="dx1-16024"></a> package with the <span class="ecss-1000">T1</span> option or something similar. </div> -</p><!--l. 1598--><p class="noindent" > -</p><!--l. 1600--><p class="indent" > The “sc” styles all use -</p><!--l. 1601--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1709--><p class="noindent" > +</p><!--l. 1711--><p class="indent" > The “sc” styles all use +</p><!--l. 1712--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrscfont</span><span class="ectt-0900"> </span></span><a id="dx1-16025"></a> <span class="ectt-1000">\glsxtrscfont{</span>⟨<span class="ecit-1000">text</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 1603--><p class="noindent" > +</p><!--l. 1714--><p class="noindent" > which is defined as </p> - <div class="verbatim" id="verbatim-40"> + <div class="verbatim" id="verbatim-47"> \newcommand*{\glsxtrscfont}[1]{\textsc{#1}} </div> -<!--l. 1607--><p class="nopar" > The default plural suffix for the short form is set to -</p><!--l. 1609--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 1718--><p class="nopar" > The default plural suffix for the short form is set to +</p><!--l. 1720--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrscsuffix</span><span class="ectt-0900"> </span></span><a id="dx1-16026"></a> <span class="ectt-1000">\glsxtrscsuffix </span></div><hr> -</p><!--l. 1611--><p class="noindent" > +</p><!--l. 1722--><p class="noindent" > This just defined as </p> - <div class="verbatim" id="verbatim-41"> + <div class="verbatim" id="verbatim-48"> \newcommand*{\glsxtrscsuffix}{\glstextup{\glspluralsuffix}} </div> -<!--l. 1615--><p class="nopar" > The <span +<!--l. 1726--><p class="nopar" > The <span class="ectt-1000">\glstextup</span><a id="dx1-16027"></a> command is provided by <span class="ecss-1000">glossaries</span><a @@ -3328,24 +3561,24 @@ class="ecss-1000">noshortplural</span><a attributes. See <a href="#sec:categories">§4 </a><a href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a> for further details.) -</p><!--l. 1626--><p class="indent" > The “sm” styles all use -</p><!--l. 1627--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1737--><p class="indent" > The “sm” styles all use +</p><!--l. 1738--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrsmfont</span><span class="ectt-0900"> </span></span><a id="dx1-16032"></a> <span class="ectt-1000">\glsxtrsmfont{</span>⟨<span class="ecit-1000">text</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 1629--><p class="noindent" > +</p><!--l. 1740--><p class="noindent" > This is defined as: </p> - <div class="verbatim" id="verbatim-42"> + <div class="verbatim" id="verbatim-49"> \newcommand*{\glsxtrsmfont}[1]{\textsmaller{#1}} </div> -<!--l. 1633--><p class="nopar" > If you want to use this, you must explicitly load the <span +<!--l. 1744--><p class="nopar" > If you want to use this, you must explicitly load the <span class="ecss-1000">relsize</span><a id="dx1-16033"></a> package which defines the <span @@ -3357,59 +3590,59 @@ case: </p> - <div class="verbatim" id="verbatim-43"> + <div class="verbatim" id="verbatim-50"> \renewcommand*{\glsxtrsmfont}[1]{\textsmaller{\MakeTextUppercase{#1}}} </div> -<!--l. 1640--><p class="nopar" > The default plural suffix for the short form is set to -</p><!--l. 1642--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 1751--><p class="nopar" > The default plural suffix for the short form is set to +</p><!--l. 1753--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrsmsuffix</span><span class="ectt-0900"> </span></span><a id="dx1-16035"></a> <span class="ectt-1000">\glsxtrsmsuffix </span></div><hr> -</p><!--l. 1644--><p class="noindent" > +</p><!--l. 1755--><p class="noindent" > This just does <span class="ectt-1000">\glspluralsuffix</span><a id="dx1-16036"></a>. -</p><!--l. 1647--><p class="indent" > The “em” styles all redefine <span +</p><!--l. 1758--><p class="indent" > The “em” styles all redefine <span class="ectt-1000">\glsabbrvfont</span><a id="dx1-16037"></a> to use <span class="ectt-1000">\emph</span><a id="dx1-16038"></a>. This is done explicitly and not through a helper command such as <span class="ectt-1000">\glsxtrscfont</span>. -</p><!--l. 1651--><p class="indent" > Some of the styles use -</p><!--l. 1652--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 1762--><p class="indent" > Some of the styles use +</p><!--l. 1763--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrfullsep</span><span class="ectt-0900"> </span></span><a id="dx1-16039"></a> <span class="ectt-1000">\glsxtrfullsep{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 1654--><p class="noindent" > +</p><!--l. 1765--><p class="noindent" > as a separator between the long and short forms. This is defined as a space by default, but may be changed as required. For example: </p> - <div class="verbatim" id="verbatim-44"> + <div class="verbatim" id="verbatim-51"> \renewcommand*{\glsxtrfullsep}[1]{~} </div> -<!--l. 1659--><p class="nopar" > or +<!--l. 1770--><p class="nopar" > or </p> - <div class="verbatim" id="verbatim-45"> + <div class="verbatim" id="verbatim-52"> \renewcommand*{\glsxtrfullsep}[1]{\glsacspace{#1}} </div> -<!--l. 1663--><p class="nopar" > -</p><!--l. 1666--><p class="noindent" > +<!--l. 1774--><p class="nopar" > +</p><!--l. 1777--><p class="noindent" > </p> -<!--l. 1666--><p class="noindent" ><a +<!--l. 1777--><p class="noindent" ><a href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><span class="titlemark">2.4.1 </span> <a id="sec:predefregabbrvstyles"></a>Predefined Abbreviation Styles that Set the Regular Attribute</h4> -<!--l. 1669--><p class="noindent" >The following abbreviation styles set the <span +<!--l. 1780--><p class="noindent" >The following abbreviation styles set the <span class="ecss-1000">regular</span><a id="dx1-17001"></a> attribute to “true” for all categories that have abbreviations defined with any of these styles. @@ -3529,7 +3762,7 @@ class="ectt-1000">\glsxtrshort</span><a class="ecti-1000">long</span>⟩ (⟨<span class="ecti-1000">short</span>⟩). - <!--l. 1719--><p class="noindent" >The <span + <!--l. 1830--><p class="noindent" >The <span class="ecss-1000">name</span><a id="dx1-17034"></a> is set to the long form and the <span class="ecss-1000">description</span><a @@ -3619,12 +3852,12 @@ class="ectt-1000">\glsabbrvfont </span>to use <span class="ectt-1000">\emph</span><a id="dx1-17059"></a>. </dd></dl> -<!--l. 1760--><p class="noindent" > +<!--l. 1871--><p class="noindent" > </p> -<!--l. 1760--><p class="noindent" ><a +<!--l. 1871--><p class="noindent" ><a href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><span class="titlemark">2.4.2 </span> <a id="sec:predefnonregabbrvstyles"></a>Predefined Abbreviation Styles that Don’t Set the Regular Attribute</h4> -<!--l. 1763--><p class="noindent" >The following abbreviation styles will set the <span +<!--l. 1874--><p class="noindent" >The following abbreviation styles will set the <span class="ecss-1000">regular</span><a id="dx1-18001"></a> attribute to “false” if it has previously been set. If it hasn’t already been set, it’s left unset. Other attributes may @@ -3846,7 +4079,7 @@ class="ecss-1000">nohyperfirst</span><a footnote marker may be, if the <span class="ecss-1000">hyperref</span><a id="dx1-18058"></a> package is used). - <!--l. 1852--><p class="noindent" >The inline full form uses the ⟨<span + <!--l. 1963--><p class="noindent" >The inline full form uses the ⟨<span class="ecti-1000">short</span>⟩ (⟨<span class="ecti-1000">long</span>⟩) style. The <span class="ecss-1000">name</span><a @@ -3903,57 +4136,61 @@ href="#glo:linktext">link-text</a> on <a by <span class="ectt-1000">\glsxtrifnextpunc</span><a id="dx1-18075"></a>. - <!--l. 1876--><p class="noindent" >The inline full form uses the ⟨<span + <!--l. 1987--><p class="noindent" >The inline full form uses the ⟨<span class="ecti-1000">short</span>⟩ (⟨<span class="ecti-1000">long</span>⟩) style. The <span class="ecss-1000">name</span><a id="dx1-18076"></a> is set to the short form. The <span class="ecss-1000">description</span><a - id="dx1-18077"></a> is set to the long form. + id="dx1-18077"></a> is set to the long form. Note that this style + will change <span +class="ectt-1000">\glsxtrfull </span>(and it’s variants) so that it fakes non-<a + id="dx1-18078"></a>first use. + (Otherwise the footnote would appear after the inline form.) </p></dd><dt class="description"> <span class="ecsx-1000">postfootnote-sc</span><a - id="dx1-18078"></a> </dt><dd + id="dx1-18079"></a> </dt><dd class="description">Like <span class="ecss-1000">postfootnote</span><a - id="dx1-18079"></a> but redefines <span + id="dx1-18080"></a> but redefines <span class="ectt-1000">\glsabbrvfont </span>to use <span class="ectt-1000">\glsxtrscfont</span><a - id="dx1-18080"></a>. + id="dx1-18081"></a>. </dd><dt class="description"> <span class="ecsx-1000">postfootnote-sm</span><a - id="dx1-18081"></a> </dt><dd + id="dx1-18082"></a> </dt><dd class="description">Like <span class="ecss-1000">postfootnote</span><a - id="dx1-18082"></a> but redefines <span + id="dx1-18083"></a> but redefines <span class="ectt-1000">\glsabbrvfont </span>to use <span class="ectt-1000">\glsxtrsmfont</span><a - id="dx1-18083"></a>. + id="dx1-18084"></a>. </dd><dt class="description"> <span class="ecsx-1000">postfootnote-em</span><a - id="dx1-18084"></a> </dt><dd + id="dx1-18085"></a> </dt><dd class="description">Like <span class="ecss-1000">postfootnote</span><a - id="dx1-18085"></a> but redefines <span + id="dx1-18086"></a> but redefines <span class="ectt-1000">\glsabbrvfont </span>to use <span class="ectt-1000">\emph</span><a - id="dx1-18086"></a>. + id="dx1-18087"></a>. </dd></dl> -<!--l. 1894--><p class="noindent" > +<!--l. 2008--><p class="noindent" > </p> -<!--l. 1894--><p class="noindent" ><a +<!--l. 2008--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">2.5 </span> <a id="sec:newabbrvstyle"></a>Defining New Abbreviation Styles</h3> -<!--l. 1897--><p class="noindent" >New abbreviation styles may be defined using: -</p><!--l. 1898--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 2011--><p class="noindent" >New abbreviation styles may be defined using: +</p><!--l. 2012--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\newabbreviationstyle</span><span class="ectt-0900"> </span></span><a id="dx1-19001"></a> <span @@ -3965,7 +4202,7 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">fmts</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 1900--><p class="noindent" > +</p><!--l. 2014--><p class="noindent" > where ⟨<span class="ecti-1000">name</span>⟩ is the name of the new style (as used in the mandatory argument of <span @@ -3976,7 +4213,7 @@ class="ecss-1000">glossaries</span><a <span class="ectt-1000">\newacronymstyle</span><a id="dx1-19004"></a> command. -</p><!--l. 1906--><p class="indent" > <div class="important" title="Important Note"> You can’t use styles defined by <span +</p><!--l. 2020--><p class="indent" > <div class="important" title="Important Note"> You can’t use styles defined by <span class="ectt-1000">\newacronymstyle </span>with <span class="ecss-1000">glossaries-extra</span> unless you have reverted <span @@ -3992,17 +4229,17 @@ class="ecss-1000">glossaries</span><a package can’t be used with abbreviations defined with <span class="ectt-1000">\newabbreviation</span>. </div> -</p><!--l. 1913--><p class="noindent" > -</p><!--l. 1915--><p class="indent" > The ⟨<span +</p><!--l. 2027--><p class="noindent" > +</p><!--l. 2029--><p class="indent" > The ⟨<span class="ecti-1000">setup</span>⟩ argument deals with the way the entry is defined and may set attributes for the given abbreviation category. This argument should redefine -</p><!--l. 1918--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2032--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\CustomAbbreviationFields</span><span class="ectt-0900"> </span></span><a id="dx1-19009"></a> <span class="ectt-1000">\CustomAbbreviationFields </span></div><hr> -</p><!--l. 1920--><p class="noindent" > +</p><!--l. 2034--><p class="noindent" > to set the entry fields including the <span class="ecss-1000">name</span><a id="dx1-19010"></a> (defaults to the short form if omitted), @@ -4020,12 +4257,12 @@ class="ecss-1000">plural</span><a <span class="ecss-1000">description</span><a id="dx1-19016"></a>. -</p><!--l. 1927--><p class="indent" > <div class="important" title="Important Note"> <span +</p><!--l. 2041--><p class="indent" > <div class="important" title="Important Note"> <span class="ectt-1000">\CustomAbbreviationFields </span>is expanded by <span class="ectt-1000">\newabbreviation </span>so take care to protect commands that shouldn’t be expanded. </div> -</p><!--l. 1930--><p class="noindent" > -</p><!--l. 1932--><p class="indent" > For example, the <span +</p><!--l. 2044--><p class="noindent" > +</p><!--l. 2046--><p class="indent" > For example, the <span class="ecss-1000">long-short</span><a id="dx1-19017"></a> style has the following in ⟨<span class="ecti-1000">setup</span>⟩: @@ -4033,7 +4270,7 @@ class="ecti-1000">setup</span>⟩: </p> - <div class="verbatim" id="verbatim-46"> + <div class="verbatim" id="verbatim-53">   \renewcommand*{\CustomAbbreviationFields}{%  <br />    name={\protect\glsabbrvfont{\the\glsshorttok}},  <br />    sort={\the\glsshorttok}, @@ -4046,24 +4283,24 @@ class="ecti-1000">setup</span>⟩:  <br />    plural={\protect\glsabbvfont{\the\glsshortpltok}},%  <br />    description={\the\glslongtok}}% </div> -<!--l. 1946--><p class="nopar" > Note that the <span +<!--l. 2060--><p class="nopar" > Note that the <span class="ecss-1000">first</span><a id="dx1-19018"></a> and <span class="ecss-1000">firstplural</span><a id="dx1-19019"></a> are set even though they’re not used by <span class="ectt-1000">\gls</span>. -</p><!--l. 1950--><p class="indent" > The ⟨<span +</p><!--l. 2064--><p class="indent" > The ⟨<span class="ecti-1000">setup</span>⟩ argument may also redefine -</p><!--l. 1951--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2065--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrPostNewAbbreviation</span><span class="ectt-0900"> </span></span><a id="dx1-19020"></a> <span class="ectt-1000">\GlsXtrPostNewAbbreviation </span></div><hr> -</p><!--l. 1953--><p class="noindent" > +</p><!--l. 2067--><p class="noindent" > which can be used to assign attributes. (This will automatically be initialised to do nothing.) -</p><!--l. 1957--><p class="indent" > For example, the <span +</p><!--l. 2071--><p class="indent" > For example, the <span class="ecss-1000">footnote</span><a id="dx1-19021"></a> includes the following in ⟨<span class="ecti-1000">setup</span>⟩: @@ -4071,7 +4308,7 @@ class="ecti-1000">setup</span>⟩: </p> - <div class="verbatim" id="verbatim-47"> + <div class="verbatim" id="verbatim-54">   \renewcommand*{\GlsXtrPostNewAbbreviation}{%  <br />    \glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%  <br />    \glshasattribute{\the\glslabeltok}{regular}% @@ -4081,7 +4318,7 @@ class="ecti-1000">setup</span>⟩:  <br />    {}%  <br />  }% </div> -<!--l. 1968--><p class="nopar" > This sets the <span +<!--l. 2082--><p class="nopar" > This sets the <span class="ecss-1000">nohyperfirst</span><a id="dx1-19022"></a> attribute to “true”. It also unsets the <span class="ecss-1000">regular</span><a @@ -4090,77 +4327,77 @@ has previously been set. Note that the <span class="ecss-1000">nohyperfirst</span><a id="dx1-19024"></a> attribute doesn’t get unset by other styles, so take care not to switch styles for the same category. -</p><!--l. 1975--><p class="indent" > You can access the short, long, short plural and long plural values through the +</p><!--l. 2089--><p class="indent" > You can access the short, long, short plural and long plural values through the following token registers. -</p><!--l. 1978--><p class="indent" > Short value (defined by <span +</p><!--l. 2092--><p class="indent" > Short value (defined by <span class="ecss-1000">glossaries</span><a id="dx1-19025"></a>): -</p><!--l. 1979--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2093--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsshorttok</span><span class="ectt-0900"> </span></span><a id="dx1-19026"></a> <span class="ectt-1000">\glsshorttok </span></div><hr> -</p><!--l. 1981--><p class="noindent" > -</p><!--l. 1983--><p class="indent" > Short plural value (defined by <span +</p><!--l. 2095--><p class="noindent" > +</p><!--l. 2097--><p class="indent" > Short plural value (defined by <span class="ecss-1000">glossaries-extra</span>): -</p><!--l. 1984--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2098--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsshortpltok</span><span class="ectt-0900"> </span></span><a id="dx1-19027"></a> <span class="ectt-1000">\glsshortpltok </span></div><hr> -</p><!--l. 1986--><p class="noindent" > +</p><!--l. 2100--><p class="noindent" > (This may be the default value or, if provided, the value provided by the user through the <span class="ecss-1000">shortplural</span><a id="dx1-19028"></a> key in the optional argument of <span class="ectt-1000">\newabbreviation</span><a id="dx1-19029"></a>.) -</p><!--l. 1991--><p class="indent" > Long value (defined by <span +</p><!--l. 2105--><p class="indent" > Long value (defined by <span class="ecss-1000">glossaries</span><a id="dx1-19030"></a>): -</p><!--l. 1992--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2106--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glslongtok</span><span class="ectt-0900"> </span></span><a id="dx1-19031"></a> <span class="ectt-1000">\glslongtok </span></div><hr> -</p><!--l. 1994--><p class="noindent" > -</p><!--l. 1996--><p class="indent" > Long plural value (defined by <span +</p><!--l. 2108--><p class="noindent" > +</p><!--l. 2110--><p class="indent" > Long plural value (defined by <span class="ecss-1000">glossaries-extra</span>): -</p><!--l. 1997--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2111--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glslongpltok</span><span class="ectt-0900"> </span></span><a id="dx1-19032"></a> <span class="ectt-1000">\glslongpltok </span></div><hr> -</p><!--l. 1999--><p class="noindent" > +</p><!--l. 2113--><p class="noindent" > (This may be the default value or, if provided, the value provided by the user through the <span class="ecss-1000">longplural</span><a id="dx1-19033"></a> key in the optional argument of <span class="ectt-1000">\newabbreviation</span><a id="dx1-19034"></a>.) -</p><!--l. 2004--><p class="indent" > There are two other registers available that are defined by <span +</p><!--l. 2118--><p class="indent" > There are two other registers available that are defined by <span class="ecss-1000">glossaries</span><a id="dx1-19035"></a>: -</p><!--l. 2007--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2121--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glslabeltok</span><span class="ectt-0900"> </span></span><a id="dx1-19036"></a> <span class="ectt-1000">\glslabeltok </span></div><hr> -</p><!--l. 2009--><p class="noindent" > +</p><!--l. 2123--><p class="noindent" > which contains the entry’s label and -</p><!--l. 2011--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2125--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glskeylisttok</span><span class="ectt-0900"> </span></span><a id="dx1-19037"></a> <span class="ectt-1000">\glskeylisttok </span></div><hr> -</p><!--l. 2013--><p class="noindent" > +</p><!--l. 2127--><p class="noindent" > which contains the values provided in the optional argument of <span class="ectt-1000">\newabbreviation</span><a id="dx1-19038"></a>. -</p><!--l. 2017--><p class="indent" > Remember put <span +</p><!--l. 2131--><p class="indent" > Remember put <span class="ectt-1000">\the </span>in front of the register command as in the examples above. The category label can be access through the command (not a register): -</p><!--l. 2020--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2134--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glscategorylabel</span><span class="ectt-0900"> </span></span><a id="dx1-19039"></a> <span @@ -4168,18 +4405,18 @@ class="ectt-1000">\glscategorylabel </span></div><hr> -</p><!--l. 2022--><p class="noindent" > +</p><!--l. 2136--><p class="noindent" > This may be used inside the definition of <span class="ectt-1000">\GlsXtrPostNewAbbreviation</span>. -</p><!--l. 2026--><p class="indent" > If you want to base a style on an existing style, you can use -</p><!--l. 2027--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2140--><p class="indent" > If you want to base a style on an existing style, you can use +</p><!--l. 2141--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrUseAbbrStyleSetup</span><span class="ectt-0900"> </span></span><a id="dx1-19040"></a> <span class="ectt-1000">\GlsXtrUseAbbrStyleSetup{</span>⟨<span class="ecit-1000">name</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2029--><p class="noindent" > +</p><!--l. 2143--><p class="noindent" > where ⟨<span class="ecti-1000">name</span>⟩ is the name of the existing style. For example, the <span class="ecss-1000">footnote-sc</span><a @@ -4191,68 +4428,68 @@ class="ecss-1000">footnote-sm</span><a </p> - <div class="verbatim" id="verbatim-48"> + <div class="verbatim" id="verbatim-55"> \GlsXtrUseAbbrStyleSetup{footnote} </div> -<!--l. 2035--><p class="nopar" > within ⟨<span +<!--l. 2149--><p class="nopar" > within ⟨<span class="ecti-1000">setup</span>⟩. -</p><!--l. 2038--><p class="indent" > The ⟨<span +</p><!--l. 2152--><p class="indent" > The ⟨<span class="ecti-1000">fmts</span>⟩ argument deals with the way the entry is displayed in the document. This argument should redefine the following commands: -</p><!--l. 2042--><p class="indent" > The default suffix for the plural short form (if not overridden by the <span +</p><!--l. 2156--><p class="indent" > The default suffix for the plural short form (if not overridden by the <span class="ecss-1000">shortplural</span><a id="dx1-19043"></a> key): -</p><!--l. 2044--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2158--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\abbrvpluralsuffix</span><span class="ectt-0900"> </span></span><a id="dx1-19044"></a> <span class="ectt-1000">\abbrvpluralsuffix </span></div><hr> -</p><!--l. 2046--><p class="noindent" > +</p><!--l. 2160--><p class="noindent" > (Note that this isn’t used for the plural long form, which just uses the regular <span class="ectt-1000">\glspluralsuffix</span>.) -</p><!--l. 2050--><p class="indent" > The font used for the short form on <a +</p><!--l. 2164--><p class="indent" > The font used for the short form on <a id="dx1-19045"></a><a href="#glo:firstuse">first use</a> or in the full forms: -</p><!--l. 2051--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2165--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsfirstabbrvfont</span><span class="ectt-0900"> </span></span><a id="dx1-19046"></a> <span class="ectt-1000">\glsfirstabbrvfont{</span>⟨<span class="ecit-1000">text</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2053--><p class="noindent" > -</p><!--l. 2055--><p class="indent" > The font used for the short form on subsequent use or through commands like +</p><!--l. 2167--><p class="noindent" > +</p><!--l. 2169--><p class="indent" > The font used for the short form on subsequent use or through commands like <span class="ectt-1000">\glsxtrshort</span><a id="dx1-19047"></a>: -</p><!--l. 2057--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2171--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsabbrvfont</span><span class="ectt-0900"> </span></span><a id="dx1-19048"></a> <span class="ectt-1000">\glsabbrvfont{</span>⟨<span class="ecit-1000">text</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2059--><p class="noindent" > -</p><!--l. 2061--><p class="indent" > The font used for the long form on <a +</p><!--l. 2173--><p class="noindent" > +</p><!--l. 2175--><p class="indent" > The font used for the long form on <a id="dx1-19049"></a>first use or in the full forms: -</p><!--l. 2062--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2176--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsfirstlongfont</span><span class="ectt-0900"> </span></span><a id="dx1-19050"></a> <span class="ectt-1000">\glsfirstlongfont{</span>⟨<span class="ecit-1000">text</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2064--><p class="noindent" > -</p><!--l. 2066--><p class="indent" > Display full form singular no case-change (used by <span +</p><!--l. 2178--><p class="noindent" > +</p><!--l. 2180--><p class="indent" > Display full form singular no case-change (used by <span class="ectt-1000">\gls</span><a id="dx1-19051"></a> on <a id="dx1-19052"></a>first use for abbreviations without the <span class="ecss-1000">regular</span><a id="dx1-19053"></a> attribute set): -</p><!--l. 2069--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2183--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrfullformat</span><span class="ectt-0900"> </span></span><a id="dx1-19054"></a> <span @@ -4261,15 +4498,15 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}{</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2071--><p class="noindent" > -</p><!--l. 2073--><p class="indent" > Display full form singular first letter converted to upper case (used by <span +</p><!--l. 2185--><p class="noindent" > +</p><!--l. 2187--><p class="indent" > Display full form singular first letter converted to upper case (used by <span class="ectt-1000">\Gls</span><a id="dx1-19055"></a> on <a id="dx1-19056"></a>first use for abbreviations without the <span class="ecss-1000">regular</span><a id="dx1-19057"></a> attribute set): -</p><!--l. 2076--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2190--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsxtrfullformat</span><span class="ectt-0900"> </span></span><a id="dx1-19058"></a> <span @@ -4278,15 +4515,15 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}{</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2078--><p class="noindent" > -</p><!--l. 2080--><p class="indent" > Display full form plural no case-change (used by <span +</p><!--l. 2192--><p class="noindent" > +</p><!--l. 2194--><p class="indent" > Display full form plural no case-change (used by <span class="ectt-1000">\glspl</span><a id="dx1-19059"></a> on <a id="dx1-19060"></a>first use for abbreviations without the <span class="ecss-1000">regular</span><a id="dx1-19061"></a> attribute set): -</p><!--l. 2083--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2197--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrfullplformat</span><span class="ectt-0900"> </span></span><a id="dx1-19062"></a> <span @@ -4295,8 +4532,8 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}{</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2085--><p class="noindent" > -</p><!--l. 2087--><p class="indent" > Display full form plural first letter converted to upper case (used by <span +</p><!--l. 2199--><p class="noindent" > +</p><!--l. 2201--><p class="indent" > Display full form plural first letter converted to upper case (used by <span class="ectt-1000">\Glspl</span><a id="dx1-19063"></a> on <a @@ -4306,7 +4543,7 @@ class="ecss-1000">regular</span><a -</p><!--l. 2090--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2204--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsxtrfullplformat</span><span class="ectt-0900"> </span></span><a id="dx1-19066"></a> <span @@ -4315,12 +4552,12 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}{</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2092--><p class="noindent" > -</p><!--l. 2094--><p class="indent" > In addition ⟨<span +</p><!--l. 2206--><p class="noindent" > +</p><!--l. 2208--><p class="indent" > In addition ⟨<span class="ecti-1000">fmts</span>⟩ may also redefine the following commands that govern the inline full formats. If the style doesn’t redefine them, they will default to the same as the display full forms. -</p><!--l. 2098--><p class="indent" > Inline singular no case-change (used by <span +</p><!--l. 2212--><p class="indent" > Inline singular no case-change (used by <span class="ectt-1000">\glsentryfull</span><a id="dx1-19067"></a>, <span class="ectt-1000">\glsxtrfull</span><a @@ -4328,7 +4565,7 @@ class="ectt-1000">\glsxtrfull</span><a <span class="ectt-1000">\GLSxtrfull</span><a id="dx1-19069"></a>): -</p><!--l. 2100--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2214--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrinlinefullformat</span><span class="ectt-0900"> </span></span><a id="dx1-19070"></a> <span @@ -4338,14 +4575,14 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 2102--><p class="noindent" > -</p><!--l. 2104--><p class="indent" > Inline singular first letter converted to upper case (used by <span +</p><!--l. 2216--><p class="noindent" > +</p><!--l. 2218--><p class="indent" > Inline singular first letter converted to upper case (used by <span class="ectt-1000">\Glsentryfull</span><a id="dx1-19071"></a> and <span class="ectt-1000">\Glsxtrfull</span><a id="dx1-19072"></a>): -</p><!--l. 2106--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2220--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsxtrinlinefullformat</span><span class="ectt-0900"> </span></span><a id="dx1-19073"></a> <span @@ -4355,8 +4592,8 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 2108--><p class="noindent" > -</p><!--l. 2110--><p class="indent" > Inline plural no case-change (used by <span +</p><!--l. 2222--><p class="noindent" > +</p><!--l. 2224--><p class="indent" > Inline plural no case-change (used by <span class="ectt-1000">\glsentryfullpl</span><a id="dx1-19074"></a>, <span class="ectt-1000">\glsxtrfullpl</span><a @@ -4364,7 +4601,7 @@ class="ectt-1000">\glsxtrfullpl</span><a <span class="ectt-1000">\GLSxtrfullpl</span><a id="dx1-19076"></a>): -</p><!--l. 2112--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2226--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrinlinefullplformat</span><span class="ectt-0900"> </span></span><a id="dx1-19077"></a> <span @@ -4374,14 +4611,14 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 2114--><p class="noindent" > -</p><!--l. 2116--><p class="indent" > Inline plural first letter converted to upper case (used by <span +</p><!--l. 2228--><p class="noindent" > +</p><!--l. 2230--><p class="indent" > Inline plural first letter converted to upper case (used by <span class="ectt-1000">\Glsentryfullpl</span><a id="dx1-19078"></a> and <span class="ectt-1000">\Glsxtrfullpl</span><a id="dx1-19079"></a>): -</p><!--l. 2118--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2232--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsxtrinlinefullplformat</span><span class="ectt-0900"> </span></span><a id="dx1-19080"></a> <span @@ -4391,8 +4628,8 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 2120--><p class="noindent" > -</p><!--l. 2122--><p class="indent" > If you want to provide support for <span +</p><!--l. 2234--><p class="noindent" > +</p><!--l. 2236--><p class="indent" > If you want to provide support for <span class="ecss-1000">glossaries-accsupp</span><a id="dx1-19081"></a> use the following <span @@ -4410,7 +4647,7 @@ class="ecss-1000">glossaries-accsupp</span><a class="ectt-1000">\glsentry</span>⟨<span class="ecti-1000">xxx</span>⟩ command.) -</p><!--l. 2130--><p class="indent" > For example, the <span +</p><!--l. 2244--><p class="indent" > For example, the <span class="ecss-1000">short-long</span><a id="dx1-19083"></a> style has the following in ⟨<span class="ecti-1000">fmts</span>⟩: @@ -4418,7 +4655,7 @@ class="ecti-1000">fmts</span>⟩: </p> - <div class="verbatim" id="verbatim-49"> + <div class="verbatim" id="verbatim-56">   \renewcommand*{\abbrvpluralsuffix}{\glspluralsuffix}%  <br />  \renewcommand*{\glsabbrvfont}[1]{\glsabbrvdefaultfont{##1}}%  <br />  \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}% @@ -4440,17 +4677,17 @@ class="ecti-1000">fmts</span>⟩:  <br />    (\glsfirstlongfont{\glsaccesslongpl{##1}})%  <br />  }% </div> -<!--l. 2153--><p class="nopar" > Since the inline full commands aren’t redefined, they default to the same as the +<!--l. 2267--><p class="nopar" > Since the inline full commands aren’t redefined, they default to the same as the display versions. -</p><!--l. 2157--><p class="indent" > If you want to base a style on an existing style, you can use -</p><!--l. 2158--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2271--><p class="indent" > If you want to base a style on an existing style, you can use +</p><!--l. 2272--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrUseAbbrStyleFmts</span><span class="ectt-0900"> </span></span><a id="dx1-19084"></a> <span class="ectt-1000">\GlsXtrUseAbbrStyleFmts{</span>⟨<span class="ecit-1000">name</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2160--><p class="noindent" > +</p><!--l. 2274--><p class="noindent" > within ⟨<span class="ecti-1000">fmts</span>⟩, where ⟨<span class="ecti-1000">name</span>⟩ is the name of the existing style. For example, the @@ -4462,25 +4699,25 @@ class="ecti-1000">fmts</span>⟩: </p> - <div class="verbatim" id="verbatim-50"> + <div class="verbatim" id="verbatim-57">   \GlsXtrUseAbbrStyleFmts{short-long}%  <br />  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%  <br />  \renewcommand*{\glsabbrvfont}[1]{\glsxtrscfont{##1}}% </div> -<!--l. 2168--><p class="nopar" > and the <span +<!--l. 2282--><p class="nopar" > and the <span class="ecss-1000">short-sm-long</span><a id="dx1-19086"></a> style has: </p> - <div class="verbatim" id="verbatim-51"> + <div class="verbatim" id="verbatim-58">   \GlsXtrUseAbbrStyleFmts{short-long-desc}%  <br />  \renewcommand*{\glsabbrvfont}[1]{\glsxtrsmfont{##1}}%  <br />  \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}% </div> -<!--l. 2174--><p class="nopar" > -</p><!--l. 2176--><p class="indent" > The simplest examples of creating a new style based on an existing style are the +<!--l. 2288--><p class="nopar" > +</p><!--l. 2290--><p class="indent" > The simplest examples of creating a new style based on an existing style are the “em” styles, such as the <span class="ecss-1000">short-em-long</span><a id="dx1-19087"></a> style, which is defined as: @@ -4488,7 +4725,7 @@ class="ecss-1000">short-em-long</span><a </p> - <div class="verbatim" id="verbatim-52"> + <div class="verbatim" id="verbatim-59"> \newabbreviationstyle  <br />{short-em-long}% label  <br />{% setup @@ -4499,16 +4736,16 @@ class="ecss-1000">short-em-long</span><a  <br />  \renewcommand*{\glsabbrvfont}[1]{\emph{##1}}%  <br />} </div> -<!--l. 2189--><p class="nopar" > +<!--l. 2303--><p class="nopar" > </p> -<!--l. 2191--><p class="indent" > </div> -</p><!--l. 2191--><p class="noindent" ><a +<!--l. 2305--><p class="indent" > </div> +</p><!--l. 2305--><p class="noindent" ><a href="#top">Top</a><div class="chapter"><h2 class="chapterHead">3. <a - id="sec:headtitle"></a>Entries in Sectioning Titles, Headers and Contents</h2> -</p><!--l. 2194--><p class="indent" > The <span + id="sec:headtitle"></a>Entries in Sectioning Titles, Headers, Captions and Contents</h2> +</p><!--l. 2308--><p class="indent" > The <span class="ecss-1000">glossaries</span><a id="dx1-20001"></a> user manual cautions against using commands like <span class="ectt-1000">\gls </span>in chapter @@ -4543,7 +4780,9 @@ class="ecss-1000">hyperref</span><a class="ecss-1000">hyperref</span><a id="dx1-20005"></a>, you will end up with nested hyperlinks in the table of contents.</li></ul> -<!--l. 2216--><p class="indent" > To get around all these problems, the <span +<!--l. 2329--><p class="noindent" >Similar problems can also occur with captions (except for the page header and bookmark +issues). +</p><!--l. 2332--><p class="indent" > To get around all these problems, the <span class="ecss-1000">glossaries</span><a id="dx1-20006"></a> user manual recommends using the expandable non-hyperlink commands, like <span @@ -4571,22 +4810,22 @@ this: </p> - <div class="verbatim" id="verbatim-53"> + <div class="verbatim" id="verbatim-60"> \chapter{A Chapter about \glsabbrvfont{\glsentryshort{html}}} </div> -<!--l. 2229--><p class="nopar" > Or, if you are using <span +<!--l. 2345--><p class="nopar" > Or, if you are using <span class="ecss-1000">hyperref</span><a id="dx1-20010"></a>: </p> - <div class="verbatim" id="verbatim-54"> + <div class="verbatim" id="verbatim-61"> \chapter{A Chapter about  <br />\texorpdfstring{\glsabbrvfont{\glsentryshort{html}}}{\glsentryshort{html}}} </div> -<!--l. 2234--><p class="nopar" > -</p><!--l. 2236--><p class="indent" > Since this is a bit cumbersome, you might want to define a new command to do +<!--l. 2350--><p class="nopar" > +</p><!--l. 2352--><p class="indent" > Since this is a bit cumbersome, you might want to define a new command to do this for you. However, if you have mixed styles this won’t work as commands like <span class="ectt-1000">\gls </span>and <span @@ -4600,7 +4839,7 @@ used by the standard page styles that display the chapter or section title in th header using <span class="ectt-1000">\MakeUppercase</span><a id="dx1-20011"></a>. -</p><!--l. 2247--><p class="indent" > The <span +</p><!--l. 2363--><p class="indent" > The <span class="ecss-1000">glossaries-extra </span>package tries to resolve this by modifying <span class="ectt-1000">\markright</span><a id="dx1-20012"></a> and @@ -4608,12 +4847,12 @@ class="ectt-1000">\markright</span><a class="ectt-1000">\markboth</span><a id="dx1-20013"></a>. If you don’t like this change, you can restore their former definitions using -</p><!--l. 2250--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2366--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrRevertMarks</span><span class="ectt-0900"> </span></span><a id="dx1-20014"></a> <span class="ectt-1000">\glsxtrRevertMarks </span></div><hr> -</p><!--l. 2252--><p class="noindent" > +</p><!--l. 2368--><p class="noindent" > In this case, you’ll have to use the <span class="ecss-1000">glossaries</span><a id="dx1-20015"></a> manual’s recommendations of either @@ -4625,17 +4864,17 @@ example: </p> - <div class="verbatim" id="verbatim-55"> + <div class="verbatim" id="verbatim-62"> \chapter[A Chapter about \glsentryshort{html}]{A Chapter about  <br />\gls{html}} </div> -<!--l. 2260--><p class="nopar" > -</p><!--l. 2262--><p class="indent" > If you don’t revert the mark commands back with <span +<!--l. 2376--><p class="nopar" > +</p><!--l. 2378--><p class="indent" > If you don’t revert the mark commands back with <span class="ectt-1000">\glsxtrRevertMarks</span>, you can use the commands described below in the argument of sectioning commands. You can still use them even if the mark commands have been reverted, but only where they don’t conflict with the page style. -</p><!--l. 2268--><p class="indent" > The commands listed below all use <span +</p><!--l. 2384--><p class="indent" > The commands listed below all use <span class="ectt-1000">\texorpdfstring</span><a id="dx1-20016"></a> if <span class="ecss-1000">hyperref</span><a @@ -4644,7 +4883,7 @@ loaded so that the expandable non-formatted version is added to the PDF bookmarks. Note that since the commands that convert the first letter to upper case aren’t expandable, the non-case-changing version is used for the bookmarks. -</p><!--l. 2274--><p class="indent" > These commands essentially behave as though you have used <span +</p><!--l. 2390--><p class="indent" > These commands essentially behave as though you have used <span class="ectt-1000">\glsxtrshort </span>(or equivalent) with the options <span class="ecss-1000">noindex</span><a @@ -4656,7 +4895,7 @@ converted to upper case you need to set the <span class="ecss-1000">headuc</span><a id="dx1-20020"></a> attribute to “true” for the appropriate category. -</p><!--l. 2282--><p class="indent" > <div class="important" title="Important Note"> If you use one of the <span +</p><!--l. 2398--><p class="indent" > <div class="important" title="Important Note"> If you use one of the <span class="ectt-1000">\textsc</span><a id="dx1-20021"></a> styles, be aware that the default fonts don’t provide bold small-caps or italic small-caps. This means that if the chapter @@ -4673,37 +4912,37 @@ class="ectt-1000">\glsabbrvfont</span>. You may want to consider using the <span class="ecss-1000">slantsc</span><a id="dx1-20023"></a> package in this case. </div> -</p><!--l. 2293--><p class="noindent" > -</p><!--l. 2295--><p class="indent" > Display the short form: -</p><!--l. 2296--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2409--><p class="noindent" > +</p><!--l. 2411--><p class="indent" > Display the short form: +</p><!--l. 2412--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsfmtshort</span><span class="ectt-0900"> </span></span><a id="dx1-20024"></a> <span class="ectt-1000">\glsfmtshort{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2298--><p class="noindent" > -</p><!--l. 2300--><p class="indent" > Display the plural short form: -</p><!--l. 2301--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2414--><p class="noindent" > +</p><!--l. 2416--><p class="indent" > Display the plural short form: +</p><!--l. 2417--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsfmtshortpl</span><span class="ectt-0900"> </span></span><a id="dx1-20025"></a> <span class="ectt-1000">\glsfmtshortpl{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2303--><p class="noindent" > -</p><!--l. 2305--><p class="indent" > First letter upper case singular short form: -</p><!--l. 2306--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2419--><p class="noindent" > +</p><!--l. 2421--><p class="indent" > First letter upper case singular short form: +</p><!--l. 2422--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsfmtshort</span><span class="ectt-0900"> </span></span><a id="dx1-20026"></a> <span class="ectt-1000">\Glsfmtshort{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2308--><p class="noindent" > +</p><!--l. 2424--><p class="noindent" > (No case-change applied to PDF bookmarks.) -</p><!--l. 2311--><p class="indent" > First letter upper case plural short form: -</p><!--l. 2312--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2427--><p class="indent" > First letter upper case plural short form: +</p><!--l. 2428--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsfmtshortpl</span><span class="ectt-0900"> </span></span><a id="dx1-20027"></a> <span @@ -4713,95 +4952,178 @@ class="ectt-1000">} </span></div><hr> -</p><!--l. 2314--><p class="noindent" > +</p><!--l. 2430--><p class="noindent" > (No case-change applied to PDF bookmarks.) -</p><!--l. 2317--><p class="indent" > There are also equivalent commands for the value of the <span +</p><!--l. 2433--><p class="indent" > Display the long form: +</p><!--l. 2434--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ectt-0900">\glsfmtlong</span><span +class="ectt-0900"> </span></span><a + id="dx1-20028"></a> <span +class="ectt-1000">\glsfmtlong{</span>⟨<span +class="ecit-1000">label</span>⟩<span +class="ectt-1000">} </span></div><hr> +</p><!--l. 2436--><p class="noindent" > +</p><!--l. 2438--><p class="indent" > Display the plural long form: +</p><!--l. 2439--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ectt-0900">\glsfmtlongpl</span><span +class="ectt-0900"> </span></span><a + id="dx1-20029"></a> <span +class="ectt-1000">\glsfmtlongpl{</span>⟨<span +class="ecit-1000">label</span>⟩<span +class="ectt-1000">} </span></div><hr> +</p><!--l. 2441--><p class="noindent" > +</p><!--l. 2443--><p class="indent" > First letter upper case singular long form: +</p><!--l. 2444--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ectt-0900">\Glsfmtlong</span><span +class="ectt-0900"> </span></span><a + id="dx1-20030"></a> <span +class="ectt-1000">\Glsfmtlong{</span>⟨<span +class="ecit-1000">label</span>⟩<span +class="ectt-1000">} </span></div><hr> +</p><!--l. 2446--><p class="noindent" > +(No case-change applied to PDF bookmarks.) +</p><!--l. 2449--><p class="indent" > First letter upper case plural long form: +</p><!--l. 2450--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ectt-0900">\Glsfmtlongpl</span><span +class="ectt-0900"> </span></span><a + id="dx1-20031"></a> <span +class="ectt-1000">\Glsfmtlongpl{</span>⟨<span +class="ecit-1000">label</span>⟩<span +class="ectt-1000">} </span></div><hr> +</p><!--l. 2452--><p class="noindent" > +(No case-change applied to PDF bookmarks.) +</p><!--l. 2455--><p class="indent" > There are similar commands for the full form, but note that these use the <span +class="ecti-1000">inline</span> +full form, which may be different from the full form used by <span +class="ectt-1000">\gls</span>. +</p><!--l. 2459--><p class="indent" > Display the full form: +</p><!--l. 2460--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ectt-0900">\glsfmtfull</span><span +class="ectt-0900"> </span></span><a + id="dx1-20032"></a> <span +class="ectt-1000">\glsfmtfull{</span>⟨<span +class="ecit-1000">label</span>⟩<span +class="ectt-1000">} </span></div><hr> +</p><!--l. 2462--><p class="noindent" > +</p><!--l. 2464--><p class="indent" > Display the plural full form: +</p><!--l. 2465--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ectt-0900">\glsfmtfullpl</span><span +class="ectt-0900"> </span></span><a + id="dx1-20033"></a> <span +class="ectt-1000">\glsfmtfullpl{</span>⟨<span +class="ecit-1000">label</span>⟩<span +class="ectt-1000">} </span></div><hr> +</p><!--l. 2467--><p class="noindent" > +</p><!--l. 2469--><p class="indent" > First letter upper case singular full form: +</p><!--l. 2470--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ectt-0900">\Glsfmtfull</span><span +class="ectt-0900"> </span></span><a + id="dx1-20034"></a> <span +class="ectt-1000">\Glsfmtfull{</span>⟨<span +class="ecit-1000">label</span>⟩<span +class="ectt-1000">} </span></div><hr> +</p><!--l. 2472--><p class="noindent" > +(No case-change applied to PDF bookmarks.) +</p><!--l. 2475--><p class="indent" > First letter upper case plural full form: +</p><!--l. 2476--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +class="ectt-0900">\Glsfmtfullpl</span><span +class="ectt-0900"> </span></span><a + id="dx1-20035"></a> <span +class="ectt-1000">\Glsfmtfullpl{</span>⟨<span +class="ecit-1000">label</span>⟩<span +class="ectt-1000">} </span></div><hr> +</p><!--l. 2478--><p class="noindent" > +(No case-change applied to PDF bookmarks.) +</p><!--l. 2481--><p class="indent" > There are also equivalent commands for the value of the <span class="ecss-1000">text</span><a - id="dx1-20028"></a> field: -</p><!--l. 2319--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="dx1-20036"></a> field: +</p><!--l. 2483--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsfmttext</span><span class="ectt-0900"> </span></span><a - id="dx1-20029"></a> <span + id="dx1-20037"></a> <span class="ectt-1000">\glsfmttext{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2321--><p class="noindent" > -</p><!--l. 2323--><p class="indent" > First letter converted to upper case: -</p><!--l. 2324--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2485--><p class="noindent" > +</p><!--l. 2487--><p class="indent" > First letter converted to upper case: +</p><!--l. 2488--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsfmttext</span><span class="ectt-0900"> </span></span><a - id="dx1-20030"></a> <span + id="dx1-20038"></a> <span class="ectt-1000">\Glsfmttext{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2326--><p class="noindent" > +</p><!--l. 2490--><p class="noindent" > (No case-change applied to PDF bookmarks.) -</p><!--l. 2329--><p class="indent" > The plural equivalents: -</p><!--l. 2330--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2493--><p class="indent" > The plural equivalents: +</p><!--l. 2494--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsfmtplural</span><span class="ectt-0900"> </span></span><a - id="dx1-20031"></a> <span + id="dx1-20039"></a> <span class="ectt-1000">\glsfmtplural{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2332--><p class="noindent" > + + + +</p><!--l. 2496--><p class="noindent" > and -</p><!--l. 2334--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2498--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsfmtplural</span><span class="ectt-0900"> </span></span><a - id="dx1-20032"></a> <span + id="dx1-20040"></a> <span class="ectt-1000">\Glsfmtplural{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2336--><p class="noindent" > -</p><!--l. 2338--><p class="indent" > Similarly for the value of the <span +</p><!--l. 2500--><p class="noindent" > +</p><!--l. 2502--><p class="indent" > Similarly for the value of the <span class="ecss-1000">first</span><a - id="dx1-20033"></a> field: -</p><!--l. 2340--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + id="dx1-20041"></a> field: +</p><!--l. 2504--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsfmtfirst</span><span class="ectt-0900"> </span></span><a - id="dx1-20034"></a> <span + id="dx1-20042"></a> <span class="ectt-1000">\glsfmtfirst{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2342--><p class="noindent" > -</p><!--l. 2344--><p class="indent" > First letter converted to upper case: -</p><!--l. 2345--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2506--><p class="noindent" > +</p><!--l. 2508--><p class="indent" > First letter converted to upper case: +</p><!--l. 2509--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsfmtfirst</span><span class="ectt-0900"> </span></span><a - id="dx1-20035"></a> <span + id="dx1-20043"></a> <span class="ectt-1000">\Glsfmtfirst{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2347--><p class="noindent" > +</p><!--l. 2511--><p class="noindent" > (No case-change applied to PDF bookmarks.) -</p><!--l. 2350--><p class="indent" > The plural equivalents: -</p><!--l. 2351--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2514--><p class="indent" > The plural equivalents: +</p><!--l. 2515--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsfmtfirstpl</span><span class="ectt-0900"> </span></span><a - id="dx1-20036"></a> <span + id="dx1-20044"></a> <span class="ectt-1000">\glsfmtfirstpl{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2353--><p class="noindent" > +</p><!--l. 2517--><p class="noindent" > and -</p><!--l. 2355--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2519--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsfmtfirstpl</span><span class="ectt-0900"> </span></span><a - id="dx1-20037"></a> <span + id="dx1-20045"></a> <span class="ectt-1000">\Glsfmtfirstpl{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2357--><p class="noindent" > +</p><!--l. 2521--><p class="noindent" > </p> -<!--l. 2359--><p class="indent" > </div> -</p><!--l. 2359--><p class="noindent" ><a +<!--l. 2523--><p class="indent" > </div> +</p><!--l. 2523--><p class="noindent" ><a href="#top">Top</a><div class="chapter"><h2 class="chapterHead">4. <a id="sec:categories"></a>Categories</h2> -</p><!--l. 2362--><p class="indent" > Each entry defined by <span +</p><!--l. 2526--><p class="indent" > Each entry defined by <span class="ectt-1000">\newglossaryentry </span>(or commands that internally use <span class="ectt-1000">\newglossaryentry </span>such as <span @@ -4814,9 +5136,9 @@ within the category label. (So take care if you have <span class="ecss-1000">babel</span><a id="dx1-21002"></a> shorthands on that make some characters active.) -</p><!--l. 2371--><p class="indent" > The use of categories can give you more control over the way entries are displayed +</p><!--l. 2535--><p class="indent" > The use of categories can give you more control over the way entries are displayed in the text or glossary. -</p><!--l. 2374--><p class="indent" > The default category assumed by <span +</p><!--l. 2538--><p class="indent" > The default category assumed by <span class="ectt-1000">\newglossaryentry </span>is labelled <span class="ecss-1000">general</span><a id="dx1-21003"></a>. @@ -4829,7 +5151,7 @@ class="ectt-1000">\newacronym </span>have the category set to <span class="ecss-1000">acronym</span><a id="dx1-21005"></a> by default. -</p><!--l. 2381--><p class="indent" > Additionally, if you have enabled <span +</p><!--l. 2545--><p class="indent" > Additionally, if you have enabled <span class="ectt-1000">\newterm</span><a id="dx1-21006"></a> with the <span class="ecss-1000">index</span><a @@ -4852,20 +5174,20 @@ class="ecss-1000">numbers</span><a option, that command will set the category to <span class="ecss-1000">number</span><a id="dx1-21014"></a>. -</p><!--l. 2389--><p class="indent" > You can obtain the category label for a given entry using -</p><!--l. 2390--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2553--><p class="indent" > You can obtain the category label for a given entry using +</p><!--l. 2554--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glscategory</span><span class="ectt-0900"> </span></span><a id="dx1-21015"></a> <span class="ectt-1000">\glscategory{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2392--><p class="noindent" > +</p><!--l. 2556--><p class="noindent" > This is equivalent to commands like <span class="ectt-1000">\glsentryname </span>and so may be used in an expandable context. No error is generated if the entry doesn’t exist. -</p><!--l. 2397--><p class="indent" > You can test the category for a given entry using -</p><!--l. 2398--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2561--><p class="indent" > You can test the category for a given entry using +</p><!--l. 2562--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsifcategory</span><span class="ectt-0900"> </span></span><a id="dx1-21016"></a> <span @@ -4880,7 +5202,7 @@ class="ecit-1000">part</span>⟩<span class="ectt-1000">}{</span>⟨<span class="ecit-1000">false part</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2401--><p class="noindent" > +</p><!--l. 2565--><p class="noindent" > This is equivalent to </p><div class="alltt"> <div class="obeylines-v"> <span @@ -4902,7 +5224,7 @@ class="ectt-1000">}</span> </div> so any restrictions that apply to <span class="ectt-1000">\ifglsfieldeq </span>also apply to <span class="ectt-1000">\glsifcategory</span>. -<!--l. 2410--><p class="indent" > Each category may have a set of attributes. For example, the <span +<!--l. 2574--><p class="indent" > Each category may have a set of attributes. For example, the <span class="ecss-1000">general</span><a id="dx1-21018"></a> and <span class="ecss-1000">acronym</span><a @@ -4916,7 +5238,7 @@ class="ectt-1000">\glsentryfmt </span>to determine whether to use <span class="ectt-1000">\glsgenentryfmt </span>or <span class="ectt-1000">\glsxtrgenabbrvfmt</span>. -</p><!--l. 2418--><p class="indent" > Other attributes recognised by <span +</p><!--l. 2582--><p class="indent" > Other attributes recognised by <span class="ecss-1000">glossaries-extra </span>are: </p><dl class="description"><dt class="description"> <span @@ -5013,14 +5335,14 @@ class="ectt-1000">\newabbreviation</span> form defaults to the new dotted version of the original ⟨<span class="ecti-1000">short</span>⟩ form with the plural suffix appended. - <!--l. 2466--><p class="noindent" ><div class="important" title="Important Note"> If you explicitly override the short plural using the <span + <!--l. 2630--><p class="noindent" ><div class="important" title="Important Note"> If you explicitly override the short plural using the <span class="ecss-1000">shortplural</span><a id="dx1-21040"></a> key, you must explicitly insert the dots yourself (since there’s no way for the code to determine if the plural has a suffix that shouldn’t be followed by a dot). </div> - </p><!--l. 2472--><p class="noindent" > - </p><!--l. 2474--><p class="noindent" >This attribute is best used with the <span + </p><!--l. 2636--><p class="noindent" > + </p><!--l. 2638--><p class="noindent" >This attribute is best used with the <span class="ecss-1000">discardperiod</span><a id="dx1-21041"></a> attribute set to “true”. </p></dd><dt class="description"> @@ -5100,7 +5422,7 @@ class="ectt-1000">\glsxtrifcounttrigger</span><a class="ectt-1000">\cgls</span><a id="dx1-21059"></a> should behave. - <!--l. 2507--><p class="noindent" >With <span + <!--l. 2671--><p class="noindent" >With <span class="ecss-1000">glossaries</span><a id="dx1-21060"></a>, commands like <span class="ectt-1000">\cgls </span>use <span @@ -5176,8 +5498,8 @@ href="#sec:autoindex">§6 </a><a href="#sec:autoindex">Auto-Indexing<!--tex4ht:ref: sec:autoindex --></a> for further details. </dd></dl> -<!--l. 2541--><p class="indent" > An attribute can be set using: -</p><!--l. 2542--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 2705--><p class="indent" > An attribute can be set using: +</p><!--l. 2706--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glssetcategoryattribute</span><span class="ectt-0900"> </span></span><a id="dx1-21077"></a> <span @@ -5189,16 +5511,16 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">value</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 2544--><p class="noindent" > +</p><!--l. 2708--><p class="noindent" > where ⟨<span class="ecti-1000">category-label</span>⟩ is the category label, ⟨<span class="ecti-1000">attribute-label</span>⟩ is the attribute label and ⟨<span class="ecti-1000">value</span>⟩ is the new value for the attribute. -</p><!--l. 2549--><p class="indent" > There is a shortcut version to set the <span +</p><!--l. 2713--><p class="indent" > There is a shortcut version to set the <span class="ecss-1000">regular</span><a id="dx1-21078"></a> attribute to “true”: -</p><!--l. 2551--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2715--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glssetregularcategory</span><span class="ectt-0900"> </span></span><a id="dx1-21079"></a> <span @@ -5206,10 +5528,10 @@ class="ectt-1000">\glssetregularcategory{</span>⟨<span class="ecit-1000">category-label</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 2553--><p class="noindent" > -</p><!--l. 2555--><p class="indent" > If you need to lookup the category label for a particular entry, you can use the +</p><!--l. 2717--><p class="noindent" > +</p><!--l. 2719--><p class="indent" > If you need to lookup the category label for a particular entry, you can use the shortcut command: -</p><!--l. 2557--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2721--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glssetattribute</span><span class="ectt-0900"> </span></span><a id="dx1-21080"></a> <span @@ -5221,13 +5543,13 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">value</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 2559--><p class="noindent" > +</p><!--l. 2723--><p class="noindent" > This uses <span class="ectt-1000">\glssetcategoryattribute </span>with <span class="ectt-1000">\glscategory </span>to set the attribute. Note that this will affect all other entries that share this entry’s category. -</p><!--l. 2564--><p class="indent" > You can fetch the value of an attribute for a particular category using: -</p><!--l. 2566--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2728--><p class="indent" > You can fetch the value of an attribute for a particular category using: +</p><!--l. 2730--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsgetcategoryattribute</span><span class="ectt-0900"> </span></span><a id="dx1-21081"></a> <span @@ -5237,10 +5559,10 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">attribute-label</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 2568--><p class="noindent" > +</p><!--l. 2732--><p class="noindent" > Again there is a shortcut if you need to lookup the category label for a given entry: -</p><!--l. 2571--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2735--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsgetattribute</span><span class="ectt-0900"> </span></span><a id="dx1-21082"></a> <span @@ -5250,9 +5572,9 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">attribute-label</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 2573--><p class="noindent" > -</p><!--l. 2575--><p class="indent" > You can test if an attribute has been assigned to a given category using: -</p><!--l. 2577--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2737--><p class="noindent" > +</p><!--l. 2739--><p class="indent" > You can test if an attribute has been assigned to a given category using: +</p><!--l. 2741--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glshascategoryattribute</span><span class="ectt-0900"> </span></span><a id="dx1-21083"></a> <span @@ -5267,7 +5589,7 @@ class="ecit-1000">code</span>⟩<span class="ectt-1000">}{</span>⟨<span class="ecit-1000">false code</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2580--><p class="noindent" > +</p><!--l. 2744--><p class="noindent" > This uses <span class="ecss-1000">etoolbox</span><a id="dx1-21084"></a>’s <span @@ -5276,7 +5598,7 @@ class="ecti-1000">true code</span>⟩ if the attribute has been set and isn’t blank and isn’t <span class="ectt-1000">\relax</span>. The shortcut if you need to lookup the category label from an entry is: -</p><!--l. 2585--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2749--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glshasattribute</span><span class="ectt-0900"> </span></span><a id="dx1-21085"></a> <span @@ -5294,9 +5616,9 @@ class="ectt-1000">} </span></div><hr> -</p><!--l. 2588--><p class="noindent" > -</p><!--l. 2590--><p class="indent" > You can test the value of an attribute for a particular category using: -</p><!--l. 2592--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2752--><p class="noindent" > +</p><!--l. 2754--><p class="indent" > You can test the value of an attribute for a particular category using: +</p><!--l. 2756--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsifcategoryattribute</span><span class="ectt-0900"> </span></span><a id="dx1-21086"></a> <span @@ -5313,7 +5635,7 @@ class="ecit-1000">true-part</span>⟩<span class="ectt-1000">}{</span>⟨<span class="ecit-1000">false-part</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2594--><p class="noindent" > +</p><!--l. 2758--><p class="noindent" > This tests if the attribute (given by ⟨<span class="ecti-1000">attribute-label</span>⟩) for the category (given by ⟨<span @@ -5323,30 +5645,30 @@ class="ecti-1000">true-part</span>⟩ is done. If the attribute isn’t set or is set but isn’t equal to ⟨<span class="ecti-1000">value</span>⟩, ⟨<span class="ecti-1000">false part</span>⟩ is done. -</p><!--l. 2601--><p class="indent" > For example: +</p><!--l. 2765--><p class="indent" > For example: </p> - <div class="verbatim" id="verbatim-56"> + <div class="verbatim" id="verbatim-63"> \glsifcategoryattribute{general}{nohyper}{true}{NO HYPER}{HYPER} </div> -<!--l. 2604--><p class="nopar" > This does “NO HYPER” if the <span +<!--l. 2768--><p class="nopar" > This does “NO HYPER” if the <span class="ecss-1000">general</span><a id="dx1-21087"></a> category has the <span class="ecss-1000">nohyper</span><a id="dx1-21088"></a> attribute set to <span class="ectt-1000">true</span> otherwise if does “HYPER”. -</p><!--l. 2609--><p class="indent" > With boolean-style attributes like <span +</p><!--l. 2773--><p class="indent" > With boolean-style attributes like <span class="ecss-1000">nohyper</span><a id="dx1-21089"></a>, make sure you always test for <span class="ectt-1000">true</span> not <span class="ectt-1000">false </span>in case the attribute hasn’t been set. -</p><!--l. 2612--><p class="indent" > Again there’s a shortcut if you need to lookup the category label from a particular +</p><!--l. 2776--><p class="indent" > Again there’s a shortcut if you need to lookup the category label from a particular entry: -</p><!--l. 2614--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2778--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsifattribute</span><span class="ectt-0900"> </span></span><a id="dx1-21090"></a> <span @@ -5363,12 +5685,12 @@ class="ectt-1000">}</span> class="ectt-1000">{</span>⟨<span class="ecit-1000">false-part</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2616--><p class="noindent" > -</p><!--l. 2618--><p class="indent" > There’s also a shortcut to determine if a particular category has the <span +</p><!--l. 2780--><p class="noindent" > +</p><!--l. 2782--><p class="indent" > There’s also a shortcut to determine if a particular category has the <span class="ecss-1000">regular</span><a id="dx1-21091"></a> attribute set: -</p><!--l. 2620--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2784--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsifregularcategory</span><span class="ectt-0900"> </span></span><a id="dx1-21092"></a> <span @@ -5380,9 +5702,9 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">false-part</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 2622--><p class="noindent" > +</p><!--l. 2786--><p class="noindent" > Alternatively, if you need to lookup the category for a particular entry: -</p><!--l. 2625--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2789--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsifregular</span><span class="ectt-0900"> </span></span><a id="dx1-21093"></a> <span @@ -5394,9 +5716,9 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">false-part</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 2627--><p class="noindent" > -</p><!--l. 2629--><p class="indent" > You can iterate through all entries with a given category using: -</p><!--l. 2631--><p class="indent" > <hr><div title="Definition"><span +</p><!--l. 2791--><p class="noindent" > +</p><!--l. 2793--><p class="indent" > You can iterate through all entries with a given category using: +</p><!--l. 2795--><p class="indent" > <hr><div title="Definition"><span class="ectt-1000">\glsforeachincategory[</span>⟨<span class="ecit-1000">glossary-labels</span>⟩<span class="ectt-1000">]{</span>⟨<span @@ -5410,7 +5732,7 @@ class="ecit-1000">label-cs</span>⟩<span class="ectt-1000">}{</span>⟨<span class="ecit-1000">body</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2632--><p class="noindent" > +</p><!--l. 2796--><p class="noindent" > This iterates through all entries in the glossaries identified by the comma-separated list ⟨<span class="ecti-1000">glossary-labels</span>⟩ that have the category given by ⟨<span @@ -5423,9 +5745,9 @@ class="ecti-1000">label-cs</span>⟩ (which much be control sequences) to access the current glossary and entry label. If ⟨<span class="ecti-1000">glossary-labels</span>⟩ is omitted, all glossaries are assumed. -</p><!--l. 2642--><p class="indent" > Similarly, you can iterate through all entries that have a category with a given +</p><!--l. 2806--><p class="indent" > Similarly, you can iterate through all entries that have a category with a given attribute using: -</p><!--l. 2644--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2808--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsforeachwithattribute</span><span class="ectt-0900"> </span></span><a id="dx1-21094"></a> <span @@ -5444,13 +5766,13 @@ class="ecit-1000">label-cs</span>⟩<span class="ectt-1000">}{</span>⟨<span class="ecit-1000">body</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2646--><p class="noindent" > +</p><!--l. 2810--><p class="noindent" > This will do ⟨<span class="ecti-1000">body</span>⟩ for each entry that has a category with the attribute ⟨<span class="ecti-1000">attribute-label</span>⟩ set to ⟨<span class="ecti-1000">attribute-value</span>⟩. The remaining arguments are as the previous command. -</p><!--l. 2651--><p class="indent" > You can change the category for a particular entry using the standard glossary +</p><!--l. 2815--><p class="indent" > You can change the category for a particular entry using the standard glossary field changing commands, such as <span class="ectt-1000">\glsfielddef</span><a id="dx1-21095"></a>. Alternatively, you can @@ -5458,7 +5780,7 @@ use -</p><!--l. 2654--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2818--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrsetcategory</span><span class="ectt-0900"> </span></span><a id="dx1-21096"></a> <span @@ -5468,7 +5790,7 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">category-label</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 2656--><p class="noindent" > +</p><!--l. 2820--><p class="noindent" > This will change the category to ⟨<span class="ecti-1000">category-label</span>⟩ for each entry listed in the comma-separated list ⟨<span @@ -5477,9 +5799,9 @@ class="ectt-1000">\glsfieldxdef</span><a id="dx1-21097"></a> so it will expand ⟨<span class="ecti-1000">category-label</span>⟩ and make the change global. -</p><!--l. 2662--><p class="indent" > You can also change the category for all entries with a glossary or glossaries +</p><!--l. 2826--><p class="indent" > You can also change the category for all entries with a glossary or glossaries using: -</p><!--l. 2664--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2828--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrsetcategoryforall</span><span class="ectt-0900"> </span></span><a id="dx1-21098"></a> <span @@ -5489,18 +5811,18 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">category-label</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 2666--><p class="noindent" > +</p><!--l. 2830--><p class="noindent" > where ⟨<span class="ecti-1000">glossary-labels</span>⟩ is a comma-separated list of glossary labels. </p> -<!--l. 2670--><p class="indent" > </div> -</p><!--l. 2670--><p class="noindent" ><a +<!--l. 2834--><p class="indent" > </div> +</p><!--l. 2834--><p class="noindent" ><a href="#top">Top</a><div class="chapter"><h2 class="chapterHead">5. <a id="sec:entrycount"></a>Entry Counting</h2> -</p><!--l. 2673--><p class="indent" > As mentioned in <a +</p><!--l. 2837--><p class="indent" > As mentioned in <a href="#sec:entrycountmods">§1.3.3 </a><a href="#sec:entrycountmods">Entry Counting Modifications<!--tex4ht:ref: sec:entrycountmods --></a>, <span class="ecss-1000">glossaries-extra</span> @@ -5516,7 +5838,7 @@ class="ectt-1000">\glsenableentrycount</span><a href="#sec:categories">§4 </a><a href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a>). -</p><!--l. 2680--><p class="indent" > You may now use <span +</p><!--l. 2844--><p class="indent" > You may now use <span class="ectt-1000">\cgls</span><a id="dx1-22004"></a> instead of <span class="ectt-1000">\gls</span><a @@ -5542,10 +5864,10 @@ class="ectt-1000">\ac</span><a id="dx1-22010"></a> which uses <span class="ectt-1000">\gls</span>. -</p><!--l. 2690--><p class="indent" > All upper case versions (not provided by <span +</p><!--l. 2854--><p class="indent" > All upper case versions (not provided by <span class="ecss-1000">glossaries</span><a id="dx1-22011"></a>) are also available: -</p><!--l. 2692--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2856--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\cGLS</span><span class="ectt-0900"> </span></span><a id="dx1-22012"></a> <span @@ -5556,9 +5878,9 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 2694--><p class="noindent" > +</p><!--l. 2858--><p class="noindent" > and -</p><!--l. 2696--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2860--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\cGLSpl</span><span class="ectt-0900"> </span></span><a id="dx1-22013"></a> <span @@ -5569,11 +5891,11 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}[</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">] </span></div><hr> -</p><!--l. 2698--><p class="noindent" > +</p><!--l. 2862--><p class="noindent" > These are analogous to <span class="ectt-1000">\cgls </span>and <span class="ectt-1000">\cglspl </span>but they use -</p><!--l. 2701--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2865--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\cGLSformat</span><span class="ectt-0900"> </span></span><a id="dx1-22014"></a> <span @@ -5582,9 +5904,9 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}{</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2703--><p class="noindent" > +</p><!--l. 2867--><p class="noindent" > and -</p><!--l. 2705--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2869--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\cGLSplformat</span><span class="ectt-0900"> </span></span><a id="dx1-22015"></a> <span @@ -5593,23 +5915,23 @@ class="ecit-1000">label</span>⟩<span class="ectt-1000">}{</span>⟨<span class="ecit-1000">insert</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2707--><p class="noindent" > +</p><!--l. 2871--><p class="noindent" > which convert the analogous <span class="ectt-1000">\cglsformat </span>and <span class="ectt-1000">\cglsplformat </span>to upper case. -</p><!--l. 2711--><p class="indent" > [TODO: work out what to do about other commands such as <span class="obeylines-h"><span class="verb"><span +</p><!--l. 2875--><p class="indent" > [TODO: work out what to do about other commands such as <span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsdisp</span></span></span> and <span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glstext</span></span></span>.] -</p><!--l. 2714--><p class="indent" > Just using <span +</p><!--l. 2878--><p class="indent" > Just using <span class="ecss-1000">glossaries</span><a id="dx1-22016"></a>: </p> - <div class="verbatim" id="verbatim-57"> + <div class="verbatim" id="verbatim-64"> \documentclass{article}  <br />\usepackage{glossaries}  <br />\makeglossaries @@ -5622,8 +5944,8 @@ class="ecss-1000">glossaries</span><a  <br />\printglossaries  <br />\end{document} </div> -<!--l. 2736--><p class="nopar" > -</p><!--l. 2738--><p class="indent" > If you switch to <span +<!--l. 2900--><p class="nopar" > +</p><!--l. 2902--><p class="indent" > If you switch to <span class="ecss-1000">glossaries-extra </span>you must set the <span class="ecss-1000">entrycount</span><a id="dx1-22017"></a> attribute: @@ -5631,7 +5953,7 @@ class="ecss-1000">entrycount</span><a </p> - <div class="verbatim" id="verbatim-58"> + <div class="verbatim" id="verbatim-65"> \documentclass{article}  <br />\usepackage{glossaries-extra}  <br />\makeglossaries @@ -5645,13 +5967,13 @@ class="ecss-1000">entrycount</span><a  <br />\printglossaries  <br />\end{document} </div> -<!--l. 2763--><p class="nopar" > -</p><!--l. 2765--><p class="indent" > When activated with <span +<!--l. 2927--><p class="nopar" > +</p><!--l. 2929--><p class="indent" > When activated with <span class="ectt-1000">\glsenableentrycount</span>, commands such as <span class="ectt-1000">\cgls</span><a id="dx1-22018"></a> now use -</p><!--l. 2767--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2931--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrifcounttrigger</span><span class="ectt-0900"> </span></span><a id="dx1-22019"></a> <span @@ -5664,7 +5986,7 @@ class="ecit-1000">normal</span> <span class="ecit-1000">code</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2770--><p class="noindent" > +</p><!--l. 2934--><p class="noindent" > to determine if the entry trips the entry count trigger. The ⟨<span class="ecti-1000">trigger code</span>⟩ uses commands like <span @@ -5680,12 +6002,12 @@ class="ecti-1000">trigger code</span>⟩ but the usual <span class="ectt-1000">\gls </span>behaviour in ⟨<span class="ecti-1000">normal code</span>⟩). -</p><!--l. 2779--><p class="indent" > The default definition is: +</p><!--l. 2943--><p class="indent" > The default definition is: </p> - <div class="verbatim" id="verbatim-59"> + <div class="verbatim" id="verbatim-66"> \newcommand*{\glsxtrifcounttrigger}[3]{%  <br /> \glshasattribute{#1}{entrycount}%  <br /> {% @@ -5698,24 +6020,24 @@ class="ecti-1000">normal code</span>⟩).  <br /> {#3}%  <br />} </div> -<!--l. 2792--><p class="nopar" > This means that if an entry is assigned to a category that has the <span +<!--l. 2956--><p class="nopar" > This means that if an entry is assigned to a category that has the <span class="ecss-1000">entrycount</span><a id="dx1-22021"></a> attribute then the ⟨<span class="ecti-1000">trigger code</span>⟩ will be used if the previous count value (the number of times the entry was used on the last run) is greater than the value of the attribute. -</p><!--l. 2799--><p class="indent" > For example, to trigger normal use if the previous count value is greater than +</p><!--l. 2963--><p class="indent" > For example, to trigger normal use if the previous count value is greater than four: </p> - <div class="verbatim" id="verbatim-60"> + <div class="verbatim" id="verbatim-67"> \glssetcategoryattribute{abbreviation}{entrycount}{4} </div> -<!--l. 2803--><p class="nopar" > -</p><!--l. 2805--><p class="indent" > There is a convenient command provided to enable entry counting, set the +<!--l. 2967--><p class="nopar" > +</p><!--l. 2969--><p class="indent" > There is a convenient command provided to enable entry counting, set the <span class="ecss-1000">entrycount</span><a id="dx1-22022"></a> attribute and redefine <span @@ -5723,7 +6045,7 @@ class="ectt-1000">\gls</span><a id="dx1-22023"></a>, etc to use <span class="ectt-1000">\cgls</span><a id="dx1-22024"></a> etc: -</p><!--l. 2808--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2972--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrEnableEntryCounting</span><span class="ectt-0900"> </span></span><a id="dx1-22025"></a> <span @@ -5733,7 +6055,7 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">value</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 2810--><p class="noindent" > +</p><!--l. 2974--><p class="noindent" > The first argument ⟨<span class="ecti-1000">categories</span>⟩ is a comma-separated list of categories. For each category, the <span @@ -5744,7 +6066,7 @@ class="ecti-1000">value</span>⟩. In addition, this does: </p> - <div class="verbatim" id="verbatim-61"> + <div class="verbatim" id="verbatim-68"> \renewcommand*{\gls}{\cgls}%  <br />\renewcommand*{\Gls}{\cGls}%  <br />\renewcommand*{\glspl}{\cglspl}% @@ -5752,18 +6074,18 @@ class="ecti-1000">value</span>⟩. In addition, this does:  <br />\renewcommand*{\GLS}{\cGLS}%  <br />\renewcommand*{\GLSpl}{\cGLSpl}% </div> -<!--l. 2821--><p class="nopar" > This makes it easier to enable entry-counting on existing documents. -</p><!--l. 2825--><p class="indent" > If you use <span +<!--l. 2985--><p class="nopar" > This makes it easier to enable entry-counting on existing documents. +</p><!--l. 2989--><p class="indent" > If you use <span class="ectt-1000">\GlsXtrEnableEntryCounting </span>more than once, subsequent uses will just set the <span class="ecss-1000">entrycount</span><a id="dx1-22027"></a> attribute for each listed category. -</p><!--l. 2829--><p class="indent" > The above example document can then become: +</p><!--l. 2993--><p class="indent" > The above example document can then become: </p> - <div class="verbatim" id="verbatim-62"> + <div class="verbatim" id="verbatim-69"> \documentclass{article}  <br />\usepackage{glossaries-extra}  <br />\makeglossaries @@ -5776,12 +6098,12 @@ class="ecss-1000">entrycount</span><a  <br />\printglossaries  <br />\end{document} </div> -<!--l. 2851--><p class="nopar" > -</p><!--l. 2853--><p class="indent" > The standard entry-counting function describe above counts the number of times +<!--l. 3015--><p class="nopar" > +</p><!--l. 3017--><p class="indent" > The standard entry-counting function describe above counts the number of times an entry has been marked as used throughout the document. (The reset commands will reset the total back to zero.) If you prefer to count per sectional-unit, you can use -</p><!--l. 2858--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3022--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrEnableEntryUnitCounting</span><span class="ectt-0900"> </span></span><a id="dx1-22028"></a> <span @@ -5793,22 +6115,22 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">counter-name</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 2860--><p class="noindent" > +</p><!--l. 3024--><p class="noindent" > where ⟨<span class="ecti-1000">categories</span>⟩ is a comma-separated list of categories to which this feature should be applied, ⟨<span class="ecti-1000">value</span>⟩ is the trigger value and ⟨<span class="ecti-1000">counter-name</span>⟩ is the name of the counter used by the sectional unit. -</p><!--l. 2866--><p class="indent" > <div class="important" title="Important Note"> Due to the asynchronous nature of <span class="TEX">T<span +</p><!--l. 3030--><p class="indent" > <div class="important" title="Important Note"> Due to the asynchronous nature of <span class="TEX">T<span class="E">E</span>X</span>’s output routine, discrepancies will occur in page spanning paragraphs if you use the <span class="ecss-1000">page</span><a id="dx1-22029"></a> counter. </div> -</p><!--l. 2870--><p class="noindent" > -</p><!--l. 2872--><p class="indent" > Note that you can’t use both the document-wide counting and the per-unit +</p><!--l. 3034--><p class="noindent" > +</p><!--l. 3036--><p class="indent" > Note that you can’t use both the document-wide counting and the per-unit counting in the same document. -</p><!--l. 2875--><p class="indent" > The counter value is used as part of a label, which means that <span +</p><!--l. 3039--><p class="indent" > The counter value is used as part of a label, which means that <span class="ectt-1000">\the</span>⟨<span class="ecti-1000">counter-name</span>⟩ needs to be expandable. Since <span @@ -5823,7 +6145,7 @@ class="ectt-1000">\theH</span>⟨<span class="ecti-1000">counter-name</span>⟩ if it exists otherwise it will use <span class="ectt-1000">\the</span>⟨<span class="ecti-1000">counter-name</span>⟩. -</p><!--l. 2882--><p class="indent" > The per-unit counting function uses two attributes: <span +</p><!--l. 3046--><p class="indent" > The per-unit counting function uses two attributes: <span class="ecss-1000">entrycount</span><a id="dx1-22031"></a> (as before) and <span @@ -5832,58 +6154,58 @@ class="ecss-1000">unitcount</span><a -</p><!--l. 2885--><p class="indent" > Both the original document-wide counting mechanism and the per-unit counting +</p><!--l. 3049--><p class="indent" > Both the original document-wide counting mechanism and the per-unit counting mechanism provide a command that can be used to access the current count value for this run: -</p><!--l. 2888--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3052--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsentrycurrcount</span><span class="ectt-0900"> </span></span><a id="dx1-22033"></a> <span class="ectt-1000">\glsentrycurrcount{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2890--><p class="noindent" > +</p><!--l. 3054--><p class="noindent" > and the final value from the previous run: -</p><!--l. 2892--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3056--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsentryprevcount</span><span class="ectt-0900"> </span></span><a id="dx1-22034"></a> <span class="ectt-1000">\glsentryprevcount{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2894--><p class="noindent" > +</p><!--l. 3058--><p class="noindent" > In the case of the per-unit counting, this is the final value <span class="ecti-1000">for the current unit</span>. In both commands ⟨<span class="ecti-1000">label</span>⟩ is the entry’s label. -</p><!--l. 2899--><p class="indent" > The per-unit counting mechanism additionally provides: -</p><!--l. 2900--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3063--><p class="indent" > The per-unit counting mechanism additionally provides: +</p><!--l. 3064--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsentryprevtotalcount</span><span class="ectt-0900"> </span></span><a id="dx1-22035"></a> <span class="ectt-1000">\glsentryprevtotalcount{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2902--><p class="noindent" > +</p><!--l. 3066--><p class="noindent" > which gives the sum of all the per-unit totals from the previous run for the entry given by ⟨<span class="ecti-1000">label</span>⟩, and -</p><!--l. 2905--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3069--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsentryprevmaxcount</span><span class="ectt-0900"> </span></span><a id="dx1-22036"></a> <span class="ectt-1000">\glsentryprevmaxcount{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 2907--><p class="noindent" > +</p><!--l. 3071--><p class="noindent" > which gives the maximum per-unit total from the previous run. -</p><!--l. 2910--><p class="indent" > The above two commands are unavailable for the document-wide counting. -</p><!--l. 2912--><p class="indent" > Example of per-unit counting, where the unit is the chapter: +</p><!--l. 3074--><p class="indent" > The above two commands are unavailable for the document-wide counting. +</p><!--l. 3076--><p class="indent" > Example of per-unit counting, where the unit is the chapter: </p> - <div class="verbatim" id="verbatim-63"> + <div class="verbatim" id="verbatim-70"> \documentclass{report}  <br />\usepackage{glossaries-extra}  <br />\GlsXtrEnableEntryUnitCounting{abbreviation}{2}{chapter} @@ -5902,7 +6224,7 @@ which gives the maximum per-unit total from the previous run.  <br />\printglossaries  <br />\end{document} </div> -<!--l. 2943--><p class="nopar" > In this document, the <span +<!--l. 3107--><p class="nopar" > In this document, the <span class="ectt-1000">css </span>entry is used three times in the first chapter. This is more than the trigger value of 2, so <span class="obeylines-h"><span class="verb"><span class="ectt-1000">\gls{css}</span></span></span> is expanded on <a @@ -5916,19 +6238,19 @@ only used once, which trips the suppression trigger, so in that chapter, the long form is used and <span class="obeylines-h"><span class="verb"><span class="ectt-1000">\gls{css}</span></span></span> doesn’t get a line added to the glossary file. -</p><!--l. 2954--><p class="indent" > The <span +</p><!--l. 3118--><p class="indent" > The <span class="ectt-1000">html </span>is used a total of three times, but the expansion and indexing suppression trigger is tripped in both chapters because the per-unit total (1 for the first chapter and 2 for the second chapter) is less than or equal to the trigger value. -</p><!--l. 2960--><p class="indent" > The <span +</p><!--l. 3124--><p class="indent" > The <span class="ectt-1000">sample </span>entry has only been used once, but it doesn’t trip the indexing suppression because it’s in the <span class="ecss-1000">general</span><a id="dx1-22038"></a> category, which hasn’t been listed in <span class="ectt-1000">\GlsXtrEnableEntryUnitCounting</span>. -</p><!--l. 2965--><p class="indent" > The per-unit entry counting can be used for other purposes. In the following +</p><!--l. 3129--><p class="indent" > The per-unit entry counting can be used for other purposes. In the following @@ -5937,19 +6259,19 @@ won’t be triggered, but the unit entry count is used to automatically supp hyperlink for commands like <span class="ectt-1000">\gls</span><a id="dx1-22039"></a> by modifying the hook -</p><!--l. 2971--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3135--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glslinkcheckfirsthyperhook</span><span class="ectt-0900"> </span></span><a id="dx1-22040"></a> <span class="ectt-1000">\glslinkcheckfirsthyperhook </span></div><hr> -</p><!--l. 2973--><p class="noindent" > +</p><!--l. 3137--><p class="noindent" > which is used at the end of the macro the determines whether or not to suppress the hyperlink. </p> - <div class="verbatim" id="verbatim-64"> + <div class="verbatim" id="verbatim-71"> \documentclass{article}  <br />\usepackage[colorlinks]{hyperref}  <br />\usepackage{glossaries-extra} @@ -5970,10 +6292,10 @@ hyperlink.  <br />\printglossaries  <br />\end{document} </div> -<!--l. 3008--><p class="nopar" > This only produces a hyperlink for the first instance of <span class="obeylines-h"><span class="verb"><span +<!--l. 3172--><p class="nopar" > This only produces a hyperlink for the first instance of <span class="obeylines-h"><span class="verb"><span class="ectt-1000">\gls{sample}</span></span></span> on each page. -</p><!--l. 3012--><p class="indent" > The earlier warning about using the <span +</p><!--l. 3176--><p class="indent" > The earlier warning about using the <span class="ecss-1000">page</span><a id="dx1-22041"></a> counter still applies. If the first instance of <span @@ -5984,11 +6306,11 @@ page. </p> -<!--l. 3017--><p class="indent" > </div> -</p><!--l. 3017--><p class="noindent" ><a +<!--l. 3181--><p class="indent" > </div> +</p><!--l. 3181--><p class="noindent" ><a href="#top">Top</a><div class="chapter"><h2 class="chapterHead">6. <a id="sec:autoindex"></a>Auto-Indexing</h2> -</p><!--l. 3020--><p class="indent" > It’s possible that you may also want a normal index as well as the glossary, +</p><!--l. 3184--><p class="indent" > It’s possible that you may also want a normal index as well as the glossary, and you may want entries to automatically be added to the index (as in this document). There are two attributes that govern this: <span class="ecss-1000">indexname</span><a @@ -5996,7 +6318,7 @@ class="ecss-1000">indexname</span><a <span class="ecss-1000">dualindex</span><a id="dx1-23002"></a>. -</p><!--l. 3026--><p class="indent" > The <span +</p><!--l. 3190--><p class="indent" > The <span class="ectt-1000">\glsxtrpostnamehook</span><a id="dx1-23003"></a> macro, used at the end of <span class="ectt-1000">\glossentryname</span><a @@ -6013,14 +6335,14 @@ location in the glossary without fiddling around with the value of the <span class="ecss-1000">name</span><a id="dx1-23007"></a> key. -</p><!--l. 3035--><p class="indent" > The internal macro used by the <span +</p><!--l. 3199--><p class="indent" > The internal macro used by the <span class="ecss-1000">glossaries</span><a id="dx1-23008"></a> package to write the information to the external glossary file is modified to check for the <span class="ecss-1000">dualindex</span><a id="dx1-23009"></a> attribute. -</p><!--l. 3039--><p class="indent" > In both cases, the indexing is done through -</p><!--l. 3040--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3203--><p class="indent" > In both cases, the indexing is done through +</p><!--l. 3204--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrdoautoindexname</span><span class="ectt-0900"> </span></span><a id="dx1-23010"></a> <span @@ -6030,7 +6352,7 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">attribute-label</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 3042--><p class="noindent" > +</p><!--l. 3206--><p class="noindent" > This uses the standard <span class="ectt-1000">\index</span><a id="dx1-23011"></a> command with the sort value taken from the entry’s @@ -6047,26 +6369,26 @@ encap will be the attribute value. For example: </p> - <div class="verbatim" id="verbatim-65"> + <div class="verbatim" id="verbatim-72"> \glssetcategoryattribute{general}{indexname}{textbf} </div> -<!--l. 3051--><p class="nopar" > will set the encap to <span +<!--l. 3215--><p class="nopar" > will set the encap to <span class="ectt-1000">textbf </span>which will display the relevant page number in bold whereas </p> - <div class="verbatim" id="verbatim-66"> + <div class="verbatim" id="verbatim-73"> \glssetcategoryattribute{general}{dualindex}{true} </div> -<!--l. 3056--><p class="nopar" > won’t apply any formatting to the page number in the index. -</p><!--l. 3059--><p class="indent" > <div class="important" title="Important Note"> The location used in the index will always be the page number not the counter +<!--l. 3220--><p class="nopar" > won’t apply any formatting to the page number in the index. +</p><!--l. 3223--><p class="indent" > <div class="important" title="Important Note"> The location used in the index will always be the page number not the counter used in the glossary. (Unless some other loaded package has modified the definition of <span class="ectt-1000">\index </span>to use some thing else.) </div> -</p><!--l. 3064--><p class="noindent" > -</p><!--l. 3066--><p class="indent" > By default the <span +</p><!--l. 3228--><p class="noindent" > +</p><!--l. 3230--><p class="indent" > By default the <span class="ecss-1000">format</span><a id="dx1-23013"></a> key won’t be used with the <span class="ecss-1000">dualindex</span><a @@ -6075,13 +6397,13 @@ allow the <span class="ecss-1000">format</span><a id="dx1-23015"></a> key to override the attribute value by using the preamble-only command: -</p><!--l. 3070--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3234--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrEnableIndexFormatOverride</span><span class="ectt-0900"> </span></span><a id="dx1-23016"></a> <span class="ectt-1000">\GlsXtrEnableIndexFormatOverride</span> </div><hr> -</p><!--l. 3072--><p class="noindent" > +</p><!--l. 3236--><p class="noindent" > If you use this command and <span class="ecss-1000">hyperref</span><a id="dx1-23017"></a> has been loaded, then the <span @@ -6092,7 +6414,7 @@ will be modified to redefine <span class="ectt-1000">\glshypernumber</span><a id="dx1-23020"></a> to allow formats that use that command. -</p><!--l. 3077--><p class="indent" > <div class="important" title="Important Note"> The <span +</p><!--l. 3241--><p class="indent" > <div class="important" title="Important Note"> The <span class="ecss-1000">dualindex</span><a id="dx1-23021"></a> attribute will still be used on subsequent use even if the <span @@ -6105,8 +6427,8 @@ class="ecss-1000">dualindex</span><a attribute will honour the <span class="ecss-1000">noindex</span><a id="dx1-23025"></a> key. </div> -</p><!--l. 3083--><p class="noindent" > -</p><!--l. 3085--><p class="indent" > The <span +</p><!--l. 3247--><p class="noindent" > +</p><!--l. 3249--><p class="indent" > The <span class="ectt-1000">\glsxtrdoautoindexname </span>command will attempt to escape any of <span class="ectt-1000">\makeindex</span><a @@ -6126,41 +6448,41 @@ class="ectt-1000">\encapchar</span><a id="dx1-23031"></a> have been defined before <span class="ecss-1000">glossaries-extra </span>is loaded). -</p><!--l. 3093--><p class="indent" > If this isn’t the case, you can use the following preamble-only commands to set +</p><!--l. 3257--><p class="indent" > If this isn’t the case, you can use the following preamble-only commands to set the correct characters. -</p><!--l. 3095--><p class="indent" > <div class="important" title="Important Note"> Be very careful of possible shifting category codes! </div> -</p><!--l. 3097--><p class="noindent" > -</p><!--l. 3099--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3259--><p class="indent" > <div class="important" title="Important Note"> Be very careful of possible shifting category codes! </div> +</p><!--l. 3261--><p class="noindent" > +</p><!--l. 3263--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrSetActualChar</span><span class="ectt-0900"> </span></span><a id="dx1-23032"></a> <span class="ectt-1000">\GlsXtrSetActualChar{</span>⟨<span class="ecit-1000">char</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3101--><p class="noindent" > +</p><!--l. 3265--><p class="noindent" > Set the actual character to ⟨<span class="ecti-1000">char</span>⟩. -</p><!--l. 3104--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3268--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrSetLevelChar</span><span class="ectt-0900"> </span></span><a id="dx1-23033"></a> <span class="ectt-1000">\GlsXtrSetLevelChar{</span>⟨<span class="ecit-1000">char</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3106--><p class="noindent" > +</p><!--l. 3270--><p class="noindent" > Set the level character to ⟨<span class="ecti-1000">char</span>⟩. -</p><!--l. 3109--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3273--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrSetEscChar</span><span class="ectt-0900"> </span></span><a id="dx1-23034"></a> <span class="ectt-1000">\GlsXtrSetEscChar{</span>⟨<span class="ecit-1000">char</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3111--><p class="noindent" > +</p><!--l. 3275--><p class="noindent" > Set the escape (quote) character to ⟨<span class="ecti-1000">char</span>⟩. -</p><!--l. 3114--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3278--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrSetEncapChar</span><span class="ectt-0900"> </span></span><a id="dx1-23035"></a> <span @@ -6170,18 +6492,18 @@ class="ectt-1000">} </span></div><hr> -</p><!--l. 3116--><p class="noindent" > +</p><!--l. 3280--><p class="noindent" > Set the encap character to ⟨<span class="ecti-1000">char</span>⟩. </p> -<!--l. 3119--><p class="indent" > </div> -</p><!--l. 3119--><p class="noindent" ><a +<!--l. 3283--><p class="indent" > </div> +</p><!--l. 3283--><p class="noindent" ><a href="#top">Top</a><div class="chapter"><h2 class="chapterHead">7. <a id="sec:onthefly"></a>On-the-Fly Document Definitions</h2> -</p><!--l. 3122--><p class="indent" > <div class="important" title="Important Note"> The commands described here may superficially look like ⟨<span +</p><!--l. 3286--><p class="indent" > <div class="important" title="Important Note"> The commands described here may superficially look like ⟨<span class="ecti-1000">word</span>⟩<span class="ectt-1000">\index{</span>⟨<span class="ecti-1000">word</span>⟩<span @@ -6190,8 +6512,8 @@ but they behave rather differently. If you want to use <span class="ectt-1000">\index </span>then just use <span class="ectt-1000">\index</span>. </div> -</p><!--l. 3127--><p class="noindent" > -</p><!--l. 3129--><p class="indent" > The <span +</p><!--l. 3291--><p class="noindent" > +</p><!--l. 3293--><p class="indent" > The <span class="ecss-1000">glossaries</span><a id="dx1-24001"></a> package advises against defining entries in the <span class="ecss-1000">document</span><a @@ -6205,7 +6527,7 @@ class="ecss-1000">glossaries-extra </span>but can be enabled using the <span class="ecss-1000">docdefs</span><a id="dx1-24004"></a> package options. -</p><!--l. 3135--><p class="indent" > Although this can be problematic, the <span +</p><!--l. 3299--><p class="indent" > Although this can be problematic, the <span class="ecss-1000">glossaries-extra </span>package provides a way of defining and using entries within the <span class="ecss-1000">document</span><a @@ -6217,14 +6539,14 @@ class="ecss-1000">docdefs</span><a class="ecti-1000">There are limitations with this approach, so take care with it.</span> This function is disabled by default, but can be enabled using the preamble-only command: -</p><!--l. 3141--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3305--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrEnableOnTheFly</span><span class="ectt-0900"> </span></span><a id="dx1-24008"></a> <span class="ectt-1000">\GlsXtrEnableOnTheFly </span></div><hr> -</p><!--l. 3143--><p class="noindent" > +</p><!--l. 3307--><p class="noindent" > When used, this defines the commands described below. -</p><!--l. 3146--><p class="indent" > <div class="important" title="Important Note"> The commands <span +</p><!--l. 3310--><p class="indent" > <div class="important" title="Important Note"> The commands <span class="ectt-1000">\glsxtr</span>, <span class="ectt-1000">\glsxtrpl</span>, <span class="ectt-1000">\Glsxtr </span>and <span @@ -6235,8 +6557,8 @@ class="ectt-1000">\printglossary</span><a mix these commands with the standard glossary commands, such as <span class="ectt-1000">\gls </span>or there may be unexpected results. </div> -</p><!--l. 3152--><p class="noindent" > -</p><!--l. 3154--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3316--><p class="noindent" > +</p><!--l. 3318--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtr</span><span class="ectt-0900"> </span></span><a id="dx1-24010"></a> <span @@ -6247,7 +6569,7 @@ class="ecit-1000">dfn-options</span>⟩<span class="ectt-1000">]{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3156--><p class="noindent" > +</p><!--l. 3320--><p class="noindent" > If an entry with the label ⟨<span class="ecti-1000">label</span>⟩ has already been defined, this just does <span @@ -6275,7 +6597,7 @@ class="ecit-1000">dfn-options</span>⟩<span class="ectt-1000">}</span> </div> </div> -<!--l. 3168--><p class="indent" > <div class="important" title="Important Note"> The ⟨<span +<!--l. 3332--><p class="indent" > <div class="important" title="Important Note"> The ⟨<span class="ecti-1000">label</span>⟩ must contain any non-expandable commands, such as formatting commands or problematic characters. If the term requires any of these, they must be omitted from the ⟨<span @@ -6284,15 +6606,15 @@ class="ecss-1000">name</span><a id="dx1-24011"></a> key must be provided in the optional argument ⟨<span class="ecti-1000">dfn-options</span>⟩. </div> -</p><!--l. 3174--><p class="noindent" > +</p><!--l. 3338--><p class="noindent" > -</p><!--l. 3176--><p class="indent" > The second optional argument ⟨<span +</p><!--l. 3340--><p class="indent" > The second optional argument ⟨<span class="ecti-1000">dfn-options</span>⟩ should be empty if the entry has already been defined, since it’s too late for them. If it’s not empty, a warning will be generated with -</p><!--l. 3179--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3343--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrWarning</span><span class="ectt-0900"> </span></span><a id="dx1-24012"></a> <span @@ -6301,39 +6623,39 @@ class="ecit-1000">dfn-options</span>⟩<span class="ectt-1000">}{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3181--><p class="noindent" > -</p><!--l. 3183--><p class="indent" > For example, this warning will be generated on the second instance of <span +</p><!--l. 3345--><p class="noindent" > +</p><!--l. 3347--><p class="indent" > For example, this warning will be generated on the second instance of <span class="ectt-1000">\glsxtr</span> below: </p> - <div class="verbatim" id="verbatim-67"> + <div class="verbatim" id="verbatim-74"> \glsxtr[][plural=geese]{goose}  <br /> ... later  <br />\glsxtr[][plural=geese]{goose} </div> -<!--l. 3189--><p class="nopar" > -</p><!--l. 3191--><p class="indent" > If you are considering doing something like: +<!--l. 3353--><p class="nopar" > +</p><!--l. 3355--><p class="indent" > If you are considering doing something like: </p> - <div class="verbatim" id="verbatim-68"> + <div class="verbatim" id="verbatim-75"> \newcommand*{\goose}{\glsxtr[][plural=geese]{goose}}  <br />\renewcommand*{\GlsXtrWarning}[2]{}  <br /> ... later  <br />\goose\ some more text here </div> -<!--l. 3197--><p class="nopar" > then don’t bother. It’s simpler and less problematic to just define the entries in the +<!--l. 3361--><p class="nopar" > then don’t bother. It’s simpler and less problematic to just define the entries in the preamble with <span class="ectt-1000">\newglossaryentry</span><a id="dx1-24013"></a> and then use <span class="ectt-1000">\gls </span>in the document. -</p><!--l. 3202--><p class="indent" > There are plural and case-changing alternatives to <span +</p><!--l. 3366--><p class="indent" > There are plural and case-changing alternatives to <span class="ectt-1000">\glsxtr</span>: -</p><!--l. 3203--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3367--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsxtrpl</span><span class="ectt-0900"> </span></span><a id="dx1-24014"></a> <span @@ -6344,12 +6666,12 @@ class="ecit-1000">dfn-options</span>⟩<span class="ectt-1000">]{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3205--><p class="noindent" > +</p><!--l. 3369--><p class="noindent" > This is like <span class="ectt-1000">\glsxtr </span>but uses <span class="ectt-1000">\glspl </span>instead of <span class="ectt-1000">\gls</span>. -</p><!--l. 3208--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3372--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsxtr</span><span class="ectt-0900"> </span></span><a id="dx1-24015"></a> <span @@ -6360,12 +6682,12 @@ class="ecit-1000">dfn-options</span>⟩<span class="ectt-1000">]{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3210--><p class="noindent" > +</p><!--l. 3374--><p class="noindent" > This is like <span class="ectt-1000">\glsxtr </span>but uses <span class="ectt-1000">\Gls </span>instead of <span class="ectt-1000">\gls</span>. -</p><!--l. 3213--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3377--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsxtrpl</span><span class="ectt-0900"> </span></span><a id="dx1-24016"></a> <span @@ -6376,12 +6698,12 @@ class="ecit-1000">dfn-options</span>⟩<span class="ectt-1000">]{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3215--><p class="noindent" > +</p><!--l. 3379--><p class="noindent" > This is like <span class="ectt-1000">\glsxtr </span>but uses <span class="ectt-1000">\Glspl </span>instead of <span class="ectt-1000">\gls</span>. -</p><!--l. 3218--><p class="indent" > If you use UTF-8 and don’t want the inconvenient of needing to use an +</p><!--l. 3382--><p class="indent" > If you use UTF-8 and don’t want the inconvenient of needing to use an ASCII-only label, then it’s better to use <span class="HoLogo-XeLaTeX"><span class="HoLogo-Xe">X<span class="HoLogo-e">Ǝ</span></span><span class="HoLogo-LaTeX">L<span class="HoLogo-a">A</span><span class="HoLogo-TeX">T<span class="HoLogo-e">E</span>X</span></span></span> or Lua<span class="HoLogo-LaTeX">L<span class="HoLogo-a">A</span><span class="HoLogo-TeX">T<span class="HoLogo-e">E</span>X</span></span> instead of <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> (or pdf<span class="HoLogo-LaTeX">L<span class="HoLogo-a">A</span><span class="HoLogo-TeX">T<span class="HoLogo-e">E</span>X</span></span>). If you really desperately want to use UTF-8 entry labels @@ -6390,20 +6712,20 @@ without switching to <span class="HoLogo-XeLaTeX"><span class="HoLogo-Xe">X<span class="ectt-1000">\GlsXtrEnableOnTheFly </span>that allows you to use UTF-8 characters in ⟨<span class="ecti-1000">label</span>⟩, but it’s experimental and may not work in some cases. -</p><!--l. 3227--><p class="indent" > <div class="important" title="Important Note"> If you use the starred version of <span +</p><!--l. 3391--><p class="indent" > <div class="important" title="Important Note"> If you use the starred version of <span class="ectt-1000">\GlsXtrEnableOnTheFly </span>don’t use any commands in the ⟨<span class="ecti-1000">label</span>⟩, even if they expand to just text. </div> -</p><!--l. 3231--><p class="noindent" > +</p><!--l. 3395--><p class="noindent" > </p> -<!--l. 3233--><p class="indent" > </div> -</p><!--l. 3233--><p class="noindent" ><a +<!--l. 3397--><p class="indent" > </div> +</p><!--l. 3397--><p class="noindent" ><a href="#top">Top</a><div class="chapter"><h2 class="chapterHead">8. <a id="sec:supplemental"></a>Supplemental Packages</h2> -</p><!--l. 3236--><p class="indent" > The <span +</p><!--l. 3400--><p class="indent" > The <span class="ecss-1000">glossaries</span><a id="dx1-25001"></a> bundle provides additional support packages <span class="ecss-1000">glossaries-prefix</span><a @@ -6413,10 +6735,10 @@ class="ecss-1000">glossaries-accsupp</span><a id="dx1-25003"></a> (for accessibility support). These packages aren’t automatically loaded. </p> -<!--l. 3241--><p class="noindent" ><a +<!--l. 3405--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">8.1 </span> <a id="sec:prefix"></a>Prefixes or Determiners</h3> -<!--l. 3244--><p class="noindent" >If prefixing is required, you can simply load <span +<!--l. 3408--><p class="noindent" >If prefixing is required, you can simply load <span class="ecss-1000">glossaries-prefix</span><a id="dx1-26001"></a> after <span class="ecss-1000">glossaries-extra</span>. For @@ -6425,7 +6747,7 @@ example: </p> - <div class="verbatim" id="verbatim-69"> + <div class="verbatim" id="verbatim-76"> \documentclass{article}  <br />\usepackage{glossaries-extra}  <br />\usepackage{glossaries-prefix} @@ -6440,13 +6762,13 @@ example:  <br />\printglossaries  <br />\end{document} </div> -<!--l. 3267--><p class="nopar" > -</p><!--l. 3269--><p class="noindent" > +<!--l. 3431--><p class="nopar" > +</p><!--l. 3433--><p class="noindent" > </p> -<!--l. 3269--><p class="noindent" ><a +<!--l. 3433--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">8.2 </span> <a id="sec:accsupp"></a>Accessibility Support</h3> -<!--l. 3272--><p class="noindent" >The <span +<!--l. 3436--><p class="noindent" >The <span class="ecss-1000">glossaries-accsupp</span><a id="dx1-27001"></a> needs to be loaded before <span class="ecss-1000">glossaries-extra </span>or through the @@ -6457,10 +6779,10 @@ class="ecss-1000">accsupp</span><a </p> - <div class="verbatim" id="verbatim-70"> + <div class="verbatim" id="verbatim-77"> \usepackage[accsupp]{glossaries-extra} </div> -<!--l. 3277--><p class="nopar" > If you don’t load <span +<!--l. 3441--><p class="nopar" > If you don’t load <span class="ecss-1000">glossaries-accsupp</span><a id="dx1-27003"></a> or you load <span class="ecss-1000">glossaries-accsupp</span><a @@ -6472,7 +6794,7 @@ class="ecti-1000">xxx</span>⟩ commands described below will simply be equ corresponding <span class="ectt-1000">\glsentry</span>⟨<span class="ecti-1000">xxx</span>⟩ commands. -</p><!--l. 3284--><p class="indent" > The following <span +</p><!--l. 3448--><p class="indent" > The following <span class="ectt-1000">\glsaccess</span>⟨<span class="ecti-1000">xxx</span>⟩ commands add accessibility information wrapped around the corresponding <span @@ -6480,34 +6802,34 @@ class="ectt-1000">\glsentry</span>⟨<span class="ecti-1000">xxx</span>⟩ commands. There is no check for existence of the entry nor do any of these commands add formatting, hyperlinks or indexing information. -</p><!--l. 3289--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3453--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsaccessname</span><span class="ectt-0900"> </span></span><a id="dx1-27005"></a> <span class="ectt-1000">\glsaccessname{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3291--><p class="noindent" > +</p><!--l. 3455--><p class="noindent" > This displays the value of the <span class="ecss-1000">name</span><a id="dx1-27006"></a> field for the entry identified by ⟨<span class="ecti-1000">label</span>⟩. -</p><!--l. 3295--><p class="indent" > If the <span +</p><!--l. 3459--><p class="indent" > If the <span class="ecss-1000">glossaries-accsupp</span><a id="dx1-27007"></a> package isn’t loaded, this is simply defined as: </p> - <div class="verbatim" id="verbatim-71"> + <div class="verbatim" id="verbatim-78"> \newcommand*{\glsaccessname}[1]{\glsentryname{#1}} </div> -<!--l. 3299--><p class="nopar" > otherwise it’s defined as: +<!--l. 3463--><p class="nopar" > otherwise it’s defined as: </p> - <div class="verbatim" id="verbatim-72"> + <div class="verbatim" id="verbatim-79"> \newcommand*{\glsaccessname}[1]{%  <br />  \glsnameaccessdisplay  <br />  {% @@ -6516,20 +6838,20 @@ class="ecss-1000">glossaries-accsupp</span><a  <br />  {#1}%  <br />} </div> -<!--l. 3309--><p class="nopar" > (<span +<!--l. 3473--><p class="nopar" > (<span class="ectt-1000">\glsnameaccessdisplay</span><a id="dx1-27008"></a> is defined by the <span class="ecss-1000">glossaries-accsupp</span><a id="dx1-27009"></a> package.) The first letter upper case version is: -</p><!--l. 3313--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3477--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsaccessname</span><span class="ectt-0900"> </span></span><a id="dx1-27010"></a> <span class="ectt-1000">\Glsaccessname{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3315--><p class="noindent" > +</p><!--l. 3479--><p class="noindent" > Without the <span class="ecss-1000">glossaries-accsupp</span><a id="dx1-27011"></a> package this is just defined as: @@ -6537,17 +6859,17 @@ class="ecss-1000">glossaries-accsupp</span><a </p> - <div class="verbatim" id="verbatim-73"> + <div class="verbatim" id="verbatim-80"> \newcommand*{\Glsaccessname}[1]{\Glsentryname{#1}} </div> -<!--l. 3320--><p class="nopar" > With the <span +<!--l. 3484--><p class="nopar" > With the <span class="ecss-1000">glossaries-accsupp</span><a id="dx1-27012"></a> package this is defined as: </p> - <div class="verbatim" id="verbatim-74"> + <div class="verbatim" id="verbatim-81"> \newcommand*{\Glsaccessname}[1]{%  <br />  \glsnameaccessdisplay  <br />  {% @@ -6556,112 +6878,112 @@ class="ecss-1000">glossaries-accsupp</span><a  <br />  {#1}%  <br />} </div> -<!--l. 3330--><p class="nopar" > -</p><!--l. 3332--><p class="indent" > The following commands are all defined in an analogous manner. -</p><!--l. 3333--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 3494--><p class="nopar" > +</p><!--l. 3496--><p class="indent" > The following commands are all defined in an analogous manner. +</p><!--l. 3497--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsaccesstext</span><span class="ectt-0900"> </span></span><a id="dx1-27013"></a> <span class="ectt-1000">\glsaccesstext{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3335--><p class="noindent" > +</p><!--l. 3499--><p class="noindent" > This displays the value of the <span class="ecss-1000">text</span><a id="dx1-27014"></a> field. -</p><!--l. 3338--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3502--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsaccesstext</span><span class="ectt-0900"> </span></span><a id="dx1-27015"></a> <span class="ectt-1000">\Glsaccesstext{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3340--><p class="noindent" > +</p><!--l. 3504--><p class="noindent" > This displays the value of the <span class="ecss-1000">text</span><a id="dx1-27016"></a> field with the first letter converted to upper case. -</p><!--l. 3344--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3508--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsaccessplural</span><span class="ectt-0900"> </span></span><a id="dx1-27017"></a> <span class="ectt-1000">\glsaccessplural{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3346--><p class="noindent" > +</p><!--l. 3510--><p class="noindent" > This displays the value of the <span class="ecss-1000">plural</span><a id="dx1-27018"></a> field. -</p><!--l. 3349--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3513--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsaccessplural</span><span class="ectt-0900"> </span></span><a id="dx1-27019"></a> <span class="ectt-1000">\Glsaccessplural{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3351--><p class="noindent" > +</p><!--l. 3515--><p class="noindent" > This displays the value of the <span class="ecss-1000">plural</span><a id="dx1-27020"></a> field with the first letter converted to upper case. -</p><!--l. 3355--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3519--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsaccessfirst</span><span class="ectt-0900"> </span></span><a id="dx1-27021"></a> <span class="ectt-1000">\glsaccessfirst{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3357--><p class="noindent" > +</p><!--l. 3521--><p class="noindent" > This displays the value of the <span class="ecss-1000">first</span><a id="dx1-27022"></a> field. -</p><!--l. 3360--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3524--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsaccessfirst</span><span class="ectt-0900"> </span></span><a id="dx1-27023"></a> <span class="ectt-1000">\Glsaccessfirst{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3362--><p class="noindent" > +</p><!--l. 3526--><p class="noindent" > This displays the value of the <span class="ecss-1000">first</span><a id="dx1-27024"></a> field with the first letter converted to upper case. -</p><!--l. 3366--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3530--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsaccessfirstplural</span><span class="ectt-0900"> </span></span><a id="dx1-27025"></a> <span class="ectt-1000">\glsaccessfirstplural{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3368--><p class="noindent" > +</p><!--l. 3532--><p class="noindent" > This displays the value of the <span class="ecss-1000">firstplural</span><a id="dx1-27026"></a> field. -</p><!--l. 3371--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3535--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsaccessfirstplural</span><span class="ectt-0900"> </span></span><a id="dx1-27027"></a> <span class="ectt-1000">\Glsaccessfirstplural{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3373--><p class="noindent" > +</p><!--l. 3537--><p class="noindent" > This displays the value of the <span class="ecss-1000">firstplural</span><a id="dx1-27028"></a> field with the first letter converted to upper case. -</p><!--l. 3377--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3541--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsaccesssymbol</span><span class="ectt-0900"> </span></span><a id="dx1-27029"></a> <span class="ectt-1000">\glsaccesssymbol{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3379--><p class="noindent" > +</p><!--l. 3543--><p class="noindent" > This displays the value of the <span class="ecss-1000">symbol</span><a id="dx1-27030"></a> field. -</p><!--l. 3382--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3546--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsaccesssymbol</span><span class="ectt-0900"> </span></span><a id="dx1-27031"></a> <span @@ -6671,150 +6993,150 @@ class="ectt-1000">} </span></div><hr> -</p><!--l. 3384--><p class="noindent" > +</p><!--l. 3548--><p class="noindent" > This displays the value of the <span class="ecss-1000">symbol</span><a id="dx1-27032"></a> field with the first letter converted to upper case. -</p><!--l. 3388--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3552--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsaccesssymbolplural</span><span class="ectt-0900"> </span></span><a id="dx1-27033"></a> <span class="ectt-1000">\glsaccesssymbolplural{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3390--><p class="noindent" > +</p><!--l. 3554--><p class="noindent" > This displays the value of the <span class="ecss-1000">symbolplural</span><a id="dx1-27034"></a> field. -</p><!--l. 3393--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3557--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsaccesssymbolplural</span><span class="ectt-0900"> </span></span><a id="dx1-27035"></a> <span class="ectt-1000">\Glsaccesssymbolplural{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3395--><p class="noindent" > +</p><!--l. 3559--><p class="noindent" > This displays the value of the <span class="ecss-1000">symbolplural</span><a id="dx1-27036"></a> field with the first letter converted to upper case. -</p><!--l. 3399--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3563--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsaccessdesc</span><span class="ectt-0900"> </span></span><a id="dx1-27037"></a> <span class="ectt-1000">\glsaccessdesc{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3401--><p class="noindent" > +</p><!--l. 3565--><p class="noindent" > This displays the value of the <span class="ecss-1000">desc</span><a id="dx1-27038"></a> field. -</p><!--l. 3404--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3568--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsaccessdesc</span><span class="ectt-0900"> </span></span><a id="dx1-27039"></a> <span class="ectt-1000">\Glsaccessdesc{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3406--><p class="noindent" > +</p><!--l. 3570--><p class="noindent" > This displays the value of the <span class="ecss-1000">desc</span><a id="dx1-27040"></a> field with the first letter converted to upper case. -</p><!--l. 3410--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3574--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsaccessdescplural</span><span class="ectt-0900"> </span></span><a id="dx1-27041"></a> <span class="ectt-1000">\glsaccessdescplural{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3412--><p class="noindent" > +</p><!--l. 3576--><p class="noindent" > This displays the value of the <span class="ecss-1000">descplural</span><a id="dx1-27042"></a> field. -</p><!--l. 3415--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3579--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsaccessdescplural</span><span class="ectt-0900"> </span></span><a id="dx1-27043"></a> <span class="ectt-1000">\Glsaccessdescplural{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3417--><p class="noindent" > +</p><!--l. 3581--><p class="noindent" > This displays the value of the <span class="ecss-1000">descplural</span><a id="dx1-27044"></a> field with the first letter converted to upper case. -</p><!--l. 3421--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3585--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsaccessshort</span><span class="ectt-0900"> </span></span><a id="dx1-27045"></a> <span class="ectt-1000">\glsaccessshort{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3423--><p class="noindent" > +</p><!--l. 3587--><p class="noindent" > This displays the value of the <span class="ecss-1000">short</span><a id="dx1-27046"></a> field. -</p><!--l. 3426--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3590--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsaccessshort</span><span class="ectt-0900"> </span></span><a id="dx1-27047"></a> <span class="ectt-1000">\Glsaccessshort{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3428--><p class="noindent" > +</p><!--l. 3592--><p class="noindent" > This displays the value of the <span class="ecss-1000">short</span><a id="dx1-27048"></a> field with the first letter converted to upper case. -</p><!--l. 3432--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3596--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsaccessshortpl</span><span class="ectt-0900"> </span></span><a id="dx1-27049"></a> <span class="ectt-1000">\glsaccessshortpl{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3434--><p class="noindent" > +</p><!--l. 3598--><p class="noindent" > This displays the value of the <span class="ecss-1000">shortplural</span><a id="dx1-27050"></a> field. -</p><!--l. 3437--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3601--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsaccessshortpl</span><span class="ectt-0900"> </span></span><a id="dx1-27051"></a> <span class="ectt-1000">\Glsaccessshortpl{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3439--><p class="noindent" > +</p><!--l. 3603--><p class="noindent" > This displays the value of the <span class="ecss-1000">shortplural</span><a id="dx1-27052"></a> field with the first letter converted to upper case. -</p><!--l. 3443--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3607--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsaccesslong</span><span class="ectt-0900"> </span></span><a id="dx1-27053"></a> <span class="ectt-1000">\glsaccesslong{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3445--><p class="noindent" > +</p><!--l. 3609--><p class="noindent" > This displays the value of the <span class="ecss-1000">long</span><a id="dx1-27054"></a> field. -</p><!--l. 3448--><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="ectt-0900">\Glsaccesslong</span><span class="ectt-0900"> </span></span><a id="dx1-27055"></a> <span class="ectt-1000">\Glsaccesslong{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3450--><p class="noindent" > +</p><!--l. 3614--><p class="noindent" > This displays the value of the <span class="ecss-1000">long</span><a id="dx1-27056"></a> field with the first letter converted to upper case. -</p><!--l. 3454--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3618--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\glsaccesslongpl</span><span class="ectt-0900"> </span></span><a id="dx1-27057"></a> <span @@ -6824,18 +7146,18 @@ class="ectt-1000">} </span></div><hr> -</p><!--l. 3456--><p class="noindent" > +</p><!--l. 3620--><p class="noindent" > This displays the value of the <span class="ecss-1000">longplural</span><a id="dx1-27058"></a> field. -</p><!--l. 3459--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3623--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\Glsaccesslongpl</span><span class="ectt-0900"> </span></span><a id="dx1-27059"></a> <span class="ectt-1000">\Glsaccesslongpl{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3461--><p class="noindent" > +</p><!--l. 3625--><p class="noindent" > This displays the value of the <span class="ecss-1000">longplural</span><a id="dx1-27060"></a> field with the first letter converted to upper @@ -6844,11 +7166,11 @@ case. </p> -<!--l. 3465--><p class="indent" > </div> -</p><!--l. 3465--><p class="noindent" ><a +<!--l. 3629--><p class="indent" > </div> +</p><!--l. 3629--><p class="noindent" ><a href="#top">Top</a><div class="chapter"><h2 class="chapterHead">9. <a id="sec:samples"></a>Sample Files</h2> -</p><!--l. 3468--><p class="indent" > The following sample files are provided with this package: +</p><!--l. 3632--><p class="indent" > The following sample files are provided with this package: </p><dl class="description"><dt class="description"> <span class="ecbx-1000">sample.tex</span> </dt><dd @@ -7023,11 +7345,11 @@ class="ecss-1000">glossaries-prefix</span><a -<!--l. 3554--><p class="indent" > </div> -</p><!--l. 3554--><p class="noindent" ><a +<!--l. 3718--><p class="indent" > </div> +</p><!--l. 3718--><p class="noindent" ><a href="#top">Top</a><div class="chapter"><h2 class="chapterHead">10. <a id="sec:lang"></a>Multi-Lingual Support</h2> -</p><!--l. 3557--><p class="indent" > There’s only one command provided by <span +</p><!--l. 3721--><p class="indent" > There’s only one command provided by <span class="ecss-1000">glossaries-extra </span>that you’re likely to want to change in your document and that’s <span class="ectt-1000">\abbreviationsname</span><a @@ -7047,15 +7369,15 @@ class="ectt-1000">\acronymname </span>(provided by <span class="ecss-1000">glossaries</span><a id="dx1-29004"></a>). -</p><!--l. 3567--><p class="indent" > You can redefine it in the usual way. For example: +</p><!--l. 3731--><p class="indent" > You can redefine it in the usual way. For example: </p> - <div class="verbatim" id="verbatim-75"> + <div class="verbatim" id="verbatim-82"> \renewcommand*{\abbreviationsname}{List of Abbreviations} </div> -<!--l. 3570--><p class="nopar" > Or using <span +<!--l. 3734--><p class="nopar" > Or using <span class="ecss-1000">babel</span><a id="dx1-29005"></a> or <span class="ecss-1000">polyglossia</span><a @@ -7064,13 +7386,13 @@ class="ecss-1000">polyglossia</span><a </p> - <div class="verbatim" id="verbatim-76"> + <div class="verbatim" id="verbatim-83"> \appto\captionsenglish{%  <br /> \renewcommand*{\abbreviationsname}{List of Abbreviations}%  <br />} </div> -<!--l. 3576--><p class="nopar" > -</p><!--l. 3578--><p class="indent" > Alternatively you can use the <span +<!--l. 3740--><p class="nopar" > +</p><!--l. 3742--><p class="indent" > Alternatively you can use the <span class="ecss-1000">title</span><a id="dx1-29007"></a> key when you print the list of abbreviations. For example: @@ -7078,24 +7400,24 @@ For example: </p> - <div class="verbatim" id="verbatim-77"> + <div class="verbatim" id="verbatim-84"> \printabbreviations[title={List of Abbreviations}] </div> -<!--l. 3582--><p class="nopar" > or +<!--l. 3746--><p class="nopar" > or </p> - <div class="verbatim" id="verbatim-78"> + <div class="verbatim" id="verbatim-85"> \printglossary[type=abbreviations,title={List of Abbreviations}] </div> -<!--l. 3586--><p class="nopar" > -</p><!--l. 3588--><p class="indent" > The other fixed text commands are the diagnostic messages, which shouldn’t +<!--l. 3750--><p class="nopar" > +</p><!--l. 3752--><p class="indent" > The other fixed text commands are the diagnostic messages, which shouldn’t appear in the final draft of your document. -</p><!--l. 3591--><p class="indent" > The <span +</p><!--l. 3755--><p class="indent" > The <span class="ecss-1000">glossaries-extra </span>package has the facility to load language modules if they exist, but won’t warn if they don’t. -</p><!--l. 3594--><p class="indent" > If you want to write your own language module, you just need to create a file +</p><!--l. 3758--><p class="indent" > If you want to write your own language module, you just need to create a file called <span class="ectt-1000">glossariesxtr-</span>⟨<span class="ecti-1000">lang</span>⟩<span @@ -7105,12 +7427,12 @@ class="ecss-1000">tracklang</span><a id="dx1-29008"></a> package). For example, <span class="ectt-1000">glossariesxtr-french.ldf</span>. -</p><!--l. 3600--><p class="indent" > The simplest code for this file is: +</p><!--l. 3764--><p class="indent" > The simplest code for this file is: </p> - <div class="verbatim" id="verbatim-79"> + <div class="verbatim" id="verbatim-86"> \ProvidesGlossariesExtraLang{french}[2015/12/09 v1.0]  <br />\newcommand*{\glossariesxtrcaptionsfrench}{%  <br /> \def\abbreviationsname{Abr\’eviations}% @@ -7136,8 +7458,8 @@ class="ectt-1000">glossariesxtr-french.ldf</span>.  <br />  \glossariesxtrcaptionsfrench  <br />} </div> -<!--l. 3628--><p class="nopar" > -</p><!--l. 3630--><p class="indent" > You can adapt this for other languages by replacing all instances of the language +<!--l. 3792--><p class="nopar" > +</p><!--l. 3794--><p class="indent" > You can adapt this for other languages by replacing all instances of the language identifier <span class="ectt-1000">french </span>and the translated text <span class="obeylines-h"><span class="verb"><span class="ectt-1000">Abr\’eviations</span></span></span> as appropriate. This <span @@ -7148,9 +7470,9 @@ class="E">E</span>X</span>’s path so that it can be found by class="ecss-1000">glossaries-extra</span>. You might also want to consider uploading it to CTAN so that it can be useful to others. (Please don’t send it to me. I already have more packages than I am able to maintain.) -</p><!--l. 3639--><p class="indent" > If you additionally want to provide translations for the diagnostic messages used +</p><!--l. 3803--><p class="indent" > If you additionally want to provide translations for the diagnostic messages used when a glossary is missing, you need to redefine the following commands: -</p><!--l. 3642--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3806--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrNoGlsWarningHead</span><span class="ectt-0900"> </span></span><a id="dx1-29009"></a> <span @@ -7160,39 +7482,39 @@ class="ectt-1000">}{</span>⟨<span class="ecit-1000">file</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 3644--><p class="noindent" > +</p><!--l. 3808--><p class="noindent" > This produces the following text in English: </p><div class="quote"> - <!--l. 3647--><p class="noindent" >This document is incomplete. The external file associated with the + <!--l. 3811--><p class="noindent" >This document is incomplete. The external file associated with the glossary ‘⟨<span class="ecti-1000">label</span>⟩’ (which should be called ⟨<span class="ecit-1000">file</span>⟩) hasn’t been created.</p></div> -<!--l. 3650--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 3814--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrNoGlsWarningEmptyStart</span><span class="ectt-0900"> </span></span><a id="dx1-29010"></a> <span class="ectt-1000">\GlsXtrNoGlsWarningEmptyStart </span></div><hr> -</p><!--l. 3652--><p class="noindent" > +</p><!--l. 3816--><p class="noindent" > This produces the following text in English: </p><div class="quote"> - <!--l. 3655--><p class="noindent" >This has probably happened because there are no entries defined in + <!--l. 3819--><p class="noindent" >This has probably happened because there are no entries defined in this glossary.</p></div> -<!--l. 3658--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 3822--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrNoGlsWarningEmptyMain</span><span class="ectt-0900"> </span></span><a id="dx1-29011"></a> <span class="ectt-1000">\GlsXtrNoGlsWarningEmptyMain </span></div><hr> -</p><!--l. 3660--><p class="noindent" > +</p><!--l. 3824--><p class="noindent" > This produces the following text in English: </p><div class="quote"> - <!--l. 3663--><p class="noindent" >If you don’t want this glossary, add <span + <!--l. 3827--><p class="noindent" >If you don’t want this glossary, add <span class="ectt-1000">nomain </span>to your package option list when you load <span class="ectt-1000">glossaries-extra.sty</span>. For example:</p></div> -<!--l. 3666--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 3830--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrNoGlsWarningEmptyNotMain</span><span class="ectt-0900"> </span></span><a id="dx1-29012"></a> <span @@ -7200,10 +7522,10 @@ class="ectt-1000">\GlsXtrNoGlsWarningEmptyNotMain{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 3668--><p class="noindent" > +</p><!--l. 3832--><p class="noindent" > This produces the following text in English: </p><div class="quote"> - <!--l. 3671--><p class="noindent" >Did you forget to use <span + <!--l. 3835--><p class="noindent" >Did you forget to use <span class="ectt-1000">type=</span>⟨<span class="ecit-1000">label</span>⟩ when you defined your entries? If you tried to load entries into this glossary with <span @@ -7215,7 +7537,7 @@ class="ectt-1000">] </span>as the optional argument? If you did, check that the definitions in the file you loaded all had the type set to <span class="ectt-1000">\glsdefaulttype</span>.</p></div> -<!--l. 3674--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 3838--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrNoGlsWarningCheckFile</span><span class="ectt-0900"> </span></span><a id="dx1-29013"></a> <span @@ -7223,25 +7545,25 @@ class="ectt-1000">\GlsXtrNoGlsWarningCheckFile{</span>⟨<span class="ecit-1000">file</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 3676--><p class="noindent" > +</p><!--l. 3840--><p class="noindent" > This produces the following text in English: </p><div class="quote"> - <!--l. 3679--><p class="noindent" >Check the contents of the file ⟨<span + <!--l. 3843--><p class="noindent" >Check the contents of the file ⟨<span class="ecit-1000">file</span>⟩. If it’s empty, that means you haven’t indexed any of your entries in this glossary (using commands like <span class="ectt-1000">\gls </span>or <span class="ectt-1000">\glsadd</span>) so this list can’t be generated. If the file isn’t empty, the document build process hasn’t been completed.</p></div> -<!--l. 3682--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 3846--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrNoGlsWarningMisMatch</span><span class="ectt-0900"> </span></span><a id="dx1-29014"></a> <span class="ectt-1000">\GlsXtrNoGlsWarningMisMatch </span></div><hr> -</p><!--l. 3684--><p class="noindent" > +</p><!--l. 3848--><p class="noindent" > This produces the following text in English: </p><div class="quote"> - <!--l. 3687--><p class="noindent" >You need + <!--l. 3851--><p class="noindent" >You need to either replace <span class="ectt-1000">\makenoidxglossaries </span>with <span class="ectt-1000">\makeglossaries </span>or @@ -7255,17 +7577,17 @@ class="ectt-1000">\printglossaries</span>) class="ectt-1000">\printnoidxglossary </span>(or <span class="ectt-1000">\printnoidxglossaries</span>) and then rebuild this document.</p></div> -<!--l. 3690--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 3854--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrNoGlsWarningNoOut</span><span class="ectt-0900"> </span></span><a id="dx1-29015"></a> <span class="ectt-1000">\GlsXtrNoGlsWarningNoOut{</span>⟨<span class="ecit-1000">file</span>⟩<span class="ectt-1000">} </span></div><hr> -</p><!--l. 3692--><p class="noindent" > +</p><!--l. 3856--><p class="noindent" > This produces the following text in English: </p><div class="quote"> - <!--l. 3695--><p class="noindent" >The file ⟨<span + <!--l. 3859--><p class="noindent" >The file ⟨<span class="ecit-1000">file</span>⟩ doesn’t exist. This most likely means you haven’t used <span class="ectt-1000">\makeglossaries </span>or you have used <span @@ -7273,25 +7595,25 @@ class="ectt-1000">\nofiles</span>. If this is just a draft version of the document, you can suppress this message using the <span class="ectt-1000">nomissingglstext </span>package option.</p></div> -<!--l. 3698--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 3862--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrNoGlsWarningTail</span><span class="ectt-0900"> </span></span><a id="dx1-29016"></a> <span class="ectt-1000">\GlsXtrNoGlsWarningTail </span></div><hr> -</p><!--l. 3700--><p class="noindent" > +</p><!--l. 3864--><p class="noindent" > This produces the following text in English: </p><div class="quote"> - <!--l. 3703--><p class="noindent" >This message will be removed once the problem has been fixed.</p></div> -<!--l. 3706--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span + <!--l. 3867--><p class="noindent" >This message will be removed once the problem has been fixed.</p></div> +<!--l. 3870--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrNoGlsWarningBuildInfo</span><span class="ectt-0900"> </span></span><a id="dx1-29017"></a> <span class="ectt-1000">\GlsXtrNoGlsWarningBuildInfo </span></div><hr> -</p><!--l. 3708--><p class="noindent" > +</p><!--l. 3872--><p class="noindent" > This is advice on how to generate the glossary files. See the documented code (<span class="ectt-1000">glossaries-extra-code.pdf</span>) for further details. -</p><!--l. 3713--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3877--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span class="ectt-0900">\GlsXtrNoGlsWarningAutoMake</span><span class="ectt-0900"> </span></span><a id="dx1-29018"></a> <span @@ -7299,7 +7621,7 @@ class="ectt-1000">\GlsXtrNoGlsWarningAutoMake{</span>⟨<span class="ecit-1000">label</span>⟩<span class="ectt-1000">}</span> </div><hr> -</p><!--l. 3715--><p class="noindent" > +</p><!--l. 3879--><p class="noindent" > This is the message produced when the <span class="ecss-1000">automake</span><a id="dx1-29019"></a> option is used, but the document @@ -7445,7 +7767,7 @@ class="ecbx-1000">A</span> <div class="theindex"><span class="index-item">abbreviation styles:<br /></span> <span class="index-subitem">    <span class="ecss-1000">footnote</span>  <a -href="glossaries-extra-manual.html#dx1-12043" >1</a>, <a +href="glossaries-extra-manual.html#dx1-12045" >1</a>, <a href="glossaries-extra-manual.html#dx1-18054" >2</a>, <a href="glossaries-extra-manual.html#dx1-18062" >3</a>, <a href="glossaries-extra-manual.html#dx1-18065" >4</a>, <a @@ -7494,10 +7816,10 @@ class="ecss-1000">long-sc</span>  <a href="glossaries-extra-manual.html#dx1-17050" >27</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">long-short</span>  <a -href="glossaries-extra-manual.html#dx1-9044" >28</a>, <a +href="glossaries-extra-manual.html#dx1-9048" >28</a>, <a href="glossaries-extra-manual.html#dx1-12028" >29</a>, <a href="glossaries-extra-manual.html#dx1-12031" >30</a>, <a -href="glossaries-extra-manual.html#dx1-12041" >31</a>, <a +href="glossaries-extra-manual.html#dx1-12043" >31</a>, <a href="glossaries-extra-manual.html#dx1-18002" >32</a>, <a href="glossaries-extra-manual.html#dx1-18007" >33</a>, <a href="glossaries-extra-manual.html#dx1-18010" >34</a>, <a @@ -7533,1555 +7855,1629 @@ class="ecss-1000">long-sm</span>  <a href="glossaries-extra-manual.html#dx1-17054" >48</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">postfootnote</span>  <a -href="glossaries-extra-manual.html#dx1-7053" >49</a>, <a -href="glossaries-extra-manual.html#dx1-18070" >50</a>, <a -href="glossaries-extra-manual.html#dx1-18079" >51</a>, <a -href="glossaries-extra-manual.html#dx1-18082" >52</a>, <a -href="glossaries-extra-manual.html#dx1-18085" >53</a> <br /></span> +href="glossaries-extra-manual.html#dx1-7050" >49</a>, <a +href="glossaries-extra-manual.html#dx1-7055" >50</a>, <a +href="glossaries-extra-manual.html#dx1-18070" >51</a>, <a +href="glossaries-extra-manual.html#dx1-18080" >52</a>, <a +href="glossaries-extra-manual.html#dx1-18083" >53</a>, <a +href="glossaries-extra-manual.html#dx1-18086" >54</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">postfootnote-em</span>  <a -href="glossaries-extra-manual.html#dx1-18084" >54</a> <br /></span> +href="glossaries-extra-manual.html#dx1-18085" >55</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">postfootnote-sc</span>  <a -href="glossaries-extra-manual.html#dx1-18078" >55</a> <br /></span> +href="glossaries-extra-manual.html#dx1-18079" >56</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">postfootnote-sm</span>  <a -href="glossaries-extra-manual.html#dx1-18081" >56</a> <br /></span> +href="glossaries-extra-manual.html#dx1-18082" >57</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short</span>  <a -href="glossaries-extra-manual.html#dx1-12019" >57</a>, <a -href="glossaries-extra-manual.html#dx1-12042" >58</a>, <a -href="glossaries-extra-manual.html#dx1-14003" >59</a>, <a -href="glossaries-extra-manual.html#dx1-14017" >60</a>, <a -href="glossaries-extra-manual.html#dx1-17002" >61</a>, <a -href="glossaries-extra-manual.html#dx1-17008" >62</a>, <a -href="glossaries-extra-manual.html#dx1-17011" >63</a>, <a -href="glossaries-extra-manual.html#dx1-17014" >64</a>, <a -href="glossaries-extra-manual.html#dx1-17017" >65</a>, <a -href="glossaries-extra-manual.html#dx1-17020" >66</a>, <a -href="glossaries-extra-manual.html#dx1-17023" >67</a> <br /></span> +href="glossaries-extra-manual.html#dx1-12019" >58</a>, <a +href="glossaries-extra-manual.html#dx1-12044" >59</a>, <a +href="glossaries-extra-manual.html#dx1-14003" >60</a>, <a +href="glossaries-extra-manual.html#dx1-14017" >61</a>, <a +href="glossaries-extra-manual.html#dx1-17002" >62</a>, <a +href="glossaries-extra-manual.html#dx1-17008" >63</a>, <a +href="glossaries-extra-manual.html#dx1-17011" >64</a>, <a +href="glossaries-extra-manual.html#dx1-17014" >65</a>, <a +href="glossaries-extra-manual.html#dx1-17017" >66</a>, <a +href="glossaries-extra-manual.html#dx1-17020" >67</a>, <a +href="glossaries-extra-manual.html#dx1-17023" >68</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short-desc</span>  <a -href="glossaries-extra-manual.html#dx1-17016" >68</a>, <a -href="glossaries-extra-manual.html#dx1-17026" >69</a>, <a -href="glossaries-extra-manual.html#dx1-17029" >70</a> <br /></span> +href="glossaries-extra-manual.html#dx1-17016" >69</a>, <a +href="glossaries-extra-manual.html#dx1-17026" >70</a>, <a +href="glossaries-extra-manual.html#dx1-17029" >71</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short-em</span>  <a -href="glossaries-extra-manual.html#dx1-17013" >71</a> <br /></span> +href="glossaries-extra-manual.html#dx1-17013" >72</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short-em-desc</span>  <a -href="glossaries-extra-manual.html#dx1-17028" >72</a> <br /></span> +href="glossaries-extra-manual.html#dx1-17028" >73</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short-em-long</span>  <a -href="glossaries-extra-manual.html#dx1-18038" >73</a>, <a -href="glossaries-extra-manual.html#dx1-19087" >74</a> <br /></span> +href="glossaries-extra-manual.html#dx1-18038" >74</a>, <a +href="glossaries-extra-manual.html#dx1-19087" >75</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short-em-long-desc</span>  <a -href="glossaries-extra-manual.html#dx1-18051" >75</a> <br /></span> +href="glossaries-extra-manual.html#dx1-18051" >76</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short-long</span>  <a -href="glossaries-extra-manual.html#dx1-12021" >76</a>, <a -href="glossaries-extra-manual.html#dx1-18028" >77</a>, <a -href="glossaries-extra-manual.html#dx1-18033" >78</a>, <a -href="glossaries-extra-manual.html#dx1-18036" >79</a>, <a -href="glossaries-extra-manual.html#dx1-18039" >80</a>, <a -href="glossaries-extra-manual.html#dx1-19083" >81</a> <br /></span> +href="glossaries-extra-manual.html#dx1-12021" >77</a>, <a +href="glossaries-extra-manual.html#dx1-12039" >78</a>, <a +href="glossaries-extra-manual.html#dx1-18028" >79</a>, <a +href="glossaries-extra-manual.html#dx1-18033" >80</a>, <a +href="glossaries-extra-manual.html#dx1-18036" >81</a>, <a +href="glossaries-extra-manual.html#dx1-18039" >82</a>, <a +href="glossaries-extra-manual.html#dx1-19083" >83</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short-long-desc</span>  <a -href="glossaries-extra-manual.html#dx1-18041" >82</a>, <a -href="glossaries-extra-manual.html#dx1-18046" >83</a>, <a -href="glossaries-extra-manual.html#dx1-18049" >84</a>, <a -href="glossaries-extra-manual.html#dx1-18052" >85</a> <br /></span> +href="glossaries-extra-manual.html#dx1-18041" >84</a>, <a +href="glossaries-extra-manual.html#dx1-18046" >85</a>, <a +href="glossaries-extra-manual.html#dx1-18049" >86</a>, <a +href="glossaries-extra-manual.html#dx1-18052" >87</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short-sc</span>  <a -href="glossaries-extra-manual.html#dx1-17007" >86</a> <br /></span> +href="glossaries-extra-manual.html#dx1-17007" >88</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short-sc-desc</span>  <a -href="glossaries-extra-manual.html#dx1-17022" >87</a> <br /></span> +href="glossaries-extra-manual.html#dx1-17022" >89</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short-sc-long</span>  <a -href="glossaries-extra-manual.html#dx1-18032" >88</a>, <a -href="glossaries-extra-manual.html#dx1-19085" >89</a> <br /></span> +href="glossaries-extra-manual.html#dx1-18032" >90</a>, <a +href="glossaries-extra-manual.html#dx1-19085" >91</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short-sc-long-desc</span>  <a -href="glossaries-extra-manual.html#dx1-18045" >90</a> <br /></span> +href="glossaries-extra-manual.html#dx1-18045" >92</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short-sm</span>  <a -href="glossaries-extra-manual.html#dx1-17010" >91</a> <br /></span> +href="glossaries-extra-manual.html#dx1-17010" >93</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short-sm-desc</span>  <a -href="glossaries-extra-manual.html#dx1-17025" >92</a> <br /></span> +href="glossaries-extra-manual.html#dx1-17025" >94</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short-sm-long</span>  <a -href="glossaries-extra-manual.html#dx1-18035" >93</a>, <a -href="glossaries-extra-manual.html#dx1-19086" >94</a> <br /></span> +href="glossaries-extra-manual.html#dx1-18035" >95</a>, <a +href="glossaries-extra-manual.html#dx1-19086" >96</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short-sm-long-desc</span>  <a -href="glossaries-extra-manual.html#dx1-18048" >95</a> <br /></span> +href="glossaries-extra-manual.html#dx1-18048" >97</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\abbreviationsname</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-4042" ><span -class="ecti-1000">96</span></a> <br /></span> +href="glossaries-extra-manual.html#dx1-4044" ><span +class="ecti-1000">98</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\abbrvpluralsuffix</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19044" ><span -class="ecti-1000">97</span></a> <br /></span> +class="ecti-1000">99</span></a> <br /></span> <span class="index-item">acronym styles (glossaries):<br /></span> <span class="index-subitem">    <span class="ectt-1000">long-sp-short</span>  <a -href="glossaries-extra-manual.html#dx1-10006" >98</a> <br /></span> +href="glossaries-extra-manual.html#dx1-10006" >100</a> <br /></span> <span class="index-item"><span class="ecss-1000">amsgen </span>package  <a -href="glossaries-extra-manual.html#dx1-15" >99</a> <br /></span> +href="glossaries-extra-manual.html#dx1-15" >101</a> <br /></span> <p class="theindex"> <span class="ecbx-1000">B</span> <span class="index-item"><span class="ecss-1000">babel </span>package  <a -href="glossaries-extra-manual.html#dx1-3012" >100</a>, <a -href="glossaries-extra-manual.html#dx1-3016" >101</a>, <a -href="glossaries-extra-manual.html#dx1-4043" >102</a>, <a -href="glossaries-extra-manual.html#dx1-4044" >103</a>, <a +href="glossaries-extra-manual.html#dx1-3012" >102</a>, <a +href="glossaries-extra-manual.html#dx1-3016" >103</a>, <a href="glossaries-extra-manual.html#dx1-4045" >104</a>, <a -href="glossaries-extra-manual.html#dx1-21002" >105</a>, <a -href="glossaries-extra-manual.html#dx1-29003" >106</a>, <a -href="glossaries-extra-manual.html#dx1-29005" >107</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4046" >105</a>, <a +href="glossaries-extra-manual.html#dx1-4047" >106</a>, <a +href="glossaries-extra-manual.html#dx1-21002" >107</a>, <a +href="glossaries-extra-manual.html#dx1-29003" >108</a>, <a +href="glossaries-extra-manual.html#dx1-29005" >109</a> <br /></span> </p><p class="theindex"> <span class="ecbx-1000">C</span> <span class="index-item">categories:<br /></span> <span class="index-subitem">    <span class="ecss-1000">abbreviation</span>  <a -href="glossaries-extra-manual.html#dx1-8003" >108</a>, <a -href="glossaries-extra-manual.html#dx1-12022" >109</a>, <a -href="glossaries-extra-manual.html#dx1-13007" >110</a>, <a -href="glossaries-extra-manual.html#dx1-21004" >111</a> <br /></span> +href="glossaries-extra-manual.html#dx1-8003" >110</a>, <a +href="glossaries-extra-manual.html#dx1-12022" >111</a>, <a +href="glossaries-extra-manual.html#dx1-13007" >112</a>, <a +href="glossaries-extra-manual.html#dx1-21004" >113</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">acronym</span>  <a -href="glossaries-extra-manual.html#dx1-11014" >112</a>, <a -href="glossaries-extra-manual.html#dx1-12020" >113</a>, <a -href="glossaries-extra-manual.html#dx1-13006" >114</a>, <a -href="glossaries-extra-manual.html#dx1-21005" >115</a>, <a -href="glossaries-extra-manual.html#dx1-21019" >116</a> <br /></span> +href="glossaries-extra-manual.html#dx1-11014" >114</a>, <a +href="glossaries-extra-manual.html#dx1-12020" >115</a>, <a +href="glossaries-extra-manual.html#dx1-13006" >116</a>, <a +href="glossaries-extra-manual.html#dx1-21005" >117</a>, <a +href="glossaries-extra-manual.html#dx1-21019" >118</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">general</span>  <a -href="glossaries-extra-manual.html#dx1-7027" >117</a>, <a -href="glossaries-extra-manual.html#dx1-7052" >118</a>, <a -href="glossaries-extra-manual.html#dx1-11013" >119</a>, <a -href="glossaries-extra-manual.html#dx1-11016" >120</a>, <a -href="glossaries-extra-manual.html#dx1-21003" >121</a>, <a -href="glossaries-extra-manual.html#dx1-21018" >122</a>, <a -href="glossaries-extra-manual.html#dx1-21087" >123</a>, <a -href="glossaries-extra-manual.html#dx1-22038" >124</a> <br /></span> +href="glossaries-extra-manual.html#dx1-7027" >119</a>, <a +href="glossaries-extra-manual.html#dx1-7054" >120</a>, <a +href="glossaries-extra-manual.html#dx1-11013" >121</a>, <a +href="glossaries-extra-manual.html#dx1-11016" >122</a>, <a +href="glossaries-extra-manual.html#dx1-21003" >123</a>, <a +href="glossaries-extra-manual.html#dx1-21018" >124</a>, <a +href="glossaries-extra-manual.html#dx1-21087" >125</a>, <a +href="glossaries-extra-manual.html#dx1-22038" >126</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">index</span>  <a -href="glossaries-extra-manual.html#dx1-5007" >125</a>, <a -href="glossaries-extra-manual.html#dx1-21008" >126</a> <br /></span> +href="glossaries-extra-manual.html#dx1-5007" >127</a>, <a +href="glossaries-extra-manual.html#dx1-21008" >128</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">number</span>  <a -href="glossaries-extra-manual.html#dx1-21014" >127</a> <br /></span> +href="glossaries-extra-manual.html#dx1-21014" >129</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">symbol</span>  <a -href="glossaries-extra-manual.html#dx1-7034" >128</a>, <a -href="glossaries-extra-manual.html#dx1-21011" >129</a> <br /></span> +href="glossaries-extra-manual.html#dx1-7034" >130</a>, <a +href="glossaries-extra-manual.html#dx1-21011" >131</a> <br /></span> <span class="index-item">category attributes:<br /></span> <span class="index-subitem">    <span class="ecss-1000">aposplural</span>  <a -href="glossaries-extra-manual.html#dx1-16030" >130</a>, <a -href="glossaries-extra-manual.html#dx1-21042" >131</a>, <a -href="glossaries-extra-manual.html#dx1-21049" >132</a> <br /></span> +href="glossaries-extra-manual.html#dx1-16030" >132</a>, <a +href="glossaries-extra-manual.html#dx1-21042" >133</a>, <a +href="glossaries-extra-manual.html#dx1-21049" >134</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">discardperiod</span>  <a -href="glossaries-extra-manual.html#dx1-7023" >133</a>, <a -href="glossaries-extra-manual.html#dx1-21030" >134</a>, <a -href="glossaries-extra-manual.html#dx1-21033" >135</a>, <a -href="glossaries-extra-manual.html#dx1-21036" >136</a>, <a -href="glossaries-extra-manual.html#dx1-21041" >137</a> <br /></span> +href="glossaries-extra-manual.html#dx1-7023" >135</a>, <a +href="glossaries-extra-manual.html#dx1-21030" >136</a>, <a +href="glossaries-extra-manual.html#dx1-21033" >137</a>, <a +href="glossaries-extra-manual.html#dx1-21036" >138</a>, <a +href="glossaries-extra-manual.html#dx1-21041" >139</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">dualindex</span>  <a -href="glossaries-extra-manual.html#dx1-21073" >138</a>, <a -href="glossaries-extra-manual.html#dx1-23002" >139</a>, <a -href="glossaries-extra-manual.html#dx1-23009" >140</a>, <a -href="glossaries-extra-manual.html#dx1-23014" >141</a>, <a -href="glossaries-extra-manual.html#dx1-23021" >142</a>, <a -href="glossaries-extra-manual.html#dx1-23024" >143</a>, <a -href="glossaries-extra-manual.html#dx1-28004" >144</a> <br /></span> +href="glossaries-extra-manual.html#dx1-21073" >140</a>, <a +href="glossaries-extra-manual.html#dx1-23002" >141</a>, <a +href="glossaries-extra-manual.html#dx1-23009" >142</a>, <a +href="glossaries-extra-manual.html#dx1-23014" >143</a>, <a +href="glossaries-extra-manual.html#dx1-23021" >144</a>, <a +href="glossaries-extra-manual.html#dx1-23024" >145</a>, <a +href="glossaries-extra-manual.html#dx1-28004" >146</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">entrycount</span>  <a -href="glossaries-extra-manual.html#dx1-8002" >145</a>, <a -href="glossaries-extra-manual.html#dx1-21056" >146</a>, <a -href="glossaries-extra-manual.html#dx1-21061" >147</a>, <a -href="glossaries-extra-manual.html#dx1-22002" >148</a>, <a -href="glossaries-extra-manual.html#dx1-22006" >149</a>, <a -href="glossaries-extra-manual.html#dx1-22017" >150</a>, <a -href="glossaries-extra-manual.html#dx1-22021" >151</a>, <a -href="glossaries-extra-manual.html#dx1-22022" >152</a>, <a -href="glossaries-extra-manual.html#dx1-22026" >153</a>, <a -href="glossaries-extra-manual.html#dx1-22027" >154</a>, <a -href="glossaries-extra-manual.html#dx1-22031" >155</a> <br /></span> +href="glossaries-extra-manual.html#dx1-8002" >147</a>, <a +href="glossaries-extra-manual.html#dx1-21056" >148</a>, <a +href="glossaries-extra-manual.html#dx1-21061" >149</a>, <a +href="glossaries-extra-manual.html#dx1-22002" >150</a>, <a +href="glossaries-extra-manual.html#dx1-22006" >151</a>, <a +href="glossaries-extra-manual.html#dx1-22017" >152</a>, <a +href="glossaries-extra-manual.html#dx1-22021" >153</a>, <a +href="glossaries-extra-manual.html#dx1-22022" >154</a>, <a +href="glossaries-extra-manual.html#dx1-22026" >155</a>, <a +href="glossaries-extra-manual.html#dx1-22027" >156</a>, <a +href="glossaries-extra-manual.html#dx1-22031" >157</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">glossdesc</span>  <a -href="glossaries-extra-manual.html#dx1-11005" >156</a>, <a -href="glossaries-extra-manual.html#dx1-21062" >157</a>, <a -href="glossaries-extra-manual.html#dx1-21068" >158</a> <br /></span> +href="glossaries-extra-manual.html#dx1-11005" >158</a>, <a +href="glossaries-extra-manual.html#dx1-21062" >159</a>, <a +href="glossaries-extra-manual.html#dx1-21068" >160</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">glossname</span>  <a -href="glossaries-extra-manual.html#dx1-11004" >159</a>, <a -href="glossaries-extra-manual.html#dx1-21067" >160</a> <br /></span> +href="glossaries-extra-manual.html#dx1-11004" >161</a>, <a +href="glossaries-extra-manual.html#dx1-21067" >162</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">headuc</span>  <a -href="glossaries-extra-manual.html#dx1-20020" >161</a>, <a -href="glossaries-extra-manual.html#dx1-20022" >162</a>, <a -href="glossaries-extra-manual.html#dx1-21051" >163</a> <br /></span> +href="glossaries-extra-manual.html#dx1-20020" >163</a>, <a +href="glossaries-extra-manual.html#dx1-20022" >164</a>, <a +href="glossaries-extra-manual.html#dx1-21051" >165</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">indexname</span>  <a -href="glossaries-extra-manual.html#dx1-11009" >164</a>, <a -href="glossaries-extra-manual.html#dx1-21070" >165</a>, <a -href="glossaries-extra-manual.html#dx1-23001" >166</a>, <a -href="glossaries-extra-manual.html#dx1-23006" >167</a>, <a -href="glossaries-extra-manual.html#dx1-28005" >168</a> <br /></span> +href="glossaries-extra-manual.html#dx1-11009" >166</a>, <a +href="glossaries-extra-manual.html#dx1-21070" >167</a>, <a +href="glossaries-extra-manual.html#dx1-23001" >168</a>, <a +href="glossaries-extra-manual.html#dx1-23006" >169</a>, <a +href="glossaries-extra-manual.html#dx1-28005" >170</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">indexonlyfirst</span>  <a -href="glossaries-extra-manual.html#dx1-6006" >169</a>, <a -href="glossaries-extra-manual.html#dx1-21028" >170</a>, <a -href="glossaries-extra-manual.html#dx1-23022" >171</a> <br /></span> +href="glossaries-extra-manual.html#dx1-6006" >171</a>, <a +href="glossaries-extra-manual.html#dx1-21028" >172</a>, <a +href="glossaries-extra-manual.html#dx1-23022" >173</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">insertdots</span>  <a -href="glossaries-extra-manual.html#dx1-12005" >172</a>, <a -href="glossaries-extra-manual.html#dx1-21038" >173</a> <br /></span> +href="glossaries-extra-manual.html#dx1-12005" >174</a>, <a +href="glossaries-extra-manual.html#dx1-21038" >175</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">nohyper</span>  <a -href="glossaries-extra-manual.html#dx1-21025" >174</a>, <a -href="glossaries-extra-manual.html#dx1-21088" >175</a>, <a -href="glossaries-extra-manual.html#dx1-21089" >176</a> <br /></span> +href="glossaries-extra-manual.html#dx1-21025" >176</a>, <a +href="glossaries-extra-manual.html#dx1-21088" >177</a>, <a +href="glossaries-extra-manual.html#dx1-21089" >178</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">nohyperfirst</span>  <a -href="glossaries-extra-manual.html#dx1-18056" >177</a>, <a -href="glossaries-extra-manual.html#dx1-19022" >178</a>, <a -href="glossaries-extra-manual.html#dx1-19024" >179</a>, <a -href="glossaries-extra-manual.html#dx1-21021" >180</a> <br /></span> +href="glossaries-extra-manual.html#dx1-18056" >179</a>, <a +href="glossaries-extra-manual.html#dx1-19022" >180</a>, <a +href="glossaries-extra-manual.html#dx1-19024" >181</a>, <a +href="glossaries-extra-manual.html#dx1-21021" >182</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">noshortplural</span>  <a -href="glossaries-extra-manual.html#dx1-12006" >181</a>, <a -href="glossaries-extra-manual.html#dx1-16031" >182</a>, <a -href="glossaries-extra-manual.html#dx1-21045" >183</a>, <a -href="glossaries-extra-manual.html#dx1-21050" >184</a> <br /></span> +href="glossaries-extra-manual.html#dx1-12006" >183</a>, <a +href="glossaries-extra-manual.html#dx1-16031" >184</a>, <a +href="glossaries-extra-manual.html#dx1-21045" >185</a>, <a +href="glossaries-extra-manual.html#dx1-21050" >186</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">pluraldiscardperiod</span>  <a -href="glossaries-extra-manual.html#dx1-21032" >185</a>, <a -href="glossaries-extra-manual.html#dx1-21037" >186</a> <br /></span> +href="glossaries-extra-manual.html#dx1-21032" >187</a>, <a +href="glossaries-extra-manual.html#dx1-21037" >188</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">regular</span>  <a -href="glossaries-extra-manual.html#dx1-7005" >187</a>, <a -href="glossaries-extra-manual.html#dx1-7015" >188</a>, <a -href="glossaries-extra-manual.html#dx1-7018" >189</a>, <a -href="glossaries-extra-manual.html#dx1-14004" >190</a>, <a -href="glossaries-extra-manual.html#dx1-16005" >191</a>, <a -href="glossaries-extra-manual.html#dx1-16014" >192</a>, <a -href="glossaries-extra-manual.html#dx1-17001" >193</a>, <a -href="glossaries-extra-manual.html#dx1-18001" >194</a>, <a -href="glossaries-extra-manual.html#dx1-19023" >195</a>, <a -href="glossaries-extra-manual.html#dx1-19053" >196</a>, <a -href="glossaries-extra-manual.html#dx1-19057" >197</a>, <a -href="glossaries-extra-manual.html#dx1-19061" >198</a>, <a -href="glossaries-extra-manual.html#dx1-19065" >199</a>, <a -href="glossaries-extra-manual.html#dx1-21020" >200</a>, <a -href="glossaries-extra-manual.html#dx1-21078" >201</a>, <a -href="glossaries-extra-manual.html#dx1-21091" >202</a> <br /></span> +href="glossaries-extra-manual.html#dx1-7005" >189</a>, <a +href="glossaries-extra-manual.html#dx1-7015" >190</a>, <a +href="glossaries-extra-manual.html#dx1-7018" >191</a>, <a +href="glossaries-extra-manual.html#dx1-14004" >192</a>, <a +href="glossaries-extra-manual.html#dx1-16005" >193</a>, <a +href="glossaries-extra-manual.html#dx1-16014" >194</a>, <a +href="glossaries-extra-manual.html#dx1-17001" >195</a>, <a +href="glossaries-extra-manual.html#dx1-18001" >196</a>, <a +href="glossaries-extra-manual.html#dx1-19023" >197</a>, <a +href="glossaries-extra-manual.html#dx1-19053" >198</a>, <a +href="glossaries-extra-manual.html#dx1-19057" >199</a>, <a +href="glossaries-extra-manual.html#dx1-19061" >200</a>, <a +href="glossaries-extra-manual.html#dx1-19065" >201</a>, <a +href="glossaries-extra-manual.html#dx1-21020" >202</a>, <a +href="glossaries-extra-manual.html#dx1-21078" >203</a>, <a +href="glossaries-extra-manual.html#dx1-21091" >204</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">retainfirstuseperiod</span>  <a -href="glossaries-extra-manual.html#dx1-21034" >203</a> <br /></span> +href="glossaries-extra-manual.html#dx1-21034" >205</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">tagging</span>  <a -href="glossaries-extra-manual.html#dx1-13002" >204</a>, <a -href="glossaries-extra-manual.html#dx1-13005" >205</a>, <a -href="glossaries-extra-manual.html#dx1-13008" >206</a>, <a -href="glossaries-extra-manual.html#dx1-21053" >207</a> <br /></span> +href="glossaries-extra-manual.html#dx1-13002" >206</a>, <a +href="glossaries-extra-manual.html#dx1-13005" >207</a>, <a +href="glossaries-extra-manual.html#dx1-13008" >208</a>, <a +href="glossaries-extra-manual.html#dx1-21053" >209</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">unitcount</span>  <a -href="glossaries-extra-manual.html#dx1-22032" >208</a> <br /></span> +href="glossaries-extra-manual.html#dx1-22032" >210</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\cGLS</span></span></span>  <a href="glossaries-extra-manual.html#dx1-22012" ><span -class="ecti-1000">209</span></a> <br /></span> +class="ecti-1000">211</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\cGLSformat</span></span></span>  <a href="glossaries-extra-manual.html#dx1-22014" ><span -class="ecti-1000">210</span></a> <br /></span> +class="ecti-1000">212</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\cGLSpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-22013" ><span -class="ecti-1000">211</span></a> <br /></span> +class="ecti-1000">213</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\cGLSplformat</span></span></span>  <a href="glossaries-extra-manual.html#dx1-22015" ><span -class="ecti-1000">212</span></a> <br /></span> +class="ecti-1000">214</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\CustomAbbreviationFields</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19009" ><span -class="ecti-1000">213</span></a> <br /></span> +class="ecti-1000">215</span></a> <br /></span> </p><p class="theindex"> <span class="ecbx-1000">D</span> <span class="index-item"><span class="ecss-1000">datatool-base </span>package  <a -href="glossaries-extra-manual.html#dx1-14" >214</a> <br /></span> +href="glossaries-extra-manual.html#dx1-14" >216</a> <br /></span> </p><p class="theindex"> <span class="ecbx-1000">E</span> <span class="index-item">entry location  <a href="glossaries-extra-manual.html#dx1-30001" ><span -class="ecbx-1000">215</span></a>, <a -href="glossaries-extra-manual.html#dx1-30021" >216</a>, <a -href="glossaries-extra-manual.html#dx1-30028" >217</a> <br /></span> +class="ecbx-1000">217</span></a>, <a +href="glossaries-extra-manual.html#dx1-30021" >218</a>, <a +href="glossaries-extra-manual.html#dx1-30028" >219</a> <br /></span> <span class="index-item"><span class="ecss-1000">etoolbox </span>package  <a -href="glossaries-extra-manual.html#dx1-10" >218</a>, <a -href="glossaries-extra-manual.html#dx1-21084" >219</a> <br /></span> +href="glossaries-extra-manual.html#dx1-10" >220</a>, <a +href="glossaries-extra-manual.html#dx1-21084" >221</a> <br /></span> </p><p class="theindex"> <span class="ecbx-1000">F</span> <span class="index-item">first use  <a -href="glossaries-extra-manual.html#dx1-6004" >220</a>, <a -href="glossaries-extra-manual.html#dx1-7011" >221</a>, <a -href="glossaries-extra-manual.html#dx1-7032" >222</a>, <a -href="glossaries-extra-manual.html#dx1-7033" >223</a>, <a -href="glossaries-extra-manual.html#dx1-7036" >224</a>, <a -href="glossaries-extra-manual.html#dx1-7041" >225</a>, <a -href="glossaries-extra-manual.html#dx1-7046" >226</a>, <a -href="glossaries-extra-manual.html#dx1-7049" >227</a>, <a -href="glossaries-extra-manual.html#dx1-7051" >228</a>, <a -href="glossaries-extra-manual.html#dx1-9009" >229</a>, <a -href="glossaries-extra-manual.html#dx1-9017" >230</a>, <a -href="glossaries-extra-manual.html#dx1-9018" >231</a>, <a -href="glossaries-extra-manual.html#dx1-9019" >232</a>, <a +href="glossaries-extra-manual.html#dx1-6004" >222</a>, <a +href="glossaries-extra-manual.html#dx1-7011" >223</a>, <a +href="glossaries-extra-manual.html#dx1-7032" >224</a>, <a +href="glossaries-extra-manual.html#dx1-7033" >225</a>, <a +href="glossaries-extra-manual.html#dx1-7036" >226</a>, <a +href="glossaries-extra-manual.html#dx1-7041" >227</a>, <a +href="glossaries-extra-manual.html#dx1-7046" >228</a>, <a +href="glossaries-extra-manual.html#dx1-7049" >229</a>, <a +href="glossaries-extra-manual.html#dx1-7051" >230</a>, <a +href="glossaries-extra-manual.html#dx1-7053" >231</a>, <a +href="glossaries-extra-manual.html#dx1-9009" >232</a>, <a href="glossaries-extra-manual.html#dx1-9020" >233</a>, <a -href="glossaries-extra-manual.html#dx1-9024" >234</a>, <a -href="glossaries-extra-manual.html#dx1-9028" >235</a>, <a -href="glossaries-extra-manual.html#dx1-9033" >236</a>, <a -href="glossaries-extra-manual.html#dx1-9045" >237</a>, <a -href="glossaries-extra-manual.html#dx1-9046" >238</a>, <a -href="glossaries-extra-manual.html#dx1-10009" >239</a>, <a -href="glossaries-extra-manual.html#dx1-10010" >240</a>, <a -href="glossaries-extra-manual.html#dx1-12002" >241</a>, <a -href="glossaries-extra-manual.html#dx1-12025" >242</a>, <a -href="glossaries-extra-manual.html#dx1-12033" >243</a>, <a -href="glossaries-extra-manual.html#dx1-12037" >244</a>, <a -href="glossaries-extra-manual.html#dx1-12038" >245</a>, <a -href="glossaries-extra-manual.html#dx1-14016" >246</a>, <a -href="glossaries-extra-manual.html#dx1-14018" >247</a>, <a -href="glossaries-extra-manual.html#dx1-16006" >248</a>, <a -href="glossaries-extra-manual.html#dx1-16020" >249</a>, <a -href="glossaries-extra-manual.html#dx1-17003" >250</a>, <a -href="glossaries-extra-manual.html#dx1-18003" >251</a>, <a -href="glossaries-extra-manual.html#dx1-18016" >252</a>, <a -href="glossaries-extra-manual.html#dx1-18029" >253</a>, <a -href="glossaries-extra-manual.html#dx1-18042" >254</a>, <a -href="glossaries-extra-manual.html#dx1-18055" >255</a>, <a -href="glossaries-extra-manual.html#dx1-18057" >256</a>, <a -href="glossaries-extra-manual.html#dx1-18074" >257</a>, <a -href="glossaries-extra-manual.html#dx1-19045" >258</a>, <a -href="glossaries-extra-manual.html#dx1-19049" >259</a>, <a -href="glossaries-extra-manual.html#dx1-19052" >260</a>, <a -href="glossaries-extra-manual.html#dx1-19056" >261</a>, <a -href="glossaries-extra-manual.html#dx1-19060" >262</a>, <a -href="glossaries-extra-manual.html#dx1-19064" >263</a>, <a -href="glossaries-extra-manual.html#dx1-21023" >264</a>, <a -href="glossaries-extra-manual.html#dx1-21035" >265</a>, <a -href="glossaries-extra-manual.html#dx1-22037" >266</a>, <a -href="glossaries-extra-manual.html#dx1-28002" >267</a>, <a +href="glossaries-extra-manual.html#dx1-9021" >234</a>, <a +href="glossaries-extra-manual.html#dx1-9022" >235</a>, <a +href="glossaries-extra-manual.html#dx1-9023" >236</a>, <a +href="glossaries-extra-manual.html#dx1-9027" >237</a>, <a +href="glossaries-extra-manual.html#dx1-9031" >238</a>, <a +href="glossaries-extra-manual.html#dx1-9036" >239</a>, <a +href="glossaries-extra-manual.html#dx1-9049" >240</a>, <a +href="glossaries-extra-manual.html#dx1-9050" >241</a>, <a +href="glossaries-extra-manual.html#dx1-10009" >242</a>, <a +href="glossaries-extra-manual.html#dx1-10010" >243</a>, <a +href="glossaries-extra-manual.html#dx1-12002" >244</a>, <a +href="glossaries-extra-manual.html#dx1-12025" >245</a>, <a +href="glossaries-extra-manual.html#dx1-12033" >246</a>, <a +href="glossaries-extra-manual.html#dx1-12037" >247</a>, <a +href="glossaries-extra-manual.html#dx1-12040" >248</a>, <a +href="glossaries-extra-manual.html#dx1-14016" >249</a>, <a +href="glossaries-extra-manual.html#dx1-14018" >250</a>, <a +href="glossaries-extra-manual.html#dx1-16006" >251</a>, <a +href="glossaries-extra-manual.html#dx1-16020" >252</a>, <a +href="glossaries-extra-manual.html#dx1-17003" >253</a>, <a +href="glossaries-extra-manual.html#dx1-18003" >254</a>, <a +href="glossaries-extra-manual.html#dx1-18016" >255</a>, <a +href="glossaries-extra-manual.html#dx1-18029" >256</a>, <a +href="glossaries-extra-manual.html#dx1-18042" >257</a>, <a +href="glossaries-extra-manual.html#dx1-18055" >258</a>, <a +href="glossaries-extra-manual.html#dx1-18057" >259</a>, <a +href="glossaries-extra-manual.html#dx1-18074" >260</a>, <a +href="glossaries-extra-manual.html#dx1-18078" >261</a>, <a +href="glossaries-extra-manual.html#dx1-19045" >262</a>, <a +href="glossaries-extra-manual.html#dx1-19049" >263</a>, <a +href="glossaries-extra-manual.html#dx1-19052" >264</a>, <a +href="glossaries-extra-manual.html#dx1-19056" >265</a>, <a +href="glossaries-extra-manual.html#dx1-19060" >266</a>, <a +href="glossaries-extra-manual.html#dx1-19064" >267</a>, <a +href="glossaries-extra-manual.html#dx1-21023" >268</a>, <a +href="glossaries-extra-manual.html#dx1-21035" >269</a>, <a +href="glossaries-extra-manual.html#dx1-22037" >270</a>, <a +href="glossaries-extra-manual.html#dx1-28002" >271</a>, <a href="glossaries-extra-manual.html#dx1-30002" ><span -class="ecbx-1000">268</span></a>, <a -href="glossaries-extra-manual.html#dx1-30011" >269</a>, <a -href="glossaries-extra-manual.html#dx1-30013" >270</a> <br /></span> +class="ecbx-1000">272</span></a>, <a +href="glossaries-extra-manual.html#dx1-30011" >273</a>, <a +href="glossaries-extra-manual.html#dx1-30013" >274</a> <br /></span> <span class="index-item">first use flag  <a -href="glossaries-extra-manual.html#dx1-7039" >271</a>, <a -href="glossaries-extra-manual.html#dx1-20002" >272</a>, <a -href="glossaries-extra-manual.html#dx1-22020" >273</a>, <a +href="glossaries-extra-manual.html#dx1-7039" >275</a>, <a +href="glossaries-extra-manual.html#dx1-20002" >276</a>, <a +href="glossaries-extra-manual.html#dx1-22020" >277</a>, <a href="glossaries-extra-manual.html#dx1-30010" ><span -class="ecbx-1000">274</span></a> <br /></span> +class="ecbx-1000">278</span></a> <br /></span> <span class="index-item">first use text  <a href="glossaries-extra-manual.html#dx1-30012" ><span -class="ecbx-1000">275</span></a>, <a -href="glossaries-extra-manual.html#dx1-30031" >276</a> <br /></span> +class="ecbx-1000">279</span></a>, <a +href="glossaries-extra-manual.html#dx1-30031" >280</a> <br /></span> <span class="index-item"><span class="ecss-1000">fontenc </span>package  <a -href="glossaries-extra-manual.html#dx1-16024" >277</a> <br /></span> +href="glossaries-extra-manual.html#dx1-16024" >281</a> <br /></span> </p><p class="theindex"> <span class="ecbx-1000">G</span> <span class="index-item"><span class="ecss-1000">glossaries </span>package  <a -href="glossaries-extra-manual.html#dx1-2" >278</a>, <a -href="glossaries-extra-manual.html#dx1-3" >279</a>, <a -href="glossaries-extra-manual.html#dx1-4" >280</a>, <a -href="glossaries-extra-manual.html#dx1-5" >281</a>, <a -href="glossaries-extra-manual.html#dx1-6" >282</a>, <a -href="glossaries-extra-manual.html#dx1-7" >283</a>, <a -href="glossaries-extra-manual.html#dx1-2001" >284</a>, <a -href="glossaries-extra-manual.html#dx1-3001" >285</a>, <a -href="glossaries-extra-manual.html#dx1-3009" >286</a>, <a -href="glossaries-extra-manual.html#dx1-3011" >287</a>, <a -href="glossaries-extra-manual.html#dx1-3023" >288</a>, <a -href="glossaries-extra-manual.html#dx1-3033" >289</a>, <a -href="glossaries-extra-manual.html#dx1-4001" >290</a>, <a -href="glossaries-extra-manual.html#dx1-4002" >291</a>, <a -href="glossaries-extra-manual.html#dx1-4003" >292</a>, <a -href="glossaries-extra-manual.html#dx1-4004" >293</a>, <a -href="glossaries-extra-manual.html#dx1-4006" >294</a>, <a -href="glossaries-extra-manual.html#dx1-4007" >295</a>, <a -href="glossaries-extra-manual.html#dx1-4019" >296</a>, <a -href="glossaries-extra-manual.html#dx1-4025" >297</a>, <a -href="glossaries-extra-manual.html#dx1-4033" >298</a>, <a -href="glossaries-extra-manual.html#dx1-4034" >299</a>, <a -href="glossaries-extra-manual.html#dx1-4049" >300</a>, <a -href="glossaries-extra-manual.html#dx1-4053" >301</a>, <a -href="glossaries-extra-manual.html#dx1-4056" >302</a>, <a -href="glossaries-extra-manual.html#dx1-4060" >303</a>, <a -href="glossaries-extra-manual.html#dx1-4063" >304</a>, <a -href="glossaries-extra-manual.html#dx1-4066" >305</a>, <a -href="glossaries-extra-manual.html#dx1-4069" >306</a>, <a -href="glossaries-extra-manual.html#dx1-4071" >307</a>, <a -href="glossaries-extra-manual.html#dx1-5001" >308</a>, <a -href="glossaries-extra-manual.html#dx1-6003" >309</a>, <a -href="glossaries-extra-manual.html#dx1-6012" >310</a>, <a -href="glossaries-extra-manual.html#dx1-7001" >311</a>, <a -href="glossaries-extra-manual.html#dx1-7008" >312</a>, <a -href="glossaries-extra-manual.html#dx1-7020" >313</a>, <a -href="glossaries-extra-manual.html#dx1-7042" >314</a>, <a -href="glossaries-extra-manual.html#dx1-9005" >315</a>, <a -href="glossaries-extra-manual.html#dx1-9031" >316</a>, <a -href="glossaries-extra-manual.html#dx1-10002" >317</a>, <a -href="glossaries-extra-manual.html#dx1-10004" >318</a>, <a -href="glossaries-extra-manual.html#dx1-10007" >319</a>, <a -href="glossaries-extra-manual.html#dx1-12001" >320</a>, <a -href="glossaries-extra-manual.html#dx1-12011" >321</a>, <a -href="glossaries-extra-manual.html#dx1-12013" >322</a>, <a -href="glossaries-extra-manual.html#dx1-12018" >323</a>, <a -href="glossaries-extra-manual.html#dx1-12023" >324</a>, <a -href="glossaries-extra-manual.html#dx1-14006" >325</a>, <a -href="glossaries-extra-manual.html#dx1-16028" >326</a>, <a -href="glossaries-extra-manual.html#dx1-19003" >327</a>, <a -href="glossaries-extra-manual.html#dx1-19006" >328</a>, <a -href="glossaries-extra-manual.html#dx1-19008" >329</a>, <a -href="glossaries-extra-manual.html#dx1-19025" >330</a>, <a -href="glossaries-extra-manual.html#dx1-19030" >331</a>, <a -href="glossaries-extra-manual.html#dx1-19035" >332</a>, <a -href="glossaries-extra-manual.html#dx1-20001" >333</a>, <a -href="glossaries-extra-manual.html#dx1-20006" >334</a>, <a -href="glossaries-extra-manual.html#dx1-20015" >335</a>, <a -href="glossaries-extra-manual.html#dx1-21060" >336</a>, <a -href="glossaries-extra-manual.html#dx1-22007" >337</a>, <a -href="glossaries-extra-manual.html#dx1-22011" >338</a>, <a -href="glossaries-extra-manual.html#dx1-22016" >339</a>, <a -href="glossaries-extra-manual.html#dx1-23008" >340</a>, <a -href="glossaries-extra-manual.html#dx1-24001" >341</a>, <a -href="glossaries-extra-manual.html#dx1-25001" >342</a>, <a -href="glossaries-extra-manual.html#dx1-28001" >343</a>, <a -href="glossaries-extra-manual.html#dx1-29004" >344</a> <br /></span> +href="glossaries-extra-manual.html#dx1-2" >282</a>, <a +href="glossaries-extra-manual.html#dx1-3" >283</a>, <a +href="glossaries-extra-manual.html#dx1-4" >284</a>, <a +href="glossaries-extra-manual.html#dx1-5" >285</a>, <a +href="glossaries-extra-manual.html#dx1-6" >286</a>, <a +href="glossaries-extra-manual.html#dx1-7" >287</a>, <a +href="glossaries-extra-manual.html#dx1-2001" >288</a>, <a +href="glossaries-extra-manual.html#dx1-3001" >289</a>, <a +href="glossaries-extra-manual.html#dx1-3009" >290</a>, <a +href="glossaries-extra-manual.html#dx1-3011" >291</a>, <a +href="glossaries-extra-manual.html#dx1-3023" >292</a>, <a +href="glossaries-extra-manual.html#dx1-3033" >293</a>, <a +href="glossaries-extra-manual.html#dx1-4001" >294</a>, <a +href="glossaries-extra-manual.html#dx1-4002" >295</a>, <a +href="glossaries-extra-manual.html#dx1-4003" >296</a>, <a +href="glossaries-extra-manual.html#dx1-4004" >297</a>, <a +href="glossaries-extra-manual.html#dx1-4006" >298</a>, <a +href="glossaries-extra-manual.html#dx1-4007" >299</a>, <a +href="glossaries-extra-manual.html#dx1-4021" >300</a>, <a +href="glossaries-extra-manual.html#dx1-4027" >301</a>, <a +href="glossaries-extra-manual.html#dx1-4035" >302</a>, <a +href="glossaries-extra-manual.html#dx1-4036" >303</a>, <a +href="glossaries-extra-manual.html#dx1-4051" >304</a>, <a +href="glossaries-extra-manual.html#dx1-4055" >305</a>, <a +href="glossaries-extra-manual.html#dx1-4058" >306</a>, <a +href="glossaries-extra-manual.html#dx1-4062" >307</a>, <a +href="glossaries-extra-manual.html#dx1-4065" >308</a>, <a +href="glossaries-extra-manual.html#dx1-4068" >309</a>, <a +href="glossaries-extra-manual.html#dx1-4071" >310</a>, <a +href="glossaries-extra-manual.html#dx1-4073" >311</a>, <a +href="glossaries-extra-manual.html#dx1-5001" >312</a>, <a +href="glossaries-extra-manual.html#dx1-6003" >313</a>, <a +href="glossaries-extra-manual.html#dx1-6012" >314</a>, <a +href="glossaries-extra-manual.html#dx1-7001" >315</a>, <a +href="glossaries-extra-manual.html#dx1-7008" >316</a>, <a +href="glossaries-extra-manual.html#dx1-7020" >317</a>, <a +href="glossaries-extra-manual.html#dx1-7042" >318</a>, <a +href="glossaries-extra-manual.html#dx1-9005" >319</a>, <a +href="glossaries-extra-manual.html#dx1-9034" >320</a>, <a +href="glossaries-extra-manual.html#dx1-10002" >321</a>, <a +href="glossaries-extra-manual.html#dx1-10004" >322</a>, <a +href="glossaries-extra-manual.html#dx1-10007" >323</a>, <a +href="glossaries-extra-manual.html#dx1-12001" >324</a>, <a +href="glossaries-extra-manual.html#dx1-12011" >325</a>, <a +href="glossaries-extra-manual.html#dx1-12013" >326</a>, <a +href="glossaries-extra-manual.html#dx1-12018" >327</a>, <a +href="glossaries-extra-manual.html#dx1-12023" >328</a>, <a +href="glossaries-extra-manual.html#dx1-14006" >329</a>, <a +href="glossaries-extra-manual.html#dx1-16028" >330</a>, <a +href="glossaries-extra-manual.html#dx1-19003" >331</a>, <a +href="glossaries-extra-manual.html#dx1-19006" >332</a>, <a +href="glossaries-extra-manual.html#dx1-19008" >333</a>, <a +href="glossaries-extra-manual.html#dx1-19025" >334</a>, <a +href="glossaries-extra-manual.html#dx1-19030" >335</a>, <a +href="glossaries-extra-manual.html#dx1-19035" >336</a>, <a +href="glossaries-extra-manual.html#dx1-20001" >337</a>, <a +href="glossaries-extra-manual.html#dx1-20006" >338</a>, <a +href="glossaries-extra-manual.html#dx1-20015" >339</a>, <a +href="glossaries-extra-manual.html#dx1-21060" >340</a>, <a +href="glossaries-extra-manual.html#dx1-22007" >341</a>, <a +href="glossaries-extra-manual.html#dx1-22011" >342</a>, <a +href="glossaries-extra-manual.html#dx1-22016" >343</a>, <a +href="glossaries-extra-manual.html#dx1-23008" >344</a>, <a +href="glossaries-extra-manual.html#dx1-24001" >345</a>, <a +href="glossaries-extra-manual.html#dx1-25001" >346</a>, <a +href="glossaries-extra-manual.html#dx1-28001" >347</a>, <a +href="glossaries-extra-manual.html#dx1-29004" >348</a> <br /></span> <span class="index-item"><span class="ecss-1000">glossaries-accsupp </span>package  <a -href="glossaries-extra-manual.html#dx1-4009" >345</a>, <a -href="glossaries-extra-manual.html#dx1-4010" >346</a>, <a -href="glossaries-extra-manual.html#dx1-4013" >347</a>, <a -href="glossaries-extra-manual.html#dx1-4016" >348</a>, <a -href="glossaries-extra-manual.html#dx1-19081" >349</a>, <a -href="glossaries-extra-manual.html#dx1-19082" >350</a>, <a -href="glossaries-extra-manual.html#dx1-25003" >351</a>, <a -href="glossaries-extra-manual.html#dx1-27001" >352</a>, <a -href="glossaries-extra-manual.html#dx1-27003" >353</a>, <a -href="glossaries-extra-manual.html#dx1-27004" >354</a>, <a -href="glossaries-extra-manual.html#dx1-27007" >355</a>, <a -href="glossaries-extra-manual.html#dx1-27009" >356</a>, <a -href="glossaries-extra-manual.html#dx1-27011" >357</a>, <a -href="glossaries-extra-manual.html#dx1-27012" >358</a>, <a -href="glossaries-extra-manual.html#dx1-28015" >359</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4009" >349</a>, <a +href="glossaries-extra-manual.html#dx1-4010" >350</a>, <a +href="glossaries-extra-manual.html#dx1-4013" >351</a>, <a +href="glossaries-extra-manual.html#dx1-4016" >352</a>, <a +href="glossaries-extra-manual.html#dx1-19081" >353</a>, <a +href="glossaries-extra-manual.html#dx1-19082" >354</a>, <a +href="glossaries-extra-manual.html#dx1-25003" >355</a>, <a +href="glossaries-extra-manual.html#dx1-27001" >356</a>, <a +href="glossaries-extra-manual.html#dx1-27003" >357</a>, <a +href="glossaries-extra-manual.html#dx1-27004" >358</a>, <a +href="glossaries-extra-manual.html#dx1-27007" >359</a>, <a +href="glossaries-extra-manual.html#dx1-27009" >360</a>, <a +href="glossaries-extra-manual.html#dx1-27011" >361</a>, <a +href="glossaries-extra-manual.html#dx1-27012" >362</a>, <a +href="glossaries-extra-manual.html#dx1-28015" >363</a> <br /></span> +<span class="index-item"><span +class="ecss-1000">glossaries-extra </span>package  <a +href="glossaries-extra-manual.html#dx1-11019" >364</a> <br /></span> +<span class="index-item"><span +class="ecss-1000">glossaries-extra-stylemods </span>package  <a +href="glossaries-extra-manual.html#dx1-4018" >365</a>, <a +href="glossaries-extra-manual.html#dx1-11018" >366</a>, <a +href="glossaries-extra-manual.html#dx1-11020" >367</a> <br /></span> <span class="index-item"><span class="ecss-1000">glossaries-prefix </span>package  <a -href="glossaries-extra-manual.html#dx1-25002" >360</a>, <a -href="glossaries-extra-manual.html#dx1-26001" >361</a>, <a -href="glossaries-extra-manual.html#dx1-28016" >362</a> <br /></span> +href="glossaries-extra-manual.html#dx1-25002" >368</a>, <a +href="glossaries-extra-manual.html#dx1-26001" >369</a>, <a +href="glossaries-extra-manual.html#dx1-28016" >370</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glossariesextrasetup</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-4085" ><span -class="ecti-1000">363</span></a> <br /></span> +href="glossaries-extra-manual.html#dx1-4087" ><span +class="ecti-1000">371</span></a> <br /></span> +<span class="index-item">glossary styles:<br /></span> +<span class="index-subitem">    <span +class="ecss-1000">inline</span>  <a +href="glossaries-extra-manual.html#dx1-11024" >372</a>, <a +href="glossaries-extra-manual.html#dx1-11026" >373</a> <br /></span> +<span class="index-subitem">    <span +class="ecss-1000">long3col</span>  <a +href="glossaries-extra-manual.html#dx1-11022" >374</a> <br /></span> +<span class="index-item"><span +class="ecss-1000">glossary-inline </span>package  <a +href="glossaries-extra-manual.html#dx1-11025" >375</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsabbrvdefaultfont</span></span></span>  <a href="glossaries-extra-manual.html#dx1-12029" ><span -class="ecti-1000">364</span></a> <br /></span> +class="ecti-1000">376</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsabbrvfont</span></span></span>  <a href="glossaries-extra-manual.html#dx1-12026" ><span -class="ecti-1000">365</span></a>, <a +class="ecti-1000">377</span></a>, <a href="glossaries-extra-manual.html#dx1-19048" ><span -class="ecti-1000">366</span></a> <br /></span> +class="ecti-1000">378</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsaccessdesc</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27039" ><span -class="ecti-1000">367</span></a> <br /></span> +class="ecti-1000">379</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsaccessdesc</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27037" ><span -class="ecti-1000">368</span></a> <br /></span> +class="ecti-1000">380</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsaccessdescplural</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27043" ><span -class="ecti-1000">369</span></a> <br /></span> +class="ecti-1000">381</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsaccessdescplural</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27041" ><span -class="ecti-1000">370</span></a> <br /></span> +class="ecti-1000">382</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsaccessfirst</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27023" ><span -class="ecti-1000">371</span></a> <br /></span> +class="ecti-1000">383</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsaccessfirst</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27021" ><span -class="ecti-1000">372</span></a> <br /></span> +class="ecti-1000">384</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsaccessfirstplural</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27027" ><span -class="ecti-1000">373</span></a> <br /></span> +class="ecti-1000">385</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsaccessfirstplural</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27025" ><span -class="ecti-1000">374</span></a> <br /></span> +class="ecti-1000">386</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsaccesslong</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27055" ><span -class="ecti-1000">375</span></a> <br /></span> +class="ecti-1000">387</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsaccesslong</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27053" ><span -class="ecti-1000">376</span></a> <br /></span> +class="ecti-1000">388</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsaccesslongpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27059" ><span -class="ecti-1000">377</span></a> <br /></span> +class="ecti-1000">389</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsaccesslongpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27057" ><span -class="ecti-1000">378</span></a> <br /></span> +class="ecti-1000">390</span></a> <br /></span> + + + <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsaccessname</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27010" ><span -class="ecti-1000">379</span></a> <br /></span> +class="ecti-1000">391</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsaccessname</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27005" ><span -class="ecti-1000">380</span></a> <br /></span> +class="ecti-1000">392</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsaccessplural</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27019" ><span -class="ecti-1000">381</span></a> <br /></span> +class="ecti-1000">393</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsaccessplural</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27017" ><span -class="ecti-1000">382</span></a> <br /></span> +class="ecti-1000">394</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsaccessshort</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27047" ><span -class="ecti-1000">383</span></a> <br /></span> +class="ecti-1000">395</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsaccessshort</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27045" ><span -class="ecti-1000">384</span></a> <br /></span> - - - +class="ecti-1000">396</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsaccessshortpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27051" ><span -class="ecti-1000">385</span></a> <br /></span> +class="ecti-1000">397</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsaccessshortpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27049" ><span -class="ecti-1000">386</span></a> <br /></span> +class="ecti-1000">398</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsaccesssymbol</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27031" ><span -class="ecti-1000">387</span></a> <br /></span> +class="ecti-1000">399</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsaccesssymbol</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27029" ><span -class="ecti-1000">388</span></a> <br /></span> +class="ecti-1000">400</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsaccesssymbolplural</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27035" ><span -class="ecti-1000">389</span></a> <br /></span> +class="ecti-1000">401</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsaccesssymbolplural</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27033" ><span -class="ecti-1000">390</span></a> <br /></span> +class="ecti-1000">402</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsaccesstext</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27015" ><span -class="ecti-1000">391</span></a> <br /></span> +class="ecti-1000">403</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsaccesstext</span></span></span>  <a href="glossaries-extra-manual.html#dx1-27013" ><span -class="ecti-1000">392</span></a> <br /></span> +class="ecti-1000">404</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsacspace</span></span></span>  <a href="glossaries-extra-manual.html#dx1-10005" ><span -class="ecti-1000">393</span></a> <br /></span> +class="ecti-1000">405</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsacspacemax</span></span></span>  <a href="glossaries-extra-manual.html#dx1-10008" ><span -class="ecti-1000">394</span></a> <br /></span> +class="ecti-1000">406</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glscategory</span></span></span>  <a href="glossaries-extra-manual.html#dx1-21015" ><span -class="ecti-1000">395</span></a> <br /></span> +class="ecti-1000">407</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glscategorylabel</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19039" ><span -class="ecti-1000">396</span></a> <br /></span> +class="ecti-1000">408</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glscurrententrylabel</span></span></span>  <a href="glossaries-extra-manual.html#dx1-11015" ><span -class="ecti-1000">397</span></a> <br /></span> +class="ecti-1000">409</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsentrycurrcount</span></span></span>  <a href="glossaries-extra-manual.html#dx1-22033" ><span -class="ecti-1000">398</span></a> <br /></span> +class="ecti-1000">410</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsentryprevcount</span></span></span>  <a href="glossaries-extra-manual.html#dx1-22034" ><span -class="ecti-1000">399</span></a> <br /></span> +class="ecti-1000">411</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsentryprevmaxcount</span></span></span>  <a href="glossaries-extra-manual.html#dx1-22036" ><span -class="ecti-1000">400</span></a> <br /></span> +class="ecti-1000">412</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsentryprevtotalcount</span></span></span>  <a href="glossaries-extra-manual.html#dx1-22035" ><span -class="ecti-1000">401</span></a> <br /></span> +class="ecti-1000">413</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsfirstabbrvdefaultfont</span></span></span>  <a href="glossaries-extra-manual.html#dx1-12032" ><span -class="ecti-1000">402</span></a> <br /></span> +class="ecti-1000">414</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsfirstabbrvfont</span></span></span>  <a href="glossaries-extra-manual.html#dx1-12024" ><span -class="ecti-1000">403</span></a>, <a +class="ecti-1000">415</span></a>, <a href="glossaries-extra-manual.html#dx1-19046" ><span -class="ecti-1000">404</span></a> <br /></span> +class="ecti-1000">416</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsfirstlongdefaultfont</span></span></span>  <a href="glossaries-extra-manual.html#dx1-12036" ><span -class="ecti-1000">405</span></a> <br /></span> +class="ecti-1000">417</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsfirstlongfont</span></span></span>  <a href="glossaries-extra-manual.html#dx1-12034" ><span -class="ecti-1000">406</span></a>, <a +class="ecti-1000">418</span></a>, <a href="glossaries-extra-manual.html#dx1-19050" ><span -class="ecti-1000">407</span></a> <br /></span> +class="ecti-1000">419</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsfmtfirst</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-20035" ><span -class="ecti-1000">408</span></a> <br /></span> +href="glossaries-extra-manual.html#dx1-20043" ><span +class="ecti-1000">420</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsfmtfirst</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-20034" ><span -class="ecti-1000">409</span></a> <br /></span> +href="glossaries-extra-manual.html#dx1-20042" ><span +class="ecti-1000">421</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsfmtfirstpl</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-20037" ><span -class="ecti-1000">410</span></a> <br /></span> +href="glossaries-extra-manual.html#dx1-20045" ><span +class="ecti-1000">422</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsfmtfirstpl</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-20036" ><span -class="ecti-1000">411</span></a> <br /></span> +href="glossaries-extra-manual.html#dx1-20044" ><span +class="ecti-1000">423</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span -class="ectt-1000">\Glsfmtplural</span></span></span>  <a +class="ectt-1000">\Glsfmtfull</span></span></span>  <a +href="glossaries-extra-manual.html#dx1-20034" ><span +class="ecti-1000">424</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ectt-1000">\glsfmtfull</span></span></span>  <a href="glossaries-extra-manual.html#dx1-20032" ><span -class="ecti-1000">412</span></a> <br /></span> +class="ecti-1000">425</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span -class="ectt-1000">\glsfmtplural</span></span></span>  <a +class="ectt-1000">\Glsfmtfullpl</span></span></span>  <a +href="glossaries-extra-manual.html#dx1-20035" ><span +class="ecti-1000">426</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ectt-1000">\glsfmtfullpl</span></span></span>  <a +href="glossaries-extra-manual.html#dx1-20033" ><span +class="ecti-1000">427</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ectt-1000">\Glsfmtlong</span></span></span>  <a +href="glossaries-extra-manual.html#dx1-20030" ><span +class="ecti-1000">428</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ectt-1000">\glsfmtlong</span></span></span>  <a +href="glossaries-extra-manual.html#dx1-20028" ><span +class="ecti-1000">429</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ectt-1000">\Glsfmtlongpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-20031" ><span -class="ecti-1000">413</span></a> <br /></span> +class="ecti-1000">430</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ectt-1000">\glsfmtlongpl</span></span></span>  <a +href="glossaries-extra-manual.html#dx1-20029" ><span +class="ecti-1000">431</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ectt-1000">\Glsfmtplural</span></span></span>  <a +href="glossaries-extra-manual.html#dx1-20040" ><span +class="ecti-1000">432</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ectt-1000">\glsfmtplural</span></span></span>  <a +href="glossaries-extra-manual.html#dx1-20039" ><span +class="ecti-1000">433</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsfmtshort</span></span></span>  <a href="glossaries-extra-manual.html#dx1-20026" ><span -class="ecti-1000">414</span></a> <br /></span> +class="ecti-1000">434</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsfmtshort</span></span></span>  <a href="glossaries-extra-manual.html#dx1-20024" ><span -class="ecti-1000">415</span></a> <br /></span> +class="ecti-1000">435</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsfmtshortpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-20027" ><span -class="ecti-1000">416</span></a> <br /></span> +class="ecti-1000">436</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsfmtshortpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-20025" ><span -class="ecti-1000">417</span></a> <br /></span> +class="ecti-1000">437</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsfmttext</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-20030" ><span -class="ecti-1000">418</span></a> <br /></span> +href="glossaries-extra-manual.html#dx1-20038" ><span +class="ecti-1000">438</span></a> <br /></span> + + + <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsfmttext</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-20029" ><span -class="ecti-1000">419</span></a> <br /></span> +href="glossaries-extra-manual.html#dx1-20037" ><span +class="ecti-1000">439</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsforeachwithattribute</span></span></span>  <a href="glossaries-extra-manual.html#dx1-21094" ><span -class="ecti-1000">420</span></a> <br /></span> +class="ecti-1000">440</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsgetattribute</span></span></span>  <a href="glossaries-extra-manual.html#dx1-21082" ><span -class="ecti-1000">421</span></a> <br /></span> +class="ecti-1000">441</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsgetcategoryattribute</span></span></span>  <a href="glossaries-extra-manual.html#dx1-21081" ><span -class="ecti-1000">422</span></a> <br /></span> +class="ecti-1000">442</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glshasattribute</span></span></span>  <a href="glossaries-extra-manual.html#dx1-21085" ><span -class="ecti-1000">423</span></a> <br /></span> +class="ecti-1000">443</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glshascategoryattribute</span></span></span>  <a href="glossaries-extra-manual.html#dx1-21083" ><span -class="ecti-1000">424</span></a> <br /></span> +class="ecti-1000">444</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsifattribute</span></span></span>  <a href="glossaries-extra-manual.html#dx1-21090" ><span -class="ecti-1000">425</span></a> <br /></span> +class="ecti-1000">445</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsifcategory</span></span></span>  <a href="glossaries-extra-manual.html#dx1-21016" ><span -class="ecti-1000">426</span></a> <br /></span> +class="ecti-1000">446</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsifcategoryattribute</span></span></span>  <a href="glossaries-extra-manual.html#dx1-21086" ><span -class="ecti-1000">427</span></a> <br /></span> +class="ecti-1000">447</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsifregular</span></span></span>  <a href="glossaries-extra-manual.html#dx1-21093" ><span -class="ecti-1000">428</span></a> <br /></span> +class="ecti-1000">448</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsifregularcategory</span></span></span>  <a href="glossaries-extra-manual.html#dx1-21092" ><span -class="ecti-1000">429</span></a> <br /></span> +class="ecti-1000">449</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glskeylisttok</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19037" ><span -class="ecti-1000">430</span></a> <br /></span> +class="ecti-1000">450</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glslabeltok</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19036" ><span -class="ecti-1000">431</span></a> <br /></span> +class="ecti-1000">451</span></a> <br /></span> <span class="index-item"><span class="ectt-1000">\glslink </span>options<br /></span> - - - <span class="index-subitem">    <span class="ecss-1000">format</span>  <a -href="glossaries-extra-manual.html#dx1-23013" >432</a>, <a -href="glossaries-extra-manual.html#dx1-23015" >433</a> <br /></span> +href="glossaries-extra-manual.html#dx1-23013" >452</a>, <a +href="glossaries-extra-manual.html#dx1-23015" >453</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">hyper</span>  <a -href="glossaries-extra-manual.html#dx1-21024" >434</a>, <a -href="glossaries-extra-manual.html#dx1-21027" >435</a> <br /></span> +href="glossaries-extra-manual.html#dx1-21024" >454</a>, <a +href="glossaries-extra-manual.html#dx1-21027" >455</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">noindex</span>  <a -href="glossaries-extra-manual.html#dx1-6001" >436</a>, <a -href="glossaries-extra-manual.html#dx1-6007" >437</a>, <a -href="glossaries-extra-manual.html#dx1-20018" >438</a>, <a -href="glossaries-extra-manual.html#dx1-23025" >439</a> <br /></span> +href="glossaries-extra-manual.html#dx1-6001" >456</a>, <a +href="glossaries-extra-manual.html#dx1-6007" >457</a>, <a +href="glossaries-extra-manual.html#dx1-20018" >458</a>, <a +href="glossaries-extra-manual.html#dx1-23025" >459</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glslinkcheckfirsthyperhook</span></span></span>  <a href="glossaries-extra-manual.html#dx1-22040" ><span -class="ecti-1000">440</span></a> <br /></span> +class="ecti-1000">460</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glslongpltok</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19032" ><span -class="ecti-1000">441</span></a> <br /></span> +class="ecti-1000">461</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glslongtok</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19031" ><span -class="ecti-1000">442</span></a> <br /></span> +class="ecti-1000">462</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glssetattribute</span></span></span>  <a href="glossaries-extra-manual.html#dx1-21080" ><span -class="ecti-1000">443</span></a> <br /></span> +class="ecti-1000">463</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glssetcategoryattribute</span></span></span>  <a href="glossaries-extra-manual.html#dx1-21077" ><span -class="ecti-1000">444</span></a> <br /></span> +class="ecti-1000">464</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glssetregularcategory</span></span></span>  <a href="glossaries-extra-manual.html#dx1-21079" ><span -class="ecti-1000">445</span></a> <br /></span> +class="ecti-1000">465</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsshortpltok</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19027" ><span -class="ecti-1000">446</span></a> <br /></span> +class="ecti-1000">466</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsshorttok</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19026" ><span -class="ecti-1000">447</span></a> <br /></span> +class="ecti-1000">467</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsxtr</span></span></span>  <a href="glossaries-extra-manual.html#dx1-24015" ><span -class="ecti-1000">448</span></a> <br /></span> +class="ecti-1000">468</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtr</span></span></span>  <a href="glossaries-extra-manual.html#dx1-24010" ><span -class="ecti-1000">449</span></a> <br /></span> +class="ecti-1000">469</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtraddallcrossrefs</span></span></span>  <a href="glossaries-extra-manual.html#dx1-6021" ><span -class="ecti-1000">450</span></a> <br /></span> +class="ecti-1000">470</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrdoautoindexname</span></span></span>  <a href="glossaries-extra-manual.html#dx1-23010" ><span -class="ecti-1000">451</span></a> <br /></span> +class="ecti-1000">471</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrdowrglossaryhook</span></span></span>  <a href="glossaries-extra-manual.html#dx1-6010" ><span -class="ecti-1000">452</span></a> <br /></span> +class="ecti-1000">472</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrEnableEntryCounting</span></span></span>  <a href="glossaries-extra-manual.html#dx1-22025" ><span -class="ecti-1000">453</span></a> <br /></span> +class="ecti-1000">473</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrEnableEntryUnitCounting</span></span></span>  <a href="glossaries-extra-manual.html#dx1-22028" ><span -class="ecti-1000">454</span></a> <br /></span> +class="ecti-1000">474</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrEnableIndexFormatOverride</span></span></span>  <a href="glossaries-extra-manual.html#dx1-23016" ><span -class="ecti-1000">455</span></a> <br /></span> +class="ecti-1000">475</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrEnableInitialTagging</span></span></span>  <a href="glossaries-extra-manual.html#dx1-13001" ><span -class="ecti-1000">456</span></a> <br /></span> +class="ecti-1000">476</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrEnableOnTheFly</span></span></span>  <a href="glossaries-extra-manual.html#dx1-24008" ><span -class="ecti-1000">457</span></a> <br /></span> +class="ecti-1000">477</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GLSxtrfull</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14024" ><span -class="ecti-1000">458</span></a> <br /></span> +class="ecti-1000">478</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsxtrfull</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14021" ><span -class="ecti-1000">459</span></a> <br /></span> +class="ecti-1000">479</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrfull</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14014" ><span -class="ecti-1000">460</span></a> <br /></span> +class="ecti-1000">480</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsxtrfullformat</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19058" ><span -class="ecti-1000">461</span></a> <br /></span> +class="ecti-1000">481</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrfullformat</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19054" ><span -class="ecti-1000">462</span></a> <br /></span> +class="ecti-1000">482</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GLSxtrfullpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14033" ><span -class="ecti-1000">463</span></a> <br /></span> +class="ecti-1000">483</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsxtrfullpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14032" ><span -class="ecti-1000">464</span></a> <br /></span> +class="ecti-1000">484</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrfullpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14031" ><span -class="ecti-1000">465</span></a> <br /></span> +class="ecti-1000">485</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsxtrfullplformat</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19066" ><span -class="ecti-1000">466</span></a> <br /></span> +class="ecti-1000">486</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrfullplformat</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19062" ><span -class="ecti-1000">467</span></a> <br /></span> +class="ecti-1000">487</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrfullsep</span></span></span>  <a href="glossaries-extra-manual.html#dx1-16039" ><span -class="ecti-1000">468</span></a> <br /></span> +class="ecti-1000">488</span></a> <br /></span> + + + <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrifcounttrigger</span></span></span>  <a href="glossaries-extra-manual.html#dx1-22019" ><span -class="ecti-1000">469</span></a> <br /></span> +class="ecti-1000">489</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrifwasfirstuse</span></span></span>  <a href="glossaries-extra-manual.html#dx1-7040" ><span -class="ecti-1000">470</span></a> <br /></span> +class="ecti-1000">490</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsxtrinlinefullformat</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19073" ><span -class="ecti-1000">471</span></a> <br /></span> +class="ecti-1000">491</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrinlinefullformat</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19070" ><span -class="ecti-1000">472</span></a> <br /></span> +class="ecti-1000">492</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsxtrinlinefullplformat</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19080" ><span -class="ecti-1000">473</span></a> <br /></span> +class="ecti-1000">493</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrinlinefullplformat</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19077" ><span -class="ecti-1000">474</span></a> <br /></span> +class="ecti-1000">494</span></a> <br /></span> +<span class="index-item"><span class="obeylines-h"><span class="verb"><span +class="ectt-1000">\glsxtrinsertinsidetrue</span></span></span>  <a +href="glossaries-extra-manual.html#dx1-12038" ><span +class="ecti-1000">495</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsxtrlong</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14020" ><span -class="ecti-1000">475</span></a>, <a +class="ecti-1000">496</span></a>, <a href="glossaries-extra-manual.html#dx1-14023" ><span -class="ecti-1000">476</span></a> <br /></span> +class="ecti-1000">497</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrlong</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14012" ><span -class="ecti-1000">477</span></a> <br /></span> +class="ecti-1000">498</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GLSxtrlongpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14030" ><span -class="ecti-1000">478</span></a> <br /></span> +class="ecti-1000">499</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsxtrlongpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14029" ><span -class="ecti-1000">479</span></a> <br /></span> +class="ecti-1000">500</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrlongpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14028" ><span -class="ecti-1000">480</span></a> <br /></span> +class="ecti-1000">501</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrnewnumber</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-4061" ><span -class="ecti-1000">481</span></a> <br /></span> +href="glossaries-extra-manual.html#dx1-4063" ><span +class="ecti-1000">502</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrnewsymbol</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-4057" ><span -class="ecti-1000">482</span></a> <br /></span> +href="glossaries-extra-manual.html#dx1-4059" ><span +class="ecti-1000">503</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrNoGlsWarningAutoMake</span></span></span>  <a href="glossaries-extra-manual.html#dx1-29018" ><span -class="ecti-1000">483</span></a> <br /></span> - - - +class="ecti-1000">504</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrNoGlsWarningBuildInfo</span></span></span>  <a href="glossaries-extra-manual.html#dx1-29017" ><span -class="ecti-1000">484</span></a> <br /></span> +class="ecti-1000">505</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrNoGlsWarningCheckFile</span></span></span>  <a href="glossaries-extra-manual.html#dx1-29013" ><span -class="ecti-1000">485</span></a> <br /></span> +class="ecti-1000">506</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrNoGlsWarningEmptyMain</span></span></span>  <a href="glossaries-extra-manual.html#dx1-29011" ><span -class="ecti-1000">486</span></a> <br /></span> +class="ecti-1000">507</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrNoGlsWarningEmptyNotMain</span></span></span>  <a href="glossaries-extra-manual.html#dx1-29012" ><span -class="ecti-1000">487</span></a> <br /></span> +class="ecti-1000">508</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrNoGlsWarningEmptyStart</span></span></span>  <a href="glossaries-extra-manual.html#dx1-29010" ><span -class="ecti-1000">488</span></a> <br /></span> +class="ecti-1000">509</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrNoGlsWarningHead</span></span></span>  <a href="glossaries-extra-manual.html#dx1-29009" ><span -class="ecti-1000">489</span></a> <br /></span> +class="ecti-1000">510</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrNoGlsWarningMisMatch</span></span></span>  <a href="glossaries-extra-manual.html#dx1-29014" ><span -class="ecti-1000">490</span></a> <br /></span> +class="ecti-1000">511</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrNoGlsWarningNoOut</span></span></span>  <a href="glossaries-extra-manual.html#dx1-29015" ><span -class="ecti-1000">491</span></a> <br /></span> +class="ecti-1000">512</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrNoGlsWarningTail</span></span></span>  <a href="glossaries-extra-manual.html#dx1-29016" ><span -class="ecti-1000">492</span></a> <br /></span> +class="ecti-1000">513</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsxtrpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-24016" ><span -class="ecti-1000">493</span></a> <br /></span> +class="ecti-1000">514</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-24014" ><span -class="ecti-1000">494</span></a> <br /></span> +class="ecti-1000">515</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrpostdescription</span></span></span>  <a href="glossaries-extra-manual.html#dx1-11011" ><span -class="ecti-1000">495</span></a> <br /></span> +class="ecti-1000">516</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrpostlink</span></span></span>  <a href="glossaries-extra-manual.html#dx1-7024" ><span -class="ecti-1000">496</span></a> <br /></span> +class="ecti-1000">517</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrpostlinkAddDescOnFirstUse</span></span></span>  <a href="glossaries-extra-manual.html#dx1-7031" ><span -class="ecti-1000">497</span></a> <br /></span> +class="ecti-1000">518</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrpostlinkAddSymbolOnFirstUse</span></span></span>  <a href="glossaries-extra-manual.html#dx1-7035" ><span -class="ecti-1000">498</span></a> <br /></span> +class="ecti-1000">519</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrpostlinkendsentence</span></span></span>  <a href="glossaries-extra-manual.html#dx1-7025" ><span -class="ecti-1000">499</span></a> <br /></span> +class="ecti-1000">520</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrpostlinkhook</span></span></span>  <a href="glossaries-extra-manual.html#dx1-7022" ><span -class="ecti-1000">500</span></a> <br /></span> +class="ecti-1000">521</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrpostnamehook</span></span></span>  <a href="glossaries-extra-manual.html#dx1-11008" ><span -class="ecti-1000">501</span></a> <br /></span> +class="ecti-1000">522</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrPostNewAbbreviation</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19020" ><span -class="ecti-1000">502</span></a> <br /></span> +class="ecti-1000">523</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrRevertMarks</span></span></span>  <a href="glossaries-extra-manual.html#dx1-20014" ><span -class="ecti-1000">503</span></a> <br /></span> +class="ecti-1000">524</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrscfont</span></span></span>  <a href="glossaries-extra-manual.html#dx1-16025" ><span -class="ecti-1000">504</span></a> <br /></span> +class="ecti-1000">525</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrscsuffix</span></span></span>  <a href="glossaries-extra-manual.html#dx1-16026" ><span -class="ecti-1000">505</span></a> <br /></span> +class="ecti-1000">526</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrSetActualChar</span></span></span>  <a href="glossaries-extra-manual.html#dx1-23032" ><span -class="ecti-1000">506</span></a> <br /></span> +class="ecti-1000">527</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrSetAltModifier</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-7060" ><span -class="ecti-1000">507</span></a> <br /></span> +href="glossaries-extra-manual.html#dx1-7062" ><span +class="ecti-1000">528</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrsetcategory</span></span></span>  <a href="glossaries-extra-manual.html#dx1-21096" ><span -class="ecti-1000">508</span></a> <br /></span> +class="ecti-1000">529</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrsetcategoryforall</span></span></span>  <a href="glossaries-extra-manual.html#dx1-21098" ><span -class="ecti-1000">509</span></a> <br /></span> +class="ecti-1000">530</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrSetDefaultGlsOpts</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-7057" ><span -class="ecti-1000">510</span></a> <br /></span> +href="glossaries-extra-manual.html#dx1-7059" ><span +class="ecti-1000">531</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrSetEncapChar</span></span></span>  <a href="glossaries-extra-manual.html#dx1-23035" ><span -class="ecti-1000">511</span></a> <br /></span> +class="ecti-1000">532</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrSetEscChar</span></span></span>  <a href="glossaries-extra-manual.html#dx1-23034" ><span -class="ecti-1000">512</span></a> <br /></span> +class="ecti-1000">533</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrSetLevelChar</span></span></span>  <a href="glossaries-extra-manual.html#dx1-23033" ><span -class="ecti-1000">513</span></a> <br /></span> +class="ecti-1000">534</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsxtrshort</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14019" ><span -class="ecti-1000">514</span></a>, <a +class="ecti-1000">535</span></a>, <a href="glossaries-extra-manual.html#dx1-14022" ><span -class="ecti-1000">515</span></a> <br /></span> +class="ecti-1000">536</span></a> <br /></span> + + + <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrshort</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14010" ><span -class="ecti-1000">516</span></a> <br /></span> +class="ecti-1000">537</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GLSxtrshortpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14027" ><span -class="ecti-1000">517</span></a> <br /></span> +class="ecti-1000">538</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\Glsxtrshortpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14026" ><span -class="ecti-1000">518</span></a> <br /></span> +class="ecti-1000">539</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrshortpl</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14025" ><span -class="ecti-1000">519</span></a> <br /></span> +class="ecti-1000">540</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrsmfont</span></span></span>  <a href="glossaries-extra-manual.html#dx1-16032" ><span -class="ecti-1000">520</span></a> <br /></span> +class="ecti-1000">541</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrsmsuffix</span></span></span>  <a href="glossaries-extra-manual.html#dx1-16035" ><span -class="ecti-1000">521</span></a> <br /></span> +class="ecti-1000">542</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\glsxtrtagfont</span></span></span>  <a href="glossaries-extra-manual.html#dx1-13003" ><span -class="ecti-1000">522</span></a> <br /></span> +class="ecti-1000">543</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrUseAbbrStyleFmts</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19084" ><span -class="ecti-1000">523</span></a> <br /></span> +class="ecti-1000">544</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrUseAbbrStyleSetup</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19040" ><span -class="ecti-1000">524</span></a> <br /></span> +class="ecti-1000">545</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\GlsXtrWarning</span></span></span>  <a href="glossaries-extra-manual.html#dx1-24012" ><span -class="ecti-1000">525</span></a> <br /></span> +class="ecti-1000">546</span></a> <br /></span> </p><p class="theindex"> <span class="ecbx-1000">H</span> <span class="index-item"><span class="ecss-1000">hyperref </span>package  <a -href="glossaries-extra-manual.html#dx1-9027" >526</a>, <a -href="glossaries-extra-manual.html#dx1-18058" >527</a>, <a -href="glossaries-extra-manual.html#dx1-20003" >528</a>, <a -href="glossaries-extra-manual.html#dx1-20004" >529</a>, <a -href="glossaries-extra-manual.html#dx1-20005" >530</a>, <a -href="glossaries-extra-manual.html#dx1-20010" >531</a>, <a -href="glossaries-extra-manual.html#dx1-20017" >532</a>, <a -href="glossaries-extra-manual.html#dx1-22030" >533</a>, <a -href="glossaries-extra-manual.html#dx1-23017" >534</a>, <a -href="glossaries-extra-manual.html#dx1-28007" >535</a> <br /></span> +href="glossaries-extra-manual.html#dx1-9030" >547</a>, <a +href="glossaries-extra-manual.html#dx1-18058" >548</a>, <a +href="glossaries-extra-manual.html#dx1-20003" >549</a>, <a +href="glossaries-extra-manual.html#dx1-20004" >550</a>, <a +href="glossaries-extra-manual.html#dx1-20005" >551</a>, <a +href="glossaries-extra-manual.html#dx1-20010" >552</a>, <a +href="glossaries-extra-manual.html#dx1-20017" >553</a>, <a +href="glossaries-extra-manual.html#dx1-22030" >554</a>, <a +href="glossaries-extra-manual.html#dx1-23017" >555</a>, <a +href="glossaries-extra-manual.html#dx1-28007" >556</a> <br /></span> </p><p class="theindex"> <span class="ecbx-1000">L</span> - - - <span class="index-item">link-text  <a -href="glossaries-extra-manual.html#dx1-7002" >536</a>, <a -href="glossaries-extra-manual.html#dx1-7004" >537</a>, <a -href="glossaries-extra-manual.html#dx1-7021" >538</a>, <a -href="glossaries-extra-manual.html#dx1-7030" >539</a>, <a -href="glossaries-extra-manual.html#dx1-7038" >540</a>, <a -href="glossaries-extra-manual.html#dx1-7043" >541</a>, <a -href="glossaries-extra-manual.html#dx1-7047" >542</a>, <a -href="glossaries-extra-manual.html#dx1-7050" >543</a>, <a -href="glossaries-extra-manual.html#dx1-7054" >544</a>, <a -href="glossaries-extra-manual.html#dx1-9035" >545</a>, <a -href="glossaries-extra-manual.html#dx1-9036" >546</a>, <a -href="glossaries-extra-manual.html#dx1-18073" >547</a>, <a -href="glossaries-extra-manual.html#dx1-21031" >548</a>, <a -href="glossaries-extra-manual.html#dx1-28003" >549</a>, <a +href="glossaries-extra-manual.html#dx1-7002" >557</a>, <a +href="glossaries-extra-manual.html#dx1-7004" >558</a>, <a +href="glossaries-extra-manual.html#dx1-7021" >559</a>, <a +href="glossaries-extra-manual.html#dx1-7030" >560</a>, <a +href="glossaries-extra-manual.html#dx1-7038" >561</a>, <a +href="glossaries-extra-manual.html#dx1-7043" >562</a>, <a +href="glossaries-extra-manual.html#dx1-7047" >563</a>, <a +href="glossaries-extra-manual.html#dx1-7052" >564</a>, <a +href="glossaries-extra-manual.html#dx1-7056" >565</a>, <a +href="glossaries-extra-manual.html#dx1-9038" >566</a>, <a +href="glossaries-extra-manual.html#dx1-9039" >567</a>, <a +href="glossaries-extra-manual.html#dx1-18073" >568</a>, <a +href="glossaries-extra-manual.html#dx1-21031" >569</a>, <a +href="glossaries-extra-manual.html#dx1-28003" >570</a>, <a href="glossaries-extra-manual.html#dx1-30018" ><span -class="ecbx-1000">550</span></a> <br /></span> +class="ecbx-1000">571</span></a> <br /></span> <span class="index-item">location list  <a -href="glossaries-extra-manual.html#dx1-28006" >551</a>, <a +href="glossaries-extra-manual.html#dx1-28006" >572</a>, <a href="glossaries-extra-manual.html#dx1-30020" ><span -class="ecbx-1000">552</span></a> <br /></span> +class="ecbx-1000">573</span></a> <br /></span> </p><p class="theindex"> <span class="ecbx-1000">M</span> <span class="index-item"><span class="ectt-1000">makeglossaries</span>  <a -href="glossaries-extra-manual.html#dx1-3030" >553</a>, <a -href="glossaries-extra-manual.html#dx1-3032" >554</a>, <a -href="glossaries-extra-manual.html#dx1-3034" >555</a>, <a +href="glossaries-extra-manual.html#dx1-3030" >574</a>, <a +href="glossaries-extra-manual.html#dx1-3032" >575</a>, <a +href="glossaries-extra-manual.html#dx1-3034" >576</a>, <a href="glossaries-extra-manual.html#dx1-30023" ><span -class="ecbx-1000">556</span></a> <br /></span> +class="ecbx-1000">577</span></a> <br /></span> <span class="index-item"><span class="ectt-1000">makeindex</span>  <a -href="glossaries-extra-manual.html#dx1-3025" >557</a>, <a -href="glossaries-extra-manual.html#dx1-3031" >558</a>, <a -href="glossaries-extra-manual.html#dx1-3035" >559</a>, <a -href="glossaries-extra-manual.html#dx1-4028" >560</a>, <a -href="glossaries-extra-manual.html#dx1-23027" >561</a>, <a -href="glossaries-extra-manual.html#dx1-30025" >562</a>, <a +href="glossaries-extra-manual.html#dx1-3025" >578</a>, <a +href="glossaries-extra-manual.html#dx1-3031" >579</a>, <a +href="glossaries-extra-manual.html#dx1-3035" >580</a>, <a +href="glossaries-extra-manual.html#dx1-4030" >581</a>, <a +href="glossaries-extra-manual.html#dx1-23027" >582</a>, <a +href="glossaries-extra-manual.html#dx1-30025" >583</a>, <a href="glossaries-extra-manual.html#dx1-30026" ><span -class="ecbx-1000">563</span></a> <br /></span> +class="ecbx-1000">584</span></a> <br /></span> <span class="index-item"><span class="ecss-1000">memoir </span>class  <a -href="glossaries-extra-manual.html#dx1-3024" >564</a> <br /></span> +href="glossaries-extra-manual.html#dx1-3024" >585</a> <br /></span> <span class="index-item"><span class="ecss-1000">mfirstuc </span>package  <a -href="glossaries-extra-manual.html#dx1-9" >565</a>, <a -href="glossaries-extra-manual.html#dx1-21066" >566</a> <br /></span> +href="glossaries-extra-manual.html#dx1-9" >586</a>, <a +href="glossaries-extra-manual.html#dx1-21066" >587</a> <br /></span> </p><p class="theindex"> <span class="ecbx-1000">N</span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\newabbreviation</span></span></span>  <a href="glossaries-extra-manual.html#dx1-12003" ><span -class="ecti-1000">567</span></a> <br /></span> +class="ecti-1000">588</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\newabbreviationstyle</span></span></span>  <a href="glossaries-extra-manual.html#dx1-19001" ><span -class="ecti-1000">568</span></a> <br /></span> +class="ecti-1000">589</span></a> <br /></span> <span class="index-item"><span class="ectt-1000">\newglossaryentry </span>options<br /></span> <span class="index-subitem">    <span class="ecss-1000">category</span>  <a -href="glossaries-extra-manual.html#dx1-5004" >569</a>, <a -href="glossaries-extra-manual.html#dx1-12004" >570</a>, <a -href="glossaries-extra-manual.html#dx1-12012" >571</a>, <a -href="glossaries-extra-manual.html#dx1-21001" >572</a> <br /></span> +href="glossaries-extra-manual.html#dx1-5004" >590</a>, <a +href="glossaries-extra-manual.html#dx1-12004" >591</a>, <a +href="glossaries-extra-manual.html#dx1-12012" >592</a>, <a +href="glossaries-extra-manual.html#dx1-21001" >593</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">desc</span>  <a -href="glossaries-extra-manual.html#dx1-27038" >573</a>, <a -href="glossaries-extra-manual.html#dx1-27040" >574</a> <br /></span> +href="glossaries-extra-manual.html#dx1-27038" >594</a>, <a +href="glossaries-extra-manual.html#dx1-27040" >595</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">descplural</span>  <a -href="glossaries-extra-manual.html#dx1-27042" >575</a>, <a -href="glossaries-extra-manual.html#dx1-27044" >576</a> <br /></span> +href="glossaries-extra-manual.html#dx1-27042" >596</a>, <a +href="glossaries-extra-manual.html#dx1-27044" >597</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">description</span>  <a -href="glossaries-extra-manual.html#dx1-17005" >577</a>, <a -href="glossaries-extra-manual.html#dx1-17019" >578</a>, <a -href="glossaries-extra-manual.html#dx1-17021" >579</a>, <a -href="glossaries-extra-manual.html#dx1-17035" >580</a>, <a -href="glossaries-extra-manual.html#dx1-17049" >581</a>, <a -href="glossaries-extra-manual.html#dx1-18005" >582</a>, <a -href="glossaries-extra-manual.html#dx1-18018" >583</a>, <a -href="glossaries-extra-manual.html#dx1-18031" >584</a>, <a -href="glossaries-extra-manual.html#dx1-18044" >585</a>, <a -href="glossaries-extra-manual.html#dx1-18060" >586</a>, <a -href="glossaries-extra-manual.html#dx1-18077" >587</a>, <a -href="glossaries-extra-manual.html#dx1-19016" >588</a> <br /></span> +href="glossaries-extra-manual.html#dx1-17005" >598</a>, <a +href="glossaries-extra-manual.html#dx1-17019" >599</a>, <a +href="glossaries-extra-manual.html#dx1-17021" >600</a>, <a +href="glossaries-extra-manual.html#dx1-17035" >601</a>, <a +href="glossaries-extra-manual.html#dx1-17049" >602</a>, <a +href="glossaries-extra-manual.html#dx1-18005" >603</a>, <a +href="glossaries-extra-manual.html#dx1-18018" >604</a>, <a +href="glossaries-extra-manual.html#dx1-18031" >605</a>, <a +href="glossaries-extra-manual.html#dx1-18044" >606</a>, <a +href="glossaries-extra-manual.html#dx1-18060" >607</a>, <a +href="glossaries-extra-manual.html#dx1-18077" >608</a>, <a +href="glossaries-extra-manual.html#dx1-19016" >609</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">first</span>  <a -href="glossaries-extra-manual.html#dx1-7009" >589</a>, <a -href="glossaries-extra-manual.html#dx1-9004" >590</a>, <a -href="glossaries-extra-manual.html#dx1-16008" >591</a>, <a -href="glossaries-extra-manual.html#dx1-16015" >592</a>, <a -href="glossaries-extra-manual.html#dx1-19012" >593</a>, <a -href="glossaries-extra-manual.html#dx1-19018" >594</a>, <a -href="glossaries-extra-manual.html#dx1-20033" >595</a>, <a -href="glossaries-extra-manual.html#dx1-27022" >596</a>, <a -href="glossaries-extra-manual.html#dx1-27024" >597</a>, <a -href="glossaries-extra-manual.html#dx1-30014" >598</a> <br /></span> +href="glossaries-extra-manual.html#dx1-7009" >610</a>, <a +href="glossaries-extra-manual.html#dx1-9004" >611</a>, <a +href="glossaries-extra-manual.html#dx1-16008" >612</a>, <a +href="glossaries-extra-manual.html#dx1-16015" >613</a>, <a +href="glossaries-extra-manual.html#dx1-19012" >614</a>, <a +href="glossaries-extra-manual.html#dx1-19018" >615</a>, <a +href="glossaries-extra-manual.html#dx1-20041" >616</a>, <a +href="glossaries-extra-manual.html#dx1-27022" >617</a>, <a +href="glossaries-extra-manual.html#dx1-27024" >618</a>, <a +href="glossaries-extra-manual.html#dx1-30014" >619</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">firstplural</span>  <a -href="glossaries-extra-manual.html#dx1-7010" >599</a>, <a -href="glossaries-extra-manual.html#dx1-19013" >600</a>, <a -href="glossaries-extra-manual.html#dx1-19019" >601</a>, <a -href="glossaries-extra-manual.html#dx1-27026" >602</a>, <a -href="glossaries-extra-manual.html#dx1-27028" >603</a>, <a -href="glossaries-extra-manual.html#dx1-30015" >604</a> <br /></span> +href="glossaries-extra-manual.html#dx1-7010" >620</a>, <a +href="glossaries-extra-manual.html#dx1-19013" >621</a>, <a +href="glossaries-extra-manual.html#dx1-19019" >622</a>, <a +href="glossaries-extra-manual.html#dx1-27026" >623</a>, <a +href="glossaries-extra-manual.html#dx1-27028" >624</a>, <a +href="glossaries-extra-manual.html#dx1-30015" >625</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">long</span>  <a -href="glossaries-extra-manual.html#dx1-12046" >605</a>, <a -href="glossaries-extra-manual.html#dx1-16012" >606</a>, <a -href="glossaries-extra-manual.html#dx1-27054" >607</a>, <a -href="glossaries-extra-manual.html#dx1-27056" >608</a> <br /></span> +href="glossaries-extra-manual.html#dx1-12048" >626</a>, <a +href="glossaries-extra-manual.html#dx1-16012" >627</a>, <a +href="glossaries-extra-manual.html#dx1-27054" >628</a>, <a +href="glossaries-extra-manual.html#dx1-27056" >629</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">longplural</span>  <a -href="glossaries-extra-manual.html#dx1-12047" >609</a>, <a -href="glossaries-extra-manual.html#dx1-19033" >610</a>, <a -href="glossaries-extra-manual.html#dx1-27058" >611</a>, <a -href="glossaries-extra-manual.html#dx1-27060" >612</a> <br /></span> +href="glossaries-extra-manual.html#dx1-12049" >630</a>, <a +href="glossaries-extra-manual.html#dx1-19033" >631</a>, <a +href="glossaries-extra-manual.html#dx1-27058" >632</a>, <a +href="glossaries-extra-manual.html#dx1-27060" >633</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">name</span>  <a -href="glossaries-extra-manual.html#dx1-9002" >613</a>, <a -href="glossaries-extra-manual.html#dx1-17004" >614</a>, <a -href="glossaries-extra-manual.html#dx1-17018" >615</a>, <a -href="glossaries-extra-manual.html#dx1-17034" >616</a>, <a -href="glossaries-extra-manual.html#dx1-17048" >617</a>, <a -href="glossaries-extra-manual.html#dx1-18004" >618</a>, <a -href="glossaries-extra-manual.html#dx1-18017" >619</a>, <a -href="glossaries-extra-manual.html#dx1-18030" >620</a>, <a -href="glossaries-extra-manual.html#dx1-18043" >621</a>, <a -href="glossaries-extra-manual.html#dx1-18059" >622</a>, <a -href="glossaries-extra-manual.html#dx1-18076" >623</a>, <a -href="glossaries-extra-manual.html#dx1-19010" >624</a>, <a -href="glossaries-extra-manual.html#dx1-23007" >625</a>, <a -href="glossaries-extra-manual.html#dx1-24011" >626</a>, <a -href="glossaries-extra-manual.html#dx1-27006" >627</a>, <a -href="glossaries-extra-manual.html#dx1-28009" >628</a>, <a -href="glossaries-extra-manual.html#dx1-28010" >629</a>, <a -href="glossaries-extra-manual.html#dx1-28011" >630</a>, <a -href="glossaries-extra-manual.html#dx1-28012" >631</a>, <a -href="glossaries-extra-manual.html#dx1-28014" >632</a> <br /></span> +href="glossaries-extra-manual.html#dx1-9002" >634</a>, <a +href="glossaries-extra-manual.html#dx1-17004" >635</a>, <a +href="glossaries-extra-manual.html#dx1-17018" >636</a>, <a +href="glossaries-extra-manual.html#dx1-17034" >637</a>, <a +href="glossaries-extra-manual.html#dx1-17048" >638</a>, <a +href="glossaries-extra-manual.html#dx1-18004" >639</a>, <a +href="glossaries-extra-manual.html#dx1-18017" >640</a>, <a +href="glossaries-extra-manual.html#dx1-18030" >641</a>, <a +href="glossaries-extra-manual.html#dx1-18043" >642</a>, <a +href="glossaries-extra-manual.html#dx1-18059" >643</a>, <a +href="glossaries-extra-manual.html#dx1-18076" >644</a>, <a +href="glossaries-extra-manual.html#dx1-19010" >645</a>, <a +href="glossaries-extra-manual.html#dx1-23007" >646</a>, <a +href="glossaries-extra-manual.html#dx1-24011" >647</a>, <a +href="glossaries-extra-manual.html#dx1-27006" >648</a>, <a +href="glossaries-extra-manual.html#dx1-28009" >649</a>, <a +href="glossaries-extra-manual.html#dx1-28010" >650</a>, <a +href="glossaries-extra-manual.html#dx1-28011" >651</a>, <a +href="glossaries-extra-manual.html#dx1-28012" >652</a>, <a +href="glossaries-extra-manual.html#dx1-28014" >653</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">plural</span>  <a -href="glossaries-extra-manual.html#dx1-7013" >633</a>, <a -href="glossaries-extra-manual.html#dx1-19015" >634</a>, <a -href="glossaries-extra-manual.html#dx1-27018" >635</a>, <a -href="glossaries-extra-manual.html#dx1-27020" >636</a> <br /></span> +href="glossaries-extra-manual.html#dx1-7013" >654</a>, <a +href="glossaries-extra-manual.html#dx1-19015" >655</a>, <a +href="glossaries-extra-manual.html#dx1-27018" >656</a>, <a +href="glossaries-extra-manual.html#dx1-27020" >657</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">see</span>  <a -href="glossaries-extra-manual.html#dx1-4037" >637</a>, <a -href="glossaries-extra-manual.html#dx1-4038" >638</a>, <a -href="glossaries-extra-manual.html#dx1-6011" >639</a>, <a -href="glossaries-extra-manual.html#dx1-6013" >640</a>, <a -href="glossaries-extra-manual.html#dx1-6014" >641</a>, <a -href="glossaries-extra-manual.html#dx1-6016" >642</a>, <a -href="glossaries-extra-manual.html#dx1-6023" >643</a>, <a -href="glossaries-extra-manual.html#dx1-6024" >644</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4039" >658</a>, <a +href="glossaries-extra-manual.html#dx1-4040" >659</a>, <a +href="glossaries-extra-manual.html#dx1-6011" >660</a>, <a +href="glossaries-extra-manual.html#dx1-6013" >661</a>, <a +href="glossaries-extra-manual.html#dx1-6014" >662</a>, <a +href="glossaries-extra-manual.html#dx1-6016" >663</a>, <a +href="glossaries-extra-manual.html#dx1-6023" >664</a>, <a +href="glossaries-extra-manual.html#dx1-6024" >665</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">short</span>  <a -href="glossaries-extra-manual.html#dx1-7006" >645</a>, <a -href="glossaries-extra-manual.html#dx1-7014" >646</a>, <a -href="glossaries-extra-manual.html#dx1-7017" >647</a>, <a -href="glossaries-extra-manual.html#dx1-12044" >648</a>, <a -href="glossaries-extra-manual.html#dx1-16011" >649</a>, <a -href="glossaries-extra-manual.html#dx1-16018" >650</a>, <a -href="glossaries-extra-manual.html#dx1-21047" >651</a>, <a -href="glossaries-extra-manual.html#dx1-27046" >652</a>, <a -href="glossaries-extra-manual.html#dx1-27048" >653</a> <br /></span> +href="glossaries-extra-manual.html#dx1-7006" >666</a>, <a +href="glossaries-extra-manual.html#dx1-7014" >667</a>, <a +href="glossaries-extra-manual.html#dx1-7017" >668</a>, <a +href="glossaries-extra-manual.html#dx1-12046" >669</a>, <a +href="glossaries-extra-manual.html#dx1-16011" >670</a>, <a +href="glossaries-extra-manual.html#dx1-16018" >671</a>, <a +href="glossaries-extra-manual.html#dx1-21047" >672</a>, <a +href="glossaries-extra-manual.html#dx1-27046" >673</a>, <a +href="glossaries-extra-manual.html#dx1-27048" >674</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">shortplural</span>  <a -href="glossaries-extra-manual.html#dx1-12007" >654</a>, <a -href="glossaries-extra-manual.html#dx1-12045" >655</a>, <a -href="glossaries-extra-manual.html#dx1-16029" >656</a>, <a -href="glossaries-extra-manual.html#dx1-19028" >657</a>, <a -href="glossaries-extra-manual.html#dx1-19043" >658</a>, <a -href="glossaries-extra-manual.html#dx1-21040" >659</a>, <a -href="glossaries-extra-manual.html#dx1-21044" >660</a>, <a -href="glossaries-extra-manual.html#dx1-21048" >661</a>, <a -href="glossaries-extra-manual.html#dx1-27050" >662</a>, <a -href="glossaries-extra-manual.html#dx1-27052" >663</a> <br /></span> +href="glossaries-extra-manual.html#dx1-12007" >675</a>, <a +href="glossaries-extra-manual.html#dx1-12047" >676</a>, <a +href="glossaries-extra-manual.html#dx1-16029" >677</a>, <a +href="glossaries-extra-manual.html#dx1-19028" >678</a>, <a +href="glossaries-extra-manual.html#dx1-19043" >679</a>, <a +href="glossaries-extra-manual.html#dx1-21040" >680</a>, <a +href="glossaries-extra-manual.html#dx1-21044" >681</a>, <a +href="glossaries-extra-manual.html#dx1-21048" >682</a>, <a +href="glossaries-extra-manual.html#dx1-27050" >683</a>, <a +href="glossaries-extra-manual.html#dx1-27052" >684</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">sort</span>  <a -href="glossaries-extra-manual.html#dx1-4058" >664</a>, <a -href="glossaries-extra-manual.html#dx1-19011" >665</a>, <a -href="glossaries-extra-manual.html#dx1-23012" >666</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4060" >685</a>, <a +href="glossaries-extra-manual.html#dx1-9017" >686</a>, <a +href="glossaries-extra-manual.html#dx1-9041" >687</a>, <a +href="glossaries-extra-manual.html#dx1-19011" >688</a>, <a +href="glossaries-extra-manual.html#dx1-23012" >689</a> <br /></span> + + + <span class="index-subitem">    <span class="ecss-1000">symbol</span>  <a -href="glossaries-extra-manual.html#dx1-27030" >667</a>, <a -href="glossaries-extra-manual.html#dx1-27032" >668</a> <br /></span> +href="glossaries-extra-manual.html#dx1-27030" >690</a>, <a +href="glossaries-extra-manual.html#dx1-27032" >691</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">symbolplural</span>  <a -href="glossaries-extra-manual.html#dx1-27034" >669</a>, <a -href="glossaries-extra-manual.html#dx1-27036" >670</a> <br /></span> +href="glossaries-extra-manual.html#dx1-27034" >692</a>, <a +href="glossaries-extra-manual.html#dx1-27036" >693</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">text</span>  <a -href="glossaries-extra-manual.html#dx1-7012" >671</a>, <a -href="glossaries-extra-manual.html#dx1-9003" >672</a>, <a -href="glossaries-extra-manual.html#dx1-16010" >673</a>, <a -href="glossaries-extra-manual.html#dx1-16016" >674</a>, <a -href="glossaries-extra-manual.html#dx1-19014" >675</a>, <a -href="glossaries-extra-manual.html#dx1-20028" >676</a>, <a -href="glossaries-extra-manual.html#dx1-27014" >677</a>, <a -href="glossaries-extra-manual.html#dx1-27016" >678</a> <br /></span> +href="glossaries-extra-manual.html#dx1-7012" >694</a>, <a +href="glossaries-extra-manual.html#dx1-9003" >695</a>, <a +href="glossaries-extra-manual.html#dx1-16010" >696</a>, <a +href="glossaries-extra-manual.html#dx1-16016" >697</a>, <a +href="glossaries-extra-manual.html#dx1-19014" >698</a>, <a +href="glossaries-extra-manual.html#dx1-20036" >699</a>, <a +href="glossaries-extra-manual.html#dx1-27014" >700</a>, <a +href="glossaries-extra-manual.html#dx1-27016" >701</a> <br /></span> <span class="index-item">number list  <a -href="glossaries-extra-manual.html#dx1-7058" >679</a>, <a -href="glossaries-extra-manual.html#dx1-30022" >680</a>, <a +href="glossaries-extra-manual.html#dx1-7060" >702</a>, <a +href="glossaries-extra-manual.html#dx1-30022" >703</a>, <a href="glossaries-extra-manual.html#dx1-30027" ><span -class="ecbx-1000">681</span></a> <br /></span> +class="ecbx-1000">704</span></a> <br /></span> </p><p class="theindex"> <span class="ecbx-1000">P</span> <span class="index-item">package options:<br /></span> <span class="index-subitem">    <span class="ecss-1000">abbreviations</span>  <a -href="glossaries-extra-manual.html#dx1-4040" >682</a>, <a -href="glossaries-extra-manual.html#dx1-4046" >683</a>, <a -href="glossaries-extra-manual.html#dx1-4047" >684</a>, <a -href="glossaries-extra-manual.html#dx1-4086" >685</a>, <a -href="glossaries-extra-manual.html#dx1-29002" >686</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4042" >705</a>, <a +href="glossaries-extra-manual.html#dx1-4048" >706</a>, <a +href="glossaries-extra-manual.html#dx1-4049" >707</a>, <a +href="glossaries-extra-manual.html#dx1-4088" >708</a>, <a +href="glossaries-extra-manual.html#dx1-29002" >709</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">accsupp</span>  <a -href="glossaries-extra-manual.html#dx1-4008" >687</a>, <a -href="glossaries-extra-manual.html#dx1-4014" >688</a>, <a -href="glossaries-extra-manual.html#dx1-27002" >689</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4008" >710</a>, <a +href="glossaries-extra-manual.html#dx1-4014" >711</a>, <a +href="glossaries-extra-manual.html#dx1-27002" >712</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">acronym</span>  <a -href="glossaries-extra-manual.html#dx1-4048" >690</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4050" >713</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">acronymlists</span>  <a -href="glossaries-extra-manual.html#dx1-4054" >691</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4056" >714</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">automake</span>  <a -href="glossaries-extra-manual.html#dx1-29019" >692</a> <br /></span> +href="glossaries-extra-manual.html#dx1-29019" >715</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">docdef</span>  <a -href="glossaries-extra-manual.html#dx1-4021" >693</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4023" >716</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">true</span>  <a -href="glossaries-extra-manual.html#dx1-4032" >694</a> <br /></span> - - - +href="glossaries-extra-manual.html#dx1-4034" >717</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">docdefs</span>  <a -href="glossaries-extra-manual.html#dx1-24004" >695</a>, <a -href="glossaries-extra-manual.html#dx1-24007" >696</a> <br /></span> +href="glossaries-extra-manual.html#dx1-24004" >718</a>, <a +href="glossaries-extra-manual.html#dx1-24007" >719</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">index</span>  <a -href="glossaries-extra-manual.html#dx1-5006" >697</a>, <a -href="glossaries-extra-manual.html#dx1-21007" >698</a> <br /></span> +href="glossaries-extra-manual.html#dx1-5006" >720</a>, <a +href="glossaries-extra-manual.html#dx1-21007" >721</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">indexcrossrefs</span>  <a -href="glossaries-extra-manual.html#dx1-4036" >699</a>, <a -href="glossaries-extra-manual.html#dx1-4039" >700</a>, <a -href="glossaries-extra-manual.html#dx1-6022" >701</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4038" >722</a>, <a +href="glossaries-extra-manual.html#dx1-4041" >723</a>, <a +href="glossaries-extra-manual.html#dx1-6022" >724</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">indexonlyfirst</span>  <a -href="glossaries-extra-manual.html#dx1-6002" >702</a>, <a -href="glossaries-extra-manual.html#dx1-6005" >703</a>, <a -href="glossaries-extra-manual.html#dx1-21029" >704</a>, <a -href="glossaries-extra-manual.html#dx1-23023" >705</a> <br /></span> +href="glossaries-extra-manual.html#dx1-6002" >725</a>, <a +href="glossaries-extra-manual.html#dx1-6005" >726</a>, <a +href="glossaries-extra-manual.html#dx1-21029" >727</a>, <a +href="glossaries-extra-manual.html#dx1-23023" >728</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">nomain</span>  <a -href="glossaries-extra-manual.html#dx1-3036" >706</a> <br /></span> +href="glossaries-extra-manual.html#dx1-3036" >729</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">nomissingglstext</span>  <a -href="glossaries-extra-manual.html#dx1-4035" >707</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4037" >730</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">nonumberlist</span>  <a -href="glossaries-extra-manual.html#dx1-30029" >708</a> <br /></span> +href="glossaries-extra-manual.html#dx1-30029" >731</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">nopostdot</span>  <a -href="glossaries-extra-manual.html#dx1-11017" >709</a> <br /></span> +href="glossaries-extra-manual.html#dx1-11017" >732</a>, <a +href="glossaries-extra-manual.html#dx1-11027" >733</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">false</span>  <a -href="glossaries-extra-manual.html#dx1-3005" >710</a>, <a -href="glossaries-extra-manual.html#dx1-11012" >711</a> <br /></span> +href="glossaries-extra-manual.html#dx1-3005" >734</a>, <a +href="glossaries-extra-manual.html#dx1-11012" >735</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">true</span>  <a -href="glossaries-extra-manual.html#dx1-3004" >712</a> <br /></span> +href="glossaries-extra-manual.html#dx1-3004" >736</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">noredefwarn</span><br /></span> <span class="index-subsubitem">        <span class="ecss-1000">false</span>  <a -href="glossaries-extra-manual.html#dx1-3010" >713</a> <br /></span> +href="glossaries-extra-manual.html#dx1-3010" >737</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">true</span>  <a -href="glossaries-extra-manual.html#dx1-3006" >714</a> <br /></span> +href="glossaries-extra-manual.html#dx1-3006" >738</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">numbers</span>  <a -href="glossaries-extra-manual.html#dx1-4059" >715</a>, <a -href="glossaries-extra-manual.html#dx1-4079" >716</a>, <a -href="glossaries-extra-manual.html#dx1-21013" >717</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4061" >739</a>, <a +href="glossaries-extra-manual.html#dx1-4081" >740</a>, <a +href="glossaries-extra-manual.html#dx1-21013" >741</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">shortcuts</span>  <a -href="glossaries-extra-manual.html#dx1-4062" >718</a>, <a -href="glossaries-extra-manual.html#dx1-4084" >719</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4064" >742</a>, <a +href="glossaries-extra-manual.html#dx1-4086" >743</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">abbr</span>  <a -href="glossaries-extra-manual.html#dx1-4068" >720</a>, <a -href="glossaries-extra-manual.html#dx1-15002" >721</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4070" >744</a>, <a +href="glossaries-extra-manual.html#dx1-15002" >745</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">abbreviation</span>  <a -href="glossaries-extra-manual.html#dx1-15001" >722</a> <br /></span> +href="glossaries-extra-manual.html#dx1-15001" >746</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">abbreviations</span>  <a -href="glossaries-extra-manual.html#dx1-4067" >723</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4069" >747</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">acro</span>  <a -href="glossaries-extra-manual.html#dx1-4065" >724</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4067" >748</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">acronyms</span>  <a -href="glossaries-extra-manual.html#dx1-4064" >725</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4066" >749</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">all</span>  <a -href="glossaries-extra-manual.html#dx1-4080" >726</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4082" >750</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">false</span>  <a -href="glossaries-extra-manual.html#dx1-4083" >727</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4085" >751</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">none</span>  <a -href="glossaries-extra-manual.html#dx1-4082" >728</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4084" >752</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">other</span>  <a -href="glossaries-extra-manual.html#dx1-4070" >729</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4072" >753</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">true</span>  <a -href="glossaries-extra-manual.html#dx1-4081" >730</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4083" >754</a> <br /></span> +<span class="index-subitem">    <span +class="ecss-1000">stylemods</span>  <a +href="glossaries-extra-manual.html#dx1-4017" >755</a>, <a +href="glossaries-extra-manual.html#dx1-11021" >756</a>, <a +href="glossaries-extra-manual.html#dx1-11023" >757</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">symbols</span>  <a -href="glossaries-extra-manual.html#dx1-4055" >731</a>, <a -href="glossaries-extra-manual.html#dx1-4076" >732</a>, <a -href="glossaries-extra-manual.html#dx1-21010" >733</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4057" >758</a>, <a +href="glossaries-extra-manual.html#dx1-4078" >759</a>, <a +href="glossaries-extra-manual.html#dx1-21010" >760</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">toc</span><br /></span> <span class="index-subsubitem">        <span class="ecss-1000">false</span>  <a -href="glossaries-extra-manual.html#dx1-3003" >734</a> <br /></span> +href="glossaries-extra-manual.html#dx1-3003" >761</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">true</span>  <a -href="glossaries-extra-manual.html#dx1-3002" >735</a> <br /></span> +href="glossaries-extra-manual.html#dx1-3002" >762</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">translate</span><br /></span> + + + <span class="index-subsubitem">        <span class="ecss-1000">babel</span>  <a -href="glossaries-extra-manual.html#dx1-3013" >736</a> <br /></span> +href="glossaries-extra-manual.html#dx1-3013" >763</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">true</span>  <a -href="glossaries-extra-manual.html#dx1-3015" >737</a> <br /></span> +href="glossaries-extra-manual.html#dx1-3015" >764</a> <br /></span> <span class="index-subitem">    <span class="ecss-1000">undefaction</span>  <a -href="glossaries-extra-manual.html#dx1-4017" >738</a>, <a -href="glossaries-extra-manual.html#dx1-5003" >739</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4019" >765</a>, <a +href="glossaries-extra-manual.html#dx1-5003" >766</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">error</span>  <a -href="glossaries-extra-manual.html#dx1-4018" >740</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4020" >767</a> <br /></span> <span class="index-subsubitem">        <span class="ecss-1000">warn</span>  <a -href="glossaries-extra-manual.html#dx1-4020" >741</a> <br /></span> +href="glossaries-extra-manual.html#dx1-4022" >768</a> <br /></span> <span class="index-item"><span class="ectt-1000">page </span>(counter)  <a -href="glossaries-extra-manual.html#dx1-22029" >742</a>, <a -href="glossaries-extra-manual.html#dx1-22041" >743</a> <br /></span> +href="glossaries-extra-manual.html#dx1-22029" >769</a>, <a +href="glossaries-extra-manual.html#dx1-22041" >770</a> <br /></span> <span class="index-item"><span class="ecss-1000">polyglossia </span>package  <a -href="glossaries-extra-manual.html#dx1-29006" >744</a> <br /></span> +href="glossaries-extra-manual.html#dx1-29006" >771</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\printabbreviations</span></span></span>  <a -href="glossaries-extra-manual.html#dx1-4041" ><span -class="ecti-1000">745</span></a> <br /></span> +href="glossaries-extra-manual.html#dx1-4043" ><span +class="ecti-1000">772</span></a> <br /></span> <span class="index-item"><span class="ectt-1000">\printglossary </span>options<br /></span> <span class="index-subitem">    <span class="ecss-1000">title</span>  <a -href="glossaries-extra-manual.html#dx1-29007" >746</a> <br /></span> +href="glossaries-extra-manual.html#dx1-29007" >773</a> <br /></span> </p><p class="theindex"> <span class="ecbx-1000">R</span> <span class="index-item"><span class="ecss-1000">relsize </span>package  <a -href="glossaries-extra-manual.html#dx1-16033" >747</a> <br /></span> +href="glossaries-extra-manual.html#dx1-16033" >774</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\RestoreAcronyms</span></span></span>  <a href="glossaries-extra-manual.html#dx1-10003" ><span -class="ecti-1000">748</span></a>, <a +class="ecti-1000">775</span></a>, <a href="glossaries-extra-manual.html#dx1-12016" ><span -class="ecti-1000">749</span></a> <br /></span> +class="ecti-1000">776</span></a> <br /></span> </p><p class="theindex"> <span class="ecbx-1000">S</span> - - - <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="ectt-1000">\setabbreviationstyle</span></span></span>  <a href="glossaries-extra-manual.html#dx1-14001" ><span -class="ecti-1000">750</span></a> <br /></span> +class="ecti-1000">777</span></a> <br /></span> <span class="index-item"><span class="ecss-1000">slantsc </span>package  <a -href="glossaries-extra-manual.html#dx1-20023" >751</a> <br /></span> +href="glossaries-extra-manual.html#dx1-20023" >778</a> <br /></span> </p><p class="theindex"> <span class="ecbx-1000">T</span> <span class="index-item"><span class="ecss-1000">textcase </span>package  <a -href="glossaries-extra-manual.html#dx1-12" >752</a> <br /></span> +href="glossaries-extra-manual.html#dx1-12" >779</a> <br /></span> <span class="index-item"><span class="ecss-1000">tracklang </span>package  <a -href="glossaries-extra-manual.html#dx1-8" >753</a>, <a -href="glossaries-extra-manual.html#dx1-29008" >754</a> <br /></span> +href="glossaries-extra-manual.html#dx1-8" >780</a>, <a +href="glossaries-extra-manual.html#dx1-29008" >781</a> <br /></span> <span class="index-item"><span class="ecss-1000">translator </span>package  <a -href="glossaries-extra-manual.html#dx1-3014" >755</a> <br /></span> +href="glossaries-extra-manual.html#dx1-3014" >782</a> <br /></span> </p><p class="theindex"> <span class="ecbx-1000">X</span> <span class="index-item"><span class="ecss-1000">xfor </span>package  <a -href="glossaries-extra-manual.html#dx1-13" >756</a> <br /></span> +href="glossaries-extra-manual.html#dx1-13" >783</a> <br /></span> <span class="index-item"><span class="ectt-1000">xindy</span>  <a -href="glossaries-extra-manual.html#dx1-3026" >757</a>, <a -href="glossaries-extra-manual.html#dx1-4029" >758</a>, <a -href="glossaries-extra-manual.html#dx1-30024" >759</a>, <a +href="glossaries-extra-manual.html#dx1-3026" >784</a>, <a +href="glossaries-extra-manual.html#dx1-4031" >785</a>, <a +href="glossaries-extra-manual.html#dx1-30024" >786</a>, <a href="glossaries-extra-manual.html#dx1-30030" ><span -class="ecbx-1000">760</span></a> <br /></span> +class="ecbx-1000">787</span></a> <br /></span> <span class="index-item"><span class="ecss-1000">xkeyval </span>package  <a -href="glossaries-extra-manual.html#dx1-11" >761</a> <br /></span> +href="glossaries-extra-manual.html#dx1-11" >788</a> <br /></span> </p></div> <a - id="dx1-31001"></a> + id="dx1-31001"></a><div class="footnotes"><!--l. 196--><p class="indent" > <span class="footnote-mark"><a +href="#fn1x1-bk" id="fn1x1"><sup class="textsuperscript">1.1</sup></a></span><span +class="ecrm-0800">4.21 was originally intended as the last release of </span><span +class="ecss-0800">glossaries </span><span +class="ecrm-0800">to incorporate new features, but</span> +<span +class="ecrm-0800">a few new minor features slipped in with some bug fixes in v4.21.</span></p> </div> + </body></html> diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf Binary files differindex f20672d8723..e2335f0a5d6 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex index 459aad1f0d1..39a9e6e1c4d 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex +++ b/Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex @@ -139,13 +139,13 @@ styles (glossaries):>#1={\protect\ttfamily#1}|main}} \MakeShortVerb{"} \DeleteShortVerb{\|} - \title{glossaries-extra.sty v1.01: + \title{glossaries-extra.sty v1.02: an extension to the glossaries package} \author{Nicola L.C. Talbot\\[10pt] Dickimaw Books\\ \url{http://www.dickimaw-books.com/}} - \date{2016-02-02} + \date{2016-04-25} \maketitle \begin{abstract} @@ -189,8 +189,11 @@ package weight and manual size). The \styfmt{glossaries-extra} package is an attempt to provide a~compromise for this -conflict. Version 4.21 of the \styfmt{glossaries} package is -the last version to incorporate new features. Future versions of +conflict. Version 4.22 of the \styfmt{glossaries} package is +the last version to incorporate new features.\footnote{4.21 was +originally intended as the last release of \styfmt{glossaries} to +incorporate new features, but a few new minor features slipped in with +some bug fixes in v4.21.} Future versions of \styfmt{glossaries} will just be bug fixes. New features will instead be added to \styfmt{glossaries-extra}. This means that the base \styfmt{glossaries} package won't increase @@ -408,6 +411,14 @@ a~package option (not through \ics{glossariesextrasetup}) since the \sty{glossar package must be loaded before \styfmt{glossaries-extra} if it's required. +\item[{\pkgopt{stylemods}}] This is a +\meta{key}=\meta{value} option used to load the +\sty{glossaries-extra-stylemods} package. The value may be a +comma-separated list of options to pass to that package. (Remember +to group \meta{value} if it contains any commas.) The value may be +omitted if no options need to be passed. See \sectionref{sec:glosstylemods} +for further details. + \item[{\pkgopt{undefaction}}] This is a \meta{key}=\meta{value} option, which has two allowed values: \pkgoptfmt{warn} and \pkgoptfmt{error}. This indicates what to do if an undefined @@ -760,6 +771,9 @@ Note that commands like \ics{glsfirst} and \ics{glsxtrfull} fake \cs{glsxtrifwasfirstuse} to \cs{@firstoftwo}. (Although, depending on the styles in use, they may not exactly match the text produced by \ics{gls}-like commands on \gls{firstuse}.) +However, the \abbrstyle{postfootnote} style alters \cs{glsxtrfull} +so that it fakes non-\gls{firstuse} otherwise the inline full format +would include the footnote, which is inappropriate. \end{important} For example, if you want to place the description in a footnote @@ -872,7 +886,7 @@ Things can go wrong if we try the following with the The main problems are: \begin{enumerate} -\item The first letter upper casing commands, such as \ics{Gls}, +\item\label{itm:nestedfirstucprob} The first letter upper casing commands, such as \ics{Gls}, won't work for the \texttt{shtml} entry on \gls{firstuse} if the long form is displayed before the short form (which is the default abbreviation style). This will attempt to do @@ -893,6 +907,9 @@ version, such as \ics{GLS}. and so can't be used be used in contexts that require this, such as PDF bookmarks. +\item\label{itm:nestedsortprob} The nested commands may end up in the \gloskey{sort} key, +which will confuse the indexing. + \item The \texttt{shtml} entry produces inconsistent results depending on whether the \texttt{ssi} or \texttt{html} entries have been used. Suppose both \texttt{ssi} and \texttt{html} are used @@ -940,7 +957,8 @@ So the \gls{firstuse} of the \texttt{shtml} entry now produces \qt{server side includes (SSI) enabled hypertext markup language (HTML) (SHTML)}, which is even more strange. -This is all aggravated by setting the style using +This is all aggravated by setting the style using the +\styfmt{glossaries} package's \cs{setacronymstyle}. For example: \begin{verbatim} \setacronymstyle{long-short} @@ -1002,6 +1020,20 @@ Note that replacing \cs{gls} with \cs{acrshort} in the original example may fix the \gls{firstuse} issue, but it doesn't fix any of the other problems listed above. +If it's simply that you want to use the abbreviation font, you can +use \cs{glsabbrvfont}: +\begin{verbatim} +\setabbreviationstyle{long-short-sc} + +\newabbreviation{ssi}{ssi}{server-side includes} +\newabbreviation{html}{html}{hypertext markup language} +\newabbreviation{shtml}{shtml}{\glsabbrvfont{ssi} enabled +\glsabbrvfont{html}} +\end{verbatim} +This will pick up the font style setting of the outer entry (shtml, +in the above case). This isn't a problem in the above example as all +the abbreviations use the same style. + However if you're really determined to use \ics{gls} in a field that may be included within some \gls{linktext}, \styfmt{glossaries-extra} patches internals @@ -1021,6 +1053,10 @@ is treated as \end{verbatim} This overcomes the last three problems listed above, but still doesn't fix the first two. +Problem~\ref{itm:nestedsortprob} usually won't be an issue as most abbreviation +styles set the \gloskey{sort} key to the short form, so using these +commands in the long form but not the short form will only affect +entries with a style that sorts according to the long form. Additionally, any instance of the long form commands, such as \ics{glsxtrlong} or \ics{acrlong} will be temporarily @@ -1067,6 +1103,12 @@ don't use any of the linking commands, such as \ics{gls} or fields that may be used by those case-changing commands. \end{important} +You can, with care, protect against issue~\ref{itm:nestedfirstucprob} by +inserting an empty group at the start if the long form starts with a +command that breaks the first letter uppercasing commands like +\cs{Gls}, but you still won't be able to use the all caps commands, +such as \cs{GLS}. + \subsection{Acronym Style Modifications} \label{sec:acronymmods} @@ -1181,6 +1223,55 @@ nothing instead of using the \pkgopt{nopostdot} option to suppress the terminating full stop.) \end{important} +As from v1.02, \styfmt{glossaries-extra} now includes the package +\sty{glossaries-extra-stylemods} that will redefine the predefined +styles to include the post-description hook (for those that are +missing it). You will need to make sure the styles have already +been defined before loading \sty{glossaries-extra}. For example: +\begin{verbatim} +\usepackage{glossaries-extra} +\usepackage{glossary-longragged} +\usepackage{glossaries-extra-stylemods} +\end{verbatim} +Alternatively you can load +\texttt{glossary-}\meta{name}\texttt{.sty} at the same time by +passing \meta{name} as a package option to +\sty{glossaries-extra-stylemods}. For example: +\begin{verbatim} +\usepackage{glossaries-extra} +\usepackage[longragged]{glossaries-extra-stylemods} +\end{verbatim} +Another option is to use the \pkgopt{stylemods} key when you +load \styfmt{glossaries-extra}. You can omit a value if you only want to use +the predefined styles that are automatically loaded by +\styfmt{glossaries} (for example, the \glostyle{long3col} style): +\begin{verbatim} +\usepackage[style=long3col,stylemods]{glossaries-extra} +\end{verbatim} +Or the value of \pkgopt{stylemods} may be a comma-separated list +of the style package identifiers. For example: +\begin{verbatim} +\usepackage[style=mcoltree,stylemods=mcols]{glossaries-extra} +\end{verbatim} +Remember to group the value if it contains any commas: +\begin{verbatim} +\usepackage[stylemods={mcols,longbooktabs}]{glossaries-extra} +\end{verbatim} + +Note that the \glostyle{inline} style is dealt with slightly +differently. The original definition provided by the +\sty{glossary-inline} package uses \cs{glspostdescription} at the +end of the glossary (not after each entry description) within the +definition of \cs{glspostinline}. The style modification changes +this so that \cs{glspostinline} just does a full stop followed by +space factor adjustment, and the description +\cs{glsinlinedescformat} and sub-entry description formats +\cs{glsinlinesubdescformat} are redefined to include +\cs{glsxtrpostdescription} (not \cs{glspostdescription}). This means +that the modified \glostyle{inline} style isn't affected by the +\pkgopt{nopostdot} option, but the post-description category hook +can still be used. + \chapter{Abbreviations} \label{sec:abbreviations} @@ -1300,6 +1391,26 @@ the long form on \gls{firstuse} for all your abbreviations, or you can define your own abbreviation style that provides a different format for only those abbreviations defined with that style. +Note that by default inserted material (provided in the final +optional argument of commands like \cs{gls}), is placed outside the +font command in the predefined styles. To move it inside, use: +\begin{definition}[\DescribeMacro\glsxtrinsertinsidetrue] +\cs{glsxtrinsertinsidetrue} +\end{definition} +This applies to all the predefined styles. For example: +\begin{verbatim} +\setabbreviationstyle{long-short} +\renewcommand*{\glsfirstlongdefaultfont}[1]{\emph{#1}} +\glsxtrinsertinsidetrue +\end{verbatim} +This will make the long form and in the inserted text emphasized, +whereas the default (without \cs{glsxtrinsertinsidetrue}) would +place the inserted text outside of the emphasized font. + +Note that for some styles, such as the \abbrstyle{short-long}, the +inserted text would be placed inside the font command for the short +form (rather than the long form in the above example). + There are two types of full forms. The display full form, which is used on \gls{firstuse} by commands like \ics{gls} and the inline full form, which is used by commands like \ics{glsxtrfull}. @@ -1876,6 +1987,9 @@ following punctuation character that's recognised by The inline full form uses the \meta{short} (\meta{long}) style. The \gloskey{name} is set to the short form. The \gloskey{description} is set to the long form. +Note that this style will change \cs{glsxtrfull} (and it's variants) +so that it fakes non-\gls{firstuse}. (Otherwise the footnote would +appear after the inline form.) \item[\abbrstyle{postfootnote-sc}] Like \abbrstyle{postfootnote} but redefines \cs{glsabbrvfont} to @@ -2188,7 +2302,7 @@ existing style are the \qt{em} styles, such as the } \end{verbatim} -\chapter{Entries in Sectioning Titles, Headers and Contents} +\chapter{Entries in Sectioning Titles, Headers, Captions and Contents} \label{sec:headtitle} The \sty{glossaries} user manual cautions against using commands @@ -2212,6 +2326,8 @@ PDF bookmark (with a warning from \sty{hyperref}); \item if you use \sty{hyperref}, you will end up with nested hyperlinks in the table of contents. \end{itemize} +Similar problems can also occur with captions (except for the page +header and bookmark issues). To get around all these problems, the \sty{glossaries} user manual recommends using the expandable non-hyperlink commands, like @@ -2314,6 +2430,54 @@ First letter upper case plural short form: \end{definition} (No case-change applied to PDF bookmarks.) +Display the long form: +\begin{definition}[\DescribeMacro\glsfmtlong] +\cs{glsfmtlong}\marg{label} +\end{definition} + +Display the plural long form: +\begin{definition}[\DescribeMacro\glsfmtlongpl] +\cs{glsfmtlongpl}\marg{label} +\end{definition} + +First letter upper case singular long form: +\begin{definition}[\DescribeMacro\Glsfmtlong] +\cs{Glsfmtlong}\marg{label} +\end{definition} +(No case-change applied to PDF bookmarks.) + +First letter upper case plural long form: +\begin{definition}[\DescribeMacro\Glsfmtlongpl] +\cs{Glsfmtlongpl}\marg{label} +\end{definition} +(No case-change applied to PDF bookmarks.) + +There are similar commands for the full form, but note that these +use the \emph{inline} full form, which may be different from the +full form used by \cs{gls}. + +Display the full form: +\begin{definition}[\DescribeMacro\glsfmtfull] +\cs{glsfmtfull}\marg{label} +\end{definition} + +Display the plural full form: +\begin{definition}[\DescribeMacro\glsfmtfullpl] +\cs{glsfmtfullpl}\marg{label} +\end{definition} + +First letter upper case singular full form: +\begin{definition}[\DescribeMacro\Glsfmtfull] +\cs{Glsfmtfull}\marg{label} +\end{definition} +(No case-change applied to PDF bookmarks.) + +First letter upper case plural full form: +\begin{definition}[\DescribeMacro\Glsfmtfullpl] +\cs{Glsfmtfullpl}\marg{label} +\end{definition} +(No case-change applied to PDF bookmarks.) + There are also equivalent commands for the value of the \gloskey{text} field: \begin{definition}[\DescribeMacro\glsfmttext] diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf Binary files differindex 541542fb41c..d6b5aa2086e 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf Binary files differindex f7d80661c4d..245f7ae6f38 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf Binary files differindex 815422f79ac..e17c5aabd3f 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf Binary files differindex ffe22d6eefc..ce9314ff30c 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf Binary files differindex 4d46825c87c..27fa78dfb7e 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf Binary files differindex 511bb1d3fcc..24b4322074c 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf Binary files differindex e7c28d4e4bf..f5c2d030bda 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf Binary files differindex 077e3a41e9f..a41c53da9f2 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf Binary files differindex 67963f08e6a..d7dff17e798 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf Binary files differindex 122fe4a2da5..c1e9c211ac1 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.tex b/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.tex index 0a96a885fbd..739cf1061ee 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.tex +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.tex @@ -20,7 +20,7 @@ \newglossaryentry{sample}{name={sample},description={sample}} \begin{document} -This is a sample document to entry counting. The entry counting +This is a sample document that uses entry counting. The entry counting has been enabled on the \texttt{abbreviation} category. This means that abbreviations will only be added to the glossary if they have been used more than $n$ times, where in this diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf Binary files differindex fff5763b1dd..6c8b2d00f04 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf Binary files differindex e3bacc0f899..f5f777383f6 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.tex b/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.tex index c0fd7b39926..4b004c02458 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.tex +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.tex @@ -36,7 +36,7 @@ \begin{abstract} This is a sample document that tests the use of entries in sectioning commands through commands like \verb|\glsfmtshort| -and \verb|glsfmttext|. +and \verb|\glsfmttext|. \end{abstract} \tableofcontents diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf Binary files differindex 9ed2dc7eae1..797149d0fd2 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf Binary files differindex 2057a8a7b53..7355b2bb3b9 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf Binary files differindex b8b7a382e52..347d4417619 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf Binary files differindex 4c16eb47bf7..d92527072d6 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf Binary files differindex 03e82941400..6bff08b09bb 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf Binary files differindex 7985e5f3ac2..ac01f3aa592 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf Binary files differindex 07ad7048fa8..5346d772a7e 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf Binary files differindex 9b87d13ae1f..42c22382984 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf Binary files differindex 5adb2ea248e..9fd084fdd85 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf Binary files differindex 97419849f04..1eca95927b7 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf Binary files differindex 46093d751b7..a510da63312 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf Binary files differindex 510c20295f2..321708d8f48 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf Binary files differindex ab9cf55be13..b748a329186 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf Binary files differindex 3d21e3a14f8..611c3db7bf8 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf Binary files differindex 228bb719bc2..f53d464c9be 100644 --- a/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf +++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf diff --git a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx index 953ec51a6c9..ec1f5a8514a 100644 --- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx +++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx @@ -1,13 +1,14 @@ %\iffalse % glossaries-extra.dtx generated using makedtx version 1.1 (c) Nicola Talbot % Command line args: -% -codetitle "Main Package Code" -% -doc "glossaries-extra-codedoc.tex" +% -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})" % -section "chapter" -% -src "glossaries-extra.sty\Z=>glossaries-extra.sty" % -author "Nicola Talbot" +% -doc "glossaries-extra-codedoc.tex" +% -src "glossaries-extra.sty\Z=>glossaries-extra.sty" +% -src "glossaries-extra-stylemods.sty\Z=>glossaries-extra-stylemods.sty" % glossaries-extra -% Created on 2016/2/2 12:31 +% Created on 2016/4/25 12:22 %\fi %\iffalse %<*package> @@ -116,7 +117,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \setcounter{IndexColumns}{2} -\CheckSum{6812} +\CheckSum{7699} \newcommand*{\ifirstuse}{\iterm{first use}} \newcommand*{\firstuse}{\gls{firstuse}} @@ -152,13 +153,13 @@ styles (glossaries):>#1={\protect\ttfamily#1}|main}} \raggedright } -\title{glossaries-extra.sty v1.01: +\title{glossaries-extra.sty v1.02: documented code} \author{Nicola L.C. Talbot\\[10pt] Dickimaw Books\\ \url{http://www.dickimaw-books.com/}} -\date{2016-02-02} +\date{2016-04-25} \begin{document} \DocInput{glossaries-extra.dtx} @@ -193,7 +194,7 @@ Dickimaw Books\\ % % % -%\chapter{Main Package Code} +%\chapter{Main Package Code (\styfmt{glossaries-extra.sty})} %\iffalse % \begin{macrocode} %<*glossaries-extra.sty> @@ -203,7 +204,7 @@ Dickimaw Books\\ %\section{Package Initialisation and Options} % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-extra}[2016/02/02 v1.01 (NLCT)] +\ProvidesPackage{glossaries-extra}[2016/04/25 v1.02 (NLCT)] % \end{macrocode} % Requires \sty{xkeyval} to define package options. % \begin{macrocode} @@ -572,6 +573,46 @@ Dickimaw Books\\ % \end{macrocode} %\end{option} % +% Provide option to load \sty{glossaries-extra-stylemods} +% (Deferred to the end.) +%\begin{macro}{\@glsxtr@redefstyles} +% \begin{macrocode} +\newcommand*{\@glsxtr@redefstyles}{} +% \end{macrocode} +%\end{macro} +% +%\begin{option}{stylemods} +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\define@key{glossaries-extra.sty}{stylemods}{% + \ifblank{#1}% + {% + \renewcommand*{\@glsxtr@redefstyles}{% + \RequirePackage{glossaries-extra-stylemods}}% + }% + {% + \renewcommand*{\@glsxtr@redefstyles}{}% + \@for\@glsxtr@tmp:=#1\do{% + \IfFileExists{glossary-\@glsxtr@tmp.sty}% + {% + \eappto\@glsxtr@redefstyles{% + \noexpand\RequirePackage{glossary-\@glsxtr@tmp}}% + }% + {% + \PackageError{glossaries-extra}% + {Glossaries style package `glossary-\@glsxtr@tmp.sty' + doesn't exist (did you mean to use the `style' key?)}% + {The list of values (#1) in the `styles' key should + match the glossary-xxx.sty files provided with + glossaries.sty}% + }% + }% + \appto\@glsxtr@redefstyles{\RequirePackage{glossaries-extra-stylemods}}% + }% +} +% \end{macrocode} +%\end{option} +% % Pass all other options to \sty{glossaries}. % \begin{macrocode} \DeclareOptionX*{% @@ -1105,6 +1146,47 @@ Dickimaw Books\\ % %\subsection{Existing Glossary Style Modifications} % +% Modify \cs{setglossarystyle} to keep track of the current style. +% This allows the \cs{glossaries-extra-stylemods} package to reset the +% current style after the required modifications have been made. +%\begin{macro}{\@glsxtr@current@style} +%\changes{1.02}{2016-04-25}{new} +% Initialise the current style to the default style. +% \begin{macrocode} +\newcommand*{\@glsxtr@current@style}{\@glossary@default@style} +% \end{macrocode} +%\end{macro} +% Modify \cs{setglossarystyle} to set the above. +%\begin{macro}{\setglossarystyle} +% \begin{macrocode} +\renewcommand*{\setglossarystyle}[1]{% + \ifcsundef{@glsstyle@#1}% + {% + \PackageError{glossaries}{Glossary style `#1' undefined}{}% + }% + {% + \csname @glsstyle@#1\endcsname +% \end{macrocode} +% Only set the current style if it exists. +% \begin{macrocode} + \protected@edef\@glsxtr@current@style{#1}% + }% + \ifx\@glossary@default@style\relax + \protected@edef\@glossary@default@style{#1}% + \fi +} +% \end{macrocode} +%\end{macro} +% +% In case we have an old version of \sty{glossaries}: +% \begin{macrocode} +\ifdef\@glossary@default@style +{} +{% + \let\@glossary@default@style\relax +} +% \end{macrocode} +% %\begin{macro}{\glslistdottedwidth} %If \cs{glslistdottedwidth} has been defined and is currently equal %to \verb|.5\hsize| then make the modification suggested in @@ -6440,8 +6522,10 @@ want %\begin{macro}{\glsxtrpostdescription} %This command will only be used if \cs{@gls@preglossaryhook} is %available \emph{and} the glossary style uses -%\cs{glspostdescription} without modifying it. (The nopostdesc -%option will suppress this.) +%\cs{glspostdescription} without modifying it. (\cs{nopostdesc} +%will suppress this.) The \sty{glossaries-extra-stylemods} package will +%add the post description hook to all the predefined styles that +%don't include it. % \begin{macrocode} \newcommand*{\glsxtrpostdescription}{% \csuse{glsxtrpostdesc\glscategory{\glscurrententrylabel}}% @@ -7957,6 +8041,17 @@ want % those keys are set. The final optional argument of \cs{glsfirst} % will behave differently to the final optional argument of \cs{gls} % with some styles. +% +%\begin{macro}{\ifglsxtrinsertinside} +%\changes{1.02}{2016-04-25}{new} +% Switch to determine if the insert text should be inside or outside +% the font changing command. The default is outside. +% \begin{macrocode} +\newif\ifglsxtrinsertinside +\glsxtrinsertinsidefalse +% \end{macrocode} +%\end{macro} +% %\begin{abbrvstyle}{long-short} % \begin{macrocode} \newabbreviationstyle{long-short}% @@ -7998,19 +8093,24 @@ want % this style. % \begin{macrocode} \renewcommand*{\glsxtrfullformat}[2]{% - \glsfirstlongfont{\glsaccesslong{##1}}##2\glsxtrfullsep{##1}% + \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi + \glsxtrfullsep{##1}% (\glsfirstabbrvfont{\glsaccessshort{##1}})% }% \renewcommand*{\glsxtrfullplformat}[2]{% - \glsfirstlongfont{\glsaccesslongpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstabbrvfont{\glsaccessshortpl{##1}})% }% \renewcommand*{\Glsxtrfullformat}[2]{% - \glsfirstlongfont{\Glsaccesslong{##1}}##2\glsxtrfullsep{##1}% + \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstabbrvfont{\glsaccessshort{##1}})% }% \renewcommand*{\Glsxtrfullplformat}[2]{% - \glsfirstlongfont{\Glsaccesslongpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstabbrvfont{\glsaccessshortpl{##1}})% }% } @@ -8098,19 +8198,25 @@ want % this style. % \begin{macrocode} \renewcommand*{\glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi + \glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi + \glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% \renewcommand*{\Glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\Glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% } @@ -8196,19 +8302,23 @@ want % as a footnote. % \begin{macrocode} \renewcommand*{\glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi \protect\footnote{\glsfirstlongfont{\glsaccesslong{##1}}}% }% \renewcommand*{\glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi \protect\footnote{\glsfirstlongfont{\glsaccesslongpl{##1}}}% }% \renewcommand*{\Glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshort{##1}}##2% + \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi \protect\footnote{\glsfirstlongfont{\glsaccesslong{##1}}}% }% \renewcommand*{\Glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2% + \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi \protect\footnote{\glsfirstlongfont{\glsaccesslongpl{##1}}}% }% % \end{macrocode} @@ -8216,19 +8326,23 @@ want % (long) style. % \begin{macrocode} \renewcommand*{\glsxtrinlinefullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\glsxtrinlinefullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% \renewcommand*{\Glsxtrinlinefullformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\Glsxtrinlinefullplformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% } @@ -8260,8 +8374,12 @@ want % \begin{macrocode} \renewcommand*{\GlsXtrPostNewAbbreviation}{% \csdef{glsxtrpostlink\glscategorylabel}{% - \glsxtrifwasfirstuse{\glsxtrdopostpunc{\protect\footnote - {\glsfirstlongfont{\glsentrylong{\glslabel}}}}}{}% + \glsxtrifwasfirstuse + {% + \glsxtrdopostpunc{\protect\footnote + {\glsfirstlongfont{\glsentrylong{\glslabel}}}}% + }% + {}% }% \glshasattribute{\the\glslabeltok}{regular}% {% @@ -8269,6 +8387,14 @@ want }% {}% }% +% \end{macrocode} +%\changes{1.02}{2016-04-25}{added redef of \cs{glsxtrsetupfulldefs}} +% The footnote needs to be suppressed in the inline form, so +% \cs{glsxtrfull} must set the first use switch off. +% \begin{macrocode} + \renewcommand*{\glsxtrsetupfulldefs}{% + \let\glsxtrifwasfirstuse\@secondoftwo + }% }% {% % \end{macrocode} @@ -8284,35 +8410,43 @@ want % deferred. % \begin{macrocode} \renewcommand*{\glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\Glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshort{##1}}##2% + \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\Glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2% + \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% % \end{macrocode} % The first use full form and the inline full form use the short % (long) style. % \begin{macrocode} \renewcommand*{\glsxtrinlinefullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\glsxtrinlinefullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% \renewcommand*{\Glsxtrinlinefullformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\Glsxtrinlinefullplformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% } @@ -8356,19 +8490,27 @@ want %\changes{0.2}{2015-11-30}{switched inline full form to short (long)} % \begin{macrocode} \renewcommand*{\glsxtrinlinefullformat}[2]{% - \protect\glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \protect\glsfirstabbrvfont{\glsaccessshort{##1}% + \ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\glsxtrinlinefullplformat}[2]{% - \protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \protect\glsfirstabbrvfont{\glsaccessshortpl{##1}% + \ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% \renewcommand*{\Glsxtrinlinefullformat}[2]{% - \protect\glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \protect\glsfirstabbrvfont{\glsaccessshort{##1}% + \ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\Glsaccesslong{##1}})% }% \renewcommand*{\Glsxtrinlinefullplformat}[2]{% - \protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \protect\glsfirstabbrvfont{\glsaccessshortpl{##1}% + \ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\Glsaccesslongpl{##1}})% }% % \end{macrocode} @@ -8376,16 +8518,20 @@ want % typically won't be used as the \catattr{regular} attribute is set by this style. % \begin{macrocode} \renewcommand*{\glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\Glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\Glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% } % \end{macrocode} @@ -8429,19 +8575,23 @@ want % long form in parentheses. % \begin{macrocode} \renewcommand*{\glsxtrinlinefullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\glsxtrinlinefullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% \renewcommand*{\Glsxtrinlinefullformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\Glsxtrinlinefullplformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% % \end{macrocode} @@ -8449,16 +8599,20 @@ want % typically won't be used as the \catattr{regular} attribute is set by this style. % \begin{macrocode} \renewcommand*{\glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\Glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\Glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% } % \end{macrocode} @@ -8498,19 +8652,23 @@ want % short form in parentheses. % \begin{macrocode} \renewcommand*{\glsxtrinlinefullformat}[2]{% - \glsfirstlongfont{\glsaccesslong{##1}}##2\glsxtrfullsep{##1}% + \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\protect\glsfirstabbrvfont{\glsaccessshort{##1}})% }% \renewcommand*{\glsxtrinlinefullplformat}[2]{% - \glsfirstlongfont{\glsaccesslongpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}})% }% \renewcommand*{\Glsxtrinlinefullformat}[2]{% - \glsfirstlongfont{\Glsaccesslong{##1}}##2\glsxtrfullsep{##1}% + \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\protect\glsfirstabbrvfont{\glsaccessshort{##1}})% }% \renewcommand*{\Glsxtrinlinefullplformat}[2]{% - \glsfirstlongfont{\Glsaccesslongpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}})% }% % \end{macrocode} @@ -8518,16 +8676,20 @@ want % typically won't be used as the \catattr{regular} attribute is set by this style. % \begin{macrocode} \renewcommand*{\glsxtrfullformat}[2]{% - \glsfirstlongfont{\glsaccesslong{##1}}##2% + \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\glsxtrfullplformat}[2]{% - \glsfirstlongfont{\glsaccesslongpl{##1}}##2% + \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\Glsxtrfullformat}[2]{% - \glsfirstlongfont{\glsaccesslong{##1}}##2% + \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\Glsxtrfullplformat}[2]{% - \glsfirstlongfont{\glsaccesslongpl{##1}}##2% + \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% } % \end{macrocode} @@ -9267,6 +9429,14 @@ want \let\@glsxtr@org@Glsxtrtitlefirst\Glsxtrtitlefirst \let\@glsxtr@org@glsxtrtitlefirstplural\glsxtrtitlefirstplural \let\@glsxtr@org@Glsxtrtitlefirstplural\Glsxtrtitlefirstplural + \let\@glsxtr@org@glsxtrtitlelong\glsxtrtitlelong + \let\@glsxtr@org@glsxtrtitlelongpl\glsxtrtitlelongpl + \let\@glsxtr@org@Glsxtrtitlelong\Glsxtrtitlelong + \let\@glsxtr@org@Glsxtrtitlelongpl\Glsxtrtitlelongpl + \let\@glsxtr@org@glsxtrtitlefull\glsxtrtitlefull + \let\@glsxtr@org@glsxtrtitlefullpl\glsxtrtitlefullpl + \let\@glsxtr@org@Glsxtrtitlefull\Glsxtrtitlefull + \let\@glsxtr@org@Glsxtrtitlefullpl\Glsxtrtitlefullpl % \end{macrocode} % New definitions % \begin{macrocode} @@ -9283,6 +9453,14 @@ want \let\Glsxtrtitlefirst\Glsxtrheadfirst \let\glsxtrtitlefirstplural\glsxtrheadfirstplural \let\Glsxtrtitlefirstplural\Glsxtrheadfirstplural + \let\glsxtrtitlelong\glsxtrheadlong + \let\glsxtrtitlelongpl\glsxtrheadlongpl + \let\Glsxtrtitlelong\Glsxtrheadlong + \let\Glsxtrtitlelongpl\Glsxtrheadlongpl + \let\glsxtrtitlefull\glsxtrheadfull + \let\glsxtrtitlefullpl\glsxtrheadfullpl + \let\Glsxtrtitlefull\Glsxtrheadfull + \let\Glsxtrtitlefullpl\Glsxtrheadfullpl } % \end{macrocode} %\end{macro} @@ -9309,6 +9487,14 @@ want \let\Glsxtrtitlefirst\@glsxtr@org@Glsxtrtitlefirst \let\glsxtrtitlefirstplural\@glsxtr@org@glsxtrtitlefirstplural \let\Glsxtrtitlefirstplural\@glsxtr@org@Glsxtrtitlefirstplural + \let\glsxtrtitlelong\@glsxtr@org@glsxtrtitlelong + \let\glsxtrtitlelongpl\@glsxtr@org@glsxtrtitlelongpl + \let\Glsxtrtitlelong\@glsxtr@org@Glsxtrtitlelong + \let\Glsxtrtitlelongpl\@glsxtr@org@Glsxtrtitlelongpl + \let\glsxtrtitlefull\@glsxtr@org@glsxtrtitlefull + \let\glsxtrtitlefullpl\@glsxtr@org@glsxtrtitlefullpl + \let\Glsxtrtitlefull\@glsxtr@org@Glsxtrtitlefull + \let\Glsxtrtitlefullpl\@glsxtr@org@Glsxtrtitlefullpl } % \end{macrocode} %\end{macro} @@ -9672,6 +9858,256 @@ want % \end{macrocode} %\end{macro} % +%\begin{macro}{\glsxtrheadlong} +% Command used to display long form in the page header. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\newcommand*{\glsxtrheadlong}[1]{% + \protect\NoCaseChange + {% + \glsifattribute{#1}{headuc}{true}% + {% + \GLSxtrlong[noindex,hyper=false]{#1}[]% + }% + {% + \glsxtrlong[noindex,hyper=false]{#1}[]% + }% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrtitlelong} +% Command to display long form of abbreviation in section title and +% table of contents. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\newrobustcmd*{\glsxtrtitlelong}[1]{% + \glsxtrlong[noindex,hyper=false]{#1}[]% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrheadlongpl} +% Command used to display plural long form in the page header. +% If you want the text converted to upper case, this needs to be +% redefined to use \cs{GLSxtrlongpl} instead. If you are using a +% smallcaps style, the default fonts don't provide italic smallcaps. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\newcommand*{\glsxtrheadlongpl}[1]{% + \protect\NoCaseChange + {% + \glsifattribute{#1}{headuc}{true}% + {% + \GLSxtrlongpl[noindex,hyper=false]{#1}[]% + }% + {% + \glsxtrlongpl[noindex,hyper=false]{#1}[]% + }% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrtitlelongpl} +% Command to display plural long form of abbreviation in section title and +% table of contents. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\newrobustcmd*{\glsxtrtitlelongpl}[1]{% + \glsxtrlong[noindex,hyper=false]{#1}[]% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Glsxtrheadlong} +% Command used to display long form in the page header with the +% first letter converted to upper case. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\newcommand*{\Glsxtrheadlong}[1]{% + \protect\NoCaseChange + {% + \glsifattribute{#1}{headuc}{true}% + {% + \GLSxtrlong[noindex,hyper=false]{#1}[]% + }% + {% + \Glsxtrlong[noindex,hyper=false]{#1}[]% + }% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Glsxtrtitlelong} +% Command to display long form of abbreviation in section title and +% table of contents with the first letter converted to upper case. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\newrobustcmd*{\Glsxtrtitlelong}[1]{% + \Glsxtrlong[noindex,hyper=false]{#1}[]% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Glsxtrheadlongpl} +% Command used to display plural long form in the page header with the +% first letter converted to upper case. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\newcommand*{\Glsxtrheadlongpl}[1]{% + \protect\NoCaseChange + {% + \glsifattribute{#1}{headuc}{true}% + {% + \GLSxtrlongpl[noindex,hyper=false]{#1}[]% + }% + {% + \Glsxtrlongpl[noindex,hyper=false]{#1}[]% + }% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Glsxtrtitlelongpl} +% Command to display plural long form of abbreviation in section title and +% table of contents with the first letter converted to upper case. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\newrobustcmd*{\Glsxtrtitlelongpl}[1]{% + \Glsxtrlongpl[noindex,hyper=false]{#1}[]% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrheadfull} +% Command used to display full form in the page header. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\newcommand*{\glsxtrheadfull}[1]{% + \protect\NoCaseChange + {% + \glsifattribute{#1}{headuc}{true}% + {% + \GLSxtrfull[noindex,hyper=false]{#1}[]% + }% + {% + \glsxtrfull[noindex,hyper=false]{#1}[]% + }% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrtitlefull} +% Command to display full form of abbreviation in section title and +% table of contents. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\newrobustcmd*{\glsxtrtitlefull}[1]{% + \glsxtrfull[noindex,hyper=false]{#1}[]% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrheadfullpl} +% Command used to display plural full form in the page header. +% If you want the text converted to upper case, this needs to be +% redefined to use \cs{GLSxtrfullpl} instead. If you are using a +% smallcaps style, the default fonts don't provide italic smallcaps. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\newcommand*{\glsxtrheadfullpl}[1]{% + \protect\NoCaseChange + {% + \glsifattribute{#1}{headuc}{true}% + {% + \GLSxtrfullpl[noindex,hyper=false]{#1}[]% + }% + {% + \glsxtrfullpl[noindex,hyper=false]{#1}[]% + }% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsxtrtitlefullpl} +% Command to display plural full form of abbreviation in section title and +% table of contents. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\newrobustcmd*{\glsxtrtitlefullpl}[1]{% + \glsxtrfullpl[noindex,hyper=false]{#1}[]% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Glsxtrheadfull} +% Command used to display full form in the page header with the +% first letter converted to upper case. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\newcommand*{\Glsxtrheadfull}[1]{% + \protect\NoCaseChange + {% + \glsifattribute{#1}{headuc}{true}% + {% + \GLSxtrfull[noindex,hyper=false]{#1}[]% + }% + {% + \Glsxtrfull[noindex,hyper=false]{#1}[]% + }% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Glsxtrtitlefull} +% Command to display full form of abbreviation in section title and +% table of contents with the first letter converted to upper case. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\newrobustcmd*{\Glsxtrtitlefull}[1]{% + \Glsxtrfull[noindex,hyper=false]{#1}[]% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Glsxtrheadfullpl} +% Command used to display plural full form in the page header with the +% first letter converted to upper case. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\newcommand*{\Glsxtrheadfullpl}[1]{% + \protect\NoCaseChange + {% + \glsifattribute{#1}{headuc}{true}% + {% + \GLSxtrfullpl[noindex,hyper=false]{#1}[]% + }% + {% + \Glsxtrfullpl[noindex,hyper=false]{#1}[]% + }% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Glsxtrtitlefullpl} +% Command to display plural full form of abbreviation in section title and +% table of contents with the first letter converted to upper case. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\newrobustcmd*{\Glsxtrtitlefullpl}[1]{% + \Glsxtrfullpl[noindex,hyper=false]{#1}[]% +} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\glsfmtshort} % Provide a way of using the formatted short form in section % headings. If \sty{hyperref} has been loaded, use @@ -9913,6 +10349,158 @@ want % \end{macrocode} %\end{macro} % +%\begin{macro}{\glsfmtlong} +%As above but for the \gloskey{long} value. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\ifdef\texorpdfstring +{ + \newcommand*{\glsfmtlong}[1]{% + \texorpdfstring + {\glsxtrtitlelong{#1}}% + {\glsentrylong{#1}}% + } +} +{ + \newcommand*{\glsfmtlong}[1]{% + \glsxtrtitlelong{#1}} +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Glsfmtlong} +%First letter converted to upper case. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\ifdef\texorpdfstring +{ + \newcommand*{\Glsfmtlong}[1]{% + \texorpdfstring + {\Glsxtrtitlelong{#1}}% + {\glsentrylong{#1}}% + } +} +{ + \newcommand*{\Glsfmtlong}[1]{% + \Glsxtrtitlelong{#1}} +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsfmtlongpl} +%As above but for the \gloskey{longplural} value. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\ifdef\texorpdfstring +{ + \newcommand*{\glsfmtlongpl}[1]{% + \texorpdfstring + {\glsxtrtitlelongpl{#1}}% + {\glsentrylongpl{#1}}% + } +} +{ + \newcommand*{\glsfmtlongpl}[1]{% + \glsxtrtitlelongpl{#1}} +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Glsfmtlongpl} +%First letter converted to upper case. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\ifdef\texorpdfstring +{ + \newcommand*{\Glsfmtlongpl}[1]{% + \texorpdfstring + {\Glsxtrtitlelongpl{#1}}% + {\glsentrylongpl{#1}}% + } +} +{ + \newcommand*{\Glsfmtlongpl}[1]{% + \Glsxtrtitlelongpl{#1}} +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsfmtfull} +%In-line full format. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\ifdef\texorpdfstring +{ + \newcommand*{\glsfmtfull}[1]{% + \texorpdfstring + {\glsxtrtitlefull{#1}}% + {\glsxtrinlinefullformat{#1}{}}% + } +} +{ + \newcommand*{\glsfmtfull}[1]{% + \glsxtrtitlefull{#1}} +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Glsfmtfull} +%First letter converted to upper case. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\ifdef\texorpdfstring +{ + \newcommand*{\Glsfmtfull}[1]{% + \texorpdfstring + {\Glsxtrtitlefull{#1}}% + {\Glsxtrinlinefullformat{#1}{}}% + } +} +{ + \newcommand*{\Glsfmtfull}[1]{% + \Glsxtrtitlefull{#1}} +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glsfmtfullpl} +%In-line full plural format. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\ifdef\texorpdfstring +{ + \newcommand*{\glsfmtfullpl}[1]{% + \texorpdfstring + {\glsxtrtitlefullpl{#1}}% + {\glsxtrinlinefullplformat{#1}{}}% + } +} +{ + \newcommand*{\glsfmtfullpl}[1]{% + \glsxtrtitlefullpl{#1}} +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Glsfmtfullpl} +%First letter converted to upper case. +%\changes{1.02}{2016-04-25}{new} +% \begin{macrocode} +\ifdef\texorpdfstring +{ + \newcommand*{\Glsfmtfullpl}[1]{% + \texorpdfstring + {\Glsxtrtitlefullpl{#1}}% + {\Glsxtrinlinefullplformat{#1}{}}% + } +} +{ + \newcommand*{\Glsfmtfullpl}[1]{% + \Glsxtrtitlefullpl{#1}} +} +% \end{macrocode} +%\end{macro} +% %\section{Multi-Lingual Support} % Add the facility to load language modules, if they are installed, % but none are provided with this package. @@ -9959,10 +10547,380 @@ want } {} % \end{macrocode} +% Load \sty{glossaries-extra-stylemods} if required. +% \begin{macrocode} +\@glsxtr@redefstyles +% \end{macrocode} %\iffalse % \begin{macrocode} %</glossaries-extra.sty> % \end{macrocode} %\fi +%\iffalse +% \begin{macrocode} +%<*glossaries-extra-stylemods.sty> +% \end{macrocode} +%\fi +%\chapter{Style Adjustments (\styfmt{glossaries-extra-stylemods.sty})} +% This package adjusts the predefined styles so that they include the post +% description hook. +% +%\section{Package Initialisation} +% First identify package: +% \begin{macrocode} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{glossaries-extra-stylemods}[2016/04/25 v1.02 (NLCT)] +% \end{macrocode} +% Provide package options to automatically load required predefined +% styles. The simplest method is to just test for the existence of +% the file \texttt{glossary-}\meta{option}\texttt{.sty}. Packages +% can't be loaded whilst the options are being processed, so save +% the list in \cs{@glsxtr@loadstyles}. +%\begin{macro}{\@glsxtr@loadstyles} +% \begin{macrocode} +\newcommand*{\@glsxtr@loadstyles}{} +% \end{macrocode} +%\end{macro} +% +% \begin{macrocode} +\DeclareOption*{% + \IfFileExists{glossary-\CurrentOption.sty} + {\eappto\@glsxtr@loadstyles{% + \noexpand\RequirePackage{glossary-\CurrentOption}}}% + {\PackageError{glossaries-extra-styles}% + {Unknown option `\CurrentOption'}{}} +} +% \end{macrocode} +% Process the package options: +% \begin{macrocode} +\ProcessOptions +% \end{macrocode} +% +% Load the required packages: +% \begin{macrocode} +\@glsxtr@loadstyles +% \end{macrocode} +% Adjust the styles that the post description hook added, but only +% for styles that have already been defined. All the tree styles in +% \sty{glossary-tree} include the post description hook, so they +% don't require adjustment. Similarly for \sty{glossary-mcols} which +% builds on the tree styles. +% +%In case we have an old version of \sty{glossaries}: +%\begin{macro}{\renewglossarystyle} +% \begin{macrocode} +\providecommand{\renewglossarystyle}[2]{% + \ifcsundef{@glsstyle@#1}% + {% + \PackageError{glossaries}{Glossary style `#1' isn't already defined}{}% + }% + {% + \csdef{@glsstyle@#1}{#2}% + }% +} +% \end{macrocode} +%\end{macro} +% +%\section{List-Like Styles} +% The list-like styles mostly already use the post description hook. +% Only the \glostyle{listdotted} style need modifying. +% \begin{macrocode} +\ifdef{\@glsstyle@listdotted} +{% + \renewglossarystyle{listdotted}{% + \setglossarystyle{list}% + \renewcommand*{\glossentry}[2]{% + \item[]\makebox[\glslistdottedwidth][l]{% + \glsentryitem{##1}% + \glstarget{##1}{\glossentryname{##1}}% + \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}% + \glossentrydesc{##1}\glspostdescription}% + \renewcommand*{\subglossentry}[3]{% + \item[]\makebox[\glslistdottedwidth][l]{% + \glssubentryitem{##2}% + \glstarget{##2}{\glossentryname{##2}}% + \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}% + \glossentrydesc{##2}\glspostdescription}% + } +} +{} +% \end{macrocode} +% The \glostyle{sublistdotted} style doesn't display the description +% for top-level entries. Sub-level entries use the +% \glostyle{listdottedstyle}. +% +%\section{Longtable Styles} +% The three and four column styles require adjustment, but not the +% two column styles. +% \begin{macrocode} +\ifcsdef{@glsstyle@long3col} +{% + \renewglossarystyle{long3col}{% + \renewenvironment{theglossary}% + {\begin{longtable}{lp{\glsdescwidth}p{\glspagelistwidth}}}% + {\end{longtable}}% + \renewcommand*{\glossaryheader}{}% + \renewcommand*{\glsgroupheading}[1]{}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription & + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & &\tabularnewline\fi}% + } +} +{} +% \end{macrocode} +% Four column style: +% \begin{macrocode} +\ifcsdef{@glsstyle@long4col} +{% + \renewglossarystyle{long4col}{% + \renewenvironment{theglossary}% + {\begin{longtable}{llll}}% + {\end{longtable}}% + \renewcommand*{\glossaryheader}{}% + \renewcommand*{\glsgroupheading}[1]{}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription & + \glossentrysymbol{##1} & + ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription & + \glossentrysymbol{##2} & ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & & &\tabularnewline\fi}% + } +} +{} +% \end{macrocode} +% +%The styles in \sty{glossary-longbooktabs} are all based on the +%styles in \sty{glossary-long}, so no adjustments are needed for +%that package. +% +%\section{Long Ragged Styles} +% The three and four column styles require adjustment, but not the +% two column styles. +% \begin{macrocode} +\ifcsdef{@glsstyle@longragged3col} +{% + \renewglossarystyle{longragged3col}{% + \renewenvironment{theglossary}% + {\begin{longtable}{l>{\raggedright}p{\glsdescwidth}% + >{\raggedright}p{\glspagelistwidth}}}% + {\end{longtable}}% + \renewcommand*{\glossaryheader}{}% + \renewcommand*{\glsgroupheading}[1]{}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription & + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & &\tabularnewline\fi}% + } +} +{} +% \end{macrocode} +% Four column style: +% \begin{macrocode} +\ifcsdef{@glsstyle@altlongragged4col} +{% + \renewglossarystyle{altlongragged4col}{% + \renewenvironment{theglossary}% + {\begin{longtable}{l>{\raggedright}p{\glsdescwidth}l% + >{\raggedright}p{\glspagelistwidth}}}% + {\end{longtable}}% + \renewcommand*{\glossaryheader}{}% + \renewcommand*{\glsgroupheading}[1]{}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription & \glossentrysymbol{##1} & + ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription & + \glossentrysymbol{##2} & ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & & &\tabularnewline\fi}% + } +} +{} +% \end{macrocode} +% +%\section{Supertabular Styles} +% The three and four column styles require adjustment, but not the +% two column styles. +% \begin{macrocode} +\ifcsdef{@glsstyle@super3col} +{% + \renewglossarystyle{super3col}{% + \renewenvironment{theglossary}% + {\tablehead{}\tabletail{}% + \begin{supertabular}{lp{\glsdescwidth}p{\glspagelistwidth}}}% + {\end{supertabular}}% + \renewcommand*{\glossaryheader}{}% + \renewcommand*{\glsgroupheading}[1]{}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription & + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & &\tabularnewline\fi}% + } +} +{} +% \end{macrocode} +% Four column styles: +% \begin{macrocode} +\ifcsdef{@glsstyle@super4col} +{% + \renewglossarystyle{super4col}{% + \renewenvironment{theglossary}% + {\tablehead{}\tabletail{}% + \begin{supertabular}{llll}}{% + \end{supertabular}}% + \renewcommand*{\glossaryheader}{}% + \renewcommand*{\glsgroupheading}[1]{}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription & + \glossentrysymbol{##1} & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription & + \glossentrysymbol{##2} & ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & & &\tabularnewline\fi}% + } +} +{} +% \end{macrocode} +% +%\section{Super Ragged Styles} +% The three and four column styles require adjustment, but not the +% two column styles. +% \begin{macrocode} +\ifcsdef{@glsstyle@superragged3col} +{% + \renewglossarystyle{superragged3col}{% + \renewenvironment{theglossary}% + {\tablehead{}\tabletail{}% + \begin{supertabular}{l>{\raggedright}p{\glsdescwidth}% + >{\raggedright}p{\glspagelistwidth}}}% + {\end{supertabular}}% + \renewcommand*{\glossaryheader}{}% + \renewcommand*{\glsgroupheading}[1]{}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription & + ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription & + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & + &\tabularnewline\fi}% + } +} +{} +% \end{macrocode} +% Four columns: +% \begin{macrocode} +\ifcsdef{@glsstyle@altsuperragged4col} +{% + \renewglossarystyle{altsuperragged4col}{% + \renewenvironment{theglossary}% + {\tablehead{}\tabletail{}% + \begin{supertabular}{l>{\raggedright}p{\glsdescwidth}l% + >{\raggedright}p{\glspagelistwidth}}}% + {\end{supertabular}}% + \renewcommand*{\glossaryheader}{}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription & + \glossentrysymbol{##1} & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription & + \glossentrysymbol{##2} & ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & + &\tabularnewline\fi}% + } +} +{} +% \end{macrocode} +% +%\section{Inline Style} +% The \glostyle{inline} style is dealt with slightly differently. +% The \cs{glspostdescription} hook is actually in +% \cs{glspostinline}, which is called at the end of the glossary. +% The original definition of \cs{glspostinline} also includes a +% space, which is unnecessary. Here, instead of redefining the +% \glostyle{inline} style, just redefine \cs{glspostinline} and +% \cs{glsinlinedescformat}. +% \begin{macrocode} +\ifdef{\@glsstyle@inline} +{% + \renewcommand*{\glspostinline}{.\spacefactor\sfcode`\.} +% \end{macrocode} +% Just use \cs{glsxtrpostdescription} instead of +% \cs{glspostdescription}. +% \begin{macrocode} + \renewcommand*{\glsinlinedescformat}[3]{% + \space#1\glsxtrpostdescription} + \renewcommand*{\glsinlinesubdescformat}[3]{% + #1\glsxtrpostdescription} +} +{} +% \end{macrocode} +% +% Reset the default style +% \begin{macrocode} +\ifx\@glossary@default@style\relax +\else + \setglossarystyle{\@glsxtr@current@style} +\fi +% \end{macrocode} +%\iffalse +% \begin{macrocode} +%</glossaries-extra-stylemods.sty> +% \end{macrocode} +%\fi %\Finale \endinput diff --git a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins index 2e34c0e9868..12d4ae7b55a 100644 --- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins +++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins @@ -1,4 +1,4 @@ -% glossaries-extra.ins generated using makedtx version 1.1 2016/2/2 12:31 +% glossaries-extra.ins generated using makedtx version 1.1 2016/4/25 12:22 \input docstrip \preamble @@ -18,7 +18,7 @@ The Current Maintainer of this work is Nicola Talbot. - This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived file glossaries-extra.sty. + This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty. \endpreamble @@ -26,6 +26,8 @@ \generate{\file{glossaries-extra.sty}{\usepreamble\defaultpreamble \usepostamble\defaultpostamble\from{glossaries-extra.dtx}{glossaries-extra.sty,package}} +\file{glossaries-extra-stylemods.sty}{\usepreamble\defaultpreamble +\usepostamble\defaultpostamble\from{glossaries-extra.dtx}{glossaries-extra-stylemods.sty,package}} } \endbatchfile diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty new file mode 100644 index 00000000000..bf1cda9b3c4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty @@ -0,0 +1,293 @@ +%% +%% This is file `glossaries-extra-stylemods.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries-extra.dtx (with options: `glossaries-extra-stylemods.sty,package') +%% +%% glossaries-extra.dtx +%% Copyright 2016 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% 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-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty. +%% +%% \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-extra-stylemods}[2016/04/25 v1.02 (NLCT)] +\newcommand*{\@glsxtr@loadstyles}{} +\DeclareOption*{% + \IfFileExists{glossary-\CurrentOption.sty} + {\eappto\@glsxtr@loadstyles{% + \noexpand\RequirePackage{glossary-\CurrentOption}}}% + {\PackageError{glossaries-extra-styles}% + {Unknown option `\CurrentOption'}{}} +} +\ProcessOptions +\@glsxtr@loadstyles +\providecommand{\renewglossarystyle}[2]{% + \ifcsundef{@glsstyle@#1}% + {% + \PackageError{glossaries}{Glossary style `#1' isn't already defined}{}% + }% + {% + \csdef{@glsstyle@#1}{#2}% + }% +} +\ifdef{\@glsstyle@listdotted} +{% + \renewglossarystyle{listdotted}{% + \setglossarystyle{list}% + \renewcommand*{\glossentry}[2]{% + \item[]\makebox[\glslistdottedwidth][l]{% + \glsentryitem{##1}% + \glstarget{##1}{\glossentryname{##1}}% + \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}% + \glossentrydesc{##1}\glspostdescription}% + \renewcommand*{\subglossentry}[3]{% + \item[]\makebox[\glslistdottedwidth][l]{% + \glssubentryitem{##2}% + \glstarget{##2}{\glossentryname{##2}}% + \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}% + \glossentrydesc{##2}\glspostdescription}% + } +} +{} +\ifcsdef{@glsstyle@long3col} +{% + \renewglossarystyle{long3col}{% + \renewenvironment{theglossary}% + {\begin{longtable}{lp{\glsdescwidth}p{\glspagelistwidth}}}% + {\end{longtable}}% + \renewcommand*{\glossaryheader}{}% + \renewcommand*{\glsgroupheading}[1]{}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription & + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & &\tabularnewline\fi}% + } +} +{} +\ifcsdef{@glsstyle@long4col} +{% + \renewglossarystyle{long4col}{% + \renewenvironment{theglossary}% + {\begin{longtable}{llll}}% + {\end{longtable}}% + \renewcommand*{\glossaryheader}{}% + \renewcommand*{\glsgroupheading}[1]{}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription & + \glossentrysymbol{##1} & + ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription & + \glossentrysymbol{##2} & ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & & &\tabularnewline\fi}% + } +} +{} +\ifcsdef{@glsstyle@longragged3col} +{% + \renewglossarystyle{longragged3col}{% + \renewenvironment{theglossary}% + {\begin{longtable}{l>{\raggedright}p{\glsdescwidth}% + >{\raggedright}p{\glspagelistwidth}}}% + {\end{longtable}}% + \renewcommand*{\glossaryheader}{}% + \renewcommand*{\glsgroupheading}[1]{}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription & + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & &\tabularnewline\fi}% + } +} +{} +\ifcsdef{@glsstyle@altlongragged4col} +{% + \renewglossarystyle{altlongragged4col}{% + \renewenvironment{theglossary}% + {\begin{longtable}{l>{\raggedright}p{\glsdescwidth}l% + >{\raggedright}p{\glspagelistwidth}}}% + {\end{longtable}}% + \renewcommand*{\glossaryheader}{}% + \renewcommand*{\glsgroupheading}[1]{}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription & \glossentrysymbol{##1} & + ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription & + \glossentrysymbol{##2} & ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & & &\tabularnewline\fi}% + } +} +{} +\ifcsdef{@glsstyle@super3col} +{% + \renewglossarystyle{super3col}{% + \renewenvironment{theglossary}% + {\tablehead{}\tabletail{}% + \begin{supertabular}{lp{\glsdescwidth}p{\glspagelistwidth}}}% + {\end{supertabular}}% + \renewcommand*{\glossaryheader}{}% + \renewcommand*{\glsgroupheading}[1]{}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription & + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & &\tabularnewline\fi}% + } +} +{} +\ifcsdef{@glsstyle@super4col} +{% + \renewglossarystyle{super4col}{% + \renewenvironment{theglossary}% + {\tablehead{}\tabletail{}% + \begin{supertabular}{llll}}{% + \end{supertabular}}% + \renewcommand*{\glossaryheader}{}% + \renewcommand*{\glsgroupheading}[1]{}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription & + \glossentrysymbol{##1} & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription & + \glossentrysymbol{##2} & ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{% + \ifglsnogroupskip\else & & &\tabularnewline\fi}% + } +} +{} +\ifcsdef{@glsstyle@superragged3col} +{% + \renewglossarystyle{superragged3col}{% + \renewenvironment{theglossary}% + {\tablehead{}\tabletail{}% + \begin{supertabular}{l>{\raggedright}p{\glsdescwidth}% + >{\raggedright}p{\glspagelistwidth}}}% + {\end{supertabular}}% + \renewcommand*{\glossaryheader}{}% + \renewcommand*{\glsgroupheading}[1]{}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription & + ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription & + ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & + &\tabularnewline\fi}% + } +} +{} +\ifcsdef{@glsstyle@altsuperragged4col} +{% + \renewglossarystyle{altsuperragged4col}{% + \renewenvironment{theglossary}% + {\tablehead{}\tabletail{}% + \begin{supertabular}{l>{\raggedright}p{\glsdescwidth}l% + >{\raggedright}p{\glspagelistwidth}}}% + {\end{supertabular}}% + \renewcommand*{\glossaryheader}{}% + \renewcommand{\glossentry}[2]{% + \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} & + \glossentrydesc{##1}\glspostdescription & + \glossentrysymbol{##1} & ##2\tabularnewline + }% + \renewcommand{\subglossentry}[3]{% + & + \glssubentryitem{##2}% + \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription & + \glossentrysymbol{##2} & ##3\tabularnewline + }% + \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else & & + &\tabularnewline\fi}% + } +} +{} +\ifdef{\@glsstyle@inline} +{% + \renewcommand*{\glspostinline}{.\spacefactor\sfcode`\.} + \renewcommand*{\glsinlinedescformat}[3]{% + \space#1\glsxtrpostdescription} + \renewcommand*{\glsinlinesubdescformat}[3]{% + #1\glsxtrpostdescription} +} +{} +\ifx\@glossary@default@style\relax +\else + \setglossarystyle{\@glsxtr@current@style} +\fi +\endinput +%% +%% End of file `glossaries-extra-stylemods.sty'. diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty index 3b1643d23f4..4de2e2d245e 100644 --- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty +++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty @@ -21,7 +21,7 @@ %% %% The Current Maintainer of this work is Nicola Talbot. %% -%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived file glossaries-extra.sty. +%% This work consists of the files glossaries-extra.dtx and glossaries-extra.ins and the derived files glossaries-extra.sty, glossaries-extra-stylemods.sty. %% %% \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-extra}[2016/02/02 v1.01 (NLCT)] +\ProvidesPackage{glossaries-extra}[2016/04/25 v1.02 (NLCT)] \RequirePackage{xkeyval} \RequirePackage{etoolbox} \@ifpackageloaded{glossaries} @@ -232,6 +232,33 @@ }% \fi } +\newcommand*{\@glsxtr@redefstyles}{} +\define@key{glossaries-extra.sty}{stylemods}{% + \ifblank{#1}% + {% + \renewcommand*{\@glsxtr@redefstyles}{% + \RequirePackage{glossaries-extra-stylemods}}% + }% + {% + \renewcommand*{\@glsxtr@redefstyles}{}% + \@for\@glsxtr@tmp:=#1\do{% + \IfFileExists{glossary-\@glsxtr@tmp.sty}% + {% + \eappto\@glsxtr@redefstyles{% + \noexpand\RequirePackage{glossary-\@glsxtr@tmp}}% + }% + {% + \PackageError{glossaries-extra}% + {Glossaries style package `glossary-\@glsxtr@tmp.sty' + doesn't exist (did you mean to use the `style' key?)}% + {The list of values (#1) in the `styles' key should + match the glossary-xxx.sty files provided with + glossaries.sty}% + }% + }% + \appto\@glsxtr@redefstyles{\RequirePackage{glossaries-extra-stylemods}}% + }% +} \DeclareOptionX*{% \expandafter\glsxtr@dooption\expandafter{\CurrentOption}} \ProcessOptionsX @@ -501,6 +528,25 @@ \let\GlsXtrEnableOnTheFly\relax } \@onlypreamble\GlsXtrEnableOnTheFly +\newcommand*{\@glsxtr@current@style}{\@glossary@default@style} +\renewcommand*{\setglossarystyle}[1]{% + \ifcsundef{@glsstyle@#1}% + {% + \PackageError{glossaries}{Glossary style `#1' undefined}{}% + }% + {% + \csname @glsstyle@#1\endcsname + \protected@edef\@glsxtr@current@style{#1}% + }% + \ifx\@glossary@default@style\relax + \protected@edef\@glossary@default@style{#1}% + \fi +} +\ifdef\@glossary@default@style +{} +{% + \let\@glossary@default@style\relax +} \ifdef\glslistdottedwidth {% \ifdim\glslistdottedwidth=.5\hsize @@ -3792,6 +3838,8 @@ want \csname @glsabbrv@dispstyle@fmts@#1\endcsname }% } +\newif\ifglsxtrinsertinside +\glsxtrinsertinsidefalse \newabbreviationstyle{long-short}% {% \renewcommand*{\CustomAbbreviationFields}{% @@ -3819,19 +3867,24 @@ want \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}% \renewcommand*{\glsxtrfullformat}[2]{% - \glsfirstlongfont{\glsaccesslong{##1}}##2\glsxtrfullsep{##1}% + \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi + \glsxtrfullsep{##1}% (\glsfirstabbrvfont{\glsaccessshort{##1}})% }% \renewcommand*{\glsxtrfullplformat}[2]{% - \glsfirstlongfont{\glsaccesslongpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstabbrvfont{\glsaccessshortpl{##1}})% }% \renewcommand*{\Glsxtrfullformat}[2]{% - \glsfirstlongfont{\Glsaccesslong{##1}}##2\glsxtrfullsep{##1}% + \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstabbrvfont{\glsaccessshort{##1}})% }% \renewcommand*{\Glsxtrfullplformat}[2]{% - \glsfirstlongfont{\Glsaccesslongpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstabbrvfont{\glsaccessshortpl{##1}})% }% } @@ -3886,19 +3939,25 @@ want \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}% \renewcommand*{\glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi + \glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi + \glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% \renewcommand*{\Glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\Glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% } @@ -3951,35 +4010,43 @@ want \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}% \renewcommand*{\glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi \protect\footnote{\glsfirstlongfont{\glsaccesslong{##1}}}% }% \renewcommand*{\glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi \protect\footnote{\glsfirstlongfont{\glsaccesslongpl{##1}}}% }% \renewcommand*{\Glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshort{##1}}##2% + \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi \protect\footnote{\glsfirstlongfont{\glsaccesslong{##1}}}% }% \renewcommand*{\Glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2% + \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi \protect\footnote{\glsfirstlongfont{\glsaccesslongpl{##1}}}% }% \renewcommand*{\glsxtrinlinefullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\glsxtrinlinefullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% \renewcommand*{\Glsxtrinlinefullformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\Glsxtrinlinefullplformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% } @@ -3996,8 +4063,12 @@ want plural={\protect\glsabbvfont{\the\glsshortpltok}}}% \renewcommand*{\GlsXtrPostNewAbbreviation}{% \csdef{glsxtrpostlink\glscategorylabel}{% - \glsxtrifwasfirstuse{\glsxtrdopostpunc{\protect\footnote - {\glsfirstlongfont{\glsentrylong{\glslabel}}}}}{}% + \glsxtrifwasfirstuse + {% + \glsxtrdopostpunc{\protect\footnote + {\glsfirstlongfont{\glsentrylong{\glslabel}}}}% + }% + {}% }% \glshasattribute{\the\glslabeltok}{regular}% {% @@ -4005,6 +4076,9 @@ want }% {}% }% + \renewcommand*{\glsxtrsetupfulldefs}{% + \let\glsxtrifwasfirstuse\@secondoftwo + }% }% {% \renewcommand*{\abbrvpluralsuffix}{\glspluralsuffix}% @@ -4012,31 +4086,39 @@ want \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}% \renewcommand*{\glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\Glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshort{##1}}##2% + \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\Glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2% + \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\glsxtrinlinefullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\glsxtrinlinefullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% \renewcommand*{\Glsxtrinlinefullformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\Glsxtrinlinefullplformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% } @@ -4059,32 +4141,44 @@ want \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}% \renewcommand*{\glsxtrinlinefullformat}[2]{% - \protect\glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \protect\glsfirstabbrvfont{\glsaccessshort{##1}% + \ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\glsxtrinlinefullplformat}[2]{% - \protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \protect\glsfirstabbrvfont{\glsaccessshortpl{##1}% + \ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% \renewcommand*{\Glsxtrinlinefullformat}[2]{% - \protect\glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \protect\glsfirstabbrvfont{\glsaccessshort{##1}% + \ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\Glsaccesslong{##1}})% }% \renewcommand*{\Glsxtrinlinefullplformat}[2]{% - \protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \protect\glsfirstabbrvfont{\glsaccessshortpl{##1}% + \ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\Glsaccesslongpl{##1}})% }% \renewcommand*{\glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\Glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\Glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% } \setabbreviationstyle[acronym]{short} @@ -4107,32 +4201,40 @@ want \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}% \renewcommand*{\glsxtrinlinefullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\glsxtrinlinefullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% \renewcommand*{\Glsxtrinlinefullformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshort{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslong{##1}})% }% \renewcommand*{\Glsxtrinlinefullplformat}[2]{% - \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\glsfirstlongfont{\glsaccesslongpl{##1}})% }% \renewcommand*{\glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\Glsxtrfullformat}[2]{% - \glsfirstabbrvfont{\glsaccessshort{##1}}##2% + \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\Glsxtrfullplformat}[2]{% - \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2% + \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% } \newabbreviationstyle{long-desc}% @@ -4154,32 +4256,40 @@ want \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}% \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}% \renewcommand*{\glsxtrinlinefullformat}[2]{% - \glsfirstlongfont{\glsaccesslong{##1}}##2\glsxtrfullsep{##1}% + \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\protect\glsfirstabbrvfont{\glsaccessshort{##1}})% }% \renewcommand*{\glsxtrinlinefullplformat}[2]{% - \glsfirstlongfont{\glsaccesslongpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}})% }% \renewcommand*{\Glsxtrinlinefullformat}[2]{% - \glsfirstlongfont{\Glsaccesslong{##1}}##2\glsxtrfullsep{##1}% + \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\protect\glsfirstabbrvfont{\glsaccessshort{##1}})% }% \renewcommand*{\Glsxtrinlinefullplformat}[2]{% - \glsfirstlongfont{\Glsaccesslongpl{##1}}##2\glsxtrfullsep{##1}% + \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}% (\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}})% }% \renewcommand*{\glsxtrfullformat}[2]{% - \glsfirstlongfont{\glsaccesslong{##1}}##2% + \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\glsxtrfullplformat}[2]{% - \glsfirstlongfont{\glsaccesslongpl{##1}}##2% + \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\Glsxtrfullformat}[2]{% - \glsfirstlongfont{\glsaccesslong{##1}}##2% + \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% \renewcommand*{\Glsxtrfullplformat}[2]{% - \glsfirstlongfont{\glsaccesslongpl{##1}}##2% + \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}% + \ifglsxtrinsertinside\else##2\fi }% } \newabbreviationstyle{long}% @@ -4493,6 +4603,14 @@ want \let\@glsxtr@org@Glsxtrtitlefirst\Glsxtrtitlefirst \let\@glsxtr@org@glsxtrtitlefirstplural\glsxtrtitlefirstplural \let\@glsxtr@org@Glsxtrtitlefirstplural\Glsxtrtitlefirstplural + \let\@glsxtr@org@glsxtrtitlelong\glsxtrtitlelong + \let\@glsxtr@org@glsxtrtitlelongpl\glsxtrtitlelongpl + \let\@glsxtr@org@Glsxtrtitlelong\Glsxtrtitlelong + \let\@glsxtr@org@Glsxtrtitlelongpl\Glsxtrtitlelongpl + \let\@glsxtr@org@glsxtrtitlefull\glsxtrtitlefull + \let\@glsxtr@org@glsxtrtitlefullpl\glsxtrtitlefullpl + \let\@glsxtr@org@Glsxtrtitlefull\Glsxtrtitlefull + \let\@glsxtr@org@Glsxtrtitlefullpl\Glsxtrtitlefullpl \let\MakeUppercase\MakeTextUppercase \let\glsxtrtitleshort\glsxtrheadshort \let\glsxtrtitleshortpl\glsxtrheadshortpl @@ -4506,6 +4624,14 @@ want \let\Glsxtrtitlefirst\Glsxtrheadfirst \let\glsxtrtitlefirstplural\glsxtrheadfirstplural \let\Glsxtrtitlefirstplural\Glsxtrheadfirstplural + \let\glsxtrtitlelong\glsxtrheadlong + \let\glsxtrtitlelongpl\glsxtrheadlongpl + \let\Glsxtrtitlelong\Glsxtrheadlong + \let\Glsxtrtitlelongpl\Glsxtrheadlongpl + \let\glsxtrtitlefull\glsxtrheadfull + \let\glsxtrtitlefullpl\glsxtrheadfullpl + \let\Glsxtrtitlefull\Glsxtrheadfull + \let\Glsxtrtitlefullpl\Glsxtrheadfullpl } \newcommand*{\glsxtrrestoremarkhook}{% \let\MakeUppercase\@glsxtr@org@MakeUppercase @@ -4521,6 +4647,14 @@ want \let\Glsxtrtitlefirst\@glsxtr@org@Glsxtrtitlefirst \let\glsxtrtitlefirstplural\@glsxtr@org@glsxtrtitlefirstplural \let\Glsxtrtitlefirstplural\@glsxtr@org@Glsxtrtitlefirstplural + \let\glsxtrtitlelong\@glsxtr@org@glsxtrtitlelong + \let\glsxtrtitlelongpl\@glsxtr@org@glsxtrtitlelongpl + \let\Glsxtrtitlelong\@glsxtr@org@Glsxtrtitlelong + \let\Glsxtrtitlelongpl\@glsxtr@org@Glsxtrtitlelongpl + \let\glsxtrtitlefull\@glsxtr@org@glsxtrtitlefull + \let\glsxtrtitlefullpl\@glsxtr@org@glsxtrtitlefullpl + \let\Glsxtrtitlefull\@glsxtr@org@Glsxtrtitlefull + \let\Glsxtrtitlefullpl\@glsxtr@org@Glsxtrtitlefullpl } \newcommand*{\glsxtrheadshort}[1]{% \protect\NoCaseChange @@ -4702,6 +4836,126 @@ want \newrobustcmd*{\Glsxtrtitlefirstplural}[1]{% \Glsfirstplural[noindex,hyper=false]{#1}[]% } +\newcommand*{\glsxtrheadlong}[1]{% + \protect\NoCaseChange + {% + \glsifattribute{#1}{headuc}{true}% + {% + \GLSxtrlong[noindex,hyper=false]{#1}[]% + }% + {% + \glsxtrlong[noindex,hyper=false]{#1}[]% + }% + }% +} +\newrobustcmd*{\glsxtrtitlelong}[1]{% + \glsxtrlong[noindex,hyper=false]{#1}[]% +} +\newcommand*{\glsxtrheadlongpl}[1]{% + \protect\NoCaseChange + {% + \glsifattribute{#1}{headuc}{true}% + {% + \GLSxtrlongpl[noindex,hyper=false]{#1}[]% + }% + {% + \glsxtrlongpl[noindex,hyper=false]{#1}[]% + }% + }% +} +\newrobustcmd*{\glsxtrtitlelongpl}[1]{% + \glsxtrlong[noindex,hyper=false]{#1}[]% +} +\newcommand*{\Glsxtrheadlong}[1]{% + \protect\NoCaseChange + {% + \glsifattribute{#1}{headuc}{true}% + {% + \GLSxtrlong[noindex,hyper=false]{#1}[]% + }% + {% + \Glsxtrlong[noindex,hyper=false]{#1}[]% + }% + }% +} +\newrobustcmd*{\Glsxtrtitlelong}[1]{% + \Glsxtrlong[noindex,hyper=false]{#1}[]% +} +\newcommand*{\Glsxtrheadlongpl}[1]{% + \protect\NoCaseChange + {% + \glsifattribute{#1}{headuc}{true}% + {% + \GLSxtrlongpl[noindex,hyper=false]{#1}[]% + }% + {% + \Glsxtrlongpl[noindex,hyper=false]{#1}[]% + }% + }% +} +\newrobustcmd*{\Glsxtrtitlelongpl}[1]{% + \Glsxtrlongpl[noindex,hyper=false]{#1}[]% +} +\newcommand*{\glsxtrheadfull}[1]{% + \protect\NoCaseChange + {% + \glsifattribute{#1}{headuc}{true}% + {% + \GLSxtrfull[noindex,hyper=false]{#1}[]% + }% + {% + \glsxtrfull[noindex,hyper=false]{#1}[]% + }% + }% +} +\newrobustcmd*{\glsxtrtitlefull}[1]{% + \glsxtrfull[noindex,hyper=false]{#1}[]% +} +\newcommand*{\glsxtrheadfullpl}[1]{% + \protect\NoCaseChange + {% + \glsifattribute{#1}{headuc}{true}% + {% + \GLSxtrfullpl[noindex,hyper=false]{#1}[]% + }% + {% + \glsxtrfullpl[noindex,hyper=false]{#1}[]% + }% + }% +} +\newrobustcmd*{\glsxtrtitlefullpl}[1]{% + \glsxtrfullpl[noindex,hyper=false]{#1}[]% +} +\newcommand*{\Glsxtrheadfull}[1]{% + \protect\NoCaseChange + {% + \glsifattribute{#1}{headuc}{true}% + {% + \GLSxtrfull[noindex,hyper=false]{#1}[]% + }% + {% + \Glsxtrfull[noindex,hyper=false]{#1}[]% + }% + }% +} +\newrobustcmd*{\Glsxtrtitlefull}[1]{% + \Glsxtrfull[noindex,hyper=false]{#1}[]% +} +\newcommand*{\Glsxtrheadfullpl}[1]{% + \protect\NoCaseChange + {% + \glsifattribute{#1}{headuc}{true}% + {% + \GLSxtrfullpl[noindex,hyper=false]{#1}[]% + }% + {% + \Glsxtrfullpl[noindex,hyper=false]{#1}[]% + }% + }% +} +\newrobustcmd*{\Glsxtrtitlefullpl}[1]{% + \Glsxtrfullpl[noindex,hyper=false]{#1}[]% +} \ifdef\texorpdfstring { \newcommand*{\glsfmtshort}[1]{% @@ -4846,6 +5100,102 @@ want \newcommand*{\Glsfmtfirstpl}[1]{% \Glsxtrtitlefirstplural{#1}} } +\ifdef\texorpdfstring +{ + \newcommand*{\glsfmtlong}[1]{% + \texorpdfstring + {\glsxtrtitlelong{#1}}% + {\glsentrylong{#1}}% + } +} +{ + \newcommand*{\glsfmtlong}[1]{% + \glsxtrtitlelong{#1}} +} +\ifdef\texorpdfstring +{ + \newcommand*{\Glsfmtlong}[1]{% + \texorpdfstring + {\Glsxtrtitlelong{#1}}% + {\glsentrylong{#1}}% + } +} +{ + \newcommand*{\Glsfmtlong}[1]{% + \Glsxtrtitlelong{#1}} +} +\ifdef\texorpdfstring +{ + \newcommand*{\glsfmtlongpl}[1]{% + \texorpdfstring + {\glsxtrtitlelongpl{#1}}% + {\glsentrylongpl{#1}}% + } +} +{ + \newcommand*{\glsfmtlongpl}[1]{% + \glsxtrtitlelongpl{#1}} +} +\ifdef\texorpdfstring +{ + \newcommand*{\Glsfmtlongpl}[1]{% + \texorpdfstring + {\Glsxtrtitlelongpl{#1}}% + {\glsentrylongpl{#1}}% + } +} +{ + \newcommand*{\Glsfmtlongpl}[1]{% + \Glsxtrtitlelongpl{#1}} +} +\ifdef\texorpdfstring +{ + \newcommand*{\glsfmtfull}[1]{% + \texorpdfstring + {\glsxtrtitlefull{#1}}% + {\glsxtrinlinefullformat{#1}{}}% + } +} +{ + \newcommand*{\glsfmtfull}[1]{% + \glsxtrtitlefull{#1}} +} +\ifdef\texorpdfstring +{ + \newcommand*{\Glsfmtfull}[1]{% + \texorpdfstring + {\Glsxtrtitlefull{#1}}% + {\Glsxtrinlinefullformat{#1}{}}% + } +} +{ + \newcommand*{\Glsfmtfull}[1]{% + \Glsxtrtitlefull{#1}} +} +\ifdef\texorpdfstring +{ + \newcommand*{\glsfmtfullpl}[1]{% + \texorpdfstring + {\glsxtrtitlefullpl{#1}}% + {\glsxtrinlinefullplformat{#1}{}}% + } +} +{ + \newcommand*{\glsfmtfullpl}[1]{% + \glsxtrtitlefullpl{#1}} +} +\ifdef\texorpdfstring +{ + \newcommand*{\Glsfmtfullpl}[1]{% + \texorpdfstring + {\Glsxtrtitlefullpl{#1}}% + {\Glsxtrinlinefullplformat{#1}{}}% + } +} +{ + \newcommand*{\Glsfmtfullpl}[1]{% + \Glsxtrtitlefullpl{#1}} +} \newcommand*{\RequireGlossariesExtraLang}[1]{% \@ifundefined{ver@glossariesxtr-#1.ldf}{\input{glossariesxtr-#1.ldf}}{}% } @@ -4870,6 +5220,7 @@ want {}% } {} +\@glsxtr@redefstyles \endinput %% %% End of file `glossaries-extra.sty'. |