summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/CHANGES41
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/README4
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdfbin606467 -> 645845 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.html6080
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdfbin497064 -> 524589 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex728
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdfbin43319 -> 43319 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdfbin80229 -> 80757 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.tex4
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdfbin50368 -> 50368 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdfbin36745 -> 36745 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdfbin35308 -> 35308 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdfbin141074 -> 140858 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdfbin146482 -> 146227 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdfbin40135 -> 40135 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdfbin45257 -> 45257 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdfbin54623 -> 54623 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdfbin63232 -> 63232 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdfbin125199 -> 125199 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdfbin42722 -> 42722 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdfbin81591 -> 81591 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-mixed-abbrv-styles.pdfbin57823 -> 57823 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdfbin159740 -> 159472 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.tex39
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdfbin0 -> 202100 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.tex355
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdfbin67736 -> 67736 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdfbin44527 -> 44527 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-utf8.pdfbin106071 -> 106071 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly-xetex.pdfbin19835 -> 19837 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdfbin43481 -> 43481 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdfbin0 -> 38801 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.tex34
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdfbin37063 -> 37063 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdfbin68876 -> 68876 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdfbin33119 -> 33119 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdfbin0 -> 49455 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.tex54
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdfbin33231 -> 33231 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdfbin61058 -> 61058 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample.pdfbin45747 -> 45747 bytes
-rw-r--r--Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx1916
-rw-r--r--Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.ins2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty1002
45 files changed, 7104 insertions, 3157 deletions
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES b/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES
index d5d29e15d8b..631b693993e 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES
@@ -1,3 +1,44 @@
+1.04 (2016-05-02):
+
+ * Added \GlsXtrEnablePreLocationTag
+
+ * Added check for category \glsxtrpostname... in
+ \glxstrpostnamehook
+
+ * Added new abbreviation styles:
+ - long-short-user
+ - long-short-user-desc
+ - short-long-user
+ - short-long-user-desc
+ and their accompanying commands \glsxtruserfield,
+ \glsxtruserparen, \glsabbrvuserfont and \glsxtrusersuffix.
+
+ * Added new abbreviation styles:
+ - long-em-short-em
+ - long-em-short-em-desc
+ - short-em-long-em
+ - short-em-long-em-desc
+ and their accompanying commands \glsabbrvemfont and
+ \glsfirstlongemfont
+
+ * Fixed sort in long-short-desc abbreviation style.
+
+ * Reorganised naming scheme of abbreviation styles.
+ (Backward-compatible synonyms provided.)
+
+ * Added \glsxtrregularfont
+
+ * Added \glslongfont and \glslongdefaultfont
+
+ * Added glossdescfont and glossnamefont attribute checks in
+ \glossentryname, \Glossentryname and \glossentrydesc
+
+ * Tidied up accessibility support
+
+ * Modified \glstext, \glsfirst, \glsplural, \glsfirstplural
+ (and case-changing variants) to set the abbreviation style
+ if required.
+
1.03 (2016-04-27):
* Fixed bug in \glsxtrtitleshortpl
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/README b/Master/texmf-dist/doc/latex/glossaries-extra/README
index dc7a629a04a..bbbc4adbac6 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.03
+LaTeX Package : glossaries-extra v1.04
-Last Modified : 2016-04-27
+Last Modified : 2016-05-02
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
index 4a2f9b6f32a..71793fb9b57 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
Binary files differ
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 8ca0f432659..bc1224a8034 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-04-27 11:10:00" />
+<meta name="date" content="2016-05-02 18:11:00" />
<style type="text/css">
<!--
@@ -298,22 +298,22 @@ a span.HoLogo-TeX span.HoLogo-e{text-decoration:none;}
</style>
</head><body
>
-<!--l. 149--><p class="noindent" ><a
+<!--l. 151--><p class="noindent" ><a
id="top"></a>
-</p><!--l. 149--><p class="indent" >
+</p><!--l. 151--><p class="indent" >
-</p><!--l. 149--><p class="indent" >
+</p><!--l. 151--><p class="indent" >
</p>
<div class="center"
>
-<!--l. 149--><p class="noindent" >
-</p><!--l. 149--><p class="noindent" ><span
-class="ecrm-1728">glossaries-extra.sty v1.03: an extension to the</span>
+<!--l. 151--><p class="noindent" >
+</p><!--l. 151--><p class="noindent" ><span
+class="ecrm-1728">glossaries-extra.sty v1.04: an extension to the</span>
<span
class="ecrm-1728">glossaries package</span>
</p>
@@ -336,22 +336,22 @@ class="td11"><a
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-04-27</span></p></div>
+<!--l. 151--><p class="noindent" ><span
+class="ecrm-1200">2016-05-02</span></p></div>
<div
class="abstract"
>
-<!--l. 151--><p class="indent" >
+<!--l. 153--><p class="indent" >
</p>
<div class="center"
>
-<!--l. 151--><p class="noindent" >
-</p><!--l. 151--><p class="noindent" ><span
+<!--l. 153--><p class="noindent" >
+</p><!--l. 153--><p class="noindent" ><span
class="ecbx-1000">Abstract</span></p></div>
-<!--l. 152--><p class="noindent" >The <span
+<!--l. 154--><p class="noindent" >The <span
class="ecss-1000">glossaries-extra </span>package is an extension to the <span
class="ecss-1000">glossaries</span><a
id="dx1-2"></a> package, providing
@@ -367,7 +367,7 @@ class="ecss-1000">glossaries</span><a
</p>
</div>
-<!--l. 160--><p class="indent" > <div class="important" title="Important Note"> Since <span
+<!--l. 162--><p class="indent" > <div class="important" title="Important Note"> Since <span
class="ecss-1000">glossaries-extra </span>internally loads the <span
class="ecss-1000">glossaries</span><a
id="dx1-5"></a> package, you also need to have
@@ -405,7 +405,7 @@ class="E">E</span>X</span>&#x00A0;distribution?</a> or <a
href="http://tex.stackexchange.com/questions/14925/updating-tex-on-linux" >Updating <span class="TEX">T<span
class="E">E</span>X</span>&#x00A0;on Linux</a>.)
</div>
-</p><!--l. 175--><p class="noindent" >
+</p><!--l. 177--><p class="noindent" >
@@ -474,16 +474,16 @@ href="#glossary">Glossary</a></span>
-<!--l. 180--><p class="indent" > <div class="chapter"><h2 class="chapterHead">1. <a
+<!--l. 182--><p class="indent" > <div class="chapter"><h2 class="chapterHead">1. <a
id="sec:intro"></a>Introduction</h2>
-</p><!--l. 183--><p class="indent" > The <span
+</p><!--l. 185--><p class="indent" > The <span
class="ecss-1000">glossaries</span><a
id="dx1-2001"></a> package is a flexible package, but it&#8217;s also a heavy-weight package
that uses a lot of resources. As package developer, I&#8217;m caught between those users
who complain about the drawbacks of a heavy-weight package with a large user
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
+</p><!--l. 192--><p class="indent" > The <span
class="ecss-1000">glossaries-extra </span>package is an attempt to provide a&#x00A0;compromise for this
conflict. Version 4.22 of the <span
class="ecss-1000">glossaries </span>package is the last version to incorporate new
@@ -499,10 +499,10 @@ 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. 204--><p class="noindent" ><a
+<!--l. 206--><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. 207--><p class="noindent" >I&#8217;m not happy with some of the default settings assumed by the <span
+<!--l. 209--><p class="noindent" >I&#8217;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&#8217;ve seen, other users also seem unhappy with them, as
@@ -513,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&#8217;re not
appropriate.
-</p><!--l. 217--><p class="indent" > The new defaults are: </p>
+</p><!--l. 219--><p class="indent" > The new defaults are: </p>
<ul class="itemize1">
<li class="itemize"><span
class="ecss-1000">toc=true</span><a
@@ -566,7 +566,7 @@ class="ecss-1000">babel</span><a
-<!--l. 241--><p class="indent" > Examples:
+<!--l. 243--><p class="indent" > Examples:
</p><ol class="enumerate1" >
<li
class="enumerate" id="x1-3018x1">
@@ -577,7 +577,7 @@ class="ecss-1000">babel</span><a
\documentclass{article}
&#x00A0;<br />\usepackage{glossaries-extra}
</div>
- <!--l. 247--><p class="nopar" > This is like:
+ <!--l. 249--><p class="nopar" > This is like:
@@ -587,7 +587,7 @@ class="ecss-1000">babel</span><a
&#x00A0;<br />\usepackage[toc,nopostdot]{glossaries}
&#x00A0;<br />\usepackage{glossaries-extra}
</div>
- <!--l. 253--><p class="nopar" >
+ <!--l. 255--><p class="nopar" >
</p></li>
<li
class="enumerate" id="x1-3020x2">
@@ -599,7 +599,7 @@ class="ecss-1000">babel</span><a
&#x00A0;<br />\usepackage{babel}
&#x00A0;<br />\usepackage{glossaries-extra}
</div>
- <!--l. 260--><p class="nopar" > This is like:
+ <!--l. 262--><p class="nopar" > This is like:
@@ -610,7 +610,7 @@ class="ecss-1000">babel</span><a
&#x00A0;<br />\usepackage[toc,nopostdot,translate=babel]{glossaries}
&#x00A0;<br />\usepackage{glossaries-extra}
</div>
- <!--l. 267--><p class="nopar" >
+ <!--l. 269--><p class="nopar" >
</p></li>
<li
class="enumerate" id="x1-3022x3">
@@ -621,7 +621,7 @@ class="ecss-1000">babel</span><a
\documentclass{memoir}
&#x00A0;<br />\usepackage{glossaries-extra}
</div>
- <!--l. 273--><p class="nopar" > This is like:
+ <!--l. 275--><p class="nopar" > This is like:
@@ -631,7 +631,7 @@ class="ecss-1000">babel</span><a
&#x00A0;<br />\usepackage[toc,nopostdot,noredefwarn]{glossaries}
&#x00A0;<br />\usepackage{glossaries-extra}
</div>
- <!--l. 279--><p class="nopar" > <span
+ <!--l. 281--><p class="nopar" > <span
class="ecti-1000">However</span>
@@ -642,7 +642,7 @@ class="ecti-1000">However</span>
&#x00A0;<br />\usepackage{glossaries}
&#x00A0;<br />\usepackage{glossaries-extra}
</div>
- <!--l. 285--><p class="nopar" > This is like:
+ <!--l. 287--><p class="nopar" > This is like:
@@ -652,20 +652,20 @@ class="ecti-1000">However</span>
&#x00A0;<br />\usepackage[toc,nopostdot]{glossaries}
&#x00A0;<br />\usepackage{glossaries-extra}
</div>
- <!--l. 291--><p class="nopar" > Since by the time <span
+ <!--l. 293--><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>&#8217;s glossary-related commands.</p></li></ol>
-<!--l. 297--><p class="indent" > Another noticeable change is that by default <span
+<!--l. 299--><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&#8217;t exist. This is
explanatory text to help new users who can&#8217;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. 304--><p class="indent" > This change is mostly likely to be noticed by users with one or more
+</p><!--l. 306--><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
@@ -695,14 +695,14 @@ following:
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 328--><p class="nopar" > The above document will only display the list of acronyms at the place where
+<!--l. 330--><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. 334--><p class="indent" > If you use <a
+</p><!--l. 336--><p class="indent" > If you use <a
id="dx1-3030"></a><a
href="#glo:makeglossaries"><span
class="ectt-1000">makeglossaries</span></a>, you&#8217;ll get the warning message:
@@ -716,7 +716,7 @@ Warning:&#x00A0;File&#x00A0;&#8217;test.glo&#8217;&#x00A0;is&#x00A0;empty.
&#x00A0;<br />Remember&#x00A0;to&#x00A0;use&#x00A0;package&#x00A0;option&#x00A0;&#8217;nomain&#8217;&#x00A0;if&#x00A0;you
&#x00A0;<br />don&#8217;t&#x00A0;want&#x00A0;to&#x00A0;use&#x00A0;the&#x00A0;main&#x00A0;glossary.
</div>
-<!--l. 340--><p class="nopar" > (where the original file is called <span
+<!--l. 342--><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
@@ -732,14 +732,14 @@ transcript file will always contain the message:
<div class="verbatim" id="verbatim-11">
No&#x00A0;file&#x00A0;test.gls.
</div>
-<!--l. 347--><p class="nopar" > This doesn&#8217;t occur with <a
+<!--l. 349--><p class="nopar" > This doesn&#8217;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. 351--><p class="indent" > If you simply change from <span
+</p><!--l. 353--><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&#8217;ll find
@@ -751,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. 356--><p class="indent" > The transcript file will still contain the message about the missing <span
+</p><!--l. 358--><p class="indent" > The transcript file will still contain the message about the missing <span
class="ectt-1000">.gls</span>, but now
you&#8217;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
@@ -773,13 +773,13 @@ class="ecss-1000">nomain</span><a
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 378--><p class="nopar" >
-</p><!--l. 381--><p class="noindent" >
+<!--l. 380--><p class="nopar" >
+</p><!--l. 383--><p class="noindent" >
</p>
-<!--l. 381--><p class="noindent" ><a
+<!--l. 383--><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. 384--><p class="noindent" >If you haven&#8217;t already loaded <span
+<!--l. 386--><p class="noindent" >If you haven&#8217;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
@@ -799,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. 392--><p class="indent" > In addition to those options recognised by <span
+</p><!--l. 394--><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
@@ -811,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. 399--><p class="noindent" >If you want to define styles that can interface with the accessibility support
+ <!--l. 401--><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
@@ -840,7 +840,7 @@ href="#sec:accsupp">Accessibility Support<!--tex4ht:ref: sec:accsupp --></a> for
- </p><!--l. 409--><p class="noindent" >Note that the <span
+ </p><!--l. 411--><p class="noindent" >Note that the <span
class="ecss-1000">accsupp</span><a
id="dx1-4014"></a> option can only be used as a&#x00A0;package option (not
through <span
@@ -928,7 +928,7 @@ class="ecss-1000">glossaries</span><a
<span
class="ecss-1000">glossaries</span><a
id="dx1-4036"></a> user manual for further details.
- <!--l. 446--><p class="noindent" >This option affects commands that internally use <span
+ <!--l. 448--><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 &#8220;on-the-fly&#8221; commands described
@@ -977,14 +977,14 @@ class="ectt-1000">abbreviations </span>and
redefines <span
class="ectt-1000">\glsxtrabbrvtype </span>to this label. In addition, it defines a shortcut
command
- <!--l. 472--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 474--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\printabbreviations</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-4043"></a> <span
class="ectt-1000">\printabbreviations[</span>&#x27E8;<span
class="ecit-1000">options</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
- </p><!--l. 474--><p class="noindent" >
+ </p><!--l. 476--><p class="noindent" >
which is equivalent to </p><div class="alltt">
<div class="obeylines-v">
<span
@@ -993,12 +993,12 @@ class="ecit-1000">options</span>&#x27E9;<span
class="ectt-1000">]</span>
</div>
</div> The title of the new glossary is given by
- <!--l. 480--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 482--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\abbreviationsname</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-4044"></a> <span
class="ectt-1000">\abbreviationsname </span></div><hr>
- </p><!--l. 482--><p class="noindent" >
+ </p><!--l. 484--><p class="noindent" >
If this command is already defined, it&#8217;s left unchanged. Otherwise it&#8217;s defined
to &#8220;Abbreviations&#8221; if <span
class="ecss-1000">babel</span><a
@@ -1013,14 +1013,14 @@ class="ecss-1000">babel</span><a
href="#sec:lang">&sect;10 </a><a
href="#sec:lang">Multi-Lingual Support<!--tex4ht:ref: sec:lang --></a> for further
details.)
- </p><!--l. 489--><p class="noindent" ><div class="important" title="Important Note"> If you don&#8217;t use the <span
+ </p><!--l. 491--><p class="noindent" ><div class="important" title="Important Note"> If you don&#8217;t use the <span
class="ecss-1000">abbreviations</span><a
id="dx1-4048"></a> package option, the <span
class="ectt-1000">\abbreviationsname</span>
command won&#8217;t be defined (unless it&#8217;s defined by an included language file).
</div>
- </p><!--l. 493--><p class="noindent" >
- </p><!--l. 495--><p class="noindent" >If the <span
+ </p><!--l. 495--><p class="noindent" >
+ </p><!--l. 497--><p class="noindent" >If the <span
class="ecss-1000">abbreviations</span><a
id="dx1-4049"></a> option is used and the <span
class="ecss-1000">acronym</span><a
@@ -1049,8 +1049,8 @@ class="ectt-1000">main</span>:
<div class="verbatim" id="verbatim-13">
\renewcommand*{\acronymtype}{main}
</div>
- <!--l. 505--><p class="nopar" >
- </p><!--l. 507--><p class="noindent" >Note that there are no analogous options to the <span
+ <!--l. 507--><p class="nopar" >
+ </p><!--l. 509--><p class="noindent" >Note that there are no analogous options to the <span
class="ecss-1000">glossaries</span><a
id="dx1-4055"></a> package&#8217;s <span
class="ecss-1000">acronymlists</span><a
@@ -1065,7 +1065,7 @@ class="ecsx-1000">symbols</span><a
class="description">This is passed to <span
class="ecss-1000">glossaries</span><a
id="dx1-4058"></a> but will additionally define
- <!--l. 514--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 516--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrnewsymbol</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-4059"></a> <span
@@ -1077,7 +1077,7 @@ class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">symbol</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
- </p><!--l. 516--><p class="noindent" >
+ </p><!--l. 518--><p class="noindent" >
which is equivalent to </p><div class="alltt">
<div class="obeylines-v">
<span
@@ -1106,7 +1106,7 @@ class="ecsx-1000">numbers</span><a
class="description">This is passed to <span
class="ecss-1000">glossaries</span><a
id="dx1-4062"></a> but will additionally define
- <!--l. 527--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 529--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrnewnumber</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-4063"></a> <span
@@ -1115,7 +1115,7 @@ class="ecit-1000">options</span>&#x27E9;<span
class="ectt-1000">]{</span>&#x27E8;<span
class="ecit-1000">number</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
- </p><!--l. 529--><p class="noindent" >
+ </p><!--l. 531--><p class="noindent" >
which is equivalent to </p><div class="alltt">
<div class="obeylines-v">
<span
@@ -1212,32 +1212,32 @@ class="ecss-1000">shortcuts=none</span><a
class="ecss-1000">shortcuts=false</span><a
id="dx1-4085"></a>): don&#8217;t define any of the shortcut
commands (default).</li></ul>
- <!--l. 568--><p class="noindent" >Note that multiple invocations of the <span
+ <!--l. 570--><p class="noindent" >Note that multiple invocations of the <span
class="ecss-1000">shortcuts</span><a
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. 572--><p class="indent" > After the <span
+<!--l. 574--><p class="indent" > After the <span
class="ecss-1000">glossaries-extra </span>package has been loaded, you can set available options
using
-</p><!--l. 574--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 576--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glossariesextrasetup</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-4087"></a> <span
class="ectt-1000">\glossariesextrasetup{</span>&#x27E8;<span
class="ecit-1000">options</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 576--><p class="noindent" >
+</p><!--l. 578--><p class="noindent" >
The <span
class="ecss-1000">abbreviations</span><a
id="dx1-4088"></a> option may only be used in the preamble.
-</p><!--l. 579--><p class="noindent" >
+</p><!--l. 581--><p class="noindent" >
</p>
-<!--l. 579--><p class="noindent" ><a
+<!--l. 581--><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. 582--><p class="noindent" >The commands used by <span
+<!--l. 584--><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
@@ -1246,7 +1246,7 @@ class="ectt-1000">\glsdoifexists</span><a
class="ecss-1000">undefaction</span><a
id="dx1-5003"></a> option into
account.
-</p><!--l. 586--><p class="indent" > The <span
+</p><!--l. 588--><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
@@ -1258,7 +1258,7 @@ further information about categories.
-</p><!--l. 592--><p class="indent" > The <span
+</p><!--l. 594--><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
@@ -1273,12 +1273,12 @@ class="ecss-1000">glossaries-extra</span>. (See <a
href="#sec:abbreviations">&sect;2
</a><a
href="#sec:abbreviations">Abbreviations<!--tex4ht:ref: sec:abbreviations --></a>.)
-</p><!--l. 598--><p class="noindent" >
+</p><!--l. 600--><p class="noindent" >
</p>
-<!--l. 598--><p class="noindent" ><a
+<!--l. 600--><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. 601--><p class="noindent" >The <span
+<!--l. 603--><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
@@ -1311,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. 616--><p class="indent" > There is a new hook that&#8217;s used each time indexing information is written to the
+</p><!--l. 618--><p class="indent" > There is a new hook that&#8217;s used each time indexing information is written to the
external glossary files:
-</p><!--l. 618--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 620--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrdowrglossaryhook</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-6010"></a> <span
class="ectt-1000">\glsxtrdowrglossaryhook{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 620--><p class="noindent" >
+</p><!--l. 622--><p class="noindent" >
where &#x27E8;<span
class="ecti-1000">label</span>&#x27E9; is the entry&#8217;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&#8217;t been indexed.)
-</p><!--l. 627--><p class="indent" > The value of the <span
+</p><!--l. 629--><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&#8217;t the case with <span
class="ecss-1000">glossaries</span><a
@@ -1354,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. 640--><p class="indent" > This modification allows <span
+</p><!--l. 642--><p class="indent" > This modification allows <span
class="ecss-1000">glossaries-extra </span>to provide
-</p><!--l. 641--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 643--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtraddallcrossrefs</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-6021"></a> <span
class="ectt-1000">\glsxtraddallcrossrefs </span></div><hr>
-</p><!--l. 643--><p class="noindent" >
+</p><!--l. 645--><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. 648--><p class="indent" > As a by-product of this enhancement, the <span
+</p><!--l. 650--><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&#8217;s still best to define entries in the
@@ -1378,12 +1378,12 @@ class="ectt-1000">\makeglossaries</span>.
-</p><!--l. 654--><p class="noindent" >
+</p><!--l. 656--><p class="noindent" >
</p>
-<!--l. 654--><p class="noindent" ><a
+<!--l. 656--><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. 657--><p class="noindent" >Recall from the <span
+<!--l. 659--><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
@@ -1395,289 +1395,379 @@ whether or not it actually has a hyperlink. The actual text and the way
it&#8217;s displayed depends on the command used (such as <span
class="ectt-1000">\gls</span>) and the entry
format.
-</p><!--l. 664--><p class="indent" > The default entry format (<span
+</p><!--l. 666--><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
<span
-class="ectt-1000">\gls </span>(but not commands like <span
+class="ectt-1000">\gls</span><a
+ id="dx1-7005"></a>, <span
+class="ectt-1000">\glsxtrfull</span><a
+ id="dx1-7006"></a>, <span
+class="ectt-1000">\glsxtrshort</span><a
+ id="dx1-7007"></a> and <span
+class="ectt-1000">\glsxtrlong</span><a
+ id="dx1-7008"></a> (but not commands like
+<span
+class="ectt-1000">\glslink</span><a
+ id="dx1-7009"></a>, <span
+class="ectt-1000">\glsfirst</span><a
+ id="dx1-7010"></a> and <span
class="ectt-1000">\glstext</span>) is changed by <span
-class="ecss-1000">glossaries-extra </span>to test for
-regular entries, which are determined as follows:
+class="ecss-1000">glossaries-extra </span>to test for regular
+entries, which are determined as follows:
</p>
<ul class="itemize1">
<li class="itemize">If an entry is assigned to a category that has the <span
class="ecss-1000">regular</span><a
- id="dx1-7005"></a> attribute set (see <a
+ id="dx1-7011"></a> attribute set (see <a
href="#sec:categories">&sect;4
</a><a
href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a>), the entry is considered a&#x00A0;regular entry, even if it has a&#x00A0;value
for the <span
class="ecss-1000">short</span><a
- id="dx1-7006"></a> key. In this case <span
+ id="dx1-7012"></a> key. In this case <span
class="ectt-1000">\glsentryfmt </span>uses <span
class="ectt-1000">\glsgenentryfmt</span><a
- id="dx1-7007"></a>
+ id="dx1-7013"></a>
(provided by <span
class="ecss-1000">glossaries</span><a
- id="dx1-7008"></a>), which uses the <span
+ id="dx1-7014"></a>), which uses the <span
class="ecss-1000">first</span><a
- id="dx1-7009"></a> (or <span
+ id="dx1-7015"></a> (or <span
class="ecss-1000">firstplural</span><a
- id="dx1-7010"></a>) value on <a
- id="dx1-7011"></a><a
+ id="dx1-7016"></a>) value on <a
+ id="dx1-7017"></a><a
href="#glo:firstuse">first
use</a> and the <span
class="ecss-1000">text</span><a
- id="dx1-7012"></a> (or <span
+ id="dx1-7018"></a> (or <span
class="ecss-1000">plural</span><a
- id="dx1-7013"></a>) value on subsequent use.
+ id="dx1-7019"></a>) value on subsequent use.
</li>
<li class="itemize">An entry that doesn&#8217;t have a&#x00A0;value for the <span
class="ecss-1000">short</span><a
- id="dx1-7014"></a> key is assumed to be
+ id="dx1-7020"></a> key is assumed to be
a&#x00A0;regular entry, even if the <span
class="ecss-1000">regular</span><a
- id="dx1-7015"></a> attribute isn&#8217;t set to &#8220;true&#8221; (since it can&#8217;t
+ id="dx1-7021"></a> attribute isn&#8217;t set to &#8220;true&#8221; (since it can&#8217;t
be an abbreviation without the short form). In this case <span
class="ectt-1000">\glsentryfmt</span>
uses <span
class="ectt-1000">\glsgenentryfmt</span><a
- id="dx1-7016"></a>.
+ id="dx1-7022"></a>.
</li>
<li class="itemize">If an entry does has a&#x00A0;value for the <span
class="ecss-1000">short</span><a
- id="dx1-7017"></a> key and hasn&#8217;t been marked as
+ id="dx1-7023"></a> key and hasn&#8217;t been marked as
a&#x00A0;regular entry through the <span
class="ecss-1000">regular</span><a
- id="dx1-7018"></a> attribute, it&#8217;s not considered a regular
+ id="dx1-7024"></a> attribute, it&#8217;s not considered a regular
entry. In this case <span
class="ectt-1000">\glsentryfmt </span>uses <span
class="ectt-1000">\glsxtrgenabbrvfmt</span><a
- id="dx1-7019"></a> (defined by
+ id="dx1-7025"></a> (defined by
<span
class="ecss-1000">glossaries-extra</span>) which is governed by the abbreviation style (see <a
href="#sec:abbrstyle">&sect;2.2
</a><a
href="#sec:abbrstyle">Abbreviation Styles<!--tex4ht:ref: sec:abbrstyle --></a>).
</li></ul>
-<!--l. 694--><p class="indent" > This means that entries with a short form can be treated as regular entries rather
+<!--l. 697--><p class="indent" > This means that entries with a short form can be treated as regular entries rather
than abbreviations if it&#8217;s more appropriate for the desired style.
-</p><!--l. 698--><p class="indent" > The <span
+</p><!--l. 701--><p class="indent" > As from version 1.04, <span
+class="ectt-1000">\glsentryfmt</span><a
+ id="dx1-7026"></a> now puts <span
+class="ectt-1000">\glsgenentry</span><a
+ id="dx1-7027"></a> in the argument of
+the new command
+</p><!--l. 703--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glsxtrregularfont</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-7028"></a> <span
+class="ectt-1000">\glsxtrregularfont{</span>&#x27E8;<span
+class="ecit-1000">text</span>&#x27E9;<span
+class="ectt-1000">} </span></div><hr>
+</p><!--l. 705--><p class="noindent" >
+This just does its argument &#x27E8;<span
+class="ecti-1000">text</span>&#x27E9; by default. This means that if you want regular
+entries in a different font but don&#8217;t want that font to apply to abbreviations, then
+you can redefine <span
+class="ectt-1000">\glsxtrregularfont</span>. This is more precise than changing
+<span
+class="ectt-1000">\glstextformat</span><a
+ id="dx1-7029"></a> which will be applied to all linking commands for all entries.
+
+
+
+</p><!--l. 713--><p class="indent" > For example:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-14">
+\renewcommand*{\glsxtrregularfont}[1]{\textsf{#1}}
+</div>
+<!--l. 716--><p class="nopar" > You can access the label through <span
+class="ectt-1000">\glslabel</span>. For example, you can query the
+category:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-15">
+\renewcommand*{\glsxtrregularfont}[1]{%
+&#x00A0;<br />&#x00A0;\glsifcategory{\glslabel}{general}{\textsf{#1}}{#1}}
+</div>
+<!--l. 722--><p class="nopar" > or query the category attribute:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-16">
+\glssetcategoryattribute{general}{font}{sf}
+&#x00A0;<br />\renewcommand*{\glsxtrregularfont}[1]{%
+&#x00A0;<br />&#x00A0;\glsifattribute{\glslabel}{font}{sf}{\textsf{#1}}{#1}}
+</div>
+<!--l. 729--><p class="nopar" > or use the attribute to store the control sequence name:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-17">
+\glssetcategoryattribute{general}{font}{textsf}
+&#x00A0;<br />\glssetcategoryattribute{acronym}{font}{emph}
+&#x00A0;<br />\renewcommand*{\glsxtrregularfont}[1]{%
+&#x00A0;<br />&#x00A0;&#x00A0;\glshasattribute{\glslabel}{font}%
+&#x00A0;<br />&#x00A0;&#x00A0;{\csuse{\glsgetattribute{\glslabel}{font}}{#1}}%
+&#x00A0;<br />&#x00A0;&#x00A0;{#1}%
+&#x00A0;<br />}
+</div>
+<!--l. 740--><p class="nopar" > (Remember the category and attribute settings will only queried here for <span
+class="ecss-1000">regular</span><a
+ id="dx1-7030"></a>
+entries, so if the abbreviation style for the <span
+class="ecss-1000">acronym</span><a
+ id="dx1-7031"></a> category in the above example
+changes the regular attribute to &#8220;false&#8221;, <span
+class="ectt-1000">\glsxtrregularfont </span>will no longer
+apply.)
+</p><!--l. 747--><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
+ id="dx1-7032"></a> package to insert information
after the <a
- id="dx1-7021"></a>link-text produced by commands like <span
+ id="dx1-7033"></a><a
+href="#glo:linktext">link-text</a> produced by commands like <span
class="ectt-1000">\gls </span>and <span
class="ectt-1000">\glstext </span>is redefined
to
-</p><!--l. 701--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 750--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrpostlinkhook</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-7022"></a> <span
+ id="dx1-7034"></a> <span
class="ectt-1000">\glsxtrpostlinkhook </span></div><hr>
-</p><!--l. 703--><p class="noindent" >
+</p><!--l. 752--><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
+ id="dx1-7035"></a> attribute
is set to &#8220;true&#8221; for the current entry&#8217;s category. It will also do
-</p><!--l. 707--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 756--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrpostlink</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-7024"></a> <span
+ id="dx1-7036"></a> <span
class="ectt-1000">\glsxtrpostlink </span></div><hr>
-
-
-
-</p><!--l. 709--><p class="noindent" >
+</p><!--l. 758--><p class="noindent" >
if a full stop hasn&#8217;t be discarded and
-</p><!--l. 711--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 760--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrpostlinkendsentence</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-7025"></a> <span
+ id="dx1-7037"></a> <span
class="ectt-1000">\glsxtrpostlinkendsentence </span></div><hr>
-</p><!--l. 713--><p class="noindent" >
+</p><!--l. 762--><p class="noindent" >
if a full stop has been discarded.
-</p><!--l. 716--><p class="indent" > By default <span
+</p><!--l. 765--><p class="indent" > By default <span
class="ectt-1000">\glsxtrpostlink </span>just does <span
class="ectt-1000">\glsxtrpostlink</span>&#x27E8;<span
class="ecti-1000">category</span>&#x27E9;<a
- id="dx1-7026"></a>&#x00A0;if
+ id="dx1-7038"></a>&#x00A0;if
it exists, where &#x27E8;<span
class="ecti-1000">category</span>&#x27E9; is the category label for the current entry. (For
example, for the <span
class="ecss-1000">general</span><a
- id="dx1-7027"></a> category, <span
+ id="dx1-7039"></a> category, <span
class="ectt-1000">\glsxtrpostlinkgeneral </span>if it has been
defined.)
-</p><!--l. 721--><p class="indent" > The sentence-ending hook is slightly more complicated. If the command
+</p><!--l. 770--><p class="indent" > The sentence-ending hook is slightly more complicated. If the command
<span
class="ectt-1000">\glsxtrpostlink</span>&#x27E8;<span
class="ecti-1000">category</span>&#x27E9;<a
- id="dx1-7028"></a>&#x00A0;is defined the hook will do that and then insert a
+ id="dx1-7040"></a>&#x00A0;is defined the hook will do that and then insert a
full stop with the space factor adjusted to match the end of sentence. If
<span
class="ectt-1000">\glsxtrpostlink</span>&#x27E8;<span
class="ecti-1000">category</span>&#x27E9;<a
- id="dx1-7029"></a>&#x00A0;hasn&#8217;t been defined, the space factor is adjusted to match
+ id="dx1-7041"></a>&#x00A0;hasn&#8217;t been defined, the space factor is adjusted to match
the end of sentence. This means that if you have, for example, an entry that ends
with a full stop, a redundant following full stop will be discarded and the space factor
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. 733--><p class="indent" > There are some convenient commands you might want to use when customizing
+</p><!--l. 782--><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. 735--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-7042"></a>link-text category hooks:
+</p><!--l. 784--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrpostlinkAddDescOnFirstUse</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-7031"></a> <span
+ id="dx1-7043"></a> <span
class="ectt-1000">\glsxtrpostlinkAddDescOnFirstUse</span>
+
+
+
</div><hr>
-</p><!--l. 737--><p class="noindent" >
+</p><!--l. 786--><p class="noindent" >
This will add the description in parentheses on <a
- id="dx1-7032"></a><a
+ id="dx1-7044"></a><a
href="#glo:firstuse">first use</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
+</p><!--l. 789--><p class="indent" > For example, suppose you want to append the description in parentheses on <a
+ id="dx1-7045"></a><a
+href="#glo:firstuse">first
+use</a> for entries in the <span
class="ecss-1000">symbol</span><a
- id="dx1-7034"></a> category:
+ id="dx1-7046"></a> category:
</p>
- <div class="verbatim" id="verbatim-14">
+ <div class="verbatim" id="verbatim-18">
\newcommand*{\glsxtrpostlinksymbol}{%
&#x00A0;<br />&#x00A0;&#x00A0;\glsxtrpostlinkAddDescOnFirstUse
&#x00A0;<br />}
</div>
-<!--l. 747--><p class="nopar" >
-</p><!--l. 749--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 796--><p class="nopar" >
+</p><!--l. 798--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrpostlinkAddSymbolOnFirstUse</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-7035"></a> <span
+ id="dx1-7047"></a> <span
class="ectt-1000">\glsxtrpostlinkAddSymbolOnFirstUse</span>
</div><hr>
-</p><!--l. 751--><p class="noindent" >
+</p><!--l. 800--><p class="noindent" >
This will append the symbol (if defined) in parentheses on <a
- id="dx1-7036"></a><a
+ id="dx1-7048"></a><a
href="#glo:firstuse">first use</a>.
-</p><!--l. 755--><p class="indent" > If you want to provide your own custom format be aware that you can&#8217;t use
+</p><!--l. 804--><p class="indent" > If you want to provide your own custom format be aware that you can&#8217;t use
<span
class="ectt-1000">\ifglsused</span><a
- id="dx1-7037"></a> within the post-<a
- id="dx1-7038"></a><a
+ id="dx1-7049"></a> within the post-<a
+ id="dx1-7050"></a><a
href="#glo:linktext">link-text</a> hook as by this point the <a
- id="dx1-7039"></a><a
+ id="dx1-7051"></a><a
href="#glo:firstuseflag">first use flag</a> will have
been unset. Instead you can use
-</p><!--l. 758--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 807--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrifwasfirstuse</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-7040"></a> <span
+ id="dx1-7052"></a> <span
class="ectt-1000">\glsxtrifwasfirstuse{</span>&#x27E8;<span
class="ecit-1000">true</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">false</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 760--><p class="noindent" >
+</p><!--l. 809--><p class="noindent" >
This will do &#x27E8;<span
class="ecti-1000">true</span>&#x27E9; if the last used entry was the <a
- id="dx1-7041"></a>first use for that entry, otherwise it
+ id="dx1-7053"></a>first use for that entry, otherwise it
will do &#x27E8;<span
class="ecti-1000">false</span>&#x27E9;. (Requires at least <span
class="ecss-1000">glossaries</span><a
- id="dx1-7042"></a> v4.19 to work properly.) This command is
+ id="dx1-7054"></a> v4.19 to work properly.) This command is
locally set by commands like <span
class="ectt-1000">\gls</span>, so don&#8217;t rely on it outside of the post-<a
- id="dx1-7043"></a>link-text
+ id="dx1-7055"></a>link-text
hook.
-</p><!--l. 768--><p class="indent" > <div class="important" title="Important Note"> Note that commands like <span
+</p><!--l. 817--><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
+ id="dx1-7056"></a> and <span
class="ectt-1000">\glsxtrfull</span><a
- id="dx1-7045"></a> fake <a
- id="dx1-7046"></a>first use for the
+ id="dx1-7057"></a> fake <a
+ id="dx1-7058"></a>first use for the
benefit of the post-<a
- id="dx1-7047"></a>link-text hooks by setting <span
+ id="dx1-7059"></a>link-text hooks by setting <span
class="ectt-1000">\glsxtrifwasfirstuse </span>to
<span
class="ectt-1000">\@firstoftwo</span>. (Although, depending on the styles in use, they may not exactly
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.) However, the
+ id="dx1-7060"></a>-like commands on <a
+ id="dx1-7061"></a>first use.) However, the
<span
-class="ecss-1000">postfootnote</span><a
- id="dx1-7050"></a> style alters <span
+class="ecss-1000">short-postfootnote</span><a
+ id="dx1-7062"></a> style alters <span
class="ectt-1000">\glsxtrfull </span>so that it fakes non-<a
- id="dx1-7051"></a>first use otherwise
+ id="dx1-7063"></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
+</p><!--l. 826--><p class="noindent" >
+</p><!--l. 828--><p class="indent" > For example, if you want to place the description in a footnote after the <a
+ id="dx1-7064"></a>link-text
on <a
- id="dx1-7053"></a>first use for the <span
+ id="dx1-7065"></a>first use for the <span
class="ecss-1000">general</span><a
- id="dx1-7054"></a> category:
+ id="dx1-7066"></a> category:
</p>
- <div class="verbatim" id="verbatim-15">
+ <div class="verbatim" id="verbatim-19">
\newcommand*{\glsxtrpostlinkgeneral}{%
&#x00A0;<br />&#x00A0;&#x00A0;\glsxtrifwasfirstuse{\footnote{\glsentrydesc{\glslabel}}}{}%
&#x00A0;<br />}
</div>
-<!--l. 785--><p class="nopar" >
-</p><!--l. 787--><p class="indent" > The <span
-class="ecss-1000">postfootnote</span><a
- id="dx1-7055"></a> abbreviation style uses the post-<a
- id="dx1-7056"></a><a
+<!--l. 834--><p class="nopar" >
+</p><!--l. 836--><p class="indent" > The <span
+class="ecss-1000">short-postfootnote</span><a
+ id="dx1-7067"></a> abbreviation style uses the post-<a
+ id="dx1-7068"></a><a
href="#glo:linktext">link-text</a> hook to place the
footnote after trailing punctuation characters.
-</p><!--l. 791--><p class="indent" > You can set the default options used by <span
+</p><!--l. 840--><p class="indent" > You can set the default options used by <span
class="ectt-1000">\glslink</span><a
- id="dx1-7057"></a>, <span
+ id="dx1-7069"></a>, <span
class="ectt-1000">\gls</span><a
- id="dx1-7058"></a> etc with:
-</p><!--l. 793--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-7070"></a> etc with:
+</p><!--l. 842--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrSetDefaultGlsOpts</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-7059"></a> <span
+ id="dx1-7071"></a> <span
class="ectt-1000">\GlsXtrSetDefaultGlsOpts{</span>&#x27E8;<span
class="ecit-1000">options</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 795--><p class="noindent" >
+</p><!--l. 844--><p class="noindent" >
For example, if you mostly don&#8217;t want to index entries then you can do:
</p>
- <div class="verbatim" id="verbatim-16">
+ <div class="verbatim" id="verbatim-20">
\GlsXtrSetDefaultGlsOpts{noindex}
</div>
-<!--l. 800--><p class="nopar" > and then use, for example, <span class="obeylines-h"><span class="verb"><span
+<!--l. 849--><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-7060"></a><a
+ id="dx1-7072"></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. 807--><p class="indent" > Note that if you don&#8217;t want <span
+</p><!--l. 856--><p class="indent" > Note that if you don&#8217;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. 811--><p class="indent" > Commands like <span
+</p><!--l. 860--><p class="indent" > Commands like <span
class="ectt-1000">\gls</span><a
- id="dx1-7061"></a> have star (<span
+ id="dx1-7073"></a> have star (<span
class="ectt-1000">*</span>) and plus (<span
class="ectt-1000">+</span>) modifiers as a short cut for
<span
@@ -1685,36 +1775,36 @@ 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. 815--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 864--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrSetAltModifier</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-7062"></a> <span
+ id="dx1-7074"></a> <span
class="ectt-1000">\GlsXtrSetAltModifier{</span>&#x27E8;<span
class="ecit-1000">char</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">options</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 817--><p class="noindent" >
+</p><!--l. 866--><p class="noindent" >
where &#x27E8;<span
class="ecti-1000">char</span>&#x27E9; is the character used as the modifier and &#x27E8;<span
class="ecti-1000">options</span>&#x27E9; is the default set of
options (which may be overridden). Note that &#x27E8;<span
class="ecti-1000">char</span>&#x27E9; 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">&#x018e;</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>&#x00A0;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. 824--><p class="indent" > <div class="important" title="Important Note"> When choosing the character &#x27E8;<span
+</p><!--l. 873--><p class="indent" > <div class="important" title="Important Note"> When choosing the character &#x27E8;<span
class="ecti-1000">char</span>&#x27E9; take care of any changes in category code.
</div>
-</p><!--l. 827--><p class="noindent" >
-</p><!--l. 829--><p class="indent" > Example:
+</p><!--l. 876--><p class="noindent" >
+</p><!--l. 878--><p class="indent" > Example:
</p>
- <div class="verbatim" id="verbatim-17">
+ <div class="verbatim" id="verbatim-21">
\GlsXtrSetAltModifier{!}{noindex}
</div>
-<!--l. 832--><p class="nopar" > This means that <span class="obeylines-h"><span class="verb"><span
+<!--l. 881--><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&#8217;s
not possible to mix modifiers. For example, if you want to do
@@ -1722,21 +1812,21 @@ not possible to mix modifiers. For example, if you want to do
</p>
- <div class="verbatim" id="verbatim-18">
+ <div class="verbatim" id="verbatim-22">
\gls[noindex,hyper=false]{sample}
</div>
-<!--l. 838--><p class="nopar" > you can use <span class="obeylines-h"><span class="verb"><span
+<!--l. 887--><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&#8217;t combine the <span
class="ectt-1000">* </span>and <span
class="ectt-1000">! </span>modifiers.
-</p><!--l. 843--><p class="noindent" >
+</p><!--l. 892--><p class="noindent" >
</p>
-<!--l. 843--><p class="noindent" ><a
+<!--l. 892--><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. 846--><p class="noindent" >The <span
+<!--l. 895--><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
@@ -1747,37 +1837,37 @@ class="ectt-1000">\glsenableentrycount</span>, but you also need to set the appr
href="#sec:categories">&sect;4
</a><a
href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a>).
-</p><!--l. 852--><p class="indent" > For example, instead of just doing:
+</p><!--l. 901--><p class="indent" > For example, instead of just doing:
</p>
- <div class="verbatim" id="verbatim-19">
+ <div class="verbatim" id="verbatim-23">
\glsenableentrycount
</div>
-<!--l. 855--><p class="nopar" > you now need to do:
+<!--l. 904--><p class="nopar" > you now need to do:
</p>
- <div class="verbatim" id="verbatim-20">
+ <div class="verbatim" id="verbatim-24">
\glsenableentrycount
&#x00A0;<br />\glssetcategoryattribute{abbreviation}{entrycount}{1}
</div>
-<!--l. 860--><p class="nopar" > This will enable the entry counting for entries in the <span
+<!--l. 909--><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. 865--><p class="indent" > Further information about entry counting, including the new per-unit feature, is
+</p><!--l. 914--><p class="indent" > Further information about entry counting, including the new per-unit feature, is
described in <a
href="#sec:entrycount">&sect;5 </a><a
href="#sec:entrycount">Entry Counting<!--tex4ht:ref: sec:entrycount --></a>.
-</p><!--l. 868--><p class="noindent" >
+</p><!--l. 917--><p class="noindent" >
</p>
-<!--l. 868--><p class="noindent" ><a
+<!--l. 917--><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. 871--><p class="noindent" >Complications arise when you use <span
+<!--l. 920--><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
@@ -1790,20 +1880,20 @@ 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. 879--><p class="indent" > Things can go wrong if we try the following with the <span
+</p><!--l. 928--><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:
</p>
- <div class="verbatim" id="verbatim-21">
+ <div class="verbatim" id="verbatim-25">
\newacronym{ssi}{SSI}{Server&#x00A0;Side&#x00A0;Includes}
&#x00A0;<br />\newacronym{html}{HTML}{Hypertext&#x00A0;Markup&#x00A0;Language}
&#x00A0;<br />\newacronym{shtml}{S\gls{html}}{\gls{ssi}&#x00A0;enabled&#x00A0;\gls{html}}
</div>
-<!--l. 885--><p class="nopar" >
-</p><!--l. 887--><p class="indent" > The main problems are:
+<!--l. 934--><p class="nopar" >
+</p><!--l. 936--><p class="indent" > The main problems are:
</p><ol class="enumerate1" >
<li
class="enumerate" id="x1-9007x1"><a
@@ -1819,20 +1909,20 @@ href="#glo:firstuse">first use</a> if the long form is displayed before the shor
- <div class="verbatim" id="verbatim-22">
+ <div class="verbatim" id="verbatim-26">
\gls{\uppercase&#x00A0;ssi}&#x00A0;enabled&#x00A0;\gls{html}
</div>
- <!--l. 895--><p class="nopar" > which just doesn&#8217;t work. Grouping the <span class="obeylines-h"><span class="verb"><span
+ <!--l. 944--><p class="nopar" > which just doesn&#8217;t work. Grouping the <span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\gls{ssi}</span></span></span> doesn&#8217;t work either as this
will effectively try to do
</p>
- <div class="verbatim" id="verbatim-23">
+ <div class="verbatim" id="verbatim-27">
\uppercase{\gls{ssi}}&#x00A0;enabled&#x00A0;\gls{html}
</div>
- <!--l. 900--><p class="nopar" > This will upper case the label <span
+ <!--l. 949--><p class="nopar" > This will upper case the label <span
class="ectt-1000">ssi </span>so the entry won&#8217;t be recognised.
This problem will also occur if you use the all capitals version, such as
<span
@@ -1870,18 +1960,18 @@ class="ectt-1000">shtml</span>. For example:
- <div class="verbatim" id="verbatim-24">
+ <div class="verbatim" id="verbatim-28">
This&#x00A0;section&#x00A0;discusses&#x00A0;\gls{ssi},&#x00A0;\gls{html}&#x00A0;and&#x00A0;\gls{shtml}.
</div>
- <!--l. 919--><p class="nopar" > This produces:
+ <!--l. 968--><p class="nopar" > This produces:
</p><div class="quote">
- <!--l. 922--><p class="noindent" >This section discusses server side includes (SSI), hypertext
+ <!--l. 971--><p class="noindent" >This section discusses server side includes (SSI), hypertext
markup language (HTML) and SSI enabled HTML (SHTML).</p></div>
- <!--l. 925--><p class="noindent" >So the <a
+ <!--l. 974--><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 &#8220;SSI enabled HTML (SHTML)&#8221;.
- </p><!--l. 928--><p class="noindent" >Now let&#8217;s suppose the <span
+ </p><!--l. 977--><p class="noindent" >Now let&#8217;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
@@ -1891,41 +1981,41 @@ class="ectt-1000">shtml </span>entry, for example:
</p>
- <div class="verbatim" id="verbatim-25">
+ <div class="verbatim" id="verbatim-29">
The&#x00A0;sample&#x00A0;files&#x00A0;are&#x00A0;either&#x00A0;\gls{html}&#x00A0;or&#x00A0;\gls{shtml},&#x00A0;but&#x00A0;let&#8217;s
&#x00A0;<br />first&#x00A0;discuss&#x00A0;\gls{ssi}.
</div>
- <!--l. 934--><p class="nopar" > This produces:
+ <!--l. 983--><p class="nopar" > This produces:
</p><div class="quote">
- <!--l. 937--><p class="noindent" >The sample files are either hypertext markup language (HTML)
+ <!--l. 986--><p class="noindent" >The sample files are either hypertext markup language (HTML)
or server side includes (SSI) enabled HTML (SHTML), but let&#8217;s
first discuss SSI.</p></div>
- <!--l. 942--><p class="noindent" >So the <a
+ <!--l. 991--><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 &#8220;server side includes (SSI)
enabled HTML (SHTML)&#8221;, which looks a bit strange.
- </p><!--l. 946--><p class="noindent" >Now let&#8217;s suppose the <span
+ </p><!--l. 995--><p class="noindent" >Now let&#8217;s suppose the <span
class="ectt-1000">shtml </span>entry is used before (or without) the other two
entries:
</p>
- <div class="verbatim" id="verbatim-26">
+ <div class="verbatim" id="verbatim-30">
This&#x00A0;article&#x00A0;is&#x00A0;an&#x00A0;introduction&#x00A0;to&#x00A0;\gls{shtml}.
</div>
- <!--l. 950--><p class="nopar" > This produces:
+ <!--l. 999--><p class="nopar" > This produces:
</p><div class="quote">
- <!--l. 953--><p class="noindent" >This article is an introduction to server side includes (SSI)
+ <!--l. 1002--><p class="noindent" >This article is an introduction to server side includes (SSI)
enabled hypertext markup language (HTML) (SHTML).</p></div>
- <!--l. 956--><p class="noindent" >So the <a
+ <!--l. 1005--><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 &#8220;server side includes (SSI)
enabled hypertext markup language (HTML) (SHTML)&#8221;, which is even more
strange.
- </p><!--l. 960--><p class="noindent" >This is all aggravated by setting the style using the <span
+ </p><!--l. 1009--><p class="noindent" >This is all aggravated by setting the style using the <span
class="ecss-1000">glossaries </span>package&#8217;s
<span
class="ectt-1000">\setacronymstyle</span>. For example:
@@ -1933,10 +2023,10 @@ class="ectt-1000">\setacronymstyle</span>. For example:
</p>
- <div class="verbatim" id="verbatim-27">
+ <div class="verbatim" id="verbatim-31">
\setacronymstyle{long-short}
</div>
- <!--l. 965--><p class="nopar" > as this references the label through the use of <span
+ <!--l. 1014--><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
@@ -1948,7 +2038,7 @@ 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. 973--><p class="noindent" >Another oddity occurs if you reset the <span
+ </p><!--l. 1022--><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:
@@ -1956,13 +2046,13 @@ class="ectt-1000">shtml</span>
</p>
- <div class="verbatim" id="verbatim-28">
+ <div class="verbatim" id="verbatim-32">
\gls{shtml}&#x00A0;...&#x00A0;\glsreset{html}\gls{shtml}
</div>
- <!--l. 977--><p class="nopar" > The next use of <span
+ <!--l. 1026--><p class="nopar" > The next use of <span
class="ectt-1000">shtml </span>produces &#8220;Shypertext markup language (HTML)&#8221;,
which is downright weird.
- </p><!--l. 981--><p class="noindent" >Even without this, the short form has nested formatting commands, which
+ </p><!--l. 1030--><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 &#8220;sm&#8221; styles (that use <span
@@ -1995,7 +2085,7 @@ class="ecss-1000">hyperref</span><a
in the glossary or they may be directed to the SHTML entry in the
glossary.
</li></ol>
-<!--l. 1002--><p class="indent" > For these reasons it&#8217;s better to use the simple expandable commands
+<!--l. 1051--><p class="indent" > For these reasons it&#8217;s better to use the simple expandable commands
like <span
class="ectt-1000">\glsentrytext</span><a
id="dx1-9032"></a> or <span
@@ -2007,24 +2097,24 @@ like:
</p>
- <div class="verbatim" id="verbatim-29">
+ <div class="verbatim" id="verbatim-33">
\newacronym
&#x00A0;<br />&#x00A0;[description={\acrshort{ssi}&#x00A0;enabled&#x00A0;\acrshort{html}}]
&#x00A0;<br />&#x00A0;{shtml}{SHTML}{SSI&#x00A0;enabled&#x00A0;HTML}
</div>
-<!--l. 1010--><p class="nopar" > with <span
+<!--l. 1059--><p class="nopar" > with <span
class="ecss-1000">glossaries</span><a
id="dx1-9034"></a> or:
</p>
- <div class="verbatim" id="verbatim-30">
+ <div class="verbatim" id="verbatim-34">
\newabbreviation
&#x00A0;<br />&#x00A0;[description={\glsxtrshort{ssi}&#x00A0;enabled&#x00A0;\glsxtrshort{html}}]
&#x00A0;<br />&#x00A0;{shtml}{SHTML}{SSI&#x00A0;enabled&#x00A0;HTML}
</div>
-<!--l. 1016--><p class="nopar" > with <span
+<!--l. 1065--><p class="nopar" > with <span
class="ecss-1000">glossaries-extra</span>. This fixes all the above listed problems (as long as you don&#8217;t
use <span
class="ectt-1000">\glsdesc</span><a
@@ -2035,24 +2125,24 @@ may fix the <a
id="dx1-9036"></a><a
href="#glo:firstuse">first use</a> issue, but it doesn&#8217;t fix any of the other problems listed
above.
-</p><!--l. 1023--><p class="indent" > If it&#8217;s simply that you want to use the abbreviation font, you can use
+</p><!--l. 1072--><p class="indent" > If it&#8217;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">
+ <div class="verbatim" id="verbatim-35">
\setabbreviationstyle{long-short-sc}
&#x00A0;<br />\newabbreviation{ssi}{ssi}{server-side&#x00A0;includes}
&#x00A0;<br />\newabbreviation{html}{html}{hypertext&#x00A0;markup&#x00A0;language}
&#x00A0;<br />\newabbreviation{shtml}{shtml}{\glsabbrvfont{ssi}&#x00A0;enabled
&#x00A0;<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).
+<!--l. 1081--><p class="nopar" > This will pick up the font style setting of the outer entry (shtml, in the above case).
This isn&#8217;t a problem in the above example as all the abbreviations use the same
style.
-</p><!--l. 1037--><p class="indent" > However if you&#8217;re really determined to use <span
+</p><!--l. 1086--><p class="indent" > However if you&#8217;re really determined to use <span
class="ectt-1000">\gls</span><a
id="dx1-9037"></a> in a field that may be included
within some <a
@@ -2073,19 +2163,19 @@ form
</p>
- <div class="verbatim" id="verbatim-32">
+ <div class="verbatim" id="verbatim-36">
\gls{ssi}&#x00A0;enabled&#x00A0;\gls{html}
</div>
-<!--l. 1048--><p class="nopar" > is treated as
+<!--l. 1097--><p class="nopar" > is treated as
</p>
- <div class="verbatim" id="verbatim-33">
+ <div class="verbatim" id="verbatim-37">
{\glstext[hyper=false,noindex]{ssi}}&#x00A0;enabled
&#x00A0;<br />{\glstext[hyper=false,noindex]{html}}
</div>
-<!--l. 1053--><p class="nopar" > This overcomes problems&#x00A0;<a
+<!--l. 1102--><p class="nopar" > This overcomes problems&#x00A0;<a
href="#itm:inconsistentfirstuseprob">4<!--tex4ht:ref: itm:inconsistentfirstuseprob --></a>, <a
href="#itm:indexingprob">5<!--tex4ht:ref: itm:indexingprob --></a> and <a
href="#itm:nestedhyplinkprob">6<!--tex4ht:ref: itm:nestedhyplinkprob --></a> listed above, but still doesn&#8217;t fix problems&#x00A0;<a
@@ -2098,9 +2188,9 @@ class="ecss-1000">sort</span><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 (such
as <span
-class="ecss-1000">long-desc</span><a
+class="ecss-1000">long-noshort-desc</span><a
id="dx1-9042"></a>).
-</p><!--l. 1064--><p class="indent" > Additionally, any instance of the long form commands, such as <span
+</p><!--l. 1113--><p class="indent" > Additionally, any instance of the long form commands, such as <span
class="ectt-1000">\glsxtrlong</span><a
id="dx1-9043"></a> or
<span
@@ -2134,10 +2224,10 @@ class="ectt-1000">shtml </span>entry had instead been defined as:
- <div class="verbatim" id="verbatim-34">
+ <div class="verbatim" id="verbatim-38">
\newacronym{shtml}{SHTML}{\acrshort{ssi}&#x00A0;enabled&#x00A0;\acrshort{html}}
</div>
-<!--l. 1077--><p class="nopar" > then (using the <span
+<!--l. 1126--><p class="nopar" > then (using the <span
class="ecss-1000">long-short</span><a
id="dx1-9049"></a> style) the <a
id="dx1-9050"></a><a
@@ -2146,31 +2236,31 @@ href="#glo:firstuse">first use</a> will be like
</p>
- <div class="verbatim" id="verbatim-35">
+ <div class="verbatim" id="verbatim-39">
{\acronymfont{\glsentryshort{ssi}}}&#x00A0;enabled
&#x00A0;<br />{\acronymfont{\glsentryshort{html}}}&#x00A0;(SHTML)
</div>
-<!--l. 1083--><p class="nopar" > whereas if the entry is defined as:
+<!--l. 1132--><p class="nopar" > whereas if the entry is defined as:
</p>
- <div class="verbatim" id="verbatim-36">
+ <div class="verbatim" id="verbatim-40">
\newabbreviation{shtml}{SHTML}{\glsxtrshort{ssi}&#x00A0;enabled
&#x00A0;<br />\glsxtrshort{html}}
</div>
-<!--l. 1088--><p class="nopar" > then the <a
+<!--l. 1137--><p class="nopar" > then the <a
id="dx1-9051"></a><a
href="#glo:firstuse">first use</a> will be like:
</p>
- <div class="verbatim" id="verbatim-37">
+ <div class="verbatim" id="verbatim-41">
{\glsabbrvfont{\glsentryshort{ssi}}}&#x00A0;enabled
&#x00A0;<br />{\glsabbrvfont{\glsentryshort{html}}}&#x00A0;(SHTML)
</div>
-<!--l. 1093--><p class="nopar" > Note that the first optional argument of <span
+<!--l. 1142--><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
@@ -2181,7 +2271,7 @@ class="ectt-1000">\glsxtrshort</span><a
id="dx1-9053"></a>. Note
that <span
class="ectt-1000">\acrshort </span>doesn&#8217;t set the abbreviation style.
-</p><!--l. 1101--><p class="indent" > <div class="important" title="Important Note"> If you use any of the case-changing commands, such as <span
+</p><!--l. 1150--><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-9054"></a> or <span
class="ectt-1000">\Glstext</span><a
@@ -2193,20 +2283,20 @@ class="ectt-1000">\gls</span><a
class="ectt-1000">\glstext</span><a
id="dx1-9057"></a>, in the definition of entries for any of the fields that may be used
by those case-changing commands. </div>
-</p><!--l. 1107--><p class="noindent" >
-</p><!--l. 1109--><p class="indent" > You can, with care, protect against issue&#x00A0;<a
+</p><!--l. 1156--><p class="noindent" >
+</p><!--l. 1158--><p class="indent" > You can, with care, protect against issue&#x00A0;<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&#8217;t be able to use the all caps commands, such
as <span
class="ectt-1000">\GLS</span>.
-</p><!--l. 1115--><p class="noindent" >
+</p><!--l. 1164--><p class="noindent" >
</p>
-<!--l. 1115--><p class="noindent" ><a
+<!--l. 1164--><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. 1118--><p class="noindent" >The <span
+<!--l. 1167--><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
@@ -2218,25 +2308,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. 1123--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1172--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\RestoreAcronyms</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-10003"></a> <span
class="ectt-1000">\RestoreAcronyms </span></div><hr>
-</p><!--l. 1125--><p class="noindent" >
+</p><!--l. 1174--><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. 1130--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1179--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsacspace</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-10005"></a> <span
class="ectt-1000">\glsacspace{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 1132--><p class="noindent" >
+</p><!--l. 1181--><p class="noindent" >
The space command <span
class="ectt-1000">\glsacspace </span>used by the <span
class="ecss-1000">long-sp-short</span><a
@@ -2244,111 +2334,133 @@ 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. 1136--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1185--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsacspacemax</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-10008"></a> <span
class="ectt-1000">\glsacspacemax </span></div><hr>
-</p><!--l. 1138--><p class="noindent" >
+</p><!--l. 1187--><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. 1142--><p class="indent" > The <a
+</p><!--l. 1191--><p class="indent" > The <a
id="dx1-10009"></a><a
href="#glo:firstuse">first use</a> acronym font command
-</p><!--l. 1143--><p class="indent" > <hr><div title="Definition"> <span
+</p><!--l. 1192--><p class="indent" > <hr><div title="Definition"> <span
class="ectt-1000">\firstacronymfont{</span>&#x27E8;<span
class="ecit-1000">text</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 1145--><p class="noindent" >
+</p><!--l. 1194--><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. 1150--><p class="indent" > The subsequent use acronym font command
-</p><!--l. 1151--><p class="indent" > <hr><div title="Definition"> <span
+</p><!--l. 1199--><p class="indent" > The subsequent use acronym font command
+</p><!--l. 1200--><p class="indent" > <hr><div title="Definition"> <span
class="ectt-1000">\acronymfont{</span>&#x27E8;<span
class="ecit-1000">text</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 1153--><p class="noindent" >
+</p><!--l. 1202--><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. 1158--><p class="noindent" >
+</p><!--l. 1207--><p class="noindent" >
</p>
-<!--l. 1158--><p class="noindent" ><a
+<!--l. 1207--><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. 1161--><p class="noindent" >The default value of <span
+<!--l. 1210--><p class="noindent" >The default value of <span
class="ectt-1000">\glslistdottedwidth</span><a
id="dx1-11001"></a> is changed so that it&#8217;s set at the start
of the document (if it hasn&#8217;t been changed in the preamble). This should
take into account situations where <span
class="ectt-1000">\hsize </span>isn&#8217;t set until the start of the
document.
-</p><!--l. 1166--><p class="indent" > The commands <span
+</p><!--l. 1215--><p class="indent" > The commands <span
class="ectt-1000">\glossentryname</span><a
id="dx1-11002"></a> and <span
class="ectt-1000">\glossentrydesc</span><a
id="dx1-11003"></a> are modified to take
into account the <span
class="ecss-1000">glossname</span><a
- id="dx1-11004"></a> and <span
+ id="dx1-11004"></a>, <span
class="ecss-1000">glossdesc</span><a
- id="dx1-11005"></a> attributes (see <a
+ id="dx1-11005"></a> and <span
+class="ecss-1000">glossdescfont</span><a
+ id="dx1-11006"></a> attributes (see <a
href="#sec:categories">&sect;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. 1172--><p class="indent" > There is a hook after <span
+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. 1221--><p class="indent" > There is a hook after <span
class="ectt-1000">\glossentryname</span><a
- id="dx1-11006"></a> and <span
+ id="dx1-11007"></a> and <span
class="ectt-1000">\Glossentryname</span><a
- id="dx1-11007"></a>:
-</p><!--l. 1174--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-11008"></a>:
+</p><!--l. 1223--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrpostnamehook</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-11008"></a> <span
+ id="dx1-11009"></a> <span
class="ectt-1000">\glsxtrpostnamehook{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 1176--><p class="noindent" >
+</p><!--l. 1225--><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
+ id="dx1-11010"></a> attribute. If the attribute exists for the
category to which the label belongs, then the name is automatically indexed
using
-</p><!--l. 1181--><p class="indent" > <hr><div title="Definition"><span
+</p><!--l. 1230--><p class="indent" > <hr><div title="Definition"><span
class="ectt-1000">\glsxtrdoautoindexname</span><a
- id="dx1-11010"></a><span
+ id="dx1-11011"></a><span
class="ectt-1000">{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}{indexname} </span></div><hr>
-</p><!--l. 1182--><p class="noindent" >
+</p><!--l. 1231--><p class="noindent" >
See <a
href="#sec:autoindex">&sect;6 </a><a
href="#sec:autoindex">Auto-Indexing<!--tex4ht:ref: sec:autoindex --></a> for further details.
-</p><!--l. 1185--><p class="indent" > The post-description code used within the glossary is modified so that it also
+</p><!--l. 1234--><p class="indent" > As from version 1.04, the post-name hook <span
+class="ectt-1000">\glsxtrpostnamehook </span>will also do
+<span
+class="ectt-1000">\glsxtrpostname</span>&#x27E8;<span
+class="ecti-1000">category</span>&#x27E9; if it exists. You can use <span
+class="ectt-1000">\glscurrententrylabel</span><a
+ id="dx1-11012"></a> to
+obtain the entry label with the definition of this command. For example,
+suppose you are using a glossary style the doesn&#8217;t display the symbol, you can
+insert the symbol after the name for a particular category, say, the &#8220;symbol&#8221;
+category:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-42">
+\newcommand*{\glsxtrpostnamesymbol}{\space
+&#x00A0;<br />&#x00A0;(\glsentrysymbol{\glscurrententrylabel})}
+</div>
+<!--l. 1244--><p class="nopar" >
+</p><!--l. 1246--><p class="indent" > The post-description code used within the glossary is modified so that it also
does
-</p><!--l. 1187--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1248--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrpostdescription</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-11011"></a> <span
+ id="dx1-11013"></a> <span
class="ectt-1000">\glsxtrpostdescription </span></div><hr>
-</p><!--l. 1189--><p class="noindent" >
+</p><!--l. 1250--><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>
+ id="dx1-11014"></a>
option is used, it will be inserted before the terminating full stop.
-</p><!--l. 1194--><p class="indent" > This new command will do <span
+</p><!--l. 1255--><p class="indent" > This new command will do <span
class="ectt-1000">\glsxtrpostdesc</span>&#x27E8;<span
class="ecit-1000">category</span>&#x27E9; if it exists, where
&#x27E8;<span
@@ -2356,42 +2468,39 @@ class="ecti-1000">category</span>&#x27E9; is the category label associated with
<span
class="ectt-1000">\glsxtrpostdescgeneral </span>for entries with the category set to <span
class="ecss-1000">general</span><a
- id="dx1-11013"></a> or
+ id="dx1-11015"></a> or
<span
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. 1201--><p class="indent" > Since both <span
+ id="dx1-11016"></a>.
+</p><!--l. 1262--><p class="indent" > Since both <span
class="ectt-1000">\glossentry </span>and <span
class="ectt-1000">\subglossentry </span>set
-</p><!--l. 1202--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1263--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glscurrententrylabel</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-11015"></a> <span
+ id="dx1-11017"></a> <span
class="ectt-1000">\glscurrententrylabel </span></div><hr>
-</p><!--l. 1204--><p class="noindent" >
+</p><!--l. 1265--><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. 1209--><p class="indent" > For example, suppose you want to insert the plural form in brackets after the
+</p><!--l. 1270--><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
+ id="dx1-11018"></a> category, then you could
do:
</p>
- <div class="verbatim" id="verbatim-38">
+ <div class="verbatim" id="verbatim-43">
\renewcommand{\glsxtrpostdescgeneral}{\space
&#x00A0;<br />&#x00A0;(plural:&#x00A0;\glsentryplural{\glscurrententrylabel})}
</div>
-<!--l. 1215--><p class="nopar" > This means you don&#8217;t have to define a custom glossary style, which you may find
+<!--l. 1276--><p class="nopar" > This means you don&#8217;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. 1220--><p class="indent" > <div class="important" title="Important Note"> This feature can&#8217;t be used for glossary styles that ignore <span
+</p><!--l. 1281--><p class="indent" > <div class="important" title="Important Note"> This feature can&#8217;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
@@ -2400,84 +2509,84 @@ class="ectt-1000">\glsxtrpostdescription</span>.
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. 1227--><p class="noindent" >
-</p><!--l. 1229--><p class="indent" > As from v1.02, <span
+ id="dx1-11019"></a> option to suppress the terminating full stop.) </div>
+</p><!--l. 1288--><p class="noindent" >
+</p><!--l. 1290--><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>
+ id="dx1-11020"></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:
+ id="dx1-11021"></a>. For example:
</p>
- <div class="verbatim" id="verbatim-39">
+ <div class="verbatim" id="verbatim-44">
\usepackage{glossaries-extra}
&#x00A0;<br />\usepackage{glossary-longragged}
&#x00A0;<br />\usepackage{glossaries-extra-stylemods}
</div>
-<!--l. 1238--><p class="nopar" > Alternatively you can load <span
+<!--l. 1299--><p class="nopar" > Alternatively you can load <span
class="ectt-1000">glossary-</span>&#x27E8;<span
class="ecti-1000">name</span>&#x27E9;<span
class="ectt-1000">.sty </span>at the same time by passing &#x27E8;<span
class="ecti-1000">name</span>&#x27E9;
as a package option to <span
class="ecss-1000">glossaries-extra-stylemods</span><a
- id="dx1-11020"></a>. For example:
+ id="dx1-11022"></a>. For example:
</p>
- <div class="verbatim" id="verbatim-40">
+ <div class="verbatim" id="verbatim-45">
\usepackage{glossaries-extra}
&#x00A0;<br />\usepackage[longragged]{glossaries-extra-stylemods}
</div>
-<!--l. 1246--><p class="nopar" > Another option is to use the <span
+<!--l. 1307--><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
+ id="dx1-11023"></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):
+ id="dx1-11024"></a> style):
</p>
- <div class="verbatim" id="verbatim-41">
+ <div class="verbatim" id="verbatim-46">
\usepackage[style=long3col,stylemods]{glossaries-extra}
</div>
-<!--l. 1253--><p class="nopar" > Or the value of <span
+<!--l. 1314--><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
+ id="dx1-11025"></a> may be a comma-separated list of the style package
identifiers. For example:
</p>
- <div class="verbatim" id="verbatim-42">
+ <div class="verbatim" id="verbatim-47">
\usepackage[style=mcoltree,stylemods=mcols]{glossaries-extra}
</div>
-<!--l. 1258--><p class="nopar" > Remember to group the value if it contains any commas:
+<!--l. 1319--><p class="nopar" > Remember to group the value if it contains any commas:
</p>
- <div class="verbatim" id="verbatim-43">
+ <div class="verbatim" id="verbatim-48">
\usepackage[stylemods={mcols,longbooktabs}]{glossaries-extra}
</div>
-<!--l. 1262--><p class="nopar" >
-</p><!--l. 1264--><p class="indent" > Note that the <span
+<!--l. 1323--><p class="nopar" >
+</p><!--l. 1325--><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
+ id="dx1-11026"></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
+ id="dx1-11027"></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>.
@@ -2492,19 +2601,91 @@ 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&#8217;t affected by the <span
+ id="dx1-11028"></a> style isn&#8217;t affected by the <span
class="ecss-1000">nopostdot</span><a
- id="dx1-11027"></a> option, but the post-description
+ id="dx1-11029"></a> option, but the post-description
category hook can still be used.
+</p><!--l. 1339--><p class="indent" > The <a
+ id="dx1-11030"></a><a
+href="#glo:numberlist">number list</a> is now placed inside the argument of
+</p><!--l. 1340--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\GlsXtrFormatLocationList</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-11031"></a> <span
+class="ectt-1000">\GlsXtrFormatLocationList{</span>&#x27E8;<span
+class="ecit-1000">number list</span>&#x27E9;<span
+class="ectt-1000">}</span>
+</div><hr>
+</p><!--l. 1342--><p class="noindent" >
+This is internally used by <span
+class="ectt-1000">\glossaryentrynumbers</span>. The <span
+class="ecss-1000">nonumberlist</span><a
+ id="dx1-11032"></a> redefines
+<span
+class="ectt-1000">\glossaryentrynumbers </span>so that it doesn&#8217;t display the <a
+ id="dx1-11033"></a>number list, but it still saves
+the <a
+ id="dx1-11034"></a>number list in case it&#8217;s required.
+</p><!--l. 1348--><p class="indent" > <div class="important" title="Important Note"> If you want to suppress the <a
+ id="dx1-11035"></a>number list always use the <span
+class="ecss-1000">nonumberlist</span><a
+ id="dx1-11036"></a> option
+instead of redefining <span
+class="ectt-1000">\glossaryentrynumbers </span>to do nothing. </div>
+</p><!--l. 1352--><p class="noindent" >
+</p><!--l. 1354--><p class="indent" > If you want to, for example, change the font for the entire <a
+ id="dx1-11037"></a>number list
+then redefine <span
+class="ectt-1000">\GlsXtrFormatLocationList </span>as appropriate. Don&#8217;t modify
+<span
+class="ectt-1000">\glossaryentrynumbers</span>.
+</p><!--l. 1358--><p class="indent" > Sometimes users like to insert &#8220;page&#8221; or &#8220;pages&#8221; in front of the <a
+ id="dx1-11038"></a>number list. This is
+quite fiddly to do with the base <span
+class="ecss-1000">glossaries </span>package, but <span
+class="ecss-1000">glossaries-extra </span>provides a way
+of doing this. First you need to enable this option and specify the text to display
+using:
+</p><!--l. 1363--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\GlsXtrEnablePreLocationTag</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-11039"></a> <span
+class="ectt-1000">\GlsXtrEnablePreLocationTag{</span>&#x27E8;<span
+class="ecit-1000">page</span>&#x27E9;<span
+class="ectt-1000">}{</span>&#x27E8;<span
+class="ecit-1000">pages</span>&#x27E9;<span
+class="ectt-1000">}</span>
+</div><hr>
+</p><!--l. 1365--><p class="noindent" >
+where &#x27E8;<span
+class="ecti-1000">page</span>&#x27E9; is the text to display if the <a
+ id="dx1-11040"></a>number list only contains a single location and
+&#x27E8;<span
+class="ecti-1000">pages</span>&#x27E9; is the text to display otherwise. For example:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-49">
+\GlsXtrEnablePreLocationTag{Page:&#x00A0;}{Pages:&#x00A0;}
+</div>
+<!--l. 1371--><p class="nopar" > An extra run is required when using this command.
+</p><!--l. 1374--><p class="indent" > <div class="important" title="Important Note"> Use <span
+class="ectt-1000">glsignore </span>not <span
+class="ectt-1000">@gobble </span>as the format if you want to suppress the page
+number (and only index the entry once). </div>
+</p><!--l. 1377--><p class="noindent" >
+</p><!--l. 1379--><p class="indent" > See the accompanying sample file <span
+class="ectt-1000">sample-pages.tex</span>.
</p>
-<!--l. 1278--><p class="indent" > </div>
-</p><!--l. 1278--><p class="noindent" ><a
+<!--l. 1381--><p class="indent" > </div>
+</p><!--l. 1381--><p class="noindent" ><a
href="#top">Top</a><div class="chapter"><h2 class="chapterHead">2. <a
id="sec:abbreviations"></a>Abbreviations</h2>
-</p><!--l. 1281--><p class="indent" > Abbreviations include acronyms (words formed from initial letters, such as
+</p><!--l. 1384--><p class="indent" > Abbreviations include acronyms (words formed from initial letters, such as
&#8220;laser&#8221;), initialisms (initial letters of a phrase, such as &#8220;html&#8221;, that aren&#8217;t pronounced
as words) and contractions (where parts of words are omitted, often replaced by an
apostrophe, such as &#8220;don&#8217;t&#8221;). The &#8220;acronym&#8221; code provided by the <span
@@ -2519,10 +2700,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. 1293--><p class="indent" > The <span
+</p><!--l. 1396--><p class="indent" > The <span
class="ecss-1000">glossaries-extra </span>package corrects this misnomer, and provides better
abbreviation handling, with
-</p><!--l. 1295--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1398--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\newabbreviation</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-12003"></a> <span
@@ -2536,8 +2717,8 @@ class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">long</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 1297--><p class="noindent" >
-</p><!--l. 1299--><p class="indent" > This sets the <span
+</p><!--l. 1400--><p class="noindent" >
+</p><!--l. 1402--><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
@@ -2557,7 +2738,7 @@ class="ecti-1000">short</span>&#x27E9; (without appending the plural suffix). Se
href="#sec:categories">&sect;4
</a><a
href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a> for further details.
-</p><!--l. 1309--><p class="indent" > See <a
+</p><!--l. 1412--><p class="indent" > See <a
href="#sec:nested">&sect;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
@@ -2567,10 +2748,10 @@ class="ectt-1000">\glsxtrshort</span><a
id="dx1-12009"></a> within &#x27E8;<span
class="ecti-1000">short</span>&#x27E9; or &#x27E8;<span
class="ecti-1000">long</span>&#x27E9;.
-</p><!--l. 1313--><p class="indent" > <div class="important" title="Important Note"> Make sure that you set the category attributes before defining new abbreviations
+</p><!--l. 1416--><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. 1316--><p class="noindent" >
-</p><!--l. 1318--><p class="indent" > The <span
+</p><!--l. 1419--><p class="noindent" >
+</p><!--l. 1421--><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
@@ -2590,24 +2771,24 @@ class="ectt-1000">\setacronymstyle</span><a
class="ectt-1000">\newacronymstyle</span><a
id="dx1-12015"></a>) you need to
use
-</p><!--l. 1325--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1428--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\RestoreAcronyms</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-12016"></a> <span
class="ectt-1000">\RestoreAcronyms </span></div><hr>
-</p><!--l. 1327--><p class="noindent" >
+</p><!--l. 1430--><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. 1332--><p class="indent" > The <span
+</p><!--l. 1435--><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>
package&#8217;s <span
class="ectt-1000">\newacronym </span>but you can apply different styles to different categories. The
default style is <span
-class="ecss-1000">short</span><a
+class="ecss-1000">short-nolong</span><a
id="dx1-12019"></a> for entries in the <span
class="ecss-1000">acronym</span><a
id="dx1-12020"></a> category and <span
@@ -2620,32 +2801,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. 1341--><p class="indent" > The short form is displayed within commands like <span
+</p><!--l. 1444--><p class="indent" > The short form is displayed within commands like <span
class="ectt-1000">\gls </span>using
-</p><!--l. 1342--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1445--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsfirstabbrvfont</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-12024"></a> <span
class="ectt-1000">\glsfirstabbrvfont{</span>&#x27E8;<span
class="ecit-1000">short-form</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 1344--><p class="noindent" >
+</p><!--l. 1447--><p class="noindent" >
on <a
id="dx1-12025"></a><a
href="#glo:firstuse">first use</a> and
-</p><!--l. 1346--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1449--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsabbrvfont</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-12026"></a> <span
class="ectt-1000">\glsabbrvfont{</span>&#x27E8;<span
class="ecit-1000">short-form</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 1348--><p class="noindent" >
+</p><!--l. 1451--><p class="noindent" >
for subsequent use.
-</p><!--l. 1351--><p class="indent" > <div class="important" title="Important Note"> These commands (<span
+</p><!--l. 1454--><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
@@ -2654,19 +2835,19 @@ class="ectt-1000">\gls</span>
class="ectt-1000">\glsentryshort</span><a
id="dx1-12027"></a>) so don&#8217;t try redefining them outside of
an abbreviation style. </div>
-</p><!--l. 1357--><p class="noindent" >
-</p><!--l. 1359--><p class="indent" > If you use the <span
+</p><!--l. 1460--><p class="noindent" >
+</p><!--l. 1462--><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. 1361--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1464--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsabbrvdefaultfont</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-12029"></a> <span
class="ectt-1000">\glsabbrvdefaultfont{</span>&#x27E8;<span
class="ecit-1000">text</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 1363--><p class="noindent" >
+</p><!--l. 1466--><p class="noindent" >
whereas the <span
class="ecss-1000">long-short-sc</span><a
id="dx1-12030"></a> style redefines <span
@@ -2678,9 +2859,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 &#8220;sc&#8221;, &#8220;sm&#8221; or &#8220;em&#8221; styles.
-</p><!--l. 1371--><p class="indent" > All predefined abbreviation styles redefine <span
+</p><!--l. 1474--><p class="indent" > Similarly the basic styles redefine <span
class="ectt-1000">\glsfirstabbrvfont </span>to use
-</p><!--l. 1373--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1476--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsfirstabbrvdefaultfont</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-12032"></a> <span
@@ -2688,118 +2869,172 @@ class="ectt-1000">\glsfirstabbrvdefaultfont{</span>&#x27E8;<span
class="ecit-1000">short-form</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 1375--><p class="noindent" >
-By default, this just does <span
-class="ectt-1000">\glsabbrvfont{</span>&#x27E8;<span
-class="ecti-1000">short-form</span>&#x27E9;<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. 1380--><p class="indent" > The commands that display the full form for abbreviations use <span
+</p><!--l. 1478--><p class="noindent" >
+whereas the font modifier styles, such as <span
+class="ecss-1000">long-short=sc</span><a
+ id="dx1-12033"></a>, use their own custom
+command, such as <span
+class="ectt-1000">\glsfirstscfont</span>.
+</p><!--l. 1483--><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. 1382--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1485--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsfirstlongfont</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-12034"></a> <span
class="ectt-1000">\glsfirstlongfont{</span>&#x27E8;<span
class="ecit-1000">long-form</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 1384--><p class="noindent" >
-to display the long form. As with <span
+</p><!--l. 1487--><p class="noindent" >
+to display the long form on <a
+ id="dx1-12035"></a>first use or for the inline full format. Commands like
+<span
+class="ectt-1000">\glsxtrlong </span>use
+</p><!--l. 1490--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glslongfont</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-12036"></a> <span
+class="ectt-1000">\glslongfont{</span>&#x27E8;<span
+class="ecit-1000">long-form</span>&#x27E9;<span
+class="ectt-1000">} </span></div><hr>
+</p><!--l. 1492--><p class="noindent" >
+instead.
+</p><!--l. 1495--><p class="indent" > As with <span
class="ectt-1000">\glsabbrvfont</span><a
- id="dx1-12035"></a>, this command is changed by all
-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. 1389--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-12037"></a>, this command is changed by all styles. Currently
+all predefined abbreviation styles, except the &#8220;long-em&#8221; (emphasize long
+form) versions, provided by <span
+class="ecss-1000">glossaries-extra </span>redefine <span
+class="ectt-1000">\glsfirstlongfont </span>to
+use
+</p><!--l. 1500--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsfirstlongdefaultfont</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-12036"></a> <span
+ id="dx1-12038"></a> <span
class="ectt-1000">\glsfirstlongdefaultfont{</span>&#x27E8;<span
class="ecit-1000">long-form</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 1391--><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. 1397--><p class="indent" > Note that by default inserted material (provided in the final optional argument of
+</p><!--l. 1502--><p class="noindent" >
+and <span
+class="ectt-1000">\glslongfont </span>to use
+</p><!--l. 1504--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glslongdefaultfont</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-12039"></a> <span
+class="ectt-1000">\glslongdefaultfont{</span>&#x27E8;<span
+class="ecit-1000">long-form</span>&#x27E9;<span
+class="ectt-1000">} </span></div><hr>
+</p><!--l. 1506--><p class="noindent" >
+
+
+
+</p><!--l. 1508--><p class="indent" > You can redefine these command if you want to change the font used by the long
+form for all your abbreviations (except for the emphasize-long styles), or you can
+define your own abbreviation style that provides a different format for only those
+abbreviations defined with that style.
+</p><!--l. 1514--><p class="indent" > The &#8220;long-em&#8221; (emphasize long) styles use
+</p><!--l. 1515--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glsfirstlongemfont</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-12040"></a> <span
+class="ectt-1000">\glsfirstlongemfont{</span>&#x27E8;<span
+class="ecit-1000">long-form</span>&#x27E9;<span
+class="ectt-1000">} </span></div><hr>
+</p><!--l. 1517--><p class="noindent" >
+instead of <span
+class="ectt-1000">\glsfirstlongdefaultfont{</span>&#x27E8;<span
+class="ecti-1000">long-form</span>&#x27E9;<span
+class="ectt-1000">} </span>and
+</p><!--l. 1519--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glslongemfont</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-12041"></a> <span
+class="ectt-1000">\glslongemfont{</span>&#x27E8;<span
+class="ecit-1000">long-form</span>&#x27E9;<span
+class="ectt-1000">} </span></div><hr>
+</p><!--l. 1521--><p class="noindent" >
+instead of <span
+class="ectt-1000">\glslongdefaultfont{</span>&#x27E8;<span
+class="ecti-1000">long-form</span>&#x27E9;<span
+class="ectt-1000">}</span>. The first form <span
+class="ectt-1000">\glsfirstlongemfont</span>
+is initialised to use <span
+class="ectt-1000">\glslongemfont</span>.
+</p><!--l. 1525--><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. 1400--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1528--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrinsertinsidetrue</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-12038"></a> <span
+ id="dx1-12042"></a> <span
class="ectt-1000">\glsxtrinsertinsidetrue </span></div><hr>
-</p><!--l. 1402--><p class="noindent" >
+</p><!--l. 1530--><p class="noindent" >
This applies to all the predefined styles. For example:
</p>
- <div class="verbatim" id="verbatim-44">
+ <div class="verbatim" id="verbatim-50">
\setabbreviationstyle{long-short}
&#x00A0;<br />\renewcommand*{\glsfirstlongdefaultfont}[1]{\emph{#1}}
&#x00A0;<br />\glsxtrinsertinsidetrue
</div>
-<!--l. 1408--><p class="nopar" > This will make the long form and in the inserted text emphasized, whereas the
+<!--l. 1536--><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. 1413--><p class="indent" > Note that for some styles, such as the <span
+</p><!--l. 1541--><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
+ id="dx1-12043"></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. 1417--><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
+</p><!--l. 1545--><p class="indent" > There are two types of full forms. The display full form, which is used on
+<a
+ id="dx1-12044"></a><a
+href="#glo:firstuse">first use</a> by commands like <span
class="ectt-1000">\gls</span><a
- id="dx1-12041"></a> and the inline full form, which is used by commands like
-<span
+ id="dx1-12045"></a> and the inline full form, which is used by
+commands like <span
class="ectt-1000">\glsxtrfull</span><a
- id="dx1-12042"></a>. For some of the abbreviation styles, such as <span
+ id="dx1-12046"></a>. For some of the abbreviation styles, such as
+<span
class="ecss-1000">long-short</span><a
- 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-12044"></a> or <span
-class="ecss-1000">footnote</span><a
- id="dx1-12045"></a>, the display
-and inline full forms are different.
-</p><!--l. 1424--><p class="indent" > These formatting commands aren&#8217;t stored in the <span
+ id="dx1-12047"></a>, the display and inline forms are the same. In the case of styles
+such as <span
+class="ecss-1000">short-nolong</span><a
+ id="dx1-12048"></a> or <span
+class="ecss-1000">short-footnote</span><a
+ id="dx1-12049"></a>, the display and inline full forms are
+different.
+</p><!--l. 1552--><p class="indent" > These formatting commands aren&#8217;t stored in the <span
class="ecss-1000">short</span><a
- id="dx1-12046"></a>, <span
+ id="dx1-12050"></a>, <span
class="ecss-1000">shortplural</span><a
- id="dx1-12047"></a>, <span
+ id="dx1-12051"></a>, <span
class="ecss-1000">long</span><a
- id="dx1-12048"></a> or
+ id="dx1-12052"></a> or
<span
class="ecss-1000">longplural</span><a
- id="dx1-12049"></a> fields, which means they won&#8217;t be used within commands like
+ id="dx1-12053"></a> fields, which means they won&#8217;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-12050"></a> and the case-changing variants don&#8217;t use
+ id="dx1-12054"></a> and the case-changing variants don&#8217;t use
<span
class="ectt-1000">\glsfirstlongfont</span>.
</p>
-<!--l. 1432--><p class="noindent" ><a
+<!--l. 1560--><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. 1435--><p class="noindent" >If you would like to tag the initial letters in the long form such that those letters are
+<!--l. 1563--><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. 1438--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1566--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrEnableInitialTagging</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-13001"></a> <span
@@ -2809,9 +3044,9 @@ class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">cs</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 1440--><p class="noindent" >
+</p><!--l. 1568--><p class="noindent" >
before you define your abbreviations.
-</p><!--l. 1443--><p class="indent" > This command (robustly) defines &#x27E8;<span
+</p><!--l. 1571--><p class="indent" > This command (robustly) defines &#x27E8;<span
class="ecti-1000">cs</span>&#x27E9; (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
@@ -2819,33 +3054,33 @@ the glossary it&#8217;s activated for those categories that have the <span
class="ecss-1000">tagging</span><a
id="dx1-13002"></a> attribute set to
&#8220;true&#8221;. For those cases it will use
-</p><!--l. 1450--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1578--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrtagfont</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-13003"></a> <span
class="ectt-1000">\glsxtrtagfont{</span>&#x27E8;<span
class="ecit-1000">text</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 1452--><p class="noindent" >
+</p><!--l. 1580--><p class="noindent" >
This command defaults to <span
class="ectt-1000">\underline</span><a
id="dx1-13004"></a><span
class="ectt-1000">{</span>&#x27E8;<span
class="ecti-1000">text</span>&#x27E9;<span
class="ectt-1000">} </span>but may be redefined as required.
-</p><!--l. 1456--><p class="indent" > The control sequence &#x27E8;<span
+</p><!--l. 1584--><p class="indent" > The control sequence &#x27E8;<span
class="ecti-1000">cs</span>&#x27E9; can&#8217;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 &#x27E8;<span
class="ecti-1000">cs</span>&#x27E9;. As with redefining any
-commands, ensure that you don&#8217;t redefine something important. In fact, just
+commands, ensure that you don&#8217;t redefine something important. In fact, just
forget the existence of the starred version and let&#8217;s pretend I didn&#8217;t mention
it.
-</p><!--l. 1465--><p class="indent" > The first argument of <span
+</p><!--l. 1593--><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
@@ -2854,7 +3089,7 @@ categories. You can later set this attribute for other categories (see <a
href="#sec:categories">&sect;4 </a><a
href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a>) but
this must be done before the glossary is displayed.
-</p><!--l. 1472--><p class="indent" > The accompanying sample file <span
+</p><!--l. 1600--><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
@@ -2865,17 +3100,17 @@ class="ecss-1000">abbreviation</span><a
</p>
- <div class="verbatim" id="verbatim-45">
+ <div class="verbatim" id="verbatim-51">
\GlsXtrEnableInitialTagging{acronym,abbreviation}{\itag}
</div>
-<!--l. 1477--><p class="nopar" > This defines the command <span
+<!--l. 1605--><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-46">
+ <div class="verbatim" id="verbatim-52">
\newacronym
&#x00A0;<br />&#x00A0;[description={a&#x00A0;system&#x00A0;for&#x00A0;detecting&#x00A0;the&#x00A0;location&#x00A0;and
&#x00A0;<br />&#x00A0;speed&#x00A0;of&#x00A0;ships,&#x00A0;aircraft,&#x00A0;etc,&#x00A0;through&#x00A0;the&#x00A0;use&#x00A0;of&#x00A0;radio
@@ -2887,17 +3122,17 @@ example:
&#x00A0;<br />\newabbreviation{xml}{XML}
&#x00A0;<br />&#x00A0;{e\itag{x}tensible&#x00A0;\itag{m}arkup&#x00A0;\itag{l}anguage}
</div>
-<!--l. 1492--><p class="nopar" > The underlining of the tagged letters only occurs in the glossary and then only for
+<!--l. 1620--><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. 1497--><p class="noindent" >
+</p><!--l. 1625--><p class="noindent" >
</p>
-<!--l. 1497--><p class="noindent" ><a
+<!--l. 1625--><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. 1500--><p class="noindent" >The abbreviation style must be set before abbreviations are defined using:
-</p><!--l. 1502--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 1628--><p class="noindent" >The abbreviation style must be set before abbreviations are defined using:
+</p><!--l. 1630--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\setabbreviationstyle</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14001"></a> <span
@@ -2907,30 +3142,30 @@ class="ectt-1000">]{</span>&#x27E8;<span
class="ecit-1000">style-name</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 1504--><p class="noindent" >
+</p><!--l. 1632--><p class="noindent" >
where &#x27E8;<span
class="ecti-1000">style-name</span>&#x27E9; is the name of the style and &#x27E8;<span
class="ecti-1000">category</span>&#x27E9; is the category label
(<span
class="ectt-1000">abbreviation </span>by default). New abbreviations will pick up the current style
-according to their given category. If there is no style set for the category,
-the fallback is the style for the <span
-class="ectt-1000">abbreviation </span>category. Some styles may
-automatically modify one or more of the attributes associated with the given
-category. For example, the <span
-class="ecss-1000">long</span><a
+according to their given category. If there is no style set for the category, the fallback
+is the style for the <span
+class="ectt-1000">abbreviation </span>category. Some styles may automatically
+modify one or more of the attributes associated with the given category. For
+example, the <span
+class="ecss-1000">long-noshort</span><a
id="dx1-14002"></a> and <span
-class="ecss-1000">short</span><a
+class="ecss-1000">short-nolong</span><a
id="dx1-14003"></a> styles set the <span
class="ecss-1000">regular</span><a
id="dx1-14004"></a> attribute to
<span
class="ectt-1000">true</span>.
-</p><!--l. 1515--><p class="indent" > <div class="important" title="Important Note"> If you want to apply different styles to groups of abbreviations, assign a
+</p><!--l. 1643--><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. 1519--><p class="noindent" >
-</p><!--l. 1521--><p class="indent" > Note that <span
+</p><!--l. 1647--><p class="noindent" >
+</p><!--l. 1649--><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">
@@ -2948,7 +3183,7 @@ class="ectt-1000">\RestoreAcronyms </span>(see
<a
href="#sec:acronymmods">&sect;1.3.5 </a><a
href="#sec:acronymmods">Acronym Style Modifications<!--tex4ht:ref: sec:acronymmods --></a>).
-<!--l. 1529--><p class="indent" > Abbreviations can be used with the standard <span
+<!--l. 1657--><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
@@ -2959,7 +3194,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. 1533--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1661--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrshort</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14010"></a> <span
@@ -2970,12 +3205,12 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1535--><p class="noindent" >
+</p><!--l. 1663--><p class="noindent" >
(Use this instead of <span
class="ectt-1000">\acrshort</span><a
id="dx1-14011"></a>.)
-</p><!--l. 1538--><p class="indent" > The long form can be produced with
-</p><!--l. 1539--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1666--><p class="indent" > The long form can be produced with
+</p><!--l. 1667--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrlong</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14012"></a> <span
@@ -2986,13 +3221,13 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1541--><p class="noindent" >
+</p><!--l. 1669--><p class="noindent" >
(Use this instead of <span
class="ectt-1000">\acrlong</span><a
id="dx1-14013"></a>.)
-</p><!--l. 1544--><p class="indent" > The <span
+</p><!--l. 1672--><p class="indent" > The <span
class="ecti-1000">inline </span>full form can be produced with
-</p><!--l. 1545--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1673--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrfull</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14014"></a> <span
@@ -3003,34 +3238,34 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1547--><p class="noindent" >
+</p><!--l. 1675--><p class="noindent" >
(This this instead of <span
class="ectt-1000">\acrfull</span><a
id="dx1-14015"></a>.)
-</p><!--l. 1550--><p class="indent" > As mentioned earlier, the inline full form may not necessarily match the format
+</p><!--l. 1678--><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
class="ectt-1000">\gls</span>. For example, the <span
-class="ecss-1000">short</span><a
- id="dx1-14017"></a> style only displays the short form
-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. 1556--><p class="indent" > <div class="important" title="Important Note"> If you want to use an abbreviation in a chapter or section title, use the
+class="ecss-1000">short-nolong</span><a
+ id="dx1-14017"></a> style only displays the
+short form 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. 1685--><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">&sect;3 </a><a
href="#sec:headtitle">Entries in Sectioning Titles, Headers, Captions and
Contents<!--tex4ht:ref: sec:headtitle --></a> instead. </div>
-</p><!--l. 1560--><p class="noindent" >
-</p><!--l. 1562--><p class="indent" > The arguments &#x27E8;<span
+</p><!--l. 1689--><p class="noindent" >
+</p><!--l. 1691--><p class="indent" > The arguments &#x27E8;<span
class="ecti-1000">options</span>&#x27E9;, &#x27E8;<span
class="ecti-1000">label</span>&#x27E9; and &#x27E8;<span
class="ecti-1000">insert</span>&#x27E9; are the same as for commands such as
<span
class="ectt-1000">\glstext</span>. There are also analogous case-changing commands:
-</p><!--l. 1566--><p class="indent" > First letter upper case short form:
-</p><!--l. 1567--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1695--><p class="indent" > First letter upper case short form:
+</p><!--l. 1696--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsxtrshort</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14019"></a> <span
@@ -3041,9 +3276,9 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1569--><p class="noindent" >
-</p><!--l. 1571--><p class="indent" > First letter upper case long form:
-</p><!--l. 1572--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1698--><p class="noindent" >
+</p><!--l. 1700--><p class="indent" > First letter upper case long form:
+</p><!--l. 1701--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsxtrlong</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14020"></a> <span
@@ -3054,9 +3289,9 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1574--><p class="noindent" >
-</p><!--l. 1576--><p class="indent" > First letter upper case inline full form:
-</p><!--l. 1577--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1703--><p class="noindent" >
+</p><!--l. 1705--><p class="indent" > First letter upper case inline full form:
+</p><!--l. 1706--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsxtrfull</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14021"></a> <span
@@ -3067,9 +3302,9 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1579--><p class="noindent" >
-</p><!--l. 1581--><p class="indent" > All upper case short form:
-</p><!--l. 1582--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1708--><p class="noindent" >
+</p><!--l. 1710--><p class="indent" > All upper case short form:
+</p><!--l. 1711--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsxtrshort</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14022"></a> <span
@@ -3080,9 +3315,9 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1584--><p class="noindent" >
-</p><!--l. 1586--><p class="indent" > All upper case long form:
-</p><!--l. 1587--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1713--><p class="noindent" >
+</p><!--l. 1715--><p class="indent" > All upper case long form:
+</p><!--l. 1716--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsxtrlong</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14023"></a> <span
@@ -3096,9 +3331,9 @@ class="ectt-1000">] </span></div><hr>
-</p><!--l. 1589--><p class="noindent" >
-</p><!--l. 1591--><p class="indent" > All upper case inline full form:
-</p><!--l. 1592--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1718--><p class="noindent" >
+</p><!--l. 1720--><p class="indent" > All upper case inline full form:
+</p><!--l. 1721--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GLSxtrfull</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14024"></a> <span
@@ -3109,10 +3344,10 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1594--><p class="noindent" >
-</p><!--l. 1596--><p class="indent" > Plural forms are also available.
-</p><!--l. 1598--><p class="indent" > Short form plurals:
-</p><!--l. 1599--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1723--><p class="noindent" >
+</p><!--l. 1725--><p class="indent" > Plural forms are also available.
+</p><!--l. 1727--><p class="indent" > Short form plurals:
+</p><!--l. 1728--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrshortpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14025"></a> <span
@@ -3123,8 +3358,8 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1601--><p class="noindent" >
-</p><!--l. 1602--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1730--><p class="noindent" >
+</p><!--l. 1731--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsxtrshortpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14026"></a> <span
@@ -3135,8 +3370,8 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1604--><p class="noindent" >
-</p><!--l. 1605--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1733--><p class="noindent" >
+</p><!--l. 1734--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GLSxtrshortpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14027"></a> <span
@@ -3147,9 +3382,9 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1607--><p class="noindent" >
-</p><!--l. 1609--><p class="indent" > Long form plurals:
-</p><!--l. 1610--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1736--><p class="noindent" >
+</p><!--l. 1738--><p class="indent" > Long form plurals:
+</p><!--l. 1739--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrlongpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14028"></a> <span
@@ -3160,8 +3395,8 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1612--><p class="noindent" >
-</p><!--l. 1613--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1741--><p class="noindent" >
+</p><!--l. 1742--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsxtrlongpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14029"></a> <span
@@ -3172,8 +3407,8 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1615--><p class="noindent" >
-</p><!--l. 1616--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1744--><p class="noindent" >
+</p><!--l. 1745--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GLSxtrlongpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14030"></a> <span
@@ -3184,9 +3419,9 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1618--><p class="noindent" >
-</p><!--l. 1620--><p class="indent" > Full form plurals:
-</p><!--l. 1621--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1747--><p class="noindent" >
+</p><!--l. 1749--><p class="indent" > Full form plurals:
+</p><!--l. 1750--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrfullpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14031"></a> <span
@@ -3197,8 +3432,8 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1623--><p class="noindent" >
-</p><!--l. 1624--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1752--><p class="noindent" >
+</p><!--l. 1753--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsxtrfullpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14032"></a> <span
@@ -3209,8 +3444,8 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1626--><p class="noindent" >
-</p><!--l. 1627--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1755--><p class="noindent" >
+</p><!--l. 1756--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GLSxtrfullpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-14033"></a> <span
@@ -3221,8 +3456,8 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 1629--><p class="noindent" >
-</p><!--l. 1631--><p class="indent" > <div class="important" title="Important Note"> Be careful about using <span
+</p><!--l. 1758--><p class="noindent" >
+</p><!--l. 1760--><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
@@ -3234,16 +3469,16 @@ class="ectt-1000">\glsxtrfull</span><a
id="dx1-14034"></a> instead. Similarly for <span
class="ectt-1000">\glsentryshort </span>etc.
</div>
-</p><!--l. 1637--><p class="noindent" >
+</p><!--l. 1766--><p class="noindent" >
-</p><!--l. 1639--><p class="noindent" >
+</p><!--l. 1768--><p class="noindent" >
</p>
-<!--l. 1639--><p class="noindent" ><a
+<!--l. 1768--><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. 1642--><p class="noindent" >The abbreviation shortcut commands can be enabled using the package option
+<!--l. 1771--><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
@@ -3256,7 +3491,7 @@ href="#tab:abbrshortcuts">table&#x00A0;2.1</a>.
-<!--l. 1647--><p class="indent" > <a
+<!--l. 1776--><p class="indent" > <a
id="tab:abbrshortcuts"></a></p><hr class="float" /><div class="float"
>
@@ -3448,10 +3683,10 @@ class="ectt-1000">\newabbreviation</span><a
</div><hr class="endfloat" />
</div>
-<!--l. 1677--><p class="noindent" ><a
+<!--l. 1806--><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. 1680--><p class="noindent" >There are two types of abbreviation styles: those that treat the abbreviation as a
+<!--l. 1809--><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
@@ -3462,7 +3697,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. 1685--><p class="indent" > The regular entry abbreviation styles set the <span
+</p><!--l. 1814--><p class="indent" > The regular entry abbreviation styles set the <span
class="ecss-1000">regular</span><a
id="dx1-16005"></a> attribute to &#8220;true&#8221; for the
category assigned to each abbreviation with that style. This means that on <a
@@ -3486,7 +3721,7 @@ class="ecss-1000">long</span><a
<span
class="ectt-1000">\glsxtrshort</span><a
id="dx1-16013"></a>.
-</p><!--l. 1694--><p class="indent" > The other abbreviation styles don&#8217;t modify the <span
+</p><!--l. 1823--><p class="indent" > The other abbreviation styles don&#8217;t modify the <span
class="ecss-1000">regular</span><a
id="dx1-16014"></a> attribute. The <span
class="ecss-1000">first</span><a
@@ -3505,14 +3740,14 @@ format (through commands like <span
class="ectt-1000">\glsxtrfullformat</span><a
id="dx1-16019"></a> that are defined by the
style).
-</p><!--l. 1702--><p class="indent" > In both cases, the <a
+</p><!--l. 1831--><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. 1706--><p class="indent" > <div class="important" title="Important Note"> For the &#8220;sc&#8221; styles that use <span
+</p><!--l. 1835--><p class="indent" > <div class="important" title="Important Note"> For the &#8220;sc&#8221; 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
@@ -3521,152 +3756,378 @@ 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. 1712--><p class="noindent" >
-</p><!--l. 1714--><p class="indent" > The &#8220;sc&#8221; styles all use
-</p><!--l. 1715--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1841--><p class="noindent" >
+</p><!--l. 1843--><p class="indent" > The &#8220;sc&#8221; styles all use
+</p><!--l. 1844--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrscfont</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-16025"></a> <span
class="ectt-1000">\glsxtrscfont{</span>&#x27E8;<span
class="ecit-1000">text</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 1717--><p class="noindent" >
+</p><!--l. 1846--><p class="noindent" >
which is defined as
</p>
- <div class="verbatim" id="verbatim-47">
+ <div class="verbatim" id="verbatim-53">
\newcommand*{\glsxtrscfont}[1]{\textsc{#1}}
</div>
-<!--l. 1721--><p class="nopar" > The default plural suffix for the short form is set to
-</p><!--l. 1723--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="ectt-0900">\glsxtrscsuffix</span><span
+<!--l. 1850--><p class="nopar" > and
+</p><!--l. 1852--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glsxtrfirstscfont</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-16026"></a> <span
+class="ectt-1000">\glsxtrfirstscfont{</span>&#x27E8;<span
+class="ecit-1000">text</span>&#x27E9;<span
+class="ectt-1000">} </span></div><hr>
+</p><!--l. 1854--><p class="noindent" >
+which is defined as
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-54">
+\newcommand*{\glsxtrfirstscfont}[1]{\glsxtrscfont{#1}}
+</div>
+<!--l. 1858--><p class="nopar" > The default plural suffix for the short form is set to
+</p><!--l. 1860--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glsxtrscsuffix</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-16027"></a> <span
class="ectt-1000">\glsxtrscsuffix </span></div><hr>
-</p><!--l. 1725--><p class="noindent" >
+</p><!--l. 1862--><p class="noindent" >
This just defined as
</p>
- <div class="verbatim" id="verbatim-48">
+ <div class="verbatim" id="verbatim-55">
\newcommand*{\glsxtrscsuffix}{\glstextup{\glspluralsuffix}}
</div>
-<!--l. 1729--><p class="nopar" > The <span
+<!--l. 1866--><p class="nopar" > The <span
class="ectt-1000">\glstextup</span><a
- id="dx1-16027"></a> command is provided by <span
+ id="dx1-16028"></a> command is provided by <span
class="ecss-1000">glossaries</span><a
- id="dx1-16028"></a> and is used to switch off the
+ id="dx1-16029"></a> and is used to switch off the
small caps font for the suffix. If you override the default short plural using the
<span
class="ecss-1000">shortplural</span><a
- id="dx1-16029"></a> key when you define the abbreviation you will need to make the
+ id="dx1-16030"></a> key when you define the abbreviation you will need to make the
appropriate adjustment if necessary. (Remember that the default plural suffix
behaviour can be modified through the use of the <span
class="ecss-1000">aposplural</span><a
- id="dx1-16030"></a> and <span
+ id="dx1-16031"></a> and <span
class="ecss-1000">noshortplural</span><a
- id="dx1-16031"></a>
+ id="dx1-16032"></a>
attributes. See <a
href="#sec:categories">&sect;4 </a><a
href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a> for further details.)
-</p><!--l. 1740--><p class="indent" > The &#8220;sm&#8221; styles all use
-</p><!--l. 1741--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1877--><p class="indent" > Remember that <span
+class="ectt-1000">\textsc </span>renders <span
+class="ecti-1000">lowercase </span>letters as small capitals. Uppercase
+letters are rendered as normal uppercase letters, so if you specify the short form in
+uppercase, you won&#8217;t get small capitals unless you redefine <span
+class="ectt-1000">\glsxtrscfont </span>to convert
+its argument to lowercase. For example:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-56">
+\renewcommand*{\glsxtrscfont}[1]{\textsc{\MakeLowercase{#1}}}
+</div>
+<!--l. 1884--><p class="nopar" >
+</p><!--l. 1886--><p class="indent" > The &#8220;sm&#8221; styles all use
+</p><!--l. 1887--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrsmfont</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-16032"></a> <span
+ id="dx1-16033"></a> <span
class="ectt-1000">\glsxtrsmfont{</span>&#x27E8;<span
class="ecit-1000">text</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 1743--><p class="noindent" >
+</p><!--l. 1889--><p class="noindent" >
This is defined as:
</p>
- <div class="verbatim" id="verbatim-49">
+ <div class="verbatim" id="verbatim-57">
\newcommand*{\glsxtrsmfont}[1]{\textsmaller{#1}}
</div>
-<!--l. 1747--><p class="nopar" > If you want to use this, you must explicitly load the <span
+<!--l. 1893--><p class="nopar" > and
+</p><!--l. 1895--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glsxtrfirstsmfont</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-16034"></a> <span
+class="ectt-1000">\glsxtrfirstsmfont{</span>&#x27E8;<span
+class="ecit-1000">text</span>&#x27E9;<span
+class="ectt-1000">} </span></div><hr>
+</p><!--l. 1897--><p class="noindent" >
+which is defined as
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-58">
+\newcommand*{\glsxtrfirstsmfont}[1]{\glsxtrsmfont{#1}}
+</div>
+<!--l. 1901--><p class="nopar" > If you want to use this style, you must explicitly load the <span
class="ecss-1000">relsize</span><a
- id="dx1-16033"></a> package which defines the
-<span
+ id="dx1-16035"></a> package which
+defines the <span
class="ectt-1000">\textsmaller</span><a
- id="dx1-16034"></a> command. If you want to easily switch between the &#8220;sc&#8221; and &#8220;sm&#8221;
-styles, you may find it easier to redefine this command to convert to upper
+ id="dx1-16036"></a> command. If you want to easily switch between the &#8220;sc&#8221;
+and &#8220;sm&#8221; styles, you may find it easier to redefine this command to convert to upper
case:
</p>
- <div class="verbatim" id="verbatim-50">
+ <div class="verbatim" id="verbatim-59">
\renewcommand*{\glsxtrsmfont}[1]{\textsmaller{\MakeTextUppercase{#1}}}
</div>
-<!--l. 1754--><p class="nopar" > The default plural suffix for the short form is set to
-</p><!--l. 1756--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 1908--><p class="nopar" > The default plural suffix for the short form is set to
+</p><!--l. 1910--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrsmsuffix</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-16035"></a> <span
+ id="dx1-16037"></a> <span
class="ectt-1000">\glsxtrsmsuffix </span></div><hr>
-</p><!--l. 1758--><p class="noindent" >
+</p><!--l. 1912--><p class="noindent" >
This just does <span
class="ectt-1000">\glspluralsuffix</span><a
- id="dx1-16036"></a>.
-</p><!--l. 1761--><p class="indent" > The &#8220;em&#8221; 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. 1765--><p class="indent" > Some of the styles use
-</p><!--l. 1766--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="ectt-0900">\glsxtrfullsep</span><span
+ id="dx1-16038"></a>.
+</p><!--l. 1915--><p class="indent" > The &#8220;em&#8221; styles all use
+</p><!--l. 1916--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glsabbrvemfont</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-16039"></a> <span
+class="ectt-1000">\glsabbrvemfont{</span>&#x27E8;<span
+class="ecit-1000">text</span>&#x27E9;<span
+class="ectt-1000">} </span></div><hr>
+</p><!--l. 1918--><p class="noindent" >
+which is defined as:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-60">
+\newcommand*{\glsabbrvemfont}[1]{\emph{#1}}
+</div>
+<!--l. 1922--><p class="nopar" > and
+</p><!--l. 1924--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glsfirstabbrvemfont</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-16040"></a> <span
+class="ectt-1000">\glsfirstabbrvemfont{</span>&#x27E8;<span
+class="ecit-1000">text</span>&#x27E9;<span
+class="ectt-1000">} </span></div><hr>
+</p><!--l. 1926--><p class="noindent" >
+which is defined as:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-61">
+\newcommand*{\glsfirstabbrvemfont}[1]{\glsabbrvemfont{#1}}
+</div>
+<!--l. 1930--><p class="nopar" >
+</p><!--l. 1932--><p class="indent" > Some of the styles use
+</p><!--l. 1933--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glsxtrfullsep</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-16041"></a> <span
class="ectt-1000">\glsxtrfullsep{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 1768--><p class="noindent" >
+</p><!--l. 1935--><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-51">
+ <div class="verbatim" id="verbatim-62">
\renewcommand*{\glsxtrfullsep}[1]{~}
</div>
-<!--l. 1773--><p class="nopar" > or
+<!--l. 1940--><p class="nopar" > or
</p>
- <div class="verbatim" id="verbatim-52">
+ <div class="verbatim" id="verbatim-63">
\renewcommand*{\glsxtrfullsep}[1]{\glsacspace{#1}}
</div>
-<!--l. 1777--><p class="nopar" >
-</p><!--l. 1780--><p class="noindent" >
+<!--l. 1944--><p class="nopar" >
+</p><!--l. 1946--><p class="indent" > The new naming scheme for abbreviation styles is as follows: </p>
+ <ul class="itemize1">
+ <li class="itemize">&#x27E8;<span
+class="ecti-1000">field1</span>&#x27E9;[<span
+class="ectt-1000">-</span>&#x27E8;<span
+class="ecti-1000">modifier1</span>&#x27E9;]<span
+class="ectt-1000">-</span>&#x27E8;<span
+class="ecti-1000">field2</span>&#x27E9;[<span
+class="ectt-1000">-</span>&#x27E8;<span
+class="ecti-1000">modifier2</span>&#x27E9;][<span
+class="ectt-1000">-user</span>]
+ <!--l. 1951--><p class="noindent" >This is for the parenthetical styles. The <span
+class="ectt-1000">-</span>&#x27E8;<span
+class="ecti-1000">modifier</span>&#x27E9; parts may be omitted.
+ These styles display &#x27E8;<span
+class="ecti-1000">field1</span>&#x27E9; followed by &#x27E8;<span
+class="ecti-1000">field2</span>&#x27E9; in parentheses. If &#x27E8;<span
+class="ecti-1000">field2</span>&#x27E9; starts
+ with &#8220;no&#8221; then the parenthetical element is omitted from the display style
+ but is included in the inline style.
+ </p><!--l. 1957--><p class="noindent" >If the <span
+class="ectt-1000">-</span>&#x27E8;<span
+class="ecti-1000">modifier</span>&#x27E9; part is present, then the field has a font changing command
+ applied to it.
+ </p><!--l. 1960--><p class="noindent" >If the <span
+class="ectt-1000">-user </span>part is present, then the <span
+class="ecss-1000">user1</span><a
+ id="dx1-16042"></a> value, if provided, is inserted
+ into the parenthetical material . (The field used for the inserted material
+ may be changed.)
+ </p><!--l. 1964--><p class="noindent" >Examples: </p>
+ <ul class="itemize2">
+ <li class="itemize"><span
+class="ecss-1000">long-noshort-sc</span><a
+ id="dx1-16043"></a>: &#x27E8;<span
+class="ecti-1000">field1</span>&#x27E9; is the long form, the short form is set in
+ smallcaps but omitted in the display style.
+ </li>
+ <li class="itemize"><span
+class="ecss-1000">long-em-short-em</span><a
+ id="dx1-16044"></a>: both the long form and the short form are
+ emphasized. The short form is in parentheses.
+ </li>
+ <li class="itemize"><span
+class="ecss-1000">long-short-em</span><a
+ id="dx1-16045"></a>: the short form is emphasized but not the long form.
+ The short form is in parentheses.
+ </li>
+ <li class="itemize"><span
+class="ecss-1000">long-short-user</span><a
+ id="dx1-16046"></a>: if the <span
+class="ecss-1000">user1</span><a
+ id="dx1-16047"></a> key has been set, this produces the style
+ &#x27E8;<span
+class="ecti-1000">long</span>&#x27E9; (&#x27E8;<span
+class="ecti-1000">short</span>&#x27E9;, &#x27E8;<span
+class="ecti-1000">user1</span>&#x27E9;) otherwise it just produces &#x27E8;<span
+class="ecti-1000">long</span>&#x27E9; (&#x27E8;<span
+class="ecti-1000">short</span>&#x27E9;).</li></ul>
+ </li>
+ <li class="itemize">&#x27E8;<span
+class="ecti-1000">field1</span>&#x27E9;[<span
+class="ectt-1000">-</span>&#x27E8;<span
+class="ecti-1000">modifier1</span>&#x27E9;]<span
+class="ectt-1000">-</span>[<span
+class="ectt-1000">post</span>]<span
+class="ectt-1000">footnote</span>
+ <!--l. 1981--><p class="noindent" >The display style uses &#x27E8;<span
+class="ecti-1000">field1</span>&#x27E9; followed by a footnote with the other field in it. If
+ <span
+class="ectt-1000">post </span>is present then the footnote is placed after the <a
+ id="dx1-16048"></a><a
+href="#glo:linktext">link-text</a> using the
+ post-link hook. The inline style does &#x27E8;<span
+class="ecti-1000">field1</span>&#x27E9; followed by the other field in
+ parentheses.
+ </p><!--l. 1987--><p class="noindent" >If <span
+class="ectt-1000">-</span>&#x27E8;<span
+class="ecti-1000">modifier1</span>&#x27E9; is present, &#x27E8;<span
+class="ecti-1000">field1</span>&#x27E9; has a font-changing command applied to
+ it.
+ </p><!--l. 1990--><p class="noindent" >Examples: </p>
+
+
+
+ <ul class="itemize2">
+ <li class="itemize"><span
+class="ecss-1000">short-footnote</span><a
+ id="dx1-16049"></a>: short form in the text with the long form in the
+ footnote.
+ </li>
+ <li class="itemize"><span
+class="ecss-1000">short-sc-postfootnote</span><a
+ id="dx1-16050"></a>: short form in smallcaps with the long form in
+ the footnote outside of the <a
+ id="dx1-16051"></a><a
+href="#glo:linktext">link-text</a>.</li></ul>
+ <!--l. 1998--><p class="noindent" ><div class="important" title="Important Note"> Take care with the footnote styles. Remember that there are some situations
+ where <span
+class="ectt-1000">\footnote</span><a
+ id="dx1-16052"></a> doesn&#8217;t work. </div>
+ </p><!--l. 2001--><p class="noindent" >
+ </p></li>
+ <li class="itemize">&#x27E8;<span
+class="ecti-1000">style</span>&#x27E9;<span
+class="ectt-1000">-desc</span>
+ <!--l. 2005--><p class="noindent" >Like &#x27E8;<span
+class="ecti-1000">style</span>&#x27E9; but the <span
+class="ecss-1000">description</span><a
+ id="dx1-16053"></a> key must be provided when defining abbreviations
+ with this style.
+ </p><!--l. 2008--><p class="noindent" >Examples: </p>
+ <ul class="itemize2">
+ <li class="itemize"><span
+class="ecss-1000">short-long-desc</span><a
+ id="dx1-16054"></a>: like <span
+class="ecss-1000">short-long</span><a
+ id="dx1-16055"></a> but requires a description.
+ </li>
+ <li class="itemize"><span
+class="ecss-1000">short-em-footnote-desc</span><a
+ id="dx1-16056"></a>: like <span
+class="ecss-1000">short-em-footnote</span><a
+ id="dx1-16057"></a> but requires a
+ description.</li></ul>
+ </li></ul>
+<!--l. 2018--><p class="indent" > Not all combinations that fit the above syntax are provided. Pre-version 1.04
+styles that didn&#8217;t fit this naming scheme are either provided with a synonym (where
+the former name wasn&#8217;t ambiguous) or provided with a deprecated synonym (where
+the former name was confusing). The deprecated style names generate a warning
+using:
+</p><!--l. 2024--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\GlsXtrWarnDeprecatedAbbrStyle</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-16058"></a> <span
+class="ectt-1000">\GlsXtrWarnDeprecatedAbbrStyle{</span>&#x27E8;<span
+class="ecit-1000">old-name</span>&#x27E9;<span
+class="ectt-1000">}{</span>&#x27E8;<span
+class="ecit-1000">new-name</span>&#x27E9;<span
+class="ectt-1000">}</span>
+</div><hr>
+</p><!--l. 2026--><p class="noindent" >
+where &#x27E8;<span
+class="ecti-1000">old-name</span>&#x27E9; is the deprecated name and &#x27E8;<span
+class="ecti-1000">new-name</span>&#x27E9; is the preferred name. You
+can suppress these warnings by redefining this command to do nothing.
+</p><!--l. 2032--><p class="noindent" >
</p>
-<!--l. 1780--><p class="noindent" ><a
+<!--l. 2032--><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. 1783--><p class="noindent" >The following abbreviation styles set the <span
+<!--l. 2035--><p class="noindent" >The following abbreviation styles set the <span
class="ecss-1000">regular</span><a
id="dx1-17001"></a> attribute to &#8220;true&#8221; for all categories
that have abbreviations defined with any of these styles.
+
+
+
</p><dl class="description"><dt class="description">
<span
-class="ecsx-1000">short</span><a
+class="ecsx-1000">short-nolong</span><a
id="dx1-17002"></a> </dt><dd
class="description">This only displays the short form on <a
id="dx1-17003"></a><a
href="#glo:firstuse">first use</a>. The <span
class="ecss-1000">name</span><a
- id="dx1-17004"></a> is set to the
- short form. The <span
+ id="dx1-17004"></a> is set to
+ the short form. The <span
class="ecss-1000">description</span><a
id="dx1-17005"></a> is set to the long form. The inline full form
displays &#x27E8;<span
@@ -3677,531 +4138,989 @@ class="ectt-1000">\glsxtrlong</span><a
id="dx1-17006"></a>.
</dd><dt class="description">
<span
-class="ecsx-1000">short-sc</span><a
+class="ecsx-1000">short</span><a
id="dx1-17007"></a> </dt><dd
-class="description">Like <span
-class="ecss-1000">short</span><a
- id="dx1-17008"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use <span
+class="description">A synonym for <span
+class="ecss-1000">short-nolong</span><a
+ id="dx1-17008"></a>.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">short-sc-nolong</span><a
+ id="dx1-17009"></a> </dt><dd
+class="description">Like <span
+class="ecss-1000">short-nolong</span><a
+ id="dx1-17010"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use
+ <span
class="ectt-1000">\glsxtrscfont</span><a
- id="dx1-17009"></a>.
+ id="dx1-17011"></a>.
</dd><dt class="description">
<span
-class="ecsx-1000">short-sm</span><a
- id="dx1-17010"></a> </dt><dd
-class="description">Like <span
-class="ecss-1000">short</span><a
- id="dx1-17011"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use <span
+class="ecsx-1000">short-sc</span><a
+ id="dx1-17012"></a> </dt><dd
+class="description">A synonym for <span
+class="ecss-1000">short-sc-nolong</span><a
+ id="dx1-17013"></a>
+ </dd><dt class="description">
+<span
+class="ecsx-1000">short-sm-nolong</span><a
+ id="dx1-17014"></a> </dt><dd
+class="description">Like <span
+class="ecss-1000">short-nolong</span><a
+ id="dx1-17015"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use
+ <span
class="ectt-1000">\glsxtrsmfont</span><a
- id="dx1-17012"></a>.
+ id="dx1-17016"></a>.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">short-sm</span><a
+ id="dx1-17017"></a> </dt><dd
+class="description">A synonym for <span
+class="ecss-1000">short-sm-nolong</span><a
+ id="dx1-17018"></a>.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">short-em-nolong</span><a
+ id="dx1-17019"></a> </dt><dd
+class="description">Like <span
+class="ecss-1000">short-nolong</span><a
+ id="dx1-17020"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use
+ <span
+class="ectt-1000">\glsxtremfont</span><a
+ id="dx1-17021"></a>.
</dd><dt class="description">
<span
class="ecsx-1000">short-em</span><a
- id="dx1-17013"></a> </dt><dd
-class="description">Like <span
-class="ecss-1000">short</span><a
- id="dx1-17014"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use <span
-class="ectt-1000">\emph</span><a
- id="dx1-17015"></a>.
+ id="dx1-17022"></a> </dt><dd
+class="description">A synonym for <span
+class="ecss-1000">short-em-nolong</span><a
+ id="dx1-17023"></a>
</dd><dt class="description">
<span
-class="ecsx-1000">short-desc</span><a
- id="dx1-17016"></a> </dt><dd
-class="description">Like the <span
-class="ecss-1000">short</span><a
- id="dx1-17017"></a> style, but the <span
+class="ecsx-1000">short-nolong-desc</span><a
+ id="dx1-17024"></a> </dt><dd
+class="description">Like the <span
+class="ecss-1000">short-nolong</span><a
+ id="dx1-17025"></a> style, but the <span
class="ecss-1000">name</span><a
- id="dx1-17018"></a> is set to the full form
- and the <span
+ id="dx1-17026"></a> is set to the full
+ form and the <span
class="ecss-1000">description</span><a
- id="dx1-17019"></a> must be supplied by the user. You may prefer
- to use the <span
-class="ecss-1000">short</span><a
- id="dx1-17020"></a> style with the post-description hook set to display
+ id="dx1-17027"></a> must be supplied by the user. You may prefer
+ to use the <span
+class="ecss-1000">short-nolong</span><a
+ id="dx1-17028"></a> style with the post-description hook set to display
the long form and override the <span
class="ecss-1000">description</span><a
- id="dx1-17021"></a> key. (See the sample file
+ id="dx1-17029"></a> key. (See the sample file
<span
class="ectt-1000">sample-acronym-desc.tex</span>.)
</dd><dt class="description">
<span
-class="ecsx-1000">short-sc-desc</span><a
- id="dx1-17022"></a> </dt><dd
-class="description">Like <span
-class="ecss-1000">short</span><a
- id="dx1-17023"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use <span
-class="ectt-1000">\glsxtrscfont</span><a
- id="dx1-17024"></a>.
+class="ecsx-1000">short-desc</span><a
+ id="dx1-17030"></a> </dt><dd
+class="description">A synonym for <span
+class="ecss-1000">short-nolong-desc</span><a
+ id="dx1-17031"></a>.
</dd><dt class="description">
<span
-class="ecsx-1000">short-sm-desc</span><a
- id="dx1-17025"></a> </dt><dd
-class="description">Like <span
-class="ecss-1000">short-desc</span><a
- id="dx1-17026"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use
+class="ecsx-1000">short-sc-nolong-desc</span><a
+ id="dx1-17032"></a> </dt><dd
+class="description">Like <span
+class="ecss-1000">short-nolong</span><a
+ id="dx1-17033"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use
<span
-class="ectt-1000">\glsxtrsmfont</span><a
- id="dx1-17027"></a>.
+class="ectt-1000">\glsxtrscfont</span><a
+ id="dx1-17034"></a>.
</dd><dt class="description">
<span
-class="ecsx-1000">short-em-desc</span><a
- id="dx1-17028"></a> </dt><dd
+class="ecsx-1000">short-sc-desc</span><a
+ id="dx1-17035"></a> </dt><dd
+class="description">A synonym for <span
+class="ecss-1000">short-sc-nolong-desc</span><a
+ id="dx1-17036"></a>.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">short-sm-nolong-desc</span><a
+ id="dx1-17037"></a> </dt><dd
class="description">Like <span
-class="ecss-1000">short-desc</span><a
- id="dx1-17029"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use <span
-class="ectt-1000">\emph</span><a
- id="dx1-17030"></a>.
+class="ecss-1000">short-nolong-desc</span><a
+ id="dx1-17038"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to
+ use <span
+class="ectt-1000">\glsxtrsmfont</span><a
+ id="dx1-17039"></a>.
</dd><dt class="description">
<span
-class="ecsx-1000">long-desc</span><a
- id="dx1-17031"></a> </dt><dd
-class="description">This style only displays the long form, regardless of first or
- subsequent use of commands <span
+class="ecsx-1000">short-sm-desc</span><a
+ id="dx1-17040"></a> </dt><dd
+class="description">A synonym for <span
+class="ecss-1000">short-sm-nolong-desc</span><a
+ id="dx1-17041"></a>.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">short-em-nolong-desc</span><a
+ id="dx1-17042"></a> </dt><dd
+class="description">Like <span
+class="ecss-1000">short-nolong-desc</span><a
+ id="dx1-17043"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to
+ use <span
+class="ectt-1000">\glsxtremfont</span><a
+ id="dx1-17044"></a>.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">short-em-desc</span><a
+ id="dx1-17045"></a> </dt><dd
+class="description">A synonym for <span
+class="ecss-1000">short-em-nolong-desc</span><a
+ id="dx1-17046"></a>.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">long-noshort-desc</span><a
+ id="dx1-17047"></a> </dt><dd
+class="description">This style only displays the long form, regardless of first
+ or subsequent use of commands <span
class="ectt-1000">\gls</span><a
- id="dx1-17032"></a>. The short form may be accessed
+ id="dx1-17048"></a>. The short form may be accessed
through commands like <span
class="ectt-1000">\glsxtrshort</span><a
- id="dx1-17033"></a>. The inline full form displays &#x27E8;<span
+ id="dx1-17049"></a>. The inline full form displays &#x27E8;<span
class="ecti-1000">long</span>&#x27E9;
(&#x27E8;<span
class="ecti-1000">short</span>&#x27E9;).
- <!--l. 1833--><p class="noindent" >The <span
+ <!--l. 2105--><p class="noindent" >The <span
class="ecss-1000">name</span><a
- id="dx1-17034"></a> is set to the long form and the <span
+ id="dx1-17050"></a> and <span
+class="ecss-1000">sort</span><a
+ id="dx1-17051"></a> keys are set to the long form and the <span
class="ecss-1000">description</span><a
- id="dx1-17035"></a> must be provided by
- the user. The predefined glossary styles won&#8217;t display the short form. You
- can use the post-description hook to automatically append the short form
- to the description. The inline full form will display &#x27E8;<span
-class="ecti-1000">long</span>&#x27E9; (&#x27E8;<span
+ id="dx1-17052"></a> must
+ be provided by the user. The predefined glossary styles won&#8217;t display the
+ short form. You can use the post-description hook to automatically append
+ the short form to the description. The inline full form will display &#x27E8;<span
+class="ecti-1000">long</span>&#x27E9;
+ (&#x27E8;<span
class="ecti-1000">short</span>&#x27E9;).
</p></dd><dt class="description">
<span
-class="ecsx-1000">long-desc-sc</span><a
- id="dx1-17036"></a> </dt><dd
+class="ecsx-1000">long-desc</span><a
+ id="dx1-17053"></a> </dt><dd
+class="description">A synonym for <span
+class="ecss-1000">long-noshort-desc</span><a
+ id="dx1-17054"></a>.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">long-noshort-sc-desc</span><a
+ id="dx1-17055"></a> </dt><dd
class="description">Like the <span
-class="ecss-1000">long-desc</span><a
- id="dx1-17037"></a> style but the short form (accessed through
- commands like <span
+class="ecss-1000">long-noshort-desc</span><a
+ id="dx1-17056"></a> style but the short form
+ (accessed through commands like <span
class="ectt-1000">\glsxtrshort</span><a
- id="dx1-17038"></a>) use <span
+ id="dx1-17057"></a>) use <span
class="ectt-1000">\glsxtrscfont</span><a
- id="dx1-17039"></a>.
+ id="dx1-17058"></a>.
+ (This style was originally called <span
+class="ecss-1000">long-desc-sc</span><a
+ id="dx1-17059"></a>. Renamed in version
+ 1.04, but original name retained as a deprecated synonym for
+ backward-compatibility.)
</dd><dt class="description">
<span
-class="ecsx-1000">long-desc-sm</span><a
- id="dx1-17040"></a> </dt><dd
-class="description">Like <span
-class="ecss-1000">long-desc</span><a
- id="dx1-17041"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use
- <span
+class="ecsx-1000">long-noshort-sm-desc</span><a
+ id="dx1-17060"></a> </dt><dd
+class="description">Like <span
+class="ecss-1000">long-noshort-desc</span><a
+ id="dx1-17061"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to
+ use <span
class="ectt-1000">\glsxtrsmfont</span><a
- id="dx1-17042"></a>.
+ id="dx1-17062"></a>. (This style was originally called <span
+class="ecss-1000">long-desc-sm</span><a
+ id="dx1-17063"></a>.
+ Renamed in version 1.04, but original name retained as a deprecated
+ synonym for backward-compatibility.)
</dd><dt class="description">
<span
-class="ecsx-1000">long-desc-em</span><a
- id="dx1-17043"></a> </dt><dd
+class="ecsx-1000">long-noshort-em-desc</span><a
+ id="dx1-17064"></a> </dt><dd
class="description">Like <span
-class="ecss-1000">long-desc</span><a
- id="dx1-17044"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use <span
-class="ectt-1000">\emph</span><a
- id="dx1-17045"></a>.
+class="ecss-1000">long-noshort-desc</span><a
+ id="dx1-17065"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to
+ use <span
+class="ectt-1000">\glsxtremfont</span><a
+ id="dx1-17066"></a>. The long form isn&#8217;t emphasized. (This style was
+ originally called <span
+class="ecss-1000">long-desc-em</span><a
+ id="dx1-17067"></a>. Renamed in version 1.04, but original name
+ retained as a deprecated synonym for backward-compatibility.)
</dd><dt class="description">
<span
-class="ecsx-1000">long</span><a
- id="dx1-17046"></a> </dt><dd
-class="description">This style doesn&#8217;t really make sense if you don&#8217;t use the short form
- anywhere in the document, but is provided for completeness. This is like
- the <span
-class="ecss-1000">long-desc</span><a
- id="dx1-17047"></a> style, but the <span
+class="ecsx-1000">long-em-noshort-em-desc</span><a
+ id="dx1-17068"></a> </dt><dd
+class="description">New to version 1.04, like <span
+class="ecss-1000">long-noshort-desc</span><a
+ id="dx1-17069"></a> but
+ redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use <span
+class="ectt-1000">\glsxtremfont</span><a
+ id="dx1-17070"></a>. The long form uses
+ <span
+class="ectt-1000">\glsfirstlongemfont</span><a
+ id="dx1-17071"></a> and <span
+class="ectt-1000">\glslongemfont</span><a
+ id="dx1-17072"></a>.
+
+
+
+ </dd><dt class="description">
+<span
+class="ecsx-1000">long-noshort</span><a
+ id="dx1-17073"></a> </dt><dd
+class="description">This style doesn&#8217;t really make sense if you don&#8217;t use the short
+ form anywhere in the document, but is provided for completeness. This is
+ like the <span
+class="ecss-1000">long-noshort-desc</span><a
+ id="dx1-17074"></a> style, but the <span
class="ecss-1000">name</span><a
- id="dx1-17048"></a> is set to the short form and the <span
+ id="dx1-17075"></a> and <span
+class="ecss-1000">sort</span><a
+ id="dx1-17076"></a> keys are set to the
+ short form and the <span
class="ecss-1000">description</span><a
- id="dx1-17049"></a>
- is set to the long form.
+ id="dx1-17077"></a> is set to the long form.
</dd><dt class="description">
<span
-class="ecsx-1000">long-sc</span><a
- id="dx1-17050"></a> </dt><dd
-class="description">Like the <span
-class="ecss-1000">long</span><a
- id="dx1-17051"></a> style but the short form (accessed through commands like
- <span
+class="ecsx-1000">long</span><a
+ id="dx1-17078"></a> </dt><dd
+class="description">A synonym for <span
+class="ecss-1000">long-noshort</span><a
+ id="dx1-17079"></a>
+ </dd><dt class="description">
+<span
+class="ecsx-1000">long-noshort-sc</span><a
+ id="dx1-17080"></a> </dt><dd
+class="description">Like the <span
+class="ecss-1000">long-noshort</span><a
+ id="dx1-17081"></a> style but the short form (accessed
+ through commands like <span
class="ectt-1000">\glsxtrshort</span><a
- id="dx1-17052"></a>) use <span
+ id="dx1-17082"></a>) use <span
class="ectt-1000">\glsxtrscfont</span><a
- id="dx1-17053"></a>.
+ id="dx1-17083"></a>. (This style
+ was originally called <span
+class="ecss-1000">long-sc</span><a
+ id="dx1-17084"></a>. Renamed in version 1.04, but original name
+ retained as a deprecated synonym for backward-compatibility.)
</dd><dt class="description">
<span
-class="ecsx-1000">long-sm</span><a
- id="dx1-17054"></a> </dt><dd
-class="description">Like <span
-class="ecss-1000">long</span><a
- id="dx1-17055"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use <span
+class="ecsx-1000">long-noshort-sm</span><a
+ id="dx1-17085"></a> </dt><dd
+class="description">Like <span
+class="ecss-1000">long-noshort</span><a
+ id="dx1-17086"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use
+ <span
class="ectt-1000">\glsxtrsmfont</span><a
- id="dx1-17056"></a>.
+ id="dx1-17087"></a>. (This style was originally called <span
+class="ecss-1000">long-sm</span><a
+ id="dx1-17088"></a>. Renamed in
+ version 1.04, but original name retained as a deprecated synonym for
+ backward-compatibility.)
</dd><dt class="description">
<span
-class="ecsx-1000">long-em</span><a
- id="dx1-17057"></a> </dt><dd
-class="description">Like <span
-class="ecss-1000">long</span><a
- id="dx1-17058"></a> but redefines <span
+class="ecsx-1000">long-noshort-em</span><a
+ id="dx1-17089"></a> </dt><dd
+class="description">This style is like <span
+class="ecss-1000">long-noshort</span><a
+ id="dx1-17090"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont</span>
+ to use <span
+class="ectt-1000">\glsxtremfont</span><a
+ id="dx1-17091"></a>. The long form isn&#8217;t emphasized. (This style was
+ originally called <span
+class="ecss-1000">long-em</span><a
+ id="dx1-17092"></a>. Renamed in version 1.04, but original name
+ retained as a deprecated synonym for backward-compatibility.)
+ </dd><dt class="description">
+<span
+class="ecsx-1000">long-em-noshort-em</span><a
+ id="dx1-17093"></a> </dt><dd
+class="description">New to version 1.04, this style is like <span
+class="ecss-1000">long-noshort</span><a
+ id="dx1-17094"></a> but
+ redefines <span
class="ectt-1000">\glsabbrvfont </span>to use <span
-class="ectt-1000">\emph</span><a
- id="dx1-17059"></a>.
+class="ectt-1000">\glsxtremfont</span><a
+ id="dx1-17095"></a>, <span
+class="ectt-1000">\glsfirstlongfont </span>to
+ use <span
+class="ectt-1000">\glsfirstlongemfont </span>and <span
+class="ectt-1000">\glslongfont </span>to use <span
+class="ectt-1000">\glslongemfont</span>.
+ The short form isn&#8217;t used by commands like <span
+class="ectt-1000">\gls</span><a
+ id="dx1-17096"></a>, but can be obtained
+ using <span
+class="ectt-1000">\glsxtrshort</span><a
+ id="dx1-17097"></a>.
</dd></dl>
-<!--l. 1874--><p class="noindent" >
+<!--l. 2182--><p class="noindent" >
</p>
-<!--l. 1874--><p class="noindent" ><a
+<!--l. 2182--><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&#8217;t Set the Regular Attribute</h4>
-<!--l. 1877--><p class="noindent" >The following abbreviation styles will set the <span
+<!--l. 2185--><p class="noindent" >The following abbreviation styles will set the <span
class="ecss-1000">regular</span><a
id="dx1-18001"></a> attribute to &#8220;false&#8221; if it has
previously been set. If it hasn&#8217;t already been set, it&#8217;s left unset. Other attributes may
also be set, depending on the style.
-
-
-
</p><dl class="description"><dt class="description">
<span
class="ecsx-1000">long-short</span><a
id="dx1-18002"></a> </dt><dd
-class="description">On <a
+class="description">On <a
id="dx1-18003"></a><a
-href="#glo:firstuse">first use</a>, this style uses the format &#x27E8;<span
+href="#glo:firstuse">first use</a>, this style uses the format &#x27E8;<span
class="ecti-1000">long</span>&#x27E9; (&#x27E8;<span
-class="ecti-1000">short</span>&#x27E9;). The inline and
- display full forms are the same. The <span
+class="ecti-1000">short</span>&#x27E9;). The inline
+ and display full forms are the same. The <span
class="ecss-1000">name</span><a
- id="dx1-18004"></a> is set to the short form. The
- <span
+ id="dx1-18004"></a> and <span
+class="ecss-1000">sort</span><a
+ id="dx1-18005"></a> keys are
+
+
+
+ set to the short form. (The <span
+class="ecss-1000">name</span><a
+ id="dx1-18006"></a> key additionally includes the font
+ command <span
+class="ectt-1000">\glsabbrvfont</span>.) The <span
class="ecss-1000">description</span><a
- id="dx1-18005"></a> is set to the long form. The long and short forms are separated
- by <span
-class="ectt-1000">\glsxtrfullsep</span>.
+ id="dx1-18007"></a> is set to the long form. The
+ long and short forms are separated by <span
+class="ectt-1000">\glsxtrfullsep</span>. If you want to
+ insert material within the parentheses (such as a&#x00A0;translation), try the
+ <span
+class="ecss-1000">long-short-user</span><a
+ id="dx1-18008"></a> style.
</dd><dt class="description">
<span
class="ecsx-1000">long-short-sc</span><a
- id="dx1-18006"></a> </dt><dd
+ id="dx1-18009"></a> </dt><dd
class="description">Like <span
class="ecss-1000">long-short</span><a
- id="dx1-18007"></a> but redefines <span
+ id="dx1-18010"></a> but redefines <span
class="ectt-1000">\glsabbrvfont </span>to use
<span
class="ectt-1000">\glsxtrscfont</span><a
- id="dx1-18008"></a>.
+ id="dx1-18011"></a>.
</dd><dt class="description">
<span
class="ecsx-1000">long-short-sm</span><a
- id="dx1-18009"></a> </dt><dd
+ id="dx1-18012"></a> </dt><dd
class="description">Like <span
class="ecss-1000">long-short</span><a
- id="dx1-18010"></a> but redefines <span
+ id="dx1-18013"></a> but redefines <span
class="ectt-1000">\glsabbrvfont </span>to use
<span
class="ectt-1000">\glsxtrsmfont</span><a
- id="dx1-18011"></a>.
+ id="dx1-18014"></a>.
</dd><dt class="description">
<span
class="ecsx-1000">long-short-em</span><a
- id="dx1-18012"></a> </dt><dd
-class="description">Like <span
+ id="dx1-18015"></a> </dt><dd
+class="description">Like <span
class="ecss-1000">long-short</span><a
- id="dx1-18013"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use <span
-class="ectt-1000">\emph</span><a
- id="dx1-18014"></a>.
+ id="dx1-18016"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use
+ <span
+class="ectt-1000">\glsxtremfont</span><a
+ id="dx1-18017"></a>.
</dd><dt class="description">
<span
+class="ecsx-1000">long-em-short-em</span><a
+ id="dx1-18018"></a> </dt><dd
+class="description">New to version 1.04, this style is like <span
+class="ecss-1000">long-short-em</span><a
+ id="dx1-18019"></a> but
+ redefines <span
+class="ectt-1000">\glsfirstlongfont </span>to use <span
+class="ectt-1000">\glsfirstlongemfont</span><a
+ id="dx1-18020"></a>.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">long-short-user</span><a
+ id="dx1-18021"></a> </dt><dd
+class="description">This style was introduced in version 1.04. It&#8217;s like the <span
+class="ecss-1000">long-short</span><a
+ id="dx1-18022"></a> style
+ but additional information can be inserted into the parenthetical material. This
+ checks the value of the field given by
+ <!--l. 2223--><p class="noindent" ><hr><div title="Definition">DescribeMacrouseri <span
+class="ectt-1000">\glsxtruserfield </span></div><hr>
+ </p><!--l. 2225--><p class="noindent" >
+ (which defaults to <span
+class="ectt-1000">useri</span>) using <span
+class="ectt-1000">\ifglshasfield</span><a
+ id="dx1-18023"></a> (provided by <span
+class="ecss-1000">glossaries</span><a
+ id="dx1-18024"></a>). If the
+ field hasn&#8217;t been set, the style behaves like the <span
+class="ecss-1000">long-short</span><a
+ id="dx1-18025"></a> style and produces
+ &#x27E8;<span
+class="ecti-1000">long</span>&#x27E9; (&#x27E8;<span
+class="ecti-1000">short</span>&#x27E9;) but if the field has been set, the contents of that field are inserted
+ within the parentheses in the form &#x27E8;<span
+class="ecti-1000">long</span>&#x27E9; (&#x27E8;<span
+class="ecti-1000">short</span>&#x27E9;, &#x27E8;<span
+class="ecti-1000">field-value</span>&#x27E9;). The format is
+ governed by
+ </p><!--l. 2233--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glsxtruserparen</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-18026"></a> <span
+class="ectt-1000">\glsxtruserparen{</span>&#x27E8;<span
+class="ecit-1000">text</span>&#x27E9;<span
+class="ectt-1000">}{</span>&#x27E8;<span
+class="ecit-1000">label</span>&#x27E9;<span
+class="ectt-1000">} </span></div><hr>
+ </p><!--l. 2235--><p class="noindent" >
+ where &#x27E8;<span
+class="ecti-1000">text</span>&#x27E9; is the short form (for the <span
+class="ecss-1000">long-short-user</span><a
+ id="dx1-18027"></a> style) or the long form (for
+ the <span
+class="ecss-1000">short-long-user</span><a
+ id="dx1-18028"></a> style). This command first inserts a space using
+ <span
+class="ectt-1000">\glsxtrfullsep </span>and then the parenthetical content. The &#x27E8;<span
+class="ecti-1000">text</span>&#x27E9; argument
+ includes the font formatting command, <span
+class="ectt-1000">\glsfirstabbrvfont{</span>&#x27E8;<span
+class="ecti-1000">short</span>&#x27E9;<span
+class="ectt-1000">} </span>in the
+ case of the <span
+class="ecss-1000">long-short-user</span><a
+ id="dx1-18029"></a> style and <span
+class="ectt-1000">\glsfirstlongfont{</span>&#x27E8;<span
+class="ecti-1000">long</span>&#x27E9;<span
+class="ectt-1000">} </span>in the case of
+ the <span
+class="ecss-1000">short-long-user</span><a
+ id="dx1-18030"></a> style.
+ </p><!--l. 2246--><p class="noindent" >For example:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-64">
+ \setabbreviationstyle[acronym]{long-short-user}
+ &#x00A0;<br />\newacronym{tug}{TUG}{\TeX\&#x00A0;User&#x00A0;Group}
+ &#x00A0;<br />\newacronym
+ &#x00A0;<br />&#x00A0;[user1={German&#x00A0;Speaking&#x00A0;\TeX\&#x00A0;User&#x00A0;Group}]
+ &#x00A0;<br />&#x00A0;{dante}{DANTE}{Deutschsprachige&#x00A0;Anwendervereinigung&#x00A0;\TeX\&#x00A0;e.V}
+</div>
+ <!--l. 2256--><p class="nopar" > On first use, <span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\gls{tug}</span></span></span> will appear as:
+ </p><div class="quote">
+ <!--l. 2259--><p class="noindent" ><span class="TEX">T<span
+class="E">E</span>X</span>&#x00A0;User Group (TUG)</p></div>
+ <!--l. 2261--><p class="noindent" >whereas <span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\gls{dante}</span></span></span> will appear as:
+ </p><div class="quote">
+ <!--l. 2263--><p class="noindent" >Deutschsprachige Anwendervereinigung <span class="TEX">T<span
+class="E">E</span>X</span>&#x00A0;e.V (DANTE,
+ German Speaking <span class="TEX">T<span
+class="E">E</span>X</span>&#x00A0;User Group)</p></div>
+ <!--l. 2266--><p class="noindent" >The short form is formatted according to
+ </p><!--l. 2267--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glsabbrvuserfont</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-18031"></a> <span
+class="ectt-1000">\glsabbrvuserfont{</span>&#x27E8;<span
+class="ecit-1000">text</span>&#x27E9;<span
+class="ectt-1000">} </span></div><hr>
+ </p><!--l. 2269--><p class="noindent" >
+ and the plural suffix is given by
+ </p><!--l. 2271--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glsxtrusersuffix</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-18032"></a> <span
+class="ectt-1000">\glsxtrusersuffix </span></div><hr>
+ </p><!--l. 2273--><p class="noindent" >
+ </p><!--l. 2275--><p class="noindent" >These may be redefined as appropriate. For example, if you want a&#x00A0;smallcaps
+ style, you can just set these commands to those used by the <span
+class="ecss-1000">long-short-sc</span><a
+ id="dx1-18033"></a>
+ style:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-65">
+ \renewcommand{\glsabbruserfont}[1]{\glsxtrscfont{#1}}
+ &#x00A0;<br />\renewcommand{\glsxtrusersuffix}{\glsxtrscsuffix}
+</div>
+ <!--l. 2281--><p class="nopar" >
+ </p></dd><dt class="description">
+<span
class="ecsx-1000">long-short-desc</span><a
- id="dx1-18015"></a> </dt><dd
+ id="dx1-18034"></a> </dt><dd
class="description">On <a
- id="dx1-18016"></a><a
+ id="dx1-18035"></a><a
href="#glo:firstuse">first use</a>, this style uses the format &#x27E8;<span
class="ecti-1000">long</span>&#x27E9; (&#x27E8;<span
-class="ecti-1000">short</span>&#x27E9;). The inline
- and display full forms are the same. The <span
+class="ecti-1000">short</span>&#x27E9;). The
+ inline and display full forms are the same. The <span
class="ecss-1000">name</span><a
- id="dx1-18017"></a> is set to the full form. The
- <span
+ id="dx1-18036"></a> is set to the full
+ form. The <span
+class="ecss-1000">sort</span><a
+ id="dx1-18037"></a> key is set to &#x27E8;<span
+class="ecti-1000">long</span>&#x27E9; (&#x27E8;<span
+class="ecti-1000">short</span>&#x27E9;). Before version 1.04, this was
+ incorrectly set to the short form. If you want to revert back to this you can
+ redefine
+ <!--l. 2290--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glsxtrlongshortdescsort</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-18038"></a> <span
+class="ectt-1000">\glsxtrlongshortdescsort </span></div><hr>
+ </p><!--l. 2292--><p class="noindent" >
+ For example:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-66">
+ \renewcommand*{\glsxtrlongshortdescsort}{\the\glsshorttok}
+</div>
+ <!--l. 2296--><p class="nopar" > The <span
class="ecss-1000">description</span><a
- id="dx1-18018"></a> must be supplied by the user. The long and short forms are
+ id="dx1-18039"></a> must be supplied by the user. The long and short forms are
separated by <span
class="ectt-1000">\glsxtrfullsep</span>.
- </dd><dt class="description">
+ </p></dd><dt class="description">
<span
class="ecsx-1000">long-short-sc-desc</span><a
- id="dx1-18019"></a> </dt><dd
-class="description">Like <span
+ id="dx1-18040"></a> </dt><dd
+class="description">Like <span
class="ecss-1000">long-short-desc</span><a
- id="dx1-18020"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use
+ id="dx1-18041"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use
<span
class="ectt-1000">\glsxtrscfont</span><a
- id="dx1-18021"></a>.
+ id="dx1-18042"></a>.
</dd><dt class="description">
<span
class="ecsx-1000">long-short-sm-desc</span><a
- id="dx1-18022"></a> </dt><dd
+ id="dx1-18043"></a> </dt><dd
class="description">Like <span
class="ecss-1000">long-short-desc</span><a
- id="dx1-18023"></a> but redefines <span
+ id="dx1-18044"></a> but redefines <span
class="ectt-1000">\glsabbrvfont </span>to use
<span
class="ectt-1000">\glsxtrsmfont</span><a
- id="dx1-18024"></a>.
+ id="dx1-18045"></a>.
</dd><dt class="description">
<span
class="ecsx-1000">long-short-em-desc</span><a
- id="dx1-18025"></a> </dt><dd
+ id="dx1-18046"></a> </dt><dd
class="description">Like <span
class="ecss-1000">long-short-desc</span><a
- id="dx1-18026"></a> but redefines <span
+ id="dx1-18047"></a> but redefines <span
class="ectt-1000">\glsabbrvfont </span>to use
<span
-class="ectt-1000">\emph</span><a
- id="dx1-18027"></a>.
+class="ectt-1000">\glsxtremfont</span><a
+ id="dx1-18048"></a>.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">long-em-short-em-desc</span><a
+ id="dx1-18049"></a> </dt><dd
+class="description">New to version 1.04, this style is like <span
+class="ecss-1000">long-short-em-desc</span><a
+ id="dx1-18050"></a> but
+ redefines <span
+class="ectt-1000">\glsfirstlongfont </span>to use <span
+class="ectt-1000">\glsfirstlongemfont</span><a
+ id="dx1-18051"></a>.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">long-short-user-desc</span><a
+ id="dx1-18052"></a> </dt><dd
+class="description">New to version 1.04, this style is like a&#x00A0;cross between the
+ <span
+class="ecss-1000">long-short-desc</span><a
+ id="dx1-18053"></a> style and the <span
+class="ecss-1000">long-short-user</span><a
+ id="dx1-18054"></a> style. The display and inline forms
+ are as for <span
+class="ecss-1000">long-short-user</span><a
+ id="dx1-18055"></a> and the <span
+class="ecss-1000">name</span><a
+ id="dx1-18056"></a> key is as <span
+class="ecss-1000">long-short-desc</span><a
+ id="dx1-18057"></a>. The <span
+class="ecss-1000">description</span><a
+ id="dx1-18058"></a>
+ key must be supplied in the optional argument of <span
+class="ectt-1000">\newabbreviation </span>(or
+ <span
+class="ectt-1000">\newacronym</span>). The <span
+class="ecss-1000">sort</span><a
+ id="dx1-18059"></a> key is set to &#x27E8;<span
+class="ecti-1000">long</span>&#x27E9; (&#x27E8;<span
+class="ecti-1000">short</span>&#x27E9;) as per the <span
+class="ecss-1000">long-short-desc</span><a
+ id="dx1-18060"></a>
+ style.
</dd><dt class="description">
<span
class="ecsx-1000">short-long</span><a
- id="dx1-18028"></a> </dt><dd
+ id="dx1-18061"></a> </dt><dd
class="description">On <a
- id="dx1-18029"></a>first use, this style uses the format &#x27E8;<span
+ id="dx1-18062"></a><a
+href="#glo:firstuse">first use</a>, this style uses the format &#x27E8;<span
class="ecti-1000">short</span>&#x27E9; (&#x27E8;<span
class="ecti-1000">long</span>&#x27E9;). The inline and
display full forms are the same. The <span
class="ecss-1000">name</span><a
- id="dx1-18030"></a> is set to the short form. The
- <span
+ id="dx1-18063"></a> and <span
+class="ecss-1000">sort</span><a
+ id="dx1-18064"></a> keys are set to the
+ short form. The <span
class="ecss-1000">description</span><a
- id="dx1-18031"></a> is set to the long form. The short and long forms are separated
- by <span
-class="ectt-1000">\glsxtrfullsep</span>.
+ id="dx1-18065"></a> is set to the long form. The short and long
+ forms are separated by <span
+class="ectt-1000">\glsxtrfullsep</span>. If you want to insert material
+ within the parentheses (such as a&#x00A0;translation), try the <span
+class="ecss-1000">short-long-user</span><a
+ id="dx1-18066"></a>
+ style.
</dd><dt class="description">
<span
class="ecsx-1000">short-sc-long</span><a
- id="dx1-18032"></a> </dt><dd
-class="description">Like <span
+ id="dx1-18067"></a> </dt><dd
+class="description">Like <span
class="ecss-1000">short-long</span><a
- id="dx1-18033"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use
- <span
+ id="dx1-18068"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use <span
class="ectt-1000">\glsxtrscfont</span><a
- id="dx1-18034"></a>.
+ id="dx1-18069"></a>.
</dd><dt class="description">
<span
class="ecsx-1000">short-sm-long</span><a
- id="dx1-18035"></a> </dt><dd
-class="description">Like <span
+ id="dx1-18070"></a> </dt><dd
+class="description">Like <span
class="ecss-1000">short-long</span><a
- id="dx1-18036"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use
- <span
+ id="dx1-18071"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use <span
class="ectt-1000">\glsxtrsmfont</span><a
- id="dx1-18037"></a>.
+ id="dx1-18072"></a>.
</dd><dt class="description">
<span
class="ecsx-1000">short-em-long</span><a
- id="dx1-18038"></a> </dt><dd
+ id="dx1-18073"></a> </dt><dd
class="description">Like <span
class="ecss-1000">short-long</span><a
- id="dx1-18039"></a> but redefines <span
+ id="dx1-18074"></a> but redefines <span
class="ectt-1000">\glsabbrvfont </span>to use <span
-class="ectt-1000">\emph</span><a
- id="dx1-18040"></a>.
+class="ectt-1000">\glsxtremfont</span><a
+ id="dx1-18075"></a>.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">short-em-long-em</span><a
+ id="dx1-18076"></a> </dt><dd
+class="description">New to version 1.04, this style is like <span
+class="ecss-1000">short-em-long</span><a
+ id="dx1-18077"></a> but redefines
+ <span
+class="ectt-1000">\glsfirstlongfont </span>to use <span
+class="ectt-1000">\glsfirstlongemfont</span><a
+ id="dx1-18078"></a>.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">short-long-user</span><a
+ id="dx1-18079"></a> </dt><dd
+class="description">New to version 1.04. This style is like the <span
+class="ecss-1000">long-short-user</span><a
+ id="dx1-18080"></a>
+ style but with the long and short forms switched. The parenthetical
+ material is governed by the same command <span
+class="ectt-1000">\glsxtruserparen</span><a
+ id="dx1-18081"></a>, but
+ the first argument supplied to it is the long form instead of the short
+ form.
</dd><dt class="description">
<span
class="ecsx-1000">short-long-desc</span><a
- id="dx1-18041"></a> </dt><dd
+ id="dx1-18082"></a> </dt><dd
class="description">On <a
- id="dx1-18042"></a>first use, this style uses the format &#x27E8;<span
+ id="dx1-18083"></a><a
+href="#glo:firstuse">first use</a>, this style uses the format &#x27E8;<span
class="ecti-1000">short</span>&#x27E9; (&#x27E8;<span
-class="ecti-1000">long</span>&#x27E9;). The inline
- and display full forms are the same. The <span
+class="ecti-1000">long</span>&#x27E9;). The inline and
+ display full forms are the same. The <span
class="ecss-1000">name</span><a
- id="dx1-18043"></a> is set to the full form. The
- <span
+ id="dx1-18084"></a> is set to the full form. The <span
class="ecss-1000">description</span><a
- id="dx1-18044"></a> must be supplied by the user. The short and long forms are
- separated by <span
+ id="dx1-18085"></a>
+ must be supplied by the user. The short and long forms are separated by
+ <span
class="ectt-1000">\glsxtrfullsep</span>.
</dd><dt class="description">
<span
class="ecsx-1000">short-sc-long-desc</span><a
- id="dx1-18045"></a> </dt><dd
-class="description">Like <span
+ id="dx1-18086"></a> </dt><dd
+class="description">Like <span
class="ecss-1000">short-long-desc</span><a
- id="dx1-18046"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use
+ id="dx1-18087"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use
<span
class="ectt-1000">\glsxtrscfont</span><a
- id="dx1-18047"></a>.
+ id="dx1-18088"></a>.
</dd><dt class="description">
<span
class="ecsx-1000">short-sm-long-desc</span><a
- id="dx1-18048"></a> </dt><dd
+ id="dx1-18089"></a> </dt><dd
class="description">Like <span
class="ecss-1000">short-long-desc</span><a
- id="dx1-18049"></a> but redefines <span
+ id="dx1-18090"></a> but redefines <span
class="ectt-1000">\glsabbrvfont </span>to use
<span
class="ectt-1000">\glsxtrsmfont</span><a
- id="dx1-18050"></a>.
+ id="dx1-18091"></a>.
</dd><dt class="description">
<span
class="ecsx-1000">short-em-long-desc</span><a
- id="dx1-18051"></a> </dt><dd
+ id="dx1-18092"></a> </dt><dd
class="description">Like <span
class="ecss-1000">short-long-desc</span><a
- id="dx1-18052"></a> but redefines <span
+ id="dx1-18093"></a> but redefines <span
class="ectt-1000">\glsabbrvfont </span>to use
<span
-class="ectt-1000">\emph</span><a
- id="dx1-18053"></a>.
+class="ectt-1000">\glsxtremfont</span><a
+ id="dx1-18094"></a>.
</dd><dt class="description">
<span
-class="ecsx-1000">footnote</span><a
- id="dx1-18054"></a> </dt><dd
+class="ecsx-1000">short-em-long-em-desc</span><a
+ id="dx1-18095"></a> </dt><dd
+class="description">New to version 1.04, this style is like <span
+class="ecss-1000">short-em-long-desc</span><a
+ id="dx1-18096"></a> but
+ redefines <span
+class="ectt-1000">\glsfirstlongfont </span>to use <span
+class="ectt-1000">\glsfirstlongemfont</span><a
+ id="dx1-18097"></a>.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">short-long-user-desc</span><a
+ id="dx1-18098"></a> </dt><dd
+class="description">New to version 1.04, this style is like a&#x00A0;cross between the
+ <span
+class="ecss-1000">short-long-desc</span><a
+ id="dx1-18099"></a> style and the <span
+class="ecss-1000">short-long-user</span><a
+ id="dx1-18100"></a> style. The display and inline forms
+ are as for <span
+class="ecss-1000">short-long-user</span><a
+ id="dx1-18101"></a> and the <span
+class="ecss-1000">name</span><a
+ id="dx1-18102"></a> key is as <span
+class="ecss-1000">short-long-desc</span><a
+ id="dx1-18103"></a>. The <span
+class="ecss-1000">description</span><a
+ id="dx1-18104"></a>
+ key must be supplied in the optional argument of <span
+class="ectt-1000">\newabbreviation </span>(or
+ <span
+class="ectt-1000">\newacronym</span>).
+ </dd><dt class="description">
+<span
+class="ecsx-1000">short-footnote</span><a
+ id="dx1-18105"></a> </dt><dd
class="description">On <a
- id="dx1-18055"></a><a
-href="#glo:firstuse">first use</a>, this style displays the short form with the long form as a
- footnote. This style automatically sets the <span
+ id="dx1-18106"></a>first use, this style displays the short form with the long form as
+ a footnote. This style automatically sets the <span
class="ecss-1000">nohyperfirst</span><a
- id="dx1-18056"></a> attribute to &#8220;true&#8221;
- for the supplied category, so the <a
- id="dx1-18057"></a>first use won&#8217;t be hyperlinked (but the
- footnote marker may be, if the <span
+ id="dx1-18107"></a> attribute to &#8220;true&#8221; for
+ the supplied category, so the <a
+ id="dx1-18108"></a>first use won&#8217;t be hyperlinked (but the footnote
+ marker may be, if the <span
class="ecss-1000">hyperref</span><a
- id="dx1-18058"></a> package is used).
- <!--l. 1966--><p class="noindent" >The inline full form uses the &#x27E8;<span
+ id="dx1-18109"></a> package is used).
+
+
+
+ <!--l. 2399--><p class="noindent" >The inline full form uses the &#x27E8;<span
class="ecti-1000">short</span>&#x27E9; (&#x27E8;<span
class="ecti-1000">long</span>&#x27E9;) style. The <span
class="ecss-1000">name</span><a
- id="dx1-18059"></a> is set to the
- short form. The <span
+ id="dx1-18110"></a> is set to the short
+ form. The <span
class="ecss-1000">description</span><a
- id="dx1-18060"></a> is set to the long form.
+ id="dx1-18111"></a> is set to the long form.
</p></dd><dt class="description">
<span
-class="ecsx-1000">footnote-sc</span><a
- id="dx1-18061"></a> </dt><dd
+class="ecsx-1000">footnote</span><a
+ id="dx1-18112"></a> </dt><dd
+class="description">A synonym for <span
+class="ecss-1000">short-footnote</span><a
+ id="dx1-18113"></a>.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">short-sc-footnote</span><a
+ id="dx1-18114"></a> </dt><dd
class="description">Like <span
-class="ecss-1000">footnote</span><a
- id="dx1-18062"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use <span
+class="ecss-1000">short-footnote</span><a
+ id="dx1-18115"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use
+ <span
class="ectt-1000">\glsxtrscfont</span><a
- id="dx1-18063"></a>.
+ id="dx1-18116"></a>. (This style was originally called <span
+class="ecss-1000">footnote-sc</span><a
+ id="dx1-18117"></a>. Renamed in
+ version 1.04, but original name retained as a deprecated synonym for
+ backward-compatibility.)
</dd><dt class="description">
<span
-class="ecsx-1000">footnote-sm</span><a
- id="dx1-18064"></a> </dt><dd
+class="ecsx-1000">short-sc-footnote</span><a
+ id="dx1-18118"></a> </dt><dd
class="description">Like <span
-class="ecss-1000">footnote</span><a
- id="dx1-18065"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use <span
+class="ecss-1000">short-footnote</span><a
+ id="dx1-18119"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use
+ <span
class="ectt-1000">\glsxtrsmfont</span><a
- id="dx1-18066"></a>.
+ id="dx1-18120"></a>. (This style was originally called <span
+class="ecss-1000">footnote-sm</span><a
+ id="dx1-18121"></a>. Renamed in
+ version 1.04, but original name retained as a deprecated synonym for
+ backward-compatibility.)
</dd><dt class="description">
<span
-class="ecsx-1000">footnote-em</span><a
- id="dx1-18067"></a> </dt><dd
+class="ecsx-1000">short-em-footnote</span><a
+ id="dx1-18122"></a> </dt><dd
class="description">Like <span
-class="ecss-1000">footnote</span><a
- id="dx1-18068"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use <span
-class="ectt-1000">\emph</span><a
- id="dx1-18069"></a>.
+class="ecss-1000">short-footnote</span><a
+ id="dx1-18123"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use
+ <span
+class="ectt-1000">\glsxtremfont</span><a
+ id="dx1-18124"></a>. (This style was originally called <span
+class="ecss-1000">footnote-em</span><a
+ id="dx1-18125"></a>. Renamed in
+ version 1.04, but original name retained as a deprecated synonym for
+ backward-compatibility.)
</dd><dt class="description">
<span
-class="ecsx-1000">postfootnote</span><a
- id="dx1-18070"></a> </dt><dd
-class="description">This is similar to the <span
-class="ecss-1000">footnote</span><a
- id="dx1-18071"></a> style but doesn&#8217;t modify the
+class="ecsx-1000">short-postfootnote</span><a
+ id="dx1-18126"></a> </dt><dd
+class="description">This is similar to the <span
+class="ecss-1000">short-footnote</span><a
+ id="dx1-18127"></a> style but doesn&#8217;t modify the
category attribute. Instead it changes <span
class="ectt-1000">\glsxtrpostlink</span>&#x27E8;<span
class="ecti-1000">category</span>&#x27E9;<a
- id="dx1-18072"></a>&#x00A0;to insert
- the footnote after the <a
- id="dx1-18073"></a><a
-href="#glo:linktext">link-text</a> on <a
- id="dx1-18074"></a>first use. This will also defer the
- footnote until after any following punctuation character that&#8217;s recognised
- by <span
+ id="dx1-18128"></a>&#x00A0;to insert the
+ footnote after the <a
+ id="dx1-18129"></a><a
+href="#glo:linktext">link-text</a> on <a
+ id="dx1-18130"></a><a
+href="#glo:firstuse">first use</a>. This will also defer the footnote
+ until after any following punctuation character that&#8217;s recognised by
+ <span
class="ectt-1000">\glsxtrifnextpunc</span><a
- id="dx1-18075"></a>.
- <!--l. 1990--><p class="noindent" >The inline full form uses the &#x27E8;<span
+ id="dx1-18131"></a>.
+ <!--l. 2435--><p class="noindent" >The inline full form uses the &#x27E8;<span
class="ecti-1000">short</span>&#x27E9; (&#x27E8;<span
class="ecti-1000">long</span>&#x27E9;) style. The <span
class="ecss-1000">name</span><a
- id="dx1-18076"></a> is set to the
- short form. The <span
+ id="dx1-18132"></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. Note that this style
- will change <span
+ id="dx1-18133"></a> is set to the long form. Note that this style will change
+ <span
class="ectt-1000">\glsxtrfull </span>(and it&#8217;s variants) so that it fakes non-<a
- id="dx1-18078"></a>first use.
- (Otherwise the footnote would appear after the inline form.)
-
-
-
+ id="dx1-18134"></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-18079"></a> </dt><dd
-class="description">Like <span
-class="ecss-1000">postfootnote</span><a
- id="dx1-18080"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use
+class="ecsx-1000">postfootnote</span><a
+ id="dx1-18135"></a> </dt><dd
+class="description">A synonym for <span
+class="ecss-1000">short-postfootnote</span><a
+ id="dx1-18136"></a>.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">short-sc-postfootnote</span><a
+ id="dx1-18137"></a> </dt><dd
+class="description">Like <span
+class="ecss-1000">short-postfootnote</span><a
+ id="dx1-18138"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use
<span
class="ectt-1000">\glsxtrscfont</span><a
- id="dx1-18081"></a>.
+ id="dx1-18139"></a>. (This style was originally called <span
+class="ecss-1000">postfootnote-sc</span><a
+ id="dx1-18140"></a>. Renamed in
+ version 1.04, but original name retained as a deprecated synonym for
+ backward-compatibility.)
</dd><dt class="description">
<span
-class="ecsx-1000">postfootnote-sm</span><a
- id="dx1-18082"></a> </dt><dd
-class="description">Like <span
-class="ecss-1000">postfootnote</span><a
- id="dx1-18083"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use
+class="ecsx-1000">short-sm-postfootnote</span><a
+ id="dx1-18141"></a> </dt><dd
+class="description">Like <span
+class="ecss-1000">short-postfootnote</span><a
+ id="dx1-18142"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use
<span
class="ectt-1000">\glsxtrsmfont</span><a
- id="dx1-18084"></a>.
+ id="dx1-18143"></a>. (This style was originally called <span
+class="ecss-1000">postfootnote-sm</span><a
+ id="dx1-18144"></a>. Renamed in
+ version 1.04, but original name retained as a deprecated synonym for
+ backward-compatibility.)
+
+
+
</dd><dt class="description">
<span
-class="ecsx-1000">postfootnote-em</span><a
- id="dx1-18085"></a> </dt><dd
+class="ecsx-1000">short-em-postfootnote</span><a
+ id="dx1-18145"></a> </dt><dd
class="description">Like <span
-class="ecss-1000">postfootnote</span><a
- id="dx1-18086"></a> but redefines <span
-class="ectt-1000">\glsabbrvfont </span>to use <span
-class="ectt-1000">\emph</span><a
- id="dx1-18087"></a>.
+class="ecss-1000">short-postfootnote</span><a
+ id="dx1-18146"></a> but redefines <span
+class="ectt-1000">\glsabbrvfont </span>to use
+ <span
+class="ectt-1000">\glsxtremfont</span><a
+ id="dx1-18147"></a>. (This style was originally called <span
+class="ecss-1000">postfootnote-em</span><a
+ id="dx1-18148"></a>. Renamed in
+ version 1.04, but original name retained as a deprecated synonym for
+ backward-compatibility.)
</dd></dl>
-<!--l. 2011--><p class="noindent" >
+<!--l. 2468--><p class="noindent" >
</p>
-<!--l. 2011--><p class="noindent" ><a
+<!--l. 2468--><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. 2014--><p class="noindent" >New abbreviation styles may be defined using:
-</p><!--l. 2015--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 2471--><p class="noindent" >New abbreviation styles may be defined using:
+</p><!--l. 2472--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\newabbreviationstyle</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-19001"></a> <span
@@ -4213,7 +5132,7 @@ class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">fmts</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 2017--><p class="noindent" >
+</p><!--l. 2474--><p class="noindent" >
where &#x27E8;<span
class="ecti-1000">name</span>&#x27E9; is the name of the new style (as used in the mandatory argument of
<span
@@ -4224,7 +5143,7 @@ class="ecss-1000">glossaries</span><a
<span
class="ectt-1000">\newacronymstyle</span><a
id="dx1-19004"></a> command.
-</p><!--l. 2023--><p class="indent" > <div class="important" title="Important Note"> You can&#8217;t use styles defined by <span
+</p><!--l. 2480--><p class="indent" > <div class="important" title="Important Note"> You can&#8217;t use styles defined by <span
class="ectt-1000">\newacronymstyle </span>with <span
class="ecss-1000">glossaries-extra</span>
unless you have reverted <span
@@ -4240,17 +5159,17 @@ class="ecss-1000">glossaries</span><a
package can&#8217;t be used with abbreviations defined with <span
class="ectt-1000">\newabbreviation</span>.
</div>
-</p><!--l. 2030--><p class="noindent" >
-</p><!--l. 2032--><p class="indent" > The &#x27E8;<span
+</p><!--l. 2487--><p class="noindent" >
+</p><!--l. 2489--><p class="indent" > The &#x27E8;<span
class="ecti-1000">setup</span>&#x27E9; argument deals with the way the entry is defined and may
set attributes for the given abbreviation category. This argument should
redefine
-</p><!--l. 2035--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2492--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\CustomAbbreviationFields</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-19009"></a> <span
class="ectt-1000">\CustomAbbreviationFields </span></div><hr>
-</p><!--l. 2037--><p class="noindent" >
+</p><!--l. 2494--><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),
@@ -4268,12 +5187,12 @@ class="ecss-1000">plural</span><a
<span
class="ecss-1000">description</span><a
id="dx1-19016"></a>.
-</p><!--l. 2044--><p class="indent" > <div class="important" title="Important Note"> <span
+</p><!--l. 2501--><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&#8217;t be expanded. </div>
-</p><!--l. 2047--><p class="noindent" >
-</p><!--l. 2049--><p class="indent" > For example, the <span
+</p><!--l. 2504--><p class="noindent" >
+</p><!--l. 2506--><p class="indent" > For example, the <span
class="ecss-1000">long-short</span><a
id="dx1-19017"></a> style has the following in &#x27E8;<span
class="ecti-1000">setup</span>&#x27E9;:
@@ -4281,7 +5200,7 @@ class="ecti-1000">setup</span>&#x27E9;:
</p>
- <div class="verbatim" id="verbatim-53">
+ <div class="verbatim" id="verbatim-67">
&#x00A0;&#x00A0;\renewcommand*{\CustomAbbreviationFields}{%
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;name={\protect\glsabbrvfont{\the\glsshorttok}},
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;sort={\the\glsshorttok},
@@ -4294,32 +5213,32 @@ class="ecti-1000">setup</span>&#x27E9;:
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;plural={\protect\glsabbvfont{\the\glsshortpltok}},%
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;description={\the\glslongtok}}%
</div>
-<!--l. 2063--><p class="nopar" > Note that the <span
+<!--l. 2520--><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&#8217;re not used by
<span
class="ectt-1000">\gls</span>.
-</p><!--l. 2067--><p class="indent" > The &#x27E8;<span
+</p><!--l. 2524--><p class="indent" > The &#x27E8;<span
class="ecti-1000">setup</span>&#x27E9; argument may also redefine
-</p><!--l. 2068--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2525--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrPostNewAbbreviation</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-19020"></a> <span
class="ectt-1000">\GlsXtrPostNewAbbreviation </span></div><hr>
-</p><!--l. 2070--><p class="noindent" >
+</p><!--l. 2527--><p class="noindent" >
which can be used to assign attributes. (This will automatically be initialised to do
nothing.)
-</p><!--l. 2074--><p class="indent" > For example, the <span
-class="ecss-1000">footnote</span><a
+</p><!--l. 2531--><p class="indent" > For example, the <span
+class="ecss-1000">short-footnote</span><a
id="dx1-19021"></a> includes the following in &#x27E8;<span
class="ecti-1000">setup</span>&#x27E9;:
</p>
- <div class="verbatim" id="verbatim-54">
+ <div class="verbatim" id="verbatim-68">
&#x00A0;&#x00A0;\renewcommand*{\GlsXtrPostNewAbbreviation}{%
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glshasattribute{\the\glslabeltok}{regular}%
@@ -4329,7 +5248,7 @@ class="ecti-1000">setup</span>&#x27E9;:
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;{}%
&#x00A0;<br />&#x00A0;&#x00A0;}%
</div>
-<!--l. 2085--><p class="nopar" > This sets the <span
+<!--l. 2542--><p class="nopar" > This sets the <span
class="ecss-1000">nohyperfirst</span><a
id="dx1-19022"></a> attribute to &#8220;true&#8221;. It also unsets the <span
class="ecss-1000">regular</span><a
@@ -4338,77 +5257,77 @@ has previously been set. Note that the <span
class="ecss-1000">nohyperfirst</span><a
id="dx1-19024"></a> attribute doesn&#8217;t get unset by
other styles, so take care not to switch styles for the same category.
-</p><!--l. 2092--><p class="indent" > You can access the short, long, short plural and long plural values through the
+</p><!--l. 2549--><p class="indent" > You can access the short, long, short plural and long plural values through the
following token registers.
-</p><!--l. 2095--><p class="indent" > Short value (defined by <span
+</p><!--l. 2552--><p class="indent" > Short value (defined by <span
class="ecss-1000">glossaries</span><a
id="dx1-19025"></a>):
-</p><!--l. 2096--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2553--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsshorttok</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-19026"></a> <span
class="ectt-1000">\glsshorttok </span></div><hr>
-</p><!--l. 2098--><p class="noindent" >
-</p><!--l. 2100--><p class="indent" > Short plural value (defined by <span
+</p><!--l. 2555--><p class="noindent" >
+</p><!--l. 2557--><p class="indent" > Short plural value (defined by <span
class="ecss-1000">glossaries-extra</span>):
-</p><!--l. 2101--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2558--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsshortpltok</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-19027"></a> <span
class="ectt-1000">\glsshortpltok </span></div><hr>
-</p><!--l. 2103--><p class="noindent" >
+</p><!--l. 2560--><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. 2108--><p class="indent" > Long value (defined by <span
+</p><!--l. 2565--><p class="indent" > Long value (defined by <span
class="ecss-1000">glossaries</span><a
id="dx1-19030"></a>):
-</p><!--l. 2109--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2566--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glslongtok</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-19031"></a> <span
class="ectt-1000">\glslongtok </span></div><hr>
-</p><!--l. 2111--><p class="noindent" >
-</p><!--l. 2113--><p class="indent" > Long plural value (defined by <span
+</p><!--l. 2568--><p class="noindent" >
+</p><!--l. 2570--><p class="indent" > Long plural value (defined by <span
class="ecss-1000">glossaries-extra</span>):
-</p><!--l. 2114--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2571--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glslongpltok</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-19032"></a> <span
class="ectt-1000">\glslongpltok </span></div><hr>
-</p><!--l. 2116--><p class="noindent" >
+</p><!--l. 2573--><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. 2121--><p class="indent" > There are two other registers available that are defined by <span
+</p><!--l. 2578--><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. 2124--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2581--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glslabeltok</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-19036"></a> <span
class="ectt-1000">\glslabeltok </span></div><hr>
-</p><!--l. 2126--><p class="noindent" >
+</p><!--l. 2583--><p class="noindent" >
which contains the entry&#8217;s label and
-</p><!--l. 2128--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2585--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glskeylisttok</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-19037"></a> <span
class="ectt-1000">\glskeylisttok </span></div><hr>
-</p><!--l. 2130--><p class="noindent" >
+</p><!--l. 2587--><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. 2134--><p class="indent" > Remember put <span
+</p><!--l. 2591--><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. 2137--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2594--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glscategorylabel</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-19039"></a> <span
@@ -4416,233 +5335,244 @@ class="ectt-1000">\glscategorylabel </span></div><hr>
-</p><!--l. 2139--><p class="noindent" >
+</p><!--l. 2596--><p class="noindent" >
This may be used inside the definition of <span
class="ectt-1000">\GlsXtrPostNewAbbreviation</span>.
-</p><!--l. 2143--><p class="indent" > If you want to base a style on an existing style, you can use
-</p><!--l. 2144--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2600--><p class="indent" > If you want to base a style on an existing style, you can use
+</p><!--l. 2601--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrUseAbbrStyleSetup</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-19040"></a> <span
class="ectt-1000">\GlsXtrUseAbbrStyleSetup{</span>&#x27E8;<span
class="ecit-1000">name</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2146--><p class="noindent" >
+</p><!--l. 2603--><p class="noindent" >
where &#x27E8;<span
class="ecti-1000">name</span>&#x27E9; is the name of the existing style. For example, the <span
-class="ecss-1000">footnote-sc</span><a
+class="ecss-1000">short-sc-footnote</span><a
id="dx1-19041"></a> and
<span
-class="ecss-1000">footnote-sm</span><a
+class="ecss-1000">short-sm-footnote</span><a
id="dx1-19042"></a> styles both simply use
</p>
- <div class="verbatim" id="verbatim-55">
-\GlsXtrUseAbbrStyleSetup{footnote}
+ <div class="verbatim" id="verbatim-69">
+\GlsXtrUseAbbrStyleSetup{short-footnote}
</div>
-<!--l. 2152--><p class="nopar" > within &#x27E8;<span
+<!--l. 2609--><p class="nopar" > within &#x27E8;<span
class="ecti-1000">setup</span>&#x27E9;.
-</p><!--l. 2155--><p class="indent" > The &#x27E8;<span
+</p><!--l. 2612--><p class="indent" > The &#x27E8;<span
class="ecti-1000">fmts</span>&#x27E9; argument deals with the way the entry is displayed in the document.
This argument should redefine the following commands:
-</p><!--l. 2159--><p class="indent" > The default suffix for the plural short form (if not overridden by the <span
+</p><!--l. 2616--><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. 2161--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2618--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\abbrvpluralsuffix</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-19044"></a> <span
class="ectt-1000">\abbrvpluralsuffix </span></div><hr>
-</p><!--l. 2163--><p class="noindent" >
+</p><!--l. 2620--><p class="noindent" >
(Note that this isn&#8217;t used for the plural long form, which just uses the regular
<span
class="ectt-1000">\glspluralsuffix</span>.)
-</p><!--l. 2167--><p class="indent" > The font used for the short form on <a
+</p><!--l. 2624--><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. 2168--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2625--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsfirstabbrvfont</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-19046"></a> <span
class="ectt-1000">\glsfirstabbrvfont{</span>&#x27E8;<span
class="ecit-1000">text</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2170--><p class="noindent" >
-</p><!--l. 2172--><p class="indent" > The font used for the short form on subsequent use or through commands like
+</p><!--l. 2627--><p class="noindent" >
+</p><!--l. 2629--><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. 2174--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2631--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsabbrvfont</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-19048"></a> <span
class="ectt-1000">\glsabbrvfont{</span>&#x27E8;<span
class="ecit-1000">text</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2176--><p class="noindent" >
-</p><!--l. 2178--><p class="indent" > The font used for the long form on <a
+</p><!--l. 2633--><p class="noindent" >
+</p><!--l. 2635--><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. 2179--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2636--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsfirstlongfont</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-19050"></a> <span
class="ectt-1000">\glsfirstlongfont{</span>&#x27E8;<span
class="ecit-1000">text</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2181--><p class="noindent" >
-</p><!--l. 2183--><p class="indent" > Display full form singular no case-change (used by <span
+</p><!--l. 2638--><p class="noindent" >
+</p><!--l. 2640--><p class="indent" > The font used for the long form in commands like <span
+class="ectt-1000">\glsxtrlong </span>use:
+</p><!--l. 2642--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glslongfont</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-19051"></a> <span
+class="ectt-1000">\glslongfont{</span>&#x27E8;<span
+class="ecit-1000">text</span>&#x27E9;<span
+class="ectt-1000">} </span></div><hr>
+</p><!--l. 2644--><p class="noindent" >
+</p><!--l. 2646--><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
+ id="dx1-19052"></a> on <a
+ id="dx1-19053"></a>first use for
abbreviations without the <span
class="ecss-1000">regular</span><a
- id="dx1-19053"></a> attribute set):
-</p><!--l. 2186--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-19054"></a> attribute set):
+</p><!--l. 2649--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrfullformat</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-19054"></a> <span
+ id="dx1-19055"></a> <span
class="ectt-1000">\glsxtrfullformat{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2188--><p class="noindent" >
-</p><!--l. 2190--><p class="indent" > Display full form singular first letter converted to upper case (used by <span
+</p><!--l. 2651--><p class="noindent" >
+</p><!--l. 2653--><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
+ id="dx1-19056"></a> on
<a
- id="dx1-19056"></a>first use for abbreviations without the <span
+ id="dx1-19057"></a>first use for abbreviations without the <span
class="ecss-1000">regular</span><a
- id="dx1-19057"></a> attribute set):
-</p><!--l. 2193--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-19058"></a> attribute set):
+</p><!--l. 2656--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsxtrfullformat</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-19058"></a> <span
+ id="dx1-19059"></a> <span
class="ectt-1000">\Glsxtrfullformat{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2195--><p class="noindent" >
-</p><!--l. 2197--><p class="indent" > Display full form plural no case-change (used by <span
+</p><!--l. 2658--><p class="noindent" >
+</p><!--l. 2660--><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
+ id="dx1-19060"></a> on <a
+ id="dx1-19061"></a>first use for
abbreviations without the <span
class="ecss-1000">regular</span><a
- id="dx1-19061"></a> attribute set):
-</p><!--l. 2200--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-19062"></a> attribute set):
+</p><!--l. 2663--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrfullplformat</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-19062"></a> <span
+ id="dx1-19063"></a> <span
class="ectt-1000">\glsxtrfullplformat{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2202--><p class="noindent" >
-</p><!--l. 2204--><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
- id="dx1-19064"></a>first use for abbreviations without the <span
-class="ecss-1000">regular</span><a
- id="dx1-19065"></a> attribute set):
-</p><!--l. 2207--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2665--><p class="noindent" >
+</p><!--l. 2667--><p class="indent" > Display full form plural first letter converted to upper case (used by <span
+class="ectt-1000">\Glspl</span><a
+ id="dx1-19064"></a> on
+<a
+ id="dx1-19065"></a><a
+href="#glo:firstuse">first use</a> for abbreviations without the <span
+class="ecss-1000">regular</span><a
+ id="dx1-19066"></a> attribute set):
+</p><!--l. 2670--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsxtrfullplformat</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-19066"></a> <span
+ id="dx1-19067"></a> <span
class="ectt-1000">\Glsxtrfullplformat{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2209--><p class="noindent" >
-</p><!--l. 2211--><p class="indent" > In addition &#x27E8;<span
+</p><!--l. 2672--><p class="noindent" >
+</p><!--l. 2674--><p class="indent" > In addition &#x27E8;<span
class="ecti-1000">fmts</span>&#x27E9; may also redefine the following commands that govern the inline
full formats. If the style doesn&#8217;t redefine them, they will default to the same as the
display full forms.
-</p><!--l. 2215--><p class="indent" > Inline singular no case-change (used by <span
+</p><!--l. 2678--><p class="indent" > Inline singular no case-change (used by <span
class="ectt-1000">\glsentryfull</span><a
- id="dx1-19067"></a>, <span
+ id="dx1-19068"></a>, <span
class="ectt-1000">\glsxtrfull</span><a
- id="dx1-19068"></a> and
+ id="dx1-19069"></a> and
<span
class="ectt-1000">\GLSxtrfull</span><a
- id="dx1-19069"></a>):
-</p><!--l. 2217--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-19070"></a>):
+</p><!--l. 2680--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrinlinefullformat</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-19070"></a> <span
+ id="dx1-19071"></a> <span
class="ectt-1000">\glsxtrinlinefullformat{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 2219--><p class="noindent" >
-</p><!--l. 2221--><p class="indent" > Inline singular first letter converted to upper case (used by <span
+</p><!--l. 2682--><p class="noindent" >
+</p><!--l. 2684--><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
+ id="dx1-19072"></a> and
<span
class="ectt-1000">\Glsxtrfull</span><a
- id="dx1-19072"></a>):
-</p><!--l. 2223--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-19073"></a>):
+</p><!--l. 2686--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsxtrinlinefullformat</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-19073"></a> <span
+ id="dx1-19074"></a> <span
class="ectt-1000">\Glsxtrinlinefullformat{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 2225--><p class="noindent" >
-</p><!--l. 2227--><p class="indent" > Inline plural no case-change (used by <span
+</p><!--l. 2688--><p class="noindent" >
+</p><!--l. 2690--><p class="indent" > Inline plural no case-change (used by <span
class="ectt-1000">\glsentryfullpl</span><a
- id="dx1-19074"></a>, <span
+ id="dx1-19075"></a>, <span
class="ectt-1000">\glsxtrfullpl</span><a
- id="dx1-19075"></a> and
+ id="dx1-19076"></a> and
<span
class="ectt-1000">\GLSxtrfullpl</span><a
- id="dx1-19076"></a>):
-</p><!--l. 2229--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-19077"></a>):
+</p><!--l. 2692--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrinlinefullplformat</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-19077"></a> <span
+ id="dx1-19078"></a> <span
class="ectt-1000">\glsxtrinlinefullplformat{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 2231--><p class="noindent" >
-</p><!--l. 2233--><p class="indent" > Inline plural first letter converted to upper case (used by <span
+</p><!--l. 2694--><p class="noindent" >
+</p><!--l. 2696--><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
+ id="dx1-19079"></a> and
<span
class="ectt-1000">\Glsxtrfullpl</span><a
- id="dx1-19079"></a>):
-</p><!--l. 2235--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-19080"></a>):
+</p><!--l. 2698--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsxtrinlinefullplformat</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-19080"></a> <span
+ id="dx1-19081"></a> <span
class="ectt-1000">\Glsxtrinlinefullplformat{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 2237--><p class="noindent" >
-</p><!--l. 2239--><p class="indent" > If you want to provide support for <span
+</p><!--l. 2700--><p class="noindent" >
+</p><!--l. 2702--><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
+ id="dx1-19082"></a> use the following
<span
class="ectt-1000">\glsaccess</span>&#x27E8;<span
class="ecit-1000">xxx</span>&#x27E9; commands (<a
@@ -4654,23 +5584,24 @@ class="ectt-1000">\glsentry</span>&#x27E8;<span
class="ecti-1000">xxx</span>&#x27E9; commands. (If you
don&#8217;t use <span
class="ecss-1000">glossaries-accsupp</span><a
- id="dx1-19082"></a>, they will just do the corresponding <span
+ id="dx1-19083"></a>, they will just do the corresponding <span
class="ectt-1000">\glsentry</span>&#x27E8;<span
class="ecti-1000">xxx</span>&#x27E9;
command.)
-</p><!--l. 2247--><p class="indent" > For example, the <span
+</p><!--l. 2710--><p class="indent" > For example, the <span
class="ecss-1000">short-long</span><a
- id="dx1-19083"></a> style has the following in &#x27E8;<span
+ id="dx1-19084"></a> style has the following in &#x27E8;<span
class="ecti-1000">fmts</span>&#x27E9;:
</p>
- <div class="verbatim" id="verbatim-56">
+ <div class="verbatim" id="verbatim-70">
&#x00A0;&#x00A0;\renewcommand*{\abbrvpluralsuffix}{\glspluralsuffix}%
&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\glsabbrvfont}[1]{\glsabbrvdefaultfont{##1}}%
&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\glsxtrfullformat}[2]{%
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}%
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;(\glsfirstlongfont{\glsaccesslong{##1}})%
@@ -4688,55 +5619,55 @@ class="ecti-1000">fmts</span>&#x27E9;:
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;(\glsfirstlongfont{\glsaccesslongpl{##1}})%
&#x00A0;<br />&#x00A0;&#x00A0;}%
</div>
-<!--l. 2270--><p class="nopar" > Since the inline full commands aren&#8217;t redefined, they default to the same as the
+<!--l. 2734--><p class="nopar" > Since the inline full commands aren&#8217;t redefined, they default to the same as the
display versions.
-</p><!--l. 2274--><p class="indent" > If you want to base a style on an existing style, you can use
-</p><!--l. 2275--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2738--><p class="indent" > If you want to base a style on an existing style, you can use
+</p><!--l. 2739--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrUseAbbrStyleFmts</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-19084"></a> <span
+ id="dx1-19085"></a> <span
class="ectt-1000">\GlsXtrUseAbbrStyleFmts{</span>&#x27E8;<span
class="ecit-1000">name</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2277--><p class="noindent" >
+</p><!--l. 2741--><p class="noindent" >
within &#x27E8;<span
class="ecti-1000">fmts</span>&#x27E9;, where &#x27E8;<span
class="ecti-1000">name</span>&#x27E9; is the name of the existing style. For example, the
<span
class="ecss-1000">short-sc-long</span><a
- id="dx1-19085"></a> style has the following in &#x27E8;<span
+ id="dx1-19086"></a> style has the following in &#x27E8;<span
class="ecti-1000">fmts</span>&#x27E9;:
</p>
- <div class="verbatim" id="verbatim-57">
+ <div class="verbatim" id="verbatim-71">
&#x00A0;&#x00A0;\GlsXtrUseAbbrStyleFmts{short-long}%
&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\glsabbrvfont}[1]{\glsxtrscfont{##1}}%
</div>
-<!--l. 2285--><p class="nopar" > and the <span
+<!--l. 2749--><p class="nopar" > and the <span
class="ecss-1000">short-sm-long</span><a
- id="dx1-19086"></a> style has:
+ id="dx1-19087"></a> style has:
</p>
- <div class="verbatim" id="verbatim-58">
+ <div class="verbatim" id="verbatim-72">
&#x00A0;&#x00A0;\GlsXtrUseAbbrStyleFmts{short-long-desc}%
&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\glsabbrvfont}[1]{\glsxtrsmfont{##1}}%
&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
</div>
-<!--l. 2291--><p class="nopar" >
-</p><!--l. 2293--><p class="indent" > The simplest examples of creating a new style based on an existing style are the
+<!--l. 2755--><p class="nopar" >
+</p><!--l. 2757--><p class="indent" > The simplest examples of creating a new style based on an existing style are the
&#8220;em&#8221; styles, such as the <span
class="ecss-1000">short-em-long</span><a
- id="dx1-19087"></a> style, which is defined as:
+ id="dx1-19088"></a> style, which is defined as:
</p>
- <div class="verbatim" id="verbatim-59">
+ <div class="verbatim" id="verbatim-73">
\newabbreviationstyle
&#x00A0;<br />{short-em-long}%&#x00A0;label
&#x00A0;<br />{%&#x00A0;setup
@@ -4744,19 +5675,19 @@ class="ecss-1000">short-em-long</span><a
&#x00A0;<br />}%
&#x00A0;<br />{%&#x00A0;fmts
&#x00A0;<br />&#x00A0;&#x00A0;\GlsXtrUseAbbrStyleFmts{short-long}%
-&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\glsabbrvfont}[1]{\emph{##1}}%
+&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\glsabbrvfont}[1]{\glsxtremfont{##1}}%
&#x00A0;<br />}
</div>
-<!--l. 2306--><p class="nopar" >
+<!--l. 2770--><p class="nopar" >
</p>
-<!--l. 2308--><p class="indent" > </div>
-</p><!--l. 2308--><p class="noindent" ><a
+<!--l. 2772--><p class="indent" > </div>
+</p><!--l. 2772--><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, Captions and Contents</h2>
-</p><!--l. 2311--><p class="indent" > The <span
+</p><!--l. 2775--><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
@@ -4791,9 +5722,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. 2332--><p class="noindent" >Similar problems can also occur with captions (except for the page header and bookmark
+<!--l. 2796--><p class="noindent" >Similar problems can also occur with captions (except for the page header and bookmark
issues).
-</p><!--l. 2335--><p class="indent" > To get around all these problems, the <span
+</p><!--l. 2799--><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
@@ -4821,22 +5752,22 @@ this:
</p>
- <div class="verbatim" id="verbatim-60">
+ <div class="verbatim" id="verbatim-74">
\chapter{A&#x00A0;Chapter&#x00A0;about&#x00A0;\glsabbrvfont{\glsentryshort{html}}}
</div>
-<!--l. 2348--><p class="nopar" > Or, if you are using <span
+<!--l. 2812--><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-61">
+ <div class="verbatim" id="verbatim-75">
\chapter{A&#x00A0;Chapter&#x00A0;about
&#x00A0;<br />\texorpdfstring{\glsabbrvfont{\glsentryshort{html}}}{\glsentryshort{html}}}
</div>
-<!--l. 2353--><p class="nopar" >
-</p><!--l. 2355--><p class="indent" > Since this is a bit cumbersome, you might want to define a new command to do
+<!--l. 2817--><p class="nopar" >
+</p><!--l. 2819--><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&#8217;t work as commands like
<span
class="ectt-1000">\gls </span>and <span
@@ -4850,7 +5781,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. 2366--><p class="indent" > The <span
+</p><!--l. 2830--><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
@@ -4858,12 +5789,12 @@ class="ectt-1000">\markright</span><a
class="ectt-1000">\markboth</span><a
id="dx1-20013"></a>. If you don&#8217;t like this change, you can restore their former definitions
using
-</p><!--l. 2369--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2833--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrRevertMarks</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20014"></a> <span
class="ectt-1000">\glsxtrRevertMarks </span></div><hr>
-</p><!--l. 2371--><p class="noindent" >
+</p><!--l. 2835--><p class="noindent" >
In this case, you&#8217;ll have to use the <span
class="ecss-1000">glossaries</span><a
id="dx1-20015"></a> manual&#8217;s recommendations of either
@@ -4875,17 +5806,17 @@ example:
</p>
- <div class="verbatim" id="verbatim-62">
+ <div class="verbatim" id="verbatim-76">
\chapter[A&#x00A0;Chapter&#x00A0;about&#x00A0;\glsentryshort{html}]{A&#x00A0;Chapter&#x00A0;about
&#x00A0;<br />\gls{html}}
</div>
-<!--l. 2379--><p class="nopar" >
-</p><!--l. 2381--><p class="indent" > If you don&#8217;t revert the mark commands back with <span
+<!--l. 2843--><p class="nopar" >
+</p><!--l. 2845--><p class="indent" > If you don&#8217;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&#8217;t conflict with the page style.
-</p><!--l. 2387--><p class="indent" > The commands listed below all use <span
+</p><!--l. 2851--><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
@@ -4894,7 +5825,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&#8217;t expandable, the non-case-changing version is used for the
bookmarks.
-</p><!--l. 2393--><p class="indent" > These commands essentially behave as though you have used <span
+</p><!--l. 2857--><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
@@ -4906,7 +5837,7 @@ converted to upper case you need to set the <span
class="ecss-1000">headuc</span><a
id="dx1-20020"></a> attribute to &#8220;true&#8221; for the
appropriate category.
-</p><!--l. 2401--><p class="indent" > <div class="important" title="Important Note"> If you use one of the <span
+</p><!--l. 2865--><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&#8217;t
provide bold small-caps or italic small-caps. This means that if the chapter
@@ -4923,37 +5854,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. 2412--><p class="noindent" >
-</p><!--l. 2414--><p class="indent" > Display the short form:
-</p><!--l. 2415--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2876--><p class="noindent" >
+</p><!--l. 2878--><p class="indent" > Display the short form:
+</p><!--l. 2879--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsfmtshort</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20024"></a> <span
class="ectt-1000">\glsfmtshort{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2417--><p class="noindent" >
-</p><!--l. 2419--><p class="indent" > Display the plural short form:
-</p><!--l. 2420--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2881--><p class="noindent" >
+</p><!--l. 2883--><p class="indent" > Display the plural short form:
+</p><!--l. 2884--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsfmtshortpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20025"></a> <span
class="ectt-1000">\glsfmtshortpl{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2422--><p class="noindent" >
-</p><!--l. 2424--><p class="indent" > First letter upper case singular short form:
-</p><!--l. 2425--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2886--><p class="noindent" >
+</p><!--l. 2888--><p class="indent" > First letter upper case singular short form:
+</p><!--l. 2889--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsfmtshort</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20026"></a> <span
class="ectt-1000">\Glsfmtshort{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2427--><p class="noindent" >
+</p><!--l. 2891--><p class="noindent" >
(No case-change applied to PDF bookmarks.)
-</p><!--l. 2430--><p class="indent" > First letter upper case plural short form:
-</p><!--l. 2431--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2894--><p class="indent" > First letter upper case plural short form:
+</p><!--l. 2895--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsfmtshortpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20027"></a> <span
@@ -4963,111 +5894,111 @@ class="ectt-1000">} </span></div><hr>
-</p><!--l. 2433--><p class="noindent" >
+</p><!--l. 2897--><p class="noindent" >
(No case-change applied to PDF bookmarks.)
-</p><!--l. 2436--><p class="indent" > Display the long form:
-</p><!--l. 2437--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2900--><p class="indent" > Display the long form:
+</p><!--l. 2901--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsfmtlong</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20028"></a> <span
class="ectt-1000">\glsfmtlong{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2439--><p class="noindent" >
-</p><!--l. 2441--><p class="indent" > Display the plural long form:
-</p><!--l. 2442--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2903--><p class="noindent" >
+</p><!--l. 2905--><p class="indent" > Display the plural long form:
+</p><!--l. 2906--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsfmtlongpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20029"></a> <span
class="ectt-1000">\glsfmtlongpl{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2444--><p class="noindent" >
-</p><!--l. 2446--><p class="indent" > First letter upper case singular long form:
-</p><!--l. 2447--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2908--><p class="noindent" >
+</p><!--l. 2910--><p class="indent" > First letter upper case singular long form:
+</p><!--l. 2911--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsfmtlong</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20030"></a> <span
class="ectt-1000">\Glsfmtlong{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2449--><p class="noindent" >
+</p><!--l. 2913--><p class="noindent" >
(No case-change applied to PDF bookmarks.)
-</p><!--l. 2452--><p class="indent" > First letter upper case plural long form:
-</p><!--l. 2453--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2916--><p class="indent" > First letter upper case plural long form:
+</p><!--l. 2917--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsfmtlongpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20031"></a> <span
class="ectt-1000">\Glsfmtlongpl{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2455--><p class="noindent" >
+</p><!--l. 2919--><p class="noindent" >
(No case-change applied to PDF bookmarks.)
-</p><!--l. 2458--><p class="indent" > There are similar commands for the full form, but note that these use the <span
+</p><!--l. 2922--><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. 2462--><p class="indent" > Display the full form:
-</p><!--l. 2463--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2926--><p class="indent" > Display the full form:
+</p><!--l. 2927--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsfmtfull</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20032"></a> <span
class="ectt-1000">\glsfmtfull{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2465--><p class="noindent" >
-</p><!--l. 2467--><p class="indent" > Display the plural full form:
-</p><!--l. 2468--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2929--><p class="noindent" >
+</p><!--l. 2931--><p class="indent" > Display the plural full form:
+</p><!--l. 2932--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsfmtfullpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20033"></a> <span
class="ectt-1000">\glsfmtfullpl{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2470--><p class="noindent" >
-</p><!--l. 2472--><p class="indent" > First letter upper case singular full form:
-</p><!--l. 2473--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2934--><p class="noindent" >
+</p><!--l. 2936--><p class="indent" > First letter upper case singular full form:
+</p><!--l. 2937--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsfmtfull</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20034"></a> <span
class="ectt-1000">\Glsfmtfull{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2475--><p class="noindent" >
+</p><!--l. 2939--><p class="noindent" >
(No case-change applied to PDF bookmarks.)
-</p><!--l. 2478--><p class="indent" > First letter upper case plural full form:
-</p><!--l. 2479--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2942--><p class="indent" > First letter upper case plural full form:
+</p><!--l. 2943--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsfmtfullpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20035"></a> <span
class="ectt-1000">\Glsfmtfullpl{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2481--><p class="noindent" >
+</p><!--l. 2945--><p class="noindent" >
(No case-change applied to PDF bookmarks.)
-</p><!--l. 2484--><p class="indent" > There are also equivalent commands for the value of the <span
+</p><!--l. 2948--><p class="indent" > There are also equivalent commands for the value of the <span
class="ecss-1000">text</span><a
id="dx1-20036"></a> field:
-</p><!--l. 2486--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2950--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsfmttext</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20037"></a> <span
class="ectt-1000">\glsfmttext{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2488--><p class="noindent" >
-</p><!--l. 2490--><p class="indent" > First letter converted to upper case:
-</p><!--l. 2491--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2952--><p class="noindent" >
+</p><!--l. 2954--><p class="indent" > First letter converted to upper case:
+</p><!--l. 2955--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsfmttext</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20038"></a> <span
class="ectt-1000">\Glsfmttext{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2493--><p class="noindent" >
+</p><!--l. 2957--><p class="noindent" >
(No case-change applied to PDF bookmarks.)
-</p><!--l. 2496--><p class="indent" > The plural equivalents:
-</p><!--l. 2497--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2960--><p class="indent" > The plural equivalents:
+</p><!--l. 2961--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsfmtplural</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20039"></a> <span
@@ -5077,64 +6008,64 @@ class="ectt-1000">} </span></div><hr>
-</p><!--l. 2499--><p class="noindent" >
+</p><!--l. 2963--><p class="noindent" >
and
-</p><!--l. 2501--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2965--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsfmtplural</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20040"></a> <span
class="ectt-1000">\Glsfmtplural{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2503--><p class="noindent" >
-</p><!--l. 2505--><p class="indent" > Similarly for the value of the <span
+</p><!--l. 2967--><p class="noindent" >
+</p><!--l. 2969--><p class="indent" > Similarly for the value of the <span
class="ecss-1000">first</span><a
id="dx1-20041"></a> field:
-</p><!--l. 2507--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2971--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsfmtfirst</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20042"></a> <span
class="ectt-1000">\glsfmtfirst{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2509--><p class="noindent" >
-</p><!--l. 2511--><p class="indent" > First letter converted to upper case:
-</p><!--l. 2512--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2973--><p class="noindent" >
+</p><!--l. 2975--><p class="indent" > First letter converted to upper case:
+</p><!--l. 2976--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsfmtfirst</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20043"></a> <span
class="ectt-1000">\Glsfmtfirst{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2514--><p class="noindent" >
+</p><!--l. 2978--><p class="noindent" >
(No case-change applied to PDF bookmarks.)
-</p><!--l. 2517--><p class="indent" > The plural equivalents:
-</p><!--l. 2518--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2981--><p class="indent" > The plural equivalents:
+</p><!--l. 2982--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsfmtfirstpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20044"></a> <span
class="ectt-1000">\glsfmtfirstpl{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2520--><p class="noindent" >
+</p><!--l. 2984--><p class="noindent" >
and
-</p><!--l. 2522--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2986--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsfmtfirstpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-20045"></a> <span
class="ectt-1000">\Glsfmtfirstpl{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2524--><p class="noindent" >
+</p><!--l. 2988--><p class="noindent" >
</p>
-<!--l. 2526--><p class="indent" > </div>
-</p><!--l. 2526--><p class="noindent" ><a
+<!--l. 2990--><p class="indent" > </div>
+</p><!--l. 2990--><p class="noindent" ><a
href="#top">Top</a><div class="chapter"><h2 class="chapterHead">4. <a
id="sec:categories"></a>Categories</h2>
-</p><!--l. 2529--><p class="indent" > Each entry defined by <span
+</p><!--l. 2993--><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
@@ -5147,9 +6078,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. 2538--><p class="indent" > The use of categories can give you more control over the way entries are displayed
+</p><!--l. 3002--><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. 2541--><p class="indent" > The default category assumed by <span
+</p><!--l. 3005--><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>.
@@ -5162,7 +6093,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. 2548--><p class="indent" > Additionally, if you have enabled <span
+</p><!--l. 3012--><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
@@ -5185,20 +6116,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. 2556--><p class="indent" > You can obtain the category label for a given entry using
-</p><!--l. 2557--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3020--><p class="indent" > You can obtain the category label for a given entry using
+</p><!--l. 3021--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glscategory</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-21015"></a> <span
class="ectt-1000">\glscategory{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2559--><p class="noindent" >
+</p><!--l. 3023--><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&#8217;t exist.
-</p><!--l. 2564--><p class="indent" > You can test the category for a given entry using
-</p><!--l. 2565--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3028--><p class="indent" > You can test the category for a given entry using
+</p><!--l. 3029--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsifcategory</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-21016"></a> <span
@@ -5213,7 +6144,7 @@ class="ecit-1000">part</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">false part</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2568--><p class="noindent" >
+</p><!--l. 3032--><p class="noindent" >
This is equivalent to </p><div class="alltt">
<div class="obeylines-v">
<span
@@ -5235,7 +6166,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. 2577--><p class="indent" > Each category may have a set of attributes. For example, the <span
+<!--l. 3041--><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
@@ -5249,7 +6180,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. 2585--><p class="indent" > Other attributes recognised by <span
+</p><!--l. 3049--><p class="indent" > Other attributes recognised by <span
class="ecss-1000">glossaries-extra </span>are:
</p><dl class="description"><dt class="description">
<span
@@ -5302,218 +6233,289 @@ class="ecti-1000">non-plural </span>commands like <span
class="ectt-1000">\gls </span>or <span
class="ectt-1000">\glstext</span>.
(Provided for entries such as abbreviations that end with a full stop.)
- </dd><dt class="description">
+ <!--l. 3076--><p class="noindent" >Note that this can cause a problem if you access a field that doesn&#8217;t end with a
+ full stop. For example:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-77">
+ \newabbreviation
+ &#x00A0;<br />&#x00A0;[user1={German&#x00A0;Speaking&#x00A0;\TeX\&#x00A0;User&#x00A0;Group}]
+ &#x00A0;<br />&#x00A0;{dante}{DANTE&#x00A0;e.V.}{Deutschsprachige&#x00A0;Anwendervereinigung&#x00A0;\TeX\
+ &#x00A0;<br />e.V.}
+</div>
+ <!--l. 3083--><p class="nopar" > Here the <span
+class="ecss-1000">short</span><a
+ id="dx1-21032"></a> and <span
+class="ecss-1000">long</span><a
+ id="dx1-21033"></a> fields end with a full stop, but the <span
+class="ecss-1000">user1</span><a
+ id="dx1-21034"></a> field doesn&#8217;t.
+ The simplest solution in this situation is to put the sentence terminator in the
+ final optional argument. For example:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-78">
+ \glsuseri{dante}[.]
+</div>
+ <!--l. 3090--><p class="nopar" > This will bring the punctuation character inside the <a
+ id="dx1-21035"></a><a
+href="#glo:linktext">link-text</a> and it won&#8217;t be
+ discarded.
+ </p></dd><dt class="description">
<span
class="ecsx-1000">pluraldiscardperiod</span><a
- id="dx1-21032"></a> </dt><dd
-class="description">If this attribute is set to &#8220;true&#8221; <span
-class="ecti-1000">and </span>the <span
+ id="dx1-21036"></a> </dt><dd
+class="description">If this attribute is set to &#8220;true&#8221; <span
+class="ecti-1000">and </span>the <span
class="ecss-1000">discardperiod</span><a
- id="dx1-21033"></a>
- attribute is set to &#8220;true&#8221;, this will behave as above for the plural commands
- like <span
-class="ectt-1000">\glspl </span>or <span
+ id="dx1-21037"></a> attribute is
+ set to &#8220;true&#8221;, this will behave as above for the plural commands like <span
+class="ectt-1000">\glspl </span>or
+ <span
class="ectt-1000">\glsplural</span>.
</dd><dt class="description">
<span
class="ecsx-1000">retainfirstuseperiod</span><a
- id="dx1-21034"></a> </dt><dd
+ id="dx1-21038"></a> </dt><dd
class="description">If this attribute is set to &#8220;true&#8221; then the full stop won&#8217;t be
discarded for <a
- id="dx1-21035"></a><a
+ id="dx1-21039"></a><a
href="#glo:firstuse">first use</a> instances, even if <span
class="ecss-1000">discardperiod</span><a
- id="dx1-21036"></a> or <span
+ id="dx1-21040"></a> or <span
class="ecss-1000">pluraldiscardperiod</span><a
- id="dx1-21037"></a>
- are set. This is useful for &#x27E8;<span
+ id="dx1-21041"></a> are
+ set. This is useful for &#x27E8;<span
class="ecti-1000">short</span>&#x27E9; (&#x27E8;<span
-class="ecti-1000">long</span>&#x27E9;) abbreviation styles where only the
- short form has a trailing full stop..
+class="ecti-1000">long</span>&#x27E9;) abbreviation styles where only the short form
+ has a trailing full stop..
</dd><dt class="description">
<span
class="ecsx-1000">insertdots</span><a
- id="dx1-21038"></a> </dt><dd
-class="description">If this attribute is set to &#8220;true&#8221; any entry defined using
- <span
+ id="dx1-21042"></a> </dt><dd
+class="description">If this attribute is set to &#8220;true&#8221; any entry defined using <span
class="ectt-1000">\newabbreviation</span><a
- id="dx1-21039"></a> will automatically have full stops (periods) inserted
- after each letter. The entry will be defined with those dots present as
- though they had been present in the &#x27E8;<span
+ id="dx1-21043"></a>
+ will automatically have full stops (periods) inserted after each letter. The entry
+ will be defined with those dots present as though they had been present in the
+ &#x27E8;<span
class="ecti-1000">short</span>&#x27E9; argument of <span
-class="ectt-1000">\newabbreviation</span>
- (rather than inserting them every time the entry is used). The short plural
- form defaults to the new dotted version of the original &#x27E8;<span
-class="ecti-1000">short</span>&#x27E9; form with
- the plural suffix appended.
- <!--l. 2633--><p class="noindent" ><div class="important" title="Important Note"> If you explicitly override the short plural using the <span
+class="ectt-1000">\newabbreviation </span>(rather than inserting them
+ every time the entry is used). The short plural form defaults to the
+ new dotted version of the original &#x27E8;<span
+class="ecti-1000">short</span>&#x27E9; form with the plural suffix
+ appended.
+ <!--l. 3115--><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
+ id="dx1-21044"></a> key, you must
explicitly insert the dots yourself (since there&#8217;s no way for the code to
determine if the plural has a suffix that shouldn&#8217;t be followed by a dot).
</div>
- </p><!--l. 2639--><p class="noindent" >
- </p><!--l. 2641--><p class="noindent" >This attribute is best used with the <span
+ </p><!--l. 3121--><p class="noindent" >
+ </p><!--l. 3123--><p class="noindent" >This attribute is best used with the <span
class="ecss-1000">discardperiod</span><a
- id="dx1-21041"></a> attribute set to &#8220;true&#8221;.
+ id="dx1-21045"></a> attribute set to &#8220;true&#8221;.
</p></dd><dt class="description">
<span
class="ecsx-1000">aposplural</span><a
- id="dx1-21042"></a> </dt><dd
+ id="dx1-21046"></a> </dt><dd
class="description">If this attribute is set to &#8220;true&#8221;, <span
class="ectt-1000">\newabbreviation</span><a
- id="dx1-21043"></a> will insert an
-
-
-
+ id="dx1-21047"></a> will insert an
apostrophe (&#8217;) before the plural suffix for the <span
class="ecti-1000">short </span>plural form (unless
explicitly overridden with the <span
class="ecss-1000">shortplural</span><a
- id="dx1-21044"></a> key). The long plural form is
+ id="dx1-21048"></a> key). The long plural form is
unaffected by this setting.
</dd><dt class="description">
<span
class="ecsx-1000">noshortplural</span><a
- id="dx1-21045"></a> </dt><dd
+ id="dx1-21049"></a> </dt><dd
class="description">If this attribute is set to &#8220;true&#8221;, <span
class="ectt-1000">\newabbreviation</span><a
- id="dx1-21046"></a> won&#8217;t append the
+ id="dx1-21050"></a> won&#8217;t append the
plural suffix for the short plural form. This means the <span
class="ecss-1000">short</span><a
- id="dx1-21047"></a> and <span
+ id="dx1-21051"></a> and <span
class="ecss-1000">shortplural</span><a
- id="dx1-21048"></a>
+ id="dx1-21052"></a>
values will be the same unless explicitly overridden. <span
class="ecti-1000">The </span><span
class="ecsi-1000">aposplural</span><a
- id="dx1-21049"></a> <span
+ id="dx1-21053"></a> <span
class="ecti-1000">attribute</span>
<span
class="ecti-1000">trumps the </span><span
class="ecsi-1000">noshortplural</span><a
- id="dx1-21050"></a> <span
+ id="dx1-21054"></a> <span
class="ecti-1000">attribute.</span>
+
+
+
</dd><dt class="description">
<span
class="ecsx-1000">headuc</span><a
- id="dx1-21051"></a> </dt><dd
+ id="dx1-21055"></a> </dt><dd
class="description">If this attribute is set to &#8220;true&#8221;, commands like <span
class="ectt-1000">\glsfmtshort</span><a
- id="dx1-21052"></a> will use the
+ id="dx1-21056"></a> will use the
upper case version in the page headers.
</dd><dt class="description">
<span
class="ecsx-1000">tagging</span><a
- id="dx1-21053"></a> </dt><dd
+ id="dx1-21057"></a> </dt><dd
class="description">If this attribute is set to &#8220;true&#8221;, the tagging command defined by
<span
class="ectt-1000">\GlsXtrEnableInitialTagging</span><a
- id="dx1-21054"></a> will be activated to use <span
+ id="dx1-21058"></a> will be activated to use <span
class="ectt-1000">\glsxtrtagfont</span><a
- id="dx1-21055"></a> in
+ id="dx1-21059"></a> in
the glossary (see <a
href="#sec:tagging">&sect;2.1 </a><a
href="#sec:tagging">Tagging Initials<!--tex4ht:ref: sec:tagging --></a>).
</dd><dt class="description">
<span
class="ecsx-1000">entrycount</span><a
- id="dx1-21056"></a> </dt><dd
+ id="dx1-21060"></a> </dt><dd
class="description">Unlike the above attributes, this attribute isn&#8217;t boolean but instead must
be an integer value and is used in combination with <span
class="ectt-1000">\glsenableentrycount</span><a
- id="dx1-21057"></a>
+ id="dx1-21061"></a>
(see <a
href="#sec:entrycountmods">&sect;1.3.3 </a><a
href="#sec:entrycountmods">Entry Counting Modifications<!--tex4ht:ref: sec:entrycountmods --></a>). Leave blank or undefined for
categories that shouldn&#8217;t have this facility enabled. The value of this attribute
is used by <span
class="ectt-1000">\glsxtrifcounttrigger</span><a
- id="dx1-21058"></a> to determine how commands such as <span
+ id="dx1-21062"></a> to determine how commands such as <span
class="ectt-1000">\cgls</span><a
- id="dx1-21059"></a>
+ id="dx1-21063"></a>
should behave.
- <!--l. 2674--><p class="noindent" >With <span
+ <!--l. 3156--><p class="noindent" >With <span
class="ecss-1000">glossaries</span><a
- id="dx1-21060"></a>, commands like <span
+ id="dx1-21064"></a>, commands like <span
class="ectt-1000">\cgls </span>use <span
class="ectt-1000">\cglsformat </span>only if the previous
usage count for that entry was equal to&#x00A0;1. With <span
class="ecss-1000">glossaries-extra </span>the test is now
for entries that have the <span
class="ecss-1000">entrycount</span><a
- id="dx1-21061"></a> attribute set and where the previous
+ id="dx1-21065"></a> attribute set and where the previous
usage count for that entry is less than or equal to the value of that
attribute.
</p></dd><dt class="description">
<span
class="ecsx-1000">glossdesc</span><a
- id="dx1-21062"></a> </dt><dd
+ id="dx1-21066"></a> </dt><dd
class="description">The <span
class="ectt-1000">\glossentrydesc</span><a
- id="dx1-21063"></a> command (used in the predefined glossary
+ id="dx1-21067"></a> command (used in the predefined glossary
styles) is modified by <span
class="ecss-1000">glossaries-extra </span>to check for this attribute. If the
attribute is set to &#8220;firstuc&#8221;, the first letter of the description will be
converted to upper case (using <span
class="ectt-1000">\Glsentrydesc</span><a
- id="dx1-21064"></a>). If the attribute is set
+ id="dx1-21068"></a>). If the attribute is set
to &#8220;title&#8221;, the title casing command <span
class="ectt-1000">\capitalisewords</span><a
- id="dx1-21065"></a> (provided by
+ id="dx1-21069"></a> (provided by
<span
class="ecss-1000">mfirstuc</span><a
- id="dx1-21066"></a>) is used on the name. Any other values of this attribute are
+ id="dx1-21070"></a>) is used on the name. Any other values of this attribute are
ignored.
</dd><dt class="description">
<span
+class="ecsx-1000">glossdescfont</span><a
+ id="dx1-21071"></a> </dt><dd
+class="description">(New to version 1.04) In addition to the above, the modified
+ <span
+class="ectt-1000">\glossentrydesc</span><a
+ id="dx1-21072"></a> command also checks this attribute. If set, it should be the
+ name of a control sequence (without the leading backslash) that takes one
+ argument. This control sequence will be applied to the description text. For
+ example:
+
+
+
+ <div class="verbatim" id="verbatim-79">
+ \glssetcategoryattribute{general}{glossdescfont}{emph}
+</div>
+ <!--l. 3181--><p class="nopar" >
+ </p></dd><dt class="description">
+<span
class="ecsx-1000">glossname</span><a
- id="dx1-21067"></a> </dt><dd
+ id="dx1-21073"></a> </dt><dd
class="description">As <span
class="ecss-1000">glossdesc</span><a
- id="dx1-21068"></a> but applies to <span
+ id="dx1-21074"></a> but applies to <span
class="ectt-1000">\glossentryname</span><a
- id="dx1-21069"></a>. Additionally, if this
+ id="dx1-21075"></a>. Additionally, if this
attribute is set to &#8220;uc&#8221; the name is converted to all capitals.
</dd><dt class="description">
<span
class="ecsx-1000">indexname</span><a
- id="dx1-21070"></a> </dt><dd
+ id="dx1-21076"></a> </dt><dd
class="description">If set, the <span
class="ectt-1000">\glsxtrpostnamehook </span>hook used at the end of <span
class="ectt-1000">\glossentyname</span><a
- id="dx1-21071"></a>
+ id="dx1-21077"></a>
will index the entry using <span
class="ectt-1000">\index</span><a
- id="dx1-21072"></a>. See <a
+ id="dx1-21078"></a>. See <a
href="#sec:autoindex">&sect;6 </a><a
href="#sec:autoindex">Auto-Indexing<!--tex4ht:ref: sec:autoindex --></a> for further
+ details.
+ </dd><dt class="description">
+<span
+class="ecsx-1000">glossnamefont</span><a
+ id="dx1-21079"></a> </dt><dd
+class="description">(New to version 1.04) In addition to the above, the modified
+ <span
+class="ectt-1000">\glossentryname</span><a
+ id="dx1-21080"></a> command also checks this attribute. If set, it should be the
+ name of a control sequence (without the leading backslash) that takes one
+ argument. This control sequence will be applied to the name text. For
+ example:
- details.
- </dd><dt class="description">
+ <div class="verbatim" id="verbatim-80">
+ \glssetcategoryattribute{general}{glossnamefont}{emph}
+</div>
+ <!--l. 3201--><p class="nopar" > Note that this overrides <span
+class="ectt-1000">\glsnamefont </span>which will only be used if this attribute
+ hasn&#8217;t been set.
+ </p><!--l. 3205--><p class="noindent" >Remember that glossary styles may additionally apply a font change,
+ such as the list styles which put the name in the optional argument of
+ <span
+class="ectt-1000">\item</span>.
+ </p></dd><dt class="description">
<span
class="ecsx-1000">dualindex</span><a
- id="dx1-21073"></a> </dt><dd
+ id="dx1-21081"></a> </dt><dd
class="description">If set, whenever a glossary entry has information written to the external
glossary file through commands like <span
class="ectt-1000">\gls</span><a
- id="dx1-21074"></a> and <span
+ id="dx1-21082"></a> and <span
class="ectt-1000">\glsadd</span><a
- id="dx1-21075"></a>, a&#x00A0;corresponding line
+ id="dx1-21083"></a>, a&#x00A0;corresponding line
will be written to the indexing file using <span
class="ectt-1000">\index</span><a
- id="dx1-21076"></a>. See <a
+ id="dx1-21084"></a>. See <a
href="#sec:autoindex">&sect;6 </a><a
href="#sec:autoindex">Auto-Indexing<!--tex4ht:ref: sec:autoindex --></a> for
further details.
</dd></dl>
-<!--l. 2708--><p class="indent" > An attribute can be set using:
-</p><!--l. 2709--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 3217--><p class="indent" > An attribute can be set using:
+</p><!--l. 3218--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glssetcategoryattribute</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-21077"></a> <span
+ id="dx1-21085"></a> <span
class="ectt-1000">\glssetcategoryattribute{</span>&#x27E8;<span
class="ecit-1000">category-label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
@@ -5522,30 +6524,30 @@ class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">value</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 2711--><p class="noindent" >
+</p><!--l. 3220--><p class="noindent" >
where &#x27E8;<span
class="ecti-1000">category-label</span>&#x27E9; is the category label, &#x27E8;<span
class="ecti-1000">attribute-label</span>&#x27E9; is the attribute label and
&#x27E8;<span
class="ecti-1000">value</span>&#x27E9; is the new value for the attribute.
-</p><!--l. 2716--><p class="indent" > There is a shortcut version to set the <span
+</p><!--l. 3225--><p class="indent" > There is a shortcut version to set the <span
class="ecss-1000">regular</span><a
- id="dx1-21078"></a> attribute to &#8220;true&#8221;:
-</p><!--l. 2718--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-21086"></a> attribute to &#8220;true&#8221;:
+</p><!--l. 3227--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glssetregularcategory</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-21079"></a> <span
+ id="dx1-21087"></a> <span
class="ectt-1000">\glssetregularcategory{</span>&#x27E8;<span
class="ecit-1000">category-label</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 2720--><p class="noindent" >
-</p><!--l. 2722--><p class="indent" > If you need to lookup the category label for a particular entry, you can use the
+</p><!--l. 3229--><p class="noindent" >
+</p><!--l. 3231--><p class="indent" > If you need to lookup the category label for a particular entry, you can use the
shortcut command:
-</p><!--l. 2724--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3233--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glssetattribute</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-21080"></a> <span
+ id="dx1-21088"></a> <span
class="ectt-1000">\glssetattribute{</span>&#x27E8;<span
class="ecit-1000">entry-label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
@@ -5554,41 +6556,44 @@ class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">value</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 2726--><p class="noindent" >
+</p><!--l. 3235--><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&#8217;s category.
-</p><!--l. 2731--><p class="indent" > You can fetch the value of an attribute for a particular category using:
-</p><!--l. 2733--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3240--><p class="indent" > You can fetch the value of an attribute for a particular category using:
+</p><!--l. 3242--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsgetcategoryattribute</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-21081"></a> <span
+ id="dx1-21089"></a> <span
class="ectt-1000">\glsgetcategoryattribute{</span>&#x27E8;<span
class="ecit-1000">category-label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">attribute-label</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 2735--><p class="noindent" >
+</p><!--l. 3244--><p class="noindent" >
Again there is a shortcut if you need to lookup the category label for a given
entry:
-</p><!--l. 2738--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3247--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsgetattribute</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-21082"></a> <span
+ id="dx1-21090"></a> <span
class="ectt-1000">\glsgetattribute{</span>&#x27E8;<span
class="ecit-1000">entry-label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">attribute-label</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 2740--><p class="noindent" >
-</p><!--l. 2742--><p class="indent" > You can test if an attribute has been assigned to a given category using:
-</p><!--l. 2744--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+
+
+
+</p><!--l. 3249--><p class="noindent" >
+</p><!--l. 3251--><p class="indent" > You can test if an attribute has been assigned to a given category using:
+</p><!--l. 3253--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glshascategoryattribute</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-21083"></a> <span
+ id="dx1-21091"></a> <span
class="ectt-1000">\glshascategoryattribute{</span>&#x27E8;<span
class="ecit-1000">category-label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
@@ -5600,19 +6605,19 @@ class="ecit-1000">code</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">false code</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2747--><p class="noindent" >
+</p><!--l. 3256--><p class="noindent" >
This uses <span
class="ecss-1000">etoolbox</span><a
- id="dx1-21084"></a>&#8217;s <span
+ id="dx1-21092"></a>&#8217;s <span
class="ectt-1000">\ifcsvoid </span>and does &#x27E8;<span
class="ecti-1000">true code</span>&#x27E9; if the attribute has been set and
isn&#8217;t blank and isn&#8217;t <span
class="ectt-1000">\relax</span>. The shortcut if you need to lookup the category label
from an entry is:
-</p><!--l. 2752--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3261--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glshasattribute</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-21085"></a> <span
+ id="dx1-21093"></a> <span
class="ectt-1000">\glshasattribute{</span>&#x27E8;<span
class="ecit-1000">entry-label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
@@ -5624,15 +6629,12 @@ class="ecit-1000">code</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">false code</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-
-
-
-</p><!--l. 2755--><p class="noindent" >
-</p><!--l. 2757--><p class="indent" > You can test the value of an attribute for a particular category using:
-</p><!--l. 2759--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3264--><p class="noindent" >
+</p><!--l. 3266--><p class="indent" > You can test the value of an attribute for a particular category using:
+</p><!--l. 3268--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsifcategoryattribute</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-21086"></a> <span
+ id="dx1-21094"></a> <span
class="ectt-1000">\glsifcategoryattribute{</span>&#x27E8;<span
class="ecit-1000">category-label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
@@ -5646,7 +6648,7 @@ class="ecit-1000">true-part</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">false-part</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2761--><p class="noindent" >
+</p><!--l. 3270--><p class="noindent" >
This tests if the attribute (given by &#x27E8;<span
class="ecti-1000">attribute-label</span>&#x27E9;) for the category (given by
&#x27E8;<span
@@ -5656,33 +6658,33 @@ class="ecti-1000">true-part</span>&#x27E9; is done. If the attribute
isn&#8217;t set or is set but isn&#8217;t equal to &#x27E8;<span
class="ecti-1000">value</span>&#x27E9;, &#x27E8;<span
class="ecti-1000">false part</span>&#x27E9; is done.
-</p><!--l. 2768--><p class="indent" > For example:
+</p><!--l. 3277--><p class="indent" > For example:
</p>
- <div class="verbatim" id="verbatim-63">
+ <div class="verbatim" id="verbatim-81">
\glsifcategoryattribute{general}{nohyper}{true}{NO&#x00A0;HYPER}{HYPER}
</div>
-<!--l. 2771--><p class="nopar" > This does &#8220;NO HYPER&#8221; if the <span
+<!--l. 3280--><p class="nopar" > This does &#8220;NO HYPER&#8221; if the <span
class="ecss-1000">general</span><a
- id="dx1-21087"></a> category has the <span
+ id="dx1-21095"></a> category has the <span
class="ecss-1000">nohyper</span><a
- id="dx1-21088"></a> attribute set to <span
+ id="dx1-21096"></a> attribute set to <span
class="ectt-1000">true</span>
otherwise if does &#8220;HYPER&#8221;.
-</p><!--l. 2776--><p class="indent" > With boolean-style attributes like <span
+</p><!--l. 3285--><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
+ id="dx1-21097"></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&#8217;t been set.
-</p><!--l. 2779--><p class="indent" > Again there&#8217;s a shortcut if you need to lookup the category label from a particular
+</p><!--l. 3288--><p class="indent" > Again there&#8217;s a shortcut if you need to lookup the category label from a particular
entry:
-</p><!--l. 2781--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3290--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsifattribute</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-21090"></a> <span
+ id="dx1-21098"></a> <span
class="ectt-1000">\glsifattribute{</span>&#x27E8;<span
class="ecit-1000">entry-label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
@@ -5696,15 +6698,15 @@ class="ectt-1000">}</span>
class="ectt-1000">{</span>&#x27E8;<span
class="ecit-1000">false-part</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2783--><p class="noindent" >
-</p><!--l. 2785--><p class="indent" > There&#8217;s also a shortcut to determine if a particular category has the <span
+</p><!--l. 3292--><p class="noindent" >
+</p><!--l. 3294--><p class="indent" > There&#8217;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. 2787--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-21099"></a>
+attribute set to &#8220;true&#8221;:
+</p><!--l. 3296--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsifregularcategory</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-21092"></a> <span
+ id="dx1-21100"></a> <span
class="ectt-1000">\glsifregularcategory{</span>&#x27E8;<span
class="ecit-1000">category-label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
@@ -5713,12 +6715,12 @@ class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">false-part</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 2789--><p class="noindent" >
+</p><!--l. 3298--><p class="noindent" >
Alternatively, if you need to lookup the category for a particular entry:
-</p><!--l. 2792--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3301--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsifregular</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-21093"></a> <span
+ id="dx1-21101"></a> <span
class="ectt-1000">\glsifregular{</span>&#x27E8;<span
class="ecit-1000">entry-label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
@@ -5727,9 +6729,49 @@ class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">false-part</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 2794--><p class="noindent" >
-</p><!--l. 2796--><p class="indent" > You can iterate through all entries with a given category using:
-</p><!--l. 2798--><p class="indent" > <hr><div title="Definition"><span
+</p><!--l. 3303--><p class="noindent" >
+Note that if the <span
+class="ecss-1000">regular</span><a
+ id="dx1-21102"></a> attribute hasn&#8217;t be set, the above do &#x27E8;<span
+class="ecti-1000">false-part</span>&#x27E9;. There
+are also reverse commands that test if the <span
+class="ecss-1000">regular</span><a
+ id="dx1-21103"></a> attribute has been set to
+&#8220;false&#8221;:
+</p><!--l. 3307--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glsifnotregularcategory</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-21104"></a> <span
+class="ectt-1000">\glsifnotregularcategory{</span>&#x27E8;<span
+class="ecit-1000">category-label</span>&#x27E9;<span
+class="ectt-1000">}{</span>&#x27E8;<span
+class="ecit-1000">true-part</span>&#x27E9;<span
+class="ectt-1000">}{</span>&#x27E8;<span
+class="ecit-1000">false-part</span>&#x27E9;<span
+class="ectt-1000">}</span>
+</div><hr>
+</p><!--l. 3309--><p class="noindent" >
+or for a particular entry:
+</p><!--l. 3311--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="ectt-0900">\glsifnotregular</span><span
+class="ectt-0900">&#x00A0;</span></span><a
+ id="dx1-21105"></a> <span
+class="ectt-1000">\glsifnotregular{</span>&#x27E8;<span
+class="ecit-1000">entry-label</span>&#x27E9;<span
+class="ectt-1000">}{</span>&#x27E8;<span
+class="ecit-1000">true-part</span>&#x27E9;<span
+class="ectt-1000">}{</span>&#x27E8;<span
+class="ecit-1000">false-part</span>&#x27E9;<span
+class="ectt-1000">}</span>
+</div><hr>
+</p><!--l. 3313--><p class="noindent" >
+Again, if the <span
+class="ecss-1000">regular</span><a
+ id="dx1-21106"></a> attribute hasn&#8217;t been set, the above do &#x27E8;<span
+class="ecti-1000">false-part</span>&#x27E9;, so these
+reverse commands aren&#8217;t logically opposite in the strict sense.
+</p><!--l. 3318--><p class="indent" > You can iterate through all entries with a given category using:
+</p><!--l. 3320--><p class="indent" > <hr><div title="Definition"><span
class="ectt-1000">\glsforeachincategory[</span>&#x27E8;<span
class="ecit-1000">glossary-labels</span>&#x27E9;<span
class="ectt-1000">]{</span>&#x27E8;<span
@@ -5743,7 +6785,7 @@ class="ecit-1000">label-cs</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">body</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2799--><p class="noindent" >
+</p><!--l. 3321--><p class="noindent" >
This iterates through all entries in the glossaries identified by the comma-separated
list &#x27E8;<span
class="ecti-1000">glossary-labels</span>&#x27E9; that have the category given by &#x27E8;<span
@@ -5756,12 +6798,15 @@ class="ecti-1000">label-cs</span>&#x27E9; (which much be
control sequences) to access the current glossary and entry label. If &#x27E8;<span
class="ecti-1000">glossary-labels</span>&#x27E9; is
omitted, all glossaries are assumed.
-</p><!--l. 2809--><p class="indent" > Similarly, you can iterate through all entries that have a category with a given
+
+
+
+</p><!--l. 3331--><p class="indent" > Similarly, you can iterate through all entries that have a category with a given
attribute using:
-</p><!--l. 2811--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3333--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsforeachwithattribute</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-21094"></a> <span
+ id="dx1-21107"></a> <span
class="ectt-1000">\glsforeachwithattribute[</span>&#x27E8;<span
class="ecit-1000">glossary-labels</span>&#x27E9;<span
class="ectt-1000">]{</span>&#x27E8;<span
@@ -5777,63 +6822,60 @@ class="ecit-1000">label-cs</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">body</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2813--><p class="noindent" >
+</p><!--l. 3335--><p class="noindent" >
This will do &#x27E8;<span
class="ecti-1000">body</span>&#x27E9; for each entry that has a category with the attribute &#x27E8;<span
class="ecti-1000">attribute-label</span>&#x27E9;
set to &#x27E8;<span
class="ecti-1000">attribute-value</span>&#x27E9;. The remaining arguments are as the previous command.
-</p><!--l. 2818--><p class="indent" > You can change the category for a particular entry using the standard glossary
+</p><!--l. 3340--><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
+ id="dx1-21108"></a>. Alternatively, you can
use
-
-
-
-</p><!--l. 2821--><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">\glsxtrsetcategory</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-21096"></a> <span
+ id="dx1-21109"></a> <span
class="ectt-1000">\glsxtrsetcategory{</span>&#x27E8;<span
class="ecit-1000">entry-labels</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">category-label</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 2823--><p class="noindent" >
+</p><!--l. 3345--><p class="noindent" >
This will change the category to &#x27E8;<span
class="ecti-1000">category-label</span>&#x27E9; for each entry listed in the
comma-separated list &#x27E8;<span
class="ecti-1000">entry-labels</span>&#x27E9;. This command uses <span
class="ectt-1000">\glsfieldxdef</span><a
- id="dx1-21097"></a> so it will
+ id="dx1-21110"></a> so it will
expand &#x27E8;<span
class="ecti-1000">category-label</span>&#x27E9; and make the change global.
-</p><!--l. 2829--><p class="indent" > You can also change the category for all entries with a glossary or glossaries
+</p><!--l. 3351--><p class="indent" > You can also change the category for all entries with a glossary or glossaries
using:
-</p><!--l. 2831--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3353--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrsetcategoryforall</span><span
class="ectt-0900">&#x00A0;</span></span><a
- id="dx1-21098"></a> <span
+ id="dx1-21111"></a> <span
class="ectt-1000">\glsxtrsetcategoryforall{</span>&#x27E8;<span
class="ecit-1000">glossary-labels</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">category-label</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 2833--><p class="noindent" >
+</p><!--l. 3355--><p class="noindent" >
where &#x27E8;<span
class="ecti-1000">glossary-labels</span>&#x27E9; is a comma-separated list of glossary labels.
</p>
-<!--l. 2837--><p class="indent" > </div>
-</p><!--l. 2837--><p class="noindent" ><a
+<!--l. 3359--><p class="indent" > </div>
+</p><!--l. 3359--><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. 2840--><p class="indent" > As mentioned in <a
+</p><!--l. 3362--><p class="indent" > As mentioned in <a
href="#sec:entrycountmods">&sect;1.3.3 </a><a
href="#sec:entrycountmods">Entry Counting Modifications<!--tex4ht:ref: sec:entrycountmods --></a>, <span
class="ecss-1000">glossaries-extra</span>
@@ -5849,7 +6891,7 @@ class="ectt-1000">\glsenableentrycount</span><a
href="#sec:categories">&sect;4
</a><a
href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a>).
-</p><!--l. 2847--><p class="indent" > You may now use <span
+</p><!--l. 3369--><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
@@ -5875,10 +6917,10 @@ class="ectt-1000">\ac</span><a
id="dx1-22010"></a>
which uses <span
class="ectt-1000">\gls</span>.
-</p><!--l. 2857--><p class="indent" > All upper case versions (not provided by <span
+</p><!--l. 3379--><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. 2859--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3381--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\cGLS</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-22012"></a> <span
@@ -5889,9 +6931,9 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 2861--><p class="noindent" >
+</p><!--l. 3383--><p class="noindent" >
and
-</p><!--l. 2863--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3385--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\cGLSpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-22013"></a> <span
@@ -5902,11 +6944,11 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}[</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">] </span></div><hr>
-</p><!--l. 2865--><p class="noindent" >
+</p><!--l. 3387--><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. 2868--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3390--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\cGLSformat</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-22014"></a> <span
@@ -5915,9 +6957,9 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2870--><p class="noindent" >
+</p><!--l. 3392--><p class="noindent" >
and
-</p><!--l. 2872--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3394--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\cGLSplformat</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-22015"></a> <span
@@ -5926,23 +6968,23 @@ class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">insert</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2874--><p class="noindent" >
+</p><!--l. 3396--><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. 2878--><p class="indent" > [TODO: work out what to do about other commands such as <span class="obeylines-h"><span class="verb"><span
+</p><!--l. 3400--><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. 2881--><p class="indent" > Just using <span
+</p><!--l. 3403--><p class="indent" > Just using <span
class="ecss-1000">glossaries</span><a
id="dx1-22016"></a>:
</p>
- <div class="verbatim" id="verbatim-64">
+ <div class="verbatim" id="verbatim-82">
\documentclass{article}
&#x00A0;<br />\usepackage{glossaries}
&#x00A0;<br />\makeglossaries
@@ -5955,8 +6997,8 @@ class="ecss-1000">glossaries</span><a
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 2903--><p class="nopar" >
-</p><!--l. 2905--><p class="indent" > If you switch to <span
+<!--l. 3425--><p class="nopar" >
+</p><!--l. 3427--><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:
@@ -5964,7 +7006,7 @@ class="ecss-1000">entrycount</span><a
</p>
- <div class="verbatim" id="verbatim-65">
+ <div class="verbatim" id="verbatim-83">
\documentclass{article}
&#x00A0;<br />\usepackage{glossaries-extra}
&#x00A0;<br />\makeglossaries
@@ -5978,13 +7020,13 @@ class="ecss-1000">entrycount</span><a
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 2930--><p class="nopar" >
-</p><!--l. 2932--><p class="indent" > When activated with <span
+<!--l. 3452--><p class="nopar" >
+</p><!--l. 3454--><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. 2934--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3456--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrifcounttrigger</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-22019"></a> <span
@@ -5997,7 +7039,7 @@ class="ecit-1000">normal</span>
<span
class="ecit-1000">code</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 2937--><p class="noindent" >
+</p><!--l. 3459--><p class="noindent" >
to determine if the entry trips the entry count trigger. The &#x27E8;<span
class="ecti-1000">trigger code</span>&#x27E9; uses
commands like <span
@@ -6013,12 +7055,12 @@ class="ecti-1000">trigger code</span>&#x27E9; but the usual <span
class="ectt-1000">\gls </span>behaviour in
&#x27E8;<span
class="ecti-1000">normal code</span>&#x27E9;).
-</p><!--l. 2946--><p class="indent" > The default definition is:
+</p><!--l. 3468--><p class="indent" > The default definition is:
</p>
- <div class="verbatim" id="verbatim-66">
+ <div class="verbatim" id="verbatim-84">
\newcommand*{\glsxtrifcounttrigger}[3]{%
&#x00A0;<br />&#x00A0;\glshasattribute{#1}{entrycount}%
&#x00A0;<br />&#x00A0;{%
@@ -6031,24 +7073,24 @@ class="ecti-1000">normal code</span>&#x27E9;).
&#x00A0;<br />&#x00A0;{#3}%
&#x00A0;<br />}
</div>
-<!--l. 2959--><p class="nopar" > This means that if an entry is assigned to a category that has the <span
+<!--l. 3481--><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 &#x27E8;<span
class="ecti-1000">trigger code</span>&#x27E9; 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. 2966--><p class="indent" > For example, to trigger normal use if the previous count value is greater than
+</p><!--l. 3488--><p class="indent" > For example, to trigger normal use if the previous count value is greater than
four:
</p>
- <div class="verbatim" id="verbatim-67">
+ <div class="verbatim" id="verbatim-85">
\glssetcategoryattribute{abbreviation}{entrycount}{4}
</div>
-<!--l. 2970--><p class="nopar" >
-</p><!--l. 2972--><p class="indent" > There is a convenient command provided to enable entry counting, set the
+<!--l. 3492--><p class="nopar" >
+</p><!--l. 3494--><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
@@ -6056,7 +7098,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. 2975--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3497--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrEnableEntryCounting</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-22025"></a> <span
@@ -6066,7 +7108,7 @@ class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">value</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 2977--><p class="noindent" >
+</p><!--l. 3499--><p class="noindent" >
The first argument &#x27E8;<span
class="ecti-1000">categories</span>&#x27E9; is a comma-separated list of categories. For each
category, the <span
@@ -6077,7 +7119,7 @@ class="ecti-1000">value</span>&#x27E9;. In addition, this does:
</p>
- <div class="verbatim" id="verbatim-68">
+ <div class="verbatim" id="verbatim-86">
\renewcommand*{\gls}{\cgls}%
&#x00A0;<br />\renewcommand*{\Gls}{\cGls}%
&#x00A0;<br />\renewcommand*{\glspl}{\cglspl}%
@@ -6085,18 +7127,18 @@ class="ecti-1000">value</span>&#x27E9;. In addition, this does:
&#x00A0;<br />\renewcommand*{\GLS}{\cGLS}%
&#x00A0;<br />\renewcommand*{\GLSpl}{\cGLSpl}%
</div>
-<!--l. 2988--><p class="nopar" > This makes it easier to enable entry-counting on existing documents.
-</p><!--l. 2992--><p class="indent" > If you use <span
+<!--l. 3510--><p class="nopar" > This makes it easier to enable entry-counting on existing documents.
+</p><!--l. 3514--><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. 2996--><p class="indent" > The above example document can then become:
+</p><!--l. 3518--><p class="indent" > The above example document can then become:
</p>
- <div class="verbatim" id="verbatim-69">
+ <div class="verbatim" id="verbatim-87">
\documentclass{article}
&#x00A0;<br />\usepackage{glossaries-extra}
&#x00A0;<br />\makeglossaries
@@ -6109,12 +7151,12 @@ class="ecss-1000">entrycount</span><a
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 3018--><p class="nopar" >
-</p><!--l. 3020--><p class="indent" > The standard entry-counting function describe above counts the number of times
+<!--l. 3540--><p class="nopar" >
+</p><!--l. 3542--><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. 3025--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3547--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrEnableEntryUnitCounting</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-22028"></a> <span
@@ -6126,22 +7168,22 @@ class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">counter-name</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 3027--><p class="noindent" >
+</p><!--l. 3549--><p class="noindent" >
where &#x27E8;<span
class="ecti-1000">categories</span>&#x27E9; is a comma-separated list of categories to which this feature should
be applied, &#x27E8;<span
class="ecti-1000">value</span>&#x27E9; is the trigger value and &#x27E8;<span
class="ecti-1000">counter-name</span>&#x27E9; is the name of the counter
used by the sectional unit.
-</p><!--l. 3033--><p class="indent" > <div class="important" title="Important Note"> Due to the asynchronous nature of <span class="TEX">T<span
+</p><!--l. 3555--><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>&#8217;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. 3037--><p class="noindent" >
-</p><!--l. 3039--><p class="indent" > Note that you can&#8217;t use both the document-wide counting and the per-unit
+</p><!--l. 3559--><p class="noindent" >
+</p><!--l. 3561--><p class="indent" > Note that you can&#8217;t use both the document-wide counting and the per-unit
counting in the same document.
-</p><!--l. 3042--><p class="indent" > The counter value is used as part of a label, which means that <span
+</p><!--l. 3564--><p class="indent" > The counter value is used as part of a label, which means that <span
class="ectt-1000">\the</span>&#x27E8;<span
class="ecti-1000">counter-name</span>&#x27E9;
needs to be expandable. Since <span
@@ -6156,7 +7198,7 @@ class="ectt-1000">\theH</span>&#x27E8;<span
class="ecti-1000">counter-name</span>&#x27E9; if it exists otherwise it will use <span
class="ectt-1000">\the</span>&#x27E8;<span
class="ecti-1000">counter-name</span>&#x27E9;.
-</p><!--l. 3049--><p class="indent" > The per-unit counting function uses two attributes: <span
+</p><!--l. 3571--><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
@@ -6165,58 +7207,58 @@ class="ecss-1000">unitcount</span><a
-</p><!--l. 3052--><p class="indent" > Both the original document-wide counting mechanism and the per-unit counting
+</p><!--l. 3574--><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. 3055--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3577--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsentrycurrcount</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-22033"></a> <span
class="ectt-1000">\glsentrycurrcount{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3057--><p class="noindent" >
+</p><!--l. 3579--><p class="noindent" >
and the final value from the previous run:
-</p><!--l. 3059--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3581--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsentryprevcount</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-22034"></a> <span
class="ectt-1000">\glsentryprevcount{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3061--><p class="noindent" >
+</p><!--l. 3583--><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 &#x27E8;<span
class="ecti-1000">label</span>&#x27E9; is the entry&#8217;s label.
-</p><!--l. 3066--><p class="indent" > The per-unit counting mechanism additionally provides:
-</p><!--l. 3067--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3588--><p class="indent" > The per-unit counting mechanism additionally provides:
+</p><!--l. 3589--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsentryprevtotalcount</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-22035"></a> <span
class="ectt-1000">\glsentryprevtotalcount{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3069--><p class="noindent" >
+</p><!--l. 3591--><p class="noindent" >
which gives the sum of all the per-unit totals from the previous run for the entry
given by &#x27E8;<span
class="ecti-1000">label</span>&#x27E9;, and
-</p><!--l. 3072--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3594--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsentryprevmaxcount</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-22036"></a> <span
class="ectt-1000">\glsentryprevmaxcount{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3074--><p class="noindent" >
+</p><!--l. 3596--><p class="noindent" >
which gives the maximum per-unit total from the previous run.
-</p><!--l. 3077--><p class="indent" > The above two commands are unavailable for the document-wide counting.
-</p><!--l. 3079--><p class="indent" > Example of per-unit counting, where the unit is the chapter:
+</p><!--l. 3599--><p class="indent" > The above two commands are unavailable for the document-wide counting.
+</p><!--l. 3601--><p class="indent" > Example of per-unit counting, where the unit is the chapter:
</p>
- <div class="verbatim" id="verbatim-70">
+ <div class="verbatim" id="verbatim-88">
\documentclass{report}
&#x00A0;<br />\usepackage{glossaries-extra}
&#x00A0;<br />\GlsXtrEnableEntryUnitCounting{abbreviation}{2}{chapter}
@@ -6235,7 +7277,7 @@ which gives the maximum per-unit total from the previous run.
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 3110--><p class="nopar" > In this document, the <span
+<!--l. 3632--><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
@@ -6249,19 +7291,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&#8217;t get a line added to the glossary
file.
-</p><!--l. 3121--><p class="indent" > The <span
+</p><!--l. 3643--><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. 3127--><p class="indent" > The <span
+</p><!--l. 3649--><p class="indent" > The <span
class="ectt-1000">sample </span>entry has only been used once, but it doesn&#8217;t trip the indexing
suppression because it&#8217;s in the <span
class="ecss-1000">general</span><a
id="dx1-22038"></a> category, which hasn&#8217;t been listed in
<span
class="ectt-1000">\GlsXtrEnableEntryUnitCounting</span>.
-</p><!--l. 3132--><p class="indent" > The per-unit entry counting can be used for other purposes. In the following
+</p><!--l. 3654--><p class="indent" > The per-unit entry counting can be used for other purposes. In the following
@@ -6270,19 +7312,19 @@ won&#8217;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. 3138--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3660--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glslinkcheckfirsthyperhook</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-22040"></a> <span
class="ectt-1000">\glslinkcheckfirsthyperhook </span></div><hr>
-</p><!--l. 3140--><p class="noindent" >
+</p><!--l. 3662--><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-71">
+ <div class="verbatim" id="verbatim-89">
\documentclass{article}
&#x00A0;<br />\usepackage[colorlinks]{hyperref}
&#x00A0;<br />\usepackage{glossaries-extra}
@@ -6303,10 +7345,10 @@ hyperlink.
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 3175--><p class="nopar" > This only produces a hyperlink for the first instance of <span class="obeylines-h"><span class="verb"><span
+<!--l. 3697--><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. 3179--><p class="indent" > The earlier warning about using the <span
+</p><!--l. 3701--><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
@@ -6317,11 +7359,11 @@ page.
</p>
-<!--l. 3184--><p class="indent" > </div>
-</p><!--l. 3184--><p class="noindent" ><a
+<!--l. 3706--><p class="indent" > </div>
+</p><!--l. 3706--><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. 3187--><p class="indent" > It&#8217;s possible that you may also want a normal index as well as the glossary,
+</p><!--l. 3709--><p class="indent" > It&#8217;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
@@ -6329,7 +7371,7 @@ class="ecss-1000">indexname</span><a
<span
class="ecss-1000">dualindex</span><a
id="dx1-23002"></a>.
-</p><!--l. 3193--><p class="indent" > The <span
+</p><!--l. 3715--><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
@@ -6346,14 +7388,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. 3202--><p class="indent" > The internal macro used by the <span
+</p><!--l. 3724--><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. 3206--><p class="indent" > In both cases, the indexing is done through
-</p><!--l. 3207--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3728--><p class="indent" > In both cases, the indexing is done through
+</p><!--l. 3729--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrdoautoindexname</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-23010"></a> <span
@@ -6363,7 +7405,7 @@ class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">attribute-label</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 3209--><p class="noindent" >
+</p><!--l. 3731--><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&#8217;s
@@ -6380,26 +7422,26 @@ encap will be the attribute value. For example:
</p>
- <div class="verbatim" id="verbatim-72">
+ <div class="verbatim" id="verbatim-90">
\glssetcategoryattribute{general}{indexname}{textbf}
</div>
-<!--l. 3218--><p class="nopar" > will set the encap to <span
+<!--l. 3740--><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-73">
+ <div class="verbatim" id="verbatim-91">
\glssetcategoryattribute{general}{dualindex}{true}
</div>
-<!--l. 3223--><p class="nopar" > won&#8217;t apply any formatting to the page number in the index.
-</p><!--l. 3226--><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. 3745--><p class="nopar" > won&#8217;t apply any formatting to the page number in the index.
+</p><!--l. 3748--><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. 3231--><p class="noindent" >
-</p><!--l. 3233--><p class="indent" > By default the <span
+</p><!--l. 3753--><p class="noindent" >
+</p><!--l. 3755--><p class="indent" > By default the <span
class="ecss-1000">format</span><a
id="dx1-23013"></a> key won&#8217;t be used with the <span
class="ecss-1000">dualindex</span><a
@@ -6408,13 +7450,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. 3237--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3759--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrEnableIndexFormatOverride</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-23016"></a> <span
class="ectt-1000">\GlsXtrEnableIndexFormatOverride</span>
</div><hr>
-</p><!--l. 3239--><p class="noindent" >
+</p><!--l. 3761--><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
@@ -6425,7 +7467,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. 3244--><p class="indent" > <div class="important" title="Important Note"> The <span
+</p><!--l. 3766--><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
@@ -6438,8 +7480,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. 3250--><p class="noindent" >
-</p><!--l. 3252--><p class="indent" > The <span
+</p><!--l. 3772--><p class="noindent" >
+</p><!--l. 3774--><p class="indent" > The <span
class="ectt-1000">\glsxtrdoautoindexname </span>command will attempt to escape any of
<span
class="ectt-1000">\makeindex</span><a
@@ -6459,41 +7501,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. 3260--><p class="indent" > If this isn&#8217;t the case, you can use the following preamble-only commands to set
+</p><!--l. 3782--><p class="indent" > If this isn&#8217;t the case, you can use the following preamble-only commands to set
the correct characters.
-</p><!--l. 3262--><p class="indent" > <div class="important" title="Important Note"> Be very careful of possible shifting category codes! </div>
-</p><!--l. 3264--><p class="noindent" >
-</p><!--l. 3266--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3784--><p class="indent" > <div class="important" title="Important Note"> Be very careful of possible shifting category codes! </div>
+</p><!--l. 3786--><p class="noindent" >
+</p><!--l. 3788--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrSetActualChar</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-23032"></a> <span
class="ectt-1000">\GlsXtrSetActualChar{</span>&#x27E8;<span
class="ecit-1000">char</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3268--><p class="noindent" >
+</p><!--l. 3790--><p class="noindent" >
Set the actual character to &#x27E8;<span
class="ecti-1000">char</span>&#x27E9;.
-</p><!--l. 3271--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3793--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrSetLevelChar</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-23033"></a> <span
class="ectt-1000">\GlsXtrSetLevelChar{</span>&#x27E8;<span
class="ecit-1000">char</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3273--><p class="noindent" >
+</p><!--l. 3795--><p class="noindent" >
Set the level character to &#x27E8;<span
class="ecti-1000">char</span>&#x27E9;.
-</p><!--l. 3276--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3798--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrSetEscChar</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-23034"></a> <span
class="ectt-1000">\GlsXtrSetEscChar{</span>&#x27E8;<span
class="ecit-1000">char</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3278--><p class="noindent" >
+</p><!--l. 3800--><p class="noindent" >
Set the escape (quote) character to &#x27E8;<span
class="ecti-1000">char</span>&#x27E9;.
-</p><!--l. 3281--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3803--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrSetEncapChar</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-23035"></a> <span
@@ -6503,18 +7545,18 @@ class="ectt-1000">} </span></div><hr>
-</p><!--l. 3283--><p class="noindent" >
+</p><!--l. 3805--><p class="noindent" >
Set the encap character to &#x27E8;<span
class="ecti-1000">char</span>&#x27E9;.
</p>
-<!--l. 3286--><p class="indent" > </div>
-</p><!--l. 3286--><p class="noindent" ><a
+<!--l. 3808--><p class="indent" > </div>
+</p><!--l. 3808--><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. 3289--><p class="indent" > <div class="important" title="Important Note"> The commands described here may superficially look like &#x27E8;<span
+</p><!--l. 3811--><p class="indent" > <div class="important" title="Important Note"> The commands described here may superficially look like &#x27E8;<span
class="ecti-1000">word</span>&#x27E9;<span
class="ectt-1000">\index{</span>&#x27E8;<span
class="ecti-1000">word</span>&#x27E9;<span
@@ -6523,8 +7565,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. 3294--><p class="noindent" >
-</p><!--l. 3296--><p class="indent" > The <span
+</p><!--l. 3816--><p class="noindent" >
+</p><!--l. 3818--><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
@@ -6538,7 +7580,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. 3302--><p class="indent" > Although this can be problematic, the <span
+</p><!--l. 3824--><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
@@ -6550,14 +7592,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. 3308--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3830--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrEnableOnTheFly</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-24008"></a> <span
class="ectt-1000">\GlsXtrEnableOnTheFly </span></div><hr>
-</p><!--l. 3310--><p class="noindent" >
+</p><!--l. 3832--><p class="noindent" >
When used, this defines the commands described below.
-</p><!--l. 3313--><p class="indent" > <div class="important" title="Important Note"> The commands <span
+</p><!--l. 3835--><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
@@ -6568,8 +7610,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. 3319--><p class="noindent" >
-</p><!--l. 3321--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3841--><p class="noindent" >
+</p><!--l. 3843--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtr</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-24010"></a> <span
@@ -6580,7 +7622,7 @@ class="ecit-1000">dfn-options</span>&#x27E9;<span
class="ectt-1000">]{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3323--><p class="noindent" >
+</p><!--l. 3845--><p class="noindent" >
If an entry with the label &#x27E8;<span
class="ecti-1000">label</span>&#x27E9; has already been defined, this just does
<span
@@ -6608,7 +7650,7 @@ class="ecit-1000">dfn-options</span>&#x27E9;<span
class="ectt-1000">}</span>
</div>
</div>
-<!--l. 3335--><p class="indent" > <div class="important" title="Important Note"> The &#x27E8;<span
+<!--l. 3857--><p class="indent" > <div class="important" title="Important Note"> The &#x27E8;<span
class="ecti-1000">label</span>&#x27E9; 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 &#x27E8;<span
@@ -6617,15 +7659,15 @@ class="ecss-1000">name</span><a
id="dx1-24011"></a> key must be provided in the optional
argument &#x27E8;<span
class="ecti-1000">dfn-options</span>&#x27E9;. </div>
-</p><!--l. 3341--><p class="noindent" >
+</p><!--l. 3863--><p class="noindent" >
-</p><!--l. 3343--><p class="indent" > The second optional argument &#x27E8;<span
+</p><!--l. 3865--><p class="indent" > The second optional argument &#x27E8;<span
class="ecti-1000">dfn-options</span>&#x27E9; should be empty if the entry has
already been defined, since it&#8217;s too late for them. If it&#8217;s not empty, a&#x00A0;warning will be
generated with
-</p><!--l. 3346--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3868--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrWarning</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-24012"></a> <span
@@ -6634,39 +7676,39 @@ class="ecit-1000">dfn-options</span>&#x27E9;<span
class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3348--><p class="noindent" >
-</p><!--l. 3350--><p class="indent" > For example, this warning will be generated on the second instance of <span
+</p><!--l. 3870--><p class="noindent" >
+</p><!--l. 3872--><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-74">
+ <div class="verbatim" id="verbatim-92">
\glsxtr[][plural=geese]{goose}
&#x00A0;<br />&#x00A0;...&#x00A0;later
&#x00A0;<br />\glsxtr[][plural=geese]{goose}
</div>
-<!--l. 3356--><p class="nopar" >
-</p><!--l. 3358--><p class="indent" > If you are considering doing something like:
+<!--l. 3878--><p class="nopar" >
+</p><!--l. 3880--><p class="indent" > If you are considering doing something like:
</p>
- <div class="verbatim" id="verbatim-75">
+ <div class="verbatim" id="verbatim-93">
\newcommand*{\goose}{\glsxtr[][plural=geese]{goose}}
&#x00A0;<br />\renewcommand*{\GlsXtrWarning}[2]{}
&#x00A0;<br />&#x00A0;...&#x00A0;later
&#x00A0;<br />\goose\&#x00A0;some&#x00A0;more&#x00A0;text&#x00A0;here
</div>
-<!--l. 3364--><p class="nopar" > then don&#8217;t bother. It&#8217;s simpler and less problematic to just define the entries in the
+<!--l. 3886--><p class="nopar" > then don&#8217;t bother. It&#8217;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. 3369--><p class="indent" > There are plural and case-changing alternatives to <span
+</p><!--l. 3891--><p class="indent" > There are plural and case-changing alternatives to <span
class="ectt-1000">\glsxtr</span>:
-</p><!--l. 3370--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3892--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsxtrpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-24014"></a> <span
@@ -6677,12 +7719,12 @@ class="ecit-1000">dfn-options</span>&#x27E9;<span
class="ectt-1000">]{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3372--><p class="noindent" >
+</p><!--l. 3894--><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. 3375--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3897--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsxtr</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-24015"></a> <span
@@ -6693,12 +7735,12 @@ class="ecit-1000">dfn-options</span>&#x27E9;<span
class="ectt-1000">]{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3377--><p class="noindent" >
+</p><!--l. 3899--><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. 3380--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3902--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsxtrpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-24016"></a> <span
@@ -6709,12 +7751,12 @@ class="ecit-1000">dfn-options</span>&#x27E9;<span
class="ectt-1000">]{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3382--><p class="noindent" >
+</p><!--l. 3904--><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. 3385--><p class="indent" > If you use UTF-8 and don&#8217;t want the inconvenient of needing to use an
+</p><!--l. 3907--><p class="indent" > If you use UTF-8 and don&#8217;t want the inconvenient of needing to use an
ASCII-only label, then it&#8217;s better to use <span class="HoLogo-XeLaTeX"><span class="HoLogo-Xe">X<span class="HoLogo-e">&#x018e;</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>&#x00A0;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>&#x00A0;instead of
<span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
class="E">E</span>X</span></span>&#x00A0;(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
@@ -6723,20 +7765,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 &#x27E8;<span
class="ecti-1000">label</span>&#x27E9;, but it&#8217;s
experimental and may not work in some cases.
-</p><!--l. 3394--><p class="indent" > <div class="important" title="Important Note"> If you use the starred version of <span
+</p><!--l. 3916--><p class="indent" > <div class="important" title="Important Note"> If you use the starred version of <span
class="ectt-1000">\GlsXtrEnableOnTheFly </span>don&#8217;t use any
commands in the &#x27E8;<span
class="ecti-1000">label</span>&#x27E9;, even if they expand to just text. </div>
-</p><!--l. 3398--><p class="noindent" >
+</p><!--l. 3920--><p class="noindent" >
</p>
-<!--l. 3400--><p class="indent" > </div>
-</p><!--l. 3400--><p class="noindent" ><a
+<!--l. 3922--><p class="indent" > </div>
+</p><!--l. 3922--><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. 3403--><p class="indent" > The <span
+</p><!--l. 3925--><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
@@ -6746,10 +7788,10 @@ class="ecss-1000">glossaries-accsupp</span><a
id="dx1-25003"></a> (for accessibility support). These packages aren&#8217;t
automatically loaded.
</p>
-<!--l. 3408--><p class="noindent" ><a
+<!--l. 3930--><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. 3411--><p class="noindent" >If prefixing is required, you can simply load <span
+<!--l. 3933--><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
@@ -6758,7 +7800,7 @@ example:
</p>
- <div class="verbatim" id="verbatim-76">
+ <div class="verbatim" id="verbatim-94">
\documentclass{article}
&#x00A0;<br />\usepackage{glossaries-extra}
&#x00A0;<br />\usepackage{glossaries-prefix}
@@ -6773,13 +7815,13 @@ example:
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 3434--><p class="nopar" >
-</p><!--l. 3436--><p class="noindent" >
+<!--l. 3956--><p class="nopar" >
+</p><!--l. 3958--><p class="noindent" >
</p>
-<!--l. 3436--><p class="noindent" ><a
+<!--l. 3958--><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. 3439--><p class="noindent" >The <span
+<!--l. 3961--><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
@@ -6790,10 +7832,10 @@ class="ecss-1000">accsupp</span><a
</p>
- <div class="verbatim" id="verbatim-77">
+ <div class="verbatim" id="verbatim-95">
\usepackage[accsupp]{glossaries-extra}
</div>
-<!--l. 3444--><p class="nopar" > If you don&#8217;t load <span
+<!--l. 3966--><p class="nopar" > If you don&#8217;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
@@ -6805,7 +7847,7 @@ class="ecti-1000">xxx</span>&#x27E9; commands described below will simply be equ
corresponding <span
class="ectt-1000">\glsentry</span>&#x27E8;<span
class="ecti-1000">xxx</span>&#x27E9; commands.
-</p><!--l. 3451--><p class="indent" > The following <span
+</p><!--l. 3973--><p class="indent" > The following <span
class="ectt-1000">\glsaccess</span>&#x27E8;<span
class="ecti-1000">xxx</span>&#x27E9; commands add accessibility information wrapped
around the corresponding <span
@@ -6813,34 +7855,34 @@ class="ectt-1000">\glsentry</span>&#x27E8;<span
class="ecti-1000">xxx</span>&#x27E9; commands. There is no check for existence
of the entry nor do any of these commands add formatting, hyperlinks or indexing
information.
-</p><!--l. 3456--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 3978--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsaccessname</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27005"></a> <span
class="ectt-1000">\glsaccessname{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3458--><p class="noindent" >
+</p><!--l. 3980--><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 &#x27E8;<span
class="ecti-1000">label</span>&#x27E9;.
-</p><!--l. 3462--><p class="indent" > If the <span
+</p><!--l. 3984--><p class="indent" > If the <span
class="ecss-1000">glossaries-accsupp</span><a
id="dx1-27007"></a> package isn&#8217;t loaded, this is simply defined as:
</p>
- <div class="verbatim" id="verbatim-78">
+ <div class="verbatim" id="verbatim-96">
\newcommand*{\glsaccessname}[1]{\glsentryname{#1}}
</div>
-<!--l. 3466--><p class="nopar" > otherwise it&#8217;s defined as:
+<!--l. 3988--><p class="nopar" > otherwise it&#8217;s defined as:
</p>
- <div class="verbatim" id="verbatim-79">
+ <div class="verbatim" id="verbatim-97">
\newcommand*{\glsaccessname}[1]{%
&#x00A0;<br />&#x00A0;&#x00A0;\glsnameaccessdisplay
&#x00A0;<br />&#x00A0;&#x00A0;{%
@@ -6849,20 +7891,20 @@ class="ecss-1000">glossaries-accsupp</span><a
&#x00A0;<br />&#x00A0;&#x00A0;{#1}%
&#x00A0;<br />}
</div>
-<!--l. 3476--><p class="nopar" > (<span
+<!--l. 3998--><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. 3480--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4002--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsaccessname</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27010"></a> <span
class="ectt-1000">\Glsaccessname{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3482--><p class="noindent" >
+</p><!--l. 4004--><p class="noindent" >
Without the <span
class="ecss-1000">glossaries-accsupp</span><a
id="dx1-27011"></a> package this is just defined as:
@@ -6870,17 +7912,17 @@ class="ecss-1000">glossaries-accsupp</span><a
</p>
- <div class="verbatim" id="verbatim-80">
+ <div class="verbatim" id="verbatim-98">
\newcommand*{\Glsaccessname}[1]{\Glsentryname{#1}}
</div>
-<!--l. 3487--><p class="nopar" > With the <span
+<!--l. 4009--><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-81">
+ <div class="verbatim" id="verbatim-99">
\newcommand*{\Glsaccessname}[1]{%
&#x00A0;<br />&#x00A0;&#x00A0;\glsnameaccessdisplay
&#x00A0;<br />&#x00A0;&#x00A0;{%
@@ -6889,112 +7931,112 @@ class="ecss-1000">glossaries-accsupp</span><a
&#x00A0;<br />&#x00A0;&#x00A0;{#1}%
&#x00A0;<br />}
</div>
-<!--l. 3497--><p class="nopar" >
-</p><!--l. 3499--><p class="indent" > The following commands are all defined in an analogous manner.
-</p><!--l. 3500--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 4019--><p class="nopar" >
+</p><!--l. 4021--><p class="indent" > The following commands are all defined in an analogous manner.
+</p><!--l. 4022--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsaccesstext</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27013"></a> <span
class="ectt-1000">\glsaccesstext{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3502--><p class="noindent" >
+</p><!--l. 4024--><p class="noindent" >
This displays the value of the <span
class="ecss-1000">text</span><a
id="dx1-27014"></a> field.
-</p><!--l. 3505--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4027--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsaccesstext</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27015"></a> <span
class="ectt-1000">\Glsaccesstext{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3507--><p class="noindent" >
+</p><!--l. 4029--><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. 3511--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4033--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsaccessplural</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27017"></a> <span
class="ectt-1000">\glsaccessplural{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3513--><p class="noindent" >
+</p><!--l. 4035--><p class="noindent" >
This displays the value of the <span
class="ecss-1000">plural</span><a
id="dx1-27018"></a> field.
-</p><!--l. 3516--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4038--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsaccessplural</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27019"></a> <span
class="ectt-1000">\Glsaccessplural{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3518--><p class="noindent" >
+</p><!--l. 4040--><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. 3522--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4044--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsaccessfirst</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27021"></a> <span
class="ectt-1000">\glsaccessfirst{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3524--><p class="noindent" >
+</p><!--l. 4046--><p class="noindent" >
This displays the value of the <span
class="ecss-1000">first</span><a
id="dx1-27022"></a> field.
-</p><!--l. 3527--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4049--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsaccessfirst</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27023"></a> <span
class="ectt-1000">\Glsaccessfirst{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3529--><p class="noindent" >
+</p><!--l. 4051--><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. 3533--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4055--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsaccessfirstplural</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27025"></a> <span
class="ectt-1000">\glsaccessfirstplural{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3535--><p class="noindent" >
+</p><!--l. 4057--><p class="noindent" >
This displays the value of the <span
class="ecss-1000">firstplural</span><a
id="dx1-27026"></a> field.
-</p><!--l. 3538--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4060--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsaccessfirstplural</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27027"></a> <span
class="ectt-1000">\Glsaccessfirstplural{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3540--><p class="noindent" >
+</p><!--l. 4062--><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. 3544--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4066--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsaccesssymbol</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27029"></a> <span
class="ectt-1000">\glsaccesssymbol{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3546--><p class="noindent" >
+</p><!--l. 4068--><p class="noindent" >
This displays the value of the <span
class="ecss-1000">symbol</span><a
id="dx1-27030"></a> field.
-</p><!--l. 3549--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4071--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsaccesssymbol</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27031"></a> <span
@@ -7004,150 +8046,150 @@ class="ectt-1000">} </span></div><hr>
-</p><!--l. 3551--><p class="noindent" >
+</p><!--l. 4073--><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. 3555--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4077--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsaccesssymbolplural</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27033"></a> <span
class="ectt-1000">\glsaccesssymbolplural{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3557--><p class="noindent" >
+</p><!--l. 4079--><p class="noindent" >
This displays the value of the <span
class="ecss-1000">symbolplural</span><a
id="dx1-27034"></a> field.
-</p><!--l. 3560--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4082--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsaccesssymbolplural</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27035"></a> <span
class="ectt-1000">\Glsaccesssymbolplural{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3562--><p class="noindent" >
+</p><!--l. 4084--><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. 3566--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4088--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsaccessdesc</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27037"></a> <span
class="ectt-1000">\glsaccessdesc{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3568--><p class="noindent" >
+</p><!--l. 4090--><p class="noindent" >
This displays the value of the <span
class="ecss-1000">desc</span><a
id="dx1-27038"></a> field.
-</p><!--l. 3571--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4093--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsaccessdesc</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27039"></a> <span
class="ectt-1000">\Glsaccessdesc{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3573--><p class="noindent" >
+</p><!--l. 4095--><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. 3577--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4099--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsaccessdescplural</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27041"></a> <span
class="ectt-1000">\glsaccessdescplural{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3579--><p class="noindent" >
+</p><!--l. 4101--><p class="noindent" >
This displays the value of the <span
class="ecss-1000">descplural</span><a
id="dx1-27042"></a> field.
-</p><!--l. 3582--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4104--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsaccessdescplural</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27043"></a> <span
class="ectt-1000">\Glsaccessdescplural{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3584--><p class="noindent" >
+</p><!--l. 4106--><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. 3588--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4110--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsaccessshort</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27045"></a> <span
class="ectt-1000">\glsaccessshort{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3590--><p class="noindent" >
+</p><!--l. 4112--><p class="noindent" >
This displays the value of the <span
class="ecss-1000">short</span><a
id="dx1-27046"></a> field.
-</p><!--l. 3593--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4115--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsaccessshort</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27047"></a> <span
class="ectt-1000">\Glsaccessshort{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3595--><p class="noindent" >
+</p><!--l. 4117--><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. 3599--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4121--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsaccessshortpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27049"></a> <span
class="ectt-1000">\glsaccessshortpl{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3601--><p class="noindent" >
+</p><!--l. 4123--><p class="noindent" >
This displays the value of the <span
class="ecss-1000">shortplural</span><a
id="dx1-27050"></a> field.
-</p><!--l. 3604--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4126--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsaccessshortpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27051"></a> <span
class="ectt-1000">\Glsaccessshortpl{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3606--><p class="noindent" >
+</p><!--l. 4128--><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. 3610--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4132--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsaccesslong</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27053"></a> <span
class="ectt-1000">\glsaccesslong{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3612--><p class="noindent" >
+</p><!--l. 4134--><p class="noindent" >
This displays the value of the <span
class="ecss-1000">long</span><a
id="dx1-27054"></a> field.
-</p><!--l. 3615--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4137--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsaccesslong</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27055"></a> <span
class="ectt-1000">\Glsaccesslong{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3617--><p class="noindent" >
+</p><!--l. 4139--><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. 3621--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4143--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\glsaccesslongpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27057"></a> <span
@@ -7157,18 +8199,18 @@ class="ectt-1000">} </span></div><hr>
-</p><!--l. 3623--><p class="noindent" >
+</p><!--l. 4145--><p class="noindent" >
This displays the value of the <span
class="ecss-1000">longplural</span><a
id="dx1-27058"></a> field.
-</p><!--l. 3626--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4148--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\Glsaccesslongpl</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-27059"></a> <span
class="ectt-1000">\Glsaccesslongpl{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3628--><p class="noindent" >
+</p><!--l. 4150--><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
@@ -7177,11 +8219,11 @@ case.
</p>
-<!--l. 3632--><p class="indent" > </div>
-</p><!--l. 3632--><p class="noindent" ><a
+<!--l. 4154--><p class="indent" > </div>
+</p><!--l. 4154--><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. 3635--><p class="indent" > The following sample files are provided with this package:
+</p><!--l. 4157--><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
@@ -7196,6 +8238,11 @@ class="description">General entries, acronyms and initialisms all treated
differently.
</dd><dt class="description">
<span
+class="ecbx-1000">sample-name-font</span> </dt><dd
+class="description">Categories and attributes are used to customize the way
+ different entries appear.
+ </dd><dt class="description">
+<span
class="ecbx-1000">sample-abbrv.tex</span> </dt><dd
class="description">General abbreviations.
</dd><dt class="description">
@@ -7240,13 +8287,13 @@ class="description">Different abbreviation styles for different
<span
class="ecbx-1000">sample-initialisms.tex</span> </dt><dd
class="description">Automatically insert dots into initialisms.
+
+
+
</dd><dt class="description">
<span
class="ecbx-1000">sample-postdot.tex</span> </dt><dd
class="description">Another initialisms example.
-
-
-
</dd><dt class="description">
<span
class="ecbx-1000">sample-postlink.tex</span> </dt><dd
@@ -7297,6 +8344,10 @@ class="ecbx-1000">sample-unitentrycount.tex</span> </dt><dd
class="description">Enable use of per-unit entry-use counting.
</dd><dt class="description">
<span
+class="ecbx-1000">sample-pages.tex</span> </dt><dd
+class="description">Insert &#8220;page&#8221; or &#8220;pages&#8221; before the location list.
+ </dd><dt class="description">
+<span
class="ecbx-1000">sample-onelink.tex</span> </dt><dd
class="description">Using the per-unit entry counting to only have one
hyperlink per entry per page.
@@ -7324,6 +8375,9 @@ class="ecss-1000">name</span><a
class="ecss-1000">name</span><a
id="dx1-28012"></a> key explicitly set
with the commands removed from the label.
+
+
+
</dd><dt class="description">
<span
class="ecbx-1000">sample-onthefly-utf8.tex</span> </dt><dd
@@ -7337,9 +8391,6 @@ class="ectt-1000">\GlsXtrEnableOnTheFly</span><a
class="ecss-1000">name</span><a
id="dx1-28014"></a> key explicitly set with the commands removed from
the label.
-
-
-
</dd><dt class="description">
<span
class="ecbx-1000">sample-accsupp.tex</span> </dt><dd
@@ -7356,11 +8407,11 @@ class="ecss-1000">glossaries-prefix</span><a
-<!--l. 3721--><p class="indent" > </div>
-</p><!--l. 3721--><p class="noindent" ><a
+<!--l. 4249--><p class="indent" > </div>
+</p><!--l. 4249--><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. 3724--><p class="indent" > There&#8217;s only one command provided by <span
+</p><!--l. 4252--><p class="indent" > There&#8217;s only one command provided by <span
class="ecss-1000">glossaries-extra </span>that you&#8217;re likely to want
to change in your document and that&#8217;s <span
class="ectt-1000">\abbreviationsname</span><a
@@ -7380,15 +8431,15 @@ class="ectt-1000">\acronymname </span>(provided by
<span
class="ecss-1000">glossaries</span><a
id="dx1-29004"></a>).
-</p><!--l. 3734--><p class="indent" > You can redefine it in the usual way. For example:
+</p><!--l. 4262--><p class="indent" > You can redefine it in the usual way. For example:
</p>
- <div class="verbatim" id="verbatim-82">
+ <div class="verbatim" id="verbatim-100">
\renewcommand*{\abbreviationsname}{List&#x00A0;of&#x00A0;Abbreviations}
</div>
-<!--l. 3737--><p class="nopar" > Or using <span
+<!--l. 4265--><p class="nopar" > Or using <span
class="ecss-1000">babel</span><a
id="dx1-29005"></a> or <span
class="ecss-1000">polyglossia</span><a
@@ -7397,13 +8448,13 @@ class="ecss-1000">polyglossia</span><a
</p>
- <div class="verbatim" id="verbatim-83">
+ <div class="verbatim" id="verbatim-101">
\appto\captionsenglish{%
&#x00A0;<br />&#x00A0;\renewcommand*{\abbreviationsname}{List&#x00A0;of&#x00A0;Abbreviations}%
&#x00A0;<br />}
</div>
-<!--l. 3743--><p class="nopar" >
-</p><!--l. 3745--><p class="indent" > Alternatively you can use the <span
+<!--l. 4271--><p class="nopar" >
+</p><!--l. 4273--><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:
@@ -7411,24 +8462,24 @@ For example:
</p>
- <div class="verbatim" id="verbatim-84">
+ <div class="verbatim" id="verbatim-102">
\printabbreviations[title={List&#x00A0;of&#x00A0;Abbreviations}]
</div>
-<!--l. 3749--><p class="nopar" > or
+<!--l. 4277--><p class="nopar" > or
</p>
- <div class="verbatim" id="verbatim-85">
+ <div class="verbatim" id="verbatim-103">
\printglossary[type=abbreviations,title={List&#x00A0;of&#x00A0;Abbreviations}]
</div>
-<!--l. 3753--><p class="nopar" >
-</p><!--l. 3755--><p class="indent" > The other fixed text commands are the diagnostic messages, which shouldn&#8217;t
+<!--l. 4281--><p class="nopar" >
+</p><!--l. 4283--><p class="indent" > The other fixed text commands are the diagnostic messages, which shouldn&#8217;t
appear in the final draft of your document.
-</p><!--l. 3758--><p class="indent" > The <span
+</p><!--l. 4286--><p class="indent" > The <span
class="ecss-1000">glossaries-extra </span>package has the facility to load language modules if they exist,
but won&#8217;t warn if they don&#8217;t.
-</p><!--l. 3761--><p class="indent" > If you want to write your own language module, you just need to create a file
+</p><!--l. 4289--><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>&#x27E8;<span
class="ecti-1000">lang</span>&#x27E9;<span
@@ -7438,12 +8489,12 @@ class="ecss-1000">tracklang</span><a
id="dx1-29008"></a>
package). For example, <span
class="ectt-1000">glossariesxtr-french.ldf</span>.
-</p><!--l. 3767--><p class="indent" > The simplest code for this file is:
+</p><!--l. 4295--><p class="indent" > The simplest code for this file is:
</p>
- <div class="verbatim" id="verbatim-86">
+ <div class="verbatim" id="verbatim-104">
\ProvidesGlossariesExtraLang{french}[2015/12/09&#x00A0;v1.0]
&#x00A0;<br />\newcommand*{\glossariesxtrcaptionsfrench}{%
&#x00A0;<br />&#x00A0;\def\abbreviationsname{Abr\&#8217;eviations}%
@@ -7469,8 +8520,8 @@ class="ectt-1000">glossariesxtr-french.ldf</span>.
&#x00A0;<br />&#x00A0;&#x00A0;\glossariesxtrcaptionsfrench
&#x00A0;<br />}
</div>
-<!--l. 3795--><p class="nopar" >
-</p><!--l. 3797--><p class="indent" > You can adapt this for other languages by replacing all instances of the language
+<!--l. 4323--><p class="nopar" >
+</p><!--l. 4325--><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\&#8217;eviations</span></span></span> as appropriate. This <span
@@ -7481,9 +8532,9 @@ class="E">E</span>X</span>&#8217;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&#8217;t send it to me. I already have more packages than I
am able to maintain.)
-</p><!--l. 3806--><p class="indent" > If you additionally want to provide translations for the diagnostic messages used
+</p><!--l. 4334--><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. 3809--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4337--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrNoGlsWarningHead</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-29009"></a> <span
@@ -7493,39 +8544,39 @@ class="ectt-1000">}{</span>&#x27E8;<span
class="ecit-1000">file</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 3811--><p class="noindent" >
+</p><!--l. 4339--><p class="noindent" >
This produces the following text in English:
</p><div class="quote">
- <!--l. 3814--><p class="noindent" >This document is incomplete. The external file associated with the
+ <!--l. 4342--><p class="noindent" >This document is incomplete. The external file associated with the
glossary &#8216;&#x27E8;<span
class="ecti-1000">label</span>&#x27E9;&#8217; (which should be called &#x27E8;<span
class="ecit-1000">file</span>&#x27E9;) hasn&#8217;t been created.</p></div>
-<!--l. 3817--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 4345--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrNoGlsWarningEmptyStart</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-29010"></a> <span
class="ectt-1000">\GlsXtrNoGlsWarningEmptyStart </span></div><hr>
-</p><!--l. 3819--><p class="noindent" >
+</p><!--l. 4347--><p class="noindent" >
This produces the following text in English:
</p><div class="quote">
- <!--l. 3822--><p class="noindent" >This has probably happened because there are no entries defined in
+ <!--l. 4350--><p class="noindent" >This has probably happened because there are no entries defined in
this glossary.</p></div>
-<!--l. 3825--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 4353--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrNoGlsWarningEmptyMain</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-29011"></a> <span
class="ectt-1000">\GlsXtrNoGlsWarningEmptyMain </span></div><hr>
-</p><!--l. 3827--><p class="noindent" >
+</p><!--l. 4355--><p class="noindent" >
This produces the following text in English:
</p><div class="quote">
- <!--l. 3830--><p class="noindent" >If you don&#8217;t want this glossary, add <span
+ <!--l. 4358--><p class="noindent" >If you don&#8217;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. 3833--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 4361--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrNoGlsWarningEmptyNotMain</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-29012"></a> <span
@@ -7533,10 +8584,10 @@ class="ectt-1000">\GlsXtrNoGlsWarningEmptyNotMain{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 3835--><p class="noindent" >
+</p><!--l. 4363--><p class="noindent" >
This produces the following text in English:
</p><div class="quote">
- <!--l. 3838--><p class="noindent" >Did you forget to use <span
+ <!--l. 4366--><p class="noindent" >Did you forget to use <span
class="ectt-1000">type=</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9; when you defined your entries?
If you tried to load entries into this glossary with <span
@@ -7548,7 +8599,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. 3841--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 4369--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrNoGlsWarningCheckFile</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-29013"></a> <span
@@ -7556,25 +8607,25 @@ class="ectt-1000">\GlsXtrNoGlsWarningCheckFile{</span>&#x27E8;<span
class="ecit-1000">file</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 3843--><p class="noindent" >
+</p><!--l. 4371--><p class="noindent" >
This produces the following text in English:
</p><div class="quote">
- <!--l. 3846--><p class="noindent" >Check the contents of the file &#x27E8;<span
+ <!--l. 4374--><p class="noindent" >Check the contents of the file &#x27E8;<span
class="ecit-1000">file</span>&#x27E9;. If it&#8217;s empty, that means you
haven&#8217;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&#8217;t be generated. If the file isn&#8217;t
empty, the document build process hasn&#8217;t been completed.</p></div>
-<!--l. 3849--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 4377--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrNoGlsWarningMisMatch</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-29014"></a> <span
class="ectt-1000">\GlsXtrNoGlsWarningMisMatch </span></div><hr>
-</p><!--l. 3851--><p class="noindent" >
+</p><!--l. 4379--><p class="noindent" >
This produces the following text in English:
</p><div class="quote">
- <!--l. 3854--><p class="noindent" >You need
+ <!--l. 4382--><p class="noindent" >You need
to either replace <span
class="ectt-1000">\makenoidxglossaries </span>with <span
class="ectt-1000">\makeglossaries </span>or
@@ -7588,17 +8639,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. 3857--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 4385--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrNoGlsWarningNoOut</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-29015"></a> <span
class="ectt-1000">\GlsXtrNoGlsWarningNoOut{</span>&#x27E8;<span
class="ecit-1000">file</span>&#x27E9;<span
class="ectt-1000">} </span></div><hr>
-</p><!--l. 3859--><p class="noindent" >
+</p><!--l. 4387--><p class="noindent" >
This produces the following text in English:
</p><div class="quote">
- <!--l. 3862--><p class="noindent" >The file &#x27E8;<span
+ <!--l. 4390--><p class="noindent" >The file &#x27E8;<span
class="ecit-1000">file</span>&#x27E9; doesn&#8217;t exist. This most likely means you haven&#8217;t used
<span
class="ectt-1000">\makeglossaries </span>or you have used <span
@@ -7606,25 +8657,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. 3865--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 4393--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrNoGlsWarningTail</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-29016"></a> <span
class="ectt-1000">\GlsXtrNoGlsWarningTail </span></div><hr>
-</p><!--l. 3867--><p class="noindent" >
+</p><!--l. 4395--><p class="noindent" >
This produces the following text in English:
</p><div class="quote">
- <!--l. 3870--><p class="noindent" >This message will be removed once the problem has been fixed.</p></div>
-<!--l. 3873--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 4398--><p class="noindent" >This message will be removed once the problem has been fixed.</p></div>
+<!--l. 4401--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrNoGlsWarningBuildInfo</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-29017"></a> <span
class="ectt-1000">\GlsXtrNoGlsWarningBuildInfo </span></div><hr>
-</p><!--l. 3875--><p class="noindent" >
+</p><!--l. 4403--><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. 3880--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4408--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="ectt-0900">\GlsXtrNoGlsWarningAutoMake</span><span
class="ectt-0900">&#x00A0;</span></span><a
id="dx1-29018"></a> <span
@@ -7632,7 +8683,7 @@ class="ectt-1000">\GlsXtrNoGlsWarningAutoMake{</span>&#x27E8;<span
class="ecit-1000">label</span>&#x27E9;<span
class="ectt-1000">}</span>
</div><hr>
-</p><!--l. 3882--><p class="noindent" >
+</p><!--l. 4410--><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
@@ -7775,1714 +8826,1989 @@ class="description">An flexible indexing application with multilingual support w
<h2 class="likechapterHead"><a
id="x1-3100010"></a>Index</h2> <span
class="ecbx-1000">A</span>
- <div class="theindex"><span class="index-item">abbreviation styles:<br /></span>
-<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
-class="ecss-1000">footnote</span>&#x00A0;&#x00A0;<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
-href="glossaries-extra-manual.html#dx1-18068" >5</a>, <a
-href="glossaries-extra-manual.html#dx1-18071" >6</a>, <a
-href="glossaries-extra-manual.html#dx1-19021" >7</a> <br /></span>
+ <div class="theindex"><span class="index-item">abbreviation styles (deprecated):<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">footnote-em</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18067" >8</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-18125" >1</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">footnote-sc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18061" >9</a>, <a
-href="glossaries-extra-manual.html#dx1-19041" >10</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-18117" >2</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">footnote-sm</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18064" >11</a>, <a
-href="glossaries-extra-manual.html#dx1-19042" >12</a> <br /></span>
-<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
-class="ecss-1000">long</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-14002" >13</a>, <a
-href="glossaries-extra-manual.html#dx1-17046" >14</a>, <a
-href="glossaries-extra-manual.html#dx1-17051" >15</a>, <a
-href="glossaries-extra-manual.html#dx1-17055" >16</a>, <a
-href="glossaries-extra-manual.html#dx1-17058" >17</a> <br /></span>
-<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
-class="ecss-1000">long-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-9042" >18</a>, <a
-href="glossaries-extra-manual.html#dx1-17031" >19</a>, <a
-href="glossaries-extra-manual.html#dx1-17037" >20</a>, <a
-href="glossaries-extra-manual.html#dx1-17041" >21</a>, <a
-href="glossaries-extra-manual.html#dx1-17044" >22</a>, <a
-href="glossaries-extra-manual.html#dx1-17047" >23</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-18121" >3</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">long-desc-em</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17043" >24</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-17067" >4</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">long-desc-sc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17036" >25</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-17059" >5</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">long-desc-sm</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17040" >26</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-17063" >6</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">long-em</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17057" >27</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-17092" >7</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">long-sc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17050" >28</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-17084" >8</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">long-sm</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17088" >9</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">postfootnote-em</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18148" >10</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">postfootnote-sc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18140" >11</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">postfootnote-sm</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18144" >12</a> <br /></span>
+<span class="index-item">abbreviation styles:<br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">footnote</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18112" >13</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">long</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17078" >14</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">long-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17053" >15</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">long-em-noshort-em</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17093" >16</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">long-em-noshort-em-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17068" >17</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">long-em-short-em</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-16044" >18</a>, <a
+href="glossaries-extra-manual.html#dx1-18018" >19</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">long-em-short-em-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18049" >20</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">long-noshort</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-14002" >21</a>, <a
+href="glossaries-extra-manual.html#dx1-17073" >22</a>, <a
+href="glossaries-extra-manual.html#dx1-17079" >23</a>, <a
+href="glossaries-extra-manual.html#dx1-17081" >24</a>, <a
+href="glossaries-extra-manual.html#dx1-17086" >25</a>, <a
+href="glossaries-extra-manual.html#dx1-17090" >26</a>, <a
+href="glossaries-extra-manual.html#dx1-17094" >27</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">long-noshort-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-9042" >28</a>, <a
+href="glossaries-extra-manual.html#dx1-17047" >29</a>, <a
+href="glossaries-extra-manual.html#dx1-17054" >30</a>, <a
+href="glossaries-extra-manual.html#dx1-17056" >31</a>, <a
+href="glossaries-extra-manual.html#dx1-17061" >32</a>, <a
+href="glossaries-extra-manual.html#dx1-17065" >33</a>, <a
+href="glossaries-extra-manual.html#dx1-17069" >34</a>, <a
+href="glossaries-extra-manual.html#dx1-17074" >35</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">long-noshort-em</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17089" >36</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">long-noshort-em-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17064" >37</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">long-noshort-sc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-16043" >38</a>, <a
+href="glossaries-extra-manual.html#dx1-17080" >39</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">long-noshort-sc-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17055" >40</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">long-noshort-sm</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17085" >41</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">long-noshort-sm-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17060" >42</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">long-short</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-9049" >29</a>, <a
-href="glossaries-extra-manual.html#dx1-12028" >30</a>, <a
-href="glossaries-extra-manual.html#dx1-12031" >31</a>, <a
-href="glossaries-extra-manual.html#dx1-12043" >32</a>, <a
-href="glossaries-extra-manual.html#dx1-18002" >33</a>, <a
-href="glossaries-extra-manual.html#dx1-18007" >34</a>, <a
-href="glossaries-extra-manual.html#dx1-18010" >35</a>, <a
-href="glossaries-extra-manual.html#dx1-18013" >36</a>, <a
-href="glossaries-extra-manual.html#dx1-19017" >37</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-9049" >43</a>, <a
+href="glossaries-extra-manual.html#dx1-12028" >44</a>, <a
+href="glossaries-extra-manual.html#dx1-12031" >45</a>, <a
+href="glossaries-extra-manual.html#dx1-12047" >46</a>, <a
+href="glossaries-extra-manual.html#dx1-18002" >47</a>, <a
+href="glossaries-extra-manual.html#dx1-18010" >48</a>, <a
+href="glossaries-extra-manual.html#dx1-18013" >49</a>, <a
+href="glossaries-extra-manual.html#dx1-18016" >50</a>, <a
+href="glossaries-extra-manual.html#dx1-18022" >51</a>, <a
+href="glossaries-extra-manual.html#dx1-18025" >52</a>, <a
+href="glossaries-extra-manual.html#dx1-19017" >53</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">long-short-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18015" >38</a>, <a
-href="glossaries-extra-manual.html#dx1-18020" >39</a>, <a
-href="glossaries-extra-manual.html#dx1-18023" >40</a>, <a
-href="glossaries-extra-manual.html#dx1-18026" >41</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-18034" >54</a>, <a
+href="glossaries-extra-manual.html#dx1-18041" >55</a>, <a
+href="glossaries-extra-manual.html#dx1-18044" >56</a>, <a
+href="glossaries-extra-manual.html#dx1-18047" >57</a>, <a
+href="glossaries-extra-manual.html#dx1-18053" >58</a>, <a
+href="glossaries-extra-manual.html#dx1-18057" >59</a>, <a
+href="glossaries-extra-manual.html#dx1-18060" >60</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">long-short-em</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18012" >42</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-16045" >61</a>, <a
+href="glossaries-extra-manual.html#dx1-18015" >62</a>, <a
+href="glossaries-extra-manual.html#dx1-18019" >63</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">long-short-em-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18025" >43</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-18046" >64</a>, <a
+href="glossaries-extra-manual.html#dx1-18050" >65</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">long-short-sc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12030" >44</a>, <a
-href="glossaries-extra-manual.html#dx1-18006" >45</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12030" >66</a>, <a
+href="glossaries-extra-manual.html#dx1-18009" >67</a>, <a
+href="glossaries-extra-manual.html#dx1-18033" >68</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">long-short-sc-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18019" >46</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-18040" >69</a> <br /></span>
+
+
+
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">long-short-sm</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18009" >47</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-18012" >70</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">long-short-sm-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18022" >48</a> <br /></span>
-<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
-class="ecss-1000">long-sm</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17054" >49</a> <br /></span>
-<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
-class="ecss-1000">postfootnote</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7050" >50</a>, <a
-href="glossaries-extra-manual.html#dx1-7055" >51</a>, <a
-href="glossaries-extra-manual.html#dx1-18070" >52</a>, <a
-href="glossaries-extra-manual.html#dx1-18080" >53</a>, <a
-href="glossaries-extra-manual.html#dx1-18083" >54</a>, <a
-href="glossaries-extra-manual.html#dx1-18086" >55</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-18043" >71</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
-class="ecss-1000">postfootnote-em</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18085" >56</a> <br /></span>
+class="ecss-1000">long-short-user</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-16046" >72</a>, <a
+href="glossaries-extra-manual.html#dx1-18008" >73</a>, <a
+href="glossaries-extra-manual.html#dx1-18021" >74</a>, <a
+href="glossaries-extra-manual.html#dx1-18027" >75</a>, <a
+href="glossaries-extra-manual.html#dx1-18029" >76</a>, <a
+href="glossaries-extra-manual.html#dx1-18054" >77</a>, <a
+href="glossaries-extra-manual.html#dx1-18055" >78</a>, <a
+href="glossaries-extra-manual.html#dx1-18080" >79</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
-class="ecss-1000">postfootnote-sc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18079" >57</a> <br /></span>
+class="ecss-1000">long-short-user-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18052" >80</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
-class="ecss-1000">postfootnote-sm</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18082" >58</a> <br /></span>
+class="ecss-1000">postfootnote</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18135" >81</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12019" >59</a>, <a
-href="glossaries-extra-manual.html#dx1-12044" >60</a>, <a
-href="glossaries-extra-manual.html#dx1-14003" >61</a>, <a
-href="glossaries-extra-manual.html#dx1-14017" >62</a>, <a
-href="glossaries-extra-manual.html#dx1-17002" >63</a>, <a
-href="glossaries-extra-manual.html#dx1-17008" >64</a>, <a
-href="glossaries-extra-manual.html#dx1-17011" >65</a>, <a
-href="glossaries-extra-manual.html#dx1-17014" >66</a>, <a
-href="glossaries-extra-manual.html#dx1-17017" >67</a>, <a
-href="glossaries-extra-manual.html#dx1-17020" >68</a>, <a
-href="glossaries-extra-manual.html#dx1-17023" >69</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-17007" >82</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17016" >70</a>, <a
-href="glossaries-extra-manual.html#dx1-17026" >71</a>, <a
-href="glossaries-extra-manual.html#dx1-17029" >72</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-17030" >83</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short-em</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17013" >73</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-17022" >84</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short-em-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17028" >74</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-17045" >85</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-em-footnote</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-16057" >86</a>, <a
+href="glossaries-extra-manual.html#dx1-18122" >87</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-em-footnote-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-16056" >88</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short-em-long</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18038" >75</a>, <a
-href="glossaries-extra-manual.html#dx1-19087" >76</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-18073" >89</a>, <a
+href="glossaries-extra-manual.html#dx1-18077" >90</a>, <a
+href="glossaries-extra-manual.html#dx1-19088" >91</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short-em-long-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18051" >77</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-18092" >92</a>, <a
+href="glossaries-extra-manual.html#dx1-18096" >93</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-em-long-em</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18076" >94</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-em-long-em-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18095" >95</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-em-nolong</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17019" >96</a>, <a
+href="glossaries-extra-manual.html#dx1-17023" >97</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-em-nolong-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17042" >98</a>, <a
+href="glossaries-extra-manual.html#dx1-17046" >99</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-em-postfootnote</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18145" >100</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-footnote</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-12049" >101</a>, <a
+href="glossaries-extra-manual.html#dx1-16049" >102</a>, <a
+href="glossaries-extra-manual.html#dx1-18105" >103</a>, <a
+href="glossaries-extra-manual.html#dx1-18113" >104</a>, <a
+href="glossaries-extra-manual.html#dx1-18115" >105</a>, <a
+href="glossaries-extra-manual.html#dx1-18119" >106</a>, <a
+href="glossaries-extra-manual.html#dx1-18123" >107</a>, <a
+href="glossaries-extra-manual.html#dx1-18127" >108</a>, <a
+href="glossaries-extra-manual.html#dx1-19021" >109</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short-long</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12021" >78</a>, <a
-href="glossaries-extra-manual.html#dx1-12039" >79</a>, <a
-href="glossaries-extra-manual.html#dx1-18028" >80</a>, <a
-href="glossaries-extra-manual.html#dx1-18033" >81</a>, <a
-href="glossaries-extra-manual.html#dx1-18036" >82</a>, <a
-href="glossaries-extra-manual.html#dx1-18039" >83</a>, <a
-href="glossaries-extra-manual.html#dx1-19083" >84</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12021" >110</a>, <a
+href="glossaries-extra-manual.html#dx1-12043" >111</a>, <a
+href="glossaries-extra-manual.html#dx1-16055" >112</a>, <a
+href="glossaries-extra-manual.html#dx1-18061" >113</a>, <a
+href="glossaries-extra-manual.html#dx1-18068" >114</a>, <a
+href="glossaries-extra-manual.html#dx1-18071" >115</a>, <a
+href="glossaries-extra-manual.html#dx1-18074" >116</a>, <a
+href="glossaries-extra-manual.html#dx1-19084" >117</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short-long-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18041" >85</a>, <a
-href="glossaries-extra-manual.html#dx1-18046" >86</a>, <a
-href="glossaries-extra-manual.html#dx1-18049" >87</a>, <a
-href="glossaries-extra-manual.html#dx1-18052" >88</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-16054" >118</a>, <a
+href="glossaries-extra-manual.html#dx1-18082" >119</a>, <a
+href="glossaries-extra-manual.html#dx1-18087" >120</a>, <a
+href="glossaries-extra-manual.html#dx1-18090" >121</a>, <a
+href="glossaries-extra-manual.html#dx1-18093" >122</a>, <a
+href="glossaries-extra-manual.html#dx1-18099" >123</a>, <a
+href="glossaries-extra-manual.html#dx1-18103" >124</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-long-user</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18028" >125</a>, <a
+href="glossaries-extra-manual.html#dx1-18030" >126</a>, <a
+href="glossaries-extra-manual.html#dx1-18066" >127</a>, <a
+href="glossaries-extra-manual.html#dx1-18079" >128</a>, <a
+href="glossaries-extra-manual.html#dx1-18100" >129</a>, <a
+href="glossaries-extra-manual.html#dx1-18101" >130</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-long-user-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18098" >131</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-nolong</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-12019" >132</a>, <a
+href="glossaries-extra-manual.html#dx1-12048" >133</a>, <a
+href="glossaries-extra-manual.html#dx1-14003" >134</a>, <a
+href="glossaries-extra-manual.html#dx1-14017" >135</a>, <a
+href="glossaries-extra-manual.html#dx1-17002" >136</a>, <a
+href="glossaries-extra-manual.html#dx1-17008" >137</a>, <a
+href="glossaries-extra-manual.html#dx1-17010" >138</a>, <a
+href="glossaries-extra-manual.html#dx1-17015" >139</a>, <a
+href="glossaries-extra-manual.html#dx1-17020" >140</a>, <a
+href="glossaries-extra-manual.html#dx1-17025" >141</a>, <a
+href="glossaries-extra-manual.html#dx1-17028" >142</a>, <a
+href="glossaries-extra-manual.html#dx1-17033" >143</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-nolong-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17024" >144</a>, <a
+href="glossaries-extra-manual.html#dx1-17031" >145</a>, <a
+href="glossaries-extra-manual.html#dx1-17038" >146</a>, <a
+href="glossaries-extra-manual.html#dx1-17043" >147</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-postfootnote</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-7062" >148</a>, <a
+href="glossaries-extra-manual.html#dx1-7067" >149</a>, <a
+href="glossaries-extra-manual.html#dx1-18126" >150</a>, <a
+href="glossaries-extra-manual.html#dx1-18136" >151</a>, <a
+href="glossaries-extra-manual.html#dx1-18138" >152</a>, <a
+href="glossaries-extra-manual.html#dx1-18142" >153</a>, <a
+href="glossaries-extra-manual.html#dx1-18146" >154</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short-sc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17007" >89</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-17012" >155</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short-sc-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17022" >90</a> <br /></span>
-
-
-
+href="glossaries-extra-manual.html#dx1-17035" >156</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-sc-footnote</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18114" >157</a>, <a
+href="glossaries-extra-manual.html#dx1-18118" >158</a>, <a
+href="glossaries-extra-manual.html#dx1-19041" >159</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short-sc-long</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18032" >91</a>, <a
-href="glossaries-extra-manual.html#dx1-19085" >92</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-18067" >160</a>, <a
+href="glossaries-extra-manual.html#dx1-19086" >161</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short-sc-long-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18045" >93</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-18086" >162</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-sc-nolong</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17009" >163</a>, <a
+href="glossaries-extra-manual.html#dx1-17013" >164</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-sc-nolong-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17032" >165</a>, <a
+href="glossaries-extra-manual.html#dx1-17036" >166</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-sc-postfootnote</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-16050" >167</a>, <a
+href="glossaries-extra-manual.html#dx1-18137" >168</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short-sm</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17010" >94</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-17017" >169</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short-sm-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17025" >95</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-17040" >170</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-sm-footnote</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-19042" >171</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short-sm-long</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18035" >96</a>, <a
-href="glossaries-extra-manual.html#dx1-19086" >97</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-18070" >172</a>, <a
+href="glossaries-extra-manual.html#dx1-19087" >173</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short-sm-long-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18048" >98</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-18089" >174</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-sm-nolong</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17014" >175</a>, <a
+href="glossaries-extra-manual.html#dx1-17018" >176</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-sm-nolong-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-17037" >177</a>, <a
+href="glossaries-extra-manual.html#dx1-17041" >178</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">short-sm-postfootnote</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18141" >179</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\abbreviationsname</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-4044" ><span
-class="ecti-1000">99</span></a> <br /></span>
+class="ecti-1000">180</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\abbrvpluralsuffix</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-19044" ><span
-class="ecti-1000">100</span></a> <br /></span>
+class="ecti-1000">181</span></a> <br /></span>
<span class="index-item">acronym styles (glossaries):<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ectt-1000">long-sp-short</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-10006" >101</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-10006" >182</a> <br /></span>
+
+
+
<span class="index-item"><span
class="ecss-1000">amsgen </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-15" >102</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-15" >183</a> <br /></span>
<p class="theindex"> <span
class="ecbx-1000">B</span>
<span class="index-item"><span
class="ecss-1000">babel </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3012" >103</a>, <a
-href="glossaries-extra-manual.html#dx1-3016" >104</a>, <a
-href="glossaries-extra-manual.html#dx1-4045" >105</a>, <a
-href="glossaries-extra-manual.html#dx1-4046" >106</a>, <a
-href="glossaries-extra-manual.html#dx1-4047" >107</a>, <a
-href="glossaries-extra-manual.html#dx1-21002" >108</a>, <a
-href="glossaries-extra-manual.html#dx1-29003" >109</a>, <a
-href="glossaries-extra-manual.html#dx1-29005" >110</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3012" >184</a>, <a
+href="glossaries-extra-manual.html#dx1-3016" >185</a>, <a
+href="glossaries-extra-manual.html#dx1-4045" >186</a>, <a
+href="glossaries-extra-manual.html#dx1-4046" >187</a>, <a
+href="glossaries-extra-manual.html#dx1-4047" >188</a>, <a
+href="glossaries-extra-manual.html#dx1-21002" >189</a>, <a
+href="glossaries-extra-manual.html#dx1-29003" >190</a>, <a
+href="glossaries-extra-manual.html#dx1-29005" >191</a> <br /></span>
</p><p class="theindex"> <span
class="ecbx-1000">C</span>
<span class="index-item">categories:<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">abbreviation</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8003" >111</a>, <a
-href="glossaries-extra-manual.html#dx1-12022" >112</a>, <a
-href="glossaries-extra-manual.html#dx1-13007" >113</a>, <a
-href="glossaries-extra-manual.html#dx1-21004" >114</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-8003" >192</a>, <a
+href="glossaries-extra-manual.html#dx1-12022" >193</a>, <a
+href="glossaries-extra-manual.html#dx1-13007" >194</a>, <a
+href="glossaries-extra-manual.html#dx1-21004" >195</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">acronym</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11014" >115</a>, <a
-href="glossaries-extra-manual.html#dx1-12020" >116</a>, <a
-href="glossaries-extra-manual.html#dx1-13006" >117</a>, <a
-href="glossaries-extra-manual.html#dx1-21005" >118</a>, <a
-href="glossaries-extra-manual.html#dx1-21019" >119</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7031" >196</a>, <a
+href="glossaries-extra-manual.html#dx1-11016" >197</a>, <a
+href="glossaries-extra-manual.html#dx1-12020" >198</a>, <a
+href="glossaries-extra-manual.html#dx1-13006" >199</a>, <a
+href="glossaries-extra-manual.html#dx1-21005" >200</a>, <a
+href="glossaries-extra-manual.html#dx1-21019" >201</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">general</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7027" >120</a>, <a
-href="glossaries-extra-manual.html#dx1-7054" >121</a>, <a
-href="glossaries-extra-manual.html#dx1-11013" >122</a>, <a
-href="glossaries-extra-manual.html#dx1-11016" >123</a>, <a
-href="glossaries-extra-manual.html#dx1-21003" >124</a>, <a
-href="glossaries-extra-manual.html#dx1-21018" >125</a>, <a
-href="glossaries-extra-manual.html#dx1-21087" >126</a>, <a
-href="glossaries-extra-manual.html#dx1-22038" >127</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7039" >202</a>, <a
+href="glossaries-extra-manual.html#dx1-7066" >203</a>, <a
+href="glossaries-extra-manual.html#dx1-11015" >204</a>, <a
+href="glossaries-extra-manual.html#dx1-11018" >205</a>, <a
+href="glossaries-extra-manual.html#dx1-21003" >206</a>, <a
+href="glossaries-extra-manual.html#dx1-21018" >207</a>, <a
+href="glossaries-extra-manual.html#dx1-21095" >208</a>, <a
+href="glossaries-extra-manual.html#dx1-22038" >209</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">index</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-5007" >128</a>, <a
-href="glossaries-extra-manual.html#dx1-21008" >129</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-5007" >210</a>, <a
+href="glossaries-extra-manual.html#dx1-21008" >211</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">number</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21014" >130</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21014" >212</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">symbol</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7034" >131</a>, <a
-href="glossaries-extra-manual.html#dx1-21011" >132</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7046" >213</a>, <a
+href="glossaries-extra-manual.html#dx1-21011" >214</a> <br /></span>
<span class="index-item">category attributes:<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">aposplural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-16030" >133</a>, <a
-href="glossaries-extra-manual.html#dx1-21042" >134</a>, <a
-href="glossaries-extra-manual.html#dx1-21049" >135</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-16031" >215</a>, <a
+href="glossaries-extra-manual.html#dx1-21046" >216</a>, <a
+href="glossaries-extra-manual.html#dx1-21053" >217</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">discardperiod</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7023" >136</a>, <a
-href="glossaries-extra-manual.html#dx1-21030" >137</a>, <a
-href="glossaries-extra-manual.html#dx1-21033" >138</a>, <a
-href="glossaries-extra-manual.html#dx1-21036" >139</a>, <a
-href="glossaries-extra-manual.html#dx1-21041" >140</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7035" >218</a>, <a
+href="glossaries-extra-manual.html#dx1-21030" >219</a>, <a
+href="glossaries-extra-manual.html#dx1-21037" >220</a>, <a
+href="glossaries-extra-manual.html#dx1-21040" >221</a>, <a
+href="glossaries-extra-manual.html#dx1-21045" >222</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">dualindex</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21073" >141</a>, <a
-href="glossaries-extra-manual.html#dx1-23002" >142</a>, <a
-href="glossaries-extra-manual.html#dx1-23009" >143</a>, <a
-href="glossaries-extra-manual.html#dx1-23014" >144</a>, <a
-href="glossaries-extra-manual.html#dx1-23021" >145</a>, <a
-href="glossaries-extra-manual.html#dx1-23024" >146</a>, <a
-href="glossaries-extra-manual.html#dx1-28004" >147</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21081" >223</a>, <a
+href="glossaries-extra-manual.html#dx1-23002" >224</a>, <a
+href="glossaries-extra-manual.html#dx1-23009" >225</a>, <a
+href="glossaries-extra-manual.html#dx1-23014" >226</a>, <a
+href="glossaries-extra-manual.html#dx1-23021" >227</a>, <a
+href="glossaries-extra-manual.html#dx1-23024" >228</a>, <a
+href="glossaries-extra-manual.html#dx1-28004" >229</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">entrycount</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8002" >148</a>, <a
-href="glossaries-extra-manual.html#dx1-21056" >149</a>, <a
-href="glossaries-extra-manual.html#dx1-21061" >150</a>, <a
-href="glossaries-extra-manual.html#dx1-22002" >151</a>, <a
-href="glossaries-extra-manual.html#dx1-22006" >152</a>, <a
-href="glossaries-extra-manual.html#dx1-22017" >153</a>, <a
-href="glossaries-extra-manual.html#dx1-22021" >154</a>, <a
-href="glossaries-extra-manual.html#dx1-22022" >155</a>, <a
-href="glossaries-extra-manual.html#dx1-22026" >156</a>, <a
-href="glossaries-extra-manual.html#dx1-22027" >157</a>, <a
-href="glossaries-extra-manual.html#dx1-22031" >158</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-8002" >230</a>, <a
+href="glossaries-extra-manual.html#dx1-21060" >231</a>, <a
+href="glossaries-extra-manual.html#dx1-21065" >232</a>, <a
+href="glossaries-extra-manual.html#dx1-22002" >233</a>, <a
+href="glossaries-extra-manual.html#dx1-22006" >234</a>, <a
+href="glossaries-extra-manual.html#dx1-22017" >235</a>, <a
+href="glossaries-extra-manual.html#dx1-22021" >236</a>, <a
+href="glossaries-extra-manual.html#dx1-22022" >237</a>, <a
+href="glossaries-extra-manual.html#dx1-22026" >238</a>, <a
+href="glossaries-extra-manual.html#dx1-22027" >239</a>, <a
+href="glossaries-extra-manual.html#dx1-22031" >240</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">glossdesc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11005" >159</a>, <a
-href="glossaries-extra-manual.html#dx1-21062" >160</a>, <a
-href="glossaries-extra-manual.html#dx1-21068" >161</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11005" >241</a>, <a
+href="glossaries-extra-manual.html#dx1-21066" >242</a>, <a
+href="glossaries-extra-manual.html#dx1-21074" >243</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">glossdescfont</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-11006" >244</a>, <a
+href="glossaries-extra-manual.html#dx1-21071" >245</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">glossname</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11004" >162</a>, <a
-href="glossaries-extra-manual.html#dx1-21067" >163</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11004" >246</a>, <a
+href="glossaries-extra-manual.html#dx1-21073" >247</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">glossnamefont</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21079" >248</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">headuc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-20020" >164</a>, <a
-href="glossaries-extra-manual.html#dx1-20022" >165</a>, <a
-href="glossaries-extra-manual.html#dx1-21051" >166</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-20020" >249</a>, <a
+href="glossaries-extra-manual.html#dx1-20022" >250</a>, <a
+href="glossaries-extra-manual.html#dx1-21055" >251</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">indexname</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11009" >167</a>, <a
-href="glossaries-extra-manual.html#dx1-21070" >168</a>, <a
-href="glossaries-extra-manual.html#dx1-23001" >169</a>, <a
-href="glossaries-extra-manual.html#dx1-23006" >170</a>, <a
-href="glossaries-extra-manual.html#dx1-28005" >171</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11010" >252</a>, <a
+href="glossaries-extra-manual.html#dx1-21076" >253</a>, <a
+href="glossaries-extra-manual.html#dx1-23001" >254</a>, <a
+href="glossaries-extra-manual.html#dx1-23006" >255</a>, <a
+href="glossaries-extra-manual.html#dx1-28005" >256</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">indexonlyfirst</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-6006" >172</a>, <a
-href="glossaries-extra-manual.html#dx1-21028" >173</a>, <a
-href="glossaries-extra-manual.html#dx1-23022" >174</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-6006" >257</a>, <a
+href="glossaries-extra-manual.html#dx1-21028" >258</a>, <a
+href="glossaries-extra-manual.html#dx1-23022" >259</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">insertdots</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12005" >175</a>, <a
-href="glossaries-extra-manual.html#dx1-21038" >176</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12005" >260</a>, <a
+href="glossaries-extra-manual.html#dx1-21042" >261</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">nohyper</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21025" >177</a>, <a
-href="glossaries-extra-manual.html#dx1-21088" >178</a>, <a
-href="glossaries-extra-manual.html#dx1-21089" >179</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21025" >262</a>, <a
+href="glossaries-extra-manual.html#dx1-21096" >263</a>, <a
+href="glossaries-extra-manual.html#dx1-21097" >264</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">nohyperfirst</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18056" >180</a>, <a
-href="glossaries-extra-manual.html#dx1-19022" >181</a>, <a
-href="glossaries-extra-manual.html#dx1-19024" >182</a>, <a
-href="glossaries-extra-manual.html#dx1-21021" >183</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-18107" >265</a>, <a
+href="glossaries-extra-manual.html#dx1-19022" >266</a>, <a
+href="glossaries-extra-manual.html#dx1-19024" >267</a>, <a
+href="glossaries-extra-manual.html#dx1-21021" >268</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">noshortplural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12006" >184</a>, <a
-href="glossaries-extra-manual.html#dx1-16031" >185</a>, <a
-href="glossaries-extra-manual.html#dx1-21045" >186</a>, <a
-href="glossaries-extra-manual.html#dx1-21050" >187</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12006" >269</a>, <a
+href="glossaries-extra-manual.html#dx1-16032" >270</a>, <a
+href="glossaries-extra-manual.html#dx1-21049" >271</a>, <a
+href="glossaries-extra-manual.html#dx1-21054" >272</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">pluraldiscardperiod</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21032" >188</a>, <a
-href="glossaries-extra-manual.html#dx1-21037" >189</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21036" >273</a>, <a
+href="glossaries-extra-manual.html#dx1-21041" >274</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">regular</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7005" >190</a>, <a
-href="glossaries-extra-manual.html#dx1-7015" >191</a>, <a
-href="glossaries-extra-manual.html#dx1-7018" >192</a>, <a
-href="glossaries-extra-manual.html#dx1-14004" >193</a>, <a
-href="glossaries-extra-manual.html#dx1-16005" >194</a>, <a
-href="glossaries-extra-manual.html#dx1-16014" >195</a>, <a
-href="glossaries-extra-manual.html#dx1-17001" >196</a>, <a
-href="glossaries-extra-manual.html#dx1-18001" >197</a>, <a
-href="glossaries-extra-manual.html#dx1-19023" >198</a>, <a
-href="glossaries-extra-manual.html#dx1-19053" >199</a>, <a
-href="glossaries-extra-manual.html#dx1-19057" >200</a>, <a
-href="glossaries-extra-manual.html#dx1-19061" >201</a>, <a
-href="glossaries-extra-manual.html#dx1-19065" >202</a>, <a
-href="glossaries-extra-manual.html#dx1-21020" >203</a>, <a
-href="glossaries-extra-manual.html#dx1-21078" >204</a>, <a
-href="glossaries-extra-manual.html#dx1-21091" >205</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7011" >275</a>, <a
+href="glossaries-extra-manual.html#dx1-7021" >276</a>, <a
+href="glossaries-extra-manual.html#dx1-7024" >277</a>, <a
+href="glossaries-extra-manual.html#dx1-7030" >278</a>, <a
+href="glossaries-extra-manual.html#dx1-14004" >279</a>, <a
+href="glossaries-extra-manual.html#dx1-16005" >280</a>, <a
+href="glossaries-extra-manual.html#dx1-16014" >281</a>, <a
+href="glossaries-extra-manual.html#dx1-17001" >282</a>, <a
+href="glossaries-extra-manual.html#dx1-18001" >283</a>, <a
+href="glossaries-extra-manual.html#dx1-19023" >284</a>, <a
+href="glossaries-extra-manual.html#dx1-19054" >285</a>, <a
+href="glossaries-extra-manual.html#dx1-19058" >286</a>, <a
+href="glossaries-extra-manual.html#dx1-19062" >287</a>, <a
+href="glossaries-extra-manual.html#dx1-19066" >288</a>, <a
+href="glossaries-extra-manual.html#dx1-21020" >289</a>, <a
+href="glossaries-extra-manual.html#dx1-21086" >290</a>, <a
+href="glossaries-extra-manual.html#dx1-21099" >291</a>, <a
+href="glossaries-extra-manual.html#dx1-21102" >292</a>, <a
+href="glossaries-extra-manual.html#dx1-21103" >293</a>, <a
+href="glossaries-extra-manual.html#dx1-21106" >294</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">retainfirstuseperiod</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21034" >206</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21038" >295</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">tagging</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-13002" >207</a>, <a
-href="glossaries-extra-manual.html#dx1-13005" >208</a>, <a
-href="glossaries-extra-manual.html#dx1-13008" >209</a>, <a
-href="glossaries-extra-manual.html#dx1-21053" >210</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-13002" >296</a>, <a
+href="glossaries-extra-manual.html#dx1-13005" >297</a>, <a
+href="glossaries-extra-manual.html#dx1-13008" >298</a>, <a
+href="glossaries-extra-manual.html#dx1-21057" >299</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">unitcount</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22032" >211</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22032" >300</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\cGLS</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-22012" ><span
-class="ecti-1000">212</span></a> <br /></span>
+class="ecti-1000">301</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\cGLSformat</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-22014" ><span
-class="ecti-1000">213</span></a> <br /></span>
-
-
-
+class="ecti-1000">302</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\cGLSpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-22013" ><span
-class="ecti-1000">214</span></a> <br /></span>
+class="ecti-1000">303</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\cGLSplformat</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-22015" ><span
-class="ecti-1000">215</span></a> <br /></span>
+class="ecti-1000">304</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\CustomAbbreviationFields</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-19009" ><span
-class="ecti-1000">216</span></a> <br /></span>
+class="ecti-1000">305</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&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-14" >217</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-14" >306</a> <br /></span>
</p><p class="theindex"> <span
class="ecbx-1000">E</span>
+
+
+
<span class="index-item">entry location&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-30001" ><span
-class="ecbx-1000">218</span></a>, <a
-href="glossaries-extra-manual.html#dx1-30021" >219</a>, <a
-href="glossaries-extra-manual.html#dx1-30028" >220</a> <br /></span>
+class="ecbx-1000">307</span></a>, <a
+href="glossaries-extra-manual.html#dx1-30021" >308</a>, <a
+href="glossaries-extra-manual.html#dx1-30028" >309</a> <br /></span>
<span class="index-item"><span
class="ecss-1000">etoolbox </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-10" >221</a>, <a
-href="glossaries-extra-manual.html#dx1-21084" >222</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-10" >310</a>, <a
+href="glossaries-extra-manual.html#dx1-21092" >311</a> <br /></span>
</p><p class="theindex"> <span
class="ecbx-1000">F</span>
<span class="index-item">first use&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-6004" >223</a>, <a
-href="glossaries-extra-manual.html#dx1-7011" >224</a>, <a
-href="glossaries-extra-manual.html#dx1-7032" >225</a>, <a
-href="glossaries-extra-manual.html#dx1-7033" >226</a>, <a
-href="glossaries-extra-manual.html#dx1-7036" >227</a>, <a
-href="glossaries-extra-manual.html#dx1-7041" >228</a>, <a
-href="glossaries-extra-manual.html#dx1-7046" >229</a>, <a
-href="glossaries-extra-manual.html#dx1-7049" >230</a>, <a
-href="glossaries-extra-manual.html#dx1-7051" >231</a>, <a
-href="glossaries-extra-manual.html#dx1-7053" >232</a>, <a
-href="glossaries-extra-manual.html#dx1-9009" >233</a>, <a
-href="glossaries-extra-manual.html#dx1-9020" >234</a>, <a
-href="glossaries-extra-manual.html#dx1-9021" >235</a>, <a
-href="glossaries-extra-manual.html#dx1-9022" >236</a>, <a
-href="glossaries-extra-manual.html#dx1-9023" >237</a>, <a
-href="glossaries-extra-manual.html#dx1-9027" >238</a>, <a
-href="glossaries-extra-manual.html#dx1-9031" >239</a>, <a
-href="glossaries-extra-manual.html#dx1-9036" >240</a>, <a
-href="glossaries-extra-manual.html#dx1-9050" >241</a>, <a
-href="glossaries-extra-manual.html#dx1-9051" >242</a>, <a
-href="glossaries-extra-manual.html#dx1-10009" >243</a>, <a
-href="glossaries-extra-manual.html#dx1-10010" >244</a>, <a
-href="glossaries-extra-manual.html#dx1-12002" >245</a>, <a
-href="glossaries-extra-manual.html#dx1-12025" >246</a>, <a
-href="glossaries-extra-manual.html#dx1-12033" >247</a>, <a
-href="glossaries-extra-manual.html#dx1-12037" >248</a>, <a
-href="glossaries-extra-manual.html#dx1-12040" >249</a>, <a
-href="glossaries-extra-manual.html#dx1-14016" >250</a>, <a
-href="glossaries-extra-manual.html#dx1-14018" >251</a>, <a
-href="glossaries-extra-manual.html#dx1-16006" >252</a>, <a
-href="glossaries-extra-manual.html#dx1-16020" >253</a>, <a
-href="glossaries-extra-manual.html#dx1-17003" >254</a>, <a
-href="glossaries-extra-manual.html#dx1-18003" >255</a>, <a
-href="glossaries-extra-manual.html#dx1-18016" >256</a>, <a
-href="glossaries-extra-manual.html#dx1-18029" >257</a>, <a
-href="glossaries-extra-manual.html#dx1-18042" >258</a>, <a
-href="glossaries-extra-manual.html#dx1-18055" >259</a>, <a
-href="glossaries-extra-manual.html#dx1-18057" >260</a>, <a
-href="glossaries-extra-manual.html#dx1-18074" >261</a>, <a
-href="glossaries-extra-manual.html#dx1-18078" >262</a>, <a
-href="glossaries-extra-manual.html#dx1-19045" >263</a>, <a
-href="glossaries-extra-manual.html#dx1-19049" >264</a>, <a
-href="glossaries-extra-manual.html#dx1-19052" >265</a>, <a
-href="glossaries-extra-manual.html#dx1-19056" >266</a>, <a
-href="glossaries-extra-manual.html#dx1-19060" >267</a>, <a
-href="glossaries-extra-manual.html#dx1-19064" >268</a>, <a
-href="glossaries-extra-manual.html#dx1-21023" >269</a>, <a
-href="glossaries-extra-manual.html#dx1-21035" >270</a>, <a
-href="glossaries-extra-manual.html#dx1-22037" >271</a>, <a
-href="glossaries-extra-manual.html#dx1-28002" >272</a>, <a
+href="glossaries-extra-manual.html#dx1-6004" >312</a>, <a
+href="glossaries-extra-manual.html#dx1-7017" >313</a>, <a
+href="glossaries-extra-manual.html#dx1-7044" >314</a>, <a
+href="glossaries-extra-manual.html#dx1-7045" >315</a>, <a
+href="glossaries-extra-manual.html#dx1-7048" >316</a>, <a
+href="glossaries-extra-manual.html#dx1-7053" >317</a>, <a
+href="glossaries-extra-manual.html#dx1-7058" >318</a>, <a
+href="glossaries-extra-manual.html#dx1-7061" >319</a>, <a
+href="glossaries-extra-manual.html#dx1-7063" >320</a>, <a
+href="glossaries-extra-manual.html#dx1-7065" >321</a>, <a
+href="glossaries-extra-manual.html#dx1-9009" >322</a>, <a
+href="glossaries-extra-manual.html#dx1-9020" >323</a>, <a
+href="glossaries-extra-manual.html#dx1-9021" >324</a>, <a
+href="glossaries-extra-manual.html#dx1-9022" >325</a>, <a
+href="glossaries-extra-manual.html#dx1-9023" >326</a>, <a
+href="glossaries-extra-manual.html#dx1-9027" >327</a>, <a
+href="glossaries-extra-manual.html#dx1-9031" >328</a>, <a
+href="glossaries-extra-manual.html#dx1-9036" >329</a>, <a
+href="glossaries-extra-manual.html#dx1-9050" >330</a>, <a
+href="glossaries-extra-manual.html#dx1-9051" >331</a>, <a
+href="glossaries-extra-manual.html#dx1-10009" >332</a>, <a
+href="glossaries-extra-manual.html#dx1-10010" >333</a>, <a
+href="glossaries-extra-manual.html#dx1-12002" >334</a>, <a
+href="glossaries-extra-manual.html#dx1-12025" >335</a>, <a
+href="glossaries-extra-manual.html#dx1-12035" >336</a>, <a
+href="glossaries-extra-manual.html#dx1-12044" >337</a>, <a
+href="glossaries-extra-manual.html#dx1-14016" >338</a>, <a
+href="glossaries-extra-manual.html#dx1-14018" >339</a>, <a
+href="glossaries-extra-manual.html#dx1-16006" >340</a>, <a
+href="glossaries-extra-manual.html#dx1-16020" >341</a>, <a
+href="glossaries-extra-manual.html#dx1-17003" >342</a>, <a
+href="glossaries-extra-manual.html#dx1-18003" >343</a>, <a
+href="glossaries-extra-manual.html#dx1-18035" >344</a>, <a
+href="glossaries-extra-manual.html#dx1-18062" >345</a>, <a
+href="glossaries-extra-manual.html#dx1-18083" >346</a>, <a
+href="glossaries-extra-manual.html#dx1-18106" >347</a>, <a
+href="glossaries-extra-manual.html#dx1-18108" >348</a>, <a
+href="glossaries-extra-manual.html#dx1-18130" >349</a>, <a
+href="glossaries-extra-manual.html#dx1-18134" >350</a>, <a
+href="glossaries-extra-manual.html#dx1-19045" >351</a>, <a
+href="glossaries-extra-manual.html#dx1-19049" >352</a>, <a
+href="glossaries-extra-manual.html#dx1-19053" >353</a>, <a
+href="glossaries-extra-manual.html#dx1-19057" >354</a>, <a
+href="glossaries-extra-manual.html#dx1-19061" >355</a>, <a
+href="glossaries-extra-manual.html#dx1-19065" >356</a>, <a
+href="glossaries-extra-manual.html#dx1-21023" >357</a>, <a
+href="glossaries-extra-manual.html#dx1-21039" >358</a>, <a
+href="glossaries-extra-manual.html#dx1-22037" >359</a>, <a
+href="glossaries-extra-manual.html#dx1-28002" >360</a>, <a
href="glossaries-extra-manual.html#dx1-30002" ><span
-class="ecbx-1000">273</span></a>, <a
-href="glossaries-extra-manual.html#dx1-30011" >274</a>, <a
-href="glossaries-extra-manual.html#dx1-30013" >275</a> <br /></span>
+class="ecbx-1000">361</span></a>, <a
+href="glossaries-extra-manual.html#dx1-30011" >362</a>, <a
+href="glossaries-extra-manual.html#dx1-30013" >363</a> <br /></span>
<span class="index-item">first use flag&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7039" >276</a>, <a
-href="glossaries-extra-manual.html#dx1-20002" >277</a>, <a
-href="glossaries-extra-manual.html#dx1-22020" >278</a>, <a
+href="glossaries-extra-manual.html#dx1-7051" >364</a>, <a
+href="glossaries-extra-manual.html#dx1-20002" >365</a>, <a
+href="glossaries-extra-manual.html#dx1-22020" >366</a>, <a
href="glossaries-extra-manual.html#dx1-30010" ><span
-class="ecbx-1000">279</span></a> <br /></span>
+class="ecbx-1000">367</span></a> <br /></span>
<span class="index-item">first use text&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-30012" ><span
-class="ecbx-1000">280</span></a>, <a
-href="glossaries-extra-manual.html#dx1-30031" >281</a> <br /></span>
+class="ecbx-1000">368</span></a>, <a
+href="glossaries-extra-manual.html#dx1-30031" >369</a> <br /></span>
<span class="index-item"><span
class="ecss-1000">fontenc </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-16024" >282</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-16024" >370</a> <br /></span>
</p><p class="theindex"> <span
class="ecbx-1000">G</span>
<span class="index-item"><span
class="ecss-1000">glossaries </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-2" >283</a>, <a
-href="glossaries-extra-manual.html#dx1-3" >284</a>, <a
-href="glossaries-extra-manual.html#dx1-4" >285</a>, <a
-href="glossaries-extra-manual.html#dx1-5" >286</a>, <a
-href="glossaries-extra-manual.html#dx1-6" >287</a>, <a
-href="glossaries-extra-manual.html#dx1-7" >288</a>, <a
-href="glossaries-extra-manual.html#dx1-2001" >289</a>, <a
-href="glossaries-extra-manual.html#dx1-3001" >290</a>, <a
-href="glossaries-extra-manual.html#dx1-3009" >291</a>, <a
-href="glossaries-extra-manual.html#dx1-3011" >292</a>, <a
-href="glossaries-extra-manual.html#dx1-3023" >293</a>, <a
-href="glossaries-extra-manual.html#dx1-3033" >294</a>, <a
-href="glossaries-extra-manual.html#dx1-4001" >295</a>, <a
-href="glossaries-extra-manual.html#dx1-4002" >296</a>, <a
-href="glossaries-extra-manual.html#dx1-4003" >297</a>, <a
-href="glossaries-extra-manual.html#dx1-4004" >298</a>, <a
-href="glossaries-extra-manual.html#dx1-4006" >299</a>, <a
-href="glossaries-extra-manual.html#dx1-4007" >300</a>, <a
-href="glossaries-extra-manual.html#dx1-4021" >301</a>, <a
-href="glossaries-extra-manual.html#dx1-4027" >302</a>, <a
-href="glossaries-extra-manual.html#dx1-4035" >303</a>, <a
-href="glossaries-extra-manual.html#dx1-4036" >304</a>, <a
-href="glossaries-extra-manual.html#dx1-4051" >305</a>, <a
-href="glossaries-extra-manual.html#dx1-4055" >306</a>, <a
-href="glossaries-extra-manual.html#dx1-4058" >307</a>, <a
-href="glossaries-extra-manual.html#dx1-4062" >308</a>, <a
-href="glossaries-extra-manual.html#dx1-4065" >309</a>, <a
-href="glossaries-extra-manual.html#dx1-4068" >310</a>, <a
-href="glossaries-extra-manual.html#dx1-4071" >311</a>, <a
-href="glossaries-extra-manual.html#dx1-4073" >312</a>, <a
-href="glossaries-extra-manual.html#dx1-5001" >313</a>, <a
-href="glossaries-extra-manual.html#dx1-6003" >314</a>, <a
-href="glossaries-extra-manual.html#dx1-6012" >315</a>, <a
-href="glossaries-extra-manual.html#dx1-7001" >316</a>, <a
-href="glossaries-extra-manual.html#dx1-7008" >317</a>, <a
-href="glossaries-extra-manual.html#dx1-7020" >318</a>, <a
-href="glossaries-extra-manual.html#dx1-7042" >319</a>, <a
-href="glossaries-extra-manual.html#dx1-9005" >320</a>, <a
-href="glossaries-extra-manual.html#dx1-9034" >321</a>, <a
-href="glossaries-extra-manual.html#dx1-10002" >322</a>, <a
-href="glossaries-extra-manual.html#dx1-10004" >323</a>, <a
-href="glossaries-extra-manual.html#dx1-10007" >324</a>, <a
-href="glossaries-extra-manual.html#dx1-12001" >325</a>, <a
-href="glossaries-extra-manual.html#dx1-12011" >326</a>, <a
-href="glossaries-extra-manual.html#dx1-12013" >327</a>, <a
-href="glossaries-extra-manual.html#dx1-12018" >328</a>, <a
-href="glossaries-extra-manual.html#dx1-12023" >329</a>, <a
-href="glossaries-extra-manual.html#dx1-14006" >330</a>, <a
-href="glossaries-extra-manual.html#dx1-16028" >331</a>, <a
-href="glossaries-extra-manual.html#dx1-19003" >332</a>, <a
-href="glossaries-extra-manual.html#dx1-19006" >333</a>, <a
-href="glossaries-extra-manual.html#dx1-19008" >334</a>, <a
-href="glossaries-extra-manual.html#dx1-19025" >335</a>, <a
-href="glossaries-extra-manual.html#dx1-19030" >336</a>, <a
-href="glossaries-extra-manual.html#dx1-19035" >337</a>, <a
-href="glossaries-extra-manual.html#dx1-20001" >338</a>, <a
-href="glossaries-extra-manual.html#dx1-20006" >339</a>, <a
-href="glossaries-extra-manual.html#dx1-20015" >340</a>, <a
-href="glossaries-extra-manual.html#dx1-21060" >341</a>, <a
-href="glossaries-extra-manual.html#dx1-22007" >342</a>, <a
-href="glossaries-extra-manual.html#dx1-22011" >343</a>, <a
-href="glossaries-extra-manual.html#dx1-22016" >344</a>, <a
-href="glossaries-extra-manual.html#dx1-23008" >345</a>, <a
-href="glossaries-extra-manual.html#dx1-24001" >346</a>, <a
-href="glossaries-extra-manual.html#dx1-25001" >347</a>, <a
-href="glossaries-extra-manual.html#dx1-28001" >348</a>, <a
-href="glossaries-extra-manual.html#dx1-29004" >349</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-2" >371</a>, <a
+href="glossaries-extra-manual.html#dx1-3" >372</a>, <a
+href="glossaries-extra-manual.html#dx1-4" >373</a>, <a
+href="glossaries-extra-manual.html#dx1-5" >374</a>, <a
+href="glossaries-extra-manual.html#dx1-6" >375</a>, <a
+href="glossaries-extra-manual.html#dx1-7" >376</a>, <a
+href="glossaries-extra-manual.html#dx1-2001" >377</a>, <a
+href="glossaries-extra-manual.html#dx1-3001" >378</a>, <a
+href="glossaries-extra-manual.html#dx1-3009" >379</a>, <a
+href="glossaries-extra-manual.html#dx1-3011" >380</a>, <a
+href="glossaries-extra-manual.html#dx1-3023" >381</a>, <a
+href="glossaries-extra-manual.html#dx1-3033" >382</a>, <a
+href="glossaries-extra-manual.html#dx1-4001" >383</a>, <a
+href="glossaries-extra-manual.html#dx1-4002" >384</a>, <a
+href="glossaries-extra-manual.html#dx1-4003" >385</a>, <a
+href="glossaries-extra-manual.html#dx1-4004" >386</a>, <a
+href="glossaries-extra-manual.html#dx1-4006" >387</a>, <a
+href="glossaries-extra-manual.html#dx1-4007" >388</a>, <a
+href="glossaries-extra-manual.html#dx1-4021" >389</a>, <a
+href="glossaries-extra-manual.html#dx1-4027" >390</a>, <a
+href="glossaries-extra-manual.html#dx1-4035" >391</a>, <a
+href="glossaries-extra-manual.html#dx1-4036" >392</a>, <a
+href="glossaries-extra-manual.html#dx1-4051" >393</a>, <a
+href="glossaries-extra-manual.html#dx1-4055" >394</a>, <a
+href="glossaries-extra-manual.html#dx1-4058" >395</a>, <a
+href="glossaries-extra-manual.html#dx1-4062" >396</a>, <a
+href="glossaries-extra-manual.html#dx1-4065" >397</a>, <a
+href="glossaries-extra-manual.html#dx1-4068" >398</a>, <a
+href="glossaries-extra-manual.html#dx1-4071" >399</a>, <a
+href="glossaries-extra-manual.html#dx1-4073" >400</a>, <a
+href="glossaries-extra-manual.html#dx1-5001" >401</a>, <a
+href="glossaries-extra-manual.html#dx1-6003" >402</a>, <a
+href="glossaries-extra-manual.html#dx1-6012" >403</a>, <a
+href="glossaries-extra-manual.html#dx1-7001" >404</a>, <a
+href="glossaries-extra-manual.html#dx1-7014" >405</a>, <a
+href="glossaries-extra-manual.html#dx1-7032" >406</a>, <a
+href="glossaries-extra-manual.html#dx1-7054" >407</a>, <a
+href="glossaries-extra-manual.html#dx1-9005" >408</a>, <a
+href="glossaries-extra-manual.html#dx1-9034" >409</a>, <a
+href="glossaries-extra-manual.html#dx1-10002" >410</a>, <a
+href="glossaries-extra-manual.html#dx1-10004" >411</a>, <a
+href="glossaries-extra-manual.html#dx1-10007" >412</a>, <a
+href="glossaries-extra-manual.html#dx1-12001" >413</a>, <a
+href="glossaries-extra-manual.html#dx1-12011" >414</a>, <a
+href="glossaries-extra-manual.html#dx1-12013" >415</a>, <a
+href="glossaries-extra-manual.html#dx1-12018" >416</a>, <a
+href="glossaries-extra-manual.html#dx1-12023" >417</a>, <a
+href="glossaries-extra-manual.html#dx1-14006" >418</a>, <a
+href="glossaries-extra-manual.html#dx1-16029" >419</a>, <a
+href="glossaries-extra-manual.html#dx1-18024" >420</a>, <a
+href="glossaries-extra-manual.html#dx1-19003" >421</a>, <a
+href="glossaries-extra-manual.html#dx1-19006" >422</a>, <a
+href="glossaries-extra-manual.html#dx1-19008" >423</a>, <a
+href="glossaries-extra-manual.html#dx1-19025" >424</a>, <a
+href="glossaries-extra-manual.html#dx1-19030" >425</a>, <a
+href="glossaries-extra-manual.html#dx1-19035" >426</a>, <a
+href="glossaries-extra-manual.html#dx1-20001" >427</a>, <a
+href="glossaries-extra-manual.html#dx1-20006" >428</a>, <a
+href="glossaries-extra-manual.html#dx1-20015" >429</a>, <a
+href="glossaries-extra-manual.html#dx1-21064" >430</a>, <a
+href="glossaries-extra-manual.html#dx1-22007" >431</a>, <a
+href="glossaries-extra-manual.html#dx1-22011" >432</a>, <a
+href="glossaries-extra-manual.html#dx1-22016" >433</a>, <a
+href="glossaries-extra-manual.html#dx1-23008" >434</a>, <a
+href="glossaries-extra-manual.html#dx1-24001" >435</a>, <a
+href="glossaries-extra-manual.html#dx1-25001" >436</a>, <a
+href="glossaries-extra-manual.html#dx1-28001" >437</a>, <a
+href="glossaries-extra-manual.html#dx1-29004" >438</a> <br /></span>
<span class="index-item"><span
class="ecss-1000">glossaries-accsupp </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4009" >350</a>, <a
-href="glossaries-extra-manual.html#dx1-4010" >351</a>, <a
-href="glossaries-extra-manual.html#dx1-4013" >352</a>, <a
-href="glossaries-extra-manual.html#dx1-4016" >353</a>, <a
-href="glossaries-extra-manual.html#dx1-19081" >354</a>, <a
-href="glossaries-extra-manual.html#dx1-19082" >355</a>, <a
-href="glossaries-extra-manual.html#dx1-25003" >356</a>, <a
-href="glossaries-extra-manual.html#dx1-27001" >357</a>, <a
-href="glossaries-extra-manual.html#dx1-27003" >358</a>, <a
-href="glossaries-extra-manual.html#dx1-27004" >359</a>, <a
-href="glossaries-extra-manual.html#dx1-27007" >360</a>, <a
-href="glossaries-extra-manual.html#dx1-27009" >361</a>, <a
-href="glossaries-extra-manual.html#dx1-27011" >362</a>, <a
-href="glossaries-extra-manual.html#dx1-27012" >363</a>, <a
-href="glossaries-extra-manual.html#dx1-28015" >364</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4009" >439</a>, <a
+href="glossaries-extra-manual.html#dx1-4010" >440</a>, <a
+href="glossaries-extra-manual.html#dx1-4013" >441</a>, <a
+href="glossaries-extra-manual.html#dx1-4016" >442</a>, <a
+href="glossaries-extra-manual.html#dx1-19082" >443</a>, <a
+href="glossaries-extra-manual.html#dx1-19083" >444</a>, <a
+href="glossaries-extra-manual.html#dx1-25003" >445</a>, <a
+href="glossaries-extra-manual.html#dx1-27001" >446</a>, <a
+href="glossaries-extra-manual.html#dx1-27003" >447</a>, <a
+href="glossaries-extra-manual.html#dx1-27004" >448</a>, <a
+href="glossaries-extra-manual.html#dx1-27007" >449</a>, <a
+href="glossaries-extra-manual.html#dx1-27009" >450</a>, <a
+href="glossaries-extra-manual.html#dx1-27011" >451</a>, <a
+href="glossaries-extra-manual.html#dx1-27012" >452</a>, <a
+href="glossaries-extra-manual.html#dx1-28015" >453</a> <br /></span>
<span class="index-item"><span
class="ecss-1000">glossaries-extra </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11019" >365</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11021" >454</a> <br /></span>
<span class="index-item"><span
class="ecss-1000">glossaries-extra-stylemods </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4018" >366</a>, <a
-href="glossaries-extra-manual.html#dx1-11018" >367</a>, <a
-href="glossaries-extra-manual.html#dx1-11020" >368</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4018" >455</a>, <a
+href="glossaries-extra-manual.html#dx1-11020" >456</a>, <a
+href="glossaries-extra-manual.html#dx1-11022" >457</a> <br /></span>
<span class="index-item"><span
class="ecss-1000">glossaries-prefix </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-25002" >369</a>, <a
-href="glossaries-extra-manual.html#dx1-26001" >370</a>, <a
-href="glossaries-extra-manual.html#dx1-28016" >371</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-25002" >458</a>, <a
+href="glossaries-extra-manual.html#dx1-26001" >459</a>, <a
+href="glossaries-extra-manual.html#dx1-28016" >460</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glossariesextrasetup</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-4087" ><span
-class="ecti-1000">372</span></a> <br /></span>
+class="ecti-1000">461</span></a> <br /></span>
<span class="index-item">glossary styles:<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">inline</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11024" >373</a>, <a
-href="glossaries-extra-manual.html#dx1-11026" >374</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11026" >462</a>, <a
+href="glossaries-extra-manual.html#dx1-11028" >463</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">long3col</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11022" >375</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11024" >464</a> <br /></span>
<span class="index-item"><span
class="ecss-1000">glossary-inline </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11025" >376</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11027" >465</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsabbrvdefaultfont</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-12029" ><span
-class="ecti-1000">377</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">\glsabbrvemfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-16039" ><span
+class="ecti-1000">467</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsabbrvfont</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-12026" ><span
-class="ecti-1000">378</span></a>, <a
+class="ecti-1000">468</span></a>, <a
href="glossaries-extra-manual.html#dx1-19048" ><span
-class="ecti-1000">379</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">\glsabbrvuserfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18031" ><span
+class="ecti-1000">470</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\Glsaccessdesc</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27039" ><span
-class="ecti-1000">380</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">\glsaccessdesc</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27037" ><span
-class="ecti-1000">381</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">\Glsaccessdescplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27043" ><span
-class="ecti-1000">382</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">\glsaccessdescplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27041" ><span
-class="ecti-1000">383</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">\Glsaccessfirst</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27023" ><span
-class="ecti-1000">384</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">\glsaccessfirst</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27021" ><span
-class="ecti-1000">385</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">\Glsaccessfirstplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27027" ><span
-class="ecti-1000">386</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">\glsaccessfirstplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27025" ><span
-class="ecti-1000">387</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">\Glsaccesslong</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27055" ><span
-class="ecti-1000">388</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">\glsaccesslong</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27053" ><span
-class="ecti-1000">389</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">\Glsaccesslongpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27059" ><span
-class="ecti-1000">390</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">\glsaccesslongpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27057" ><span
-class="ecti-1000">391</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">\Glsaccessname</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27010" ><span
-class="ecti-1000">392</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">\glsaccessname</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27005" ><span
-class="ecti-1000">393</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">\Glsaccessplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27019" ><span
-class="ecti-1000">394</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">\glsaccessplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27017" ><span
-class="ecti-1000">395</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">\Glsaccessshort</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27047" ><span
-class="ecti-1000">396</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">\glsaccessshort</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27045" ><span
-class="ecti-1000">397</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">\Glsaccessshortpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27051" ><span
-class="ecti-1000">398</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">\glsaccessshortpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27049" ><span
-class="ecti-1000">399</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">\Glsaccesssymbol</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27031" ><span
-class="ecti-1000">400</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">\glsaccesssymbol</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27029" ><span
-class="ecti-1000">401</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">\Glsaccesssymbolplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27035" ><span
-class="ecti-1000">402</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">\glsaccesssymbolplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27033" ><span
-class="ecti-1000">403</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">\Glsaccesstext</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27015" ><span
-class="ecti-1000">404</span></a> <br /></span>
+class="ecti-1000">495</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsaccesstext</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-27013" ><span
-class="ecti-1000">405</span></a> <br /></span>
+class="ecti-1000">496</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsacspace</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-10005" ><span
-class="ecti-1000">406</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">\glsacspacemax</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-10008" ><span
-class="ecti-1000">407</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">\glscategory</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-21015" ><span
-class="ecti-1000">408</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">\glscategorylabel</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-19039" ><span
-class="ecti-1000">409</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">\glscurrententrylabel</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11015" ><span
-class="ecti-1000">410</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11017" ><span
+class="ecti-1000">501</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsentrycurrcount</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-22033" ><span
-class="ecti-1000">411</span></a> <br /></span>
+class="ecti-1000">502</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsentryprevcount</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-22034" ><span
-class="ecti-1000">412</span></a> <br /></span>
+class="ecti-1000">503</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsentryprevmaxcount</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-22036" ><span
-class="ecti-1000">413</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">\glsentryprevtotalcount</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-22035" ><span
-class="ecti-1000">414</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">\glsfirstabbrvdefaultfont</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-12032" ><span
-class="ecti-1000">415</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">\glsfirstabbrvemfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-16040" ><span
+class="ecti-1000">507</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsfirstabbrvfont</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-12024" ><span
-class="ecti-1000">416</span></a>, <a
+class="ecti-1000">508</span></a>, <a
href="glossaries-extra-manual.html#dx1-19046" ><span
-class="ecti-1000">417</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">\glsfirstlongdefaultfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12036" ><span
-class="ecti-1000">418</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12038" ><span
+class="ecti-1000">510</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\glsfirstlongemfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-12040" ><span
+class="ecti-1000">511</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsfirstlongfont</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-12034" ><span
-class="ecti-1000">419</span></a>, <a
+class="ecti-1000">512</span></a>, <a
href="glossaries-extra-manual.html#dx1-19050" ><span
-class="ecti-1000">420</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">\Glsfmtfirst</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20043" ><span
-class="ecti-1000">421</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">\glsfmtfirst</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20042" ><span
-class="ecti-1000">422</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">\Glsfmtfirstpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20045" ><span
-class="ecti-1000">423</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">\glsfmtfirstpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20044" ><span
-class="ecti-1000">424</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">\Glsfmtfull</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20034" ><span
-class="ecti-1000">425</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">\glsfmtfull</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20032" ><span
-class="ecti-1000">426</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">\Glsfmtfullpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20035" ><span
-class="ecti-1000">427</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">\glsfmtfullpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20033" ><span
-class="ecti-1000">428</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">\Glsfmtlong</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20030" ><span
-class="ecti-1000">429</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">\glsfmtlong</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20028" ><span
-class="ecti-1000">430</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">\Glsfmtlongpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20031" ><span
-class="ecti-1000">431</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">\glsfmtlongpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20029" ><span
-class="ecti-1000">432</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">\Glsfmtplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20040" ><span
-class="ecti-1000">433</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">\glsfmtplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20039" ><span
-class="ecti-1000">434</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">\Glsfmtshort</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20026" ><span
-class="ecti-1000">435</span></a> <br /></span>
+class="ecti-1000">528</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsfmtshort</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20024" ><span
-class="ecti-1000">436</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">\Glsfmtshortpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20027" ><span
-class="ecti-1000">437</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">\glsfmtshortpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20025" ><span
-class="ecti-1000">438</span></a> <br /></span>
+class="ecti-1000">531</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\Glsfmttext</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20038" ><span
-class="ecti-1000">439</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">\glsfmttext</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20037" ><span
-class="ecti-1000">440</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">\glsforeachwithattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21094" ><span
-class="ecti-1000">441</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21107" ><span
+class="ecti-1000">534</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsgetattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21082" ><span
-class="ecti-1000">442</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21090" ><span
+class="ecti-1000">535</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsgetcategoryattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21081" ><span
-class="ecti-1000">443</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21089" ><span
+class="ecti-1000">536</span></a> <br /></span>
+
+
+
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glshasattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21085" ><span
-class="ecti-1000">444</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21093" ><span
+class="ecti-1000">537</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glshascategoryattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21083" ><span
-class="ecti-1000">445</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21091" ><span
+class="ecti-1000">538</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsifattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21090" ><span
-class="ecti-1000">446</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21098" ><span
+class="ecti-1000">539</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsifcategory</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-21016" ><span
-class="ecti-1000">447</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">\glsifcategoryattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21086" ><span
-class="ecti-1000">448</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21094" ><span
+class="ecti-1000">541</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\glsifnotregular</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21105" ><span
+class="ecti-1000">542</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\glsifnotregularcategory</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21104" ><span
+class="ecti-1000">543</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsifregular</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21093" ><span
-class="ecti-1000">449</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21101" ><span
+class="ecti-1000">544</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsifregularcategory</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21092" ><span
-class="ecti-1000">450</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21100" ><span
+class="ecti-1000">545</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glskeylisttok</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-19037" ><span
-class="ecti-1000">451</span></a> <br /></span>
+class="ecti-1000">546</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glslabeltok</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-19036" ><span
-class="ecti-1000">452</span></a> <br /></span>
+class="ecti-1000">547</span></a> <br /></span>
<span class="index-item"><span
class="ectt-1000">\glslink </span>options<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">format</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23013" >453</a>, <a
-href="glossaries-extra-manual.html#dx1-23015" >454</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23013" >548</a>, <a
+href="glossaries-extra-manual.html#dx1-23015" >549</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">hyper</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21024" >455</a>, <a
-href="glossaries-extra-manual.html#dx1-21027" >456</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21024" >550</a>, <a
+href="glossaries-extra-manual.html#dx1-21027" >551</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">noindex</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-6001" >457</a>, <a
-href="glossaries-extra-manual.html#dx1-6007" >458</a>, <a
-href="glossaries-extra-manual.html#dx1-20018" >459</a>, <a
-href="glossaries-extra-manual.html#dx1-23025" >460</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-6001" >552</a>, <a
+href="glossaries-extra-manual.html#dx1-6007" >553</a>, <a
+href="glossaries-extra-manual.html#dx1-20018" >554</a>, <a
+href="glossaries-extra-manual.html#dx1-23025" >555</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glslinkcheckfirsthyperhook</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-22040" ><span
-class="ecti-1000">461</span></a> <br /></span>
+class="ecti-1000">556</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\glslongdefaultfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-12039" ><span
+class="ecti-1000">557</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\glslongemfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-12041" ><span
+class="ecti-1000">558</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\glslongfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-12036" ><span
+class="ecti-1000">559</span></a>, <a
+href="glossaries-extra-manual.html#dx1-19051" ><span
+class="ecti-1000">560</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glslongpltok</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-19032" ><span
-class="ecti-1000">462</span></a> <br /></span>
+class="ecti-1000">561</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glslongtok</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-19031" ><span
-class="ecti-1000">463</span></a> <br /></span>
+class="ecti-1000">562</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glssetattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21080" ><span
-class="ecti-1000">464</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21088" ><span
+class="ecti-1000">563</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glssetcategoryattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21077" ><span
-class="ecti-1000">465</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21085" ><span
+class="ecti-1000">564</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glssetregularcategory</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21079" ><span
-class="ecti-1000">466</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21087" ><span
+class="ecti-1000">565</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsshortpltok</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-19027" ><span
-class="ecti-1000">467</span></a> <br /></span>
+class="ecti-1000">566</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsshorttok</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-19026" ><span
-class="ecti-1000">468</span></a> <br /></span>
+class="ecti-1000">567</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\Glsxtr</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-24015" ><span
-class="ecti-1000">469</span></a> <br /></span>
+class="ecti-1000">568</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtr</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-24010" ><span
-class="ecti-1000">470</span></a> <br /></span>
+class="ecti-1000">569</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtraddallcrossrefs</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-6021" ><span
-class="ecti-1000">471</span></a> <br /></span>
+class="ecti-1000">570</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrdoautoindexname</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-23010" ><span
-class="ecti-1000">472</span></a> <br /></span>
+class="ecti-1000">571</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrdowrglossaryhook</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-6010" ><span
-class="ecti-1000">473</span></a> <br /></span>
+class="ecti-1000">572</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrEnableEntryCounting</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-22025" ><span
-class="ecti-1000">474</span></a> <br /></span>
+class="ecti-1000">573</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrEnableEntryUnitCounting</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-22028" ><span
-class="ecti-1000">475</span></a> <br /></span>
+class="ecti-1000">574</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrEnableIndexFormatOverride</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-23016" ><span
-class="ecti-1000">476</span></a> <br /></span>
+class="ecti-1000">575</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrEnableInitialTagging</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-13001" ><span
-class="ecti-1000">477</span></a> <br /></span>
+class="ecti-1000">576</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrEnableOnTheFly</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-24008" ><span
-class="ecti-1000">478</span></a> <br /></span>
+class="ecti-1000">577</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\GlsXtrEnablePreLocationTag</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-11039" ><span
+class="ecti-1000">578</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\glsxtrfirstscfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-16026" ><span
+class="ecti-1000">579</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\glsxtrfirstsmfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-16034" ><span
+class="ecti-1000">580</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\GlsXtrFormatLocationList</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-11031" ><span
+class="ecti-1000">581</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GLSxtrfull</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14024" ><span
-class="ecti-1000">479</span></a> <br /></span>
+class="ecti-1000">582</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\Glsxtrfull</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14021" ><span
-class="ecti-1000">480</span></a> <br /></span>
+class="ecti-1000">583</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrfull</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14014" ><span
-class="ecti-1000">481</span></a> <br /></span>
+class="ecti-1000">584</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\Glsxtrfullformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19058" ><span
-class="ecti-1000">482</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19059" ><span
+class="ecti-1000">585</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrfullformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19054" ><span
-class="ecti-1000">483</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19055" ><span
+class="ecti-1000">586</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GLSxtrfullpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14033" ><span
-class="ecti-1000">484</span></a> <br /></span>
+class="ecti-1000">587</span></a> <br /></span>
+
+
+
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\Glsxtrfullpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14032" ><span
-class="ecti-1000">485</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">\glsxtrfullpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14031" ><span
-class="ecti-1000">486</span></a> <br /></span>
+class="ecti-1000">589</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\Glsxtrfullplformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19066" ><span
-class="ecti-1000">487</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19067" ><span
+class="ecti-1000">590</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrfullplformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19062" ><span
-class="ecti-1000">488</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19063" ><span
+class="ecti-1000">591</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrfullsep</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-16039" ><span
-class="ecti-1000">489</span></a> <br /></span>
-
-
-
+href="glossaries-extra-manual.html#dx1-16041" ><span
+class="ecti-1000">592</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrifcounttrigger</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-22019" ><span
-class="ecti-1000">490</span></a> <br /></span>
+class="ecti-1000">593</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrifwasfirstuse</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7040" ><span
-class="ecti-1000">491</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7052" ><span
+class="ecti-1000">594</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\Glsxtrinlinefullformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19073" ><span
-class="ecti-1000">492</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19074" ><span
+class="ecti-1000">595</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrinlinefullformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19070" ><span
-class="ecti-1000">493</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19071" ><span
+class="ecti-1000">596</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\Glsxtrinlinefullplformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19080" ><span
-class="ecti-1000">494</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19081" ><span
+class="ecti-1000">597</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrinlinefullplformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19077" ><span
-class="ecti-1000">495</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19078" ><span
+class="ecti-1000">598</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrinsertinsidetrue</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12038" ><span
-class="ecti-1000">496</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12042" ><span
+class="ecti-1000">599</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\Glsxtrlong</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14020" ><span
-class="ecti-1000">497</span></a>, <a
+class="ecti-1000">600</span></a>, <a
href="glossaries-extra-manual.html#dx1-14023" ><span
-class="ecti-1000">498</span></a> <br /></span>
+class="ecti-1000">601</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrlong</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14012" ><span
-class="ecti-1000">499</span></a> <br /></span>
+class="ecti-1000">602</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GLSxtrlongpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14030" ><span
-class="ecti-1000">500</span></a> <br /></span>
+class="ecti-1000">603</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\Glsxtrlongpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14029" ><span
-class="ecti-1000">501</span></a> <br /></span>
+class="ecti-1000">604</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrlongpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14028" ><span
-class="ecti-1000">502</span></a> <br /></span>
+class="ecti-1000">605</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\glsxtrlongshortdescsort</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18038" ><span
+class="ecti-1000">606</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrnewnumber</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-4063" ><span
-class="ecti-1000">503</span></a> <br /></span>
+class="ecti-1000">607</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrnewsymbol</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-4059" ><span
-class="ecti-1000">504</span></a> <br /></span>
+class="ecti-1000">608</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrNoGlsWarningAutoMake</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-29018" ><span
-class="ecti-1000">505</span></a> <br /></span>
+class="ecti-1000">609</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrNoGlsWarningBuildInfo</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-29017" ><span
-class="ecti-1000">506</span></a> <br /></span>
+class="ecti-1000">610</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrNoGlsWarningCheckFile</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-29013" ><span
-class="ecti-1000">507</span></a> <br /></span>
+class="ecti-1000">611</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrNoGlsWarningEmptyMain</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-29011" ><span
-class="ecti-1000">508</span></a> <br /></span>
+class="ecti-1000">612</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrNoGlsWarningEmptyNotMain</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-29012" ><span
-class="ecti-1000">509</span></a> <br /></span>
+class="ecti-1000">613</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrNoGlsWarningEmptyStart</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-29010" ><span
-class="ecti-1000">510</span></a> <br /></span>
+class="ecti-1000">614</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrNoGlsWarningHead</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-29009" ><span
-class="ecti-1000">511</span></a> <br /></span>
+class="ecti-1000">615</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrNoGlsWarningMisMatch</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-29014" ><span
-class="ecti-1000">512</span></a> <br /></span>
+class="ecti-1000">616</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrNoGlsWarningNoOut</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-29015" ><span
-class="ecti-1000">513</span></a> <br /></span>
+class="ecti-1000">617</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrNoGlsWarningTail</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-29016" ><span
-class="ecti-1000">514</span></a> <br /></span>
+class="ecti-1000">618</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\Glsxtrpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-24016" ><span
-class="ecti-1000">515</span></a> <br /></span>
+class="ecti-1000">619</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-24014" ><span
-class="ecti-1000">516</span></a> <br /></span>
+class="ecti-1000">620</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrpostdescription</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11011" ><span
-class="ecti-1000">517</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11013" ><span
+class="ecti-1000">621</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrpostlink</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7024" ><span
-class="ecti-1000">518</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7036" ><span
+class="ecti-1000">622</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrpostlinkAddDescOnFirstUse</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7031" ><span
-class="ecti-1000">519</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7043" ><span
+class="ecti-1000">623</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrpostlinkAddSymbolOnFirstUse</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7035" ><span
-class="ecti-1000">520</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7047" ><span
+class="ecti-1000">624</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrpostlinkendsentence</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7025" ><span
-class="ecti-1000">521</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7037" ><span
+class="ecti-1000">625</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrpostlinkhook</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7022" ><span
-class="ecti-1000">522</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7034" ><span
+class="ecti-1000">626</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrpostnamehook</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11008" ><span
-class="ecti-1000">523</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11009" ><span
+class="ecti-1000">627</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrPostNewAbbreviation</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-19020" ><span
-class="ecti-1000">524</span></a> <br /></span>
+class="ecti-1000">628</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\glsxtrregularfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-7028" ><span
+class="ecti-1000">629</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrRevertMarks</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-20014" ><span
-class="ecti-1000">525</span></a> <br /></span>
+class="ecti-1000">630</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrscfont</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16025" ><span
-class="ecti-1000">526</span></a> <br /></span>
+class="ecti-1000">631</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrscsuffix</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-16026" ><span
-class="ecti-1000">527</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-16027" ><span
+class="ecti-1000">632</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrSetActualChar</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-23032" ><span
-class="ecti-1000">528</span></a> <br /></span>
+class="ecti-1000">633</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrSetAltModifier</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7062" ><span
-class="ecti-1000">529</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7074" ><span
+class="ecti-1000">634</span></a> <br /></span>
+
+
+
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrsetcategory</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21096" ><span
-class="ecti-1000">530</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21109" ><span
+class="ecti-1000">635</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrsetcategoryforall</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21098" ><span
-class="ecti-1000">531</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21111" ><span
+class="ecti-1000">636</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrSetDefaultGlsOpts</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7059" ><span
-class="ecti-1000">532</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7071" ><span
+class="ecti-1000">637</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrSetEncapChar</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-23035" ><span
-class="ecti-1000">533</span></a> <br /></span>
+class="ecti-1000">638</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrSetEscChar</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-23034" ><span
-class="ecti-1000">534</span></a> <br /></span>
+class="ecti-1000">639</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrSetLevelChar</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-23033" ><span
-class="ecti-1000">535</span></a> <br /></span>
+class="ecti-1000">640</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\Glsxtrshort</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14019" ><span
-class="ecti-1000">536</span></a>, <a
+class="ecti-1000">641</span></a>, <a
href="glossaries-extra-manual.html#dx1-14022" ><span
-class="ecti-1000">537</span></a> <br /></span>
-
-
-
+class="ecti-1000">642</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrshort</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14010" ><span
-class="ecti-1000">538</span></a> <br /></span>
+class="ecti-1000">643</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GLSxtrshortpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14027" ><span
-class="ecti-1000">539</span></a> <br /></span>
+class="ecti-1000">644</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\Glsxtrshortpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14026" ><span
-class="ecti-1000">540</span></a> <br /></span>
+class="ecti-1000">645</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrshortpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14025" ><span
-class="ecti-1000">541</span></a> <br /></span>
+class="ecti-1000">646</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrsmfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-16032" ><span
-class="ecti-1000">542</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-16033" ><span
+class="ecti-1000">647</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrsmsuffix</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-16035" ><span
-class="ecti-1000">543</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-16037" ><span
+class="ecti-1000">648</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\glsxtrtagfont</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-13003" ><span
-class="ecti-1000">544</span></a> <br /></span>
+class="ecti-1000">649</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrUseAbbrStyleFmts</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19084" ><span
-class="ecti-1000">545</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19085" ><span
+class="ecti-1000">650</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrUseAbbrStyleSetup</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-19040" ><span
-class="ecti-1000">546</span></a> <br /></span>
+class="ecti-1000">651</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\glsxtruserparen</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18026" ><span
+class="ecti-1000">652</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\glsxtrusersuffix</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-18032" ><span
+class="ecti-1000">653</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="ectt-1000">\GlsXtrWarnDeprecatedAbbrStyle</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-16058" ><span
+class="ecti-1000">654</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\GlsXtrWarning</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-24012" ><span
-class="ecti-1000">547</span></a> <br /></span>
+class="ecti-1000">655</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&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-9030" >548</a>, <a
-href="glossaries-extra-manual.html#dx1-18058" >549</a>, <a
-href="glossaries-extra-manual.html#dx1-20003" >550</a>, <a
-href="glossaries-extra-manual.html#dx1-20004" >551</a>, <a
-href="glossaries-extra-manual.html#dx1-20005" >552</a>, <a
-href="glossaries-extra-manual.html#dx1-20010" >553</a>, <a
-href="glossaries-extra-manual.html#dx1-20017" >554</a>, <a
-href="glossaries-extra-manual.html#dx1-22030" >555</a>, <a
-href="glossaries-extra-manual.html#dx1-23017" >556</a>, <a
-href="glossaries-extra-manual.html#dx1-28007" >557</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-9030" >656</a>, <a
+href="glossaries-extra-manual.html#dx1-18109" >657</a>, <a
+href="glossaries-extra-manual.html#dx1-20003" >658</a>, <a
+href="glossaries-extra-manual.html#dx1-20004" >659</a>, <a
+href="glossaries-extra-manual.html#dx1-20005" >660</a>, <a
+href="glossaries-extra-manual.html#dx1-20010" >661</a>, <a
+href="glossaries-extra-manual.html#dx1-20017" >662</a>, <a
+href="glossaries-extra-manual.html#dx1-22030" >663</a>, <a
+href="glossaries-extra-manual.html#dx1-23017" >664</a>, <a
+href="glossaries-extra-manual.html#dx1-28007" >665</a> <br /></span>
</p><p class="theindex"> <span
class="ecbx-1000">L</span>
<span class="index-item">link-text&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7002" >558</a>, <a
-href="glossaries-extra-manual.html#dx1-7004" >559</a>, <a
-href="glossaries-extra-manual.html#dx1-7021" >560</a>, <a
-href="glossaries-extra-manual.html#dx1-7030" >561</a>, <a
-href="glossaries-extra-manual.html#dx1-7038" >562</a>, <a
-href="glossaries-extra-manual.html#dx1-7043" >563</a>, <a
-href="glossaries-extra-manual.html#dx1-7047" >564</a>, <a
-href="glossaries-extra-manual.html#dx1-7052" >565</a>, <a
-href="glossaries-extra-manual.html#dx1-7056" >566</a>, <a
-href="glossaries-extra-manual.html#dx1-9038" >567</a>, <a
-href="glossaries-extra-manual.html#dx1-9039" >568</a>, <a
-href="glossaries-extra-manual.html#dx1-18073" >569</a>, <a
-href="glossaries-extra-manual.html#dx1-21031" >570</a>, <a
-href="glossaries-extra-manual.html#dx1-28003" >571</a>, <a
+href="glossaries-extra-manual.html#dx1-7002" >666</a>, <a
+href="glossaries-extra-manual.html#dx1-7004" >667</a>, <a
+href="glossaries-extra-manual.html#dx1-7033" >668</a>, <a
+href="glossaries-extra-manual.html#dx1-7042" >669</a>, <a
+href="glossaries-extra-manual.html#dx1-7050" >670</a>, <a
+href="glossaries-extra-manual.html#dx1-7055" >671</a>, <a
+href="glossaries-extra-manual.html#dx1-7059" >672</a>, <a
+href="glossaries-extra-manual.html#dx1-7064" >673</a>, <a
+href="glossaries-extra-manual.html#dx1-7068" >674</a>, <a
+href="glossaries-extra-manual.html#dx1-9038" >675</a>, <a
+href="glossaries-extra-manual.html#dx1-9039" >676</a>, <a
+href="glossaries-extra-manual.html#dx1-16048" >677</a>, <a
+href="glossaries-extra-manual.html#dx1-16051" >678</a>, <a
+href="glossaries-extra-manual.html#dx1-18129" >679</a>, <a
+href="glossaries-extra-manual.html#dx1-21031" >680</a>, <a
+href="glossaries-extra-manual.html#dx1-21035" >681</a>, <a
+href="glossaries-extra-manual.html#dx1-28003" >682</a>, <a
href="glossaries-extra-manual.html#dx1-30018" ><span
-class="ecbx-1000">572</span></a> <br /></span>
+class="ecbx-1000">683</span></a> <br /></span>
<span class="index-item">location list&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-28006" >573</a>, <a
+href="glossaries-extra-manual.html#dx1-28006" >684</a>, <a
href="glossaries-extra-manual.html#dx1-30020" ><span
-class="ecbx-1000">574</span></a> <br /></span>
+class="ecbx-1000">685</span></a> <br /></span>
</p><p class="theindex"> <span
class="ecbx-1000">M</span>
<span class="index-item"><span
class="ectt-1000">makeglossaries</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3030" >575</a>, <a
-href="glossaries-extra-manual.html#dx1-3032" >576</a>, <a
-href="glossaries-extra-manual.html#dx1-3034" >577</a>, <a
+href="glossaries-extra-manual.html#dx1-3030" >686</a>, <a
+href="glossaries-extra-manual.html#dx1-3032" >687</a>, <a
+href="glossaries-extra-manual.html#dx1-3034" >688</a>, <a
href="glossaries-extra-manual.html#dx1-30023" ><span
-class="ecbx-1000">578</span></a> <br /></span>
+class="ecbx-1000">689</span></a> <br /></span>
<span class="index-item"><span
class="ectt-1000">makeindex</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3025" >579</a>, <a
-href="glossaries-extra-manual.html#dx1-3031" >580</a>, <a
-href="glossaries-extra-manual.html#dx1-3035" >581</a>, <a
-href="glossaries-extra-manual.html#dx1-4030" >582</a>, <a
-href="glossaries-extra-manual.html#dx1-23027" >583</a>, <a
-href="glossaries-extra-manual.html#dx1-30025" >584</a>, <a
+href="glossaries-extra-manual.html#dx1-3025" >690</a>, <a
+href="glossaries-extra-manual.html#dx1-3031" >691</a>, <a
+href="glossaries-extra-manual.html#dx1-3035" >692</a>, <a
+href="glossaries-extra-manual.html#dx1-4030" >693</a>, <a
+href="glossaries-extra-manual.html#dx1-23027" >694</a>, <a
+href="glossaries-extra-manual.html#dx1-30025" >695</a>, <a
href="glossaries-extra-manual.html#dx1-30026" ><span
-class="ecbx-1000">585</span></a> <br /></span>
+class="ecbx-1000">696</span></a> <br /></span>
<span class="index-item"><span
class="ecss-1000">memoir </span>class&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3024" >586</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3024" >697</a> <br /></span>
<span class="index-item"><span
class="ecss-1000">mfirstuc </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-9" >587</a>, <a
-href="glossaries-extra-manual.html#dx1-21066" >588</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-9" >698</a>, <a
+href="glossaries-extra-manual.html#dx1-21070" >699</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>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-12003" ><span
-class="ecti-1000">589</span></a> <br /></span>
+class="ecti-1000">700</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\newabbreviationstyle</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-19001" ><span
-class="ecti-1000">590</span></a> <br /></span>
+class="ecti-1000">701</span></a> <br /></span>
<span class="index-item"><span
class="ectt-1000">\newglossaryentry </span>options<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">category</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-5004" >591</a>, <a
-href="glossaries-extra-manual.html#dx1-12004" >592</a>, <a
-href="glossaries-extra-manual.html#dx1-12012" >593</a>, <a
-href="glossaries-extra-manual.html#dx1-21001" >594</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-5004" >702</a>, <a
+href="glossaries-extra-manual.html#dx1-12004" >703</a>, <a
+href="glossaries-extra-manual.html#dx1-12012" >704</a>, <a
+href="glossaries-extra-manual.html#dx1-21001" >705</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27038" >595</a>, <a
-href="glossaries-extra-manual.html#dx1-27040" >596</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27038" >706</a>, <a
+href="glossaries-extra-manual.html#dx1-27040" >707</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">descplural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27042" >597</a>, <a
-href="glossaries-extra-manual.html#dx1-27044" >598</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27042" >708</a>, <a
+href="glossaries-extra-manual.html#dx1-27044" >709</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">description</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17005" >599</a>, <a
-href="glossaries-extra-manual.html#dx1-17019" >600</a>, <a
-href="glossaries-extra-manual.html#dx1-17021" >601</a>, <a
-href="glossaries-extra-manual.html#dx1-17035" >602</a>, <a
-href="glossaries-extra-manual.html#dx1-17049" >603</a>, <a
-href="glossaries-extra-manual.html#dx1-18005" >604</a>, <a
-href="glossaries-extra-manual.html#dx1-18018" >605</a>, <a
-href="glossaries-extra-manual.html#dx1-18031" >606</a>, <a
-href="glossaries-extra-manual.html#dx1-18044" >607</a>, <a
-href="glossaries-extra-manual.html#dx1-18060" >608</a>, <a
-href="glossaries-extra-manual.html#dx1-18077" >609</a>, <a
-href="glossaries-extra-manual.html#dx1-19016" >610</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-16053" >710</a>, <a
+href="glossaries-extra-manual.html#dx1-17005" >711</a>, <a
+href="glossaries-extra-manual.html#dx1-17027" >712</a>, <a
+href="glossaries-extra-manual.html#dx1-17029" >713</a>, <a
+href="glossaries-extra-manual.html#dx1-17052" >714</a>, <a
+href="glossaries-extra-manual.html#dx1-17077" >715</a>, <a
+href="glossaries-extra-manual.html#dx1-18007" >716</a>, <a
+href="glossaries-extra-manual.html#dx1-18039" >717</a>, <a
+href="glossaries-extra-manual.html#dx1-18058" >718</a>, <a
+href="glossaries-extra-manual.html#dx1-18065" >719</a>, <a
+href="glossaries-extra-manual.html#dx1-18085" >720</a>, <a
+href="glossaries-extra-manual.html#dx1-18104" >721</a>, <a
+href="glossaries-extra-manual.html#dx1-18111" >722</a>, <a
+href="glossaries-extra-manual.html#dx1-18133" >723</a>, <a
+href="glossaries-extra-manual.html#dx1-19016" >724</a> <br /></span>
+
+
+
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">first</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7009" >611</a>, <a
-href="glossaries-extra-manual.html#dx1-9004" >612</a>, <a
-href="glossaries-extra-manual.html#dx1-16008" >613</a>, <a
-href="glossaries-extra-manual.html#dx1-16015" >614</a>, <a
-href="glossaries-extra-manual.html#dx1-19012" >615</a>, <a
-href="glossaries-extra-manual.html#dx1-19018" >616</a>, <a
-href="glossaries-extra-manual.html#dx1-20041" >617</a>, <a
-href="glossaries-extra-manual.html#dx1-27022" >618</a>, <a
-href="glossaries-extra-manual.html#dx1-27024" >619</a>, <a
-href="glossaries-extra-manual.html#dx1-30014" >620</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7015" >725</a>, <a
+href="glossaries-extra-manual.html#dx1-9004" >726</a>, <a
+href="glossaries-extra-manual.html#dx1-16008" >727</a>, <a
+href="glossaries-extra-manual.html#dx1-16015" >728</a>, <a
+href="glossaries-extra-manual.html#dx1-19012" >729</a>, <a
+href="glossaries-extra-manual.html#dx1-19018" >730</a>, <a
+href="glossaries-extra-manual.html#dx1-20041" >731</a>, <a
+href="glossaries-extra-manual.html#dx1-27022" >732</a>, <a
+href="glossaries-extra-manual.html#dx1-27024" >733</a>, <a
+href="glossaries-extra-manual.html#dx1-30014" >734</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">firstplural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7010" >621</a>, <a
-href="glossaries-extra-manual.html#dx1-19013" >622</a>, <a
-href="glossaries-extra-manual.html#dx1-19019" >623</a>, <a
-href="glossaries-extra-manual.html#dx1-27026" >624</a>, <a
-href="glossaries-extra-manual.html#dx1-27028" >625</a>, <a
-href="glossaries-extra-manual.html#dx1-30015" >626</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7016" >735</a>, <a
+href="glossaries-extra-manual.html#dx1-19013" >736</a>, <a
+href="glossaries-extra-manual.html#dx1-19019" >737</a>, <a
+href="glossaries-extra-manual.html#dx1-27026" >738</a>, <a
+href="glossaries-extra-manual.html#dx1-27028" >739</a>, <a
+href="glossaries-extra-manual.html#dx1-30015" >740</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">long</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12048" >627</a>, <a
-href="glossaries-extra-manual.html#dx1-16012" >628</a>, <a
-href="glossaries-extra-manual.html#dx1-27054" >629</a>, <a
-href="glossaries-extra-manual.html#dx1-27056" >630</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12052" >741</a>, <a
+href="glossaries-extra-manual.html#dx1-16012" >742</a>, <a
+href="glossaries-extra-manual.html#dx1-21033" >743</a>, <a
+href="glossaries-extra-manual.html#dx1-27054" >744</a>, <a
+href="glossaries-extra-manual.html#dx1-27056" >745</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">longplural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12049" >631</a>, <a
-href="glossaries-extra-manual.html#dx1-19033" >632</a>, <a
-href="glossaries-extra-manual.html#dx1-27058" >633</a>, <a
-href="glossaries-extra-manual.html#dx1-27060" >634</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12053" >746</a>, <a
+href="glossaries-extra-manual.html#dx1-19033" >747</a>, <a
+href="glossaries-extra-manual.html#dx1-27058" >748</a>, <a
+href="glossaries-extra-manual.html#dx1-27060" >749</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">name</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-9002" >635</a>, <a
-href="glossaries-extra-manual.html#dx1-17004" >636</a>, <a
-href="glossaries-extra-manual.html#dx1-17018" >637</a>, <a
-href="glossaries-extra-manual.html#dx1-17034" >638</a>, <a
-href="glossaries-extra-manual.html#dx1-17048" >639</a>, <a
-href="glossaries-extra-manual.html#dx1-18004" >640</a>, <a
-href="glossaries-extra-manual.html#dx1-18017" >641</a>, <a
-href="glossaries-extra-manual.html#dx1-18030" >642</a>, <a
-href="glossaries-extra-manual.html#dx1-18043" >643</a>, <a
-href="glossaries-extra-manual.html#dx1-18059" >644</a>, <a
-href="glossaries-extra-manual.html#dx1-18076" >645</a>, <a
-href="glossaries-extra-manual.html#dx1-19010" >646</a>, <a
-href="glossaries-extra-manual.html#dx1-23007" >647</a>, <a
-href="glossaries-extra-manual.html#dx1-24011" >648</a>, <a
-href="glossaries-extra-manual.html#dx1-27006" >649</a>, <a
-href="glossaries-extra-manual.html#dx1-28009" >650</a>, <a
-href="glossaries-extra-manual.html#dx1-28010" >651</a>, <a
-href="glossaries-extra-manual.html#dx1-28011" >652</a>, <a
-href="glossaries-extra-manual.html#dx1-28012" >653</a>, <a
-href="glossaries-extra-manual.html#dx1-28014" >654</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-9002" >750</a>, <a
+href="glossaries-extra-manual.html#dx1-17004" >751</a>, <a
+href="glossaries-extra-manual.html#dx1-17026" >752</a>, <a
+href="glossaries-extra-manual.html#dx1-17050" >753</a>, <a
+href="glossaries-extra-manual.html#dx1-17075" >754</a>, <a
+href="glossaries-extra-manual.html#dx1-18004" >755</a>, <a
+href="glossaries-extra-manual.html#dx1-18006" >756</a>, <a
+href="glossaries-extra-manual.html#dx1-18036" >757</a>, <a
+href="glossaries-extra-manual.html#dx1-18056" >758</a>, <a
+href="glossaries-extra-manual.html#dx1-18063" >759</a>, <a
+href="glossaries-extra-manual.html#dx1-18084" >760</a>, <a
+href="glossaries-extra-manual.html#dx1-18102" >761</a>, <a
+href="glossaries-extra-manual.html#dx1-18110" >762</a>, <a
+href="glossaries-extra-manual.html#dx1-18132" >763</a>, <a
+href="glossaries-extra-manual.html#dx1-19010" >764</a>, <a
+href="glossaries-extra-manual.html#dx1-23007" >765</a>, <a
+href="glossaries-extra-manual.html#dx1-24011" >766</a>, <a
+href="glossaries-extra-manual.html#dx1-27006" >767</a>, <a
+href="glossaries-extra-manual.html#dx1-28009" >768</a>, <a
+href="glossaries-extra-manual.html#dx1-28010" >769</a>, <a
+href="glossaries-extra-manual.html#dx1-28011" >770</a>, <a
+href="glossaries-extra-manual.html#dx1-28012" >771</a>, <a
+href="glossaries-extra-manual.html#dx1-28014" >772</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">plural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7013" >655</a>, <a
-href="glossaries-extra-manual.html#dx1-19015" >656</a>, <a
-href="glossaries-extra-manual.html#dx1-27018" >657</a>, <a
-href="glossaries-extra-manual.html#dx1-27020" >658</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7019" >773</a>, <a
+href="glossaries-extra-manual.html#dx1-19015" >774</a>, <a
+href="glossaries-extra-manual.html#dx1-27018" >775</a>, <a
+href="glossaries-extra-manual.html#dx1-27020" >776</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">see</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4039" >659</a>, <a
-href="glossaries-extra-manual.html#dx1-4040" >660</a>, <a
-href="glossaries-extra-manual.html#dx1-6011" >661</a>, <a
-href="glossaries-extra-manual.html#dx1-6013" >662</a>, <a
-href="glossaries-extra-manual.html#dx1-6014" >663</a>, <a
-href="glossaries-extra-manual.html#dx1-6016" >664</a>, <a
-href="glossaries-extra-manual.html#dx1-6023" >665</a>, <a
-href="glossaries-extra-manual.html#dx1-6024" >666</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4039" >777</a>, <a
+href="glossaries-extra-manual.html#dx1-4040" >778</a>, <a
+href="glossaries-extra-manual.html#dx1-6011" >779</a>, <a
+href="glossaries-extra-manual.html#dx1-6013" >780</a>, <a
+href="glossaries-extra-manual.html#dx1-6014" >781</a>, <a
+href="glossaries-extra-manual.html#dx1-6016" >782</a>, <a
+href="glossaries-extra-manual.html#dx1-6023" >783</a>, <a
+href="glossaries-extra-manual.html#dx1-6024" >784</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">short</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7006" >667</a>, <a
-href="glossaries-extra-manual.html#dx1-7014" >668</a>, <a
-href="glossaries-extra-manual.html#dx1-7017" >669</a>, <a
-href="glossaries-extra-manual.html#dx1-12046" >670</a>, <a
-href="glossaries-extra-manual.html#dx1-16011" >671</a>, <a
-href="glossaries-extra-manual.html#dx1-16018" >672</a>, <a
-href="glossaries-extra-manual.html#dx1-21047" >673</a>, <a
-href="glossaries-extra-manual.html#dx1-27046" >674</a>, <a
-href="glossaries-extra-manual.html#dx1-27048" >675</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7012" >785</a>, <a
+href="glossaries-extra-manual.html#dx1-7020" >786</a>, <a
+href="glossaries-extra-manual.html#dx1-7023" >787</a>, <a
+href="glossaries-extra-manual.html#dx1-12050" >788</a>, <a
+href="glossaries-extra-manual.html#dx1-16011" >789</a>, <a
+href="glossaries-extra-manual.html#dx1-16018" >790</a>, <a
+href="glossaries-extra-manual.html#dx1-21032" >791</a>, <a
+href="glossaries-extra-manual.html#dx1-21051" >792</a>, <a
+href="glossaries-extra-manual.html#dx1-27046" >793</a>, <a
+href="glossaries-extra-manual.html#dx1-27048" >794</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">shortplural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12007" >676</a>, <a
-href="glossaries-extra-manual.html#dx1-12047" >677</a>, <a
-href="glossaries-extra-manual.html#dx1-16029" >678</a>, <a
-href="glossaries-extra-manual.html#dx1-19028" >679</a>, <a
-href="glossaries-extra-manual.html#dx1-19043" >680</a>, <a
-href="glossaries-extra-manual.html#dx1-21040" >681</a>, <a
-href="glossaries-extra-manual.html#dx1-21044" >682</a>, <a
-href="glossaries-extra-manual.html#dx1-21048" >683</a>, <a
-href="glossaries-extra-manual.html#dx1-27050" >684</a>, <a
-href="glossaries-extra-manual.html#dx1-27052" >685</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12007" >795</a>, <a
+href="glossaries-extra-manual.html#dx1-12051" >796</a>, <a
+href="glossaries-extra-manual.html#dx1-16030" >797</a>, <a
+href="glossaries-extra-manual.html#dx1-19028" >798</a>, <a
+href="glossaries-extra-manual.html#dx1-19043" >799</a>, <a
+href="glossaries-extra-manual.html#dx1-21044" >800</a>, <a
+href="glossaries-extra-manual.html#dx1-21048" >801</a>, <a
+href="glossaries-extra-manual.html#dx1-21052" >802</a>, <a
+href="glossaries-extra-manual.html#dx1-27050" >803</a>, <a
+href="glossaries-extra-manual.html#dx1-27052" >804</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">sort</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4060" >686</a>, <a
-href="glossaries-extra-manual.html#dx1-9017" >687</a>, <a
-href="glossaries-extra-manual.html#dx1-9041" >688</a>, <a
-href="glossaries-extra-manual.html#dx1-19011" >689</a>, <a
-href="glossaries-extra-manual.html#dx1-23012" >690</a> <br /></span>
-
-
-
+href="glossaries-extra-manual.html#dx1-4060" >805</a>, <a
+href="glossaries-extra-manual.html#dx1-9017" >806</a>, <a
+href="glossaries-extra-manual.html#dx1-9041" >807</a>, <a
+href="glossaries-extra-manual.html#dx1-17051" >808</a>, <a
+href="glossaries-extra-manual.html#dx1-17076" >809</a>, <a
+href="glossaries-extra-manual.html#dx1-18005" >810</a>, <a
+href="glossaries-extra-manual.html#dx1-18037" >811</a>, <a
+href="glossaries-extra-manual.html#dx1-18059" >812</a>, <a
+href="glossaries-extra-manual.html#dx1-18064" >813</a>, <a
+href="glossaries-extra-manual.html#dx1-19011" >814</a>, <a
+href="glossaries-extra-manual.html#dx1-23012" >815</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">symbol</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27030" >691</a>, <a
-href="glossaries-extra-manual.html#dx1-27032" >692</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27030" >816</a>, <a
+href="glossaries-extra-manual.html#dx1-27032" >817</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">symbolplural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27034" >693</a>, <a
-href="glossaries-extra-manual.html#dx1-27036" >694</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27034" >818</a>, <a
+href="glossaries-extra-manual.html#dx1-27036" >819</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">text</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7012" >695</a>, <a
-href="glossaries-extra-manual.html#dx1-9003" >696</a>, <a
-href="glossaries-extra-manual.html#dx1-16010" >697</a>, <a
-href="glossaries-extra-manual.html#dx1-16016" >698</a>, <a
-href="glossaries-extra-manual.html#dx1-19014" >699</a>, <a
-href="glossaries-extra-manual.html#dx1-20036" >700</a>, <a
-href="glossaries-extra-manual.html#dx1-27014" >701</a>, <a
-href="glossaries-extra-manual.html#dx1-27016" >702</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7018" >820</a>, <a
+href="glossaries-extra-manual.html#dx1-9003" >821</a>, <a
+href="glossaries-extra-manual.html#dx1-16010" >822</a>, <a
+href="glossaries-extra-manual.html#dx1-16016" >823</a>, <a
+href="glossaries-extra-manual.html#dx1-19014" >824</a>, <a
+href="glossaries-extra-manual.html#dx1-20036" >825</a>, <a
+href="glossaries-extra-manual.html#dx1-27014" >826</a>, <a
+href="glossaries-extra-manual.html#dx1-27016" >827</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="ecss-1000">user1</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-16042" >828</a>, <a
+href="glossaries-extra-manual.html#dx1-16047" >829</a>, <a
+href="glossaries-extra-manual.html#dx1-21034" >830</a> <br /></span>
<span class="index-item">number list&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7060" >703</a>, <a
-href="glossaries-extra-manual.html#dx1-30022" >704</a>, <a
+href="glossaries-extra-manual.html#dx1-7072" >831</a>, <a
+href="glossaries-extra-manual.html#dx1-11030" >832</a>, <a
+href="glossaries-extra-manual.html#dx1-11033" >833</a>, <a
+href="glossaries-extra-manual.html#dx1-11034" >834</a>, <a
+href="glossaries-extra-manual.html#dx1-11035" >835</a>, <a
+href="glossaries-extra-manual.html#dx1-11037" >836</a>, <a
+href="glossaries-extra-manual.html#dx1-11038" >837</a>, <a
+href="glossaries-extra-manual.html#dx1-11040" >838</a>, <a
+href="glossaries-extra-manual.html#dx1-30022" >839</a>, <a
href="glossaries-extra-manual.html#dx1-30027" ><span
-class="ecbx-1000">705</span></a> <br /></span>
+class="ecbx-1000">840</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">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">abbreviations</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4042" >706</a>, <a
-href="glossaries-extra-manual.html#dx1-4048" >707</a>, <a
-href="glossaries-extra-manual.html#dx1-4049" >708</a>, <a
-href="glossaries-extra-manual.html#dx1-4088" >709</a>, <a
-href="glossaries-extra-manual.html#dx1-29002" >710</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4042" >841</a>, <a
+href="glossaries-extra-manual.html#dx1-4048" >842</a>, <a
+href="glossaries-extra-manual.html#dx1-4049" >843</a>, <a
+href="glossaries-extra-manual.html#dx1-4088" >844</a>, <a
+href="glossaries-extra-manual.html#dx1-29002" >845</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">accsupp</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4008" >711</a>, <a
-href="glossaries-extra-manual.html#dx1-4014" >712</a>, <a
-href="glossaries-extra-manual.html#dx1-27002" >713</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4008" >846</a>, <a
+href="glossaries-extra-manual.html#dx1-4014" >847</a>, <a
+href="glossaries-extra-manual.html#dx1-27002" >848</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">acronym</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4050" >714</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4050" >849</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">acronymlists</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4056" >715</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4056" >850</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">automake</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-29019" >716</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-29019" >851</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">docdef</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4023" >717</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4023" >852</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">true</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4034" >718</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4034" >853</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">docdefs</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24004" >719</a>, <a
-href="glossaries-extra-manual.html#dx1-24007" >720</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24004" >854</a>, <a
+href="glossaries-extra-manual.html#dx1-24007" >855</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">index</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-5006" >721</a>, <a
-href="glossaries-extra-manual.html#dx1-21007" >722</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-5006" >856</a>, <a
+href="glossaries-extra-manual.html#dx1-21007" >857</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">indexcrossrefs</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4038" >723</a>, <a
-href="glossaries-extra-manual.html#dx1-4041" >724</a>, <a
-href="glossaries-extra-manual.html#dx1-6022" >725</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4038" >858</a>, <a
+href="glossaries-extra-manual.html#dx1-4041" >859</a>, <a
+href="glossaries-extra-manual.html#dx1-6022" >860</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">indexonlyfirst</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-6002" >726</a>, <a
-href="glossaries-extra-manual.html#dx1-6005" >727</a>, <a
-href="glossaries-extra-manual.html#dx1-21029" >728</a>, <a
-href="glossaries-extra-manual.html#dx1-23023" >729</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-6002" >861</a>, <a
+href="glossaries-extra-manual.html#dx1-6005" >862</a>, <a
+href="glossaries-extra-manual.html#dx1-21029" >863</a>, <a
+href="glossaries-extra-manual.html#dx1-23023" >864</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">nomain</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3036" >730</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3036" >865</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">nomissingglstext</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4037" >731</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4037" >866</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">nonumberlist</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-30029" >732</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11032" >867</a>, <a
+href="glossaries-extra-manual.html#dx1-11036" >868</a>, <a
+href="glossaries-extra-manual.html#dx1-30029" >869</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">nopostdot</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11017" >733</a>, <a
-href="glossaries-extra-manual.html#dx1-11027" >734</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11019" >870</a>, <a
+href="glossaries-extra-manual.html#dx1-11029" >871</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">false</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3005" >735</a>, <a
-href="glossaries-extra-manual.html#dx1-11012" >736</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3005" >872</a>, <a
+href="glossaries-extra-manual.html#dx1-11014" >873</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">true</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3004" >737</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3004" >874</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">noredefwarn</span><br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">false</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3010" >738</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3010" >875</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">true</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3006" >739</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3006" >876</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">numbers</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4061" >740</a>, <a
-href="glossaries-extra-manual.html#dx1-4081" >741</a>, <a
-href="glossaries-extra-manual.html#dx1-21013" >742</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4061" >877</a>, <a
+href="glossaries-extra-manual.html#dx1-4081" >878</a>, <a
+href="glossaries-extra-manual.html#dx1-21013" >879</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">shortcuts</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4064" >743</a>, <a
-href="glossaries-extra-manual.html#dx1-4086" >744</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4064" >880</a>, <a
+href="glossaries-extra-manual.html#dx1-4086" >881</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">abbr</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4070" >745</a>, <a
-href="glossaries-extra-manual.html#dx1-15002" >746</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4070" >882</a>, <a
+href="glossaries-extra-manual.html#dx1-15002" >883</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">abbreviation</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-15001" >747</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-15001" >884</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">abbreviations</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4069" >748</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4069" >885</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">acro</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4067" >749</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4067" >886</a> <br /></span>
+
+
+
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">acronyms</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4066" >750</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4066" >887</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">all</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4082" >751</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4082" >888</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">false</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4085" >752</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4085" >889</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">none</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4084" >753</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4084" >890</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">other</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4072" >754</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4072" >891</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">true</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4083" >755</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4083" >892</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">stylemods</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4017" >756</a>, <a
-href="glossaries-extra-manual.html#dx1-11021" >757</a>, <a
-href="glossaries-extra-manual.html#dx1-11023" >758</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4017" >893</a>, <a
+href="glossaries-extra-manual.html#dx1-11023" >894</a>, <a
+href="glossaries-extra-manual.html#dx1-11025" >895</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">symbols</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4057" >759</a>, <a
-href="glossaries-extra-manual.html#dx1-4078" >760</a>, <a
-href="glossaries-extra-manual.html#dx1-21010" >761</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4057" >896</a>, <a
+href="glossaries-extra-manual.html#dx1-4078" >897</a>, <a
+href="glossaries-extra-manual.html#dx1-21010" >898</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">toc</span><br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">false</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3003" >762</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3003" >899</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">true</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3002" >763</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3002" >900</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">translate</span><br /></span>
-
-
-
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">babel</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3013" >764</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3013" >901</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">true</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3015" >765</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3015" >902</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">undefaction</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4019" >766</a>, <a
-href="glossaries-extra-manual.html#dx1-5003" >767</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4019" >903</a>, <a
+href="glossaries-extra-manual.html#dx1-5003" >904</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">error</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4020" >768</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4020" >905</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">warn</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4022" >769</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4022" >906</a> <br /></span>
<span class="index-item"><span
class="ectt-1000">page </span>(counter)&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22029" >770</a>, <a
-href="glossaries-extra-manual.html#dx1-22041" >771</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22029" >907</a>, <a
+href="glossaries-extra-manual.html#dx1-22041" >908</a> <br /></span>
<span class="index-item"><span
class="ecss-1000">polyglossia </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-29006" >772</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-29006" >909</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\printabbreviations</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-4043" ><span
-class="ecti-1000">773</span></a> <br /></span>
+class="ecti-1000">910</span></a> <br /></span>
<span class="index-item"><span
class="ectt-1000">\printglossary </span>options<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="ecss-1000">title</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-29007" >774</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-29007" >911</a> <br /></span>
</p><p class="theindex"> <span
class="ecbx-1000">R</span>
<span class="index-item"><span
class="ecss-1000">relsize </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-16033" >775</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-16035" >912</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="ectt-1000">\RestoreAcronyms</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-10003" ><span
-class="ecti-1000">776</span></a>, <a
+class="ecti-1000">913</span></a>, <a
href="glossaries-extra-manual.html#dx1-12016" ><span
-class="ecti-1000">777</span></a> <br /></span>
+class="ecti-1000">914</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>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14001" ><span
-class="ecti-1000">778</span></a> <br /></span>
+class="ecti-1000">915</span></a> <br /></span>
<span class="index-item"><span
class="ecss-1000">slantsc </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-20023" >779</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-20023" >916</a> <br /></span>
</p><p class="theindex"> <span
class="ecbx-1000">T</span>
<span class="index-item"><span
class="ecss-1000">textcase </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12" >780</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12" >917</a> <br /></span>
<span class="index-item"><span
class="ecss-1000">tracklang </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8" >781</a>, <a
-href="glossaries-extra-manual.html#dx1-29008" >782</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-8" >918</a>, <a
+href="glossaries-extra-manual.html#dx1-29008" >919</a> <br /></span>
<span class="index-item"><span
class="ecss-1000">translator </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3014" >783</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3014" >920</a> <br /></span>
</p><p class="theindex"> <span
class="ecbx-1000">X</span>
<span class="index-item"><span
class="ecss-1000">xfor </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-13" >784</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-13" >921</a> <br /></span>
<span class="index-item"><span
class="ectt-1000">xindy</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3026" >785</a>, <a
-href="glossaries-extra-manual.html#dx1-4031" >786</a>, <a
-href="glossaries-extra-manual.html#dx1-30024" >787</a>, <a
+href="glossaries-extra-manual.html#dx1-3026" >922</a>, <a
+href="glossaries-extra-manual.html#dx1-4031" >923</a>, <a
+href="glossaries-extra-manual.html#dx1-30024" >924</a>, <a
href="glossaries-extra-manual.html#dx1-30030" ><span
-class="ecbx-1000">788</span></a> <br /></span>
+class="ecbx-1000">925</span></a> <br /></span>
<span class="index-item"><span
class="ecss-1000">xkeyval </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11" >789</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11" >926</a> <br /></span>
</p></div>
+
+
+
<a
- id="dx1-31001"></a><div class="footnotes"><!--l. 196--><p class="indent" > <span class="footnote-mark"><a
+ id="dx1-31001"></a><div class="footnotes"><!--l. 198--><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
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
index 5643e32a8dc..e694ad5e677 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
Binary files differ
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 bf74f0c66f8..e82cc157a45 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
@@ -124,6 +124,8 @@ styles (glossaries):>#1={\protect\ttfamily#1}|main}}
\newcommand*{\abbrstyle}[1]{\textsf{#1}\index{abbreviation styles:>#1={\protect\sffamily#1}|main}}
+\newcommand*{\depabbrstyle}[1]{\textsf{#1}\index{abbreviation styles (deprecated):>#1={\protect\sffamily#1}|main}}
+
\newcommand*{\category}[1]{\textsf{#1}\index{categories:>#1={\protect\sffamily#1}|main}}
\newcommand*{\catattr}[1]{\textsf{#1}\index{category attributes:>#1={\protect\sffamily#1}|main}}
@@ -139,13 +141,13 @@ styles (glossaries):>#1={\protect\ttfamily#1}|main}}
\MakeShortVerb{"}
\DeleteShortVerb{\|}
- \title{glossaries-extra.sty v1.03:
+ \title{glossaries-extra.sty v1.04:
an extension to the glossaries package}
\author{Nicola L.C. Talbot\\[10pt]
Dickimaw Books\\
\url{http://www.dickimaw-books.com/}}
- \date{2016-04-27}
+ \date{2016-05-02}
\maketitle
\begin{abstract}
@@ -662,8 +664,9 @@ actually has a hyperlink. The actual text and the way it's displayed
depends on the command used (such as \cs{gls}) and the entry format.
The default entry format (\ics{glsentryfmt}) used in the
-\gls{linktext} by commands like \cs{gls} (but not commands like
-\cs{glstext}) is changed by \styfmt{glossaries-extra} to test for
+\gls{linktext} by commands like \ics{gls}, \ics{glsxtrfull},
+\ics{glsxtrshort} and \ics{glsxtrlong} (but not commands like
+\ics{glslink}, \ics{glsfirst} and \cs{glstext}) is changed by \styfmt{glossaries-extra} to test for
regular entries, which are determined as follows:
\begin{itemize}
@@ -695,6 +698,52 @@ 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.
+As from version 1.04, \ics{glsentryfmt} now puts \ics{glsgenentry}
+in the argument of the new command
+\begin{definition}[\DescribeMacro\glsxtrregularfont]
+\cs{glsxtrregularfont}\marg{text}
+\end{definition}
+This just does its argument \meta{text} by default. This means that
+if you want regular entries in a different font but don't want
+that font to apply to abbreviations, then you can redefine
+\cs{glsxtrregularfont}. This is more precise than changing
+\ics{glstextformat} which will be applied to all linking commands
+for all entries.
+
+For example:
+\begin{verbatim}
+\renewcommand*{\glsxtrregularfont}[1]{\textsf{#1}}
+\end{verbatim}
+You can access the label through \cs{glslabel}. For example,
+you can query the category:
+\begin{verbatim}
+\renewcommand*{\glsxtrregularfont}[1]{%
+ \glsifcategory{\glslabel}{general}{\textsf{#1}}{#1}}
+\end{verbatim}
+or query the category attribute:
+\begin{verbatim}
+\glssetcategoryattribute{general}{font}{sf}
+
+\renewcommand*{\glsxtrregularfont}[1]{%
+ \glsifattribute{\glslabel}{font}{sf}{\textsf{#1}}{#1}}
+\end{verbatim}
+or use the attribute to store the control sequence name:
+\begin{verbatim}
+\glssetcategoryattribute{general}{font}{textsf}
+\glssetcategoryattribute{acronym}{font}{emph}
+
+\renewcommand*{\glsxtrregularfont}[1]{%
+ \glshasattribute{\glslabel}{font}%
+ {\csuse{\glsgetattribute{\glslabel}{font}}{#1}}%
+ {#1}%
+}
+\end{verbatim}
+(Remember the category and attribute settings will only queried
+here for \catattr{regular} entries, so if the abbreviation style
+for the \category{acronym} category in the above example changes
+the regular attribute to \qt{false}, \cs{glsxtrregularfont} will
+no longer apply.)
+
The \cs{glspostlinkhook} provided by the \sty{glossaries} package to
insert information after the \gls{linktext} produced by commands like \cs{gls} and \cs{glstext} is
redefined to
@@ -771,7 +820,7 @@ 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}
+However, the \abbrstyle{short-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}
@@ -784,7 +833,7 @@ after the \gls{linktext} on \gls{firstuse} for the \category{general} category:
}
\end{verbatim}
-The \abbrstyle{postfootnote} abbreviation style uses the
+The \abbrstyle{short-postfootnote} abbreviation style uses the
post-\gls{linktext} hook to
place the footnote after trailing punctuation characters.
@@ -1059,7 +1108,7 @@ 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 (such as
-\abbrstyle{long-desc}).
+\abbrstyle{long-noshort-desc}).
Additionally, any instance of the long form commands, such
as \ics{glsxtrlong} or \ics{acrlong} will be temporarily
@@ -1164,8 +1213,8 @@ the preamble). This should take into account situations where
\cs{hsize} isn't set until the start of the document.
The commands \ics{glossentryname} and \ics{glossentrydesc} are
-modified to take into account the \catattr{glossname} and
-\catattr{glossdesc} attributes (see \sectionref{sec:categories}).
+modified to take into account the \catattr{glossname},
+\catattr{glossdesc} and \catattr{glossdescfont} attributes (see \sectionref{sec:categories}).
This means you can make simple case-changing modifications to
the name and description without defining a new glossary style.
@@ -1182,6 +1231,18 @@ then the name is automatically indexed using
\end{definition}
See \sectionref{sec:autoindex} for further details.
+As from version 1.04, the post-name hook \cs{glsxtrpostnamehook}
+will also do \cs{glsxtrpostname}\meta{category} if it exists.
+You can use \ics{glscurrententrylabel} to obtain the entry label
+with the definition of this command. For example, suppose you are
+using a glossary style the doesn't display the symbol, you can
+insert the symbol after the name for a particular category, say,
+the \qt{symbol} category:
+\begin{verbatim}
+\newcommand*{\glsxtrpostnamesymbol}{\space
+ (\glsentrysymbol{\glscurrententrylabel})}
+\end{verbatim}
+
The post-description code used within the glossary is modified so
that it also does
\begin{definition}[\DescribeMacro\glsxtrpostdescription]
@@ -1275,6 +1336,48 @@ that the modified \glostyle{inline} style isn't affected by the
\pkgopt{nopostdot} option, but the post-description category hook
can still be used.
+The \gls{numberlist} is now placed inside the argument of
+\begin{definition}[\DescribeMacro\GlsXtrFormatLocationList]
+\cs{GlsXtrFormatLocationList}\marg{number list}
+\end{definition}
+This is internally used by \cs{glossaryentrynumbers}. The
+\pkgopt{nonumberlist} redefines \cs{glossaryentrynumbers} so that it
+doesn't display the \gls{numberlist}, but it still saves the
+\gls{numberlist} in case it's required.
+
+\begin{important}
+If you want to suppress the \gls{numberlist} always use the
+\pkgopt{nonumberlist} option instead of redefining
+\cs{glossaryentrynumbers} to do nothing.
+\end{important}
+
+If you want to, for example, change the font for the entire
+\gls{numberlist} then redefine \cs{GlsXtrFormatLocationList} as
+appropriate. Don't modify \cs{glossaryentrynumbers}.
+
+Sometimes users like to insert \qt{page} or \qt{pages} in front of
+the \gls{numberlist}. This is quite fiddly to do with the base
+\styfmt{glossaries} package, but \styfmt{glossaries-extra}
+provides a way of doing this. First you need to enable this
+option and specify the text to display using:
+\begin{definition}[\DescribeMacro\GlsXtrEnablePreLocationTag]
+\cs{GlsXtrEnablePreLocationTag}\marg{page}\marg{pages}
+\end{definition}
+where \meta{page} is the text to display if the \gls{numberlist} only
+contains a single location and \meta{pages} is the text to display
+otherwise. For example:
+\begin{verbatim}
+\GlsXtrEnablePreLocationTag{Page: }{Pages: }
+\end{verbatim}
+An extra run is required when using this command.
+
+\begin{important}
+Use \texttt{glsignore} not \texttt{@gobble} as the format if you
+want to suppress the page number (and only index the entry once).
+\end{important}
+
+See the accompanying sample file \texttt{sample-pages.tex}.
+
\chapter{Abbreviations}
\label{sec:abbreviations}
@@ -1332,7 +1435,7 @@ redefine \ics{acronymtype}.)
The \cs{newabbreviation} command is superficially similar to the
\sty{glossaries} package's \cs{newacronym} but you can apply
different styles to different categories. The default style is
-\abbrstyle{short} for entries in the \category{acronym} category and
+\abbrstyle{short-nolong} for entries in the \category{acronym} category and
\abbrstyle{short-long} for entries in the \category{abbreviation}
category. (These aren't the same as the acronym styles provided by
the \sty{glossaries} package, although they may produce similar
@@ -1368,32 +1471,57 @@ use one of the base styles, such as \abbrstyle{long-short}, or
define a new style in a similar manner to the \qt{sc}, \qt{sm}
or \qt{em} styles.
-All predefined abbreviation styles redefine \cs{glsfirstabbrvfont}
+Similarly the basic styles redefine \cs{glsfirstabbrvfont}
to use
\begin{definition}[\DescribeMacro\glsfirstabbrvdefaultfont]
\cs{glsfirstabbrvdefaultfont}\marg{short-form}
\end{definition}
-By default, this just does \cs{glsabbrvfont}\marg{short-form}
-so the \gls{firstuse} format matches the subsequence use format
-for the short form.
+whereas the font modifier styles, such as \abbrstyle{long-short=sc},
+use their own custom command, such as \cs{glsfirstscfont}.
+
The commands that display the full form for abbreviations use
\cs{glsfirstabbrvfont} to display the short form and
\begin{definition}[\DescribeMacro\glsfirstlongfont]
\cs{glsfirstlongfont}\marg{long-form}
\end{definition}
-to display the long form. As with \ics{glsabbrvfont}, this command
+to display the long form on \gls{firstuse} or for the inline full
+format. Commands like \cs{glsxtrlong} use
+\begin{definition}[\DescribeMacro\glslongfont]
+\cs{glslongfont}\marg{long-form}
+\end{definition}
+instead.
+
+As with \ics{glsabbrvfont}, this command
is changed by all styles. Currently all predefined abbreviation
-styles provided by \styfmt{glossaries-extra} redefine
+styles, except the \qt{long-em} (emphasize long form) versions, provided by
+\styfmt{glossaries-extra} redefine
\cs{glsfirstlongfont} to use
\begin{definition}[\DescribeMacro\glsfirstlongdefaultfont]
\cs{glsfirstlongdefaultfont}\marg{long-form}
\end{definition}
-You can redefine this command if you want to change the font used by
-the long form on \gls{firstuse} for all your abbreviations, or you can
+and \cs{glslongfont} to use
+\begin{definition}[\DescribeMacro\glslongdefaultfont]
+\cs{glslongdefaultfont}\marg{long-form}
+\end{definition}
+
+You can redefine these command if you want to change the font used by
+the long form for all your abbreviations (except for the
+emphasize-long styles), or you can
define your own abbreviation style that provides a different format
for only those abbreviations defined with that style.
+The \qt{long-em} (emphasize long) styles use
+\begin{definition}[\DescribeMacro\glsfirstlongemfont]
+\cs{glsfirstlongemfont}\marg{long-form}
+\end{definition}
+instead of \cs{glsfirstlongdefaultfont}\marg{long-form} and
+\begin{definition}[\DescribeMacro\glslongemfont]
+\cs{glslongemfont}\marg{long-form}
+\end{definition}
+instead of \cs{glslongdefaultfont}\marg{long-form}. The first form
+\cs{glsfirstlongemfont} is initialised to use \cs{glslongemfont}.
+
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:
@@ -1418,8 +1546,8 @@ 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}.
For some of the abbreviation styles, such as \abbrstyle{long-short}, the display and inline forms
-are the same. In the case of styles such as \abbrstyle{short} or
-\abbrstyle{footnote}, the display and inline full forms are different.
+are the same. In the case of styles such as \abbrstyle{short-nolong} or
+\abbrstyle{short-footnote}, the display and inline full forms are different.
These formatting commands aren't stored in the \gloskey{short},
\gloskey{shortplural}, \gloskey{long} or \gloskey{longplural}
@@ -1509,7 +1637,7 @@ given category. If there is no style set for the category, the
fallback is the style for the \texttt{abbreviation} category.
Some styles may automatically modify one or more of the attributes
associated with the given category. For example, the
-\abbrstyle{long} and \abbrstyle{short} styles set the
+\abbrstyle{long-noshort} and \abbrstyle{short-nolong} styles set the
\catattr{regular} attribute to \texttt{true}.
\begin{important}
@@ -1548,7 +1676,8 @@ The \emph{inline} full form can be produced with
(This this instead of \ics{acrfull}.)
As mentioned earlier, the inline full form may not necessarily match the format used on
-\gls{firstuse} with \cs{gls}. For example, the \abbrstyle{short} style
+\gls{firstuse} with \cs{gls}. For example, the
+\abbrstyle{short-nolong} style
only displays the short form on \gls{firstuse}, but the full
form will display the long form followed by the short form in
parentheses.
@@ -1719,6 +1848,14 @@ which is defined as
\begin{verbatim}
\newcommand*{\glsxtrscfont}[1]{\textsc{#1}}
\end{verbatim}
+and
+\begin{definition}[\DescribeMacro\glsxtrfirstscfont]
+\cs{glsxtrfirstscfont}\marg{text}
+\end{definition}
+which is defined as
+\begin{verbatim}
+\newcommand*{\glsxtrfirstscfont}[1]{\glsxtrscfont{#1}}
+\end{verbatim}
The default plural suffix for the short form is set to
\begin{definition}[\DescribeMacro\glsxtrscsuffix]
\cs{glsxtrscsuffix}
@@ -1737,6 +1874,15 @@ through the use of the \catattr{aposplural} and
\catattr{noshortplural} attributes. See
\sectionref{sec:categories} for further details.)
+Remember that \cs{textsc} renders \emph{lowercase} letters as small
+capitals. Uppercase letters are rendered as normal uppercase
+letters, so if you specify the short form in uppercase, you won't
+get small capitals unless you redefine \cs{glsxtrscfont} to
+convert its argument to lowercase. For example:
+\begin{verbatim}
+\renewcommand*{\glsxtrscfont}[1]{\textsc{\MakeLowercase{#1}}}
+\end{verbatim}
+
The \qt{sm} styles all use
\begin{definition}[\DescribeMacro\glsxtrsmfont]
\cs{glsxtrsmfont}\marg{text}
@@ -1745,7 +1891,15 @@ This is defined as:
\begin{verbatim}
\newcommand*{\glsxtrsmfont}[1]{\textsmaller{#1}}
\end{verbatim}
-If you want to use this, you must explicitly load the \sty{relsize}
+and
+\begin{definition}[\DescribeMacro\glsxtrfirstsmfont]
+\cs{glsxtrfirstsmfont}\marg{text}
+\end{definition}
+which is defined as
+\begin{verbatim}
+\newcommand*{\glsxtrfirstsmfont}[1]{\glsxtrsmfont{#1}}
+\end{verbatim}
+If you want to use this style, you must explicitly load the \sty{relsize}
package which defines the \ics{textsmaller} command. If you want to
easily switch between the \qt{sc} and \qt{sm} styles, you may find
it easier to redefine this command to convert to upper case:
@@ -1758,9 +1912,22 @@ The default plural suffix for the short form is set to
\end{definition}
This just does \ics{glspluralsuffix}.
-The \qt{em} styles all redefine \ics{glsabbrvfont} to use
-\ics{emph}. This is done explicitly and not through a helper
-command such as \cs{glsxtrscfont}.
+The \qt{em} styles all use
+\begin{definition}[\DescribeMacro\glsabbrvemfont]
+\cs{glsabbrvemfont}\marg{text}
+\end{definition}
+which is defined as:
+\begin{verbatim}
+\newcommand*{\glsabbrvemfont}[1]{\emph{#1}}
+\end{verbatim}
+and
+\begin{definition}[\DescribeMacro\glsfirstabbrvemfont]
+\cs{glsfirstabbrvemfont}\marg{text}
+\end{definition}
+which is defined as:
+\begin{verbatim}
+\newcommand*{\glsfirstabbrvemfont}[1]{\glsabbrvemfont{#1}}
+\end{verbatim}
Some of the styles use
\begin{definition}[\DescribeMacro\glsxtrfullsep]
@@ -1776,6 +1943,91 @@ or
\renewcommand*{\glsxtrfullsep}[1]{\glsacspace{#1}}
\end{verbatim}
+The new naming scheme for abbreviation styles is as follows:
+\begin{itemize}
+\item
+\meta{field1}[\texttt{-}\meta{modifier1}]\texttt{-}\meta{field2}[\texttt{-}\meta{modifier2}][\texttt{-user}]
+
+This is for the parenthetical styles. The \texttt{-}\meta{modifier} parts may
+be omitted. These styles display \meta{field1} followed by
+\meta{field2} in parentheses. If \meta{field2} starts with \qt{no}
+then the parenthetical element is omitted from the display style but
+is included in the inline style.
+
+If the \texttt{-}\meta{modifier} part is present, then the field has
+a font changing command applied to it.
+
+If the \texttt{-user} part is present, then the \gloskey{user1}
+value, if provided, is inserted into the parenthetical material .
+(The field used for the inserted material may be changed.)
+
+Examples:
+ \begin{itemize}
+ \item\abbrstyle{long-noshort-sc}: \meta{field1} is the long
+form, the short form is set in smallcaps but omitted in the display
+style.
+ \item\abbrstyle{long-em-short-em}: both the long form and the
+short form are emphasized. The short form is in parentheses.
+ \item\abbrstyle{long-short-em}: the
+short form is emphasized but not the long form. The short form is in parentheses.
+ \item\abbrstyle{long-short-user}: if the \gloskey{user1} key has
+been set, this produces the style \meta{long} (\meta{short},
+\meta{user1}) otherwise it just produces \meta{long} (\meta{short}).
+ \end{itemize}
+
+\item
+\meta{field1}[\texttt{-}\meta{modifier1}]\texttt{-}[\texttt{post}]\texttt{footnote}
+
+The display style uses \meta{field1} followed by a footnote with the
+other field in it. If \texttt{post} is present then the footnote is
+placed after the \gls{linktext} using the post-link hook.
+The inline style does \meta{field1} followed by the other field in
+parentheses.
+
+If \texttt{-}\meta{modifier1} is present, \meta{field1} has a
+font-changing command applied to it.
+
+Examples:
+\begin{itemize}
+\item \abbrstyle{short-footnote}: short form in the text with the
+long form in the footnote.
+\item \abbrstyle{short-sc-postfootnote}: short form in smallcaps
+with the long form in the footnote outside of the \gls{linktext}.
+\end{itemize}
+
+\begin{important}
+Take care with the footnote styles. Remember that there are some
+situations where \ics{footnote} doesn't work.
+\end{important}
+
+\item \meta{style}\texttt{-desc}
+
+Like \meta{style} but the \gloskey{description} key must be provided
+when defining abbreviations with this style.
+
+Examples:
+\begin{itemize}
+
+\item \abbrstyle{short-long-desc}: like \abbrstyle{short-long} but
+requires a description.
+\item \abbrstyle{short-em-footnote-desc}: like
+\abbrstyle{short-em-footnote} but requires a description.
+\end{itemize}
+\end{itemize}
+
+Not all combinations that fit the above syntax are provided.
+Pre-version 1.04 styles that didn't fit this naming scheme are either
+provided with a synonym (where the former name wasn't ambiguous) or
+provided with a deprecated synonym (where the former name was
+confusing).
+The deprecated style names generate a warning using:
+\begin{definition}[\DescribeMacro\GlsXtrWarnDeprecatedAbbrStyle]
+\cs{GlsXtrWarnDeprecatedAbbrStyle}\marg{old-name}\marg{new-name}
+\end{definition}
+where \meta{old-name} is the deprecated name and \meta{new-name} is
+the preferred name. You can suppress these warnings by redefining
+this command to do nothing.
+
\subsection{Predefined Abbreviation Styles that Set the Regular
Attribute}
\label{sec:predefregabbrvstyles}
@@ -1785,88 +2037,144 @@ attribute to \qt{true} for all categories that have abbreviations
defined with any of these styles.
\begin{description}
-\item[\abbrstyle{short}]
+\item[\abbrstyle{short-nolong}]
This only displays the short form on \gls{firstuse}. The \gloskey{name}
is set to the short form. The \gloskey{description} is set to the
long form. The inline full form displays
\meta{short} (\meta{long}). The long form on its own can be
displayed through commands like \ics{glsxtrlong}.
-\item[\abbrstyle{short-sc}]
-Like \abbrstyle{short} but redefines \cs{glsabbrvfont} to
+\item[\abbrstyle{short}] A synonym for \abbrstyle{short-nolong}.
+
+\item[\abbrstyle{short-sc-nolong}]
+Like \abbrstyle{short-nolong} but redefines \cs{glsabbrvfont} to
use \ics{glsxtrscfont}.
-\item[\abbrstyle{short-sm}]
-Like \abbrstyle{short} but redefines \cs{glsabbrvfont} to
+\item[\abbrstyle{short-sc}] A synonym for \abbrstyle{short-sc-nolong}
+
+\item[\abbrstyle{short-sm-nolong}]
+Like \abbrstyle{short-nolong} but redefines \cs{glsabbrvfont} to
use \ics{glsxtrsmfont}.
-\item[\abbrstyle{short-em}]
-Like \abbrstyle{short} but redefines \cs{glsabbrvfont} to
-use \ics{emph}.
+\item[\abbrstyle{short-sm}] A synonym for \abbrstyle{short-sm-nolong}.
+
+\item[\abbrstyle{short-em-nolong}]
+Like \abbrstyle{short-nolong} but redefines \cs{glsabbrvfont} to
+use \ics{glsxtremfont}.
-\item[\abbrstyle{short-desc}]
-Like the \abbrstyle{short} style, but the \gloskey{name} is set to
+\item[\abbrstyle{short-em}] A synonym for \abbrstyle{short-em-nolong}
+
+\item[\abbrstyle{short-nolong-desc}]
+Like the \abbrstyle{short-nolong} style, but the \gloskey{name} is set to
the full form and the \gloskey{description} must be supplied by the
-user. You may prefer to use the \abbrstyle{short} style with the
+user. You may prefer to use the \abbrstyle{short-nolong} style with the
post-description hook set to display the long form and override
the \gloskey{description} key. (See the sample file
\texttt{sample-acronym-desc.tex}.)
-\item[\abbrstyle{short-sc-desc}]
-Like \abbrstyle{short} but redefines \cs{glsabbrvfont} to
+\item[\abbrstyle{short-desc}] A synonym for
+\abbrstyle{short-nolong-desc}.
+
+\item[\abbrstyle{short-sc-nolong-desc}]
+Like \abbrstyle{short-nolong} but redefines \cs{glsabbrvfont} to
use \ics{glsxtrscfont}.
-\item[\abbrstyle{short-sm-desc}]
-Like \abbrstyle{short-desc} but redefines \cs{glsabbrvfont} to
+\item[\abbrstyle{short-sc-desc}] A synonym for
+\abbrstyle{short-sc-nolong-desc}.
+
+\item[\abbrstyle{short-sm-nolong-desc}]
+Like \abbrstyle{short-nolong-desc} but redefines \cs{glsabbrvfont} to
use \ics{glsxtrsmfont}.
-\item[\abbrstyle{short-em-desc}]
-Like \abbrstyle{short-desc} but redefines \cs{glsabbrvfont} to
-use \ics{emph}.
+\item[\abbrstyle{short-sm-desc}] A synonym for
+\abbrstyle{short-sm-nolong-desc}.
+
+\item[\abbrstyle{short-em-nolong-desc}]
+Like \abbrstyle{short-nolong-desc} but redefines \cs{glsabbrvfont} to
+use \ics{glsxtremfont}.
+
+\item[\abbrstyle{short-em-desc}] A synonym for
+\abbrstyle{short-em-nolong-desc}.
-\item[\abbrstyle{long-desc}]
+\item[\abbrstyle{long-noshort-desc}]
This style only displays the long form, regardless of first or
subsequent use of commands \ics{gls}. The short form may be
accessed through commands like \ics{glsxtrshort}. The inline full
form displays \meta{long} (\meta{short}).
-The \gloskey{name} is set to the long form and the
+The \gloskey{name} and \gloskey{sort} keys are set to the long form and the
\gloskey{description} must be provided by the user. The predefined
glossary styles won't display the short form. You can use the
post-description hook to automatically append the short form to the
description. The inline full form will display \meta{long}
(\meta{short}).
-\item[\abbrstyle{long-desc-sc}]
-Like the \abbrstyle{long-desc} style but the short form (accessed
+\item[\abbrstyle{long-desc}] A synonym for
+\abbrstyle{long-noshort-desc}.
+
+\item[\abbrstyle{long-noshort-sc-desc}]
+Like the \abbrstyle{long-noshort-desc} style but the short form (accessed
through commands like \ics{glsxtrshort}) use \ics{glsxtrscfont}.
+(This style was originally called \depabbrstyle{long-desc-sc}. Renamed in version
+1.04, but original name retained as a deprecated synonym for
+backward-compatibility.)
-\item[\abbrstyle{long-desc-sm}]
-Like \abbrstyle{long-desc} but redefines \cs{glsabbrvfont} to
+\item[\abbrstyle{long-noshort-sm-desc}]
+Like \abbrstyle{long-noshort-desc} but redefines \cs{glsabbrvfont} to
use \ics{glsxtrsmfont}.
-
-\item[\abbrstyle{long-desc-em}]
-Like \abbrstyle{long-desc} but redefines \cs{glsabbrvfont} to
-use \ics{emph}.
-
-\item[\abbrstyle{long}]
+(This style was originally called \depabbrstyle{long-desc-sm}. Renamed in version
+1.04, but original name retained as a deprecated synonym for
+backward-compatibility.)
+
+\item[\abbrstyle{long-noshort-em-desc}]
+Like \abbrstyle{long-noshort-desc} but redefines \cs{glsabbrvfont} to
+use \ics{glsxtremfont}. The long form isn't emphasized.
+(This style was originally called \depabbrstyle{long-desc-em}. Renamed in version
+1.04, but original name retained as a deprecated synonym for
+backward-compatibility.)
+
+\item[\abbrstyle{long-em-noshort-em-desc}]
+New to version 1.04, like \abbrstyle{long-noshort-desc} but redefines
+\cs{glsabbrvfont} to use \ics{glsxtremfont}. The long form uses
+\ics{glsfirstlongemfont} and \ics{glslongemfont}.
+
+\item[\abbrstyle{long-noshort}]
This style doesn't really make sense if you don't use the short
form anywhere in the document, but is provided for completeness.
-This is like the \abbrstyle{long-desc} style, but the \gloskey{name}
-is set to the short form and the \gloskey{description} is set to the
+This is like the \abbrstyle{long-noshort-desc} style, but the \gloskey{name}
+and \gloskey{sort} keys are
+set to the short form and the \gloskey{description} is set to the
long form.
-\item[\abbrstyle{long-sc}]
-Like the \abbrstyle{long} style but the short form (accessed
+\item[\abbrstyle{long}] A synonym for \abbrstyle{long-noshort}
+
+\item[\abbrstyle{long-noshort-sc}]
+Like the \abbrstyle{long-noshort} style but the short form (accessed
through commands like \ics{glsxtrshort}) use \ics{glsxtrscfont}.
+(This style was originally called \depabbrstyle{long-sc}. Renamed in version
+1.04, but original name retained as a deprecated synonym for
+backward-compatibility.)
-\item[\abbrstyle{long-sm}]
-Like \abbrstyle{long} but redefines \cs{glsabbrvfont} to
+\item[\abbrstyle{long-noshort-sm}]
+Like \abbrstyle{long-noshort} but redefines \cs{glsabbrvfont} to
use \ics{glsxtrsmfont}.
-
-\item[\abbrstyle{long-em}]
-Like \abbrstyle{long} but redefines \cs{glsabbrvfont} to
-use \ics{emph}.
+(This style was originally called \depabbrstyle{long-sm}. Renamed in version
+1.04, but original name retained as a deprecated synonym for
+backward-compatibility.)
+
+\item[\abbrstyle{long-noshort-em}]
+This style is like \abbrstyle{long-noshort} but redefines \cs{glsabbrvfont} to
+use \ics{glsxtremfont}. The long form isn't emphasized.
+(This style was originally called \depabbrstyle{long-em}. Renamed in version
+1.04, but original name retained as a deprecated synonym for
+backward-compatibility.)
+
+\item[\abbrstyle{long-em-noshort-em}]
+New to version 1.04, this style is like \abbrstyle{long-noshort} but redefines \cs{glsabbrvfont} to
+use \ics{glsxtremfont}, \cs{glsfirstlongfont} to use
+\cs{glsfirstlongemfont} and \cs{glslongfont} to use
+\cs{glslongemfont}. The short form isn't used by commands like
+\ics{gls}, but can be obtained using \ics{glsxtrshort}.
\end{description}
@@ -1883,9 +2191,13 @@ Other attributes may also be set, depending on the style.
\item[\abbrstyle{long-short}]
On \gls{firstuse}, this style uses the format \meta{long} (\meta{short}).
The inline and display full forms are the same. The \gloskey{name}
-is set to the short form. The
+and \gloskey{sort} keys are set to the short form. (The
+\gloskey{name} key additionally includes the font command
+\cs{glsabbrvfont}.) The
\gloskey{description} is set to the long form. The long and short
-forms are separated by \cs{glsxtrfullsep}.
+forms are separated by \cs{glsxtrfullsep}. If you want to insert
+material within the parentheses (such as a~translation), try the
+\abbrstyle{long-short-user} style.
\item[\abbrstyle{long-short-sc}]
Like \abbrstyle{long-short} but redefines \cs{glsabbrvfont} to
@@ -1897,13 +2209,92 @@ use \ics{glsxtrsmfont}.
\item[\abbrstyle{long-short-em}]
Like \abbrstyle{long-short} but redefines \cs{glsabbrvfont} to
-use \ics{emph}.
+use \ics{glsxtremfont}.
+
+\item[\abbrstyle{long-em-short-em}]
+New to version 1.04, this style is like \abbrstyle{long-short-em} but redefines \cs{glsfirstlongfont} to
+use \ics{glsfirstlongemfont}.
+
+\item[\abbrstyle{long-short-user}]
+This style was introduced in version 1.04. It's like the
+\abbrstyle{long-short} style but additional information can be
+inserted into the parenthetical material. This checks the value
+of the field given by
+\begin{definition}[DescribeMacro\glsxtruserfield]
+\cs{glsxtruserfield}
+\end{definition}
+(which defaults to \texttt{useri}) using \ics{ifglshasfield}
+(provided by \sty{glossaries}). If the field hasn't been set,
+the style behaves like the \abbrstyle{long-short} style and
+produces \meta{long} (\meta{short}) but if the field has been set,
+the contents of that field are inserted within the parentheses in
+the form \meta{long} (\meta{short}, \meta{field-value}).
+The format is governed by
+\begin{definition}[\DescribeMacro\glsxtruserparen]
+\cs{glsxtruserparen}\marg{text}\marg{label}
+\end{definition}
+where \meta{text} is the short form (for the
+\abbrstyle{long-short-user} style) or the long form (for the
+\abbrstyle{short-long-user} style). This command first inserts
+a space using \cs{glsxtrfullsep} and then the parenthetical content.
+The \meta{text} argument includes the font formatting command,
+\cs{glsfirstabbrvfont}\marg{short} in the case of the
+\abbrstyle{long-short-user} style and
+\cs{glsfirstlongfont}\marg{long} in the
+case of the \abbrstyle{short-long-user} style.
+
+For example:
+\begin{verbatim}
+\setabbreviationstyle[acronym]{long-short-user}
+
+\newacronym{tug}{TUG}{\TeX\ User Group}
+
+\newacronym
+ [user1={German Speaking \TeX\ User Group}]
+ {dante}{DANTE}{Deutschsprachige Anwendervereinigung \TeX\ e.V}
+
+\end{verbatim}
+On first use, \verb|\gls{tug}| will appear as:
+\begin{quote}
+\TeX\ User Group (TUG)
+\end{quote}
+whereas \verb|\gls{dante}| will appear as:
+\begin{quote}
+Deutschsprachige Anwendervereinigung \TeX\ e.V (DANTE, German Speaking \TeX\ User Group)
+\end{quote}
+
+The short form is formatted according to
+\begin{definition}[\DescribeMacro\glsabbrvuserfont]
+\cs{glsabbrvuserfont}\marg{text}
+\end{definition}
+and the plural suffix is given by
+\begin{definition}[\DescribeMacro\glsxtrusersuffix]
+\cs{glsxtrusersuffix}
+\end{definition}
+
+These may be redefined as appropriate. For example,
+if you want a~smallcaps style, you can just set these commands
+to those used by the \abbrstyle{long-short-sc} style:
+\begin{verbatim}
+\renewcommand{\glsabbruserfont}[1]{\glsxtrscfont{#1}}
+\renewcommand{\glsxtrusersuffix}{\glsxtrscsuffix}
+\end{verbatim}
\item[\abbrstyle{long-short-desc}]
On \gls{firstuse}, this style uses the format \meta{long} (\meta{short}).
The inline and display full forms are the same. The \gloskey{name}
-is set to the full form. The
-\gloskey{description} must be supplied by the user.
+is set to the full form. The \gloskey{sort} key is set to
+\meta{long} (\meta{short}). Before version 1.04, this was
+incorrectly set to the short form. If you want to revert back to
+this you can redefine
+\begin{definition}[\DescribeMacro\glsxtrlongshortdescsort]
+\cs{glsxtrlongshortdescsort}
+\end{definition}
+For example:
+\begin{verbatim}
+\renewcommand*{\glsxtrlongshortdescsort}{\the\glsshorttok}
+\end{verbatim}
+The \gloskey{description} must be supplied by the user.
The long and short forms are separated by \cs{glsxtrfullsep}.
\item[\abbrstyle{long-short-sc-desc}]
@@ -1916,14 +2307,32 @@ use \ics{glsxtrsmfont}.
\item[\abbrstyle{long-short-em-desc}]
Like \abbrstyle{long-short-desc} but redefines \cs{glsabbrvfont} to
-use \ics{emph}.
+use \ics{glsxtremfont}.
+
+\item[\abbrstyle{long-em-short-em-desc}]
+New to version 1.04, this style is like \abbrstyle{long-short-em-desc} but redefines \cs{glsfirstlongfont} to
+use \ics{glsfirstlongemfont}.
+
+
+\item[\abbrstyle{long-short-user-desc}]
+New to version 1.04, this style is like a~cross between the
+\abbrstyle{long-short-desc} style and the
+\abbrstyle{long-short-user} style. The display and inline forms are
+as for \abbrstyle{long-short-user} and the \gloskey{name} key is as
+\abbrstyle{long-short-desc}. The \gloskey{description} key must be
+supplied in the optional argument of \cs{newabbreviation}
+(or \cs{newacronym}). The \gloskey{sort} key is set to \meta{long}
+(\meta{short}) as per the \abbrstyle{long-short-desc} style.
\item[\abbrstyle{short-long}]
On \gls{firstuse}, this style uses the format \meta{short} (\meta{long}).
The inline and display full forms are the same. The \gloskey{name}
-is set to the short form. The
+and \gloskey{sort} keys are set to the short form. The
\gloskey{description} is set to the long form.
The short and long forms are separated by \cs{glsxtrfullsep}.
+If you want to insert
+material within the parentheses (such as a~translation), try the
+\abbrstyle{short-long-user} style.
\item[\abbrstyle{short-sc-long}]
Like \abbrstyle{short-long} but redefines \cs{glsabbrvfont} to
@@ -1935,7 +2344,18 @@ use \ics{glsxtrsmfont}.
\item[\abbrstyle{short-em-long}]
Like \abbrstyle{short-long} but redefines \cs{glsabbrvfont} to
-use \ics{emph}.
+use \ics{glsxtremfont}.
+
+\item[\abbrstyle{short-em-long-em}]
+New to version 1.04, this style is like \abbrstyle{short-em-long} but redefines \cs{glsfirstlongfont} to
+use \ics{glsfirstlongemfont}.
+
+\item[\abbrstyle{short-long-user}]
+New to version 1.04. This style is like the
+\abbrstyle{long-short-user} style but with the long and short forms
+switched. The parenthetical material is governed by the same command
+\ics{glsxtruserparen}, but the first argument supplied to it is
+the long form instead of the short form.
\item[\abbrstyle{short-long-desc}]
On \gls{firstuse}, this style uses the format \meta{short} (\meta{long}).
@@ -1954,9 +2374,22 @@ use \ics{glsxtrsmfont}.
\item[\abbrstyle{short-em-long-desc}]
Like \abbrstyle{short-long-desc} but redefines \cs{glsabbrvfont} to
-use \ics{emph}.
-
-\item[\abbrstyle{footnote}]
+use \ics{glsxtremfont}.
+
+\item[\abbrstyle{short-em-long-em-desc}]
+New to version 1.04, this style is like \abbrstyle{short-em-long-desc} but redefines \cs{glsfirstlongfont} to
+use \ics{glsfirstlongemfont}.
+
+\item[\abbrstyle{short-long-user-desc}]
+New to version 1.04, this style is like a~cross between the
+\abbrstyle{short-long-desc} style and the
+\abbrstyle{short-long-user} style. The display and inline forms are
+as for \abbrstyle{short-long-user} and the \gloskey{name} key is as
+\abbrstyle{short-long-desc}. The \gloskey{description} key must be
+supplied in the optional argument of \cs{newabbreviation}
+(or \cs{newacronym}).
+
+\item[\abbrstyle{short-footnote}]
On \gls{firstuse}, this style displays the short form with the long form
as a footnote. This style automatically sets the
\catattr{nohyperfirst} attribute to \qt{true} for the supplied
@@ -1967,20 +2400,32 @@ 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.
-\item[\abbrstyle{footnote-sc}]
-Like \abbrstyle{footnote} but redefines \cs{glsabbrvfont} to
+\item[\abbrstyle{footnote}] A synonym for
+\abbrstyle{short-footnote}.
+
+\item[\abbrstyle{short-sc-footnote}]
+Like \abbrstyle{short-footnote} but redefines \cs{glsabbrvfont} to
use \ics{glsxtrscfont}.
+(This style was originally called \depabbrstyle{footnote-sc}. Renamed in version
+1.04, but original name retained as a deprecated synonym for
+backward-compatibility.)
-\item[\abbrstyle{footnote-sm}]
-Like \abbrstyle{footnote} but redefines \cs{glsabbrvfont} to
+\item[\abbrstyle{short-sc-footnote}]
+Like \abbrstyle{short-footnote} but redefines \cs{glsabbrvfont} to
use \ics{glsxtrsmfont}.
-
-\item[\abbrstyle{footnote-em}]
-Like \abbrstyle{footnote} but redefines \cs{glsabbrvfont} to
-use \ics{emph}.
-
-\item[\abbrstyle{postfootnote}]
-This is similar to the \abbrstyle{footnote} style but doesn't modify
+(This style was originally called \depabbrstyle{footnote-sm}. Renamed in version
+1.04, but original name retained as a deprecated synonym for
+backward-compatibility.)
+
+\item[\abbrstyle{short-em-footnote}]
+Like \abbrstyle{short-footnote} but redefines \cs{glsabbrvfont} to
+use \ics{glsxtremfont}.
+(This style was originally called \depabbrstyle{footnote-em}. Renamed in version
+1.04, but original name retained as a deprecated synonym for
+backward-compatibility.)
+
+\item[\abbrstyle{short-postfootnote}]
+This is similar to the \abbrstyle{short-footnote} style but doesn't modify
the category attribute. Instead it changes \postlinkcat\ to
insert the footnote after the
\gls{linktext} on \gls{firstuse}. This will also defer the footnote until after any
@@ -1994,17 +2439,29 @@ 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
+\item[\abbrstyle{postfootnote}] A synonym for
+\abbrstyle{short-postfootnote}.
+
+\item[\abbrstyle{short-sc-postfootnote}]
+Like \abbrstyle{short-postfootnote} but redefines \cs{glsabbrvfont} to
use \ics{glsxtrscfont}.
+(This style was originally called \depabbrstyle{postfootnote-sc}. Renamed in version
+1.04, but original name retained as a deprecated synonym for
+backward-compatibility.)
-\item[\abbrstyle{postfootnote-sm}]
-Like \abbrstyle{postfootnote} but redefines \cs{glsabbrvfont} to
+\item[\abbrstyle{short-sm-postfootnote}]
+Like \abbrstyle{short-postfootnote} but redefines \cs{glsabbrvfont} to
use \ics{glsxtrsmfont}.
+(This style was originally called \depabbrstyle{postfootnote-sm}. Renamed in version
+1.04, but original name retained as a deprecated synonym for
+backward-compatibility.)
-\item[\abbrstyle{postfootnote-em}]
-Like \abbrstyle{postfootnote} but redefines \cs{glsabbrvfont} to
-use \ics{emph}.
+\item[\abbrstyle{short-em-postfootnote}]
+Like \abbrstyle{short-postfootnote} but redefines \cs{glsabbrvfont} to
+use \ics{glsxtremfont}.
+(This style was originally called \depabbrstyle{postfootnote-em}. Renamed in version
+1.04, but original name retained as a deprecated synonym for
+backward-compatibility.)
\end{description}
@@ -2071,7 +2528,7 @@ The \meta{setup} argument may also redefine
which can be used to assign attributes. (This will automatically
be initialised to do nothing.)
-For example, the \abbrstyle{footnote} includes the following in
+For example, the \abbrstyle{short-footnote} includes the following in
\meta{setup}:
\begin{verbatim}
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
@@ -2145,10 +2602,10 @@ If you want to base a style on an existing style, you can use
\cs{GlsXtrUseAbbrStyleSetup}\marg{name}
\end{definition}
where \meta{name} is the name of the existing style.
-For example, the \abbrstyle{footnote-sc} and \abbrstyle{footnote-sm}
+For example, the \abbrstyle{short-sc-footnote} and \abbrstyle{short-sm-footnote}
styles both simply use
\begin{verbatim}
-\GlsXtrUseAbbrStyleSetup{footnote}
+\GlsXtrUseAbbrStyleSetup{short-footnote}
\end{verbatim}
within \meta{setup}.
@@ -2180,6 +2637,12 @@ The font used for the long form on \gls{firstuse} or in the full forms:
\cs{glsfirstlongfont}\marg{text}
\end{definition}
+The font used for the long form in commands like \cs{glsxtrlong}
+use:
+\begin{definition}[\DescribeMacro\glslongfont]
+\cs{glslongfont}\marg{text}
+\end{definition}
+
Display full form singular no case-change (used by \ics{gls} on
\gls{firstuse} for abbreviations without the \catattr{regular} attribute
set):
@@ -2251,6 +2714,7 @@ For example, the \abbrstyle{short-long} style has the following in
\renewcommand*{\glsabbrvfont}[1]{\glsabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
\renewcommand*{\glsxtrfullformat}[2]{%
\glsfirstabbrvfont{\glsaccessshort{##1}}##2\glsxtrfullsep{##1}%
(\glsfirstlongfont{\glsaccesslong{##1}})%
@@ -2301,7 +2765,7 @@ existing style are the \qt{em} styles, such as the
}%
{% fmts
\GlsXtrUseAbbrStyleFmts{short-long}%
- \renewcommand*{\glsabbrvfont}[1]{\emph{##1}}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsxtremfont{##1}}%
}
\end{verbatim}
@@ -2609,6 +3073,24 @@ post-\gls{linktext} hook will
discard a~full stop (period) that follows \emph{non-plural} commands like \cs{gls} or
\cs{glstext}. (Provided for entries such as abbreviations that end with a full stop.)
+Note that this can cause a problem if you access a field that
+doesn't end with a full stop. For example:
+\begin{verbatim}
+\newabbreviation
+ [user1={German Speaking \TeX\ User Group}]
+ {dante}{DANTE e.V.}{Deutschsprachige Anwendervereinigung \TeX\
+e.V.}
+\end{verbatim}
+Here the \gloskey{short} and \gloskey{long} fields end with a full stop, but the
+\gloskey{user1} field doesn't. The simplest solution in this
+situation is to put the sentence terminator in the final optional
+argument. For example:
+\begin{verbatim}
+\glsuseri{dante}[.]
+\end{verbatim}
+This will bring the punctuation character inside the \gls{linktext}
+and it won't be discarded.
+
\item[\catattr{pluraldiscardperiod}] If this attribute is set to
\qt{true} \emph{and} the \catattr{discardperiod} attribute is set to
\qt{true}, this will behave as above for the plural commands like
@@ -2688,6 +3170,17 @@ the title casing command \ics{capitalisewords} (provided
by \sty{mfirstuc}) is used on the name. Any other values of
this attribute are ignored.
+\item[\catattr{glossdescfont}] (New to version 1.04)
+In addition to the above, the modified \ics{glossentrydesc}
+command also checks this attribute. If set, it should be the name of
+a control sequence (without the leading backslash) that takes one
+argument. This control sequence will be applied to the description
+text. For example:
+\begin{verbatim}
+\glssetcategoryattribute{general}{glossdescfont}{emph}
+\end{verbatim}
+
+
\item[\catattr{glossname}] As \catattr{glossdesc} but applies
to \ics{glossentryname}. Additionally, if this attribute is
set to \qt{uc} the name is converted to all capitals.
@@ -2697,6 +3190,22 @@ used at the end of \ics{glossentyname}
will index the entry using \ics{index}. See
\sectionref{sec:autoindex} for further details.
+\item[\catattr{glossnamefont}] (New to version 1.04)
+In addition to the above, the modified \ics{glossentryname}
+command also checks this attribute. If set, it should be the name of
+a control sequence (without the leading backslash) that takes one
+argument. This control sequence will be applied to the name
+text. For example:
+\begin{verbatim}
+\glssetcategoryattribute{general}{glossnamefont}{emph}
+\end{verbatim}
+Note that this overrides \cs{glsnamefont} which will only
+be used if this attribute hasn't been set.
+
+Remember that glossary styles may additionally apply a font change,
+such as the list styles which put the name in the optional argument
+of \cs{item}.
+
\item[\catattr{dualindex}] If set, whenever a glossary entry
has information written to the external glossary file
through commands like \ics{gls} and \ics{glsadd}, a~corresponding
@@ -2783,7 +3292,7 @@ from a particular entry:
\end{definition}
There's also a shortcut to determine if a particular category has
-the \catattr{regular} attribute set:
+the \catattr{regular} attribute set to \qt{true}:
\begin{definition}[\DescribeMacro\glsifregularcategory]
\cs{glsifregularcategory}\marg{category-label}\marg{true-part}\marg{false-part}
\end{definition}
@@ -2792,6 +3301,19 @@ entry:
\begin{definition}[\DescribeMacro\glsifregular]
\cs{glsifregular}\marg{entry-label}\marg{true-part}\marg{false-part}
\end{definition}
+Note that if the \catattr{regular} attribute hasn't be set, the
+above do \meta{false-part}. There are also reverse commands that
+test if the \catattr{regular} attribute has been set to \qt{false}:
+\begin{definition}[\DescribeMacro\glsifnotregularcategory]
+\cs{glsifnotregularcategory}\marg{category-label}\marg{true-part}\marg{false-part}
+\end{definition}
+or for a particular entry:
+\begin{definition}[\DescribeMacro\glsifnotregular]
+\cs{glsifnotregular}\marg{entry-label}\marg{true-part}\marg{false-part}
+\end{definition}
+Again, if the \catattr{regular} attribute hasn't been set, the above
+do \meta{false-part}, so these reverse commands aren't logically
+opposite in the strict sense.
You can iterate through all entries with a given category using:
\begin{definition}
@@ -3640,6 +4162,9 @@ files provided by the \sty{glossaries} package for testing.
\item[sample-mixture.tex] General entries, acronyms and initialisms
all treated differently.
+\item[sample-name-font] Categories and attributes are used to
+customize the way different entries appear.
+
\item[sample-abbrv.tex] General abbreviations.
\item[sample-acronym.tex] Acronyms aren't initialisms and don't
@@ -3690,6 +4215,9 @@ if used more than $n$ times).
\item[sample-unitentrycount.tex] Enable use of per-unit entry-use counting.
+\item[sample-pages.tex] Insert \qt{page} or \qt{pages} before the
+location list.
+
\item[sample-onelink.tex] Using the per-unit entry counting
to only have one hyperlink per entry per page.
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf
index 84a4f37b9e6..b37ee2e20a9 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf
index 7e13ea85f34..175c980c4f7 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.tex b/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.tex
index 5ff870ab85f..a49aab93228 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.tex
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.tex
@@ -70,8 +70,8 @@ Access short: \glsentryshortaccess{spld}.
If the access field isn't set in the above, no replacement text
is used in the corresponding \verb|\glstext|, \verb|\glsaccesstext| etc commands.
-Text field: \glstext{spld} (\glsaccesstext{spld}).
-Short field: \glsxtrshort{spld} (\glsaccessshort{spld}).
+Text field: \glstext{spld} [no-index/link version: \glsaccesstext{spld}].
+Short field: \glsxtrshort{spld} [no-index/link version: \glsaccessshort{spld}].
\section{A Symbol}
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
index 6b31b5ae5db..e0f6c8f46e1 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
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf
index 77009987f7a..65eafa65876 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf
index bdf84f15706..1de3b3e449e 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-altmodifier.pdf
Binary files differ
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
index df6fa0ab87c..96ad5c905e6 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
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf
index 5508e3c7c69..adc12e48bce 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf
index af58db8ed32..7565c9bca20 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf
index 5811b5a6aa3..dac1c527910 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-docdef.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf
index 4bde611ee48..939f5cdb4f4 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-entrycount.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf
index 926772c8453..bc3c3e12c1c 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-footnote.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf
index 85655ff7f4f..82b7fa8d327 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-header.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf
index 9d1645b20ae..27643283f2d 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-indexhook.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf
index ad95437e75b..d971b7501f0 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-initialisms.pdf
Binary files differ
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
index 0309d0c0a19..c082e3fa908 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
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf
index 2ef99d7689a..7a325b6e116 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.tex b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.tex
index b4fcb875202..352200311e1 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.tex
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.tex
@@ -13,6 +13,35 @@
% regular terms:
+% (Version 1.04+) The following will make regular terms appear
+% in sans-serif when used with \gls etc but won't affect the
+% abbreviations:
+
+%\renewcommand*{\glsxtrregularfont}[1]{\textsf{#1}}
+
+% or limit to just the "general" category:
+%\renewcommand*{\glsxtrregularfont}[1]{%
+% \glsifcategory{\glslabel}{general}{\textsf{#1}}{#1}}
+
+% or limit to a particular attribute:
+
+%\glssetcategoryattribute{general}{font}{sf}
+%\glssetcategoryattribute{acronym}{font}{sf}
+
+%\renewcommand*{\glsxtrregularfont}[1]{%
+% \glsifattribute{\glslabel}{font}{sf}{\textsf{#1}}{#1}}
+
+% or use the attribute to store the font control sequence name:
+
+%\glssetcategoryattribute{general}{font}{textsf}
+%\glssetcategoryattribute{acronym}{font}{emph}
+%
+%\renewcommand*{\glsxtrregularfont}[1]{%
+% \glshasattribute{\glslabel}{font}%
+% {\csuse{\glsgetattribute{\glslabel}{font}}{#1}}%
+% {#1}%
+%}
+
% The following will make the first letter of the name upper case
% in the glossary for the general entries:
\glssetcategoryattribute{general}{glossname}{firstuc}
@@ -21,6 +50,16 @@
% in the glossary for the general entries:
\glssetcategoryattribute{general}{glossdesc}{firstuc}
+% (version 1.04+) The following will make the description
+% appear in italic in the glossary for general entries:
+
+%\glssetcategoryattribute{general}{glossdescfont}{emph}
+
+% (version 1.04+) The following will make the name
+% appear in italic in the glossary for general entries:
+
+%\glssetcategoryattribute{general}{glossnamefont}{emph}
+
\newglossaryentry{duck}{name=duck,%
description={a waterbird with webbed feet}}
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf
new file mode 100644
index 00000000000..062ea4bb470
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.tex b/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.tex
new file mode 100644
index 00000000000..169b28e9c22
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.tex
@@ -0,0 +1,355 @@
+% arara: pdflatex
+% arara: makeglossaries
+% arara: pdflatex
+% arara: pdflatex
+\documentclass[fontsize=10pt,open=any]{scrbook}
+
+\usepackage[T1]{fontenc}
+\usepackage{tgtermes}
+\usepackage{xcolor}
+\usepackage{siunitx}
+\usepackage[hidelinks]{hyperref}
+\usepackage[nopostdot=false,% don't suppress the post-description dot
+ stylemods=longragged,% load glossary-longragged.sty and glossaries-extra-stylemods.sty
+ style=longragged3col,% set the glossary style
+ nogroupskip% don't have a gap between groups
+]{glossaries-extra}
+
+% KOMA class alterations (the default sans-serif clashes
+% with the smallcaps font in the headings examples)
+\setkomafont{disposition}{\normalcolor\bfseries}
+
+\pagestyle{headings}
+
+% Need a wider column for the location list:
+\setlength{\glspagelistwidth}{0.12\textwidth}
+
+% Adjust the description column width if necessary:
+%\setlength{\glsdescwidth}{0.5\textwidth}
+
+% Default font for name field in the glossary. This may be
+% overridden by the category attributes:
+\renewcommand*{\glsnamefont}[1]{\textbf{#1}}
+
+\makeglossaries
+
+% Define some semantic commands:
+\newcommand*{\animalfont}[1]{\textcolor{brown}{#1}}
+\newcommand*{\vegetablefont}[1]{\textcolor{teal}{#1}}
+\newcommand*{\mineralfont}[1]{\textcolor{violet}{#1}}
+\newcommand*{\myacronymfont}[1]{\textcolor{orange}{#1}}
+\newcommand*{\bacteriafont}[1]{\textcolor{green}{#1}}
+\newcommand*{\unitfont}[1]{\textcolor{blue}{#1}}
+\newcommand*{\constantfont}[1]{\textcolor{magenta}{#1}}
+
+% Make the first letter of the name field uppercase in the glossary
+% for the given categories:
+
+\glssetcategoryattribute{animal}{glossname}{firstuc}
+\glssetcategoryattribute{mineral}{glossname}{firstuc}
+\glssetcategoryattribute{vegetable}{glossname}{firstuc}
+
+% Make the name field in the glossary use a font changing command
+% (overrides \glsnamefont). In this example, I'm using the semantic
+% commands I defined above. The backslash is omitted.
+
+\glssetcategoryattribute{animal}{glossnamefont}{animalfont}
+\glssetcategoryattribute{mineral}{glossnamefont}{mineralfont}
+\glssetcategoryattribute{vegetable}{glossnamefont}{vegetablefont}
+\glssetcategoryattribute{acronym}{glossnamefont}{myacronymfont}
+\glssetcategoryattribute{bacteria}{glossnamefont}{bacteriafont}
+\glssetcategoryattribute{unit}{glossnamefont}{unitfont}
+\glssetcategoryattribute{constant}{glossnamefont}{constantfont}
+
+% Modify the font used for the description in the glossary:
+%\glssetcategoryattribute{bacteria}{glossdescfont}{textsf}
+
+% Modify the way commands like \gls display regular terms according
+% to attribute.
+
+\glssetcategoryattribute{general}{font}{textsf}
+\glssetcategoryattribute{mineral}{font}{mineralfont}
+\glssetcategoryattribute{animal}{font}{animalfont}
+\glssetcategoryattribute{vegetable}{font}{vegetablefont}
+\glssetcategoryattribute{acronym}{font}{myacronymfont}
+\glssetcategoryattribute{unit}{font}{unitfont}
+\glssetcategoryattribute{constant}{font}{constantfont}
+
+% I can't add one of the above for the "abbreviation" or "bacteria"
+% category as they aren't considered regular entries. (They use
+% one of the abbreviation styles that sets the "regular" attribute
+% to "false".)
+\glssetcategoryattribute{bacteria}{font}{bacteriafont}% ignored!
+% If the abbreviation style for "bacteria" is changed to, say,
+% "short-em", the attribute won't be ignored.
+
+% Adjust \glsxtrregularfont so that it picks up the appropriate
+% command from the "font" attribute (set above).
+\renewcommand*{\glsxtrregularfont}[1]{%
+ \glshasattribute{\glslabel}{font}%
+ {\csuse{\glsgetattribute{\glslabel}{font}}{#1}}%
+ {#1}%
+}
+
+\newglossaryentry{duck}{name=duck,
+ category={animal},
+ description={a waterbird with webbed feet}}
+
+\newglossaryentry{parrot}{name=parrot,
+ category={animal},
+ description={mainly tropical bird with bright plumage}}
+
+\newglossaryentry{cabbage}{name=cabbage,
+ category={vegetable},
+ description={vegetable with thick green or purple leaves}}
+
+\newglossaryentry{brocolli}{name=brocolli,
+ category={vegetable},
+ description={vegetable with heads of small green or purple flower
+buds}}
+
+\newglossaryentry{quartz}{name=quartz,
+ category=mineral,
+ description={hard mineral consisting of silica}}
+
+\newglossaryentry{corundum}{name=corundum,
+ category=mineral,
+ description={crystalline form of aluminium oxide}}
+
+% The following doesn't have the category explicitly set, so it
+% defaults to "general":
+
+\newglossaryentry{loremipsum}{name={lorem ipsum},
+ description={dummy text}}
+
+% The following set the category to "unit":
+
+\newglossaryentry{ohm}{name=ohm,symbol={\si{\ohm}},
+category=unit,
+description=unit of electrical resistance}
+
+\newglossaryentry{angstrom}{name={\aa}ngstr\"om,
+category=unit,
+symbol={\si{\angstrom}},sort=angstrom,
+description={non-SI unit of length}}
+
+% The selected style doesn't display the symbol
+% so add it to the post-name hook:
+\newcommand*{\glsxtrpostnameunit}{ (\glsentrysymbol{\glscurrententrylabel})}
+
+% Insert the symbol after commands like \gls but only on first use
+% (and only for the "unit" category):
+
+\newcommand*{\glsxtrpostlinkunit}{%
+ \ifdefempty\glscustomtext{\glsxtrpostlinkAddSymbolOnFirstUse}{}}
+% The above "post-link" hook occurs after the link-text produced by
+% \gls so it's place outside the \unitfont argument.
+
+% Mathematic constants need the "sort" key set because the "name"
+% field contains commands:
+\newglossaryentry{pi}{name={\ensuremath{\pi}},
+sort=pi,
+category=constant,
+user1=pi,
+description={ratio of a circle's circumference to its diameter}}
+
+% Insert the description and "user1" text after commands like \gls but only on first use
+% (and only for the "constant" category):
+
+\newcommand*{\glsxtrpostlinkconstant}{%
+ \ifdefempty\glscustomtext
+ {\glsxtrifwasfirstuse{ (\glsentryuseri{\glslabel},
+ \glsentrydesc{\glslabel})}{}}%
+ {}}
+
+% Insert the "user1" text after the description in the glossary
+% but only for the "constant" category:
+\newcommand*{\glsxtrpostdescconstant}{\space
+ (\glsentryuseri{\glscurrententrylabel})}
+
+% \newacronym sets the category to "acronym" by default. The
+% "short-em" style makes it a regular entry.
+\setabbreviationstyle[acronym]{short-em}
+
+\newacronym{laser}{laser}{light amplification by
+stimulated emission of radiation}
+
+\newacronym{scuba}{scuba}{self-contained underwater breathing
+apparatus}
+
+% \newabbreviation sets the category to "abbreviation" by default.
+% The "long-short-sc" style sets the regular attribute to false.
+\setabbreviationstyle{long-short-sc}
+
+\newabbreviation{html}{html}{hypertext markup language}
+
+\newabbreviation{svg}{svg}{scalable vector graphics}
+
+% The optional argument can be used to set a different category:
+\setabbreviationstyle[bacteria]{long-em-short-em}
+%\setabbreviationstyle[bacteria]{short-em}
+
+% An alternative approach that uses \bacteriafont in the document
+% and in the glossary is to provide a custom style:
+%\newabbreviationstyle{bacteria}%
+%{%
+% \GlsXtrUseAbbrStyleSetup{long-short}%
+%}%
+%{%
+% \GlsXtrUseAbbrStyleFmts{long-short}%
+% \renewcommand*{\glsabbrvfont}[1]{\bacteriafont{##1}}%
+% \renewcommand*{\glsfirstlongfont}[1]{\bacteriafont{##1}}%
+% \renewcommand*{\glslongfont}[1]{\bacteriafont{##1}}%
+%}
+% (the definition of \bacteriafont would need to be adjusted to
+% include \emph)
+%\setabbreviationstyle[bacteria]{bacteria}
+
+\newabbreviation[category=bacteria]%
+ {cbot}% label
+ {C.~botulinum}% short
+ {Clostridium botulinum}% long
+
+\newabbreviation[category=bacteria]%
+ {putida}% label
+ {P.~putida}% short
+ {Pseudomonas putida}% long
+
+% Abbreviations that have translations. These put the translated
+% text in the "user1" field. The "-user" abbreviation styles
+% insert this field (if present) into the parenthetical material
+% when used with \gls.
+
+\setabbreviationstyle[foreign]{short-long-user}
+
+% The fonts used by this style can be adjusted:
+\renewcommand*{\glsabbrvuserfont}[1]{\textsf{\color{red}#1}}% short-form font
+\renewcommand*{\glslonguserfont}[1]{\textsf{#1}}% long-form font
+
+\newabbreviation[category=foreign,user1={French \TeX\ user group}]
+ {gutenberg}{GUTenburg}{Groupe francophone des utilisateurs de \TeX}
+
+% Insert the translation (user1) text after the description
+% in the glossary but only for the "foreign" category:
+\newcommand*{\glsxtrpostdescforeign}{\space
+ (Translation: \glsentryuseri{\glscurrententrylabel})}
+
+% Now we have an awkward one that ends with a period:
+\setabbreviationstyle[foreignenddot]{short-long-user}
+
+% Need to discard the end of sentence period for the
+% entries in this category.
+
+\glssetcategoryattribute{foreignenddot}{discardperiod}{true}
+
+% But not on first use (the user1 text doesn't end with a
+% period):
+\glssetcategoryattribute{foreignenddot}{retainfirstuseperiod}{true}
+
+\newabbreviation
+ [user1={German Speaking \TeX\ User Group},category=foreignenddot]
+ {dante}{DANTE e.V.}{Deutschsprachige Anwendervereinigung \TeX\ e.V.}
+
+% Insert the translation (user1) text after the description
+% in the glossary but only for the "foreignenddot" category:
+\newcommand*{\glsxtrpostdescforeignenddot}{\space
+ (Translation: \glsentryuseri{\glscurrententrylabel})}
+
+% Insert page/pages tag before location list:
+\GlsXtrEnablePreLocationTag{Page: }{Pages: }
+
+\begin{document}
+\tableofcontents
+
+\chapter{Samples in the Main Document Text}
+
+\section{All Entries}
+
+First use (\verb|\gls|): \forglsentries{\thislabel}{\gls{\thislabel}. }
+
+Next use (\verb|\gls|): \forglsentries{\thislabel}{\gls{\thislabel}. }
+
+Using \verb|\glsfirst|: \forglsentries{\thislabel}{\glsfirst{\thislabel}. }
+
+Using \verb|\glstext|: \forglsentries{\thislabel}{\glstext{\thislabel}. }
+
+\section{Abbreviations only}
+Abbreviations that have the \verb|regular| attribute set are
+hybrids and can have odd results. In this example, the hybrid
+entries are:
+\forglsentries{\thislabel}{%
+ \ifglshasshort{\thislabel}%
+ {% is an abbreviation
+ \glsifregular{\thislabel}%
+ {% is regular
+ \texttt{\thislabel}.
+ }%
+ {}%
+ }
+ {}%
+}
+
+Using \verb|\glsxtrfull|:
+\forglsentries{\thislabel}{%
+ \ifglshasshort{\thislabel}{\glsxtrfull{\thislabel}. }{}}
+
+Using \verb|\glsxtrshort|:
+\forglsentries{\thislabel}{%
+ \ifglshasshort{\thislabel}{\glsxtrshort{\thislabel}. }{}}
+
+Using \verb|\glsxtrlong|:
+\forglsentries{\thislabel}{%
+ \ifglshaslong{\thislabel}{\glsxtrlong{\thislabel}. }{}}
+
+\section{Symbols}
+
+Using \verb|\glssymbol|:
+\forglsentries{\thislabel}{%
+ \ifglshassymbol{\thislabel}{\glssymbol{\thislabel}. }{}}
+
+\section{User Field}
+
+Using \verb|\glsuseri|:
+\forglsentries{\thislabel}{%
+ \ifglshasfield{useri}{\thislabel}{\glsuseri{\thislabel}[.] }{}}
+
+(The full stop in the above is placed inside square brackets
+to prevent the \verb|discardperiod| attribute from discarding it
+since the \verb|useri| field doesn't end with a dot.)
+
+\chapter{Math Mode}
+Inline: $\gls{pi} = \frac{C}{d}$, display:
+
+\[
+ \gls{pi} = \frac{C}{d}
+\]
+
+\chapter{Samples in Headings}
+
+Don't use commands like \verb|\gls| in section headings, but you can
+use commands like \verb|\glsfmttext| or \verb|\glsfmtshort|.
+
+\forglsentries{\thislabel}{%
+ \ifglshasshort{\thislabel}%
+ {\section{\glsfmtshort{\thislabel}}}%
+ {%
+% the constant entry "pi" can't be used in the PDF bookmarks,
+% so use the user1 text for the bookmark
+ \glsifcategory{\thislabel}{constant}
+ {%
+ \section{\texorpdfstring{\glsfmttext{\thislabel}}{\glsentryuseri{\thislabel}}}%
+ }%
+ {%
+ \section{\glsfmttext{\thislabel}}%
+ }%
+ }%
+ \Glsdesc[noindex]{\thislabel}.
+}
+
+
+\renewcommand{\glossarypreamble}{\emph{This glossary uses the style
+`\csuse{@glossary@default@style}' with modifications made
+through categories and their attributes.}\par\medskip}
+\printglossaries
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf
index 3ed3e9db38a..1f220749904 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf
index 5a0b2c107e9..c0a9a80703e 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onelink.pdf
Binary files differ
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
index 0f157562111..b18a68a2335 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
Binary files differ
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
index 931611bf4bb..f6ae9c8c0ab 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
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf
index 26bdd2d7660..2c134f93aa4 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-onthefly.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf
new file mode 100644
index 00000000000..ff7334038da
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.tex b/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.tex
new file mode 100644
index 00000000000..bb1722f9d75
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.tex
@@ -0,0 +1,34 @@
+% arara: pdflatex
+% arara: makeglossaries
+% arara: pdflatex
+% arara: pdflatex
+\documentclass{report}
+
+\usepackage[nopostdot=false]{glossaries-extra}
+
+\makeglossaries
+
+\GlsXtrEnablePreLocationTag{Page: }{Pages: }
+
+\newglossaryentry{sample1}{name={sample1},description={an example}}
+\newglossaryentry{sample2}{name={sample2},description={another example}}
+\newglossaryentry{sample3}{name={sample3},description={a third example}}
+
+\newglossaryentry{sample4}{name={sample4},description={a fourth example}}
+\glsadd[format=glsignore]{sample4}
+
+\begin{document}
+\chapter{First}
+
+Two entries: \gls{sample1}, \gls{sample2}.
+
+\chapter{Second}
+
+One entry: \gls{sample1}.
+
+\chapter{Third}
+
+All entries: \gls{sample1}, \gls{sample2}, \gls{sample3}.
+
+\printglossaries
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf
index c99ef34d038..72e1e835085 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf
index 2d576a9c157..395057f732d 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf
index 8866b9f8ae7..613f4987a2d 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-prefix.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf
new file mode 100644
index 00000000000..27d4e874c3b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.tex b/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.tex
new file mode 100644
index 00000000000..041dc24e48c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.tex
@@ -0,0 +1,54 @@
+% arara: pdflatex
+% arara: makeglossaries
+% arara: pdflatex
+\documentclass{article}
+
+\usepackage[T1]{fontenc}
+\usepackage[colorlinks]{hyperref}
+\usepackage[nogroupskip]{glossaries-extra}
+
+\makeglossaries
+
+\setabbreviationstyle[acronym]{long-short-user}
+
+% Translations are stored in the user1 key in the sample file
+% (loaded below).
+% This is the default for the long-short-user style so
+% \glsxtruserfield doesn't need changing, but let's illustrate
+% changing the font style for the short form:
+
+\renewcommand{\glsabbrvuserfont}[1]{\textsc{\MakeLowercase{#1}}}
+\renewcommand*{\glsxtrusersuffix}{\glsxtrscsuffix}
+
+\loadglsentries{example-glossaries-acronyms-lang}
+
+% The entries in the above file are all defined using
+% \newacronym, which automatically sets the category
+% to "acronym" (which is why the abbreviation style needs
+% to use "acronym" in the optional argument). The glossary
+% can be adapted by using the post-description hook for this
+% category.
+
+% \glscurrentfieldvalue only works with glossaries v4.23 (and above)
+\renewcommand{\glsxtrpostdescacronym}{%
+ \ifglshasfield{\glsxtruserfield}{\glscurrententrylabel}%
+ { (English: \glscurrentfieldvalue)}%
+ {}%
+}
+
+\begin{document}
+
+\section{Sample}
+
+First use:
+
+\forglsentries{\thislabel}{\gls{\thislabel}. }
+
+Next use:
+
+\forglsentries{\thislabel}{\gls{\thislabel}. }
+
+\printglossaries
+
+\end{document}
+
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf
index b7deb2b704a..0dd1f2cbf18 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf
index 51318b99765..02dabc8bbdc 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-unitentrycount.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf
index ac8659003a9..6917c78dfa9 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample.pdf
Binary files differ
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 8935783ee9b..78529390d7a 100644
--- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
+++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
@@ -1,14 +1,14 @@
%\iffalse
% glossaries-extra.dtx generated using makedtx version 1.1 (c) Nicola Talbot
% Command line args:
-% -author "Nicola Talbot"
% -src "glossaries-extra.sty\Z=>glossaries-extra.sty"
% -src "glossaries-extra-stylemods.sty\Z=>glossaries-extra-stylemods.sty"
+% -author "Nicola Talbot"
% -section "chapter"
% -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})"
% -doc "glossaries-extra-codedoc.tex"
% glossaries-extra
-% Created on 2016/4/27 10:59
+% Created on 2016/5/2 18:05
%\fi
%\iffalse
%<*package>
@@ -117,7 +117,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\setcounter{IndexColumns}{2}
-\CheckSum{7699}
+\CheckSum{8698}
\newcommand*{\ifirstuse}{\iterm{first use}}
\newcommand*{\firstuse}{\gls{firstuse}}
@@ -153,13 +153,13 @@ styles (glossaries):>#1={\protect\ttfamily#1}|main}}
\raggedright
}
-\title{glossaries-extra.sty v1.03:
+\title{glossaries-extra.sty v1.04:
documented code}
\author{Nicola L.C. Talbot\\[10pt]
Dickimaw Books\\
\url{http://www.dickimaw-books.com/}}
-\date{2016-04-27}
+\date{2016-05-02}
\begin{document}
\DocInput{glossaries-extra.dtx}
@@ -204,7 +204,7 @@ Dickimaw Books\\
%\section{Package Initialisation and Options}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2016/04/27 v1.03 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2016/05/02 v1.04 (NLCT)]
% \end{macrocode}
% Requires \sty{xkeyval} to define package options.
% \begin{macrocode}
@@ -602,7 +602,7 @@ Dickimaw Books\\
\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
+ {The list of values (#1) in the `stylemods' key should
match the glossary-xxx.sty files provided with
glossaries.sty}%
}%
@@ -613,6 +613,34 @@ Dickimaw Books\\
% \end{macrocode}
%\end{option}
%
+%\begin{macro}{\@glsxtr@do@style}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\@glsxtr@do@style}{}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{option}{style}
+%\changes{1.04}{2016-05-02}{new}
+% Since the \pkgopt{stylemods} option can automatically load extra
+% style packages, deal with the \pkgopt{style} option after those
+% packages have been loaded.
+% \begin{macrocode}
+\define@key{glossaries-extra.sty}{style}{%
+ \renewcommand*{\@glsxtr@do@style}{%
+% \end{macrocode}
+% Set this as the default style:
+% \begin{macrocode}
+ \setkeys{glossaries.sty}{style={#1}}%
+% \end{macrocode}
+% Set this style:
+% \begin{macrocode}
+ \setglossarystyle{#1}%
+ }%
+}
+% \end{macrocode}
+%\end{option}
+%
% Pass all other options to \sty{glossaries}.
% \begin{macrocode}
\DeclareOptionX*{%
@@ -1248,15 +1276,27 @@ Dickimaw Books\\
% Has the \pkgopt{nonumberlist} option been used?
%\changes{0.5.2}{2015-12-08}{added}
% \begin{macrocode}
- \def\org@glossaryentrynumbers#1{#1\gls@save@numberlist{#1}}%
- \ifx\org@glossaryentrynumbers\glossaryentrynumbers
- \glsnonumberlistfalse
- \renewcommand*{\glossaryentrynumbers}[1]{%
- \GlsXtrFormatLocationList{#1}\gls@save@numberlist{#1}}%
- \else
- \glsnonumberlisttrue
- \renewcommand*{\glossaryentrynumbers}[1]{\gls@save@numberlist{#1}}%
- \fi
+\def\org@glossaryentrynumbers#1{#1\gls@save@numberlist{#1}}%
+\ifx\org@glossaryentrynumbers\glossaryentrynumbers
+ \glsnonumberlistfalse
+ \renewcommand*{\glossaryentrynumbers}[1]{%
+ \ifglsentryexists{\glscurrententrylabel}%
+ {%
+ \@glsxtrpreloctag
+ \GlsXtrFormatLocationList{#1}%
+ \@glsxtrpostloctag
+ \gls@save@numberlist{#1}%
+ }{}%
+ }%
+\else
+ \glsnonumberlisttrue
+ \renewcommand*{\glossaryentrynumbers}[1]{%
+ \ifglsentryexists{\glscurrententrylabel}%
+ {%
+ \gls@save@numberlist{#1}%
+ }{}%
+ }%
+\fi
% \end{macrocode}
%\end{macro}
%
@@ -1269,6 +1309,116 @@ Dickimaw Books\\
% \end{macrocode}
%\end{macro}
%
+% Sometimes users want to prefix the location list with
+% \qt{page}\slash\qt{pages}. The simplest way to determine if the
+% location list consists of a single location is to check for
+% instances of \cs{delimN} or \cs{delimR}, but this isn't so easy to
+% do as they might be embedded inside the argument of formatting
+% commands. With a bit of trickery we can find out by adjusting
+% \cs{delimN} and \cs{delimR} to set a flag and then save
+% information to the auxiliary file for the next run.
+%\begin{macro}{\GlsXtrEnablePreLocationTag}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\GlsXtrEnablePreLocationTag}[2]{%
+ \let\@glsxtrpreloctag\@@glsxtrpreloctag
+ \let\@glsxtrpostloctag\@@glsxtrpostloctag
+ \renewcommand*{\@glsxtr@pagetag}{#1}%
+ \renewcommand*{\@glsxtr@pagestag}{#2}%
+ \renewcommand*{\@glsxtr@savepreloctag}[2]{%
+ \csgdef{@glsxtr@preloctag@##1}{##2}%
+ }%
+ \renewcommand*{\@glsxtr@doloctag}{%
+ \ifcsundef{@glsxtr@preloctag@\glscurrententrylabel}%
+ {%
+ \GlossariesWarning{Missing pre-location tag for `\glscurrententrylabel'.
+ Rerun required}%
+ }%
+ {%
+ \csuse{@glsxtr@preloctag@\glscurrententrylabel}%
+ }%
+ }%
+}
+\@onlypreamble\GlsXtrEnablePreLocationTag
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@glsxtrpreloctag}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\@@glsxtrpreloctag}{%
+ \let\@glsxtr@org@delimN\delimN
+ \let\@glsxtr@org@delimR\delimR
+ \let\@glsxtr@org@glsignore\glsignore
+% \end{macrocode}
+% \cs{gdef} is required as the delimiters may occur inside a scope.
+% \begin{macrocode}
+ \gdef\@glsxtr@thisloctag{\@glsxtr@pagetag}%
+ \renewcommand*{\delimN}{%
+ \gdef\@glsxtr@thisloctag{\@glsxtr@pagestag}%
+ \@glsxtr@org@delimN}%
+ \renewcommand*{\delimR}{%
+ \gdef\@glsxtr@thisloctag{\@glsxtr@pagestag}%
+ \@glsxtr@org@delimR}%
+ \renewcommand*{\glsignore}[1]{%
+ \gdef\@glsxtr@thisloctag{\relax}%
+ \@glsxtr@org@glsignore{##1}}%
+ \@glsxtr@doloctag
+}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@glsxtrpreloctag}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\@glsxtrpreloctag}{}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@glsxtr@pagetag}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\@glsxtr@pagetag}{}%
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@glsxtr@pagestag}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\@glsxtr@pagestag}{}%
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@@glsxtrpostloctag}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\@@glsxtrpostloctag}{%
+ \let\delimN\@glsxtr@org@delimN
+ \let\delimR\@glsxtr@org@delimR
+ \let\glsignore\@glsxtr@org@glsignore
+ \protected@write\@auxout{}%
+ {\string\@glsxtr@savepreloctag{\glscurrententrylabel}{\@glsxtr@thisloctag}}%
+}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@glsxtrpostloctag}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\@glsxtrpostloctag}{}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@glsxtr@preloctag}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\@glsxtr@savepreloctag}[2]{}
+\protected@write\@auxout{}{%
+ \string\providecommand\string\@glsxtr@savepreloctag[2]{}}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@glsxtr@doloctag}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\@glsxtr@doloctag}{}
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\KV@printgloss@nonumberlist}
% Modify the \gloskey[printglossary]{nonumberlist} key to
% use \cs{GlsXtrFormatLocationList} (and also save the number list):
@@ -1284,7 +1434,9 @@ Dickimaw Books\\
\def\glossaryentrynumbers##1{\gls@save@numberlist{##1}}%
\else
\def\glossaryentrynumbers##1{%
+ \@glsxtrpreloctag
\GlsXtrFormatLocationList{##1}%
+ \@glsxtrpostloctag
\gls@save@numberlist{##1}}%
\fi
}%
@@ -1311,12 +1463,24 @@ Dickimaw Books\\
\renewcommand*{\glsentryfmt}{%
\ifglshasshort{\glslabel}{\glssetabbrvfmt{\glscategory{\glslabel}}}{}%
\glsifregular{\glslabel}%
- {\glsgenentryfmt}%
- {\ifglshasshort{\glslabel}{\glsxtrgenabbrvfmt}{\glsgenentryfmt}}%
+ {\glsxtrregularfont{\glsgenentryfmt}}%
+ {%
+ \ifglshasshort{\glslabel}%
+ {\glsxtrgenabbrvfmt}%
+ {\glsxtrregularfont{\glsgenentryfmt}}%
+ }%
}
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glsxtrregularfont}
+%\changes{1.04}{2016-05-02}{new}
+% Font used for regular entries.
+% \begin{macrocode}
+\newcommand*{\glsxtrregularfont}[1]{#1}
+% \end{macrocode}
+%\end{macro}
+%
% Commands like \cs{glsifplural} are only used by the \cs{gls}-like
% commands in the \sty{glossaries} package, but it might be useful
% for the postlink hook to know if the user has used, say,
@@ -1359,13 +1523,51 @@ Dickimaw Books\\
%\end{macro}
%
%Redefine the field link commands that need to modify the above.
+%Also add accessibility support and set the abbreviation styles if
+%required.
+%\begin{macro}{\glsxtrassignfieldfont}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrassignfieldfont}[1]{%
+ \ifglshasshort{#1}%
+ {%
+ \glssetabbrvfmt{\glscategory{#1}}%
+ \glsifregular{#1}%
+ {\let\@gls@field@font\glsxtrregularfont}%
+ {\let\@gls@field@font\@firstofone}%
+ }%
+ {%
+ \glsifnotregular{#1}%
+ {\let\@gls@field@font\@firstofone}%
+ {\let\@gls@field@font\glsxtrregularfont}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@glstext@}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
+% The abbreviation format may also need setting.
+% \begin{macrocode}
+\def\@glstext@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
+ \@gls@field@link{#1}{#2}{\@gls@field@font{\glsaccesstext{#2}#3}}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\@GLStext@}
% All uppercase version of \cs{glstext}.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+% The abbreviation format may also need setting.
% \begin{macrocode}
\def\@GLStext@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdofthree]{#1}{#2}%
- {\mfirstucMakeUppercase{\glsentrytext{#2}#3}}%
+ {\@gls@field@font{\GLSaccesstext{#2}\mfirstucMakeUppercase{#3}}}%
}
% \end{macrocode}
%\end{macro}
@@ -1373,10 +1575,14 @@ Dickimaw Books\\
%\begin{macro}{\@Glstext@}
% First letter uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+% The abbreviation format may also need setting.
% \begin{macrocode}
\def\@Glstext@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@secondofthree]{#1}{#2}%
- {\Glsentrytext{#2}#3}%
+ {\@gls@field@font{\Glsaccesstext{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1384,10 +1590,14 @@ Dickimaw Books\\
%\begin{macro}{\@glsfirst@}
% No case changing version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+% The abbreviation format may also need setting.
% \begin{macrocode}
\def\@glsfirst@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glsxtrifwasfirstuse\@firstoftwo]{#1}{#2}%
- {\glsentryfirst{#2}#3}%
+ {\@gls@field@font{\glsaccessfirst{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1395,13 +1605,17 @@ Dickimaw Books\\
%\begin{macro}{\@Glsfirst@}
% First letter uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+% The abbreviation format may also need setting.
% \begin{macrocode}
\def\@Glsfirst@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glsxtrifwasfirstuse\@firstoftwo
\let\glscapscase\@secondofthree
]%
- {#1}{#2}{\Glsentryfirst{#2}#3}%
+ {#1}{#2}{\@gls@field@font{\Glsaccessfirst{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1409,13 +1623,17 @@ Dickimaw Books\\
%\begin{macro}{\@GLSfirst@}
% All uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set abbreviation format}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+% The abbreviation format may also need setting.
% \begin{macrocode}
\def\@GLSfirst@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glsxtrifwasfirstuse\@firstoftwo
\let\glscapscase\@thirdofthree
]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryfirst{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\GLSaccessfirst{#2}\mfirstucMakeUppercase{#3}}}%
}
% \end{macrocode}
%\end{macro}
@@ -1425,10 +1643,14 @@ Dickimaw Books\\
%\changes{0.3}{2015-12-02}{added redefinition}
%\changes{1.03}{2016-04-27}{fixed bug \cs{@glsplural@} should be redefined
%not \cs{@glsplural}}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+% The abbreviation format may also need setting.
% \begin{macrocode}
\def\@glsplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glsifplural\@firstoftwo]{#1}{#2}%
- {\glsentryplural{#2}#3}%
+ {\@gls@field@font{\glsaccessplural{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1438,13 +1660,17 @@ Dickimaw Books\\
%\changes{0.3}{2015-12-02}{added redefinition}
%\changes{1.03}{2016-04-27}{fixed bug \cs{@Glsplural@} should be redefined
%not \cs{@Glsplural}}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+% The abbreviation format may also need setting.
% \begin{macrocode}
\def\@Glsplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glsifplural\@firstoftwo
\let\glscapscase\@secondofthree
]%
- {#1}{#2}{\Glsentryplural{#2}#3}%
+ {#1}{#2}{\@gls@field@font{\Glsaccessplural{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1454,13 +1680,17 @@ Dickimaw Books\\
%\changes{0.3}{2015-12-02}{added redefinition}
%\changes{1.03}{2016-04-27}{fixed bug \cs{@GLSplural@} should be redefined
%not \cs{@GLSplural}}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+% The abbreviation format may also need setting.
% \begin{macrocode}
\def\@GLSplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glsifplural\@firstoftwo
\let\glscapscase\@thirdofthree
]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryplural{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\GLSaccessplural{#2}\mfirstucMakeUppercase{#3}}}%
}
% \end{macrocode}
%\end{macro}
@@ -1468,13 +1698,17 @@ Dickimaw Books\\
%\begin{macro}{\@glsfirstplural@}
% No case changing version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+% The abbreviation format may also need setting.
% \begin{macrocode}
\def\@glsfirstplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glsxtrifwasfirstuse\@firstoftwo
\let\glsifplural\@firstoftwo
]%
- {#1}{#2}{\glsentryfirstplural{#2}#3}%
+ {#1}{#2}{\@gls@field@font{\glsaccessfirstplural{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1483,14 +1717,18 @@ Dickimaw Books\\
% First letter uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
%\changes{1.03}{2016-04-27}{bug fix: misspelt cs name}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+% The abbreviation format may also need setting.
% \begin{macrocode}
\def\@Glsfirstplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glsxtrifwasfirstuse\@firstoftwo
\let\glsifplural\@firstoftwo
\let\glscapscase\@secondofthree
]%
- {#1}{#2}{\Glsentryfirstplural{#2}#3}%
+ {#1}{#2}{\@gls@field@font{\Glsaccessfirstplural{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1499,14 +1737,32 @@ Dickimaw Books\\
% All uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
%\changes{1.03}{2016-04-27}{bug fix: misspelt cs name}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+% The abbreviation format may also need setting.
% \begin{macrocode}
\def\@GLSfirstplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glsxtrifwasfirstuse\@firstoftwo
\let\glsifplural\@firstoftwo
\let\glscapscase\@thirdofthree
]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryfirstplural{#2}#3}}%
+ {#1}{#2}%
+ {\@gls@field@font{\GLSaccessfirstplural{#2}\mfirstucMakeUppercase{#3}}}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@glsname@}
+% Redefine to use accessibility support.
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
+% The abbreviation format may also need setting.
+% \begin{macrocode}
+\def\@glsname@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
+ \@gls@field@link{#1}{#2}{\@gls@field@font{\glsaccessname{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1514,10 +1770,15 @@ Dickimaw Books\\
%\begin{macro}{\@Glsname@}
% First letter uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
+%\changes{0.5.2}{2015-12-08}{add accessibility support}
+% The abbreviation format may also need setting.
% \begin{macrocode}
\def\@Glsname@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryname{#2}#3}%
+ [\let\glscapscase\@secondoftwo]{#1}{#2}%
+ {\@gls@field@font{\Glsaccessname{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1525,10 +1786,26 @@ Dickimaw Books\\
%\begin{macro}{\@GLSname@}
% All uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+% The abbreviation format may also need setting.
% \begin{macrocode}
\def\@GLSname@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryname{#2}#3}}%
+ {#1}{#2}%
+ {\@gls@field@font{\GLSaccessname{#2}\mfirstucMakeUppercase{#3}}}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@glsdesc@}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
+% \begin{macrocode}
+\def\@glsdesc@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
+ \@gls@field@link{#1}{#2}{\@gls@field@font{\glsaccessdesc{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1536,10 +1813,14 @@ Dickimaw Books\\
%\begin{macro}{\@Glsdesc@}
% First letter uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
% \begin{macrocode}
\def\@Glsdesc@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentrydesc{#2}#3}%
+ [\let\glscapscase\@secondoftwo]{#1}{#2}%
+ {\@gls@field@font{\Glsaccessdesc{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1547,10 +1828,13 @@ Dickimaw Books\\
%\begin{macro}{\@GLSdesc@}
% All uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
% \begin{macrocode}
\def\@GLSdesc@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentrydesc{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\GLSaccessdesc{#2}\mfirstucMakeUppercase{#3}}}%
}
% \end{macrocode}
%\end{macro}
@@ -1558,12 +1842,15 @@ Dickimaw Books\\
%\begin{macro}{\@glsdescplural@}
% No case-changing version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
% \begin{macrocode}
\def\@glsdescplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glscapscase\@secondoftwo
\let\glsifplural\@firstoftwo
- ]{#1}{#2}{\glsentrydescplural{#2}#3}%
+ ]{#1}{#2}{\@gls@field@font{\glsaccessdescplural{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1571,12 +1858,15 @@ Dickimaw Books\\
%\begin{macro}{\@Glsdescplural@}
% First letter uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
% \begin{macrocode}
\def\@Glsdescplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glscapscase\@secondoftwo
\let\glsifplural\@firstoftwo
- ]{#1}{#2}{\Glsentrydescplural{#2}#3}%
+ ]{#1}{#2}{\@gls@field@font{\Glsaccessdescplural{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1584,13 +1874,28 @@ Dickimaw Books\\
%\begin{macro}{\@GLSdescplural@}
% All uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+%\changes{1.04}{2016-05-02}{set abbreviation and regular format}
% \begin{macrocode}
\def\@GLSdesc@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glscapscase\@thirdoftwo
\let\glsifplural\@firstoftwo
]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentrydescplural{#2}#3}}%
+ {#1}{#2}%
+ {\@gls@field@font{\GLSaccessdescplural{#2}\mfirstucMakeUppercase{#3}}}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@glssymbol@}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+%\changes{1.04}{2016-05-02}{set regular format}
+% \begin{macrocode}
+\def\@glssymbol@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
+ \@gls@field@link{#1}{#2}{\@gls@field@font{\glsaccesssymbol{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1598,10 +1903,14 @@ Dickimaw Books\\
%\begin{macro}{\@Glssymbol@}
% First letter uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@Glssymbol@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentrysymbol{#2}#3}%
+ [\let\glscapscase\@secondoftwo]%
+ {#1}{#2}{\@gls@field@font{\Glsaccesssymbol{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1609,10 +1918,13 @@ Dickimaw Books\\
%\begin{macro}{\@GLSsymbol@}
% All uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@GLSsymbol@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentrysymbol{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\GLSaccesssymbol{#2}\mfirstucMakeUppercase{#3}}}%
}
% \end{macrocode}
%\end{macro}
@@ -1620,12 +1932,15 @@ Dickimaw Books\\
%\begin{macro}{\@glssymbolplural@}
% No case-changing version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@glssymbolplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glscapscase\@secondoftwo
\let\glsifplural\@firstoftwo
- ]{#1}{#2}{\glsentrysymbolplural{#2}#3}%
+ ]{#1}{#2}{\@gls@field@font{\glsaccesssymbolplural{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1633,12 +1948,15 @@ Dickimaw Books\\
%\begin{macro}{\@Glssymbolplural@}
% First letter uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@Glssymbolplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glscapscase\@secondoftwo
\let\glsifplural\@firstoftwo
- ]{#1}{#2}{\Glsentrysymbolplural{#2}#3}%
+ ]{#1}{#2}{\@gls@field@font{\Glsaccesssymbolplural{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1646,13 +1964,17 @@ Dickimaw Books\\
%\begin{macro}{\@GLSsymbolplural@}
% All uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{0.5.2}{2015-12-08}{added accessibility support}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@GLSsymbol@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glscapscase\@thirdoftwo
\let\glsifplural\@firstoftwo
]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentrysymbolplural{#2}#3}}%
+ {#1}{#2}%
+ {\@gls@field@font{\GLSaccesssymbolplural{#2}\mfirstucMakeUppercase{#3}}}%
}
% \end{macrocode}
%\end{macro}
@@ -1660,10 +1982,13 @@ Dickimaw Books\\
%\begin{macro}{\@Glsuseri@}
% First letter uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@Glsuseri@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuseri{#2}#3}%
+ [\let\glscapscase\@secondoftwo]{#1}{#2}%
+ {\@gls@field@font{\Glsentryuseri{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1671,10 +1996,12 @@ Dickimaw Books\\
%\begin{macro}{\@GLSuseri@}
% All uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@GLSuseri@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryuseri{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\mfirstucMakeUppercase{\glsentryuseri{#2}#3}}}%
}
% \end{macrocode}
%\end{macro}
@@ -1682,10 +2009,13 @@ Dickimaw Books\\
%\begin{macro}{\@Glsuserii@}
% First letter uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@Glsuserii@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuserii{#2}#3}%
+ [\let\glscapscase\@secondoftwo]%
+ {#1}{#2}{\@gls@field@font{\Glsentryuserii{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1693,10 +2023,12 @@ Dickimaw Books\\
%\begin{macro}{\@GLSuserii@}
% All uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@GLSuserii@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryuserii{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\mfirstucMakeUppercase{\glsentryuserii{#2}#3}}}%
}
% \end{macrocode}
%\end{macro}
@@ -1704,10 +2036,13 @@ Dickimaw Books\\
%\begin{macro}{\@Glsuseriii@}
% First letter uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@Glsuseriii@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuseriii{#2}#3}%
+ [\let\glscapscase\@secondoftwo]%
+ {#1}{#2}{\@gls@field@font{\Glsentryuseriii{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1715,10 +2050,12 @@ Dickimaw Books\\
%\begin{macro}{\@GLSuseriii@}
% All uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@GLSuseriii@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryuseriii{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\mfirstucMakeUppercase{\glsentryuseriii{#2}#3}}}%
}
% \end{macrocode}
%\end{macro}
@@ -1726,10 +2063,13 @@ Dickimaw Books\\
%\begin{macro}{\@Glsuseriv@}
% First letter uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@Glsuseriv@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuseriv{#2}#3}%
+ [\let\glscapscase\@secondoftwo]%
+ {#1}{#2}{\@gls@field@font{\Glsentryuseriv{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1737,10 +2077,13 @@ Dickimaw Books\\
%\begin{macro}{\@GLSuseriv@}
% All uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@GLSuseriv@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryuseriv{#2}#3}}%
+ {#1}{#2}%
+ {\@gls@field@font{\mfirstucMakeUppercase{\glsentryuseriv{#2}#3}}}%
}
% \end{macrocode}
%\end{macro}
@@ -1748,10 +2091,13 @@ Dickimaw Books\\
%\begin{macro}{\@Glsuserv@}
% First letter uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@Glsuserv@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuserv{#2}#3}%
+ [\let\glscapscase\@secondoftwo]%
+ {#1}{#2}{\@gls@field@font{\Glsentryuserv{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1759,10 +2105,12 @@ Dickimaw Books\\
%\begin{macro}{\@GLSuserv@}
% All uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@GLSuserv@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryuserv{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\mfirstucMakeUppercase{\glsentryuserv{#2}#3}}}%
}
% \end{macrocode}
%\end{macro}
@@ -1770,10 +2118,13 @@ Dickimaw Books\\
%\begin{macro}{\@Glsuservi@}
% First letter uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@Glsuservi@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuservi{#2}#3}%
+ [\let\glscapscase\@secondoftwo]%
+ {#1}{#2}{\@gls@field@font{\Glsentryuservi{#2}#3}}%
}
% \end{macrocode}
%\end{macro}
@@ -1781,10 +2132,12 @@ Dickimaw Books\\
%\begin{macro}{\@GLSuservi@}
% All uppercase version.
%\changes{0.3}{2015-12-02}{added redefinition}
+%\changes{1.04}{2016-05-02}{set regular format}
% \begin{macrocode}
\def\@GLSuservi@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryuservi{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\mfirstucMakeUppercase{\glsentryuservi{#2}#3}}}%
}
% \end{macrocode}
%\end{macro}
@@ -2614,7 +2967,7 @@ Dickimaw Books\\
%\changes{0.5.4}{2015-12-15}{new}
% \begin{macrocode}
\def\@GLSxtr@p@long@#1#2[#3]{%
- {\mfirstucMakeUppercase{\glsentrylong{#2}#3}}}
+ {\mfirstucMakeUppercase{\glslongfont{\glsentrylong{#2}}#3}}}
% \end{macrocode}
%\end{macro}
%
@@ -2628,7 +2981,7 @@ Dickimaw Books\\
%\begin{macro}{\@Glsxtr@p@longpl@}
%\changes{0.5.4}{2015-12-15}{new}
% \begin{macrocode}
-\def\@Glsxtr@p@longpl@#1#2[#3]{{\Glsentrylongpl{#2}#3}}
+\def\@Glsxtr@p@longpl@#1#2[#3]{{\glslongfont{\Glsentrylongpl{#2}}#3}}
% \end{macrocode}
%\end{macro}
%
@@ -2636,7 +2989,7 @@ Dickimaw Books\\
%\changes{0.5.4}{2015-12-15}{new}
% \begin{macrocode}
\def\@GLSxtr@p@longpl@#1#2[#3]{%
- {\mfirstucMakeUppercase{\glsentrylongpl{#2}#3}}}
+ {\mfirstucMakeUppercase{\glslongfont{\glsentrylongpl{#2}}#3}}}
% \end{macrocode}
%\end{macro}
%
@@ -3755,7 +4108,7 @@ Dickimaw Books\\
%First we need a list of the glossaries that require
%\gls{makeindex}\slash\gls{xindy}.
%\begin{macro}{\@glsxtr@reg@glosslist}
-%\changes{0.5.5}{??}{new}
+%\changes{1.0}{2016-01-24}{new}
% \begin{macrocode}
\newcommand*{\@glsxtr@reg@glosslist}{}
% \end{macrocode}
@@ -3771,7 +4124,7 @@ Dickimaw Books\\
% list of glossary labels indicating those glossaries that should be
% processed with an indexing application.
%\begin{macro}{\makeglossaries}
-%\changes{0.5.5}{??}{new}
+%\changes{1.0}{2016-01-24}{new}
% \begin{macrocode}
\renewcommand*{\makeglossaries}[1][]{%
\ifblank{#1}%
@@ -3914,7 +4267,7 @@ want
%
% Display number list for the regular version:
%\begin{macro}{\@glsxtr@idx@displaynumberlist}
-%\changes{0.5.5}{??}{new}
+%\changes{1.0}{2016-01-24}{new}
% \begin{macrocode}
\let\@glsxtr@idx@displaynumberlist\glsdisplaynumberlist
% \end{macrocode}
@@ -3922,7 +4275,7 @@ want
%
% Display number list for the \qt{noidx} version:
%\begin{macro}{\@glsxtr@noidx@displaynumberlist}
-%\changes{0.5.5}{??}{new}
+%\changes{1.0}{2016-01-24}{new}
% \begin{macrocode}
\newcommand*{\@glsxtr@noidx@displaynumberlist}[1]{%
\letcs{\@gls@loclist}{glo@\glsdetoklabel{#1}@loclist}%
@@ -3955,7 +4308,7 @@ want
%\end{macro}
%And for the number list loop:
%\begin{macro}{\@glsxtr@noidx@numberlistloop}
-%\changes{0.5.5}{??}{new}
+%\changes{1.0}{2016-01-24}{new}
% \begin{macrocode}
\newcommand*{\@glsxtr@noidx@numberlistloop}[3]{%
\letcs{\@gls@loclist}{glo@\glsdetoklabel{#1}@loclist}%
@@ -3982,7 +4335,7 @@ want
%
%Same for entry number list.
%\begin{macro}{\@glsxtr@noidx@entrynumberlist}
-%\changes{0.5.5}{??}{new}
+%\changes{1.0}{2016-01-24}{new}
% \begin{macrocode}
\newcommand*{\@glsxtr@noidx@entrynumberlist}[1]{%
\letcs{\@gls@loclist}{glo@\glsdetoklabel{#1}@loclist}%
@@ -4002,9 +4355,10 @@ want
%\end{macro}
%
%\begin{macro}{\@glsxtr@idx@entrynumberlist}
-%\changes{0.5.5}{??}{new}
+%\changes{1.0}{2016-01-24}{new}
+%\changes{1.04}{2016-05-02}{switched from \cs{let} to \cs{newcommand}}
% \begin{macrocode}
-\let\@glsxtr@idx@entrynumberlist\glsentrynumberlist
+\newcommand*{\@glsxtr@idx@entrynumberlist}[1]{\glsentrynumberlist{#1}}
% \end{macrocode}
%\end{macro}
%
@@ -4137,7 +4491,7 @@ want
\begin{itemize}
\item Run the external (Lua) application:
- \texttt{makeglossaries-lite \string"\jobname\string"}
+ \texttt{makeglossaries-lite.lua \string"\jobname\string"}
\item Run the external (Perl) application:
@@ -4182,7 +4536,7 @@ want
\item Run the external (Lua) application:
- \texttt{makeglossaries-lite \string"\jobname\string"}
+ \texttt{makeglossaries-lite.lua \string"\jobname\string"}
\item Run the external (Perl) application:
@@ -4307,16 +4661,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@glsname@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@glsname@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccessname{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\Glsaccessname}
% Display the \gloskey{name} value (no link and no check for existence)
% with the first letter converted to upper case.
@@ -4332,16 +4676,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@Glsname@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@Glsname@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccessname{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\GLSaccessname}
% Display the \gloskey{name} value (no link and no check for existence)
% converted to upper case.
@@ -4357,16 +4691,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@GLSname@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@GLSname@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccessname{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\glsaccesstext}
% Display the \gloskey{text} value (no link and no check for existence).
%\changes{0.3}{2015-12-02}{new}
@@ -4381,16 +4705,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@glstext@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@glstext@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccesstext{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\Glsaccesstext}
% Display the \gloskey{text} value (no link and no check for existence)
% with the first letter converted to upper case.
@@ -4406,16 +4720,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@Glstext@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@Glstext@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccesstext{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\GLSaccesstext}
% Display the \gloskey{text} value (no link and no check for existence)
% converted to upper case.
@@ -4431,16 +4735,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@GLStext@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@GLStext@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccesstext{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\glsaccessplural}
% Display the \gloskey{plural} value (no link and no check for existence).
%\changes{0.3}{2015-12-02}{new}
@@ -4455,16 +4749,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@glsplural@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@glsplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccessplural{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\Glsaccessplural}
% Display the \gloskey{plural} value (no link and no check for existence)
% with the first letter converted to upper case.
@@ -4480,16 +4764,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@Glsplural@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@glsplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccessplural{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\GLSaccessplural}
% Display the \gloskey{plural} value (no link and no check for existence)
% converted to upper case.
@@ -4505,16 +4779,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@GLSplural@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@GLSplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccessplural{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\glsaccessfirst}
% Display the \gloskey{first} value (no link and no check for existence).
%\changes{0.3}{2015-12-02}{new}
@@ -4529,16 +4793,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@glsfirst@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@glsfirst@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccessfirst{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\Glsaccessfirst}
% Display the \gloskey{first} value (no link and no check for existence)
% with the first letter converted to upper case.
@@ -4554,16 +4808,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@Glsfirst@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@Glsfirst@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccessfirst{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\GLSaccessfirst}
% Display the \gloskey{first} value (no link and no check for existence)
% converted to upper case.
@@ -4579,16 +4823,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@GLSfirst@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@GLSfirst@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccessfirst{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\glsaccessfirstplural}
% Display the \gloskey{firstplural} value (no link and no check for existence).
%\changes{0.3}{2015-12-02}{new}
@@ -4603,16 +4837,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@glsfirstplural@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@glsfirstplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccessfirstplural{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\Glsaccessfirstplural}
% Display the \gloskey{firstplural} value (no link and no check for existence)
% with the first letter converted to upper case.
@@ -4628,16 +4852,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@Glsfirstplural@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@Glsfirstplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccessfirstplural{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\GLSaccessfirstplural}
% Display the \gloskey{firstplural} value (no link and no check for existence)
% converted to upper case.
@@ -4653,16 +4867,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@GLSfirstplural@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@GLSfirstplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccessfirstplural{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\glsaccesssymbol}
% Display the \gloskey{symbol} value (no link and no check for existence).
%\changes{0.3}{2015-12-02}{new}
@@ -4677,16 +4881,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@glssymbol@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@glssymbol@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccesssymbol{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\Glsaccesssymbol}
% Display the \gloskey{symbol} value (no link and no check for existence)
% with the first letter converted to upper case.
@@ -4702,16 +4896,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@Glssymbol@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@Glssymbol@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccesssymbol{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\GLSaccesssymbol}
% Display the \gloskey{symbol} value (no link and no check for existence)
% converted to upper case.
@@ -4727,16 +4911,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@GLSsymbol@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@GLSsymbol@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccesssymbol{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\glsaccesssymbolplural}
% Display the \gloskey{symbolplural} value (no link and no check for existence).
%\changes{0.3}{2015-12-02}{new}
@@ -4751,16 +4925,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@glssymbolplural@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@glssymbolplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccesssymbolplural{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\Glsaccesssymbolplural}
% Display the \gloskey{symbolplural} value (no link and no check for existence)
% with the first letter converted to upper case.
@@ -4776,16 +4940,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@Glssymbolplural@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@Glssymbolplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccesssymbolplural{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\GLSaccesssymbolplural}
% Display the \gloskey{symbolplural} value (no link and no check for existence)
% converted to upper case.
@@ -4801,16 +4955,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@GLSsymbolplural@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@GLSsymbolplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccesssymbolplural{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\glsaccessdesc}
% Display the \gloskey{desc} value (no link and no check for existence).
%\changes{0.3}{2015-12-02}{new}
@@ -4825,16 +4969,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@glsdesc@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@glsdesc@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccessdesc{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\Glsaccessdesc}
% Display the \gloskey{desc} value (no link and no check for existence)
% with the first letter converted to upper case.
@@ -4850,16 +4984,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@Glsdesc@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@Glsdesc@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccessdesc{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\GLSaccessdesc}
% Display the \gloskey{desc} value (no link and no check for existence)
% converted to upper case.
@@ -4875,16 +4999,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@GLSdesc@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@GLSdesc@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccessdesc{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\glsaccessdescplural}
% Display the \gloskey{descplural} value (no link and no check for existence).
%\changes{0.3}{2015-12-02}{new}
@@ -4899,16 +5013,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@glsdescplural@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@glsdescplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccessdescplural{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\Glsaccessdescplural}
% Display the \gloskey{descplural} value (no link and no check for existence)
% with the first letter converted to upper case.
@@ -4924,16 +5028,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@Glsdescplural@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@Glsdescplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccessdescplural{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\GLSaccessdescplural}
% Display the \gloskey{descplural} value (no link and no check for existence)
% converted to upper case.
@@ -4949,16 +5043,6 @@ want
% \end{macrocode}
%\end{macro}
%
-%\begin{macro}{\@GLSdescplural@}
-% Redefine to use accessibility support.
-%\changes{0.5.2}{2015-12-08}{added}
-% \begin{macrocode}
-\def\@GLSdescplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccessdescplural{#2}#3}%
-}
-% \end{macrocode}
-%\end{macro}
-%
%\begin{macro}{\glsaccessshort}
% Display the short form (no link and no check for existence).
%\changes{0.3}{2015-12-02}{new}
@@ -5612,7 +5696,8 @@ want
%\begin{definition}
%\cs{glsifregularcategory}\marg{category}\marg{true part}\marg{false part}
%\end{definition}
-% Short cut to determine if a category has the regular attribute.
+% Short cut to determine if a category has the regular attribute
+% explicitly set to true.
% \begin{macrocode}
\newcommand{\glsifregularcategory}[3]{%
\glsifcategoryattribute{#1}{regular}{true}{#2}{#3}%
@@ -5620,11 +5705,26 @@ want
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glsifnotregularcategory}
+%\begin{definition}
+%\cs{glsifnotregularcategory}\marg{category}\marg{true part}\marg{false part}
+%\end{definition}
+% Short cut to determine if a category has the regular attribute
+% explicitly set to false.
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand{\glsifnotregularcategory}[3]{%
+ \glsifcategoryattribute{#1}{regular}{false}{#2}{#3}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\glsifregular}
%\begin{definition}
%\cs{glsifregular}\marg{entry label}\marg{true part}\marg{false part}
%\end{definition}
-% Short cut to determine if an entry has a regular category.
+% Short cut to determine if an entry has a regular attribute set to
+% true.
% \begin{macrocode}
\newcommand{\glsifregular}[3]{%
\glsifregularcategory{\glscategory{#1}}{#2}{#3}%
@@ -5632,6 +5732,19 @@ want
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glsifnotregular}
+%\begin{definition}
+%\cs{glsifnotregular}\marg{entry label}\marg{true part}\marg{false part}
+%\end{definition}
+% Short cut to determine if an entry has a regular attribute set to
+% false.
+% \begin{macrocode}
+\newcommand{\glsifnotregular}[3]{%
+ \glsifnotregularcategory{\glscategory{#1}}{#2}{#3}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\glsforeachincategory}
%\begin{definition}
%\cs{glsforeachincategory}\oarg{glossary
@@ -5828,9 +5941,29 @@ want
\glsdoifexistsorwarn{#1}%
{%
\glssetabbrvfmt{\glscategory{#1}}%
+% \end{macrocode}
+% As from version 1.04, allow the \catattr{glossdescfont} attribute
+% to determine the font applied.
+%\changes{1.04}{2016-05-02}{added glossdescfont attribute check}
+% \begin{macrocode}
+ \glshasattribute{#1}{glossdescfont}%
+ {%
+ \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossdescfont}}%
+ \ifcsdef{\@glsxtr@attrval}%
+ {%
+ \letcs{\@glsxtr@glossdescfont}{\@glsxtr@attrval}%
+ }%
+ {%
+ \GlossariesExtraWarning{Unknown control sequence name
+ `\@glsxtr@attrval' supplied in glossdescfont attribute
+ for entry `#1'. Ignoring}%
+ \let\@glsxtr@glossdescfont\@firstofone
+ }%
+ }%
+ {\let\@glsxtr@glossdescfont\@firstofone}%
\glsifattribute{#1}{glossdesc}{firstuc}%
{%
- \Glsaccessdesc{#1}%
+ \@glsxtr@glossdescfont{\Glsaccessdesc{#1}}%
}%
{%
\glsifattribute{#1}{glossdesc}{title}%
@@ -5838,12 +5971,12 @@ want
\@glsxtr@do@titlecaps@warn
\glsdescriptionaccessdisplay
{%
- \glsxtrfieldtitlecase{#1}{desc}%
+ \@glsxtr@glossdescfont{\glsxtrfieldtitlecase{#1}{desc}}%
}%
{#1}%
}%
{%
- \glsaccessdesc{#1}%
+ \@glsxtr@glossdescfont{\glsaccessdesc{#1}}%
}%
}%
}%
@@ -5854,18 +5987,33 @@ want
\glsdoifexistsorwarn{#1}%
{%
\glssetabbrvfmt{\glscategory{#1}}%
+ \glshasattribute{#1}{glossdescfont}%
+ {%
+ \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossdescfont}}%
+ \ifcsdef{\@glsxtr@attrval}%
+ {%
+ \letcs{\@glsxtr@glossdescfont}{\@glsxtr@attrval}%
+ }%
+ {%
+ \GlossariesExtraWarning{Unknown control sequence name
+ `\@glsxtr@attrval' supplied in glossdescfont attribute
+ for entry `#1'. Ignoring}%
+ \let\@glsxtr@glossdescfont\@firstofone
+ }%
+ }%
+ {\let\@glsxtr@glossdescfont\@firstofone}%
\glsifattribute{#1}{glossdesc}{firstuc}%
{%
- \Glsentrydesc{#1}%
+ \@glsxtr@glossdescfont{\Glsentrydesc{#1}}%
}%
{%
\glsifattribute{#1}{glossdesc}{title}%
{%
\@glsxtr@do@titlecaps@warn
- \glsxtrfieldtitlecase{#1}{desc}%
+ \@glsxtr@glossdescfont{\glsxtrfieldtitlecase{#1}{desc}}%
}%
{%
- \glsentrydesc{#1}%
+ \@glsxtr@glossdescfont{\glsentrydesc{#1}}%
}%
}%
}%
@@ -5885,11 +6033,31 @@ want
\glsdoifexistsorwarn{#1}%
{%
\glssetabbrvfmt{\glscategory{#1}}%
+% \end{macrocode}
+% As from version 1.04, allow the \catattr{glossnamefont} attribute
+% to determine the font applied.
+%\changes{1.04}{2016-05-02}{added glossnamefont attribute check}
+% \begin{macrocode}
+ \glshasattribute{#1}{glossnamefont}%
+ {%
+ \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
+ \ifcsdef{\@glsxtr@attrval}%
+ {%
+ \letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}%
+ }%
+ {%
+ \GlossariesExtraWarning{Unknown control sequence name
+ `\@glsxtr@attrval' supplied in glossnamefont attribute
+ for entry `#1'. Reverting to default \string\glsnamefont}%
+ \let\@glsxtr@glossnamefont\glsnamefont
+ }%
+ }%
+ {\let\@glsxtr@glossnamefont\glsnamefont}%
\glsifattribute{#1}{glossname}{firstuc}%
{%
\glsnameaccessdisplay
{%
- \glsnamefont{\Glsentryname{#1}}%
+ \@glsxtr@glossnamefont{\Glsentryname{#1}}%
}%
{#1}%
}%
@@ -5899,7 +6067,7 @@ want
\@glsxtr@do@titlecaps@warn
\glsnameaccessdisplay
{%
- \glsnamefont{\glsxtrfieldtitlecase{#1}{name}}%
+ \@glsxtr@glossnamefont{\glsxtrfieldtitlecase{#1}{name}}%
}%
{#1}%
}%
@@ -5912,7 +6080,7 @@ want
% Hide the label from the upper-casing command.
% \begin{macrocode}
\letcs{\glo@name}{glo@\glsdetoklabel{#1}@name}%
- \glsnamefont{\mfirstucMakeUppercase{\glo@name}}%
+ \@glsxtr@glossnamefont{\mfirstucMakeUppercase{\glo@name}}%
}%
{#1}%
}%
@@ -5920,7 +6088,7 @@ want
\letcs{\glo@name}{glo@\glsdetoklabel{#1}@name}%
\glsnameaccessdisplay
{%
- \expandafter\glsnamefont\expandafter{\glo@name}%
+ \expandafter\@glsxtr@glossnamefont\expandafter{\glo@name}%
}%
{#1}%
}%
@@ -5938,15 +6106,30 @@ want
\glsdoifexistsorwarn{#1}%
{%
\glssetabbrvfmt{\glscategory{#1}}%
+ \glshasattribute{#1}{glossnamefont}%
+ {%
+ \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
+ \ifcsdef{\@glsxtr@attrval}%
+ {%
+ \letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}%
+ }%
+ {%
+ \GlossariesExtraWarning{Unknown control sequence name
+ `\@glsxtr@attrval' supplied in glossnamefont attribute
+ for entry `#1'. Reverting to default \string\glsnamefont}%
+ \let\@glsxtr@glossnamefont\glsnamefont
+ }%
+ }%
+ {\let\@glsxtr@glossnamefont\glsnamefont}%
\glsifattribute{#1}{glossname}{firstuc}%
{%
- \glsnamefont{\Glsentryname{#1}}%
+ \@glsxtr@glossnamefont{\Glsentryname{#1}}%
}%
{%
\glsifattribute{#1}{glossname}{title}%
{%
\@glsxtr@do@titlecaps@warn
- \glsnamefont{\glsxtrfieldtitlecase{#1}{name}}%
+ \@glsxtr@glossnamefont{\glsxtrfieldtitlecase{#1}{name}}%
}%
{%
\glsifattribute{#1}{glossname}{uc}%
@@ -5955,7 +6138,7 @@ want
% Hide the label from the upper-casing command.
% \begin{macrocode}
\letcs{\glo@name}{glo@\glsdetoklabel{#1}@name}%
- \glsnamefont{\mfirstucMakeUppercase{\glo@name}}%
+ \@glsxtr@glossnamefont{\mfirstucMakeUppercase{\glo@name}}%
}%
{%
% \end{macrocode}
@@ -5964,15 +6147,16 @@ want
% even though they can now use the \catattr{firstuc} attribute.
% \begin{macrocode}
\letcs{\glo@name}{glo@\glsdetoklabel{#1}@name}%
- \expandafter\glsnamefont\expandafter{\glo@name}%
+ \expandafter\@glsxtr@glossnamefont\expandafter{\glo@name}%
}%
}%
}%
- }%
% \end{macrocode}
-% Do post-name hook:
+% Do post-name hook.
+%\changes{1.04}{2016-05-02}{moved post name hook inside condition}
% \begin{macrocode}
- \glsxtrpostnamehook{#1}%
+ \glsxtrpostnamehook{#1}%
+ }%
}
}
% \end{macrocode}
@@ -5988,9 +6172,29 @@ want
\glsdoifexistsorwarn{#1}%
{%
\glssetabbrvfmt{\glscategory{#1}}%
+% \end{macrocode}
+% As from version 1.04, allow the \catattr{glossnamefont} attribute
+% to determine the font applied.
+%\changes{1.04}{2016-05-02}{added glossnamefont attribute check}
+% \begin{macrocode}
+ \glshasattribute{#1}{glossnamefont}%
+ {%
+ \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
+ \ifcsdef{\@glsxtr@attrval}%
+ {%
+ \letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}%
+ }%
+ {%
+ \GlossariesExtraWarning{Unknown control sequence name
+ `\@glsxtr@attrval' supplied in glossnamefont attribute
+ for entry `#1'. Reverting to default \string\glsnamefont}%
+ \let\@glsxtr@glossnamefont\glsnamefont
+ }%
+ }%
+ {\let\@glsxtr@glossnamefont\glsnamefont}%
\glsnameaccessdisplay
{%
- \glsnamefont{\Glsentryname{#1}}%
+ \@glsxtr@glossnamefont{\Glsentryname{#1}}%
}%
{#1}%
% \end{macrocode}
@@ -6005,7 +6209,22 @@ want
\glsdoifexistsorwarn{#1}%
{%
\glssetabbrvfmt{\glscategory{#1}}%
- \glsnamefont{\Glsentryname{#1}}%
+ \glshasattribute{#1}{glossnamefont}%
+ {%
+ \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
+ \ifcsdef{\@glsxtr@attrval}%
+ {%
+ \letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}%
+ }%
+ {%
+ \GlossariesExtraWarning{Unknown control sequence name
+ `\@glsxtr@attrval' supplied in glossnamefont attribute
+ for entry `#1'. Reverting to default \string\glsnamefont}%
+ \let\@glsxtr@glossnamefont\glsnamefont
+ }%
+ }%
+ {\let\@glsxtr@glossnamefont\glsnamefont}%
+ \@glsxtr@glossnamefont{\Glsentryname{#1}}%
% \end{macrocode}
% Do post-name hook:
% \begin{macrocode}
@@ -6028,6 +6247,11 @@ want
\newcommand*{\glsxtrpostnamehook}[1]{%
\def\@glsnumberformat{glsnumberformat}%
\glsxtrdoautoindexname{#1}{indexname}%
+% \end{macrocode}
+% Allow categories to hook in here.
+%\changes{1.04}{2016-05-02}{added category check}
+% \begin{macrocode}
+ \csuse{glsxtrpostname\glscategory{\glscurrententrylabel}}%
}
% \end{macrocode}
%\end{macro}
@@ -6510,7 +6734,10 @@ want
%\begin{macro}{\@gls@preglossaryhook}
% This macro was introduced in \sty{glossaries} version 4.19, so it
% may not be defined. If it hasn't been defined this feature is
-% unavailable.
+% unavailable. A check is added for the entry's existence to prevent
+% errors from occurring if the user removes an entry or changes the
+% label, which can interrupt the build process.
+%\changes{1.04}{2016-05-02}{added check for entry's existence}
% \begin{macrocode}
\ifdef\@gls@preglossaryhook
{
@@ -6518,8 +6745,11 @@ want
\@glsxtr@activate@initialtagging
\let\@glsxtr@org@postdescription\glspostdescription
\renewcommand*{\glspostdescription}{%
- \glsxtrpostdescription
- \@glsxtr@org@postdescription
+ \ifglsentryexists{\glscurrententrylabel}%
+ {%
+ \glsxtrpostdescription
+ \@glsxtr@org@postdescription
+ }{}%
}%
}%
}
@@ -6834,7 +7064,13 @@ want
\edef\glscategorylabel{#1}%
\ifcsdef{@glsabbrv@current@#1}%
{%
+% \end{macrocode}
+% Warning should already have been issued.
+% \begin{macrocode}
+ \let\@glsxtr@orgwarndep\GlsXtrWarnDeprecatedAbbrStyle
+ \let\GlsXtrWarnDeprecatedAbbrStyle\@gobbletwo
\glsxtr@applyabbrvstyle{\csname @glsabbrv@current@#1\endcsname}%
+ \let\GlsXtrWarnDeprecatedAbbrStyle\@glsxtr@orgwarndep
}%
{}%
}
@@ -7171,18 +7407,36 @@ want
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glslongfont}
+%\changes{1.04}{2016-05-02}{new}
+% Font changing command used for the long form in commands like
+% \cs{glsxtrlong}.
+% \begin{macrocode}
+\newcommand*{\glslongfont}[1]{\glslongdefaultfont{#1}}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glslongdefaultfont}
+% Default font changing command used for the long form in commands like
+%\changes{1.04}{2016-05-02}{new}
+% \cs{glsxtrlong}.
+% \begin{macrocode}
+\newcommand*{\glslongdefaultfont}[1]{#1}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\glsfirstlongfont}
% Font changing command used for the long form on first use or in
% the full format.
% \begin{macrocode}
-\newcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{#1}}
+\newcommand*{\glsfirstlongfont}[1]{\glslongfont{#1}}
% \end{macrocode}
%\end{macro}
%
%\begin{macro}{\glsfirstlongdefaultfont}
%\changes{0.5}{2015-12-07}{new}
% \begin{macrocode}
-\newcommand*{\glsfirstlongdefaultfont}[1]{#1}
+\newcommand*{\glsfirstlongdefaultfont}[1]{\glslongdefaultfont{#1}}
% \end{macrocode}
%\end{macro}
%
@@ -7416,7 +7670,8 @@ want
\let\glscapscase\@firstofthree
\let\glsinsert\@empty
\def\glscustomtext{%
- \glsabbrvfont{\glsaccessshort{#2}}#3%
+ \glsabbrvfont{\glsaccessshort{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
}%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
@@ -7448,7 +7703,8 @@ want
\let\glscapscase\@secondofthree
\let\glsinsert\@empty
\def\glscustomtext{%
- \glsabbrvfont{\Glsaccessshort{#2}}#3%
+ \glsabbrvfont{\Glsaccessshort{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
}%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
@@ -7480,7 +7736,10 @@ want
\let\glscapscase\@thirdofthree
\let\glsinsert\@empty
\def\glscustomtext{%
- \mfirstucMakeUppercase{\glsabbrvfont{\glsaccessshort{#2}}#3}%
+ \mfirstucMakeUppercase
+ {\glsabbrvfont{\glsaccessshort{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
+ }%
}%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
@@ -7510,7 +7769,10 @@ want
\let\glsifplural\@secondoftwo
\let\glscapscase\@firstofthree
\let\glsinsert\@empty
- \def\glscustomtext{\glsaccesslong{#2}#3}%
+ \def\glscustomtext{%
+ \glslongfont{\glsaccesslong{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
+ }%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
\glspostlinkhook
@@ -7539,7 +7801,10 @@ want
\let\glsifplural\@secondoftwo
\let\glscapscase\@secondofthree
\let\glsinsert\@empty
- \def\glscustomtext{\Glsaccesslong{#2}#3}%
+ \def\glscustomtext{%
+ \glslongfont{\Glsaccesslong{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
+ }%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
\glspostlinkhook
@@ -7568,7 +7833,12 @@ want
\let\glsifplural\@secondoftwo
\let\glscapscase\@thirdofthree
\let\glsinsert\@empty
- \def\glscustomtext{\mfirstucMakeUppercase{\glsaccesslong{#2}#3}}%
+ \def\glscustomtext{%
+ \mfirstucMakeUppercase
+ {\glslongfont{\glsaccesslong{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
+ }%
+ }%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
\glspostlinkhook
@@ -7601,7 +7871,8 @@ want
\let\glscapscase\@firstofthree
\let\glsinsert\@empty
\def\glscustomtext{%
- \glsabbrvfont{\glsaccessshortpl{#2}}#3%
+ \glsabbrvfont{\glsaccessshortpl{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
}%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
@@ -7634,7 +7905,8 @@ want
\let\glscapscase\@secondofthree
\let\glsinsert\@empty
\def\glscustomtext{%
- \glsabbrvfont{\Glsaccessshortpl{#2}}#3%
+ \glsabbrvfont{\Glsaccessshortpl{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
}%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
@@ -7667,7 +7939,10 @@ want
\let\glscapscase\@thirdofthree
\let\glsinsert\@empty
\def\glscustomtext{%
- \mfirstucMakeUppercase{\glsabbrvfont{\glsaccessshortpl{#2}}#3}%
+ \mfirstucMakeUppercase
+ {\glsabbrvfont{\glsaccessshortpl{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
+ }%
}%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
@@ -7699,7 +7974,10 @@ want
\let\glsifplural\@firstoftwo
\let\glscapscase\@firstofthree
\let\glsinsert\@empty
- \def\glscustomtext{\glsaccesslongpl{#2}#3}%
+ \def\glscustomtext{%
+ \glslongfont{\glsaccesslongpl{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
+ }%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
\glspostlinkhook
@@ -7729,7 +8007,10 @@ want
\let\glsifplural\@firstoftwo
\let\glscapscase\@secondofthree
\let\glsinsert\@empty
- \def\glscustomtext{\Glsaccesslongpl{#2}#3}%
+ \def\glscustomtext{%
+ \glslongfont{\Glsaccesslongpl{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
+ }%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
\glspostlinkhook
@@ -7759,7 +8040,12 @@ want
\let\glsifplural\@firstoftwo
\let\glscapscase\@thirdofthree
\let\glsinsert\@empty
- \def\glscustomtext{\mfirstucMakeUppercase{\glsaccesslongpl{#2}#3}}%
+ \def\glscustomtext{%
+ \mfirstucMakeUppercase
+ {\glslongfont{\glsaccesslongpl{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
+ }%
+ }%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
\glspostlinkhook
@@ -7978,9 +8264,10 @@ want
% the label, the second argument sets the information required when
% defining the new abbreviation and the third argument sets the
% commands used to display the full format.
+%\changes{1.04}{2016-05-02}{bug fix: corrected test for existence}
% \begin{macrocode}
\newcommand*{\newabbreviationstyle}[3]{%
- \ifcsdef{@glsabbrv@dispstyle@#1}
+ \ifcsdef{@glsabbrv@dispstyle@setup@#1}
{%
\PackageError{glossaries-extra}{Abbreviation style `#1' already
defined}{}%
@@ -8007,6 +8294,75 @@ want
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\renewabbreviationstyle}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\renewabbreviationstyle}[3]{%
+ \ifcsundef{@glsabbrv@dispstyle@setup@#1}
+ {%
+ \PackageError{glossaries-extra}{Abbreviation style `#1' not defined}{}%
+ }%
+ {%
+ \csdef{@glsabbrv@dispstyle@setup@#1}{%
+% \end{macrocode}
+% Initialise hook to do nothing. The style may change this.
+% \begin{macrocode}
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{}%
+ #2}%
+ \csdef{@glsabbrv@dispstyle@fmts@#1}{%
+% \end{macrocode}
+% Assume in-line form is the same as first use. The style may change
+% this.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}{\glsxtrfullformat}%
+ \renewcommand*{\Glsxtrinlinefullformat}{\Glsxtrfullformat}%
+ \renewcommand*{\glsxtrinlinefullplformat}{\glsxtrfullplformat}%
+ \renewcommand*{\Glsxtrinlinefullplformat}{\Glsxtrfullplformat}%
+ #3}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\letabbreviationstyle}
+%\changes{1.04}{2016-05-02}{new}
+% Define a synonym for an abbreviation style. The first argument is
+% the new name. The second argument is the original style's name.
+% \begin{macrocode}
+\newcommand*{\letabbreviationstyle}[2]{%
+ \csletcs{@glsabbrv@dispstyle@setup@#1}{@glsabbrv@dispstyle@setup@#2}%
+ \csletcs{@glsabbrv@dispstyle@fmts@#1}{@glsabbrv@dispstyle@fmts@#2}%
+}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@glsxtr@deprecated@abbrstyle}
+%\changes{1.04}{2016-05-02}{new}
+%\begin{definition}
+%\cs{@glsxtr@deprecated@abbrstyle}\marg{old-name}\marg{new-name}
+%\end{definition}
+% Define a synonym for a deprecated abbreviation style.
+% \begin{macrocode}
+\newcommand*{\@glsxtr@deprecated@abbrstyle}[2]{%
+ \csdef{@glsabbrv@dispstyle@setup@#1}{%
+ \GlsXtrWarnDeprecatedAbbrStyle{#1}{#2}%
+ \csuse{@glsabbrv@dispstyle@setup@#2}%
+ }%
+ \csletcs{@glsabbrv@dispstyle@fmts@#1}{@glsabbrv@dispstyle@fmts@#2}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\GlsXtrWarnDeprecatedAbbrStyle}
+%Generate warning for deprecated style use.
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\GlsXtrWarnDeprecatedAbbrStyle}[2]{%
+ \GlossariesExtraWarning{Deprecated abbreviation style name `#1',
+ use `#2' instead}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\GlsXtrUseAbbrStyleSetup}
% \begin{macrocode}
\newcommand*{\GlsXtrUseAbbrStyleSetup}[1]{%
@@ -8096,6 +8452,7 @@ want
\renewcommand*{\glsabbrvfont}[1]{\glsabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
% \end{macrocode}
% The first use full form and the inline full form are the same for
% this style.
@@ -8130,6 +8487,13 @@ want
\setabbreviationstyle{long-short}
% \end{macrocode}
%
+%\begin{macro}{\glsxtrlongshortdescsort}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrlongshortdescsort}{\the\glslongtok\space(\the\glsshorttok)}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{abbrvstyle}{long-short-desc}
% User supplies description. The long form is included in the name.
%\changes{0.3}{2015-12-02}{fixed name to use \cs{glslabeltok}}
@@ -8138,7 +8502,7 @@ want
{%
\renewcommand*{\CustomAbbreviationFields}{%
name={\protect\glsxtrfullformat{\the\glslabeltok}{}},
- sort={\the\glsshorttok},%
+ sort={\glsxtrlongshortdescsort},%
first={\protect\glsfirstlongfont{\the\glslongtok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
(\protect\glsfirstabbrvfont{\the\glsshorttok})},%
@@ -8201,6 +8565,7 @@ want
\renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
% \end{macrocode}
% The first use full form and the inline full form are the same for
% this style.
@@ -8305,6 +8670,7 @@ want
\renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
% \end{macrocode}
% The full format displays the short form followed by the long form
% as a footnote.
@@ -8356,6 +8722,12 @@ want
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{short-footnote}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\letabbreviationstyle{short-footnote}{footnote}
+% \end{macrocode}
+%\end{abbrvstyle}
%
%\begin{abbrvstyle}{postfootnote}
% Similar to the above but the footnote is placed afterwards,
@@ -8413,6 +8785,7 @@ want
\renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
% \end{macrocode}
% The full format displays the short form. The long form is
% deferred.
@@ -8461,6 +8834,12 @@ want
% \end{macrocode}
%\end{abbrvstyle}
%
+%\begin{abbrvstyle}{short-postfootnote}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\letabbreviationstyle{short-postfootnote}{postfootnote}
+% \end{macrocode}
+%\end{abbrvstyle}
%
%\begin{abbrvstyle}{short}
% Provide a style that only displays the short form on first use,
@@ -8492,6 +8871,7 @@ want
\renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
% \end{macrocode}
% The inline full form displays the short form followed by the
% long form in parentheses.
@@ -8548,6 +8928,12 @@ want
% \begin{macrocode}
\setabbreviationstyle[acronym]{short}
% \end{macrocode}
+%\begin{abbrvstyle}{short-nolong}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\letabbreviationstyle{short-nolong}{short}
+% \end{macrocode}
+%\end{abbrvstyle}
%
%\begin{abbrvstyle}{short-desc}
% The user must supply the description in this style. The long form
@@ -8578,6 +8964,7 @@ want
\renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
% \end{macrocode}
% The inline full form displays the short format followed by the
% long form in parentheses.
@@ -8625,6 +9012,12 @@ want
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{short-nolong-desc}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\letabbreviationstyle{short-nolong-desc}{short-desc}
+% \end{macrocode}
+%\end{abbrvstyle}
%
%\begin{abbrvstyle}{long-desc}
% Provide a style that only displays the long form,
@@ -8655,6 +9048,7 @@ want
\renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
% \end{macrocode}
% The inline full form displays the long format followed by the
% short form in parentheses.
@@ -8702,6 +9096,13 @@ want
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{long-noshort-desc}
+%\changes{1.04}{2016-05-02}{new}
+%Provide a synonym that matches similar styles.
+% \begin{macrocode}
+\letabbreviationstyle{long-noshort-desc}{long-desc}
+% \end{macrocode}
+%\end{abbrvstyle}
%
%\begin{abbrvstyle}{long}
% It doesn't really make a great deal of sense to have a long-only
@@ -8728,6 +9129,13 @@ want
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{long-noshort}
+%\changes{1.04}{2016-05-02}{new}
+%Provide a synonym that matches similar styles.
+% \begin{macrocode}
+\letabbreviationstyle{long-noshort}{long}
+% \end{macrocode}
+%\end{abbrvstyle}
%
%\subsection{Predefined Styles (Small Capitals)}
%These styles use:
@@ -8737,6 +9145,12 @@ want
\newcommand*{\glsxtrscfont}[1]{\textsc{#1}}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\glsxtrfirstscfont}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrfirstscfont}[1]{\glsxtrscfont{#1}}
+% \end{macrocode}
+%\end{macro}
% and for the default short form suffix:
%\begin{macro}{\glsxtrscsuffix}
%\changes{0.5}{2015-12-07}{new}
@@ -8761,6 +9175,7 @@ want
% \begin{macrocode}
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
% \end{macrocode}
%
@@ -8780,6 +9195,7 @@ want
% \begin{macrocode}
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
% \end{macrocode}
%
@@ -8799,6 +9215,7 @@ want
% \begin{macrocode}
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -8819,6 +9236,7 @@ want
% \begin{macrocode}
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -8827,22 +9245,30 @@ want
% \begin{macrocode}
\newabbreviationstyle{short-sc}%
{%
- \GlsXtrUseAbbrStyleSetup{short}%
+ \GlsXtrUseAbbrStyleSetup{short-nolong}%
}%
{%
% \end{macrocode}
% Mostly as short style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short}%
+ \GlsXtrUseAbbrStyleFmts{short-nolong}%
% \end{macrocode}
% Use smallcaps and adjust the plural suffix to revert to upright.
% \begin{macrocode}
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
%
+%\begin{abbrvstyle}{short-sc-nolong}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\letabbreviationstyle{short-sc-nolong}{short-sc}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
%\begin{abbrvstyle}{short-sc-desc}
% \begin{macrocode}
\newabbreviationstyle{short-sc-desc}%
@@ -8859,97 +9285,136 @@ want
% \begin{macrocode}
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{short-sc-nolong-desc}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\letabbreviationstyle{short-sc-nolong-desc}{short-sc-desc}
+% \end{macrocode}
+%\end{abbrvstyle}
%
-%\begin{abbrvstyle}{long-sc}
+%\begin{abbrvstyle}{long-noshort-sc}
+%\changes{1.04}{2016-05-02}{renamed from \qt{long-sc}}
% The smallcaps font will only be used if
% the short form is explicitly invoked through commands like
% \cs{glsshort}.
% \begin{macrocode}
-\newabbreviationstyle{long-sc}%
+\newabbreviationstyle{long-noshort-sc}%
{%
- \GlsXtrUseAbbrStyleSetup{long}%
+ \GlsXtrUseAbbrStyleSetup{long-noshort}%
}%
{%
% \end{macrocode}
% Mostly as long style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long}%
+ \GlsXtrUseAbbrStyleFmts{long-noshort}%
% \end{macrocode}
% Use smallcaps and adjust the plural suffix to revert to upright.
% \begin{macrocode}
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{long-sc}
+%Backward compatibility:
+% \begin{macrocode}
+\@glsxtr@deprecated@abbrstyle{long-sc}{long-noshort-sc}
+% \end{macrocode}
+%\end{abbrvstyle}
%
-%\begin{abbrvstyle}{long-desc-sc}
+%\begin{abbrvstyle}{long-noshort-sc-desc}
+%\changes{1.04}{2016-05-02}{renamed from \qt{long-desc-sc}}
% The smallcaps font will only be used if
% the short form is explicitly invoked through commands like
% \cs{glsshort}.
% \begin{macrocode}
-\newabbreviationstyle{long-desc-sc}%
+\newabbreviationstyle{long-noshort-sc-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-desc}%
+ \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
}%
{%
% \end{macrocode}
% Mostly as long style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long-desc}%
+ \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
% \end{macrocode}
% Use smallcaps and adjust the plural suffix to revert to upright.
% \begin{macrocode}
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{long-desc-sc}
+%Backward compatibility:
+% \begin{macrocode}
+\@glsxtr@deprecated@abbrstyle{long-desc-sc}{long-noshort-sc-desc}
+% \end{macrocode}
+%\end{abbrvstyle}
%
-%\begin{abbrvstyle}{footnote-sc}
+%\begin{abbrvstyle}{short-sc-footnote}
%\changes{0.5}{2015-12-07}{new}
+%\changes{1.04}{2016-05-02}{renamed from \qt{footnote-sc}}
% \begin{macrocode}
-\newabbreviationstyle{footnote-sc}%
+\newabbreviationstyle{short-sc-footnote}%
{%
- \GlsXtrUseAbbrStyleSetup{footnote}%
+ \GlsXtrUseAbbrStyleSetup{short-footnote}%
}%
{%
% \end{macrocode}
% Mostly as long style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{footnote}%
+ \GlsXtrUseAbbrStyleFmts{short-footnote}%
% \end{macrocode}
% Use smallcaps and adjust the plural suffix to revert to upright.
% \begin{macrocode}
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{footnote-sc}
+%Backward compatibility:
+% \begin{macrocode}
+\@glsxtr@deprecated@abbrstyle{footnote-sc}{short-sc-footnote}
+% \end{macrocode}
+%\end{abbrvstyle}
%
-%\begin{abbrvstyle}{postfootnote-sc}
+%\begin{abbrvstyle}{short-sc-postfootnote}
%\changes{0.5}{2015-12-07}{new}
+%\changes{1.04}{2016-05-02}{renamed from \qt{postfootnote-sc}}
% \begin{macrocode}
-\newabbreviationstyle{postfootnote-sc}%
+\newabbreviationstyle{short-sc-postfootnote}%
{%
- \GlsXtrUseAbbrStyleSetup{postfootnote}%
+ \GlsXtrUseAbbrStyleSetup{short-postfootnote}%
}%
{%
% \end{macrocode}
% Mostly as long style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{postfootnote}%
+ \GlsXtrUseAbbrStyleFmts{short-postfootnote}%
% \end{macrocode}
% Use smallcaps and adjust the plural suffix to revert to upright.
% \begin{macrocode}
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{postfootnote-sc}
+%Backward compatibility:
+% \begin{macrocode}
+\@glsxtr@deprecated@abbrstyle{postfootnote-sc}{short-sc-postfootnote}
+% \end{macrocode}
+%\end{abbrvstyle}
%
%\subsection{Predefined Styles (Fake Small Capitals)}
% These styles require the \sty{relsize} package, which must be
@@ -8960,6 +9425,12 @@ want
\newcommand*{\glsxtrsmfont}[1]{\textsmaller{#1}}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\glsxtrfirstsmfont}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrfirstsmfont}[1]{\glsxtrsmfont{#1}}
+% \end{macrocode}
+%\end{macro}
% and for the default short form suffix:
%\begin{macro}{\glsxtrsmsuffix}
%\changes{0.5}{2015-12-07}{new}
@@ -8981,6 +9452,7 @@ want
% \begin{macrocode}
\GlsXtrUseAbbrStyleFmts{long-short}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
% \end{macrocode}
@@ -8999,6 +9471,7 @@ want
% \begin{macrocode}
\GlsXtrUseAbbrStyleFmts{long-short-desc}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
% \end{macrocode}
@@ -9018,6 +9491,7 @@ want
% \begin{macrocode}
\GlsXtrUseAbbrStyleFmts{short-long}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
% \end{macrocode}
@@ -9037,6 +9511,7 @@ want
% \begin{macrocode}
\GlsXtrUseAbbrStyleFmts{short-long-desc}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
% \end{macrocode}
@@ -9047,117 +9522,190 @@ want
% \begin{macrocode}
\newabbreviationstyle{short-sm}%
{%
- \GlsXtrUseAbbrStyleSetup{short}%
+ \GlsXtrUseAbbrStyleSetup{short-nolong}%
}%
{%
% \end{macrocode}
% Mostly as short style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short}%
+ \GlsXtrUseAbbrStyleFmts{short-nolong}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{short-sm-nolong}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\letabbreviationstyle{short-sm-nolong}{short-sm}
+% \end{macrocode}
+%\end{abbrvstyle}
%
%\begin{abbrvstyle}{short-sm-desc}
%\changes{0.5}{2015-12-07}{new}
% \begin{macrocode}
\newabbreviationstyle{short-sm-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-desc}%
+ \GlsXtrUseAbbrStyleSetup{short-nolong-desc}%
}%
{%
% \end{macrocode}
% Mostly as short style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-desc}%
+ \GlsXtrUseAbbrStyleFmts{short-nolong-desc}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{short-sm-nolong-desc}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\letabbreviationstyle{short-sm-nolong-desc}{short-sm-desc}
+% \end{macrocode}
+%\end{abbrvstyle}
%
-%\begin{abbrvstyle}{long-sm}
+%\begin{abbrvstyle}{long-noshort-sm}
%\changes{0.5}{2015-12-07}{new}
+%\changes{1.04}{2016-05-02}{renamed from \qt{long-sm}}
% The smallcaps font will only be used if
% the short form is explicitly invoked through commands like
% \cs{glsshort}.
% \begin{macrocode}
-\newabbreviationstyle{long-sm}%
+\newabbreviationstyle{long-noshort-sm}%
{%
- \GlsXtrUseAbbrStyleSetup{long}%
+ \GlsXtrUseAbbrStyleSetup{long-noshort}%
}%
{%
% \end{macrocode}
% Mostly as long style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long}%
+ \GlsXtrUseAbbrStyleFmts{long-noshort}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{long-sm}
+%Backward compatibility:
+% \begin{macrocode}
+\@glsxtr@deprecated@abbrstyle{long-sm}{long-noshort-sm}
+% \end{macrocode}
+%\end{abbrvstyle}
%
-%\begin{abbrvstyle}{long-desc-sm}
+%\begin{abbrvstyle}{long-noshort-sm-desc}
%\changes{0.5}{2015-12-07}{new}
+%\changes{1.04}{2016-05-02}{renamed from \cs{long-desc-sm}}
% The smaller font will only be used if
% the short form is explicitly invoked through commands like
% \cs{glsshort}.
% \begin{macrocode}
-\newabbreviationstyle{long-desc-sm}%
+\newabbreviationstyle{long-noshort-sm-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-desc}%
+ \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
}%
{%
% \end{macrocode}
% Mostly as long style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long-desc}%
+ \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{long-desc-sm}
+%Backward compatibility:
+% \begin{macrocode}
+\@glsxtr@deprecated@abbrstyle{long-desc-sm}{long-noshort-sm-desc}
+% \end{macrocode}
+%\end{abbrvstyle}
%
-%\begin{abbrvstyle}{footnote-sm}
+%\begin{abbrvstyle}{short-sm-footnote}
%\changes{0.5}{2015-12-07}{new}
+%\changes{1.04}{2016-05-02}{renamed from \qt{footnote-sm}}
% \begin{macrocode}
-\newabbreviationstyle{footnote-sm}%
+\newabbreviationstyle{short-sm-footnote}%
{%
- \GlsXtrUseAbbrStyleSetup{footnote}%
+ \GlsXtrUseAbbrStyleSetup{short-footnote}%
}%
{%
% \end{macrocode}
% Mostly as long style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{footnote}%
+ \GlsXtrUseAbbrStyleFmts{short-footnote}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{footnote-sm}
+%Backward compatibility:
+% \begin{macrocode}
+\@glsxtr@deprecated@abbrstyle{footnote-sm}{short-sm-footnote}
+% \end{macrocode}
+%\end{abbrvstyle}
%
-%\begin{abbrvstyle}{postfootnote-sm}
+%\begin{abbrvstyle}{short-sm-postfootnote}
%\changes{0.5}{2015-12-07}{new}
+%\changes{1.04}{2016-05-02}{renamed from \qt{postfootnote-sm}}
% \begin{macrocode}
-\newabbreviationstyle{postfootnote-sm}%
+\newabbreviationstyle{short-sm-postfootnote}%
{%
- \GlsXtrUseAbbrStyleSetup{postfootnote}%
+ \GlsXtrUseAbbrStyleSetup{short-postfootnote}%
}%
{%
% \end{macrocode}
% Mostly as long style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{postfootnote}%
+ \GlsXtrUseAbbrStyleFmts{short-postfootnote}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{postfootnote-sm}
+%Backward compatibility:
+% \begin{macrocode}
+\@glsxtr@deprecated@abbrstyle{postfootnote-sm}{short-sm-postfootnote}
+% \end{macrocode}
+%\end{abbrvstyle}
%
%\subsection{Predefined Styles (Emphasized)}
% These styles use \ics{emph} for the short form.
+%\begin{macro}{\glsabbrvemfont}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\glsabbrvemfont}[1]{\emph{#1}}%
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\glsfirstabbrvemfont}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\glsfirstabbrvemfont}[1]{\glsabbrvemfont{#1}}%
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\glsfirstlongemfont}
+%\changes{1.04}{2016-05-02}{new}
+%Only used by the \qt{long-em} styles.
+% \begin{macrocode}
+\newcommand*{\glsfirstlongemfont}[1]{\glslongemfont{#1}}%
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glslongemfont}
+%\changes{1.04}{2016-05-02}{new}
+%Only used by the \qt{long-em} styles.
+% \begin{macrocode}
+\newcommand*{\glslongemfont}[1]{\emph{#1}}%
+% \end{macrocode}
+%\end{macro}
%
%\begin{abbrvstyle}{long-short-em}
%\changes{0.5}{2015-12-07}{new}
@@ -9171,7 +9719,7 @@ want
% Mostly as long-short style:
% \begin{macrocode}
\GlsXtrUseAbbrStyleFmts{long-short}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -9188,7 +9736,73 @@ want
% Mostly as long-short-desc style:
% \begin{macrocode}
\GlsXtrUseAbbrStyleFmts{long-short-desc}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{abbrvstyle}{long-em-short-em}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newabbreviationstyle{long-em-short-em}%
+{%
+% \end{macrocode}
+%\cs{glslongemfont} is used in the description since \cs{glsdesc}
+%doesn't set the style.
+% \begin{macrocode}
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ (\protect\glsfirstabbrvfont{\the\glsshorttok})},%
+ firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ (\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
+ plural={\protect\glsabbvfont{\the\glsshortpltok}},%
+ description={\protect\glslongemfont{\the\glslongtok}}}%
+% \end{macrocode}
+% Unset the \catattr{regular} attribute if it has been set.
+% \begin{macrocode}
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+% \end{macrocode}
+% In case the user wants to mix and match font styles, these are
+% redefined here.
+% \begin{macrocode}
+ \GlsXtrUseAbbrStyleFmts{long-short}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{abbrvstyle}{long-em-short-em-desc}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newabbreviationstyle{long-em-short-em-desc}%
+{%
+ \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+}%
+{%
+% \end{macrocode}
+% In case the user wants to mix and match font styles, these are
+% redefined here.
+% \begin{macrocode}
+ \GlsXtrUseAbbrStyleFmts{long-short-desc}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -9206,7 +9820,10 @@ want
% Mostly as short-long style:
% \begin{macrocode}
\GlsXtrUseAbbrStyleFmts{short-long}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -9224,7 +9841,76 @@ want
% Mostly as short-long-desc style:
% \begin{macrocode}
\GlsXtrUseAbbrStyleFmts{short-long-desc}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{abbrvstyle}{short-em-long-em}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newabbreviationstyle{short-em-long-em}%
+{%
+% \end{macrocode}
+%\cs{glslongemfont} is used in the description since \cs{glsdesc}
+%doesn't set the style.
+% \begin{macrocode}
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\protect\glslongemfont{\the\glslongtok}},%
+ first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ (\protect\glsfirstlongfont{\the\glslongtok})},%
+ firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ (\protect\glsfirstlongfont{\the\glslongpltok})},%
+ plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+% \end{macrocode}
+% Unset the \catattr{regular} attribute if it has been set.
+% \begin{macrocode}
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+% \end{macrocode}
+% In case the user wants to mix and match font styles, these are
+% redefined here.
+% \begin{macrocode}
+ \GlsXtrUseAbbrStyleFmts{short-long}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{abbrvstyle}{short-em-long-em-desc}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newabbreviationstyle{short-em-long-em-desc}%
+{%
+ \GlsXtrUseAbbrStyleSetup{short-long-desc}%
+}%
+{%
+% \end{macrocode}
+% In case the user wants to mix and match font styles, these are
+% redefined here.
+% \begin{macrocode}
+ \GlsXtrUseAbbrStyleFmts{short-long-desc}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -9234,105 +9920,435 @@ want
% \begin{macrocode}
\newabbreviationstyle{short-em}%
{%
- \GlsXtrUseAbbrStyleSetup{short}%
+ \GlsXtrUseAbbrStyleSetup{short-nolong}%
}%
{%
% \end{macrocode}
% Mostly as short style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \GlsXtrUseAbbrStyleFmts{short-nolong}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{short-em-nolong}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\letabbreviationstyle{short-em-nolong}{short-em}
+% \end{macrocode}
+%\end{abbrvstyle}
%
%\begin{abbrvstyle}{short-em-desc}
%\changes{0.5}{2015-12-07}{new}
% \begin{macrocode}
\newabbreviationstyle{short-em-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-desc}%
+ \GlsXtrUseAbbrStyleSetup{short-nolong-desc}%
}%
{%
% \end{macrocode}
% Mostly as short style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-desc}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \GlsXtrUseAbbrStyleFmts{short-nolong-desc}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{short-em-nolong-desc}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\letabbreviationstyle{short-em-nolong-desc}{short-em-desc}
+% \end{macrocode}
+%\end{abbrvstyle}
%
-%\begin{abbrvstyle}{long-em}
+%\begin{abbrvstyle}{long-noshort-em}
%\changes{0.5}{2015-12-07}{new}
-% The emphasized font will only be used if
-% the short form is explicitly invoked through commands like
+%\changes{1.04}{2016-05-02}{renamed from \qt{long-em}}
+% The short form is explicitly invoked through commands like
% \cs{glsshort}.
% \begin{macrocode}
-\newabbreviationstyle{long-em}%
+\newabbreviationstyle{long-noshort-em}%
{%
- \GlsXtrUseAbbrStyleSetup{long}%
+ \GlsXtrUseAbbrStyleSetup{long-noshort}%
}%
{%
% \end{macrocode}
-% Mostly as long style:
+% Mostly as \abbrstyle{long-noshort} style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \GlsXtrUseAbbrStyleFmts{long-noshort}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{long-em}
+%Backward compatibility:
+% \begin{macrocode}
+\@glsxtr@deprecated@abbrstyle{long-em}{long-noshort-em}
+% \end{macrocode}
+%\end{abbrvstyle}
%
-%\begin{abbrvstyle}{long-desc-em}
+%\begin{abbrvstyle}{long-em-noshort-em}
+%\changes{1.04}{2016-05-02}{new}
+% The short form is explicitly invoked through commands like
+% \cs{glsshort}.
+% \begin{macrocode}
+\newabbreviationstyle{long-em-noshort-em}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongfont{\the\glslongtok}},
+ firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},
+ text={\the\glslongtok},
+ plural={\the\glslongpltok},%
+ description={\protect\glslongemfont{\the\glslongtok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
+}%
+{%
+% \end{macrocode}
+% Mostly as \abbrstyle{long-noshort} style:
+% \begin{macrocode}
+ \GlsXtrUseAbbrStyleFmts{long-noshort}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{abbrvstyle}{long-noshort-em-desc}
+%\changes{1.04}{2016-05-02}{renamed from \qt{long-desc-em}}
%\changes{0.5}{2015-12-07}{new}
% The emphasized font will only be used if
% the short form is explicitly invoked through commands like
% \cs{glsshort}.
% \begin{macrocode}
-\newabbreviationstyle{long-desc-em}%
+\newabbreviationstyle{long-noshort-em-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-desc}%
+ \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
}%
{%
% \end{macrocode}
% Mostly as long style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long-desc}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{long-desc-em}
+%Backward compatibility:
+% \begin{macrocode}
+\@glsxtr@deprecated@abbrstyle{long-desc-em}{long-noshort-em-desc}
+% \end{macrocode}
+%\end{abbrvstyle}
%
-%\begin{abbrvstyle}{footnote-em}
+%\begin{abbrvstyle}{long-em-noshort-em-desc}
+%\changes{1.04}{2016-05-02}{new}
+% The short form is explicitly invoked through commands like
+% \cs{glsshort}. The long form is emphasized.
+% \begin{macrocode}
+\newabbreviationstyle{long-em-noshort-em-desc}%
+{%
+ \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
+}%
+{%
+% \end{macrocode}
+% Mostly as long style:
+% \begin{macrocode}
+ \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{abbrvstyle}{short-em-footnote}
%\changes{0.5}{2015-12-07}{new}
+%\changes{1.04}{2015-04-30}{renamed from \qt{footnote-em}}
% \begin{macrocode}
-\newabbreviationstyle{footnote-em}%
+\newabbreviationstyle{short-em-footnote}%
{%
- \GlsXtrUseAbbrStyleSetup{footnote}%
+ \GlsXtrUseAbbrStyleSetup{short-footnote}%
}%
{%
% \end{macrocode}
% Mostly as long style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{footnote}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \GlsXtrUseAbbrStyleFmts{short-footnote}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
}
% \end{macrocode}
%\end{abbrvstyle}
+%\begin{abbrvstyle}{footnote-em}
+%Backward compatibility:
+% \begin{macrocode}
+\@glsxtr@deprecated@abbrstyle{footnote-em}{short-em-footnote}
+% \end{macrocode}
+%\end{abbrvstyle}
%
-%\begin{abbrvstyle}{postfootnote-em}
+%\begin{abbrvstyle}{short-em-postfootnote}
%\changes{0.5}{2015-12-07}{new}
+%\changes{1.04}{2016-05-02}{renamed from \qt{postfootnote-em}}
% \begin{macrocode}
-\newabbreviationstyle{postfootnote-em}%
+\newabbreviationstyle{short-em-postfootnote}%
{%
- \GlsXtrUseAbbrStyleSetup{postfootnote}%
+ \GlsXtrUseAbbrStyleSetup{short-postfootnote}%
}%
{%
% \end{macrocode}
% Mostly as long style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{postfootnote}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \GlsXtrUseAbbrStyleFmts{short-postfootnote}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%\begin{abbrvstyle}{postfootnote-em}
+%Backward compatibility:
+% \begin{macrocode}
+\@glsxtr@deprecated@abbrstyle{postfootnote-em}{short-em-postfootnote}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\subsection{Predefined Styles (User Parentheses Hook)}
+% These styles allow the user to adjust the parenthetical forms.
+% These styles all test for the existence of the
+% field given by:
+%\begin{macro}{\glsxtruserfield}
+%\changes{1.04}{2016-05-02}{new}
+% Default is the useri field.
+% \begin{macrocode}
+\newcommand*{\glsxtruserfield}{useri}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtruserparen}
+%\changes{1.04}{2016-05-02}{new}
+% The format of the parenthetical information.
+% The first argument is the long/short form. The second argument
+% is the entry's label. If \cs{glscurrentfieldvalue} has been
+% defined, then we have at least \sty{glossaries} v4.23, which makes
+% it easier for the user to adjust this.
+% \begin{macrocode}
+\ifdef\glscurrentfieldvalue
+{
+ \newcommand*{\glsxtruserparen}[2]{%
+ \glsxtrfullsep{#2}%
+ (#1\ifglshasfield{\glsxtruserfield}{#2}{, \glscurrentfieldvalue}{})%
+ }
+}
+{
+ \newcommand*{\glsxtruserparen}[2]{%
+ \glsxtrfullsep{#2}%
+ (#1\ifglshasfield{\glsxtruserfield}{#2}{, \@glo@thisvalue}{})%
+ }
+}
+% \end{macrocode}
+%\end{macro}
+% Font used for short form:
+%\begin{macro}{\glsabbrvuserfont}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\glsabbrvuserfont}[1]{#1}
+% \end{macrocode}
+%\end{macro}
+% Font used for short form on first use:
+%\begin{macro}{\glsfirstabbrvuserfont}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\glsfirstabbrvuserfont}[1]{\glsabbrvuserfont{#1}}
+% \end{macrocode}
+%\end{macro}
+% Font used for long form:
+%\begin{macro}{\glslonguserfont}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\glslonguserfont}[1]{#1}
+% \end{macrocode}
+%\end{macro}
+% Font used for long form on first use:
+%\begin{macro}{\glsfirstlonguserfont}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\glsfirstlonguserfont}[1]{\glslonguserfont{#1}}
+% \end{macrocode}
+%\end{macro}
+% The default short form suffix:
+%\begin{macro}{\glsxtrusersuffix}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrusersuffix}{\glspluralsuffix}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{abbrvstyle}{long-short-user}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newabbreviationstyle{long-short-user}%
+{%
+% \end{macrocode}
+%\cs{glslonguserfont} is used in the description since \cs{glsdesc}
+%doesn't set the style.
+% \begin{macrocode}
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongfont{\the\glslongtok}%
+ \protect\glsxtruserparen{\protect\glsfirstabbrvfont{\the\glsshorttok}}{\the\glslabeltok}},%
+ firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
+ \protect\glsxtruserparen{\protect\glsfirstabbrvfont{\the\glsshortpltok}}{\the\glslabeltok}},%
+ plural={\protect\glsabbvfont{\the\glsshortpltok}},%
+ description={\protect\glslonguserfont{\the\glslongtok}}}%
+% \end{macrocode}
+% Unset the \catattr{regular} attribute if it has been set.
+% \begin{macrocode}
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+% \end{macrocode}
+% In case the user wants to mix and match font styles, these are
+% redefined here.
+% \begin{macrocode}
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrusersuffix}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvuserfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvuserfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonguserfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslonguserfont{##1}}%
+% \end{macrocode}
+% The first use full form and the inline full form are the same for
+% this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}%
+ }%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{abbrvstyle}{long-short-user-desc}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newabbreviationstyle{long-short-user-desc}%
+{%
+ \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-short-user}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{abbrvstyle}{short-long-user}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newabbreviationstyle{short-long-user}%
+{%
+% \end{macrocode}
+%\cs{glslonguserfont} is used in the description since \cs{glsdesc}
+%doesn't set the style.
+% \begin{macrocode}
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\protect\glslonguserfont{\the\glslongtok}},%
+ first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
+ \protect\glsxtruserparen{\protect\glslonguserfont{\the\glslongtok}}{\the\glslabeltok}},%
+ firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
+ \protect\glsxtruserparen{\protect\glslonguserfont{\the\glslongpltok}}{\the\glslabeltok}},%
+ plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+% \end{macrocode}
+% Unset the \catattr{regular} attribute if it has been set.
+% \begin{macrocode}
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+% \end{macrocode}
+% In case the user wants to mix and match font styles, these are
+% redefined here.
+% \begin{macrocode}
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrusersuffix}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvuserfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvuserfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonguserfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslonguserfont{##1}}%
+% \end{macrocode}
+% The first use full form and the inline full form are the same for
+% this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}%
+ }%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{abbrvstyle}{short-long-user-desc}
+%\changes{1.04}{2016-05-02}{new}
+% \begin{macrocode}
+\newabbreviationstyle{short-long-user-desc}%
+{%
+ \GlsXtrUseAbbrStyleSetup{short-long-desc}%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-long-user}%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -10563,6 +11579,10 @@ want
% \begin{macrocode}
\@glsxtr@redefstyles
% \end{macrocode}
+% and set the style:
+% \begin{macrocode}
+\@glsxtr@do@style
+% \end{macrocode}
%\iffalse
% \begin{macrocode}
%</glossaries-extra.sty>
@@ -10581,7 +11601,7 @@ want
% First identify package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2016/04/27 v1.03 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2016/05/02 v1.04 (NLCT)]
% \end{macrocode}
% Provide package options to automatically load required predefined
% styles. The simplest method is to just test for the existence of
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 3f693042de9..c1a3bd89823 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/4/27 10:59
+% glossaries-extra.ins generated using makedtx version 1.1 2016/5/2 18:05
\input docstrip
\preamble
diff --git a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty
index e901f8bfa4b..044bc566442 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra-stylemods.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2016/04/27 v1.03 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2016/05/02 v1.04 (NLCT)]
\newcommand*{\@glsxtr@loadstyles}{}
\DeclareOption*{%
\IfFileExists{glossary-\CurrentOption.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 fe0f3ceda2e..45d8d8ccdfd 100644
--- a/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
+++ b/Master/texmf-dist/tex/latex/glossaries-extra/glossaries-extra.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2016/04/27 v1.03 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2016/05/02 v1.04 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
\@ifpackageloaded{glossaries}
@@ -251,7 +251,7 @@
\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
+ {The list of values (#1) in the `stylemods' key should
match the glossary-xxx.sty files provided with
glossaries.sty}%
}%
@@ -259,6 +259,13 @@
\appto\@glsxtr@redefstyles{\RequirePackage{glossaries-extra-stylemods}}%
}%
}
+\newcommand*{\@glsxtr@do@style}{}
+\define@key{glossaries-extra.sty}{style}{%
+ \renewcommand*{\@glsxtr@do@style}{%
+ \setkeys{glossaries.sty}{style={#1}}%
+ \setglossarystyle{#1}%
+ }%
+}
\DeclareOptionX*{%
\expandafter\glsxtr@dooption\expandafter{\CurrentOption}}
\ProcessOptionsX
@@ -583,16 +590,79 @@
\fi
}
{}%
- \def\org@glossaryentrynumbers#1{#1\gls@save@numberlist{#1}}%
- \ifx\org@glossaryentrynumbers\glossaryentrynumbers
- \glsnonumberlistfalse
- \renewcommand*{\glossaryentrynumbers}[1]{%
- \GlsXtrFormatLocationList{#1}\gls@save@numberlist{#1}}%
- \else
- \glsnonumberlisttrue
- \renewcommand*{\glossaryentrynumbers}[1]{\gls@save@numberlist{#1}}%
- \fi
+\def\org@glossaryentrynumbers#1{#1\gls@save@numberlist{#1}}%
+\ifx\org@glossaryentrynumbers\glossaryentrynumbers
+ \glsnonumberlistfalse
+ \renewcommand*{\glossaryentrynumbers}[1]{%
+ \ifglsentryexists{\glscurrententrylabel}%
+ {%
+ \@glsxtrpreloctag
+ \GlsXtrFormatLocationList{#1}%
+ \@glsxtrpostloctag
+ \gls@save@numberlist{#1}%
+ }{}%
+ }%
+\else
+ \glsnonumberlisttrue
+ \renewcommand*{\glossaryentrynumbers}[1]{%
+ \ifglsentryexists{\glscurrententrylabel}%
+ {%
+ \gls@save@numberlist{#1}%
+ }{}%
+ }%
+\fi
\newcommand*{\GlsXtrFormatLocationList}[1]{#1}
+\newcommand*{\GlsXtrEnablePreLocationTag}[2]{%
+ \let\@glsxtrpreloctag\@@glsxtrpreloctag
+ \let\@glsxtrpostloctag\@@glsxtrpostloctag
+ \renewcommand*{\@glsxtr@pagetag}{#1}%
+ \renewcommand*{\@glsxtr@pagestag}{#2}%
+ \renewcommand*{\@glsxtr@savepreloctag}[2]{%
+ \csgdef{@glsxtr@preloctag@##1}{##2}%
+ }%
+ \renewcommand*{\@glsxtr@doloctag}{%
+ \ifcsundef{@glsxtr@preloctag@\glscurrententrylabel}%
+ {%
+ \GlossariesWarning{Missing pre-location tag for `\glscurrententrylabel'.
+ Rerun required}%
+ }%
+ {%
+ \csuse{@glsxtr@preloctag@\glscurrententrylabel}%
+ }%
+ }%
+}
+\@onlypreamble\GlsXtrEnablePreLocationTag
+\newcommand*{\@@glsxtrpreloctag}{%
+ \let\@glsxtr@org@delimN\delimN
+ \let\@glsxtr@org@delimR\delimR
+ \let\@glsxtr@org@glsignore\glsignore
+ \gdef\@glsxtr@thisloctag{\@glsxtr@pagetag}%
+ \renewcommand*{\delimN}{%
+ \gdef\@glsxtr@thisloctag{\@glsxtr@pagestag}%
+ \@glsxtr@org@delimN}%
+ \renewcommand*{\delimR}{%
+ \gdef\@glsxtr@thisloctag{\@glsxtr@pagestag}%
+ \@glsxtr@org@delimR}%
+ \renewcommand*{\glsignore}[1]{%
+ \gdef\@glsxtr@thisloctag{\relax}%
+ \@glsxtr@org@glsignore{##1}}%
+ \@glsxtr@doloctag
+}
+\newcommand*{\@glsxtrpreloctag}{}
+\newcommand*{\@glsxtr@pagetag}{}%
+\newcommand*{\@glsxtr@pagestag}{}%
+\newcommand*{\@@glsxtrpostloctag}{%
+ \let\delimN\@glsxtr@org@delimN
+ \let\delimR\@glsxtr@org@delimR
+ \let\glsignore\@glsxtr@org@glsignore
+ \protected@write\@auxout{}%
+ {\string\@glsxtr@savepreloctag{\glscurrententrylabel}{\@glsxtr@thisloctag}}%
+}
+\newcommand*{\@glsxtrpostloctag}{}
+\newcommand*{\@glsxtr@savepreloctag}[2]{}
+\protected@write\@auxout{}{%
+ \string\providecommand\string\@glsxtr@savepreloctag[2]{}}
+\newcommand*{\@glsxtr@doloctag}{}
\renewcommand*{\KV@printgloss@nonumberlist}[1]{%
\XKV@plfalse
\XKV@sttrue
@@ -603,7 +673,9 @@
\def\glossaryentrynumbers##1{\gls@save@numberlist{##1}}%
\else
\def\glossaryentrynumbers##1{%
+ \@glsxtrpreloctag
\GlsXtrFormatLocationList{##1}%
+ \@glsxtrpostloctag
\gls@save@numberlist{##1}}%
\fi
}%
@@ -611,9 +683,14 @@
\renewcommand*{\glsentryfmt}{%
\ifglshasshort{\glslabel}{\glssetabbrvfmt{\glscategory{\glslabel}}}{}%
\glsifregular{\glslabel}%
- {\glsgenentryfmt}%
- {\ifglshasshort{\glslabel}{\glsxtrgenabbrvfmt}{\glsgenentryfmt}}%
+ {\glsxtrregularfont{\glsgenentryfmt}}%
+ {%
+ \ifglshasshort{\glslabel}%
+ {\glsxtrgenabbrvfmt}%
+ {\glsxtrregularfont{\glsgenentryfmt}}%
+ }%
}
+\newcommand*{\glsxtrregularfont}[1]{#1}
\renewcommand{\@gls@field@link}[4][]{%
\glsdoifexists{#3}%
{%
@@ -631,182 +708,261 @@
\let\glscapscase\@firstofthree
\let\glsinsert\@empty
}
+\newcommand*{\glsxtrassignfieldfont}[1]{%
+ \ifglshasshort{#1}%
+ {%
+ \glssetabbrvfmt{\glscategory{#1}}%
+ \glsifregular{#1}%
+ {\let\@gls@field@font\glsxtrregularfont}%
+ {\let\@gls@field@font\@firstofone}%
+ }%
+ {%
+ \glsifnotregular{#1}%
+ {\let\@gls@field@font\@firstofone}%
+ {\let\@gls@field@font\glsxtrregularfont}%
+ }%
+}
+\def\@glstext@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
+ \@gls@field@link{#1}{#2}{\@gls@field@font{\glsaccesstext{#2}#3}}%
+}
\def\@GLStext@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdofthree]{#1}{#2}%
- {\mfirstucMakeUppercase{\glsentrytext{#2}#3}}%
+ {\@gls@field@font{\GLSaccesstext{#2}\mfirstucMakeUppercase{#3}}}%
}
\def\@Glstext@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@secondofthree]{#1}{#2}%
- {\Glsentrytext{#2}#3}%
+ {\@gls@field@font{\Glsaccesstext{#2}#3}}%
}
\def\@glsfirst@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glsxtrifwasfirstuse\@firstoftwo]{#1}{#2}%
- {\glsentryfirst{#2}#3}%
+ {\@gls@field@font{\glsaccessfirst{#2}#3}}%
}
\def\@Glsfirst@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glsxtrifwasfirstuse\@firstoftwo
\let\glscapscase\@secondofthree
]%
- {#1}{#2}{\Glsentryfirst{#2}#3}%
+ {#1}{#2}{\@gls@field@font{\Glsaccessfirst{#2}#3}}%
}
\def\@GLSfirst@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glsxtrifwasfirstuse\@firstoftwo
\let\glscapscase\@thirdofthree
]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryfirst{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\GLSaccessfirst{#2}\mfirstucMakeUppercase{#3}}}%
}
\def\@glsplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glsifplural\@firstoftwo]{#1}{#2}%
- {\glsentryplural{#2}#3}%
+ {\@gls@field@font{\glsaccessplural{#2}#3}}%
}
\def\@Glsplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glsifplural\@firstoftwo
\let\glscapscase\@secondofthree
]%
- {#1}{#2}{\Glsentryplural{#2}#3}%
+ {#1}{#2}{\@gls@field@font{\Glsaccessplural{#2}#3}}%
}
\def\@GLSplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glsifplural\@firstoftwo
\let\glscapscase\@thirdofthree
]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryplural{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\GLSaccessplural{#2}\mfirstucMakeUppercase{#3}}}%
}
\def\@glsfirstplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glsxtrifwasfirstuse\@firstoftwo
\let\glsifplural\@firstoftwo
]%
- {#1}{#2}{\glsentryfirstplural{#2}#3}%
+ {#1}{#2}{\@gls@field@font{\glsaccessfirstplural{#2}#3}}%
}
\def\@Glsfirstplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glsxtrifwasfirstuse\@firstoftwo
\let\glsifplural\@firstoftwo
\let\glscapscase\@secondofthree
]%
- {#1}{#2}{\Glsentryfirstplural{#2}#3}%
+ {#1}{#2}{\@gls@field@font{\Glsaccessfirstplural{#2}#3}}%
}
\def\@GLSfirstplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glsxtrifwasfirstuse\@firstoftwo
\let\glsifplural\@firstoftwo
\let\glscapscase\@thirdofthree
]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryfirstplural{#2}#3}}%
+ {#1}{#2}%
+ {\@gls@field@font{\GLSaccessfirstplural{#2}\mfirstucMakeUppercase{#3}}}%
+}
+\def\@glsname@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
+ \@gls@field@link{#1}{#2}{\@gls@field@font{\glsaccessname{#2}#3}}%
}
\def\@Glsname@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryname{#2}#3}%
+ [\let\glscapscase\@secondoftwo]{#1}{#2}%
+ {\@gls@field@font{\Glsaccessname{#2}#3}}%
}
\def\@GLSname@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryname{#2}#3}}%
+ {#1}{#2}%
+ {\@gls@field@font{\GLSaccessname{#2}\mfirstucMakeUppercase{#3}}}%
+}
+\def\@glsdesc@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
+ \@gls@field@link{#1}{#2}{\@gls@field@font{\glsaccessdesc{#2}#3}}%
}
\def\@Glsdesc@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentrydesc{#2}#3}%
+ [\let\glscapscase\@secondoftwo]{#1}{#2}%
+ {\@gls@field@font{\Glsaccessdesc{#2}#3}}%
}
\def\@GLSdesc@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentrydesc{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\GLSaccessdesc{#2}\mfirstucMakeUppercase{#3}}}%
}
\def\@glsdescplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glscapscase\@secondoftwo
\let\glsifplural\@firstoftwo
- ]{#1}{#2}{\glsentrydescplural{#2}#3}%
+ ]{#1}{#2}{\@gls@field@font{\glsaccessdescplural{#2}#3}}%
}
\def\@Glsdescplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glscapscase\@secondoftwo
\let\glsifplural\@firstoftwo
- ]{#1}{#2}{\Glsentrydescplural{#2}#3}%
+ ]{#1}{#2}{\@gls@field@font{\Glsaccessdescplural{#2}#3}}%
}
\def\@GLSdesc@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glscapscase\@thirdoftwo
\let\glsifplural\@firstoftwo
]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentrydescplural{#2}#3}}%
+ {#1}{#2}%
+ {\@gls@field@font{\GLSaccessdescplural{#2}\mfirstucMakeUppercase{#3}}}%
+}
+\def\@glssymbol@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
+ \@gls@field@link{#1}{#2}{\@gls@field@font{\glsaccesssymbol{#2}#3}}%
}
\def\@Glssymbol@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentrysymbol{#2}#3}%
+ [\let\glscapscase\@secondoftwo]%
+ {#1}{#2}{\@gls@field@font{\Glsaccesssymbol{#2}#3}}%
}
\def\@GLSsymbol@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentrysymbol{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\GLSaccesssymbol{#2}\mfirstucMakeUppercase{#3}}}%
}
\def\@glssymbolplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glscapscase\@secondoftwo
\let\glsifplural\@firstoftwo
- ]{#1}{#2}{\glsentrysymbolplural{#2}#3}%
+ ]{#1}{#2}{\@gls@field@font{\glsaccesssymbolplural{#2}#3}}%
}
\def\@Glssymbolplural@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glscapscase\@secondoftwo
\let\glsifplural\@firstoftwo
- ]{#1}{#2}{\Glsentrysymbolplural{#2}#3}%
+ ]{#1}{#2}{\@gls@field@font{\Glsaccesssymbolplural{#2}#3}}%
}
\def\@GLSsymbol@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
[\let\glscapscase\@thirdoftwo
\let\glsifplural\@firstoftwo
]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentrysymbolplural{#2}#3}}%
+ {#1}{#2}%
+ {\@gls@field@font{\GLSaccesssymbolplural{#2}\mfirstucMakeUppercase{#3}}}%
}
\def\@Glsuseri@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuseri{#2}#3}%
+ [\let\glscapscase\@secondoftwo]{#1}{#2}%
+ {\@gls@field@font{\Glsentryuseri{#2}#3}}%
}
\def\@GLSuseri@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryuseri{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\mfirstucMakeUppercase{\glsentryuseri{#2}#3}}}%
}
\def\@Glsuserii@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuserii{#2}#3}%
+ [\let\glscapscase\@secondoftwo]%
+ {#1}{#2}{\@gls@field@font{\Glsentryuserii{#2}#3}}%
}
\def\@GLSuserii@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryuserii{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\mfirstucMakeUppercase{\glsentryuserii{#2}#3}}}%
}
\def\@Glsuseriii@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuseriii{#2}#3}%
+ [\let\glscapscase\@secondoftwo]%
+ {#1}{#2}{\@gls@field@font{\Glsentryuseriii{#2}#3}}%
}
\def\@GLSuseriii@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryuseriii{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\mfirstucMakeUppercase{\glsentryuseriii{#2}#3}}}%
}
\def\@Glsuseriv@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuseriv{#2}#3}%
+ [\let\glscapscase\@secondoftwo]%
+ {#1}{#2}{\@gls@field@font{\Glsentryuseriv{#2}#3}}%
}
\def\@GLSuseriv@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryuseriv{#2}#3}}%
+ {#1}{#2}%
+ {\@gls@field@font{\mfirstucMakeUppercase{\glsentryuseriv{#2}#3}}}%
}
\def\@Glsuserv@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuserv{#2}#3}%
+ [\let\glscapscase\@secondoftwo]%
+ {#1}{#2}{\@gls@field@font{\Glsentryuserv{#2}#3}}%
}
\def\@GLSuserv@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryuserv{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\mfirstucMakeUppercase{\glsentryuserv{#2}#3}}}%
}
\def\@Glsuservi@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link
- [\let\glscapscase\@secondoftwo]{#1}{#2}{\Glsentryuservi{#2}#3}%
+ [\let\glscapscase\@secondoftwo]%
+ {#1}{#2}{\@gls@field@font{\Glsentryuservi{#2}#3}}%
}
\def\@GLSuservi@#1#2[#3]{%
+ \glsxtrassignfieldfont{#2}%
\@gls@field@link[\let\glscapscase\@thirdoftwo]%
- {#1}{#2}{\mfirstucMakeUppercase{\glsentryuservi{#2}#3}}%
+ {#1}{#2}{\@gls@field@font{\mfirstucMakeUppercase{\glsentryuservi{#2}#3}}}%
}
\def\@acrshort#1#2[#3]{%
\glsdoifexists{#2}%
@@ -1262,11 +1418,11 @@
\def\@glsxtr@p@long@#1#2[#3]{{\glsentrylong{#2}#3}}
\def\@Glsxtr@p@long@#1#2[#3]{{\Glsentrylong{#2}#3}}
\def\@GLSxtr@p@long@#1#2[#3]{%
- {\mfirstucMakeUppercase{\glsentrylong{#2}#3}}}
+ {\mfirstucMakeUppercase{\glslongfont{\glsentrylong{#2}}#3}}}
\def\@glsxtr@p@longpl@#1#2[#3]{{\glsentrylongpl{#2}#3}}
-\def\@Glsxtr@p@longpl@#1#2[#3]{{\Glsentrylongpl{#2}#3}}
+\def\@Glsxtr@p@longpl@#1#2[#3]{{\glslongfont{\Glsentrylongpl{#2}}#3}}
\def\@GLSxtr@p@longpl@#1#2[#3]{%
- {\mfirstucMakeUppercase{\glsentrylongpl{#2}#3}}}
+ {\mfirstucMakeUppercase{\glslongfont{\glsentrylongpl{#2}}#3}}}
\def\@glsxtr@p@acrshort@#1#2[#3]{{\acronymfont{\glsentryshort{#2}}#3}}
\def\@Glsxtr@p@acrshort@#1#2[#3]{{\acronymfont{\Glsentryshort{#2}}#3}}
\def\@GLSxtr@p@acrshort@#1#2[#3]{%
@@ -2008,7 +2164,7 @@ want
}%
}%
}%
-\let\@glsxtr@idx@entrynumberlist\glsentrynumberlist
+\newcommand*{\@glsxtr@idx@entrynumberlist}[1]{\glsentrynumberlist{#1}}
\renewcommand{\@print@glossary}{%
\makeatletter
\@input@{\jobname.\csname @glotype@\@glo@type @in\endcsname}%
@@ -2094,7 +2250,7 @@ want
\begin{itemize}
\item Run the external (Lua) application:
- \texttt{makeglossaries-lite \string"\jobname\string"}
+ \texttt{makeglossaries-lite.lua \string"\jobname\string"}
\item Run the external (Perl) application:
@@ -2125,7 +2281,7 @@ want
\item Run the external (Lua) application:
- \texttt{makeglossaries-lite \string"\jobname\string"}
+ \texttt{makeglossaries-lite.lua \string"\jobname\string"}
\item Run the external (Perl) application:
@@ -2207,9 +2363,6 @@ want
}%
{#1}%
}
-\def\@glsname@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccessname{#2}#3}%
-}
\newcommand*{\Glsaccessname}[1]{%
\glsnameaccessdisplay
{%
@@ -2217,9 +2370,6 @@ want
}%
{#1}%
}
-\def\@Glsname@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccessname{#2}#3}%
-}
\newcommand*{\GLSaccessname}[1]{%
\glsnameaccessdisplay
{%
@@ -2227,9 +2377,6 @@ want
}%
{#1}%
}
-\def\@GLSname@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccessname{#2}#3}%
-}
\newcommand*{\glsaccesstext}[1]{%
\glstextaccessdisplay
{%
@@ -2237,9 +2384,6 @@ want
}%
{#1}%
}
-\def\@glstext@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccesstext{#2}#3}%
-}
\newcommand*{\Glsaccesstext}[1]{%
\glstextaccessdisplay
{%
@@ -2247,9 +2391,6 @@ want
}%
{#1}%
}
-\def\@Glstext@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccesstext{#2}#3}%
-}
\newcommand*{\GLSaccesstext}[1]{%
\glstextaccessdisplay
{%
@@ -2257,9 +2398,6 @@ want
}%
{#1}%
}
-\def\@GLStext@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccesstext{#2}#3}%
-}
\newcommand*{\glsaccessplural}[1]{%
\glspluralaccessdisplay
{%
@@ -2267,9 +2405,6 @@ want
}%
{#1}%
}
-\def\@glsplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccessplural{#2}#3}%
-}
\newcommand*{\Glsaccessplural}[1]{%
\glspluralaccessdisplay
{%
@@ -2277,9 +2412,6 @@ want
}%
{#1}%
}
-\def\@glsplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccessplural{#2}#3}%
-}
\newcommand*{\GLSaccessplural}[1]{%
\glspluralaccessdisplay
{%
@@ -2287,9 +2419,6 @@ want
}%
{#1}%
}
-\def\@GLSplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccessplural{#2}#3}%
-}
\newcommand*{\glsaccessfirst}[1]{%
\glsfirstaccessdisplay
{%
@@ -2297,9 +2426,6 @@ want
}%
{#1}%
}
-\def\@glsfirst@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccessfirst{#2}#3}%
-}
\newcommand*{\Glsaccessfirst}[1]{%
\glsfirstaccessdisplay
{%
@@ -2307,9 +2433,6 @@ want
}%
{#1}%
}
-\def\@Glsfirst@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccessfirst{#2}#3}%
-}
\newcommand*{\GLSaccessfirst}[1]{%
\glsfirstaccessdisplay
{%
@@ -2317,9 +2440,6 @@ want
}%
{#1}%
}
-\def\@GLSfirst@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccessfirst{#2}#3}%
-}
\newcommand*{\glsaccessfirstplural}[1]{%
\glsfirstpluralaccessdisplay
{%
@@ -2327,9 +2447,6 @@ want
}%
{#1}%
}
-\def\@glsfirstplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccessfirstplural{#2}#3}%
-}
\newcommand*{\Glsaccessfirstplural}[1]{%
\glsfirstpluralaccessdisplay
{%
@@ -2337,9 +2454,6 @@ want
}%
{#1}%
}
-\def\@Glsfirstplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccessfirstplural{#2}#3}%
-}
\newcommand*{\GLSaccessfirstplural}[1]{%
\glsfirstpluralaccessdisplay
{%
@@ -2347,9 +2461,6 @@ want
}%
{#1}%
}
-\def\@GLSfirstplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccessfirstplural{#2}#3}%
-}
\newcommand*{\glsaccesssymbol}[1]{%
\glssymbolaccessdisplay
{%
@@ -2357,9 +2468,6 @@ want
}%
{#1}%
}
-\def\@glssymbol@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccesssymbol{#2}#3}%
-}
\newcommand*{\Glsaccesssymbol}[1]{%
\glssymbolaccessdisplay
{%
@@ -2367,9 +2475,6 @@ want
}%
{#1}%
}
-\def\@Glssymbol@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccesssymbol{#2}#3}%
-}
\newcommand*{\GLSaccesssymbol}[1]{%
\glssymbolaccessdisplay
{%
@@ -2377,9 +2482,6 @@ want
}%
{#1}%
}
-\def\@GLSsymbol@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccesssymbol{#2}#3}%
-}
\newcommand*{\glsaccesssymbolplural}[1]{%
\glssymbolpluralaccessdisplay
{%
@@ -2387,9 +2489,6 @@ want
}%
{#1}%
}
-\def\@glssymbolplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccesssymbolplural{#2}#3}%
-}
\newcommand*{\Glsaccesssymbolplural}[1]{%
\glssymbolpluralaccessdisplay
{%
@@ -2397,9 +2496,6 @@ want
}%
{#1}%
}
-\def\@Glssymbolplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccesssymbolplural{#2}#3}%
-}
\newcommand*{\GLSaccesssymbolplural}[1]{%
\glssymbolpluralaccessdisplay
{%
@@ -2407,9 +2503,6 @@ want
}%
{#1}%
}
-\def\@GLSsymbolplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccesssymbolplural{#2}#3}%
-}
\newcommand*{\glsaccessdesc}[1]{%
\glsdescriptionaccessdisplay
{%
@@ -2417,9 +2510,6 @@ want
}%
{#1}%
}
-\def\@glsdesc@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccessdesc{#2}#3}%
-}
\newcommand*{\Glsaccessdesc}[1]{%
\glsdescriptionaccessdisplay
{%
@@ -2427,9 +2517,6 @@ want
}%
{#1}%
}
-\def\@Glsdesc@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccessdesc{#2}#3}%
-}
\newcommand*{\GLSaccessdesc}[1]{%
\glsdescriptionaccessdisplay
{%
@@ -2437,9 +2524,6 @@ want
}%
{#1}%
}
-\def\@GLSdesc@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccessdesc{#2}#3}%
-}
\newcommand*{\glsaccessdescplural}[1]{%
\glsdescriptionpluralaccessdisplay
{%
@@ -2447,9 +2531,6 @@ want
}%
{#1}%
}
-\def\@glsdescplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\glsaccessdescplural{#2}#3}%
-}
\newcommand*{\Glsaccessdescplural}[1]{%
\glsdescriptionpluralaccessdisplay
{%
@@ -2457,9 +2538,6 @@ want
}%
{#1}%
}
-\def\@Glsdescplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\Glsaccessdescplural{#2}#3}%
-}
\newcommand*{\GLSaccessdescplural}[1]{%
\glsdescriptionpluralaccessdisplay
{%
@@ -2467,9 +2545,6 @@ want
}%
{#1}%
}
-\def\@GLSdescplural@#1#2[#3]{%
- \@gls@field@link{#1}{#2}{\GLSaccessdescplural{#2}#3}%
-}
\newcommand*{\glsaccessshort}[1]{%
\glsshortaccessdisplay
{%
@@ -2637,9 +2712,15 @@ want
\newcommand{\glsifregularcategory}[3]{%
\glsifcategoryattribute{#1}{regular}{true}{#2}{#3}%
}
+\newcommand{\glsifnotregularcategory}[3]{%
+ \glsifcategoryattribute{#1}{regular}{false}{#2}{#3}%
+}
\newcommand{\glsifregular}[3]{%
\glsifregularcategory{\glscategory{#1}}{#2}{#3}%
}
+\newcommand{\glsifnotregular}[3]{%
+ \glsifnotregularcategory{\glscategory{#1}}{#2}{#3}%
+}
\newcommand{\glsforeachincategory}[5][\@glo@types]{%
\forallglossaries[#1]{#3}%
{%
@@ -2712,9 +2793,24 @@ want
\glsdoifexistsorwarn{#1}%
{%
\glssetabbrvfmt{\glscategory{#1}}%
+ \glshasattribute{#1}{glossdescfont}%
+ {%
+ \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossdescfont}}%
+ \ifcsdef{\@glsxtr@attrval}%
+ {%
+ \letcs{\@glsxtr@glossdescfont}{\@glsxtr@attrval}%
+ }%
+ {%
+ \GlossariesExtraWarning{Unknown control sequence name
+ `\@glsxtr@attrval' supplied in glossdescfont attribute
+ for entry `#1'. Ignoring}%
+ \let\@glsxtr@glossdescfont\@firstofone
+ }%
+ }%
+ {\let\@glsxtr@glossdescfont\@firstofone}%
\glsifattribute{#1}{glossdesc}{firstuc}%
{%
- \Glsaccessdesc{#1}%
+ \@glsxtr@glossdescfont{\Glsaccessdesc{#1}}%
}%
{%
\glsifattribute{#1}{glossdesc}{title}%
@@ -2722,12 +2818,12 @@ want
\@glsxtr@do@titlecaps@warn
\glsdescriptionaccessdisplay
{%
- \glsxtrfieldtitlecase{#1}{desc}%
+ \@glsxtr@glossdescfont{\glsxtrfieldtitlecase{#1}{desc}}%
}%
{#1}%
}%
{%
- \glsaccessdesc{#1}%
+ \@glsxtr@glossdescfont{\glsaccessdesc{#1}}%
}%
}%
}%
@@ -2738,18 +2834,33 @@ want
\glsdoifexistsorwarn{#1}%
{%
\glssetabbrvfmt{\glscategory{#1}}%
+ \glshasattribute{#1}{glossdescfont}%
+ {%
+ \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossdescfont}}%
+ \ifcsdef{\@glsxtr@attrval}%
+ {%
+ \letcs{\@glsxtr@glossdescfont}{\@glsxtr@attrval}%
+ }%
+ {%
+ \GlossariesExtraWarning{Unknown control sequence name
+ `\@glsxtr@attrval' supplied in glossdescfont attribute
+ for entry `#1'. Ignoring}%
+ \let\@glsxtr@glossdescfont\@firstofone
+ }%
+ }%
+ {\let\@glsxtr@glossdescfont\@firstofone}%
\glsifattribute{#1}{glossdesc}{firstuc}%
{%
- \Glsentrydesc{#1}%
+ \@glsxtr@glossdescfont{\Glsentrydesc{#1}}%
}%
{%
\glsifattribute{#1}{glossdesc}{title}%
{%
\@glsxtr@do@titlecaps@warn
- \glsxtrfieldtitlecase{#1}{desc}%
+ \@glsxtr@glossdescfont{\glsxtrfieldtitlecase{#1}{desc}}%
}%
{%
- \glsentrydesc{#1}%
+ \@glsxtr@glossdescfont{\glsentrydesc{#1}}%
}%
}%
}%
@@ -2761,11 +2872,26 @@ want
\glsdoifexistsorwarn{#1}%
{%
\glssetabbrvfmt{\glscategory{#1}}%
+ \glshasattribute{#1}{glossnamefont}%
+ {%
+ \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
+ \ifcsdef{\@glsxtr@attrval}%
+ {%
+ \letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}%
+ }%
+ {%
+ \GlossariesExtraWarning{Unknown control sequence name
+ `\@glsxtr@attrval' supplied in glossnamefont attribute
+ for entry `#1'. Reverting to default \string\glsnamefont}%
+ \let\@glsxtr@glossnamefont\glsnamefont
+ }%
+ }%
+ {\let\@glsxtr@glossnamefont\glsnamefont}%
\glsifattribute{#1}{glossname}{firstuc}%
{%
\glsnameaccessdisplay
{%
- \glsnamefont{\Glsentryname{#1}}%
+ \@glsxtr@glossnamefont{\Glsentryname{#1}}%
}%
{#1}%
}%
@@ -2775,7 +2901,7 @@ want
\@glsxtr@do@titlecaps@warn
\glsnameaccessdisplay
{%
- \glsnamefont{\glsxtrfieldtitlecase{#1}{name}}%
+ \@glsxtr@glossnamefont{\glsxtrfieldtitlecase{#1}{name}}%
}%
{#1}%
}%
@@ -2785,7 +2911,7 @@ want
\glsnameaccessdisplay
{%
\letcs{\glo@name}{glo@\glsdetoklabel{#1}@name}%
- \glsnamefont{\mfirstucMakeUppercase{\glo@name}}%
+ \@glsxtr@glossnamefont{\mfirstucMakeUppercase{\glo@name}}%
}%
{#1}%
}%
@@ -2793,7 +2919,7 @@ want
\letcs{\glo@name}{glo@\glsdetoklabel{#1}@name}%
\glsnameaccessdisplay
{%
- \expandafter\glsnamefont\expandafter{\glo@name}%
+ \expandafter\@glsxtr@glossnamefont\expandafter{\glo@name}%
}%
{#1}%
}%
@@ -2808,30 +2934,45 @@ want
\glsdoifexistsorwarn{#1}%
{%
\glssetabbrvfmt{\glscategory{#1}}%
+ \glshasattribute{#1}{glossnamefont}%
+ {%
+ \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
+ \ifcsdef{\@glsxtr@attrval}%
+ {%
+ \letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}%
+ }%
+ {%
+ \GlossariesExtraWarning{Unknown control sequence name
+ `\@glsxtr@attrval' supplied in glossnamefont attribute
+ for entry `#1'. Reverting to default \string\glsnamefont}%
+ \let\@glsxtr@glossnamefont\glsnamefont
+ }%
+ }%
+ {\let\@glsxtr@glossnamefont\glsnamefont}%
\glsifattribute{#1}{glossname}{firstuc}%
{%
- \glsnamefont{\Glsentryname{#1}}%
+ \@glsxtr@glossnamefont{\Glsentryname{#1}}%
}%
{%
\glsifattribute{#1}{glossname}{title}%
{%
\@glsxtr@do@titlecaps@warn
- \glsnamefont{\glsxtrfieldtitlecase{#1}{name}}%
+ \@glsxtr@glossnamefont{\glsxtrfieldtitlecase{#1}{name}}%
}%
{%
\glsifattribute{#1}{glossname}{uc}%
{%
\letcs{\glo@name}{glo@\glsdetoklabel{#1}@name}%
- \glsnamefont{\mfirstucMakeUppercase{\glo@name}}%
+ \@glsxtr@glossnamefont{\mfirstucMakeUppercase{\glo@name}}%
}%
{%
\letcs{\glo@name}{glo@\glsdetoklabel{#1}@name}%
- \expandafter\glsnamefont\expandafter{\glo@name}%
+ \expandafter\@glsxtr@glossnamefont\expandafter{\glo@name}%
}%
}%
}%
+ \glsxtrpostnamehook{#1}%
}%
- \glsxtrpostnamehook{#1}%
}
}
\@ifpackageloaded{glossaries-accsupp}
@@ -2840,9 +2981,24 @@ want
\glsdoifexistsorwarn{#1}%
{%
\glssetabbrvfmt{\glscategory{#1}}%
+ \glshasattribute{#1}{glossnamefont}%
+ {%
+ \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
+ \ifcsdef{\@glsxtr@attrval}%
+ {%
+ \letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}%
+ }%
+ {%
+ \GlossariesExtraWarning{Unknown control sequence name
+ `\@glsxtr@attrval' supplied in glossnamefont attribute
+ for entry `#1'. Reverting to default \string\glsnamefont}%
+ \let\@glsxtr@glossnamefont\glsnamefont
+ }%
+ }%
+ {\let\@glsxtr@glossnamefont\glsnamefont}%
\glsnameaccessdisplay
{%
- \glsnamefont{\Glsentryname{#1}}%
+ \@glsxtr@glossnamefont{\Glsentryname{#1}}%
}%
{#1}%
\glsxtrpostnamehook{#1}%
@@ -2854,7 +3010,22 @@ want
\glsdoifexistsorwarn{#1}%
{%
\glssetabbrvfmt{\glscategory{#1}}%
- \glsnamefont{\Glsentryname{#1}}%
+ \glshasattribute{#1}{glossnamefont}%
+ {%
+ \edef\@glsxtr@attrval{\glsgetattribute{#1}{glossnamefont}}%
+ \ifcsdef{\@glsxtr@attrval}%
+ {%
+ \letcs{\@glsxtr@glossnamefont}{\@glsxtr@attrval}%
+ }%
+ {%
+ \GlossariesExtraWarning{Unknown control sequence name
+ `\@glsxtr@attrval' supplied in glossnamefont attribute
+ for entry `#1'. Reverting to default \string\glsnamefont}%
+ \let\@glsxtr@glossnamefont\glsnamefont
+ }%
+ }%
+ {\let\@glsxtr@glossnamefont\glsnamefont}%
+ \@glsxtr@glossnamefont{\Glsentryname{#1}}%
\glsxtrpostnamehook{#1}%
}%
}
@@ -2862,6 +3033,7 @@ want
\newcommand*{\glsxtrpostnamehook}[1]{%
\def\@glsnumberformat{glsnumberformat}%
\glsxtrdoautoindexname{#1}{indexname}%
+ \csuse{glsxtrpostname\glscategory{\glscurrententrylabel}}%
}
\newif\if@glsxtr@format@override
\@glsxtr@format@overridefalse
@@ -3105,8 +3277,11 @@ want
\@glsxtr@activate@initialtagging
\let\@glsxtr@org@postdescription\glspostdescription
\renewcommand*{\glspostdescription}{%
- \glsxtrpostdescription
- \@glsxtr@org@postdescription
+ \ifglsentryexists{\glscurrententrylabel}%
+ {%
+ \glsxtrpostdescription
+ \@glsxtr@org@postdescription
+ }{}%
}%
}%
}
@@ -3225,7 +3400,10 @@ want
\edef\glscategorylabel{#1}%
\ifcsdef{@glsabbrv@current@#1}%
{%
+ \let\@glsxtr@orgwarndep\GlsXtrWarnDeprecatedAbbrStyle
+ \let\GlsXtrWarnDeprecatedAbbrStyle\@gobbletwo
\glsxtr@applyabbrvstyle{\csname @glsabbrv@current@#1\endcsname}%
+ \let\GlsXtrWarnDeprecatedAbbrStyle\@glsxtr@orgwarndep
}%
{}%
}
@@ -3352,8 +3530,10 @@ want
\newcommand*{\glsfirstabbrvdefaultfont}[1]{\glsabbrvfont{#1}}
\newcommand*{\glsabbrvfont}[1]{\glsabbrvdefaultfont{#1}}
\newcommand*{\glsabbrvdefaultfont}[1]{#1}
-\newcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{#1}}
-\newcommand*{\glsfirstlongdefaultfont}[1]{#1}
+\newcommand*{\glslongfont}[1]{\glslongdefaultfont{#1}}
+\newcommand*{\glslongdefaultfont}[1]{#1}
+\newcommand*{\glsfirstlongfont}[1]{\glslongfont{#1}}
+\newcommand*{\glsfirstlongdefaultfont}[1]{\glslongdefaultfont{#1}}
\newcommand*{\abbrvpluralsuffix}{\glspluralsuffix}
\newrobustcmd*{\glsxtrfull}{\@gls@hyp@opt\ns@glsxtrfull}
\newcommand*\ns@glsxtrfull[2][]{%
@@ -3486,7 +3666,8 @@ want
\let\glscapscase\@firstofthree
\let\glsinsert\@empty
\def\glscustomtext{%
- \glsabbrvfont{\glsaccessshort{#2}}#3%
+ \glsabbrvfont{\glsaccessshort{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
}%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
@@ -3506,7 +3687,8 @@ want
\let\glscapscase\@secondofthree
\let\glsinsert\@empty
\def\glscustomtext{%
- \glsabbrvfont{\Glsaccessshort{#2}}#3%
+ \glsabbrvfont{\Glsaccessshort{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
}%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
@@ -3526,7 +3708,10 @@ want
\let\glscapscase\@thirdofthree
\let\glsinsert\@empty
\def\glscustomtext{%
- \mfirstucMakeUppercase{\glsabbrvfont{\glsaccessshort{#2}}#3}%
+ \mfirstucMakeUppercase
+ {\glsabbrvfont{\glsaccessshort{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
+ }%
}%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
@@ -3544,7 +3729,10 @@ want
\let\glsifplural\@secondoftwo
\let\glscapscase\@firstofthree
\let\glsinsert\@empty
- \def\glscustomtext{\glsaccesslong{#2}#3}%
+ \def\glscustomtext{%
+ \glslongfont{\glsaccesslong{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
+ }%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
\glspostlinkhook
@@ -3561,7 +3749,10 @@ want
\let\glsifplural\@secondoftwo
\let\glscapscase\@secondofthree
\let\glsinsert\@empty
- \def\glscustomtext{\Glsaccesslong{#2}#3}%
+ \def\glscustomtext{%
+ \glslongfont{\Glsaccesslong{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
+ }%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
\glspostlinkhook
@@ -3578,7 +3769,12 @@ want
\let\glsifplural\@secondoftwo
\let\glscapscase\@thirdofthree
\let\glsinsert\@empty
- \def\glscustomtext{\mfirstucMakeUppercase{\glsaccesslong{#2}#3}}%
+ \def\glscustomtext{%
+ \mfirstucMakeUppercase
+ {\glslongfont{\glsaccesslong{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
+ }%
+ }%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
\glspostlinkhook
@@ -3597,7 +3793,8 @@ want
\let\glscapscase\@firstofthree
\let\glsinsert\@empty
\def\glscustomtext{%
- \glsabbrvfont{\glsaccessshortpl{#2}}#3%
+ \glsabbrvfont{\glsaccessshortpl{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
}%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
@@ -3617,7 +3814,8 @@ want
\let\glscapscase\@secondofthree
\let\glsinsert\@empty
\def\glscustomtext{%
- \glsabbrvfont{\Glsaccessshortpl{#2}}#3%
+ \glsabbrvfont{\Glsaccessshortpl{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
}%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
@@ -3637,7 +3835,10 @@ want
\let\glscapscase\@thirdofthree
\let\glsinsert\@empty
\def\glscustomtext{%
- \mfirstucMakeUppercase{\glsabbrvfont{\glsaccessshortpl{#2}}#3}%
+ \mfirstucMakeUppercase
+ {\glsabbrvfont{\glsaccessshortpl{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
+ }%
}%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
@@ -3655,7 +3856,10 @@ want
\let\glsifplural\@firstoftwo
\let\glscapscase\@firstofthree
\let\glsinsert\@empty
- \def\glscustomtext{\glsaccesslongpl{#2}#3}%
+ \def\glscustomtext{%
+ \glslongfont{\glsaccesslongpl{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
+ }%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
\glspostlinkhook
@@ -3672,7 +3876,10 @@ want
\let\glsifplural\@firstoftwo
\let\glscapscase\@secondofthree
\let\glsinsert\@empty
- \def\glscustomtext{\Glsaccesslongpl{#2}#3}%
+ \def\glscustomtext{%
+ \glslongfont{\Glsaccesslongpl{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
+ }%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
\glspostlinkhook
@@ -3689,7 +3896,12 @@ want
\let\glsifplural\@firstoftwo
\let\glscapscase\@thirdofthree
\let\glsinsert\@empty
- \def\glscustomtext{\mfirstucMakeUppercase{\glsaccesslongpl{#2}#3}}%
+ \def\glscustomtext{%
+ \mfirstucMakeUppercase
+ {\glslongfont{\glsaccesslongpl{#2}\ifglsxtrinsertinside#3\fi}%
+ \ifglsxtrinsertinside\else#3\fi
+ }%
+ }%
\@gls@link[#1]{#2}{\csname gls@\glstype @entryfmt\endcsname}%
}%
\glspostlinkhook
@@ -3801,7 +4013,7 @@ want
\csuse{@glsabbrv@dispstyle@fmts@#1}%
}
\newcommand*{\newabbreviationstyle}[3]{%
- \ifcsdef{@glsabbrv@dispstyle@#1}
+ \ifcsdef{@glsabbrv@dispstyle@setup@#1}
{%
\PackageError{glossaries-extra}{Abbreviation style `#1' already
defined}{}%
@@ -3818,6 +4030,38 @@ want
#3}%
}%
}
+\newcommand*{\renewabbreviationstyle}[3]{%
+ \ifcsundef{@glsabbrv@dispstyle@setup@#1}
+ {%
+ \PackageError{glossaries-extra}{Abbreviation style `#1' not defined}{}%
+ }%
+ {%
+ \csdef{@glsabbrv@dispstyle@setup@#1}{%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{}%
+ #2}%
+ \csdef{@glsabbrv@dispstyle@fmts@#1}{%
+ \renewcommand*{\glsxtrinlinefullformat}{\glsxtrfullformat}%
+ \renewcommand*{\Glsxtrinlinefullformat}{\Glsxtrfullformat}%
+ \renewcommand*{\glsxtrinlinefullplformat}{\glsxtrfullplformat}%
+ \renewcommand*{\Glsxtrinlinefullplformat}{\Glsxtrfullplformat}%
+ #3}%
+ }%
+}
+\newcommand*{\letabbreviationstyle}[2]{%
+ \csletcs{@glsabbrv@dispstyle@setup@#1}{@glsabbrv@dispstyle@setup@#2}%
+ \csletcs{@glsabbrv@dispstyle@fmts@#1}{@glsabbrv@dispstyle@fmts@#2}%
+}
+\newcommand*{\@glsxtr@deprecated@abbrstyle}[2]{%
+ \csdef{@glsabbrv@dispstyle@setup@#1}{%
+ \GlsXtrWarnDeprecatedAbbrStyle{#1}{#2}%
+ \csuse{@glsabbrv@dispstyle@setup@#2}%
+ }%
+ \csletcs{@glsabbrv@dispstyle@fmts@#1}{@glsabbrv@dispstyle@fmts@#2}%
+}
+\newcommand*{\GlsXtrWarnDeprecatedAbbrStyle}[2]{%
+ \GlossariesExtraWarning{Deprecated abbreviation style name `#1',
+ use `#2' instead}%
+}
\newcommand*{\GlsXtrUseAbbrStyleSetup}[1]{%
\ifcsundef{@glsabbrv@dispstyle@setup@#1}%
{%
@@ -3866,6 +4110,7 @@ want
\renewcommand*{\glsabbrvfont}[1]{\glsabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
\renewcommand*{\glsxtrfullformat}[2]{%
\glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
@@ -3889,11 +4134,12 @@ want
}%
}
\setabbreviationstyle{long-short}
+\newcommand*{\glsxtrlongshortdescsort}{\the\glslongtok\space(\the\glsshorttok)}
\newabbreviationstyle{long-short-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
name={\protect\glsxtrfullformat{\the\glslabeltok}{}},
- sort={\the\glsshorttok},%
+ sort={\glsxtrlongshortdescsort},%
first={\protect\glsfirstlongfont{\the\glslongtok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
(\protect\glsfirstabbrvfont{\the\glsshorttok})},%
@@ -3938,6 +4184,7 @@ want
\renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
\renewcommand*{\glsxtrfullformat}[2]{%
\glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
@@ -4009,6 +4256,7 @@ want
\renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
\renewcommand*{\glsxtrfullformat}[2]{%
\glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
@@ -4050,6 +4298,7 @@ want
(\glsfirstlongfont{\glsaccesslongpl{##1}})%
}%
}
+\letabbreviationstyle{short-footnote}{footnote}
\newabbreviationstyle{postfootnote}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
@@ -4085,6 +4334,7 @@ want
\renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
\renewcommand*{\glsxtrfullformat}[2]{%
\glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
@@ -4122,6 +4372,7 @@ want
(\glsfirstlongfont{\glsaccesslongpl{##1}})%
}%
}
+\letabbreviationstyle{short-postfootnote}{postfootnote}
\newabbreviationstyle{short}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
@@ -4140,6 +4391,7 @@ want
\renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
\renewcommand*{\glsxtrinlinefullformat}[2]{%
\protect\glsfirstabbrvfont{\glsaccessshort{##1}%
\ifglsxtrinsertinside##2\fi}%
@@ -4182,6 +4434,7 @@ want
}%
}
\setabbreviationstyle[acronym]{short}
+\letabbreviationstyle{short-nolong}{short}
\newabbreviationstyle{short-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
@@ -4200,6 +4453,7 @@ want
\renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
\renewcommand*{\glsxtrinlinefullformat}[2]{%
\glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
@@ -4237,6 +4491,7 @@ want
\ifglsxtrinsertinside\else##2\fi
}%
}
+\letabbreviationstyle{short-nolong-desc}{short-desc}
\newabbreviationstyle{long-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
@@ -4255,6 +4510,7 @@ want
\renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
\renewcommand*{\glsxtrinlinefullformat}[2]{%
\glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
@@ -4292,6 +4548,7 @@ want
\ifglsxtrinsertinside\else##2\fi
}%
}
+\letabbreviationstyle{long-noshort-desc}{long-desc}
\newabbreviationstyle{long}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
@@ -4309,7 +4566,9 @@ want
{%
\GlsXtrUseAbbrStyleFmts{long-desc}%
}
+\letabbreviationstyle{long-noshort}{long}
\newcommand*{\glsxtrscfont}[1]{\textsc{#1}}
+\newcommand*{\glsxtrfirstscfont}[1]{\glsxtrscfont{#1}}
\newcommand*{\glsxtrscsuffix}{\glstextup{\glspluralsuffix}}
\newabbreviationstyle{long-short-sc}%
{%
@@ -4319,6 +4578,7 @@ want
\GlsXtrUseAbbrStyleFmts{long-short}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
\newabbreviationstyle{long-short-sc-desc}%
{%
@@ -4328,6 +4588,7 @@ want
\GlsXtrUseAbbrStyleFmts{long-short-desc}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
\newabbreviationstyle{short-sc-long}%
{%
@@ -4337,6 +4598,7 @@ want
\GlsXtrUseAbbrStyleFmts{short-long}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
\newabbreviationstyle{short-sc-long-desc}%
{%
@@ -4346,16 +4608,19 @@ want
\GlsXtrUseAbbrStyleFmts{short-long-desc}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
\newabbreviationstyle{short-sc}%
{%
- \GlsXtrUseAbbrStyleSetup{short}%
+ \GlsXtrUseAbbrStyleSetup{short-nolong}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short}%
+ \GlsXtrUseAbbrStyleFmts{short-nolong}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
+\letabbreviationstyle{short-sc-nolong}{short-sc}
\newabbreviationstyle{short-sc-desc}%
{%
\GlsXtrUseAbbrStyleSetup{short-desc}%
@@ -4364,44 +4629,55 @@ want
\GlsXtrUseAbbrStyleFmts{short-desc}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
-\newabbreviationstyle{long-sc}%
+\letabbreviationstyle{short-sc-nolong-desc}{short-sc-desc}
+\newabbreviationstyle{long-noshort-sc}%
{%
- \GlsXtrUseAbbrStyleSetup{long}%
+ \GlsXtrUseAbbrStyleSetup{long-noshort}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long}%
+ \GlsXtrUseAbbrStyleFmts{long-noshort}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
-\newabbreviationstyle{long-desc-sc}%
+\@glsxtr@deprecated@abbrstyle{long-sc}{long-noshort-sc}
+\newabbreviationstyle{long-noshort-sc-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-desc}%
+ \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-desc}%
+ \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
-\newabbreviationstyle{footnote-sc}%
+\@glsxtr@deprecated@abbrstyle{long-desc-sc}{long-noshort-sc-desc}
+\newabbreviationstyle{short-sc-footnote}%
{%
- \GlsXtrUseAbbrStyleSetup{footnote}%
+ \GlsXtrUseAbbrStyleSetup{short-footnote}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{footnote}%
+ \GlsXtrUseAbbrStyleFmts{short-footnote}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
-\newabbreviationstyle{postfootnote-sc}%
+\@glsxtr@deprecated@abbrstyle{footnote-sc}{short-sc-footnote}
+\newabbreviationstyle{short-sc-postfootnote}%
{%
- \GlsXtrUseAbbrStyleSetup{postfootnote}%
+ \GlsXtrUseAbbrStyleSetup{short-postfootnote}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{postfootnote}%
+ \GlsXtrUseAbbrStyleFmts{short-postfootnote}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
}
+\@glsxtr@deprecated@abbrstyle{postfootnote-sc}{short-sc-postfootnote}
\newcommand*{\glsxtrsmfont}[1]{\textsmaller{#1}}
+\newcommand*{\glsxtrfirstsmfont}[1]{\glsxtrsmfont{#1}}
\newcommand*{\glsxtrsmsuffix}{\glspluralsuffix}
\newabbreviationstyle{long-short-sm}%
{%
@@ -4410,6 +4686,7 @@ want
{%
\GlsXtrUseAbbrStyleFmts{long-short}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
\newabbreviationstyle{long-short-sm-desc}%
@@ -4419,6 +4696,7 @@ want
{%
\GlsXtrUseAbbrStyleFmts{long-short-desc}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
\newabbreviationstyle{short-sm-long}%
@@ -4428,6 +4706,7 @@ want
{%
\GlsXtrUseAbbrStyleFmts{short-long}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
\newabbreviationstyle{short-sm-long-desc}%
@@ -4437,69 +4716,86 @@ want
{%
\GlsXtrUseAbbrStyleFmts{short-long-desc}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
\newabbreviationstyle{short-sm}%
{%
- \GlsXtrUseAbbrStyleSetup{short}%
+ \GlsXtrUseAbbrStyleSetup{short-nolong}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short}%
+ \GlsXtrUseAbbrStyleFmts{short-nolong}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
+\letabbreviationstyle{short-sm-nolong}{short-sm}
\newabbreviationstyle{short-sm-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-desc}%
+ \GlsXtrUseAbbrStyleSetup{short-nolong-desc}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-desc}%
+ \GlsXtrUseAbbrStyleFmts{short-nolong-desc}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
-\newabbreviationstyle{long-sm}%
+\letabbreviationstyle{short-sm-nolong-desc}{short-sm-desc}
+\newabbreviationstyle{long-noshort-sm}%
{%
- \GlsXtrUseAbbrStyleSetup{long}%
+ \GlsXtrUseAbbrStyleSetup{long-noshort}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long}%
+ \GlsXtrUseAbbrStyleFmts{long-noshort}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
-\newabbreviationstyle{long-desc-sm}%
+\@glsxtr@deprecated@abbrstyle{long-sm}{long-noshort-sm}
+\newabbreviationstyle{long-noshort-sm-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-desc}%
+ \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-desc}%
+ \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
-\newabbreviationstyle{footnote-sm}%
+\@glsxtr@deprecated@abbrstyle{long-desc-sm}{long-noshort-sm-desc}
+\newabbreviationstyle{short-sm-footnote}%
{%
- \GlsXtrUseAbbrStyleSetup{footnote}%
+ \GlsXtrUseAbbrStyleSetup{short-footnote}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{footnote}%
+ \GlsXtrUseAbbrStyleFmts{short-footnote}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
-\newabbreviationstyle{postfootnote-sm}%
+\@glsxtr@deprecated@abbrstyle{footnote-sm}{short-sm-footnote}
+\newabbreviationstyle{short-sm-postfootnote}%
{%
- \GlsXtrUseAbbrStyleSetup{postfootnote}%
+ \GlsXtrUseAbbrStyleSetup{short-postfootnote}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{postfootnote}%
+ \GlsXtrUseAbbrStyleFmts{short-postfootnote}%
\renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
}
+\@glsxtr@deprecated@abbrstyle{postfootnote-sm}{short-sm-postfootnote}
+\newcommand*{\glsabbrvemfont}[1]{\emph{#1}}%
+\newcommand*{\glsfirstabbrvemfont}[1]{\glsabbrvemfont{#1}}%
+\newcommand*{\glsfirstlongemfont}[1]{\glslongemfont{#1}}%
+\newcommand*{\glslongemfont}[1]{\emph{#1}}%
\newabbreviationstyle{long-short-em}%
{%
\GlsXtrUseAbbrStyleSetup{long-short}%
}%
{%
\GlsXtrUseAbbrStyleFmts{long-short}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
}
\newabbreviationstyle{long-short-em-desc}%
{%
@@ -4507,7 +4803,46 @@ want
}%
{%
\GlsXtrUseAbbrStyleFmts{long-short-desc}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+}
+\newabbreviationstyle{long-em-short-em}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ (\protect\glsfirstabbrvfont{\the\glsshorttok})},%
+ firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ (\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
+ plural={\protect\glsabbvfont{\the\glsshortpltok}},%
+ description={\protect\glslongemfont{\the\glslongtok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-short}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+}
+\newabbreviationstyle{long-em-short-em-desc}%
+{%
+ \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-short-desc}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
}
\newabbreviationstyle{short-em-long}%
{%
@@ -4515,7 +4850,10 @@ want
}%
{%
\GlsXtrUseAbbrStyleFmts{short-long}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
}
\newabbreviationstyle{short-em-long-desc}%
{%
@@ -4523,55 +4861,266 @@ want
}%
{%
\GlsXtrUseAbbrStyleFmts{short-long-desc}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+}
+\newabbreviationstyle{short-em-long-em}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\protect\glslongemfont{\the\glslongtok}},%
+ first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ (\protect\glsfirstlongfont{\the\glslongtok})},%
+ firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ (\protect\glsfirstlongfont{\the\glslongpltok})},%
+ plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-long}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+}
+\newabbreviationstyle{short-em-long-em-desc}%
+{%
+ \GlsXtrUseAbbrStyleSetup{short-long-desc}%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-long-desc}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
}
\newabbreviationstyle{short-em}%
{%
- \GlsXtrUseAbbrStyleSetup{short}%
+ \GlsXtrUseAbbrStyleSetup{short-nolong}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \GlsXtrUseAbbrStyleFmts{short-nolong}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
}
+\letabbreviationstyle{short-em-nolong}{short-em}
\newabbreviationstyle{short-em-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-desc}%
+ \GlsXtrUseAbbrStyleSetup{short-nolong-desc}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-desc}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \GlsXtrUseAbbrStyleFmts{short-nolong-desc}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+}
+\letabbreviationstyle{short-em-nolong-desc}{short-em-desc}
+\newabbreviationstyle{long-noshort-em}%
+{%
+ \GlsXtrUseAbbrStyleSetup{long-noshort}%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-noshort}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+}
+\@glsxtr@deprecated@abbrstyle{long-em}{long-noshort-em}
+\newabbreviationstyle{long-em-noshort-em}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongfont{\the\glslongtok}},
+ firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},
+ text={\the\glslongtok},
+ plural={\the\glslongpltok},%
+ description={\protect\glslongemfont{\the\glslongtok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-noshort}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
}
-\newabbreviationstyle{long-em}%
+\newabbreviationstyle{long-noshort-em-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long}%
+ \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
}
-\newabbreviationstyle{long-desc-em}%
+\@glsxtr@deprecated@abbrstyle{long-desc-em}{long-noshort-em-desc}
+\newabbreviationstyle{long-em-noshort-em-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-desc}%
+ \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-desc}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
}
-\newabbreviationstyle{footnote-em}%
+\newabbreviationstyle{short-em-footnote}%
{%
- \GlsXtrUseAbbrStyleSetup{footnote}%
+ \GlsXtrUseAbbrStyleSetup{short-footnote}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{footnote}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \GlsXtrUseAbbrStyleFmts{short-footnote}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
}
-\newabbreviationstyle{postfootnote-em}%
+\@glsxtr@deprecated@abbrstyle{footnote-em}{short-em-footnote}
+\newabbreviationstyle{short-em-postfootnote}%
{%
- \GlsXtrUseAbbrStyleSetup{postfootnote}%
+ \GlsXtrUseAbbrStyleSetup{short-postfootnote}%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-postfootnote}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+}
+\@glsxtr@deprecated@abbrstyle{postfootnote-em}{short-em-postfootnote}
+\newcommand*{\glsxtruserfield}{useri}
+\ifdef\glscurrentfieldvalue
+{
+ \newcommand*{\glsxtruserparen}[2]{%
+ \glsxtrfullsep{#2}%
+ (#1\ifglshasfield{\glsxtruserfield}{#2}{, \glscurrentfieldvalue}{})%
+ }
+}
+{
+ \newcommand*{\glsxtruserparen}[2]{%
+ \glsxtrfullsep{#2}%
+ (#1\ifglshasfield{\glsxtruserfield}{#2}{, \@glo@thisvalue}{})%
+ }
+}
+\newcommand*{\glsabbrvuserfont}[1]{#1}
+\newcommand*{\glsfirstabbrvuserfont}[1]{\glsabbrvuserfont{#1}}
+\newcommand*{\glslonguserfont}[1]{#1}
+\newcommand*{\glsfirstlonguserfont}[1]{\glslonguserfont{#1}}
+\newcommand*{\glsxtrusersuffix}{\glspluralsuffix}
+\newabbreviationstyle{long-short-user}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongfont{\the\glslongtok}%
+ \protect\glsxtruserparen{\protect\glsfirstabbrvfont{\the\glsshorttok}}{\the\glslabeltok}},%
+ firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
+ \protect\glsxtruserparen{\protect\glsfirstabbrvfont{\the\glsshortpltok}}{\the\glslabeltok}},%
+ plural={\protect\glsabbvfont{\the\glsshortpltok}},%
+ description={\protect\glslonguserfont{\the\glslongtok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrusersuffix}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvuserfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvuserfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonguserfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslonguserfont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}%
+ }%
+}
+\newabbreviationstyle{long-short-user-desc}%
+{%
+ \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-short-user}%
+}
+\newabbreviationstyle{short-long-user}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\protect\glslonguserfont{\the\glslongtok}},%
+ first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
+ \protect\glsxtruserparen{\protect\glslonguserfont{\the\glslongtok}}{\the\glslabeltok}},%
+ firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
+ \protect\glsxtruserparen{\protect\glslonguserfont{\the\glslongpltok}}{\the\glslabeltok}},%
+ plural={\protect\glsabbvfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrusersuffix}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvuserfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvuserfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonguserfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslonguserfont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}%
+ }%
+}
+\newabbreviationstyle{short-long-user-desc}%
+{%
+ \GlsXtrUseAbbrStyleSetup{short-long-desc}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{postfootnote}%
- \renewcommand*\glsabbrvfont[1]{\emph{##1}}%
+ \GlsXtrUseAbbrStyleFmts{short-long-user}%
}
\let\@glsxtr@org@markright\markright
\renewcommand*{\markright}[1]{%
@@ -5221,6 +5770,7 @@ want
}
{}
\@glsxtr@redefstyles
+\@glsxtr@do@style
\endinput
%%
%% End of file `glossaries-extra.sty'.