summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-08-09 22:15:23 +0000
committerKarl Berry <karl@freefriends.org>2017-08-09 22:15:23 +0000
commit88be00188d030954be624d333c41f0bf0a6c6488 (patch)
tree3e3b334e6c5d72e48de3d1ee9c73335008512589
parent1aeae3e685706e19df5cf9084e71685db8e18d1a (diff)
glossaries-extra (9aug17)
git-svn-id: svn://tug.org/texlive/trunk@44998 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/CHANGES39
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/README4
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-code.pdfbin798427 -> 927368 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.html10817
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.pdfbin690735 -> 736071 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/glossaries-extra-manual.tex1349
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.pdfbin0 -> 500436 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.tex425
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-abbrv.pdfbin44761 -> 44761 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-accsupp.pdfbin80757 -> 80757 bytes
-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-alias.pdfbin43611 -> 43611 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-alttree-marginpar.pdfbin91061 -> 91061 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdfbin69532 -> 69532 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdfbin54866 -> 54866 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex-hyp.pdfbin141998 -> 142277 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-autoindex.pdfbin161489 -> 161737 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref.pdfbin41294 -> 41294 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdfbin41613 -> 41613 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-external.pdfbin55786 -> 55786 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdfbin75272 -> 75272 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 -> 81618 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-mixedsort.pdfbin45154 -> 45154 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-mixture.pdfbin159939 -> 160170 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdfbin202102 -> 202102 bytes
-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-noidx-restricteddocdefs.pdfbin47582 -> 47582 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.pdfbin19856 -> 19860 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.pdfbin38801 -> 38801 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdfbin37063 -> 37059 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-postlink.pdfbin67889 -> 67889 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-record.pdfbin49665 -> 49665 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdfbin47895 -> 47895 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdfbin34944 -> 34944 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdfbin32971 -> 32971 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdfbin31607 -> 31607 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdfbin13423 -> 13423 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdfbin49455 -> 49455 bytes
-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.pdfbin61051 -> 61051 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.dtx4142
-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.sty3015
57 files changed, 14092 insertions, 5703 deletions
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES b/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES
index 91e3ac4cd3e..ecdf9ec7ab1 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/CHANGES
@@ -1,3 +1,42 @@
+1.17 (2017-08-09):
+
+ * Added \glsxtrword, \glsxtrwordsep and check for 'markwords'
+ and 'markshortwords' category attributes.
+
+ * New abbreviation styles:
+
+ - short-nolong-noreg
+ - short-nolong-desc-noreg
+ - long-noshort-desc-noreg
+ - long-noshort-noreg
+ - long-em-noshort-em-noreg
+ - long-em-noshort-em-desc-noreg
+ - long-only-short-only
+ - long-only-short-only-desc
+
+ designed to work with 'markwords' attribute:
+ - long-hyphen-short-hyphen
+ - long-hyphen-short-hyphen-desc
+ - long-hyphen-noshort-desc-noreg
+ - long-hyphen-postshort-hyphen
+ - long-hyphen-postshort-hyphen-desc
+ - short-hyphen-long-hyphen
+ - short-hyphen-long-hyphen-desc
+ - short-hyphen-postlong-hyphen
+ - short-hyphen-postlong-hyphen-desc
+
+ * New sample document sample-abbr-styles.tex that illustrates all
+ available abbreviation styles.
+
+ * Fixed some inconsistencies in the predefined abbreviation styles.
+
+ * Added extra value 'ac' to package option 'shortcuts'
+
+ * Added \ifglsxtrinsertinside check for subsequent use.
+
+ * Added \glsxtrparen, \glsxtrsubsequentfmt and sundry other helper
+ commands related to abbreviation styles.
+
1.16 (2017-06-15):
* New key: seealso
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/README b/Master/texmf-dist/doc/latex/glossaries-extra/README
index a5a766cd75d..4be4bbb24a7 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.16
+LaTeX Package : glossaries-extra v1.17
-Last Modified : 2017-06-15
+Last Modified : 2017-08-09
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 c83974ff9e4..8e3a34864dd 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 0328541b6af..4595b84584c 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
@@ -202,22 +202,22 @@ a span.HoLogo-TeX span.HoLogo-e{text-decoration:none;}
</style>
</head><body
>
-<!--l. 177--><p class="noindent" ><a
+<!--l. 214--><p class="noindent" ><a
id="top"></a>
-</p><!--l. 177--><p class="indent" >
+</p><!--l. 214--><p class="indent" >
-</p><!--l. 177--><p class="indent" >
+</p><!--l. 214--><p class="indent" >
</p>
<div class="center"
>
-<!--l. 177--><p class="noindent" >
-</p><!--l. 177--><p class="noindent" ><span
-class="cmr-17">glossaries-extra.sty v1.16: an extension to the</span>
+<!--l. 214--><p class="noindent" >
+</p><!--l. 214--><p class="noindent" ><span
+class="cmr-17">glossaries-extra.sty v1.17: an extension to the</span>
<span
class="cmr-17">glossaries package</span>
</p>
@@ -240,22 +240,22 @@ class="td11"><a
href="http://www.dickimaw-books.com/" class="url" ><span
class="cmtt-12">http://www.dickimaw-books.com/</span></a></td></tr></table>
</div>
-<!--l. 177--><p class="noindent" ><span
-class="cmr-12">2017-06-15</span></p></div>
+<!--l. 214--><p class="noindent" ><span
+class="cmr-12">2017-08-09</span></p></div>
<div
class="abstract"
>
-<!--l. 179--><p class="indent" >
+<!--l. 216--><p class="indent" >
</p>
<div class="center"
>
-<!--l. 179--><p class="noindent" >
-</p><!--l. 179--><p class="noindent" ><span
+<!--l. 216--><p class="noindent" >
+</p><!--l. 216--><p class="noindent" ><span
class="cmbx-10">Abstract</span></p></div>
-<!--l. 180--><p class="noindent" >The <span
+<!--l. 217--><p class="noindent" >The <span
class="cmss-10">glossaries-extra </span>package is an extension to the <span
class="cmss-10">glossaries </span>package, providing
additional features. Some of the features provided by this package are only available
@@ -263,7 +263,7 @@ with <span
class="cmss-10">glossaries </span>version 4.19 (or above). This document assumes familiarity with the
<span
class="cmss-10">glossaries </span>package.
-</p><!--l. 186--><p class="indent" > The file <span
+</p><!--l. 223--><p class="indent" > The file <span
class="cmtt-10">example-glossaries-xr.tex </span>contains dummy entries with cross-references
that may be used for creating minimal working examples for testing the
<span
@@ -276,7 +276,7 @@ class="cmss-10">glossaries-extra</span>.)
</p>
</div>
-<!--l. 194--><p class="indent" > <div class="important" title="Important Note"> Since <span
+<!--l. 231--><p class="indent" > <div class="important" title="Important Note"> Since <span
class="cmss-10">glossaries-extra </span>internally loads the <span
class="cmss-10">glossaries </span>package, you also need to have
<span
@@ -311,8 +311,8 @@ 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. 209--><p class="noindent" >
-</p><!--l. 211--><p class="indent" > Additional resources: </p>
+</p><!--l. 246--><p class="noindent" >
+</p><!--l. 248--><p class="indent" > Additional resources: </p>
<ul class="itemize1">
<li class="itemize">The <span
class="cmss-10">glossaries-extra </span>documented code <a
@@ -419,15 +419,15 @@ href="#glossary">Glossary</a></span>
-<!--l. 228--><p class="indent" > <div class="chapter"><h2 class="chapterHead">1. <a
+<!--l. 265--><p class="indent" > <div class="chapter"><h2 class="chapterHead">1. <a
id="sec:intro"></a>Introduction</h2>
-</p><!--l. 231--><p class="indent" > The <span
+</p><!--l. 268--><p class="indent" > The <span
class="cmss-10">glossaries </span>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. 238--><p class="indent" > The <span
+</p><!--l. 275--><p class="indent" > The <span
class="cmss-10">glossaries-extra </span>package is an attempt to provide a&#x00A0;compromise for this
conflict. Version 4.22 of the <span
class="cmss-10">glossaries </span>package is the last version to incorporate new
@@ -443,10 +443,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. 252--><p class="noindent" ><a
+<!--l. 289--><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. 255--><p class="noindent" >I&#8217;m not happy with some of the default settings assumed by the <span
+<!--l. 292--><p class="noindent" >I&#8217;m not happy with some of the default settings assumed by the <span
class="cmss-10">glossaries </span>package,
and, judging from code I&#8217;ve seen, other users also seem unhappy with them, as
certain package options are often used in questions posted on various sites. I can&#8217;t
@@ -456,7 +456,7 @@ but since <span
class="cmss-10">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. 265--><p class="indent" > The new defaults are: </p>
+</p><!--l. 302--><p class="indent" > The new defaults are: </p>
<ul class="itemize1">
<li class="itemize"><span
class="cmss-10">toc=true</span><a
@@ -468,23 +468,26 @@ class="cmss-10">toc=false</span><a
<li class="itemize"><span
class="cmss-10">nopostdot=true</span><a
id="dx1-3003"></a> (suppress the terminating full stop after the description
- in the glossary). Use <span
+ in the glossary). Use <span
class="cmss-10">nopostdot=false</span><a
- id="dx1-3004"></a> to restore the terminating full stop
- (period).
+ id="dx1-3004"></a> or just <a
+href="#styopt.postdot"><span
+class="cmss-10">postdot</span></a><a
+ id="dx1-3005"></a> to restore the
+ terminating full stop (period).
</li>
<li class="itemize"><span
class="cmss-10">noredefwarn=true</span><a
- id="dx1-3005"></a> (suppress the warnings that occur when the <span
+ id="dx1-3006"></a> (suppress the warnings that occur when the <span
class="cmss-10">theglossary</span><a
- id="dx1-3006"></a><a
- id="dx1-3007"></a>
+ id="dx1-3007"></a><a
+ id="dx1-3008"></a>
environment and <span
class="cmtt-10">\printglossary </span>are redefined while <span
class="cmss-10">glossaries </span>is
loading). To restore the warnings, use <span
class="cmss-10">noredefwarn=false</span><a
- id="dx1-3008"></a>. Note that this
+ id="dx1-3009"></a>. Note that this
won&#8217;t have any effect if the <span
class="cmss-10">glossaries </span>package has already been loaded
before you use the <span
@@ -492,22 +495,22 @@ class="cmss-10">glossaries-extra </span>package.
</li>
<li class="itemize">If <span
class="cmss-10">babel</span><a
- id="dx1-3009"></a> has been loaded, the <span
+ id="dx1-3010"></a> has been loaded, the <span
class="cmss-10">translate=babel</span><a
- id="dx1-3010"></a> option is switched on. To
+ id="dx1-3011"></a> option is switched on. To
revert to using the <span
class="cmss-10">translator</span><a
- id="dx1-3011"></a> interface, use <span
+ id="dx1-3012"></a> interface, use <span
class="cmss-10">translate=true</span><a
- id="dx1-3012"></a>. There is no
+ id="dx1-3013"></a>. There is no
change to the default if <span
class="cmss-10">babel</span><a
- id="dx1-3013"></a> hasn&#8217;t been loaded.
+ id="dx1-3014"></a> hasn&#8217;t been loaded.
</li></ul>
-<!--l. 289--><p class="indent" > The examples below illustrate the difference in explicit package options between
+<!--l. 326--><p class="indent" > The examples below illustrate the difference in explicit package options between
<span
class="cmss-10">glossaries </span>and <span
class="cmss-10">glossaries-extra</span>. There may be other differences resulting from
@@ -517,10 +520,10 @@ href="#sec:modifications"><span
class="cmsy-10">&sect;</span>2 </a><a
href="#sec:modifications">Modifications to Existing
Commands and Styles<!--tex4ht:ref: sec:modifications --></a>).
-</p><!--l. 295--><p class="indent" >
+</p><!--l. 332--><p class="indent" >
</p><ol class="enumerate1" >
<li
- class="enumerate" id="x1-3015x1">
+ class="enumerate" id="x1-3016x1">
@@ -528,7 +531,7 @@ Commands and Styles<!--tex4ht:ref: sec:modifications --></a>).
\documentclass{article}
&#x00A0;<br />\usepackage{glossaries-extra}
</div>
- <!--l. 300--><p class="nopar" > This is like:
+ <!--l. 337--><p class="nopar" > This is like:
@@ -538,10 +541,10 @@ Commands and Styles<!--tex4ht:ref: sec:modifications --></a>).
&#x00A0;<br />\usepackage[toc,nopostdot]{glossaries}
&#x00A0;<br />\usepackage{glossaries-extra}
</div>
- <!--l. 306--><p class="nopar" >
+ <!--l. 343--><p class="nopar" >
</p></li>
<li
- class="enumerate" id="x1-3017x2">
+ class="enumerate" id="x1-3018x2">
@@ -550,7 +553,7 @@ Commands and Styles<!--tex4ht:ref: sec:modifications --></a>).
&#x00A0;<br />\usepackage{babel}
&#x00A0;<br />\usepackage{glossaries-extra}
</div>
- <!--l. 313--><p class="nopar" > This is like:
+ <!--l. 350--><p class="nopar" > This is like:
@@ -561,10 +564,10 @@ Commands and Styles<!--tex4ht:ref: sec:modifications --></a>).
&#x00A0;<br />\usepackage[toc,nopostdot,translate=babel]{glossaries}
&#x00A0;<br />\usepackage{glossaries-extra}
</div>
- <!--l. 320--><p class="nopar" >
+ <!--l. 357--><p class="nopar" >
</p></li>
<li
- class="enumerate" id="x1-3019x3">
+ class="enumerate" id="x1-3020x3">
@@ -572,7 +575,7 @@ Commands and Styles<!--tex4ht:ref: sec:modifications --></a>).
\documentclass{memoir}
&#x00A0;<br />\usepackage{glossaries-extra}
</div>
- <!--l. 326--><p class="nopar" > This is like:
+ <!--l. 363--><p class="nopar" > This is like:
@@ -582,7 +585,7 @@ Commands and Styles<!--tex4ht:ref: sec:modifications --></a>).
&#x00A0;<br />\usepackage[toc,nopostdot,noredefwarn]{glossaries}
&#x00A0;<br />\usepackage{glossaries-extra}
</div>
- <!--l. 332--><p class="nopar" > <span
+ <!--l. 369--><p class="nopar" > <span
class="cmti-10">However</span>
@@ -593,7 +596,7 @@ class="cmti-10">However</span>
&#x00A0;<br />\usepackage{glossaries}
&#x00A0;<br />\usepackage{glossaries-extra}
</div>
- <!--l. 338--><p class="nopar" > This is like:
+ <!--l. 375--><p class="nopar" > This is like:
@@ -603,32 +606,32 @@ class="cmti-10">However</span>
&#x00A0;<br />\usepackage[toc,nopostdot]{glossaries}
&#x00A0;<br />\usepackage{glossaries-extra}
</div>
- <!--l. 344--><p class="nopar" > Since by the time <span
+ <!--l. 381--><p class="nopar" > Since by the time <span
class="cmss-10">glossaries-extra </span>has been loaded, <span
class="cmss-10">glossaries </span>has already
redefined <span
class="cmss-10">memoir</span><a
- id="dx1-3020"></a>&#8217;s glossary-related commands.</p></li></ol>
-<!--l. 350--><p class="indent" > Another noticeable change is that by default <span
+ id="dx1-3021"></a>&#8217;s glossary-related commands.</p></li></ol>
+<!--l. 387--><p class="indent" > Another noticeable change is that by default <span
class="cmtt-10">\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. 357--><p class="indent" > This change is mostly likely to be noticed by users with one or more
+</p><!--l. 394--><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-3021"></a><a
+ id="dx1-3022"></a><a
href="#glo:makeindex"><span
class="cmtt-10">makeindex</span></a>/<a
- id="dx1-3022"></a><a
+ id="dx1-3023"></a><a
href="#glo:xindy"><span
class="cmtt-10">xindy</span></a> on just the non-empty glossary (or glossaries) and use the iterative
<span
class="cmtt-10">\printglossaries</span><a
- id="dx1-3023"></a> command instead of <span
+ id="dx1-3024"></a> command instead of <span
class="cmtt-10">\printglossary</span><a
- id="dx1-3024"></a>. For example, consider the
+ id="dx1-3025"></a>. For example, consider the
following:
@@ -645,15 +648,15 @@ following:
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 381--><p class="nopar" > The above document will only display the list of acronyms at the place where
+<!--l. 418--><p class="nopar" > The above document will only display the list of acronyms at the place where
<span
class="cmtt-10">\printglossaries</span><a
- id="dx1-3025"></a> occurs. However it will also attempt to input the <span
+ id="dx1-3026"></a> occurs. However it will also attempt to input the <span
class="cmtt-10">.gls </span>file
associated with the <span
class="cmtt-10">main </span>glossary.
-</p><!--l. 387--><p class="indent" > If you use <a
- id="dx1-3026"></a><a
+</p><!--l. 424--><p class="indent" > If you use <a
+ id="dx1-3027"></a><a
href="#glo:makeglossaries"><span
class="cmtt-10">makeglossaries</span></a>, you&#8217;ll get the warning message:
@@ -666,9 +669,9 @@ Warning:&#x00A0;File&#x00A0;'test.glo'&#x00A0;is&#x00A0;empty.
&#x00A0;<br />Remember&#x00A0;to&#x00A0;use&#x00A0;package&#x00A0;option&#x00A0;'nomain'&#x00A0;if&#x00A0;you
&#x00A0;<br />don't&#x00A0;want&#x00A0;to&#x00A0;use&#x00A0;the&#x00A0;main&#x00A0;glossary.
</div>
-<!--l. 393--><p class="nopar" > (where the original file is called <span
+<!--l. 430--><p class="nopar" > (where the original file is called <span
class="cmtt-10">test.tex</span>) but if you simply call <a
- id="dx1-3027"></a><a
+ id="dx1-3028"></a><a
href="#glo:makeindex"><span
class="cmtt-10">makeindex</span></a> directly
to generate the <span
@@ -682,39 +685,40 @@ transcript file will always contain the message:
<div class="verbatim" id="verbatim-11">
No&#x00A0;file&#x00A0;test.gls.
</div>
-<!--l. 400--><p class="nopar" > This doesn&#8217;t occur with <a
- id="dx1-3028"></a><a
+<!--l. 437--><p class="nopar" > This doesn&#8217;t occur with <a
+ id="dx1-3029"></a><a
href="#glo:makeglossaries"><span
class="cmtt-10">makeglossaries</span></a> as it will create the <span
class="cmtt-10">.gls </span>file containing
the single command <span
class="cmtt-10">\null</span>.
-</p><!--l. 404--><p class="indent" > If you simply change from <span
+</p><!--l. 441--><p class="indent" > If you simply change from <span
class="cmss-10">glossaries </span>to <span
class="cmss-10">glossaries-extra </span>in this document, you&#8217;ll
find a change in the resulting PDF if you don&#8217;t use <a
- id="dx1-3029"></a><span
+ id="dx1-3030"></a><span
class="cmtt-10">makeglossaries </span>and you only
generate the <span
class="cmtt-10">.acr </span>file with <a
- id="dx1-3030"></a><a
+ id="dx1-3031"></a><a
href="#glo:makeindex"><span
class="cmtt-10">makeindex</span></a>.
-</p><!--l. 409--><p class="indent" > The transcript file will still contain the message about the missing <span
+</p><!--l. 446--><p class="indent" > The transcript file will still contain the message about the missing <span
class="cmtt-10">.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
<span
class="cmss-10">nomain</span><a
- id="dx1-3031"></a> package option:
+ id="dx1-3032"></a> package option:
</p>
<div class="verbatim" id="verbatim-12">
\documentclass{article}
-&#x00A0;<br />\usepackage[nomain,acronym]{glossaries-extra}
+&#x00A0;<br />\usepackage[nomain,acronym,postdot]{glossaries-extra}
&#x00A0;<br />\makeglossaries
+&#x00A0;<br />\setabbreviationstyle[acronym]{long-short}
&#x00A0;<br />\newacronym{laser}{laser}{light&#x00A0;amplification&#x00A0;by&#x00A0;stimulated
&#x00A0;<br />emission&#x00A0;of&#x00A0;radiation}
&#x00A0;<br />\begin{document}
@@ -722,13 +726,19 @@ class="cmss-10">nomain</span><a
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 431--><p class="nopar" >
-</p><!--l. 434--><p class="noindent" >
+<!--l. 470--><p class="nopar" > (Note the need to set the acronym style using <span
+class="cmtt-10">\setabbreviationstyle </span>before
+<span
+class="cmtt-10">\newacronym</span>. See <a
+href="#sec:abbreviations"><span
+class="cmsy-10">&sect;</span>3 </a><a
+href="#sec:abbreviations">Abbreviations<!--tex4ht:ref: sec:abbreviations --></a> for further details.)
+</p><!--l. 475--><p class="noindent" >
</p>
-<!--l. 434--><p class="noindent" ><a
+<!--l. 475--><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. 437--><p class="noindent" >If you haven&#8217;t already loaded <span
+<!--l. 478--><p class="noindent" >If you haven&#8217;t already loaded <span
class="cmss-10">glossaries</span>, you can use any of the package options
provided by <span
class="cmss-10">glossaries </span>when you load <span
@@ -743,43 +753,53 @@ class="cmtt-10">\setupglossaries</span><a
remember that not all of the <span
class="cmss-10">glossaries </span>package options may be used in that
command.
-</p><!--l. 445--><p class="indent" > <div class="important" title="Important Note"> This section only lists options that are either unrecognised by the <span
+</p><!--l. 486--><p class="indent" > <div class="important" title="Important Note"> This section only lists options that are either unrecognised by the <span
class="cmss-10">glossaries</span>
package or are a modified version of options of the same name provided by <span
class="cmss-10">glossaries</span>.
See the <span
class="cmss-10">glossaries </span>user manual for details about the unmodified options.
</div>
-</p><!--l. 451--><p class="noindent" >
-</p><!--l. 453--><p class="indent" > The new and modified options provided by <span
+</p><!--l. 492--><p class="noindent" >
+</p><!--l. 494--><p class="indent" > The new and modified options provided by <span
class="cmss-10">glossaries-extra </span>are described
below:
+
+
+
</p><dl class="description"><dt class="description">
-<span
-class="cmssbx-10">accsupp</span><a
+<a
+ id="styopt.postdot"></a><span
+class="cmssbx-10">postdot</span><a
id="dx1-4002"></a> </dt><dd
+class="description">(New to version 1.12.) This option is just a shortcut for
+ <span
+class="cmss-10">nopostdot=false</span><a
+ id="dx1-4003"></a>.
+ </dd><dt class="description">
+<a
+ id="styopt.accsupp"></a><span
+class="cmssbx-10">accsupp</span><a
+ id="dx1-4004"></a> </dt><dd
class="description">Load the <span
class="cmss-10">glossaries-accsupp</span><a
- id="dx1-4003"></a> package (if not already loaded).
-
-
-
- <!--l. 460--><p class="noindent" >If you want to define styles that can interface with the accessibility support
+ id="dx1-4005"></a> package (if not already loaded).
+ <!--l. 504--><p class="noindent" >If you want to define styles that can interface with the accessibility support
provided by <span
class="cmss-10">glossaries-accsupp</span><a
- id="dx1-4004"></a> use the <span
+ id="dx1-4006"></a> use the <span
class="cmtt-10">\glsaccess</span>&#x27E8;<span
class="cmitt-10">xxx</span>&#x27E9; type of commands
instead of <span
class="cmtt-10">\glsentry</span>&#x27E8;<span
class="cmitt-10">xxx</span>&#x27E9; (for example, <span
class="cmtt-10">\glsaccesstext</span><a
- id="dx1-4005"></a> instead of
+ id="dx1-4007"></a> instead of
<span
class="cmtt-10">\glsentrytext</span><a
- id="dx1-4006"></a>). If <span
+ id="dx1-4008"></a>). If <span
class="cmss-10">glossaries-accsupp</span><a
- id="dx1-4007"></a> hasn&#8217;t been loaded those commands
+ id="dx1-4009"></a> hasn&#8217;t been loaded those commands
are equivalent (for example, <span
class="cmtt-10">\glsaccesstext </span>just does <span
class="cmtt-10">\glsentrytext</span>)
@@ -791,25 +811,26 @@ href="#sec:accsupp"><span
class="cmsy-10">&sect;</span>11.2 </a><a
href="#sec:accsupp">Accessibility Support<!--tex4ht:ref: sec:accsupp --></a> for further
details.)
- </p><!--l. 470--><p class="noindent" >Note that the <span
+ </p><!--l. 514--><p class="noindent" >Note that the <span
class="cmss-10">accsupp</span><a
- id="dx1-4008"></a> option can only be used as a&#x00A0;package option (not
+ id="dx1-4010"></a> option can only be used as a&#x00A0;package option (not
through <span
class="cmtt-10">\glossariesextrasetup</span><a
- id="dx1-4009"></a>) since the <span
+ id="dx1-4011"></a>) since the <span
class="cmss-10">glossaries-accsupp</span><a
- id="dx1-4010"></a> package
+ id="dx1-4012"></a> package
must be loaded before <span
class="cmss-10">glossaries-extra </span>if it&#8217;s required.
</p></dd><dt class="description">
-<span
+<a
+ id="styopt.stylemods"></a><span
class="cmssbx-10">stylemods</span><a
- id="dx1-4011"></a> </dt><dd
+ id="dx1-4013"></a> </dt><dd
class="description">This is a &#x27E8;<span
class="cmti-10">key</span>&#x27E9;=&#x27E8;<span
class="cmti-10">value</span>&#x27E9; option used to load the <span
class="cmss-10">glossaries-extra-stylemods</span><a
- id="dx1-4012"></a>
+ id="dx1-4014"></a>
package. The value may be a comma-separated list of options to pass to
that package. (Remember to group &#x27E8;<span
class="cmti-10">value</span>&#x27E9; if it contains any commas.) The
@@ -819,9 +840,10 @@ class="cmsy-10">&sect;</span>2.8 </a><a
href="#sec:glosstylemods">Glossary
Style Modifications<!--tex4ht:ref: sec:glosstylemods --></a> for further details.
</dd><dt class="description">
-<span
+<a
+ id="styopt.undefaction"></a><span
class="cmssbx-10">undefaction</span><a
- id="dx1-4013"></a> </dt><dd
+ id="dx1-4015"></a> </dt><dd
class="description">This is a &#x27E8;<span
class="cmti-10">key</span>&#x27E9;=&#x27E8;<span
class="cmti-10">value</span>&#x27E9; option, which has two allowed values: <span
@@ -830,24 +852,25 @@ class="cmss-10">warn</span>
class="cmss-10">error</span>. This indicates what to do if an undefined glossary entry is
referenced. The default behaviour is <span
class="cmss-10">undefaction=error</span><a
- id="dx1-4014"></a>, which produces an
+ id="dx1-4016"></a>, which produces an
error message (the default for <span
class="cmss-10">glossaries</span>). You can switch this to a warning
message (and ?? appearing in the text) with <span
class="cmss-10">undefaction=warn</span><a
- id="dx1-4015"></a>.
- <!--l. 492--><p class="noindent" ><div class="important" title="Important Note"> Undefined entries can&#8217;t be picked up by any commands that iterate
+ id="dx1-4017"></a>.
+ <!--l. 536--><p class="noindent" ><div class="important" title="Important Note"> Undefined entries can&#8217;t be picked up by any commands that iterate
over a glossary list. This includes <span
class="cmtt-10">\forglsentries</span><a
- id="dx1-4016"></a> and <span
+ id="dx1-4018"></a> and <span
class="cmtt-10">\glsaddall</span><a
- id="dx1-4017"></a>.
+ id="dx1-4019"></a>.
</div>
- </p><!--l. 496--><p class="noindent" >
+ </p><!--l. 540--><p class="noindent" >
</p></dd><dt class="description">
-<span
+<a
+ id="styopt.indexcrossrefs"></a><span
class="cmssbx-10">indexcrossrefs</span><a
- id="dx1-4018"></a> </dt><dd
+ id="dx1-4020"></a> </dt><dd
class="description">This is a boolean option. If <span
class="cmss-10">true</span>, this will automatically index any
cross-referenced entries that haven&#8217;t been marked as used at the end of the
@@ -856,58 +879,63 @@ class="cmss-10">true</span>, this will automatically index any
class="cmss-10">false</span>,
but it will be automatically switched on if you use the <span
class="cmss-10">see</span><a
- id="dx1-4019"></a> or <span
+ id="dx1-4021"></a> or <span
class="cmss-10">seealso</span><a
- id="dx1-4020"></a> keys
- in any entries (unless <span
-class="cmss-10">autoseeindex=false</span><a
- id="dx1-4021"></a>). To force it off, even if you
+ id="dx1-4022"></a> keys
+ in any entries (unless <a
+href="#styopt.autoseeindex"><span
+class="cmss-10">autoseeindex</span></a><span
+class="cmss-10">=false</span><a
+ id="dx1-4023"></a>). To force it off, even if you
use the <span
class="cmss-10">see</span><a
- id="dx1-4022"></a> or <span
+ id="dx1-4024"></a> or <span
class="cmss-10">seealso</span><a
- id="dx1-4023"></a> key, you need to explicitly set <span
+ id="dx1-4025"></a> key, you need to explicitly set <span
class="cmss-10">indexcrossrefs</span><a
- id="dx1-4024"></a> to
+ id="dx1-4026"></a> to
<span
class="cmss-10">false</span>.
- <!--l. 510--><p class="noindent" >Note that <a
- id="dx1-4025"></a><a
+
+
+
+ <!--l. 554--><p class="noindent" >Note that <a
+ id="dx1-4027"></a><a
href="#glo:bib2gls"><span
class="cmtt-10">bib2gls</span><a
- id="dx1-4026"></a></a> can automatically find dependent entries when it
+ id="dx1-4028"></a></a> can automatically find dependent entries when it
parses the <span
class="cmtt-10">.bib </span>source file. The <span
class="cmss-10">record</span><a
- id="dx1-4027"></a> option automatically implements
+ id="dx1-4029"></a> option automatically implements
<span
class="cmss-10">indexcrossrefs=false</span><a
- id="dx1-4028"></a>.
+ id="dx1-4030"></a>.
</p></dd><dt class="description">
-<span
+<a
+ id="styopt.autoseeindex"></a><span
class="cmssbx-10">autoseeindex</span><a
- id="dx1-4029"></a> </dt><dd
+ id="dx1-4031"></a> </dt><dd
class="description"> (New to v1.16.) This is a boolean option. If true (default), this makes
-
-
-
the <span
class="cmss-10">see</span><a
- id="dx1-4030"></a> and <span
+ id="dx1-4032"></a> and <span
class="cmss-10">seealso</span><a
- id="dx1-4031"></a> keys automatically index the cross-reference when an entry
+ id="dx1-4033"></a> keys automatically index the cross-reference when an entry
is defined. If false, the value of those keys will still be stored in their
corresponding fields (and can be accessed using commands like <span
class="cmtt-10">\glsxtrusesee</span>
and <span
class="cmtt-10">\glsxtruseseealso</span>) but cross-reference won&#8217;t be automatically
indexed.
- <!--l. 524--><p class="noindent" >Note that the <span
-class="cmss-10">record=only</span><a
- id="dx1-4032"></a> option automatically implements <span
+ <!--l. 568--><p class="noindent" >Note that the <a
+href="#styopt.record"><span
+class="cmss-10">record</span></a><span
+class="cmss-10">=only</span><a
+ id="dx1-4034"></a> option automatically implements <span
class="cmss-10">autoseeindex=false</span><a
- id="dx1-4033"></a>.
- </p><!--l. 527--><p class="noindent" >For example, if an entry is defined as
+ id="dx1-4035"></a>.
+ </p><!--l. 571--><p class="noindent" >For example, if an entry is defined as
@@ -915,7 +943,7 @@ class="cmss-10">autoseeindex=false</span><a
<div class="verbatim" id="verbatim-13">
\newglossaryentry{foo}{name={foo},description={},see={bar,baz}}
</div>
- <!--l. 530--><p class="nopar" > then with <span
+ <!--l. 574--><p class="nopar" > then with <span
class="cmtt-10">autoseeindex=true</span>, this is equivalent to
@@ -927,7 +955,7 @@ class="cmtt-10">autoseeindex=true</span>, this is equivalent to
&#x00A0;<br />\glossariesextrasetup{indexcrossrefs=true}
&#x00A0;<br />\GlsXtrSetField{foo}{see}{bar,baz}
</div>
- <!--l. 537--><p class="nopar" > but with <span
+ <!--l. 581--><p class="nopar" > but with <span
class="cmtt-10">autoseeindex=false</span>, this is equivalent to
@@ -937,17 +965,18 @@ class="cmtt-10">autoseeindex=false</span>, this is equivalent to
\newglossaryentry{foo}{name={foo},description={}}
&#x00A0;<br />\GlsXtrSetField{foo}{see}{bar,baz}
</div>
- <!--l. 542--><p class="nopar" > Note that <span
-class="cmss-10">indexcrossrefs</span><a
- id="dx1-4034"></a> isn&#8217;t automatically implemented by the presence of the
+ <!--l. 586--><p class="nopar" > Note that <a
+href="#styopt.indexcrossrefs"><span
+class="cmss-10">indexcrossrefs</span></a><a
+ id="dx1-4036"></a> isn&#8217;t automatically implemented by the presence of the
<span
class="cmss-10">see</span><a
- id="dx1-4035"></a> key when <span
+ id="dx1-4037"></a> key when <span
class="cmss-10">autoseeindex</span><a
- id="dx1-4036"></a> is false.
- </p><!--l. 547--><p class="noindent" >It&#8217;s therefore possible to remove the cross-references from the location lists and
+ id="dx1-4038"></a> is false.
+ </p><!--l. 591--><p class="noindent" >It&#8217;s therefore possible to remove the cross-references from the location lists and
set their position within the glossary style.
- </p><!--l. 550--><p class="noindent" >Another method of preventing the automatic indexing is to define the entries
+ </p><!--l. 594--><p class="noindent" >Another method of preventing the automatic indexing is to define the entries
before the external indexing files have been opened with <span
class="cmtt-10">\makeglossaries</span>.
Since the appropriate file isn&#8217;t open, the information can&#8217;t be written to it.
@@ -956,9 +985,10 @@ class="cmss-10">seenoindex=ignore </span>(provided by <span
class="cmss-10">glossaries</span>) to
prevent an error occurring.
</p></dd><dt class="description">
-<span
+<a
+ id="styopt.record"></a><span
class="cmssbx-10">record</span><a
- id="dx1-4037"></a> </dt><dd
+ id="dx1-4039"></a> </dt><dd
class="description">(New to v1.08.) This is a &#x27E8;<span
class="cmti-10">key</span>&#x27E9;=&#x27E8;<span
class="cmti-10">value</span>&#x27E9; option, which has three allowed values:
@@ -968,63 +998,67 @@ class="cmss-10">only </span>and <span
class="cmss-10">alsoindex</span>. If the value is omitted <span
class="cmss-10">only </span>is assumed. The
option is provided for the benefit of <a
- id="dx1-4038"></a><a
+ id="dx1-4040"></a><a
href="#glo:bib2gls"><span
class="cmtt-10">bib2gls</span><a
- id="dx1-4039"></a></a> (see <a
+ id="dx1-4041"></a></a> (see <a
href="#sec:bib2gls"><span
class="cmsy-10">&sect;</span>9 </a><a
href="#sec:bib2gls">bib2gls: Managing
Reference Databases<!--tex4ht:ref: sec:bib2gls --></a>).
- <!--l. 563--><p class="noindent" >The option may only be set in the preamble.
- </p><!--l. 565--><p class="noindent" >The <span
+ <!--l. 607--><p class="noindent" >The option may only be set in the preamble.
+ </p><!--l. 609--><p class="noindent" >The <span
class="cmss-10">record=off</span><a
- id="dx1-4040"></a> option switches off the recording, as per the default behaviour.
- It implements <span
-class="cmss-10">undefaction=error</span><a
- id="dx1-4041"></a>.
- </p><!--l. 568--><p class="noindent" >The other values switch on the recording and also <span
-class="cmss-10">undefaction=warn</span><a
- id="dx1-4042"></a>,
+ id="dx1-4042"></a> option switches off the recording, as per the default behaviour.
+ It implements <a
+href="#styopt.undefaction"><span
+class="cmss-10">undefaction</span></a><span
+class="cmss-10">=error</span><a
+ id="dx1-4043"></a>.
+ </p><!--l. 612--><p class="noindent" >The other values switch on the recording and also <a
+href="#styopt.undefaction"><span
+class="cmss-10">undefaction</span></a><span
+class="cmss-10">=warn</span><a
+ id="dx1-4044"></a>,
but <span
class="cmss-10">record=only</span><a
- id="dx1-4043"></a> will also switch off the indexing mechanism (even if
+ id="dx1-4045"></a> will also switch off the indexing mechanism (even if
<span
class="cmtt-10">\makeglossaries </span>or <span
class="cmtt-10">\makenoidxglossaries </span>has been used) whereas
<span
class="cmss-10">record=alsoindex</span><a
- id="dx1-4044"></a> will both record and index. Note that <span
+ id="dx1-4046"></a> will both record and index. Note that <span
class="cmss-10">record=only</span><a
- id="dx1-4045"></a> will prevent
+ id="dx1-4047"></a> will prevent
the <span
class="cmss-10">see</span><a
- id="dx1-4046"></a> from automatically implementing <span
+ id="dx1-4048"></a> from automatically implementing <span
class="cmtt-10">\glssee</span>. (<a
- id="dx1-4047"></a><span
+ id="dx1-4049"></a><span
class="cmtt-10">bib2gls</span><a
- id="dx1-4048"></a> deals with the <span
+ id="dx1-4050"></a> deals with the <span
class="cmss-10">see</span><a
- id="dx1-4049"></a>
+ id="dx1-4051"></a>
field.) You may explicitly use <span
class="cmtt-10">\glssee </span>in the document, but <a
- id="dx1-4050"></a><span
+ id="dx1-4052"></a><span
class="cmtt-10">bib2gls</span><a
- id="dx1-4051"></a>
+ id="dx1-4053"></a>
will ignore the cross-reference if the <span
class="cmss-10">see</span><a
- id="dx1-4052"></a> field was already set for that
+ id="dx1-4054"></a> field was already set for that
entry.
- </p><!--l. 579--><p class="noindent" >The <span
+ </p><!--l. 623--><p class="noindent" >The <span
class="cmss-10">record=only</span><a
- id="dx1-4053"></a> option will automatically set the <span
+ id="dx1-4055"></a> option will automatically set the <span
class="cmss-10">glossaries </span>package&#8217;s <span
class="cmss-10">sort=none</span><a
- id="dx1-4054"></a>
+ id="dx1-4056"></a>
option if available. (That option value was only introduced to <span
class="cmss-10">glossaries</span>
v4.30.)
- </p><!--l. 584--><p class="noindent" >With the recording on, any of the commands that would typically index the
+ </p><!--l. 628--><p class="noindent" >With the recording on, any of the commands that would typically index the
entry (such as <span
class="cmtt-10">\gls</span>, <span
class="cmtt-10">\glstext </span>or <span
@@ -1032,9 +1066,9 @@ class="cmtt-10">\glsadd</span>) will add a <span
class="cmtt-10">\glsxtr@record </span>entry
to the <span
class="cmtt-10">.aux </span>file. <a
- id="dx1-4055"></a><span
+ id="dx1-4057"></a><span
class="cmtt-10">bib2gls</span><a
- id="dx1-4056"></a> can then read these lines to find out which entries
+ id="dx1-4058"></a> can then read these lines to find out which entries
have been used. (Remember that commands like <span
class="cmtt-10">\glsentryname </span>don&#8217;t index,
so any use of these commands won&#8217;t add a corresponding <span
@@ -1049,9 +1083,10 @@ href="#sec:bib2gls">bib2gls: Managing Reference Databases<!--tex4ht:ref: sec:bib
</p></dd><dt class="description">
-<span
+<a
+ id="styopt.docdef"></a><span
class="cmssbx-10">docdef</span><a
- id="dx1-4057"></a> </dt><dd
+ id="dx1-4059"></a> </dt><dd
class="description">This option governs the use of <span
class="cmtt-10">\newglossaryentry</span>. It was originally a
boolean option, but as from version 1.06, it can now take one of three values (if
@@ -1060,10 +1095,10 @@ class="cmss-10">true </span>is assumed):
<ul class="itemize1">
<li class="itemize"><span
class="cmtt-10">\newglossaryentry</span><a
- id="dx1-4059"></a> is not permitted in the <span
+ id="dx1-4061"></a> is not permitted in the <span
class="cmss-10">document</span><a
- id="dx1-4060"></a><a
- id="dx1-4061"></a> environment
+ id="dx1-4062"></a><a
+ id="dx1-4063"></a> environment
(default).
</li>
<li class="itemize"><span
@@ -1071,16 +1106,16 @@ class="cmtt-10">\newglossaryentry </span>behaves as it does in the base <span
class="cmss-10">glossaries </span>package.
That is, where its use is permitted in the <span
class="cmss-10">document</span><a
- id="dx1-4063"></a><a
- id="dx1-4064"></a> environment, it
+ id="dx1-4065"></a><a
+ id="dx1-4066"></a> environment, it
uses the <span
class="cmtt-10">.glsdefs </span>temporary file to store the entry definitions so
that on the next <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
class="E">E</span>X</span></span>&#x00A0;run the entries are defined at the beginning
of the <span
class="cmss-10">document</span><a
- id="dx1-4065"></a><a
- id="dx1-4066"></a> environment. This allows the entry information
+ id="dx1-4067"></a><a
+ id="dx1-4068"></a> environment. This allows the entry information
to be referenced in the glossary, even if the glossary occurs before
<span
class="cmtt-10">\newglossaryentry</span>. (For example, when the glossary is displayed in
@@ -1092,11 +1127,11 @@ class="cmss-10">glossaries </span>user
</li>
<li class="itemize">(new to version 1.06) <span
class="cmtt-10">\newglossaryentry</span><a
- id="dx1-4068"></a> is permitted in the
+ id="dx1-4070"></a> is permitted in the
<span
class="cmss-10">document</span><a
- id="dx1-4069"></a><a
- id="dx1-4070"></a> environment without using the <span
+ id="dx1-4071"></a><a
+ id="dx1-4072"></a> environment without using the <span
class="cmtt-10">.glsdefs </span>file. This means
that all entries must be defined before the glossary is displayed, but
it avoids the complications associated with saving the entry details
@@ -1105,15 +1140,15 @@ class="cmtt-10">.glsdefs </span>file. This means
class="cmti-10">key</span>&#x27E9;=&#x27E8;<span
class="cmti-10">value</span>&#x27E9; mechanism
(that is, the comma and equal sign) and any <a
- id="dx1-4071"></a><a
+ id="dx1-4073"></a><a
href="#glo:makeindex"><span
class="cmtt-10">makeindex</span></a> or <a
- id="dx1-4072"></a><a
+ id="dx1-4074"></a><a
href="#glo:xindy"><span
class="cmtt-10">xindy</span></a>
character that occurs in the <span
class="cmss-10">sort</span><a
- id="dx1-4073"></a> key or label. If any of those characters
+ id="dx1-4075"></a> key or label. If any of those characters
are made active in the document, then it can cause problems with
the entry definition. This option will allow <span
class="cmtt-10">\newglossaryentry </span>to
@@ -1121,10 +1156,12 @@ class="cmtt-10">\newglossaryentry </span>to
class="cmtt-10">\makenoidxglossaries</span>, but note that
<span
class="cmtt-10">\longnewglossaryentry </span>remains a preamble-only command.
- <!--l. 628--><p class="noindent" >With this option, if an entry appears in the glossary before it has been
- defined, an error will occur (or a warning if the <span
-class="cmss-10">undefaction=warn</span><a
- id="dx1-4074"></a>
+ <!--l. 672--><p class="noindent" >With this option, if an entry appears in the glossary before it has been
+ defined, an error will occur (or a warning if the <a
+href="#styopt.undefaction"><span
+class="cmss-10">undefaction</span></a><span
+class="cmss-10">=warn</span><a
+ id="dx1-4076"></a>
option is used.) If you edit your document and either remove an entry
or change its label, you may need to delete the document&#8217;s temporary
files (such as the <span
@@ -1132,16 +1169,16 @@ class="cmtt-10">.aux </span>and <span
class="cmtt-10">.gls </span>files).
</p>
</li></ul>
- <!--l. 637--><p class="noindent" >The <span
+ <!--l. 681--><p class="noindent" >The <span
class="cmss-10">glossaries </span>package allows <span
class="cmtt-10">\newglossaryentry </span>within the <span
class="cmss-10">document</span><a
- id="dx1-4075"></a><a
- id="dx1-4076"></a>
+ id="dx1-4077"></a><a
+ id="dx1-4078"></a>
environment (when used with <a
- id="dx1-4077"></a><span
+ id="dx1-4079"></a><span
class="cmtt-10">makeindex </span>or <a
- id="dx1-4078"></a><span
+ id="dx1-4080"></a><span
class="cmtt-10">xindy</span>) but the user manual warns
against this usage. By default the <span
class="cmss-10">glossaries-extra </span>package <span
@@ -1149,11 +1186,11 @@ class="cmti-10">prohibits</span>
this, only allowing definitions within the preamble. If you are really
determined to define entries in the <span
class="cmss-10">document</span><a
- id="dx1-4079"></a><a
- id="dx1-4080"></a> environment, despite all the
+ id="dx1-4081"></a><a
+ id="dx1-4082"></a> environment, despite all the
associated drawbacks, you can restore this with <span
class="cmss-10">docdef=true</span><a
- id="dx1-4081"></a>. Note that this
+ id="dx1-4083"></a>. Note that this
@@ -1164,12 +1201,12 @@ class="cmss-10">glossaries </span>user
manual for further details. A better option if document definitions are
required is <span
class="cmss-10">docdef=restricted</span><a
- id="dx1-4082"></a>. Only use <span
+ id="dx1-4084"></a>. Only use <span
class="cmss-10">docdef=true</span><a
- id="dx1-4083"></a> if document definitions
+ id="dx1-4085"></a> if document definitions
are necessary and one or more of the glossaries occurs in the front
matter.
- </p><!--l. 654--><p class="noindent" >This option affects commands that internally use <span
+ </p><!--l. 698--><p class="noindent" >This option affects commands that internally use <span
class="cmtt-10">\newglossaryentry</span>, such as
<span
class="cmtt-10">\newabbreviation</span>, but not the &#8220;on-the-fly&#8221; commands described in <a
@@ -1178,32 +1215,34 @@ class="cmsy-10">&sect;</span>8
</a><a
href="#sec:onthefly">On-the-Fly Document Definitions<!--tex4ht:ref: sec:onthefly --></a>.
</p></dd><dt class="description">
-<span
+<a
+ id="styopt.nomissingglstext"></a><span
class="cmssbx-10">nomissingglstext</span><a
- id="dx1-4084"></a> </dt><dd
+ id="dx1-4086"></a> </dt><dd
class="description">This is a boolean option. If true, this will suppress the warning
text that will appear in the document if the external glossary files haven&#8217;t been
generated due to an incomplete document build. However, it&#8217;s probably simpler
just to fix whatever has caused the failure to build the external file or
files.
</dd><dt class="description">
-<span
+<a
+ id="styopt.abbreviations"></a><span
class="cmssbx-10">abbreviations</span><a
- id="dx1-4085"></a> </dt><dd
+ id="dx1-4087"></a> </dt><dd
class="description">This option has no value and can&#8217;t be cancelled. If used, it will
automatically create a new glossary with the label <span
class="cmtt-10">abbreviations </span>and
redefines <span
class="cmtt-10">\glsxtrabbrvtype </span>to this label. In addition, it defines a shortcut
command
- <!--l. 671--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 715--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\printabbreviations</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-4086"></a> <span
+ id="dx1-4088"></a> <span
class="cmtt-10">\printabbreviations[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
- </p><!--l. 673--><p class="noindent" >
+ </p><!--l. 717--><p class="noindent" >
which is equivalent to </p><div class="alltt">
<div class="obeylines-v">
<span
@@ -1212,51 +1251,51 @@ class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]</span>
</div>
</div> The title of the new glossary is given by
- <!--l. 679--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 723--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\abbreviationsname</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-4087"></a> <span
+ id="dx1-4089"></a> <span
class="cmtt-10">\abbreviationsname </span></div><hr>
- </p><!--l. 681--><p class="noindent" >
+ </p><!--l. 725--><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="cmss-10">babel</span><a
- id="dx1-4088"></a> hasn&#8217;t been loaded or <span
+ id="dx1-4090"></a> hasn&#8217;t been loaded or <span
class="cmtt-10">\acronymname </span>if
<span
class="cmss-10">babel</span><a
- id="dx1-4089"></a> has been loaded. However, if you&#8217;re using <span
+ id="dx1-4091"></a> has been loaded. However, if you&#8217;re using <span
class="cmss-10">babel</span><a
- id="dx1-4090"></a> it&#8217;s likely you
+ id="dx1-4092"></a> it&#8217;s likely you
will need to change this. (See <a
href="#sec:lang"><span
class="cmsy-10">&sect;</span>13 </a><a
href="#sec:lang">Multi-Lingual Support<!--tex4ht:ref: sec:lang --></a> for further
details.)
- </p><!--l. 688--><p class="noindent" ><div class="important" title="Important Note"> If you don&#8217;t use the <span
+ </p><!--l. 732--><p class="noindent" ><div class="important" title="Important Note"> If you don&#8217;t use the <span
class="cmss-10">abbreviations</span><a
- id="dx1-4091"></a> package option, the <span
+ id="dx1-4093"></a> package option, the <span
class="cmtt-10">\abbreviationsname</span>
command won&#8217;t be defined (unless it&#8217;s defined by an included language file).
</div>
- </p><!--l. 692--><p class="noindent" >
+ </p><!--l. 736--><p class="noindent" >
- </p><!--l. 694--><p class="noindent" >If the <span
+ </p><!--l. 738--><p class="noindent" >If the <span
class="cmss-10">abbreviations</span><a
- id="dx1-4092"></a> option is used and the <span
+ id="dx1-4094"></a> option is used and the <span
class="cmss-10">acronym</span><a
- id="dx1-4093"></a> option provided by the
+ id="dx1-4095"></a> option provided by the
<span
class="cmss-10">glossaries </span>package hasn&#8217;t been used, then <span
class="cmtt-10">\acronymtype</span><a
- id="dx1-4094"></a> will be set to
+ id="dx1-4096"></a> will be set to
<span
class="cmtt-10">\glsxtrabbrvtype</span><a
- id="dx1-4095"></a> so that acronyms defined with <span
+ id="dx1-4097"></a> so that acronyms defined with <span
class="cmtt-10">\newacronym</span><a
- id="dx1-4096"></a> can be added
+ id="dx1-4098"></a> can be added
to the list of abbreviations. If you want acronyms in the <span
class="cmtt-10">main </span>glossary and
other abbreviations in the <span
@@ -1271,24 +1310,25 @@ class="cmtt-10">main</span>:
<div class="verbatim" id="verbatim-16">
\renewcommand*{\acronymtype}{main}
</div>
- <!--l. 704--><p class="nopar" >
- </p><!--l. 706--><p class="noindent" >Note that there are no analogous options to the <span
+ <!--l. 748--><p class="nopar" >
+ </p><!--l. 750--><p class="noindent" >Note that there are no analogous options to the <span
class="cmss-10">glossaries </span>package&#8217;s <span
class="cmss-10">acronymlists</span><a
- id="dx1-4097"></a>
+ id="dx1-4099"></a>
option (or associated commands) as the abbreviation mechanism is handled
differently with <span
class="cmss-10">glossaries-extra</span>.
</p></dd><dt class="description">
-<span
+<a
+ id="styopt.symbols"></a><span
class="cmssbx-10">symbols</span><a
- id="dx1-4098"></a> </dt><dd
+ id="dx1-4100"></a> </dt><dd
class="description">This is passed to <span
class="cmss-10">glossaries </span>but will additionally define
- <!--l. 713--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 757--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrnewsymbol</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-4099"></a> <span
+ id="dx1-4101"></a> <span
class="cmtt-10">\glsxtrnewsymbol[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -1297,7 +1337,7 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">symbol</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
- </p><!--l. 715--><p class="noindent" >
+ </p><!--l. 759--><p class="noindent" >
which is equivalent to </p><div class="alltt">
<div class="obeylines-v">
<span
@@ -1317,26 +1357,27 @@ class="cmsy-10">}</span>
</div>
</div> Note that the <span
class="cmss-10">sort</span><a
- id="dx1-4100"></a> key is set to the &#x27E8;<span
+ id="dx1-4102"></a> key is set to the &#x27E8;<span
class="cmti-10">label</span>&#x27E9; not the &#x27E8;<span
class="cmti-10">symbol</span>&#x27E9; as the symbol will
likely contain commands.
</dd><dt class="description">
-<span
+<a
+ id="styopt.numbers"></a><span
class="cmssbx-10">numbers</span><a
- id="dx1-4101"></a> </dt><dd
+ id="dx1-4103"></a> </dt><dd
class="description">This is passed to <span
class="cmss-10">glossaries </span>but will additionally define
- <!--l. 726--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 770--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrnewnumber</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-4102"></a> <span
+ id="dx1-4104"></a> <span
class="cmtt-10">\glsxtrnewnumber[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
class="cmitt-10">number</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
- </p><!--l. 728--><p class="noindent" >
+ </p><!--l. 772--><p class="noindent" >
which is equivalent to </p><div class="alltt">
<div class="obeylines-v">
<span
@@ -1356,9 +1397,10 @@ class="cmsy-10">}</span>
</div>
</div>
</dd><dt class="description">
-<span
+<a
+ id="styopt.shortcuts"></a><span
class="cmssbx-10">shortcuts</span><a
- id="dx1-4103"></a> </dt><dd
+ id="dx1-4105"></a> </dt><dd
class="description">Unlike the <span
class="cmss-10">glossaries </span>package option of the same name, this option isn&#8217;t
boolean but has multiple values:
@@ -1368,18 +1410,33 @@ class="cmss-10">glossaries </span>package option of the same name, this option i
<ul class="itemize1">
<li class="itemize"><span
class="cmss-10">shortcuts=acronyms</span><a
- id="dx1-4104"></a> (or <span
+ id="dx1-4106"></a> (or <span
class="cmss-10">shortcuts=acro</span><a
- id="dx1-4105"></a>): set the shortcuts provided
+ id="dx1-4107"></a>): set the shortcuts provided
by the <span
class="cmss-10">glossaries </span>package for acronyms (such as <span
class="cmtt-10">\ac</span>).
</li>
<li class="itemize"><span
+class="cmss-10">shortcuts=ac</span><a
+ id="dx1-4108"></a>: set the shortcuts provided by the <span
+class="cmss-10">glossaries </span>package for
+ acronyms (such as <span
+class="cmtt-10">\ac</span>) but uses the <span
+class="cmss-10">glossaries-extra </span>interface (such
+ as <span
+class="cmtt-10">\glsxtrshort </span>rather than <span
+class="cmtt-10">\acrshort</span>). In this case <span
+class="cmtt-10">\ac </span>is defined
+ as <span
+class="cmtt-10">\cgls </span>rather than <span
+class="cmtt-10">\gls</span>.
+ </li>
+ <li class="itemize"><span
class="cmss-10">shortcuts=abbreviations</span><a
- id="dx1-4106"></a> (or <span
+ id="dx1-4109"></a> (or <span
class="cmss-10">shortcuts=abbr</span><a
- id="dx1-4107"></a>):
+ id="dx1-4110"></a>):
set the abbreviation shortcuts provided by <span
class="cmss-10">glossaries-extra</span>. (See <a
href="#sec:abbrshortcuts"><span
@@ -1391,99 +1448,104 @@ class="cmss-10">glossaries </span>package.
</li>
<li class="itemize"><span
class="cmss-10">shortcuts=other</span><a
- id="dx1-4108"></a>: set the &#8220;other&#8221; shortcut commands, but not the shortcut
+ id="dx1-4111"></a>: set the &#8220;other&#8221; shortcut commands, but not the shortcut
commands for abbreviations or the acronym shortcuts provided by
<span
class="cmss-10">glossaries</span>. The &#8220;other&#8221; shortcuts are:
<ul class="itemize2">
<li class="itemize"><span
class="cmtt-10">\newentry</span><a
- id="dx1-4109"></a> equivalent to <span
+ id="dx1-4112"></a> equivalent to <span
class="cmtt-10">\newglossaryentry</span><a
- id="dx1-4110"></a>
+ id="dx1-4113"></a>
</li>
<li class="itemize"><span
class="cmtt-10">\newsym</span><a
- id="dx1-4111"></a> equivalent to <span
+ id="dx1-4114"></a> equivalent to <span
class="cmtt-10">\glsxtrnewsymbol</span><a
- id="dx1-4112"></a> (see the <span
+ id="dx1-4115"></a> (see the <span
class="cmss-10">symbols</span><a
- id="dx1-4113"></a>
+ id="dx1-4116"></a>
option).
</li>
<li class="itemize"><span
class="cmtt-10">\newnum</span><a
- id="dx1-4114"></a> equivalent to <span
+ id="dx1-4117"></a> equivalent to <span
class="cmtt-10">\glsxtrnewnumber</span><a
- id="dx1-4115"></a> (see the <span
+ id="dx1-4118"></a> (see the <span
class="cmss-10">numbers</span><a
- id="dx1-4116"></a>
+ id="dx1-4119"></a>
option).</li></ul>
</li>
<li class="itemize"><span
class="cmss-10">shortcuts=all</span><a
- id="dx1-4117"></a> (or <span
+ id="dx1-4120"></a> (or <span
class="cmss-10">shortcuts=true</span><a
- id="dx1-4118"></a>): define all the shortcut commands.
+ id="dx1-4121"></a>): define all the shortcut commands.
</li>
<li class="itemize"><span
class="cmss-10">shortcuts=none</span><a
- id="dx1-4119"></a> (or <span
+ id="dx1-4122"></a> (or <span
class="cmss-10">shortcuts=false</span><a
- id="dx1-4120"></a>): don&#8217;t define any of the shortcut
+ id="dx1-4123"></a>): don&#8217;t define any of the shortcut
commands (default).</li></ul>
- <!--l. 767--><p class="noindent" >Note that multiple invocations of the <span
+ <!--l. 818--><p class="noindent" >Note that multiple invocations of the <span
class="cmss-10">shortcuts</span><a
- id="dx1-4121"></a> option <span
+ id="dx1-4124"></a> option <span
class="cmti-10">within the same option</span>
<span
class="cmti-10">list </span>will override each other.</p></dd></dl>
-<!--l. 771--><p class="indent" > After the <span
+<!--l. 822--><p class="indent" > After the <span
class="cmss-10">glossaries-extra </span>package has been loaded, you can set available options
using
-</p><!--l. 773--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 824--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glossariesextrasetup</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-4122"></a> <span
+ id="dx1-4125"></a> <span
class="cmtt-10">\glossariesextrasetup{</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 775--><p class="noindent" >
-The <span
-class="cmss-10">abbreviations</span><a
- id="dx1-4123"></a> and <span
-class="cmss-10">docdef</span><a
- id="dx1-4124"></a> options may only be used in the preamble. Additionally,
-<span
-class="cmss-10">docdef</span><a
- id="dx1-4125"></a> can&#8217;t be used after <span
+</p><!--l. 826--><p class="noindent" >
+The <a
+href="#styopt.abbreviations"><span
+class="cmss-10">abbreviations</span></a><a
+ id="dx1-4126"></a> and <a
+href="#styopt.docdef"><span
+class="cmss-10">docdef</span></a><a
+ id="dx1-4127"></a> options may only be used in the preamble. Additionally,
+<a
+href="#styopt.docdef"><span
+class="cmss-10">docdef</span></a><a
+ id="dx1-4128"></a> can&#8217;t be used after <span
class="cmtt-10">\makenoidxglossaries</span><a
- id="dx1-4126"></a>.
+ id="dx1-4129"></a>.
</p>
-<!--l. 780--><p class="indent" > </div>
-</p><!--l. 780--><p class="noindent" ><a
+<!--l. 831--><p class="indent" > </div>
+</p><!--l. 831--><p class="noindent" ><a
href="#top">Top</a><div class="chapter"><h2 class="chapterHead">2. <a
id="sec:modifications"></a>Modifications to Existing Commands and Styles</h2>
-</p><!--l. 783--><p class="indent" > The commands used by <span
+</p><!--l. 834--><p class="indent" > The commands used by <span
class="cmss-10">glossaries </span>to automatically produce an error if an entry is
undefined (such as <span
class="cmtt-10">\glsdoifexists</span><a
- id="dx1-5001"></a>) are changed to take the <span
-class="cmss-10">undefaction</span><a
+ id="dx1-5001"></a>) are changed to take the <a
+href="#styopt.undefaction"><span
+class="cmss-10">undefaction</span></a><a
id="dx1-5002"></a> option into
account.
-</p><!--l. 787--><p class="indent" > The <span
+</p><!--l. 838--><p class="indent" > The <span
class="cmtt-10">\newignoredglossary</span><a
id="dx1-5003"></a><span
class="cmtt-10">{</span>&#x27E8;<span
class="cmti-10">type</span>&#x27E9;<span
class="cmtt-10">} </span>command now (as from v1.11) has a starred
version that doesn&#8217;t automatically switch off the hyperlinks. This starred version may
-be used with the <span
-class="cmss-10">targeturl</span><a
+be used with the <a
+href="#catattr.targeturl"><span
+class="cmss-10">targeturl</span></a><a
id="dx1-5004"></a> attribute to create a link to an external URL. (See <a
href="#sec:categories"><span
class="cmsy-10">&sect;</span>5
@@ -1492,18 +1554,18 @@ href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a> for furt
check that the glossary doesn&#8217;t already exist. (The <span
class="cmss-10">glossaries </span>package omits this
check.)
-</p><!--l. 796--><p class="indent" > You can now provide an ignored glossary with:
-</p><!--l. 797--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 847--><p class="indent" > You can now provide an ignored glossary with:
+</p><!--l. 848--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\provideignoredglossary</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-5005"></a> <span
class="cmtt-10">\provideignoredglossary{</span>&#x27E8;<span
class="cmitt-10">type</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 799--><p class="noindent" >
+</p><!--l. 850--><p class="noindent" >
which will only define the glossary if it doesn&#8217;t already exist. This also has a starred
version that doesn&#8217;t automatically switch off hyperlinks.
-</p><!--l. 804--><p class="indent" > The individual glossary displaying commands <span
+</p><!--l. 855--><p class="indent" > The individual glossary displaying commands <span
class="cmtt-10">\printglossary</span><a
id="dx1-5006"></a>,
<span
@@ -1518,7 +1580,7 @@ class="cmtt-10">\glsdisablehyper </span>this doesn&#8217;t switch off hyperlinks
any cross-references within the glossary won&#8217;t be affected. This is a way of
avoiding duplicate target warnings if a glossary needs to be displayed multiple
times.
-</p><!--l. 813--><p class="indent" > The <span
+</p><!--l. 864--><p class="indent" > The <span
class="cmtt-10">\newglossaryentry </span>command has three new keys: </p>
<ul class="itemize1">
<li class="itemize"><span
@@ -1548,7 +1610,7 @@ href="#sec:see"><span
class="cmsy-10">&sect;</span>2.2 </a><a
href="#sec:see">Cross-References (&#8220;see&#8221; and &#8220;see also&#8221;)<!--tex4ht:ref: sec:see --></a> for
further details.</li></ul>
-<!--l. 825--><p class="noindent" >The test file <span
+<!--l. 876--><p class="noindent" >The test file <span
class="cmtt-10">example-glossaries-xr.tex </span>contains dummy entries with a mixture of
<span
class="cmss-10">see</span><a
@@ -1557,7 +1619,7 @@ class="cmss-10">alias</span><a
id="dx1-5014"></a> and <span
class="cmss-10">seealso</span><a
id="dx1-5015"></a> keys for use with minimal working examples.
-</p><!--l. 829--><p class="indent" > The <span
+</p><!--l. 880--><p class="indent" > The <span
class="cmtt-10">\longnewglossaryentry </span>command now has a starred version (as from v1.12)
that doesn&#8217;t automatically insert
@@ -1567,8 +1629,8 @@ that doesn&#8217;t automatically insert
<div class="verbatim" id="verbatim-17">
\leavevmode\unskip\nopostdesc
</div>
-<!--l. 833--><p class="nopar" > at the end of the description field.
-</p><!--l. 835--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 884--><p class="nopar" > at the end of the description field.
+</p><!--l. 886--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\longnewglossaryentry</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-5016"></a> <span
@@ -1581,19 +1643,19 @@ class="cmtt-10">}</span>
class="cmtt-10">{</span>&#x27E8;<span
class="cmitt-10">description</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 837--><p class="noindent" >
+</p><!--l. 888--><p class="noindent" >
The <span
class="cmss-10">descriptionplural</span><a
id="dx1-5017"></a> key is left unset unless explicitly set in &#x27E8;<span
class="cmti-10">options</span>&#x27E9;.
-</p><!--l. 841--><p class="indent" > The unstarred version no longer hard-codes the above code (which removes
+</p><!--l. 892--><p class="indent" > The unstarred version no longer hard-codes the above code (which removes
trailing space and suppresses the post-description hook) but instead uses:
-</p><!--l. 844--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 895--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrpostlongdescription</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-5018"></a> <span
class="cmtt-10">\glsxtrpostlongdescription </span></div><hr>
-</p><!--l. 846--><p class="noindent" >
+</p><!--l. 897--><p class="noindent" >
This can be redefined to allow the post-description hook to work but retain the
<span
class="cmtt-10">\unskip </span>part if required. For example:
@@ -1604,9 +1666,9 @@ class="cmtt-10">\unskip </span>part if required. For example:
<div class="verbatim" id="verbatim-18">
\renewcommand*{\glsxtrpostlongdescription}{\leavevmode\unskip}
</div>
-<!--l. 852--><p class="nopar" > This will discarded unwanted trailing space at the end of the description but won&#8217;t
+<!--l. 903--><p class="nopar" > This will discarded unwanted trailing space at the end of the description but won&#8217;t
suppress the post-description hook.
-</p><!--l. 856--><p class="indent" > The unstarred version also alters the base <span
+</p><!--l. 907--><p class="indent" > The unstarred version also alters the base <span
class="cmss-10">glossaries</span><a
id="dx1-5019"></a> package&#8217;s treatment of the
<span
@@ -1625,10 +1687,10 @@ of this command sets the description&#8217;s plural form to the same as the
singular.<span class="footnote-mark"><a
href="#fn1x2" id="fn1x2-bk"><sup class="textsuperscript">2.1</sup></a></span><a
id="x1-5023f1"></a>
-</p><!--l. 871--><p class="indent" > Note that this modified unstarred version doesn&#8217;t append <span
+</p><!--l. 922--><p class="indent" > Note that this modified unstarred version doesn&#8217;t append <span
class="cmtt-10">\glsxtrpostlongdescription</span>
to the description&#8217;s plural form.
-</p><!--l. 874--><p class="indent" > The <span
+</p><!--l. 925--><p class="indent" > The <span
class="cmtt-10">\newterm</span><a
id="dx1-5029"></a> command (defined through the <span
class="cmss-10">index</span><a
@@ -1644,16 +1706,16 @@ href="#sec:abbreviations"><span
class="cmsy-10">&sect;</span>3
</a><a
href="#sec:abbreviations">Abbreviations<!--tex4ht:ref: sec:abbreviations --></a>.)
-</p><!--l. 880--><p class="indent" > The <span
+</p><!--l. 931--><p class="indent" > The <span
class="cmtt-10">\makeglossaries </span>command now has an optional argument.
-</p><!--l. 881--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 932--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\makeglossaries</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-5033"></a> <span
class="cmtt-10">\makeglossaries[</span>&#x27E8;<span
class="cmitt-10">list</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 883--><p class="noindent" >
+</p><!--l. 934--><p class="noindent" >
If &#x27E8;<span
class="cmti-10">list</span>&#x27E9; is empty, <span
class="cmtt-10">\makeglossaries </span>behaves as per its original definition in the
@@ -1661,20 +1723,21 @@ class="cmtt-10">\makeglossaries </span>behaves as per its original definition in
class="cmss-10">glossaries </span>package, otherwise &#x27E8;<span
class="cmti-10">list</span>&#x27E9; can be a comma-separated list of glossaries that
need processing with an external indexing application.
-</p><!--l. 889--><p class="indent" > It should then be possible to use <span
+</p><!--l. 940--><p class="indent" > It should then be possible to use <span
class="cmtt-10">\printglossary </span>for those glossaries listed in &#x27E8;<span
class="cmti-10">list</span>&#x27E9;
and <span
class="cmtt-10">\printnoidxglossary </span>for the other glossaries. (See the accompanying file
<span
class="cmtt-10">sample-mixedsort.tex </span>for an example.)
-</p><!--l. 894--><p class="indent" > <div class="important" title="Important Note"> If you use the optional argument &#x27E8;<span
+</p><!--l. 945--><p class="indent" > <div class="important" title="Important Note"> If you use the optional argument &#x27E8;<span
class="cmti-10">list</span>&#x27E9;, you can&#8217;t define entries in the document
-(even with the <span
-class="cmss-10">docdef</span><a
+(even with the <a
+href="#styopt.docdef"><span
+class="cmss-10">docdef</span></a><a
id="dx1-5034"></a> option). </div>
-</p><!--l. 897--><p class="noindent" >
-</p><!--l. 899--><p class="indent" > You will need at least version 2.20 of <a
+</p><!--l. 948--><p class="noindent" >
+</p><!--l. 950--><p class="indent" > You will need at least version 2.20 of <a
id="dx1-5035"></a><a
href="#glo:makeglossaries"><span
class="cmtt-10">makeglossaries</span></a> or at least version 1.3 of
@@ -1692,10 +1755,10 @@ class="cmtt-10">]</span>. Alternatively, use the
class="cmss-10">automake</span><a
id="dx1-5038"></a> option.
</p>
-<!--l. 905--><p class="noindent" ><a
+<!--l. 956--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">2.1 </span> <a
id="sec:wrglossary"></a>Entry Indexing</h3>
-<!--l. 908--><p class="noindent" >The <span
+<!--l. 959--><p class="noindent" >The <span
class="cmss-10">glossaries-extra </span>package provides extra keys for commands like <span
class="cmtt-10">\gls </span>and
<span
@@ -1720,8 +1783,9 @@ href="#glo:firstuse">first use</a> might not be the most pertinent use. (If you
want to apply <span
class="cmss-10">indexonlyfirst</span><a
id="dx1-6004"></a> to selected entries, rather than all of them, you
- can use the <span
-class="cmss-10">indexonlyfirst</span><a
+ can use the <a
+href="#catattr.indexonlyfirst"><span
+class="cmss-10">indexonlyfirst</span></a><a
id="dx1-6005"></a> attribute, see <a
href="#sec:categories"><span
class="cmsy-10">&sect;</span>5 </a><a
@@ -1755,13 +1819,13 @@ class="cmtt-10">wrgloss=after </span>for specific instances. Note that this opti
settings (such as <span
class="cmss-10">noindex</span><a
id="dx1-6010"></a>).
- <!--l. 938--><p class="noindent" >The default value is set up using
- </p><!--l. 939--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 989--><p class="noindent" >The default value is set up using
+ </p><!--l. 990--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrinitwrgloss</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-6011"></a> <span
class="cmtt-10">\glsxtrinitwrgloss </span></div><hr>
- </p><!--l. 941--><p class="noindent" >
+ </p><!--l. 992--><p class="noindent" >
which is defined as:
@@ -1778,16 +1842,17 @@ class="cmtt-10">\glsxtrinitwrgloss </span></div><hr>
&#x00A0;<br />&#x00A0;}%
&#x00A0;<br />}
</div>
- <!--l. 953--><p class="nopar" > This sets the conditional
- </p><!--l. 955--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 1004--><p class="nopar" > This sets the conditional
+ </p><!--l. 1006--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\ifglsxtrinitwrglossbefore</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-6012"></a> <span
class="cmtt-10">\ifglsxtrinitwrgloss </span></div><hr>
- </p><!--l. 957--><p class="noindent" >
+ </p><!--l. 1008--><p class="noindent" >
which is used to determine where to perform the indexing.
- </p><!--l. 960--><p class="noindent" >This means you can set the <span
-class="cmss-10">wrgloss</span><a
+ </p><!--l. 1011--><p class="noindent" >This means you can set the <a
+href="#catattr.wrgloss"><span
+class="cmss-10">wrgloss</span></a><a
id="dx1-6013"></a> attribute to <span
class="cmss-10">after </span>to automatically use this
as the default for entries with that category attribute. (Note that adding
@@ -1800,22 +1865,22 @@ class="cmtt-10">\GlsXtrSetDefaultGlsOpts</span><a
class="cmtt-10">\glsxtrinitwrgloss</span>.)
</p>
</dd></dl>
-<!--l. 969--><p class="indent" > There is a new hook that&#8217;s used each time indexing information is written to the
+<!--l. 1020--><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. 971--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1022--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrdowrglossaryhook</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-6016"></a> <span
class="cmtt-10">\glsxtrdowrglossaryhook{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 973--><p class="noindent" >
+</p><!--l. 1024--><p class="noindent" >
where &#x27E8;<span
class="cmti-10">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="cmtt-10">sample-indexhook.tex</span>, which uses
this hook to determine which entries haven&#8217;t been indexed.)
-</p><!--l. 980--><p class="indent" > As from version 1.14, there are two new keys for <span
+</p><!--l. 1031--><p class="indent" > As from version 1.14, there are two new keys for <span
class="cmtt-10">\glsadd</span>: <span
class="cmss-10">thevalue</span><a
id="dx1-6017"></a> and
@@ -1841,7 +1906,7 @@ class="cmtt-10">\gls </span>or <span
class="cmtt-10">\glslink</span>. Remember that the value will still need to be a
valid location according to the rules of whichever indexing application you
use.
-</p><!--l. 992--><p class="indent" > For example, suppose the file <span
+</p><!--l. 1043--><p class="indent" > For example, suppose the file <span
class="cmtt-10">suppl.tex </span>contains:
@@ -1858,7 +1923,7 @@ class="cmtt-10">suppl.tex </span>contains:
&#x00A0;<br />\gls{sample}.
&#x00A0;<br />\end{document}
</div>
-<!--l. 1007--><p class="nopar" > This has an entry on page S.2. Suppose another document wants to include this
+<!--l. 1058--><p class="nopar" > This has an entry on page S.2. Suppose another document wants to include this
location in the glossary. Then this can be done by setting <span
class="cmss-10">thevalue</span><a
id="dx1-6023"></a> to <span
@@ -1879,13 +1944,14 @@ example:
&#x00A0;<br />\glsadd[thevalue={S.2}]{sample}
&#x00A0;<br />\end{document}
</div>
-<!--l. 1026--><p class="nopar" > (By placing <span
+<!--l. 1077--><p class="nopar" > (By placing <span
class="cmtt-10">\glsadd </span>at the end of the document, it adds the supplementary location
to the end of the location list, although the ordering may be changed by the indexing
application depending on its location collation settings.)
-</p><!--l. 1032--><p class="indent" > If you want hyperlinks, things are more complicated. First you need to set the
-<span
-class="cmss-10">externallocation</span><a
+</p><!--l. 1083--><p class="indent" > If you want hyperlinks, things are more complicated. First you need to set the
+<a
+href="#catattr.externallocation"><span
+class="cmss-10">externallocation</span></a><a
id="dx1-6024"></a> to the location of the PDF file. For example:
@@ -1896,7 +1962,7 @@ class="cmss-10">externallocation</span><a
&#x00A0;<br />\newglossaryentry{sample}{category=supplemental,
&#x00A0;<br />&#x00A0;name={sample},description={an&#x00A0;example}}
</div>
-<!--l. 1040--><p class="nopar" > Next you need to add <span
+<!--l. 1091--><p class="nopar" > Next you need to add <span
class="cmtt-10">glsxtrsupphypernumber </span>as the format:
@@ -1905,7 +1971,7 @@ class="cmtt-10">glsxtrsupphypernumber </span>as the format:
<div class="verbatim" id="verbatim-23">
\glsadd[thevalue={S.2},format=glsxtrsupphypernumber]{sample}
</div>
-<!--l. 1044--><p class="nopar" > Both documents will need to use the <span
+<!--l. 1095--><p class="nopar" > Both documents will need to use the <span
class="cmss-10">hyperref</span><a
id="dx1-6025"></a> package. Remember that the counter
used for the location also needs to match. If <span
@@ -1923,19 +1989,19 @@ class="cmtt-10">sample-suppl-main-hyp.tex </span>for an example that uses
<span
class="cmss-10">hyperref</span><a
id="dx1-6027"></a>.
-</p><!--l. 1054--><p class="indent" > <div class="important" title="Important Note"> The hyperlink for the supplementary location may or <span
+</p><!--l. 1105--><p class="indent" > <div class="important" title="Important Note"> The hyperlink for the supplementary location may or <span
class="cmti-10">may not </span>take you to the
relevant place in the external PDF file <span
class="cmti-10">depending on your PDF viewer</span>. Some may not
support external links, and some may take you to the first page or last visited page.
</div>
-</p><!--l. 1059--><p class="noindent" >
-</p><!--l. 1061--><p class="noindent" >
+</p><!--l. 1110--><p class="noindent" >
+</p><!--l. 1112--><p class="noindent" >
</p>
-<!--l. 1061--><p class="noindent" ><a
+<!--l. 1112--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">2.2 </span> <a
id="sec:see"></a>Cross-References (&#8220;see&#8221; and &#8220;see also&#8221;)</h3>
-<!--l. 1064--><p class="noindent" >The value of the <span
+<!--l. 1115--><p class="noindent" >The value of the <span
class="cmss-10">see</span><a
id="dx1-7001"></a> key is now saved as a field. This isn&#8217;t the case with <span
class="cmss-10">glossaries</span>,
@@ -1962,19 +2028,20 @@ class="cmss-10">document</span><a
id="dx1-7008"></a><a
id="dx1-7009"></a> environment on the next
run.
-</p><!--l. 1077--><p class="indent" > This modification allows <span
+</p><!--l. 1128--><p class="indent" > This modification allows <span
class="cmss-10">glossaries-extra </span>to provide
-</p><!--l. 1078--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1129--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtraddallcrossrefs</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-7010"></a> <span
class="cmtt-10">\glsxtraddallcrossrefs </span></div><hr>
-</p><!--l. 1080--><p class="noindent" >
+</p><!--l. 1131--><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="cmss-10">indexcrossrefs</span><a
+cross-references unless the package option <a
+href="#styopt.indexcrossrefs"><span
+class="cmss-10">indexcrossrefs</span></a><a
id="dx1-7011"></a> was set to false.
-</p><!--l. 1085--><p class="indent" > As a by-product of this enhancement, the <span
+</p><!--l. 1136--><p class="indent" > As a by-product of this enhancement, the <span
class="cmss-10">see</span><a
id="dx1-7012"></a> key will now work for entries
defined in the <span
@@ -2003,18 +2070,18 @@ point.
-</p><!--l. 1096--><p class="indent" > As from version 1.06, you can display the cross-referenced information for a given
+</p><!--l. 1147--><p class="indent" > As from version 1.06, you can display the cross-referenced information for a given
entry using
-</p><!--l. 1098--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1149--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrusesee</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-7020"></a> <span
class="cmtt-10">\glsxtrusesee{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1100--><p class="noindent" >
+</p><!--l. 1151--><p class="noindent" >
This internally uses
-</p><!--l. 1102--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1153--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtruseseeformat</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-7021"></a> <span
@@ -2023,7 +2090,7 @@ class="cmitt-10">tag</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">xr list</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1104--><p class="noindent" >
+</p><!--l. 1155--><p class="noindent" >
where &#x27E8;<span
class="cmti-10">tag</span>&#x27E9; and &#x27E8;<span
class="cmti-10">xr list</span>&#x27E9; are obtained from the value of the entry&#8217;s <span
@@ -2045,7 +2112,7 @@ class="cmss-10">see</span><a
id="dx1-7024"></a> field hasn&#8217;t been set for the entry given by
&#x27E8;<span
class="cmti-10">label</span>&#x27E9;.
-</p><!--l. 1113--><p class="indent" > Suppose you want to suppress the <a
+</p><!--l. 1164--><p class="indent" > Suppose you want to suppress the <a
id="dx1-7025"></a>number list using <span
class="cmss-10">nonumberlist</span><a
id="dx1-7026"></a>. This
@@ -2059,7 +2126,7 @@ class="cmss-10">see</span><a
id="dx1-7029"></a> key set, but this will also show the rest of the <a
id="dx1-7030"></a>number
list.
-</p><!--l. 1120--><p class="indent" > Another approach in this situation is to use the post description hook
+</p><!--l. 1171--><p class="indent" > Another approach in this situation is to use the post description hook
with <span
class="cmtt-10">\glsxtrusesee </span>to append the cross-reference after the description. For
example:
@@ -2074,11 +2141,11 @@ example:
&#x00A0;<br />&#x00A0;{}%
&#x00A0;<br />}
</div>
-<!--l. 1129--><p class="nopar" > Now the cross-references can appear even though the <a
+<!--l. 1180--><p class="nopar" > Now the cross-references can appear even though the <a
id="dx1-7031"></a><a
href="#glo:numberlist">number list</a> has been
suppressed.
-</p><!--l. 1133--><p class="indent" > As from v1.16, there&#8217;s a separate <span
+</p><!--l. 1184--><p class="indent" > As from v1.16, there&#8217;s a separate <span
class="cmss-10">seealso</span><a
id="dx1-7032"></a> key. Unlike <span
class="cmss-10">see</span><a
@@ -2098,28 +2165,28 @@ instead (or redefine <span
class="cmtt-10">\seealsoname </span>or <span
class="cmtt-10">\glsxtruseseealsoformat</span>, described
below).
-</p><!--l. 1141--><p class="indent" > You can display the formatted list of cross-references stored in the <span
+</p><!--l. 1192--><p class="indent" > You can display the formatted list of cross-references stored in the <span
class="cmss-10">seealso</span><a
id="dx1-7035"></a> key
using:
-</p><!--l. 1143--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1194--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtruseseealso</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-7036"></a> <span
class="cmtt-10">\glsxtruseseealso{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1145--><p class="noindent" >
+</p><!--l. 1196--><p class="noindent" >
This works in much the same way as <span
class="cmtt-10">\glsxtrusesee </span>but it internally uses
-</p><!--l. 1148--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1199--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtruseseeformat</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-7037"></a> <span
class="cmtt-10">\glsxtruseseealsoformat{</span>&#x27E8;<span
class="cmitt-10">xr list</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1150--><p class="noindent" >
+</p><!--l. 1201--><p class="noindent" >
For example:
@@ -2135,20 +2202,20 @@ For example:
&#x00A0;<br />&#x00A0;{}%
&#x00A0;<br />}
</div>
-<!--l. 1161--><p class="nopar" >
-</p><!--l. 1163--><p class="indent" > The actual unformatted comma-separated list &#x27E8;<span
+<!--l. 1212--><p class="nopar" >
+</p><!--l. 1214--><p class="indent" > The actual unformatted comma-separated list &#x27E8;<span
class="cmti-10">xr-list</span>&#x27E9; stored in the <span
class="cmss-10">seealso</span><a
id="dx1-7038"></a> field
can be accessed with:
-</p><!--l. 1165--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1216--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrseealsolabels</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-7039"></a> <span
class="cmtt-10">\glsxtrseealsolabels{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1167--><p class="noindent" >
+</p><!--l. 1218--><p class="noindent" >
This will just expand to the &#x27E8;<span
class="cmti-10">xr-labels</span>&#x27E9; provided in the value of the <span
class="cmss-10">seealso</span><a
@@ -2163,7 +2230,7 @@ class="cmtt-10">[</span>&#x27E8;<span
class="cmti-10">tag</span>&#x27E9;<span
class="cmtt-10">]</span>, so it can&#8217;t be automatically treated as a simple comma-separated
list.
-</p><!--l. 1175--><p class="indent" > The base <span
+</p><!--l. 1226--><p class="indent" > The base <span
class="cmss-10">glossaries </span>package provides <span
class="cmtt-10">\glsseelist</span><a
id="dx1-7042"></a>, which requires a
@@ -2174,20 +2241,20 @@ class="cmti-10">label</span>&#x27E9;<span
class="cmtt-10">} </span>as the
argument. For convenience, <span
class="cmss-10">glossaries-extra </span>provides
-</p><!--l. 1180--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1231--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrseelist</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-7043"></a> <span
class="cmtt-10">\glsxtrseelist{</span>&#x27E8;<span
class="cmitt-10">xr list</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1182--><p class="noindent" >
+</p><!--l. 1233--><p class="noindent" >
which fully expands its argument and passes it to <span
class="cmtt-10">\glsseelist</span>.
-</p><!--l. 1185--><p class="indent" > The <span
+</p><!--l. 1236--><p class="indent" > The <span
class="cmss-10">seealso</span><a
id="dx1-7044"></a> key implements the automatic indexing using
-</p><!--l. 1186--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1237--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrindexseealso</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-7045"></a> <span
@@ -2196,7 +2263,7 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">xr list</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1188--><p class="noindent" >
+</p><!--l. 1239--><p class="noindent" >
which just does </p><div class="alltt">
<div class="obeylines-v">
<span
@@ -2216,15 +2283,15 @@ class="cmss-10">glossaries</span><a
id="dx1-7047"></a> v4.30+, in which case a distinct
<span
class="cmtt-10">seealso </span>cross-reference class is used instead.
-<!--l. 1197--><p class="noindent" >
+<!--l. 1248--><p class="noindent" >
</p>
-<!--l. 1197--><p class="noindent" ><a
+<!--l. 1248--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">2.3 </span> <a
id="sec:entryfmtmods"></a>Entry Display Style Modifications</h3>
-<!--l. 1200--><p class="noindent" >Recall from the <span
+<!--l. 1251--><p class="noindent" >Recall from the <span
class="cmss-10">glossaries </span>package that commands such as <span
class="cmtt-10">\gls </span>display text at
that point in the document (optionally with a hyperlink to the relevant
@@ -2235,7 +2302,7 @@ 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="cmtt-10">\gls</span>) and the entry
format.
-</p><!--l. 1207--><p class="indent" > The default entry format (<span
+</p><!--l. 1258--><p class="indent" > The default entry format (<span
class="cmtt-10">\glsentryfmt</span><a
id="dx1-8002"></a>) used in the <a
id="dx1-8003"></a><a
@@ -2259,8 +2326,9 @@ class="cmss-10">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="cmss-10">regular</span><a
+ <li class="itemize">If an entry is assigned to a category that has the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
id="dx1-8010"></a> attribute set (see <a
href="#sec:categories"><span
class="cmsy-10">&sect;</span>5
@@ -2289,8 +2357,9 @@ class="cmss-10">plural</span><a
<li class="itemize">An entry that doesn&#8217;t have a&#x00A0;value for the <span
class="cmss-10">short</span><a
id="dx1-8018"></a> key is assumed to
- be a&#x00A0;regular entry, even if the <span
-class="cmss-10">regular</span><a
+ be a&#x00A0;regular entry, even if the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
id="dx1-8019"></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
@@ -2301,8 +2370,9 @@ class="cmtt-10">\glsgenentryfmt</span><a
<li class="itemize">If an entry does has a&#x00A0;value for the <span
class="cmss-10">short</span><a
id="dx1-8021"></a> key and hasn&#8217;t been marked as
- a&#x00A0;regular entry through the <span
-class="cmss-10">regular</span><a
+ a&#x00A0;regular entry through the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
id="dx1-8022"></a> attribute, it&#8217;s not considered a regular
entry. In this case <span
class="cmtt-10">\glsentryfmt </span>uses <span
@@ -2315,22 +2385,22 @@ class="cmsy-10">&sect;</span>3.2
</a><a
href="#sec:abbrstyle">Abbreviation Styles<!--tex4ht:ref: sec:abbrstyle --></a>).
</li></ul>
-<!--l. 1238--><p class="indent" > This means that entries with a short form can be treated as regular entries rather
+<!--l. 1289--><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. 1242--><p class="indent" > As from version 1.04, <span
+</p><!--l. 1293--><p class="indent" > As from version 1.04, <span
class="cmtt-10">\glsentryfmt</span><a
id="dx1-8024"></a> now puts <span
class="cmtt-10">\glsgenentry</span><a
id="dx1-8025"></a> in the argument of
the new command
-</p><!--l. 1244--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1295--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrregularfont</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-8026"></a> <span
class="cmtt-10">\glsxtrregularfont{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1246--><p class="noindent" >
+</p><!--l. 1297--><p class="noindent" >
This just does its argument &#x27E8;<span
class="cmti-10">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
@@ -2339,7 +2409,7 @@ class="cmtt-10">\glsxtrregularfont</span>. This is more precise than changing
<span
class="cmtt-10">\glstextformat</span><a
id="dx1-8027"></a> which will be applied to all linking commands for all entries.
-</p><!--l. 1254--><p class="indent" > For example:
+</p><!--l. 1305--><p class="indent" > For example:
@@ -2347,7 +2417,7 @@ class="cmtt-10">\glstextformat</span><a
<div class="verbatim" id="verbatim-26">
\renewcommand*{\glsxtrregularfont}[1]{\textsf{#1}}
</div>
-<!--l. 1257--><p class="nopar" > You can access the label through <span
+<!--l. 1308--><p class="nopar" > You can access the label through <span
class="cmtt-10">\glslabel</span>. For example, you can query the
category:
@@ -2358,7 +2428,7 @@ category:
\renewcommand*{\glsxtrregularfont}[1]{%
&#x00A0;<br />&#x00A0;\glsifcategory{\glslabel}{general}{\textsf{#1}}{#1}}
</div>
-<!--l. 1263--><p class="nopar" > or query the category attribute:
+<!--l. 1314--><p class="nopar" > or query the category attribute:
@@ -2368,7 +2438,7 @@ category:
&#x00A0;<br />\renewcommand*{\glsxtrregularfont}[1]{%
&#x00A0;<br />&#x00A0;\glsifattribute{\glslabel}{font}{sf}{\textsf{#1}}{#1}}
</div>
-<!--l. 1270--><p class="nopar" > or use the attribute to store the control sequence name:
+<!--l. 1321--><p class="nopar" > or use the attribute to store the control sequence name:
@@ -2382,8 +2452,9 @@ category:
&#x00A0;<br />&#x00A0;&#x00A0;{#1}%
&#x00A0;<br />}
</div>
-<!--l. 1281--><p class="nopar" > (Remember the category and attribute settings will only queried here for <span
-class="cmss-10">regular</span><a
+<!--l. 1332--><p class="nopar" > (Remember the category and attribute settings will only queried here for <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
id="dx1-8028"></a>
entries, so if the abbreviation style for the <span
class="cmss-10">acronym</span><a
@@ -2391,7 +2462,7 @@ class="cmss-10">acronym</span><a
changes the regular attribute to &#8220;false&#8221;, <span
class="cmtt-10">\glsxtrregularfont </span>will no longer
apply.)
-</p><!--l. 1288--><p class="indent" > The <span
+</p><!--l. 1339--><p class="indent" > The <span
class="cmtt-10">\glspostlinkhook </span>provided by the <span
class="cmss-10">glossaries </span>package to insert information
after the <a
@@ -2400,31 +2471,32 @@ href="#glo:linktext">link-text</a> produced by commands like <span
class="cmtt-10">\gls </span>and <span
class="cmtt-10">\glstext </span>is redefined
to
-</p><!--l. 1291--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1342--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrpostlinkhook</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-8031"></a> <span
class="cmtt-10">\glsxtrpostlinkhook </span></div><hr>
-</p><!--l. 1293--><p class="noindent" >
-This command will discard a following full stop (period) if the <span
-class="cmss-10">discardperiod</span><a
+</p><!--l. 1344--><p class="noindent" >
+This command will discard a following full stop (period) if the <a
+href="#catattr.discardperiod"><span
+class="cmss-10">discardperiod</span></a><a
id="dx1-8032"></a> attribute
is set to &#8220;true&#8221; for the current entry&#8217;s category. It will also do
-</p><!--l. 1297--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1348--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrpostlink</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-8033"></a> <span
class="cmtt-10">\glsxtrpostlink </span></div><hr>
-</p><!--l. 1299--><p class="noindent" >
+</p><!--l. 1350--><p class="noindent" >
if a full stop hasn&#8217;t be discarded and
-</p><!--l. 1301--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1352--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrpostlinkendsentence</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-8034"></a> <span
class="cmtt-10">\glsxtrpostlinkendsentence </span></div><hr>
-</p><!--l. 1303--><p class="noindent" >
+</p><!--l. 1354--><p class="noindent" >
if a full stop has been discarded.
-</p><!--l. 1306--><p class="indent" > <div class="important" title="Important Note"> Avoid the use of <span
+</p><!--l. 1357--><p class="indent" > <div class="important" title="Important Note"> Avoid the use of <span
class="cmtt-10">\gls</span>-like and <span
class="cmtt-10">\glstext</span>-like commands within the
post-link hook as they will cause interference. Consider using commands like
@@ -2436,8 +2508,8 @@ href="#sec:nested"><span
class="cmsy-10">&sect;</span>2.6 </a><a
href="#sec:nested">Nested Links<!--tex4ht:ref: sec:nested --></a>) instead.
</div>
-</p><!--l. 1311--><p class="noindent" >
-</p><!--l. 1313--><p class="indent" > By default <span
+</p><!--l. 1362--><p class="noindent" >
+</p><!--l. 1364--><p class="indent" > By default <span
class="cmtt-10">\glsxtrpostlink </span>just does <span
class="cmtt-10">\glsxtrpostlink</span>&#x27E8;<span
class="cmti-10">category</span>&#x27E9;<a
@@ -2449,7 +2521,7 @@ class="cmss-10">general</span><a
id="dx1-8036"></a> category, <span
class="cmtt-10">\glsxtrpostlinkgeneral </span>if it has been
defined.)
-</p><!--l. 1319--><p class="indent" > The sentence-ending hook is slightly more complicated. If the command
+</p><!--l. 1370--><p class="indent" > The sentence-ending hook is slightly more complicated. If the command
<span
class="cmtt-10">\glsxtrpostlink</span>&#x27E8;<span
class="cmti-10">category</span>&#x27E9;<a
@@ -2467,21 +2539,21 @@ with a full stop, a redundant following full stop will be discarded and the spac
adjusted (in case the entry is in uppercase) unless the entry is followed by additional
material, in which case the following full stop is no longer redundant and needs to be
reinserted.
-</p><!--l. 1332--><p class="indent" > There are some convenient commands you might want to use when customizing
+</p><!--l. 1383--><p class="indent" > There are some convenient commands you might want to use when customizing
the post-<a
id="dx1-8039"></a><a
href="#glo:linktext">link-text</a> category hooks:
-</p><!--l. 1334--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1385--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrpostlinkAddDescOnFirstUse</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-8040"></a> <span
class="cmtt-10">\glsxtrpostlinkAddDescOnFirstUse</span>
</div><hr>
-</p><!--l. 1336--><p class="noindent" >
+</p><!--l. 1387--><p class="noindent" >
This will add the description in parentheses on <a
id="dx1-8041"></a><a
href="#glo:firstuse">first use</a>.
-</p><!--l. 1339--><p class="indent" > For example, suppose you want to append the description in parentheses on <a
+</p><!--l. 1390--><p class="indent" > For example, suppose you want to append the description in parentheses on <a
id="dx1-8042"></a>first
use for entries in the <span
class="cmss-10">symbol</span><a
@@ -2495,18 +2567,18 @@ class="cmss-10">symbol</span><a
&#x00A0;<br />&#x00A0;&#x00A0;\glsxtrpostlinkAddDescOnFirstUse
&#x00A0;<br />}
</div>
-<!--l. 1346--><p class="nopar" >
-</p><!--l. 1348--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 1397--><p class="nopar" >
+</p><!--l. 1399--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrpostlinkAddSymbolOnFirstUse</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-8044"></a> <span
class="cmtt-10">\glsxtrpostlinkAddSymbolOnFirstUse</span>
</div><hr>
-</p><!--l. 1350--><p class="noindent" >
+</p><!--l. 1401--><p class="noindent" >
This will append the symbol (if defined) in parentheses on <a
id="dx1-8045"></a><a
href="#glo:firstuse">first use</a>.
-</p><!--l. 1354--><p class="indent" > If you want to provide your own custom format be aware that you can&#8217;t use
+</p><!--l. 1405--><p class="indent" > If you want to provide your own custom format be aware that you can&#8217;t use
<span
class="cmtt-10">\ifglsused</span><a
id="dx1-8046"></a> within the post-<a
@@ -2515,7 +2587,7 @@ href="#glo:linktext">link-text</a> hook as by this point the <a
id="dx1-8048"></a><a
href="#glo:firstuseflag">first use flag</a> will have
been unset. Instead you can use
-</p><!--l. 1357--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1408--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrifwasfirstuse</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-8049"></a> <span
@@ -2524,7 +2596,7 @@ class="cmitt-10">true</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">false</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1359--><p class="noindent" >
+</p><!--l. 1410--><p class="noindent" >
This will do &#x27E8;<span
class="cmti-10">true</span>&#x27E9; if the last used entry was the <a
id="dx1-8050"></a>first use for that entry, otherwise it
@@ -2535,7 +2607,7 @@ locally set by commands like <span
class="cmtt-10">\gls</span>, so don&#8217;t rely on it outside of the post-<a
id="dx1-8051"></a>link-text
hook.
-</p><!--l. 1367--><p class="indent" > <div class="important" title="Important Note"> Note that commands like <span
+</p><!--l. 1418--><p class="indent" > <div class="important" title="Important Note"> Note that commands like <span
class="cmtt-10">\glsfirst</span><a
id="dx1-8052"></a> and <span
class="cmtt-10">\glsxtrfull</span><a
@@ -2550,15 +2622,16 @@ match the text produced by <span
class="cmtt-10">\gls</span><a
id="dx1-8056"></a>-like commands on <a
id="dx1-8057"></a>first use.) However, the
-<span
-class="cmss-10">short-postfootnote</span><a
+<a
+href="#abbrstyle.short-postfootnote"><span
+class="cmss-10">short-postfootnote</span></a><a
id="dx1-8058"></a> style alters <span
class="cmtt-10">\glsxtrfull </span>so that it fakes non-<a
id="dx1-8059"></a>first use otherwise
the inline full format would include the footnote, which is inappropriate.
</div>
-</p><!--l. 1376--><p class="noindent" >
-</p><!--l. 1378--><p class="indent" > For example, if you want to place the description in a footnote after the <a
+</p><!--l. 1427--><p class="noindent" >
+</p><!--l. 1429--><p class="indent" > For example, if you want to place the description in a footnote after the <a
id="dx1-8060"></a>link-text
on <a
id="dx1-8061"></a>first use for the <span
@@ -2573,26 +2646,27 @@ class="cmss-10">general</span><a
&#x00A0;<br />&#x00A0;&#x00A0;\glsxtrifwasfirstuse{\footnote{\glsentrydesc{\glslabel}}}{}%
&#x00A0;<br />}
</div>
-<!--l. 1384--><p class="nopar" >
-</p><!--l. 1386--><p class="indent" > The <span
-class="cmss-10">short-postfootnote</span><a
+<!--l. 1435--><p class="nopar" >
+</p><!--l. 1437--><p class="indent" > The <a
+href="#abbrstyle.short-postfootnote"><span
+class="cmss-10">short-postfootnote</span></a><a
id="dx1-8063"></a> abbreviation style uses the post-<a
id="dx1-8064"></a><a
href="#glo:linktext">link-text</a> hook to place the
footnote after trailing punctuation characters.
-</p><!--l. 1390--><p class="indent" > You can set the default options used by <span
+</p><!--l. 1441--><p class="indent" > You can set the default options used by <span
class="cmtt-10">\glslink</span><a
id="dx1-8065"></a>, <span
class="cmtt-10">\gls</span><a
id="dx1-8066"></a> etc with:
-</p><!--l. 1392--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1443--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrSetDefaultGlsOpts</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-8067"></a> <span
class="cmtt-10">\GlsXtrSetDefaultGlsOpts{</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1394--><p class="noindent" >
+</p><!--l. 1445--><p class="noindent" >
For example, if you mostly don&#8217;t want to index entries then you can do:
@@ -2601,7 +2675,7 @@ For example, if you mostly don&#8217;t want to index entries then you can do:
<div class="verbatim" id="verbatim-32">
\GlsXtrSetDefaultGlsOpts{noindex}
</div>
-<!--l. 1399--><p class="nopar" > and then use, for example, <span class="obeylines-h"><span class="verb"><span
+<!--l. 1450--><p class="nopar" > and then use, for example, <span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\gls[noindex=false]{sample}</span></span></span> when you actually want
the location added to the <a
id="dx1-8068"></a><a
@@ -2610,7 +2684,7 @@ settings (such as category attributes) in addition to any settings passed in the
argument of commands like <span
class="cmtt-10">\glslink </span>and <span
class="cmtt-10">\gls</span>.
-</p><!--l. 1406--><p class="indent" > Note that if you don&#8217;t want <span
+</p><!--l. 1457--><p class="indent" > Note that if you don&#8217;t want <span
class="cmti-10">any </span>indexing, just omit <span
class="cmtt-10">\makeglossaries </span>and
<span
@@ -2621,7 +2695,7 @@ class="cmss-10">wrgloss</span><a
class="cmtt-10">\glsxtrinitwrgloss</span><a
id="dx1-8070"></a>
instead.
-</p><!--l. 1412--><p class="indent" > Commands like <span
+</p><!--l. 1463--><p class="indent" > Commands like <span
class="cmtt-10">\gls</span><a
id="dx1-8071"></a> have star (<span
class="cmtt-10">*</span>) and plus (<span
@@ -2631,7 +2705,7 @@ class="cmtt-10">hyper=false </span>and <span
class="cmtt-10">hyper=true</span>. The <span
class="cmss-10">glossaries-extra </span>package provides a way to add a
third modifier, if required, using
-</p><!--l. 1416--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1467--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrSetAltModifier</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-8072"></a> <span
@@ -2641,18 +2715,18 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 1418--><p class="noindent" >
+</p><!--l. 1469--><p class="noindent" >
where &#x27E8;<span
class="cmti-10">char</span>&#x27E9; is the character used as the modifier and &#x27E8;<span
class="cmti-10">options</span>&#x27E9; is the default set of
options (which may be overridden). Note that &#x27E8;<span
class="cmti-10">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. 1425--><p class="indent" > <div class="important" title="Important Note"> When choosing the character &#x27E8;<span
+</p><!--l. 1476--><p class="indent" > <div class="important" title="Important Note"> When choosing the character &#x27E8;<span
class="cmti-10">char</span>&#x27E9; take care of any changes in category code.
</div>
-</p><!--l. 1428--><p class="noindent" >
-</p><!--l. 1430--><p class="indent" > Example:
+</p><!--l. 1479--><p class="noindent" >
+</p><!--l. 1481--><p class="indent" > Example:
@@ -2660,7 +2734,7 @@ class="cmti-10">char</span>&#x27E9; take care of any changes in category code.
<div class="verbatim" id="verbatim-33">
\GlsXtrSetAltModifier{!}{noindex}
</div>
-<!--l. 1433--><p class="nopar" > This means that <span class="obeylines-h"><span class="verb"><span
+<!--l. 1484--><p class="nopar" > This means that <span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\gls!{sample}</span></span></span> will be equivalent to <span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\gls[noindex]{sample}</span></span></span>. It&#8217;s
not possible to mix modifiers. For example, if you want to do
@@ -2671,17 +2745,17 @@ not possible to mix modifiers. For example, if you want to do
<div class="verbatim" id="verbatim-34">
\gls[noindex,hyper=false]{sample}
</div>
-<!--l. 1439--><p class="nopar" > you can use <span class="obeylines-h"><span class="verb"><span
+<!--l. 1490--><p class="nopar" > you can use <span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\gls*[noindex]{sample}</span></span></span> or <span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\gls![hyper=false]{sample}</span></span></span> but you
can&#8217;t combine the <span
class="cmtt-10">* </span>and <span
class="cmtt-10">! </span>modifiers.
-</p><!--l. 1444--><p class="indent" > <a
+</p><!--l. 1495--><p class="indent" > <a
id="dx1-8073"></a><a
href="#glo:locationlist">Location lists</a> displayed with <span
class="cmtt-10">\printnoidxglossary </span>internally use
-</p><!--l. 1446--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1497--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsnoidxdisplayloc</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-8074"></a> <span
@@ -2696,7 +2770,7 @@ class="cmtt-10">}</span>
class="cmtt-10">{</span>&#x27E8;<span
class="cmitt-10">location</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1448--><p class="noindent" >
+</p><!--l. 1499--><p class="noindent" >
This command is provided by <span
class="cmss-10">glossaries</span>, but is modified by <span
class="cmss-10">glossaries-extra </span>to check
@@ -2705,8 +2779,8 @@ class="cmtt-10">(</span></span></span> and <span class="obeylines-h"><span class
class="cmtt-10">)</span></span></span> which are discarded to
obtain the actual control sequence name that forms the location formatting
command.
-</p><!--l. 1455--><p class="indent" > If the range identifiers aren&#8217;t present, this just uses
-</p><!--l. 1456--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1506--><p class="indent" > If the range identifiers aren&#8217;t present, this just uses
+</p><!--l. 1507--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrdisplaysingleloc</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-8075"></a> <span
@@ -2716,9 +2790,9 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">location</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 1458--><p class="noindent" >
+</p><!--l. 1509--><p class="noindent" >
otherwise it uses
-</p><!--l. 1460--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1511--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrdisplaystartloc</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-8076"></a> <span
@@ -2728,11 +2802,11 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">location</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 1462--><p class="noindent" >
+</p><!--l. 1513--><p class="noindent" >
for the start of a range (where the identifier has been stripped from &#x27E8;<span
class="cmti-10">format</span>&#x27E9;)
or
-</p><!--l. 1465--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1516--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrdisplayendloc</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-8077"></a> <span
@@ -2742,16 +2816,16 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">location</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 1467--><p class="noindent" >
+</p><!--l. 1518--><p class="noindent" >
for the end of a range (where the identifier has been stripped from &#x27E8;<span
class="cmti-10">format</span>&#x27E9;).
-</p><!--l. 1471--><p class="indent" > By default the start range command saves the format in
-</p><!--l. 1472--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1522--><p class="indent" > By default the start range command saves the format in
+</p><!--l. 1523--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrlocrangefmt</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-8078"></a> <span
class="cmtt-10">\glsxtrlocrangefmt </span></div><hr>
-</p><!--l. 1474--><p class="noindent" >
+</p><!--l. 1525--><p class="noindent" >
and does <spacer type=vertical size=10><span class="obeylines-h">
<br /><span
class="cmtt-10">\glsxtrdisplaysingleloc{</span>&#x27E8;<span
@@ -2762,9 +2836,9 @@ class="cmtt-10">}</span>
<br /><spacer type=vertical size=10></span>
(If the format is empty, it will be replaced with <span
class="cmtt-10">glsnumberformat</span>.)
-</p><!--l. 1482--><p class="indent" > The end command checks that the format matches the start of the range,
+</p><!--l. 1533--><p class="indent" > The end command checks that the format matches the start of the range,
does
-</p><!--l. 1484--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1535--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrdisplayendlochook</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-8079"></a> <span
@@ -2774,7 +2848,7 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">location</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 1486--><p class="noindent" >
+</p><!--l. 1537--><p class="noindent" >
(which does nothing by default), followed by <spacer type=vertical size=10><span class="obeylines-h">
<br /><span
class="cmtt-10">\glsxtrdisplaysingleloc{</span>&#x27E8;<span
@@ -2788,7 +2862,7 @@ class="cmtt-10">\glsxtrlocrangefmt </span>to empty.
-</p><!--l. 1493--><p class="indent" > This means that the list
+</p><!--l. 1544--><p class="indent" > This means that the list
@@ -2798,7 +2872,7 @@ class="cmtt-10">\glsxtrlocrangefmt </span>to empty.
&#x00A0;<br />\glsnoidxdisplayloc{}{page}{textbf}{1},
&#x00A0;<br />\glsnoidxdisplayloc{}{page}{)textbf}{1}.
</div>
-<!--l. 1498--><p class="nopar" > doesn&#8217;t display any differently from
+<!--l. 1549--><p class="nopar" > doesn&#8217;t display any differently from
@@ -2808,17 +2882,18 @@ class="cmtt-10">\glsxtrlocrangefmt </span>to empty.
&#x00A0;<br />\glsnoidxdisplayloc{}{page}{textbf}{1},
&#x00A0;<br />\glsnoidxdisplayloc{}{page}{textbf}{1}.
</div>
-<!--l. 1504--><p class="nopar" > but it does make it easier to define your own custom list handler that can
+<!--l. 1555--><p class="nopar" > but it does make it easier to define your own custom list handler that can
accommodate the ranges.
-</p><!--l. 1509--><p class="noindent" >
+</p><!--l. 1560--><p class="noindent" >
</p>
-<!--l. 1509--><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.4 </span> <a
id="sec:entrycountmods"></a>Entry Counting Modifications</h3>
-<!--l. 1512--><p class="noindent" >The <span
+<!--l. 1563--><p class="noindent" >The <span
class="cmtt-10">\glsenableentrycount</span><a
- id="dx1-9001"></a> command is modified to allow for the <span
-class="cmss-10">entrycount</span><a
+ id="dx1-9001"></a> command is modified to allow for the <a
+href="#catattr.entrycount"><span
+class="cmss-10">entrycount</span></a><a
id="dx1-9002"></a>
attribute. This means that you not only need to enable entry counting with
<span
@@ -2827,7 +2902,7 @@ href="#sec:categories"><span
class="cmsy-10">&sect;</span>5
</a><a
href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a>).
-</p><!--l. 1518--><p class="indent" > For example, instead of just doing:
+</p><!--l. 1569--><p class="indent" > For example, instead of just doing:
@@ -2835,7 +2910,7 @@ href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a>).
<div class="verbatim" id="verbatim-37">
\glsenableentrycount
</div>
-<!--l. 1521--><p class="nopar" > you now need to do:
+<!--l. 1572--><p class="nopar" > you now need to do:
@@ -2844,21 +2919,21 @@ href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a>).
\glsenableentrycount
&#x00A0;<br />\glssetcategoryattribute{abbreviation}{entrycount}{1}
</div>
-<!--l. 1526--><p class="nopar" > This will enable the entry counting for entries in the <span
+<!--l. 1577--><p class="nopar" > This will enable the entry counting for entries in the <span
class="cmss-10">abbreviation</span><a
id="dx1-9003"></a> category, but any
entries assigned to other categories will be unchanged.
-</p><!--l. 1531--><p class="indent" > Further information about entry counting, including the new per-unit feature, is
+</p><!--l. 1582--><p class="indent" > Further information about entry counting, including the new per-unit feature, is
described in <a
href="#sec:entrycount"><span
class="cmsy-10">&sect;</span>6 </a><a
href="#sec:entrycount">Entry Counting<!--tex4ht:ref: sec:entrycount --></a>.
-</p><!--l. 1534--><p class="noindent" >
+</p><!--l. 1585--><p class="noindent" >
</p>
-<!--l. 1534--><p class="noindent" ><a
+<!--l. 1585--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">2.5 </span> <a
id="plurals"></a>Plurals</h3>
-<!--l. 1536--><p class="noindent" >Some languages, such as English, have a general rule that plurals are formed from
+<!--l. 1587--><p class="noindent" >Some languages, such as English, have a general rule that plurals are formed from
the singular with a suffix appended. This isn&#8217;t an absolute rule. There are
plenty of exceptions (for example, geese, children, churches, elves, fairies,
sheep). The <span
@@ -2869,7 +2944,7 @@ class="cmss-10">plural</span><a
defining entries. In some cases a plural may not make any sense (for example,
the term is a symbol) and in some cases the plural may be identical to the
singular.
-</p><!--l. 1545--><p class="indent" > To make life easier for languages where the majority of plurals can simply be
+</p><!--l. 1596--><p class="indent" > To make life easier for languages where the majority of plurals can simply be
formed by appending a suffix to the singular, the <span
class="cmss-10">glossaries</span><a
id="dx1-10003"></a> package sets lets the <span
@@ -2885,11 +2960,11 @@ don&#8217;t need to have the <span
class="cmss-10">plural</span><a
id="dx1-10007"></a> supplied as well, and you only need to use it for the
exceptions.
-</p><!--l. 1554--><p class="indent" > For languages that don&#8217;t have this general rule, the <span
+</p><!--l. 1605--><p class="indent" > For languages that don&#8217;t have this general rule, the <span
class="cmss-10">plural</span><a
id="dx1-10008"></a> field will always need to
be supplied, where needed.
-</p><!--l. 1557--><p class="indent" > There are other plural fields, such as <span
+</p><!--l. 1608--><p class="indent" > There are other plural fields, such as <span
class="cmss-10">firstplural</span><a
id="dx1-10009"></a>, <span
class="cmss-10">longplural</span><a
@@ -2899,7 +2974,7 @@ class="cmss-10">shortplural</span><a
you are using a language that doesn&#8217;t have a simple suffix rule, you&#8217;ll have to
supply the plural forms if you need them (and if a plural makes sense in the
context).
-</p><!--l. 1563--><p class="indent" > If these fields are omitted, the <span
+</p><!--l. 1614--><p class="indent" > If these fields are omitted, the <span
class="cmss-10">glossaries</span><a
id="dx1-10012"></a> package follows these rules: </p>
<ul class="itemize1">
@@ -2963,7 +3038,7 @@ class="cmtt-10">\acrpluralsuffix</span><a
class="cmss-10">short</span><a
id="dx1-10031"></a> field.
</li></ul>
-<!--l. 1586--><p class="indent" > This <span
+<!--l. 1637--><p class="indent" > This <span
class="cmti-10">last case is changed </span>with <span
class="cmss-10">glossaries-extra</span>. With this extension package, the
<span
@@ -2978,60 +3053,54 @@ abbreviation styles. This means that every time an abbreviation style is
implemented, <span
class="cmtt-10">\abbrvpluralsuffix </span>is redefined. In most cases its redefined to
use
-</p><!--l. 1594--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1645--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrabbrvpluralsuffix</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-10035"></a> <span
class="cmtt-10">\glsxtrabbrvpluralsuffix </span></div><hr>
-</p><!--l. 1596--><p class="noindent" >
+</p><!--l. 1647--><p class="noindent" >
which defaults to just <span
class="cmtt-10">\glspluralsuffix</span>. Some of the abbreviation styles have their
own command for the plural suffix, such as <span
-class="cmtt-10">\glsxtrscsuffix </span>which is defined
-as:
-
-
-
-</p>
- <div class="verbatim" id="verbatim-39">
-\newcommand*{\glsxtrscsuffix}{\glstextup{\glsxtrabbrvpluralsuffix}}
-</div>
-<!--l. 1602--><p class="nopar" > So if you want to completely strip all the plural suffixes used for abbreviations then
-you need to redefine <span
+class="cmtt-10">\glsxtrscsuffix</span>, so if you want to
+completely strip all the plural suffixes used for abbreviations then you need to
+redefine <span
class="cmtt-10">\glsxtrabbrvpluralsuffix </span><span
class="cmti-10">not </span><span
-class="cmtt-10">\abbrvpluralsuffix</span>, which
-changes with the style. Redefining <span
-class="cmtt-10">\acrpluralsuffix </span>will have no affect, since it&#8217;s
-not used by the new abbreviation mechanism.
-</p><!--l. 1609--><p class="indent" > If you require a mixture (for example, in a multilingual document), there are two
-attributes that affect the short plural suffix formation. The first is <span
-class="cmss-10">aposplural</span><a
+class="cmtt-10">\abbrvpluralsuffix</span>, which changes with
+the style. Redefining <span
+class="cmtt-10">\acrpluralsuffix </span>will have no affect, since it&#8217;s not used by the
+new abbreviation mechanism.
+</p><!--l. 1657--><p class="indent" > If you require a mixture (for example, in a multilingual document), there are two
+attributes that affect the short plural suffix formation. The first is <a
+href="#catattr.aposplural"><span
+class="cmss-10">aposplural</span></a><a
id="dx1-10036"></a> which
uses the suffix
</p>
- <div class="verbatim" id="verbatim-40">
+ <div class="verbatim" id="verbatim-39">
'\abbrvpluralsuffix
</div>
-<!--l. 1614--><p class="nopar" > That is, an apostrophe followed by <span
+<!--l. 1662--><p class="nopar" > That is, an apostrophe followed by <span
class="cmtt-10">\abbrvpluralsuffix </span>is appended. The second
-attribute is <span
-class="cmss-10">noshortplural</span><a
+attribute is <a
+href="#catattr.noshortplural"><span
+class="cmss-10">noshortplural</span></a><a
id="dx1-10037"></a> which suppresses the suffix and simply sets <span
class="cmss-10">shortplural</span><a
id="dx1-10038"></a> to the
same as <span
class="cmss-10">short</span><a
id="dx1-10039"></a>.
-</p><!--l. 1620--><p class="noindent" >
+</p><!--l. 1668--><p class="noindent" >
</p>
-<!--l. 1620--><p class="noindent" ><a
+<!--l. 1668--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">2.6 </span> <a
id="sec:nested"></a>Nested Links</h3>
-<!--l. 1623--><p class="noindent" >Complications arise when you use <span
+<!--l. 1671--><p class="noindent" >Complications arise when you use <span
class="cmtt-10">\gls</span><a
id="dx1-11001"></a> in the value of the <span
class="cmss-10">name</span><a
@@ -3044,19 +3113,19 @@ 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. 1631--><p class="indent" > Things can go wrong if we try the following with the <span
+</p><!--l. 1679--><p class="indent" > Things can go wrong if we try the following with the <span
class="cmss-10">glossaries </span>package:
</p>
- <div class="verbatim" id="verbatim-41">
+ <div class="verbatim" id="verbatim-40">
\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. 1637--><p class="nopar" >
-</p><!--l. 1639--><p class="indent" > The main problems are:
+<!--l. 1685--><p class="nopar" >
+</p><!--l. 1687--><p class="indent" > The main problems are:
</p><ol class="enumerate1" >
<li
class="enumerate" id="x1-11006x1"><a
@@ -3072,20 +3141,20 @@ href="#glo:firstuse">first use</a> if the long form is displayed before the shor
- <div class="verbatim" id="verbatim-42">
+ <div class="verbatim" id="verbatim-41">
\gls{\uppercase&#x00A0;ssi}&#x00A0;enabled&#x00A0;\gls{html}
</div>
- <!--l. 1647--><p class="nopar" > which just doesn&#8217;t work. Grouping the <span class="obeylines-h"><span class="verb"><span
+ <!--l. 1695--><p class="nopar" > which just doesn&#8217;t work. Grouping the <span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\gls{ssi}</span></span></span> doesn&#8217;t work either as this
will effectively try to do
</p>
- <div class="verbatim" id="verbatim-43">
+ <div class="verbatim" id="verbatim-42">
\uppercase{\gls{ssi}}&#x00A0;enabled&#x00A0;\gls{html}
</div>
- <!--l. 1652--><p class="nopar" > This will upper case the label <span
+ <!--l. 1700--><p class="nopar" > This will upper case the label <span
class="cmtt-10">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
@@ -3123,18 +3192,18 @@ class="cmtt-10">shtml</span>. For example:
- <div class="verbatim" id="verbatim-44">
+ <div class="verbatim" id="verbatim-43">
This&#x00A0;section&#x00A0;discusses&#x00A0;\gls{ssi},&#x00A0;\gls{html}&#x00A0;and&#x00A0;\gls{shtml}.
</div>
- <!--l. 1671--><p class="nopar" > This produces:
+ <!--l. 1719--><p class="nopar" > This produces:
</p><div class="quote">
- <!--l. 1674--><p class="noindent" >This section discusses server side includes (SSI), hypertext
+ <!--l. 1722--><p class="noindent" >This section discusses server side includes (SSI), hypertext
markup language (HTML) and SSI enabled HTML (SHTML).</p></div>
- <!--l. 1677--><p class="noindent" >So the <a
+ <!--l. 1725--><p class="noindent" >So the <a
id="dx1-11019"></a><a
href="#glo:firstuse">first use</a> of the <span
class="cmtt-10">shtml </span>entry produces &#8220;SSI enabled HTML (SHTML)&#8221;.
- </p><!--l. 1680--><p class="noindent" >Now let&#8217;s suppose the <span
+ </p><!--l. 1728--><p class="noindent" >Now let&#8217;s suppose the <span
class="cmtt-10">html </span>entry is used before the <span
class="cmtt-10">shtml </span>but the <span
class="cmtt-10">ssi </span>entry is
@@ -3144,41 +3213,41 @@ class="cmtt-10">shtml </span>entry, for example:
</p>
- <div class="verbatim" id="verbatim-45">
+ <div class="verbatim" id="verbatim-44">
The&#x00A0;sample&#x00A0;files&#x00A0;are&#x00A0;either&#x00A0;\gls{html}&#x00A0;or&#x00A0;\gls{shtml},&#x00A0;but&#x00A0;let's
&#x00A0;<br />first&#x00A0;discuss&#x00A0;\gls{ssi}.
</div>
- <!--l. 1686--><p class="nopar" > This produces:
+ <!--l. 1734--><p class="nopar" > This produces:
</p><div class="quote">
- <!--l. 1689--><p class="noindent" >The sample files are either hypertext markup language (HTML)
+ <!--l. 1737--><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. 1694--><p class="noindent" >So the <a
+ <!--l. 1742--><p class="noindent" >So the <a
id="dx1-11020"></a><a
href="#glo:firstuse">first use</a> of the <span
class="cmtt-10">shtml </span>entry now produces &#8220;server side includes (SSI)
enabled HTML (SHTML)&#8221;, which looks a bit strange.
- </p><!--l. 1698--><p class="noindent" >Now let&#8217;s suppose the <span
+ </p><!--l. 1746--><p class="noindent" >Now let&#8217;s suppose the <span
class="cmtt-10">shtml </span>entry is used before (or without) the other two
entries:
</p>
- <div class="verbatim" id="verbatim-46">
+ <div class="verbatim" id="verbatim-45">
This&#x00A0;article&#x00A0;is&#x00A0;an&#x00A0;introduction&#x00A0;to&#x00A0;\gls{shtml}.
</div>
- <!--l. 1702--><p class="nopar" > This produces:
+ <!--l. 1750--><p class="nopar" > This produces:
</p><div class="quote">
- <!--l. 1705--><p class="noindent" >This article is an introduction to server side includes (SSI)
+ <!--l. 1753--><p class="noindent" >This article is an introduction to server side includes (SSI)
enabled hypertext markup language (HTML) (SHTML).</p></div>
- <!--l. 1708--><p class="noindent" >So the <a
+ <!--l. 1756--><p class="noindent" >So the <a
id="dx1-11021"></a><a
href="#glo:firstuse">first use</a> of the <span
class="cmtt-10">shtml </span>entry now produces &#8220;server side includes (SSI)
enabled hypertext markup language (HTML) (SHTML)&#8221;, which is even more
strange.
- </p><!--l. 1712--><p class="noindent" >This is all aggravated by setting the style using the <span
+ </p><!--l. 1760--><p class="noindent" >This is all aggravated by setting the style using the <span
class="cmss-10">glossaries </span>package&#8217;s
<span
class="cmtt-10">\setacronymstyle</span>. For example:
@@ -3186,10 +3255,10 @@ class="cmtt-10">\setacronymstyle</span>. For example:
</p>
- <div class="verbatim" id="verbatim-47">
+ <div class="verbatim" id="verbatim-46">
\setacronymstyle{long-short}
</div>
- <!--l. 1717--><p class="nopar" > as this references the label through the use of <span
+ <!--l. 1765--><p class="nopar" > as this references the label through the use of <span
class="cmtt-10">\glslabel </span>when displaying the
long and short forms, but this value changes with each use of <span
class="cmtt-10">\gls</span>, so
@@ -3201,7 +3270,7 @@ class="cmtt-10">\glslabel </span>has been changed to <span
class="cmtt-10">html </span>by
<span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\gls{html}</span></span></span>.
- </p><!--l. 1725--><p class="noindent" >Another oddity occurs if you reset the <span
+ </p><!--l. 1773--><p class="noindent" >Another oddity occurs if you reset the <span
class="cmtt-10">html </span>entry between uses of the <span
class="cmtt-10">shtml</span>
entry. For example:
@@ -3209,13 +3278,13 @@ class="cmtt-10">shtml</span>
</p>
- <div class="verbatim" id="verbatim-48">
+ <div class="verbatim" id="verbatim-47">
\gls{shtml}&#x00A0;...&#x00A0;\glsreset{html}\gls{shtml}
</div>
- <!--l. 1729--><p class="nopar" > The next use of <span
+ <!--l. 1777--><p class="nopar" > The next use of <span
class="cmtt-10">shtml </span>produces &#8220;Shypertext markup language (HTML)&#8221;,
which is downright weird.
- </p><!--l. 1733--><p class="noindent" >Even without this, the short form has nested formatting commands, which
+ </p><!--l. 1781--><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="cmtt-10">\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
@@ -3248,7 +3317,7 @@ class="cmss-10">hyperref</span><a
in the glossary or they may be directed to the SHTML entry in the
glossary.
</li></ol>
-<!--l. 1754--><p class="indent" > For these reasons it&#8217;s better to use the simple expandable commands
+<!--l. 1802--><p class="indent" > For these reasons it&#8217;s better to use the simple expandable commands
like <span
class="cmtt-10">\glsentrytext</span><a
id="dx1-11031"></a> or <span
@@ -3260,23 +3329,23 @@ like:
</p>
- <div class="verbatim" id="verbatim-49">
+ <div class="verbatim" id="verbatim-48">
\newacronym
&#x00A0;<br />&#x00A0;[description={\acrshort{ssi}&#x00A0;enabled&#x00A0;\acrshort{html}}]
&#x00A0;<br />&#x00A0;{shtml}{SHTML}{SSI&#x00A0;enabled&#x00A0;HTML}
</div>
-<!--l. 1762--><p class="nopar" > with <span
+<!--l. 1810--><p class="nopar" > with <span
class="cmss-10">glossaries </span>or:
</p>
- <div class="verbatim" id="verbatim-50">
+ <div class="verbatim" id="verbatim-49">
\newabbreviation
&#x00A0;<br />&#x00A0;[description={\glsxtrshort{ssi}&#x00A0;enabled&#x00A0;\glsxtrshort{html}}]
&#x00A0;<br />&#x00A0;{shtml}{SHTML}{SSI&#x00A0;enabled&#x00A0;HTML}
</div>
-<!--l. 1768--><p class="nopar" > with <span
+<!--l. 1816--><p class="nopar" > with <span
class="cmss-10">glossaries-extra</span>. This fixes all the above listed problems (as long as you don&#8217;t
use <span
class="cmtt-10">\glsdesc</span><a
@@ -3287,24 +3356,24 @@ may fix the <a
id="dx1-11034"></a><a
href="#glo:firstuse">first use</a> issue, but it doesn&#8217;t fix any of the other problems listed
above.
-</p><!--l. 1775--><p class="indent" > If it&#8217;s simply that you want to use the abbreviation font, you can use
+</p><!--l. 1823--><p class="indent" > If it&#8217;s simply that you want to use the abbreviation font, you can use
<span
class="cmtt-10">\glsabbrvfont</span>:
</p>
- <div class="verbatim" id="verbatim-51">
+ <div class="verbatim" id="verbatim-50">
\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. 1784--><p class="nopar" > This will pick up the font style setting of the outer entry (shtml, in the above case).
+<!--l. 1832--><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. 1789--><p class="indent" > However if you&#8217;re really determined to use <span
+</p><!--l. 1837--><p class="indent" > However if you&#8217;re really determined to use <span
class="cmtt-10">\gls</span><a
id="dx1-11035"></a> in a field that may be included
within some <a
@@ -3325,19 +3394,19 @@ form
</p>
- <div class="verbatim" id="verbatim-52">
+ <div class="verbatim" id="verbatim-51">
\gls{ssi}&#x00A0;enabled&#x00A0;\gls{html}
</div>
-<!--l. 1800--><p class="nopar" > is treated as
+<!--l. 1848--><p class="nopar" > is treated as
</p>
- <div class="verbatim" id="verbatim-53">
+ <div class="verbatim" id="verbatim-52">
{\glstext[hyper=false,noindex]{ssi}}&#x00A0;enabled
&#x00A0;<br />{\glstext[hyper=false,noindex]{html}}
</div>
-<!--l. 1805--><p class="nopar" > This overcomes problems&#x00A0;<a
+<!--l. 1853--><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
@@ -3349,10 +3418,11 @@ class="cmss-10">sort</span><a
id="dx1-11039"></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="cmss-10">long-noshort-desc</span><a
+as <a
+href="#abbrstyle.long-noshort-desc"><span
+class="cmss-10">long-noshort-desc</span></a><a
id="dx1-11040"></a>).
-</p><!--l. 1816--><p class="indent" > Additionally, any instance of the long form commands, such as <span
+</p><!--l. 1864--><p class="indent" > Additionally, any instance of the long form commands, such as <span
class="cmtt-10">\glsxtrlong</span><a
id="dx1-11041"></a> or
<span
@@ -3387,11 +3457,12 @@ class="cmtt-10">shtml </span>entry had instead been defined as:
- <div class="verbatim" id="verbatim-54">
+ <div class="verbatim" id="verbatim-53">
\newacronym{shtml}{SHTML}{\acrshort{ssi}&#x00A0;enabled&#x00A0;\acrshort{html}}
</div>
-<!--l. 1829--><p class="nopar" > then (using the <span
-class="cmss-10">long-short</span><a
+<!--l. 1877--><p class="nopar" > then (using the <a
+href="#abbrstyle.long-short"><span
+class="cmss-10">long-short</span></a><a
id="dx1-11047"></a> style) the <a
id="dx1-11048"></a><a
href="#glo:firstuse">first use</a> will be like
@@ -3399,31 +3470,31 @@ href="#glo:firstuse">first use</a> will be like
</p>
- <div class="verbatim" id="verbatim-55">
+ <div class="verbatim" id="verbatim-54">
{\acronymfont{\glsentryshort{ssi}}}&#x00A0;enabled
&#x00A0;<br />{\acronymfont{\glsentryshort{html}}}&#x00A0;(SHTML)
</div>
-<!--l. 1835--><p class="nopar" > whereas if the entry is defined as:
+<!--l. 1883--><p class="nopar" > whereas if the entry is defined as:
</p>
- <div class="verbatim" id="verbatim-56">
+ <div class="verbatim" id="verbatim-55">
\newabbreviation{shtml}{SHTML}{\glsxtrshort{ssi}&#x00A0;enabled
&#x00A0;<br />\glsxtrshort{html}}
</div>
-<!--l. 1840--><p class="nopar" > then the <a
+<!--l. 1888--><p class="nopar" > then the <a
id="dx1-11049"></a><a
href="#glo:firstuse">first use</a> will be like:
</p>
- <div class="verbatim" id="verbatim-57">
+ <div class="verbatim" id="verbatim-56">
{\glsabbrvfont{\glsentryshort{ssi}}}&#x00A0;enabled
&#x00A0;<br />{\glsabbrvfont{\glsentryshort{html}}}&#x00A0;(SHTML)
</div>
-<!--l. 1845--><p class="nopar" > Note that the first optional argument of <span
+<!--l. 1893--><p class="nopar" > Note that the first optional argument of <span
class="cmtt-10">\acrshort </span>or <span
class="cmtt-10">\glsxtrshort </span>is ignored in
this context. (The final optional argument will be inserted, if present.) The
@@ -3434,8 +3505,8 @@ class="cmtt-10">\glsxtrshort</span><a
id="dx1-11051"></a>. Note
that <span
class="cmtt-10">\acrshort </span>doesn&#8217;t set the abbreviation style.
-</p><!--l. 1853--><p class="indent" > Alternatively you can use:
-</p><!--l. 1854--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1901--><p class="indent" > Alternatively you can use:
+</p><!--l. 1902--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrp</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-11052"></a> <span
@@ -3444,7 +3515,7 @@ class="cmitt-10">field</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1856--><p class="noindent" >
+</p><!--l. 1904--><p class="noindent" >
where &#x27E8;<span
class="cmti-10">field</span>&#x27E9; is the field label and corresponds to a command in the form <span
class="cmtt-10">\gls</span>&#x27E8;<span
@@ -3454,34 +3525,34 @@ class="cmtt-10">\glstext</span>) or in the form <span
class="cmtt-10">\glsxtr</span>&#x27E8;<span
class="cmti-10">field</span>&#x27E9; (e.g.&#x00A0;<span
class="cmtt-10">\glsxtrshort</span>).
-</p><!--l. 1861--><p class="indent" > There&#8217;s a shortcut command for the most common fields:
-</p><!--l. 1862--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1909--><p class="indent" > There&#8217;s a shortcut command for the most common fields:
+</p><!--l. 1910--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsps</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-11053"></a> <span
class="cmtt-10">\glsps{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1864--><p class="noindent" >
+</p><!--l. 1912--><p class="noindent" >
which is equivalent to <span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrp{short}</span></span></span><span
class="cmtt-10">{</span>&#x27E8;<span
class="cmti-10">label</span>&#x27E9;<span
class="cmtt-10">}</span>, and
-</p><!--l. 1866--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1914--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glspt</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-11054"></a> <span
class="cmtt-10">\glspt{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1868--><p class="noindent" >
+</p><!--l. 1916--><p class="noindent" >
which is equivalent to <span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrp{text}</span></span></span><span
class="cmtt-10">{</span>&#x27E8;<span
class="cmti-10">label</span>&#x27E9;<span
class="cmtt-10">}</span>.
-</p><!--l. 1871--><p class="indent" > The <span
+</p><!--l. 1919--><p class="indent" > The <span
class="cmtt-10">\glsxtrp </span>command behaves much like the <span
class="cmtt-10">\glsfmt</span>&#x27E8;<span
class="cmti-10">field</span>&#x27E9; commands described
@@ -3498,103 +3569,104 @@ class="cmss-10">noindex</span><a
id="dx1-11056"></a> to <span
class="cmtt-10">true</span>. If you want to change this, you can
use
-</p><!--l. 1878--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1926--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrsetpopts</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-11057"></a> <span
class="cmtt-10">\glsxtrsetpopts{</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1880--><p class="noindent" >
+</p><!--l. 1928--><p class="noindent" >
For example:
</p>
- <div class="verbatim" id="verbatim-58">
+ <div class="verbatim" id="verbatim-57">
\glsxtrsetpopts{hyper=false}
</div>
-<!--l. 1884--><p class="nopar" > will just switch off the hyperlinks but not the indexing. Be careful using
+<!--l. 1932--><p class="nopar" > will just switch off the hyperlinks but not the indexing. Be careful using
this command or you can end up back to the original problem of nested
links.
-</p><!--l. 1889--><p class="indent" > The hyper link is re-enabled within glossaries. This is done through the
+</p><!--l. 1937--><p class="indent" > The hyper link is re-enabled within glossaries. This is done through the
command:
-</p><!--l. 1891--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1939--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glossxtrsetpopts</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-11058"></a> <span
class="cmtt-10">\glossxtrsetpopts </span></div><hr>
-</p><!--l. 1893--><p class="noindent" >
+</p><!--l. 1941--><p class="noindent" >
which by default just does
</p>
- <div class="verbatim" id="verbatim-59">
+ <div class="verbatim" id="verbatim-58">
\glsxtrsetpopts{noindex}
</div>
-<!--l. 1897--><p class="nopar" > You can redefine this if you want to adjust the setting when <span
+<!--l. 1945--><p class="nopar" > You can redefine this if you want to adjust the setting when <span
class="cmtt-10">\glsxtrp </span>is used in the
glossary. For example:
</p>
- <div class="verbatim" id="verbatim-60">
+ <div class="verbatim" id="verbatim-59">
\renewcommand{\glossxtrsetpopts}{\glsxtrsetpopts{noindex=false}}
</div>
-<!--l. 1902--><p class="nopar" >
-</p><!--l. 1904--><p class="indent" > For example,
+<!--l. 1950--><p class="nopar" >
+</p><!--l. 1952--><p class="indent" > For example,
</p>
- <div class="verbatim" id="verbatim-61">
+ <div class="verbatim" id="verbatim-60">
\glsxtrp{short}{ssi}
</div>
-<!--l. 1907--><p class="nopar" > is equivalent to
+<!--l. 1955--><p class="nopar" > is equivalent to
</p>
- <div class="verbatim" id="verbatim-62">
+ <div class="verbatim" id="verbatim-61">
{\let\glspostlinkhook\relax
&#x00A0;<br />&#x00A0;\glsxtrshort[hyper=false,noindex]{ssi}[]%
&#x00A0;<br />}
</div>
-<!--l. 1913--><p class="nopar" > in the main body of the document or
+<!--l. 1961--><p class="nopar" > in the main body of the document or
</p>
- <div class="verbatim" id="verbatim-63">
+ <div class="verbatim" id="verbatim-62">
{\let\glspostlinkhook\relax
&#x00A0;<br />&#x00A0;\glsxtrshort[noindex]{ssi}[]%
&#x00A0;<br />}
</div>
-<!--l. 1919--><p class="nopar" > inside the glossary. (Note the post-link hook is locally disabled.)
-</p><!--l. 1922--><p class="indent" > If <span class="obeylines-h"><span class="verb"><span
+<!--l. 1967--><p class="nopar" > inside the glossary. (Note the post-link hook is locally disabled.)
+</p><!--l. 1970--><p class="indent" > If <span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrp{short}{ssi}</span></span></span> occurs in a sectioning mark, it&#8217;s equivalent
to
</p>
- <div class="verbatim" id="verbatim-64">
+ <div class="verbatim" id="verbatim-63">
{\glsxtrheadshort{ssi}}
</div>
-<!--l. 1926--><p class="nopar" > (which recognises the <span
-class="cmss-10">headuc</span><a
+<!--l. 1974--><p class="nopar" > (which recognises the <a
+href="#catattr.headuc"><span
+class="cmss-10">headuc</span></a><a
id="dx1-11059"></a> attribute.)
-</p><!--l. 1929--><p class="indent" > If <span
+</p><!--l. 1977--><p class="indent" > If <span
class="cmss-10">hyperref</span><a
id="dx1-11060"></a> has been loaded, then the bookmark will use <span
class="cmtt-10">\glsentry</span>&#x27E8;<span
class="cmti-10">field</span>&#x27E9;
(<span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsentryshort{ssi}</span></span></span> in the above example).
-</p><!--l. 1933--><p class="indent" > There are similar commands
-</p><!--l. 1934--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1981--><p class="indent" > There are similar commands
+</p><!--l. 1982--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtrp</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-11061"></a> <span
@@ -3603,9 +3675,9 @@ class="cmitt-10">field</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1936--><p class="noindent" >
+</p><!--l. 1984--><p class="noindent" >
for first letter upper case and
-</p><!--l. 1938--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 1986--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtrp</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-11062"></a> <span
@@ -3614,9 +3686,9 @@ class="cmitt-10">field</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 1940--><p class="noindent" >
+</p><!--l. 1988--><p class="noindent" >
for all upper case.
-</p><!--l. 1943--><p class="indent" > <div class="important" title="Important Note"> If you use any of the case-changing commands, such as <span
+</p><!--l. 1991--><p class="indent" > <div class="important" title="Important Note"> If you use any of the case-changing commands, such as <span
class="cmtt-10">\Gls</span><a
id="dx1-11063"></a> or <span
class="cmtt-10">\Glstext</span><a
@@ -3628,31 +3700,31 @@ class="cmtt-10">\gls</span><a
class="cmtt-10">\glstext</span><a
id="dx1-11066"></a>, in the definition of entries for any of the fields that may be used
by those case-changing commands. </div>
-</p><!--l. 1949--><p class="noindent" >
-</p><!--l. 1951--><p class="indent" > You can, with care, protect against issue&#x00A0;<a
+</p><!--l. 1997--><p class="noindent" >
+</p><!--l. 1999--><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="cmtt-10">\Gls</span>, but you still won&#8217;t be able to use the all caps commands, such
as <span
class="cmtt-10">\GLS</span>.
-</p><!--l. 1957--><p class="indent" > If you <span
+</p><!--l. 2005--><p class="indent" > If you <span
class="cmti-10">really need </span>nested commands, the safest method is
</p>
- <div class="verbatim" id="verbatim-65">
+ <div class="verbatim" id="verbatim-64">
\newabbreviation{shtml}{shtml}{{}\glsxtrp{short}{ssi}&#x00A0;enabled
&#x00A0;<br />\glsxtrp{short}{html}}
</div>
-<!--l. 1961--><p class="nopar" > but be aware that it may have some unexpected results occasionally.
-</p><!--l. 1964--><p class="indent" > Example document:
+<!--l. 2009--><p class="nopar" > but be aware that it may have some unexpected results occasionally.
+</p><!--l. 2012--><p class="indent" > Example document:
</p>
- <div class="verbatim" id="verbatim-66">
+ <div class="verbatim" id="verbatim-65">
\documentclass{report}
&#x00A0;<br />\usepackage[utf8]{inputenc}
&#x00A0;<br />\usepackage[T1]{fontenc}
@@ -3677,16 +3749,16 @@ class="cmti-10">really need </span>nested commands, the safest method is
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 2002--><p class="nopar" >
-</p><!--l. 2004--><p class="noindent" >
+<!--l. 2050--><p class="nopar" >
+</p><!--l. 2052--><p class="noindent" >
</p>
-<!--l. 2004--><p class="noindent" ><a
+<!--l. 2052--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">2.7 </span> <a
id="sec:acronymmods"></a>Acronym Style Modifications</h3>
-<!--l. 2007--><p class="noindent" >The <span
+<!--l. 2055--><p class="noindent" >The <span
class="cmss-10">glossaries-extra </span>package provides a new way of dealing with abbreviations and
redefines <span
class="cmtt-10">\newacronym</span><a
@@ -3704,17 +3776,17 @@ class="cmss-10">glossaries-extra </span>is do just add
</p>
- <div class="verbatim" id="verbatim-67">
+ <div class="verbatim" id="verbatim-66">
\setabbreviationstyle[acronym]{long-short}
</div>
-<!--l. 2015--><p class="nopar" > before you define any entries. For example, the following document using just
+<!--l. 2063--><p class="nopar" > before you define any entries. For example, the following document using just
<span
class="cmss-10">glossaries</span>
</p>
- <div class="verbatim" id="verbatim-68">
+ <div class="verbatim" id="verbatim-67">
\documentclass{article}
&#x00A0;<br />\usepackage[acronym,nopostdot,toc]{glossaries}
&#x00A0;<br />\makeglossaries
@@ -3725,13 +3797,13 @@ class="cmss-10">glossaries</span>
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 2028--><p class="nopar" > can be easily adapted to use <span
+<!--l. 2076--><p class="nopar" > can be easily adapted to use <span
class="cmss-10">glossaries-extra</span>:
</p>
- <div class="verbatim" id="verbatim-69">
+ <div class="verbatim" id="verbatim-68">
\documentclass{article}
&#x00A0;<br />\usepackage[acronym]{glossaries-extra}
&#x00A0;<br />\makeglossaries
@@ -3742,7 +3814,7 @@ class="cmss-10">glossaries-extra</span>:
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 2040--><p class="nopar" > Table&#x00A0;<a
+<!--l. 2088--><p class="nopar" > Table&#x00A0;<a
href="#tab:acrabbrvstyles">2.1<!--tex4ht:ref: tab:acrabbrvstyles --></a> lists the nearest equivalent <span
class="cmss-10">glossaries-extra </span>abbreviation styles for the
predefined acronym styles provided by <span
@@ -3757,7 +3829,7 @@ details.
-<!--l. 2047--><p class="indent" > <a
+<!--l. 2095--><p class="indent" > <a
id="tab:acrabbrvstyles"></a></p><hr class="float" /><div class="float"
>
@@ -3781,33 +3853,36 @@ cellspacing="0" cellpadding="0"
id="TBL-2-1" /><col
id="TBL-2-2" /></colgroup><tr
style="vertical-align:baseline;" id="TBL-2-1-"><td style="white-space:wrap; text-align:left;" id="TBL-2-1-1"
-class="td01"><!--l. 2054--><p class="noindent" ><span
+class="td01"><!--l. 2102--><p class="noindent" ><span
class="cmbx-10">Old Style Name</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-1-2"
-class="td10"><!--l. 2055--><p class="noindent" ><span
+class="td10"><!--l. 2103--><p class="noindent" ><span
class="cmbx-10">New Style Name</span> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-2-"><td style="white-space:wrap; text-align:left;" id="TBL-2-2-1"
-class="td01"><!--l. 2056--><p class="noindent" ><span
+class="td01"><!--l. 2104--><p class="noindent" ><span
class="cmss-10">long-sc-short</span><a
id="dx1-12003"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-2-2"
-class="td10"><!--l. 2056--><p class="noindent" ><span
-class="cmss-10">long-short-sc</span><a
+class="td10"><!--l. 2104--><p class="noindent" ><a
+href="#abbrstyle.long-short-sc"><span
+class="cmss-10">long-short-sc</span></a><a
id="dx1-12004"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-3-"><td style="white-space:wrap; text-align:left;" id="TBL-2-3-1"
-class="td01"><!--l. 2057--><p class="noindent" ><span
+class="td01"><!--l. 2105--><p class="noindent" ><span
class="cmss-10">long-sm-short</span><a
id="dx1-12005"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-3-2"
-class="td10"><!--l. 2057--><p class="noindent" ><span
-class="cmss-10">long-short-sm</span><a
+class="td10"><!--l. 2105--><p class="noindent" ><a
+href="#abbrstyle.long-short-sm"><span
+class="cmss-10">long-short-sm</span></a><a
id="dx1-12006"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-4-"><td style="white-space:wrap; text-align:left;" id="TBL-2-4-1"
-class="td01"><!--l. 2058--><p class="noindent" ><span
+class="td01"><!--l. 2106--><p class="noindent" ><span
class="cmss-10">long-sp-short</span><a
id="dx1-12007"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-4-2"
-class="td10"><!--l. 2058--><p class="noindent" ><span
-class="cmss-10">long-short</span><a
+class="td10"><!--l. 2106--><p class="noindent" ><a
+href="#abbrstyle.long-short"><span
+class="cmss-10">long-short</span></a><a
id="dx1-12008"></a> <br
class="newline" />with <span
class="cmtt-10">\renewcommand</span><span
@@ -3822,59 +3897,66 @@ class="cmtt-10">#1</span><span
class="cmsy-10">}}</span> </p> </td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-5-"><td style="white-space:wrap; text-align:left;" id="TBL-2-5-1"
-class="td01"><!--l. 2060--><p class="noindent" ><span
+class="td01"><!--l. 2108--><p class="noindent" ><span
class="cmss-10">short-long</span><a
id="dx1-12009"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-5-2"
-class="td10"><!--l. 2060--><p class="noindent" ><span
-class="cmss-10">short-long</span><a
+class="td10"><!--l. 2108--><p class="noindent" ><a
+href="#abbrstyle.short-long"><span
+class="cmss-10">short-long</span></a><a
id="dx1-12010"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-6-"><td style="white-space:wrap; text-align:left;" id="TBL-2-6-1"
-class="td01"><!--l. 2061--><p class="noindent" ><span
+class="td01"><!--l. 2109--><p class="noindent" ><span
class="cmss-10">sc-short-long</span><a
id="dx1-12011"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-6-2"
-class="td10"><!--l. 2061--><p class="noindent" ><span
-class="cmss-10">short-sc-long</span><a
+class="td10"><!--l. 2109--><p class="noindent" ><a
+href="#abbrstyle.short-sc-long"><span
+class="cmss-10">short-sc-long</span></a><a
id="dx1-12012"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-7-"><td style="white-space:wrap; text-align:left;" id="TBL-2-7-1"
-class="td01"><!--l. 2062--><p class="noindent" ><span
+class="td01"><!--l. 2110--><p class="noindent" ><span
class="cmss-10">sm-short-long</span><a
id="dx1-12013"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-7-2"
-class="td10"><!--l. 2062--><p class="noindent" ><span
-class="cmss-10">short-sm-long</span><a
+class="td10"><!--l. 2110--><p class="noindent" ><a
+href="#abbrstyle.short-sm-long"><span
+class="cmss-10">short-sm-long</span></a><a
id="dx1-12014"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-8-"><td style="white-space:wrap; text-align:left;" id="TBL-2-8-1"
-class="td01"><!--l. 2063--><p class="noindent" ><span
+class="td01"><!--l. 2111--><p class="noindent" ><span
class="cmss-10">long-short-desc</span><a
id="dx1-12015"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-8-2"
-class="td10"><!--l. 2063--><p class="noindent" ><span
-class="cmss-10">long-short-desc</span><a
+class="td10"><!--l. 2111--><p class="noindent" ><a
+href="#abbrstyle.long-short-desc"><span
+class="cmss-10">long-short-desc</span></a><a
id="dx1-12016"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-9-"><td style="white-space:wrap; text-align:left;" id="TBL-2-9-1"
-class="td01"><!--l. 2064--><p class="noindent" ><span
+class="td01"><!--l. 2112--><p class="noindent" ><span
class="cmss-10">long-sc-short-desc</span><a
id="dx1-12017"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-9-2"
-class="td10"><!--l. 2064--><p class="noindent" ><span
-class="cmss-10">long-short-sc-desc</span><a
+class="td10"><!--l. 2112--><p class="noindent" ><a
+href="#abbrstyle.long-short-sc-desc"><span
+class="cmss-10">long-short-sc-desc</span></a><a
id="dx1-12018"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-10-"><td style="white-space:wrap; text-align:left;" id="TBL-2-10-1"
-class="td01"><!--l. 2065--><p class="noindent" ><span
+class="td01"><!--l. 2113--><p class="noindent" ><span
class="cmss-10">long-sm-short-desc</span><a
id="dx1-12019"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-10-2"
-class="td10"><!--l. 2065--><p class="noindent" ><span
-class="cmss-10">long-short-sm-desc</span><a
+class="td10"><!--l. 2113--><p class="noindent" ><a
+href="#abbrstyle.long-short-sm-desc"><span
+class="cmss-10">long-short-sm-desc</span></a><a
id="dx1-12020"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-11-"><td style="white-space:wrap; text-align:left;" id="TBL-2-11-1"
-class="td01"><!--l. 2066--><p class="noindent" ><span
+class="td01"><!--l. 2114--><p class="noindent" ><span
class="cmss-10">long-sp-short-desc</span><a
id="dx1-12021"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-11-2"
-class="td10"><!--l. 2066--><p class="noindent" ><span
-class="cmss-10">long-short-desc</span><a
+class="td10"><!--l. 2114--><p class="noindent" ><a
+href="#abbrstyle.long-short-desc"><span
+class="cmss-10">long-short-desc</span></a><a
id="dx1-12022"></a> <br
class="newline" />with <span
class="cmtt-10">\renewcommand</span><span
@@ -3889,98 +3971,109 @@ class="cmtt-10">#1</span><span
class="cmsy-10">}}</span> </p> </td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-12-"><td style="white-space:wrap; text-align:left;" id="TBL-2-12-1"
-class="td01"><!--l. 2068--><p class="noindent" ><span
+class="td01"><!--l. 2116--><p class="noindent" ><span
class="cmss-10">short-long-desc</span><a
id="dx1-12023"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-12-2"
-class="td10"><!--l. 2068--><p class="noindent" ><span
-class="cmss-10">short-long-desc</span><a
+class="td10"><!--l. 2116--><p class="noindent" ><a
+href="#abbrstyle.short-long-desc"><span
+class="cmss-10">short-long-desc</span></a><a
id="dx1-12024"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-13-"><td style="white-space:wrap; text-align:left;" id="TBL-2-13-1"
-class="td01"><!--l. 2069--><p class="noindent" ><span
+class="td01"><!--l. 2117--><p class="noindent" ><span
class="cmss-10">sc-short-long-desc</span><a
id="dx1-12025"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-13-2"
-class="td10"><!--l. 2069--><p class="noindent" ><span
-class="cmss-10">short-sc-long-desc</span><a
+class="td10"><!--l. 2117--><p class="noindent" ><a
+href="#abbrstyle.short-sc-long-desc"><span
+class="cmss-10">short-sc-long-desc</span></a><a
id="dx1-12026"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-14-"><td style="white-space:wrap; text-align:left;" id="TBL-2-14-1"
-class="td01"><!--l. 2070--><p class="noindent" ><span
+class="td01"><!--l. 2118--><p class="noindent" ><span
class="cmss-10">sm-short-long-desc</span><a
id="dx1-12027"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-14-2"
-class="td10"><!--l. 2070--><p class="noindent" ><span
-class="cmss-10">short-sm-long-desc</span><a
+class="td10"><!--l. 2118--><p class="noindent" ><a
+href="#abbrstyle.short-sm-long-desc"><span
+class="cmss-10">short-sm-long-desc</span></a><a
id="dx1-12028"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-15-"><td style="white-space:wrap; text-align:left;" id="TBL-2-15-1"
-class="td01"><!--l. 2071--><p class="noindent" ><span
+class="td01"><!--l. 2119--><p class="noindent" ><span
class="cmss-10">dua</span><a
id="dx1-12029"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-15-2"
-class="td10"><!--l. 2071--><p class="noindent" ><span
-class="cmss-10">long-noshort</span><a
+class="td10"><!--l. 2119--><p class="noindent" ><a
+href="#abbrstyle.long-noshort"><span
+class="cmss-10">long-noshort</span></a><a
id="dx1-12030"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-16-"><td style="white-space:wrap; text-align:left;" id="TBL-2-16-1"
-class="td01"><!--l. 2072--><p class="noindent" ><span
+class="td01"><!--l. 2120--><p class="noindent" ><span
class="cmss-10">dua-desc</span><a
id="dx1-12031"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-16-2"
-class="td10"><!--l. 2072--><p class="noindent" ><span
-class="cmss-10">long-noshort-desc</span><a
+class="td10"><!--l. 2120--><p class="noindent" ><a
+href="#abbrstyle.long-noshort-desc"><span
+class="cmss-10">long-noshort-desc</span></a><a
id="dx1-12032"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-17-"><td style="white-space:wrap; text-align:left;" id="TBL-2-17-1"
-class="td01"><!--l. 2073--><p class="noindent" ><span
+class="td01"><!--l. 2121--><p class="noindent" ><span
class="cmss-10">footnote</span><a
id="dx1-12033"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-17-2"
-class="td10"><!--l. 2073--><p class="noindent" ><span
-class="cmss-10">short-footnote</span><a
+class="td10"><!--l. 2121--><p class="noindent" ><a
+href="#abbrstyle.short-footnote"><span
+class="cmss-10">short-footnote</span></a><a
id="dx1-12034"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-18-"><td style="white-space:wrap; text-align:left;" id="TBL-2-18-1"
-class="td01"><!--l. 2074--><p class="noindent" ><span
+class="td01"><!--l. 2122--><p class="noindent" ><span
class="cmss-10">footnote-sc</span><a
id="dx1-12035"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-18-2"
-class="td10"><!--l. 2074--><p class="noindent" ><span
-class="cmss-10">short-sc-footnote</span><a
+class="td10"><!--l. 2122--><p class="noindent" ><a
+href="#abbrstyle.short-sc-footnote"><span
+class="cmss-10">short-sc-footnote</span></a><a
id="dx1-12036"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-19-"><td style="white-space:wrap; text-align:left;" id="TBL-2-19-1"
-class="td01"><!--l. 2075--><p class="noindent" ><span
+class="td01"><!--l. 2123--><p class="noindent" ><span
class="cmss-10">footnote-sm</span><a
id="dx1-12037"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-19-2"
-class="td10"><!--l. 2075--><p class="noindent" ><span
-class="cmss-10">short-sm-footnote</span><a
+class="td10"><!--l. 2123--><p class="noindent" ><a
+href="#abbrstyle.short-sm-footnote"><span
+class="cmss-10">short-sm-footnote</span></a><a
id="dx1-12038"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-20-"><td style="white-space:wrap; text-align:left;" id="TBL-2-20-1"
-class="td01"><!--l. 2076--><p class="noindent" ><span
+class="td01"><!--l. 2124--><p class="noindent" ><span
class="cmss-10">footnote-desc</span><a
id="dx1-12039"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-20-2"
-class="td10"><!--l. 2076--><p class="noindent" ><span
-class="cmss-10">short-footnote-desc</span><a
+class="td10"><!--l. 2124--><p class="noindent" ><a
+href="#abbrstyle.short-footnote-desc"><span
+class="cmss-10">short-footnote-desc</span></a><a
id="dx1-12040"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-21-"><td style="white-space:wrap; text-align:left;" id="TBL-2-21-1"
-class="td01"><!--l. 2077--><p class="noindent" ><span
+class="td01"><!--l. 2125--><p class="noindent" ><span
class="cmss-10">footnote-sc-desc</span><a
id="dx1-12041"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-21-2"
-class="td10"><!--l. 2077--><p class="noindent" ><span
-class="cmss-10">short-sc-footnote-desc</span><a
+class="td10"><!--l. 2125--><p class="noindent" ><a
+href="#abbrstyle.short-sc-footnote-desc"><span
+class="cmss-10">short-sc-footnote-desc</span></a><a
id="dx1-12042"></a> </p></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-2-22-"><td style="white-space:wrap; text-align:left;" id="TBL-2-22-1"
-class="td01"><!--l. 2078--><p class="noindent" ><span
+class="td01"><!--l. 2126--><p class="noindent" ><span
class="cmss-10">footnote-sm-desc</span><a
id="dx1-12043"></a> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-2-22-2"
-class="td10"><!--l. 2078--><p class="noindent" ><span
-class="cmss-10">short-sm-footnote-desc</span><a
+class="td10"><!--l. 2126--><p class="noindent" ><a
+href="#abbrstyle.short-sm-footnote-desc"><span
+class="cmss-10">short-sm-footnote-desc</span></a><a
id="dx1-12044"></a> </p></td></tr></table></div>
</div><hr class="endfloat" />
</div>
-<!--l. 2082--><p class="indent" > The reason for introducing the new style of abbreviation commands provided by
+<!--l. 2130--><p class="indent" > The reason for introducing the new style of abbreviation commands provided by
<span
class="cmss-10">glossaries-extra </span>is because the original acronym commands provided by <span
class="cmss-10">glossaries </span>are
@@ -3989,15 +4082,15 @@ class="cmss-10">glossaries-extra</span>.
However, if you really want to restore the generic acronym function provided by
<span
class="cmss-10">glossaries </span>you can use
-</p><!--l. 2089--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2137--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\RestoreAcronyms</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-12045"></a> <span
class="cmtt-10">\RestoreAcronyms </span></div><hr>
-</p><!--l. 2091--><p class="noindent" >
+</p><!--l. 2139--><p class="noindent" >
(before any use of <span
class="cmtt-10">\newacronym</span>).
-</p><!--l. 2094--><p class="indent" > <span
+</p><!--l. 2142--><p class="indent" > <span
class="cmtt-10">\RestoreAcronyms </span>should not be used in combination with the newer
<span
class="cmss-10">glossaries-extra </span>abbreviations. Don&#8217;t combine old and new style entries with the same
@@ -4007,7 +4100,7 @@ class="cmss-10">type</span><a
class="cmss-10">glossaries </span>acronym mechanism doesn&#8217;t work well with the newer
<span
class="cmss-10">glossaries-extra </span>commands.
-</p><!--l. 2100--><p class="indent" > <div class="important" title="Important Note"> If you use <span
+</p><!--l. 2148--><p class="indent" > <div class="important" title="Important Note"> If you use <span
class="cmtt-10">\RestoreAcronyms</span>, don&#8217;t use any of the commands provided by
<span
class="cmss-10">glossaries-extra </span>intended for abbreviations (such as <span
@@ -4019,8 +4112,8 @@ with entries defined via <span
class="cmtt-10">\newacronym</span><a
id="dx1-12049"></a> as it will cause unexpected results.
</div>
-</p><!--l. 2106--><p class="noindent" >
-</p><!--l. 2108--><p class="indent" > In general, there&#8217;s rarely any need for <span
+</p><!--l. 2154--><p class="noindent" >
+</p><!--l. 2156--><p class="indent" > In general, there&#8217;s rarely any need for <span
class="cmtt-10">\RestoreAcronyms</span>. If you have a
document that uses <span
class="cmtt-10">\newacronymstyle</span><a
@@ -4034,33 +4127,34 @@ href="#sec:newabbrvstyle"><span
class="cmsy-10">&sect;</span>3.5 </a><a
href="#sec:newabbrvstyle">Defining New Abbreviation Styles<!--tex4ht:ref: sec:newabbrvstyle --></a> for further
details.)
-</p><!--l. 2115--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2163--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsacspace</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-12052"></a> <span
class="cmtt-10">\glsacspace{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2117--><p class="noindent" >
+</p><!--l. 2165--><p class="noindent" >
The space command <span
class="cmtt-10">\glsacspace </span>used by the <span
class="cmss-10">long-sp-short</span><a
id="dx1-12053"></a> acronym style provided
by <span
class="cmss-10">glossaries </span>is modified so that it uses
-</p><!--l. 2121--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2169--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsacspacemax</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-12054"></a> <span
class="cmtt-10">\glsacspacemax </span></div><hr>
-</p><!--l. 2123--><p class="noindent" >
+</p><!--l. 2171--><p class="noindent" >
instead of the hard-coded 3em. This is a command not a length and so can be
changed using <span
class="cmtt-10">\renewcommand</span>.
-</p><!--l. 2127--><p class="indent" > Any of the new abbreviation styles that use <span
+</p><!--l. 2175--><p class="indent" > Any of the new abbreviation styles that use <span
class="cmtt-10">\glsxtrfullsep</span><a
- id="dx1-12055"></a> (such as <span
-class="cmss-10">long-short</span><a
+ id="dx1-12055"></a> (such as <a
+href="#abbrstyle.long-short"><span
+class="cmss-10">long-short</span></a><a
id="dx1-12056"></a>)
can easily be changed to use <span
class="cmtt-10">\glsacspace </span>with
@@ -4068,47 +4162,47 @@ class="cmtt-10">\glsacspace </span>with
</p>
- <div class="verbatim" id="verbatim-70">
+ <div class="verbatim" id="verbatim-69">
\renewcommand*{\glsxtrfullsep}[1]{\glsacspace{#1}}
</div>
-<!--l. 2132--><p class="nopar" >
-</p><!--l. 2134--><p class="indent" > The <a
+<!--l. 2180--><p class="nopar" >
+</p><!--l. 2182--><p class="indent" > The <a
id="dx1-12057"></a><a
href="#glo:firstuse">first use</a> acronym font command
-</p><!--l. 2135--><p class="indent" > <hr><div title="Definition"> <span
+</p><!--l. 2183--><p class="indent" > <hr><div title="Definition"> <span
class="cmtt-10">\firstacronymfont{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2137--><p class="noindent" >
+</p><!--l. 2185--><p class="noindent" >
is redefined to use the <a
id="dx1-12058"></a>first use abbreviation font command <span
class="cmtt-10">\glsfirstabbrvfont</span><a
id="dx1-12059"></a>.
This will be reset if you use <span
class="cmtt-10">\RestoreAcronyms</span>.
-</p><!--l. 2142--><p class="indent" > The subsequent use acronym font command
-</p><!--l. 2143--><p class="indent" > <hr><div title="Definition"> <span
+</p><!--l. 2190--><p class="indent" > The subsequent use acronym font command
+</p><!--l. 2191--><p class="indent" > <hr><div title="Definition"> <span
class="cmtt-10">\acronymfont{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2145--><p class="noindent" >
+</p><!--l. 2193--><p class="noindent" >
is redefined to use the subsequent use abbreviation font command <span
class="cmtt-10">\glsabbrvfont</span><a
id="dx1-12060"></a>.
This will be reset if you use <span
class="cmtt-10">\RestoreAcronyms</span>.
</p>
-<!--l. 2150--><p class="noindent" ><a
+<!--l. 2198--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">2.8 </span> <a
id="sec:glosstylemods"></a>Glossary Style Modifications</h3>
-<!--l. 2153--><p class="noindent" >The default value of <span
+<!--l. 2201--><p class="noindent" >The default value of <span
class="cmtt-10">\glslistdottedwidth</span><a
id="dx1-13001"></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="cmtt-10">\hsize </span>isn&#8217;t set until the start of the
document.
-</p><!--l. 2158--><p class="indent" > The <span
+</p><!--l. 2206--><p class="indent" > The <span
class="cmss-10">glossaries</span><a
id="dx1-13002"></a> package tries to determine the group title from its label by first
checking if <span
@@ -4129,7 +4223,7 @@ class="cmtt-10">\glsxtr@grouptitle@</span>&#x27E8;<span
class="cmti-10">label</span>&#x27E9;
which shouldn&#8217;t clash with another package. You can set the group title
using
-</p><!--l. 2170--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2218--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrsetgrouptitle</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-13005"></a> <span
@@ -4138,57 +4232,61 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">title</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2172--><p class="noindent" >
+</p><!--l. 2220--><p class="noindent" >
For example:
</p>
- <div class="verbatim" id="verbatim-71">
+ <div class="verbatim" id="verbatim-70">
\glsxtrsetgrouptitle{A}{A&#x00A0;(a)}
</div>
-<!--l. 2176--><p class="nopar" >
-</p><!--l. 2178--><p class="noindent" >
+<!--l. 2224--><p class="nopar" >
+</p><!--l. 2226--><p class="noindent" >
</p>
-<!--l. 2178--><p class="noindent" ><a
+<!--l. 2226--><p class="noindent" ><a
href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><span class="titlemark">2.8.1 </span> <a
id="sec:stylehooks"></a>Style Hooks</h4>
-<!--l. 2181--><p class="noindent" >The commands <span
+<!--l. 2229--><p class="noindent" >The commands <span
class="cmtt-10">\glossentryname</span><a
id="dx1-14001"></a> and <span
class="cmtt-10">\glossentrydesc</span><a
id="dx1-14002"></a> are modified to take into
-account the <span
-class="cmss-10">glossname</span><a
- id="dx1-14003"></a>, <span
-class="cmss-10">glossdesc</span><a
- id="dx1-14004"></a> and <span
-class="cmss-10">glossdescfont</span><a
+account the <a
+href="#catattr.glossname"><span
+class="cmss-10">glossname</span></a><a
+ id="dx1-14003"></a>, <a
+href="#catattr.glossdesc"><span
+class="cmss-10">glossdesc</span></a><a
+ id="dx1-14004"></a> and <a
+href="#catattr.glossdescfont"><span
+class="cmss-10">glossdescfont</span></a><a
id="dx1-14005"></a> attributes (see <a
href="#sec:categories"><span
class="cmsy-10">&sect;</span>5 </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. 2187--><p class="indent" > There is a hook after <span
+</p><!--l. 2235--><p class="indent" > There is a hook after <span
class="cmtt-10">\glossentryname</span><a
id="dx1-14006"></a> and <span
class="cmtt-10">\Glossentryname</span><a
id="dx1-14007"></a>:
-</p><!--l. 2189--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2237--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrpostnamehook</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-14008"></a> <span
class="cmtt-10">\glsxtrpostnamehook{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2191--><p class="noindent" >
-By default this checks the <span
-class="cmss-10">indexname</span><a
+</p><!--l. 2239--><p class="noindent" >
+By default this checks the <a
+href="#catattr.indexname"><span
+class="cmss-10">indexname</span></a><a
id="dx1-14009"></a> attribute. If the attribute exists for the
category to which the label belongs, then the name is automatically indexed
using
-</p><!--l. 2196--><p class="indent" > <hr><div title="Definition"><span
+</p><!--l. 2244--><p class="indent" > <hr><div title="Definition"><span
class="cmtt-10">\glsxtrdoautoindexname</span><a
id="dx1-14010"></a><span
class="cmtt-10">{</span>&#x27E8;<span
@@ -4197,12 +4295,12 @@ class="cmtt-10">}</span><span
class="cmsy-10">{</span><span
class="cmtt-10">indexname</span><span
class="cmsy-10">} </span></div><hr>
-</p><!--l. 2197--><p class="noindent" >
+</p><!--l. 2245--><p class="noindent" >
See <a
href="#sec:autoindex"><span
class="cmsy-10">&sect;</span>7 </a><a
href="#sec:autoindex">Auto-Indexing<!--tex4ht:ref: sec:autoindex --></a> for further details.
-</p><!--l. 2201--><p class="indent" > As from version 1.04, the post-name hook <span
+</p><!--l. 2249--><p class="indent" > As from version 1.04, the post-name hook <span
class="cmtt-10">\glsxtrpostnamehook </span>will also use
<span
class="cmtt-10">\glsxtrpostname</span>&#x27E8;<span
@@ -4217,25 +4315,25 @@ category:
</p>
- <div class="verbatim" id="verbatim-72">
+ <div class="verbatim" id="verbatim-71">
\newcommand*{\glsxtrpostnamesymbol}{\space
&#x00A0;<br />&#x00A0;(\glsentrysymbol{\glscurrententrylabel})}
</div>
-<!--l. 2212--><p class="nopar" >
-</p><!--l. 2214--><p class="indent" > The post-description code used within the glossary is modified so that it also
+<!--l. 2260--><p class="nopar" >
+</p><!--l. 2262--><p class="indent" > The post-description code used within the glossary is modified so that it also
does
-</p><!--l. 2216--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2264--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrpostdescription</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-14012"></a> <span
class="cmtt-10">\glsxtrpostdescription </span></div><hr>
-</p><!--l. 2218--><p class="noindent" >
+</p><!--l. 2266--><p class="noindent" >
This occurs before the original <span
class="cmtt-10">\glspostdescription</span>, so if the <span
class="cmss-10">nopostdot=false</span><a
id="dx1-14013"></a>
option is used, it will be inserted before the terminating full stop.
-</p><!--l. 2223--><p class="indent" > This new command will do <span
+</p><!--l. 2271--><p class="indent" > This new command will do <span
class="cmtt-10">\glsxtrpostdesc</span>&#x27E8;<span
class="cmitt-10">category</span>&#x27E9; if it exists, where
&#x27E8;<span
@@ -4248,18 +4346,18 @@ class="cmss-10">general</span><a
class="cmtt-10">\glsxtrpostdescacronym </span>for entries with the category set to <span
class="cmss-10">acronym</span><a
id="dx1-14015"></a>.
-</p><!--l. 2230--><p class="indent" > Since both <span
+</p><!--l. 2278--><p class="indent" > Since both <span
class="cmtt-10">\glossentry </span>and <span
class="cmtt-10">\subglossentry </span>set
-</p><!--l. 2231--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2279--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glscurrententrylabel</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-14016"></a> <span
class="cmtt-10">\glscurrententrylabel </span></div><hr>
-</p><!--l. 2233--><p class="noindent" >
+</p><!--l. 2281--><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. 2238--><p class="indent" > For example, suppose you want to insert the plural form in brackets after the
+</p><!--l. 2286--><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="cmss-10">general</span><a
id="dx1-14017"></a> category, then you could
@@ -4268,14 +4366,14 @@ do:
</p>
- <div class="verbatim" id="verbatim-73">
+ <div class="verbatim" id="verbatim-72">
\renewcommand{\glsxtrpostdescgeneral}{\space
&#x00A0;<br />&#x00A0;(plural:&#x00A0;\glsentryplural{\glscurrententrylabel})}
</div>
-<!--l. 2244--><p class="nopar" > This means you don&#8217;t have to define a custom glossary style, which you may find
+<!--l. 2292--><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. 2249--><p class="indent" > <div class="important" title="Important Note"> This feature can&#8217;t be used for glossary styles that ignore <span
+</p><!--l. 2297--><p class="indent" > <div class="important" title="Important Note"> This feature can&#8217;t be used for glossary styles that ignore <span
class="cmtt-10">\glspostdescription </span>or if
you redefine <span
class="cmtt-10">\glspostdescription </span>without including <span
@@ -4293,16 +4391,16 @@ class="cmss-10">glossaries-extra-stylemods </span>Package<!--tex4ht:ref: sec:sty
class="cmss-10">glossaries</span>
that are missing <span
class="cmtt-10">\glspostdescription</span>. </div>
-</p><!--l. 2258--><p class="noindent" >
-</p><!--l. 2260--><p class="noindent" >
+</p><!--l. 2306--><p class="noindent" >
+</p><!--l. 2308--><p class="noindent" >
</p>
-<!--l. 2260--><p class="noindent" ><a
+<!--l. 2308--><p class="noindent" ><a
href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><span class="titlemark">2.8.2 </span> <a
id="sec:glosstylenumlist"></a>Number List</h4>
-<!--l. 2263--><p class="noindent" >The <a
+<!--l. 2311--><p class="noindent" >The <a
id="dx1-15001"></a><a
href="#glo:numberlist">number list</a> is now placed inside the argument of
-</p><!--l. 2264--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2312--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrFormatLocationList</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-15002"></a> <span
@@ -4310,7 +4408,7 @@ class="cmtt-10">\GlsXtrFormatLocationList{</span>&#x27E8;<span
class="cmitt-10">number list</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 2266--><p class="noindent" >
+</p><!--l. 2314--><p class="noindent" >
This is internally used by <span
class="cmtt-10">\glossaryentrynumbers</span>. The <span
class="cmss-10">nonumberlist</span><a
@@ -4320,27 +4418,27 @@ class="cmtt-10">\glossaryentrynumbers </span>so that it doesn&#8217;t display th
id="dx1-15004"></a>number list, but it
still saves the <a
id="dx1-15005"></a>number list in case it&#8217;s required.
-</p><!--l. 2272--><p class="indent" > <div class="important" title="Important Note"> If you want to suppress the <a
+</p><!--l. 2320--><p class="indent" > <div class="important" title="Important Note"> If you want to suppress the <a
id="dx1-15006"></a>number list always use the <span
class="cmss-10">nonumberlist</span><a
id="dx1-15007"></a> option
instead of redefining <span
class="cmtt-10">\glossaryentrynumbers </span>to do nothing. </div>
-</p><!--l. 2276--><p class="noindent" >
-</p><!--l. 2278--><p class="indent" > If you want to, for example, change the font for the entire <a
+</p><!--l. 2324--><p class="noindent" >
+</p><!--l. 2326--><p class="indent" > If you want to, for example, change the font for the entire <a
id="dx1-15008"></a>number list
then redefine <span
class="cmtt-10">\GlsXtrFormatLocationList </span>as appropriate. Don&#8217;t modify
<span
class="cmtt-10">\glossaryentrynumbers</span>.
-</p><!--l. 2282--><p class="indent" > Sometimes users like to insert &#8220;page&#8221; or &#8220;pages&#8221; in front of the <a
+</p><!--l. 2330--><p class="indent" > Sometimes users like to insert &#8220;page&#8221; or &#8220;pages&#8221; in front of the <a
id="dx1-15009"></a>number list. This
is quite fiddly to do with the base <span
class="cmss-10">glossaries </span>package, but <span
class="cmss-10">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. 2287--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2335--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrEnablePreLocationTag</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-15010"></a> <span
@@ -4350,7 +4448,7 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">pages</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 2289--><p class="noindent" >
+</p><!--l. 2337--><p class="noindent" >
where &#x27E8;<span
class="cmti-10">page</span>&#x27E9; is the text to display if the <a
id="dx1-15011"></a>number list only contains a single location and
@@ -4360,31 +4458,31 @@ class="cmti-10">pages</span>&#x27E9; is the text to display otherwise. For examp
</p>
- <div class="verbatim" id="verbatim-74">
+ <div class="verbatim" id="verbatim-73">
\GlsXtrEnablePreLocationTag{Page:&#x00A0;}{Pages:&#x00A0;}
</div>
-<!--l. 2295--><p class="nopar" > An extra run is required when using this command.
-</p><!--l. 2298--><p class="indent" > <div class="important" title="Important Note"> Use <span
+<!--l. 2343--><p class="nopar" > An extra run is required when using this command.
+</p><!--l. 2346--><p class="indent" > <div class="important" title="Important Note"> Use <span
class="cmtt-10">glsignore </span>not <span
class="cmtt-10">@gobble </span>as the format if you want to suppress the page
number (and only index the entry once). </div>
-</p><!--l. 2301--><p class="noindent" >
-</p><!--l. 2303--><p class="indent" > See the accompanying sample file <span
+</p><!--l. 2349--><p class="noindent" >
+</p><!--l. 2351--><p class="indent" > See the accompanying sample file <span
class="cmtt-10">sample-pages.tex</span>.
-</p><!--l. 2305--><p class="indent" > Note that <a
+</p><!--l. 2353--><p class="indent" > Note that <a
id="dx1-15012"></a><a
href="#glo:bib2gls"><span
class="cmtt-10">bib2gls</span><a
id="dx1-15013"></a></a> can be instructed to insert a prefix at the start of non-empty
location lists, which can be used as an alternative to <span
class="cmtt-10">\GlsXtrEnablePreLocationTag</span>.
-</p><!--l. 2309--><p class="noindent" >
+</p><!--l. 2357--><p class="noindent" >
</p>
-<!--l. 2309--><p class="noindent" ><a
+<!--l. 2357--><p class="noindent" ><a
href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><span class="titlemark">2.8.3 </span> <a
id="x1-160002.8.3"></a>The <span
class="cmss-10">glossaries-extra-stylemods </span>Package</h4>
-<!--l. 2312--><p class="noindent" >As from v1.02, <span
+<!--l. 2360--><p class="noindent" >As from v1.02, <span
class="cmss-10">glossaries-extra </span>now includes the package <span
class="cmss-10">glossaries-extra-stylemods</span><a
id="dx1-16001"></a> that
@@ -4396,12 +4494,12 @@ class="cmss-10">glossaries-extra</span>. For example:
</p>
- <div class="verbatim" id="verbatim-75">
+ <div class="verbatim" id="verbatim-74">
\usepackage{glossaries-extra}
&#x00A0;<br />\usepackage{glossary-longragged}
&#x00A0;<br />\usepackage{glossaries-extra-stylemods}
</div>
-<!--l. 2321--><p class="nopar" > Alternatively you can load <span
+<!--l. 2369--><p class="nopar" > Alternatively you can load <span
class="cmtt-10">glossary-</span>&#x27E8;<span
class="cmti-10">name</span>&#x27E9;<span
class="cmtt-10">.sty </span>at the same time by passing &#x27E8;<span
@@ -4413,12 +4511,13 @@ class="cmss-10">glossaries-extra-stylemods</span><a
</p>
- <div class="verbatim" id="verbatim-76">
+ <div class="verbatim" id="verbatim-75">
\usepackage{glossaries-extra}
&#x00A0;<br />\usepackage[longragged]{glossaries-extra-stylemods}
</div>
-<!--l. 2329--><p class="nopar" > Another option is to use the <span
-class="cmss-10">stylemods</span><a
+<!--l. 2377--><p class="nopar" > Another option is to use the <a
+href="#styopt.stylemods"><span
+class="cmss-10">stylemods</span></a><a
id="dx1-16003"></a> key when you load <span
class="cmss-10">glossaries-extra</span>. You can
omit a value if you only want to use the predefined styles that are automatically
@@ -4430,30 +4529,31 @@ class="cmss-10">long3col</span><a
</p>
- <div class="verbatim" id="verbatim-77">
+ <div class="verbatim" id="verbatim-76">
\usepackage[style=long3col,stylemods]{glossaries-extra}
</div>
-<!--l. 2336--><p class="nopar" > Or the value of <span
-class="cmss-10">stylemods</span><a
+<!--l. 2384--><p class="nopar" > Or the value of <a
+href="#styopt.stylemods"><span
+class="cmss-10">stylemods</span></a><a
id="dx1-16005"></a> may be a comma-separated list of the style package
identifiers. For example:
</p>
- <div class="verbatim" id="verbatim-78">
+ <div class="verbatim" id="verbatim-77">
\usepackage[style=mcoltree,stylemods=mcols]{glossaries-extra}
</div>
-<!--l. 2341--><p class="nopar" > Remember to group the value if it contains any commas:
+<!--l. 2389--><p class="nopar" > Remember to group the value if it contains any commas:
</p>
- <div class="verbatim" id="verbatim-79">
+ <div class="verbatim" id="verbatim-78">
\usepackage[stylemods={mcols,longbooktabs}]{glossaries-extra}
</div>
-<!--l. 2345--><p class="nopar" >
-</p><!--l. 2347--><p class="indent" > Note that the <span
+<!--l. 2393--><p class="nopar" >
+</p><!--l. 2395--><p class="indent" > Note that the <span
class="cmss-10">inline</span><a
id="dx1-16006"></a> style is dealt with slightly differently. The original definition
provided by the <span
@@ -4477,7 +4577,7 @@ class="cmss-10">inline</span><a
class="cmss-10">nopostdot</span><a
id="dx1-16009"></a> option, but the post-description
category hook can still be used.
-</p><!--l. 2361--><p class="indent" > As from version 1.05, the <span
+</p><!--l. 2409--><p class="indent" > As from version 1.05, the <span
class="cmss-10">glossaries-extra-stylemods </span>package provides some
additional commands for use with the <span
class="cmss-10">alttree</span><a
@@ -4490,7 +4590,7 @@ class="cmss-10">notree</span><a
id="dx1-16012"></a> option has been used when loading
<span
class="cmss-10">glossaries</span>.
-</p><!--l. 2369--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2417--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\eglssetwidest</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16013"></a> <span
@@ -4499,14 +4599,14 @@ class="cmitt-10">level</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
class="cmitt-10">name</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2371--><p class="noindent" >
+</p><!--l. 2419--><p class="noindent" >
This is like <span
class="cmtt-10">\glssetwidest </span>(provided by <span
class="cmss-10">glossary-tree</span><a
id="dx1-16014"></a>) but performs a protected
expansion on &#x27E8;<span
class="cmti-10">name</span>&#x27E9;. This has a localised effect. For a global setting, use
-</p><!--l. 2375--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2423--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\xglssetwidest</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16015"></a> <span
@@ -4515,31 +4615,31 @@ class="cmitt-10">level</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
class="cmitt-10">name</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2377--><p class="noindent" >
+</p><!--l. 2425--><p class="noindent" >
The widest entry value can later be retrieved using
-</p><!--l. 2379--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2427--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsgetwidestname</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16016"></a> <span
class="cmtt-10">\glsgetwidestname </span></div><hr>
-</p><!--l. 2381--><p class="noindent" >
+</p><!--l. 2429--><p class="noindent" >
for the top-level entries and
-</p><!--l. 2383--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2431--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsgetwidestsubname</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16017"></a> <span
class="cmtt-10">\glsgetwidestsubname{</span>&#x27E8;<span
class="cmitt-10">level</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2385--><p class="noindent" >
+</p><!--l. 2433--><p class="noindent" >
for sub-entries, where &#x27E8;<span
class="cmti-10">level</span>&#x27E9; is the level number.
-</p><!--l. 2388--><p class="indent" > The command <span
+</p><!--l. 2436--><p class="indent" > The command <span
class="cmtt-10">\glsfindwidesttoplevelname </span>provided by <span
class="cmss-10">glossary-tree</span><a
id="dx1-16018"></a> has a
CamelCase synonym:
-</p><!--l. 2390--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2438--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsFindWidestTopLevelName</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16019"></a> <span
@@ -4547,9 +4647,9 @@ class="cmtt-10">\glsFindWidestTopLevelName[</span>&#x27E8;<span
class="cmitt-10">glossary list</span>&#x27E9;<span
class="cmtt-10">]</span>
</div><hr>
-</p><!--l. 2392--><p class="noindent" >
+</p><!--l. 2440--><p class="noindent" >
Similar commands are also provided:
-</p><!--l. 2394--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2442--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsFindWidestUsedTopLevelName</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16020"></a> <span
@@ -4558,7 +4658,7 @@ class="cmitt-10">glossary</span>
<span
class="cmitt-10">list</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2396--><p class="noindent" >
+</p><!--l. 2444--><p class="noindent" >
This has an additional check that the entry has been used. Naturally this is only
useful if the glossaries that use the <span
class="cmss-10">alttree</span><a
@@ -4569,7 +4669,7 @@ This command should be placed just before the start of the glossary. (Alternativ
place it at the end of the document and save the value in the auxiliary file for the
next run.)
-</p><!--l. 2404--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2452--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsFindWidestUsedAnyName</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16022"></a> <span
@@ -4577,22 +4677,22 @@ class="cmtt-10">\glsFindWidestUsedAnyName[</span>&#x27E8;<span
class="cmitt-10">glossary list</span>&#x27E9;<span
class="cmtt-10">]</span>
</div><hr>
-</p><!--l. 2406--><p class="noindent" >
+</p><!--l. 2454--><p class="noindent" >
This is like the previous command but if doesn&#8217;t check the <span
class="cmss-10">parent</span><a
id="dx1-16023"></a> key. This is useful if
all levels should have the same width for the name.
-</p><!--l. 2411--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2459--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsFindWidestAnyName</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16024"></a> <span
class="cmtt-10">\glsFindWidestAnyName[</span>&#x27E8;<span
class="cmitt-10">glossary list</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2413--><p class="noindent" >
+</p><!--l. 2461--><p class="noindent" >
This is like the previous command but doesn&#8217;t check if the entry has been
used.
-</p><!--l. 2417--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2465--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsFindWidestUsedLevelTwo</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16025"></a> <span
@@ -4600,11 +4700,11 @@ class="cmtt-10">\glsFindWidestUsedLevelTwo[</span>&#x27E8;<span
class="cmitt-10">glossary list</span>&#x27E9;<span
class="cmtt-10">]</span>
</div><hr>
-</p><!--l. 2419--><p class="noindent" >
+</p><!--l. 2467--><p class="noindent" >
This is like <span
class="cmtt-10">\glsFindWidestUsedTopLevelName </span>but also sets the first two sub-levels
as well. Any entry that has a great-grandparent is ignored.
-</p><!--l. 2424--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2472--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsFindWidestLevelTwo</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16026"></a> <span
@@ -4612,10 +4712,10 @@ class="cmtt-10">\glsFindWidestLevelTwo[</span>&#x27E8;<span
class="cmitt-10">glossary list</span>&#x27E9;<span
class="cmtt-10">]</span>
</div><hr>
-</p><!--l. 2426--><p class="noindent" >
+</p><!--l. 2474--><p class="noindent" >
This is like the previous command but doesn&#8217;t check if the entry has been
used.
-</p><!--l. 2430--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2478--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsFindWidestUsedAnyNameSymbol</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16027"></a> <span
@@ -4626,12 +4726,12 @@ class="cmitt-10">glossary list</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
class="cmitt-10">register</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2433--><p class="noindent" >
+</p><!--l. 2481--><p class="noindent" >
This is like <span
class="cmtt-10">\glsFindWidestUsedAnyName </span>but also measures the symbol. The length
of the widest symbol is stored in &#x27E8;<span
class="cmti-10">register</span>&#x27E9;.
-</p><!--l. 2438--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2486--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsFindWidestAnyNameSymbol</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16028"></a> <span
@@ -4642,10 +4742,10 @@ class="cmitt-10">list</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
class="cmitt-10">register</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2440--><p class="noindent" >
+</p><!--l. 2488--><p class="noindent" >
This is like the previous command but it doesn&#8217;t check if the entry has been
used.
-</p><!--l. 2444--><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="cmtt-9">\glsFindWidestUsedAnyNameSymbolLocation</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16029"></a> <span
@@ -4658,7 +4758,7 @@ class="cmitt-10">symbol register</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">location register</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2447--><p class="noindent" >
+</p><!--l. 2495--><p class="noindent" >
This is like <span
class="cmtt-10">\glsFindWidestUsedAnyNameSymbol </span>but also measures the <a
id="dx1-16030"></a><a
@@ -4672,7 +4772,7 @@ class="cmti-10">symbol register</span>&#x27E9; and the length of the widest <a
id="dx1-16032"></a>number
list is stored in &#x27E8;<span
class="cmti-10">location register</span>&#x27E9;.
-</p><!--l. 2455--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2503--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsFindWidestAnyNameSymbolLocation</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16033"></a> <span
@@ -4685,10 +4785,10 @@ class="cmitt-10">symbol register</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">location register</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2458--><p class="noindent" >
+</p><!--l. 2506--><p class="noindent" >
This is like the previous command but it doesn&#8217;t check if the entry has been
used.
-</p><!--l. 2462--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2510--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsFindWidestUsedAnyNameLocation</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16034"></a> <span
@@ -4702,13 +4802,13 @@ class="cmtt-10">} </span></div><hr>
-</p><!--l. 2465--><p class="noindent" >
+</p><!--l. 2513--><p class="noindent" >
This is like <span
class="cmtt-10">\glsFindWidestUsedAnyNameSymbolLocation </span>but doesn&#8217;t measure the
symbol. The length of the widest <a
id="dx1-16035"></a>number list is stored in &#x27E8;<span
class="cmti-10">register</span>&#x27E9;.
-</p><!--l. 2470--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2518--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsFindWidestAnyNameLocation</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16036"></a> <span
@@ -4719,13 +4819,13 @@ class="cmitt-10">list</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
class="cmitt-10">register</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2473--><p class="noindent" >
+</p><!--l. 2521--><p class="noindent" >
This is like the previous command but doesn&#8217;t check if the entry has been
used.
-</p><!--l. 2477--><p class="indent" > The layout of the symbol, description and <a
+</p><!--l. 2525--><p class="indent" > The layout of the symbol, description and <a
id="dx1-16037"></a><a
href="#glo:numberlist">number list</a> is governed by
-</p><!--l. 2479--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2527--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtralttreeSymbolDescLocation</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16038"></a> <span
@@ -4736,9 +4836,9 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">number list</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2481--><p class="noindent" >
+</p><!--l. 2529--><p class="noindent" >
for top-level entries and
-</p><!--l. 2483--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2531--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtralttreeSubSymbolDescLocation</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16039"></a> <span
@@ -4749,27 +4849,27 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">number list</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2485--><p class="noindent" >
+</p><!--l. 2533--><p class="noindent" >
for sub-entries.
-</p><!--l. 2488--><p class="indent" > There is now a user level command that performs the initialisation for the <span
+</p><!--l. 2536--><p class="indent" > There is now a user level command that performs the initialisation for the <span
class="cmss-10">alttree</span><a
id="dx1-16040"></a>
style:
-</p><!--l. 2490--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2538--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtralttreeInit</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16041"></a> <span
class="cmtt-10">\glsxtralttreeInit </span></div><hr>
-</p><!--l. 2492--><p class="noindent" >
-</p><!--l. 2494--><p class="indent" > The paragraph indent for subsequent paragraphs in multi-paragraph descriptions
+</p><!--l. 2540--><p class="noindent" >
+</p><!--l. 2542--><p class="indent" > The paragraph indent for subsequent paragraphs in multi-paragraph descriptions
is provided by the length
-</p><!--l. 2496--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2544--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrAltTreeIndent</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-16042"></a> <span
class="cmtt-10">\glsxtrAltTreeIndent </span></div><hr>
-</p><!--l. 2498--><p class="noindent" >
-</p><!--l. 2500--><p class="indent" > For additional commands that are available with the <span
+</p><!--l. 2546--><p class="noindent" >
+</p><!--l. 2548--><p class="indent" > For additional commands that are available with the <span
class="cmss-10">alttree</span><a
id="dx1-16043"></a> style, see the
documented code (<span
@@ -4783,11 +4883,11 @@ class="cmtt-10">sample-alttree-marginpar.tex</span>.
</p>
-<!--l. 2507--><p class="indent" > </div>
-</p><!--l. 2507--><p class="noindent" ><a
+<!--l. 2555--><p class="indent" > </div>
+</p><!--l. 2555--><p class="noindent" ><a
href="#top">Top</a><div class="chapter"><h2 class="chapterHead">3. <a
id="sec:abbreviations"></a>Abbreviations</h2>
-</p><!--l. 2510--><p class="indent" > Abbreviations include acronyms (words formed from initial letters, such as
+</p><!--l. 2558--><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
@@ -4801,10 +4901,10 @@ to be <span
class="cmti-10">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. 2522--><p class="indent" > The <span
+</p><!--l. 2570--><p class="indent" > The <span
class="cmss-10">glossaries-extra </span>package corrects this misnomer, and provides better
abbreviation handling, with
-</p><!--l. 2524--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2572--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\newabbreviation</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-17002"></a> <span
@@ -4818,19 +4918,21 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">long</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 2526--><p class="noindent" >
-</p><!--l. 2528--><p class="indent" > This sets the <span
+</p><!--l. 2574--><p class="noindent" >
+</p><!--l. 2576--><p class="indent" > This sets the <span
class="cmss-10">category</span><a
id="dx1-17003"></a> key to <span
class="cmtt-10">abbreviation </span>by default, but that value may be
overridden in &#x27E8;<span
class="cmti-10">options</span>&#x27E9;. The category may have attributes that modify the way
-abbreviations are defined. For example, the <span
-class="cmss-10">insertdots</span><a
+abbreviations are defined. For example, the <a
+href="#catattr.insertdots"><span
+class="cmss-10">insertdots</span></a><a
id="dx1-17004"></a> attribute will automatically
insert full stops (periods) into &#x27E8;<span
-class="cmti-10">short</span>&#x27E9; or the <span
-class="cmss-10">noshortplural</span><a
+class="cmti-10">short</span>&#x27E9; or the <a
+href="#catattr.noshortplural"><span
+class="cmss-10">noshortplural</span></a><a
id="dx1-17005"></a> attribute will set the default
value of the <span
class="cmss-10">shortplural</span><a
@@ -4840,7 +4942,7 @@ href="#sec:categories"><span
class="cmsy-10">&sect;</span>5
</a><a
href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a> for further details.
-</p><!--l. 2538--><p class="indent" > See <a
+</p><!--l. 2586--><p class="indent" > See <a
href="#sec:nested"><span
class="cmsy-10">&sect;</span>2.6 </a><a
href="#sec:nested">Nested Links<!--tex4ht:ref: sec:nested --></a> regarding the pitfalls of using commands like <span
@@ -4851,10 +4953,10 @@ class="cmtt-10">\glsxtrshort</span><a
id="dx1-17008"></a> within &#x27E8;<span
class="cmti-10">short</span>&#x27E9; or &#x27E8;<span
class="cmti-10">long</span>&#x27E9;.
-</p><!--l. 2542--><p class="indent" > <div class="important" title="Important Note"> Make sure that you set the category attributes before defining new abbreviations
+</p><!--l. 2590--><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. 2545--><p class="noindent" >
-</p><!--l. 2547--><p class="indent" > The <span
+</p><!--l. 2593--><p class="noindent" >
+</p><!--l. 2595--><p class="indent" > The <span
class="cmtt-10">\newacronym</span><a
id="dx1-17009"></a> command provided by the <span
class="cmss-10">glossaries </span>package is redefined by
@@ -4868,7 +4970,7 @@ class="cmtt-10">acronym </span>(see also
href="#sec:acronymmods"><span
class="cmsy-10">&sect;</span>2.7 </a><a
href="#sec:acronymmods">Acronym Style Modifications<!--tex4ht:ref: sec:acronymmods --></a>) so
-</p><!--l. 2551--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2599--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\newacronym</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-17011"></a> <span
@@ -4881,7 +4983,7 @@ class="cmitt-10">short</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">long</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2553--><p class="noindent" >
+</p><!--l. 2601--><p class="noindent" >
is
now
equivalent
@@ -4907,17 +5009,19 @@ class="cmtt-10">}</span>
<br /><spacer type=vertical size=10></span>
-</p><!--l. 2560--><p class="indent" > The <span
+</p><!--l. 2608--><p class="indent" > The <span
class="cmtt-10">\newabbreviation </span>command is superficially similar to the <span
class="cmss-10">glossaries</span>
package&#8217;s <span
class="cmtt-10">\newacronym </span>but you can apply different styles to different categories. The
-default style is <span
-class="cmss-10">short-nolong</span><a
+default style is <a
+href="#abbrstyle.short-nolong"><span
+class="cmss-10">short-nolong</span></a><a
id="dx1-17012"></a> for entries in the <span
class="cmss-10">acronym</span><a
- id="dx1-17013"></a> category and <span
-class="cmss-10">short-long</span><a
+ id="dx1-17013"></a> category and <a
+href="#abbrstyle.short-long"><span
+class="cmss-10">short-long</span></a><a
id="dx1-17014"></a> for
entries in the <span
class="cmss-10">abbreviation</span><a
@@ -4925,237 +5029,60 @@ class="cmss-10">abbreviation</span><a
styles provided by the <span
class="cmss-10">glossaries </span>package, although they may produce similar
results.)
-</p><!--l. 2570--><p class="indent" > The short form is displayed within commands like <span
-class="cmtt-10">\gls </span>using
-</p><!--l. 2571--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glsfirstabbrvfont</span><span
-class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-17016"></a> <span
-class="cmtt-10">\glsfirstabbrvfont{</span>&#x27E8;<span
-class="cmitt-10">short-form</span>&#x27E9;<span
-class="cmtt-10">} </span></div><hr>
-</p><!--l. 2573--><p class="noindent" >
-on <a
- id="dx1-17017"></a><a
-href="#glo:firstuse">first use</a> and
-</p><!--l. 2575--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glsabbrvfont</span><span
-class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-17018"></a> <span
-class="cmtt-10">\glsabbrvfont{</span>&#x27E8;<span
-class="cmitt-10">short-form</span>&#x27E9;<span
-class="cmtt-10">} </span></div><hr>
-</p><!--l. 2577--><p class="noindent" >
-for subsequent use.
-</p><!--l. 2580--><p class="indent" > <div class="important" title="Important Note"> These commands (<span
-class="cmtt-10">\glsfirstabbrvfont </span>and <span
-class="cmtt-10">\glsabbrvfont</span>) are reset by the
-abbreviation styles and whenever an abbreviation is used by commands like <span
-class="cmtt-10">\gls</span>
-(but not by commands like <span
-class="cmtt-10">\glsentryshort</span><a
- id="dx1-17019"></a>) so don&#8217;t try redefining them outside of
-an abbreviation style. </div>
-</p><!--l. 2586--><p class="noindent" >
-</p><!--l. 2588--><p class="indent" > If you use the <span
-class="cmss-10">long-short</span><a
- id="dx1-17020"></a> style, <span
-class="cmtt-10">\glsabbrvfont </span>is redefine to use
-</p><!--l. 2590--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glsabbrvdefaultfont</span><span
-class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-17021"></a> <span
-class="cmtt-10">\glsabbrvdefaultfont{</span>&#x27E8;<span
-class="cmitt-10">text</span>&#x27E9;<span
-class="cmtt-10">} </span></div><hr>
-</p><!--l. 2592--><p class="noindent" >
-whereas the <span
-class="cmss-10">long-short-sc</span><a
- id="dx1-17022"></a> style redefines <span
-class="cmtt-10">\glsabbrvfont </span>to use <span
-class="cmtt-10">\glsxtrscfont</span>. If
-you want to use a different font-changing command you can either redefine
-<span
-class="cmtt-10">\glsabbrvdefaultfont </span>and use one of the base styles, such as <span
-class="cmss-10">long-short</span><a
- id="dx1-17023"></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. 2600--><p class="indent" > Similarly the basic styles redefine <span
-class="cmtt-10">\glsfirstabbrvfont </span>to use
-</p><!--l. 2602--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glsfirstabbrvdefaultfont</span><span
-class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-17024"></a> <span
-class="cmtt-10">\glsfirstabbrvdefaultfont{</span>&#x27E8;<span
-class="cmitt-10">short-form</span>&#x27E9;<span
-class="cmtt-10">}</span>
-</div><hr>
-</p><!--l. 2604--><p class="noindent" >
-whereas the font modifier styles, such as <span
-class="cmss-10">long-short-sc</span><a
- id="dx1-17025"></a>, use their own custom
-command, such as <span
-class="cmtt-10">\glsfirstscfont</span>.
-</p><!--l. 2609--><p class="indent" > The commands that display the full form for abbreviations use <span
-class="cmtt-10">\glsfirstabbrvfont</span>
-to display the short form and
-</p><!--l. 2611--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glsfirstlongfont</span><span
-class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-17026"></a> <span
-class="cmtt-10">\glsfirstlongfont{</span>&#x27E8;<span
-class="cmitt-10">long-form</span>&#x27E9;<span
-class="cmtt-10">} </span></div><hr>
-</p><!--l. 2613--><p class="noindent" >
-to display the long form on <a
- id="dx1-17027"></a>first use or for the inline full format. Commands like
-<span
-class="cmtt-10">\glsxtrlong </span>use
-</p><!--l. 2616--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glslongfont</span><span
-class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-17028"></a> <span
-class="cmtt-10">\glslongfont{</span>&#x27E8;<span
-class="cmitt-10">long-form</span>&#x27E9;<span
-class="cmtt-10">} </span></div><hr>
-</p><!--l. 2618--><p class="noindent" >
-instead.
-</p><!--l. 2621--><p class="indent" > As with <span
-class="cmtt-10">\glsabbrvfont</span><a
- id="dx1-17029"></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="cmss-10">glossaries-extra </span>redefine <span
-class="cmtt-10">\glsfirstlongfont </span>to
-
-
-
-use
-</p><!--l. 2626--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glsfirstlongdefaultfont</span><span
-class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-17030"></a> <span
-class="cmtt-10">\glsfirstlongdefaultfont{</span>&#x27E8;<span
-class="cmitt-10">long-form</span>&#x27E9;<span
-class="cmtt-10">}</span>
-</div><hr>
-</p><!--l. 2628--><p class="noindent" >
-and <span
-class="cmtt-10">\glslongfont </span>to use
-</p><!--l. 2630--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glslongdefaultfont</span><span
-class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-17031"></a> <span
-class="cmtt-10">\glslongdefaultfont{</span>&#x27E8;<span
-class="cmitt-10">long-form</span>&#x27E9;<span
-class="cmtt-10">} </span></div><hr>
-</p><!--l. 2632--><p class="noindent" >
-</p><!--l. 2634--><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. 2640--><p class="indent" > The &#8220;long-em&#8221; (emphasize long) styles use
-</p><!--l. 2641--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glsfirstlongemfont</span><span
-class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-17032"></a> <span
-class="cmtt-10">\glsfirstlongemfont{</span>&#x27E8;<span
-class="cmitt-10">long-form</span>&#x27E9;<span
-class="cmtt-10">} </span></div><hr>
-</p><!--l. 2643--><p class="noindent" >
-instead of <span
-class="cmtt-10">\glsfirstlongdefaultfont{</span>&#x27E8;<span
-class="cmti-10">long-form</span>&#x27E9;<span
-class="cmtt-10">} </span>and
-</p><!--l. 2645--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glslongemfont</span><span
-class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-17033"></a> <span
-class="cmtt-10">\glslongemfont{</span>&#x27E8;<span
-class="cmitt-10">long-form</span>&#x27E9;<span
-class="cmtt-10">} </span></div><hr>
-</p><!--l. 2647--><p class="noindent" >
-instead of <span
-class="cmtt-10">\glslongdefaultfont{</span>&#x27E8;<span
-class="cmti-10">long-form</span>&#x27E9;<span
-class="cmtt-10">}</span>. The first form <span
-class="cmtt-10">\glsfirstlongemfont</span>
-is initialised to use <span
-class="cmtt-10">\glslongemfont</span>.
-</p><!--l. 2651--><p class="indent" > Note that by default inserted material (provided in the final optional argument of
-commands like <span
-class="cmtt-10">\gls</span>), is placed outside the font command in the predefined styles. To
-move it inside, use:
-</p><!--l. 2654--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glsxtrinsertinsidetrue</span><span
-class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-17034"></a> <span
-class="cmtt-10">\glsxtrinsertinsidetrue </span></div><hr>
-</p><!--l. 2656--><p class="noindent" >
-This applies to all the predefined styles. For example:
-
-
-
-</p>
- <div class="verbatim" id="verbatim-80">
-\setabbreviationstyle{long-short}
-&#x00A0;<br />\renewcommand*{\glsfirstlongdefaultfont}[1]{\emph{#1}}
-&#x00A0;<br />\glsxtrinsertinsidetrue
-</div>
-<!--l. 2662--><p class="nopar" > This will make the long form and the inserted text emphasized, whereas the default
-(without <span
-class="cmtt-10">\glsxtrinsertinsidetrue</span>) would place the inserted text outside of the
-emphasized font.
-</p><!--l. 2667--><p class="indent" > Note that for some styles, such as the <span
-class="cmss-10">short-long</span><a
- id="dx1-17035"></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. 2671--><p class="indent" > There are two types of full forms. The display full form, which is used on
+</p><!--l. 2618--><p class="indent" > The way the abbreviations are displayed by commands like <span
+class="cmtt-10">\gls </span>varies according
+to the abbreviation style. The styles are set according to the entry&#8217;s category so,
+unlike the base <span
+class="cmss-10">glossaries </span>package, you can have different abbreviation styles within
+the same glossary.
+</p><!--l. 2624--><p class="indent" > There are two types of full forms. The display full form, which is used on
<a
- id="dx1-17036"></a><a
+ id="dx1-17016"></a><a
href="#glo:firstuse">first use</a> by commands like <span
class="cmtt-10">\gls</span><a
- id="dx1-17037"></a> and the inline full form, which is used by
+ id="dx1-17017"></a> and the inline full form, which is used by
commands like <span
class="cmtt-10">\glsxtrfull</span><a
- id="dx1-17038"></a>. For some of the abbreviation styles, such as
-<span
-class="cmss-10">long-short</span><a
- id="dx1-17039"></a>, the display and inline forms are the same. In the case of styles
-such as <span
-class="cmss-10">short-nolong</span><a
- id="dx1-17040"></a> or <span
-class="cmss-10">short-footnote</span><a
- id="dx1-17041"></a>, the display and inline full forms are
+ id="dx1-17018"></a>. For some of the abbreviation styles, such as
+<a
+href="#abbrstyle.long-short"><span
+class="cmss-10">long-short</span></a><a
+ id="dx1-17019"></a>, the display and inline forms are the same. In the case of styles
+such as <a
+href="#abbrstyle.short-nolong"><span
+class="cmss-10">short-nolong</span></a><a
+ id="dx1-17020"></a> or <a
+href="#abbrstyle.short-footnote"><span
+class="cmss-10">short-footnote</span></a><a
+ id="dx1-17021"></a>, the display and inline full forms are
different.
-</p><!--l. 2678--><p class="indent" > These formatting commands aren&#8217;t stored in the <span
+</p><!--l. 2631--><p class="indent" > These formatting commands aren&#8217;t stored in the <span
class="cmss-10">short</span><a
- id="dx1-17042"></a>, <span
+ id="dx1-17022"></a>, <span
class="cmss-10">shortplural</span><a
- id="dx1-17043"></a>, <span
+ id="dx1-17023"></a>, <span
class="cmss-10">long</span><a
- id="dx1-17044"></a> or
+ id="dx1-17024"></a> or
<span
class="cmss-10">longplural</span><a
- id="dx1-17045"></a> fields, which means they won&#8217;t be used within commands like
+ id="dx1-17025"></a> fields, which means they won&#8217;t be used within commands like
<span
class="cmtt-10">\glsentryshort </span>(but they are used within commands like <span
class="cmtt-10">\glsxtrshort </span>and
<span
class="cmtt-10">\glsfmtshort</span>). Note that <span
class="cmtt-10">\glsxtrlong</span><a
- id="dx1-17046"></a> and the case-changing variants don&#8217;t use
+ id="dx1-17026"></a> and the case-changing variants don&#8217;t use
<span
class="cmtt-10">\glsfirstlongfont</span>.
</p>
-<!--l. 2686--><p class="noindent" ><a
+<!--l. 2639--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">3.1 </span> <a
id="sec:tagging"></a>Tagging Initials</h3>
-<!--l. 2689--><p class="noindent" >If you would like to tag the initial letters in the long form such that those letters are
+<!--l. 2642--><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. 2692--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2645--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrEnableInitialTagging</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-18001"></a> <span
@@ -5166,53 +5093,55 @@ class="cmtt-10">}</span>
class="cmtt-10">{</span>&#x27E8;<span
class="cmitt-10">cs</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2694--><p class="noindent" >
+</p><!--l. 2647--><p class="noindent" >
before you define your abbreviations.
-</p><!--l. 2697--><p class="indent" > This command (robustly) defines &#x27E8;<span
+</p><!--l. 2650--><p class="indent" > This command (robustly) defines &#x27E8;<span
class="cmti-10">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
-the glossary it&#8217;s activated for those categories that have the <span
-class="cmss-10">tagging</span><a
+the glossary it&#8217;s activated for those categories that have the <a
+href="#catattr.tagging"><span
+class="cmss-10">tagging</span></a><a
id="dx1-18002"></a> attribute set to
&#8220;true&#8221;. For those cases it will use
-</p><!--l. 2704--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2657--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrtagfont</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-18003"></a> <span
class="cmtt-10">\glsxtrtagfont{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2706--><p class="noindent" >
+</p><!--l. 2659--><p class="noindent" >
This command defaults to <span
class="cmtt-10">\underline</span><a
id="dx1-18004"></a><span
class="cmtt-10">{</span>&#x27E8;<span
class="cmti-10">text</span>&#x27E9;<span
class="cmtt-10">} </span>but may be redefined as required.
-</p><!--l. 2710--><p class="indent" > The control sequence &#x27E8;<span
+</p><!--l. 2663--><p class="indent" > The control sequence &#x27E8;<span
class="cmti-10">cs</span>&#x27E9; can&#8217;t already be defined when used with the unstarred
version of <span
class="cmtt-10">\GlsXtrEnableInitialTagging </span>for safety reasons. The starred
version will overwrite any previous definition of &#x27E8;<span
class="cmti-10">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. 2719--><p class="indent" > The first argument of <span
+</p><!--l. 2672--><p class="indent" > The first argument of <span
class="cmtt-10">\GlsXtrEnableInitialTagging </span>is a comma-separated list
-of category names. The <span
-class="cmss-10">tagging</span><a
+of category names. The <a
+href="#catattr.tagging"><span
+class="cmss-10">tagging</span></a><a
id="dx1-18005"></a> attribute will automatically be set for those
categories. You can later set this attribute for other categories (see <a
href="#sec:categories"><span
class="cmsy-10">&sect;</span>5 </a><a
href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a>) but
this must be done before the glossary is displayed.
-</p><!--l. 2726--><p class="indent" > The accompanying sample file <span
+</p><!--l. 2679--><p class="indent" > The accompanying sample file <span
class="cmtt-10">sample-mixtures.tex </span>uses initial tagging for both
the <span
class="cmss-10">acronym</span><a
@@ -5223,17 +5152,17 @@ class="cmss-10">abbreviation</span><a
</p>
- <div class="verbatim" id="verbatim-81">
+ <div class="verbatim" id="verbatim-79">
\GlsXtrEnableInitialTagging{acronym,abbreviation}{\itag}
</div>
-<!--l. 2731--><p class="nopar" > This defines the command <span
+<!--l. 2684--><p class="nopar" > This defines the command <span
class="cmtt-10">\itag </span>which can be used in the definitions. For
example:
</p>
- <div class="verbatim" id="verbatim-82">
+ <div class="verbatim" id="verbatim-80">
\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
@@ -5245,17 +5174,18 @@ example:
&#x00A0;<br />\newabbreviation{xml}{XML}
&#x00A0;<br />&#x00A0;{e\itag{x}tensible&#x00A0;\itag{m}arkup&#x00A0;\itag{l}anguage}
</div>
-<!--l. 2746--><p class="nopar" > The underlining of the tagged letters only occurs in the glossary and then only for
-entries with the <span
-class="cmss-10">tagging</span><a
+<!--l. 2699--><p class="nopar" > The underlining of the tagged letters only occurs in the glossary and then only for
+entries with the <a
+href="#catattr.tagging"><span
+class="cmss-10">tagging</span></a><a
id="dx1-18008"></a> attribute set.
-</p><!--l. 2751--><p class="noindent" >
+</p><!--l. 2704--><p class="noindent" >
</p>
-<!--l. 2751--><p class="noindent" ><a
+<!--l. 2704--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">3.2 </span> <a
id="sec:abbrstyle"></a>Abbreviation Styles</h3>
-<!--l. 2754--><p class="noindent" >The abbreviation style must be set before abbreviations are defined using:
-</p><!--l. 2756--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 2707--><p class="noindent" >The abbreviation style must be set before abbreviations are defined using:
+</p><!--l. 2709--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\setabbreviationstyle</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-19001"></a> <span
@@ -5265,7 +5195,7 @@ class="cmtt-10">]{</span>&#x27E8;<span
class="cmitt-10">style-name</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 2758--><p class="noindent" >
+</p><!--l. 2711--><p class="noindent" >
where &#x27E8;<span
class="cmti-10">style-name</span>&#x27E9; is the name of the style and &#x27E8;<span
class="cmti-10">category</span>&#x27E9; is the category label
@@ -5275,20 +5205,23 @@ according to their given category. If there is no style set for the category, th
is the style for the <span
class="cmtt-10">abbreviation </span>category. Some styles may automatically
modify one or more of the attributes associated with the given category. For
-example, the <span
-class="cmss-10">long-noshort</span><a
- id="dx1-19002"></a> and <span
-class="cmss-10">short-nolong</span><a
- id="dx1-19003"></a> styles set the <span
-class="cmss-10">regular</span><a
+example, the <a
+href="#abbrstyle.long-noshort"><span
+class="cmss-10">long-noshort</span></a><a
+ id="dx1-19002"></a> and <a
+href="#abbrstyle.short-nolong"><span
+class="cmss-10">short-nolong</span></a><a
+ id="dx1-19003"></a> styles set the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
id="dx1-19004"></a> attribute to
<span
class="cmtt-10">true</span>.
-</p><!--l. 2769--><p class="indent" > <div class="important" title="Important Note"> If you want to apply different styles to groups of abbreviations, assign a
+</p><!--l. 2722--><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. 2773--><p class="noindent" >
-</p><!--l. 2775--><p class="indent" > Note that <span
+</p><!--l. 2726--><p class="noindent" >
+</p><!--l. 2728--><p class="indent" > Note that <span
class="cmtt-10">\setacronymstyle</span><a
id="dx1-19005"></a> is disabled by <span
class="cmss-10">glossaries-extra</span>. Use </p><div class="alltt">
@@ -5309,7 +5242,7 @@ href="#sec:acronymmods"><span
class="cmsy-10">&sect;</span>2.7 </a><a
href="#sec:acronymmods">Acronym Style Modifications<!--tex4ht:ref: sec:acronymmods --></a>). However the original acronym interface is
incompatible with all the commands described here.
-<!--l. 2785--><p class="indent" > Abbreviations can be used with the standard <span
+<!--l. 2738--><p class="indent" > Abbreviations can be used with the standard <span
class="cmss-10">glossaries </span>commands, such as <span
class="cmtt-10">\gls</span><a
id="dx1-19007"></a>,
@@ -5319,7 +5252,7 @@ class="cmtt-10">\acrshort</span><a
class="cmtt-10">\acronymfont</span><a
id="dx1-19009"></a>).
The short form can be produced with:
-</p><!--l. 2789--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2742--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrshort</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-19010"></a> <span
@@ -5330,12 +5263,12 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2791--><p class="noindent" >
+</p><!--l. 2744--><p class="noindent" >
(Use this instead of <span
class="cmtt-10">\acrshort</span><a
id="dx1-19011"></a>.)
-</p><!--l. 2794--><p class="indent" > The long form can be produced with
-</p><!--l. 2795--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2747--><p class="indent" > The long form can be produced with
+</p><!--l. 2748--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrlong</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-19012"></a> <span
@@ -5346,13 +5279,13 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2797--><p class="noindent" >
+</p><!--l. 2750--><p class="noindent" >
(Use this instead of <span
class="cmtt-10">\acrlong</span><a
id="dx1-19013"></a>.)
-</p><!--l. 2800--><p class="indent" > The <span
+</p><!--l. 2753--><p class="indent" > The <span
class="cmti-10">inline </span>full form can be produced with
-</p><!--l. 2801--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2754--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrfull</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-19014"></a> <span
@@ -5363,38 +5296,48 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2803--><p class="noindent" >
+</p><!--l. 2756--><p class="noindent" >
(This this instead of <span
class="cmtt-10">\acrfull</span><a
id="dx1-19015"></a>.)
-</p><!--l. 2806--><p class="indent" > As mentioned earlier, the inline full form may not necessarily match the format
+</p><!--l. 2759--><p class="indent" > <div class="important" title="Important Note"> In general, it&#8217;s best not to use commands like <span
+class="cmtt-10">\glsfirst</span><a
+ id="dx1-19016"></a> for abbreviations,
+especially if you use the &#x27E8;<span
+class="cmti-10">insert</span>&#x27E9; optional argument. Use either <span
+class="cmtt-10">\gls </span>(possibly with a
+reset) or <span
+class="cmtt-10">\glsxtrfull</span>. </div>
+</p><!--l. 2764--><p class="noindent" >
+</p><!--l. 2766--><p class="indent" > As mentioned earlier, the inline full form may not necessarily match the format
used on <a
- id="dx1-19016"></a><a
+ id="dx1-19017"></a><a
href="#glo:firstuse">first use</a> with <span
-class="cmtt-10">\gls</span>. For example, the <span
-class="cmss-10">short-nolong</span><a
- id="dx1-19017"></a> style only displays the
+class="cmtt-10">\gls</span>. For example, the <a
+href="#abbrstyle.short-nolong"><span
+class="cmss-10">short-nolong</span></a><a
+ id="dx1-19018"></a> style only displays the
short form on <a
- id="dx1-19018"></a>first use, but the full form will display the long form followed by the
+ id="dx1-19019"></a>first use, but the full form will display the long form followed by the
short form in parentheses.
-</p><!--l. 2813--><p class="indent" > <div class="important" title="Important Note"> If you want to use an abbreviation in a chapter or section title, use the
+</p><!--l. 2773--><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"><span
class="cmsy-10">&sect;</span>4 </a><a
href="#sec:headtitle">Entries in Sectioning Titles, Headers, Captions and
Contents<!--tex4ht:ref: sec:headtitle --></a> instead. </div>
-</p><!--l. 2817--><p class="noindent" >
-</p><!--l. 2819--><p class="indent" > The arguments &#x27E8;<span
+</p><!--l. 2777--><p class="noindent" >
+</p><!--l. 2779--><p class="indent" > The arguments &#x27E8;<span
class="cmti-10">options</span>&#x27E9;, &#x27E8;<span
class="cmti-10">label</span>&#x27E9; and &#x27E8;<span
class="cmti-10">insert</span>&#x27E9; are the same as for commands such as
<span
class="cmtt-10">\glstext</span>. There are also analogous case-changing commands:
-</p><!--l. 2823--><p class="indent" > First letter upper case short form:
-</p><!--l. 2824--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2783--><p class="indent" > First letter upper case short form:
+</p><!--l. 2784--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtrshort</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-19019"></a> <span
+ id="dx1-19020"></a> <span
class="cmtt-10">\Glsxtrshort[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -5402,12 +5345,12 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2826--><p class="noindent" >
-</p><!--l. 2828--><p class="indent" > First letter upper case long form:
-</p><!--l. 2829--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2786--><p class="noindent" >
+</p><!--l. 2788--><p class="indent" > First letter upper case long form:
+</p><!--l. 2789--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtrlong</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-19020"></a> <span
+ id="dx1-19021"></a> <span
class="cmtt-10">\Glsxtrlong[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -5415,12 +5358,12 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2831--><p class="noindent" >
-</p><!--l. 2833--><p class="indent" > First letter upper case inline full form:
-</p><!--l. 2834--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2791--><p class="noindent" >
+</p><!--l. 2793--><p class="indent" > First letter upper case inline full form:
+</p><!--l. 2794--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtrfull</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-19021"></a> <span
+ id="dx1-19022"></a> <span
class="cmtt-10">\Glsxtrfull[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -5428,12 +5371,15 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2836--><p class="noindent" >
-</p><!--l. 2838--><p class="indent" > All upper case short form:
-</p><!--l. 2839--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2796--><p class="noindent" >
+</p><!--l. 2798--><p class="indent" > All upper case short form:
+
+
+
+</p><!--l. 2799--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtrshort</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-19022"></a> <span
+ id="dx1-19023"></a> <span
class="cmtt-10">\GLSxtrshort[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -5441,12 +5387,12 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2841--><p class="noindent" >
-</p><!--l. 2843--><p class="indent" > All upper case long form:
-</p><!--l. 2844--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2801--><p class="noindent" >
+</p><!--l. 2803--><p class="indent" > All upper case long form:
+</p><!--l. 2804--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtrlong</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-19023"></a> <span
+ id="dx1-19024"></a> <span
class="cmtt-10">\GLSxtrlong[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -5454,15 +5400,12 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-
-
-
-</p><!--l. 2846--><p class="noindent" >
-</p><!--l. 2848--><p class="indent" > All upper case inline full form:
-</p><!--l. 2849--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2806--><p class="noindent" >
+</p><!--l. 2808--><p class="indent" > All upper case inline full form:
+</p><!--l. 2809--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GLSxtrfull</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-19024"></a> <span
+ id="dx1-19025"></a> <span
class="cmtt-10">\GLSxtrfull[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -5470,13 +5413,13 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2851--><p class="noindent" >
-</p><!--l. 2853--><p class="indent" > Plural forms are also available.
-</p><!--l. 2855--><p class="indent" > Short form plurals:
-</p><!--l. 2856--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2811--><p class="noindent" >
+</p><!--l. 2813--><p class="indent" > Plural forms are also available.
+</p><!--l. 2815--><p class="indent" > Short form plurals:
+</p><!--l. 2816--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrshortpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-19025"></a> <span
+ id="dx1-19026"></a> <span
class="cmtt-10">\glsxtrshortpl[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -5484,11 +5427,11 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2858--><p class="noindent" >
-</p><!--l. 2859--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2818--><p class="noindent" >
+</p><!--l. 2819--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtrshortpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-19026"></a> <span
+ id="dx1-19027"></a> <span
class="cmtt-10">\Glsxtrshortpl[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -5496,11 +5439,11 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2861--><p class="noindent" >
-</p><!--l. 2862--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2821--><p class="noindent" >
+</p><!--l. 2822--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GLSxtrshortpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-19027"></a> <span
+ id="dx1-19028"></a> <span
class="cmtt-10">\GLSxtrshortpl[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -5508,12 +5451,12 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2864--><p class="noindent" >
-</p><!--l. 2866--><p class="indent" > Long form plurals:
-</p><!--l. 2867--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2824--><p class="noindent" >
+</p><!--l. 2826--><p class="indent" > Long form plurals:
+</p><!--l. 2827--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrlongpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-19028"></a> <span
+ id="dx1-19029"></a> <span
class="cmtt-10">\glsxtrlongpl[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -5521,11 +5464,11 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2869--><p class="noindent" >
-</p><!--l. 2870--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2829--><p class="noindent" >
+</p><!--l. 2830--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtrlongpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-19029"></a> <span
+ id="dx1-19030"></a> <span
class="cmtt-10">\Glsxtrlongpl[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -5533,11 +5476,11 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2872--><p class="noindent" >
-</p><!--l. 2873--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2832--><p class="noindent" >
+</p><!--l. 2833--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GLSxtrlongpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-19030"></a> <span
+ id="dx1-19031"></a> <span
class="cmtt-10">\GLSxtrlongpl[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -5545,12 +5488,12 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2875--><p class="noindent" >
-</p><!--l. 2877--><p class="indent" > Full form plurals:
-</p><!--l. 2878--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2835--><p class="noindent" >
+</p><!--l. 2837--><p class="indent" > Full form plurals:
+</p><!--l. 2838--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrfullpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-19031"></a> <span
+ id="dx1-19032"></a> <span
class="cmtt-10">\glsxtrfullpl[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -5558,11 +5501,11 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2880--><p class="noindent" >
-</p><!--l. 2881--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2840--><p class="noindent" >
+</p><!--l. 2841--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtrfullpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-19032"></a> <span
+ id="dx1-19033"></a> <span
class="cmtt-10">\Glsxtrfullpl[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -5570,11 +5513,11 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2883--><p class="noindent" >
-</p><!--l. 2884--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 2843--><p class="noindent" >
+</p><!--l. 2844--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GLSxtrfullpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-19033"></a> <span
+ id="dx1-19034"></a> <span
class="cmtt-10">\GLSxtrfullpl[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -5582,8 +5525,8 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 2886--><p class="noindent" >
-</p><!--l. 2888--><p class="indent" > <div class="important" title="Important Note"> Be careful about using <span
+</p><!--l. 2846--><p class="noindent" >
+</p><!--l. 2848--><p class="indent" > <div class="important" title="Important Note"> Be careful about using <span
class="cmtt-10">\glsentryfull</span>, <span
class="cmtt-10">\Glsentryfull</span>, <span
class="cmtt-10">\glsentryfullpl </span>and
@@ -5592,24 +5535,33 @@ class="cmtt-10">\Glsentryfullpl</span>. These commands will use the currently ap
than the style in use when the entry was defined. If you have mixed styles,
you&#8217;ll need to use <span
class="cmtt-10">\glsxtrfull</span><a
- id="dx1-19034"></a> instead. Similarly for <span
+ id="dx1-19035"></a> instead. Similarly for <span
class="cmtt-10">\glsentryshort </span>etc.
-</div>
-</p><!--l. 2894--><p class="noindent" >
-</p><!--l. 2896--><p class="noindent" >
+</div>
+</p><!--l. 2854--><p class="noindent" >
+</p><!--l. 2856--><p class="noindent" >
</p>
-<!--l. 2896--><p class="noindent" ><a
+<!--l. 2856--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">3.3 </span> <a
id="sec:abbrshortcuts"></a>Shortcut Commands</h3>
-<!--l. 2899--><p class="noindent" >The abbreviation shortcut commands can be enabled using the package option
-<span
-class="cmss-10">shortcuts=abbreviation</span><a
- id="dx1-20001"></a> (or <span
-class="cmss-10">shortcuts=abbr</span><a
- id="dx1-20002"></a>). This defines the commands listed in
+<!--l. 2859--><p class="noindent" >The abbreviation shortcut commands can be enabled using the package option
+<a
+href="#styopt.shortcuts"><span
+class="cmss-10">shortcuts</span></a><span
+class="cmss-10">=abbreviation</span><a
+ id="dx1-20001"></a> (or <a
+href="#styopt.shortcuts"><span
+class="cmss-10">shortcuts</span></a><span
+class="cmss-10">=abbr</span><a
+ id="dx1-20002"></a>) or <a
+href="#styopt.shortcuts"><span
+class="cmss-10">shortcuts</span></a><span
+class="cmss-10">=ac</span><a
+ id="dx1-20003"></a>. (You can use
+both settings at the same time.) The provided shortcut commands listed in
<a
href="#tab:abbrshortcuts">table&#x00A0;3.1</a>.
</p>
@@ -5617,7 +5569,7 @@ href="#tab:abbrshortcuts">table&#x00A0;3.1</a>.
-<!--l. 2904--><p class="indent" > <a
+<!--l. 2866--><p class="indent" > <a
id="tab:abbrshortcuts"></a></p><hr class="float" /><div class="float"
>
@@ -5625,194 +5577,316 @@ href="#tab:abbrshortcuts">table&#x00A0;3.1</a>.
<div class="caption"
><span class="id">Table&#x00A0;3.1: </span><span
-class="content">Abbreviation Shortcut Commands</span></div><!--tex4ht:label?: x1-200031 -->
+class="content">Abbreviation Shortcut Commands</span></div><!--tex4ht:label?: x1-200041 -->
<div class="tabular"> <table id="TBL-3" class="tabular"
cellspacing="0" cellpadding="0"
><colgroup id="TBL-3-1g"><col
id="TBL-3-1" /><col
-id="TBL-3-2" /></colgroup><tr
+id="TBL-3-2" /><col
+id="TBL-3-3" /></colgroup><tr
style="vertical-align:baseline;" id="TBL-3-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-1-1"
class="td11"><span
-class="cmbx-10">Shortcut</span></td><td style="white-space:nowrap; text-align:left;" id="TBL-3-1-2"
+class="cmbx-10">Shortcut </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-3-1-2"
+class="td11"><span
+class="cmbx-10">Shortcut </span></td><td style="white-space:nowrap; text-align:left;" id="TBL-3-1-3"
class="td11"><span
class="cmbx-10">Equivalent Command</span></td>
</tr><tr
style="vertical-align:baseline;" id="TBL-3-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-2-1"
class="td11"><span
+class="cmbx-10">(</span><span
+class="cmssbx-10">shortcuts=abbreviation</span><a
+ id="dx1-20005"></a><span
+class="cmbx-10">)</span></td><td style="white-space:nowrap; text-align:left;" id="TBL-3-2-2"
+class="td11"><span
+class="cmbx-10">(</span><span
+class="cmssbx-10">shortcuts=ac</span><a
+ id="dx1-20006"></a><span
+class="cmbx-10">)</span></td>
+</tr><tr
+ style="vertical-align:baseline;" id="TBL-3-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-3-1"
+class="td11"><span
class="cmtt-10">\ab</span><a
- id="dx1-20004"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-2-2"
+ id="dx1-20007"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-3-2"
+class="td11"><span
+class="cmtt-10">\ac</span><a
+ id="dx1-20008"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-3-3"
class="td11"><span
class="cmtt-10">\cgls</span><a
- id="dx1-20005"></a> </td>
+ id="dx1-20009"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-3-1"
+ style="vertical-align:baseline;" id="TBL-3-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-4-1"
class="td11"><span
class="cmtt-10">\abp</span><a
- id="dx1-20006"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-3-2"
+ id="dx1-20010"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-4-2"
+class="td11"><span
+class="cmtt-10">\acp</span><a
+ id="dx1-20011"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-4-3"
class="td11"><span
class="cmtt-10">\cglspl</span><a
- id="dx1-20007"></a> </td>
+ id="dx1-20012"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-4-1"
+ style="vertical-align:baseline;" id="TBL-3-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-5-1"
class="td11"><span
class="cmtt-10">\as</span><a
- id="dx1-20008"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-4-2"
+ id="dx1-20013"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-5-2"
+class="td11"><span
+class="cmtt-10">\acs</span><a
+ id="dx1-20014"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-5-3"
class="td11"><span
class="cmtt-10">\glsxtrshort</span><a
- id="dx1-20009"></a> </td>
+ id="dx1-20015"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-5-1"
+ style="vertical-align:baseline;" id="TBL-3-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-6-1"
class="td11"><span
class="cmtt-10">\asp</span><a
- id="dx1-20010"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-5-2"
+ id="dx1-20016"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-6-2"
+class="td11"><span
+class="cmtt-10">\acsp</span><a
+ id="dx1-20017"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-6-3"
class="td11"><span
class="cmtt-10">\glsxtrshortpl</span><a
- id="dx1-20011"></a> </td>
+ id="dx1-20018"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-6-1"
+ style="vertical-align:baseline;" id="TBL-3-7-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-7-1"
class="td11"><span
class="cmtt-10">\al</span><a
- id="dx1-20012"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-6-2"
+ id="dx1-20019"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-7-2"
+class="td11"><span
+class="cmtt-10">\acl</span><a
+ id="dx1-20020"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-7-3"
class="td11"><span
class="cmtt-10">\glsxtrlong</span><a
- id="dx1-20013"></a> </td>
+ id="dx1-20021"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-7-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-7-1"
+ style="vertical-align:baseline;" id="TBL-3-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-8-1"
class="td11"><span
class="cmtt-10">\alp</span><a
- id="dx1-20014"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-7-2"
+ id="dx1-20022"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-8-2"
+class="td11"><span
+class="cmtt-10">\aclp</span><a
+ id="dx1-20023"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-8-3"
class="td11"><span
class="cmtt-10">\glsxtrlongpl</span><a
- id="dx1-20015"></a> </td>
+ id="dx1-20024"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-8-1"
+ style="vertical-align:baseline;" id="TBL-3-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-9-1"
class="td11"><span
class="cmtt-10">\af</span><a
- id="dx1-20016"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-8-2"
+ id="dx1-20025"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-9-2"
+class="td11"><span
+class="cmtt-10">\acf</span><a
+ id="dx1-20026"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-9-3"
class="td11"><span
class="cmtt-10">\glsxtrfull</span><a
- id="dx1-20017"></a> </td>
+ id="dx1-20027"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-9-1"
+ style="vertical-align:baseline;" id="TBL-3-10-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-10-1"
class="td11"><span
class="cmtt-10">\afp</span><a
- id="dx1-20018"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-9-2"
+ id="dx1-20028"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-10-2"
+class="td11"><span
+class="cmtt-10">\acfp</span><a
+ id="dx1-20029"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-10-3"
class="td11"><span
class="cmtt-10">\glsxtrfullpl</span><a
- id="dx1-20019"></a> </td>
+ id="dx1-20030"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-10-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-10-1"
+ style="vertical-align:baseline;" id="TBL-3-11-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-11-1"
+class="td11"><span
+class="cmtt-10">\Ab</span><a
+ id="dx1-20031"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-11-2"
+class="td11"><span
+class="cmtt-10">\Ac</span><a
+ id="dx1-20032"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-11-3"
+class="td11"><span
+class="cmtt-10">\cgls</span><a
+ id="dx1-20033"></a> </td>
+</tr><tr
+ style="vertical-align:baseline;" id="TBL-3-12-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-12-1"
+class="td11"><span
+class="cmtt-10">\Abp</span><a
+ id="dx1-20034"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-12-2"
+class="td11"><span
+class="cmtt-10">\Acp</span><a
+ id="dx1-20035"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-12-3"
+class="td11"><span
+class="cmtt-10">\cglspl</span><a
+ id="dx1-20036"></a> </td>
+</tr><tr
+ style="vertical-align:baseline;" id="TBL-3-13-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-13-1"
class="td11"><span
class="cmtt-10">\As</span><a
- id="dx1-20020"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-10-2"
+ id="dx1-20037"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-13-2"
+class="td11"><span
+class="cmtt-10">\Acs</span><a
+ id="dx1-20038"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-13-3"
class="td11"><span
class="cmtt-10">\Glsxtrshort</span><a
- id="dx1-20021"></a> </td>
+ id="dx1-20039"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-11-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-11-1"
+ style="vertical-align:baseline;" id="TBL-3-14-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-14-1"
class="td11"><span
class="cmtt-10">\Asp</span><a
- id="dx1-20022"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-11-2"
+ id="dx1-20040"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-14-2"
+class="td11"><span
+class="cmtt-10">\Acsp</span><a
+ id="dx1-20041"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-14-3"
class="td11"><span
class="cmtt-10">\Glsxtrshortpl</span><a
- id="dx1-20023"></a> </td>
+ id="dx1-20042"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-12-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-12-1"
+ style="vertical-align:baseline;" id="TBL-3-15-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-15-1"
class="td11"><span
class="cmtt-10">\Al</span><a
- id="dx1-20024"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-12-2"
+ id="dx1-20043"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-15-2"
+class="td11"><span
+class="cmtt-10">\Acl</span><a
+ id="dx1-20044"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-15-3"
class="td11"><span
class="cmtt-10">\Glsxtrlong</span><a
- id="dx1-20025"></a> </td>
+ id="dx1-20045"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-13-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-13-1"
+ style="vertical-align:baseline;" id="TBL-3-16-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-16-1"
class="td11"><span
class="cmtt-10">\Alp</span><a
- id="dx1-20026"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-13-2"
+ id="dx1-20046"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-16-2"
+class="td11"><span
+class="cmtt-10">\Aclp</span><a
+ id="dx1-20047"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-16-3"
class="td11"><span
class="cmtt-10">\Glsxtrlongpl</span><a
- id="dx1-20027"></a> </td>
+ id="dx1-20048"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-14-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-14-1"
+ style="vertical-align:baseline;" id="TBL-3-17-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-17-1"
class="td11"><span
class="cmtt-10">\Af</span><a
- id="dx1-20028"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-14-2"
+ id="dx1-20049"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-17-2"
+class="td11"><span
+class="cmtt-10">\Acf</span><a
+ id="dx1-20050"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-17-3"
class="td11"><span
class="cmtt-10">\Glsxtrfull</span><a
- id="dx1-20029"></a> </td>
+ id="dx1-20051"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-15-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-15-1"
+ style="vertical-align:baseline;" id="TBL-3-18-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-18-1"
class="td11"><span
class="cmtt-10">\Afp</span><a
- id="dx1-20030"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-15-2"
+ id="dx1-20052"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-18-2"
+class="td11"><span
+class="cmtt-10">\Acfp</span><a
+ id="dx1-20053"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-18-3"
class="td11"><span
class="cmtt-10">\Glsxtrfullpl</span><a
- id="dx1-20031"></a> </td>
+ id="dx1-20054"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-16-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-16-1"
+ style="vertical-align:baseline;" id="TBL-3-19-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-19-1"
+class="td11"><span
+class="cmtt-10">\AB</span><a
+ id="dx1-20055"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-19-2"
+class="td11"><span
+class="cmtt-10">\AC</span><a
+ id="dx1-20056"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-19-3"
+class="td11"><span
+class="cmtt-10">\cGLS</span><a
+ id="dx1-20057"></a> </td>
+</tr><tr
+ style="vertical-align:baseline;" id="TBL-3-20-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-20-1"
+class="td11"><span
+class="cmtt-10">\ABP</span><a
+ id="dx1-20058"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-20-2"
+class="td11"><span
+class="cmtt-10">\ACP</span><a
+ id="dx1-20059"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-20-3"
+class="td11"><span
+class="cmtt-10">\cGLSpl</span><a
+ id="dx1-20060"></a> </td>
+</tr><tr
+ style="vertical-align:baseline;" id="TBL-3-21-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-21-1"
class="td11"><span
class="cmtt-10">\AS</span><a
- id="dx1-20032"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-16-2"
+ id="dx1-20061"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-21-2"
+class="td11"><span
+class="cmtt-10">\ACS</span><a
+ id="dx1-20062"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-21-3"
class="td11"><span
class="cmtt-10">\GLSxtrshort</span><a
- id="dx1-20033"></a> </td>
+ id="dx1-20063"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-17-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-17-1"
+ style="vertical-align:baseline;" id="TBL-3-22-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-22-1"
class="td11"><span
class="cmtt-10">\ASP</span><a
- id="dx1-20034"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-17-2"
+ id="dx1-20064"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-22-2"
+class="td11"><span
+class="cmtt-10">\ACSP</span><a
+ id="dx1-20065"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-22-3"
class="td11"><span
class="cmtt-10">\GLSxtrshortpl</span><a
- id="dx1-20035"></a> </td>
+ id="dx1-20066"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-18-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-18-1"
+ style="vertical-align:baseline;" id="TBL-3-23-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-23-1"
class="td11"><span
class="cmtt-10">\AL</span><a
- id="dx1-20036"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-18-2"
+ id="dx1-20067"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-23-2"
+class="td11"><span
+class="cmtt-10">\ACL</span><a
+ id="dx1-20068"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-23-3"
class="td11"><span
class="cmtt-10">\GLSxtrlong</span><a
- id="dx1-20037"></a> </td>
+ id="dx1-20069"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-19-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-19-1"
+ style="vertical-align:baseline;" id="TBL-3-24-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-24-1"
class="td11"><span
class="cmtt-10">\ALP</span><a
- id="dx1-20038"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-19-2"
+ id="dx1-20070"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-24-2"
+class="td11"><span
+class="cmtt-10">\ACLP</span><a
+ id="dx1-20071"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-24-3"
class="td11"><span
class="cmtt-10">\GLSxtrlongpl</span><a
- id="dx1-20039"></a> </td>
+ id="dx1-20072"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-20-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-20-1"
+ style="vertical-align:baseline;" id="TBL-3-25-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-25-1"
class="td11"><span
class="cmtt-10">\AF</span><a
- id="dx1-20040"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-20-2"
+ id="dx1-20073"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-25-2"
+class="td11"><span
+class="cmtt-10">\ACF</span><a
+ id="dx1-20074"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-25-3"
class="td11"><span
class="cmtt-10">\GLSxtrfull</span><a
- id="dx1-20041"></a> </td>
+ id="dx1-20075"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-21-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-21-1"
+ style="vertical-align:baseline;" id="TBL-3-26-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-26-1"
class="td11"><span
class="cmtt-10">\AFP</span><a
- id="dx1-20042"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-21-2"
+ id="dx1-20076"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-26-2"
+class="td11"><span
+class="cmtt-10">\ACFP</span><a
+ id="dx1-20077"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-26-3"
class="td11"><span
class="cmtt-10">\GLSxtrfullpl</span><a
- id="dx1-20043"></a> </td>
+ id="dx1-20078"></a> </td>
</tr><tr
- style="vertical-align:baseline;" id="TBL-3-22-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-22-1"
+ style="vertical-align:baseline;" id="TBL-3-27-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-27-1"
class="td11"><span
class="cmtt-10">\newabbr</span><a
- id="dx1-20044"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-22-2"
+ id="dx1-20079"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-27-2"
+class="td11"><span
+class="cmtt-10">\newabbr</span><a
+ id="dx1-20080"></a> </td><td style="white-space:nowrap; text-align:left;" id="TBL-3-27-3"
class="td11"><span
class="cmtt-10">\newabbreviation</span><a
- id="dx1-20045"></a> </td></tr></table></div>
+ id="dx1-20081"></a> </td></tr></table></div>
</div><hr class="endfloat" />
</div>
-<!--l. 2934--><p class="noindent" ><a
+<!--l. 2904--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">3.4 </span> <a
id="sec:predefabbrvstyles"></a>Predefined Abbreviation Styles</h3>
-<!--l. 2937--><p class="noindent" >There are two types of abbreviation styles: those that treat the abbreviation as a
+<!--l. 2907--><p class="noindent" >There are two types of abbreviation styles: those that treat the abbreviation as a
regular entry (so that <span
class="cmtt-10">\gls</span><a
id="dx1-21001"></a> uses <span
@@ -5823,8 +5897,9 @@ class="cmtt-10">\gls</span><a
id="dx1-21003"></a> uses <span
class="cmtt-10">\glsxtrgenabbrvfmt</span><a
id="dx1-21004"></a>).
-</p><!--l. 2942--><p class="indent" > The regular entry abbreviation styles set the <span
-class="cmss-10">regular</span><a
+</p><!--l. 2912--><p class="indent" > The regular entry abbreviation styles set the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
id="dx1-21005"></a> attribute to &#8220;true&#8221; for the
category assigned to each abbreviation with that style. This means that on <a
id="dx1-21006"></a><a
@@ -5847,8 +5922,9 @@ class="cmss-10">long</span><a
<span
class="cmtt-10">\glsxtrshort</span><a
id="dx1-21013"></a>.
-</p><!--l. 2951--><p class="indent" > The other abbreviation styles don&#8217;t modify the <span
-class="cmss-10">regular</span><a
+</p><!--l. 2921--><p class="indent" > The other abbreviation styles don&#8217;t modify the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
id="dx1-21014"></a> attribute. The <span
class="cmss-10">first</span><a
id="dx1-21015"></a>
@@ -5866,14 +5942,17 @@ format (through commands like <span
class="cmtt-10">\glsxtrfullformat</span><a
id="dx1-21019"></a> that are defined by the
style).
-</p><!--l. 2959--><p class="indent" > In both cases, the <a
+</p><!--l. 2929--><p class="indent" > In both cases, the <a
id="dx1-21020"></a>first use of <span
class="cmtt-10">\gls</span><a
id="dx1-21021"></a> may not match the text produced by
<span
class="cmtt-10">\glsfirst</span><a
id="dx1-21022"></a> (and likewise for the plural and case-changing versions).
-</p><!--l. 2963--><p class="indent" > <div class="important" title="Important Note"> For the &#8220;sc&#8221; styles that use <span
+</p><!--l. 2933--><p class="indent" > The sample file <span
+class="cmtt-10">sample-abbr-styles.tex </span>demonstrates all predefined styles
+described here.
+</p><!--l. 2936--><p class="indent" > <div class="important" title="Important Note"> For the &#8220;sc&#8221; styles that use <span
class="cmtt-10">\textsc</span><a
id="dx1-21023"></a>, be careful about your choice of fonts as
some only have limited support. For example, you may not be able to combine bold
@@ -5882,222 +5961,509 @@ class="cmss-10">fontenc</span><a
id="dx1-21024"></a> package with the <span
class="cmss-10">T1</span>
option or something similar. </div>
-</p><!--l. 2969--><p class="noindent" >
-</p><!--l. 2971--><p class="indent" > The &#8220;sc&#8221; styles all use
-</p><!--l. 2972--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glsxtrscfont</span><span
+</p><!--l. 2942--><p class="noindent" >
+</p><!--l. 2944--><p class="indent" > The parenthetical styles, such as <a
+href="#abbrstyle.long-short"><span
+class="cmss-10">long-short</span></a><a
+ id="dx1-21025"></a>, use
+</p><!--l. 2946--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrparen</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21026"></a> <span
+class="cmtt-10">\glsxtrparen{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 2948--><p class="noindent" >
+to set the parenthetical material. This just puts parentheses around the text:
+(&#x27E8;<span
+class="cmti-10">text</span>&#x27E9;).
+</p><!--l. 2952--><p class="indent" > The basic abbreviation styles, such as <a
+href="#abbrstyle.long-short"><span
+class="cmss-10">long-short</span></a><a
+ id="dx1-21027"></a> and <a
+href="#abbrstyle.short-long"><span
+class="cmss-10">short-long</span></a><a
+ id="dx1-21028"></a> use
+</p><!--l. 2954--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsabbrvdefaultfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21029"></a> <span
+class="cmtt-10">\glsabbrvdefaultfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 2956--><p class="noindent" >
+for the short form. This just does &#x27E8;<span
+class="cmti-10">text</span>&#x27E9; by default. (That is, no font change is
+applied.) On first use,
+</p><!--l. 2959--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsfirstabbrvdefaultfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21030"></a> <span
+class="cmtt-10">\glsfirstabbrvdefaultfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 2961--><p class="noindent" >
+is used instead. By default, this just does <span
+class="cmtt-10">\glsabbrvdefaultfont</span>. The long form is
+formatted according to
+</p><!--l. 2964--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glslongdefaultfont</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-21025"></a> <span
-class="cmtt-10">\glsxtrscfont{</span>&#x27E8;<span
+ id="dx1-21031"></a> <span
+class="cmtt-10">\glslongdefaultfont{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 2974--><p class="noindent" >
-which is defined as
-</p>
- <div class="verbatim" id="verbatim-83">
-\newcommand*{\glsxtrscfont}[1]{\textsc{#1}}
-</div>
-<!--l. 2978--><p class="nopar" > and
+</p><!--l. 2966--><p class="noindent" >
+which again just does &#x27E8;<span
+class="cmti-10">text</span>&#x27E9; (no font change). On first use,
+</p><!--l. 2968--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsfirstlongdefaultfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21032"></a> <span
+class="cmtt-10">\glsfirstlongdefaultfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 2970--><p class="noindent" >
+is used instead. This just does <span
+class="cmtt-10">\glslongdefaultfont</span>. The plural suffix used for the
+short form is given by
+</p><!--l. 2973--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrabbrvpluralsuffix</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21033"></a> <span
+class="cmtt-10">\glsxtrabbrvpluralsuffix </span></div><hr>
+</p><!--l. 2975--><p class="noindent" >
+which defaults to <span
+class="cmtt-10">\glspluralsuffix</span><a
+ id="dx1-21034"></a>.
+</p><!--l. 2978--><p class="indent" > The small-cap styles, such as <a
+href="#abbrstyle.long-short-sc"><span
+class="cmss-10">long-short-sc</span></a><a
+ id="dx1-21035"></a> and <a
+href="#abbrstyle.short-sc-long"><span
+class="cmss-10">short-sc-long</span></a><a
+ id="dx1-21036"></a>, use
</p><!--l. 2980--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glsxtrfirstscfont</span><span
+class="cmtt-9">\glsabbrvscfont</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-21026"></a> <span
-class="cmtt-10">\glsxtrfirstscfont{</span>&#x27E8;<span
+ id="dx1-21037"></a> <span
+class="cmtt-10">\glsabbrvscfont{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
</p><!--l. 2982--><p class="noindent" >
-which is defined as
-
-
-
-</p>
- <div class="verbatim" id="verbatim-84">
-\newcommand*{\glsxtrfirstscfont}[1]{\glsxtrscfont{#1}}
-</div>
-<!--l. 2986--><p class="nopar" > The default plural suffix for the short form is set to
+which uses <span
+class="cmtt-10">\textsc</span>.<span class="footnote-mark"><a
+href="#fn1x3" id="fn1x3-bk"><sup class="textsuperscript">3.1</sup></a></span><a
+ id="x1-21038f1"></a>
+On first use
</p><!--l. 2988--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsabbrvdefaultfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21039"></a> <span
+class="cmtt-10">\glsfirstabbrvscfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 2990--><p class="noindent" >
+is used instead. This uses <span
+class="cmtt-10">\glsabbrvscfont </span>by default. So redefine, <span
+class="cmtt-10">\glsabbrvscfont</span>
+to change first and subsequent uses or <span
+class="cmtt-10">\glsfirstabbrvscfont </span>to change just the
+first use.
+</p><!--l. 2995--><p class="indent" > The long form for the small-cap styles uses <span
+class="cmtt-10">\glslongdefaultfont </span>or
+<span
+class="cmtt-10">\glsfirstlongdefaultfont</span>, as with the basic style. The suffix is given
+by
+</p><!--l. 2998--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrscsuffix</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-21027"></a> <span
+ id="dx1-21040"></a> <span
class="cmtt-10">\glsxtrscsuffix </span></div><hr>
-</p><!--l. 2990--><p class="noindent" >
-This just defined as
+</p><!--l. 3000--><p class="noindent" >
+This is defined as
</p>
- <div class="verbatim" id="verbatim-85">
-\newcommand*{\glsxtrscsuffix}{\glstextup{\glspluralsuffix}}
+ <div class="verbatim" id="verbatim-81">
+\newcommand*{\glsxtrscsuffix}{\glstextup{\glsxtrabbrvpluralsuffix}}
</div>
-<!--l. 2994--><p class="nopar" > The <span
+<!--l. 3004--><p class="nopar" > The <span
class="cmtt-10">\glstextup</span><a
- id="dx1-21028"></a> command is provided by <span
+ id="dx1-21041"></a> command is provided by <span
class="cmss-10">glossaries </span>and is used to switch off the
small caps font for the suffix. If you override the default short plural using the
<span
class="cmss-10">shortplural</span><a
- id="dx1-21029"></a> key when you define the abbreviation you will need to make the
+ id="dx1-21042"></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="cmss-10">aposplural</span><a
- id="dx1-21030"></a> and <span
-class="cmss-10">noshortplural</span><a
- id="dx1-21031"></a>
+behaviour can be modified through the use of the <a
+href="#catattr.aposplural"><span
+class="cmss-10">aposplural</span></a><a
+ id="dx1-21043"></a> and <a
+href="#catattr.noshortplural"><span
+class="cmss-10">noshortplural</span></a><a
+ id="dx1-21044"></a>
attributes. See <a
href="#sec:categories"><span
class="cmsy-10">&sect;</span>5 </a><a
href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a> for further details.)
-</p><!--l. 3005--><p class="indent" > Remember that <span
-class="cmtt-10">\textsc </span>renders <span
-class="cmti-10">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="cmtt-10">\glsxtrscfont </span>to convert
-its argument to lowercase. For example:
-
-
-
-</p>
- <div class="verbatim" id="verbatim-86">
-\renewcommand*{\glsxtrscfont}[1]{\textsc{\MakeLowercase{#1}}}
-</div>
-<!--l. 3012--><p class="nopar" >
-</p><!--l. 3014--><p class="indent" > The &#8220;sm&#8221; styles all use
-</p><!--l. 3015--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glsxtrsmfont</span><span
+</p><!--l. 3015--><p class="indent" > The small styles, such as <a
+href="#abbrstyle.long-short-sm"><span
+class="cmss-10">long-short-sm</span></a><a
+ id="dx1-21045"></a> and <a
+href="#abbrstyle.short-sm-long"><span
+class="cmss-10">short-sm-long</span></a><a
+ id="dx1-21046"></a>, use
+</p><!--l. 3017--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsabbrvsmfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21047"></a> <span
+class="cmtt-10">\glsabbrvsmfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 3019--><p class="noindent" >
+which uses <span
+class="cmtt-10">\textsmaller</span>. (This requires the <span
+class="cmss-10">relsizes</span><a
+ id="dx1-21048"></a> package, which isn&#8217;t loaded by
+<span
+class="cmss-10">glossaries-extra</span>, so must be loaded explicitly.) On first use
+</p><!--l. 3024--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsfirstabbrvsmfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21049"></a> <span
+class="cmtt-10">\glsfirstabbrvsmfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 3026--><p class="noindent" >
+is used instead. This uses <span
+class="cmtt-10">\glsabbrvsmfont </span>by default.
+</p><!--l. 3029--><p class="indent" > The long form for the smaller styles uses <span
+class="cmtt-10">\glslongdefaultfont </span>or
+<span
+class="cmtt-10">\glsfirstlongdefaultfont</span>, as with the basic style. The suffix is given
+by
+</p><!--l. 3032--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrsmsuffix</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-21032"></a> <span
-class="cmtt-10">\glsxtrsmfont{</span>&#x27E8;<span
+ id="dx1-21050"></a> <span
+class="cmtt-10">\glsxtrsmsuffix </span></div><hr>
+</p><!--l. 3034--><p class="noindent" >
+which defaults to just <span
+class="cmtt-10">\glsxtrabbrvpluralsuffix</span>.
+</p><!--l. 3037--><p class="indent" > The &#8220;short-em&#8221; (emphasize short) styles, such as <a
+href="#abbrstyle.long-short-em"><span
+class="cmss-10">long-short-em</span></a><a
+ id="dx1-21051"></a> or <a
+href="#abbrstyle.short-em-long"><span
+class="cmss-10">short-em-long</span></a><a
+ id="dx1-21052"></a>,
+use
+</p><!--l. 3039--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsabbrvemfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21053"></a> <span
+class="cmtt-10">\glsabbrvemfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 3041--><p class="noindent" >
+On first use
+</p><!--l. 3043--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsfirstabbrvemfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21054"></a> <span
+class="cmtt-10">\glsfirstabbrvemfont{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 3017--><p class="noindent" >
-This is defined as:
+</p><!--l. 3045--><p class="noindent" >
+is used instead. This uses <span
+class="cmtt-10">\glsabbrvemfont </span>by default. The suffix is given
+by
+</p><!--l. 3048--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtremsuffix</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21055"></a> <span
+class="cmtt-10">\glsxtremsuffix </span></div><hr>
+</p><!--l. 3050--><p class="noindent" >
+which defaults to just <span
+class="cmtt-10">\glsxtrabbrvpluralsuffix</span>. The long form is as for the basic
+style unless the style is a &#8220;long-em&#8221; style.
+</p><!--l. 3055--><p class="indent" > The &#8220;long-em&#8221; (emphasize long) styles, such as <a
+href="#abbrstyle.long-em-short-em"><span
+class="cmss-10">long-em-short-em</span></a><a
+ id="dx1-21056"></a> or <a
+href="#abbrstyle.short-em-long-em"><span
+class="cmss-10">short-em-long-em</span></a><a
+ id="dx1-21057"></a>,
+use
+</p><!--l. 3057--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsfirstlongemfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21058"></a> <span
+class="cmtt-10">\glsfirstlongemfont{</span>&#x27E8;<span
+class="cmitt-10">long-form</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 3059--><p class="noindent" >
+instead of <span
+class="cmtt-10">\glsfirstlongdefaultfont{</span>&#x27E8;<span
+class="cmti-10">long-form</span>&#x27E9;<span
+class="cmtt-10">} </span>and
+</p><!--l. 3061--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glslongemfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21059"></a> <span
+class="cmtt-10">\glslongemfont{</span>&#x27E8;<span
+class="cmitt-10">long-form</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
-</p>
- <div class="verbatim" id="verbatim-87">
-\newcommand*{\glsxtrsmfont}[1]{\textsmaller{#1}}
-</div>
-<!--l. 3021--><p class="nopar" > and
-</p><!--l. 3023--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glsxtrfirstsmfont</span><span
+</p><!--l. 3063--><p class="noindent" >
+instead of <span
+class="cmtt-10">\glslongdefaultfont{</span>&#x27E8;<span
+class="cmti-10">long-form</span>&#x27E9;<span
+class="cmtt-10">}</span>. The first form <span
+class="cmtt-10">\glsfirstlongemfont</span>
+is initialised to use <span
+class="cmtt-10">\glslongemfont</span>.
+</p><!--l. 3067--><p class="indent" > The user styles have similar commands:
+</p><!--l. 3068--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsabbrvuserfont</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-21033"></a> <span
-class="cmtt-10">\glsxtrfirstsmfont{</span>&#x27E8;<span
+ id="dx1-21060"></a> <span
+class="cmtt-10">\glsabbrvuserfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 3070--><p class="noindent" >
+for the short form,
+</p><!--l. 3072--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsfirstabbrvuserfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21061"></a> <span
+class="cmtt-10">\glsfirstabbrvuserfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 3074--><p class="noindent" >
+for the first use short form,
+</p><!--l. 3076--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glslonguserfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21062"></a> <span
+class="cmtt-10">\glslonguserfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 3078--><p class="noindent" >
+for the long form,
+</p><!--l. 3080--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsfirstlonguserfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21063"></a> <span
+class="cmtt-10">\glsfirstlonguserfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 3082--><p class="noindent" >
+for the first use long form, and
+</p><!--l. 3084--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrusersuffix</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21064"></a> <span
+class="cmtt-10">\glsxtrusersuffix </span></div><hr>
+</p><!--l. 3086--><p class="noindent" >
+for the short plural suffix.
+</p><!--l. 3089--><p class="indent" > Similarly for the hyphen styles:
+</p><!--l. 3090--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsabbrvhyphenfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21065"></a> <span
+class="cmtt-10">\glsabbrvhyphenfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 3092--><p class="noindent" >
+for the short form,
+</p><!--l. 3094--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsfirstabbrvhyphenfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21066"></a> <span
+class="cmtt-10">\glsfirstabbrvhyphenfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 3096--><p class="noindent" >
+for the first use short form,
+</p><!--l. 3098--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glslonghyphenfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21067"></a> <span
+class="cmtt-10">\glslonghyphenfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 3100--><p class="noindent" >
+for the long form,
+</p><!--l. 3102--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsfirstlonghyphenfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21068"></a> <span
+class="cmtt-10">\glsfirstlonghyphenfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 3104--><p class="noindent" >
+for the first use long form, and
+</p><!--l. 3106--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrhyphensuffix</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21069"></a> <span
+class="cmtt-10">\glsxtrhyphensuffix </span></div><hr>
+</p><!--l. 3108--><p class="noindent" >
+for the short plural suffix.
+</p><!--l. 3111--><p class="indent" > Similarly for the &#8220;only&#8221; styles, such as <a
+href="#abbrstyle.long-only-short-only"><span
+class="cmss-10">long-only-short-only</span></a><a
+ id="dx1-21070"></a>:
+</p><!--l. 3113--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsabbrvonlyfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21071"></a> <span
+class="cmtt-10">\glsabbrvonlyfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 3115--><p class="noindent" >
+for the short form,
+</p><!--l. 3117--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsfirstabbrvonlyfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21072"></a> <span
+class="cmtt-10">\glsfirstabbrvonlyfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 3119--><p class="noindent" >
+for the first use short form,
+</p><!--l. 3121--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glslongonlyfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21073"></a> <span
+class="cmtt-10">\glslongonlyfont{</span>&#x27E8;<span
+class="cmitt-10">text</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 3123--><p class="noindent" >
+for the long form,
+</p><!--l. 3125--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsfirstlongonlyfont</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21074"></a> <span
+class="cmtt-10">\glsfirstlongonlyfont{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 3025--><p class="noindent" >
-which is defined as
-</p>
- <div class="verbatim" id="verbatim-88">
-\newcommand*{\glsxtrfirstsmfont}[1]{\glsxtrsmfont{#1}}
-</div>
-<!--l. 3029--><p class="nopar" > If you want to use this style, you must explicitly load the <span
-class="cmss-10">relsize</span><a
- id="dx1-21034"></a> package which
-defines the <span
-class="cmtt-10">\textsmaller</span><a
- id="dx1-21035"></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><!--l. 3127--><p class="noindent" >
+for the first use long form, and
+</p><!--l. 3129--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtronlysuffix</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21075"></a> <span
+class="cmtt-10">\glsxtronlysuffix </span></div><hr>
+</p><!--l. 3131--><p class="noindent" >
+for the short plural suffix.
+</p><!--l. 3134--><p class="indent" > Note that by default inserted material (provided in the final optional argument of
+commands like <span
+class="cmtt-10">\gls</span>), is placed outside the font command in the predefined styles. To
+move it inside, use:
+</p><!--l. 3137--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrinsertinsidetrue</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-21076"></a> <span
+class="cmtt-10">\glsxtrinsertinsidetrue </span></div><hr>
+</p><!--l. 3139--><p class="noindent" >
+This applies to all the predefined styles. For example:
</p>
- <div class="verbatim" id="verbatim-89">
-\renewcommand*{\glsxtrsmfont}[1]{\textsmaller{\MakeTextUppercase{#1}}}
+ <div class="verbatim" id="verbatim-82">
+\setabbreviationstyle{long-short}
+&#x00A0;<br />\renewcommand*{\glsfirstlongdefaultfont}[1]{\emph{#1}}
+&#x00A0;<br />\glsxtrinsertinsidetrue
</div>
-<!--l. 3036--><p class="nopar" > The default plural suffix for the short form is set to
-</p><!--l. 3038--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glsxtrsmsuffix</span><span
-class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-21036"></a> <span
-class="cmtt-10">\glsxtrsmsuffix </span></div><hr>
-</p><!--l. 3040--><p class="noindent" >
-This just does <span
-class="cmtt-10">\glspluralsuffix</span><a
- id="dx1-21037"></a>.
-</p><!--l. 3043--><p class="indent" > The &#8220;em&#8221; styles all use
-</p><!--l. 3044--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glsabbrvemfont</span><span
-class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-21038"></a> <span
-class="cmtt-10">\glsabbrvemfont{</span>&#x27E8;<span
-class="cmitt-10">text</span>&#x27E9;<span
-class="cmtt-10">} </span></div><hr>
-</p><!--l. 3046--><p class="noindent" >
-which is defined as:
+<!--l. 3145--><p class="nopar" > This will make the long form and the inserted text emphasized, whereas the default
+(without <span
+class="cmtt-10">\glsxtrinsertinsidetrue</span>) would place the inserted text outside of the
+emphasized font.
+</p><!--l. 3150--><p class="indent" > Note that for some styles, such as the <a
+href="#abbrstyle.short-long"><span
+class="cmss-10">short-long</span></a><a
+ id="dx1-21077"></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. 3154--><p class="indent" > Remember that <span
+class="cmtt-10">\textsc </span>renders <span
+class="cmti-10">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="cmtt-10">\glsabbrvscfont </span>to
+convert its argument to lowercase. For example:
</p>
- <div class="verbatim" id="verbatim-90">
-\newcommand*{\glsabbrvemfont}[1]{\emph{#1}}
+ <div class="verbatim" id="verbatim-83">
+\renewcommand*{\glsabbrvscfont}[1]{\textsc{\MakeLowercase{#1}}}
</div>
-<!--l. 3050--><p class="nopar" > and
-</p><!--l. 3052--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\glsfirstabbrvemfont</span><span
-class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-21039"></a> <span
-class="cmtt-10">\glsfirstabbrvemfont{</span>&#x27E8;<span
-class="cmitt-10">text</span>&#x27E9;<span
-class="cmtt-10">} </span></div><hr>
-</p><!--l. 3054--><p class="noindent" >
-which is defined as:
+<!--l. 3161--><p class="nopar" >
+</p><!--l. 3163--><p class="indent" > 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 case:
</p>
- <div class="verbatim" id="verbatim-91">
-\newcommand*{\glsfirstabbrvemfont}[1]{\glsabbrvemfont{#1}}
+ <div class="verbatim" id="verbatim-84">
+\renewcommand*{\glsabbrvscfont}[1]{\textsc{\MakeTextLowercase{#1}}}
+&#x00A0;<br />\renewcommand*{\glsabbrvsmfont}[1]{\textsmaller{\MakeTextUppercase{#1}}}
</div>
-<!--l. 3058--><p class="nopar" >
-</p><!--l. 3060--><p class="indent" > Some of the styles use
-</p><!--l. 3061--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 3169--><p class="nopar" >
+</p><!--l. 3171--><p class="indent" > Some of the styles use
+</p><!--l. 3172--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrfullsep</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-21040"></a> <span
+ id="dx1-21078"></a> <span
class="cmtt-10">\glsxtrfullsep{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 3063--><p class="noindent" >
+</p><!--l. 3174--><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-92">
+ <div class="verbatim" id="verbatim-85">
\renewcommand*{\glsxtrfullsep}[1]{~}
</div>
-<!--l. 3068--><p class="nopar" > or
+<!--l. 3179--><p class="nopar" > or
</p>
- <div class="verbatim" id="verbatim-93">
+ <div class="verbatim" id="verbatim-86">
\renewcommand*{\glsxtrfullsep}[1]{\glsacspace{#1}}
</div>
-<!--l. 3072--><p class="nopar" >
-</p><!--l. 3074--><p class="indent" > The new naming scheme for abbreviation styles is as follows: </p>
+<!--l. 3183--><p class="nopar" >
+</p><!--l. 3185--><p class="indent" > The new naming scheme for abbreviation styles is as follows: </p>
<ul class="itemize1">
<li class="itemize">&#x27E8;<span
class="cmti-10">field1</span>&#x27E9;[<span
class="cmtt-10">-</span>&#x27E8;<span
class="cmti-10">modifier1</span>&#x27E9;]<span
-class="cmtt-10">-</span>&#x27E8;<span
+class="cmtt-10">-</span>[post]&#x27E8;<span
class="cmti-10">field2</span>&#x27E9;[<span
class="cmtt-10">-</span>&#x27E8;<span
class="cmti-10">modifier2</span>&#x27E9;][<span
class="cmtt-10">-user</span>]
- <!--l. 3079--><p class="noindent" >This is for the parenthetical styles. The <span
+ <!--l. 3190--><p class="noindent" >This is for the parenthetical styles. The <span
class="cmtt-10">-</span>&#x27E8;<span
class="cmti-10">modifier</span>&#x27E9; parts may be omitted.
These styles display &#x27E8;<span
@@ -6106,121 +6472,185 @@ class="cmti-10">field2</span>&#x27E9; in parentheses. If &#x27E8;<span
class="cmti-10">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. 3085--><p class="noindent" >If the <span
+ </p><!--l. 3196--><p class="noindent" >If the <span
class="cmtt-10">-</span>&#x27E8;<span
class="cmti-10">modifier</span>&#x27E9; part is present, then the field has a font changing command
applied to it.
- </p><!--l. 3088--><p class="noindent" >If the <span
+ </p><!--l. 3199--><p class="noindent" >If <span
+class="cmtt-10">post </span>is present then &#x27E8;<span
+class="cmti-10">field2</span>&#x27E9; is placed after the <a
+ id="dx1-21079"></a><a
+href="#glo:linktext">link-text</a> using the
+ post-link hook.
+ </p><!--l. 3202--><p class="noindent" >If the <span
class="cmtt-10">-user </span>part is present, then the <span
class="cmss-10">user1</span><a
- id="dx1-21041"></a> value, if provided, is inserted
+ id="dx1-21080"></a> value, if provided, is inserted
into the parenthetical material . (The field used for the inserted material
may be changed.)
- </p><!--l. 3092--><p class="noindent" >Examples: </p>
+ </p><!--l. 3206--><p class="noindent" >Examples: </p>
<ul class="itemize2">
- <li class="itemize"><span
-class="cmss-10">long-noshort-sc</span><a
- id="dx1-21042"></a>: &#x27E8;<span
+ <li class="itemize"><a
+href="#abbrstyle.long-noshort-sc"><span
+class="cmss-10">long-noshort-sc</span></a><a
+ id="dx1-21081"></a>: &#x27E8;<span
class="cmti-10">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="cmss-10">long-em-short-em</span><a
- id="dx1-21043"></a>: both the long form and the short form are
+ <li class="itemize"><a
+href="#abbrstyle.long-em-short-em"><span
+class="cmss-10">long-em-short-em</span></a><a
+ id="dx1-21082"></a>: both the long form and the short form are
emphasized. The short form is in parentheses.
</li>
- <li class="itemize"><span
-class="cmss-10">long-short-em</span><a
- id="dx1-21044"></a>: the short form is emphasized but not the long form.
+ <li class="itemize"><a
+href="#abbrstyle.long-short-em"><span
+class="cmss-10">long-short-em</span></a><a
+ id="dx1-21083"></a>: the short form is emphasized but not the long form.
The short form is in parentheses.
</li>
- <li class="itemize"><span
-class="cmss-10">long-short-user</span><a
- id="dx1-21045"></a>: if the <span
+ <li class="itemize"><a
+href="#abbrstyle.long-short-user"><span
+class="cmss-10">long-short-user</span></a><a
+ id="dx1-21084"></a>: if the <span
class="cmss-10">user1</span><a
- id="dx1-21046"></a> key has been set, this produces the style
+ id="dx1-21085"></a> key has been set, this produces the style
&#x27E8;<span
class="cmti-10">long</span>&#x27E9; (&#x27E8;<span
class="cmti-10">short</span>&#x27E9;, &#x27E8;<span
class="cmti-10">user1</span>&#x27E9;) otherwise it just produces &#x27E8;<span
class="cmti-10">long</span>&#x27E9; (&#x27E8;<span
-class="cmti-10">short</span>&#x27E9;).</li></ul>
+class="cmti-10">short</span>&#x27E9;).
+ </li>
+ <li class="itemize"><a
+href="#abbrstyle.long-hyphen-postshort-hyphen"><span
+class="cmss-10">long-hyphen-postshort-hyphen</span></a><a
+ id="dx1-21086"></a>: the short form and the inserted
+ material (provided by the final optional argument of commands like
+ <span
+class="cmtt-10">\gls</span>) is moved to the post-link hook. The long form is formatted
+ according to <span
+class="cmtt-10">\glslonghyphenfont </span>(or <span
+class="cmtt-10">\glsfirstlonghyphenfont</span>
+ on first use). The short form is formatted according to
+ <span
+class="cmtt-10">\glsabbrvhyphenfont </span>(or <span
+class="cmtt-10">\glsfirstabbrvhyphenfont </span>on first
+ use).</li></ul>
+
+
+
</li>
<li class="itemize">&#x27E8;<span
+class="cmti-10">style</span>&#x27E9;<span
+class="cmtt-10">-noreg</span>
+ <!--l. 3230--><p class="noindent" >Some styles set the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-21087"></a> attribute. In some cases, there&#8217;s a version of the
+ style that doesn&#8217;t set this attribute. For example, <a
+href="#abbrstyle.long-em-noshort-em"><span
+class="cmss-10">long-em-noshort-em</span></a><a
+ id="dx1-21088"></a> sets the
+ <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-21089"></a> attribute. The <a
+href="#abbrstyle.long-em-noshort-em-noreg"><span
+class="cmss-10">long-em-noshort-em-noreg</span></a><a
+ id="dx1-21090"></a> style is a minor variation that
+ style that doesn&#8217;t set the attribute.
+ </p><!--l. 3237--><p class="noindent" >There are a few &#8220;noshort&#8221; styles, such as <a
+href="#abbrstyle.long-hyphen-noshort-noreg"><span
+class="cmss-10">long-hyphen-noshort-noreg</span></a><a
+ id="dx1-21091"></a>, that have
+ &#8220;-noreg&#8221; version without a regular version. This is because the style won&#8217;t work
+ properly with the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-21092"></a> set, but the naming scheme is maintained for
+ consistency with the other &#8220;noshort&#8221; styles.
+ </p></li>
+ <li class="itemize">&#x27E8;<span
class="cmti-10">field1</span>&#x27E9;[<span
class="cmtt-10">-</span>&#x27E8;<span
class="cmti-10">modifier1</span>&#x27E9;]<span
class="cmtt-10">-</span>[<span
class="cmtt-10">post</span>]<span
class="cmtt-10">footnote</span>
- <!--l. 3109--><p class="noindent" >The display style uses &#x27E8;<span
+ <!--l. 3247--><p class="noindent" >The display style uses &#x27E8;<span
class="cmti-10">field1</span>&#x27E9; followed by a footnote with the other field in it. If
<span
class="cmtt-10">post </span>is present then the footnote is placed after the <a
- id="dx1-21047"></a><a
+ id="dx1-21093"></a><a
href="#glo:linktext">link-text</a> using the
post-link hook. The inline style does &#x27E8;<span
class="cmti-10">field1</span>&#x27E9; followed by the other field in
parentheses.
- </p><!--l. 3115--><p class="noindent" >If <span
+ </p><!--l. 3253--><p class="noindent" >If <span
class="cmtt-10">-</span>&#x27E8;<span
class="cmti-10">modifier1</span>&#x27E9; is present, &#x27E8;<span
class="cmti-10">field1</span>&#x27E9; has a font-changing command applied to
it.
- </p><!--l. 3118--><p class="noindent" >Examples: </p>
-
-
-
+ </p><!--l. 3256--><p class="noindent" >Examples: </p>
<ul class="itemize2">
- <li class="itemize"><span
-class="cmss-10">short-footnote</span><a
- id="dx1-21048"></a>: short form in the text with the long form in the
+ <li class="itemize"><a
+href="#abbrstyle.short-footnote"><span
+class="cmss-10">short-footnote</span></a><a
+ id="dx1-21094"></a>: short form in the text with the long form in the
footnote.
</li>
- <li class="itemize"><span
-class="cmss-10">short-sc-postfootnote</span><a
- id="dx1-21049"></a>: short form in smallcaps with the long form in
+ <li class="itemize"><a
+href="#abbrstyle.short-sc-postfootnote"><span
+class="cmss-10">short-sc-postfootnote</span></a><a
+ id="dx1-21095"></a>: short form in smallcaps with the long form in
the footnote outside of the <a
- id="dx1-21050"></a><a
-href="#glo:linktext">link-text</a>.</li></ul>
- <!--l. 3126--><p class="noindent" ><div class="important" title="Important Note"> Take care with the footnote styles. Remember that there are some situations
+ id="dx1-21096"></a>link-text.</li></ul>
+ <!--l. 3264--><p class="noindent" ><div class="important" title="Important Note"> Take care with the footnote styles. Remember that there are some situations
where <span
class="cmtt-10">\footnote</span><a
- id="dx1-21051"></a> doesn&#8217;t work. </div>
- </p><!--l. 3129--><p class="noindent" >
+ id="dx1-21097"></a> doesn&#8217;t work. </div>
+ </p><!--l. 3267--><p class="noindent" >
</p></li>
<li class="itemize">&#x27E8;<span
class="cmti-10">style</span>&#x27E9;<span
class="cmtt-10">-desc</span>
- <!--l. 3133--><p class="noindent" >Like &#x27E8;<span
+ <!--l. 3271--><p class="noindent" >Like &#x27E8;<span
class="cmti-10">style</span>&#x27E9; but the <span
class="cmss-10">description</span><a
- id="dx1-21052"></a> key must be provided when defining abbreviations
+ id="dx1-21098"></a> key must be provided when defining abbreviations
with this style.
- </p><!--l. 3136--><p class="noindent" >Examples: </p>
+ </p><!--l. 3274--><p class="noindent" >Examples: </p>
<ul class="itemize2">
- <li class="itemize"><span
-class="cmss-10">short-long-desc</span><a
- id="dx1-21053"></a>: like <span
-class="cmss-10">short-long</span><a
- id="dx1-21054"></a> but requires a description.
+ <li class="itemize"><a
+href="#abbrstyle.short-long-desc"><span
+class="cmss-10">short-long-desc</span></a><a
+ id="dx1-21099"></a>: like <a
+href="#abbrstyle.short-long"><span
+class="cmss-10">short-long</span></a><a
+ id="dx1-21100"></a> but requires a description.
</li>
- <li class="itemize"><span
-class="cmss-10">short-em-footnote-desc</span><a
- id="dx1-21055"></a>: like <span
-class="cmss-10">short-em-footnote</span><a
- id="dx1-21056"></a> but requires a
+ <li class="itemize"><a
+href="#abbrstyle.short-em-footnote-desc"><span
+class="cmss-10">short-em-footnote-desc</span></a><a
+ id="dx1-21101"></a>: like <a
+href="#abbrstyle.short-em-footnote"><span
+class="cmss-10">short-em-footnote</span></a><a
+ id="dx1-21102"></a> but requires a
description.</li></ul>
+
+
+
</li></ul>
-<!--l. 3146--><p class="indent" > Not all combinations that fit the above syntax are provided. Pre-version 1.04
+<!--l. 3284--><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. 3152--><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="cmtt-9">\GlsXtrWarnDeprecatedAbbrStyle</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-21057"></a> <span
+ id="dx1-21103"></a> <span
class="cmtt-10">\GlsXtrWarnDeprecatedAbbrStyle</span>
<span
class="cmtt-10">{</span>&#x27E8;<span
@@ -6228,25 +6658,24 @@ class="cmitt-10">old-name</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">new-name</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 3154--><p class="noindent" >
+</p><!--l. 3292--><p class="noindent" >
where &#x27E8;<span
class="cmti-10">old-name</span>&#x27E9; is the deprecated name and &#x27E8;<span
class="cmti-10">new-name</span>&#x27E9; is the preferred name. You
can suppress these warnings by redefining this command to do nothing.
-</p><!--l. 3160--><p class="noindent" >
+</p><!--l. 3298--><p class="noindent" >
</p>
-<!--l. 3160--><p class="noindent" ><a
+<!--l. 3298--><p class="noindent" ><a
href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><span class="titlemark">3.4.1 </span> <a
id="sec:predefregabbrvstyles"></a>Predefined Abbreviation Styles that Set the Regular Attribute</h4>
-<!--l. 3163--><p class="noindent" >The following abbreviation styles set the <span
-class="cmss-10">regular</span><a
+<!--l. 3301--><p class="noindent" >The following abbreviation styles set the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
id="dx1-22001"></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
+<a
+ id="abbrstyle.short-nolong"></a><span
class="cmssbx-10">short-nolong</span><a
id="dx1-22002"></a> </dt><dd
class="description">This only displays the short form on <a
@@ -6264,80 +6693,102 @@ class="cmti-10">long</span>&#x27E9;). The long form on its own can be displayed
class="cmtt-10">\glsxtrlong</span><a
id="dx1-22006"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short"></a><span
class="cmssbx-10">short</span><a
id="dx1-22007"></a> </dt><dd
-class="description">A synonym for <span
-class="cmss-10">short-nolong</span><a
+class="description">A synonym for <a
+href="#abbrstyle.short-nolong"><span
+class="cmss-10">short-nolong</span></a><a
id="dx1-22008"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-sc-nolong"></a><span
class="cmssbx-10">short-sc-nolong</span><a
id="dx1-22009"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-nolong</span><a
+class="description">Like <a
+href="#abbrstyle.short-nolong"><span
+class="cmss-10">short-nolong</span></a><a
id="dx1-22010"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtrscfont</span><a
- id="dx1-22011"></a>.
+class="cmtt-10">\glsabbrvscfont</span><a
+ id="dx1-22011"></a> (which defaults to <span
+class="cmtt-10">\textsc</span>).
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-sc"></a><span
class="cmssbx-10">short-sc</span><a
id="dx1-22012"></a> </dt><dd
-class="description">A synonym for <span
-class="cmss-10">short-sc-nolong</span><a
+class="description">A synonym for <a
+href="#abbrstyle.short-sc-nolong"><span
+class="cmss-10">short-sc-nolong</span></a><a
id="dx1-22013"></a>
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-sm-nolong"></a><span
class="cmssbx-10">short-sm-nolong</span><a
id="dx1-22014"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-nolong</span><a
+class="description">Like <a
+href="#abbrstyle.short-nolong"><span
+class="cmss-10">short-nolong</span></a><a
id="dx1-22015"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtrsmfont</span><a
- id="dx1-22016"></a>.
+class="cmtt-10">\glsabbrvsmfont</span><a
+ id="dx1-22016"></a> (which defaults to <span
+class="cmtt-10">\textsmaller</span>).
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-sm"></a><span
class="cmssbx-10">short-sm</span><a
id="dx1-22017"></a> </dt><dd
-class="description">A synonym for <span
-class="cmss-10">short-sm-nolong</span><a
+class="description">A synonym for <a
+href="#abbrstyle.short-sm-nolong"><span
+class="cmss-10">short-sm-nolong</span></a><a
id="dx1-22018"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-em-nolong"></a><span
class="cmssbx-10">short-em-nolong</span><a
id="dx1-22019"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-nolong</span><a
+class="description">Like <a
+href="#abbrstyle.short-nolong"><span
+class="cmss-10">short-nolong</span></a><a
id="dx1-22020"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtremfont</span><a
+class="cmtt-10">\glsabbrvemfont</span><a
id="dx1-22021"></a>.
+
+
+
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-em"></a><span
class="cmssbx-10">short-em</span><a
id="dx1-22022"></a> </dt><dd
-class="description">A synonym for <span
-class="cmss-10">short-em-nolong</span><a
+class="description">A synonym for <a
+href="#abbrstyle.short-em-nolong"><span
+class="cmss-10">short-em-nolong</span></a><a
id="dx1-22023"></a>
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-nolong-desc"></a><span
class="cmssbx-10">short-nolong-desc</span><a
id="dx1-22024"></a> </dt><dd
-class="description">Like the <span
-class="cmss-10">short-nolong</span><a
+class="description">Like the <a
+href="#abbrstyle.short-nolong"><span
+class="cmss-10">short-nolong</span></a><a
id="dx1-22025"></a> style, but the <span
class="cmss-10">name</span><a
id="dx1-22026"></a> is set to the full
form and the <span
class="cmss-10">description</span><a
id="dx1-22027"></a> must be supplied by the user. You may prefer
- to use the <span
-class="cmss-10">short-nolong</span><a
+ to use the <a
+href="#abbrstyle.short-nolong"><span
+class="cmss-10">short-nolong</span></a><a
id="dx1-22028"></a> style with the post-description hook set to display
the long form and override the <span
class="cmss-10">description</span><a
@@ -6345,71 +6796,85 @@ class="cmss-10">description</span><a
<span
class="cmtt-10">sample-acronym-desc.tex</span>.)
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-desc"></a><span
class="cmssbx-10">short-desc</span><a
id="dx1-22030"></a> </dt><dd
-class="description">A synonym for <span
-class="cmss-10">short-nolong-desc</span><a
+class="description">A synonym for <a
+href="#abbrstyle.short-nolong-desc"><span
+class="cmss-10">short-nolong-desc</span></a><a
id="dx1-22031"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-sc-nolong-desc"></a><span
class="cmssbx-10">short-sc-nolong-desc</span><a
id="dx1-22032"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-nolong</span><a
+class="description">Like <a
+href="#abbrstyle.short-nolong"><span
+class="cmss-10">short-nolong</span></a><a
id="dx1-22033"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtrscfont</span><a
- id="dx1-22034"></a>.
+class="cmtt-10">\glsabbrvscfont</span><a
+ id="dx1-22034"></a> (which defaults to <span
+class="cmtt-10">\textsc</span>).
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-sc-desc"></a><span
class="cmssbx-10">short-sc-desc</span><a
id="dx1-22035"></a> </dt><dd
-class="description">A synonym for <span
-class="cmss-10">short-sc-nolong-desc</span><a
+class="description">A synonym for <a
+href="#abbrstyle.short-sc-nolong-desc"><span
+class="cmss-10">short-sc-nolong-desc</span></a><a
id="dx1-22036"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-sm-nolong-desc"></a><span
class="cmssbx-10">short-sm-nolong-desc</span><a
id="dx1-22037"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-nolong-desc</span><a
+class="description">Like <a
+href="#abbrstyle.short-nolong-desc"><span
+class="cmss-10">short-nolong-desc</span></a><a
id="dx1-22038"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to
use <span
-class="cmtt-10">\glsxtrsmfont</span><a
- id="dx1-22039"></a>.
-
-
-
+class="cmtt-10">\glsabbrvsmfont</span><a
+ id="dx1-22039"></a> (which defaults to <span
+class="cmtt-10">\textsmaller</span>).
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-sm-desc"></a><span
class="cmssbx-10">short-sm-desc</span><a
id="dx1-22040"></a> </dt><dd
-class="description">A synonym for <span
-class="cmss-10">short-sm-nolong-desc</span><a
+class="description">A synonym for <a
+href="#abbrstyle.short-sm-nolong-desc"><span
+class="cmss-10">short-sm-nolong-desc</span></a><a
id="dx1-22041"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-em-nolong-desc"></a><span
class="cmssbx-10">short-em-nolong-desc</span><a
id="dx1-22042"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-nolong-desc</span><a
+class="description">Like <a
+href="#abbrstyle.short-nolong-desc"><span
+class="cmss-10">short-nolong-desc</span></a><a
id="dx1-22043"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to
use <span
-class="cmtt-10">\glsxtremfont</span><a
+class="cmtt-10">\glsabbrvemfont</span><a
id="dx1-22044"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-em-desc"></a><span
class="cmssbx-10">short-em-desc</span><a
id="dx1-22045"></a> </dt><dd
-class="description">A synonym for <span
-class="cmss-10">short-em-nolong-desc</span><a
+class="description">A synonym for <a
+href="#abbrstyle.short-em-nolong-desc"><span
+class="cmss-10">short-em-nolong-desc</span></a><a
id="dx1-22046"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-noshort-desc"></a><span
class="cmssbx-10">long-noshort-desc</span><a
id="dx1-22047"></a> </dt><dd
class="description">This style only displays the long form, regardless of first
@@ -6422,7 +6887,7 @@ class="cmtt-10">\glsxtrshort</span><a
class="cmti-10">long</span>&#x27E9;
(&#x27E8;<span
class="cmti-10">short</span>&#x27E9;).
- <!--l. 3233--><p class="noindent" >The <span
+ <!--l. 3371--><p class="noindent" >The <span
class="cmss-10">name</span><a
id="dx1-22050"></a> and <span
class="cmss-10">sort</span><a
@@ -6436,23 +6901,30 @@ class="cmti-10">long</span>&#x27E9;
(&#x27E8;<span
class="cmti-10">short</span>&#x27E9;).
</p></dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-desc"></a><span
class="cmssbx-10">long-desc</span><a
id="dx1-22053"></a> </dt><dd
-class="description">A synonym for <span
-class="cmss-10">long-noshort-desc</span><a
+class="description">A synonym for <a
+href="#abbrstyle.long-noshort-desc"><span
+class="cmss-10">long-noshort-desc</span></a><a
id="dx1-22054"></a>.
+
+
+
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-noshort-sc-desc"></a><span
class="cmssbx-10">long-noshort-sc-desc</span><a
id="dx1-22055"></a> </dt><dd
-class="description">Like the <span
-class="cmss-10">long-noshort-desc</span><a
+class="description">Like the <a
+href="#abbrstyle.long-noshort-desc"><span
+class="cmss-10">long-noshort-desc</span></a><a
id="dx1-22056"></a> style but the short form
- (accessed through commands like <span
+ (accessed through commands like <span
class="cmtt-10">\glsxtrshort</span><a
- id="dx1-22057"></a>) use <span
-class="cmtt-10">\glsxtrscfont</span><a
+ id="dx1-22057"></a>) use <span
+class="cmtt-10">\glsabbrvscfont</span><a
id="dx1-22058"></a>.
(This style was originally called <span
class="cmss-10">long-desc-sc</span><a
@@ -6460,62 +6932,67 @@ class="cmss-10">long-desc-sc</span><a
1.04, but original name retained as a deprecated synonym for
backward-compatibility.)
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-noshort-sm-desc"></a><span
class="cmssbx-10">long-noshort-sm-desc</span><a
id="dx1-22060"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">long-noshort-desc</span><a
+class="description">Like <a
+href="#abbrstyle.long-noshort-desc"><span
+class="cmss-10">long-noshort-desc</span></a><a
id="dx1-22061"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to
use <span
-class="cmtt-10">\glsxtrsmfont</span><a
+class="cmtt-10">\glsabbrvsmfont</span><a
id="dx1-22062"></a>. (This style was originally called <span
class="cmss-10">long-desc-sm</span><a
id="dx1-22063"></a>.
Renamed in version 1.04, but original name retained as a deprecated
synonym for backward-compatibility.)
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-noshort-em-desc"></a><span
class="cmssbx-10">long-noshort-em-desc</span><a
id="dx1-22064"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">long-noshort-desc</span><a
+class="description">Like <a
+href="#abbrstyle.long-noshort-desc"><span
+class="cmss-10">long-noshort-desc</span></a><a
id="dx1-22065"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to
- use <span
-class="cmtt-10">\glsxtremfont</span><a
- id="dx1-22066"></a>. The long form isn&#8217;t emphasized. (This style was
+ use <span
+class="cmtt-10">\glsabbrvemfont</span><a
+ id="dx1-22066"></a>. The long form isn&#8217;t emphasized. (This style was
originally called <span
class="cmss-10">long-desc-em</span><a
id="dx1-22067"></a>. Renamed in version 1.04, but original name
retained as a deprecated synonym for backward-compatibility.)
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-em-noshort-em-desc"></a><span
class="cmssbx-10">long-em-noshort-em-desc</span><a
id="dx1-22068"></a> </dt><dd
-class="description">New to version 1.04, like <span
-class="cmss-10">long-noshort-desc</span><a
+class="description">New to version 1.04, like <a
+href="#abbrstyle.long-noshort-desc"><span
+class="cmss-10">long-noshort-desc</span></a><a
id="dx1-22069"></a> but
- redefines <span
-class="cmtt-10">\glsabbrvfont </span>to use <span
-class="cmtt-10">\glsxtremfont</span><a
- id="dx1-22070"></a>. The long form uses
+ redefines <span
+class="cmtt-10">\glsabbrvfont </span>to use <span
+class="cmtt-10">\glsabbrvemfont</span><a
+ id="dx1-22070"></a>. The long form uses
<span
class="cmtt-10">\glsfirstlongemfont</span><a
id="dx1-22071"></a> and <span
class="cmtt-10">\glslongemfont</span><a
id="dx1-22072"></a>.
-
-
-
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-noshort"></a><span
class="cmssbx-10">long-noshort</span><a
id="dx1-22073"></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="cmss-10">long-noshort-desc</span><a
+ like the <a
+href="#abbrstyle.long-noshort-desc"><span
+class="cmss-10">long-noshort-desc</span></a><a
id="dx1-22074"></a> style, but the <span
class="cmss-10">name</span><a
id="dx1-22075"></a> and <span
@@ -6525,71 +7002,84 @@ class="cmss-10">sort</span><a
class="cmss-10">description</span><a
id="dx1-22077"></a> is set to the long form.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long"></a><span
class="cmssbx-10">long</span><a
id="dx1-22078"></a> </dt><dd
-class="description">A synonym for <span
-class="cmss-10">long-noshort</span><a
+class="description">A synonym for <a
+href="#abbrstyle.long-noshort"><span
+class="cmss-10">long-noshort</span></a><a
id="dx1-22079"></a>
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-noshort-sc"></a><span
class="cmssbx-10">long-noshort-sc</span><a
id="dx1-22080"></a> </dt><dd
-class="description">Like the <span
-class="cmss-10">long-noshort</span><a
- id="dx1-22081"></a> style but the short form (accessed
- through commands like <span
+class="description">Like the <a
+href="#abbrstyle.long-noshort"><span
+class="cmss-10">long-noshort</span></a><a
+ id="dx1-22081"></a> style but the short form (accessed through
+ commands like <span
class="cmtt-10">\glsxtrshort</span><a
- id="dx1-22082"></a>) use <span
-class="cmtt-10">\glsxtrscfont</span><a
- id="dx1-22083"></a>. (This style
- was originally called <span
+ id="dx1-22082"></a>) use <span
+class="cmtt-10">\glsabbrvscfont</span><a
+ id="dx1-22083"></a>. (This style was
+ originally called <span
class="cmss-10">long-sc</span><a
- id="dx1-22084"></a>. Renamed in version 1.04, but original name
+ id="dx1-22084"></a>. Renamed in version 1.04, but original name
retained as a deprecated synonym for backward-compatibility.)
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-noshort-sm"></a><span
class="cmssbx-10">long-noshort-sm</span><a
id="dx1-22085"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">long-noshort</span><a
+class="description">Like <a
+href="#abbrstyle.long-noshort"><span
+class="cmss-10">long-noshort</span></a><a
id="dx1-22086"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtrsmfont</span><a
+class="cmtt-10">\glsabbrvsmfont</span><a
id="dx1-22087"></a>. (This style was originally called <span
class="cmss-10">long-sm</span><a
id="dx1-22088"></a>. Renamed in
version 1.04, but original name retained as a deprecated synonym for
backward-compatibility.)
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-noshort-em"></a><span
class="cmssbx-10">long-noshort-em</span><a
id="dx1-22089"></a> </dt><dd
-class="description">This style is like <span
-class="cmss-10">long-noshort</span><a
+class="description">This style is like <a
+href="#abbrstyle.long-noshort"><span
+class="cmss-10">long-noshort</span></a><a
id="dx1-22090"></a> but redefines <span
class="cmtt-10">\glsabbrvfont</span>
to use <span
-class="cmtt-10">\glsxtremfont</span><a
- id="dx1-22091"></a>. The long form isn&#8217;t emphasized. (This style was
- originally called <span
+class="cmtt-10">\glsabbrvemfont</span><a
+ id="dx1-22091"></a>. The long form isn&#8217;t emphasized. (This style
+ was originally called <span
class="cmss-10">long-em</span><a
- id="dx1-22092"></a>. Renamed in version 1.04, but original name
+ id="dx1-22092"></a>. Renamed in version 1.04, but original name
retained as a deprecated synonym for backward-compatibility.)
+
+
+
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-em-noshort-em"></a><span
class="cmssbx-10">long-em-noshort-em</span><a
id="dx1-22093"></a> </dt><dd
-class="description">New to version 1.04, this style is like <span
-class="cmss-10">long-noshort</span><a
+class="description">New to version 1.04, this style is like <a
+href="#abbrstyle.long-noshort"><span
+class="cmss-10">long-noshort</span></a><a
id="dx1-22094"></a> but
redefines <span
class="cmtt-10">\glsabbrvfont </span>to use <span
-class="cmtt-10">\glsxtremfont</span><a
+class="cmtt-10">\glsabbrvemfont</span><a
id="dx1-22095"></a>, <span
-class="cmtt-10">\glsfirstlongfont </span>to
- use <span
+class="cmtt-10">\glsfirstlongfont</span>
+ to use <span
class="cmtt-10">\glsfirstlongemfont </span>and <span
class="cmtt-10">\glslongfont </span>to use <span
class="cmtt-10">\glslongemfont</span>.
@@ -6598,20 +7088,29 @@ class="cmtt-10">\gls</span><a
id="dx1-22096"></a>, but can be obtained
using <span
class="cmtt-10">\glsxtrshort</span><a
- id="dx1-22097"></a>.
+ id="dx1-22097"></a>. The related style <a
+ id="abbrstyle.long-em-noshort-em-noreg"></a><span
+class="cmss-10">long-em-noshort-em-noreg</span><a
+ id="dx1-22098"></a> doesn&#8217;t
+ set the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-22099"></a> attribute.
</dd></dl>
-<!--l. 3310--><p class="noindent" >
+<!--l. 3450--><p class="noindent" >
</p>
-<!--l. 3310--><p class="noindent" ><a
+<!--l. 3450--><p class="noindent" ><a
href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><span class="titlemark">3.4.2 </span> <a
id="sec:predefnonregabbrvstyles"></a>Predefined Abbreviation Styles that Don&#8217;t Set the Regular Attribute</h4>
-<!--l. 3313--><p class="noindent" >The following abbreviation styles will set the <span
-class="cmss-10">regular</span><a
+<!--l. 3453--><p class="noindent" >The following abbreviation styles will set the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
id="dx1-23001"></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
+<a
+ id="abbrstyle.long-short"></a><span
class="cmssbx-10">long-short</span><a
id="dx1-23002"></a> </dt><dd
class="description">On <a
@@ -6624,9 +7123,6 @@ class="cmss-10">name</span><a
id="dx1-23004"></a> and <span
class="cmss-10">sort</span><a
id="dx1-23005"></a> keys are
-
-
-
set to the short form. (The <span
class="cmss-10">name</span><a
id="dx1-23006"></a> key additionally includes the font
@@ -6637,76 +7133,124 @@ class="cmss-10">description</span><a
long and short forms are separated by <span
class="cmtt-10">\glsxtrfullsep</span>. If you want to
insert material within the parentheses (such as a&#x00A0;translation), try the
- <span
-class="cmss-10">long-short-user</span><a
+ <a
+href="#abbrstyle.long-short-user"><span
+class="cmss-10">long-short-user</span></a><a
id="dx1-23008"></a> style.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-short-sc"></a><span
class="cmssbx-10">long-short-sc</span><a
id="dx1-23009"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">long-short</span><a
+class="description">Like <a
+href="#abbrstyle.long-short"><span
+class="cmss-10">long-short</span></a><a
id="dx1-23010"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtrscfont</span><a
+class="cmtt-10">\glsabbrvscfont</span><a
id="dx1-23011"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-short-sm"></a><span
class="cmssbx-10">long-short-sm</span><a
id="dx1-23012"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">long-short</span><a
+class="description">Like <a
+href="#abbrstyle.long-short"><span
+class="cmss-10">long-short</span></a><a
id="dx1-23013"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtrsmfont</span><a
+class="cmtt-10">\glsabbrvsmfont</span><a
id="dx1-23014"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-short-em"></a><span
class="cmssbx-10">long-short-em</span><a
id="dx1-23015"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">long-short</span><a
+class="description">Like <a
+href="#abbrstyle.long-short"><span
+class="cmss-10">long-short</span></a><a
id="dx1-23016"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtremfont</span><a
+class="cmtt-10">\glsabbrvemfont</span><a
id="dx1-23017"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-em-short-em"></a><span
class="cmssbx-10">long-em-short-em</span><a
id="dx1-23018"></a> </dt><dd
-class="description">New to version 1.04, this style is like <span
-class="cmss-10">long-short-em</span><a
+class="description">New to version 1.04, this style is like <a
+href="#abbrstyle.long-short-em"><span
+class="cmss-10">long-short-em</span></a><a
id="dx1-23019"></a> but
redefines <span
class="cmtt-10">\glsfirstlongfont </span>to use <span
class="cmtt-10">\glsfirstlongemfont</span><a
id="dx1-23020"></a>.
</dd><dt class="description">
-<span
-class="cmssbx-10">long-short-user</span><a
+<a
+ id="abbrstyle.long-only-short-only"></a><span
+class="cmssbx-10">long-only-short-only</span><a
id="dx1-23021"></a> </dt><dd
-class="description">This style was introduced in version 1.04. It&#8217;s like the <span
-class="cmss-10">long-short</span><a
- id="dx1-23022"></a> style
+class="description">New to version 1.17, this style only shows the long form
+ on first use and only shows the short form on subsequent use. The inline
+ full form <span
+class="cmtt-10">\glsxtrfull </span>shows the long form followed by the short form in
+ parentheses.
+
+
+
+ </dd><dt class="description">
+<a
+ id="abbrstyle.long-only-short-only-desc"></a><span
+class="cmssbx-10">long-only-short-only-desc</span><a
+ id="dx1-23022"></a> </dt><dd
+class="description">New to version 1.17, this style is like
+ <a
+href="#abbrstyle.long-only-short-only"><span
+class="cmss-10">long-only-short-only</span></a><a
+ id="dx1-23023"></a> but the user must supply the description.
+ </dd><dt class="description">
+<a
+ id="abbrstyle.long-em-noshort-em-noreg"></a><span
+class="cmssbx-10">long-em-noshort-em-noreg</span><a
+ id="dx1-23024"></a> </dt><dd
+class="description">New to version 1.17, this style is like
+ <a
+href="#abbrstyle.long-em-noshort-em"><span
+class="cmss-10">long-em-noshort-em</span></a><a
+ id="dx1-23025"></a> but doesn&#8217;t set the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-23026"></a> attribute.
+ </dd><dt class="description">
+<a
+ id="abbrstyle.long-short-user"></a><span
+class="cmssbx-10">long-short-user</span><a
+ id="dx1-23027"></a> </dt><dd
+class="description">This style was introduced in version 1.04. It&#8217;s like the <a
+href="#abbrstyle.long-short"><span
+class="cmss-10">long-short</span></a><a
+ id="dx1-23028"></a> style
but additional information can be inserted into the parenthetical material. This
checks the value of the field given by
- <!--l. 3351--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 3507--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtruserfield</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-23023"></a> <span
+ id="dx1-23029"></a> <span
class="cmtt-10">\glsxtruserfield </span></div><hr>
- </p><!--l. 3353--><p class="noindent" >
+ </p><!--l. 3509--><p class="noindent" >
(which defaults to <span
class="cmtt-10">useri</span>) using <span
class="cmtt-10">\ifglshasfield</span><a
- id="dx1-23024"></a> (provided by <span
+ id="dx1-23030"></a> (provided by <span
class="cmss-10">glossaries</span>). If the
- field hasn&#8217;t been set, the style behaves like the <span
-class="cmss-10">long-short</span><a
- id="dx1-23025"></a> style and produces
+ field hasn&#8217;t been set, the style behaves like the <a
+href="#abbrstyle.long-short"><span
+class="cmss-10">long-short</span></a><a
+ id="dx1-23031"></a> style and produces
&#x27E8;<span
class="cmti-10">long</span>&#x27E9; (&#x27E8;<span
class="cmti-10">short</span>&#x27E9;) but if the field has been set, the contents of that field are inserted
@@ -6715,431 +7259,546 @@ class="cmti-10">long</span>&#x27E9; (&#x27E8;<span
class="cmti-10">short</span>&#x27E9;, &#x27E8;<span
class="cmti-10">field-value</span>&#x27E9;). The format is
governed by
- </p><!--l. 3361--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ </p><!--l. 3517--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtruserparen</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-23026"></a> <span
+ id="dx1-23032"></a> <span
class="cmtt-10">\glsxtruserparen{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
- </p><!--l. 3363--><p class="noindent" >
+ </p><!--l. 3519--><p class="noindent" >
where &#x27E8;<span
-class="cmti-10">text</span>&#x27E9; is the short form (for the <span
-class="cmss-10">long-short-user</span><a
- id="dx1-23027"></a> style) or the long form (for
- the <span
-class="cmss-10">short-long-user</span><a
- id="dx1-23028"></a> style). This command first inserts a space using
+class="cmti-10">text</span>&#x27E9; is the short form (for the <a
+href="#abbrstyle.long-short-user"><span
+class="cmss-10">long-short-user</span></a><a
+ id="dx1-23033"></a> style) or the long form (for
+ the <a
+href="#abbrstyle.short-long-user"><span
+class="cmss-10">short-long-user</span></a><a
+ id="dx1-23034"></a> style). This command first inserts a space using
<span
-class="cmtt-10">\glsxtrfullsep </span>and then the parenthetical content. The &#x27E8;<span
-class="cmti-10">text</span>&#x27E9; argument
- includes the font formatting command, <span
-class="cmtt-10">\glsfirstabbrvfont{</span>&#x27E8;<span
+class="cmtt-10">\glsxtrfullsep </span>and then the parenthetical content (using <span
+class="cmtt-10">\glsxtrparen</span><a
+ id="dx1-23035"></a>).
+ </p><!--l. 3526--><p class="noindent" >The &#x27E8;<span
+class="cmti-10">text</span>&#x27E9; argument includes the font formatting command, <span
+class="cmtt-10">\glsfirstabbrvfont</span>
+ <span
+class="cmtt-10">{</span>&#x27E8;<span
class="cmti-10">short</span>&#x27E9;<span
-class="cmtt-10">} </span>in the
- case of the <span
-class="cmss-10">long-short-user</span><a
- id="dx1-23029"></a> style and <span
+class="cmtt-10">} </span>in the case of the <a
+href="#abbrstyle.long-short-user"><span
+class="cmss-10">long-short-user</span></a><a
+ id="dx1-23036"></a> style and <span
class="cmtt-10">\glsfirstlongfont{</span>&#x27E8;<span
class="cmti-10">long</span>&#x27E9;<span
-class="cmtt-10">} </span>in the case of
- the <span
-class="cmss-10">short-long-user</span><a
- id="dx1-23030"></a> style.
- </p><!--l. 3374--><p class="noindent" >For example:
+class="cmtt-10">}</span>
+ in the case of the <a
+href="#abbrstyle.short-long-user"><span
+class="cmss-10">short-long-user</span></a><a
+ id="dx1-23037"></a> style.
+ </p><!--l. 3532--><p class="noindent" >For example:
</p>
- <div class="verbatim" id="verbatim-94">
+ <div class="verbatim" id="verbatim-87">
\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. 3384--><p class="nopar" > On first use, <span class="obeylines-h"><span class="verb"><span
+ <!--l. 3542--><p class="nopar" > On first use, <span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\gls{tug}</span></span></span> will appear as:
</p><div class="quote">
- <!--l. 3387--><p class="noindent" ><span class="TEX">T<span
+ <!--l. 3545--><p class="noindent" ><span class="TEX">T<span
class="E">E</span>X</span>&#x00A0;User Group (TUG)</p></div>
- <!--l. 3389--><p class="noindent" >whereas <span class="obeylines-h"><span class="verb"><span
+ <!--l. 3547--><p class="noindent" >whereas <span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\gls{dante}</span></span></span> will appear as:
</p><div class="quote">
- <!--l. 3391--><p class="noindent" >Deutschsprachige Anwendervereinigung <span class="TEX">T<span
+ <!--l. 3549--><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. 3394--><p class="noindent" >The short form is formatted according to
- </p><!--l. 3395--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 3552--><p class="noindent" >The short form is formatted according to
+ </p><!--l. 3553--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsabbrvuserfont</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-23031"></a> <span
+ id="dx1-23038"></a> <span
class="cmtt-10">\glsabbrvuserfont{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
- </p><!--l. 3397--><p class="noindent" >
+ </p><!--l. 3555--><p class="noindent" >
and the plural suffix is given by
- </p><!--l. 3399--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ </p><!--l. 3557--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrusersuffix</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-23032"></a> <span
+ id="dx1-23039"></a> <span
class="cmtt-10">\glsxtrusersuffix </span></div><hr>
- </p><!--l. 3401--><p class="noindent" >
- </p><!--l. 3403--><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="cmss-10">long-short-sc</span><a
- id="dx1-23033"></a>
+ </p><!--l. 3559--><p class="noindent" >
+ </p><!--l. 3561--><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 <a
+href="#abbrstyle.long-short-sc"><span
+class="cmss-10">long-short-sc</span></a><a
+ id="dx1-23040"></a>
style:
</p>
- <div class="verbatim" id="verbatim-95">
- \renewcommand{\glsabbruserfont}[1]{\glsxtrscfont{#1}}
+ <div class="verbatim" id="verbatim-88">
+ \renewcommand{\glsabbruserfont}[1]{\glsabbrvscfont{#1}}
&#x00A0;<br />\renewcommand{\glsxtrusersuffix}{\glsxtrscsuffix}
</div>
- <!--l. 3409--><p class="nopar" >
+ <!--l. 3567--><p class="nopar" >
</p></dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-noshort-noreg"></a><span
+class="cmssbx-10">long-noshort-noreg</span><a
+ id="dx1-23041"></a> </dt><dd
+class="description">This style is like <a
+href="#abbrstyle.long-noshort"><span
+class="cmss-10">long-noshort</span></a><a
+ id="dx1-23042"></a> but it doesn&#8217;t set the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-23043"></a>
+ attribute.
+ </dd><dt class="description">
+<a
+ id="abbrstyle.long-noshort-desc-noreg"></a><span
+class="cmssbx-10">long-noshort-desc-noreg</span><a
+ id="dx1-23044"></a> </dt><dd
+class="description">This style is like <a
+href="#abbrstyle.long-noshort-desc"><span
+class="cmss-10">long-noshort-desc</span></a><a
+ id="dx1-23045"></a> but it doesn&#8217;t set the
+ <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-23046"></a> attribute.
+ </dd><dt class="description">
+<a
+ id="abbrstyle.long-short-desc"></a><span
class="cmssbx-10">long-short-desc</span><a
- id="dx1-23034"></a> </dt><dd
+ id="dx1-23047"></a> </dt><dd
class="description">On <a
- id="dx1-23035"></a><a
+ id="dx1-23048"></a><a
href="#glo:firstuse">first use</a>, this style uses the format &#x27E8;<span
class="cmti-10">long</span>&#x27E9; (&#x27E8;<span
class="cmti-10">short</span>&#x27E9;). The
inline and display full forms are the same. The <span
class="cmss-10">name</span><a
- id="dx1-23036"></a> is set to the full
+ id="dx1-23049"></a> is set to the full
form. The <span
class="cmss-10">sort</span><a
- id="dx1-23037"></a> key is set to &#x27E8;<span
+ id="dx1-23050"></a> key is set to &#x27E8;<span
class="cmti-10">long</span>&#x27E9; (&#x27E8;<span
class="cmti-10">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. 3418--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 3584--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrlongshortdescsort</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-23038"></a> <span
+ id="dx1-23051"></a> <span
class="cmtt-10">\glsxtrlongshortdescsort </span></div><hr>
- </p><!--l. 3420--><p class="noindent" >
+ </p><!--l. 3586--><p class="noindent" >
For example:
</p>
- <div class="verbatim" id="verbatim-96">
+ <div class="verbatim" id="verbatim-89">
\renewcommand*{\glsxtrlongshortdescsort}{\the\glsshorttok}
</div>
- <!--l. 3424--><p class="nopar" > The <span
+ <!--l. 3590--><p class="nopar" > The <span
class="cmss-10">description</span><a
- id="dx1-23039"></a> must be supplied by the user. The long and short forms are
+ id="dx1-23052"></a> must be supplied by the user. The long and short forms are
separated by <span
class="cmtt-10">\glsxtrfullsep</span>.
</p></dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-short-sc-desc"></a><span
class="cmssbx-10">long-short-sc-desc</span><a
- id="dx1-23040"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">long-short-desc</span><a
- id="dx1-23041"></a> but redefines <span
+ id="dx1-23053"></a> </dt><dd
+class="description">Like <a
+href="#abbrstyle.long-short-desc"><span
+class="cmss-10">long-short-desc</span></a><a
+ id="dx1-23054"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtrscfont</span><a
- id="dx1-23042"></a>.
+class="cmtt-10">\glsabbrvscfont</span><a
+ id="dx1-23055"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-short-sm-desc"></a><span
class="cmssbx-10">long-short-sm-desc</span><a
- id="dx1-23043"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">long-short-desc</span><a
- id="dx1-23044"></a> but redefines <span
+ id="dx1-23056"></a> </dt><dd
+class="description">Like <a
+href="#abbrstyle.long-short-desc"><span
+class="cmss-10">long-short-desc</span></a><a
+ id="dx1-23057"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtrsmfont</span><a
- id="dx1-23045"></a>.
+class="cmtt-10">\glsabbrvsmfont</span><a
+ id="dx1-23058"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-short-em-desc"></a><span
class="cmssbx-10">long-short-em-desc</span><a
- id="dx1-23046"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">long-short-desc</span><a
- id="dx1-23047"></a> but redefines <span
+ id="dx1-23059"></a> </dt><dd
+class="description">Like <a
+href="#abbrstyle.long-short-desc"><span
+class="cmss-10">long-short-desc</span></a><a
+ id="dx1-23060"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtremfont</span><a
- id="dx1-23048"></a>.
+class="cmtt-10">\glsabbrvemfont</span><a
+ id="dx1-23061"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-em-short-em-desc"></a><span
class="cmssbx-10">long-em-short-em-desc</span><a
- id="dx1-23049"></a> </dt><dd
-class="description">New to version 1.04, this style is like <span
-class="cmss-10">long-short-em-desc</span><a
- id="dx1-23050"></a> but
+ id="dx1-23062"></a> </dt><dd
+class="description">New to version 1.04, this style is like <a
+href="#abbrstyle.long-short-em-desc"><span
+class="cmss-10">long-short-em-desc</span></a><a
+ id="dx1-23063"></a> but
redefines <span
class="cmtt-10">\glsfirstlongfont </span>to use <span
class="cmtt-10">\glsfirstlongemfont</span><a
- id="dx1-23051"></a>.
+ id="dx1-23064"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-em-noshort-em-desc-noreg"></a><span
+class="cmssbx-10">long-em-noshort-em-desc-noreg</span><a
+ id="dx1-23065"></a> </dt><dd
+class="description">New to version 1.17, this style is like
+ <a
+href="#abbrstyle.long-em-noshort-em-desc"><span
+class="cmss-10">long-em-noshort-em-desc</span></a><a
+ id="dx1-23066"></a> but doesn&#8217;t set the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-23067"></a> attribute.
+ </dd><dt class="description">
+<a
+ id="abbrstyle.long-short-user-desc"></a><span
class="cmssbx-10">long-short-user-desc</span><a
- id="dx1-23052"></a> </dt><dd
+ id="dx1-23068"></a> </dt><dd
class="description">New to version 1.04, this style is like a&#x00A0;cross between the
- <span
-class="cmss-10">long-short-desc</span><a
- id="dx1-23053"></a> style and the <span
-class="cmss-10">long-short-user</span><a
- id="dx1-23054"></a> style. The display and inline forms
- are as for <span
-class="cmss-10">long-short-user</span><a
- id="dx1-23055"></a> and the <span
+ <a
+href="#abbrstyle.long-short-desc"><span
+class="cmss-10">long-short-desc</span></a><a
+ id="dx1-23069"></a> style and the <a
+href="#abbrstyle.long-short-user"><span
+class="cmss-10">long-short-user</span></a><a
+ id="dx1-23070"></a> style. The display and inline forms
+ are as for <a
+href="#abbrstyle.long-short-user"><span
+class="cmss-10">long-short-user</span></a><a
+ id="dx1-23071"></a> and the <span
class="cmss-10">name</span><a
- id="dx1-23056"></a> key is as <span
-class="cmss-10">long-short-desc</span><a
- id="dx1-23057"></a>. The <span
+ id="dx1-23072"></a> key is as <a
+href="#abbrstyle.long-short-desc"><span
+class="cmss-10">long-short-desc</span></a><a
+ id="dx1-23073"></a>. The <span
class="cmss-10">description</span><a
- id="dx1-23058"></a>
+ id="dx1-23074"></a>
key must be supplied in the optional argument of <span
class="cmtt-10">\newabbreviation </span>(or
<span
class="cmtt-10">\newacronym</span>). The <span
class="cmss-10">sort</span><a
- id="dx1-23059"></a> key is set to &#x27E8;<span
+ id="dx1-23075"></a> key is set to &#x27E8;<span
class="cmti-10">long</span>&#x27E9; (&#x27E8;<span
-class="cmti-10">short</span>&#x27E9;) as per the <span
-class="cmss-10">long-short-desc</span><a
- id="dx1-23060"></a>
+class="cmti-10">short</span>&#x27E9;) as per the <a
+href="#abbrstyle.long-short-desc"><span
+class="cmss-10">long-short-desc</span></a><a
+ id="dx1-23076"></a>
style.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-nolong-noreg"></a><span
+class="cmssbx-10">short-nolong-noreg</span><a
+ id="dx1-23077"></a> </dt><dd
+class="description">This is like <a
+href="#abbrstyle.short-nolong"><span
+class="cmss-10">short-nolong</span></a><a
+ id="dx1-23078"></a> but doesn&#8217;t set the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-23079"></a> attribute.
+ </dd><dt class="description">
+<a
+ id="abbrstyle.short-long"></a><span
class="cmssbx-10">short-long</span><a
- id="dx1-23061"></a> </dt><dd
+ id="dx1-23080"></a> </dt><dd
class="description">On <a
- id="dx1-23062"></a><a
+ id="dx1-23081"></a><a
href="#glo:firstuse">first use</a>, this style uses the format &#x27E8;<span
class="cmti-10">short</span>&#x27E9; (&#x27E8;<span
class="cmti-10">long</span>&#x27E9;). The inline and
display full forms are the same. The <span
class="cmss-10">name</span><a
- id="dx1-23063"></a> and <span
+ id="dx1-23082"></a> and <span
class="cmss-10">sort</span><a
- id="dx1-23064"></a> keys are set to the
+ id="dx1-23083"></a> keys are set to the
short form. The <span
class="cmss-10">description</span><a
- id="dx1-23065"></a> is set to the long form. The short and long
+ id="dx1-23084"></a> is set to the long form. The short and long
forms are separated by <span
class="cmtt-10">\glsxtrfullsep</span>. If you want to insert material
- within the parentheses (such as a&#x00A0;translation), try the <span
-class="cmss-10">short-long-user</span><a
- id="dx1-23066"></a>
+ within the parentheses (such as a&#x00A0;translation), try the <a
+href="#abbrstyle.short-long-user"><span
+class="cmss-10">short-long-user</span></a><a
+ id="dx1-23085"></a>
style.
+
+
+
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-sc-long"></a><span
class="cmssbx-10">short-sc-long</span><a
- id="dx1-23067"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-long</span><a
- id="dx1-23068"></a> but redefines <span
+ id="dx1-23086"></a> </dt><dd
+class="description">Like <a
+href="#abbrstyle.short-long"><span
+class="cmss-10">short-long</span></a><a
+ id="dx1-23087"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use <span
-class="cmtt-10">\glsxtrscfont</span><a
- id="dx1-23069"></a>.
+class="cmtt-10">\glsabbrvscfont</span><a
+ id="dx1-23088"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-sm-long"></a><span
class="cmssbx-10">short-sm-long</span><a
- id="dx1-23070"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-long</span><a
- id="dx1-23071"></a> but redefines <span
+ id="dx1-23089"></a> </dt><dd
+class="description">Like <a
+href="#abbrstyle.short-long"><span
+class="cmss-10">short-long</span></a><a
+ id="dx1-23090"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use <span
-class="cmtt-10">\glsxtrsmfont</span><a
- id="dx1-23072"></a>.
-
-
-
+class="cmtt-10">\glsabbrvsmfont</span><a
+ id="dx1-23091"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-em-long"></a><span
class="cmssbx-10">short-em-long</span><a
- id="dx1-23073"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-long</span><a
- id="dx1-23074"></a> but redefines <span
+ id="dx1-23092"></a> </dt><dd
+class="description">Like <a
+href="#abbrstyle.short-long"><span
+class="cmss-10">short-long</span></a><a
+ id="dx1-23093"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use <span
-class="cmtt-10">\glsxtremfont</span><a
- id="dx1-23075"></a>.
+class="cmtt-10">\glsabbrvemfont</span><a
+ id="dx1-23094"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-em-long-em"></a><span
class="cmssbx-10">short-em-long-em</span><a
- id="dx1-23076"></a> </dt><dd
-class="description">New to version 1.04, this style is like <span
-class="cmss-10">short-em-long</span><a
- id="dx1-23077"></a> but redefines
+ id="dx1-23095"></a> </dt><dd
+class="description">New to version 1.04, this style is like <a
+href="#abbrstyle.short-em-long"><span
+class="cmss-10">short-em-long</span></a><a
+ id="dx1-23096"></a> but redefines
<span
class="cmtt-10">\glsfirstlongfont </span>to use <span
class="cmtt-10">\glsfirstlongemfont</span><a
- id="dx1-23078"></a>.
+ id="dx1-23097"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-long-user"></a><span
class="cmssbx-10">short-long-user</span><a
- id="dx1-23079"></a> </dt><dd
-class="description">New to version 1.04. This style is like the <span
-class="cmss-10">long-short-user</span><a
- id="dx1-23080"></a>
+ id="dx1-23098"></a> </dt><dd
+class="description">New to version 1.04. This style is like the <a
+href="#abbrstyle.long-short-user"><span
+class="cmss-10">long-short-user</span></a><a
+ id="dx1-23099"></a>
style but with the long and short forms switched. The parenthetical
material is governed by the same command <span
class="cmtt-10">\glsxtruserparen</span><a
- id="dx1-23081"></a>, but
+ id="dx1-23100"></a>, but
the first argument supplied to it is the long form instead of the short
form.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-nolong-desc-noreg"></a><span
+class="cmssbx-10">short-nolong-desc-noreg</span><a
+ id="dx1-23101"></a> </dt><dd
+class="description">This style is like <a
+href="#abbrstyle.short-nolong-desc"><span
+class="cmss-10">short-nolong-desc</span></a><a
+ id="dx1-23102"></a> but it doesn&#8217;t set the
+ <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-23103"></a> attribute.
+ </dd><dt class="description">
+<a
+ id="abbrstyle.short-long-desc"></a><span
class="cmssbx-10">short-long-desc</span><a
- id="dx1-23082"></a> </dt><dd
+ id="dx1-23104"></a> </dt><dd
class="description">On <a
- id="dx1-23083"></a><a
+ id="dx1-23105"></a><a
href="#glo:firstuse">first use</a>, this style uses the format &#x27E8;<span
class="cmti-10">short</span>&#x27E9; (&#x27E8;<span
class="cmti-10">long</span>&#x27E9;). The inline and
display full forms are the same. The <span
class="cmss-10">name</span><a
- id="dx1-23084"></a> is set to the full form. The <span
+ id="dx1-23106"></a> is set to the full form. The <span
class="cmss-10">description</span><a
- id="dx1-23085"></a>
+ id="dx1-23107"></a>
must be supplied by the user. The short and long forms are separated by
<span
class="cmtt-10">\glsxtrfullsep</span>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-sc-long-desc"></a><span
class="cmssbx-10">short-sc-long-desc</span><a
- id="dx1-23086"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-long-desc</span><a
- id="dx1-23087"></a> but redefines <span
+ id="dx1-23108"></a> </dt><dd
+class="description">Like <a
+href="#abbrstyle.short-long-desc"><span
+class="cmss-10">short-long-desc</span></a><a
+ id="dx1-23109"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtrscfont</span><a
- id="dx1-23088"></a>.
+class="cmtt-10">\glsabbrvscfont</span><a
+ id="dx1-23110"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-sm-long-desc"></a><span
class="cmssbx-10">short-sm-long-desc</span><a
- id="dx1-23089"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-long-desc</span><a
- id="dx1-23090"></a> but redefines <span
+ id="dx1-23111"></a> </dt><dd
+class="description">Like <a
+href="#abbrstyle.short-long-desc"><span
+class="cmss-10">short-long-desc</span></a><a
+ id="dx1-23112"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtrsmfont</span><a
- id="dx1-23091"></a>.
+class="cmtt-10">\glsabbrvsmfont</span><a
+ id="dx1-23113"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-em-long-desc"></a><span
class="cmssbx-10">short-em-long-desc</span><a
- id="dx1-23092"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-long-desc</span><a
- id="dx1-23093"></a> but redefines <span
+ id="dx1-23114"></a> </dt><dd
+class="description">Like <a
+href="#abbrstyle.short-long-desc"><span
+class="cmss-10">short-long-desc</span></a><a
+ id="dx1-23115"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtremfont</span><a
- id="dx1-23094"></a>.
+class="cmtt-10">\glsabbrvemfont</span><a
+ id="dx1-23116"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-em-long-em-desc"></a><span
class="cmssbx-10">short-em-long-em-desc</span><a
- id="dx1-23095"></a> </dt><dd
-class="description">New to version 1.04, this style is like <span
-class="cmss-10">short-em-long-desc</span><a
- id="dx1-23096"></a> but
+ id="dx1-23117"></a> </dt><dd
+class="description">New to version 1.04, this style is like <a
+href="#abbrstyle.short-em-long-desc"><span
+class="cmss-10">short-em-long-desc</span></a><a
+ id="dx1-23118"></a> but
redefines <span
class="cmtt-10">\glsfirstlongfont </span>to use <span
class="cmtt-10">\glsfirstlongemfont</span><a
- id="dx1-23097"></a>.
+ id="dx1-23119"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-long-user-desc"></a><span
class="cmssbx-10">short-long-user-desc</span><a
- id="dx1-23098"></a> </dt><dd
+ id="dx1-23120"></a> </dt><dd
class="description">New to version 1.04, this style is like a&#x00A0;cross between the
- <span
-class="cmss-10">short-long-desc</span><a
- id="dx1-23099"></a> style and the <span
-class="cmss-10">short-long-user</span><a
- id="dx1-23100"></a> style. The display and inline forms
- are as for <span
-class="cmss-10">short-long-user</span><a
- id="dx1-23101"></a> and the <span
+ <a
+href="#abbrstyle.short-long-desc"><span
+class="cmss-10">short-long-desc</span></a><a
+ id="dx1-23121"></a> style and the <a
+href="#abbrstyle.short-long-user"><span
+class="cmss-10">short-long-user</span></a><a
+ id="dx1-23122"></a> style. The display and inline forms
+ are as for <a
+href="#abbrstyle.short-long-user"><span
+class="cmss-10">short-long-user</span></a><a
+ id="dx1-23123"></a> and the <span
class="cmss-10">name</span><a
- id="dx1-23102"></a> key is as <span
-class="cmss-10">short-long-desc</span><a
- id="dx1-23103"></a>. The <span
+ id="dx1-23124"></a> key is as <a
+href="#abbrstyle.short-long-desc"><span
+class="cmss-10">short-long-desc</span></a><a
+ id="dx1-23125"></a>. The <span
class="cmss-10">description</span><a
- id="dx1-23104"></a>
+ id="dx1-23126"></a>
+
+
+
key must be supplied in the optional argument of <span
class="cmtt-10">\newabbreviation </span>(or
<span
class="cmtt-10">\newacronym</span>).
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-footnote"></a><span
class="cmssbx-10">short-footnote</span><a
- id="dx1-23105"></a> </dt><dd
+ id="dx1-23127"></a> </dt><dd
class="description">On <a
- id="dx1-23106"></a>first use, this style displays the short form with the long form as
- a footnote. This style automatically sets the <span
-class="cmss-10">nohyperfirst</span><a
- id="dx1-23107"></a> attribute to &#8220;true&#8221; for
+ id="dx1-23128"></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 <a
+href="#catattr.nohyperfirst"><span
+class="cmss-10">nohyperfirst</span></a><a
+ id="dx1-23129"></a> attribute to &#8220;true&#8221; for
the supplied category, so the <a
- id="dx1-23108"></a>first use won&#8217;t be hyperlinked (but the footnote
+ id="dx1-23130"></a>first use won&#8217;t be hyperlinked (but the footnote
marker may be, if the <span
class="cmss-10">hyperref</span><a
- id="dx1-23109"></a> package is used).
-
-
-
- <!--l. 3527--><p class="noindent" >The inline full form uses the &#x27E8;<span
+ id="dx1-23131"></a> package is used).
+ <!--l. 3706--><p class="noindent" >The inline full form uses the &#x27E8;<span
class="cmti-10">short</span>&#x27E9; (&#x27E8;<span
class="cmti-10">long</span>&#x27E9;) style. The <span
class="cmss-10">name</span><a
- id="dx1-23110"></a> is set to the short
+ id="dx1-23132"></a> is set to the short
form. The <span
class="cmss-10">description</span><a
- id="dx1-23111"></a> is set to the long form.
- </p><!--l. 3531--><p class="noindent" >As from version 1.05, all the footnote styles use:
- </p><!--l. 3532--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-23133"></a> is set to the long form.
+ </p><!--l. 3710--><p class="noindent" >As from version 1.05, all the footnote styles use:
+ </p><!--l. 3711--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsfirstlongfootnotefont</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-23112"></a> <span
+ id="dx1-23134"></a> <span
class="cmtt-10">\glsfirstlongfootnotefont{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
- </p><!--l. 3534--><p class="noindent" >
+ </p><!--l. 3713--><p class="noindent" >
to format the long form on <a
- id="dx1-23113"></a><a
-href="#glo:firstuse">first use</a> or for the full form and
- </p><!--l. 3536--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-23135"></a>first use or for the full form and
+ </p><!--l. 3715--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glslongfootnotefont</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-23114"></a> <span
+ id="dx1-23136"></a> <span
class="cmtt-10">\glslongfootnotefont{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
- </p><!--l. 3538--><p class="noindent" >
+ </p><!--l. 3717--><p class="noindent" >
to format the long form elsewhere (for example, when used with <span
class="cmtt-10">\glsxtrlong</span>).
- </p><!--l. 3542--><p class="noindent" >As from version 1.07, all the footnote styles use:
- </p><!--l. 3543--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ </p><!--l. 3721--><p class="noindent" >As from version 1.07, all the footnote styles use:
+ </p><!--l. 3722--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrabbrvfootnote</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-23115"></a> <span
+ id="dx1-23137"></a> <span
class="cmtt-10">\glsxtrabbrvfootnote{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">long</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
- </p><!--l. 3545--><p class="noindent" >
+ </p><!--l. 3724--><p class="noindent" >
By default, this just does <span
class="cmtt-10">\footnote</span><a
- id="dx1-23116"></a><span
+ id="dx1-23138"></a><span
class="cmtt-10">{</span>&#x27E8;<span
class="cmti-10">long</span>&#x27E9;<span
class="cmtt-10">} </span>(the first argument is ignored). For
@@ -7149,22 +7808,22 @@ class="cmtt-10">} </span>(the first argument is ignored). For
</p>
- <div class="verbatim" id="verbatim-97">
+ <div class="verbatim" id="verbatim-90">
\renewcommand{\glsxtrabbrvfootnote}[2]{%
&#x00A0;<br />&#x00A0;&#x00A0;\footnote{\glshyperlink[#2]{#1}}%
&#x00A0;<br />}
</div>
- <!--l. 3553--><p class="nopar" > or to include the short form with a hyperlink:
+ <!--l. 3732--><p class="nopar" > or to include the short form with a hyperlink:
</p>
- <div class="verbatim" id="verbatim-98">
+ <div class="verbatim" id="verbatim-91">
\renewcommand{\glsxtrabbrvfootnote}[2]{%
&#x00A0;<br />&#x00A0;&#x00A0;\footnote{\glshyperlink[\glsfmtshort{#1}]{#1}:&#x00A0;#2}%
&#x00A0;<br />}
</div>
- <!--l. 3559--><p class="nopar" > Note that I haven&#8217;t used commands like <span
+ <!--l. 3738--><p class="nopar" > Note that I haven&#8217;t used commands like <span
class="cmtt-10">\glsxtrshort </span>to avoid interference
(see <a
href="#sec:entryfmtmods"><span
@@ -7174,202 +7833,659 @@ href="#sec:nested"><span
class="cmsy-10">&sect;</span>2.6 </a><a
href="#sec:nested">Nested Links<!--tex4ht:ref: sec:nested --></a>).
</p></dd><dt class="description">
-<span
+<a
+ id="abbrstyle.footnote"></a><span
class="cmssbx-10">footnote</span><a
- id="dx1-23117"></a> </dt><dd
-class="description">A synonym for <span
-class="cmss-10">short-footnote</span><a
- id="dx1-23118"></a>.
+ id="dx1-23139"></a> </dt><dd
+class="description">A synonym for <a
+href="#abbrstyle.short-footnote"><span
+class="cmss-10">short-footnote</span></a><a
+ id="dx1-23140"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-sc-footnote"></a><span
class="cmssbx-10">short-sc-footnote</span><a
- id="dx1-23119"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-footnote</span><a
- id="dx1-23120"></a> but redefines <span
+ id="dx1-23141"></a> </dt><dd
+class="description">Like <a
+href="#abbrstyle.short-footnote"><span
+class="cmss-10">short-footnote</span></a><a
+ id="dx1-23142"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtrscfont</span><a
- id="dx1-23121"></a>. (This style was originally called <span
+class="cmtt-10">\glsabbrvscfont</span><a
+ id="dx1-23143"></a>. (This style was originally called <span
class="cmss-10">footnote-sc</span><a
- id="dx1-23122"></a>. Renamed in
+ id="dx1-23144"></a>. Renamed in
version 1.04, but original name retained as a deprecated synonym for
backward-compatibility.)
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-sc-footnote"></a><span
class="cmssbx-10">short-sc-footnote</span><a
- id="dx1-23123"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-footnote</span><a
- id="dx1-23124"></a> but redefines <span
+ id="dx1-23145"></a> </dt><dd
+class="description">Like <a
+href="#abbrstyle.short-footnote"><span
+class="cmss-10">short-footnote</span></a><a
+ id="dx1-23146"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtrsmfont</span><a
- id="dx1-23125"></a>. (This style was originally called <span
+class="cmtt-10">\glsabbrvsmfont</span><a
+ id="dx1-23147"></a>. (This style was originally called <span
class="cmss-10">footnote-sm</span><a
- id="dx1-23126"></a>. Renamed in
+ id="dx1-23148"></a>. Renamed in
version 1.04, but original name retained as a deprecated synonym for
backward-compatibility.)
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-em-footnote"></a><span
class="cmssbx-10">short-em-footnote</span><a
- id="dx1-23127"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-footnote</span><a
- id="dx1-23128"></a> but redefines <span
+ id="dx1-23149"></a> </dt><dd
+class="description">Like <a
+href="#abbrstyle.short-footnote"><span
+class="cmss-10">short-footnote</span></a><a
+ id="dx1-23150"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtremfont</span><a
- id="dx1-23129"></a>. (This style was originally called <span
+class="cmtt-10">\glsabbrvemfont</span><a
+ id="dx1-23151"></a>. (This style was originally called <span
class="cmss-10">footnote-em</span><a
- id="dx1-23130"></a>. Renamed in
+ id="dx1-23152"></a>. Renamed in
version 1.04, but original name retained as a deprecated synonym for
backward-compatibility.)
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-postfootnote"></a><span
class="cmssbx-10">short-postfootnote</span><a
- id="dx1-23131"></a> </dt><dd
-class="description">This is similar to the <span
-class="cmss-10">short-footnote</span><a
- id="dx1-23132"></a> style but doesn&#8217;t modify the
+ id="dx1-23153"></a> </dt><dd
+class="description">This is similar to the <a
+href="#abbrstyle.short-footnote"><span
+class="cmss-10">short-footnote</span></a><a
+ id="dx1-23154"></a> style but doesn&#8217;t modify the
category attribute. Instead it changes <span
class="cmtt-10">\glsxtrpostlink</span>&#x27E8;<span
class="cmti-10">category</span>&#x27E9;<a
- id="dx1-23133"></a>&#x00A0;to insert the
+ id="dx1-23155"></a>&#x00A0;to insert the
footnote after the <a
- id="dx1-23134"></a><a
+ id="dx1-23156"></a><a
href="#glo:linktext">link-text</a> on <a
- id="dx1-23135"></a><a
+ id="dx1-23157"></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="cmtt-10">\glsxtrifnextpunc</span><a
- id="dx1-23136"></a>.
- <!--l. 3596--><p class="noindent" >The inline full form uses the &#x27E8;<span
+ id="dx1-23158"></a>.
+ <!--l. 3775--><p class="noindent" >The inline full form uses the &#x27E8;<span
class="cmti-10">short</span>&#x27E9; (&#x27E8;<span
class="cmti-10">long</span>&#x27E9;) style. The <span
class="cmss-10">name</span><a
- id="dx1-23137"></a> is set to the short
+ id="dx1-23159"></a> is set to the short
form. The <span
class="cmss-10">description</span><a
- id="dx1-23138"></a> is set to the long form. Note that this style will change
+ id="dx1-23160"></a> is set to the long form. Note that this style will change
<span
class="cmtt-10">\glsxtrfull </span>(and it&#8217;s variants) so that it fakes non-<a
- id="dx1-23139"></a>first use. (Otherwise the
+ id="dx1-23161"></a>first use. (Otherwise the
footnote would appear after the inline form.)
</p></dd><dt class="description">
-<span
+<a
+ id="abbrstyle.postfootnote"></a><span
class="cmssbx-10">postfootnote</span><a
- id="dx1-23140"></a> </dt><dd
-class="description">A synonym for <span
-class="cmss-10">short-postfootnote</span><a
- id="dx1-23141"></a>.
+ id="dx1-23162"></a> </dt><dd
+class="description">A synonym for <a
+href="#abbrstyle.short-postfootnote"><span
+class="cmss-10">short-postfootnote</span></a><a
+ id="dx1-23163"></a>.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-sc-postfootnote"></a><span
class="cmssbx-10">short-sc-postfootnote</span><a
- id="dx1-23142"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-postfootnote</span><a
- id="dx1-23143"></a> but redefines <span
+ id="dx1-23164"></a> </dt><dd
+class="description">Like <a
+href="#abbrstyle.short-postfootnote"><span
+class="cmss-10">short-postfootnote</span></a><a
+ id="dx1-23165"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtrscfont</span><a
- id="dx1-23144"></a>. (This style was originally called <span
+class="cmtt-10">\glsabbrvscfont</span><a
+ id="dx1-23166"></a>. (This style was originally called <span
class="cmss-10">postfootnote-sc</span><a
- id="dx1-23145"></a>. Renamed in
+ id="dx1-23167"></a>. Renamed in
version 1.04, but original name retained as a deprecated synonym for
backward-compatibility.)
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-sm-postfootnote"></a><span
class="cmssbx-10">short-sm-postfootnote</span><a
- id="dx1-23146"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-postfootnote</span><a
- id="dx1-23147"></a> but redefines <span
+ id="dx1-23168"></a> </dt><dd
+class="description">Like <a
+href="#abbrstyle.short-postfootnote"><span
+class="cmss-10">short-postfootnote</span></a><a
+ id="dx1-23169"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtrsmfont</span><a
- id="dx1-23148"></a>. (This style was originally called <span
+class="cmtt-10">\glsabbrvsmfont</span><a
+ id="dx1-23170"></a>. (This style was originally called <span
class="cmss-10">postfootnote-sm</span><a
- id="dx1-23149"></a>. Renamed in
- version 1.04, but original name retained as a deprecated synonym for
+ id="dx1-23171"></a>. Renamed
+ in version 1.04, but original name retained as a deprecated synonym for
backward-compatibility.)
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-em-postfootnote"></a><span
class="cmssbx-10">short-em-postfootnote</span><a
- id="dx1-23150"></a> </dt><dd
-class="description">Like <span
-class="cmss-10">short-postfootnote</span><a
- id="dx1-23151"></a> but redefines <span
+ id="dx1-23172"></a> </dt><dd
+class="description">Like <a
+href="#abbrstyle.short-postfootnote"><span
+class="cmss-10">short-postfootnote</span></a><a
+ id="dx1-23173"></a> but redefines <span
class="cmtt-10">\glsabbrvfont </span>to use
<span
-class="cmtt-10">\glsxtremfont</span><a
- id="dx1-23152"></a>. (This style was originally called <span
+class="cmtt-10">\glsabbrvemfont</span><a
+ id="dx1-23174"></a>. (This style was originally called <span
class="cmss-10">postfootnote-em</span><a
- id="dx1-23153"></a>. Renamed in
- version 1.04, but original name retained as a deprecated synonym for
+ id="dx1-23175"></a>. Renamed
+ in version 1.04, but original name retained as a deprecated synonym for
backward-compatibility.)
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-postlong-user"></a><span
class="cmssbx-10">short-postlong-user</span><a
- id="dx1-23154"></a> </dt><dd
+ id="dx1-23176"></a> </dt><dd
class="description">This style was introduced in version 1.12. It&#8217;s like the
- <span
-class="cmss-10">short-long-user</span><a
- id="dx1-23155"></a> style but defers the parenthetical material to after the
+ <a
+href="#abbrstyle.short-long-user"><span
+class="cmss-10">short-long-user</span></a><a
+ id="dx1-23177"></a> style but defers the parenthetical material to after the
link-text. This means that you don&#8217;t have such a long hyperlink (which
can cause problems for the DVI <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
class="E">E</span>X</span></span>&#x00A0;format) and it also means
that the user supplied material can include a hyperlink to another
location.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.short-postlong-user-desc"></a><span
class="cmssbx-10">short-postlong-user-desc</span><a
- id="dx1-23156"></a> </dt><dd
+ id="dx1-23178"></a> </dt><dd
class="description">This style was introduced in version 1.12. It&#8217;s
- like the above <span
-class="cmss-10">short-postlong-user</span><a
- id="dx1-23157"></a> style but the <span
+ like the above <a
+href="#abbrstyle.short-postlong-user"><span
+class="cmss-10">short-postlong-user</span></a><a
+ id="dx1-23179"></a> style but the <span
class="cmss-10">description</span><a
- id="dx1-23158"></a> must be
+ id="dx1-23180"></a> must be
specified.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-postshort-user"></a><span
class="cmssbx-10">long-postshort-user</span><a
- id="dx1-23159"></a> </dt><dd
+ id="dx1-23181"></a> </dt><dd
class="description">This style was introduced in version 1.12. It&#8217;s like the
- above <span
-class="cmss-10">short-postlong-user</span><a
- id="dx1-23160"></a> style but the long form is shown first and
- the short form is in the parenthetical material (as for <span
-class="cmss-10">long-short-user</span><a
- id="dx1-23161"></a>)
+ above <a
+href="#abbrstyle.short-postlong-user"><span
+class="cmss-10">short-postlong-user</span></a><a
+ id="dx1-23182"></a> style but the long form is shown first and
+ the short form is in the parenthetical material (as for <a
+href="#abbrstyle.long-short-user"><span
+class="cmss-10">long-short-user</span></a><a
+ id="dx1-23183"></a>)
style.
</dd><dt class="description">
-<span
+<a
+ id="abbrstyle.long-postshort-user-desc"></a><span
class="cmssbx-10">long-postshort-user-desc</span><a
- id="dx1-23162"></a> </dt><dd
+ id="dx1-23184"></a> </dt><dd
class="description">This style was introduced in version 1.12. It&#8217;s
- like the above <span
-class="cmss-10">long-postshort-user</span><a
- id="dx1-23163"></a> style but the <span
+ like the above <a
+href="#abbrstyle.long-postshort-user"><span
+class="cmss-10">long-postshort-user</span></a><a
+ id="dx1-23185"></a> style but the <span
class="cmss-10">description</span><a
- id="dx1-23164"></a> must be
+ id="dx1-23186"></a> must be
specified.
- </dd></dl>
-<!--l. 3653--><p class="noindent" >
+ </dd><dt class="description">
+<a
+ id="abbrstyle.long-hyphen-short-hyphen"></a><span
+class="cmssbx-10">long-hyphen-short-hyphen</span><a
+ id="dx1-23187"></a> </dt><dd
+class="description">This style (new to v1.17) is designed to work
+ with the <a
+href="#catattr.markwords"><span
+class="cmss-10">markwords</span></a><a
+ id="dx1-23188"></a> category attribute. The full form is formatted
+ using
+ <!--l. 3833--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrlonghyphenshort</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-23189"></a> <span
+class="cmtt-10">\glsxtrlonghyphenshort{</span>&#x27E8;<span
+class="cmitt-10">label</span>&#x27E9;<span
+class="cmtt-10">}{</span>&#x27E8;<span
+class="cmitt-10">long</span>&#x27E9;<span
+class="cmtt-10">}{</span>&#x27E8;<span
+class="cmitt-10">short</span>&#x27E9;<span
+class="cmtt-10">}</span>
+ <span
+class="cmtt-10">{</span>&#x27E8;<span
+class="cmitt-10">insert</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+
+
+
+ </p><!--l. 3835--><p class="noindent" >
+ where &#x27E8;<span
+class="cmti-10">insert</span>&#x27E9; is the inserted material provided in the final optional argument of
+ commands like <span
+class="cmtt-10">\insert</span>. If &#x27E8;<span
+class="cmti-10">insert</span>&#x27E9; start with a hyphen, then this locally
+ redefines <span
+class="cmtt-10">\glsxtrwordsep</span><a
+ id="dx1-23190"></a> to a hyphen, which means that if the <a
+href="#catattr.markwords"><span
+class="cmss-10">markwords</span></a><a
+ id="dx1-23191"></a>
+ attribute is set then the long form will become hyphenated. (If this
+ attribute isn&#8217;t set, there&#8217;s no alteration to the way the long form is
+ displayed.)
+ </p><!--l. 3844--><p class="noindent" >Unlike the other &#x27E8;<span
+class="cmti-10">long</span>&#x27E9; (&#x27E8;<span
+class="cmti-10">short</span>&#x27E9;) type of styles, such as <a
+href="#abbrstyle.long-short"><span
+class="cmss-10">long-short</span></a><a
+ id="dx1-23192"></a>, this style also
+ repeats the insertion in the parenthetical part, so that the first use form
+ is:
+ </p><div class="quote">
+ <!--l. 3849--><p class="noindent" ><span
+class="cmtt-10">\glsfirstlonghyphenfont{</span>&#x27E8;<span
+class="cmti-10">long</span>&#x27E9;<span
+class="cmtt-10">}</span>&#x27E8;<span
+class="cmti-10">insert</span>&#x27E9;
+ (<span
+class="cmtt-10">\glsfirstabbrvhyphenfont{</span>&#x27E8;<span
+class="cmti-10">short</span>&#x27E9;<span
+class="cmtt-10">}</span>&#x27E8;<span
+class="cmti-10">insert</span>&#x27E9;)</p></div>
+ <!--l. 3852--><p class="noindent" >The space before the parenthetical material is actually given by
+ <span
+class="cmtt-10">\glsxtrfullsep{</span>&#x27E8;<span
+class="cmti-10">label</span>&#x27E9;<span
+class="cmtt-10">} </span>which defaults to a space. The &#x27E8;<span
+class="cmti-10">insert</span>&#x27E9; may be
+ moved into the formatting commands according to the conditional
+ <span
+class="cmtt-10">\ifglsxtrinsertinside</span>.
+ </p><!--l. 3857--><p class="noindent" >For example, if <span
+class="cmtt-10">ip </span>is defined using:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-92">
+ \glssetcategoryattribute{english}{markwords}{true}
+ &#x00A0;<br />\setabbreviationstyle[english]{long-hyphen-short-hyphen}
+ &#x00A0;<br />\newabbreviation[category=english]{ip}{IP}{Internet&#x00A0;Protocol}
+</div>
+ <!--l. 3862--><p class="nopar" > then
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-93">
+ \gls{ip}[-Adressen]
+</div>
+ <!--l. 3866--><p class="nopar" > will do
+ </p><div class="quote">
+ <!--l. 3869--><p class="noindent" >Internet-Protocol-Adressen (IP-Adressen)</p></div>
+ <!--l. 3871--><p class="noindent" >on first use, whereas
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-94">
+ \gls{ip}[&#x00A0;Address]
+</div>
+ <!--l. 3874--><p class="nopar" > will do
+ </p><div class="quote">
+ <!--l. 3877--><p class="noindent" >Internet Protocol Address (IP Address)</p></div>
+ <!--l. 3879--><p class="noindent" >on first use.
+ </p><!--l. 3881--><p class="noindent" ><div class="important" title="Important Note"> Note that the hyphenation isn&#8217;t applied when using commands like
+ <span
+class="cmtt-10">\glsxtrlong</span>. This means that
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-95">
+ \glsxtrlong{ip}[-Adressen]
+</div>
+ <!--l. 3886--><p class="nopar" > will do
+ </p><div class="quote">
+ <!--l. 3889--><p class="noindent" >Internet Protocol-Adressen</p></div>
+ </div>
+ <!--l. 3891--><p class="noindent" >
+ </p><!--l. 3893--><p class="noindent" >If the <a
+href="#catattr.markwords"><span
+class="cmss-10">markwords</span></a><a
+ id="dx1-23193"></a> attribute hadn&#8217;t been set, then the first use of
+
+
+
</p>
+ <div class="verbatim" id="verbatim-96">
+ \gls{ip}[-Adressen]
+</div>
+ <!--l. 3897--><p class="nopar" > would do
+ </p><div class="quote">
+ <!--l. 3900--><p class="noindent" >Internet Protocol-Adressen (IP-Adressen)</p></div>
+ <!--l. 3902--><p class="noindent" >instead.
+ </p><!--l. 3904--><p class="noindent" ><div class="important" title="Important Note"> If the inserted material &#x27E8;<span
+class="cmti-10">insert</span>&#x27E9; is likely to contain commands like <span
+class="cmtt-10">\gls</span>,
+ then use <a
+href="#abbrstyle.long-hyphen-postshort-hyphen"><span
+class="cmss-10">long-hyphen-postshort-hyphen</span></a><a
+ id="dx1-23194"></a> instead to avoid nested links.
+ </div>
+ </p><!--l. 3908--><p class="noindent" >
+ </p><!--l. 3910--><p class="noindent" >If you want the short version in small-caps, you can just redefine
+ <span
+class="cmtt-10">\glsabbrvhyphenfont </span>and <span
+class="cmtt-10">\glsxtrhyphensuffix </span>to use the small-caps
+ versions. For example:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-97">
+ \renewcommand{\glsabbrvhyphenfont}{\glsabbrvscfont}
+ &#x00A0;<br />\renewcommand{\glsxtrhyphensuffix}{\glsxtrscsuffix}
+</div>
+ <!--l. 3916--><p class="nopar" > Similarly for other font-changing variations.
+ </p></dd><dt class="description">
+<a
+ id="abbrstyle.long-hyphen-noshort-desc-noreg"></a><span
+class="cmssbx-10">long-hyphen-noshort-desc-noreg</span><a
+ id="dx1-23195"></a> </dt><dd
+class="description">New to version 1.17, this style is like
+ <a
+href="#abbrstyle.long-hyphen-short-hyphen-desc"><span
+class="cmss-10">long-hyphen-short-hyphen-desc</span></a><a
+ id="dx1-23196"></a> except that the parenthetical part is omitted and
+ the long form is displayed on subsequent use. The short form can be accessed
+ with <span
+class="cmtt-10">\glsxtrshort </span>but just uses the default abbreviation font. There&#8217;s no
+ regular version of this style as the regular form doesn&#8217;t have the flexibility to
+ deal with the hyphen switch.
+ </dd><dt class="description">
+<a
+ id="abbrstyle.long-hyphen-noshort-noreg"></a><span
+class="cmssbx-10">long-hyphen-noshort-noreg</span><a
+ id="dx1-23197"></a> </dt><dd
+class="description">New to version 1.17, this style is like
+ <a
+href="#abbrstyle.long-hyphen-noshort-desc-noreg"><span
+class="cmss-10">long-hyphen-noshort-desc-noreg</span></a><a
+ id="dx1-23198"></a> but the name is set to the short form and the
+ description is set to the long form.
+ </dd><dt class="description">
+<a
+ id="abbrstyle.long-hyphen-short-hyphen-desc"></a><span
+class="cmssbx-10">long-hyphen-short-hyphen-desc</span><a
+ id="dx1-23199"></a> </dt><dd
+class="description">
+ <!--l. 3936--><p class="noindent" >New to version 1.17. This is similar to <a
+href="#abbrstyle.long-hyphen-short-hyphen"><span
+class="cmss-10">long-hyphen-short-hyphen</span></a><a
+ id="dx1-23200"></a> but the user
+ supplies the description.
+ </p></dd><dt class="description">
+<a
+ id="abbrstyle.long-hyphen-postshort-hyphen"></a><span
+class="cmssbx-10">long-hyphen-postshort-hyphen</span><a
+ id="dx1-23201"></a> </dt><dd
+class="description">
+ <!--l. 3942--><p class="noindent" >New to version 1.17. This is similar to <a
+href="#abbrstyle.long-hyphen-short-hyphen"><span
+class="cmss-10">long-hyphen-short-hyphen</span></a><a
+ id="dx1-23202"></a> but the
+ inserted and parenthetical material are moved to the post-link hook. On first
+ use, <span
+class="cmtt-10">\gls{</span>&#x27E8;<span
+class="cmti-10">label</span>&#x27E9;<span
+class="cmtt-10">}[</span>&#x27E8;<span
+class="cmti-10">insert</span>&#x27E9;<span
+class="cmtt-10">] </span>will do <spacer type=vertical size=10><span class="obeylines-h">
+ <br /><span
+class="cmtt-10">\glsxtrlonghyphen{</span>&#x27E8;<span
+class="cmti-10">long</span>&#x27E9;<span
+class="cmtt-10">}{</span>&#x27E8;<span
+class="cmti-10">label</span>&#x27E9;<span
+class="cmtt-10">}{</span>&#x27E8;<span
+class="cmti-10">insert</span>&#x27E9;<span
+class="cmtt-10">}\glsxtrposthyphenshort</span>
+ <span
+class="cmtt-10">{</span>&#x27E8;<span
+class="cmti-10">label</span>&#x27E9;<span
+class="cmtt-10">}</span>&#x27E8;<span
+class="cmti-10">insert</span>&#x27E9;
+ <br /><spacer type=vertical size=10></span>
+ where
+ </p><!--l. 3950--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrposthyphenshort</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-23203"></a> <span
+class="cmtt-10">\glsxtrposthyphenshort{</span>&#x27E8;<span
+class="cmitt-10">label</span>&#x27E9;<span
+class="cmtt-10">}</span>&#x27E8;<span
+class="cmitt-10">insert</span>&#x27E9;
+ </div><hr>
+ </p><!--l. 3952--><p class="noindent" >
+ is in the post-link hook. This uses the format: <spacer type=vertical size=10><span class="obeylines-h">
+ <br />&#x27E8;<span
+class="cmti-10">insert</span>&#x27E9; (<span
+class="cmtt-10">\glsfirstabbrvhyphenfont{</span>&#x27E8;<span
+class="cmti-10">short</span>&#x27E9;<span
+class="cmtt-10">}</span>&#x27E8;<span
+class="cmti-10">isnert</span>&#x27E9;)
+ <br /><spacer type=vertical size=10></span>
+
+
+
+ </p><!--l. 3958--><p class="noindent" ><div class="important" title="Important Note"> The singular short form is always used here, even with <span
+class="cmtt-10">\glspl</span>. (Unlike
+ <a
+href="#abbrstyle.long-hyphen-long-hyphen"><span
+class="cmss-10">long-hyphen-long-hyphen</span></a><a
+ id="dx1-23204"></a>.) </div>
+ </p><!--l. 3961--><p class="noindent" >
+ </p><!--l. 3963--><p class="noindent" >The part in the link-text on first use:
+ </p><!--l. 3964--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrlonghyphen</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-23205"></a> <span
+class="cmtt-10">\glsxtrlonghyphen{</span>&#x27E8;<span
+class="cmitt-10">long</span>&#x27E9;<span
+class="cmtt-10">}{</span>&#x27E8;<span
+class="cmitt-10">label</span>&#x27E9;<span
+class="cmtt-10">}{</span>&#x27E8;<span
+class="cmitt-10">insert</span>&#x27E9;<span
+class="cmtt-10">}</span>
+ </div><hr>
+ </p><!--l. 3966--><p class="noindent" >
+ checks if &#x27E8;<span
+class="cmti-10">insert</span>&#x27E9; starts with a hyphen. If it does, then <span
+class="cmtt-10">\glsxtrwordsep </span>is locally
+ redefined to a hyphen. This command only uses &#x27E8;<span
+class="cmti-10">insert</span>&#x27E9; to test if it starts with a
+ hyphen. The actual insertion code isn&#8217;t typeset until the post-link hook and it&#8217;s
+ also localised, which means that you can use commands like <span
+class="cmtt-10">\gls </span>in &#x27E8;<span
+class="cmti-10">insert</span>&#x27E9; for
+ this style without causing nested hyperlinks, but only for commands like
+ <span
+class="cmtt-10">\gls</span>.
+ </p><!--l. 3975--><p class="noindent" ><div class="important" title="Important Note"> Don&#8217;t use <span
+class="cmtt-10">\gls </span>in the &#x27E8;<span
+class="cmti-10">insert</span>&#x27E9; part for commands like <span
+class="cmtt-10">\glsxtrfull</span>,
+ <span
+class="cmtt-10">\glsxtrshort </span>or <span
+class="cmtt-10">\glsxtrlong</span>. </div>
+ </p><!--l. 3978--><p class="noindent" >
+ </p><!--l. 3980--><p class="noindent" >The inline full display format used by commands like <span
+class="cmtt-10">\glsxtrfull</span>
+ behaves differently to the first use of <span
+class="cmtt-10">\gls </span>with this style. It&#8217;s better
+ to use <span
+class="cmtt-10">\glsreset{</span>&#x27E8;<span
+class="cmti-10">label</span>&#x27E9;<span
+class="cmtt-10">}\gls{</span>&#x27E8;<span
+class="cmti-10">label</span>&#x27E9;<span
+class="cmtt-10">} </span>if you want to ensure the full
+ format.
+ </p></dd><dt class="description">
+<a
+ id="abbrstyle.long-hyphen-postshort-hyphen-desc"></a><span
+class="cmssbx-10">long-hyphen-postshort-hyphen-desc</span><a
+ id="dx1-23206"></a> </dt><dd
+class="description">
+ <!--l. 3987--><p class="noindent" >New to version 1.17. This is similar to <a
+href="#abbrstyle.long-hyphen-postshort-hyphen"><span
+class="cmss-10">long-hyphen-postshort-hyphen</span></a><a
+ id="dx1-23207"></a> but the
+ user supplies the description.
+ </p></dd><dt class="description">
+<a
+ id="abbrstyle.short-hyphen-long-hyphen"></a><span
+class="cmssbx-10">short-hyphen-long-hyphen</span><a
+ id="dx1-23208"></a> </dt><dd
+class="description">This style (new to v1.17) is like <a
+href="#abbrstyle.long-hyphen-short-hyphen"><span
+class="cmss-10">long-hyphen-short-hyphen</span></a><a
+ id="dx1-23209"></a>,
+ except that the short form is displayed first followed by the long form in
+ parentheses. The full form is formatted using
+ <!--l. 3996--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrshorthyphenlong</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-23210"></a> <span
+class="cmtt-10">\glsxtrshorthyphenlong{</span>&#x27E8;<span
+class="cmitt-10">label</span>&#x27E9;<span
+class="cmtt-10">}{</span>&#x27E8;<span
+class="cmitt-10">short</span>&#x27E9;<span
+class="cmtt-10">}{</span>&#x27E8;<span
+class="cmitt-10">long</span>&#x27E9;<span
+class="cmtt-10">}</span>
+ <span
+class="cmtt-10">{</span>&#x27E8;<span
+class="cmitt-10">insert</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+ </p><!--l. 3998--><p class="noindent" >
+ which behaves in an analogous way to <span
+class="cmtt-10">\glsxtrlonghyphenshort</span>.
+ </p></dd><dt class="description">
+<a
+ id="abbrstyle.short-hyphen-long-hyphen-desc"></a><span
+class="cmssbx-10">short-hyphen-long-hyphen-desc</span><a
+ id="dx1-23211"></a> </dt><dd
+class="description">
+ <!--l. 4003--><p class="noindent" >New to version 1.17. This is similar to <a
+href="#abbrstyle.short-hyphen-long-hyphen"><span
+class="cmss-10">short-hyphen-long-hyphen</span></a><a
+ id="dx1-23212"></a> but the user
+ supplies the description.
-<!--l. 3653--><p class="noindent" ><a
+ </p></dd><dt class="description">
+<a
+ id="abbrstyle.short-hyphen-postlong-hyphen"></a><span
+class="cmssbx-10">short-hyphen-postlong-hyphen</span><a
+ id="dx1-23213"></a> </dt><dd
+class="description">This style (new to v1.17) is like
+ <a
+href="#abbrstyle.long-hyphen-postshort-hyphen"><span
+class="cmss-10">long-hyphen-postshort-hyphen</span></a><a
+ id="dx1-23214"></a>, but the short form is displayed first followed by
+ the long form in parentheses. On first use, <span
+class="cmtt-10">\gls{</span>&#x27E8;<span
+class="cmti-10">label</span>&#x27E9;<span
+class="cmtt-10">}[</span>&#x27E8;<span
+class="cmti-10">insert</span>&#x27E9;<span
+class="cmtt-10">] </span>will do
+ <spacer type=vertical size=10><span class="obeylines-h">
+ <br /><span
+class="cmtt-10">\glsxtrshorthyphen{</span>&#x27E8;<span
+class="cmti-10">short</span>&#x27E9;<span
+class="cmtt-10">}{</span>&#x27E8;<span
+class="cmti-10">label</span>&#x27E9;<span
+class="cmtt-10">}{</span>&#x27E8;<span
+class="cmti-10">insert</span>&#x27E9;<span
+class="cmtt-10">}\glsxtrposthyphenlong</span>
+ <span
+class="cmtt-10">{</span>&#x27E8;<span
+class="cmti-10">label</span>&#x27E9;<span
+class="cmtt-10">}</span>&#x27E8;<span
+class="cmti-10">insert</span>&#x27E9;
+ <br /><spacer type=vertical size=10></span>
+ where
+ <!--l. 4017--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrposthyphenlong</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-23215"></a> <span
+class="cmtt-10">\glsxtrposthyphenlong{</span>&#x27E8;<span
+class="cmitt-10">label</span>&#x27E9;<span
+class="cmtt-10">}</span>&#x27E8;<span
+class="cmitt-10">insert</span>&#x27E9;
+ </div><hr>
+ </p><!--l. 4019--><p class="noindent" >
+ is in the post-link hook. These commands behave in an analogous manner to
+ those used with <a
+href="#abbrstyle.long-hyphen-postshort-hyphen"><span
+class="cmss-10">long-hyphen-postshort-hyphen</span></a><a
+ id="dx1-23216"></a>.
+ </p><!--l. 4023--><p class="noindent" ><div class="important" title="Important Note"> Don&#8217;t use <span
+class="cmtt-10">\gls </span>in the &#x27E8;<span
+class="cmti-10">insert</span>&#x27E9; part for commands like <span
+class="cmtt-10">\glsxtrfull</span>,
+ <span
+class="cmtt-10">\glsxtrshort </span>or <span
+class="cmtt-10">\glsxtrlong</span>. </div>
+ </p><!--l. 4026--><p class="noindent" >
+ </p><!--l. 4028--><p class="noindent" >The inline full display format used by commands like <span
+class="cmtt-10">\glsxtrfull</span>
+ behaves differently to the first use of <span
+class="cmtt-10">\gls </span>with this style. It&#8217;s better
+ to use <span
+class="cmtt-10">\glsreset{</span>&#x27E8;<span
+class="cmti-10">label</span>&#x27E9;<span
+class="cmtt-10">}\gls{</span>&#x27E8;<span
+class="cmti-10">label</span>&#x27E9;<span
+class="cmtt-10">} </span>if you want to ensure the full
+ format.
+ </p></dd><dt class="description">
+<a
+ id="abbrstyle.short-hyphen-postlong-hyphen-desc"></a><span
+class="cmssbx-10">short-hyphen-postlong-hyphen-desc</span><a
+ id="dx1-23217"></a> </dt><dd
+class="description">
+ <!--l. 4035--><p class="noindent" >New to version 1.17. This is similar to <a
+href="#abbrstyle.short-hyphen-postlong-hyphen"><span
+class="cmss-10">short-hyphen-postlong-hyphen</span></a><a
+ id="dx1-23218"></a> but the
+ user supplies the description.
+</p>
+ </dd></dl>
+<!--l. 4041--><p class="noindent" >
+</p>
+<!--l. 4041--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">3.5 </span> <a
id="sec:newabbrvstyle"></a>Defining New Abbreviation Styles</h3>
-<!--l. 3656--><p class="noindent" >New abbreviation styles may be defined using:
-</p><!--l. 3657--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 4044--><p class="noindent" >New abbreviation styles may be defined using:
+</p><!--l. 4045--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\newabbreviationstyle</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-24001"></a> <span
@@ -7381,8 +8497,8 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">fmts</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 3659--><p class="noindent" >
-</p><!--l. 3660--><p class="noindent" >where &#x27E8;<span
+</p><!--l. 4047--><p class="noindent" >
+</p><!--l. 4048--><p class="noindent" >where &#x27E8;<span
class="cmti-10">name</span>&#x27E9; is the name of the new style (as used in the mandatory argument of
<span
class="cmtt-10">\setabbreviationstyle</span><a
@@ -7391,7 +8507,10 @@ class="cmss-10">glossaries </span>package&#8217;s
<span
class="cmtt-10">\newacronymstyle</span><a
id="dx1-24003"></a> command.
-</p><!--l. 3667--><p class="indent" > <div class="important" title="Important Note"> You can&#8217;t use styles defined by <span
+
+
+
+</p><!--l. 4055--><p class="indent" > <div class="important" title="Important Note"> You can&#8217;t use styles defined by <span
class="cmtt-10">\newacronymstyle </span>with <span
class="cmss-10">glossaries-extra</span>
unless you have reverted <span
@@ -7405,17 +8524,17 @@ class="cmss-10">glossaries</span>
package can&#8217;t be used with abbreviations defined with <span
class="cmtt-10">\newabbreviation</span>.
</div>
-</p><!--l. 3674--><p class="noindent" >
-</p><!--l. 3676--><p class="indent" > The &#x27E8;<span
+</p><!--l. 4062--><p class="noindent" >
+</p><!--l. 4064--><p class="indent" > The &#x27E8;<span
class="cmti-10">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. 3679--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4067--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\CustomAbbreviationFields</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-24006"></a> <span
class="cmtt-10">\CustomAbbreviationFields </span></div><hr>
-</p><!--l. 3681--><p class="noindent" >
+</p><!--l. 4069--><p class="noindent" >
to set the entry fields including the <span
class="cmss-10">name</span><a
id="dx1-24007"></a> (defaults to the short form if omitted),
@@ -7433,58 +8552,78 @@ class="cmss-10">plural</span><a
<span
class="cmss-10">description</span><a
id="dx1-24013"></a>.
-</p><!--l. 3688--><p class="indent" > <div class="important" title="Important Note"> <span
+</p><!--l. 4076--><p class="indent" > <div class="important" title="Important Note"> <span
class="cmtt-10">\CustomAbbreviationFields </span>is expanded by <span
class="cmtt-10">\newabbreviation </span>so take care to
protect commands that shouldn&#8217;t be expanded. </div>
-</p><!--l. 3691--><p class="noindent" >
-</p><!--l. 3693--><p class="indent" > For example, the <span
-class="cmss-10">long-short</span><a
+</p><!--l. 4079--><p class="noindent" >
+</p><!--l. 4081--><p class="indent" > For example, the <a
+href="#abbrstyle.long-short"><span
+class="cmss-10">long-short</span></a><a
id="dx1-24014"></a> style has the following in &#x27E8;<span
class="cmti-10">setup</span>&#x27E9;:
</p>
- <div class="verbatim" id="verbatim-99">
+ <div class="verbatim" id="verbatim-98">
&#x00A0;&#x00A0;\renewcommand*{\CustomAbbreviationFields}{%
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;name={\protect\glsabbrvfont{\the\glsshorttok}},
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;sort={\the\glsshorttok},
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;first={\protect\glsfirstlongfont{\the\glslongtok}%
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;\protect\glsxtrfullsep{\the\glslabeltok}%
-&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;(\protect\glsfirstabbrvfont{\the\glsshorttok})},%
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshorttok}}},%
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;\protect\glsxtrfullsep{\the\glslabeltok}%
-&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;(\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
-&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;plural={\protect\glsabbvfont{\the\glsshortpltok}},%
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshortpltok}}},%
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;description={\the\glslongtok}}%
</div>
-<!--l. 3707--><p class="nopar" > Note that the <span
+<!--l. 4095--><p class="nopar" > Note that the <span
class="cmss-10">first</span><a
id="dx1-24015"></a> and <span
class="cmss-10">firstplural</span><a
id="dx1-24016"></a> are set even though they&#8217;re not used by
<span
class="cmtt-10">\gls</span>.
-</p><!--l. 3711--><p class="indent" > The &#x27E8;<span
+</p><!--l. 4099--><p class="indent" > The basic styles, such as <a
+href="#abbrstyle.long-short"><span
+class="cmss-10">long-short</span></a><a
+ id="dx1-24017"></a>, use commands like <span
+class="cmtt-10">\glsabbrvfont </span>(which are
+redefined whenever the style formatting is set) within <span
+class="cmtt-10">\CustomAbbreviationFields</span>.
+Other styles, such as <a
+href="#abbrstyle.long-em-short-em"><span
+class="cmss-10">long-em-short-em</span></a><a
+ id="dx1-24018"></a> directly use their own custom commands, such
+as <span
+class="cmtt-10">\glsabbrvemfont</span>. With these styles, commands like <span
+class="cmtt-10">\glsabbrvfont </span>still need to
+be defined as appropriate in the &#x27E8;<span
+class="cmti-10">fmts</span>&#x27E9; argument even if they&#8217;re not used within
+<span
+class="cmtt-10">\CustomAbbreviationFields</span>.
+</p><!--l. 4108--><p class="indent" > The &#x27E8;<span
class="cmti-10">setup</span>&#x27E9; argument may also redefine
-</p><!--l. 3712--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4109--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrPostNewAbbreviation</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24017"></a> <span
+ id="dx1-24019"></a> <span
class="cmtt-10">\GlsXtrPostNewAbbreviation </span></div><hr>
-</p><!--l. 3714--><p class="noindent" >
+</p><!--l. 4111--><p class="noindent" >
which can be used to assign attributes. (This will automatically be initialised to do
nothing.)
-</p><!--l. 3718--><p class="indent" > For example, the <span
-class="cmss-10">short-footnote</span><a
- id="dx1-24018"></a> includes the following in &#x27E8;<span
+</p><!--l. 4115--><p class="indent" > For example, the <a
+href="#abbrstyle.short-footnote"><span
+class="cmss-10">short-footnote</span></a><a
+ id="dx1-24020"></a> includes the following in &#x27E8;<span
class="cmti-10">setup</span>&#x27E9;:
</p>
- <div class="verbatim" id="verbatim-100">
+ <div class="verbatim" id="verbatim-99">
&#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}%
@@ -7494,222 +8633,252 @@ class="cmti-10">setup</span>&#x27E9;:
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;{}%
&#x00A0;<br />&#x00A0;&#x00A0;}%
</div>
-<!--l. 3729--><p class="nopar" > This sets the <span
-class="cmss-10">nohyperfirst</span><a
- id="dx1-24019"></a> attribute to &#8220;true&#8221;. It also unsets the <span
-class="cmss-10">regular</span><a
- id="dx1-24020"></a> attribute if it
-has previously been set. Note that the <span
-class="cmss-10">nohyperfirst</span><a
- id="dx1-24021"></a> attribute doesn&#8217;t get unset by
+<!--l. 4126--><p class="nopar" > This sets the <a
+href="#catattr.nohyperfirst"><span
+class="cmss-10">nohyperfirst</span></a><a
+ id="dx1-24021"></a> attribute to &#8220;true&#8221;. It also unsets the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-24022"></a> attribute if it
+has previously been set. Note that the <a
+href="#catattr.nohyperfirst"><span
+class="cmss-10">nohyperfirst</span></a><a
+ id="dx1-24023"></a> attribute doesn&#8217;t get unset by
other styles, so take care not to switch styles for the same category.
-</p><!--l. 3736--><p class="indent" > You can access the short, long, short plural and long plural values through the
+</p><!--l. 4133--><p class="indent" > You can access the short, long, short plural and long plural values through the
following token registers.
-</p><!--l. 3739--><p class="indent" > Short value (defined by <span
+</p><!--l. 4136--><p class="indent" > Short value (defined by <span
class="cmss-10">glossaries</span>):
-</p><!--l. 3740--><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="cmtt-9">\glsshorttok</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24022"></a> <span
+ id="dx1-24024"></a> <span
class="cmtt-10">\glsshorttok </span></div><hr>
-</p><!--l. 3742--><p class="noindent" >
-</p><!--l. 3744--><p class="indent" > Short plural value (defined by <span
+</p><!--l. 4139--><p class="noindent" >
+</p><!--l. 4141--><p class="indent" > Short plural value (defined by <span
class="cmss-10">glossaries-extra</span>):
-</p><!--l. 3745--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4142--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsshortpltok</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24023"></a> <span
+ id="dx1-24025"></a> <span
class="cmtt-10">\glsshortpltok </span></div><hr>
-</p><!--l. 3747--><p class="noindent" >
+</p><!--l. 4144--><p class="noindent" >
(This may be the default value or, if provided, the value provided by the user
through the <span
class="cmss-10">shortplural</span><a
- id="dx1-24024"></a> key in the optional argument of <span
+ id="dx1-24026"></a> key in the optional argument of <span
class="cmtt-10">\newabbreviation</span><a
- id="dx1-24025"></a>.)
-</p><!--l. 3752--><p class="indent" > Long value (defined by <span
+ id="dx1-24027"></a>.)
+</p><!--l. 4149--><p class="indent" > Long value (defined by <span
class="cmss-10">glossaries</span>):
-</p><!--l. 3753--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4150--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glslongtok</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24026"></a> <span
+ id="dx1-24028"></a> <span
class="cmtt-10">\glslongtok </span></div><hr>
-</p><!--l. 3755--><p class="noindent" >
-</p><!--l. 3757--><p class="indent" > Long plural value (defined by <span
+</p><!--l. 4152--><p class="noindent" >
+</p><!--l. 4154--><p class="indent" > Long plural value (defined by <span
class="cmss-10">glossaries-extra</span>):
-</p><!--l. 3758--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4155--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glslongpltok</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24027"></a> <span
+ id="dx1-24029"></a> <span
class="cmtt-10">\glslongpltok </span></div><hr>
-</p><!--l. 3760--><p class="noindent" >
+</p><!--l. 4157--><p class="noindent" >
(This may be the default value or, if provided, the value provided by the user
through the <span
class="cmss-10">longplural</span><a
- id="dx1-24028"></a> key in the optional argument of <span
+ id="dx1-24030"></a> key in the optional argument of <span
class="cmtt-10">\newabbreviation</span><a
- id="dx1-24029"></a>.)
-</p><!--l. 3765--><p class="indent" > There are two other registers available that are defined by <span
+ id="dx1-24031"></a>.)
+</p><!--l. 4162--><p class="indent" > The short or long values may be modified by attributes (such as <a
+href="#catattr.markwords"><span
+class="cmss-10">markwords</span></a><a
+ id="dx1-24032"></a>). The
+above registers reflect the modification. If you want to access the original
+(unmodified) short or long form (as provided in the final two arguments of
+<span
+class="cmtt-10">\newabbreviation</span>), then use the commands:
+</p><!--l. 4167--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrorgshort</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-24033"></a> <span
+class="cmtt-10">\glsxtrorgshort </span></div><hr>
+</p><!--l. 4169--><p class="noindent" >
+for the short form and
+</p><!--l. 4171--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrorglong</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-24034"></a> <span
+class="cmtt-10">\glsxtrorglong </span></div><hr>
+</p><!--l. 4173--><p class="noindent" >
+for the long form. (These may be useful for the <span
+class="cmss-10">sort</span><a
+ id="dx1-24035"></a> key to avoid any formatting that
+
+
+
+may be added by the attribute setting.)
+</p><!--l. 4177--><p class="indent" > There are two other registers available that are defined by <span
class="cmss-10">glossaries</span>:
-</p><!--l. 3768--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4180--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glslabeltok</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24030"></a> <span
+ id="dx1-24036"></a> <span
class="cmtt-10">\glslabeltok </span></div><hr>
-</p><!--l. 3770--><p class="noindent" >
+</p><!--l. 4182--><p class="noindent" >
which contains the entry&#8217;s label and
-</p><!--l. 3772--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4184--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glskeylisttok</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24031"></a> <span
+ id="dx1-24037"></a> <span
class="cmtt-10">\glskeylisttok </span></div><hr>
-</p><!--l. 3774--><p class="noindent" >
+</p><!--l. 4186--><p class="noindent" >
which contains the values provided in the optional argument of <span
class="cmtt-10">\newabbreviation</span><a
- id="dx1-24032"></a>.
-</p><!--l. 3778--><p class="indent" > Remember put <span
+ id="dx1-24038"></a>.
+</p><!--l. 4190--><p class="indent" > Remember put <span
class="cmtt-10">\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. 3781--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4193--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glscategorylabel</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24033"></a> <span
+ id="dx1-24039"></a> <span
class="cmtt-10">\glscategorylabel </span></div><hr>
-
-
-
-</p><!--l. 3783--><p class="noindent" >
+</p><!--l. 4195--><p class="noindent" >
This may be used inside the definition of <span
class="cmtt-10">\GlsXtrPostNewAbbreviation</span>.
-</p><!--l. 3787--><p class="indent" > If you want to base a style on an existing style, you can use
-</p><!--l. 3788--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4199--><p class="indent" > If you want to base a style on an existing style, you can use
+</p><!--l. 4200--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrUseAbbrStyleSetup</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24034"></a> <span
+ id="dx1-24040"></a> <span
class="cmtt-10">\GlsXtrUseAbbrStyleSetup{</span>&#x27E8;<span
class="cmitt-10">name</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 3790--><p class="noindent" >
+</p><!--l. 4202--><p class="noindent" >
where &#x27E8;<span
-class="cmti-10">name</span>&#x27E9; is the name of the existing style. For example, the <span
-class="cmss-10">short-sc-footnote</span><a
- id="dx1-24035"></a> and
-<span
-class="cmss-10">short-sm-footnote</span><a
- id="dx1-24036"></a> styles both simply use
+class="cmti-10">name</span>&#x27E9; is the name of the existing style. For example, the <a
+href="#abbrstyle.long-noshort-sc-desc"><span
+class="cmss-10">long-noshort-sc-desc</span></a><a
+ id="dx1-24041"></a>
+style simply does
</p>
- <div class="verbatim" id="verbatim-101">
-\GlsXtrUseAbbrStyleSetup{short-footnote}
+ <div class="verbatim" id="verbatim-100">
+\GlsXtrUseAbbrStyleSetup{long-noshort-desc}
</div>
-<!--l. 3796--><p class="nopar" > within &#x27E8;<span
+<!--l. 4207--><p class="nopar" > within &#x27E8;<span
class="cmti-10">setup</span>&#x27E9;.
-</p><!--l. 3799--><p class="indent" > The &#x27E8;<span
+</p><!--l. 4210--><p class="indent" > The &#x27E8;<span
class="cmti-10">fmts</span>&#x27E9; argument deals with the way the entry is displayed in the document.
-This argument should redefine the following commands:
-</p><!--l. 3803--><p class="indent" > The default suffix for the plural short form (if not overridden by the <span
+This argument should redefine the following commands.
+</p><!--l. 4214--><p class="indent" > The default suffix for the plural short form (if not overridden by the <span
class="cmss-10">shortplural</span><a
- id="dx1-24037"></a>
+ id="dx1-24042"></a>
key):
-</p><!--l. 3805--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4216--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\abbrvpluralsuffix</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24038"></a> <span
+ id="dx1-24043"></a> <span
class="cmtt-10">\abbrvpluralsuffix </span></div><hr>
-</p><!--l. 3807--><p class="noindent" >
+</p><!--l. 4218--><p class="noindent" >
(Note that this isn&#8217;t used for the plural long form, which just uses the regular
<span
class="cmtt-10">\glspluralsuffix</span>.)
-</p><!--l. 3811--><p class="indent" > The font used for the short form on <a
- id="dx1-24039"></a><a
+</p><!--l. 4222--><p class="indent" > The font used for the short form on <a
+ id="dx1-24044"></a><a
href="#glo:firstuse">first use</a> or in the full forms:
-</p><!--l. 3812--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4223--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsfirstabbrvfont</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24040"></a> <span
+ id="dx1-24045"></a> <span
class="cmtt-10">\glsfirstabbrvfont{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 3814--><p class="noindent" >
-</p><!--l. 3816--><p class="indent" > The font used for the short form on subsequent use or through commands like
+</p><!--l. 4225--><p class="noindent" >
+</p><!--l. 4227--><p class="indent" > The font used for the short form on subsequent use or through commands like
<span
class="cmtt-10">\glsxtrshort</span><a
- id="dx1-24041"></a>:
-</p><!--l. 3818--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-24046"></a>:
+</p><!--l. 4229--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsabbrvfont</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24042"></a> <span
+ id="dx1-24047"></a> <span
class="cmtt-10">\glsabbrvfont{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 3820--><p class="noindent" >
-</p><!--l. 3822--><p class="indent" > The font used for the long form on <a
- id="dx1-24043"></a>first use or in the full forms:
-</p><!--l. 3823--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4231--><p class="noindent" >
+</p><!--l. 4233--><p class="indent" > The font used for the long form on <a
+ id="dx1-24048"></a>first use or in the full forms:
+</p><!--l. 4234--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsfirstlongfont</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24044"></a> <span
+ id="dx1-24049"></a> <span
class="cmtt-10">\glsfirstlongfont{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 3825--><p class="noindent" >
-</p><!--l. 3827--><p class="indent" > The font used for the long form in commands like <span
+</p><!--l. 4236--><p class="noindent" >
+</p><!--l. 4238--><p class="indent" > The font used for the long form in commands like <span
class="cmtt-10">\glsxtrlong </span>use:
-</p><!--l. 3829--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4240--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glslongfont</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24045"></a> <span
+ id="dx1-24050"></a> <span
class="cmtt-10">\glslongfont{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 3831--><p class="noindent" >
-</p><!--l. 3833--><p class="indent" > Display full form singular no case-change (used by <span
+</p><!--l. 4242--><p class="noindent" >
+</p><!--l. 4244--><p class="indent" > Display full form singular no case-change (used by <span
class="cmtt-10">\gls</span><a
- id="dx1-24046"></a> on <a
- id="dx1-24047"></a>first use for
-abbreviations without the <span
-class="cmss-10">regular</span><a
- id="dx1-24048"></a> attribute set):
-</p><!--l. 3836--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-24051"></a> on <a
+ id="dx1-24052"></a>first use for
+abbreviations without the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-24053"></a> attribute set):
+</p><!--l. 4247--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrfullformat</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24049"></a> <span
+ id="dx1-24054"></a> <span
class="cmtt-10">\glsxtrfullformat{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 3838--><p class="noindent" >
-</p><!--l. 3840--><p class="indent" > Display full form singular first letter converted to upper case (used by <span
+</p><!--l. 4249--><p class="noindent" >
+</p><!--l. 4251--><p class="indent" > Display full form singular first letter converted to upper case (used by <span
class="cmtt-10">\Gls</span><a
- id="dx1-24050"></a> on
+ id="dx1-24055"></a> on
<a
- id="dx1-24051"></a>first use for abbreviations without the <span
-class="cmss-10">regular</span><a
- id="dx1-24052"></a> attribute set):
-</p><!--l. 3843--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-24056"></a>first use for abbreviations without the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-24057"></a> attribute set):
+</p><!--l. 4254--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtrfullformat</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24053"></a> <span
+ id="dx1-24058"></a> <span
class="cmtt-10">\Glsxtrfullformat{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 3845--><p class="noindent" >
-</p><!--l. 3847--><p class="indent" > Display full form plural no case-change (used by <span
+</p><!--l. 4256--><p class="noindent" >
+</p><!--l. 4258--><p class="indent" > Display full form plural no case-change (used by <span
class="cmtt-10">\glspl</span><a
- id="dx1-24054"></a> on <a
- id="dx1-24055"></a>first use for
-abbreviations without the <span
-class="cmss-10">regular</span><a
- id="dx1-24056"></a> attribute set):
-</p><!--l. 3850--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-24059"></a> on <a
+ id="dx1-24060"></a>first use for
+abbreviations without the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-24061"></a> attribute set):
+</p><!--l. 4261--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrfullplformat</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24057"></a> <span
+ id="dx1-24062"></a> <span
class="cmtt-10">\glsxtrfullplformat{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
@@ -7718,104 +8887,161 @@ class="cmtt-10">} </span></div><hr>
-</p><!--l. 3852--><p class="noindent" >
-</p><!--l. 3854--><p class="indent" > Display full form plural first letter converted to upper case (used by <span
+</p><!--l. 4263--><p class="noindent" >
+</p><!--l. 4265--><p class="indent" > Display full form plural first letter converted to upper case (used by <span
class="cmtt-10">\Glspl</span><a
- id="dx1-24058"></a> on
+ id="dx1-24063"></a> on
<a
- id="dx1-24059"></a><a
-href="#glo:firstuse">first use</a> for abbreviations without the <span
-class="cmss-10">regular</span><a
- id="dx1-24060"></a> attribute set):
-</p><!--l. 3857--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-24064"></a><a
+href="#glo:firstuse">first use</a> for abbreviations without the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-24065"></a> attribute set):
+</p><!--l. 4268--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtrfullplformat</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24061"></a> <span
+ id="dx1-24066"></a> <span
class="cmtt-10">\Glsxtrfullplformat{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 3859--><p class="noindent" >
-</p><!--l. 3861--><p class="indent" > In addition &#x27E8;<span
+</p><!--l. 4270--><p class="noindent" >
+</p><!--l. 4272--><p class="indent" > In addition &#x27E8;<span
class="cmti-10">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. 3865--><p class="indent" > Inline singular no case-change (used by <span
+</p><!--l. 4276--><p class="indent" > Inline singular no case-change (used by <span
class="cmtt-10">\glsentryfull</span><a
- id="dx1-24062"></a>, <span
+ id="dx1-24067"></a>, <span
class="cmtt-10">\glsxtrfull</span><a
- id="dx1-24063"></a> and
+ id="dx1-24068"></a> and
<span
class="cmtt-10">\GLSxtrfull</span><a
- id="dx1-24064"></a>):
-</p><!--l. 3867--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-24069"></a>):
+</p><!--l. 4278--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrinlinefullformat</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24065"></a> <span
+ id="dx1-24070"></a> <span
class="cmtt-10">\glsxtrinlinefullformat{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 3869--><p class="noindent" >
-</p><!--l. 3871--><p class="indent" > Inline singular first letter converted to upper case (used by <span
+</p><!--l. 4280--><p class="noindent" >
+</p><!--l. 4282--><p class="indent" > Inline singular first letter converted to upper case (used by <span
class="cmtt-10">\Glsentryfull</span><a
- id="dx1-24066"></a> and
+ id="dx1-24071"></a> and
<span
class="cmtt-10">\Glsxtrfull</span><a
- id="dx1-24067"></a>):
-</p><!--l. 3873--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-24072"></a>):
+</p><!--l. 4284--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtrinlinefullformat</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24068"></a> <span
+ id="dx1-24073"></a> <span
class="cmtt-10">\Glsxtrinlinefullformat{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 3875--><p class="noindent" >
-</p><!--l. 3877--><p class="indent" > Inline plural no case-change (used by <span
+</p><!--l. 4286--><p class="noindent" >
+</p><!--l. 4288--><p class="indent" > Inline plural no case-change (used by <span
class="cmtt-10">\glsentryfullpl</span><a
- id="dx1-24069"></a>, <span
+ id="dx1-24074"></a>, <span
class="cmtt-10">\glsxtrfullpl</span><a
- id="dx1-24070"></a> and
+ id="dx1-24075"></a> and
<span
class="cmtt-10">\GLSxtrfullpl</span><a
- id="dx1-24071"></a>):
-</p><!--l. 3879--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-24076"></a>):
+</p><!--l. 4290--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrinlinefullplformat</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24072"></a> <span
+ id="dx1-24077"></a> <span
class="cmtt-10">\glsxtrinlinefullplformat{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 3881--><p class="noindent" >
-</p><!--l. 3883--><p class="indent" > Inline plural first letter converted to upper case (used by <span
+</p><!--l. 4292--><p class="noindent" >
+</p><!--l. 4294--><p class="indent" > Inline plural first letter converted to upper case (used by <span
class="cmtt-10">\Glsentryfullpl</span><a
- id="dx1-24073"></a> and
+ id="dx1-24078"></a> and
<span
class="cmtt-10">\Glsxtrfullpl</span><a
- id="dx1-24074"></a>):
-</p><!--l. 3885--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-24079"></a>):
+</p><!--l. 4296--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtrinlinefullplformat</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24075"></a> <span
+ id="dx1-24080"></a> <span
class="cmtt-10">\Glsxtrinlinefullplformat{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 3887--><p class="noindent" >
-</p><!--l. 3889--><p class="indent" > If you want to provide support for <span
+</p><!--l. 4298--><p class="noindent" >
+</p><!--l. 4300--><p class="indent" > (New to version 1.17.) You can also modify the way the subsequent use is
+formatted by redefining the following four commands, but these won&#8217;t be used for
+abbreviations with the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-24081"></a> attribute set. If the style doesn&#8217;t redefine these
+commands, the default values are used.
+</p><!--l. 4306--><p class="indent" > Singular with no case-change:
+</p><!--l. 4307--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrsubsequentfmt</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-24082"></a> <span
+class="cmtt-10">\glsxtrsubsequentfmt{</span>&#x27E8;<span
+class="cmitt-10">label</span>&#x27E9;<span
+class="cmtt-10">}{</span>&#x27E8;<span
+class="cmitt-10">insert</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 4309--><p class="noindent" >
+</p><!--l. 4311--><p class="indent" > Singular with first letter upper case:
+</p><!--l. 4312--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\Glsxtrsubsequentfmt</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-24083"></a> <span
+class="cmtt-10">\Glsxtrsubsequentfmt{</span>&#x27E8;<span
+class="cmitt-10">label</span>&#x27E9;<span
+class="cmtt-10">}{</span>&#x27E8;<span
+class="cmitt-10">insert</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+</p><!--l. 4314--><p class="noindent" >
+
+
+
+</p><!--l. 4316--><p class="indent" > Plural with no case-change:
+</p><!--l. 4317--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrsubsequentplfmt</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-24084"></a> <span
+class="cmtt-10">\glsxtrsubsequentplfmt{</span>&#x27E8;<span
+class="cmitt-10">label</span>&#x27E9;<span
+class="cmtt-10">}{</span>&#x27E8;<span
+class="cmitt-10">insert</span>&#x27E9;<span
+class="cmtt-10">}</span>
+</div><hr>
+</p><!--l. 4319--><p class="noindent" >
+</p><!--l. 4321--><p class="indent" > Plural with first letter upper case:
+</p><!--l. 4322--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\Glsxtrsubsequentplfmt</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-24085"></a> <span
+class="cmtt-10">\Glsxtrsubsequentplfmt{</span>&#x27E8;<span
+class="cmitt-10">label</span>&#x27E9;<span
+class="cmtt-10">}{</span>&#x27E8;<span
+class="cmitt-10">insert</span>&#x27E9;<span
+class="cmtt-10">}</span>
+</div><hr>
+</p><!--l. 4324--><p class="noindent" >
+</p><!--l. 4326--><p class="indent" > If you want to provide support for <span
class="cmss-10">glossaries-accsupp</span><a
- id="dx1-24076"></a> use the following
+ id="dx1-24086"></a> use the following
<span
class="cmtt-10">\glsaccess</span>&#x27E8;<span
class="cmitt-10">xxx</span>&#x27E9; commands (<a
@@ -7828,110 +9054,121 @@ class="cmtt-10">\glsentry</span>&#x27E8;<span
class="cmti-10">xxx</span>&#x27E9; commands. (If you
don&#8217;t use <span
class="cmss-10">glossaries-accsupp</span><a
- id="dx1-24077"></a>, they will just do the corresponding <span
+ id="dx1-24087"></a>, they will just do the corresponding <span
class="cmtt-10">\glsentry</span>&#x27E8;<span
class="cmti-10">xxx</span>&#x27E9;
command.)
-</p><!--l. 3897--><p class="indent" > For example, the <span
-class="cmss-10">short-long</span><a
- id="dx1-24078"></a> style has the following in &#x27E8;<span
+</p><!--l. 4334--><p class="indent" > For example, the <a
+href="#abbrstyle.short-long"><span
+class="cmss-10">short-long</span></a><a
+ id="dx1-24088"></a> style has the following in &#x27E8;<span
class="cmti-10">fmts</span>&#x27E9;:
</p>
- <div class="verbatim" id="verbatim-102">
-&#x00A0;&#x00A0;\renewcommand*{\abbrvpluralsuffix}{\glspluralsuffix}%
+ <div class="verbatim" id="verbatim-101">
+&#x00A0;&#x00A0;\renewcommand*{\abbrvpluralsuffix}{\glsxtrabbrvpluralsuffix}%
&#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}})%
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\ifglsxtrinsertinside\else##2\fi
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsxtrfullsep{##1}%
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
&#x00A0;<br />&#x00A0;&#x00A0;}%
&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\glsxtrfullplformat}[2]{%
-&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}%
-&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;(\glsfirstlongfont{\glsaccesslongpl{##1}})%
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\ifglsxtrinsertinside\else##2\fi
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsxtrfullsep{##1}%
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
&#x00A0;<br />&#x00A0;&#x00A0;}%
&#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}})%
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
&#x00A0;<br />&#x00A0;&#x00A0;}%
&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\Glsxtrfullplformat}[2]{%
-&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}%
-&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;(\glsfirstlongfont{\glsaccesslongpl{##1}})%
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
&#x00A0;<br />&#x00A0;&#x00A0;}%
</div>
-<!--l. 3921--><p class="nopar" > Since the inline full commands aren&#8217;t redefined, they default to the same as the
+<!--l. 4364--><p class="nopar" > Since the inline full commands aren&#8217;t redefined, they default to the same as the
display versions.
-</p><!--l. 3925--><p class="indent" > If you want to base a style on an existing style, you can use
-</p><!--l. 3926--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4368--><p class="indent" > If you want to base a style on an existing style, you can use
+</p><!--l. 4369--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrUseAbbrStyleFmts</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-24079"></a> <span
+ id="dx1-24089"></a> <span
class="cmtt-10">\GlsXtrUseAbbrStyleFmts{</span>&#x27E8;<span
class="cmitt-10">name</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 3928--><p class="noindent" >
+</p><!--l. 4371--><p class="noindent" >
within &#x27E8;<span
class="cmti-10">fmts</span>&#x27E9;, where &#x27E8;<span
class="cmti-10">name</span>&#x27E9; is the name of the existing style. For example, the
-<span
-class="cmss-10">short-sc-long</span><a
- id="dx1-24080"></a> style has the following in &#x27E8;<span
+<a
+href="#abbrstyle.long-short-desc"><span
+class="cmss-10">long-short-desc</span></a><a
+ id="dx1-24090"></a> style has the following in &#x27E8;<span
class="cmti-10">fmts</span>&#x27E9;:
</p>
- <div class="verbatim" id="verbatim-103">
-&#x00A0;&#x00A0;\GlsXtrUseAbbrStyleFmts{short-long}%
-&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
-&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\glsabbrvfont}[1]{\glsxtrscfont{##1}}%
-</div>
-<!--l. 3936--><p class="nopar" > and the <span
-class="cmss-10">short-sm-long</span><a
- id="dx1-24081"></a> style has:
-
-
-
-</p>
- <div class="verbatim" id="verbatim-104">
-&#x00A0;&#x00A0;\GlsXtrUseAbbrStyleFmts{short-long-desc}%
-&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\glsabbrvfont}[1]{\glsxtrsmfont{##1}}%
-&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ <div class="verbatim" id="verbatim-102">
+&#x00A0;&#x00A0;\GlsXtrUseAbbrStyleFmts{long-short}%
</div>
-<!--l. 3942--><p class="nopar" >
-</p><!--l. 3944--><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="cmss-10">short-em-long</span><a
- id="dx1-24082"></a> style, which is defined as:
+<!--l. 4377--><p class="nopar" >
+</p><!--l. 4379--><p class="indent" > Here&#8217;s an example of an abbreviation style that&#8217;s based on <a
+href="#abbrstyle.long-short"><span
+class="cmss-10">long-short</span></a><a
+ id="dx1-24091"></a> that displays
+the short form within <span
+class="cmtt-10">\textsf</span>:
</p>
- <div class="verbatim" id="verbatim-105">
+ <div class="verbatim" id="verbatim-103">
\newabbreviationstyle
-&#x00A0;<br />{short-em-long}%&#x00A0;label
+&#x00A0;<br />{custom-sf}%&#x00A0;label
&#x00A0;<br />{%&#x00A0;setup
&#x00A0;<br />&#x00A0;&#x00A0;\GlsXtrUseAbbrStyleSetup{short-long}%
&#x00A0;<br />}%
&#x00A0;<br />{%&#x00A0;fmts
&#x00A0;<br />&#x00A0;&#x00A0;\GlsXtrUseAbbrStyleFmts{short-long}%
-&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\glsabbrvfont}[1]{\glsxtremfont{##1}}%
+&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\glsabbrvfont}[1]{\textsf{##1}}%
&#x00A0;<br />}
</div>
-<!--l. 3957--><p class="nopar" >
+<!--l. 4392--><p class="nopar" > Note that this wouldn&#8217;t work if it was instead based on one of the modified versions
+such as <a
+href="#abbrstyle.short-sc-long"><span
+class="cmss-10">short-sc-long</span></a><a
+ id="dx1-24092"></a> as they explicitly use their own formatting commands, such as
+<span
+class="cmtt-10">\glsabbrvemfont</span>. The base styles, such as <a
+href="#abbrstyle.short-long"><span
+class="cmss-10">short-long</span></a><a
+ id="dx1-24093"></a>, use the more generic
+<span
+class="cmtt-10">\glsabbrvfont </span>etc which makes them easier to adapt than the modified
+styles.
+</p><!--l. 4400--><p class="indent" > For further details, see the &#8220;Abbreviations&#8221; section in the documented code
+(<span
+class="cmtt-10">glossaries-extra-code.pdf</span>).
</p>
-<!--l. 3959--><p class="indent" > </div>
-</p><!--l. 3959--><p class="noindent" ><a
+<!--l. 4403--><p class="indent" > </div>
+</p><!--l. 4403--><p class="noindent" ><a
href="#top">Top</a><div class="chapter"><h2 class="chapterHead">4. <a
id="sec:headtitle"></a>Entries in Sectioning Titles, Headers, Captions and Contents</h2>
-</p><!--l. 3962--><p class="indent" > The <span
+</p><!--l. 4406--><p class="indent" > The <span
class="cmss-10">glossaries </span>user manual cautions against using commands like <span
class="cmtt-10">\gls </span>in chapter
or section titles. The principle problems are: </p>
@@ -7965,9 +9202,9 @@ class="cmss-10">hyperref</span><a
class="cmss-10">hyperref</span><a
id="dx1-25004"></a>, you will end up with nested hyperlinks in the table of
contents.</li></ul>
-<!--l. 3983--><p class="noindent" >Similar problems can also occur with captions (except for the page header and bookmark
+<!--l. 4427--><p class="noindent" >Similar problems can also occur with captions (except for the page header and bookmark
issues).
-</p><!--l. 3986--><p class="indent" > To get around all these problems, the <span
+</p><!--l. 4430--><p class="indent" > To get around all these problems, the <span
class="cmss-10">glossaries </span>user manual recommends
using the expandable non-hyperlink commands, such as <span
class="cmtt-10">\glsentrytext</span><a
@@ -7995,22 +9232,22 @@ this:
</p>
- <div class="verbatim" id="verbatim-106">
+ <div class="verbatim" id="verbatim-104">
\chapter{A&#x00A0;Chapter&#x00A0;about&#x00A0;\glsabbrvfont{\glsentryshort{html}}}
</div>
-<!--l. 3999--><p class="nopar" > Or, if you are using <span
+<!--l. 4443--><p class="nopar" > Or, if you are using <span
class="cmss-10">hyperref</span><a
id="dx1-25008"></a>:
</p>
- <div class="verbatim" id="verbatim-107">
+ <div class="verbatim" id="verbatim-105">
\chapter{A&#x00A0;Chapter&#x00A0;about
&#x00A0;<br />\texorpdfstring{\glsabbrvfont{\glsentryshort{html}}}{\glsentryshort{html}}}
</div>
-<!--l. 4004--><p class="nopar" >
-</p><!--l. 4006--><p class="indent" > Since this is a bit cumbersome, you might want to define a new command to do
+<!--l. 4448--><p class="nopar" >
+</p><!--l. 4450--><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="cmtt-10">\gls </span>and <span
@@ -8024,7 +9261,7 @@ used by the standard page styles that display the chapter or section title in th
header using <span
class="cmtt-10">\MakeUppercase</span><a
id="dx1-25009"></a>.
-</p><!--l. 4017--><p class="indent" > The <span
+</p><!--l. 4461--><p class="indent" > The <span
class="cmss-10">glossaries-extra </span>package tries to resolve this by modifying <span
class="cmtt-10">\markright</span><a
id="dx1-25010"></a> and
@@ -8032,12 +9269,12 @@ class="cmtt-10">\markright</span><a
class="cmtt-10">\markboth</span><a
id="dx1-25011"></a>. If you don&#8217;t like this change, you can restore their former definitions
using
-</p><!--l. 4020--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4464--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrRevertMarks</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25012"></a> <span
class="cmtt-10">\glsxtrRevertMarks </span></div><hr>
-</p><!--l. 4022--><p class="noindent" >
+</p><!--l. 4466--><p class="noindent" >
In this case, you&#8217;ll have to use the <span
class="cmss-10">glossaries </span>manual&#8217;s recommendations of either
simply using <span
@@ -8048,16 +9285,16 @@ example:
</p>
- <div class="verbatim" id="verbatim-108">
+ <div class="verbatim" id="verbatim-106">
\chapter[A&#x00A0;Chapter&#x00A0;about&#x00A0;\glsentryshort{html}]{A&#x00A0;Chapter&#x00A0;about&#x00A0;\gls{html}}
</div>
-<!--l. 4029--><p class="nopar" >
-</p><!--l. 4031--><p class="indent" > If you don&#8217;t revert the mark commands back with <span
+<!--l. 4473--><p class="nopar" >
+</p><!--l. 4475--><p class="indent" > If you don&#8217;t revert the mark commands back with <span
class="cmtt-10">\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. 4037--><p class="indent" > The commands listed below all use <span
+</p><!--l. 4481--><p class="indent" > The commands listed below all use <span
class="cmtt-10">\texorpdfstring</span><a
id="dx1-25013"></a> if <span
class="cmss-10">hyperref</span><a
@@ -8066,7 +9303,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. 4043--><p class="indent" > These commands essentially behave as though you have used <span
+</p><!--l. 4487--><p class="indent" > These commands essentially behave as though you have used <span
class="cmtt-10">\glsxtrshort </span>(or
equivalent) with the options <span
class="cmss-10">noindex</span><a
@@ -8074,11 +9311,12 @@ class="cmss-10">noindex</span><a
class="cmss-10">hyper=false</span><a
id="dx1-25016"></a>. The text produced won&#8217;t be
converted to upper case in the page headings by default. If you want the text
-converted to upper case you need to set the <span
-class="cmss-10">headuc</span><a
+converted to upper case you need to set the <a
+href="#catattr.headuc"><span
+class="cmss-10">headuc</span></a><a
id="dx1-25017"></a> attribute to &#8220;true&#8221; for the
appropriate category.
-</p><!--l. 4051--><p class="indent" > <div class="important" title="Important Note"> If you use one of the <span
+</p><!--l. 4495--><p class="indent" > <div class="important" title="Important Note"> If you use one of the <span
class="cmtt-10">\textsc</span><a
id="dx1-25018"></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
@@ -8086,8 +9324,9 @@ or section title style uses bold, this may override the small-caps setting,
in which case the abbreviation will just appear as lower case bold. If the
heading style uses italic, the abbreviation may appear in upright small-caps,
<span
-class="cmti-10">even if you have set the </span><span
-class="cmssi-10">headuc</span><a
+class="cmti-10">even if you have set the </span><a
+href="#catattr.headuc"><span
+class="cmssi-10">headuc</span></a><a
id="dx1-25019"></a> <span
class="cmti-10">attribute </span>since the all-capitals form still uses
<span
@@ -8095,37 +9334,37 @@ class="cmtt-10">\glsabbrvfont</span>. You may want to consider using the <span
class="cmss-10">slantsc</span><a
id="dx1-25020"></a> package in this case.
</div>
-</p><!--l. 4062--><p class="noindent" >
-</p><!--l. 4064--><p class="indent" > Display the short form:
-</p><!--l. 4065--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4506--><p class="noindent" >
+</p><!--l. 4508--><p class="indent" > Display the short form:
+</p><!--l. 4509--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsfmtshort</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25021"></a> <span
class="cmtt-10">\glsfmtshort{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4067--><p class="noindent" >
-</p><!--l. 4069--><p class="indent" > Display the plural short form:
-</p><!--l. 4070--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4511--><p class="noindent" >
+</p><!--l. 4513--><p class="indent" > Display the plural short form:
+</p><!--l. 4514--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsfmtshortpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25022"></a> <span
class="cmtt-10">\glsfmtshortpl{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4072--><p class="noindent" >
-</p><!--l. 4074--><p class="indent" > First letter upper case singular short form:
-</p><!--l. 4075--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4516--><p class="noindent" >
+</p><!--l. 4518--><p class="indent" > First letter upper case singular short form:
+</p><!--l. 4519--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsfmtshort</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25023"></a> <span
class="cmtt-10">\Glsfmtshort{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4077--><p class="noindent" >
+</p><!--l. 4521--><p class="noindent" >
(No case-change applied to PDF bookmarks.)
-</p><!--l. 4080--><p class="indent" > First letter upper case plural short form:
-</p><!--l. 4081--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4524--><p class="indent" > First letter upper case plural short form:
+</p><!--l. 4525--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsfmtshortpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25024"></a> <span
@@ -8135,111 +9374,111 @@ class="cmtt-10">} </span></div><hr>
-</p><!--l. 4083--><p class="noindent" >
+</p><!--l. 4527--><p class="noindent" >
(No case-change applied to PDF bookmarks.)
-</p><!--l. 4086--><p class="indent" > Display the long form:
-</p><!--l. 4087--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4530--><p class="indent" > Display the long form:
+</p><!--l. 4531--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsfmtlong</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25025"></a> <span
class="cmtt-10">\glsfmtlong{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4089--><p class="noindent" >
-</p><!--l. 4091--><p class="indent" > Display the plural long form:
-</p><!--l. 4092--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4533--><p class="noindent" >
+</p><!--l. 4535--><p class="indent" > Display the plural long form:
+</p><!--l. 4536--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsfmtlongpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25026"></a> <span
class="cmtt-10">\glsfmtlongpl{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4094--><p class="noindent" >
-</p><!--l. 4096--><p class="indent" > First letter upper case singular long form:
-</p><!--l. 4097--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4538--><p class="noindent" >
+</p><!--l. 4540--><p class="indent" > First letter upper case singular long form:
+</p><!--l. 4541--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsfmtlong</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25027"></a> <span
class="cmtt-10">\Glsfmtlong{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4099--><p class="noindent" >
+</p><!--l. 4543--><p class="noindent" >
(No case-change applied to PDF bookmarks.)
-</p><!--l. 4102--><p class="indent" > First letter upper case plural long form:
-</p><!--l. 4103--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4546--><p class="indent" > First letter upper case plural long form:
+</p><!--l. 4547--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsfmtlongpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25028"></a> <span
class="cmtt-10">\Glsfmtlongpl{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4105--><p class="noindent" >
+</p><!--l. 4549--><p class="noindent" >
(No case-change applied to PDF bookmarks.)
-</p><!--l. 4108--><p class="indent" > There are similar commands for the full form, but note that these use the <span
+</p><!--l. 4552--><p class="indent" > There are similar commands for the full form, but note that these use the <span
class="cmti-10">inline</span>
full form, which may be different from the full form used by <span
class="cmtt-10">\gls</span>.
-</p><!--l. 4112--><p class="indent" > Display the full form:
-</p><!--l. 4113--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4556--><p class="indent" > Display the full form:
+</p><!--l. 4557--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsfmtfull</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25029"></a> <span
class="cmtt-10">\glsfmtfull{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4115--><p class="noindent" >
-</p><!--l. 4117--><p class="indent" > Display the plural full form:
-</p><!--l. 4118--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4559--><p class="noindent" >
+</p><!--l. 4561--><p class="indent" > Display the plural full form:
+</p><!--l. 4562--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsfmtfullpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25030"></a> <span
class="cmtt-10">\glsfmtfullpl{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4120--><p class="noindent" >
-</p><!--l. 4122--><p class="indent" > First letter upper case singular full form:
-</p><!--l. 4123--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4564--><p class="noindent" >
+</p><!--l. 4566--><p class="indent" > First letter upper case singular full form:
+</p><!--l. 4567--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsfmtfull</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25031"></a> <span
class="cmtt-10">\Glsfmtfull{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4125--><p class="noindent" >
+</p><!--l. 4569--><p class="noindent" >
(No case-change applied to PDF bookmarks.)
-</p><!--l. 4128--><p class="indent" > First letter upper case plural full form:
-</p><!--l. 4129--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4572--><p class="indent" > First letter upper case plural full form:
+</p><!--l. 4573--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsfmtfullpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25032"></a> <span
class="cmtt-10">\Glsfmtfullpl{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4131--><p class="noindent" >
+</p><!--l. 4575--><p class="noindent" >
(No case-change applied to PDF bookmarks.)
-</p><!--l. 4134--><p class="indent" > There are also equivalent commands for the value of the <span
+</p><!--l. 4578--><p class="indent" > There are also equivalent commands for the value of the <span
class="cmss-10">text</span><a
id="dx1-25033"></a> field:
-</p><!--l. 4136--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4580--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsfmttext</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25034"></a> <span
class="cmtt-10">\glsfmttext{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4138--><p class="noindent" >
-</p><!--l. 4140--><p class="indent" > First letter converted to upper case:
-</p><!--l. 4141--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4582--><p class="noindent" >
+</p><!--l. 4584--><p class="indent" > First letter converted to upper case:
+</p><!--l. 4585--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsfmttext</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25035"></a> <span
class="cmtt-10">\Glsfmttext{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4143--><p class="noindent" >
+</p><!--l. 4587--><p class="noindent" >
(No case-change applied to PDF bookmarks.)
-</p><!--l. 4146--><p class="indent" > The plural equivalents:
-</p><!--l. 4147--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4590--><p class="indent" > The plural equivalents:
+</p><!--l. 4591--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsfmtplural</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25036"></a> <span
@@ -8249,64 +9488,64 @@ class="cmtt-10">} </span></div><hr>
-</p><!--l. 4149--><p class="noindent" >
+</p><!--l. 4593--><p class="noindent" >
and
-</p><!--l. 4151--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4595--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsfmtplural</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25037"></a> <span
class="cmtt-10">\Glsfmtplural{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4153--><p class="noindent" >
-</p><!--l. 4155--><p class="indent" > Similarly for the value of the <span
+</p><!--l. 4597--><p class="noindent" >
+</p><!--l. 4599--><p class="indent" > Similarly for the value of the <span
class="cmss-10">first</span><a
id="dx1-25038"></a> field:
-</p><!--l. 4157--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4601--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsfmtfirst</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25039"></a> <span
class="cmtt-10">\glsfmtfirst{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4159--><p class="noindent" >
-</p><!--l. 4161--><p class="indent" > First letter converted to upper case:
-</p><!--l. 4162--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4603--><p class="noindent" >
+</p><!--l. 4605--><p class="indent" > First letter converted to upper case:
+</p><!--l. 4606--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsfmtfirst</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25040"></a> <span
class="cmtt-10">\Glsfmtfirst{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4164--><p class="noindent" >
+</p><!--l. 4608--><p class="noindent" >
(No case-change applied to PDF bookmarks.)
-</p><!--l. 4167--><p class="indent" > The plural equivalents:
-</p><!--l. 4168--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4611--><p class="indent" > The plural equivalents:
+</p><!--l. 4612--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsfmtfirstpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25041"></a> <span
class="cmtt-10">\glsfmtfirstpl{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4170--><p class="noindent" >
+</p><!--l. 4614--><p class="noindent" >
and
-</p><!--l. 4172--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4616--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsfmtfirstpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-25042"></a> <span
class="cmtt-10">\Glsfmtfirstpl{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4174--><p class="noindent" >
+</p><!--l. 4618--><p class="noindent" >
</p>
-<!--l. 4176--><p class="indent" > </div>
-</p><!--l. 4176--><p class="noindent" ><a
+<!--l. 4620--><p class="indent" > </div>
+</p><!--l. 4620--><p class="noindent" ><a
href="#top">Top</a><div class="chapter"><h2 class="chapterHead">5. <a
id="sec:categories"></a>Categories</h2>
-</p><!--l. 4179--><p class="indent" > Each entry defined by <span
+</p><!--l. 4623--><p class="indent" > Each entry defined by <span
class="cmtt-10">\newglossaryentry</span><a
id="dx1-26001"></a> (or commands that internally use it
such as <span
@@ -8320,14 +9559,14 @@ of some control sequences, avoid problematic characters within the category labe
class="cmss-10">babel</span><a
id="dx1-26004"></a> shorthands on that make some characters
active.)
-</p><!--l. 4188--><p class="indent" > The use of categories can give you more control over the way entries are displayed
+</p><!--l. 4632--><p class="indent" > The use of categories can give you more control over the way entries are displayed
in the text or glossary. Note that an entry&#8217;s category is independent of the glossary
type. Be careful not to confuse <span
class="cmss-10">category</span><a
id="dx1-26005"></a> with <span
class="cmss-10">type</span><a
id="dx1-26006"></a>.
-</p><!--l. 4193--><p class="indent" > The default category assumed by <span
+</p><!--l. 4637--><p class="indent" > The default category assumed by <span
class="cmtt-10">\newglossaryentry </span>is labelled <span
class="cmss-10">general</span><a
id="dx1-26007"></a>.
@@ -8340,7 +9579,7 @@ class="cmtt-10">\newacronym </span>have the category set to
<span
class="cmss-10">acronym</span><a
id="dx1-26009"></a> by default.
-</p><!--l. 4200--><p class="indent" > Additionally, if you have enabled <span
+</p><!--l. 4644--><p class="indent" > Additionally, if you have enabled <span
class="cmtt-10">\newterm</span><a
id="dx1-26010"></a> with the <span
class="cmss-10">index</span><a
@@ -8350,33 +9589,35 @@ class="cmss-10">index</span><a
id="dx1-26012"></a> by default. If you have enabled
<span
class="cmtt-10">\glsxtrnewsymbol</span><a
- id="dx1-26013"></a> with the <span
-class="cmss-10">symbols</span><a
+ id="dx1-26013"></a> with the <a
+href="#styopt.symbols"><span
+class="cmss-10">symbols</span></a><a
id="dx1-26014"></a> package option, that command will set the
category to <span
class="cmss-10">symbol</span><a
id="dx1-26015"></a>. If you have enabled <span
class="cmtt-10">\glsxtrnewnumber</span><a
- id="dx1-26016"></a> with the <span
-class="cmss-10">numbers</span><a
+ id="dx1-26016"></a> with the <a
+href="#styopt.numbers"><span
+class="cmss-10">numbers</span></a><a
id="dx1-26017"></a> package
option, that command will set the category to <span
class="cmss-10">number</span><a
id="dx1-26018"></a>.
-</p><!--l. 4208--><p class="indent" > You can obtain the category label for a given entry using
-</p><!--l. 4209--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4652--><p class="indent" > You can obtain the category label for a given entry using
+</p><!--l. 4653--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glscategory</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-26019"></a> <span
class="cmtt-10">\glscategory{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4211--><p class="noindent" >
+</p><!--l. 4655--><p class="noindent" >
This is equivalent to commands like <span
class="cmtt-10">\glsentryname </span>and so may be used in an
expandable context. No error is generated if the entry doesn&#8217;t exist.
-</p><!--l. 4216--><p class="indent" > You can test the category for a given entry using
-</p><!--l. 4217--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 4660--><p class="indent" > You can test the category for a given entry using
+</p><!--l. 4661--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsifcategory</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-26020"></a> <span
@@ -8391,7 +9632,7 @@ class="cmitt-10">part</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">false part</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4220--><p class="noindent" >
+</p><!--l. 4664--><p class="noindent" >
This is equivalent to </p><div class="alltt">
<div class="obeylines-v">
<span
@@ -8417,13 +9658,14 @@ class="cmtt-10">}</span>
</div> so any restrictions that apply to <span
class="cmtt-10">\ifglsfieldeq </span>also apply to <span
class="cmtt-10">\glsifcategory</span>.
-<!--l. 4229--><p class="indent" > Each category may have a set of attributes. For example, the <span
+<!--l. 4673--><p class="indent" > Each category may have a set of attributes. For example, the <span
class="cmss-10">general</span><a
id="dx1-26022"></a> and <span
class="cmss-10">acronym</span><a
id="dx1-26023"></a>
-categories have the attribute <span
-class="cmss-10">regular</span><a
+categories have the attribute <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
id="dx1-26024"></a> set to &#8220;true&#8221; to indicate that all entries with
either of those categories are regular entries (as opposed to abbreviations).
This attribute is accessed by <span
@@ -8431,10 +9673,11 @@ class="cmtt-10">\glsentryfmt </span>to determine whether to use
<span
class="cmtt-10">\glsgenentryfmt </span>or <span
class="cmtt-10">\glsxtrgenabbrvfmt</span>.
-</p><!--l. 4237--><p class="indent" > Other attributes recognised by <span
+</p><!--l. 4681--><p class="indent" > Other attributes recognised by <span
class="cmss-10">glossaries-extra </span>are:
</p><dl class="description"><dt class="description">
-<span
+<a
+ id="catattr.nohyperfirst"></a><span
class="cmssbx-10">nohyperfirst</span><a
id="dx1-26025"></a> </dt><dd
class="description">When using commands like <span
@@ -8466,21 +9709,23 @@ class="cmss-10">hyperfirst=false</span><a
class="cmss-10">glossaries</span><a
id="dx1-26031"></a>). If you want commands these
<span
-class="cmtt-10">\glsfirst </span>etc commands to ignore the <span
-class="cmss-10">nohyperfirst</span><a
+class="cmtt-10">\glsfirst </span>etc commands to ignore the <a
+href="#catattr.nohyperfirst"><span
+class="cmss-10">nohyperfirst</span></a><a
id="dx1-26032"></a> attribute then just
redefine
- <!--l. 4254--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 4698--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrchecknohyperfirst</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-26033"></a> <span
class="cmtt-10">\glsxtrchecknohyperfirst{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
- </p><!--l. 4256--><p class="noindent" >
+ </p><!--l. 4700--><p class="noindent" >
to do nothing.
</p></dd><dt class="description">
-<span
+<a
+ id="catattr.nohyper"></a><span
class="cmssbx-10">nohyper</span><a
id="dx1-26034"></a> </dt><dd
class="description">When using commands like <span
@@ -8493,7 +9738,8 @@ class="cmss-10">hyper</span><a
optional argument of commands like <span
class="cmtt-10">\gls</span>.)
</dd><dt class="description">
-<span
+<a
+ id="catattr.indexonlyfirst"></a><span
class="cmssbx-10">indexonlyfirst</span><a
id="dx1-26037"></a> </dt><dd
class="description">This is similar to the <span
@@ -8501,7 +9747,8 @@ class="cmss-10">indexonlyfirst</span><a
id="dx1-26038"></a> package option but only for entries
that have a category with this attribute set to &#8220;true&#8221;.
</dd><dt class="description">
-<span
+<a
+ id="catattr.wrgloss"></a><span
class="cmssbx-10">wrgloss</span><a
id="dx1-26039"></a> </dt><dd
class="description">When using commands like <span
@@ -8512,7 +9759,8 @@ class="cmss-10">wrgloss</span><a
id="dx1-26041"></a><span
class="cmss-10">=after</span>. (New to v1.14.)
</dd><dt class="description">
-<span
+<a
+ id="catattr.discardperiod"></a><span
class="cmssbx-10">discardperiod</span><a
id="dx1-26042"></a> </dt><dd
class="description">If set to &#8220;true&#8221;, the post-<a
@@ -8523,19 +9771,19 @@ class="cmti-10">non-plural </span>commands like <span
class="cmtt-10">\gls </span>or <span
class="cmtt-10">\glstext</span>. (Provided
for entries such as abbreviations that end with a full stop.)
- <!--l. 4279--><p class="noindent" >Note that this can cause a problem if you access a field that doesn&#8217;t end with a
+ <!--l. 4723--><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-109">
+ <div class="verbatim" id="verbatim-107">
\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. 4286--><p class="nopar" > Here the <span
+ <!--l. 4730--><p class="nopar" > Here the <span
class="cmss-10">short</span><a
id="dx1-26044"></a> and <span
class="cmss-10">long</span><a
@@ -8548,135 +9796,251 @@ class="cmss-10">user1</span><a
</p>
- <div class="verbatim" id="verbatim-110">
+ <div class="verbatim" id="verbatim-108">
\glsuseri{dante}[.]
</div>
- <!--l. 4293--><p class="nopar" > This will bring the punctuation character inside the <a
+ <!--l. 4737--><p class="nopar" > This will bring the punctuation character inside the <a
id="dx1-26047"></a><a
href="#glo:linktext">link-text</a> and it won&#8217;t be
discarded.
</p></dd><dt class="description">
-<span
+<a
+ id="catattr.pluraldiscardperiod"></a><span
class="cmssbx-10">pluraldiscardperiod</span><a
id="dx1-26048"></a> </dt><dd
class="description">If this attribute is set to &#8220;true&#8221; <span
-class="cmti-10">and </span>the <span
-class="cmss-10">discardperiod</span><a
+class="cmti-10">and </span>the <a
+href="#catattr.discardperiod"><span
+class="cmss-10">discardperiod</span></a><a
id="dx1-26049"></a> attribute is
set to &#8220;true&#8221;, this will behave as above for the plural commands like <span
class="cmtt-10">\glspl </span>or
<span
class="cmtt-10">\glsplural</span>.
</dd><dt class="description">
-<span
+<a
+ id="catattr.retainfirstuseperiod"></a><span
class="cmssbx-10">retainfirstuseperiod</span><a
id="dx1-26050"></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-26051"></a><a
-href="#glo:firstuse">first use</a> instances, even if <span
-class="cmss-10">discardperiod</span><a
- id="dx1-26052"></a> or <span
-class="cmss-10">pluraldiscardperiod</span><a
+href="#glo:firstuse">first use</a> instances, even if <a
+href="#catattr.discardperiod"><span
+class="cmss-10">discardperiod</span></a><a
+ id="dx1-26052"></a> or <a
+href="#catattr.pluraldiscardperiod"><span
+class="cmss-10">pluraldiscardperiod</span></a><a
id="dx1-26053"></a> are
set. This is useful for &#x27E8;<span
class="cmti-10">short</span>&#x27E9; (&#x27E8;<span
class="cmti-10">long</span>&#x27E9;) abbreviation styles where only the short form
- has a trailing full stop..
+ has a trailing full stop.
</dd><dt class="description">
-<span
-class="cmssbx-10">insertdots</span><a
+<a
+ id="catattr.markwords"></a><span
+class="cmssbx-10">markwords</span><a
id="dx1-26054"></a> </dt><dd
class="description">If this attribute is set to &#8220;true&#8221; any entry defined using <span
class="cmtt-10">\newabbreviation</span><a
id="dx1-26055"></a>
+ will automatically have spaces in the long form replaced with
+ <!--l. 4756--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrwordsep</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-26056"></a> <span
+class="cmtt-10">\glsxtrwordsep </span></div><hr>
+ </p><!--l. 4758--><p class="noindent" >
+ and each word is encapsulated with
+ </p><!--l. 4760--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\glsxtrword</span><span
+class="cmtt-9">&#x00A0;</span></span><a
+ id="dx1-26057"></a> <span
+class="cmtt-10">\glsxtrword{</span>&#x27E8;<span
+class="cmitt-10">word</span>&#x27E9;<span
+class="cmtt-10">} </span></div><hr>
+ </p><!--l. 4762--><p class="noindent" >
+ For example:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-109">
+ \glssetcategoryattribute{abbreviation}{markwords}{true}
+ &#x00A0;<br />\newabbreviation{ip}{IP}{Internet&#x00A0;Protocol}
+</div>
+ <!--l. 4767--><p class="nopar" > is essentially the same as
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-110">
+ \newabbreviation{ip}{IP}
+ &#x00A0;<br />{\glsxtrword{Internet}\glsxtrwordsep\glsxtrword{Protocol}}
+</div>
+ <!--l. 4772--><p class="nopar" > The &#8220;hyphen&#8221; styles, such as <a
+href="#abbrstyle.long-hyphen-short-hyphen"><span
+class="cmss-10">long-hyphen-short-hyphen</span></a><a
+ id="dx1-26058"></a>, take advantage of this
+ markup. If the inserted material (provided in the final argument of commands
+ like <span
+class="cmtt-10">\gls</span><a
+ id="dx1-26059"></a>) starts with a hyphen then <span
+class="cmtt-10">\glsxtrwordsep </span>is locally redefined to a
+ hyphen. (The default value is a space). Note that this only applies to
+ commands like <span
+class="cmtt-10">\gls </span>and not like <span
+class="cmtt-10">\glsxtrlong</span>. You can provide your own
+ localised switch, if required. For example:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-111">
+ \newcommand{\hyplong}[2][]{%
+ &#x00A0;<br />&#x00A0;{\def\glsxtrwordsep{-}\glsxtrlong[#1]{#2}}}
+</div>
+ <!--l. 4784--><p class="nopar" >
+ </p><!--l. 4786--><p class="noindent" >This setting will also adjust the long plural.
+ </p><!--l. 4788--><p class="noindent" ><div class="important" title="Important Note"> This setting may result in the <span
+class="cmtt-10">\glsxtrword </span>and <span
+class="cmtt-10">\glsxtrwordsep </span>markup
+ ending up in the <span
+class="cmss-10">sort</span><a
+ id="dx1-26060"></a> field, depending on the style in use. </div>
+ </p><!--l. 4792--><p class="noindent" >
+ </p></dd><dt class="description">
+<a
+ id="catattr.markshortwords"></a><span
+class="cmssbx-10">markshortwords</span><a
+ id="dx1-26061"></a> </dt><dd
+class="description">This is similar to <a
+href="#catattr.markwords"><span
+class="cmss-10">markwords</span></a><a
+ id="dx1-26062"></a> but applies to the short form. (Only
+ useful for abbreviations that contain spaces.)
+ <!--l. 4798--><p class="noindent" >This setting will only adjust the short plural if the <span
+class="cmss-10">shortplural</span><a
+ id="dx1-26063"></a> key isn&#8217;t used.
+ This setting will take precedence over <a
+href="#catattr.insertdots"><span
+class="cmss-10">insertdots</span></a><a
+ id="dx1-26064"></a>.
+ </p><!--l. 4802--><p class="noindent" ><div class="important" title="Important Note"> This setting may result in the <span
+class="cmtt-10">\glsxtrword </span>and <span
+class="cmtt-10">\glsxtrwordsep </span>markup
+ ending up in the <span
+class="cmss-10">sort</span><a
+ id="dx1-26065"></a> field, depending on the style in use. </div>
+ </p><!--l. 4806--><p class="noindent" >
+ </p></dd><dt class="description">
+<a
+ id="catattr.insertdots"></a><span
+class="cmssbx-10">insertdots</span><a
+ id="dx1-26066"></a> </dt><dd
+class="description">If this attribute is set to &#8220;true&#8221; any entry defined using <span
+class="cmtt-10">\newabbreviation</span><a
+ id="dx1-26067"></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="cmti-10">short</span>&#x27E9; argument of <span
-class="cmtt-10">\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="cmti-10">short</span>&#x27E9; form with the plural suffix
- appended.
- <!--l. 4318--><p class="noindent" ><div class="important" title="Important Note"> If you explicitly override the short plural using the <span
+class="cmtt-10">\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="cmti-10">short</span>&#x27E9; form with the plural suffix appended. <span
+class="cmti-10">This setting is</span>
+ <span
+class="cmti-10">incompatible with </span><a
+href="#catattr.markshortwords"><span
+class="cmssi-10">markshortwords</span></a><a
+ id="dx1-26068"></a><span
+class="cmti-10">.</span>
+ <!--l. 4818--><p class="noindent" ><div class="important" title="Important Note"> If you explicitly override the short plural using the <span
class="cmss-10">shortplural</span><a
- id="dx1-26056"></a> key, you must
+ id="dx1-26069"></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. 4324--><p class="noindent" >
- </p><!--l. 4326--><p class="noindent" >This attribute is best used with the <span
-class="cmss-10">discardperiod</span><a
- id="dx1-26057"></a> attribute set to &#8220;true&#8221;.
+ </p><!--l. 4824--><p class="noindent" >
+ </p><!--l. 4826--><p class="noindent" >This attribute is best used with the <a
+href="#catattr.discardperiod"><span
+class="cmss-10">discardperiod</span></a><a
+ id="dx1-26070"></a> attribute set to &#8220;true&#8221;.
</p></dd><dt class="description">
-<span
+<a
+ id="catattr.aposplural"></a><span
class="cmssbx-10">aposplural</span><a
- id="dx1-26058"></a> </dt><dd
+ id="dx1-26071"></a> </dt><dd
class="description">If this attribute is set to &#8220;true&#8221;, <span
class="cmtt-10">\newabbreviation</span><a
- id="dx1-26059"></a> will insert an
+ id="dx1-26072"></a> will insert an
apostrophe (&#8217;) before the plural suffix for the <span
class="cmti-10">short </span>plural form (unless
+
+
+
explicitly overridden with the <span
class="cmss-10">shortplural</span><a
- id="dx1-26060"></a> key). The long plural form is
- unaffected by this setting.
+ id="dx1-26073"></a> key). The long plural form is
+ unaffected by this setting. This setting overrides <a
+href="#catattr.noshortplural"><span
+class="cmss-10">noshortplural</span></a><a
+ id="dx1-26074"></a>.
</dd><dt class="description">
-<span
+<a
+ id="catattr.noshortplural"></a><span
class="cmssbx-10">noshortplural</span><a
- id="dx1-26061"></a> </dt><dd
+ id="dx1-26075"></a> </dt><dd
class="description">If this attribute is set to &#8220;true&#8221;, <span
class="cmtt-10">\newabbreviation</span><a
- id="dx1-26062"></a> won&#8217;t append the
+ id="dx1-26076"></a> won&#8217;t append the
plural suffix for the short plural form. This means the <span
class="cmss-10">short</span><a
- id="dx1-26063"></a> and <span
+ id="dx1-26077"></a> and <span
class="cmss-10">shortplural</span><a
- id="dx1-26064"></a>
+ id="dx1-26078"></a>
values will be the same unless explicitly overridden. <span
-class="cmti-10">The </span><span
-class="cmssi-10">aposplural</span><a
- id="dx1-26065"></a> <span
-class="cmti-10">attribute</span>
+class="cmti-10">This setting is incompatible</span>
<span
-class="cmti-10">trumps the </span><span
-class="cmssi-10">noshortplural</span><a
- id="dx1-26066"></a> <span
-class="cmti-10">attribute.</span>
-
-
-
+class="cmti-10">with </span><a
+href="#catattr.aposplural"><span
+class="cmssi-10">aposplural</span></a><a
+ id="dx1-26079"></a><span
+class="cmti-10">.</span>
</dd><dt class="description">
-<span
+<a
+ id="catattr.headuc"></a><span
class="cmssbx-10">headuc</span><a
- id="dx1-26067"></a> </dt><dd
+ id="dx1-26080"></a> </dt><dd
class="description">If this attribute is set to &#8220;true&#8221;, commands like <span
class="cmtt-10">\glsfmtshort</span><a
- id="dx1-26068"></a> will use the
+ id="dx1-26081"></a> will use the
upper case version in the page headers.
</dd><dt class="description">
-<span
+<a
+ id="catattr.tagging"></a><span
class="cmssbx-10">tagging</span><a
- id="dx1-26069"></a> </dt><dd
+ id="dx1-26082"></a> </dt><dd
class="description">If this attribute is set to &#8220;true&#8221;, the tagging command defined by
<span
class="cmtt-10">\GlsXtrEnableInitialTagging</span><a
- id="dx1-26070"></a> will be activated to use <span
+ id="dx1-26083"></a> will be activated to use <span
class="cmtt-10">\glsxtrtagfont</span><a
- id="dx1-26071"></a> in
+ id="dx1-26084"></a> in
the glossary (see <a
href="#sec:tagging"><span
class="cmsy-10">&sect;</span>3.1 </a><a
href="#sec:tagging">Tagging Initials<!--tex4ht:ref: sec:tagging --></a>).
</dd><dt class="description">
-<span
+<a
+ id="catattr.entrycount"></a><span
class="cmssbx-10">entrycount</span><a
- id="dx1-26072"></a> </dt><dd
+ id="dx1-26085"></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="cmtt-10">\glsenableentrycount</span><a
- id="dx1-26073"></a>
+ id="dx1-26086"></a>
(see <a
href="#sec:entrycountmods"><span
class="cmsy-10">&sect;</span>2.4 </a><a
@@ -8684,28 +10048,30 @@ href="#sec:entrycountmods">Entry Counting Modifications<!--tex4ht:ref: sec:entry
categories that shouldn&#8217;t have this facility enabled. The value of this attribute
is used by <span
class="cmtt-10">\glsxtrifcounttrigger</span><a
- id="dx1-26074"></a> to determine how commands such as <span
+ id="dx1-26087"></a> to determine how commands such as <span
class="cmtt-10">\cgls</span><a
- id="dx1-26075"></a>
+ id="dx1-26088"></a>
should behave.
- <!--l. 4359--><p class="noindent" >With <span
+ <!--l. 4859--><p class="noindent" >With <span
class="cmss-10">glossaries</span>, commands like <span
class="cmtt-10">\cgls </span>use <span
class="cmtt-10">\cglsformat </span>only if the previous
usage count for that entry was equal to&#x00A0;1. With <span
class="cmss-10">glossaries-extra </span>the test is now
- for entries that have the <span
-class="cmss-10">entrycount</span><a
- id="dx1-26076"></a> attribute set and where the previous
+ for entries that have the <a
+href="#catattr.entrycount"><span
+class="cmss-10">entrycount</span></a><a
+ id="dx1-26089"></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
+<a
+ id="catattr.glossdesc"></a><span
class="cmssbx-10">glossdesc</span><a
- id="dx1-26077"></a> </dt><dd
+ id="dx1-26090"></a> </dt><dd
class="description">The <span
class="cmtt-10">\glossentrydesc</span><a
- id="dx1-26078"></a> command (used in the predefined glossary styles) is
+ id="dx1-26091"></a> command (used in the predefined glossary styles) is
modified by <span
class="cmss-10">glossaries-extra </span>to check for this attribute. The attribute may have
one of the following values:
@@ -8714,34 +10080,34 @@ class="cmss-10">glossaries-extra </span>to check for this attribute. The attribu
class="cmtt-10">firstuc</span>: the first letter of the description will be converted to upper
case (using <span
class="cmtt-10">\Glsentrydesc</span><a
- id="dx1-26079"></a>).
+ id="dx1-26092"></a>).
</li>
<li class="itemize"><span
class="cmtt-10">title</span>: the description will be used in the argument of the title casing
command <span
class="cmtt-10">\capitalisewords</span><a
- id="dx1-26080"></a> (provided by <span
+ id="dx1-26093"></a> (provided by <span
class="cmss-10">mfirstuc</span><a
- id="dx1-26081"></a>). If you want to use a
+ id="dx1-26094"></a>). If you want to use a
different command you can redefine:
- <!--l. 4378--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 4878--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrfieldtitlecasecs</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26082"></a> <span
+ id="dx1-26095"></a> <span
class="cmtt-10">\glsxtrfieldtitlecasecs{</span>&#x27E8;<span
class="cmitt-10">phrase cs</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
- </p><!--l. 4380--><p class="noindent" >
+ </p><!--l. 4880--><p class="noindent" >
For example:
</p>
- <div class="verbatim" id="verbatim-111">
+ <div class="verbatim" id="verbatim-112">
\newcommand*{\glsxtrfieldtitlecasecs}[1]{\xcapitalisefmtwords*{#1}}
</div>
- <!--l. 4384--><p class="nopar" > (Note that the argument to <span
+ <!--l. 4884--><p class="nopar" > (Note that the argument to <span
class="cmtt-10">\glsxtrfieldtitlecasecs </span>will be a control
sequence whose replacement text is the entry&#8217;s description, which is why
<span
@@ -8749,109 +10115,116 @@ class="cmtt-10">\xcapitalisefmtwords </span>is needed instead of <span
class="cmtt-10">\capitalisefmtwords</span>.)
</p>
</li></ul>
- <!--l. 4391--><p class="noindent" >Any other values of this attribute are ignored. Remember that there are design
+ <!--l. 4891--><p class="noindent" >Any other values of this attribute are ignored. Remember that there are design
limitations for both the first letter uppercasing and the title casing commands.
See the <span
class="cmss-10">mfirstuc</span><a
- id="dx1-26083"></a> user manual for further details.
+ id="dx1-26096"></a> user manual for further details.
</p></dd><dt class="description">
-<span
+<a
+ id="catattr.glossdescfont"></a><span
class="cmssbx-10">glossdescfont</span><a
- id="dx1-26084"></a> </dt><dd
+ id="dx1-26097"></a> </dt><dd
class="description">(New to version 1.04) In addition to the above, the modified
<span
class="cmtt-10">\glossentrydesc</span><a
- id="dx1-26085"></a> command also checks this attribute. If set, it should be the
+ id="dx1-26098"></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-112">
+ <div class="verbatim" id="verbatim-113">
\glssetcategoryattribute{general}{glossdescfont}{emph}
</div>
- <!--l. 4404--><p class="nopar" >
+ <!--l. 4904--><p class="nopar" >
</p></dd><dt class="description">
-<span
+<a
+ id="catattr.glossname"></a><span
class="cmssbx-10">glossname</span><a
- id="dx1-26086"></a> </dt><dd
-class="description">As <span
-class="cmss-10">glossdesc</span><a
- id="dx1-26087"></a> but applies to <span
+ id="dx1-26099"></a> </dt><dd
+class="description">As <a
+href="#catattr.glossdesc"><span
+class="cmss-10">glossdesc</span></a><a
+ id="dx1-26100"></a> but applies to <span
class="cmtt-10">\glossentryname</span><a
- id="dx1-26088"></a>. Additionally, if this
+ id="dx1-26101"></a>. Additionally, if this
attribute is set to &#8220;uc&#8221; the name is converted to all capitals.
</dd><dt class="description">
-<span
+<a
+ id="catattr.indexname"></a><span
class="cmssbx-10">indexname</span><a
- id="dx1-26089"></a> </dt><dd
+ id="dx1-26102"></a> </dt><dd
class="description">If set, the <span
class="cmtt-10">\glsxtrpostnamehook </span>hook used at the end of <span
class="cmtt-10">\glossentyname</span><a
- id="dx1-26090"></a>
+ id="dx1-26103"></a>
will index the entry using <span
class="cmtt-10">\index</span><a
- id="dx1-26091"></a>. See <a
+ id="dx1-26104"></a>. See <a
href="#sec:autoindex"><span
class="cmsy-10">&sect;</span>7 </a><a
href="#sec:autoindex">Auto-Indexing<!--tex4ht:ref: sec:autoindex --></a> for further
details.
</dd><dt class="description">
-<span
+<a
+ id="catattr.glossnamefont"></a><span
class="cmssbx-10">glossnamefont</span><a
- id="dx1-26092"></a> </dt><dd
+ id="dx1-26105"></a> </dt><dd
class="description">(New to version 1.04) In addition to the above, the modified
<span
class="cmtt-10">\glossentryname</span><a
- id="dx1-26093"></a> command also checks this attribute. If set, it should be the
+ id="dx1-26106"></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:
- <div class="verbatim" id="verbatim-113">
+ <div class="verbatim" id="verbatim-114">
\glssetcategoryattribute{general}{glossnamefont}{emph}
</div>
- <!--l. 4424--><p class="nopar" > Note that this overrides <span
+ <!--l. 4924--><p class="nopar" > Note that this overrides <span
class="cmtt-10">\glsnamefont </span>which will only be used if this attribute
hasn&#8217;t been set.
- </p><!--l. 4428--><p class="noindent" >Remember that glossary styles may additionally apply a font change,
+ </p><!--l. 4928--><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="cmtt-10">\item</span>.
</p></dd><dt class="description">
-<span
+<a
+ id="catattr.dualindex"></a><span
class="cmssbx-10">dualindex</span><a
- id="dx1-26094"></a> </dt><dd
+ id="dx1-26107"></a> </dt><dd
class="description">If set, whenever a glossary entry has information written to the external
glossary file through commands like <span
class="cmtt-10">\gls</span><a
- id="dx1-26095"></a> and <span
+ id="dx1-26108"></a> and <span
class="cmtt-10">\glsadd</span><a
- id="dx1-26096"></a>, a&#x00A0;corresponding line
+ id="dx1-26109"></a>, a&#x00A0;corresponding line
will be written to the indexing file using <span
class="cmtt-10">\index</span><a
- id="dx1-26097"></a>. See <a
+ id="dx1-26110"></a>. See <a
href="#sec:autoindex"><span
class="cmsy-10">&sect;</span>7 </a><a
href="#sec:autoindex">Auto-Indexing<!--tex4ht:ref: sec:autoindex --></a> for
further details.
</dd><dt class="description">
-<span
+<a
+ id="catattr.targeturl"></a><span
class="cmssbx-10">targeturl</span><a
- id="dx1-26098"></a> </dt><dd
+ id="dx1-26111"></a> </dt><dd
class="description">If set, the hyperlink generated by commands like <span
class="cmtt-10">\gls </span>will be set to the
URL provided by this attributes value. For example:
- <div class="verbatim" id="verbatim-114">
+ <div class="verbatim" id="verbatim-115">
\glssetcategoryattribute{general}{targeturl}{master-doc.pdf}
</div>
- <!--l. 4443--><p class="nopar" > (See also the accompanying sample file <span
+ <!--l. 4943--><p class="nopar" > (See also the accompanying sample file <span
class="cmtt-10">sample-external.tex</span>.) If the URL
contains awkward characters (such as <span class="obeylines-h"><span class="verb"><span
class="cmtt-10">%</span></span></span> or <span class="obeylines-h"><span class="verb"><span
@@ -8859,75 +10232,79 @@ class="cmtt-10">~</span></span></span>) remember that the base <span
class="cmss-10">glossaries</span>
package provides commands like <span
class="cmtt-10">\glspercentchar</span><a
- id="dx1-26099"></a> and <span
+ id="dx1-26112"></a> and <span
class="cmtt-10">\glstildechar </span>that
expand to literal characters.
- </p><!--l. 4451--><p class="noindent" >If you want to a named anchor within the target URL (notionally adding
+ </p><!--l. 4951--><p class="noindent" >If you want to a named anchor within the target URL (notionally adding
<span
class="cmtt-10">#</span>&#x27E8;<span
-class="cmti-10">name</span>&#x27E9; to the URL), then you also need to set <span
-class="cmss-10">targetname</span><a
- id="dx1-26100"></a> to the anchor &#x27E8;<span
+class="cmti-10">name</span>&#x27E9; to the URL), then you also need to set <a
+href="#catattr.targetname"><span
+class="cmss-10">targetname</span></a><a
+ id="dx1-26113"></a> to the anchor &#x27E8;<span
class="cmti-10">name</span>&#x27E9;.
You may use <span
class="cmtt-10">\glslabel </span>within &#x27E8;<span
class="cmti-10">name</span>&#x27E9; which is set by commands like <span
class="cmtt-10">\gls </span>to
the entry&#8217;s label.
- </p><!--l. 4457--><p class="noindent" >All the predefined glossary styles start each entry listing with <span
+ </p><!--l. 4957--><p class="noindent" >All the predefined glossary styles start each entry listing with <span
class="cmtt-10">\glstarget</span>
which sets the anchor to <span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glolinkprefix\glslabel</span></span></span>, so if you want
- entries to link to glossaries in the URL given by <span
-class="cmss-10">targeturl</span><a
- id="dx1-26101"></a>, you can just
+ entries to link to glossaries in the URL given by <a
+href="#catattr.targeturl"><span
+class="cmss-10">targeturl</span></a><a
+ id="dx1-26114"></a>, you can just
do:
</p>
- <div class="verbatim" id="verbatim-115">
+ <div class="verbatim" id="verbatim-116">
\glssetcategoryattribute{general}{targetname}{\glolinkprefix\glslabel}
</div>
- <!--l. 4464--><p class="nopar" > (If the target document changed <span
+ <!--l. 4964--><p class="nopar" > (If the target document changed <span
class="cmtt-10">\glolinkprefix </span>then you will need to adjust
the above as appropriate.)
- </p><!--l. 4468--><p class="noindent" >If the anchor is in the form &#x27E8;<span
+ </p><!--l. 4968--><p class="noindent" >If the anchor is in the form &#x27E8;<span
class="cmti-10">name1</span>&#x27E9;<span
class="cmtt-10">.</span>&#x27E8;<span
-class="cmti-10">name2</span>&#x27E9; then use <span
-class="cmss-10">targetname</span><a
- id="dx1-26102"></a> for the &#x27E8;<span
+class="cmti-10">name2</span>&#x27E9; then use <a
+href="#catattr.targetname"><span
+class="cmss-10">targetname</span></a><a
+ id="dx1-26115"></a> for the &#x27E8;<span
class="cmti-10">name2</span>&#x27E9;
- part and <span
-class="cmss-10">targetcategory</span><a
- id="dx1-26103"></a> for the &#x27E8;<span
+ part and <a
+href="#catattr.targetcategory"><span
+class="cmss-10">targetcategory</span></a><a
+ id="dx1-26116"></a> for the &#x27E8;<span
class="cmti-10">name1</span>&#x27E9; part.
- </p><!--l. 4472--><p class="noindent" >For example:
+ </p><!--l. 4972--><p class="noindent" >For example:
</p>
- <div class="verbatim" id="verbatim-116">
+ <div class="verbatim" id="verbatim-117">
\glssetcategoryattribute{general}{targeturl}{master-doc.pdf}
&#x00A0;<br />\glssetcategoryattribute{general}{targetcategory}{page}
&#x00A0;<br />\glssetcategoryattribute{general}{targetname}{7}
</div>
- <!--l. 4477--><p class="nopar" > will cause all link text for <span
+ <!--l. 4977--><p class="nopar" > will cause all link text for <span
class="cmtt-10">general </span>entries to link to <span
class="cmtt-10">master-doc.pdf#page.7</span>
(page 7 of that PDF).
- </p><!--l. 4481--><p class="noindent" >If you want a mixture in your document of entries that link to an internal
+ </p><!--l. 4981--><p class="noindent" >If you want a mixture in your document of entries that link to an internal
glossary and entries that link to an external URL then you can use
the starred form of <span
class="cmtt-10">\newignoredglossary</span><a
- id="dx1-26104"></a> for the external list. For
+ id="dx1-26117"></a> for the external list. For
example:
</p>
- <div class="verbatim" id="verbatim-117">
+ <div class="verbatim" id="verbatim-118">
\newignoredglossary*{external}
&#x00A0;<br />\glssetcategoryattribute{external}{targeturl}{master-doc.pdf}
&#x00A0;<br />\glssetcategoryattribute{general}{targetname}{\glolinkprefix\glslabel}
@@ -8937,14 +10314,14 @@ class="cmtt-10">\newignoredglossary</span><a
&#x00A0;<br />&#x00A0;&#x00A0;category=external,
&#x00A0;<br />&#x00A0;&#x00A0;description={external&#x00A0;example}}
</div>
- <!--l. 4497--><p class="nopar" >
+ <!--l. 4997--><p class="nopar" >
</p>
</dd></dl>
-<!--l. 4502--><p class="indent" > An attribute can be set using:
-</p><!--l. 4503--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 5002--><p class="indent" > An attribute can be set using:
+</p><!--l. 5003--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glssetcategoryattribute</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26105"></a> <span
+ id="dx1-26118"></a> <span
class="cmtt-10">\glssetcategoryattribute{</span>&#x27E8;<span
class="cmitt-10">category-label</span>&#x27E9;<span
class="cmtt-10">}</span>
@@ -8954,30 +10331,31 @@ class="cmitt-10">attribute-label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">value</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4505--><p class="noindent" >
+</p><!--l. 5005--><p class="noindent" >
where &#x27E8;<span
class="cmti-10">category-label</span>&#x27E9; is the category label, &#x27E8;<span
class="cmti-10">attribute-label</span>&#x27E9; is the attribute label and
&#x27E8;<span
class="cmti-10">value</span>&#x27E9; is the new value for the attribute.
-</p><!--l. 4510--><p class="indent" > There is a shortcut version to set the <span
-class="cmss-10">regular</span><a
- id="dx1-26106"></a> attribute to &#8220;true&#8221;:
-</p><!--l. 4512--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5010--><p class="indent" > There is a shortcut version to set the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-26119"></a> attribute to &#8220;true&#8221;:
+</p><!--l. 5012--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glssetregularcategory</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26107"></a> <span
+ id="dx1-26120"></a> <span
class="cmtt-10">\glssetregularcategory{</span>&#x27E8;<span
class="cmitt-10">category-label</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 4514--><p class="noindent" >
-</p><!--l. 4516--><p class="indent" > If you need to lookup the category label for a particular entry, you can use the
+</p><!--l. 5014--><p class="noindent" >
+</p><!--l. 5016--><p class="indent" > If you need to lookup the category label for a particular entry, you can use the
shortcut command:
-</p><!--l. 4518--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5018--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glssetattribute</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26108"></a> <span
+ id="dx1-26121"></a> <span
class="cmtt-10">\glssetattribute{</span>&#x27E8;<span
class="cmitt-10">entry-label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
@@ -8987,16 +10365,16 @@ class="cmtt-10">}</span>
class="cmtt-10">{</span>&#x27E8;<span
class="cmitt-10">value</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4520--><p class="noindent" >
+</p><!--l. 5020--><p class="noindent" >
This uses <span
class="cmtt-10">\glssetcategoryattribute </span>with <span
class="cmtt-10">\glscategory </span>to set the attribute. Note
that this will affect all other entries that share this entry&#8217;s category.
-</p><!--l. 4525--><p class="indent" > You can fetch the value of an attribute for a particular category using:
-</p><!--l. 4527--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5025--><p class="indent" > You can fetch the value of an attribute for a particular category using:
+</p><!--l. 5027--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsgetcategoryattribute</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26109"></a> <span
+ id="dx1-26122"></a> <span
class="cmtt-10">\glsgetcategoryattribute{</span>&#x27E8;<span
class="cmitt-10">category-label</span>&#x27E9;<span
class="cmtt-10">}</span>
@@ -9004,13 +10382,13 @@ class="cmtt-10">}</span>
class="cmtt-10">{</span>&#x27E8;<span
class="cmitt-10">attribute-label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4529--><p class="noindent" >
+</p><!--l. 5029--><p class="noindent" >
Again there is a shortcut if you need to lookup the category label for a given
entry:
-</p><!--l. 4532--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5032--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsgetattribute</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26110"></a> <span
+ id="dx1-26123"></a> <span
class="cmtt-10">\glsgetattribute{</span>&#x27E8;<span
class="cmitt-10">entry-label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
@@ -9020,12 +10398,12 @@ class="cmtt-10">}</span>
-</p><!--l. 4534--><p class="noindent" >
-</p><!--l. 4536--><p class="indent" > You can test if an attribute has been assigned to a given category using:
-</p><!--l. 4538--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5034--><p class="noindent" >
+</p><!--l. 5036--><p class="indent" > You can test if an attribute has been assigned to a given category using:
+</p><!--l. 5038--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glshascategoryattribute</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26111"></a> <span
+ id="dx1-26124"></a> <span
class="cmtt-10">\glshascategoryattribute{</span>&#x27E8;<span
class="cmitt-10">category-label</span>&#x27E9;<span
class="cmtt-10">}</span>
@@ -9037,19 +10415,19 @@ class="cmitt-10">true code</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">false code</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4541--><p class="noindent" >
+</p><!--l. 5041--><p class="noindent" >
This uses <span
class="cmss-10">etoolbox</span><a
- id="dx1-26112"></a>&#8217;s <span
+ id="dx1-26125"></a>&#8217;s <span
class="cmtt-10">\ifcsvoid </span>and does &#x27E8;<span
class="cmti-10">true code</span>&#x27E9; if the attribute has been set and
isn&#8217;t blank and isn&#8217;t <span
class="cmtt-10">\relax</span>. The shortcut if you need to lookup the category label
from an entry is:
-</p><!--l. 4546--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5046--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glshasattribute</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26113"></a> <span
+ id="dx1-26126"></a> <span
class="cmtt-10">\glshasattribute{</span>&#x27E8;<span
class="cmitt-10">entry-label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
@@ -9061,12 +10439,12 @@ class="cmitt-10">code</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">false code</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4549--><p class="noindent" >
-</p><!--l. 4551--><p class="indent" > You can test the value of an attribute for a particular category using:
-</p><!--l. 4553--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5049--><p class="noindent" >
+</p><!--l. 5051--><p class="indent" > You can test the value of an attribute for a particular category using:
+</p><!--l. 5053--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsifcategoryattribute</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26114"></a> <span
+ id="dx1-26127"></a> <span
class="cmtt-10">\glsifcategoryattribute{</span>&#x27E8;<span
class="cmitt-10">category-label</span>&#x27E9;<span
class="cmtt-10">}</span>
@@ -9080,7 +10458,7 @@ class="cmitt-10">true-part</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">false-part</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4555--><p class="noindent" >
+</p><!--l. 5055--><p class="noindent" >
This tests if the attribute (given by &#x27E8;<span
class="cmti-10">attribute-label</span>&#x27E9;) for the category (given by
&#x27E8;<span
@@ -9090,33 +10468,35 @@ class="cmti-10">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="cmti-10">value</span>&#x27E9;, &#x27E8;<span
class="cmti-10">false part</span>&#x27E9; is done.
-</p><!--l. 4562--><p class="indent" > For example:
+</p><!--l. 5062--><p class="indent" > For example:
</p>
- <div class="verbatim" id="verbatim-118">
+ <div class="verbatim" id="verbatim-119">
\glsifcategoryattribute{general}{nohyper}{true}{NO&#x00A0;HYPER}{HYPER}
</div>
-<!--l. 4565--><p class="nopar" > This does &#8220;NO HYPER&#8221; if the <span
+<!--l. 5065--><p class="nopar" > This does &#8220;NO HYPER&#8221; if the <span
class="cmss-10">general</span><a
- id="dx1-26115"></a> category has the <span
-class="cmss-10">nohyper</span><a
- id="dx1-26116"></a> attribute set to
+ id="dx1-26128"></a> category has the <a
+href="#catattr.nohyper"><span
+class="cmss-10">nohyper</span></a><a
+ id="dx1-26129"></a> attribute set to
<span
class="cmtt-10">true </span>otherwise if does &#8220;HYPER&#8221;.
-</p><!--l. 4570--><p class="indent" > With boolean-style attributes like <span
-class="cmss-10">nohyper</span><a
- id="dx1-26117"></a>, make sure you always test for <span
+</p><!--l. 5070--><p class="indent" > With boolean-style attributes like <a
+href="#catattr.nohyper"><span
+class="cmss-10">nohyper</span></a><a
+ id="dx1-26130"></a>, make sure you always test for <span
class="cmtt-10">true</span>
not <span
class="cmtt-10">false </span>in case the attribute hasn&#8217;t been set.
-</p><!--l. 4573--><p class="indent" > Again there&#8217;s a shortcut if you need to lookup the category label from a particular
+</p><!--l. 5073--><p class="indent" > Again there&#8217;s a shortcut if you need to lookup the category label from a particular
entry:
-</p><!--l. 4575--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5075--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsifattribute</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26118"></a> <span
+ id="dx1-26131"></a> <span
class="cmtt-10">\glsifattribute{</span>&#x27E8;<span
class="cmitt-10">entry-label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
@@ -9130,15 +10510,16 @@ class="cmitt-10">true-part</span>&#x27E9;<span
class="cmtt-10">} {</span>&#x27E8;<span
class="cmitt-10">false-part</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4577--><p class="noindent" >
-</p><!--l. 4579--><p class="indent" > There&#8217;s also a shortcut to determine if a particular category has the <span
-class="cmss-10">regular</span><a
- id="dx1-26119"></a>
+</p><!--l. 5077--><p class="noindent" >
+</p><!--l. 5079--><p class="indent" > There&#8217;s also a shortcut to determine if a particular category has the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-26132"></a>
attribute set to &#8220;true&#8221;:
-</p><!--l. 4581--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5081--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsifregularcategory</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26120"></a> <span
+ id="dx1-26133"></a> <span
class="cmtt-10">\glsifregularcategory{</span>&#x27E8;<span
class="cmitt-10">category-label</span>&#x27E9;<span
class="cmtt-10">}</span>
@@ -9148,12 +10529,12 @@ class="cmitt-10">true-part</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">false-part</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4583--><p class="noindent" >
+</p><!--l. 5083--><p class="noindent" >
Alternatively, if you need to lookup the category for a particular entry:
-</p><!--l. 4586--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5086--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsifregular</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26121"></a> <span
+ id="dx1-26134"></a> <span
class="cmtt-10">\glsifregular{</span>&#x27E8;<span
class="cmitt-10">entry-label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
@@ -9162,19 +10543,21 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">false-part</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 4588--><p class="noindent" >
-Note that if the <span
-class="cmss-10">regular</span><a
- id="dx1-26122"></a> attribute hasn&#8217;t be set, the above do &#x27E8;<span
+</p><!--l. 5088--><p class="noindent" >
+Note that if the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-26135"></a> attribute hasn&#8217;t be set, the above do &#x27E8;<span
class="cmti-10">false-part</span>&#x27E9;. There
-are also reverse commands that test if the <span
-class="cmss-10">regular</span><a
- id="dx1-26123"></a> attribute has been set to
+are also reverse commands that test if the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-26136"></a> attribute has been set to
&#8220;false&#8221;:
-</p><!--l. 4592--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5092--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsifnotregularcategory</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26124"></a> <span
+ id="dx1-26137"></a> <span
class="cmtt-10">\glsifnotregularcategory{</span>&#x27E8;<span
class="cmitt-10">category-label</span>&#x27E9;<span
class="cmtt-10">}</span>
@@ -9184,12 +10567,12 @@ class="cmitt-10">true-part</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">false-part</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4594--><p class="noindent" >
+</p><!--l. 5094--><p class="noindent" >
or for a particular entry:
-</p><!--l. 4596--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5096--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsifnotregular</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26125"></a> <span
+ id="dx1-26138"></a> <span
class="cmtt-10">\glsifnotregular{</span>&#x27E8;<span
class="cmitt-10">entry-label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
@@ -9198,14 +10581,15 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">false-part</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 4598--><p class="noindent" >
-Again, if the <span
-class="cmss-10">regular</span><a
- id="dx1-26126"></a> attribute hasn&#8217;t been set, the above do &#x27E8;<span
+</p><!--l. 5098--><p class="noindent" >
+Again, if the <a
+href="#catattr.regular"><span
+class="cmss-10">regular</span></a><a
+ id="dx1-26139"></a> attribute hasn&#8217;t been set, the above do &#x27E8;<span
class="cmti-10">false-part</span>&#x27E9;, so these
reverse commands aren&#8217;t logically opposite in the strict sense.
-</p><!--l. 4603--><p class="indent" > You can iterate through all entries with a given category using:
-</p><!--l. 4605--><p class="indent" > <hr><div title="Definition"><span
+</p><!--l. 5103--><p class="indent" > You can iterate through all entries with a given category using:
+</p><!--l. 5105--><p class="indent" > <hr><div title="Definition"><span
class="cmtt-10">\glsforeachincategory[</span>&#x27E8;<span
class="cmitt-10">glossary-labels</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -9219,7 +10603,7 @@ class="cmitt-10">label-cs</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">body</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4606--><p class="noindent" >
+</p><!--l. 5106--><p class="noindent" >
This iterates through all entries in the glossaries identified by the comma-separated
list &#x27E8;<span
class="cmti-10">glossary-labels</span>&#x27E9; that have the category given by &#x27E8;<span
@@ -9235,12 +10619,12 @@ omitted, all glossaries are assumed.
-</p><!--l. 4616--><p class="indent" > Similarly, you can iterate through all entries that have a category with a given
+</p><!--l. 5116--><p class="indent" > Similarly, you can iterate through all entries that have a category with a given
attribute using:
-</p><!--l. 4618--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5118--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsforeachwithattribute</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26127"></a> <span
+ id="dx1-26140"></a> <span
class="cmtt-10">\glsforeachwithattribute[</span>&#x27E8;<span
class="cmitt-10">glossary-labels</span>&#x27E9;<span
class="cmtt-10">]</span>
@@ -9257,42 +10641,42 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">body</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 4620--><p class="noindent" >
+</p><!--l. 5120--><p class="noindent" >
This will do &#x27E8;<span
class="cmti-10">body</span>&#x27E9; for each entry that has a category with the attribute &#x27E8;<span
class="cmti-10">attribute-label</span>&#x27E9;
set to &#x27E8;<span
class="cmti-10">attribute-value</span>&#x27E9;. The remaining arguments are as the previous command.
-</p><!--l. 4625--><p class="indent" > You can change the category for a particular entry using the standard glossary
+</p><!--l. 5125--><p class="indent" > You can change the category for a particular entry using the standard glossary
field changing commands, such as <span
class="cmtt-10">\glsfielddef</span><a
- id="dx1-26128"></a>. Alternatively, you can
+ id="dx1-26141"></a>. Alternatively, you can
use
-</p><!--l. 4628--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5128--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrsetcategory</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26129"></a> <span
+ id="dx1-26142"></a> <span
class="cmtt-10">\glsxtrsetcategory{</span>&#x27E8;<span
class="cmitt-10">entry-labels</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">category-label</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 4630--><p class="noindent" >
+</p><!--l. 5130--><p class="noindent" >
This will change the category to &#x27E8;<span
class="cmti-10">category-label</span>&#x27E9; for each entry listed in the
comma-separated list &#x27E8;<span
class="cmti-10">entry-labels</span>&#x27E9;. This command uses <span
class="cmtt-10">\glsfieldxdef</span><a
- id="dx1-26130"></a> so it will
+ id="dx1-26143"></a> so it will
expand &#x27E8;<span
class="cmti-10">category-label</span>&#x27E9; and make the change global.
-</p><!--l. 4636--><p class="indent" > You can also change the category for all entries with a glossary or glossaries
+</p><!--l. 5136--><p class="indent" > You can also change the category for all entries with a glossary or glossaries
using:
-</p><!--l. 4638--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5138--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrsetcategoryforall</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-26131"></a> <span
+ id="dx1-26144"></a> <span
class="cmtt-10">\glsxtrsetcategoryforall{</span>&#x27E8;<span
class="cmitt-10">glossary-labels</span>&#x27E9;<span
class="cmtt-10">}</span>
@@ -9300,26 +10684,27 @@ class="cmtt-10">}</span>
class="cmtt-10">{</span>&#x27E8;<span
class="cmitt-10">category-label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4640--><p class="noindent" >
+</p><!--l. 5140--><p class="noindent" >
where &#x27E8;<span
class="cmti-10">glossary-labels</span>&#x27E9; is a comma-separated list of glossary labels.
</p>
-<!--l. 4644--><p class="indent" > </div>
-</p><!--l. 4644--><p class="noindent" ><a
+<!--l. 5144--><p class="indent" > </div>
+</p><!--l. 5144--><p class="noindent" ><a
href="#top">Top</a><div class="chapter"><h2 class="chapterHead">6. <a
id="sec:entrycount"></a>Entry Counting</h2>
-</p><!--l. 4647--><p class="indent" > As mentioned in <a
+</p><!--l. 5147--><p class="indent" > As mentioned in <a
href="#sec:entrycountmods"><span
class="cmsy-10">&sect;</span>2.4 </a><a
href="#sec:entrycountmods">Entry Counting Modifications<!--tex4ht:ref: sec:entrycountmods --></a>, <span
class="cmss-10">glossaries-extra </span>modifies the
<span
class="cmtt-10">\glsenableentrycount</span><a
- id="dx1-27001"></a> command to allow for the <span
-class="cmss-10">entrycount</span><a
+ id="dx1-27001"></a> command to allow for the <a
+href="#catattr.entrycount"><span
+class="cmss-10">entrycount</span></a><a
id="dx1-27002"></a> attribute. This means
that you not only need to enable entry counting with <span
class="cmtt-10">\glsenableentrycount</span><a
@@ -9328,15 +10713,15 @@ you also need to set the appropriate attribute (see <a
href="#sec:categories"><span
class="cmsy-10">&sect;</span>5 </a><a
href="#sec:categories">Categories<!--tex4ht:ref: sec:categories --></a>).
-</p><!--l. 4654--><p class="indent" > <div class="important" title="Important Note"> Remember that entry counting only counts the number of times an entry is used
+</p><!--l. 5154--><p class="indent" > <div class="important" title="Important Note"> Remember that entry counting only counts the number of times an entry is used
by commands that change the <a
id="dx1-27004"></a><a
href="#glo:firstuseflag">first use flag</a>. (That is, all those commands
that mark the entry as having been used.) There are many commands that
don&#8217;t modify this flag and they won&#8217;t contribute to the entry use count.
</div>
-</p><!--l. 4660--><p class="noindent" >
-</p><!--l. 4662--><p class="indent" > With <span
+</p><!--l. 5160--><p class="noindent" >
+</p><!--l. 5162--><p class="indent" > With <span
class="cmss-10">glossaries-extra</span>, you may use <span
class="cmtt-10">\cgls</span><a
id="dx1-27005"></a> instead of <span
@@ -9344,31 +10729,37 @@ class="cmtt-10">\gls</span><a
id="dx1-27006"></a> even if you haven&#8217;t enabled
entry counting. You will only get a warning if you use <span
class="cmtt-10">\glsenableentrycount</span>
-without setting the <span
-class="cmss-10">entrycount</span><a
+without setting the <a
+href="#catattr.entrycount"><span
+class="cmss-10">entrycount</span></a><a
id="dx1-27007"></a> attribute. (With <span
class="cmss-10">glossaries</span>, commands like <span
class="cmtt-10">\cgls</span><a
- id="dx1-27008"></a> will
-generate a warning if <span
-class="cmtt-10">\glsenableentrycount </span>hasn&#8217;t been used.) The abbreviation
-shortcut <span
+ id="dx1-27008"></a>
+will generate a warning if <span
+class="cmtt-10">\glsenableentrycount </span>hasn&#8217;t been used.) The
+abbreviation shortcut <span
class="cmtt-10">\ab</span><a
id="dx1-27009"></a> uses <span
class="cmtt-10">\cgls </span>(see <a
href="#sec:abbrshortcuts"><span
class="cmsy-10">&sect;</span>3.3 </a><a
-href="#sec:abbrshortcuts">Shortcut Commands<!--tex4ht:ref: sec:abbrshortcuts --></a>) unlike the acronym shortcut
-<span
+href="#sec:abbrshortcuts">Shortcut Commands<!--tex4ht:ref: sec:abbrshortcuts --></a>) unlike the
+acronym shortcut <span
class="cmtt-10">\ac</span><a
id="dx1-27010"></a> which uses <span
-class="cmtt-10">\gls</span>.
-</p><!--l. 4672--><p class="indent" > All upper case versions (not provided by <span
+class="cmtt-10">\gls </span>(except when it&#8217;s defined through
+<a
+href="#styopt.shortcuts"><span
+class="cmss-10">shortcuts</span></a><span
+class="cmss-10">=ac</span><a
+ id="dx1-27011"></a>).
+</p><!--l. 5173--><p class="indent" > All upper case versions (not provided by <span
class="cmss-10">glossaries</span>) are also available:
-</p><!--l. 4674--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5175--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\cGLS</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-27011"></a> <span
+ id="dx1-27012"></a> <span
class="cmtt-10">\cGLS[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -9376,12 +10767,12 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 4676--><p class="noindent" >
+</p><!--l. 5177--><p class="noindent" >
and
-</p><!--l. 4678--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5179--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\cGLSpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-27012"></a> <span
+ id="dx1-27013"></a> <span
class="cmtt-10">\cGLSpl[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
@@ -9389,42 +10780,42 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}[</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 4680--><p class="noindent" >
+</p><!--l. 5181--><p class="noindent" >
These are analogous to <span
class="cmtt-10">\cgls </span>and <span
class="cmtt-10">\cglspl </span>but they use
-</p><!--l. 4683--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5184--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\cGLSformat</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-27013"></a> <span
+ id="dx1-27014"></a> <span
class="cmtt-10">\cGLSformat{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4685--><p class="noindent" >
+</p><!--l. 5186--><p class="noindent" >
and
-</p><!--l. 4687--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5188--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\cGLSplformat</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-27014"></a> <span
+ id="dx1-27015"></a> <span
class="cmtt-10">\cGLSplformat{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">insert</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4689--><p class="noindent" >
+</p><!--l. 5190--><p class="noindent" >
which convert the analogous <span
class="cmtt-10">\cglsformat </span>and <span
class="cmtt-10">\cglsplformat </span>to upper
case.
-</p><!--l. 4693--><p class="indent" > Just using <span
+</p><!--l. 5194--><p class="indent" > Just using <span
class="cmss-10">glossaries</span>:
</p>
- <div class="verbatim" id="verbatim-119">
+ <div class="verbatim" id="verbatim-120">
\documentclass{article}
&#x00A0;<br />\usepackage{glossaries}
&#x00A0;<br />\makeglossaries
@@ -9437,16 +10828,17 @@ class="cmss-10">glossaries</span>:
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 4715--><p class="nopar" >
-</p><!--l. 4717--><p class="indent" > If you switch to <span
-class="cmss-10">glossaries-extra </span>you must set the <span
-class="cmss-10">entrycount</span><a
- id="dx1-27015"></a> attribute:
+<!--l. 5216--><p class="nopar" >
+</p><!--l. 5218--><p class="indent" > If you switch to <span
+class="cmss-10">glossaries-extra </span>you must set the <a
+href="#catattr.entrycount"><span
+class="cmss-10">entrycount</span></a><a
+ id="dx1-27016"></a> attribute:
</p>
- <div class="verbatim" id="verbatim-120">
+ <div class="verbatim" id="verbatim-121">
\documentclass{article}
&#x00A0;<br />\usepackage{glossaries-extra}
&#x00A0;<br />\makeglossaries
@@ -9460,16 +10852,16 @@ class="cmss-10">entrycount</span><a
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 4742--><p class="nopar" >
-</p><!--l. 4744--><p class="indent" > When activated with <span
+<!--l. 5243--><p class="nopar" >
+</p><!--l. 5245--><p class="indent" > When activated with <span
class="cmtt-10">\glsenableentrycount</span>, commands such as <span
class="cmtt-10">\cgls</span><a
- id="dx1-27016"></a> now
+ id="dx1-27017"></a> now
use
-</p><!--l. 4746--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5247--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrifcounttrigger</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-27017"></a> <span
+ id="dx1-27018"></a> <span
class="cmtt-10">\glsxtrifcounttrigger{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
@@ -9479,12 +10871,12 @@ class="cmtt-10">}</span>
class="cmtt-10">{</span>&#x27E8;<span
class="cmitt-10">normal code</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4749--><p class="noindent" >
+</p><!--l. 5250--><p class="noindent" >
to determine if the entry trips the entry count trigger. The &#x27E8;<span
class="cmti-10">trigger code</span>&#x27E9; uses
commands like <span
class="cmtt-10">\cglsformat </span>and unsets the <a
- id="dx1-27018"></a><a
+ id="dx1-27019"></a><a
href="#glo:firstuseflag">first use flag</a>. The &#x27E8;<span
class="cmti-10">normal code</span>&#x27E9; is the
code that would ordinarily be performed by whatever the equivalent command is (for
@@ -9495,12 +10887,12 @@ class="cmti-10">trigger code</span>&#x27E9; but the usual <span
class="cmtt-10">\gls </span>behaviour in
&#x27E8;<span
class="cmti-10">normal code</span>&#x27E9;).
-</p><!--l. 4758--><p class="indent" > The default definition is:
+</p><!--l. 5259--><p class="indent" > The default definition is:
</p>
- <div class="verbatim" id="verbatim-121">
+ <div class="verbatim" id="verbatim-122">
\newcommand*{\glsxtrifcounttrigger}[3]{%
&#x00A0;<br />&#x00A0;\glshasattribute{#1}{entrycount}%
&#x00A0;<br />&#x00A0;{%
@@ -9513,35 +10905,37 @@ class="cmti-10">normal code</span>&#x27E9;).
&#x00A0;<br />&#x00A0;{#3}%
&#x00A0;<br />}
</div>
-<!--l. 4771--><p class="nopar" > This means that if an entry is assigned to a category that has the <span
-class="cmss-10">entrycount</span><a
- id="dx1-27019"></a>
+<!--l. 5272--><p class="nopar" > This means that if an entry is assigned to a category that has the <a
+href="#catattr.entrycount"><span
+class="cmss-10">entrycount</span></a><a
+ id="dx1-27020"></a>
attribute then the &#x27E8;<span
class="cmti-10">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. 4778--><p class="indent" > For example, to trigger normal use if the previous count value is greater than
+</p><!--l. 5279--><p class="indent" > For example, to trigger normal use if the previous count value is greater than
four:
</p>
- <div class="verbatim" id="verbatim-122">
+ <div class="verbatim" id="verbatim-123">
\glssetcategoryattribute{abbreviation}{entrycount}{4}
</div>
-<!--l. 4782--><p class="nopar" >
-</p><!--l. 4784--><p class="indent" > There is a convenient command provided to enable entry counting, set the
-<span
-class="cmss-10">entrycount</span><a
- id="dx1-27020"></a> attribute and redefine <span
+<!--l. 5283--><p class="nopar" >
+</p><!--l. 5285--><p class="indent" > There is a convenient command provided to enable entry counting, set the
+<a
+href="#catattr.entrycount"><span
+class="cmss-10">entrycount</span></a><a
+ id="dx1-27021"></a> attribute and redefine <span
class="cmtt-10">\gls</span><a
- id="dx1-27021"></a>, etc to use <span
+ id="dx1-27022"></a>, etc to use <span
class="cmtt-10">\cgls</span><a
- id="dx1-27022"></a> etc:
-</p><!--l. 4787--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-27023"></a> etc:
+</p><!--l. 5288--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrEnableEntryCounting</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-27023"></a> <span
+ id="dx1-27024"></a> <span
class="cmtt-10">\GlsXtrEnableEntryCounting{</span>&#x27E8;<span
class="cmitt-10">categories</span>&#x27E9;<span
class="cmtt-10">}</span>
@@ -9549,18 +10943,19 @@ class="cmtt-10">}</span>
class="cmtt-10">{</span>&#x27E8;<span
class="cmitt-10">value</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4789--><p class="noindent" >
+</p><!--l. 5290--><p class="noindent" >
The first argument &#x27E8;<span
class="cmti-10">categories</span>&#x27E9; is a comma-separated list of categories. For each
-category, the <span
-class="cmss-10">entrycount</span><a
- id="dx1-27024"></a> attribute is set to &#x27E8;<span
+category, the <a
+href="#catattr.entrycount"><span
+class="cmss-10">entrycount</span></a><a
+ id="dx1-27025"></a> attribute is set to &#x27E8;<span
class="cmti-10">value</span>&#x27E9;. In addition, this does:
</p>
- <div class="verbatim" id="verbatim-123">
+ <div class="verbatim" id="verbatim-124">
\renewcommand*{\gls}{\cgls}%
&#x00A0;<br />\renewcommand*{\Gls}{\cGls}%
&#x00A0;<br />\renewcommand*{\glspl}{\cglspl}%
@@ -9568,18 +10963,19 @@ class="cmti-10">value</span>&#x27E9;. In addition, this does:
&#x00A0;<br />\renewcommand*{\GLS}{\cGLS}%
&#x00A0;<br />\renewcommand*{\GLSpl}{\cGLSpl}%
</div>
-<!--l. 4800--><p class="nopar" > This makes it easier to enable entry-counting on existing documents.
-</p><!--l. 4804--><p class="indent" > If you use <span
+<!--l. 5301--><p class="nopar" > This makes it easier to enable entry-counting on existing documents.
+</p><!--l. 5305--><p class="indent" > If you use <span
class="cmtt-10">\GlsXtrEnableEntryCounting </span>more than once, subsequent uses will
-just set the <span
-class="cmss-10">entrycount</span><a
- id="dx1-27025"></a> attribute for each listed category.
-</p><!--l. 4808--><p class="indent" > The above example document can then become:
+just set the <a
+href="#catattr.entrycount"><span
+class="cmss-10">entrycount</span></a><a
+ id="dx1-27026"></a> attribute for each listed category.
+</p><!--l. 5309--><p class="indent" > The above example document can then become:
</p>
- <div class="verbatim" id="verbatim-124">
+ <div class="verbatim" id="verbatim-125">
\documentclass{article}
&#x00A0;<br />\usepackage{glossaries-extra}
&#x00A0;<br />\makeglossaries
@@ -9592,15 +10988,15 @@ class="cmss-10">entrycount</span><a
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 4830--><p class="nopar" >
-</p><!--l. 4832--><p class="indent" > The standard entry-counting function describe above counts the number of times
+<!--l. 5331--><p class="nopar" >
+</p><!--l. 5333--><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. 4837--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5338--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrEnableEntryUnitCounting</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-27026"></a> <span
+ id="dx1-27027"></a> <span
class="cmtt-10">\GlsXtrEnableEntryUnitCounting</span>
<span
class="cmtt-10">{</span>&#x27E8;<span
@@ -9610,27 +11006,27 @@ class="cmitt-10">value</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">counter-name</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4839--><p class="noindent" >
+</p><!--l. 5340--><p class="noindent" >
where &#x27E8;<span
class="cmti-10">categories</span>&#x27E9; is a comma-separated list of categories to which this feature should
be applied, &#x27E8;<span
class="cmti-10">value</span>&#x27E9; is the trigger value and &#x27E8;<span
class="cmti-10">counter-name</span>&#x27E9; is the name of the counter
used by the sectional unit.
-</p><!--l. 4845--><p class="indent" > <div class="important" title="Important Note"> Due to the asynchronous nature of <span class="TEX">T<span
+</p><!--l. 5346--><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="cmss-10">page</span><a
- id="dx1-27027"></a> counter. </div>
-</p><!--l. 4849--><p class="noindent" >
-</p><!--l. 4851--><p class="indent" > Note that you can&#8217;t use both the document-wide counting and the per-unit
+ id="dx1-27028"></a> counter. </div>
+</p><!--l. 5350--><p class="noindent" >
+</p><!--l. 5352--><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. 4854--><p class="indent" > The counter value is used as part of a label, which means that <span
+</p><!--l. 5355--><p class="indent" > The counter value is used as part of a label, which means that <span
class="cmtt-10">\the</span>&#x27E8;<span
class="cmti-10">counter-name</span>&#x27E9;
needs to be expandable. Since <span
class="cmss-10">hyperref</span><a
- id="dx1-27028"></a> also has a similar requirement and provides
+ id="dx1-27029"></a> also has a similar requirement and provides
<span
class="cmtt-10">\theH</span>&#x27E8;<span
class="cmti-10">counter-name</span>&#x27E9; as an expandable alternative, <span
@@ -9640,67 +11036,69 @@ class="cmtt-10">\theH</span>&#x27E8;<span
class="cmti-10">counter-name</span>&#x27E9; if it exists otherwise it will use <span
class="cmtt-10">\the</span>&#x27E8;<span
class="cmti-10">counter-name</span>&#x27E9;.
-</p><!--l. 4861--><p class="indent" > The per-unit counting function uses two attributes: <span
-class="cmss-10">entrycount</span><a
- id="dx1-27029"></a> (as before) and
-<span
-class="cmss-10">unitcount</span><a
- id="dx1-27030"></a> (the name of the counter).
+</p><!--l. 5362--><p class="indent" > The per-unit counting function uses two attributes: <a
+href="#catattr.entrycount"><span
+class="cmss-10">entrycount</span></a><a
+ id="dx1-27030"></a> (as before) and
+<a
+href="#catattr.unitcount"><span
+class="cmss-10">unitcount</span></a><a
+ id="dx1-27031"></a> (the name of the counter).
-</p><!--l. 4864--><p class="indent" > Both the original document-wide counting mechanism and the per-unit counting
+</p><!--l. 5365--><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. 4867--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5368--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsentrycurrcount</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-27031"></a> <span
+ id="dx1-27032"></a> <span
class="cmtt-10">\glsentrycurrcount{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4869--><p class="noindent" >
+</p><!--l. 5370--><p class="noindent" >
and the final value from the previous run:
-</p><!--l. 4871--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5372--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsentryprevcount</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-27032"></a> <span
+ id="dx1-27033"></a> <span
class="cmtt-10">\glsentryprevcount{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4873--><p class="noindent" >
+</p><!--l. 5374--><p class="noindent" >
In the case of the per-unit counting, this is the final value <span
class="cmti-10">for the current unit</span>. In
both commands &#x27E8;<span
class="cmti-10">label</span>&#x27E9; is the entry&#8217;s label.
-</p><!--l. 4878--><p class="indent" > The per-unit counting mechanism additionally provides:
-</p><!--l. 4879--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5379--><p class="indent" > The per-unit counting mechanism additionally provides:
+</p><!--l. 5380--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsentryprevtotalcount</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-27033"></a> <span
+ id="dx1-27034"></a> <span
class="cmtt-10">\glsentryprevtotalcount{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4881--><p class="noindent" >
+</p><!--l. 5382--><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="cmti-10">label</span>&#x27E9;, and
-</p><!--l. 4884--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5385--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsentryprevmaxcount</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-27034"></a> <span
+ id="dx1-27035"></a> <span
class="cmtt-10">\glsentryprevmaxcount{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 4886--><p class="noindent" >
+</p><!--l. 5387--><p class="noindent" >
which gives the maximum per-unit total from the previous run.
-</p><!--l. 4889--><p class="indent" > The above two commands are unavailable for the document-wide counting.
-</p><!--l. 4891--><p class="indent" > Example of per-unit counting, where the unit is the chapter:
+</p><!--l. 5390--><p class="indent" > The above two commands are unavailable for the document-wide counting.
+</p><!--l. 5392--><p class="indent" > Example of per-unit counting, where the unit is the chapter:
</p>
- <div class="verbatim" id="verbatim-125">
+ <div class="verbatim" id="verbatim-126">
\documentclass{report}
&#x00A0;<br />\usepackage{glossaries-extra}
&#x00A0;<br />\GlsXtrEnableEntryUnitCounting{abbreviation}{2}{chapter}
@@ -9719,11 +11117,11 @@ which gives the maximum per-unit total from the previous run.
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 4922--><p class="nopar" > In this document, the <span
+<!--l. 5423--><p class="nopar" > In this document, the <span
class="cmtt-10">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="cmtt-10">\gls{css}</span></span></span> is expanded on <a
- id="dx1-27035"></a><a
+ id="dx1-27036"></a><a
href="#glo:firstuse">first use</a>
with the short form used on subsequent use, and the <span
class="cmtt-10">css </span>entries in that
@@ -9733,19 +11131,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="cmtt-10">\gls{css}</span></span></span> doesn&#8217;t get a line added to the glossary
file.
-</p><!--l. 4933--><p class="indent" > The <span
+</p><!--l. 5434--><p class="indent" > The <span
class="cmtt-10">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. 4939--><p class="indent" > The <span
+</p><!--l. 5440--><p class="indent" > The <span
class="cmtt-10">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="cmss-10">general</span><a
- id="dx1-27036"></a> category, which hasn&#8217;t been listed in
+ id="dx1-27037"></a> category, which hasn&#8217;t been listed in
<span
class="cmtt-10">\GlsXtrEnableEntryUnitCounting</span>.
-</p><!--l. 4944--><p class="indent" > The per-unit entry counting can be used for other purposes. In the following
+</p><!--l. 5445--><p class="indent" > The per-unit entry counting can be used for other purposes. In the following
@@ -9753,20 +11151,20 @@ example document the trigger value is set to zero, which means the index suppres
won&#8217;t be triggered, but the unit entry count is used to automatically suppress the
hyperlink for commands like <span
class="cmtt-10">\gls</span><a
- id="dx1-27037"></a> by modifying the hook
-</p><!--l. 4950--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ id="dx1-27038"></a> by modifying the hook
+</p><!--l. 5451--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glslinkcheckfirsthyperhook</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-27038"></a> <span
+ id="dx1-27039"></a> <span
class="cmtt-10">\glslinkcheckfirsthyperhook </span></div><hr>
-</p><!--l. 4952--><p class="noindent" >
+</p><!--l. 5453--><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-126">
+ <div class="verbatim" id="verbatim-127">
\documentclass{article}
&#x00A0;<br />\usepackage[colorlinks]{hyperref}
&#x00A0;<br />\usepackage{glossaries-extra}
@@ -9787,12 +11185,12 @@ hyperlink.
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 4987--><p class="nopar" > This only produces a hyperlink for the first instance of <span class="obeylines-h"><span class="verb"><span
+<!--l. 5488--><p class="nopar" > This only produces a hyperlink for the first instance of <span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\gls{sample}</span></span></span> on each
page.
-</p><!--l. 4991--><p class="indent" > The earlier warning about using the <span
+</p><!--l. 5492--><p class="indent" > The earlier warning about using the <span
class="cmss-10">page</span><a
- id="dx1-27039"></a> counter still applies. If the
+ id="dx1-27040"></a> counter still applies. If the
first instance of <span
class="cmtt-10">\gls </span>occurs at the top of the page within a paragraph that
started on the previous page, then the count will continue from the previous
@@ -9801,27 +11199,30 @@ page.
</p>
-<!--l. 4996--><p class="indent" > </div>
-</p><!--l. 4996--><p class="noindent" ><a
+<!--l. 5497--><p class="indent" > </div>
+</p><!--l. 5497--><p class="noindent" ><a
href="#top">Top</a><div class="chapter"><h2 class="chapterHead">7. <a
id="sec:autoindex"></a>Auto-Indexing</h2>
-</p><!--l. 4999--><p class="indent" > It&#8217;s possible that you may also want a normal index as well as the glossary,
+</p><!--l. 5500--><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="cmss-10">indexname</span><a
+this document). There are two attributes that govern this: <a
+href="#catattr.indexname"><span
+class="cmss-10">indexname</span></a><a
id="dx1-28001"></a> and
-<span
-class="cmss-10">dualindex</span><a
+<a
+href="#catattr.dualindex"><span
+class="cmss-10">dualindex</span></a><a
id="dx1-28002"></a>.
-</p><!--l. 5006--><p class="indent" > The <span
+</p><!--l. 5507--><p class="indent" > The <span
class="cmtt-10">\glsxtrpostnamehook</span><a
id="dx1-28003"></a> macro, used at the end of <span
class="cmtt-10">\glossentryname</span><a
id="dx1-28004"></a> and
<span
class="cmtt-10">\Glossentryname</span><a
- id="dx1-28005"></a>, checks the <span
-class="cmss-10">indexname</span><a
+ id="dx1-28005"></a>, checks the <a
+href="#catattr.indexname"><span
+class="cmss-10">indexname</span></a><a
id="dx1-28006"></a> attribute for the category associated with
that entry. Since <span
class="cmtt-10">\glossentryname </span>is used in the default glossary styles, this
@@ -9830,13 +11231,14 @@ location in the glossary without fiddling around with the value of the <span
class="cmss-10">name</span><a
id="dx1-28007"></a>
key.
-</p><!--l. 5016--><p class="indent" > The internal macro used by the <span
+</p><!--l. 5517--><p class="indent" > The internal macro used by the <span
class="cmss-10">glossaries </span>package to write the information to the
-external glossary file is modified to check for the <span
-class="cmss-10">dualindex</span><a
+external glossary file is modified to check for the <a
+href="#catattr.dualindex"><span
+class="cmss-10">dualindex</span></a><a
id="dx1-28008"></a> attribute.
-</p><!--l. 5020--><p class="indent" > In both cases, the indexing is done through
-</p><!--l. 5021--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5521--><p class="indent" > In both cases, the indexing is done through
+</p><!--l. 5522--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrdoautoindexname</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-28009"></a> <span
@@ -9846,7 +11248,7 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">attribute-label</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 5023--><p class="noindent" >
+</p><!--l. 5524--><p class="noindent" >
This uses the standard <span
class="cmtt-10">\index</span><a
id="dx1-28010"></a> command with the sort value taken from the entry&#8217;s
@@ -9858,30 +11260,30 @@ class="cmti-10">label</span>&#x27E9;<span
class="cmtt-10">}</span>. As from v1.16, there are
user-level commands available to change the sort and actual value used by the
automated index.
-</p><!--l. 5030--><p class="indent" > The actual value is given by
-</p><!--l. 5031--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5531--><p class="indent" > The actual value is given by
+</p><!--l. 5532--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrautoindexentry</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-28012"></a> <span
class="cmtt-10">\glsxtrautoindexentry{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5033--><p class="noindent" >
+</p><!--l. 5534--><p class="noindent" >
where &#x27E8;<span
class="cmti-10">label</span>&#x27E9; is the entry&#8217;s label. The default definition is:
</p>
- <div class="verbatim" id="verbatim-127">
+ <div class="verbatim" id="verbatim-128">
\newcommand*{\glsxtrautoindexentry}[1]{\string\glsentryname{#1}}
</div>
-<!--l. 5038--><p class="nopar" > Note the use of <span
+<!--l. 5539--><p class="nopar" > Note the use of <span
class="cmtt-10">\string </span>to prevent <span
class="cmtt-10">\glsentryname </span>from being expanded as it&#8217;s
written to the index file.
-</p><!--l. 5042--><p class="indent" > The sort value is assigned using:
-</p><!--l. 5043--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5543--><p class="indent" > The sort value is assigned using:
+</p><!--l. 5544--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrautoindexassignsort</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-28013"></a> <span
@@ -9891,7 +11293,7 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 5045--><p class="noindent" >
+</p><!--l. 5546--><p class="noindent" >
where &#x27E8;<span
class="cmti-10">label</span>&#x27E9; is the entry label and &#x27E8;<span
class="cmti-10">cs</span>&#x27E9; is the command which needs to be set to the
@@ -9900,36 +11302,36 @@ sort value. The default definition is:
</p>
- <div class="verbatim" id="verbatim-128">
+ <div class="verbatim" id="verbatim-129">
\newcommand*{\glsxtrautoindexassignsort}[2]{%
&#x00A0;<br />&#x00A0;&#x00A0;\glsletentryfield{#1}{#2}{sort}%
&#x00A0;<br />}
</div>
-<!--l. 5052--><p class="nopar" > After this macro is called, &#x27E8;<span
+<!--l. 5553--><p class="nopar" > After this macro is called, &#x27E8;<span
class="cmti-10">cs</span>&#x27E9; is then processed to escape any of <span
class="cmtt-10">makeindex</span><a
id="dx1-28014"></a>&#8217;s special
characters. Note that this escaping is only performed on the sort not on the actual
value.
-</p><!--l. 5057--><p class="indent" > The command used to perform the actual indexing is:
-</p><!--l. 5058--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5558--><p class="indent" > The command used to perform the actual indexing is:
+</p><!--l. 5559--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrautoindex</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-28015"></a> <span
class="cmtt-10">\glsxtrautoindex{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5060--><p class="noindent" >
+</p><!--l. 5561--><p class="noindent" >
This just does <span
class="cmtt-10">\index{</span>&#x27E8;<span
class="cmti-10">text</span>&#x27E9;<span
class="cmtt-10">} </span>by default.
-</p><!--l. 5063--><p class="indent" > <div class="important" title="Important Note"> The entry&#8217;s <span
+</p><!--l. 5564--><p class="indent" > <div class="important" title="Important Note"> The entry&#8217;s <span
class="cmss-10">parent</span><a
id="dx1-28016"></a> field isn&#8217;t referenced in this automated indexing.
</div>
-</p><!--l. 5066--><p class="noindent" >
-</p><!--l. 5068--><p class="indent" > For example, to index the value of the <span
+</p><!--l. 5567--><p class="noindent" >
+</p><!--l. 5569--><p class="indent" > For example, to index the value of the <span
class="cmss-10">first</span><a
id="dx1-28017"></a> key, instead of the <span
class="cmss-10">name</span><a
@@ -9938,10 +11340,10 @@ class="cmss-10">name</span><a
</p>
- <div class="verbatim" id="verbatim-129">
+ <div class="verbatim" id="verbatim-130">
\renewcommand*{\glsxtrautoindexentry}[1]{\string\glsentryfirst{#1}}
</div>
-<!--l. 5072--><p class="nopar" > and if the sort value also needs to be set to the <span
+<!--l. 5573--><p class="nopar" > and if the sort value also needs to be set to the <span
class="cmss-10">long</span><a
id="dx1-28019"></a> field, if present, otherwise the
<span
@@ -9951,56 +11353,57 @@ class="cmss-10">sort</span><a
</p>
- <div class="verbatim" id="verbatim-130">
+ <div class="verbatim" id="verbatim-131">
\renewcommand*{\glsxtrautoindexassignsort}[2]{%
&#x00A0;<br />&#x00A0;&#x00A0;\ifglshaslong{#2}%
&#x00A0;<br />&#x00A0;&#x00A0;{\glsletentryfield{#1}{#2}{long}}%
&#x00A0;<br />&#x00A0;&#x00A0;{\glsletentryfield{#1}{#2}{sort}}%
&#x00A0;<br />}
</div>
-<!--l. 5081--><p class="nopar" >
-</p><!--l. 5083--><p class="indent" > If the value of the attribute given by &#x27E8;<span
+<!--l. 5582--><p class="nopar" >
+</p><!--l. 5584--><p class="indent" > If the value of the attribute given by &#x27E8;<span
class="cmti-10">attribute-label</span>&#x27E9; is &#8220;true&#8221;, no encap will be
added, otherwise the encap will be the attribute value. For example:
</p>
- <div class="verbatim" id="verbatim-131">
+ <div class="verbatim" id="verbatim-132">
\glssetcategoryattribute{general}{indexname}{textbf}
</div>
-<!--l. 5089--><p class="nopar" > will set the encap to <span
+<!--l. 5590--><p class="nopar" > will set the encap to <span
class="cmtt-10">textbf </span>which will display the relevant page number in bold
whereas
</p>
- <div class="verbatim" id="verbatim-132">
+ <div class="verbatim" id="verbatim-133">
\glssetcategoryattribute{general}{dualindex}{true}
</div>
-<!--l. 5094--><p class="nopar" > won&#8217;t apply any formatting to the page number in the index.
-</p><!--l. 5097--><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. 5595--><p class="nopar" > won&#8217;t apply any formatting to the page number in the index.
+</p><!--l. 5598--><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="cmtt-10">\index </span>to use some thing else.) </div>
-</p><!--l. 5102--><p class="noindent" >
-</p><!--l. 5104--><p class="indent" > By default the <span
+</p><!--l. 5603--><p class="noindent" >
+</p><!--l. 5605--><p class="indent" > By default the <span
class="cmss-10">format</span><a
- id="dx1-28021"></a> key won&#8217;t be used with the <span
-class="cmss-10">dualindex</span><a
+ id="dx1-28021"></a> key won&#8217;t be used with the <a
+href="#catattr.dualindex"><span
+class="cmss-10">dualindex</span></a><a
id="dx1-28022"></a> attribute. You can
allow the <span
class="cmss-10">format</span><a
id="dx1-28023"></a> key to override the attribute value by using the preamble-only
command:
-</p><!--l. 5108--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5609--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrEnableIndexFormatOverride</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-28024"></a> <span
class="cmtt-10">\GlsXtrEnableIndexFormatOverride</span>
</div><hr>
-</p><!--l. 5110--><p class="noindent" >
+</p><!--l. 5611--><p class="noindent" >
If you use this command and <span
class="cmss-10">hyperref</span><a
id="dx1-28025"></a> has been loaded, then the <span
@@ -10011,21 +11414,24 @@ environment will be modified to redefine <span
class="cmtt-10">\glshypernumber</span><a
id="dx1-28028"></a> to allow formats that use
that command.
-</p><!--l. 5115--><p class="indent" > <div class="important" title="Important Note"> The <span
-class="cmss-10">dualindex</span><a
+</p><!--l. 5616--><p class="indent" > <div class="important" title="Important Note"> The <a
+href="#catattr.dualindex"><span
+class="cmss-10">dualindex</span></a><a
id="dx1-28029"></a> attribute will still be used on subsequent use even if the
-<span
-class="cmss-10">indexonlyfirst</span><a
+<a
+href="#catattr.indexonlyfirst"><span
+class="cmss-10">indexonlyfirst</span></a><a
id="dx1-28030"></a> attribute (or <span
class="cmss-10">indexonlyfirst</span><a
- id="dx1-28031"></a> package option) is set. However, the <span
-class="cmss-10">dualindex</span><a
+ id="dx1-28031"></a> package option) is set. However, the <a
+href="#catattr.dualindex"><span
+class="cmss-10">dualindex</span></a><a
id="dx1-28032"></a>
attribute will honour the <span
class="cmss-10">noindex</span><a
id="dx1-28033"></a> key. </div>
-</p><!--l. 5121--><p class="noindent" >
-</p><!--l. 5123--><p class="indent" > The <span
+</p><!--l. 5622--><p class="noindent" >
+</p><!--l. 5624--><p class="indent" > The <span
class="cmtt-10">\glsxtrdoautoindexname </span>command will attempt to escape any of
<span
class="cmtt-10">\makeindex</span><a
@@ -10045,41 +11451,41 @@ class="cmtt-10">\encapchar</span><a
id="dx1-28039"></a>
have been defined before <span
class="cmss-10">glossaries-extra </span>is loaded).
-</p><!--l. 5131--><p class="indent" > If this isn&#8217;t the case, you can use the following preamble-only commands to set
+</p><!--l. 5632--><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. 5133--><p class="indent" > <div class="important" title="Important Note"> Be very careful of possible shifting category codes! </div>
-</p><!--l. 5135--><p class="noindent" >
-</p><!--l. 5137--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5634--><p class="indent" > <div class="important" title="Important Note"> Be very careful of possible shifting category codes! </div>
+</p><!--l. 5636--><p class="noindent" >
+</p><!--l. 5638--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrSetActualChar</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-28040"></a> <span
class="cmtt-10">\GlsXtrSetActualChar{</span>&#x27E8;<span
class="cmitt-10">char</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5139--><p class="noindent" >
+</p><!--l. 5640--><p class="noindent" >
Set the actual character to &#x27E8;<span
class="cmti-10">char</span>&#x27E9;.
-</p><!--l. 5142--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5643--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrSetLevelChar</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-28041"></a> <span
class="cmtt-10">\GlsXtrSetLevelChar{</span>&#x27E8;<span
class="cmitt-10">char</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5144--><p class="noindent" >
+</p><!--l. 5645--><p class="noindent" >
Set the level character to &#x27E8;<span
class="cmti-10">char</span>&#x27E9;.
-</p><!--l. 5147--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5648--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrSetEscChar</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-28042"></a> <span
class="cmtt-10">\GlsXtrSetEscChar{</span>&#x27E8;<span
class="cmitt-10">char</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5149--><p class="noindent" >
+</p><!--l. 5650--><p class="noindent" >
Set the escape (quote) character to &#x27E8;<span
class="cmti-10">char</span>&#x27E9;.
-</p><!--l. 5152--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5653--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrSetEncapChar</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-28043"></a> <span
@@ -10089,18 +11495,18 @@ class="cmtt-10">} </span></div><hr>
-</p><!--l. 5154--><p class="noindent" >
+</p><!--l. 5655--><p class="noindent" >
Set the encap character to &#x27E8;<span
class="cmti-10">char</span>&#x27E9;.
</p>
-<!--l. 5157--><p class="indent" > </div>
-</p><!--l. 5157--><p class="noindent" ><a
+<!--l. 5658--><p class="indent" > </div>
+</p><!--l. 5658--><p class="noindent" ><a
href="#top">Top</a><div class="chapter"><h2 class="chapterHead">8. <a
id="sec:onthefly"></a>On-the-Fly Document Definitions</h2>
-</p><!--l. 5160--><p class="indent" > <div class="important" title="Important Note"> The commands described here may superficially look like &#x27E8;<span
+</p><!--l. 5661--><p class="indent" > <div class="important" title="Important Note"> The commands described here may superficially look like &#x27E8;<span
class="cmti-10">word</span>&#x27E9;<span
class="cmtt-10">\index{</span>&#x27E8;<span
class="cmti-10">word</span>&#x27E9;<span
@@ -10109,8 +11515,8 @@ but they behave rather differently. If you want to use <span
class="cmtt-10">\index </span>then just use <span
class="cmtt-10">\index</span>.
</div>
-</p><!--l. 5165--><p class="noindent" >
-</p><!--l. 5167--><p class="indent" > The <span
+</p><!--l. 5666--><p class="noindent" >
+</p><!--l. 5668--><p class="indent" > The <span
class="cmss-10">glossaries </span>package advises against defining entries in the <span
class="cmss-10">document</span><a
id="dx1-29001"></a><a
@@ -10121,29 +11527,31 @@ class="cmsy-10">&sect;</span>1.2 </a><a
href="#sec:pkgopts">New or Modified Package Options<!--tex4ht:ref: sec:pkgopts --></a> above, this
ability is disabled by default with <span
class="cmss-10">glossaries-extra </span>but can be enabled using the
-<span
-class="cmss-10">docdefs</span><a
+<a
+href="#styopt.docdefs"><span
+class="cmss-10">docdefs</span></a><a
id="dx1-29003"></a> package options.
-</p><!--l. 5173--><p class="indent" > Although this can be problematic, the <span
+</p><!--l. 5674--><p class="indent" > Although this can be problematic, the <span
class="cmss-10">glossaries-extra </span>package provides a way of
defining and using entries within the <span
class="cmss-10">document</span><a
id="dx1-29004"></a><a
id="dx1-29005"></a> environment without the tricks used
-with the <span
-class="cmss-10">docdefs</span><a
+with the <a
+href="#styopt.docdefs"><span
+class="cmss-10">docdefs</span></a><a
id="dx1-29006"></a> option. <span
class="cmti-10">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. 5179--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5680--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrEnableOnTheFly</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-29007"></a> <span
class="cmtt-10">\GlsXtrEnableOnTheFly </span></div><hr>
-</p><!--l. 5181--><p class="noindent" >
+</p><!--l. 5682--><p class="noindent" >
When used, this defines the commands described below.
-</p><!--l. 5184--><p class="indent" > <div class="important" title="Important Note"> The commands <span
+</p><!--l. 5685--><p class="indent" > <div class="important" title="Important Note"> The commands <span
class="cmtt-10">\glsxtr</span>, <span
class="cmtt-10">\glsxtrpl</span>, <span
class="cmtt-10">\Glsxtr </span>and <span
@@ -10154,8 +11562,8 @@ class="cmtt-10">\printglossary</span><a
mix these commands with the standard glossary commands, such as <span
class="cmtt-10">\gls </span>or there
may be unexpected results. </div>
-</p><!--l. 5190--><p class="noindent" >
-</p><!--l. 5192--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5691--><p class="noindent" >
+</p><!--l. 5693--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtr</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-29009"></a> <span
@@ -10166,7 +11574,7 @@ class="cmitt-10">dfn-options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5194--><p class="noindent" >
+</p><!--l. 5695--><p class="noindent" >
If an entry with the label &#x27E8;<span
class="cmti-10">label</span>&#x27E9; has already been defined, this just does <span
class="cmtt-10">\gls</span>
@@ -10201,7 +11609,7 @@ class="cmitt-10">dfn-options</span>&#x27E9;<span
class="cmsy-10">}</span>
</div>
</div>
-<!--l. 5206--><p class="indent" > <div class="important" title="Important Note"> The &#x27E8;<span
+<!--l. 5707--><p class="indent" > <div class="important" title="Important Note"> The &#x27E8;<span
class="cmti-10">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
@@ -10210,15 +11618,15 @@ class="cmss-10">name</span><a
id="dx1-29010"></a> key must be provided in the optional
argument &#x27E8;<span
class="cmti-10">dfn-options</span>&#x27E9;. </div>
-</p><!--l. 5212--><p class="noindent" >
+</p><!--l. 5713--><p class="noindent" >
-</p><!--l. 5214--><p class="indent" > The second optional argument &#x27E8;<span
+</p><!--l. 5715--><p class="indent" > The second optional argument &#x27E8;<span
class="cmti-10">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. 5217--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5718--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrWarning</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-29011"></a> <span
@@ -10227,39 +11635,39 @@ class="cmitt-10">dfn-options</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5219--><p class="noindent" >
-</p><!--l. 5221--><p class="indent" > For example, this warning will be generated on the second instance of <span
+</p><!--l. 5720--><p class="noindent" >
+</p><!--l. 5722--><p class="indent" > For example, this warning will be generated on the second instance of <span
class="cmtt-10">\glsxtr</span>
below:
</p>
- <div class="verbatim" id="verbatim-133">
+ <div class="verbatim" id="verbatim-134">
\glsxtr[][plural=geese]{goose}
&#x00A0;<br />&#x00A0;...&#x00A0;later
&#x00A0;<br />\glsxtr[][plural=geese]{goose}
</div>
-<!--l. 5227--><p class="nopar" >
-</p><!--l. 5229--><p class="indent" > If you are considering doing something like:
+<!--l. 5728--><p class="nopar" >
+</p><!--l. 5730--><p class="indent" > If you are considering doing something like:
</p>
- <div class="verbatim" id="verbatim-134">
+ <div class="verbatim" id="verbatim-135">
\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. 5235--><p class="nopar" > then don&#8217;t bother. It&#8217;s simpler and less problematic to just define the entries in the
+<!--l. 5736--><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="cmtt-10">\newglossaryentry</span><a
id="dx1-29012"></a> and then use <span
class="cmtt-10">\gls </span>in the document.
-</p><!--l. 5240--><p class="indent" > There are plural and case-changing alternatives to <span
+</p><!--l. 5741--><p class="indent" > There are plural and case-changing alternatives to <span
class="cmtt-10">\glsxtr</span>:
-</p><!--l. 5241--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5742--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-29013"></a> <span
@@ -10270,12 +11678,12 @@ class="cmitt-10">dfn-options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5243--><p class="noindent" >
+</p><!--l. 5744--><p class="noindent" >
This is like <span
class="cmtt-10">\glsxtr </span>but uses <span
class="cmtt-10">\glspl </span>instead of <span
class="cmtt-10">\gls</span>.
-</p><!--l. 5246--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5747--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtr</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-29014"></a> <span
@@ -10286,12 +11694,12 @@ class="cmitt-10">dfn-options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5248--><p class="noindent" >
+</p><!--l. 5749--><p class="noindent" >
This is like <span
class="cmtt-10">\glsxtr </span>but uses <span
class="cmtt-10">\Gls </span>instead of <span
class="cmtt-10">\gls</span>.
-</p><!--l. 5251--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5752--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtrpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-29015"></a> <span
@@ -10302,12 +11710,12 @@ class="cmitt-10">dfn-options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5253--><p class="noindent" >
+</p><!--l. 5754--><p class="noindent" >
This is like <span
class="cmtt-10">\glsxtr </span>but uses <span
class="cmtt-10">\Glspl </span>instead of <span
class="cmtt-10">\gls</span>.
-</p><!--l. 5256--><p class="indent" > If you use UTF-8 and don&#8217;t want the inconvenient of needing to use an
+</p><!--l. 5757--><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
@@ -10316,41 +11724,42 @@ without switching to <span class="HoLogo-XeLaTeX"><span class="HoLogo-Xe">X<span
class="cmtt-10">\GlsXtrEnableOnTheFly </span>that allows you to use UTF-8 characters in &#x27E8;<span
class="cmti-10">label</span>&#x27E9;, but it&#8217;s
experimental and may not work in some cases.
-</p><!--l. 5265--><p class="indent" > <div class="important" title="Important Note"> If you use the starred version of <span
+</p><!--l. 5766--><p class="indent" > <div class="important" title="Important Note"> If you use the starred version of <span
class="cmtt-10">\GlsXtrEnableOnTheFly </span>don&#8217;t use any
commands in the &#x27E8;<span
class="cmti-10">label</span>&#x27E9;, even if they expand to just text. </div>
-</p><!--l. 5269--><p class="noindent" >
+</p><!--l. 5770--><p class="noindent" >
</p>
-<!--l. 5271--><p class="indent" > </div>
-</p><!--l. 5271--><p class="noindent" ><a
+<!--l. 5772--><p class="indent" > </div>
+</p><!--l. 5772--><p class="noindent" ><a
href="#top">Top</a><div class="chapter"><h2 class="chapterHead">9. <a
id="sec:bib2gls"></a>bib2gls: Managing Reference Databases</h2>
-</p><!--l. 5274--><p class="indent" > There is a new command line application under development called <a
+</p><!--l. 5775--><p class="indent" > There is a new command line application under development called <a
id="dx1-30001"></a><a
href="#glo:bib2gls"><span
class="cmtt-10">bib2gls</span><a
id="dx1-30002"></a></a>,
-which works in much the same way as <span
-class="cmtt-10">bibtex</span>. Instead of storing all your entry
-definitions in a <span
+which works in much the same way as a combination of <span
+class="cmtt-10">bibtex </span>and <span
+class="cmtt-10">makeindex</span>.
+Instead of storing all your entry definitions in a <span
class="cmtt-10">.tex </span>and loading them using <span
-class="cmtt-10">\input </span>or <span
-class="cmtt-10">\loadglsentries</span>, the entries
-can instead be stored in a <span
+class="cmtt-10">\input</span>
+or <span
+class="cmtt-10">\loadglsentries</span>, the entries can instead be stored in a <span
class="cmtt-10">.bib </span>file and <a
id="dx1-30003"></a><span
class="cmtt-10">bib2gls</span><a
- id="dx1-30004"></a> can selectively write the appropriate
-commands to a <span
-class="cmtt-10">.glstex </span>file which is loaded using <span
-class="cmtt-10">\glsxtrresourcefile </span>(or
-<span
+ id="dx1-30004"></a>
+can selectively write the appropriate commands to a <span
+class="cmtt-10">.glstex </span>file which is loaded
+using <span
+class="cmtt-10">\glsxtrresourcefile </span>(or <span
class="cmtt-10">\GlsXtrLoadResources</span>).
-</p><!--l. 5283--><p class="indent" > This means that you can use a reference managing system, such as JabRef, to
+</p><!--l. 5785--><p class="indent" > This means that you can use a reference managing system, such as JabRef, to
maintain the database and it reduces the <span class="TEX">T<span
class="E">E</span>X</span>&#x00A0;overhead by only defining the entries
that are actually required in the document. If you currently have a <span
@@ -10358,17 +11767,17 @@ class="cmtt-10">.tex </span>file that
contains hundreds of definitions, but you only use a dozen or so in your document,
then the build time is needlessly slowed by the unrequired definitions that occur
when the file is input.
-</p><!--l. 5291--><p class="indent" > Although <a
+</p><!--l. 5793--><p class="indent" > Although <a
id="dx1-30005"></a><span
class="cmtt-10">bib2gls</span><a
- id="dx1-30006"></a> isn&#8217;t ready yet, there have been some new commands and
-options added to <span
-class="cmss-10">glossaries-extra </span>to help assist the integration of <a
+ id="dx1-30006"></a> isn&#8217;t ready yet (at the time of writing this), there have been
+some new commands and options added to <span
+class="cmss-10">glossaries-extra </span>to help assist the
+integration of <a
id="dx1-30007"></a><span
class="cmtt-10">bib2gls</span><a
- id="dx1-30008"></a> into the
-document build process.
-</p><!--l. 5296--><p class="indent" > An example of the contents of <span
+ id="dx1-30008"></a> into the document build process.
+</p><!--l. 5798--><p class="indent" > An example of the contents of <span
class="cmtt-10">.bib </span>file that stores glossary entries that can be
extracted with <a
id="dx1-30009"></a><span
@@ -10378,7 +11787,7 @@ class="cmtt-10">bib2gls</span><a
</p>
- <div class="verbatim" id="verbatim-135">
+ <div class="verbatim" id="verbatim-136">
@entry{bird,
&#x00A0;<br />&#x00A0;&#x00A0;name={bird},
&#x00A0;<br />&#x00A0;&#x00A0;description&#x00A0;=&#x00A0;{feathered&#x00A0;animal},
@@ -10394,13 +11803,13 @@ class="cmtt-10">bib2gls</span><a
&#x00A0;<br />&#x00A0;&#x00A0;description={a&#x00A0;waterbird&#x00A0;with&#x00A0;a&#x00A0;long&#x00A0;neck}
&#x00A0;<br />}
</div>
-<!--l. 5315--><p class="nopar" >
-</p><!--l. 5317--><p class="indent" > The follow provides some abbreviations:
+<!--l. 5817--><p class="nopar" >
+</p><!--l. 5819--><p class="indent" > The follow provides some abbreviations:
</p>
- <div class="verbatim" id="verbatim-136">
+ <div class="verbatim" id="verbatim-137">
@string{ssi={server-side&#x00A0;includes}}
&#x00A0;<br />@string{html={hypertext&#x00A0;markup&#x00A0;language}}
&#x00A0;<br />@abbreviation{shtml,
@@ -10419,13 +11828,13 @@ class="cmtt-10">bib2gls</span><a
&#x00A0;<br />&#x00A0;&#x00A0;description={a&#x00A0;simple&#x00A0;interpreted&#x00A0;server-side&#x00A0;scripting&#x00A0;language}
&#x00A0;<br />}
</div>
-<!--l. 5339--><p class="nopar" >
-</p><!--l. 5341--><p class="indent" > Here are some symbols:
+<!--l. 5841--><p class="nopar" >
+</p><!--l. 5843--><p class="indent" > Here are some symbols:
</p>
- <div class="verbatim" id="verbatim-137">
+ <div class="verbatim" id="verbatim-138">
preamble{"\providecommand{\mtx}[1]{\boldsymbol{#1}}"}
&#x00A0;<br />@symbol{M,
&#x00A0;<br />&#x00A0;&#x00A0;name={$\mtx{M}$},
@@ -10443,47 +11852,50 @@ preamble{"\providecommand{\mtx}[1]{\boldsymbol{#1}}"}
&#x00A0;<br />&#x00A0;&#x00A0;description={a&#x00A0;set}
&#x00A0;<br />}
</div>
-<!--l. 5362--><p class="nopar" >
-</p><!--l. 5364--><p class="indent" > To ensure that <a
+<!--l. 5864--><p class="nopar" >
+</p><!--l. 5866--><p class="indent" > To ensure that <a
id="dx1-30011"></a><a
href="#glo:bib2gls"><span
class="cmtt-10">bib2gls</span><a
id="dx1-30012"></a></a> can find out which entries have been used in the
-document, you need the <span
-class="cmss-10">record</span><a
- id="dx1-30013"></a> package. Option:
+document, you need the <a
+href="#styopt.record"><span
+class="cmss-10">record</span></a><a
+ id="dx1-30013"></a> package option:
</p>
- <div class="verbatim" id="verbatim-138">
+ <div class="verbatim" id="verbatim-139">
\usepackage[record]{glossaries-extra}
</div>
-<!--l. 5368--><p class="nopar" > If this option&#8217;s value is omitted (as above), the normal indexing will be switched off,
+<!--l. 5870--><p class="nopar" > If this option&#8217;s value is omitted (as above), the normal indexing will be switched off,
since <a
id="dx1-30014"></a><a
href="#glo:bib2gls"><span
class="cmtt-10">bib2gls</span><a
id="dx1-30015"></a></a> can also sort the entries and collate the locations.
-</p><!--l. 5373--><p class="indent" > If you still want to use an indexing application (for example, you need a custom
+</p><!--l. 5875--><p class="indent" > If you still want to use an indexing application (for example, you need a custom
<a
id="dx1-30016"></a><a
href="#glo:xindy"><span
-class="cmtt-10">xindy</span></a> rule), then just use <span
-class="cmss-10">record=alsoindex</span><a
+class="cmtt-10">xindy</span></a> rule), then just use <a
+href="#styopt.record"><span
+class="cmss-10">record</span></a><span
+class="cmss-10">=alsoindex</span><a
id="dx1-30017"></a> and continue to use <span
class="cmtt-10">\makeglossaries</span>
and <span
class="cmtt-10">\printglossary </span>(or <span
-class="cmtt-10">\printglossaries</span>), but instruct <a
+class="cmtt-10">\printglossaries</span>), but it&#8217;s a good idea to also instruct
+<a
id="dx1-30018"></a><span
class="cmtt-10">bib2gls</span><a
- id="dx1-30019"></a> to omit sorting
-to save time.
-</p><!--l. 5379--><p class="indent" > The <span
+ id="dx1-30019"></a> to omit sorting to save time.
+</p><!--l. 5881--><p class="indent" > The <span
class="cmtt-10">.glstex </span>file created by <span
class="cmtt-10">\bib2gls </span>is loaded using:
-</p><!--l. 5380--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5882--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrresourcefile</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-30020"></a> <span
@@ -10493,20 +11905,20 @@ class="cmtt-10">]{</span>&#x27E8;<span
class="cmitt-10">filename</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 5382--><p class="noindent" >
+</p><!--l. 5884--><p class="noindent" >
(Don&#8217;t include the file extension in &#x27E8;<span
class="cmti-10">filename</span>&#x27E9;.) There&#8217;s a shortcut version that sets
&#x27E8;<span
class="cmti-10">filename</span>&#x27E9; <span
class="cmtt-10">\jobname</span>:
-</p><!--l. 5385--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 5887--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrLoadResources</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-30021"></a> <span
class="cmtt-10">\GlsXtrLoadResources[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 5387--><p class="noindent" >
+</p><!--l. 5889--><p class="noindent" >
On the first use, this command is a shortcut for </p><div class="alltt">
<div class="obeylines-v">
<span
@@ -10533,15 +11945,15 @@ class="cmsy-10">}</span>
</div>
</div> where &#x27E8;<span
class="cmti-10">n</span>&#x27E9; is the current value of
-<!--l. 5399--><p class="indent" > <hr><div title="Definition"><span
+<!--l. 5901--><p class="indent" > <hr><div title="Definition"><span
class="cmtt-10">\glsxtrresourcecount </span></div><hr>
-</p><!--l. 5400--><p class="noindent" >
+</p><!--l. 5902--><p class="noindent" >
which is incremented at the end of <span
class="cmtt-10">\GlsXtrLoadResources</span>. Any advisory notes
regarding <span
class="cmtt-10">\glsxtrresourcefile </span>also apply to <span
class="cmtt-10">\GlsXtrLoadResources</span>.
-</p><!--l. 5405--><p class="indent" > The <span
+</p><!--l. 5907--><p class="indent" > The <span
class="cmtt-10">\glsxtrresourcefile </span>command writes the line </p><div class="alltt">
<div class="obeylines-v">
<span
@@ -10561,7 +11973,7 @@ href="#fn2x9" id="fn2x9-bk"><sup class="textsuperscript">9.2</sup></a></span><a
-<!--l. 5415--><p class="indent" > The options are ignored by <span
+<!--l. 5917--><p class="indent" > The options are ignored by <span
class="cmss-10">glossaries-extra </span>but are picked up by <a
id="dx1-30024"></a><span
class="cmtt-10">bib2gls</span><a
@@ -10569,13 +11981,16 @@ class="cmtt-10">bib2gls</span><a
used to supply various information, such as the name of the <span
class="cmtt-10">.bib </span>files and any
changes to the default behaviour.
-</p><!--l. 5420--><p class="indent" > Since the <span
+</p><!--l. 5922--><p class="indent" > Since the <span
class="cmtt-10">.glstex </span>won&#8217;t exist on the first <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
-class="E">E</span>X</span></span>&#x00A0;run, the <span
-class="cmss-10">record</span><a
+class="E">E</span>X</span></span>&#x00A0;run, the <a
+href="#styopt.record"><span
+class="cmss-10">record</span></a><a
id="dx1-30026"></a> package option
-additionally switches on <span
-class="cmss-10">undefaction=warn</span><a
+additionally switches on <a
+href="#styopt.undefaction"><span
+class="cmss-10">undefaction</span></a><span
+class="cmss-10">=warn</span><a
id="dx1-30027"></a>. Any use of commands like <span
class="cmtt-10">\gls </span>or
<span
@@ -10587,17 +12002,47 @@ class="cmtt-10">bib2gls</span><a
id="dx1-30029"></a></a> has created the <span
class="cmtt-10">.glstex </span>file the references should be
resolved.
-</p><!--l. 5427--><p class="indent" > Note that as from v1.12, <span
+</p><!--l. 5929--><p class="indent" > <div class="important" title="Important Note"> Note that <span
+class="cmtt-10">\glsaddall </span>doesn&#8217;t work with <a
+ id="dx1-30030"></a><span
+class="cmtt-10">bib2gls</span><a
+ id="dx1-30031"></a> as the command has to iterate
+over the glossary lists, which will be empty on the first run and on subsequent
+runs will only contain those entries that have been selected by <a
+ id="dx1-30032"></a><span
+class="cmtt-10">bib2gls</span><a
+ id="dx1-30033"></a>.
+</div>
+</p><!--l. 5934--><p class="noindent" >
+</p><!--l. 5936--><p class="indent" > If you want to add all entries to the glossary, you need to tell <a
+ id="dx1-30034"></a><span
+class="cmtt-10">bib2gls</span><a
+ id="dx1-30035"></a> this in the
+options list. For example:
+
+
+
+</p>
+ <div class="verbatim" id="verbatim-140">
+\GlsXtrLoadResources[src={terms},selection={all}]
+</div>
+<!--l. 5941--><p class="nopar" > See the <a
+ id="dx1-30036"></a><a
+href="#glo:bib2gls"><span
+class="cmtt-10">bib2gls</span><a
+ id="dx1-30037"></a></a> user manual for more details of this and other available
+options.
+</p><!--l. 5945--><p class="indent" > Note that as from v1.12, <span
class="cmtt-10">\glsxtrresourcefile </span>temporarily switches the
category code of <span
class="cmtt-10">@ </span>to 11 (letter) while it reads the file to allow for any internal
commands stored in the location field.
-</p><!--l. 5432--><p class="indent" > Since the <span
+</p><!--l. 5950--><p class="indent" > Since the <span
class="cmtt-10">.glstex </span>file only defines those references used within the document and
the definitions have been written in the order corresponding to <a
- id="dx1-30030"></a><span
+ id="dx1-30038"></a><span
class="cmtt-10">bib2gls</span><a
- id="dx1-30031"></a> sorted
+ id="dx1-30039"></a> sorted
list, the glossaries can simply be displayed using <span
class="cmtt-10">\printunsrtglossary </span>(or
<span
@@ -10606,7 +12051,7 @@ href="#sec:printunsrt"><span
class="cmsy-10">&sect;</span>10.2 </a><a
href="#sec:printunsrt">Display All Entries Without Sorting or
Indexing<!--tex4ht:ref: sec:printunsrt --></a>.
-</p><!--l. 5438--><p class="indent" > Suppose the <span
+</p><!--l. 5956--><p class="indent" > Suppose the <span
class="cmtt-10">.bib </span>examples shown above have been stored in the files <span
class="cmtt-10">terms.bib</span>,
<span
@@ -10618,7 +12063,7 @@ class="E">E</span>X</span>&#8217;s path. Then the document might look like:
</p>
- <div class="verbatim" id="verbatim-139">
+ <div class="verbatim" id="verbatim-141">
\documentclass{article}
&#x00A0;<br />\usepackage[record]{glossaries-extra}
&#x00A0;<br />\setabbreviationstyle{long-short-desc}
@@ -10630,18 +12075,18 @@ class="E">E</span>X</span>&#8217;s path. Then the document might look like:
&#x00A0;<br />\printunsrtglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 5460--><p class="nopar" > The document build process (assuming the document is called <span
+<!--l. 5978--><p class="nopar" > The document build process (assuming the document is called <span
class="cmtt-10">mydoc</span>) is:
</p>
- <div class="verbatim" id="verbatim-140">
+ <div class="verbatim" id="verbatim-142">
pdflatex&#x00A0;mydoc
&#x00A0;<br />bib2gls&#x00A0;mydoc
&#x00A0;<br />pdflatex&#x00A0;mydoc
</div>
-<!--l. 5467--><p class="nopar" > This creates a single glossary containing the entries: <span
+<!--l. 5985--><p class="nopar" > This creates a single glossary containing the entries: <span
class="cmtt-10">bird</span>, <span
class="cmtt-10">duck</span>, <span
class="cmtt-10">goose</span>, <span
@@ -10654,39 +12099,39 @@ class="cmtt-10">bird</span>, <span
class="cmtt-10">shtml </span>and <span
class="cmtt-10">M </span>entries were added because
<a
- id="dx1-30032"></a><a
+ id="dx1-30040"></a><a
href="#glo:bib2gls"><span
class="cmtt-10">bib2gls</span><a
- id="dx1-30033"></a></a> detected (from the <span
+ id="dx1-30041"></a></a> detected (from the <span
class="cmtt-10">.aux </span>file) that they had been used in the document. The
other entries were added because <a
- id="dx1-30034"></a><span
+ id="dx1-30042"></a><span
class="cmtt-10">bib2gls</span><a
- id="dx1-30035"></a> detected (from the <span
+ id="dx1-30043"></a> detected (from the <span
class="cmtt-10">.bib </span>files) that they
are referenced by the used entries. In the case of <span
class="cmtt-10">duck </span>and <span
class="cmtt-10">goose</span>, they are
in the <span
class="cmss-10">see</span><a
- id="dx1-30036"></a> field for <span
+ id="dx1-30044"></a> field for <span
class="cmtt-10">bird</span>. In the case of <span
class="cmtt-10">ssi </span>and <span
class="cmtt-10">html</span>, they are referenced
in the <span
class="cmss-10">description</span><a
- id="dx1-30037"></a> field of <span
+ id="dx1-30045"></a> field of <span
class="cmtt-10">shtml</span>. These cross-referenced entries won&#8217;t have
a location list when the glossary is first displayed, but depending on how
they are referenced, they may pick up a location list on the next document
build.
-</p><!--l. 5484--><p class="indent" > The entries can be separated into different glossaries with different sort
+</p><!--l. 6002--><p class="indent" > The entries can be separated into different glossaries with different sort
methods:
</p>
- <div class="verbatim" id="verbatim-141">
+ <div class="verbatim" id="verbatim-143">
\documentclass{article}
&#x00A0;<br />\usepackage[record,abbreviations,symbols]{glossaries-extra}
&#x00A0;<br />\setabbreviationstyle{long-short-desc}
@@ -10704,46 +12149,20 @@ methods:
&#x00A0;<br />\printunsrtglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 5512--><p class="nopar" > (By default, entries are sorted according to the operating system&#8217;s locale.
+<!--l. 6030--><p class="nopar" > (By default, entries are sorted according to the operating system&#8217;s locale.
If this doesn&#8217;t match the document language, you need to set this in the
option list, for example <span class="obeylines-h"><span class="verb"><span
class="cmtt-10">sort=de-CH-1996</span></span></span> for Swiss German using the new
orthography.)
-</p><!--l. 5518--><p class="indent" > Note that <span
-class="cmtt-10">\glsaddall </span>doesn&#8217;t work in this case as it has to iterate over the
-glossary lists, which will be empty on the first run and on subsequent runs will only
-contain those entries that have been selected by <a
- id="dx1-30038"></a><a
-href="#glo:bib2gls"><span
-class="cmtt-10">bib2gls</span><a
- id="dx1-30039"></a></a>. Instead, if you want to
-add all entries to the glossary, you need to tell <a
- id="dx1-30040"></a><span
-class="cmtt-10">bib2gls</span><a
- id="dx1-30041"></a> this in the options
-list:
</p>
- <div class="verbatim" id="verbatim-142">
-\GlsXtrLoadResources[src={terms},selection={all}]
-</div>
-<!--l. 5526--><p class="nopar" >
-</p><!--l. 5528--><p class="indent" > The <a
- id="dx1-30042"></a><a
-href="#glo:bib2gls"><span
-class="cmtt-10">bib2gls</span><a
- id="dx1-30043"></a></a> user manual will contain more detail.
-
-
-
-</p>
-<!--l. 5530--><p class="indent" > </div>
-</p><!--l. 5530--><p class="noindent" ><a
+<!--l. 6037--><p class="indent" > </div>
+</p><!--l. 6037--><p class="noindent" ><a
href="#top">Top</a><div class="chapter"><h2 class="chapterHead">10. <a
id="sec:miscnew"></a>Miscellaneous New Commands</h2>
-</p><!--l. 5533--><p class="indent" > The <span
+</p><!--l. 6040--><p class="indent" > The <span
class="cmss-10">glossaries </span>package provides <span
class="cmtt-10">\glsrefentry</span><a
id="dx1-31001"></a> entry to cross-reference entries
@@ -10754,21 +12173,21 @@ class="cmss-10">subentrycounter</span><a
id="dx1-31003"></a> options. The <span
class="cmss-10">glossaries-extra</span>
package provides a supplementary command
-</p><!--l. 5537--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6044--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrpageref</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-31004"></a> <span
class="cmtt-10">\glsxtrpageref{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5539--><p class="noindent" >
+</p><!--l. 6046--><p class="noindent" >
that works in the same way except that it uses <span
class="cmtt-10">\pageref</span><a
id="dx1-31005"></a> instead of <span
class="cmtt-10">\ref</span><a
id="dx1-31006"></a>.
-</p><!--l. 5543--><p class="indent" > You can copy an entry to another glossary using
-</p><!--l. 5544--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6050--><p class="indent" > You can copy an entry to another glossary using
+</p><!--l. 6051--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrcopytoglossary</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-31007"></a> <span
@@ -10778,7 +12197,7 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">glossary-type</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 5546--><p class="noindent" >
+</p><!--l. 6053--><p class="noindent" >
This appends &#x27E8;<span
class="cmti-10">entry-label</span>&#x27E9; to the end of the internal list for the glossary given by
&#x27E8;<span
@@ -10795,18 +12214,18 @@ switch off the targets:
</p>
- <div class="verbatim" id="verbatim-143">
+ <div class="verbatim" id="verbatim-144">
\printunsrtglossary[target=false]
</div>
-<!--l. 5556--><p class="nopar" >
-</p><!--l. 5558--><p class="indent" > The <span
+<!--l. 6063--><p class="nopar" >
+</p><!--l. 6065--><p class="indent" > The <span
class="cmss-10">glossaries </span>package allows you to set preamble code for a given glossary
type using <span
class="cmtt-10">\setglossarypreamble</span>. This overrides any previous setting.
With <span
class="cmss-10">glossaries-extra </span>(as from v1.12) you can instead append to the preamble
using
-</p><!--l. 5563--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6070--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\apptoglossarypreamble</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-31010"></a> <span
@@ -10815,9 +12234,9 @@ class="cmitt-10">type</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
class="cmitt-10">code</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5565--><p class="noindent" >
+</p><!--l. 6072--><p class="noindent" >
or prepend using
-</p><!--l. 5567--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6074--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\pretoglossarypreamble</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-31011"></a> <span
@@ -10826,29 +12245,29 @@ class="cmitt-10">type</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
class="cmitt-10">code</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5569--><p class="noindent" >
+</p><!--l. 6076--><p class="noindent" >
</p>
-<!--l. 5571--><p class="noindent" ><a
+<!--l. 6078--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">10.1 </span> <a
id="sec:fields"></a>Entry Fields</h3>
-<!--l. 5574--><p class="noindent" >A field may now be used to store the name of a text-block command that takes a
+<!--l. 6081--><p class="noindent" >A field may now be used to store the name of a text-block command that takes a
single argument. The field is given by
-</p><!--l. 5576--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6083--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrFmtField</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32001"></a> <span
class="cmtt-10">\GlsXtrFmtField </span></div><hr>
-</p><!--l. 5578--><p class="noindent" >
+</p><!--l. 6085--><p class="noindent" >
The default value is <span
class="cmtt-10">useri</span>. Note that the value must be the control sequence name
<span
class="cmti-10">without the initial backslash</span>.
-</p><!--l. 5583--><p class="indent" > For example:
+</p><!--l. 6090--><p class="indent" > For example:
</p>
- <div class="verbatim" id="verbatim-144">
+ <div class="verbatim" id="verbatim-145">
\newcommand*{\mtx}[1]{\boldsymbol{#1}}
&#x00A0;<br />\newcommand*{\mtxinv}[1]{\mtx{#1}\sp{-1}}
&#x00A0;<br />\newglossaryentry{matrix}{%
@@ -10873,10 +12292,10 @@ class="cmti-10">without the initial backslash</span>.
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;$\mtx{M}\mtxinv{M}=\glssymbol{identitymatrix}$}
&#x00A0;<br />}
</div>
-<!--l. 5611--><p class="nopar" >
-</p><!--l. 5613--><p class="indent" > There are two commands provided that allow you to apply the command to an
+<!--l. 6118--><p class="nopar" >
+</p><!--l. 6120--><p class="indent" > There are two commands provided that allow you to apply the command to an
argument:
-</p><!--l. 5615--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6122--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrfmt</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32002"></a> <span
@@ -10887,7 +12306,7 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5617--><p class="noindent" >
+</p><!--l. 6124--><p class="noindent" >
This effectively does </p><div class="alltt">
<div class="obeylines-v">
<span
@@ -10909,12 +12328,12 @@ class="cmtt-10">\glsxtrfmt </span>will simply do &#x27E8;<span
class="cmti-10">text</span>&#x27E9;. The
default &#x27E8;<span
class="cmti-10">options</span>&#x27E9; are given by
-<!--l. 5626--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 6133--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrFmtDefaultOptions</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32003"></a> <span
class="cmtt-10">\GlsXtrFmtDefaultOptions </span></div><hr>
-</p><!--l. 5628--><p class="noindent" >
+</p><!--l. 6135--><p class="noindent" >
@@ -10924,12 +12343,12 @@ replacement text of <span
class="cmtt-10">\GlsXtrFmtDefaultOptions </span>is prepended to the optional
argument of <span
class="cmtt-10">\glslink</span>.
-</p><!--l. 5634--><p class="indent" > For example:
+</p><!--l. 6141--><p class="indent" > For example:
</p>
- <div class="verbatim" id="verbatim-145">
+ <div class="verbatim" id="verbatim-146">
\[
&#x00A0;<br />&#x00A0;&#x00A0;\glsxtrfmt{matrix}{A}
&#x00A0;<br />&#x00A0;&#x00A0;\glsxtrfmt{matrixinv}{A}
@@ -10937,7 +12356,7 @@ class="cmtt-10">\glslink</span>.
&#x00A0;<br />&#x00A0;&#x00A0;\glssymbol{identitymatrix}
&#x00A0;<br />\]
</div>
-<!--l. 5642--><p class="nopar" > If the default options are set to <span
+<!--l. 6149--><p class="nopar" > If the default options are set to <span
class="cmtt-10">noindex </span>then <span
class="cmtt-10">\glsxtrfmt </span>won&#8217;t index, but will
create a hyperlink (if <span
@@ -10948,14 +12367,14 @@ suppresses the hyperlink:
</p>
- <div class="verbatim" id="verbatim-146">
+ <div class="verbatim" id="verbatim-147">
\renewcommand{\GlsXtrFmtDefaultOptions}{hyper=false,noindex}
</div>
-<!--l. 5649--><p class="nopar" >
-</p><!--l. 5651--><p class="indent" > Note that <span
+<!--l. 6156--><p class="nopar" >
+</p><!--l. 6158--><p class="indent" > Note that <span
class="cmtt-10">\glsxtrfmt </span>won&#8217;t work with PDF bookmarks. Instead you can
use
-</p><!--l. 5653--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6160--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrentryfmt</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32005"></a> <span
@@ -10964,7 +12383,7 @@ class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5655--><p class="noindent" >
+</p><!--l. 6162--><p class="noindent" >
This uses <span
class="cmtt-10">\texorpdfstring </span>and will simply expand to &#x27E8;<span
class="cmti-10">text</span>&#x27E9; within the PDF
@@ -10975,14 +12394,14 @@ class="cmti-10">text</span>&#x27E9;<span
class="cmtt-10">} </span>if a control sequence name has
been provided or just &#x27E8;<span
class="cmti-10">text</span>&#x27E9; otherwise.
-</p><!--l. 5661--><p class="indent" > The <span
+</p><!--l. 6168--><p class="indent" > The <span
class="cmss-10">glossaries </span>package provides <span
class="cmtt-10">\glsaddstoragekey </span>to add new keys. This
command will cause an error if the key has already been defined. The <span
class="cmss-10">glossaries-extra</span>
package provides a supplementary command that will only define the key if it doesn&#8217;t
already exist:
-</p><!--l. 5666--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6173--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrprovidestoragekey</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32006"></a> <span
@@ -10994,7 +12413,7 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">cs</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 5668--><p class="noindent" >
+</p><!--l. 6175--><p class="noindent" >
If the key has already been defined, it will still provide the command given in the
third argument &#x27E8;<span
class="cmti-10">cs</span>&#x27E9; (if it hasn&#8217;t already been defined). Unlike <span
@@ -11003,8 +12422,8 @@ class="cmti-10">cs</span>&#x27E9;
may be left empty if you&#8217;re happy to just use <span
class="cmtt-10">\glsfieldfetch </span>to fetch the value of
this new key.
-</p><!--l. 5674--><p class="indent" > You can test if a key has been provided with:
-</p><!--l. 5675--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6181--><p class="indent" > You can test if a key has been provided with:
+</p><!--l. 6182--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrifkeydefined</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32007"></a> <span
@@ -11015,7 +12434,7 @@ class="cmitt-10">true</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">false</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5677--><p class="noindent" >
+</p><!--l. 6184--><p class="noindent" >
This tests if &#x27E8;<span
class="cmti-10">key</span>&#x27E9; is available for use in the &#x27E8;<span
class="cmti-10">key</span>&#x27E9;= list in the second argument of
@@ -11024,7 +12443,7 @@ class="cmtt-10">\newglossaryentry </span>(or the optional argument of commands l
class="cmtt-10">\newabbreviation</span>).
The corresponding field may not have been set for any of the entries if no default was
provided.
-</p><!--l. 5685--><p class="indent" > There are now commands provided to set individual fields. Note that
+</p><!--l. 6192--><p class="indent" > There are now commands provided to set individual fields. Note that
these only change the specified field, not any related values. For example,
changing the value of the <span
class="cmss-10">text</span><a
@@ -11036,7 +12455,7 @@ the <span
class="cmss-10">parent</span><a
id="dx1-32010"></a> field). Unexpected results may occur if they are subsequently
changed.
-</p><!--l. 5693--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6200--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrSetField</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32011"></a> <span
@@ -11047,7 +12466,7 @@ class="cmitt-10">field</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">value</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5695--><p class="noindent" >
+</p><!--l. 6202--><p class="noindent" >
Sets the field given by &#x27E8;<span
class="cmti-10">field</span>&#x27E9; to &#x27E8;<span
class="cmti-10">value</span>&#x27E9; for the entry given by &#x27E8;<span
@@ -11063,9 +12482,9 @@ command is robust.
-</p><!--l. 5705--><p class="indent" > <span
+</p><!--l. 6212--><p class="indent" > <span
class="cmtt-10">\GlsXtrSetField </span>uses
-</p><!--l. 5706--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6213--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrsetfieldifexists</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32012"></a> <span
@@ -11077,11 +12496,11 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">code</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 5708--><p class="noindent" >
+</p><!--l. 6215--><p class="noindent" >
where &#x27E8;<span
class="cmti-10">label</span>&#x27E9; is the entry label and &#x27E8;<span
class="cmti-10">code</span>&#x27E9; is the assignment code.
-</p><!--l. 5712--><p class="indent" > This command just uses <span
+</p><!--l. 6219--><p class="indent" > This command just uses <span
class="cmtt-10">\glsdoifexists</span><a
id="dx1-32013"></a><span
class="cmtt-10">{</span>&#x27E8;<span
@@ -11091,14 +12510,16 @@ class="cmti-10">code</span>&#x27E9;<span
class="cmtt-10">} </span>(ignoring the
&#x27E8;<span
class="cmti-10">field</span>&#x27E9; argument), so by default it causes an error if the entry doesn&#8217;t exist.
-This can be changed to a warning with <span
-class="cmss-10">undefaction=warn</span><a
+This can be changed to a warning with <a
+href="#styopt.undefaction"><span
+class="cmss-10">undefaction</span></a><span
+class="cmss-10">=warn</span><a
id="dx1-32014"></a>. You can redefine
<span
class="cmtt-10">\glsxtrsetfieldifexists </span>to simply do &#x27E8;<span
class="cmti-10">code</span>&#x27E9; if you want to skip the existence check.
Alternatively you can instead use
-</p><!--l. 5718--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6225--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrdeffield</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32015"></a> <span
@@ -11113,14 +12534,14 @@ class="cmitt-10">replacement</span>
<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5720--><p class="noindent" >
+</p><!--l. 6227--><p class="noindent" >
This simply uses <span
class="cmss-10">etoolbox</span><a
id="dx1-32016"></a>&#8217;s <span
class="cmtt-10">\csdef </span>without any checks. This command isn&#8217;t robust.
There is also a version that uses <span
class="cmtt-10">\csedef </span>instead:
-</p><!--l. 5724--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6231--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtredeffield</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32017"></a> <span
@@ -11135,8 +12556,8 @@ class="cmitt-10">replacement</span>
<span
class="cmitt-10">text</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5726--><p class="noindent" >
-</p><!--l. 5728--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6233--><p class="noindent" >
+</p><!--l. 6235--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\gGlsXtrSetField</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32018"></a> <span
@@ -11147,10 +12568,10 @@ class="cmitt-10">field</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">value</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5730--><p class="noindent" >
+</p><!--l. 6237--><p class="noindent" >
As <span
class="cmtt-10">\GlsXtrSetField </span>but globally.
-</p><!--l. 5733--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6240--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\eGlsXtrSetField</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32019"></a> <span
@@ -11161,10 +12582,10 @@ class="cmitt-10">field</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">value</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5735--><p class="noindent" >
+</p><!--l. 6242--><p class="noindent" >
As <span
class="cmtt-10">\GlsXtrSetField </span>but uses protected expansion.
-</p><!--l. 5738--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6245--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\xGlsXtrSetField</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32020"></a> <span
@@ -11175,10 +12596,10 @@ class="cmitt-10">field</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">value</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5740--><p class="noindent" >
+</p><!--l. 6247--><p class="noindent" >
As <span
class="cmtt-10">\gGlsXtrSetField </span>but uses protected expansion.
-</p><!--l. 5743--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6250--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrLetField</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32021"></a> <span
@@ -11189,14 +12610,14 @@ class="cmitt-10">field</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">cs</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5745--><p class="noindent" >
+</p><!--l. 6252--><p class="noindent" >
Sets the field given by &#x27E8;<span
class="cmti-10">field</span>&#x27E9; to the replacement text of &#x27E8;<span
class="cmti-10">cs</span>&#x27E9; for the entry given by &#x27E8;<span
class="cmti-10">label</span>&#x27E9;
(using <span
class="cmtt-10">\let</span>).
-</p><!--l. 5749--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6256--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\csGlsXtrLetField</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32022"></a> <span
@@ -11208,10 +12629,10 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">cs name</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 5751--><p class="noindent" >
+</p><!--l. 6258--><p class="noindent" >
As <span
class="cmtt-10">\GlsXtrLetField </span>but the control sequence name is supplied instead.
-</p><!--l. 5755--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6262--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrLetFieldToField</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32023"></a> <span
@@ -11226,7 +12647,7 @@ class="cmitt-10">label-2</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">field-2</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5757--><p class="noindent" >
+</p><!--l. 6264--><p class="noindent" >
Sets the field given by &#x27E8;<span
class="cmti-10">field-1</span>&#x27E9; for the entry given by &#x27E8;<span
class="cmti-10">label-1</span>&#x27E9; to the field given by
@@ -11244,7 +12665,7 @@ class="cmti-10">code</span>&#x27E9;<span
class="cmtt-10">} </span>is still used, as for
<span
class="cmtt-10">\GlsXtrSetField</span>.
-</p><!--l. 5765--><p class="indent" > The <span
+</p><!--l. 6272--><p class="indent" > The <span
class="cmss-10">glossaries </span>package provides <span
class="cmtt-10">\glsfieldfetch</span><a
id="dx1-32024"></a> which can be used to fetch the
@@ -11254,7 +12675,7 @@ provides another way of accessing the field value:
-</p><!--l. 5769--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6276--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrusefield</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32025"></a> <span
@@ -11263,7 +12684,7 @@ class="cmitt-10">entry-label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">field-label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5771--><p class="noindent" >
+</p><!--l. 6278--><p class="noindent" >
This works in the same way as commands like <span
class="cmtt-10">\glsentrytext </span>but the field label is
specified in the first argument. Note that the &#x27E8;<span
@@ -11273,10 +12694,10 @@ class="cmss-10">glossaries</span><a
id="dx1-32026"></a>
manual. No error occurs if the entry or field haven&#8217;t been defined. This command is
not robust.
-</p><!--l. 5779--><p class="indent" > There is also a version that converts the first letter to uppercase (analogous to
+</p><!--l. 6286--><p class="indent" > There is also a version that converts the first letter to uppercase (analogous to
<span
class="cmtt-10">\Glsentrytext</span>):
-</p><!--l. 5781--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6288--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsxtrusefield</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32027"></a> <span
@@ -11285,8 +12706,8 @@ class="cmitt-10">entry-label</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">field-label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5783--><p class="noindent" >
-</p><!--l. 5785--><p class="indent" > If you want to use a field to store a list that can be used as an <span
+</p><!--l. 6290--><p class="noindent" >
+</p><!--l. 6292--><p class="indent" > If you want to use a field to store a list that can be used as an <span
class="cmss-10">etoolbox</span><a
id="dx1-32028"></a> internal
list, you can use the following command that adds an item to the field using
@@ -11294,7 +12715,7 @@ list, you can use the following command that adds an item to the field using
class="cmss-10">etoolbox</span><a
id="dx1-32029"></a>&#8217;s <span
class="cmtt-10">\listcsadd</span>:
-</p><!--l. 5789--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6296--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrfieldlistadd</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32030"></a> <span
@@ -11306,7 +12727,7 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">item</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 5791--><p class="noindent" >
+</p><!--l. 6298--><p class="noindent" >
where &#x27E8;<span
class="cmti-10">label</span>&#x27E9; is the entry&#8217;s label, &#x27E8;<span
class="cmti-10">field</span>&#x27E9; is the entry&#8217;s field and &#x27E8;<span
@@ -11316,7 +12737,7 @@ class="cmtt-10">\listgadd</span>, <span
class="cmtt-10">\listeadd </span>and
<span
class="cmtt-10">\listxadd</span>:
-</p><!--l. 5796--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6303--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrfieldlistgadd</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32031"></a> <span
@@ -11328,8 +12749,8 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">item</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 5798--><p class="noindent" >
-</p><!--l. 5799--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6305--><p class="noindent" >
+</p><!--l. 6306--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrfieldlisteadd</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32032"></a> <span
@@ -11341,8 +12762,8 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">item</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 5801--><p class="noindent" >
-</p><!--l. 5802--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6308--><p class="noindent" >
+</p><!--l. 6309--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrfieldlistxadd</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32033"></a> <span
@@ -11354,9 +12775,9 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">item</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 5804--><p class="noindent" >
+</p><!--l. 6311--><p class="noindent" >
You can then iterate over the list using:
-</p><!--l. 5806--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6313--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrfielddolistloop</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32034"></a> <span
@@ -11366,9 +12787,9 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">field</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 5808--><p class="noindent" >
+</p><!--l. 6315--><p class="noindent" >
or
-</p><!--l. 5810--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6317--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrfieldforlistloop</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32035"></a> <span
@@ -11381,13 +12802,13 @@ class="cmtt-10">}</span>
class="cmtt-10">{</span>&#x27E8;<span
class="cmitt-10">handler</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5812--><p class="noindent" >
+</p><!--l. 6319--><p class="noindent" >
that internally use <span
class="cmtt-10">\dolistcsloop </span>and <span
class="cmtt-10">\forlistloop</span>, respectively.
-</p><!--l. 5816--><p class="indent" > There are also commands that use <span
+</p><!--l. 6323--><p class="indent" > There are also commands that use <span
class="cmtt-10">\ifinlistcs</span>:
-</p><!--l. 5817--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6324--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrfieldifinlist</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32036"></a> <span
@@ -11404,13 +12825,13 @@ class="cmtt-10">}</span>
class="cmtt-10">{</span>&#x27E8;<span
class="cmitt-10">false</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5819--><p class="noindent" >
+</p><!--l. 6326--><p class="noindent" >
and <span
class="cmtt-10">\xifinlistcs</span>
-</p><!--l. 5821--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6328--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrfieldxifinlist</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32037"></a> <span
@@ -11427,35 +12848,36 @@ class="cmitt-10">true</span>&#x27E9;<span
class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">false</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5823--><p class="noindent" >
-</p><!--l. 5825--><p class="indent" > See the <span
+</p><!--l. 6330--><p class="noindent" >
+</p><!--l. 6332--><p class="indent" > See the <span
class="cmss-10">etoolbox</span><a
id="dx1-32038"></a>&#8217;s user manual for further details of these commands, in particular
the limitations of <span
class="cmtt-10">\ifinlist</span>.
-</p><!--l. 5829--><p class="indent" > When using the <span
-class="cmss-10">record</span><a
+</p><!--l. 6336--><p class="indent" > When using the <a
+href="#styopt.record"><span
+class="cmss-10">record</span></a><a
id="dx1-32039"></a> option, in addition to recording the usual location, you can
also record the current value of another counter at the same time using the
preamble-only command:
-</p><!--l. 5832--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6339--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrRecordCounter</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-32040"></a> <span
class="cmtt-10">\GlsXtrRecordCounter{</span>&#x27E8;<span
class="cmitt-10">counter name</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5834--><p class="noindent" >
+</p><!--l. 6341--><p class="noindent" >
For example:
</p>
- <div class="verbatim" id="verbatim-147">
+ <div class="verbatim" id="verbatim-148">
\usepackage[record]{glossaries-extra}
&#x00A0;<br />\GlsXtrRecordCounter{section}
</div>
-<!--l. 5839--><p class="nopar" > Each time an entry is referenced with commands like <span
+<!--l. 6346--><p class="nopar" > Each time an entry is referenced with commands like <span
class="cmtt-10">\gls </span>or <span
class="cmtt-10">\glstext</span>,
the <span
@@ -11499,44 +12921,44 @@ class="cmtt-10">\gls{bird}</span></span></span> is used in section&#x00A0;1.2 th
- <div class="verbatim" id="verbatim-148">
+ <div class="verbatim" id="verbatim-149">
\glsxtrfieldlistgadd{bird}{record.section}{1.2}
</div>
-<!--l. 5856--><p class="nopar" > Note that there&#8217;s no key corresponding to this new <span
+<!--l. 6363--><p class="nopar" > Note that there&#8217;s no key corresponding to this new <span
class="cmtt-10">record.section </span>field, but its
value can be accessed with <span
class="cmtt-10">\glsxtrfielduse </span>or the list can be iterated over with
<span
class="cmtt-10">\glsxtrfielddolistloop </span>etc.
-</p><!--l. 5862--><p class="noindent" >
+</p><!--l. 6369--><p class="noindent" >
</p>
-<!--l. 5862--><p class="noindent" ><a
+<!--l. 6369--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">10.2 </span> <a
id="sec:printunsrt"></a>Display All Entries Without Sorting or Indexing</h3>
-<!--l. 5865--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
+<!--l. 6372--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\printunsrtglossary</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-33001"></a> <span
class="cmtt-10">\printunsrtglossary[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">] </span></div><hr>
-</p><!--l. 5867--><p class="noindent" >
+</p><!--l. 6374--><p class="noindent" >
This behaves like <span
class="cmtt-10">\printnoidxglossary </span>but never sorts the entries and
always lists all the defined entries for the given glossary (and doesn&#8217;t require
<span
class="cmtt-10">\makenoidxglossaries</span>).
-</p><!--l. 5872--><p class="noindent" >There&#8217;s also a starred form
-</p><!--l. 5873--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
-class="cmtt-9">\printunsrtglossary</span><span
+</p><!--l. 6379--><p class="noindent" >There&#8217;s also a starred form
+</p><!--l. 6380--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+class="cmtt-9">\printunsrtglossary*</span><span
class="cmtt-9">&#x00A0;</span></span><a
- id="dx1-33002"></a>* <span
+ id="dx1-33002"></a> <span
class="cmtt-10">\printunsrtglossary*[</span>&#x27E8;<span
class="cmitt-10">options</span>&#x27E9;<span
class="cmtt-10">]{</span>&#x27E8;<span
class="cmitt-10">code</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5875--><p class="noindent" >
+</p><!--l. 6382--><p class="noindent" >
which is equivalent to </p><div class="alltt">
<div class="obeylines-v">
<span
@@ -11554,7 +12976,7 @@ class="cmtt-10">\endgroup</span>
class="cmtt-10">\glossarypreamble</span>, the supplied &#x27E8;<span
class="cmti-10">code</span>&#x27E9; is done before the glossary
header.
-<!--l. 5885--><p class="indent" > This means you now have the option to simply list all entries on the first
+<!--l. 6392--><p class="indent" > This means you now have the option to simply list all entries on the first
<span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
class="E">E</span>X</span></span>&#x00A0;run without the need for a post-processor, however there will be no <a
id="dx1-33003"></a><a
@@ -11568,7 +12990,12 @@ href="#sec:bib2gls"><span
class="cmsy-10">&sect;</span>9
</a><a
href="#sec:bib2gls">bib2gls: Managing Reference Databases<!--tex4ht:ref: sec:bib2gls --></a>).
-</p><!--l. 5891--><p class="indent" > If you have any entries with the <span
+</p><!--l. 6398--><p class="indent" > <div class="important" title="Important Note"> No attempt is made to gather hierarchical elements. If child entries aren&#8217;t defined
+immediately after their parent entry, they won&#8217;t be together in the glossary when
+using <span
+class="cmtt-10">\printunsrtglossary</span>. </div>
+</p><!--l. 6403--><p class="noindent" >
+</p><!--l. 6405--><p class="indent" > If you have any entries with the <span
class="cmss-10">see</span><a
id="dx1-33006"></a> key set, you will need the <span
class="cmss-10">glossaries</span><a
@@ -11579,16 +13006,18 @@ class="cmss-10">seenoindex=ignore</span><a
class="cmss-10">seenoindex=warn</span><a
id="dx1-33009"></a> to prevent an error occurring from the
automated <span
-class="cmtt-10">\glssee </span>normally triggered by this key. The <span
-class="cmss-10">record=only</span><a
+class="cmtt-10">\glssee </span>normally triggered by this key. The <a
+href="#styopt.record"><span
+class="cmss-10">record</span></a><span
+class="cmss-10">=only</span><a
id="dx1-33010"></a> package option
will automatically deal with this.
-</p><!--l. 5898--><p class="indent" > For example:
+</p><!--l. 6412--><p class="indent" > For example:
</p>
- <div class="verbatim" id="verbatim-149">
+ <div class="verbatim" id="verbatim-150">
\documentclass{article}
&#x00A0;<br />\usepackage{glossaries-extra}
&#x00A0;<br />\newglossaryentry{zebra}{name={zebra},description={stripy&#x00A0;animal}}
@@ -11598,33 +13027,34 @@ will automatically deal with this.
&#x00A0;<br />\printunsrtglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 5912--><p class="nopar" > In the above, zebra will be listed before ant as it was defined first.
-</p><!--l. 5916--><p class="indent" > If you allow document definitions with the <span
-class="cmss-10">docdefs</span><a
+<!--l. 6426--><p class="nopar" > In the above, zebra will be listed before ant as it was defined first.
+</p><!--l. 6430--><p class="indent" > If you allow document definitions with the <a
+href="#styopt.docdefs"><span
+class="cmss-10">docdefs</span></a><a
id="dx1-33011"></a> option, the document will
require a second <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span
class="E">E</span>X</span></span>&#x00A0;run if the entries are defined after <span
class="cmtt-10">\printunsrtglossary</span>.
-</p><!--l. 5920--><p class="indent" > The optional argument is as for <span
+</p><!--l. 6434--><p class="indent" > The optional argument is as for <span
class="cmtt-10">\printnoidxglossary </span>(except for the <span
class="cmss-10">sort</span><a
id="dx1-33012"></a> key,
which isn&#8217;t available).
-</p><!--l. 5923--><p class="indent" > All glossaries may be displayed in the order of their definition using:
-</p><!--l. 5925--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6437--><p class="indent" > All glossaries may be displayed in the order of their definition using:
+</p><!--l. 6439--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\printunsrtglossaries</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-33013"></a> <span
class="cmtt-10">\printunsrtglossaries </span></div><hr>
-</p><!--l. 5927--><p class="noindent" >
+</p><!--l. 6441--><p class="noindent" >
which is analogous to <span
class="cmtt-10">\printnoidxglossaries</span>. This just iterates over all defined
glossaries (that aren&#8217;t on the ignored list) and does <span
class="cmtt-10">\printunsrtglossary</span>[type=&#x27E8;<span
class="cmti-10">type</span>&#x27E9;].
-</p><!--l. 5932--><p class="indent" > The <span
+</p><!--l. 6446--><p class="indent" > The <span
class="cmtt-10">\printunsrtglossary </span>command internally uses
-</p><!--l. 5933--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6447--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\printunsrtglossaryhandler</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-33014"></a> <span
@@ -11632,18 +13062,18 @@ class="cmtt-10">\printunsrtglossaryhandler{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 5935--><p class="noindent" >
+</p><!--l. 6449--><p class="noindent" >
for each item in the list, where &#x27E8;<span
class="cmti-10">label</span>&#x27E9; is the current label.
-</p><!--l. 5938--><p class="indent" > By default this just does
-</p><!--l. 5939--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6452--><p class="indent" > By default this just does
+</p><!--l. 6453--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrunsrtdo</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-33015"></a> <span
class="cmtt-10">\glsxtrunsrtdo{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 5941--><p class="noindent" >
+</p><!--l. 6455--><p class="noindent" >
which determines whether to use <span
class="cmtt-10">\glossentry </span>or <span
class="cmtt-10">\subglossentry </span>and checks the
@@ -11654,42 +13084,42 @@ class="cmss-10">loclist</span><a
id="dx1-33017"></a> fields for the <a
id="dx1-33018"></a><a
href="#glo:numberlist">number list</a>.
-</p><!--l. 5946--><p class="indent" > You can redefine the handler if required.
-</p><!--l. 5948--><p class="indent" > <div class="important" title="Important Note"> If you redefine the handler to exclude entries, you may end up with an empty
+</p><!--l. 6460--><p class="indent" > You can redefine the handler if required.
+</p><!--l. 6462--><p class="indent" > <div class="important" title="Important Note"> If you redefine the handler to exclude entries, you may end up with an empty
glossary. This could cause a problem for the list-based styles. </div>
-</p><!--l. 5952--><p class="noindent" >
-</p><!--l. 5954--><p class="indent" > For example, if the preamble includes:
+</p><!--l. 6466--><p class="noindent" >
+</p><!--l. 6468--><p class="indent" > For example, if the preamble includes:
</p>
- <div class="verbatim" id="verbatim-150">
+ <div class="verbatim" id="verbatim-151">
\usepackage[record,style=index]{glossaries-extra}
&#x00A0;<br />\GlsXtrRecordCounter{section}
</div>
-<!--l. 5958--><p class="nopar" > then you can print the glossary but first redefine the handler to only select entries
+<!--l. 6472--><p class="nopar" > then you can print the glossary but first redefine the handler to only select entries
that include the current section number in the <span
class="cmtt-10">record.section </span>field:
</p>
- <div class="verbatim" id="verbatim-151">
+ <div class="verbatim" id="verbatim-152">
\renewcommand{\printunsrtglossaryhandler}[1]{%
&#x00A0;<br />&#x00A0;&#x00A0;\glsxtrfieldxifinlist{#1}{record.section}{\thesection}
&#x00A0;<br />&#x00A0;&#x00A0;{\glsxtrunsrtdo{#1}}%
&#x00A0;<br />&#x00A0;&#x00A0;{}%
&#x00A0;<br />}
</div>
-<!--l. 5968--><p class="nopar" >
-</p><!--l. 5970--><p class="indent" > Alternatively you can use the starred form of <span
+<!--l. 6482--><p class="nopar" >
+</p><!--l. 6484--><p class="indent" > Alternatively you can use the starred form of <span
class="cmtt-10">\printunsrtglossary </span>which will
localise the change:
</p>
- <div class="verbatim" id="verbatim-152">
+ <div class="verbatim" id="verbatim-153">
\printunsrtglossary*{%
&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand{\printunsrtglossaryhandler}[1]{%
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsxtrfieldxifinlist{#1}{record.section}{\thesection}
@@ -11698,8 +13128,8 @@ localise the change:
&#x00A0;<br />&#x00A0;&#x00A0;}%
&#x00A0;<br />}
</div>
-<!--l. 5981--><p class="nopar" >
-</p><!--l. 5983--><p class="indent" > If you are using the <span
+<!--l. 6495--><p class="nopar" >
+</p><!--l. 6497--><p class="indent" > If you are using the <span
class="cmss-10">hyperref</span><a
id="dx1-33019"></a> package and want to display the same glossary more
than once, you can also add a temporary redefinition of <span
@@ -11709,7 +13139,7 @@ duplicate hypertarget names. For example:
</p>
- <div class="verbatim" id="verbatim-153">
+ <div class="verbatim" id="verbatim-154">
\printunsrtglossary*{%
&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand{\printunsrtglossaryhandler}[1]{%
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsxtrfieldxifinlist{#1}{record.section}{\thesection}
@@ -11725,13 +13155,13 @@ duplicate hypertarget names. For example:
&#x00A0;<br />&#x00A0;&#x00A0;}%
&#x00A0;<br />}
</div>
-<!--l. 6003--><p class="nopar" > If it&#8217;s a short summary at the start of a section, you might also want to suppress the
+<!--l. 6517--><p class="nopar" > If it&#8217;s a short summary at the start of a section, you might also want to suppress the
glossary header and add some vertical space afterwards:
</p>
- <div class="verbatim" id="verbatim-154">
+ <div class="verbatim" id="verbatim-155">
\printunsrtglossary*{%
&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand{\printunsrtglossaryhandler}[1]{%
&#x00A0;<br />&#x00A0;&#x00A0;&#x00A0;&#x00A0;\glsxtrfieldxifinlist{#1}{record.section}{\thesection}
@@ -11749,9 +13179,9 @@ glossary header and add some vertical space afterwards:
&#x00A0;<br />&#x00A0;&#x00A0;\appto\glossarypostamble{\glspar\medskip\glspar}%
&#x00A0;<br />}
</div>
-<!--l. 6024--><p class="nopar" >
-</p><!--l. 6026--><p class="indent" > There&#8217;s a shortcut command that does this:
-</p><!--l. 6027--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 6538--><p class="nopar" >
+</p><!--l. 6540--><p class="indent" > There&#8217;s a shortcut command that does this:
+</p><!--l. 6541--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\printunsrtglossaryunit</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-33020"></a> <span
@@ -11762,20 +13192,20 @@ class="cmitt-10">counter</span>
<span
class="cmitt-10">name</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6029--><p class="noindent" >
+</p><!--l. 6543--><p class="noindent" >
The above example can simply be replaced with:
</p>
- <div class="verbatim" id="verbatim-155">
+ <div class="verbatim" id="verbatim-156">
\printunsrtglossaryunit{section}
</div>
-<!--l. 6033--><p class="nopar" >
-</p><!--l. 6035--><p class="indent" > This shortcut command is actually defined to use <span
+<!--l. 6547--><p class="nopar" >
+</p><!--l. 6549--><p class="indent" > This shortcut command is actually defined to use <span
class="cmtt-10">\printunsrtglossary*</span>
with
-</p><!--l. 6036--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6550--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\printunsrtglossaryunitsetup</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-33021"></a> <span
@@ -11784,26 +13214,29 @@ class="cmitt-10">counter</span>
<span
class="cmitt-10">name</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6038--><p class="noindent" >
+</p><!--l. 6552--><p class="noindent" >
so if you want to just make some minor modifications you can do
</p>
- <div class="verbatim" id="verbatim-156">
+ <div class="verbatim" id="verbatim-157">
\printunsrtglossary*{\printunsrtglossaryunitsetup{section}%
&#x00A0;<br />&#x00A0;&#x00A0;\renewcommand*{\glossarysection}[2][]{\subsection*{Summary}}%
&#x00A0;<br />}
</div>
-<!--l. 6045--><p class="nopar" > which will start the list with a subsection header with the title &#8220;Summary&#8221;
+<!--l. 6559--><p class="nopar" > which will start the list with a subsection header with the title &#8220;Summary&#8221;
(overriding the glossary&#8217;s title).
-</p><!--l. 6049--><p class="indent" > Note that this shortcut command is only available with the <span
-class="cmss-10">record</span><a
+</p><!--l. 6563--><p class="indent" > Note that this shortcut command is only available with the <a
+href="#styopt.record"><span
+class="cmss-10">record</span></a><a
id="dx1-33022"></a> (or
-<span
-class="cmss-10">record=alsoindex</span><a
+<a
+href="#styopt.record"><span
+class="cmss-10">record</span></a><span
+class="cmss-10">=alsoindex</span><a
id="dx1-33023"></a>) package option.
-</p><!--l. 6052--><p class="indent" > This temporary change in the hypertarget prefix means you need to explicitly use
+</p><!--l. 6566--><p class="indent" > This temporary change in the hypertarget prefix means you need to explicitly use
<span
class="cmtt-10">\hyperlink </span>to create a link to it as commands like <span
class="cmtt-10">\gls </span>will try to link to the target
@@ -11815,12 +13248,12 @@ the front or back matter) which can be the target for all glossary references an
just use <span
class="cmtt-10">\printunsrtglossaryunit </span>for a quick summary at the start of a section
etc.
-</p><!--l. 6062--><p class="noindent" >
+</p><!--l. 6576--><p class="noindent" >
</p>
-<!--l. 6062--><p class="noindent" ><a
+<!--l. 6576--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">10.3 </span> <a
id="sec:alias"></a>Entry Aliases</h3>
-<!--l. 6065--><p class="noindent" >An entry can be made an alias of another entry using the <span
+<!--l. 6579--><p class="noindent" >An entry can be made an alias of another entry using the <span
class="cmss-10">alias</span><a
id="dx1-34001"></a> key. The
value should be the label of the other term. There&#8217;s no check for the other&#8217;s
@@ -11831,7 +13264,7 @@ defining the other entry after the aliased entry. (For example, when used with
href="#glo:bib2gls"><span
class="cmtt-10">bib2gls</span><a
id="dx1-34003"></a></a>.)
-</p><!--l. 6072--><p class="indent" > If an entry &#x27E8;<span
+</p><!--l. 6586--><p class="indent" > If an entry &#x27E8;<span
class="cmti-10">entry-1</span>&#x27E9; is made an alias of &#x27E8;<span
class="cmti-10">entry-2</span>&#x27E9; then: </p>
<ul class="itemize1">
@@ -11859,8 +13292,9 @@ class="cmtt-10">\gls{</span>&#x27E8;<span
class="cmti-10">entry-1</span>&#x27E9;<span
class="cmtt-10">} </span>will link to
&#x27E8;<span
-class="cmti-10">entry-2</span>&#x27E9;&#8217;s target. (Unless the <span
-class="cmss-10">targeturl</span><a
+class="cmti-10">entry-2</span>&#x27E9;&#8217;s target. (Unless the <a
+href="#catattr.targeturl"><span
+class="cmss-10">targeturl</span></a><a
id="dx1-34007"></a> attribute has been set for &#x27E8;<span
class="cmti-10">entry-1</span>&#x27E9;&#8217;s
category.)
@@ -11868,10 +13302,14 @@ class="cmti-10">entry-1</span>&#x27E9;&#8217;s
</li>
- <li class="itemize">With <span
-class="cmss-10">record=off</span><a
- id="dx1-34008"></a> or <span
-class="cmss-10">record=alsoindex</span><a
+ <li class="itemize">With <a
+href="#styopt.record"><span
+class="cmss-10">record</span></a><span
+class="cmss-10">=off</span><a
+ id="dx1-34008"></a> or <a
+href="#styopt.record"><span
+class="cmss-10">record</span></a><span
+class="cmss-10">=alsoindex</span><a
id="dx1-34009"></a>, the <span
class="cmss-10">noindex</span><a
id="dx1-34010"></a> setting will automatically
@@ -11889,8 +13327,10 @@ class="cmtt-10">\glssee</span>) unless it&#8217;s been explicitly
class="cmtt-10">\glsadd </span>or if the indexing has been explicitly set using
<span
class="cmtt-10">noindex=false</span>.
- <!--l. 6091--><p class="noindent" >Note that with <span
-class="cmss-10">record=only</span><a
+ <!--l. 6605--><p class="noindent" >Note that with <a
+href="#styopt.record"><span
+class="cmss-10">record</span></a><span
+class="cmss-10">=only</span><a
id="dx1-34012"></a>, the <a
id="dx1-34013"></a><a
href="#glo:locationlist">location list</a> for aliased entries is controlled
@@ -11899,64 +13339,66 @@ href="#glo:locationlist">location list</a> for aliased entries is controlled
href="#glo:bib2gls"><span
class="cmtt-10">bib2gls</span><a
id="dx1-34015"></a>&#8217;s</a> settings.</p></li></ul>
-<!--l. 6095--><p class="indent" > The index suppression trigger is performed by
-</p><!--l. 6096--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 6609--><p class="indent" > The index suppression trigger is performed by
+</p><!--l. 6610--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrsetaliasnoindex</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-34016"></a> <span
class="cmtt-10">\glsxtrsetaliasnoindex </span></div><hr>
-</p><!--l. 6098--><p class="noindent" >
+</p><!--l. 6612--><p class="noindent" >
This is performed after the default options provided by <span
class="cmtt-10">\GlsXtrSetDefaultGlsOpts</span><a
id="dx1-34017"></a>
-have been set. With <span
-class="cmss-10">record=only</span><a
+have been set. With <a
+href="#styopt.record"><span
+class="cmss-10">record</span></a><span
+class="cmss-10">=only</span><a
id="dx1-34018"></a>, <span
class="cmtt-10">\glsxtrsetaliasnoindex </span>will default to do
nothing.
-</p><!--l. 6104--><p class="indent" > Within the definition of <span
+</p><!--l. 6618--><p class="indent" > Within the definition of <span
class="cmtt-10">\glsxtrsetaliasnoindex </span>you can use
-</p><!--l. 6105--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6619--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtrindexaliased</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-34019"></a> <span
class="cmtt-10">\glsxtrindexaliased </span></div><hr>
-</p><!--l. 6107--><p class="noindent" >
+</p><!--l. 6621--><p class="noindent" >
to index &#x27E8;<span
class="cmti-10">entry-2</span>&#x27E9;.
-</p><!--l. 6110--><p class="indent" > The index suppression command can be redefined to index the main term instead.
+</p><!--l. 6624--><p class="indent" > The index suppression command can be redefined to index the main term instead.
For example:
</p>
- <div class="verbatim" id="verbatim-157">
+ <div class="verbatim" id="verbatim-158">
\renewcommand{\glsxtrsetaliasnoindex}{%
&#x00A0;<br />&#x00A0;\glsxtrindexaliased
&#x00A0;<br />&#x00A0;\setkeys{glslink}{noindex}%
&#x00A0;<br />}
</div>
-<!--l. 6117--><p class="nopar" >
-</p><!--l. 6119--><p class="indent" > The value of the <span
+<!--l. 6631--><p class="nopar" >
+</p><!--l. 6633--><p class="indent" > The value of the <span
class="cmss-10">alias</span><a
id="dx1-34020"></a> field can be accessed using
-</p><!--l. 6120--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6634--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsxtralias</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-34021"></a> <span
class="cmtt-10">\glsxtralias{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6122--><p class="noindent" >
+</p><!--l. 6636--><p class="noindent" >
</p>
-<!--l. 6124--><p class="indent" > </div>
-</p><!--l. 6124--><p class="noindent" ><a
+<!--l. 6638--><p class="indent" > </div>
+</p><!--l. 6638--><p class="noindent" ><a
href="#top">Top</a><div class="chapter"><h2 class="chapterHead">11. <a
id="sec:supplemental"></a>Supplemental Packages</h2>
-</p><!--l. 6127--><p class="indent" > The <span
+</p><!--l. 6641--><p class="indent" > The <span
class="cmss-10">glossaries </span>bundle provides additional support packages <span
class="cmss-10">glossaries-prefix</span><a
id="dx1-35001"></a> (for
@@ -11965,10 +13407,10 @@ class="cmss-10">glossaries-accsupp</span><a
id="dx1-35002"></a> (for accessibility support). These packages aren&#8217;t
automatically loaded.
</p>
-<!--l. 6132--><p class="noindent" ><a
+<!--l. 6646--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">11.1 </span> <a
id="sec:prefix"></a>Prefixes or Determiners</h3>
-<!--l. 6135--><p class="noindent" >If prefixing is required, you can simply load <span
+<!--l. 6649--><p class="noindent" >If prefixing is required, you can simply load <span
class="cmss-10">glossaries-prefix</span><a
id="dx1-36001"></a> after <span
class="cmss-10">glossaries-extra</span>. For
@@ -11977,7 +13419,7 @@ example:
</p>
- <div class="verbatim" id="verbatim-158">
+ <div class="verbatim" id="verbatim-159">
\documentclass{article}
&#x00A0;<br />\usepackage{glossaries-extra}
&#x00A0;<br />\usepackage{glossaries-prefix}
@@ -11992,27 +13434,28 @@ example:
&#x00A0;<br />\printglossaries
&#x00A0;<br />\end{document}
</div>
-<!--l. 6158--><p class="nopar" >
-</p><!--l. 6160--><p class="noindent" >
+<!--l. 6672--><p class="nopar" >
+</p><!--l. 6674--><p class="noindent" >
</p>
-<!--l. 6160--><p class="noindent" ><a
+<!--l. 6674--><p class="noindent" ><a
href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">11.2 </span> <a
id="sec:accsupp"></a>Accessibility Support</h3>
-<!--l. 6163--><p class="noindent" >The <span
+<!--l. 6677--><p class="noindent" >The <span
class="cmss-10">glossaries-accsupp</span><a
id="dx1-37001"></a> needs to be loaded before <span
class="cmss-10">glossaries-extra </span>or through the
-<span
-class="cmss-10">accsupp</span><a
+<a
+href="#styopt.accsupp"><span
+class="cmss-10">accsupp</span></a><a
id="dx1-37002"></a> package option:
</p>
- <div class="verbatim" id="verbatim-159">
+ <div class="verbatim" id="verbatim-160">
\usepackage[accsupp]{glossaries-extra}
</div>
-<!--l. 6168--><p class="nopar" > If you don&#8217;t load <span
+<!--l. 6682--><p class="nopar" > If you don&#8217;t load <span
class="cmss-10">glossaries-accsupp</span><a
id="dx1-37003"></a> or you load <span
class="cmss-10">glossaries-accsupp</span><a
@@ -12024,7 +13467,7 @@ class="cmti-10">xxx</span>&#x27E9; commands described below will simply be equiv
corresponding <span
class="cmtt-10">\glsentry</span>&#x27E8;<span
class="cmti-10">xxx</span>&#x27E9; commands.
-</p><!--l. 6175--><p class="indent" > The following <span
+</p><!--l. 6689--><p class="indent" > The following <span
class="cmtt-10">\glsaccess</span>&#x27E8;<span
class="cmti-10">xxx</span>&#x27E9; commands add accessibility information wrapped
around the corresponding <span
@@ -12032,34 +13475,34 @@ class="cmtt-10">\glsentry</span>&#x27E8;<span
class="cmti-10">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. 6180--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6694--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsaccessname</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37005"></a> <span
class="cmtt-10">\glsaccessname{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6182--><p class="noindent" >
+</p><!--l. 6696--><p class="noindent" >
This displays the value of the <span
class="cmss-10">name</span><a
id="dx1-37006"></a> field for the entry identified by &#x27E8;<span
class="cmti-10">label</span>&#x27E9;.
-</p><!--l. 6186--><p class="indent" > If the <span
+</p><!--l. 6700--><p class="indent" > If the <span
class="cmss-10">glossaries-accsupp</span><a
id="dx1-37007"></a> package isn&#8217;t loaded, this is simply defined as:
</p>
- <div class="verbatim" id="verbatim-160">
+ <div class="verbatim" id="verbatim-161">
\newcommand*{\glsaccessname}[1]{\glsentryname{#1}}
</div>
-<!--l. 6190--><p class="nopar" > otherwise it&#8217;s defined as:
+<!--l. 6704--><p class="nopar" > otherwise it&#8217;s defined as:
</p>
- <div class="verbatim" id="verbatim-161">
+ <div class="verbatim" id="verbatim-162">
\newcommand*{\glsaccessname}[1]{%
&#x00A0;<br />&#x00A0;&#x00A0;\glsnameaccessdisplay
&#x00A0;<br />&#x00A0;&#x00A0;{%
@@ -12068,20 +13511,20 @@ class="cmss-10">glossaries-accsupp</span><a
&#x00A0;<br />&#x00A0;&#x00A0;{#1}%
&#x00A0;<br />}
</div>
-<!--l. 6200--><p class="nopar" > (<span
+<!--l. 6714--><p class="nopar" > (<span
class="cmtt-10">\glsnameaccessdisplay</span><a
id="dx1-37008"></a> is defined by the <span
class="cmss-10">glossaries-accsupp</span><a
id="dx1-37009"></a> package.) The first
letter upper case version is:
-</p><!--l. 6204--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6718--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsaccessname</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37010"></a> <span
class="cmtt-10">\Glsaccessname{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6206--><p class="noindent" >
+</p><!--l. 6720--><p class="noindent" >
Without the <span
class="cmss-10">glossaries-accsupp</span><a
id="dx1-37011"></a> package this is just defined as:
@@ -12089,17 +13532,17 @@ class="cmss-10">glossaries-accsupp</span><a
</p>
- <div class="verbatim" id="verbatim-162">
+ <div class="verbatim" id="verbatim-163">
\newcommand*{\Glsaccessname}[1]{\Glsentryname{#1}}
</div>
-<!--l. 6211--><p class="nopar" > With the <span
+<!--l. 6725--><p class="nopar" > With the <span
class="cmss-10">glossaries-accsupp</span><a
id="dx1-37012"></a> package this is defined as:
</p>
- <div class="verbatim" id="verbatim-163">
+ <div class="verbatim" id="verbatim-164">
\newcommand*{\Glsaccessname}[1]{%
&#x00A0;<br />&#x00A0;&#x00A0;\glsnameaccessdisplay
&#x00A0;<br />&#x00A0;&#x00A0;{%
@@ -12108,112 +13551,112 @@ class="cmss-10">glossaries-accsupp</span><a
&#x00A0;<br />&#x00A0;&#x00A0;{#1}%
&#x00A0;<br />}
</div>
-<!--l. 6221--><p class="nopar" >
-</p><!--l. 6223--><p class="indent" > The following commands are all defined in an analogous manner.
-</p><!--l. 6224--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 6735--><p class="nopar" >
+</p><!--l. 6737--><p class="indent" > The following commands are all defined in an analogous manner.
+</p><!--l. 6738--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsaccesstext</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37013"></a> <span
class="cmtt-10">\glsaccesstext{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6226--><p class="noindent" >
+</p><!--l. 6740--><p class="noindent" >
This displays the value of the <span
class="cmss-10">text</span><a
id="dx1-37014"></a> field.
-</p><!--l. 6229--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6743--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsaccesstext</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37015"></a> <span
class="cmtt-10">\Glsaccesstext{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6231--><p class="noindent" >
+</p><!--l. 6745--><p class="noindent" >
This displays the value of the <span
class="cmss-10">text</span><a
id="dx1-37016"></a> field with the first letter converted to upper
case.
-</p><!--l. 6235--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6749--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsaccessplural</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37017"></a> <span
class="cmtt-10">\glsaccessplural{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6237--><p class="noindent" >
+</p><!--l. 6751--><p class="noindent" >
This displays the value of the <span
class="cmss-10">plural</span><a
id="dx1-37018"></a> field.
-</p><!--l. 6240--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6754--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsaccessplural</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37019"></a> <span
class="cmtt-10">\Glsaccessplural{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6242--><p class="noindent" >
+</p><!--l. 6756--><p class="noindent" >
This displays the value of the <span
class="cmss-10">plural</span><a
id="dx1-37020"></a> field with the first letter converted to upper
case.
-</p><!--l. 6246--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6760--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsaccessfirst</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37021"></a> <span
class="cmtt-10">\glsaccessfirst{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6248--><p class="noindent" >
+</p><!--l. 6762--><p class="noindent" >
This displays the value of the <span
class="cmss-10">first</span><a
id="dx1-37022"></a> field.
-</p><!--l. 6251--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6765--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsaccessfirst</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37023"></a> <span
class="cmtt-10">\Glsaccessfirst{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6253--><p class="noindent" >
+</p><!--l. 6767--><p class="noindent" >
This displays the value of the <span
class="cmss-10">first</span><a
id="dx1-37024"></a> field with the first letter converted to upper
case.
-</p><!--l. 6257--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6771--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsaccessfirstplural</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37025"></a> <span
class="cmtt-10">\glsaccessfirstplural{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6259--><p class="noindent" >
+</p><!--l. 6773--><p class="noindent" >
This displays the value of the <span
class="cmss-10">firstplural</span><a
id="dx1-37026"></a> field.
-</p><!--l. 6262--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6776--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsaccessfirstplural</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37027"></a> <span
class="cmtt-10">\Glsaccessfirstplural{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6264--><p class="noindent" >
+</p><!--l. 6778--><p class="noindent" >
This displays the value of the <span
class="cmss-10">firstplural</span><a
id="dx1-37028"></a> field with the first letter converted to upper
case.
-</p><!--l. 6268--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6782--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsaccesssymbol</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37029"></a> <span
class="cmtt-10">\glsaccesssymbol{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6270--><p class="noindent" >
+</p><!--l. 6784--><p class="noindent" >
This displays the value of the <span
class="cmss-10">symbol</span><a
id="dx1-37030"></a> field.
-</p><!--l. 6273--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6787--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsaccesssymbol</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37031"></a> <span
@@ -12223,150 +13666,150 @@ class="cmtt-10">} </span></div><hr>
-</p><!--l. 6275--><p class="noindent" >
+</p><!--l. 6789--><p class="noindent" >
This displays the value of the <span
class="cmss-10">symbol</span><a
id="dx1-37032"></a> field with the first letter converted to upper
case.
-</p><!--l. 6279--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6793--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsaccesssymbolplural</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37033"></a> <span
class="cmtt-10">\glsaccesssymbolplural{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6281--><p class="noindent" >
+</p><!--l. 6795--><p class="noindent" >
This displays the value of the <span
class="cmss-10">symbolplural</span><a
id="dx1-37034"></a> field.
-</p><!--l. 6284--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6798--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsaccesssymbolplural</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37035"></a> <span
class="cmtt-10">\Glsaccesssymbolplural{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6286--><p class="noindent" >
+</p><!--l. 6800--><p class="noindent" >
This displays the value of the <span
class="cmss-10">symbolplural</span><a
id="dx1-37036"></a> field with the first letter converted to
upper case.
-</p><!--l. 6290--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6804--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsaccessdesc</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37037"></a> <span
class="cmtt-10">\glsaccessdesc{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6292--><p class="noindent" >
+</p><!--l. 6806--><p class="noindent" >
This displays the value of the <span
class="cmss-10">desc</span><a
id="dx1-37038"></a> field.
-</p><!--l. 6295--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6809--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsaccessdesc</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37039"></a> <span
class="cmtt-10">\Glsaccessdesc{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6297--><p class="noindent" >
+</p><!--l. 6811--><p class="noindent" >
This displays the value of the <span
class="cmss-10">desc</span><a
id="dx1-37040"></a> field with the first letter converted to upper
case.
-</p><!--l. 6301--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6815--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsaccessdescplural</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37041"></a> <span
class="cmtt-10">\glsaccessdescplural{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6303--><p class="noindent" >
+</p><!--l. 6817--><p class="noindent" >
This displays the value of the <span
class="cmss-10">descplural</span><a
id="dx1-37042"></a> field.
-</p><!--l. 6306--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6820--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsaccessdescplural</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37043"></a> <span
class="cmtt-10">\Glsaccessdescplural{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6308--><p class="noindent" >
+</p><!--l. 6822--><p class="noindent" >
This displays the value of the <span
class="cmss-10">descplural</span><a
id="dx1-37044"></a> field with the first letter converted to upper
case.
-</p><!--l. 6312--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6826--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsaccessshort</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37045"></a> <span
class="cmtt-10">\glsaccessshort{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6314--><p class="noindent" >
+</p><!--l. 6828--><p class="noindent" >
This displays the value of the <span
class="cmss-10">short</span><a
id="dx1-37046"></a> field.
-</p><!--l. 6317--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6831--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsaccessshort</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37047"></a> <span
class="cmtt-10">\Glsaccessshort{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6319--><p class="noindent" >
+</p><!--l. 6833--><p class="noindent" >
This displays the value of the <span
class="cmss-10">short</span><a
id="dx1-37048"></a> field with the first letter converted to upper
case.
-</p><!--l. 6323--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6837--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsaccessshortpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37049"></a> <span
class="cmtt-10">\glsaccessshortpl{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6325--><p class="noindent" >
+</p><!--l. 6839--><p class="noindent" >
This displays the value of the <span
class="cmss-10">shortplural</span><a
id="dx1-37050"></a> field.
-</p><!--l. 6328--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6842--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsaccessshortpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37051"></a> <span
class="cmtt-10">\Glsaccessshortpl{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6330--><p class="noindent" >
+</p><!--l. 6844--><p class="noindent" >
This displays the value of the <span
class="cmss-10">shortplural</span><a
id="dx1-37052"></a> field with the first letter converted to upper
case.
-</p><!--l. 6334--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6848--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsaccesslong</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37053"></a> <span
class="cmtt-10">\glsaccesslong{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6336--><p class="noindent" >
+</p><!--l. 6850--><p class="noindent" >
This displays the value of the <span
class="cmss-10">long</span><a
id="dx1-37054"></a> field.
-</p><!--l. 6339--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6853--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsaccesslong</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37055"></a> <span
class="cmtt-10">\Glsaccesslong{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6341--><p class="noindent" >
+</p><!--l. 6855--><p class="noindent" >
This displays the value of the <span
class="cmss-10">long</span><a
id="dx1-37056"></a> field with the first letter converted to upper
case.
-</p><!--l. 6345--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6859--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\glsaccesslongpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37057"></a> <span
@@ -12376,18 +13819,18 @@ class="cmtt-10">} </span></div><hr>
-</p><!--l. 6347--><p class="noindent" >
+</p><!--l. 6861--><p class="noindent" >
This displays the value of the <span
class="cmss-10">longplural</span><a
id="dx1-37058"></a> field.
-</p><!--l. 6350--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 6864--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\Glsaccesslongpl</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-37059"></a> <span
class="cmtt-10">\Glsaccesslongpl{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6352--><p class="noindent" >
+</p><!--l. 6866--><p class="noindent" >
This displays the value of the <span
class="cmss-10">longplural</span><a
id="dx1-37060"></a> field with the first letter converted to upper
@@ -12396,11 +13839,11 @@ case.
</p>
-<!--l. 6356--><p class="indent" > </div>
-</p><!--l. 6356--><p class="noindent" ><a
+<!--l. 6870--><p class="indent" > </div>
+</p><!--l. 6870--><p class="noindent" ><a
href="#top">Top</a><div class="chapter"><h2 class="chapterHead">12. <a
id="sec:samples"></a>Sample Files</h2>
-</p><!--l. 6359--><p class="indent" > The following sample files are provided with this package:
+</p><!--l. 6873--><p class="indent" > The following sample files are provided with this package:
</p><dl class="description"><dt class="description">
<span
class="cmbx-10">sample.tex</span> </dt><dd
@@ -12409,6 +13852,10 @@ class="description">Simple sample file that uses one of the dummy files provided
class="cmss-10">glossaries </span>package for testing.
</dd><dt class="description">
<span
+class="cmbx-10">sample-abbr-styles.tex</span> </dt><dd
+class="description">Demonstrates all predefined abbreviation styles.
+ </dd><dt class="description">
+<span
class="cmbx-10">sample-mixture.tex</span> </dt><dd
class="description">General entries, acronyms and initialisms all treated
differently.
@@ -12459,13 +13906,13 @@ class="description">Warn on undefined entries instead of generating an error.
class="cmbx-10">sample-mixed-abbrv-styles.tex</span> </dt><dd
class="description">Different abbreviation styles for different
entries.
+
+
+
</dd><dt class="description">
<span
class="cmbx-10">sample-initialisms.tex</span> </dt><dd
class="description">Automatically insert dots into initialisms.
-
-
-
</dd><dt class="description">
<span
class="cmbx-10">sample-postdot.tex</span> </dt><dd
@@ -12485,10 +13932,12 @@ class="description">Using entries in section/chapter headings.
</dd><dt class="description">
<span
class="cmbx-10">sample-autoindex.tex</span> </dt><dd
-class="description">Using the <span
-class="cmss-10">dualindex</span><a
- id="dx1-38003"></a> and <span
-class="cmss-10">indexname</span><a
+class="description">Using the <a
+href="#catattr.dualindex"><span
+class="cmss-10">dualindex</span></a><a
+ id="dx1-38003"></a> and <a
+href="#catattr.indexname"><span
+class="cmss-10">indexname</span></a><a
id="dx1-38004"></a> attributes to
automatically add glossary entries to the index (in addition to the glossary
<a
@@ -12544,19 +13993,20 @@ class="cmtt-10">\printnoidxglossary</span>.
</dd><dt class="description">
<span
class="cmbx-10">sample-external.tex</span> </dt><dd
-class="description">Uses the <span
-class="cmss-10">targeturl</span><a
+class="description">Uses the <a
+href="#catattr.targeturl"><span
+class="cmss-10">targeturl</span></a><a
id="dx1-38009"></a> attribute to allow for entries that
should link to an external URL rather than to an internal glossary.
+
+
+
</dd><dt class="description">
<span
class="cmbx-10">sample-fmt.tex</span> </dt><dd
class="description">Provides text-block commands associated with entries in
order to use <span
class="cmtt-10">\glsxtrfmt</span>.
-
-
-
</dd><dt class="description">
<span
class="cmbx-10">sample-alias.tex</span> </dt><dd
@@ -12655,15 +14105,18 @@ class="cmss-10">hyperref</span><a
id="dx1-38024"></a> package to reference a location in the supplementary file
<span
class="cmtt-10">sample-suppl-hyp.tex</span>.
+
+
+
</dd></dl>
-<!--l. 6482--><p class="indent" > </div>
-</p><!--l. 6482--><p class="noindent" ><a
+<!--l. 6999--><p class="indent" > </div>
+</p><!--l. 6999--><p class="noindent" ><a
href="#top">Top</a><div class="chapter"><h2 class="chapterHead">13. <a
id="sec:lang"></a>Multi-Lingual Support</h2>
-</p><!--l. 6485--><p class="indent" > There&#8217;s only one command provided by <span
+</p><!--l. 7002--><p class="indent" > There&#8217;s only one command provided by <span
class="cmss-10">glossaries-extra </span>that you&#8217;re likely to want
to change in your document and that&#8217;s <span
class="cmtt-10">\abbreviationsname</span><a
@@ -12671,8 +14124,9 @@ class="cmtt-10">\abbreviationsname</span><a
href="#sec:pkgopts"><span
class="cmsy-10">&sect;</span>1.2 </a><a
href="#sec:pkgopts">New or
-Modified Package Options<!--tex4ht:ref: sec:pkgopts --></a>) if you use the <span
-class="cmss-10">abbreviations</span><a
+Modified Package Options<!--tex4ht:ref: sec:pkgopts --></a>) if you use the <a
+href="#styopt.abbreviations"><span
+class="cmss-10">abbreviations</span></a><a
id="dx1-39002"></a> package option to
automatically create the glossary labelled <span
class="cmtt-10">abbreviations</span>. If this command
@@ -12683,15 +14137,15 @@ been loaded, otherwise it will be defined as <span
class="cmtt-10">\acronymname </span>(provided by
<span
class="cmss-10">glossaries</span>).
-</p><!--l. 6495--><p class="indent" > You can redefine it in the usual way. For example:
+</p><!--l. 7012--><p class="indent" > You can redefine it in the usual way. For example:
</p>
- <div class="verbatim" id="verbatim-164">
+ <div class="verbatim" id="verbatim-165">
\renewcommand*{\abbreviationsname}{List&#x00A0;of&#x00A0;Abbreviations}
</div>
-<!--l. 6498--><p class="nopar" > Or using <span
+<!--l. 7015--><p class="nopar" > Or using <span
class="cmss-10">babel</span><a
id="dx1-39004"></a> or <span
class="cmss-10">polyglossia</span><a
@@ -12700,13 +14154,13 @@ class="cmss-10">polyglossia</span><a
</p>
- <div class="verbatim" id="verbatim-165">
+ <div class="verbatim" id="verbatim-166">
\appto\captionsenglish{%
&#x00A0;<br />&#x00A0;\renewcommand*{\abbreviationsname}{List&#x00A0;of&#x00A0;Abbreviations}%
&#x00A0;<br />}
</div>
-<!--l. 6504--><p class="nopar" >
-</p><!--l. 6506--><p class="indent" > Alternatively you can use the <span
+<!--l. 7021--><p class="nopar" >
+</p><!--l. 7023--><p class="indent" > Alternatively you can use the <span
class="cmss-10">title</span><a
id="dx1-39006"></a> key when you print the list of abbreviations.
For example:
@@ -12714,24 +14168,24 @@ For example:
</p>
- <div class="verbatim" id="verbatim-166">
+ <div class="verbatim" id="verbatim-167">
\printabbreviations[title={List&#x00A0;of&#x00A0;Abbreviations}]
</div>
-<!--l. 6510--><p class="nopar" > or
+<!--l. 7027--><p class="nopar" > or
</p>
- <div class="verbatim" id="verbatim-167">
+ <div class="verbatim" id="verbatim-168">
\printglossary[type=abbreviations,title={List&#x00A0;of&#x00A0;Abbreviations}]
</div>
-<!--l. 6514--><p class="nopar" >
-</p><!--l. 6516--><p class="indent" > The other fixed text commands are the diagnostic messages, which shouldn&#8217;t
+<!--l. 7031--><p class="nopar" >
+</p><!--l. 7033--><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. 6519--><p class="indent" > The <span
+</p><!--l. 7036--><p class="indent" > The <span
class="cmss-10">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. 6522--><p class="indent" > If you want to write your own language module, you just need to create a file
+</p><!--l. 7039--><p class="indent" > If you want to write your own language module, you just need to create a file
called <span
class="cmtt-10">glossariesxtr-</span>&#x27E8;<span
class="cmti-10">lang</span>&#x27E9;<span
@@ -12741,12 +14195,12 @@ class="cmss-10">tracklang</span><a
id="dx1-39007"></a>
package). For example, <span
class="cmtt-10">glossariesxtr-french.ldf</span>.
-</p><!--l. 6528--><p class="indent" > The simplest code for this file is:
+</p><!--l. 7045--><p class="indent" > The simplest code for this file is:
</p>
- <div class="verbatim" id="verbatim-168">
+ <div class="verbatim" id="verbatim-169">
\ProvidesGlossariesExtraLang{french}[2015/12/09&#x00A0;v1.0]
&#x00A0;<br />\newcommand*{\glossariesxtrcaptionsfrench}{%
&#x00A0;<br />&#x00A0;\def\abbreviationsname{Abr\'eviations}%
@@ -12772,8 +14226,8 @@ class="cmtt-10">glossariesxtr-french.ldf</span>.
&#x00A0;<br />&#x00A0;&#x00A0;\glossariesxtrcaptionsfrench
&#x00A0;<br />}
</div>
-<!--l. 6556--><p class="nopar" >
-</p><!--l. 6558--><p class="indent" > You can adapt this for other languages by replacing all instances of the language
+<!--l. 7073--><p class="nopar" >
+</p><!--l. 7075--><p class="indent" > You can adapt this for other languages by replacing all instances of the language
identifier <span
class="cmtt-10">french </span>and the translated text <span class="obeylines-h"><span class="verb"><span
class="cmtt-10">Abr\&#8217;eviations</span></span></span> as appropriate. This <span
@@ -12784,9 +14238,9 @@ class="E">E</span>X</span>&#8217;s path so that it can be found by
class="cmss-10">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. 6567--><p class="indent" > If you additionally want to provide translations for the diagnostic messages used
+</p><!--l. 7084--><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. 6570--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 7087--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrNoGlsWarningHead</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-39008"></a> <span
@@ -12796,39 +14250,39 @@ class="cmtt-10">}{</span>&#x27E8;<span
class="cmitt-10">file</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 6572--><p class="noindent" >
+</p><!--l. 7089--><p class="noindent" >
This produces the following text in English:
</p><div class="quote">
- <!--l. 6575--><p class="noindent" >This document is incomplete. The external file associated with the
+ <!--l. 7092--><p class="noindent" >This document is incomplete. The external file associated with the
glossary &#8216;&#x27E8;<span
class="cmti-10">label</span>&#x27E9;&#8217; (which should be called &#x27E8;<span
class="cmitt-10">file</span>&#x27E9;) hasn&#8217;t been created.</p></div>
-<!--l. 6578--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 7095--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrNoGlsWarningEmptyStart</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-39009"></a> <span
class="cmtt-10">\GlsXtrNoGlsWarningEmptyStart </span></div><hr>
-</p><!--l. 6580--><p class="noindent" >
+</p><!--l. 7097--><p class="noindent" >
This produces the following text in English:
</p><div class="quote">
- <!--l. 6583--><p class="noindent" >This has probably happened because there are no entries defined in
+ <!--l. 7100--><p class="noindent" >This has probably happened because there are no entries defined in
this glossary.</p></div>
-<!--l. 6586--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 7103--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrNoGlsWarningEmptyMain</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-39010"></a> <span
class="cmtt-10">\GlsXtrNoGlsWarningEmptyMain </span></div><hr>
-</p><!--l. 6588--><p class="noindent" >
+</p><!--l. 7105--><p class="noindent" >
This produces the following text in English:
</p><div class="quote">
- <!--l. 6591--><p class="noindent" >If you don&#8217;t want this glossary, add <span
+ <!--l. 7108--><p class="noindent" >If you don&#8217;t want this glossary, add <span
class="cmtt-10">nomain </span>to your package option
list when you load <span
class="cmtt-10">glossaries-extra.sty</span>. For example:</p></div>
-<!--l. 6594--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 7111--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrNoGlsWarningEmptyNotMain</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-39011"></a> <span
@@ -12836,10 +14290,10 @@ class="cmtt-10">\GlsXtrNoGlsWarningEmptyNotMain{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 6596--><p class="noindent" >
+</p><!--l. 7113--><p class="noindent" >
This produces the following text in English:
</p><div class="quote">
- <!--l. 6599--><p class="noindent" >Did you forget to use <span
+ <!--l. 7116--><p class="noindent" >Did you forget to use <span
class="cmtt-10">type=</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9; when you defined your entries?
If you tried to load entries into this glossary with <span
@@ -12851,7 +14305,7 @@ class="cmtt-10">] </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="cmtt-10">\glsdefaulttype</span>.</p></div>
-<!--l. 6602--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 7119--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrNoGlsWarningCheckFile</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-39012"></a> <span
@@ -12859,25 +14313,25 @@ class="cmtt-10">\GlsXtrNoGlsWarningCheckFile{</span>&#x27E8;<span
class="cmitt-10">file</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 6604--><p class="noindent" >
+</p><!--l. 7121--><p class="noindent" >
This produces the following text in English:
</p><div class="quote">
- <!--l. 6607--><p class="noindent" >Check the contents of the file &#x27E8;<span
+ <!--l. 7124--><p class="noindent" >Check the contents of the file &#x27E8;<span
class="cmitt-10">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="cmtt-10">\gls </span>or <span
class="cmtt-10">\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. 6610--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 7127--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrNoGlsWarningMisMatch</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-39013"></a> <span
class="cmtt-10">\GlsXtrNoGlsWarningMisMatch </span></div><hr>
-</p><!--l. 6612--><p class="noindent" >
+</p><!--l. 7129--><p class="noindent" >
This produces the following text in English:
</p><div class="quote">
- <!--l. 6615--><p class="noindent" >You need
+ <!--l. 7132--><p class="noindent" >You need
to either replace <span
class="cmtt-10">\makenoidxglossaries </span>with <span
class="cmtt-10">\makeglossaries </span>or
@@ -12891,17 +14345,17 @@ class="cmtt-10">\printglossaries</span>)
class="cmtt-10">\printnoidxglossary </span>(or <span
class="cmtt-10">\printnoidxglossaries</span>) and then
rebuild this document.</p></div>
-<!--l. 6618--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 7135--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrNoGlsWarningNoOut</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-39014"></a> <span
class="cmtt-10">\GlsXtrNoGlsWarningNoOut{</span>&#x27E8;<span
class="cmitt-10">file</span>&#x27E9;<span
class="cmtt-10">} </span></div><hr>
-</p><!--l. 6620--><p class="noindent" >
+</p><!--l. 7137--><p class="noindent" >
This produces the following text in English:
</p><div class="quote">
- <!--l. 6623--><p class="noindent" >The file &#x27E8;<span
+ <!--l. 7140--><p class="noindent" >The file &#x27E8;<span
class="cmitt-10">file</span>&#x27E9; doesn&#8217;t exist. This most likely means you haven&#8217;t used
<span
class="cmtt-10">\makeglossaries </span>or you have used <span
@@ -12909,25 +14363,25 @@ class="cmtt-10">\nofiles</span>. If this is just a draft
version of the document, you can suppress this message using the
<span
class="cmtt-10">nomissingglstext </span>package option.</p></div>
-<!--l. 6626--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+<!--l. 7143--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrNoGlsWarningTail</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-39015"></a> <span
class="cmtt-10">\GlsXtrNoGlsWarningTail </span></div><hr>
-</p><!--l. 6628--><p class="noindent" >
+</p><!--l. 7145--><p class="noindent" >
This produces the following text in English:
</p><div class="quote">
- <!--l. 6631--><p class="noindent" >This message will be removed once the problem has been fixed.</p></div>
-<!--l. 6634--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+ <!--l. 7148--><p class="noindent" >This message will be removed once the problem has been fixed.</p></div>
+<!--l. 7151--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrNoGlsWarningBuildInfo</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-39016"></a> <span
class="cmtt-10">\GlsXtrNoGlsWarningBuildInfo </span></div><hr>
-</p><!--l. 6636--><p class="noindent" >
+</p><!--l. 7153--><p class="noindent" >
This is advice on how to generate the glossary files. See the documented code
(<span
class="cmtt-10">glossaries-extra-code.pdf</span>) for further details.
-</p><!--l. 6641--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
+</p><!--l. 7158--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span
class="cmtt-9">\GlsXtrNoGlsWarningAutoMake</span><span
class="cmtt-9">&#x00A0;</span></span><a
id="dx1-39017"></a> <span
@@ -12935,7 +14389,7 @@ class="cmtt-10">\GlsXtrNoGlsWarningAutoMake{</span>&#x27E8;<span
class="cmitt-10">label</span>&#x27E9;<span
class="cmtt-10">}</span>
</div><hr>
-</p><!--l. 6643--><p class="noindent" >
+</p><!--l. 7160--><p class="noindent" >
This is the message produced when the <span
class="cmss-10">automake</span><a
id="dx1-39018"></a> option is used, but the document
@@ -13117,13 +14571,13 @@ class="cmbx-10">A</span>
<div class="theindex"><span class="index-item">abbreviation styles (deprecated):<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">footnote-em</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23130" >1</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23152" >1</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">footnote-sc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23122" >2</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23144" >2</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">footnote-sm</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23126" >3</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23148" >3</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-desc-em</span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-22067" >4</a> <br /></span>
@@ -13144,17 +14598,17 @@ class="cmss-10">long-sm</span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-22088" >9</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">postfootnote-em</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23153" >10</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23175" >10</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">postfootnote-sc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23145" >11</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23167" >11</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">postfootnote-sm</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23149" >12</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23171" >12</a> <br /></span>
<span class="index-item">abbreviation styles:<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">footnote</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23117" >13</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23139" >13</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long</span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-22078" >14</a> <br /></span>
@@ -13163,2785 +14617,3031 @@ class="cmss-10">long-desc</span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-22053" >15</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-em-noshort-em</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22093" >16</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21088" >16</a>, <a
+href="glossaries-extra-manual.html#dx1-22093" >17</a>, <a
+href="glossaries-extra-manual.html#dx1-23025" >18</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-em-noshort-em-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22068" >17</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22068" >19</a>, <a
+href="glossaries-extra-manual.html#dx1-23066" >20</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">long-em-noshort-em-desc-noreg</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23065" >21</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">long-em-noshort-em-noreg</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21090" >22</a>, <a
+href="glossaries-extra-manual.html#dx1-22098" >23</a>, <a
+href="glossaries-extra-manual.html#dx1-23024" >24</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-em-short-em</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21043" >18</a>, <a
-href="glossaries-extra-manual.html#dx1-23018" >19</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21056" >25</a>, <a
+href="glossaries-extra-manual.html#dx1-21082" >26</a>, <a
+href="glossaries-extra-manual.html#dx1-23018" >27</a>, <a
+href="glossaries-extra-manual.html#dx1-24018" >28</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-em-short-em-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23049" >20</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23062" >29</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">long-hyphen-long-hyphen</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23204" >30</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">long-hyphen-noshort-desc-noreg</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23195" >31</a>, <a
+href="glossaries-extra-manual.html#dx1-23198" >32</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">long-hyphen-noshort-noreg</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21091" >33</a>, <a
+href="glossaries-extra-manual.html#dx1-23197" >34</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">long-hyphen-postshort-hyphen</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21086" >35</a>, <a
+href="glossaries-extra-manual.html#dx1-23194" >36</a>, <a
+href="glossaries-extra-manual.html#dx1-23201" >37</a>, <a
+href="glossaries-extra-manual.html#dx1-23207" >38</a>, <a
+href="glossaries-extra-manual.html#dx1-23214" >39</a>, <a
+href="glossaries-extra-manual.html#dx1-23216" >40</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">long-hyphen-postshort-hyphen-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23206" >41</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">long-hyphen-short-hyphen</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23187" >42</a>, <a
+href="glossaries-extra-manual.html#dx1-23200" >43</a>, <a
+href="glossaries-extra-manual.html#dx1-23202" >44</a>, <a
+href="glossaries-extra-manual.html#dx1-23209" >45</a>, <a
+href="glossaries-extra-manual.html#dx1-26058" >46</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">long-hyphen-short-hyphen-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23196" >47</a>, <a
+href="glossaries-extra-manual.html#dx1-23199" >48</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-noshort</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12030" >21</a>, <a
-href="glossaries-extra-manual.html#dx1-19002" >22</a>, <a
-href="glossaries-extra-manual.html#dx1-22073" >23</a>, <a
-href="glossaries-extra-manual.html#dx1-22079" >24</a>, <a
-href="glossaries-extra-manual.html#dx1-22081" >25</a>, <a
-href="glossaries-extra-manual.html#dx1-22086" >26</a>, <a
-href="glossaries-extra-manual.html#dx1-22090" >27</a>, <a
-href="glossaries-extra-manual.html#dx1-22094" >28</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12030" >49</a>, <a
+href="glossaries-extra-manual.html#dx1-19002" >50</a>, <a
+href="glossaries-extra-manual.html#dx1-22073" >51</a>, <a
+href="glossaries-extra-manual.html#dx1-22079" >52</a>, <a
+href="glossaries-extra-manual.html#dx1-22081" >53</a>, <a
+href="glossaries-extra-manual.html#dx1-22086" >54</a>, <a
+href="glossaries-extra-manual.html#dx1-22090" >55</a>, <a
+href="glossaries-extra-manual.html#dx1-22094" >56</a>, <a
+href="glossaries-extra-manual.html#dx1-23042" >57</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-noshort-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11040" >29</a>, <a
-href="glossaries-extra-manual.html#dx1-12032" >30</a>, <a
-href="glossaries-extra-manual.html#dx1-22047" >31</a>, <a
-href="glossaries-extra-manual.html#dx1-22054" >32</a>, <a
-href="glossaries-extra-manual.html#dx1-22056" >33</a>, <a
-href="glossaries-extra-manual.html#dx1-22061" >34</a>, <a
-href="glossaries-extra-manual.html#dx1-22065" >35</a>, <a
-href="glossaries-extra-manual.html#dx1-22069" >36</a>, <a
-href="glossaries-extra-manual.html#dx1-22074" >37</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11040" >58</a>, <a
+href="glossaries-extra-manual.html#dx1-12032" >59</a>, <a
+href="glossaries-extra-manual.html#dx1-22047" >60</a>, <a
+href="glossaries-extra-manual.html#dx1-22054" >61</a>, <a
+href="glossaries-extra-manual.html#dx1-22056" >62</a>, <a
+href="glossaries-extra-manual.html#dx1-22061" >63</a>, <a
+href="glossaries-extra-manual.html#dx1-22065" >64</a>, <a
+href="glossaries-extra-manual.html#dx1-22069" >65</a>, <a
+href="glossaries-extra-manual.html#dx1-22074" >66</a>, <a
+href="glossaries-extra-manual.html#dx1-23045" >67</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">long-noshort-desc-noreg</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23044" >68</a> <br /></span>
+
+
+
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-noshort-em</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22089" >38</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22089" >69</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-noshort-em-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22064" >39</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22064" >70</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">long-noshort-noreg</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23041" >71</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-noshort-sc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21042" >40</a>, <a
-href="glossaries-extra-manual.html#dx1-22080" >41</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21081" >72</a>, <a
+href="glossaries-extra-manual.html#dx1-22080" >73</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-noshort-sc-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22055" >42</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22055" >74</a>, <a
+href="glossaries-extra-manual.html#dx1-24041" >75</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-noshort-sm</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22085" >43</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22085" >76</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-noshort-sm-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22060" >44</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22060" >77</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">long-only-short-only</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21070" >78</a>, <a
+href="glossaries-extra-manual.html#dx1-23021" >79</a>, <a
+href="glossaries-extra-manual.html#dx1-23023" >80</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">long-only-short-only-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23022" >81</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-postshort-user</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23159" >45</a>, <a
-href="glossaries-extra-manual.html#dx1-23163" >46</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23181" >82</a>, <a
+href="glossaries-extra-manual.html#dx1-23185" >83</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-postshort-user-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23162" >47</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23184" >84</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-short</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11047" >48</a>, <a
-href="glossaries-extra-manual.html#dx1-12008" >49</a>, <a
-href="glossaries-extra-manual.html#dx1-12056" >50</a>, <a
-href="glossaries-extra-manual.html#dx1-17020" >51</a>, <a
-href="glossaries-extra-manual.html#dx1-17023" >52</a>, <a
-href="glossaries-extra-manual.html#dx1-17039" >53</a>, <a
-href="glossaries-extra-manual.html#dx1-23002" >54</a>, <a
-href="glossaries-extra-manual.html#dx1-23010" >55</a>, <a
-href="glossaries-extra-manual.html#dx1-23013" >56</a>, <a
-href="glossaries-extra-manual.html#dx1-23016" >57</a>, <a
-href="glossaries-extra-manual.html#dx1-23022" >58</a>, <a
-href="glossaries-extra-manual.html#dx1-23025" >59</a>, <a
-href="glossaries-extra-manual.html#dx1-24014" >60</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11047" >85</a>, <a
+href="glossaries-extra-manual.html#dx1-12008" >86</a>, <a
+href="glossaries-extra-manual.html#dx1-12056" >87</a>, <a
+href="glossaries-extra-manual.html#dx1-17019" >88</a>, <a
+href="glossaries-extra-manual.html#dx1-21025" >89</a>, <a
+href="glossaries-extra-manual.html#dx1-21027" >90</a>, <a
+href="glossaries-extra-manual.html#dx1-23002" >91</a>, <a
+href="glossaries-extra-manual.html#dx1-23010" >92</a>, <a
+href="glossaries-extra-manual.html#dx1-23013" >93</a>, <a
+href="glossaries-extra-manual.html#dx1-23016" >94</a>, <a
+href="glossaries-extra-manual.html#dx1-23028" >95</a>, <a
+href="glossaries-extra-manual.html#dx1-23031" >96</a>, <a
+href="glossaries-extra-manual.html#dx1-23192" >97</a>, <a
+href="glossaries-extra-manual.html#dx1-24014" >98</a>, <a
+href="glossaries-extra-manual.html#dx1-24017" >99</a>, <a
+href="glossaries-extra-manual.html#dx1-24091" >100</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-short-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12016" >61</a>, <a
-href="glossaries-extra-manual.html#dx1-12022" >62</a>, <a
-href="glossaries-extra-manual.html#dx1-23034" >63</a>, <a
-href="glossaries-extra-manual.html#dx1-23041" >64</a>, <a
-href="glossaries-extra-manual.html#dx1-23044" >65</a>, <a
-href="glossaries-extra-manual.html#dx1-23047" >66</a>, <a
-href="glossaries-extra-manual.html#dx1-23053" >67</a>, <a
-href="glossaries-extra-manual.html#dx1-23057" >68</a>, <a
-href="glossaries-extra-manual.html#dx1-23060" >69</a> <br /></span>
-
-
-
+href="glossaries-extra-manual.html#dx1-12016" >101</a>, <a
+href="glossaries-extra-manual.html#dx1-12022" >102</a>, <a
+href="glossaries-extra-manual.html#dx1-23047" >103</a>, <a
+href="glossaries-extra-manual.html#dx1-23054" >104</a>, <a
+href="glossaries-extra-manual.html#dx1-23057" >105</a>, <a
+href="glossaries-extra-manual.html#dx1-23060" >106</a>, <a
+href="glossaries-extra-manual.html#dx1-23069" >107</a>, <a
+href="glossaries-extra-manual.html#dx1-23073" >108</a>, <a
+href="glossaries-extra-manual.html#dx1-23076" >109</a>, <a
+href="glossaries-extra-manual.html#dx1-24090" >110</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-short-em</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21044" >70</a>, <a
-href="glossaries-extra-manual.html#dx1-23015" >71</a>, <a
-href="glossaries-extra-manual.html#dx1-23019" >72</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21051" >111</a>, <a
+href="glossaries-extra-manual.html#dx1-21083" >112</a>, <a
+href="glossaries-extra-manual.html#dx1-23015" >113</a>, <a
+href="glossaries-extra-manual.html#dx1-23019" >114</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-short-em-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23046" >73</a>, <a
-href="glossaries-extra-manual.html#dx1-23050" >74</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23059" >115</a>, <a
+href="glossaries-extra-manual.html#dx1-23063" >116</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-short-sc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12004" >75</a>, <a
-href="glossaries-extra-manual.html#dx1-17022" >76</a>, <a
-href="glossaries-extra-manual.html#dx1-17025" >77</a>, <a
-href="glossaries-extra-manual.html#dx1-23009" >78</a>, <a
-href="glossaries-extra-manual.html#dx1-23033" >79</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12004" >117</a>, <a
+href="glossaries-extra-manual.html#dx1-21035" >118</a>, <a
+href="glossaries-extra-manual.html#dx1-23009" >119</a>, <a
+href="glossaries-extra-manual.html#dx1-23040" >120</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-short-sc-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12018" >80</a>, <a
-href="glossaries-extra-manual.html#dx1-23040" >81</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12018" >121</a>, <a
+href="glossaries-extra-manual.html#dx1-23053" >122</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-short-sm</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12006" >82</a>, <a
-href="glossaries-extra-manual.html#dx1-23012" >83</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12006" >123</a>, <a
+href="glossaries-extra-manual.html#dx1-21045" >124</a>, <a
+href="glossaries-extra-manual.html#dx1-23012" >125</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-short-sm-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12020" >84</a>, <a
-href="glossaries-extra-manual.html#dx1-23043" >85</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12020" >126</a>, <a
+href="glossaries-extra-manual.html#dx1-23056" >127</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-short-user</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21045" >86</a>, <a
-href="glossaries-extra-manual.html#dx1-23008" >87</a>, <a
-href="glossaries-extra-manual.html#dx1-23021" >88</a>, <a
-href="glossaries-extra-manual.html#dx1-23027" >89</a>, <a
-href="glossaries-extra-manual.html#dx1-23029" >90</a>, <a
-href="glossaries-extra-manual.html#dx1-23054" >91</a>, <a
-href="glossaries-extra-manual.html#dx1-23055" >92</a>, <a
-href="glossaries-extra-manual.html#dx1-23080" >93</a>, <a
-href="glossaries-extra-manual.html#dx1-23161" >94</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21084" >128</a>, <a
+href="glossaries-extra-manual.html#dx1-23008" >129</a>, <a
+href="glossaries-extra-manual.html#dx1-23027" >130</a>, <a
+href="glossaries-extra-manual.html#dx1-23033" >131</a>, <a
+href="glossaries-extra-manual.html#dx1-23036" >132</a>, <a
+href="glossaries-extra-manual.html#dx1-23070" >133</a>, <a
+href="glossaries-extra-manual.html#dx1-23071" >134</a>, <a
+href="glossaries-extra-manual.html#dx1-23099" >135</a>, <a
+href="glossaries-extra-manual.html#dx1-23183" >136</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long-short-user-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23052" >95</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23068" >137</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">postfootnote</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23140" >96</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23162" >138</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22007" >97</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22007" >139</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22030" >98</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22030" >140</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-em</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22022" >99</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22022" >141</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-em-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22045" >100</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22045" >142</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-em-footnote</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21056" >101</a>, <a
-href="glossaries-extra-manual.html#dx1-23127" >102</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21102" >143</a>, <a
+href="glossaries-extra-manual.html#dx1-23149" >144</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-em-footnote-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21055" >103</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21101" >145</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-em-long</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23073" >104</a>, <a
-href="glossaries-extra-manual.html#dx1-23077" >105</a>, <a
-href="glossaries-extra-manual.html#dx1-24082" >106</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21052" >146</a>, <a
+href="glossaries-extra-manual.html#dx1-23092" >147</a>, <a
+href="glossaries-extra-manual.html#dx1-23096" >148</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-em-long-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23092" >107</a>, <a
-href="glossaries-extra-manual.html#dx1-23096" >108</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23114" >149</a>, <a
+href="glossaries-extra-manual.html#dx1-23118" >150</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-em-long-em</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23076" >109</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21057" >151</a>, <a
+href="glossaries-extra-manual.html#dx1-23095" >152</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-em-long-em-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23095" >110</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23117" >153</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-em-nolong</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22019" >111</a>, <a
-href="glossaries-extra-manual.html#dx1-22023" >112</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22019" >154</a>, <a
+href="glossaries-extra-manual.html#dx1-22023" >155</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-em-nolong-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22042" >113</a>, <a
-href="glossaries-extra-manual.html#dx1-22046" >114</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22042" >156</a>, <a
+href="glossaries-extra-manual.html#dx1-22046" >157</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-em-postfootnote</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23150" >115</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23172" >158</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-footnote</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12034" >116</a>, <a
-href="glossaries-extra-manual.html#dx1-17041" >117</a>, <a
-href="glossaries-extra-manual.html#dx1-21048" >118</a>, <a
-href="glossaries-extra-manual.html#dx1-23105" >119</a>, <a
-href="glossaries-extra-manual.html#dx1-23118" >120</a>, <a
-href="glossaries-extra-manual.html#dx1-23120" >121</a>, <a
-href="glossaries-extra-manual.html#dx1-23124" >122</a>, <a
-href="glossaries-extra-manual.html#dx1-23128" >123</a>, <a
-href="glossaries-extra-manual.html#dx1-23132" >124</a>, <a
-href="glossaries-extra-manual.html#dx1-24018" >125</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12034" >159</a>, <a
+href="glossaries-extra-manual.html#dx1-17021" >160</a>, <a
+href="glossaries-extra-manual.html#dx1-21094" >161</a>, <a
+href="glossaries-extra-manual.html#dx1-23127" >162</a>, <a
+href="glossaries-extra-manual.html#dx1-23140" >163</a>, <a
+href="glossaries-extra-manual.html#dx1-23142" >164</a>, <a
+href="glossaries-extra-manual.html#dx1-23146" >165</a>, <a
+href="glossaries-extra-manual.html#dx1-23150" >166</a>, <a
+href="glossaries-extra-manual.html#dx1-23154" >167</a>, <a
+href="glossaries-extra-manual.html#dx1-24020" >168</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-footnote-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12040" >126</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12040" >169</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">short-hyphen-long-hyphen</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23208" >170</a>, <a
+href="glossaries-extra-manual.html#dx1-23212" >171</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">short-hyphen-long-hyphen-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23211" >172</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">short-hyphen-postlong-hyphen</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23213" >173</a>, <a
+href="glossaries-extra-manual.html#dx1-23218" >174</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">short-hyphen-postlong-hyphen-desc</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23217" >175</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-long</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12010" >127</a>, <a
-href="glossaries-extra-manual.html#dx1-17014" >128</a>, <a
-href="glossaries-extra-manual.html#dx1-17035" >129</a>, <a
-href="glossaries-extra-manual.html#dx1-21054" >130</a>, <a
-href="glossaries-extra-manual.html#dx1-23061" >131</a>, <a
-href="glossaries-extra-manual.html#dx1-23068" >132</a>, <a
-href="glossaries-extra-manual.html#dx1-23071" >133</a>, <a
-href="glossaries-extra-manual.html#dx1-23074" >134</a>, <a
-href="glossaries-extra-manual.html#dx1-24078" >135</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12010" >176</a>, <a
+href="glossaries-extra-manual.html#dx1-17014" >177</a>, <a
+href="glossaries-extra-manual.html#dx1-21028" >178</a>, <a
+href="glossaries-extra-manual.html#dx1-21077" >179</a>, <a
+href="glossaries-extra-manual.html#dx1-21100" >180</a>, <a
+href="glossaries-extra-manual.html#dx1-23080" >181</a>, <a
+href="glossaries-extra-manual.html#dx1-23087" >182</a>, <a
+href="glossaries-extra-manual.html#dx1-23090" >183</a>, <a
+href="glossaries-extra-manual.html#dx1-23093" >184</a>, <a
+href="glossaries-extra-manual.html#dx1-24088" >185</a>, <a
+href="glossaries-extra-manual.html#dx1-24093" >186</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-long-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12024" >136</a>, <a
-href="glossaries-extra-manual.html#dx1-21053" >137</a>, <a
-href="glossaries-extra-manual.html#dx1-23082" >138</a>, <a
-href="glossaries-extra-manual.html#dx1-23087" >139</a>, <a
-href="glossaries-extra-manual.html#dx1-23090" >140</a>, <a
-href="glossaries-extra-manual.html#dx1-23093" >141</a>, <a
-href="glossaries-extra-manual.html#dx1-23099" >142</a>, <a
-href="glossaries-extra-manual.html#dx1-23103" >143</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12024" >187</a>, <a
+href="glossaries-extra-manual.html#dx1-21099" >188</a>, <a
+href="glossaries-extra-manual.html#dx1-23104" >189</a>, <a
+href="glossaries-extra-manual.html#dx1-23109" >190</a>, <a
+href="glossaries-extra-manual.html#dx1-23112" >191</a>, <a
+href="glossaries-extra-manual.html#dx1-23115" >192</a>, <a
+href="glossaries-extra-manual.html#dx1-23121" >193</a>, <a
+href="glossaries-extra-manual.html#dx1-23125" >194</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-long-user</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23028" >144</a>, <a
-href="glossaries-extra-manual.html#dx1-23030" >145</a>, <a
-href="glossaries-extra-manual.html#dx1-23066" >146</a>, <a
-href="glossaries-extra-manual.html#dx1-23079" >147</a>, <a
-href="glossaries-extra-manual.html#dx1-23100" >148</a>, <a
-href="glossaries-extra-manual.html#dx1-23101" >149</a>, <a
-href="glossaries-extra-manual.html#dx1-23155" >150</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23034" >195</a>, <a
+href="glossaries-extra-manual.html#dx1-23037" >196</a>, <a
+href="glossaries-extra-manual.html#dx1-23085" >197</a>, <a
+href="glossaries-extra-manual.html#dx1-23098" >198</a>, <a
+href="glossaries-extra-manual.html#dx1-23122" >199</a>, <a
+href="glossaries-extra-manual.html#dx1-23123" >200</a>, <a
+href="glossaries-extra-manual.html#dx1-23177" >201</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-long-user-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23098" >151</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23120" >202</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-nolong</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17012" >152</a>, <a
-href="glossaries-extra-manual.html#dx1-17040" >153</a>, <a
-href="glossaries-extra-manual.html#dx1-19003" >154</a>, <a
-href="glossaries-extra-manual.html#dx1-19017" >155</a>, <a
-href="glossaries-extra-manual.html#dx1-22002" >156</a>, <a
-href="glossaries-extra-manual.html#dx1-22008" >157</a>, <a
-href="glossaries-extra-manual.html#dx1-22010" >158</a>, <a
-href="glossaries-extra-manual.html#dx1-22015" >159</a>, <a
-href="glossaries-extra-manual.html#dx1-22020" >160</a>, <a
-href="glossaries-extra-manual.html#dx1-22025" >161</a>, <a
-href="glossaries-extra-manual.html#dx1-22028" >162</a>, <a
-href="glossaries-extra-manual.html#dx1-22033" >163</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-17012" >203</a>, <a
+href="glossaries-extra-manual.html#dx1-17020" >204</a>, <a
+href="glossaries-extra-manual.html#dx1-19003" >205</a>, <a
+href="glossaries-extra-manual.html#dx1-19018" >206</a>, <a
+href="glossaries-extra-manual.html#dx1-22002" >207</a>, <a
+href="glossaries-extra-manual.html#dx1-22008" >208</a>, <a
+href="glossaries-extra-manual.html#dx1-22010" >209</a>, <a
+href="glossaries-extra-manual.html#dx1-22015" >210</a>, <a
+href="glossaries-extra-manual.html#dx1-22020" >211</a>, <a
+href="glossaries-extra-manual.html#dx1-22025" >212</a>, <a
+href="glossaries-extra-manual.html#dx1-22028" >213</a>, <a
+href="glossaries-extra-manual.html#dx1-22033" >214</a>, <a
+href="glossaries-extra-manual.html#dx1-23078" >215</a> <br /></span>
+
+
+
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-nolong-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22024" >164</a>, <a
-href="glossaries-extra-manual.html#dx1-22031" >165</a>, <a
-href="glossaries-extra-manual.html#dx1-22038" >166</a>, <a
-href="glossaries-extra-manual.html#dx1-22043" >167</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22024" >216</a>, <a
+href="glossaries-extra-manual.html#dx1-22031" >217</a>, <a
+href="glossaries-extra-manual.html#dx1-22038" >218</a>, <a
+href="glossaries-extra-manual.html#dx1-22043" >219</a>, <a
+href="glossaries-extra-manual.html#dx1-23102" >220</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">short-nolong-desc-noreg</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23101" >221</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">short-nolong-noreg</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23077" >222</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-postfootnote</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8058" >168</a>, <a
-href="glossaries-extra-manual.html#dx1-8063" >169</a>, <a
-href="glossaries-extra-manual.html#dx1-23131" >170</a>, <a
-href="glossaries-extra-manual.html#dx1-23141" >171</a>, <a
-href="glossaries-extra-manual.html#dx1-23143" >172</a>, <a
-href="glossaries-extra-manual.html#dx1-23147" >173</a>, <a
-href="glossaries-extra-manual.html#dx1-23151" >174</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-8058" >223</a>, <a
+href="glossaries-extra-manual.html#dx1-8063" >224</a>, <a
+href="glossaries-extra-manual.html#dx1-23153" >225</a>, <a
+href="glossaries-extra-manual.html#dx1-23163" >226</a>, <a
+href="glossaries-extra-manual.html#dx1-23165" >227</a>, <a
+href="glossaries-extra-manual.html#dx1-23169" >228</a>, <a
+href="glossaries-extra-manual.html#dx1-23173" >229</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-postlong-user</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23154" >175</a>, <a
-href="glossaries-extra-manual.html#dx1-23157" >176</a>, <a
-href="glossaries-extra-manual.html#dx1-23160" >177</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23176" >230</a>, <a
+href="glossaries-extra-manual.html#dx1-23179" >231</a>, <a
+href="glossaries-extra-manual.html#dx1-23182" >232</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-postlong-user-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23156" >178</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23178" >233</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22012" >179</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22012" >234</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sc-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22035" >180</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22035" >235</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sc-footnote</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12036" >181</a>, <a
-href="glossaries-extra-manual.html#dx1-23119" >182</a>, <a
-href="glossaries-extra-manual.html#dx1-23123" >183</a>, <a
-href="glossaries-extra-manual.html#dx1-24035" >184</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12036" >236</a>, <a
+href="glossaries-extra-manual.html#dx1-23141" >237</a>, <a
+href="glossaries-extra-manual.html#dx1-23145" >238</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sc-footnote-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12042" >185</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12042" >239</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sc-long</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12012" >186</a>, <a
-href="glossaries-extra-manual.html#dx1-23067" >187</a>, <a
-href="glossaries-extra-manual.html#dx1-24080" >188</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12012" >240</a>, <a
+href="glossaries-extra-manual.html#dx1-21036" >241</a>, <a
+href="glossaries-extra-manual.html#dx1-23086" >242</a>, <a
+href="glossaries-extra-manual.html#dx1-24092" >243</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sc-long-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12026" >189</a>, <a
-href="glossaries-extra-manual.html#dx1-23086" >190</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12026" >244</a>, <a
+href="glossaries-extra-manual.html#dx1-23108" >245</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sc-nolong</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22009" >191</a>, <a
-href="glossaries-extra-manual.html#dx1-22013" >192</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22009" >246</a>, <a
+href="glossaries-extra-manual.html#dx1-22013" >247</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sc-nolong-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22032" >193</a>, <a
-href="glossaries-extra-manual.html#dx1-22036" >194</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22032" >248</a>, <a
+href="glossaries-extra-manual.html#dx1-22036" >249</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sc-postfootnote</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21049" >195</a>, <a
-href="glossaries-extra-manual.html#dx1-23142" >196</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21095" >250</a>, <a
+href="glossaries-extra-manual.html#dx1-23164" >251</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sm</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22017" >197</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22017" >252</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sm-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22040" >198</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22040" >253</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sm-footnote</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12038" >199</a>, <a
-href="glossaries-extra-manual.html#dx1-24036" >200</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12038" >254</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sm-footnote-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12044" >201</a> <br /></span>
-
-
-
+href="glossaries-extra-manual.html#dx1-12044" >255</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sm-long</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12014" >202</a>, <a
-href="glossaries-extra-manual.html#dx1-23070" >203</a>, <a
-href="glossaries-extra-manual.html#dx1-24081" >204</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12014" >256</a>, <a
+href="glossaries-extra-manual.html#dx1-21046" >257</a>, <a
+href="glossaries-extra-manual.html#dx1-23089" >258</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sm-long-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12028" >205</a>, <a
-href="glossaries-extra-manual.html#dx1-23089" >206</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12028" >259</a>, <a
+href="glossaries-extra-manual.html#dx1-23111" >260</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sm-nolong</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22014" >207</a>, <a
-href="glossaries-extra-manual.html#dx1-22018" >208</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22014" >261</a>, <a
+href="glossaries-extra-manual.html#dx1-22018" >262</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sm-nolong-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-22037" >209</a>, <a
-href="glossaries-extra-manual.html#dx1-22041" >210</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-22037" >263</a>, <a
+href="glossaries-extra-manual.html#dx1-22041" >264</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short-sm-postfootnote</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23146" >211</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23168" >265</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\abbreviationsname</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4087" ><span
-class="cmti-10">212</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4089" ><span
+class="cmti-10">266</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\abbrvpluralsuffix</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24038" ><span
-class="cmti-10">213</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24043" ><span
+class="cmti-10">267</span></a> <br /></span>
<span class="index-item">acronym styles (glossaries):<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">dua</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12029" >214</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12029" >268</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">dua-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12031" >215</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12031" >269</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">footnote</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12033" >216</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12033" >270</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">footnote-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12039" >217</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12039" >271</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">footnote-sc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12035" >218</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12035" >272</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">footnote-sc-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12041" >219</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12041" >273</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">footnote-sm</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12037" >220</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12037" >274</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">footnote-sm-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12043" >221</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12043" >275</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">long-sc-short</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12003" >222</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12003" >276</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">long-sc-short-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12017" >223</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12017" >277</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">long-short-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12015" >224</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12015" >278</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">long-sm-short</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12005" >225</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12005" >279</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">long-sm-short-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12019" >226</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12019" >280</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">long-sp-short</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12007" >227</a>, <a
-href="glossaries-extra-manual.html#dx1-12053" >228</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12007" >281</a>, <a
+href="glossaries-extra-manual.html#dx1-12053" >282</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">long-sp-short-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12021" >229</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12021" >283</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">sc-short-long</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12011" >230</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12011" >284</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">sc-short-long-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12025" >231</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12025" >285</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">short-long</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12009" >232</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12009" >286</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">short-long-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12023" >233</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12023" >287</a> <br /></span>
+
+
+
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">sm-short-long</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12013" >234</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12013" >288</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmtt-10">sm-short-long-desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12027" >235</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12027" >289</a> <br /></span>
<span class="index-item"><span
class="cmss-10">amsgen </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-9" >236</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-9" >290</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\apptoglossarypreamble</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-31010" ><span
-class="cmti-10">237</span></a> <br /></span>
+class="cmti-10">291</span></a> <br /></span>
<p class="theindex"> <span
class="cmbx-10">B</span>
<span class="index-item"><span
class="cmss-10">babel </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3009" >238</a>, <a
-href="glossaries-extra-manual.html#dx1-3013" >239</a>, <a
-href="glossaries-extra-manual.html#dx1-4088" >240</a>, <a
-href="glossaries-extra-manual.html#dx1-4089" >241</a>, <a
-href="glossaries-extra-manual.html#dx1-4090" >242</a>, <a
-href="glossaries-extra-manual.html#dx1-26004" >243</a>, <a
-href="glossaries-extra-manual.html#dx1-39003" >244</a>, <a
-href="glossaries-extra-manual.html#dx1-39004" >245</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3010" >292</a>, <a
+href="glossaries-extra-manual.html#dx1-3014" >293</a>, <a
+href="glossaries-extra-manual.html#dx1-4090" >294</a>, <a
+href="glossaries-extra-manual.html#dx1-4091" >295</a>, <a
+href="glossaries-extra-manual.html#dx1-4092" >296</a>, <a
+href="glossaries-extra-manual.html#dx1-26004" >297</a>, <a
+href="glossaries-extra-manual.html#dx1-39003" >298</a>, <a
+href="glossaries-extra-manual.html#dx1-39004" >299</a> <br /></span>
<span class="index-item"><span
class="cmtt-10">bib2gls</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4025" >246</a>, <a
-href="glossaries-extra-manual.html#dx1-4038" >247</a>, <a
-href="glossaries-extra-manual.html#dx1-4047" >248</a>, <a
-href="glossaries-extra-manual.html#dx1-4050" >249</a>, <a
-href="glossaries-extra-manual.html#dx1-4055" >250</a>, <a
-href="glossaries-extra-manual.html#dx1-6019" >251</a>, <a
-href="glossaries-extra-manual.html#dx1-15012" >252</a>, <a
-href="glossaries-extra-manual.html#dx1-30001" >253</a>, <a
-href="glossaries-extra-manual.html#dx1-30003" >254</a>, <a
-href="glossaries-extra-manual.html#dx1-30005" >255</a>, <a
-href="glossaries-extra-manual.html#dx1-30007" >256</a>, <a
-href="glossaries-extra-manual.html#dx1-30009" >257</a>, <a
-href="glossaries-extra-manual.html#dx1-30011" >258</a>, <a
-href="glossaries-extra-manual.html#dx1-30014" >259</a>, <a
-href="glossaries-extra-manual.html#dx1-30018" >260</a>, <a
-href="glossaries-extra-manual.html#dx1-30024" >261</a>, <a
-href="glossaries-extra-manual.html#dx1-30028" >262</a>, <a
-href="glossaries-extra-manual.html#dx1-30030" >263</a>, <a
-href="glossaries-extra-manual.html#dx1-30032" >264</a>, <a
-href="glossaries-extra-manual.html#dx1-30034" >265</a>, <a
-href="glossaries-extra-manual.html#dx1-30038" >266</a>, <a
-href="glossaries-extra-manual.html#dx1-30040" >267</a>, <a
-href="glossaries-extra-manual.html#dx1-30042" >268</a>, <a
-href="glossaries-extra-manual.html#dx1-33004" >269</a>, <a
-href="glossaries-extra-manual.html#dx1-34002" >270</a>, <a
-href="glossaries-extra-manual.html#dx1-34014" >271</a>, <a
+href="glossaries-extra-manual.html#dx1-4027" >300</a>, <a
+href="glossaries-extra-manual.html#dx1-4040" >301</a>, <a
+href="glossaries-extra-manual.html#dx1-4049" >302</a>, <a
+href="glossaries-extra-manual.html#dx1-4052" >303</a>, <a
+href="glossaries-extra-manual.html#dx1-4057" >304</a>, <a
+href="glossaries-extra-manual.html#dx1-6019" >305</a>, <a
+href="glossaries-extra-manual.html#dx1-15012" >306</a>, <a
+href="glossaries-extra-manual.html#dx1-30001" >307</a>, <a
+href="glossaries-extra-manual.html#dx1-30003" >308</a>, <a
+href="glossaries-extra-manual.html#dx1-30005" >309</a>, <a
+href="glossaries-extra-manual.html#dx1-30007" >310</a>, <a
+href="glossaries-extra-manual.html#dx1-30009" >311</a>, <a
+href="glossaries-extra-manual.html#dx1-30011" >312</a>, <a
+href="glossaries-extra-manual.html#dx1-30014" >313</a>, <a
+href="glossaries-extra-manual.html#dx1-30018" >314</a>, <a
+href="glossaries-extra-manual.html#dx1-30024" >315</a>, <a
+href="glossaries-extra-manual.html#dx1-30028" >316</a>, <a
+href="glossaries-extra-manual.html#dx1-30030" >317</a>, <a
+href="glossaries-extra-manual.html#dx1-30032" >318</a>, <a
+href="glossaries-extra-manual.html#dx1-30034" >319</a>, <a
+href="glossaries-extra-manual.html#dx1-30036" >320</a>, <a
+href="glossaries-extra-manual.html#dx1-30038" >321</a>, <a
+href="glossaries-extra-manual.html#dx1-30040" >322</a>, <a
+href="glossaries-extra-manual.html#dx1-30042" >323</a>, <a
+href="glossaries-extra-manual.html#dx1-33004" >324</a>, <a
+href="glossaries-extra-manual.html#dx1-34002" >325</a>, <a
+href="glossaries-extra-manual.html#dx1-34014" >326</a>, <a
href="glossaries-extra-manual.html#dx1-40002" ><span
-class="cmbx-10">272</span></a> <br /></span>
+class="cmbx-10">327</span></a> <br /></span>
<span class="index-item"><span
class="cmtt-10">bib2gls</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4026" >273</a>, <a
-href="glossaries-extra-manual.html#dx1-4039" >274</a>, <a
-href="glossaries-extra-manual.html#dx1-4048" >275</a>, <a
-href="glossaries-extra-manual.html#dx1-4051" >276</a>, <a
-href="glossaries-extra-manual.html#dx1-4056" >277</a>, <a
-href="glossaries-extra-manual.html#dx1-6020" >278</a>, <a
-href="glossaries-extra-manual.html#dx1-15013" >279</a>, <a
-href="glossaries-extra-manual.html#dx1-30002" >280</a>, <a
-href="glossaries-extra-manual.html#dx1-30004" >281</a>, <a
-href="glossaries-extra-manual.html#dx1-30006" >282</a>, <a
-href="glossaries-extra-manual.html#dx1-30008" >283</a>, <a
-href="glossaries-extra-manual.html#dx1-30010" >284</a>, <a
-href="glossaries-extra-manual.html#dx1-30012" >285</a>, <a
-href="glossaries-extra-manual.html#dx1-30015" >286</a>, <a
-href="glossaries-extra-manual.html#dx1-30019" >287</a>, <a
-href="glossaries-extra-manual.html#dx1-30025" >288</a>, <a
-href="glossaries-extra-manual.html#dx1-30029" >289</a>, <a
-href="glossaries-extra-manual.html#dx1-30031" >290</a>, <a
-href="glossaries-extra-manual.html#dx1-30033" >291</a>, <a
-href="glossaries-extra-manual.html#dx1-30035" >292</a>, <a
-href="glossaries-extra-manual.html#dx1-30039" >293</a>, <a
-href="glossaries-extra-manual.html#dx1-30041" >294</a>, <a
-href="glossaries-extra-manual.html#dx1-30043" >295</a>, <a
-href="glossaries-extra-manual.html#dx1-33005" >296</a>, <a
-href="glossaries-extra-manual.html#dx1-34003" >297</a>, <a
-href="glossaries-extra-manual.html#dx1-34015" >298</a>, <a
+href="glossaries-extra-manual.html#dx1-4028" >328</a>, <a
+href="glossaries-extra-manual.html#dx1-4041" >329</a>, <a
+href="glossaries-extra-manual.html#dx1-4050" >330</a>, <a
+href="glossaries-extra-manual.html#dx1-4053" >331</a>, <a
+href="glossaries-extra-manual.html#dx1-4058" >332</a>, <a
+href="glossaries-extra-manual.html#dx1-6020" >333</a>, <a
+href="glossaries-extra-manual.html#dx1-15013" >334</a>, <a
+href="glossaries-extra-manual.html#dx1-30002" >335</a>, <a
+href="glossaries-extra-manual.html#dx1-30004" >336</a>, <a
+href="glossaries-extra-manual.html#dx1-30006" >337</a>, <a
+href="glossaries-extra-manual.html#dx1-30008" >338</a>, <a
+href="glossaries-extra-manual.html#dx1-30010" >339</a>, <a
+href="glossaries-extra-manual.html#dx1-30012" >340</a>, <a
+href="glossaries-extra-manual.html#dx1-30015" >341</a>, <a
+href="glossaries-extra-manual.html#dx1-30019" >342</a>, <a
+href="glossaries-extra-manual.html#dx1-30025" >343</a>, <a
+href="glossaries-extra-manual.html#dx1-30029" >344</a>, <a
+href="glossaries-extra-manual.html#dx1-30031" >345</a>, <a
+href="glossaries-extra-manual.html#dx1-30033" >346</a>, <a
+href="glossaries-extra-manual.html#dx1-30035" >347</a>, <a
+href="glossaries-extra-manual.html#dx1-30037" >348</a>, <a
+href="glossaries-extra-manual.html#dx1-30039" >349</a>, <a
+href="glossaries-extra-manual.html#dx1-30041" >350</a>, <a
+href="glossaries-extra-manual.html#dx1-30043" >351</a>, <a
+href="glossaries-extra-manual.html#dx1-33005" >352</a>, <a
+href="glossaries-extra-manual.html#dx1-34003" >353</a>, <a
+href="glossaries-extra-manual.html#dx1-34015" >354</a>, <a
href="glossaries-extra-manual.html#dx1-40001" ><span
-class="cmbx-10">299</span></a> <br /></span>
+class="cmbx-10">355</span></a> <br /></span>
</p><p class="theindex"> <span
class="cmbx-10">C</span>
<span class="index-item">categories:<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">abbreviation</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-9003" >300</a>, <a
-href="glossaries-extra-manual.html#dx1-17015" >301</a>, <a
-href="glossaries-extra-manual.html#dx1-18007" >302</a>, <a
-href="glossaries-extra-manual.html#dx1-26008" >303</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-9003" >356</a>, <a
+href="glossaries-extra-manual.html#dx1-17015" >357</a>, <a
+href="glossaries-extra-manual.html#dx1-18007" >358</a>, <a
+href="glossaries-extra-manual.html#dx1-26008" >359</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">acronym</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8029" >304</a>, <a
-href="glossaries-extra-manual.html#dx1-14015" >305</a>, <a
-href="glossaries-extra-manual.html#dx1-17013" >306</a>, <a
-href="glossaries-extra-manual.html#dx1-18006" >307</a>, <a
-href="glossaries-extra-manual.html#dx1-26009" >308</a>, <a
-href="glossaries-extra-manual.html#dx1-26023" >309</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-8029" >360</a>, <a
+href="glossaries-extra-manual.html#dx1-14015" >361</a>, <a
+href="glossaries-extra-manual.html#dx1-17013" >362</a>, <a
+href="glossaries-extra-manual.html#dx1-18006" >363</a>, <a
+href="glossaries-extra-manual.html#dx1-26009" >364</a>, <a
+href="glossaries-extra-manual.html#dx1-26023" >365</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">general</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8036" >310</a>, <a
-href="glossaries-extra-manual.html#dx1-8062" >311</a>, <a
-href="glossaries-extra-manual.html#dx1-14014" >312</a>, <a
-href="glossaries-extra-manual.html#dx1-14017" >313</a>, <a
-href="glossaries-extra-manual.html#dx1-26007" >314</a>, <a
-href="glossaries-extra-manual.html#dx1-26022" >315</a>, <a
-href="glossaries-extra-manual.html#dx1-26115" >316</a>, <a
-href="glossaries-extra-manual.html#dx1-27036" >317</a> <br /></span>
-
-
-
+href="glossaries-extra-manual.html#dx1-8036" >366</a>, <a
+href="glossaries-extra-manual.html#dx1-8062" >367</a>, <a
+href="glossaries-extra-manual.html#dx1-14014" >368</a>, <a
+href="glossaries-extra-manual.html#dx1-14017" >369</a>, <a
+href="glossaries-extra-manual.html#dx1-26007" >370</a>, <a
+href="glossaries-extra-manual.html#dx1-26022" >371</a>, <a
+href="glossaries-extra-manual.html#dx1-26128" >372</a>, <a
+href="glossaries-extra-manual.html#dx1-27037" >373</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">index</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-5031" >318</a>, <a
-href="glossaries-extra-manual.html#dx1-26012" >319</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-5031" >374</a>, <a
+href="glossaries-extra-manual.html#dx1-26012" >375</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">number</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26018" >320</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26018" >376</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">symbol</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8043" >321</a>, <a
-href="glossaries-extra-manual.html#dx1-26015" >322</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-8043" >377</a>, <a
+href="glossaries-extra-manual.html#dx1-26015" >378</a> <br /></span>
<span class="index-item">category attributes:<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">aposplural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-10036" >323</a>, <a
-href="glossaries-extra-manual.html#dx1-21030" >324</a>, <a
-href="glossaries-extra-manual.html#dx1-26058" >325</a>, <a
-href="glossaries-extra-manual.html#dx1-26065" >326</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-10036" >379</a>, <a
+href="glossaries-extra-manual.html#dx1-21043" >380</a>, <a
+href="glossaries-extra-manual.html#dx1-26071" >381</a>, <a
+href="glossaries-extra-manual.html#dx1-26079" >382</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">discardperiod</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8032" >327</a>, <a
-href="glossaries-extra-manual.html#dx1-26042" >328</a>, <a
-href="glossaries-extra-manual.html#dx1-26049" >329</a>, <a
-href="glossaries-extra-manual.html#dx1-26052" >330</a>, <a
-href="glossaries-extra-manual.html#dx1-26057" >331</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-8032" >383</a>, <a
+href="glossaries-extra-manual.html#dx1-26042" >384</a>, <a
+href="glossaries-extra-manual.html#dx1-26049" >385</a>, <a
+href="glossaries-extra-manual.html#dx1-26052" >386</a>, <a
+href="glossaries-extra-manual.html#dx1-26070" >387</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">dualindex</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26094" >332</a>, <a
-href="glossaries-extra-manual.html#dx1-28002" >333</a>, <a
-href="glossaries-extra-manual.html#dx1-28008" >334</a>, <a
-href="glossaries-extra-manual.html#dx1-28022" >335</a>, <a
-href="glossaries-extra-manual.html#dx1-28029" >336</a>, <a
-href="glossaries-extra-manual.html#dx1-28032" >337</a>, <a
-href="glossaries-extra-manual.html#dx1-38003" >338</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26107" >388</a>, <a
+href="glossaries-extra-manual.html#dx1-28002" >389</a>, <a
+href="glossaries-extra-manual.html#dx1-28008" >390</a>, <a
+href="glossaries-extra-manual.html#dx1-28022" >391</a>, <a
+href="glossaries-extra-manual.html#dx1-28029" >392</a>, <a
+href="glossaries-extra-manual.html#dx1-28032" >393</a>, <a
+href="glossaries-extra-manual.html#dx1-38003" >394</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">entrycount</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-9002" >339</a>, <a
-href="glossaries-extra-manual.html#dx1-26072" >340</a>, <a
-href="glossaries-extra-manual.html#dx1-26076" >341</a>, <a
-href="glossaries-extra-manual.html#dx1-27002" >342</a>, <a
-href="glossaries-extra-manual.html#dx1-27007" >343</a>, <a
-href="glossaries-extra-manual.html#dx1-27015" >344</a>, <a
-href="glossaries-extra-manual.html#dx1-27019" >345</a>, <a
-href="glossaries-extra-manual.html#dx1-27020" >346</a>, <a
-href="glossaries-extra-manual.html#dx1-27024" >347</a>, <a
-href="glossaries-extra-manual.html#dx1-27025" >348</a>, <a
-href="glossaries-extra-manual.html#dx1-27029" >349</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-9002" >395</a>, <a
+href="glossaries-extra-manual.html#dx1-26085" >396</a>, <a
+href="glossaries-extra-manual.html#dx1-26089" >397</a>, <a
+href="glossaries-extra-manual.html#dx1-27002" >398</a>, <a
+href="glossaries-extra-manual.html#dx1-27007" >399</a>, <a
+href="glossaries-extra-manual.html#dx1-27016" >400</a>, <a
+href="glossaries-extra-manual.html#dx1-27020" >401</a>, <a
+href="glossaries-extra-manual.html#dx1-27021" >402</a>, <a
+href="glossaries-extra-manual.html#dx1-27025" >403</a>, <a
+href="glossaries-extra-manual.html#dx1-27026" >404</a>, <a
+href="glossaries-extra-manual.html#dx1-27030" >405</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">externallocation</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-6024" >350</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-6024" >406</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">glossdesc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-14004" >351</a>, <a
-href="glossaries-extra-manual.html#dx1-26077" >352</a>, <a
-href="glossaries-extra-manual.html#dx1-26087" >353</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-14004" >407</a>, <a
+href="glossaries-extra-manual.html#dx1-26090" >408</a>, <a
+href="glossaries-extra-manual.html#dx1-26100" >409</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">glossdescfont</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-14005" >354</a>, <a
-href="glossaries-extra-manual.html#dx1-26084" >355</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-14005" >410</a>, <a
+href="glossaries-extra-manual.html#dx1-26097" >411</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">glossname</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-14003" >356</a>, <a
-href="glossaries-extra-manual.html#dx1-26086" >357</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-14003" >412</a>, <a
+href="glossaries-extra-manual.html#dx1-26099" >413</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">glossnamefont</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26092" >358</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26105" >414</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">headuc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11059" >359</a>, <a
-href="glossaries-extra-manual.html#dx1-25017" >360</a>, <a
-href="glossaries-extra-manual.html#dx1-25019" >361</a>, <a
-href="glossaries-extra-manual.html#dx1-26067" >362</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11059" >415</a>, <a
+href="glossaries-extra-manual.html#dx1-25017" >416</a>, <a
+href="glossaries-extra-manual.html#dx1-25019" >417</a>, <a
+href="glossaries-extra-manual.html#dx1-26080" >418</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">indexname</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-14009" >363</a>, <a
-href="glossaries-extra-manual.html#dx1-26089" >364</a>, <a
-href="glossaries-extra-manual.html#dx1-28001" >365</a>, <a
-href="glossaries-extra-manual.html#dx1-28006" >366</a>, <a
-href="glossaries-extra-manual.html#dx1-38004" >367</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-14009" >419</a>, <a
+href="glossaries-extra-manual.html#dx1-26102" >420</a>, <a
+href="glossaries-extra-manual.html#dx1-28001" >421</a>, <a
+href="glossaries-extra-manual.html#dx1-28006" >422</a>, <a
+href="glossaries-extra-manual.html#dx1-38004" >423</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">indexonlyfirst</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-6005" >368</a>, <a
-href="glossaries-extra-manual.html#dx1-26037" >369</a>, <a
-href="glossaries-extra-manual.html#dx1-28030" >370</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-6005" >424</a>, <a
+href="glossaries-extra-manual.html#dx1-26037" >425</a>, <a
+href="glossaries-extra-manual.html#dx1-28030" >426</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">insertdots</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17004" >371</a>, <a
-href="glossaries-extra-manual.html#dx1-26054" >372</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-17004" >427</a>, <a
+href="glossaries-extra-manual.html#dx1-26064" >428</a>, <a
+href="glossaries-extra-manual.html#dx1-26066" >429</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">markshortwords</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-26061" >430</a>, <a
+href="glossaries-extra-manual.html#dx1-26068" >431</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">markwords</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23188" >432</a>, <a
+href="glossaries-extra-manual.html#dx1-23191" >433</a>, <a
+href="glossaries-extra-manual.html#dx1-23193" >434</a>, <a
+href="glossaries-extra-manual.html#dx1-24032" >435</a>, <a
+href="glossaries-extra-manual.html#dx1-26054" >436</a>, <a
+href="glossaries-extra-manual.html#dx1-26062" >437</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">nohyper</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26034" >373</a>, <a
-href="glossaries-extra-manual.html#dx1-26116" >374</a>, <a
-href="glossaries-extra-manual.html#dx1-26117" >375</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26034" >438</a>, <a
+href="glossaries-extra-manual.html#dx1-26129" >439</a>, <a
+href="glossaries-extra-manual.html#dx1-26130" >440</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">nohyperfirst</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23107" >376</a>, <a
-href="glossaries-extra-manual.html#dx1-24019" >377</a>, <a
-href="glossaries-extra-manual.html#dx1-24021" >378</a>, <a
-href="glossaries-extra-manual.html#dx1-26025" >379</a>, <a
-href="glossaries-extra-manual.html#dx1-26032" >380</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23129" >441</a>, <a
+href="glossaries-extra-manual.html#dx1-24021" >442</a>, <a
+href="glossaries-extra-manual.html#dx1-24023" >443</a>, <a
+href="glossaries-extra-manual.html#dx1-26025" >444</a>, <a
+href="glossaries-extra-manual.html#dx1-26032" >445</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">noshortplural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-10037" >381</a>, <a
-href="glossaries-extra-manual.html#dx1-17005" >382</a>, <a
-href="glossaries-extra-manual.html#dx1-21031" >383</a>, <a
-href="glossaries-extra-manual.html#dx1-26061" >384</a>, <a
-href="glossaries-extra-manual.html#dx1-26066" >385</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-10037" >446</a>, <a
+href="glossaries-extra-manual.html#dx1-17005" >447</a>, <a
+href="glossaries-extra-manual.html#dx1-21044" >448</a>, <a
+href="glossaries-extra-manual.html#dx1-26074" >449</a>, <a
+href="glossaries-extra-manual.html#dx1-26075" >450</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">pluraldiscardperiod</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26048" >386</a>, <a
-href="glossaries-extra-manual.html#dx1-26053" >387</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26048" >451</a>, <a
+href="glossaries-extra-manual.html#dx1-26053" >452</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">regular</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8010" >388</a>, <a
-href="glossaries-extra-manual.html#dx1-8019" >389</a>, <a
-href="glossaries-extra-manual.html#dx1-8022" >390</a>, <a
-href="glossaries-extra-manual.html#dx1-8028" >391</a>, <a
-href="glossaries-extra-manual.html#dx1-19004" >392</a>, <a
-href="glossaries-extra-manual.html#dx1-21005" >393</a>, <a
-href="glossaries-extra-manual.html#dx1-21014" >394</a>, <a
-href="glossaries-extra-manual.html#dx1-22001" >395</a>, <a
-href="glossaries-extra-manual.html#dx1-23001" >396</a>, <a
-href="glossaries-extra-manual.html#dx1-24020" >397</a>, <a
-href="glossaries-extra-manual.html#dx1-24048" >398</a>, <a
-href="glossaries-extra-manual.html#dx1-24052" >399</a>, <a
-href="glossaries-extra-manual.html#dx1-24056" >400</a>, <a
-href="glossaries-extra-manual.html#dx1-24060" >401</a>, <a
-href="glossaries-extra-manual.html#dx1-26024" >402</a>, <a
-href="glossaries-extra-manual.html#dx1-26106" >403</a>, <a
-href="glossaries-extra-manual.html#dx1-26119" >404</a>, <a
-href="glossaries-extra-manual.html#dx1-26122" >405</a>, <a
-href="glossaries-extra-manual.html#dx1-26123" >406</a>, <a
-href="glossaries-extra-manual.html#dx1-26126" >407</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-8010" >453</a>, <a
+href="glossaries-extra-manual.html#dx1-8019" >454</a>, <a
+href="glossaries-extra-manual.html#dx1-8022" >455</a>, <a
+href="glossaries-extra-manual.html#dx1-8028" >456</a>, <a
+href="glossaries-extra-manual.html#dx1-19004" >457</a>, <a
+href="glossaries-extra-manual.html#dx1-21005" >458</a>, <a
+href="glossaries-extra-manual.html#dx1-21014" >459</a>, <a
+href="glossaries-extra-manual.html#dx1-21087" >460</a>, <a
+href="glossaries-extra-manual.html#dx1-21089" >461</a>, <a
+href="glossaries-extra-manual.html#dx1-21092" >462</a>, <a
+href="glossaries-extra-manual.html#dx1-22001" >463</a>, <a
+href="glossaries-extra-manual.html#dx1-22099" >464</a>, <a
+href="glossaries-extra-manual.html#dx1-23001" >465</a>, <a
+href="glossaries-extra-manual.html#dx1-23026" >466</a>, <a
+href="glossaries-extra-manual.html#dx1-23043" >467</a>, <a
+href="glossaries-extra-manual.html#dx1-23046" >468</a>, <a
+href="glossaries-extra-manual.html#dx1-23067" >469</a>, <a
+href="glossaries-extra-manual.html#dx1-23079" >470</a>, <a
+href="glossaries-extra-manual.html#dx1-23103" >471</a>, <a
+href="glossaries-extra-manual.html#dx1-24022" >472</a>, <a
+href="glossaries-extra-manual.html#dx1-24053" >473</a>, <a
+href="glossaries-extra-manual.html#dx1-24057" >474</a>, <a
+href="glossaries-extra-manual.html#dx1-24061" >475</a>, <a
+href="glossaries-extra-manual.html#dx1-24065" >476</a>, <a
+href="glossaries-extra-manual.html#dx1-24081" >477</a>, <a
+href="glossaries-extra-manual.html#dx1-26024" >478</a>, <a
+href="glossaries-extra-manual.html#dx1-26119" >479</a>, <a
+href="glossaries-extra-manual.html#dx1-26132" >480</a>, <a
+href="glossaries-extra-manual.html#dx1-26135" >481</a>, <a
+href="glossaries-extra-manual.html#dx1-26136" >482</a>, <a
+href="glossaries-extra-manual.html#dx1-26139" >483</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">retainfirstuseperiod</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26050" >408</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26050" >484</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">tagging</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-18002" >409</a>, <a
-href="glossaries-extra-manual.html#dx1-18005" >410</a>, <a
-href="glossaries-extra-manual.html#dx1-18008" >411</a>, <a
-href="glossaries-extra-manual.html#dx1-26069" >412</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-18002" >485</a>, <a
+href="glossaries-extra-manual.html#dx1-18005" >486</a>, <a
+href="glossaries-extra-manual.html#dx1-18008" >487</a>, <a
+href="glossaries-extra-manual.html#dx1-26082" >488</a> <br /></span>
+
+
+
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">targetcategory</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26103" >413</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26116" >489</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">targetname</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26100" >414</a>, <a
-href="glossaries-extra-manual.html#dx1-26102" >415</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26113" >490</a>, <a
+href="glossaries-extra-manual.html#dx1-26115" >491</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">targeturl</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-5004" >416</a>, <a
-href="glossaries-extra-manual.html#dx1-26098" >417</a>, <a
-href="glossaries-extra-manual.html#dx1-26101" >418</a>, <a
-href="glossaries-extra-manual.html#dx1-34007" >419</a>, <a
-href="glossaries-extra-manual.html#dx1-38009" >420</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-5004" >492</a>, <a
+href="glossaries-extra-manual.html#dx1-26111" >493</a>, <a
+href="glossaries-extra-manual.html#dx1-26114" >494</a>, <a
+href="glossaries-extra-manual.html#dx1-34007" >495</a>, <a
+href="glossaries-extra-manual.html#dx1-38009" >496</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">unitcount</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27030" >421</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27031" >497</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">wrgloss</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-6013" >422</a>, <a
-href="glossaries-extra-manual.html#dx1-26039" >423</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-6013" >498</a>, <a
+href="glossaries-extra-manual.html#dx1-26039" >499</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\cGLS</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27011" ><span
-class="cmti-10">424</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27012" ><span
+class="cmti-10">500</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\cGLSformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27013" ><span
-class="cmti-10">425</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27014" ><span
+class="cmti-10">501</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\cGLSpl</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27012" ><span
-class="cmti-10">426</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27013" ><span
+class="cmti-10">502</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\cGLSplformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27014" ><span
-class="cmti-10">427</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27015" ><span
+class="cmti-10">503</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\csGlsXtrLetField</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32022" ><span
-class="cmti-10">428</span></a> <br /></span>
+class="cmti-10">504</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\CustomAbbreviationFields</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-24006" ><span
-class="cmti-10">429</span></a> <br /></span>
+class="cmti-10">505</span></a> <br /></span>
</p><p class="theindex"> <span
class="cmbx-10">D</span>
<span class="index-item"><span
class="cmss-10">datatool-base </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8" >430</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-8" >506</a> <br /></span>
</p><p class="theindex"> <span
class="cmbx-10">E</span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\eglssetwidest</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16013" ><span
-class="cmti-10">431</span></a> <br /></span>
+class="cmti-10">507</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\eGlsXtrSetField</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32019" ><span
-class="cmti-10">432</span></a> <br /></span>
+class="cmti-10">508</span></a> <br /></span>
<span class="index-item">entry location&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-40003" ><span
-class="cmbx-10">433</span></a>, <a
-href="glossaries-extra-manual.html#dx1-40023" >434</a>, <a
-href="glossaries-extra-manual.html#dx1-40034" >435</a> <br /></span>
+class="cmbx-10">509</span></a>, <a
+href="glossaries-extra-manual.html#dx1-40023" >510</a>, <a
+href="glossaries-extra-manual.html#dx1-40034" >511</a> <br /></span>
<span class="index-item"><span
class="cmss-10">etoolbox </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4" >436</a>, <a
-href="glossaries-extra-manual.html#dx1-26112" >437</a>, <a
-href="glossaries-extra-manual.html#dx1-32016" >438</a>, <a
-href="glossaries-extra-manual.html#dx1-32028" >439</a>, <a
-href="glossaries-extra-manual.html#dx1-32029" >440</a>, <a
-href="glossaries-extra-manual.html#dx1-32038" >441</a> <br /></span>
-
-
-
+href="glossaries-extra-manual.html#dx1-4" >512</a>, <a
+href="glossaries-extra-manual.html#dx1-26125" >513</a>, <a
+href="glossaries-extra-manual.html#dx1-32016" >514</a>, <a
+href="glossaries-extra-manual.html#dx1-32028" >515</a>, <a
+href="glossaries-extra-manual.html#dx1-32029" >516</a>, <a
+href="glossaries-extra-manual.html#dx1-32038" >517</a> <br /></span>
</p><p class="theindex"> <span
class="cmbx-10">F</span>
<span class="index-item">first use&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-6003" >442</a>, <a
-href="glossaries-extra-manual.html#dx1-8015" >443</a>, <a
-href="glossaries-extra-manual.html#dx1-8041" >444</a>, <a
-href="glossaries-extra-manual.html#dx1-8042" >445</a>, <a
-href="glossaries-extra-manual.html#dx1-8045" >446</a>, <a
-href="glossaries-extra-manual.html#dx1-8050" >447</a>, <a
-href="glossaries-extra-manual.html#dx1-8054" >448</a>, <a
-href="glossaries-extra-manual.html#dx1-8057" >449</a>, <a
-href="glossaries-extra-manual.html#dx1-8059" >450</a>, <a
-href="glossaries-extra-manual.html#dx1-8061" >451</a>, <a
-href="glossaries-extra-manual.html#dx1-11008" >452</a>, <a
-href="glossaries-extra-manual.html#dx1-11019" >453</a>, <a
-href="glossaries-extra-manual.html#dx1-11020" >454</a>, <a
-href="glossaries-extra-manual.html#dx1-11021" >455</a>, <a
-href="glossaries-extra-manual.html#dx1-11022" >456</a>, <a
-href="glossaries-extra-manual.html#dx1-11026" >457</a>, <a
-href="glossaries-extra-manual.html#dx1-11030" >458</a>, <a
-href="glossaries-extra-manual.html#dx1-11034" >459</a>, <a
-href="glossaries-extra-manual.html#dx1-11048" >460</a>, <a
-href="glossaries-extra-manual.html#dx1-11049" >461</a>, <a
-href="glossaries-extra-manual.html#dx1-12057" >462</a>, <a
-href="glossaries-extra-manual.html#dx1-12058" >463</a>, <a
-href="glossaries-extra-manual.html#dx1-17001" >464</a>, <a
-href="glossaries-extra-manual.html#dx1-17017" >465</a>, <a
-href="glossaries-extra-manual.html#dx1-17027" >466</a>, <a
-href="glossaries-extra-manual.html#dx1-17036" >467</a>, <a
-href="glossaries-extra-manual.html#dx1-19016" >468</a>, <a
-href="glossaries-extra-manual.html#dx1-19018" >469</a>, <a
-href="glossaries-extra-manual.html#dx1-21006" >470</a>, <a
-href="glossaries-extra-manual.html#dx1-21020" >471</a>, <a
-href="glossaries-extra-manual.html#dx1-22003" >472</a>, <a
-href="glossaries-extra-manual.html#dx1-23003" >473</a>, <a
-href="glossaries-extra-manual.html#dx1-23035" >474</a>, <a
-href="glossaries-extra-manual.html#dx1-23062" >475</a>, <a
-href="glossaries-extra-manual.html#dx1-23083" >476</a>, <a
-href="glossaries-extra-manual.html#dx1-23106" >477</a>, <a
-href="glossaries-extra-manual.html#dx1-23108" >478</a>, <a
-href="glossaries-extra-manual.html#dx1-23113" >479</a>, <a
-href="glossaries-extra-manual.html#dx1-23135" >480</a>, <a
-href="glossaries-extra-manual.html#dx1-23139" >481</a>, <a
-href="glossaries-extra-manual.html#dx1-24039" >482</a>, <a
-href="glossaries-extra-manual.html#dx1-24043" >483</a>, <a
-href="glossaries-extra-manual.html#dx1-24047" >484</a>, <a
-href="glossaries-extra-manual.html#dx1-24051" >485</a>, <a
-href="glossaries-extra-manual.html#dx1-24055" >486</a>, <a
-href="glossaries-extra-manual.html#dx1-24059" >487</a>, <a
-href="glossaries-extra-manual.html#dx1-26027" >488</a>, <a
-href="glossaries-extra-manual.html#dx1-26029" >489</a>, <a
-href="glossaries-extra-manual.html#dx1-26051" >490</a>, <a
-href="glossaries-extra-manual.html#dx1-27035" >491</a>, <a
-href="glossaries-extra-manual.html#dx1-38001" >492</a>, <a
+href="glossaries-extra-manual.html#dx1-6003" >518</a>, <a
+href="glossaries-extra-manual.html#dx1-8015" >519</a>, <a
+href="glossaries-extra-manual.html#dx1-8041" >520</a>, <a
+href="glossaries-extra-manual.html#dx1-8042" >521</a>, <a
+href="glossaries-extra-manual.html#dx1-8045" >522</a>, <a
+href="glossaries-extra-manual.html#dx1-8050" >523</a>, <a
+href="glossaries-extra-manual.html#dx1-8054" >524</a>, <a
+href="glossaries-extra-manual.html#dx1-8057" >525</a>, <a
+href="glossaries-extra-manual.html#dx1-8059" >526</a>, <a
+href="glossaries-extra-manual.html#dx1-8061" >527</a>, <a
+href="glossaries-extra-manual.html#dx1-11008" >528</a>, <a
+href="glossaries-extra-manual.html#dx1-11019" >529</a>, <a
+href="glossaries-extra-manual.html#dx1-11020" >530</a>, <a
+href="glossaries-extra-manual.html#dx1-11021" >531</a>, <a
+href="glossaries-extra-manual.html#dx1-11022" >532</a>, <a
+href="glossaries-extra-manual.html#dx1-11026" >533</a>, <a
+href="glossaries-extra-manual.html#dx1-11030" >534</a>, <a
+href="glossaries-extra-manual.html#dx1-11034" >535</a>, <a
+href="glossaries-extra-manual.html#dx1-11048" >536</a>, <a
+href="glossaries-extra-manual.html#dx1-11049" >537</a>, <a
+href="glossaries-extra-manual.html#dx1-12057" >538</a>, <a
+href="glossaries-extra-manual.html#dx1-12058" >539</a>, <a
+href="glossaries-extra-manual.html#dx1-17001" >540</a>, <a
+href="glossaries-extra-manual.html#dx1-17016" >541</a>, <a
+href="glossaries-extra-manual.html#dx1-19017" >542</a>, <a
+href="glossaries-extra-manual.html#dx1-19019" >543</a>, <a
+href="glossaries-extra-manual.html#dx1-21006" >544</a>, <a
+href="glossaries-extra-manual.html#dx1-21020" >545</a>, <a
+href="glossaries-extra-manual.html#dx1-22003" >546</a>, <a
+href="glossaries-extra-manual.html#dx1-23003" >547</a>, <a
+href="glossaries-extra-manual.html#dx1-23048" >548</a>, <a
+href="glossaries-extra-manual.html#dx1-23081" >549</a>, <a
+href="glossaries-extra-manual.html#dx1-23105" >550</a>, <a
+href="glossaries-extra-manual.html#dx1-23128" >551</a>, <a
+href="glossaries-extra-manual.html#dx1-23130" >552</a>, <a
+href="glossaries-extra-manual.html#dx1-23135" >553</a>, <a
+href="glossaries-extra-manual.html#dx1-23157" >554</a>, <a
+href="glossaries-extra-manual.html#dx1-23161" >555</a>, <a
+href="glossaries-extra-manual.html#dx1-24044" >556</a>, <a
+href="glossaries-extra-manual.html#dx1-24048" >557</a>, <a
+href="glossaries-extra-manual.html#dx1-24052" >558</a>, <a
+href="glossaries-extra-manual.html#dx1-24056" >559</a>, <a
+href="glossaries-extra-manual.html#dx1-24060" >560</a>, <a
+href="glossaries-extra-manual.html#dx1-24064" >561</a>, <a
+href="glossaries-extra-manual.html#dx1-26027" >562</a>, <a
+href="glossaries-extra-manual.html#dx1-26029" >563</a>, <a
+href="glossaries-extra-manual.html#dx1-26051" >564</a>, <a
+href="glossaries-extra-manual.html#dx1-27036" >565</a>, <a
+href="glossaries-extra-manual.html#dx1-38001" >566</a>, <a
href="glossaries-extra-manual.html#dx1-40004" ><span
-class="cmbx-10">493</span></a>, <a
-href="glossaries-extra-manual.html#dx1-40013" >494</a>, <a
-href="glossaries-extra-manual.html#dx1-40015" >495</a> <br /></span>
+class="cmbx-10">567</span></a>, <a
+href="glossaries-extra-manual.html#dx1-40013" >568</a>, <a
+href="glossaries-extra-manual.html#dx1-40015" >569</a> <br /></span>
<span class="index-item">first use flag&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8048" >496</a>, <a
-href="glossaries-extra-manual.html#dx1-25001" >497</a>, <a
-href="glossaries-extra-manual.html#dx1-27004" >498</a>, <a
-href="glossaries-extra-manual.html#dx1-27018" >499</a>, <a
+href="glossaries-extra-manual.html#dx1-8048" >570</a>, <a
+href="glossaries-extra-manual.html#dx1-25001" >571</a>, <a
+href="glossaries-extra-manual.html#dx1-27004" >572</a>, <a
+href="glossaries-extra-manual.html#dx1-27019" >573</a>, <a
href="glossaries-extra-manual.html#dx1-40012" ><span
-class="cmbx-10">500</span></a> <br /></span>
+class="cmbx-10">574</span></a> <br /></span>
<span class="index-item">first use text&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-40014" ><span
-class="cmbx-10">501</span></a>, <a
-href="glossaries-extra-manual.html#dx1-40037" >502</a> <br /></span>
+class="cmbx-10">575</span></a>, <a
+href="glossaries-extra-manual.html#dx1-40037" >576</a> <br /></span>
<span class="index-item"><span
class="cmss-10">fontenc </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21024" >503</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21024" >577</a> <br /></span>
</p><p class="theindex"> <span
class="cmbx-10">G</span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\gGlsXtrSetField</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32018" ><span
-class="cmti-10">504</span></a> <br /></span>
+class="cmti-10">578</span></a> <br /></span>
<span class="index-item"><span
class="cmss-10">glossaries </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-5019" >505</a>, <a
-href="glossaries-extra-manual.html#dx1-7047" >506</a>, <a
-href="glossaries-extra-manual.html#dx1-10001" >507</a>, <a
-href="glossaries-extra-manual.html#dx1-10003" >508</a>, <a
-href="glossaries-extra-manual.html#dx1-10012" >509</a>, <a
-href="glossaries-extra-manual.html#dx1-10029" >510</a>, <a
-href="glossaries-extra-manual.html#dx1-13002" >511</a>, <a
-href="glossaries-extra-manual.html#dx1-13003" >512</a>, <a
-href="glossaries-extra-manual.html#dx1-26031" >513</a>, <a
-href="glossaries-extra-manual.html#dx1-32026" >514</a>, <a
-href="glossaries-extra-manual.html#dx1-33007" >515</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-5019" >579</a>, <a
+href="glossaries-extra-manual.html#dx1-7047" >580</a>, <a
+href="glossaries-extra-manual.html#dx1-10001" >581</a>, <a
+href="glossaries-extra-manual.html#dx1-10003" >582</a>, <a
+href="glossaries-extra-manual.html#dx1-10012" >583</a>, <a
+href="glossaries-extra-manual.html#dx1-10029" >584</a>, <a
+href="glossaries-extra-manual.html#dx1-13002" >585</a>, <a
+href="glossaries-extra-manual.html#dx1-13003" >586</a>, <a
+href="glossaries-extra-manual.html#dx1-26031" >587</a>, <a
+href="glossaries-extra-manual.html#dx1-32026" >588</a>, <a
+href="glossaries-extra-manual.html#dx1-33007" >589</a> <br /></span>
<span class="index-item"><span
class="cmss-10">glossaries-accsupp </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4003" >516</a>, <a
-href="glossaries-extra-manual.html#dx1-4004" >517</a>, <a
-href="glossaries-extra-manual.html#dx1-4007" >518</a>, <a
-href="glossaries-extra-manual.html#dx1-4010" >519</a>, <a
-href="glossaries-extra-manual.html#dx1-24076" >520</a>, <a
-href="glossaries-extra-manual.html#dx1-24077" >521</a>, <a
-href="glossaries-extra-manual.html#dx1-35002" >522</a>, <a
-href="glossaries-extra-manual.html#dx1-37001" >523</a>, <a
-href="glossaries-extra-manual.html#dx1-37003" >524</a>, <a
-href="glossaries-extra-manual.html#dx1-37004" >525</a>, <a
-href="glossaries-extra-manual.html#dx1-37007" >526</a>, <a
-href="glossaries-extra-manual.html#dx1-37009" >527</a>, <a
-href="glossaries-extra-manual.html#dx1-37011" >528</a>, <a
-href="glossaries-extra-manual.html#dx1-37012" >529</a>, <a
-href="glossaries-extra-manual.html#dx1-38021" >530</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4005" >590</a>, <a
+href="glossaries-extra-manual.html#dx1-4006" >591</a>, <a
+href="glossaries-extra-manual.html#dx1-4009" >592</a>, <a
+href="glossaries-extra-manual.html#dx1-4012" >593</a>, <a
+href="glossaries-extra-manual.html#dx1-24086" >594</a>, <a
+href="glossaries-extra-manual.html#dx1-24087" >595</a>, <a
+href="glossaries-extra-manual.html#dx1-35002" >596</a>, <a
+href="glossaries-extra-manual.html#dx1-37001" >597</a>, <a
+href="glossaries-extra-manual.html#dx1-37003" >598</a>, <a
+href="glossaries-extra-manual.html#dx1-37004" >599</a>, <a
+href="glossaries-extra-manual.html#dx1-37007" >600</a>, <a
+href="glossaries-extra-manual.html#dx1-37009" >601</a>, <a
+href="glossaries-extra-manual.html#dx1-37011" >602</a>, <a
+href="glossaries-extra-manual.html#dx1-37012" >603</a>, <a
+href="glossaries-extra-manual.html#dx1-38021" >604</a> <br /></span>
<span class="index-item"><span
class="cmss-10">glossaries-extra </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-5021" >531</a>, <a
-href="glossaries-extra-manual.html#dx1-13004" >532</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-5021" >605</a>, <a
+href="glossaries-extra-manual.html#dx1-13004" >606</a> <br /></span>
<span class="index-item"><span
class="cmss-10">glossaries-extra-stylemods </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4012" >533</a>, <a
-href="glossaries-extra-manual.html#dx1-16001" >534</a>, <a
-href="glossaries-extra-manual.html#dx1-16002" >535</a>, <a
-href="glossaries-extra-manual.html#dx1-38011" >536</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4014" >607</a>, <a
+href="glossaries-extra-manual.html#dx1-16001" >608</a>, <a
+href="glossaries-extra-manual.html#dx1-16002" >609</a>, <a
+href="glossaries-extra-manual.html#dx1-38011" >610</a> <br /></span>
<span class="index-item"><span
class="cmss-10">glossaries-prefix </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-35001" >537</a>, <a
-href="glossaries-extra-manual.html#dx1-36001" >538</a>, <a
-href="glossaries-extra-manual.html#dx1-38022" >539</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-35001" >611</a>, <a
+href="glossaries-extra-manual.html#dx1-36001" >612</a>, <a
+href="glossaries-extra-manual.html#dx1-38022" >613</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glossariesextrasetup</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4122" ><span
-class="cmti-10">540</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4125" ><span
+class="cmti-10">614</span></a> <br /></span>
<span class="index-item">glossary styles:<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">alttree</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-16010" >541</a>, <a
-href="glossaries-extra-manual.html#dx1-16021" >542</a>, <a
-href="glossaries-extra-manual.html#dx1-16040" >543</a>, <a
-href="glossaries-extra-manual.html#dx1-16043" >544</a>, <a
-href="glossaries-extra-manual.html#dx1-38012" >545</a>, <a
-href="glossaries-extra-manual.html#dx1-38013" >546</a>, <a
-href="glossaries-extra-manual.html#dx1-38014" >547</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-16010" >615</a>, <a
+href="glossaries-extra-manual.html#dx1-16021" >616</a>, <a
+href="glossaries-extra-manual.html#dx1-16040" >617</a>, <a
+href="glossaries-extra-manual.html#dx1-16043" >618</a>, <a
+href="glossaries-extra-manual.html#dx1-38012" >619</a>, <a
+href="glossaries-extra-manual.html#dx1-38013" >620</a>, <a
+href="glossaries-extra-manual.html#dx1-38014" >621</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">inline</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-16006" >548</a>, <a
-href="glossaries-extra-manual.html#dx1-16008" >549</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-16006" >622</a>, <a
+href="glossaries-extra-manual.html#dx1-16008" >623</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long3col</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-16004" >550</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-16004" >624</a> <br /></span>
<span class="index-item"><span
class="cmss-10">glossary-inline </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-16007" >551</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-16007" >625</a> <br /></span>
<span class="index-item"><span
class="cmss-10">glossary-tree </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-16011" >552</a>, <a
-href="glossaries-extra-manual.html#dx1-16014" >553</a>, <a
-href="glossaries-extra-manual.html#dx1-16018" >554</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-16011" >626</a>, <a
+href="glossaries-extra-manual.html#dx1-16014" >627</a>, <a
+href="glossaries-extra-manual.html#dx1-16018" >628</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glossxtrsetpopts</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-11058" ><span
-class="cmti-10">555</span></a> <br /></span>
+class="cmti-10">629</span></a> <br /></span>
+
+
+
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsabbrvdefaultfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17021" ><span
-class="cmti-10">556</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21029" ><span
+class="cmti-10">630</span></a>, <a
+href="glossaries-extra-manual.html#dx1-21039" ><span
+class="cmti-10">631</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsabbrvemfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21038" ><span
-class="cmti-10">557</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21053" ><span
+class="cmti-10">632</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsabbrvfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17018" ><span
-class="cmti-10">558</span></a>, <a
-href="glossaries-extra-manual.html#dx1-24042" ><span
-class="cmti-10">559</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24047" ><span
+class="cmti-10">633</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsabbrvhyphenfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21065" ><span
+class="cmti-10">634</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsabbrvonlyfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21071" ><span
+class="cmti-10">635</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsabbrvscfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21037" ><span
+class="cmti-10">636</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsabbrvsmfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21047" ><span
+class="cmti-10">637</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsabbrvuserfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23031" ><span
-class="cmti-10">560</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21060" ><span
+class="cmti-10">638</span></a>, <a
+href="glossaries-extra-manual.html#dx1-23038" ><span
+class="cmti-10">639</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsaccessdesc</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37039" ><span
-class="cmti-10">561</span></a> <br /></span>
+class="cmti-10">640</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsaccessdesc</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37037" ><span
-class="cmti-10">562</span></a> <br /></span>
+class="cmti-10">641</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsaccessdescplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37043" ><span
-class="cmti-10">563</span></a> <br /></span>
+class="cmti-10">642</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsaccessdescplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37041" ><span
-class="cmti-10">564</span></a> <br /></span>
+class="cmti-10">643</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsaccessfirst</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37023" ><span
-class="cmti-10">565</span></a> <br /></span>
+class="cmti-10">644</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsaccessfirst</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37021" ><span
-class="cmti-10">566</span></a> <br /></span>
+class="cmti-10">645</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsaccessfirstplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37027" ><span
-class="cmti-10">567</span></a> <br /></span>
+class="cmti-10">646</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsaccessfirstplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37025" ><span
-class="cmti-10">568</span></a> <br /></span>
+class="cmti-10">647</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsaccesslong</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37055" ><span
-class="cmti-10">569</span></a> <br /></span>
+class="cmti-10">648</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsaccesslong</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37053" ><span
-class="cmti-10">570</span></a> <br /></span>
+class="cmti-10">649</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsaccesslongpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37059" ><span
-class="cmti-10">571</span></a> <br /></span>
+class="cmti-10">650</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsaccesslongpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37057" ><span
-class="cmti-10">572</span></a> <br /></span>
+class="cmti-10">651</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsaccessname</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37010" ><span
-class="cmti-10">573</span></a> <br /></span>
+class="cmti-10">652</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsaccessname</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37005" ><span
-class="cmti-10">574</span></a> <br /></span>
+class="cmti-10">653</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsaccessplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37019" ><span
-class="cmti-10">575</span></a> <br /></span>
+class="cmti-10">654</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsaccessplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37017" ><span
-class="cmti-10">576</span></a> <br /></span>
+class="cmti-10">655</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsaccessshort</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37047" ><span
-class="cmti-10">577</span></a> <br /></span>
+class="cmti-10">656</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsaccessshort</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37045" ><span
-class="cmti-10">578</span></a> <br /></span>
-
-
-
+class="cmti-10">657</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsaccessshortpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37051" ><span
-class="cmti-10">579</span></a> <br /></span>
+class="cmti-10">658</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsaccessshortpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37049" ><span
-class="cmti-10">580</span></a> <br /></span>
+class="cmti-10">659</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsaccesssymbol</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37031" ><span
-class="cmti-10">581</span></a> <br /></span>
+class="cmti-10">660</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsaccesssymbol</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37029" ><span
-class="cmti-10">582</span></a> <br /></span>
+class="cmti-10">661</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsaccesssymbolplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37035" ><span
-class="cmti-10">583</span></a> <br /></span>
+class="cmti-10">662</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsaccesssymbolplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37033" ><span
-class="cmti-10">584</span></a> <br /></span>
+class="cmti-10">663</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsaccesstext</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37015" ><span
-class="cmti-10">585</span></a> <br /></span>
+class="cmti-10">664</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsaccesstext</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-37013" ><span
-class="cmti-10">586</span></a> <br /></span>
+class="cmti-10">665</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsacspace</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-12052" ><span
-class="cmti-10">587</span></a> <br /></span>
+class="cmti-10">666</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsacspacemax</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-12054" ><span
-class="cmti-10">588</span></a> <br /></span>
+class="cmti-10">667</span></a> <br /></span>
<span class="index-item"><span
class="cmtt-10">\glsadd </span>options<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">theHvalue</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-6018" >589</a>, <a
-href="glossaries-extra-manual.html#dx1-6026" >590</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-6018" >668</a>, <a
+href="glossaries-extra-manual.html#dx1-6026" >669</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">thevalue</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-6017" >591</a>, <a
-href="glossaries-extra-manual.html#dx1-6023" >592</a>, <a
-href="glossaries-extra-manual.html#dx1-38023" >593</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-6017" >670</a>, <a
+href="glossaries-extra-manual.html#dx1-6023" >671</a>, <a
+href="glossaries-extra-manual.html#dx1-38023" >672</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glscategory</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-26019" ><span
-class="cmti-10">594</span></a> <br /></span>
+class="cmti-10">673</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glscategorylabel</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24033" ><span
-class="cmti-10">595</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24039" ><span
+class="cmti-10">674</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glscurrententrylabel</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14016" ><span
-class="cmti-10">596</span></a> <br /></span>
+class="cmti-10">675</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsentrycurrcount</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27031" ><span
-class="cmti-10">597</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27032" ><span
+class="cmti-10">676</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsentryprevcount</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27032" ><span
-class="cmti-10">598</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27033" ><span
+class="cmti-10">677</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsentryprevmaxcount</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27034" ><span
-class="cmti-10">599</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27035" ><span
+class="cmti-10">678</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsentryprevtotalcount</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27033" ><span
-class="cmti-10">600</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27034" ><span
+class="cmti-10">679</span></a> <br /></span>
+
+
+
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsFindWidestAnyName</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16024" ><span
-class="cmti-10">601</span></a> <br /></span>
+class="cmti-10">680</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsFindWidestAnyNameLocation</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16036" ><span
-class="cmti-10">602</span></a> <br /></span>
+class="cmti-10">681</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsFindWidestAnyNameSymbol</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16028" ><span
-class="cmti-10">603</span></a> <br /></span>
+class="cmti-10">682</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsFindWidestAnyNameSymbolLocation</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16033" ><span
-class="cmti-10">604</span></a> <br /></span>
+class="cmti-10">683</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsFindWidestLevelTwo</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16026" ><span
-class="cmti-10">605</span></a> <br /></span>
+class="cmti-10">684</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsFindWidestTopLevelName</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16019" ><span
-class="cmti-10">606</span></a> <br /></span>
+class="cmti-10">685</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsFindWidestUsedAnyName</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16022" ><span
-class="cmti-10">607</span></a> <br /></span>
+class="cmti-10">686</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsFindWidestUsedAnyNameLocation</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16034" ><span
-class="cmti-10">608</span></a> <br /></span>
+class="cmti-10">687</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsFindWidestUsedAnyNameSymbol</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16027" ><span
-class="cmti-10">609</span></a> <br /></span>
+class="cmti-10">688</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsFindWidestUsedAnyNameSymbolLocation</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16029" ><span
-class="cmti-10">610</span></a> <br /></span>
+class="cmti-10">689</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsFindWidestUsedLevelTwo</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16025" ><span
-class="cmti-10">611</span></a> <br /></span>
+class="cmti-10">690</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsFindWidestUsedTopLevelName</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16020" ><span
-class="cmti-10">612</span></a> <br /></span>
+class="cmti-10">691</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfirstabbrvdefaultfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17024" ><span
-class="cmti-10">613</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21030" ><span
+class="cmti-10">692</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfirstabbrvemfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21039" ><span
-class="cmti-10">614</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21054" ><span
+class="cmti-10">693</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfirstabbrvfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17016" ><span
-class="cmti-10">615</span></a>, <a
-href="glossaries-extra-manual.html#dx1-24040" ><span
-class="cmti-10">616</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24045" ><span
+class="cmti-10">694</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsfirstabbrvhyphenfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21066" ><span
+class="cmti-10">695</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsfirstabbrvonlyfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21072" ><span
+class="cmti-10">696</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsfirstabbrvsmfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21049" ><span
+class="cmti-10">697</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsfirstabbrvuserfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21061" ><span
+class="cmti-10">698</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfirstlongdefaultfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17030" ><span
-class="cmti-10">617</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21032" ><span
+class="cmti-10">699</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfirstlongemfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17032" ><span
-class="cmti-10">618</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21058" ><span
+class="cmti-10">700</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfirstlongfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17026" ><span
-class="cmti-10">619</span></a>, <a
-href="glossaries-extra-manual.html#dx1-24044" ><span
-class="cmti-10">620</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24049" ><span
+class="cmti-10">701</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfirstlongfootnotefont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23112" ><span
-class="cmti-10">621</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23134" ><span
+class="cmti-10">702</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsfirstlonghyphenfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21068" ><span
+class="cmti-10">703</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsfirstlongonlyfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21074" ><span
+class="cmti-10">704</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsfirstlonguserfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21063" ><span
+class="cmti-10">705</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsfmtfirst</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25040" ><span
-class="cmti-10">622</span></a> <br /></span>
+class="cmti-10">706</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfmtfirst</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25039" ><span
-class="cmti-10">623</span></a> <br /></span>
+class="cmti-10">707</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsfmtfirstpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25042" ><span
-class="cmti-10">624</span></a> <br /></span>
+class="cmti-10">708</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfmtfirstpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25041" ><span
-class="cmti-10">625</span></a> <br /></span>
+class="cmti-10">709</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsfmtfull</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25031" ><span
-class="cmti-10">626</span></a> <br /></span>
+class="cmti-10">710</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfmtfull</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25029" ><span
-class="cmti-10">627</span></a> <br /></span>
+class="cmti-10">711</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsfmtfullpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25032" ><span
-class="cmti-10">628</span></a> <br /></span>
-
-
-
+class="cmti-10">712</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfmtfullpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25030" ><span
-class="cmti-10">629</span></a> <br /></span>
+class="cmti-10">713</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsfmtlong</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25027" ><span
-class="cmti-10">630</span></a> <br /></span>
+class="cmti-10">714</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfmtlong</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25025" ><span
-class="cmti-10">631</span></a> <br /></span>
+class="cmti-10">715</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsfmtlongpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25028" ><span
-class="cmti-10">632</span></a> <br /></span>
+class="cmti-10">716</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfmtlongpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25026" ><span
-class="cmti-10">633</span></a> <br /></span>
+class="cmti-10">717</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsfmtplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25037" ><span
-class="cmti-10">634</span></a> <br /></span>
+class="cmti-10">718</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfmtplural</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25036" ><span
-class="cmti-10">635</span></a> <br /></span>
+class="cmti-10">719</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsfmtshort</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25023" ><span
-class="cmti-10">636</span></a> <br /></span>
+class="cmti-10">720</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfmtshort</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25021" ><span
-class="cmti-10">637</span></a> <br /></span>
+class="cmti-10">721</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsfmtshortpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25024" ><span
-class="cmti-10">638</span></a> <br /></span>
+class="cmti-10">722</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfmtshortpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25022" ><span
-class="cmti-10">639</span></a> <br /></span>
+class="cmti-10">723</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsfmttext</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25035" ><span
-class="cmti-10">640</span></a> <br /></span>
+class="cmti-10">724</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsfmttext</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25034" ><span
-class="cmti-10">641</span></a> <br /></span>
+class="cmti-10">725</span></a> <br /></span>
+
+
+
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsforeachwithattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26127" ><span
-class="cmti-10">642</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26140" ><span
+class="cmti-10">726</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsgetattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26110" ><span
-class="cmti-10">643</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26123" ><span
+class="cmti-10">727</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsgetcategoryattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26109" ><span
-class="cmti-10">644</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26122" ><span
+class="cmti-10">728</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsgetwidestname</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16016" ><span
-class="cmti-10">645</span></a> <br /></span>
+class="cmti-10">729</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsgetwidestsubname</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16017" ><span
-class="cmti-10">646</span></a> <br /></span>
+class="cmti-10">730</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glshasattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26113" ><span
-class="cmti-10">647</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26126" ><span
+class="cmti-10">731</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glshascategoryattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26111" ><span
-class="cmti-10">648</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26124" ><span
+class="cmti-10">732</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsifattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26118" ><span
-class="cmti-10">649</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26131" ><span
+class="cmti-10">733</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsifcategory</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-26020" ><span
-class="cmti-10">650</span></a> <br /></span>
+class="cmti-10">734</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsifcategoryattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26114" ><span
-class="cmti-10">651</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26127" ><span
+class="cmti-10">735</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsifnotregular</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26125" ><span
-class="cmti-10">652</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26138" ><span
+class="cmti-10">736</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsifnotregularcategory</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26124" ><span
-class="cmti-10">653</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26137" ><span
+class="cmti-10">737</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsifregular</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26121" ><span
-class="cmti-10">654</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26134" ><span
+class="cmti-10">738</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsifregularcategory</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26120" ><span
-class="cmti-10">655</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26133" ><span
+class="cmti-10">739</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glskeylisttok</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24031" ><span
-class="cmti-10">656</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24037" ><span
+class="cmti-10">740</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glslabeltok</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24030" ><span
-class="cmti-10">657</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24036" ><span
+class="cmti-10">741</span></a> <br /></span>
<span class="index-item"><span
class="cmtt-10">\glslink </span>options<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">format</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-28021" >658</a>, <a
-href="glossaries-extra-manual.html#dx1-28023" >659</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-28021" >742</a>, <a
+href="glossaries-extra-manual.html#dx1-28023" >743</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">hyper</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-11055" >660</a>, <a
-href="glossaries-extra-manual.html#dx1-26028" >661</a>, <a
-href="glossaries-extra-manual.html#dx1-26036" >662</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-11055" >744</a>, <a
+href="glossaries-extra-manual.html#dx1-26028" >745</a>, <a
+href="glossaries-extra-manual.html#dx1-26036" >746</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">hyper=false</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-25016" >663</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-25016" >747</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">noindex</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-6001" >664</a>, <a
-href="glossaries-extra-manual.html#dx1-6006" >665</a>, <a
-href="glossaries-extra-manual.html#dx1-6010" >666</a>, <a
-href="glossaries-extra-manual.html#dx1-11056" >667</a>, <a
-href="glossaries-extra-manual.html#dx1-25015" >668</a>, <a
-href="glossaries-extra-manual.html#dx1-28033" >669</a>, <a
-href="glossaries-extra-manual.html#dx1-34010" >670</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-6001" >748</a>, <a
+href="glossaries-extra-manual.html#dx1-6006" >749</a>, <a
+href="glossaries-extra-manual.html#dx1-6010" >750</a>, <a
+href="glossaries-extra-manual.html#dx1-11056" >751</a>, <a
+href="glossaries-extra-manual.html#dx1-25015" >752</a>, <a
+href="glossaries-extra-manual.html#dx1-28033" >753</a>, <a
+href="glossaries-extra-manual.html#dx1-34010" >754</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">wrgloss</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-6009" >671</a>, <a
-href="glossaries-extra-manual.html#dx1-6014" >672</a>, <a
-href="glossaries-extra-manual.html#dx1-8069" >673</a>, <a
-href="glossaries-extra-manual.html#dx1-26041" >674</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-6009" >755</a>, <a
+href="glossaries-extra-manual.html#dx1-6014" >756</a>, <a
+href="glossaries-extra-manual.html#dx1-8069" >757</a>, <a
+href="glossaries-extra-manual.html#dx1-26041" >758</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glslinkcheckfirsthyperhook</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27038" ><span
-class="cmti-10">675</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27039" ><span
+class="cmti-10">759</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glslongdefaultfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17031" ><span
-class="cmti-10">676</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21031" ><span
+class="cmti-10">760</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glslongemfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17033" ><span
-class="cmti-10">677</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21059" ><span
+class="cmti-10">761</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glslongfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17028" ><span
-class="cmti-10">678</span></a>, <a
-href="glossaries-extra-manual.html#dx1-24045" ><span
-class="cmti-10">679</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24050" ><span
+class="cmti-10">762</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glslongfootnotefont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23114" ><span
-class="cmti-10">680</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23136" ><span
+class="cmti-10">763</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glslonghyphenfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21067" ><span
+class="cmti-10">764</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glslongonlyfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21073" ><span
+class="cmti-10">765</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glslongpltok</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24027" ><span
-class="cmti-10">681</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24029" ><span
+class="cmti-10">766</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glslongtok</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24026" ><span
-class="cmti-10">682</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24028" ><span
+class="cmti-10">767</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glslonguserfont</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21062" ><span
+class="cmti-10">768</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsnoidxdisplayloc</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-8074" ><span
-class="cmti-10">683</span></a> <br /></span>
+class="cmti-10">769</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsps</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-11053" ><span
-class="cmti-10">684</span></a> <br /></span>
+class="cmti-10">770</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glspt</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-11054" ><span
-class="cmti-10">685</span></a> <br /></span>
+class="cmti-10">771</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glssetattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26108" ><span
-class="cmti-10">686</span></a> <br /></span>
-
-
-
+href="glossaries-extra-manual.html#dx1-26121" ><span
+class="cmti-10">772</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glssetcategoryattribute</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26105" ><span
-class="cmti-10">687</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26118" ><span
+class="cmti-10">773</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glssetregularcategory</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26107" ><span
-class="cmti-10">688</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26120" ><span
+class="cmti-10">774</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsshortpltok</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24023" ><span
-class="cmti-10">689</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24025" ><span
+class="cmti-10">775</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsshorttok</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24022" ><span
-class="cmti-10">690</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24024" ><span
+class="cmti-10">776</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsxtr</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-29014" ><span
-class="cmti-10">691</span></a> <br /></span>
+class="cmti-10">777</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtr</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-29009" ><span
-class="cmti-10">692</span></a> <br /></span>
+class="cmti-10">778</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrabbrvfootnote</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23115" ><span
-class="cmti-10">693</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23137" ><span
+class="cmti-10">779</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrabbrvpluralsuffix</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-10035" ><span
-class="cmti-10">694</span></a> <br /></span>
+class="cmti-10">780</span></a>, <a
+href="glossaries-extra-manual.html#dx1-21033" ><span
+class="cmti-10">781</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtraddallcrossrefs</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-7010" ><span
-class="cmti-10">695</span></a> <br /></span>
+class="cmti-10">782</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtralias</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-34021" ><span
-class="cmti-10">696</span></a> <br /></span>
+class="cmti-10">783</span></a> <br /></span>
+
+
+
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrAltTreeIndent</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16042" ><span
-class="cmti-10">697</span></a> <br /></span>
+class="cmti-10">784</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtralttreeInit</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16041" ><span
-class="cmti-10">698</span></a> <br /></span>
+class="cmti-10">785</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtralttreeSubSymbolDescLocation</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16039" ><span
-class="cmti-10">699</span></a> <br /></span>
+class="cmti-10">786</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtralttreeSymbolDescLocation</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16038" ><span
-class="cmti-10">700</span></a> <br /></span>
+class="cmti-10">787</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrautoindex</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-28015" ><span
-class="cmti-10">701</span></a> <br /></span>
+class="cmti-10">788</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrautoindexassignsort</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-28013" ><span
-class="cmti-10">702</span></a> <br /></span>
+class="cmti-10">789</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrautoindexentry</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-28012" ><span
-class="cmti-10">703</span></a> <br /></span>
+class="cmti-10">790</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrchecknohyperfirst</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-26033" ><span
-class="cmti-10">704</span></a> <br /></span>
+class="cmti-10">791</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrcopytoglossary</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-31007" ><span
-class="cmti-10">705</span></a> <br /></span>
+class="cmti-10">792</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrdeffield</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32015" ><span
-class="cmti-10">706</span></a> <br /></span>
+class="cmti-10">793</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrdisplayendloc</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-8077" ><span
-class="cmti-10">707</span></a> <br /></span>
+class="cmti-10">794</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrdisplayendlochook</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-8079" ><span
-class="cmti-10">708</span></a> <br /></span>
+class="cmti-10">795</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrdisplaysingleloc</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-8075" ><span
-class="cmti-10">709</span></a> <br /></span>
+class="cmti-10">796</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrdisplaystartloc</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-8076" ><span
-class="cmti-10">710</span></a> <br /></span>
+class="cmti-10">797</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrdoautoindexname</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-28009" ><span
-class="cmti-10">711</span></a> <br /></span>
+class="cmti-10">798</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrdowrglossaryhook</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-6016" ><span
-class="cmti-10">712</span></a> <br /></span>
+class="cmti-10">799</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtredeffield</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32017" ><span
-class="cmti-10">713</span></a> <br /></span>
+class="cmti-10">800</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsxtremsuffix</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21055" ><span
+class="cmti-10">801</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrEnableEntryCounting</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27023" ><span
-class="cmti-10">714</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27024" ><span
+class="cmti-10">802</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrEnableEntryUnitCounting</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27026" ><span
-class="cmti-10">715</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27027" ><span
+class="cmti-10">803</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrEnableIndexFormatOverride</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-28024" ><span
-class="cmti-10">716</span></a> <br /></span>
+class="cmti-10">804</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrEnableInitialTagging</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-18001" ><span
-class="cmti-10">717</span></a> <br /></span>
+class="cmti-10">805</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrEnableOnTheFly</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-29007" ><span
-class="cmti-10">718</span></a> <br /></span>
+class="cmti-10">806</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrEnablePreLocationTag</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-15010" ><span
-class="cmti-10">719</span></a> <br /></span>
+class="cmti-10">807</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrentryfmt</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32005" ><span
-class="cmti-10">720</span></a> <br /></span>
+class="cmti-10">808</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrfielddolistloop</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32034" ><span
-class="cmti-10">721</span></a> <br /></span>
+class="cmti-10">809</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrfieldforlistloop</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32035" ><span
-class="cmti-10">722</span></a> <br /></span>
+class="cmti-10">810</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrfieldifinlist</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32036" ><span
-class="cmti-10">723</span></a> <br /></span>
+class="cmti-10">811</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrfieldlistadd</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32030" ><span
-class="cmti-10">724</span></a> <br /></span>
+class="cmti-10">812</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrfieldlisteadd</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32032" ><span
-class="cmti-10">725</span></a> <br /></span>
+class="cmti-10">813</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrfieldlistgadd</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32031" ><span
-class="cmti-10">726</span></a> <br /></span>
+class="cmti-10">814</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrfieldlistxadd</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32033" ><span
-class="cmti-10">727</span></a> <br /></span>
+class="cmti-10">815</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrfieldtitlecasecs</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26082" ><span
-class="cmti-10">728</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26095" ><span
+class="cmti-10">816</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrfieldxifinlist</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32037" ><span
-class="cmti-10">729</span></a> <br /></span>
-<span class="index-item"><span class="obeylines-h"><span class="verb"><span
-class="cmtt-10">\glsxtrfirstscfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21026" ><span
-class="cmti-10">730</span></a> <br /></span>
-<span class="index-item"><span class="obeylines-h"><span class="verb"><span
-class="cmtt-10">\glsxtrfirstsmfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21033" ><span
-class="cmti-10">731</span></a> <br /></span>
+class="cmti-10">817</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrfmt</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32002" ><span
-class="cmti-10">732</span></a> <br /></span>
-
-
-
+class="cmti-10">818</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrFmtDefaultOptions</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32003" ><span
-class="cmti-10">733</span></a> <br /></span>
+class="cmti-10">819</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrFmtField</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32001" ><span
-class="cmti-10">734</span></a> <br /></span>
+class="cmti-10">820</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrFormatLocationList</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-15002" ><span
-class="cmti-10">735</span></a> <br /></span>
+class="cmti-10">821</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GLSxtrfull</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19024" ><span
-class="cmti-10">736</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19025" ><span
+class="cmti-10">822</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsxtrfull</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19021" ><span
-class="cmti-10">737</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19022" ><span
+class="cmti-10">823</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrfull</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-19014" ><span
-class="cmti-10">738</span></a> <br /></span>
+class="cmti-10">824</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsxtrfullformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24053" ><span
-class="cmti-10">739</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24058" ><span
+class="cmti-10">825</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrfullformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24049" ><span
-class="cmti-10">740</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24054" ><span
+class="cmti-10">826</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GLSxtrfullpl</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19033" ><span
-class="cmti-10">741</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19034" ><span
+class="cmti-10">827</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsxtrfullpl</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19032" ><span
-class="cmti-10">742</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19033" ><span
+class="cmti-10">828</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrfullpl</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19031" ><span
-class="cmti-10">743</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19032" ><span
+class="cmti-10">829</span></a> <br /></span>
+
+
+
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsxtrfullplformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24061" ><span
-class="cmti-10">744</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24066" ><span
+class="cmti-10">830</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrfullplformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24057" ><span
-class="cmti-10">745</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24062" ><span
+class="cmti-10">831</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrfullsep</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21040" ><span
-class="cmti-10">746</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21078" ><span
+class="cmti-10">832</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsxtrhyphensuffix</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21069" ><span
+class="cmti-10">833</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrifcounttrigger</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27017" ><span
-class="cmti-10">747</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27018" ><span
+class="cmti-10">834</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrifkeydefined</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32007" ><span
-class="cmti-10">748</span></a> <br /></span>
+class="cmti-10">835</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrifwasfirstuse</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-8049" ><span
-class="cmti-10">749</span></a> <br /></span>
+class="cmti-10">836</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrindexaliased</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-34019" ><span
-class="cmti-10">750</span></a> <br /></span>
+class="cmti-10">837</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrindexseealso</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-7045" ><span
-class="cmti-10">751</span></a> <br /></span>
+class="cmti-10">838</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrinitwrgloss</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-6011" ><span
-class="cmti-10">752</span></a> <br /></span>
+class="cmti-10">839</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsxtrinlinefullformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24068" ><span
-class="cmti-10">753</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24073" ><span
+class="cmti-10">840</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrinlinefullformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24065" ><span
-class="cmti-10">754</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24070" ><span
+class="cmti-10">841</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsxtrinlinefullplformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24075" ><span
-class="cmti-10">755</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24080" ><span
+class="cmti-10">842</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrinlinefullplformat</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24072" ><span
-class="cmti-10">756</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24077" ><span
+class="cmti-10">843</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrinsertinsidetrue</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-17034" ><span
-class="cmti-10">757</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21076" ><span
+class="cmti-10">844</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrLetField</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32021" ><span
-class="cmti-10">758</span></a> <br /></span>
+class="cmti-10">845</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrLetFieldToField</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32023" ><span
-class="cmti-10">759</span></a> <br /></span>
+class="cmti-10">846</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrLoadResources</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-30021" ><span
-class="cmti-10">760</span></a> <br /></span>
+class="cmti-10">847</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrlocrangefmt</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-8078" ><span
-class="cmti-10">761</span></a> <br /></span>
+class="cmti-10">848</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsxtrlong</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19020" ><span
-class="cmti-10">762</span></a>, <a
-href="glossaries-extra-manual.html#dx1-19023" ><span
-class="cmti-10">763</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19021" ><span
+class="cmti-10">849</span></a>, <a
+href="glossaries-extra-manual.html#dx1-19024" ><span
+class="cmti-10">850</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrlong</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-19012" ><span
-class="cmti-10">764</span></a> <br /></span>
+class="cmti-10">851</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsxtrlonghyphen</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23205" ><span
+class="cmti-10">852</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsxtrlonghyphenshort</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23189" ><span
+class="cmti-10">853</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GLSxtrlongpl</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19030" ><span
-class="cmti-10">765</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19031" ><span
+class="cmti-10">854</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsxtrlongpl</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19029" ><span
-class="cmti-10">766</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19030" ><span
+class="cmti-10">855</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrlongpl</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19028" ><span
-class="cmti-10">767</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19029" ><span
+class="cmti-10">856</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrlongshortdescsort</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23038" ><span
-class="cmti-10">768</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23051" ><span
+class="cmti-10">857</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrnewnumber</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4102" ><span
-class="cmti-10">769</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4104" ><span
+class="cmti-10">858</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrnewsymbol</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4099" ><span
-class="cmti-10">770</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4101" ><span
+class="cmti-10">859</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrNoGlsWarningAutoMake</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-39017" ><span
-class="cmti-10">771</span></a> <br /></span>
+class="cmti-10">860</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrNoGlsWarningBuildInfo</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-39016" ><span
-class="cmti-10">772</span></a> <br /></span>
+class="cmti-10">861</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrNoGlsWarningCheckFile</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-39012" ><span
-class="cmti-10">773</span></a> <br /></span>
+class="cmti-10">862</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrNoGlsWarningEmptyMain</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-39010" ><span
-class="cmti-10">774</span></a> <br /></span>
+class="cmti-10">863</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrNoGlsWarningEmptyNotMain</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-39011" ><span
-class="cmti-10">775</span></a> <br /></span>
+class="cmti-10">864</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrNoGlsWarningEmptyStart</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-39009" ><span
-class="cmti-10">776</span></a> <br /></span>
+class="cmti-10">865</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrNoGlsWarningHead</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-39008" ><span
-class="cmti-10">777</span></a> <br /></span>
+class="cmti-10">866</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrNoGlsWarningMisMatch</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-39013" ><span
-class="cmti-10">778</span></a> <br /></span>
+class="cmti-10">867</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrNoGlsWarningNoOut</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-39014" ><span
-class="cmti-10">779</span></a> <br /></span>
-
-
-
+class="cmti-10">868</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrNoGlsWarningTail</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-39015" ><span
-class="cmti-10">780</span></a> <br /></span>
+class="cmti-10">869</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsxtronlysuffix</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21075" ><span
+class="cmti-10">870</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsxtrorglong</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-24034" ><span
+class="cmti-10">871</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsxtrorgshort</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-24033" ><span
+class="cmti-10">872</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsxtrp</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-11061" ><span
-class="cmti-10">781</span></a>, <a
+class="cmti-10">873</span></a>, <a
href="glossaries-extra-manual.html#dx1-11062" ><span
-class="cmti-10">782</span></a> <br /></span>
+class="cmti-10">874</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrp</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-11052" ><span
-class="cmti-10">783</span></a> <br /></span>
+class="cmti-10">875</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrpageref</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-31004" ><span
-class="cmti-10">784</span></a> <br /></span>
+class="cmti-10">876</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsxtrparen</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21026" ><span
+class="cmti-10">877</span></a> <br /></span>
+
+
+
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsxtrpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-29015" ><span
-class="cmti-10">785</span></a> <br /></span>
+class="cmti-10">878</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrpl</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-29013" ><span
-class="cmti-10">786</span></a> <br /></span>
+class="cmti-10">879</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrpostdescription</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14012" ><span
-class="cmti-10">787</span></a> <br /></span>
+class="cmti-10">880</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsxtrposthyphenlong</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23215" ><span
+class="cmti-10">881</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsxtrposthyphenshort</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23203" ><span
+class="cmti-10">882</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrpostlink</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-8033" ><span
-class="cmti-10">788</span></a> <br /></span>
+class="cmti-10">883</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrpostlinkAddDescOnFirstUse</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-8040" ><span
-class="cmti-10">789</span></a> <br /></span>
+class="cmti-10">884</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrpostlinkAddSymbolOnFirstUse</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-8044" ><span
-class="cmti-10">790</span></a> <br /></span>
+class="cmti-10">885</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrpostlinkendsentence</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-8034" ><span
-class="cmti-10">791</span></a> <br /></span>
+class="cmti-10">886</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrpostlinkhook</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-8031" ><span
-class="cmti-10">792</span></a> <br /></span>
+class="cmti-10">887</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrpostlongdescription</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-5018" ><span
-class="cmti-10">793</span></a> <br /></span>
+class="cmti-10">888</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrpostnamehook</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-14008" ><span
-class="cmti-10">794</span></a> <br /></span>
+class="cmti-10">889</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrPostNewAbbreviation</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24017" ><span
-class="cmti-10">795</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24019" ><span
+class="cmti-10">890</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrprovidestoragekey</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32006" ><span
-class="cmti-10">796</span></a> <br /></span>
+class="cmti-10">891</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrRecordCounter</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32040" ><span
-class="cmti-10">797</span></a> <br /></span>
+class="cmti-10">892</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrregularfont</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-8026" ><span
-class="cmti-10">798</span></a> <br /></span>
+class="cmti-10">893</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrresourcefile</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-30020" ><span
-class="cmti-10">799</span></a> <br /></span>
+class="cmti-10">894</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrRevertMarks</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-25012" ><span
-class="cmti-10">800</span></a> <br /></span>
-<span class="index-item"><span class="obeylines-h"><span class="verb"><span
-class="cmtt-10">\glsxtrscfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21025" ><span
-class="cmti-10">801</span></a> <br /></span>
+class="cmti-10">895</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrscsuffix</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21027" ><span
-class="cmti-10">802</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21040" ><span
+class="cmti-10">896</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrseealsolabels</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-7039" ><span
-class="cmti-10">803</span></a> <br /></span>
+class="cmti-10">897</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrseelist</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-7043" ><span
-class="cmti-10">804</span></a> <br /></span>
+class="cmti-10">898</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrSetActualChar</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-28040" ><span
-class="cmti-10">805</span></a> <br /></span>
+class="cmti-10">899</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrsetaliasnoindex</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-34016" ><span
-class="cmti-10">806</span></a> <br /></span>
+class="cmti-10">900</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrSetAltModifier</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-8072" ><span
-class="cmti-10">807</span></a> <br /></span>
+class="cmti-10">901</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrsetcategory</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26129" ><span
-class="cmti-10">808</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26142" ><span
+class="cmti-10">902</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrsetcategoryforall</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26131" ><span
-class="cmti-10">809</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26144" ><span
+class="cmti-10">903</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrSetDefaultGlsOpts</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-8067" ><span
-class="cmti-10">810</span></a> <br /></span>
+class="cmti-10">904</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrSetEncapChar</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-28043" ><span
-class="cmti-10">811</span></a> <br /></span>
+class="cmti-10">905</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrSetEscChar</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-28042" ><span
-class="cmti-10">812</span></a> <br /></span>
+class="cmti-10">906</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrSetField</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32011" ><span
-class="cmti-10">813</span></a> <br /></span>
+class="cmti-10">907</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrsetfieldifexists</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32012" ><span
-class="cmti-10">814</span></a> <br /></span>
+class="cmti-10">908</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrsetgrouptitle</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-13005" ><span
-class="cmti-10">815</span></a> <br /></span>
+class="cmti-10">909</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrSetLevelChar</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-28041" ><span
-class="cmti-10">816</span></a> <br /></span>
+class="cmti-10">910</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrsetpopts</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-11057" ><span
-class="cmti-10">817</span></a> <br /></span>
+class="cmti-10">911</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsxtrshort</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19019" ><span
-class="cmti-10">818</span></a>, <a
-href="glossaries-extra-manual.html#dx1-19022" ><span
-class="cmti-10">819</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19020" ><span
+class="cmti-10">912</span></a>, <a
+href="glossaries-extra-manual.html#dx1-19023" ><span
+class="cmti-10">913</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrshort</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-19010" ><span
-class="cmti-10">820</span></a> <br /></span>
+class="cmti-10">914</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsxtrshorthyphenlong</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-23210" ><span
+class="cmti-10">915</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GLSxtrshortpl</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19027" ><span
-class="cmti-10">821</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19028" ><span
+class="cmti-10">916</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsxtrshortpl</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19026" ><span
-class="cmti-10">822</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19027" ><span
+class="cmti-10">917</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrshortpl</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-19025" ><span
-class="cmti-10">823</span></a> <br /></span>
-<span class="index-item"><span class="obeylines-h"><span class="verb"><span
-class="cmtt-10">\glsxtrsmfont</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21032" ><span
-class="cmti-10">824</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-19026" ><span
+class="cmti-10">918</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrsmsuffix</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21036" ><span
-class="cmti-10">825</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21050" ><span
+class="cmti-10">919</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\Glsxtrsubsequentfmt</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-24083" ><span
+class="cmti-10">920</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsxtrsubsequentfmt</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-24082" ><span
+class="cmti-10">921</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\Glsxtrsubsequentplfmt</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-24085" ><span
+class="cmti-10">922</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsxtrsubsequentplfmt</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-24084" ><span
+class="cmti-10">923</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrtagfont</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-18003" ><span
-class="cmti-10">826</span></a> <br /></span>
-<span class="index-item"><span class="obeylines-h"><span class="verb"><span
-class="cmtt-10">\glsxtrunsrtdo</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-33015" ><span
-class="cmti-10">827</span></a> <br /></span>
+class="cmti-10">924</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsxtrunsrtdo</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-33015" ><span
+class="cmti-10">925</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrUseAbbrStyleFmts</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24079" ><span
-class="cmti-10">828</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24089" ><span
+class="cmti-10">926</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrUseAbbrStyleSetup</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-24034" ><span
-class="cmti-10">829</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-24040" ><span
+class="cmti-10">927</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\Glsxtrusefield</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32027" ><span
-class="cmti-10">830</span></a> <br /></span>
+class="cmti-10">928</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrusefield</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32025" ><span
-class="cmti-10">831</span></a> <br /></span>
+class="cmti-10">929</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtruserfield</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23023" ><span
-class="cmti-10">832</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23029" ><span
+class="cmti-10">930</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtruserparen</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23026" ><span
-class="cmti-10">833</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-23032" ><span
+class="cmti-10">931</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrusersuffix</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-23032" ><span
-class="cmti-10">834</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21064" ><span
+class="cmti-10">932</span></a>, <a
+href="glossaries-extra-manual.html#dx1-23039" ><span
+class="cmti-10">933</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtrusesee</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-7020" ><span
-class="cmti-10">835</span></a> <br /></span>
+class="cmti-10">934</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtruseseealso</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-7036" ><span
-class="cmti-10">836</span></a> <br /></span>
+class="cmti-10">935</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\glsxtruseseeformat</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-7021" ><span
-class="cmti-10">837</span></a>, <a
+class="cmti-10">936</span></a>, <a
href="glossaries-extra-manual.html#dx1-7037" ><span
-class="cmti-10">838</span></a> <br /></span>
+class="cmti-10">937</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrWarnDeprecatedAbbrStyle</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21057" ><span
-class="cmti-10">839</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21103" ><span
+class="cmti-10">938</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\GlsXtrWarning</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-29011" ><span
-class="cmti-10">840</span></a> <br /></span>
+class="cmti-10">939</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsxtrword</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-26057" ><span
+class="cmti-10">940</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\glsxtrwordsep</span></span></span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-26056" ><span
+class="cmti-10">941</span></a> <br /></span>
</p><p class="theindex"> <span
class="cmbx-10">H</span>
<span class="index-item"><span
class="cmss-10">hyperref </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-6025" >841</a>, <a
-href="glossaries-extra-manual.html#dx1-6027" >842</a>, <a
-href="glossaries-extra-manual.html#dx1-11029" >843</a>, <a
-href="glossaries-extra-manual.html#dx1-11060" >844</a>, <a
-href="glossaries-extra-manual.html#dx1-23109" >845</a>, <a
-href="glossaries-extra-manual.html#dx1-25002" >846</a>, <a
-href="glossaries-extra-manual.html#dx1-25003" >847</a>, <a
-href="glossaries-extra-manual.html#dx1-25004" >848</a>, <a
-href="glossaries-extra-manual.html#dx1-25008" >849</a>, <a
-href="glossaries-extra-manual.html#dx1-25014" >850</a>, <a
-href="glossaries-extra-manual.html#dx1-27028" >851</a>, <a
-href="glossaries-extra-manual.html#dx1-28025" >852</a>, <a
-href="glossaries-extra-manual.html#dx1-31008" >853</a>, <a
-href="glossaries-extra-manual.html#dx1-32004" >854</a>, <a
-href="glossaries-extra-manual.html#dx1-33019" >855</a>, <a
-href="glossaries-extra-manual.html#dx1-34006" >856</a>, <a
-href="glossaries-extra-manual.html#dx1-38006" >857</a>, <a
-href="glossaries-extra-manual.html#dx1-38024" >858</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-6025" >942</a>, <a
+href="glossaries-extra-manual.html#dx1-6027" >943</a>, <a
+href="glossaries-extra-manual.html#dx1-11029" >944</a>, <a
+href="glossaries-extra-manual.html#dx1-11060" >945</a>, <a
+href="glossaries-extra-manual.html#dx1-23131" >946</a>, <a
+href="glossaries-extra-manual.html#dx1-25002" >947</a>, <a
+href="glossaries-extra-manual.html#dx1-25003" >948</a>, <a
+href="glossaries-extra-manual.html#dx1-25004" >949</a>, <a
+href="glossaries-extra-manual.html#dx1-25008" >950</a>, <a
+href="glossaries-extra-manual.html#dx1-25014" >951</a>, <a
+href="glossaries-extra-manual.html#dx1-27029" >952</a>, <a
+href="glossaries-extra-manual.html#dx1-28025" >953</a>, <a
+href="glossaries-extra-manual.html#dx1-31008" >954</a>, <a
+href="glossaries-extra-manual.html#dx1-32004" >955</a>, <a
+href="glossaries-extra-manual.html#dx1-33019" >956</a>, <a
+href="glossaries-extra-manual.html#dx1-34006" >957</a>, <a
+href="glossaries-extra-manual.html#dx1-38006" >958</a>, <a
+href="glossaries-extra-manual.html#dx1-38024" >959</a> <br /></span>
</p><p class="theindex"> <span
class="cmbx-10">I</span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\ifglsxtrinitwrglossbefore</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-6012" ><span
-class="cmti-10">859</span></a> <br /></span>
+class="cmti-10">960</span></a> <br /></span>
</p><p class="theindex"> <span
class="cmbx-10">L</span>
<span class="index-item">link-text&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8001" >860</a>, <a
-href="glossaries-extra-manual.html#dx1-8003" >861</a>, <a
-href="glossaries-extra-manual.html#dx1-8030" >862</a>, <a
-href="glossaries-extra-manual.html#dx1-8039" >863</a>, <a
-href="glossaries-extra-manual.html#dx1-8047" >864</a>, <a
-href="glossaries-extra-manual.html#dx1-8051" >865</a>, <a
-href="glossaries-extra-manual.html#dx1-8055" >866</a>, <a
-href="glossaries-extra-manual.html#dx1-8060" >867</a>, <a
-href="glossaries-extra-manual.html#dx1-8064" >868</a>, <a
-href="glossaries-extra-manual.html#dx1-11036" >869</a>, <a
-href="glossaries-extra-manual.html#dx1-11037" >870</a>, <a
-href="glossaries-extra-manual.html#dx1-21047" >871</a>, <a
-href="glossaries-extra-manual.html#dx1-21050" >872</a>, <a
-href="glossaries-extra-manual.html#dx1-23134" >873</a>, <a
-href="glossaries-extra-manual.html#dx1-26043" >874</a>, <a
-href="glossaries-extra-manual.html#dx1-26047" >875</a>, <a
-href="glossaries-extra-manual.html#dx1-38002" >876</a>, <a
+href="glossaries-extra-manual.html#dx1-8001" >961</a>, <a
+href="glossaries-extra-manual.html#dx1-8003" >962</a>, <a
+href="glossaries-extra-manual.html#dx1-8030" >963</a>, <a
+href="glossaries-extra-manual.html#dx1-8039" >964</a>, <a
+href="glossaries-extra-manual.html#dx1-8047" >965</a>, <a
+href="glossaries-extra-manual.html#dx1-8051" >966</a>, <a
+href="glossaries-extra-manual.html#dx1-8055" >967</a>, <a
+href="glossaries-extra-manual.html#dx1-8060" >968</a>, <a
+href="glossaries-extra-manual.html#dx1-8064" >969</a>, <a
+href="glossaries-extra-manual.html#dx1-11036" >970</a>, <a
+href="glossaries-extra-manual.html#dx1-11037" >971</a>, <a
+href="glossaries-extra-manual.html#dx1-21079" >972</a>, <a
+href="glossaries-extra-manual.html#dx1-21093" >973</a>, <a
+href="glossaries-extra-manual.html#dx1-21096" >974</a>, <a
+href="glossaries-extra-manual.html#dx1-23156" >975</a>, <a
+href="glossaries-extra-manual.html#dx1-26043" >976</a>, <a
+href="glossaries-extra-manual.html#dx1-26047" >977</a>, <a
+href="glossaries-extra-manual.html#dx1-38002" >978</a>, <a
href="glossaries-extra-manual.html#dx1-40020" ><span
-class="cmbx-10">877</span></a> <br /></span>
+class="cmbx-10">979</span></a> <br /></span>
<span class="index-item">location list&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8073" >878</a>, <a
-href="glossaries-extra-manual.html#dx1-34011" >879</a>, <a
-href="glossaries-extra-manual.html#dx1-34013" >880</a>, <a
-href="glossaries-extra-manual.html#dx1-38005" >881</a>, <a
+href="glossaries-extra-manual.html#dx1-8073" >980</a>, <a
+href="glossaries-extra-manual.html#dx1-34011" >981</a>, <a
+href="glossaries-extra-manual.html#dx1-34013" >982</a>, <a
+href="glossaries-extra-manual.html#dx1-38005" >983</a>, <a
href="glossaries-extra-manual.html#dx1-40022" ><span
-class="cmbx-10">882</span></a> <br /></span>
+class="cmbx-10">984</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\longnewglossaryentry</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-5016" ><span
-class="cmti-10">883</span></a> <br /></span>
+class="cmti-10">985</span></a> <br /></span>
</p><p class="theindex"> <span
class="cmbx-10">M</span>
<span class="index-item"><span
class="cmtt-10">makeglossaries</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3026" >884</a>, <a
-href="glossaries-extra-manual.html#dx1-3028" >885</a>, <a
-href="glossaries-extra-manual.html#dx1-3029" >886</a>, <a
-href="glossaries-extra-manual.html#dx1-5035" >887</a>, <a
+href="glossaries-extra-manual.html#dx1-3027" >986</a>, <a
+href="glossaries-extra-manual.html#dx1-3029" >987</a>, <a
+href="glossaries-extra-manual.html#dx1-3030" >988</a>, <a
+href="glossaries-extra-manual.html#dx1-5035" >989</a>, <a
href="glossaries-extra-manual.html#dx1-40025" ><span
-class="cmbx-10">888</span></a> <br /></span>
+class="cmbx-10">990</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\makeglossaries</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-5033" ><span
-class="cmti-10">889</span></a> <br /></span>
+class="cmti-10">991</span></a> <br /></span>
<span class="index-item"><span
class="cmtt-10">makeglossaries-lite.lua</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-5036" >890</a>, <a
+href="glossaries-extra-manual.html#dx1-5036" >992</a>, <a
href="glossaries-extra-manual.html#dx1-40029" ><span
-class="cmbx-10">891</span></a> <br /></span>
+class="cmbx-10">993</span></a> <br /></span>
<span class="index-item"><span
class="cmtt-10">makeglossaries-lite.lua</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-5037" >892</a>, <a
+href="glossaries-extra-manual.html#dx1-5037" >994</a>, <a
href="glossaries-extra-manual.html#dx1-40028" ><span
-class="cmbx-10">893</span></a> <br /></span>
+class="cmbx-10">995</span></a> <br /></span>
<span class="index-item"><span
class="cmtt-10">makeindex</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3021" >894</a>, <a
-href="glossaries-extra-manual.html#dx1-3027" >895</a>, <a
-href="glossaries-extra-manual.html#dx1-3030" >896</a>, <a
-href="glossaries-extra-manual.html#dx1-4071" >897</a>, <a
-href="glossaries-extra-manual.html#dx1-4077" >898</a>, <a
-href="glossaries-extra-manual.html#dx1-6021" >899</a>, <a
-href="glossaries-extra-manual.html#dx1-28035" >900</a>, <a
-href="glossaries-extra-manual.html#dx1-40027" >901</a>, <a
-href="glossaries-extra-manual.html#dx1-40031" >902</a>, <a
+href="glossaries-extra-manual.html#dx1-3022" >996</a>, <a
+href="glossaries-extra-manual.html#dx1-3028" >997</a>, <a
+href="glossaries-extra-manual.html#dx1-3031" >998</a>, <a
+href="glossaries-extra-manual.html#dx1-4073" >999</a>, <a
+href="glossaries-extra-manual.html#dx1-4079" >1000</a>, <a
+href="glossaries-extra-manual.html#dx1-6021" >1001</a>, <a
+href="glossaries-extra-manual.html#dx1-28035" >1002</a>, <a
+href="glossaries-extra-manual.html#dx1-40027" >1003</a>, <a
+href="glossaries-extra-manual.html#dx1-40031" >1004</a>, <a
href="glossaries-extra-manual.html#dx1-40032" ><span
-class="cmbx-10">903</span></a> <br /></span>
+class="cmbx-10">1005</span></a> <br /></span>
<span class="index-item"><span
class="cmtt-10">makeindex</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-28014" >904</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-28014" >1006</a> <br /></span>
<span class="index-item"><span
class="cmss-10">memoir </span>class&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3020" >905</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3021" >1007</a> <br /></span>
<span class="index-item"><span
class="cmss-10">mfirstuc </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3" >906</a>, <a
-href="glossaries-extra-manual.html#dx1-26081" >907</a>, <a
-href="glossaries-extra-manual.html#dx1-26083" >908</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3" >1008</a>, <a
+href="glossaries-extra-manual.html#dx1-26094" >1009</a>, <a
+href="glossaries-extra-manual.html#dx1-26096" >1010</a> <br /></span>
</p><p class="theindex"> <span
class="cmbx-10">N</span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\newabbreviation</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-17002" ><span
-class="cmti-10">909</span></a> <br /></span>
+class="cmti-10">1011</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\newabbreviationstyle</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-24001" ><span
-class="cmti-10">910</span></a> <br /></span>
+class="cmti-10">1012</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\newacronym</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-17011" ><span
-class="cmti-10">911</span></a> <br /></span>
+class="cmti-10">1013</span></a> <br /></span>
+
+
+
<span class="index-item"><span
class="cmtt-10">\newglossaryentry </span>options<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">alias</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-5010" >912</a>, <a
-href="glossaries-extra-manual.html#dx1-5014" >913</a>, <a
-href="glossaries-extra-manual.html#dx1-34001" >914</a>, <a
-href="glossaries-extra-manual.html#dx1-34005" >915</a>, <a
-href="glossaries-extra-manual.html#dx1-34020" >916</a>, <a
-href="glossaries-extra-manual.html#dx1-38010" >917</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-5010" >1014</a>, <a
+href="glossaries-extra-manual.html#dx1-5014" >1015</a>, <a
+href="glossaries-extra-manual.html#dx1-34001" >1016</a>, <a
+href="glossaries-extra-manual.html#dx1-34005" >1017</a>, <a
+href="glossaries-extra-manual.html#dx1-34020" >1018</a>, <a
+href="glossaries-extra-manual.html#dx1-38010" >1019</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">category</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-5009" >918</a>, <a
-href="glossaries-extra-manual.html#dx1-17003" >919</a>, <a
-href="glossaries-extra-manual.html#dx1-17010" >920</a>, <a
-href="glossaries-extra-manual.html#dx1-26003" >921</a>, <a
-href="glossaries-extra-manual.html#dx1-26005" >922</a> <br /></span>
-
-
-
+href="glossaries-extra-manual.html#dx1-5009" >1020</a>, <a
+href="glossaries-extra-manual.html#dx1-17003" >1021</a>, <a
+href="glossaries-extra-manual.html#dx1-17010" >1022</a>, <a
+href="glossaries-extra-manual.html#dx1-26003" >1023</a>, <a
+href="glossaries-extra-manual.html#dx1-26005" >1024</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">desc</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-37038" >923</a>, <a
-href="glossaries-extra-manual.html#dx1-37040" >924</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-37038" >1025</a>, <a
+href="glossaries-extra-manual.html#dx1-37040" >1026</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">descplural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-37042" >925</a>, <a
-href="glossaries-extra-manual.html#dx1-37044" >926</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-37042" >1027</a>, <a
+href="glossaries-extra-manual.html#dx1-37044" >1028</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">description</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21052" >927</a>, <a
-href="glossaries-extra-manual.html#dx1-22005" >928</a>, <a
-href="glossaries-extra-manual.html#dx1-22027" >929</a>, <a
-href="glossaries-extra-manual.html#dx1-22029" >930</a>, <a
-href="glossaries-extra-manual.html#dx1-22052" >931</a>, <a
-href="glossaries-extra-manual.html#dx1-22077" >932</a>, <a
-href="glossaries-extra-manual.html#dx1-23007" >933</a>, <a
-href="glossaries-extra-manual.html#dx1-23039" >934</a>, <a
-href="glossaries-extra-manual.html#dx1-23058" >935</a>, <a
-href="glossaries-extra-manual.html#dx1-23065" >936</a>, <a
-href="glossaries-extra-manual.html#dx1-23085" >937</a>, <a
-href="glossaries-extra-manual.html#dx1-23104" >938</a>, <a
-href="glossaries-extra-manual.html#dx1-23111" >939</a>, <a
-href="glossaries-extra-manual.html#dx1-23138" >940</a>, <a
-href="glossaries-extra-manual.html#dx1-23158" >941</a>, <a
-href="glossaries-extra-manual.html#dx1-23164" >942</a>, <a
-href="glossaries-extra-manual.html#dx1-24013" >943</a>, <a
-href="glossaries-extra-manual.html#dx1-30037" >944</a>, <a
-href="glossaries-extra-manual.html#dx1-5027" >945</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21098" >1029</a>, <a
+href="glossaries-extra-manual.html#dx1-22005" >1030</a>, <a
+href="glossaries-extra-manual.html#dx1-22027" >1031</a>, <a
+href="glossaries-extra-manual.html#dx1-22029" >1032</a>, <a
+href="glossaries-extra-manual.html#dx1-22052" >1033</a>, <a
+href="glossaries-extra-manual.html#dx1-22077" >1034</a>, <a
+href="glossaries-extra-manual.html#dx1-23007" >1035</a>, <a
+href="glossaries-extra-manual.html#dx1-23052" >1036</a>, <a
+href="glossaries-extra-manual.html#dx1-23074" >1037</a>, <a
+href="glossaries-extra-manual.html#dx1-23084" >1038</a>, <a
+href="glossaries-extra-manual.html#dx1-23107" >1039</a>, <a
+href="glossaries-extra-manual.html#dx1-23126" >1040</a>, <a
+href="glossaries-extra-manual.html#dx1-23133" >1041</a>, <a
+href="glossaries-extra-manual.html#dx1-23160" >1042</a>, <a
+href="glossaries-extra-manual.html#dx1-23180" >1043</a>, <a
+href="glossaries-extra-manual.html#dx1-23186" >1044</a>, <a
+href="glossaries-extra-manual.html#dx1-24013" >1045</a>, <a
+href="glossaries-extra-manual.html#dx1-30045" >1046</a>, <a
+href="glossaries-extra-manual.html#dx1-5027" >1047</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">descriptionplural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-5017" >946</a>, <a
-href="glossaries-extra-manual.html#dx1-5020" >947</a>, <a
-href="glossaries-extra-manual.html#dx1-5022" >948</a>, <a
-href="glossaries-extra-manual.html#dx1-5024" >949</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-5017" >1048</a>, <a
+href="glossaries-extra-manual.html#dx1-5020" >1049</a>, <a
+href="glossaries-extra-manual.html#dx1-5022" >1050</a>, <a
+href="glossaries-extra-manual.html#dx1-5024" >1051</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">first</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8013" >950</a>, <a
-href="glossaries-extra-manual.html#dx1-10014" >951</a>, <a
-href="glossaries-extra-manual.html#dx1-10015" >952</a>, <a
-href="glossaries-extra-manual.html#dx1-11004" >953</a>, <a
-href="glossaries-extra-manual.html#dx1-21008" >954</a>, <a
-href="glossaries-extra-manual.html#dx1-21015" >955</a>, <a
-href="glossaries-extra-manual.html#dx1-24009" >956</a>, <a
-href="glossaries-extra-manual.html#dx1-24015" >957</a>, <a
-href="glossaries-extra-manual.html#dx1-25038" >958</a>, <a
-href="glossaries-extra-manual.html#dx1-28017" >959</a>, <a
-href="glossaries-extra-manual.html#dx1-37022" >960</a>, <a
-href="glossaries-extra-manual.html#dx1-37024" >961</a>, <a
-href="glossaries-extra-manual.html#dx1-40016" >962</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-8013" >1052</a>, <a
+href="glossaries-extra-manual.html#dx1-10014" >1053</a>, <a
+href="glossaries-extra-manual.html#dx1-10015" >1054</a>, <a
+href="glossaries-extra-manual.html#dx1-11004" >1055</a>, <a
+href="glossaries-extra-manual.html#dx1-21008" >1056</a>, <a
+href="glossaries-extra-manual.html#dx1-21015" >1057</a>, <a
+href="glossaries-extra-manual.html#dx1-24009" >1058</a>, <a
+href="glossaries-extra-manual.html#dx1-24015" >1059</a>, <a
+href="glossaries-extra-manual.html#dx1-25038" >1060</a>, <a
+href="glossaries-extra-manual.html#dx1-28017" >1061</a>, <a
+href="glossaries-extra-manual.html#dx1-37022" >1062</a>, <a
+href="glossaries-extra-manual.html#dx1-37024" >1063</a>, <a
+href="glossaries-extra-manual.html#dx1-40016" >1064</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">firstplural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8014" >963</a>, <a
-href="glossaries-extra-manual.html#dx1-10009" >964</a>, <a
-href="glossaries-extra-manual.html#dx1-10013" >965</a>, <a
-href="glossaries-extra-manual.html#dx1-10017" >966</a>, <a
-href="glossaries-extra-manual.html#dx1-10021" >967</a>, <a
-href="glossaries-extra-manual.html#dx1-24010" >968</a>, <a
-href="glossaries-extra-manual.html#dx1-24016" >969</a>, <a
-href="glossaries-extra-manual.html#dx1-37026" >970</a>, <a
-href="glossaries-extra-manual.html#dx1-37028" >971</a>, <a
-href="glossaries-extra-manual.html#dx1-40017" >972</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-8014" >1065</a>, <a
+href="glossaries-extra-manual.html#dx1-10009" >1066</a>, <a
+href="glossaries-extra-manual.html#dx1-10013" >1067</a>, <a
+href="glossaries-extra-manual.html#dx1-10017" >1068</a>, <a
+href="glossaries-extra-manual.html#dx1-10021" >1069</a>, <a
+href="glossaries-extra-manual.html#dx1-24010" >1070</a>, <a
+href="glossaries-extra-manual.html#dx1-24016" >1071</a>, <a
+href="glossaries-extra-manual.html#dx1-37026" >1072</a>, <a
+href="glossaries-extra-manual.html#dx1-37028" >1073</a>, <a
+href="glossaries-extra-manual.html#dx1-40017" >1074</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">location</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-33016" >973</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-33016" >1075</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">loclist</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-33017" >974</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-33017" >1076</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">long</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-10026" >975</a>, <a
-href="glossaries-extra-manual.html#dx1-10027" >976</a>, <a
-href="glossaries-extra-manual.html#dx1-17044" >977</a>, <a
-href="glossaries-extra-manual.html#dx1-21012" >978</a>, <a
-href="glossaries-extra-manual.html#dx1-26045" >979</a>, <a
-href="glossaries-extra-manual.html#dx1-28019" >980</a>, <a
-href="glossaries-extra-manual.html#dx1-37054" >981</a>, <a
-href="glossaries-extra-manual.html#dx1-37056" >982</a>, <a
-href="glossaries-extra-manual.html#dx1-5025" >983</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-10026" >1077</a>, <a
+href="glossaries-extra-manual.html#dx1-10027" >1078</a>, <a
+href="glossaries-extra-manual.html#dx1-17024" >1079</a>, <a
+href="glossaries-extra-manual.html#dx1-21012" >1080</a>, <a
+href="glossaries-extra-manual.html#dx1-26045" >1081</a>, <a
+href="glossaries-extra-manual.html#dx1-28019" >1082</a>, <a
+href="glossaries-extra-manual.html#dx1-37054" >1083</a>, <a
+href="glossaries-extra-manual.html#dx1-37056" >1084</a>, <a
+href="glossaries-extra-manual.html#dx1-5025" >1085</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">longplural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-10010" >984</a>, <a
-href="glossaries-extra-manual.html#dx1-10025" >985</a>, <a
-href="glossaries-extra-manual.html#dx1-17045" >986</a>, <a
-href="glossaries-extra-manual.html#dx1-24028" >987</a>, <a
-href="glossaries-extra-manual.html#dx1-37058" >988</a>, <a
-href="glossaries-extra-manual.html#dx1-37060" >989</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-10010" >1086</a>, <a
+href="glossaries-extra-manual.html#dx1-10025" >1087</a>, <a
+href="glossaries-extra-manual.html#dx1-17025" >1088</a>, <a
+href="glossaries-extra-manual.html#dx1-24030" >1089</a>, <a
+href="glossaries-extra-manual.html#dx1-37058" >1090</a>, <a
+href="glossaries-extra-manual.html#dx1-37060" >1091</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">name</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-10023" >990</a>, <a
-href="glossaries-extra-manual.html#dx1-11002" >991</a>, <a
-href="glossaries-extra-manual.html#dx1-22004" >992</a>, <a
-href="glossaries-extra-manual.html#dx1-22026" >993</a>, <a
-href="glossaries-extra-manual.html#dx1-22050" >994</a>, <a
-href="glossaries-extra-manual.html#dx1-22075" >995</a>, <a
-href="glossaries-extra-manual.html#dx1-23004" >996</a>, <a
-href="glossaries-extra-manual.html#dx1-23006" >997</a>, <a
-href="glossaries-extra-manual.html#dx1-23036" >998</a>, <a
-href="glossaries-extra-manual.html#dx1-23056" >999</a>, <a
-href="glossaries-extra-manual.html#dx1-23063" >1000</a>, <a
-href="glossaries-extra-manual.html#dx1-23084" >1001</a>, <a
-href="glossaries-extra-manual.html#dx1-23102" >1002</a>, <a
-href="glossaries-extra-manual.html#dx1-23110" >1003</a>, <a
-href="glossaries-extra-manual.html#dx1-23137" >1004</a>, <a
-href="glossaries-extra-manual.html#dx1-24007" >1005</a>, <a
-href="glossaries-extra-manual.html#dx1-28007" >1006</a>, <a
-href="glossaries-extra-manual.html#dx1-28018" >1007</a>, <a
-href="glossaries-extra-manual.html#dx1-29010" >1008</a>, <a
-href="glossaries-extra-manual.html#dx1-37006" >1009</a>, <a
-href="glossaries-extra-manual.html#dx1-38008" >1010</a>, <a
-href="glossaries-extra-manual.html#dx1-38016" >1011</a>, <a
-href="glossaries-extra-manual.html#dx1-38017" >1012</a>, <a
-href="glossaries-extra-manual.html#dx1-38018" >1013</a>, <a
-href="glossaries-extra-manual.html#dx1-38020" >1014</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-10023" >1092</a>, <a
+href="glossaries-extra-manual.html#dx1-11002" >1093</a>, <a
+href="glossaries-extra-manual.html#dx1-22004" >1094</a>, <a
+href="glossaries-extra-manual.html#dx1-22026" >1095</a>, <a
+href="glossaries-extra-manual.html#dx1-22050" >1096</a>, <a
+href="glossaries-extra-manual.html#dx1-22075" >1097</a>, <a
+href="glossaries-extra-manual.html#dx1-23004" >1098</a>, <a
+href="glossaries-extra-manual.html#dx1-23006" >1099</a>, <a
+href="glossaries-extra-manual.html#dx1-23049" >1100</a>, <a
+href="glossaries-extra-manual.html#dx1-23072" >1101</a>, <a
+href="glossaries-extra-manual.html#dx1-23082" >1102</a>, <a
+href="glossaries-extra-manual.html#dx1-23106" >1103</a>, <a
+href="glossaries-extra-manual.html#dx1-23124" >1104</a>, <a
+href="glossaries-extra-manual.html#dx1-23132" >1105</a>, <a
+href="glossaries-extra-manual.html#dx1-23159" >1106</a>, <a
+href="glossaries-extra-manual.html#dx1-24007" >1107</a>, <a
+href="glossaries-extra-manual.html#dx1-28007" >1108</a>, <a
+href="glossaries-extra-manual.html#dx1-28018" >1109</a>, <a
+href="glossaries-extra-manual.html#dx1-29010" >1110</a>, <a
+href="glossaries-extra-manual.html#dx1-37006" >1111</a>, <a
+href="glossaries-extra-manual.html#dx1-38008" >1112</a>, <a
+href="glossaries-extra-manual.html#dx1-38016" >1113</a>, <a
+href="glossaries-extra-manual.html#dx1-38017" >1114</a>, <a
+href="glossaries-extra-manual.html#dx1-38018" >1115</a>, <a
+href="glossaries-extra-manual.html#dx1-38020" >1116</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">parent</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-16023" >1015</a>, <a
-href="glossaries-extra-manual.html#dx1-28016" >1016</a>, <a
-href="glossaries-extra-manual.html#dx1-32010" >1017</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-16023" >1117</a>, <a
+href="glossaries-extra-manual.html#dx1-28016" >1118</a>, <a
+href="glossaries-extra-manual.html#dx1-32010" >1119</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">plural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8017" >1018</a>, <a
-href="glossaries-extra-manual.html#dx1-10002" >1019</a>, <a
-href="glossaries-extra-manual.html#dx1-10004" >1020</a>, <a
-href="glossaries-extra-manual.html#dx1-10007" >1021</a>, <a
-href="glossaries-extra-manual.html#dx1-10008" >1022</a>, <a
-href="glossaries-extra-manual.html#dx1-10016" >1023</a>, <a
-href="glossaries-extra-manual.html#dx1-10018" >1024</a>, <a
-href="glossaries-extra-manual.html#dx1-10019" >1025</a>, <a
-href="glossaries-extra-manual.html#dx1-10020" >1026</a>, <a
-href="glossaries-extra-manual.html#dx1-24012" >1027</a>, <a
-href="glossaries-extra-manual.html#dx1-32009" >1028</a>, <a
-href="glossaries-extra-manual.html#dx1-37018" >1029</a>, <a
-href="glossaries-extra-manual.html#dx1-37020" >1030</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-8017" >1120</a>, <a
+href="glossaries-extra-manual.html#dx1-10002" >1121</a>, <a
+href="glossaries-extra-manual.html#dx1-10004" >1122</a>, <a
+href="glossaries-extra-manual.html#dx1-10007" >1123</a>, <a
+href="glossaries-extra-manual.html#dx1-10008" >1124</a>, <a
+href="glossaries-extra-manual.html#dx1-10016" >1125</a>, <a
+href="glossaries-extra-manual.html#dx1-10018" >1126</a>, <a
+href="glossaries-extra-manual.html#dx1-10019" >1127</a>, <a
+href="glossaries-extra-manual.html#dx1-10020" >1128</a>, <a
+href="glossaries-extra-manual.html#dx1-24012" >1129</a>, <a
+href="glossaries-extra-manual.html#dx1-32009" >1130</a>, <a
+href="glossaries-extra-manual.html#dx1-37018" >1131</a>, <a
+href="glossaries-extra-manual.html#dx1-37020" >1132</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">see</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4019" >1031</a>, <a
-href="glossaries-extra-manual.html#dx1-4022" >1032</a>, <a
-href="glossaries-extra-manual.html#dx1-4030" >1033</a>, <a
-href="glossaries-extra-manual.html#dx1-4035" >1034</a>, <a
-href="glossaries-extra-manual.html#dx1-4046" >1035</a>, <a
-href="glossaries-extra-manual.html#dx1-4049" >1036</a>, <a
-href="glossaries-extra-manual.html#dx1-4052" >1037</a>, <a
-href="glossaries-extra-manual.html#dx1-5012" >1038</a>, <a
-href="glossaries-extra-manual.html#dx1-5013" >1039</a>, <a
-href="glossaries-extra-manual.html#dx1-7001" >1040</a>, <a
-href="glossaries-extra-manual.html#dx1-7002" >1041</a>, <a
-href="glossaries-extra-manual.html#dx1-7003" >1042</a>, <a
-href="glossaries-extra-manual.html#dx1-7005" >1043</a>, <a
-href="glossaries-extra-manual.html#dx1-7012" >1044</a>, <a
-href="glossaries-extra-manual.html#dx1-7015" >1045</a>, <a
-href="glossaries-extra-manual.html#dx1-7017" >1046</a>, <a
-href="glossaries-extra-manual.html#dx1-7019" >1047</a>, <a
-href="glossaries-extra-manual.html#dx1-7022" >1048</a>, <a
-href="glossaries-extra-manual.html#dx1-7024" >1049</a>, <a
-href="glossaries-extra-manual.html#dx1-7029" >1050</a>, <a
-href="glossaries-extra-manual.html#dx1-7033" >1051</a>, <a
-href="glossaries-extra-manual.html#dx1-7034" >1052</a>, <a
-href="glossaries-extra-manual.html#dx1-7041" >1053</a>, <a
-href="glossaries-extra-manual.html#dx1-30036" >1054</a>, <a
-href="glossaries-extra-manual.html#dx1-33006" >1055</a>, <a
-href="glossaries-extra-manual.html#dx1-34004" >1056</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4021" >1133</a>, <a
+href="glossaries-extra-manual.html#dx1-4024" >1134</a>, <a
+href="glossaries-extra-manual.html#dx1-4032" >1135</a>, <a
+href="glossaries-extra-manual.html#dx1-4037" >1136</a>, <a
+href="glossaries-extra-manual.html#dx1-4048" >1137</a>, <a
+href="glossaries-extra-manual.html#dx1-4051" >1138</a>, <a
+href="glossaries-extra-manual.html#dx1-4054" >1139</a>, <a
+href="glossaries-extra-manual.html#dx1-5012" >1140</a>, <a
+href="glossaries-extra-manual.html#dx1-5013" >1141</a>, <a
+href="glossaries-extra-manual.html#dx1-7001" >1142</a>, <a
+href="glossaries-extra-manual.html#dx1-7002" >1143</a>, <a
+href="glossaries-extra-manual.html#dx1-7003" >1144</a>, <a
+href="glossaries-extra-manual.html#dx1-7005" >1145</a>, <a
+href="glossaries-extra-manual.html#dx1-7012" >1146</a>, <a
+href="glossaries-extra-manual.html#dx1-7015" >1147</a>, <a
+href="glossaries-extra-manual.html#dx1-7017" >1148</a>, <a
+href="glossaries-extra-manual.html#dx1-7019" >1149</a>, <a
+href="glossaries-extra-manual.html#dx1-7022" >1150</a>, <a
+href="glossaries-extra-manual.html#dx1-7024" >1151</a>, <a
+href="glossaries-extra-manual.html#dx1-7029" >1152</a>, <a
+href="glossaries-extra-manual.html#dx1-7033" >1153</a>, <a
+href="glossaries-extra-manual.html#dx1-7034" >1154</a>, <a
+href="glossaries-extra-manual.html#dx1-7041" >1155</a>, <a
+href="glossaries-extra-manual.html#dx1-30044" >1156</a>, <a
+href="glossaries-extra-manual.html#dx1-33006" >1157</a>, <a
+href="glossaries-extra-manual.html#dx1-34004" >1158</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">seealso</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4020" >1057</a>, <a
-href="glossaries-extra-manual.html#dx1-4023" >1058</a>, <a
-href="glossaries-extra-manual.html#dx1-4031" >1059</a>, <a
-href="glossaries-extra-manual.html#dx1-5011" >1060</a>, <a
-href="glossaries-extra-manual.html#dx1-5015" >1061</a>, <a
-href="glossaries-extra-manual.html#dx1-7032" >1062</a>, <a
-href="glossaries-extra-manual.html#dx1-7035" >1063</a>, <a
-href="glossaries-extra-manual.html#dx1-7038" >1064</a>, <a
-href="glossaries-extra-manual.html#dx1-7040" >1065</a>, <a
-href="glossaries-extra-manual.html#dx1-7044" >1066</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4022" >1159</a>, <a
+href="glossaries-extra-manual.html#dx1-4025" >1160</a>, <a
+href="glossaries-extra-manual.html#dx1-4033" >1161</a>, <a
+href="glossaries-extra-manual.html#dx1-5011" >1162</a>, <a
+href="glossaries-extra-manual.html#dx1-5015" >1163</a>, <a
+href="glossaries-extra-manual.html#dx1-7032" >1164</a>, <a
+href="glossaries-extra-manual.html#dx1-7035" >1165</a>, <a
+href="glossaries-extra-manual.html#dx1-7038" >1166</a>, <a
+href="glossaries-extra-manual.html#dx1-7040" >1167</a>, <a
+href="glossaries-extra-manual.html#dx1-7044" >1168</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">short</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8011" >1067</a>, <a
-href="glossaries-extra-manual.html#dx1-8018" >1068</a>, <a
-href="glossaries-extra-manual.html#dx1-8021" >1069</a>, <a
-href="glossaries-extra-manual.html#dx1-10031" >1070</a>, <a
-href="glossaries-extra-manual.html#dx1-10033" >1071</a>, <a
-href="glossaries-extra-manual.html#dx1-10039" >1072</a>, <a
-href="glossaries-extra-manual.html#dx1-17042" >1073</a>, <a
-href="glossaries-extra-manual.html#dx1-21011" >1074</a>, <a
-href="glossaries-extra-manual.html#dx1-21018" >1075</a>, <a
-href="glossaries-extra-manual.html#dx1-26044" >1076</a>, <a
-href="glossaries-extra-manual.html#dx1-26063" >1077</a>, <a
-href="glossaries-extra-manual.html#dx1-37046" >1078</a>, <a
-href="glossaries-extra-manual.html#dx1-37048" >1079</a>, <a
-href="glossaries-extra-manual.html#dx1-5026" >1080</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-8011" >1169</a>, <a
+href="glossaries-extra-manual.html#dx1-8018" >1170</a>, <a
+href="glossaries-extra-manual.html#dx1-8021" >1171</a>, <a
+href="glossaries-extra-manual.html#dx1-10031" >1172</a>, <a
+href="glossaries-extra-manual.html#dx1-10033" >1173</a>, <a
+href="glossaries-extra-manual.html#dx1-10039" >1174</a>, <a
+href="glossaries-extra-manual.html#dx1-17022" >1175</a>, <a
+href="glossaries-extra-manual.html#dx1-21011" >1176</a>, <a
+href="glossaries-extra-manual.html#dx1-21018" >1177</a>, <a
+href="glossaries-extra-manual.html#dx1-26044" >1178</a>, <a
+href="glossaries-extra-manual.html#dx1-26077" >1179</a>, <a
+href="glossaries-extra-manual.html#dx1-37046" >1180</a>, <a
+href="glossaries-extra-manual.html#dx1-37048" >1181</a>, <a
+href="glossaries-extra-manual.html#dx1-5026" >1182</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">shortplural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-10011" >1081</a>, <a
-href="glossaries-extra-manual.html#dx1-10028" >1082</a>, <a
-href="glossaries-extra-manual.html#dx1-10032" >1083</a>, <a
-href="glossaries-extra-manual.html#dx1-10038" >1084</a>, <a
-href="glossaries-extra-manual.html#dx1-17006" >1085</a>, <a
-href="glossaries-extra-manual.html#dx1-17043" >1086</a>, <a
-href="glossaries-extra-manual.html#dx1-21029" >1087</a>, <a
-href="glossaries-extra-manual.html#dx1-24024" >1088</a>, <a
-href="glossaries-extra-manual.html#dx1-24037" >1089</a>, <a
-href="glossaries-extra-manual.html#dx1-26056" >1090</a>, <a
-href="glossaries-extra-manual.html#dx1-26060" >1091</a>, <a
-href="glossaries-extra-manual.html#dx1-26064" >1092</a>, <a
-href="glossaries-extra-manual.html#dx1-37050" >1093</a>, <a
-href="glossaries-extra-manual.html#dx1-37052" >1094</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-10011" >1183</a>, <a
+href="glossaries-extra-manual.html#dx1-10028" >1184</a>, <a
+href="glossaries-extra-manual.html#dx1-10032" >1185</a>, <a
+href="glossaries-extra-manual.html#dx1-10038" >1186</a>, <a
+href="glossaries-extra-manual.html#dx1-17006" >1187</a>, <a
+href="glossaries-extra-manual.html#dx1-17023" >1188</a>, <a
+href="glossaries-extra-manual.html#dx1-21042" >1189</a>, <a
+href="glossaries-extra-manual.html#dx1-24026" >1190</a>, <a
+href="glossaries-extra-manual.html#dx1-24042" >1191</a>, <a
+href="glossaries-extra-manual.html#dx1-26063" >1192</a>, <a
+href="glossaries-extra-manual.html#dx1-26069" >1193</a>, <a
+href="glossaries-extra-manual.html#dx1-26073" >1194</a>, <a
+href="glossaries-extra-manual.html#dx1-26078" >1195</a>, <a
+href="glossaries-extra-manual.html#dx1-37050" >1196</a>, <a
+href="glossaries-extra-manual.html#dx1-37052" >1197</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">sort</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4073" >1095</a>, <a
-href="glossaries-extra-manual.html#dx1-4100" >1096</a>, <a
-href="glossaries-extra-manual.html#dx1-11016" >1097</a>, <a
-href="glossaries-extra-manual.html#dx1-11039" >1098</a>, <a
-href="glossaries-extra-manual.html#dx1-22051" >1099</a>, <a
-href="glossaries-extra-manual.html#dx1-22076" >1100</a>, <a
-href="glossaries-extra-manual.html#dx1-23005" >1101</a>, <a
-href="glossaries-extra-manual.html#dx1-23037" >1102</a>, <a
-href="glossaries-extra-manual.html#dx1-23059" >1103</a>, <a
-href="glossaries-extra-manual.html#dx1-23064" >1104</a>, <a
-href="glossaries-extra-manual.html#dx1-24008" >1105</a>, <a
-href="glossaries-extra-manual.html#dx1-28011" >1106</a>, <a
-href="glossaries-extra-manual.html#dx1-28020" >1107</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4075" >1198</a>, <a
+href="glossaries-extra-manual.html#dx1-4102" >1199</a>, <a
+href="glossaries-extra-manual.html#dx1-11016" >1200</a>, <a
+href="glossaries-extra-manual.html#dx1-11039" >1201</a>, <a
+href="glossaries-extra-manual.html#dx1-22051" >1202</a>, <a
+href="glossaries-extra-manual.html#dx1-22076" >1203</a>, <a
+href="glossaries-extra-manual.html#dx1-23005" >1204</a>, <a
+href="glossaries-extra-manual.html#dx1-23050" >1205</a>, <a
+href="glossaries-extra-manual.html#dx1-23075" >1206</a>, <a
+href="glossaries-extra-manual.html#dx1-23083" >1207</a>, <a
+href="glossaries-extra-manual.html#dx1-24008" >1208</a>, <a
+href="glossaries-extra-manual.html#dx1-24035" >1209</a>, <a
+href="glossaries-extra-manual.html#dx1-26060" >1210</a>, <a
+href="glossaries-extra-manual.html#dx1-26065" >1211</a>, <a
+href="glossaries-extra-manual.html#dx1-28011" >1212</a>, <a
+href="glossaries-extra-manual.html#dx1-28020" >1213</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">symbol</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-37030" >1108</a>, <a
-href="glossaries-extra-manual.html#dx1-37032" >1109</a>, <a
-href="glossaries-extra-manual.html#dx1-5028" >1110</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-37030" >1214</a>, <a
+href="glossaries-extra-manual.html#dx1-37032" >1215</a>, <a
+href="glossaries-extra-manual.html#dx1-5028" >1216</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">symbolplural</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-37034" >1111</a>, <a
-href="glossaries-extra-manual.html#dx1-37036" >1112</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-37034" >1217</a>, <a
+href="glossaries-extra-manual.html#dx1-37036" >1218</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">text</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-8016" >1113</a>, <a
-href="glossaries-extra-manual.html#dx1-10005" >1114</a>, <a
-href="glossaries-extra-manual.html#dx1-10022" >1115</a>, <a
-href="glossaries-extra-manual.html#dx1-10024" >1116</a>, <a
-href="glossaries-extra-manual.html#dx1-11003" >1117</a>, <a
-href="glossaries-extra-manual.html#dx1-21010" >1118</a>, <a
-href="glossaries-extra-manual.html#dx1-21016" >1119</a>, <a
-href="glossaries-extra-manual.html#dx1-24011" >1120</a>, <a
-href="glossaries-extra-manual.html#dx1-25033" >1121</a>, <a
-href="glossaries-extra-manual.html#dx1-32008" >1122</a>, <a
-href="glossaries-extra-manual.html#dx1-37014" >1123</a>, <a
-href="glossaries-extra-manual.html#dx1-37016" >1124</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-8016" >1219</a>, <a
+href="glossaries-extra-manual.html#dx1-10005" >1220</a>, <a
+href="glossaries-extra-manual.html#dx1-10022" >1221</a>, <a
+href="glossaries-extra-manual.html#dx1-10024" >1222</a>, <a
+href="glossaries-extra-manual.html#dx1-11003" >1223</a>, <a
+href="glossaries-extra-manual.html#dx1-21010" >1224</a>, <a
+href="glossaries-extra-manual.html#dx1-21016" >1225</a>, <a
+href="glossaries-extra-manual.html#dx1-24011" >1226</a>, <a
+href="glossaries-extra-manual.html#dx1-25033" >1227</a>, <a
+href="glossaries-extra-manual.html#dx1-32008" >1228</a>, <a
+href="glossaries-extra-manual.html#dx1-37014" >1229</a>, <a
+href="glossaries-extra-manual.html#dx1-37016" >1230</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">type</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-12046" >1125</a>, <a
-href="glossaries-extra-manual.html#dx1-26006" >1126</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-12046" >1231</a>, <a
+href="glossaries-extra-manual.html#dx1-26006" >1232</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">user1</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21041" >1127</a>, <a
-href="glossaries-extra-manual.html#dx1-21046" >1128</a>, <a
-href="glossaries-extra-manual.html#dx1-26046" >1129</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-21080" >1233</a>, <a
+href="glossaries-extra-manual.html#dx1-21085" >1234</a>, <a
+href="glossaries-extra-manual.html#dx1-26046" >1235</a> <br /></span>
<span class="index-item">number list&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7023" >1130</a>, <a
-href="glossaries-extra-manual.html#dx1-7025" >1131</a>, <a
-href="glossaries-extra-manual.html#dx1-7028" >1132</a>, <a
-href="glossaries-extra-manual.html#dx1-7030" >1133</a>, <a
-href="glossaries-extra-manual.html#dx1-7031" >1134</a>, <a
-href="glossaries-extra-manual.html#dx1-8068" >1135</a>, <a
-href="glossaries-extra-manual.html#dx1-15001" >1136</a>, <a
-href="glossaries-extra-manual.html#dx1-15004" >1137</a>, <a
-href="glossaries-extra-manual.html#dx1-15005" >1138</a>, <a
-href="glossaries-extra-manual.html#dx1-15006" >1139</a>, <a
-href="glossaries-extra-manual.html#dx1-15008" >1140</a>, <a
-href="glossaries-extra-manual.html#dx1-15009" >1141</a>, <a
-href="glossaries-extra-manual.html#dx1-15011" >1142</a>, <a
-href="glossaries-extra-manual.html#dx1-16030" >1143</a>, <a
-href="glossaries-extra-manual.html#dx1-16032" >1144</a>, <a
-href="glossaries-extra-manual.html#dx1-16035" >1145</a>, <a
-href="glossaries-extra-manual.html#dx1-16037" >1146</a>, <a
-href="glossaries-extra-manual.html#dx1-33003" >1147</a>, <a
-href="glossaries-extra-manual.html#dx1-33018" >1148</a>, <a
-href="glossaries-extra-manual.html#dx1-38015" >1149</a>, <a
-href="glossaries-extra-manual.html#dx1-40024" >1150</a>, <a
+href="glossaries-extra-manual.html#dx1-7023" >1236</a>, <a
+href="glossaries-extra-manual.html#dx1-7025" >1237</a>, <a
+href="glossaries-extra-manual.html#dx1-7028" >1238</a>, <a
+href="glossaries-extra-manual.html#dx1-7030" >1239</a>, <a
+href="glossaries-extra-manual.html#dx1-7031" >1240</a>, <a
+href="glossaries-extra-manual.html#dx1-8068" >1241</a>, <a
+href="glossaries-extra-manual.html#dx1-15001" >1242</a>, <a
+href="glossaries-extra-manual.html#dx1-15004" >1243</a>, <a
+href="glossaries-extra-manual.html#dx1-15005" >1244</a>, <a
+href="glossaries-extra-manual.html#dx1-15006" >1245</a>, <a
+href="glossaries-extra-manual.html#dx1-15008" >1246</a>, <a
+href="glossaries-extra-manual.html#dx1-15009" >1247</a>, <a
+href="glossaries-extra-manual.html#dx1-15011" >1248</a>, <a
+href="glossaries-extra-manual.html#dx1-16030" >1249</a>, <a
+href="glossaries-extra-manual.html#dx1-16032" >1250</a>, <a
+href="glossaries-extra-manual.html#dx1-16035" >1251</a>, <a
+href="glossaries-extra-manual.html#dx1-16037" >1252</a>, <a
+href="glossaries-extra-manual.html#dx1-33003" >1253</a>, <a
+href="glossaries-extra-manual.html#dx1-33018" >1254</a>, <a
+href="glossaries-extra-manual.html#dx1-38015" >1255</a>, <a
+href="glossaries-extra-manual.html#dx1-40024" >1256</a>, <a
href="glossaries-extra-manual.html#dx1-40033" ><span
-class="cmbx-10">1151</span></a> <br /></span>
+class="cmbx-10">1257</span></a> <br /></span>
</p><p class="theindex"> <span
class="cmbx-10">P</span>
<span class="index-item">package options:<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">abbreviations</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4085" >1152</a>, <a
-href="glossaries-extra-manual.html#dx1-4091" >1153</a>, <a
-href="glossaries-extra-manual.html#dx1-4092" >1154</a>, <a
-href="glossaries-extra-manual.html#dx1-4123" >1155</a>, <a
-href="glossaries-extra-manual.html#dx1-39002" >1156</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4087" >1258</a>, <a
+href="glossaries-extra-manual.html#dx1-4093" >1259</a>, <a
+href="glossaries-extra-manual.html#dx1-4094" >1260</a>, <a
+href="glossaries-extra-manual.html#dx1-4126" >1261</a>, <a
+href="glossaries-extra-manual.html#dx1-39002" >1262</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">accsupp</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4002" >1157</a>, <a
-href="glossaries-extra-manual.html#dx1-4008" >1158</a>, <a
-href="glossaries-extra-manual.html#dx1-37002" >1159</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4004" >1263</a>, <a
+href="glossaries-extra-manual.html#dx1-4010" >1264</a>, <a
+href="glossaries-extra-manual.html#dx1-37002" >1265</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">acronym</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4093" >1160</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4095" >1266</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">acronymlists</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4097" >1161</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4099" >1267</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">automake</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-5038" >1162</a>, <a
-href="glossaries-extra-manual.html#dx1-39018" >1163</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-5038" >1268</a>, <a
+href="glossaries-extra-manual.html#dx1-39018" >1269</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">autoseeindex</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4029" >1164</a>, <a
-href="glossaries-extra-manual.html#dx1-4036" >1165</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4031" >1270</a>, <a
+href="glossaries-extra-manual.html#dx1-4038" >1271</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">false</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4021" >1166</a>, <a
-href="glossaries-extra-manual.html#dx1-4033" >1167</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4023" >1272</a>, <a
+href="glossaries-extra-manual.html#dx1-4035" >1273</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">docdef</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4057" >1168</a>, <a
-href="glossaries-extra-manual.html#dx1-4124" >1169</a>, <a
-href="glossaries-extra-manual.html#dx1-4125" >1170</a>, <a
-href="glossaries-extra-manual.html#dx1-5034" >1171</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4059" >1274</a>, <a
+href="glossaries-extra-manual.html#dx1-4127" >1275</a>, <a
+href="glossaries-extra-manual.html#dx1-4128" >1276</a>, <a
+href="glossaries-extra-manual.html#dx1-5034" >1277</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">restricted</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4082" >1172</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4084" >1278</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">true</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4081" >1173</a>, <a
-href="glossaries-extra-manual.html#dx1-4083" >1174</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4083" >1279</a>, <a
+href="glossaries-extra-manual.html#dx1-4085" >1280</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">docdefs</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-29003" >1175</a>, <a
-href="glossaries-extra-manual.html#dx1-29006" >1176</a>, <a
-href="glossaries-extra-manual.html#dx1-33011" >1177</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-29003" >1281</a>, <a
+href="glossaries-extra-manual.html#dx1-29006" >1282</a>, <a
+href="glossaries-extra-manual.html#dx1-33011" >1283</a> <br /></span>
+
+
+
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">entrycounter</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-31002" >1178</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-31002" >1284</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">hyperfirst</span><br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">false</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-26030" >1179</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-26030" >1285</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">index</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-5030" >1180</a>, <a
-href="glossaries-extra-manual.html#dx1-26011" >1181</a> <br /></span>
-
-
-
+href="glossaries-extra-manual.html#dx1-5030" >1286</a>, <a
+href="glossaries-extra-manual.html#dx1-26011" >1287</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">indexcrossrefs</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4018" >1182</a>, <a
-href="glossaries-extra-manual.html#dx1-4024" >1183</a>, <a
-href="glossaries-extra-manual.html#dx1-4034" >1184</a>, <a
-href="glossaries-extra-manual.html#dx1-7011" >1185</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4020" >1288</a>, <a
+href="glossaries-extra-manual.html#dx1-4026" >1289</a>, <a
+href="glossaries-extra-manual.html#dx1-4036" >1290</a>, <a
+href="glossaries-extra-manual.html#dx1-7011" >1291</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">false</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4028" >1186</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4030" >1292</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">indexonlyfirst</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-6002" >1187</a>, <a
-href="glossaries-extra-manual.html#dx1-6004" >1188</a>, <a
-href="glossaries-extra-manual.html#dx1-26038" >1189</a>, <a
-href="glossaries-extra-manual.html#dx1-28031" >1190</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-6002" >1293</a>, <a
+href="glossaries-extra-manual.html#dx1-6004" >1294</a>, <a
+href="glossaries-extra-manual.html#dx1-26038" >1295</a>, <a
+href="glossaries-extra-manual.html#dx1-28031" >1296</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">nomain</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3031" >1191</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3032" >1297</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">nomissingglstext</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4084" >1192</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4086" >1298</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">nonumberlist</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7026" >1193</a>, <a
-href="glossaries-extra-manual.html#dx1-15003" >1194</a>, <a
-href="glossaries-extra-manual.html#dx1-15007" >1195</a>, <a
-href="glossaries-extra-manual.html#dx1-40035" >1196</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7026" >1299</a>, <a
+href="glossaries-extra-manual.html#dx1-15003" >1300</a>, <a
+href="glossaries-extra-manual.html#dx1-15007" >1301</a>, <a
+href="glossaries-extra-manual.html#dx1-40035" >1302</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">nopostdot</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-14018" >1197</a>, <a
-href="glossaries-extra-manual.html#dx1-16009" >1198</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-14018" >1303</a>, <a
+href="glossaries-extra-manual.html#dx1-16009" >1304</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">false</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3004" >1199</a>, <a
-href="glossaries-extra-manual.html#dx1-14013" >1200</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3004" >1305</a>, <a
+href="glossaries-extra-manual.html#dx1-4003" >1306</a>, <a
+href="glossaries-extra-manual.html#dx1-14013" >1307</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">true</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3003" >1201</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3003" >1308</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">noredefwarn</span><br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">false</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3008" >1202</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3009" >1309</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">true</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3005" >1203</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3006" >1310</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">notree</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-16012" >1204</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-16012" >1311</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">numbers</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4101" >1205</a>, <a
-href="glossaries-extra-manual.html#dx1-4116" >1206</a>, <a
-href="glossaries-extra-manual.html#dx1-26017" >1207</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4103" >1312</a>, <a
+href="glossaries-extra-manual.html#dx1-4119" >1313</a>, <a
+href="glossaries-extra-manual.html#dx1-26017" >1314</a> <br /></span>
+<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">postdot</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-3005" >1315</a>, <a
+href="glossaries-extra-manual.html#dx1-4002" >1316</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">record</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4027" >1208</a>, <a
-href="glossaries-extra-manual.html#dx1-4037" >1209</a>, <a
-href="glossaries-extra-manual.html#dx1-30013" >1210</a>, <a
-href="glossaries-extra-manual.html#dx1-30026" >1211</a>, <a
-href="glossaries-extra-manual.html#dx1-32039" >1212</a>, <a
-href="glossaries-extra-manual.html#dx1-33022" >1213</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4029" >1317</a>, <a
+href="glossaries-extra-manual.html#dx1-4039" >1318</a>, <a
+href="glossaries-extra-manual.html#dx1-30013" >1319</a>, <a
+href="glossaries-extra-manual.html#dx1-30026" >1320</a>, <a
+href="glossaries-extra-manual.html#dx1-32039" >1321</a>, <a
+href="glossaries-extra-manual.html#dx1-33022" >1322</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">alsoindex</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4044" >1214</a>, <a
-href="glossaries-extra-manual.html#dx1-30017" >1215</a>, <a
-href="glossaries-extra-manual.html#dx1-33023" >1216</a>, <a
-href="glossaries-extra-manual.html#dx1-34009" >1217</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4046" >1323</a>, <a
+href="glossaries-extra-manual.html#dx1-30017" >1324</a>, <a
+href="glossaries-extra-manual.html#dx1-33023" >1325</a>, <a
+href="glossaries-extra-manual.html#dx1-34009" >1326</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">off</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4040" >1218</a>, <a
-href="glossaries-extra-manual.html#dx1-34008" >1219</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4042" >1327</a>, <a
+href="glossaries-extra-manual.html#dx1-34008" >1328</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">only</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4032" >1220</a>, <a
-href="glossaries-extra-manual.html#dx1-4043" >1221</a>, <a
-href="glossaries-extra-manual.html#dx1-4045" >1222</a>, <a
-href="glossaries-extra-manual.html#dx1-4053" >1223</a>, <a
-href="glossaries-extra-manual.html#dx1-33010" >1224</a>, <a
-href="glossaries-extra-manual.html#dx1-34012" >1225</a>, <a
-href="glossaries-extra-manual.html#dx1-34018" >1226</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4034" >1329</a>, <a
+href="glossaries-extra-manual.html#dx1-4045" >1330</a>, <a
+href="glossaries-extra-manual.html#dx1-4047" >1331</a>, <a
+href="glossaries-extra-manual.html#dx1-4055" >1332</a>, <a
+href="glossaries-extra-manual.html#dx1-33010" >1333</a>, <a
+href="glossaries-extra-manual.html#dx1-34012" >1334</a>, <a
+href="glossaries-extra-manual.html#dx1-34018" >1335</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">seeautonumberlist</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7027" >1227</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7027" >1336</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">seenoindex</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7016" >1228</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7016" >1337</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">ignore</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7018" >1229</a>, <a
-href="glossaries-extra-manual.html#dx1-33008" >1230</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7018" >1338</a>, <a
+href="glossaries-extra-manual.html#dx1-33008" >1339</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">warn</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-33009" >1231</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-33009" >1340</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">shortcuts</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4103" >1232</a>, <a
-href="glossaries-extra-manual.html#dx1-4121" >1233</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4105" >1341</a>, <a
+href="glossaries-extra-manual.html#dx1-4124" >1342</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">abbr</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4107" >1234</a>, <a
-href="glossaries-extra-manual.html#dx1-20002" >1235</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4110" >1343</a>, <a
+href="glossaries-extra-manual.html#dx1-20002" >1344</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">abbreviation</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-20001" >1236</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-20001" >1345</a>, <a
+href="glossaries-extra-manual.html#dx1-20005" >1346</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">abbreviations</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4106" >1237</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4109" >1347</a> <br /></span>
+<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
+class="cmss-10">ac</span>&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-4108" >1348</a>, <a
+href="glossaries-extra-manual.html#dx1-20003" >1349</a>, <a
+href="glossaries-extra-manual.html#dx1-20006" >1350</a>, <a
+href="glossaries-extra-manual.html#dx1-27011" >1351</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">acro</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4105" >1238</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4107" >1352</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">acronyms</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4104" >1239</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4106" >1353</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">all</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4117" >1240</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4120" >1354</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">false</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4120" >1241</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4123" >1355</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">none</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4119" >1242</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4122" >1356</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">other</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4108" >1243</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4111" >1357</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">true</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4118" >1244</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4121" >1358</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">sort</span><br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">none</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4054" >1245</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4056" >1359</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">stylemods</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4011" >1246</a>, <a
-href="glossaries-extra-manual.html#dx1-16003" >1247</a>, <a
-href="glossaries-extra-manual.html#dx1-16005" >1248</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4013" >1360</a>, <a
+href="glossaries-extra-manual.html#dx1-16003" >1361</a>, <a
+href="glossaries-extra-manual.html#dx1-16005" >1362</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">subentrycounter</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-31003" >1249</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-31003" >1363</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">symbols</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4098" >1250</a>, <a
-href="glossaries-extra-manual.html#dx1-4113" >1251</a>, <a
-href="glossaries-extra-manual.html#dx1-26014" >1252</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4100" >1364</a>, <a
+href="glossaries-extra-manual.html#dx1-4116" >1365</a>, <a
+href="glossaries-extra-manual.html#dx1-26014" >1366</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">toc</span><br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">false</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3002" >1253</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3002" >1367</a> <br /></span>
+
+
+
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">true</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3001" >1254</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3001" >1368</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">translate</span><br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">babel</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3010" >1255</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3011" >1369</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">true</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3012" >1256</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3013" >1370</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">undefaction</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4013" >1257</a>, <a
-href="glossaries-extra-manual.html#dx1-5002" >1258</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4015" >1371</a>, <a
+href="glossaries-extra-manual.html#dx1-5002" >1372</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">error</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4014" >1259</a>, <a
-href="glossaries-extra-manual.html#dx1-4041" >1260</a> <br /></span>
-
-
-
+href="glossaries-extra-manual.html#dx1-4016" >1373</a>, <a
+href="glossaries-extra-manual.html#dx1-4043" >1374</a> <br /></span>
<span class="index-subsubitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">warn</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4015" >1261</a>, <a
-href="glossaries-extra-manual.html#dx1-4042" >1262</a>, <a
-href="glossaries-extra-manual.html#dx1-4074" >1263</a>, <a
-href="glossaries-extra-manual.html#dx1-30027" >1264</a>, <a
-href="glossaries-extra-manual.html#dx1-32014" >1265</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4017" >1375</a>, <a
+href="glossaries-extra-manual.html#dx1-4044" >1376</a>, <a
+href="glossaries-extra-manual.html#dx1-4076" >1377</a>, <a
+href="glossaries-extra-manual.html#dx1-30027" >1378</a>, <a
+href="glossaries-extra-manual.html#dx1-32014" >1379</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">xindy</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7046" >1266</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7046" >1380</a> <br /></span>
<span class="index-item"><span
class="cmtt-10">page </span>(counter)&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-27027" >1267</a>, <a
-href="glossaries-extra-manual.html#dx1-27039" >1268</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-27028" >1381</a>, <a
+href="glossaries-extra-manual.html#dx1-27040" >1382</a> <br /></span>
<span class="index-item"><span
class="cmss-10">polyglossia </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-39005" >1269</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-39005" >1383</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\pretoglossarypreamble</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-31011" ><span
-class="cmti-10">1270</span></a> <br /></span>
+class="cmti-10">1384</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\printabbreviations</span></span></span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-4086" ><span
-class="cmti-10">1271</span></a> <br /></span>
+href="glossaries-extra-manual.html#dx1-4088" ><span
+class="cmti-10">1385</span></a> <br /></span>
<span class="index-item"><span
class="cmtt-10">\printglossary </span>options<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">target</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-5008" >1272</a>, <a
-href="glossaries-extra-manual.html#dx1-31009" >1273</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-5008" >1386</a>, <a
+href="glossaries-extra-manual.html#dx1-31009" >1387</a> <br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">title</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-39006" >1274</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-39006" >1388</a> <br /></span>
<span class="index-item"><span
class="cmtt-10">\printnoidxglossary </span>options<br /></span>
<span class="index-subitem">&#x00A0;&#x00A0;&#x00A0;&#x00A0;<span
class="cmss-10">sort</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-33012" >1275</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-33012" >1389</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\printunsrtglossaries</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-33013" ><span
-class="cmti-10">1276</span></a> <br /></span>
+class="cmti-10">1390</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\printunsrtglossary</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-33001" ><span
-class="cmti-10">1277</span></a>, <a
+class="cmti-10">1391</span></a> <br /></span>
+<span class="index-item"><span class="obeylines-h"><span class="verb"><span
+class="cmtt-10">\printunsrtglossary*</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-33002" ><span
-class="cmti-10">1278</span></a> <br /></span>
+class="cmti-10">1392</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\printunsrtglossaryhandler</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-33014" ><span
-class="cmti-10">1279</span></a> <br /></span>
+class="cmti-10">1393</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\printunsrtglossaryunit</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-33020" ><span
-class="cmti-10">1280</span></a> <br /></span>
+class="cmti-10">1394</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\printunsrtglossaryunitsetup</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-33021" ><span
-class="cmti-10">1281</span></a> <br /></span>
+class="cmti-10">1395</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\provideignoredglossary</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-5005" ><span
-class="cmti-10">1282</span></a> <br /></span>
+class="cmti-10">1396</span></a> <br /></span>
</p><p class="theindex"> <span
class="cmbx-10">R</span>
<span class="index-item"><span
-class="cmss-10">relsize </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-21034" >1283</a> <br /></span>
+class="cmss-10">relsizes </span>package&#x00A0;&#x00A0;<a
+href="glossaries-extra-manual.html#dx1-21048" >1397</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\RestoreAcronyms</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-12045" ><span
-class="cmti-10">1284</span></a> <br /></span>
+class="cmti-10">1398</span></a> <br /></span>
</p><p class="theindex"> <span
class="cmbx-10">S</span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\setabbreviationstyle</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-19001" ><span
-class="cmti-10">1285</span></a> <br /></span>
+class="cmti-10">1399</span></a> <br /></span>
<span class="index-item"><span
class="cmss-10">slantsc </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-25020" >1286</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-25020" >1400</a> <br /></span>
</p><p class="theindex"> <span
class="cmbx-10">T</span>
<span class="index-item"><span
class="cmss-10">textcase </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-6" >1287</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-6" >1401</a> <br /></span>
<span class="index-item"><span
class="cmss-10">tracklang </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-2" >1288</a>, <a
-href="glossaries-extra-manual.html#dx1-39007" >1289</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-2" >1402</a>, <a
+href="glossaries-extra-manual.html#dx1-39007" >1403</a> <br /></span>
<span class="index-item"><span
class="cmss-10">translator </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3011" >1290</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-3012" >1404</a> <br /></span>
</p><p class="theindex"> <span
class="cmbx-10">X</span>
<span class="index-item"><span
class="cmss-10">xfor </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-7" >1291</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-7" >1405</a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\xglssetwidest</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-16015" ><span
-class="cmti-10">1292</span></a> <br /></span>
+class="cmti-10">1406</span></a> <br /></span>
<span class="index-item"><span class="obeylines-h"><span class="verb"><span
class="cmtt-10">\xGlsXtrSetField</span></span></span>&#x00A0;&#x00A0;<a
href="glossaries-extra-manual.html#dx1-32020" ><span
-class="cmti-10">1293</span></a> <br /></span>
+class="cmti-10">1407</span></a> <br /></span>
+
+
+
<span class="index-item"><span
class="cmtt-10">xindy</span>&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-3022" >1294</a>, <a
-href="glossaries-extra-manual.html#dx1-4072" >1295</a>, <a
-href="glossaries-extra-manual.html#dx1-4078" >1296</a>, <a
-href="glossaries-extra-manual.html#dx1-6022" >1297</a>, <a
-href="glossaries-extra-manual.html#dx1-30016" >1298</a>, <a
-href="glossaries-extra-manual.html#dx1-40026" >1299</a>, <a
-href="glossaries-extra-manual.html#dx1-40030" >1300</a>, <a
+href="glossaries-extra-manual.html#dx1-3023" >1408</a>, <a
+href="glossaries-extra-manual.html#dx1-4074" >1409</a>, <a
+href="glossaries-extra-manual.html#dx1-4080" >1410</a>, <a
+href="glossaries-extra-manual.html#dx1-6022" >1411</a>, <a
+href="glossaries-extra-manual.html#dx1-30016" >1412</a>, <a
+href="glossaries-extra-manual.html#dx1-40026" >1413</a>, <a
+href="glossaries-extra-manual.html#dx1-40030" >1414</a>, <a
href="glossaries-extra-manual.html#dx1-40036" ><span
-class="cmbx-10">1301</span></a> <br /></span>
+class="cmbx-10">1415</span></a> <br /></span>
<span class="index-item"><span
class="cmss-10">xkeyval </span>package&#x00A0;&#x00A0;<a
-href="glossaries-extra-manual.html#dx1-5" >1302</a> <br /></span>
+href="glossaries-extra-manual.html#dx1-5" >1416</a> <br /></span>
</p></div>
-
-
-
<a
- id="dx1-41001"></a><div class="footnotes"><!--l. 244--><p class="indent" > <span class="footnote-mark"><a
+ id="dx1-41001"></a><div class="footnotes"><!--l. 281--><p class="indent" > <span class="footnote-mark"><a
href="#fn1x1-bk" id="fn1x1"><sup class="textsuperscript">1.1</sup></a></span><span
class="cmr-8">4.21 was originally intended as the last release of </span><span
class="cmss-8">glossaries </span><span
class="cmr-8">to incorporate new features, but</span>
<span
class="cmr-8">a few new minor features slipped in with some bug fixes in v4.21.</span></p>
-<!--l. 869--><p class="indent" > <span class="footnote-mark"><a
+<!--l. 920--><p class="indent" > <span class="footnote-mark"><a
href="#fn1x2-bk" id="fn1x2"><sup class="textsuperscript">2.1</sup></a></span><span
class="cmr-8">The </span><span
class="cmss-8">descriptionplural</span><a
@@ -15962,12 +17662,27 @@ class="cmr-8">field and the short form was stored in the </span><span
class="cmss-8">symbol</span><a
id="dx1-5028"></a> <span
class="cmr-8">field.</span></p>
-<!--l. 5393--><p class="indent" > <span class="footnote-mark"><a
+<!--l. 2986--><p class="indent" > <span class="footnote-mark"><a
+href="#fn1x3-bk" id="fn1x3"><sup class="textsuperscript">3.1</sup></a></span><span
+class="cmr-8">For compatibility with earlier versions, </span><span
+class="cmtt-8">\glsabbrvscfont </span><span
+class="cmr-8">is defined to </span><span
+class="cmtt-8">\glsxtrscfont</span><span
+class="cmr-8">, which</span>
+<span
+class="cmr-8">is defined to use </span><span
+class="cmtt-8">\textsc</span><span
+class="cmr-8">. Direct use of </span><span
+class="cmtt-8">\glsxtrscfont </span><span
+class="cmr-8">is now deprecated. Likewise for similar</span>
+<span
+class="cmr-8">commands.</span></p>
+<!--l. 5895--><p class="indent" > <span class="footnote-mark"><a
href="#fn1x9-bk" id="fn1x9"><sup class="textsuperscript">9.1</sup></a></span><span
class="cmr-8">Version 1.11 only allowed one use of </span><span
class="cmtt-8">\GlsXtrLoadResources </span><span
class="cmr-8">per document.</span></p>
-<!--l. 5413--><p class="indent" > <span class="footnote-mark"><a
+<!--l. 5915--><p class="indent" > <span class="footnote-mark"><a
href="#fn2x9-bk" id="fn2x9"><sup class="textsuperscript">9.2</sup></a></span><span
class="cmr-8">v1.08 assumed </span>&#x27E8;<span
class="cmti-8">filename</span>&#x27E9;<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 6bb3646fc8d..b79f3448bf9 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 5178132f110..c80625f9bcb 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
@@ -148,32 +148,69 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\newcommand*{\acrstyle}[1]{\textsf{#1}\index{acronym
styles (glossaries):>#1={\protect\ttfamily#1}|main}}
-\newcommand*{\abbrstyle}[1]{\textsf{#1}\index{abbreviation styles:>#1={\protect\sffamily#1}|main}}
+\newcommand*{\abbrstylenolink}[1]{%
+ \textsf{#1}\index{abbreviation styles:>#1={\protect\sffamily#1}|main}}
+
+\newcommand*{\abbrstyle}[1]{%
+ \hyperlink{abbrstyle.#1}{\textsf{#1}}%
+ \index{abbreviation styles:>#1={\protect\sffamily#1}|main}%
+}
+
+\makeatletter
+\newcommand{\htarget}[2]{\Hy@raisedlink{\hypertarget{#1}{}}#2}
+\makeatother
+
+\newcommand*{\abbrstyledef}[1]{%
+ \htarget{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}}
+\newcommand*{\catattrnolink}[1]{%
+ \textsf{#1}\index{category attributes:>#1={\protect\sffamily#1}|main}}
+
+\newcommand*{\catattr}[1]{%
+ \hyperlink{catattr.#1}{\textsf{#1}}%
+ \index{category attributes:>#1={\protect\sffamily#1}|main}%
+}
+
+\newcommand*{\catattrdef}[1]{%
+ \htarget{catattr.#1}{\textsf{#1}}%
+ \index{category attributes:>#1={\protect\sffamily#1}|main}%
+}
\newcommand*{\postlinkcat}{%
\cs{glsxtrpostlink}\meta{category}%
\index{glsxtrpostlinkcategory=\cs{glsxtrpostlink}\meta{category}|hyperpage}%
}
+\newcommand*{\styopt}[2][]{%
+ \hyperlink{styopt.#2}{\pkgoptfmt{#2}}%
+ \ifstrempty{#1}{}{\pkgoptfmt{=#1}}%
+ \ipkgopt[#1]{#2}%
+}
+
+\newcommand*{\styoptdef}[1]{%
+ \htarget{styopt.#1}{\pkgoptfmt{#1}}%
+ \ipkgopt{#1}%
+}
+
\setlength\marginparwidth{70pt}
\begin{document}
\DeleteShortVerb{\|}
\MakeShortVerb{"}
- \title{glossaries-extra.sty v1.16:
+ \title{glossaries-extra.sty v1.17:
an extension to the glossaries package}
\author{Nicola L.C. Talbot\\[10pt]
Dickimaw Books\\
\url{http://www.dickimaw-books.com/}}
- \date{2017-06-15}
+ \date{2017-08-09}
\maketitle
\begin{abstract}
@@ -269,8 +306,8 @@ contents). Use \pkgopt[false]{toc} to switch this back off.
\item \pkgopt[true]{nopostdot} (suppress the terminating full stop
after the description in the glossary). Use
-\pkgopt[false]{nopostdot} to restore the terminating full stop
-(period).
+\pkgopt[false]{nopostdot} or just \styopt{postdot} to restore the
+terminating full stop (period).
\item \pkgopt[true]{noredefwarn} (suppress the warnings that occur when
the \env{theglossary} environment and \cs{printglossary} are redefined while
@@ -414,10 +451,12 @@ to add the \pkgopt{nomain} package option:
\begin{verbatim}
\documentclass{article}
-\usepackage[nomain,acronym]{glossaries-extra}
+\usepackage[nomain,acronym,postdot]{glossaries-extra}
\makeglossaries
+\setabbreviationstyle[acronym]{long-short}
+
\newacronym{laser}{laser}{light amplification by stimulated
emission of radiation}
@@ -429,7 +468,9 @@ emission of radiation}
\end{document}
\end{verbatim}
-
+(Note the need to set the acronym style using
+\cs{setabbreviationstyle} before \cs{newacronym}.
+See \sectionref{sec:abbreviations} for further details.)
\section{New or Modified Package Options}
\label{sec:pkgopts}
@@ -454,7 +495,10 @@ The new and modified options provided by \styfmt{glossaries-extra}
are described below:
\begin{description}
-\item[{\pkgopt{accsupp}}] Load the \sty{glossaries-accsupp}
+\item[{\styoptdef{postdot}}] (New to version 1.12.)
+This option is just a shortcut for \pkgopt[false]{nopostdot}.
+
+\item[{\styoptdef{accsupp}}] Load the \sty{glossaries-accsupp}
package (if not already loaded).
If you want to define styles that can interface with the
@@ -472,7 +516,7 @@ a~package option (not through \ics{glossariesextrasetup}) since the \sty{glossar
package must be loaded before \styfmt{glossaries-extra} if it's
required.
-\item[{\pkgopt{stylemods}}] This is a
+\item[{\styoptdef{stylemods}}] This is a
\meta{key}=\meta{value} option used to load the
\sty{glossaries-extra-stylemods} package. The value may be a
comma-separated list of options to pass to that package. (Remember
@@ -480,7 +524,7 @@ to group \meta{value} if it contains any commas.) The value may be
omitted if no options need to be passed. See \sectionref{sec:glosstylemods}
for further details.
-\item[{\pkgopt{undefaction}}] This is a \meta{key}=\meta{value}
+\item[{\styoptdef{undefaction}}] This is a \meta{key}=\meta{value}
option, which has two allowed values: \pkgoptfmt{warn} and
\pkgoptfmt{error}. This indicates what to do if an undefined
glossary entry is referenced. The default behaviour is
@@ -495,7 +539,7 @@ over a glossary list. This includes \ics{forglsentries} and
\ics{glsaddall}.
\end{important}
-\item[{\pkgopt{indexcrossrefs}}] This is a boolean option.
+\item[{\styoptdef{indexcrossrefs}}] This is a boolean option.
If \pkgoptfmt{true}, this will automatically index any
cross-referenced entries that haven't been marked as used at
the end of the document. Note that this necessarily adds to
@@ -503,7 +547,7 @@ the overall document build time, especially if you have defined
a large number of entries, so this defaults to \pkgoptfmt{false},
but it will be automatically switched on if you use the \gloskey{see}
or \gloskey{seealso} keys in any entries (unless
-\pkgopt[false]{autoseeindex}). To force it off, even if you use the
+\styopt[false]{autoseeindex}). To force it off, even if you use the
\gloskey{see} or \gloskey{seealso} key, you
need to explicitly set \pkgopt{indexcrossrefs} to \pkgoptfmt{false}.
@@ -512,7 +556,7 @@ entries when it parses the \texttt{.bib} source file.
The \pkgopt{record} option automatically implements
\pkgopt[false]{indexcrossrefs}.
-\item[{\pkgopt{autoseeindex}}]\label{opt:autoseeindex} (New to
+\item[{\styoptdef{autoseeindex}}]\label{opt:autoseeindex} (New to
v1.16.) This is a boolean option. If true (default), this makes
the \gloskey{see} and \gloskey{seealso} keys automatically index the
cross-reference when an entry is defined. If false, the value
@@ -521,7 +565,7 @@ of those keys will still be stored in their corresponding fields
\cs{glsxtruseseealso}) but cross-reference won't be automatically
indexed.
-Note that the \pkgopt[only]{record} option automatically implements
+Note that the \styopt[only]{record} option automatically implements
\pkgopt[false]{autoseeindex}.
For example, if an entry is defined as
@@ -540,7 +584,7 @@ but with \texttt{autoseeindex=false}, this is equivalent to
\newglossaryentry{foo}{name={foo},description={}}
\GlsXtrSetField{foo}{see}{bar,baz}
\end{verbatim}
-Note that \pkgopt{indexcrossrefs} isn't automatically implemented
+Note that \styopt{indexcrossrefs} isn't automatically implemented
by the presence of the \gloskey{see} key when \pkgopt{autoseeindex}
is false.
@@ -554,7 +598,7 @@ open, the information can't be written to it. This will need
the package option \pkgoptfmt{seenoindex=ignore} (provided by
\styfmt{glossaries}) to prevent an error occurring.
-\item[{\pkgopt{record}}]\label{opt:record}(New to v1.08.) This is a \meta{key}=\meta{value}
+\item[{\styoptdef{record}}]\label{opt:record}(New to v1.08.) This is a \meta{key}=\meta{value}
option, which has three allowed values: \pkgoptfmt{off} (default),
\pkgoptfmt{only} and \pkgoptfmt{alsoindex}. If the value is omitted
\pkgoptfmt{only} is assumed. The option is provided for the benefit
@@ -563,10 +607,10 @@ of \gls{bib2gls} (see \sectionref{sec:bib2gls}).
The option may only be set in the preamble.
The \pkgopt[off]{record} option switches off the recording, as per
-the default behaviour. It implements \pkgopt[error]{undefaction}.
+the default behaviour. It implements \styopt[error]{undefaction}.
The other values switch on the recording and also
-\pkgopt[warn]{undefaction}, but \pkgopt[only]{record}
+\styopt[warn]{undefaction}, but \pkgopt[only]{record}
will also switch off the indexing mechanism (even if \cs{makeglossaries}
or \cs{makenoidxglossaries} has been used) whereas
\pkgopt[alsoindex]{record} will both record and index.
@@ -590,7 +634,7 @@ out which entries have been used. (Remember that commands like
add a corresponding \cs{glsxtr@record} entry to the \texttt{.aux}
file.) See \sectionref{sec:bib2gls} for further details.
-\item[{\pkgopt{docdef}}] This option governs the use of
+\item[{\styoptdef{docdef}}] This option governs the use of
\cs{newglossaryentry}. It was originally a boolean option,
but as from version 1.06, it can now take one of three values (if
the value is omitted, \pkgoptfmt{true} is assumed):
@@ -627,7 +671,7 @@ remains a preamble-only command.
With this option, if an entry appears in the glossary before
it has been defined, an error will occur (or a warning if
-the \pkgopt[warn]{undefaction} option is used.) If you edit your
+the \styopt[warn]{undefaction} option is used.) If you edit your
document and either remove an entry or change its label, you may
need to delete the document's temporary files (such as the
\texttt{.aux} and \texttt{.gls} files).
@@ -656,14 +700,14 @@ This option affects commands that internally use
the \qt{on-the-fly} commands described in \sectionref{sec:onthefly}.
\end{sloppypar}
-\item[{\pkgopt{nomissingglstext}}] This is a boolean option.
+\item[{\styoptdef{nomissingglstext}}] This is a boolean option.
If true, this will suppress the warning text that will appear in the
document if the external glossary files haven't been generated due
to an incomplete document build. However, it's probably simpler
just to fix whatever has caused the failure to build the external
file or files.
-\item[{\pkgopt{abbreviations}}] This option has no value and can't
+\item[{\styoptdef{abbreviations}}] This option has no value and can't
be cancelled. If used,
it will automatically create a new glossary with the label
\texttt{abbreviations} and redefines \cs{glsxtrabbrvtype} to this
@@ -708,7 +752,7 @@ package's \pkgopt{acronymlists} option (or associated commands)
as the abbreviation mechanism is handled differently with
\styfmt{glossaries-extra}.
-\item[{\pkgopt{symbols}}] This is passed to \styfmt{glossaries} but
+\item[{\styoptdef{symbols}}] This is passed to \styfmt{glossaries} but
will additionally define
\begin{definition}[\DescribeMacro\glsxtrnewsymbol]
\cs{glsxtrnewsymbol}\oarg{options}\marg{label}\marg{symbol}
@@ -721,7 +765,7 @@ which is equivalent to
Note that the \gloskey{sort} key is set to the \meta{label}
not the \meta{symbol} as the symbol will likely contain commands.
-\item[{\pkgopt{numbers}}] This is passed to \styfmt{glossaries} but
+\item[{\styoptdef{numbers}}] This is passed to \styfmt{glossaries} but
will additionally define
\begin{definition}[\DescribeMacro\glsxtrnewnumber]
\cs{glsxtrnewnumber}\oarg{options}\marg{number}
@@ -732,13 +776,20 @@ which is equivalent to
sort=\marg{label},type=numbers,category=number,\meta{options}\}
\end{alltt}
-\item[{\pkgopt{shortcuts}}] Unlike the \styfmt{glossaries} package
+\item[{\styoptdef{shortcuts}}] Unlike the \styfmt{glossaries} package
option of the same name, this option isn't boolean but has multiple
values:
\begin{itemize}
\item \pkgopt[acronyms]{shortcuts} (or \pkgopt[acro]{shortcuts}):
set the shortcuts provided by the \styfmt{glossaries} package for acronyms (such as \cs{ac}).
+\item \pkgopt[ac]{shortcuts}:
+set the shortcuts provided by the \styfmt{glossaries} package for
+acronyms (such as \cs{ac}) but uses the \styfmt{glossaries-extra}
+interface (such as \cs{glsxtrshort} rather than \cs{acrshort}).
+In this case \cs{ac} is defined as \cs{cgls} rather than
+\cs{gls}.
+
\item \pkgopt[abbreviations]{shortcuts} (or
\pkgopt[abbr]{shortcuts}):
set the abbreviation shortcuts provided by \styfmt{glossaries-extra}. (See
@@ -773,8 +824,8 @@ set available options using
\begin{definition}[\DescribeMacro\glossariesextrasetup]
\cs{glossariesextrasetup}\marg{options}
\end{definition}
-The \pkgopt{abbreviations} and \pkgopt{docdef} options may only be
-used in the preamble. Additionally, \pkgopt{docdef} can't be used
+The \styopt{abbreviations} and \styopt{docdef} options may only be
+used in the preamble. Additionally, \styopt{docdef} can't be used
after \ics{makenoidxglossaries}.
\chapter{Modifications to Existing Commands and Styles}
@@ -782,7 +833,7 @@ after \ics{makenoidxglossaries}.
The commands used by \styfmt{glossaries} to automatically produce an
error if an entry is undefined (such as \ics{glsdoifexists}) are
-changed to take the \pkgopt{undefaction} option into account.
+changed to take the \styopt{undefaction} option into account.
The \ics{newignoredglossary}\marg{type} command now (as from v1.11) has a starred
version that doesn't automatically switch off the hyperlinks.
@@ -893,7 +944,7 @@ for the other glossaries. (See the accompanying file
\begin{important}
If you use the optional argument \meta{list}, you can't define
-entries in the document (even with the \pkgopt{docdef} option).
+entries in the document (even with the \styopt{docdef} option).
\end{important}
You will need at least version 2.20 of \gls{makeglossaries} or at
@@ -1080,7 +1131,7 @@ This modification allows \styfmt{glossaries-extra} to provide
\end{definition}
which is used at the end of the document to automatically add
any unused cross-references unless the package option
-\pkgopt{indexcrossrefs} was set to false.
+\styopt{indexcrossrefs} was set to false.
As a by-product of this enhancement, the \gloskey{see} key will now
work for entries defined in the \env{document} environment, but it's still
@@ -1596,11 +1647,8 @@ use
\end{definition}
which defaults to just \cs{glspluralsuffix}. Some of the
abbreviation styles have their own command for the plural suffix,
-such as \cs{glsxtrscsuffix} which is defined as:
-\begin{verbatim}
-\newcommand*{\glsxtrscsuffix}{\glstextup{\glsxtrabbrvpluralsuffix}}
-\end{verbatim}
-So if you want to completely strip all the plural suffixes used for
+such as \cs{glsxtrscsuffix},
+so if you want to completely strip all the plural suffixes used for
abbreviations then you need to redefine \cs{glsxtrabbrvpluralsuffix}
\emph{not} \cs{abbrvpluralsuffix}, which changes with the style. Redefining
\cs{acrpluralsuffix} will have no affect, since it's not used by the
@@ -2327,14 +2375,14 @@ passing \meta{name} as a package option to
\usepackage{glossaries-extra}
\usepackage[longragged]{glossaries-extra-stylemods}
\end{verbatim}
-Another option is to use the \pkgopt{stylemods} key when you
+Another option is to use the \styopt{stylemods} key when you
load \styfmt{glossaries-extra}. You can omit a value if you only want to use
the predefined styles that are automatically loaded by
\styfmt{glossaries} (for example, the \glostyle{long3col} style):
\begin{verbatim}
\usepackage[style=long3col,stylemods]{glossaries-extra}
\end{verbatim}
-Or the value of \pkgopt{stylemods} may be a comma-separated list
+Or the value of \styopt{stylemods} may be a comma-separated list
of the style package identifiers. For example:
\begin{verbatim}
\usepackage[style=mcoltree,stylemods=mcols]{glossaries-extra}
@@ -2567,106 +2615,11 @@ the \styfmt{glossaries} package, although they may produce similar
results.)
\end{sloppypar}
-The short form is displayed within commands like \cs{gls} using
-\begin{definition}[\DescribeMacro\glsfirstabbrvfont]
-\cs{glsfirstabbrvfont}\marg{short-form}
-\end{definition}
-on \gls{firstuse} and
-\begin{definition}[\DescribeMacro\glsabbrvfont]
-\cs{glsabbrvfont}\marg{short-form}
-\end{definition}
-for subsequent use.
-
-\begin{important}
-These commands (\cs{glsfirstabbrvfont} and \cs{glsabbrvfont}) are
-reset by the abbreviation styles and whenever an abbreviation is
-used by commands like \cs{gls} (but not by commands like
-\ics{glsentryshort}) so don't try redefining them outside of an
-abbreviation style.
-\end{important}
-
-If you use the \abbrstyle{long-short} style,
-\cs{glsabbrvfont} is redefine to use
-\begin{definition}[\DescribeMacro\glsabbrvdefaultfont]
-\cs{glsabbrvdefaultfont}\marg{text}
-\end{definition}
-whereas the \abbrstyle{long-short-sc} style redefines
-\cs{glsabbrvfont} to use \cs{glsxtrscfont}. If you want to use a different
-font-changing command you can either redefine \cs{glsabbrvdefaultfont} and
-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.
-
-Similarly the basic styles redefine \cs{glsfirstabbrvfont}
-to use
-\begin{definition}[\DescribeMacro\glsfirstabbrvdefaultfont]
-\cs{glsfirstabbrvdefaultfont}\marg{short-form}
-\end{definition}
-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 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, 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}
-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:
-\begin{definition}[\DescribeMacro\glsxtrinsertinsidetrue]
-\cs{glsxtrinsertinsidetrue}
-\end{definition}
-This applies to all the predefined styles. For example:
-\begin{verbatim}
-\setabbreviationstyle{long-short}
-\renewcommand*{\glsfirstlongdefaultfont}[1]{\emph{#1}}
-\glsxtrinsertinsidetrue
-\end{verbatim}
-This will make the long form and the inserted text emphasized,
-whereas the default (without \cs{glsxtrinsertinsidetrue}) would
-place the inserted text outside of the emphasized font.
-
-Note that for some styles, such as the \abbrstyle{short-long}, the
-inserted text would be placed inside the font command for the short
-form (rather than the long form in the above example).
+The way the abbreviations are displayed by commands like \cs{gls}
+varies according to the abbreviation style. The styles are set
+according to the entry's category so, unlike the base
+\styfmt{glossaries} package, you can have different abbreviation
+styles within the same glossary.
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
@@ -2803,6 +2756,13 @@ The \emph{inline} full form can be produced with
\end{definition}
(This this instead of \ics{acrfull}.)
+\begin{important}
+In general, it's best not to use commands like \ics{glsfirst}
+for abbreviations, especially if you use the \meta{insert}
+optional argument. Use either \cs{gls} (possibly with a reset)
+or \cs{glsxtrfull}.
+\end{important}
+
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-nolong} style
@@ -2897,37 +2857,47 @@ entry was defined. If you have mixed styles, you'll need to use
\label{sec:abbrshortcuts}
The abbreviation shortcut commands can be enabled using
-the package option \pkgopt[abbreviation]{shortcuts}
-(or \pkgopt[abbr]{shortcuts}). This defines the commands listed in
+the package option \styopt[abbreviation]{shortcuts}
+(or \styopt[abbr]{shortcuts}) or \styopt[ac]{shortcuts}.
+(You can use both settings at the same time.)
+The provided shortcut commands listed in
\tableref{tab:abbrshortcuts}.
\begin{table}[htbp]
\caption{Abbreviation Shortcut Commands}
\label{tab:abbrshortcuts}
\centering
-\begin{tabular}{ll}
-\bfseries Shortcut & \bfseries Equivalent Command\\
-\ics{ab} & \ics{cgls}\\
-\ics{abp} & \ics{cglspl}\\
-\ics{as} & \ics{glsxtrshort}\\
-\ics{asp} & \ics{glsxtrshortpl}\\
-\ics{al} & \ics{glsxtrlong}\\
-\ics{alp} & \ics{glsxtrlongpl}\\
-\ics{af} & \ics{glsxtrfull}\\
-\ics{afp} & \ics{glsxtrfullpl}\\
-\ics{As} & \ics{Glsxtrshort}\\
-\ics{Asp} & \ics{Glsxtrshortpl}\\
-\ics{Al} & \ics{Glsxtrlong}\\
-\ics{Alp} & \ics{Glsxtrlongpl}\\
-\ics{Af} & \ics{Glsxtrfull}\\
-\ics{Afp} & \ics{Glsxtrfullpl}\\
-\ics{AS} & \ics{GLSxtrshort}\\
-\ics{ASP} & \ics{GLSxtrshortpl}\\
-\ics{AL} & \ics{GLSxtrlong}\\
-\ics{ALP} & \ics{GLSxtrlongpl}\\
-\ics{AF} & \ics{GLSxtrfull}\\
-\ics{AFP} & \ics{GLSxtrfullpl}\\
-\ics{newabbr} & \ics{newabbreviation}
+\begin{tabular}{lll}
+\bfseries Shortcut &
+\bfseries Shortcut &
+\bfseries Equivalent Command\\
+\bfseries (\pkgopt[abbreviation]{shortcuts}) &
+\bfseries (\pkgopt[ac]{shortcuts})\\
+\ics{ab} & \ics{ac} & \ics{cgls}\\
+\ics{abp} & \ics{acp} & \ics{cglspl}\\
+\ics{as} & \ics{acs} & \ics{glsxtrshort}\\
+\ics{asp} & \ics{acsp} & \ics{glsxtrshortpl}\\
+\ics{al} & \ics{acl} & \ics{glsxtrlong}\\
+\ics{alp} & \ics{aclp} & \ics{glsxtrlongpl}\\
+\ics{af} & \ics{acf} & \ics{glsxtrfull}\\
+\ics{afp} & \ics{acfp} & \ics{glsxtrfullpl}\\
+\ics{Ab} & \ics{Ac} & \ics{cgls}\\
+\ics{Abp} & \ics{Acp} & \ics{cglspl}\\
+\ics{As} & \ics{Acs} & \ics{Glsxtrshort}\\
+\ics{Asp} & \ics{Acsp} & \ics{Glsxtrshortpl}\\
+\ics{Al} & \ics{Acl} & \ics{Glsxtrlong}\\
+\ics{Alp} & \ics{Aclp} & \ics{Glsxtrlongpl}\\
+\ics{Af} & \ics{Acf} & \ics{Glsxtrfull}\\
+\ics{Afp} & \ics{Acfp} & \ics{Glsxtrfullpl}\\
+\ics{AB} & \ics{AC} & \ics{cGLS}\\
+\ics{ABP} & \ics{ACP} & \ics{cGLSpl}\\
+\ics{AS} & \ics{ACS} & \ics{GLSxtrshort}\\
+\ics{ASP} & \ics{ACSP} & \ics{GLSxtrshortpl}\\
+\ics{AL} & \ics{ACL} & \ics{GLSxtrlong}\\
+\ics{ALP} & \ics{ACLP} & \ics{GLSxtrlongpl}\\
+\ics{AF} & \ics{ACF} & \ics{GLSxtrfull}\\
+\ics{AFP} & \ics{ACFP} & \ics{GLSxtrfullpl}\\
+\ics{newabbr} & \ics{newabbr} & \ics{newabbreviation}
\end{tabular}
\end{table}
@@ -2960,6 +2930,9 @@ In both cases, the \gls{firstuse} of \ics{gls} may not match the
text produced by \ics{glsfirst} (and likewise for the plural
and case-changing versions).
+The sample file \texttt{sample-abbr-styles.tex} demonstrates all
+predefined styles described here.
+
\begin{important}
For the \qt{sc} styles that use \ics{textsc}, be careful about your choice
of fonts as some only have limited support. For
@@ -2968,29 +2941,66 @@ recommend that you at least use the \sty{fontenc} package with the
\pkgoptfmt{T1} option or something similar.
\end{important}
-The \qt{sc} styles all use
-\begin{definition}[\DescribeMacro\glsxtrscfont]
-\cs{glsxtrscfont}\marg{text}
+The parenthetical styles, such as \abbrstyle{long-short},
+use
+\begin{definition}[\DescribeMacro\glsxtrparen]
+\cs{glsxtrparen}\marg{text}
+\end{definition}
+to set the parenthetical material. This just puts parentheses around
+the text: (\meta{text}).
+
+The basic abbreviation styles, such as \abbrstyle{long-short}
+and \abbrstyle{short-long} use
+\begin{definition}[\DescribeMacro\glsabbrvdefaultfont]
+\cs{glsabbrvdefaultfont}\marg{text}
\end{definition}
-which is defined as
-\begin{verbatim}
-\newcommand*{\glsxtrscfont}[1]{\textsc{#1}}
-\end{verbatim}
-and
-\begin{definition}[\DescribeMacro\glsxtrfirstscfont]
-\cs{glsxtrfirstscfont}\marg{text}
+for the short form. This just does \meta{text} by default.
+(That is, no font change is applied.) On first use,
+\begin{definition}[\DescribeMacro\glsfirstabbrvdefaultfont]
+\cs{glsfirstabbrvdefaultfont}\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
+is used instead. By default, this just does
+\cs{glsabbrvdefaultfont}. The long form is formatted according to
+\begin{definition}[\DescribeMacro\glslongdefaultfont]
+\cs{glslongdefaultfont}\marg{text}
+\end{definition}
+which again just does \meta{text} (no font change). On first use,
+\begin{definition}[\DescribeMacro\glsfirstlongdefaultfont]
+\cs{glsfirstlongdefaultfont}\marg{text}
+\end{definition}
+is used instead. This just does \cs{glslongdefaultfont}.
+The plural suffix used for the short form is given by
+\begin{definition}[\DescribeMacro\glsxtrabbrvpluralsuffix]
+\cs{glsxtrabbrvpluralsuffix}
+\end{definition}
+which defaults to \ics{glspluralsuffix}.
+
+The small-cap styles, such as \abbrstyle{long-short-sc}
+and \abbrstyle{short-sc-long}, use
+\begin{definition}[\DescribeMacro\glsabbrvscfont]
+\cs{glsabbrvscfont}\marg{text}
+\end{definition}
+which uses \cs{textsc}.\footnote{For compatibility with earlier
+versions, \cs{glsabbrvscfont} is defined to \cs{glsxtrscfont},
+which is defined to use \cs{textsc}. Direct use of
+\cs{glsxtrscfont} is now deprecated. Likewise for similar commands.}
+On first use
+\begin{definition}[\DescribeMacro\glsabbrvdefaultfont]
+\cs{glsfirstabbrvscfont}\marg{text}
+\end{definition}
+is used instead. This uses \cs{glsabbrvscfont} by default.
+So redefine, \cs{glsabbrvscfont} to change first and subsequent uses or
+\cs{glsfirstabbrvscfont} to change just the first use.
+
+The long form for the small-cap styles uses \cs{glslongdefaultfont}
+or \cs{glsfirstlongdefaultfont}, as with the basic style.
+The suffix is given by
\begin{definition}[\DescribeMacro\glsxtrscsuffix]
\cs{glsxtrscsuffix}
\end{definition}
-This just defined as
+This is defined as
\begin{verbatim}
-\newcommand*{\glsxtrscsuffix}{\glstextup{\glspluralsuffix}}
+\newcommand*{\glsxtrscsuffix}{\glstextup{\glsxtrabbrvpluralsuffix}}
\end{verbatim}
The \ics{glstextup} command is provided by \styfmt{glossaries}
and is used to switch off the small caps font for the suffix.
@@ -3002,59 +3012,160 @@ 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}
+The small styles, such as \abbrstyle{long-short-sm}
+and \abbrstyle{short-sm-long}, use
+\begin{definition}[\DescribeMacro\glsabbrvsmfont]
+\cs{glsabbrvsmfont}\marg{text}
\end{definition}
-This is defined as:
-\begin{verbatim}
-\newcommand*{\glsxtrsmfont}[1]{\textsmaller{#1}}
-\end{verbatim}
-and
-\begin{definition}[\DescribeMacro\glsxtrfirstsmfont]
-\cs{glsxtrfirstsmfont}\marg{text}
+which uses \cs{textsmaller}. (This requires the \sty{relsizes}
+package, which isn't loaded by \styfmt{glossaries-extra}, so must be
+loaded explicitly.)
+On first use
+\begin{definition}[\DescribeMacro\glsfirstabbrvsmfont]
+\cs{glsfirstabbrvsmfont}\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:
-\begin{verbatim}
-\renewcommand*{\glsxtrsmfont}[1]{\textsmaller{\MakeTextUppercase{#1}}}
-\end{verbatim}
-The default plural suffix for the short form is set to
+is used instead. This uses \cs{glsabbrvsmfont} by default.
+
+The long form for the smaller styles uses \cs{glslongdefaultfont}
+or \cs{glsfirstlongdefaultfont}, as with the basic style.
+The suffix is given by
\begin{definition}[\DescribeMacro\glsxtrsmsuffix]
\cs{glsxtrsmsuffix}
\end{definition}
-This just does \ics{glspluralsuffix}.
+which defaults to just \cs{glsxtrabbrvpluralsuffix}.
-The \qt{em} styles all use
+The \qt{short-em} (emphasize short) styles, such as
+\abbrstyle{long-short-em} or \abbrstyle{short-em-long}, 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
+On first use
\begin{definition}[\DescribeMacro\glsfirstabbrvemfont]
\cs{glsfirstabbrvemfont}\marg{text}
\end{definition}
-which is defined as:
+is used instead. This uses \cs{glsabbrvemfont} by default.
+The suffix is given by
+\begin{definition}[\DescribeMacro\glsxtremsuffix]
+\cs{glsxtremsuffix}
+\end{definition}
+which defaults to just \cs{glsxtrabbrvpluralsuffix}.
+The long form is as for the basic style unless the style
+is a \qt{long-em} style.
+
+The \qt{long-em} (emphasize long) styles, such as
+\abbrstyle{long-em-short-em} or \abbrstyle{short-em-long-em}, 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}.
+
+The user styles have similar commands:
+\begin{definition}[\DescribeMacro\glsabbrvuserfont]
+\cs{glsabbrvuserfont}\marg{text}
+\end{definition}
+for the short form,
+\begin{definition}[\DescribeMacro\glsfirstabbrvuserfont]
+\cs{glsfirstabbrvuserfont}\marg{text}
+\end{definition}
+for the first use short form,
+\begin{definition}[\DescribeMacro\glslonguserfont]
+\cs{glslonguserfont}\marg{text}
+\end{definition}
+for the long form,
+\begin{definition}[\DescribeMacro\glsfirstlonguserfont]
+\cs{glsfirstlonguserfont}\marg{text}
+\end{definition}
+for the first use long form, and
+\begin{definition}[\DescribeMacro\glsxtrusersuffix]
+\cs{glsxtrusersuffix}
+\end{definition}
+for the short plural suffix.
+
+Similarly for the hyphen styles:
+\begin{definition}[\DescribeMacro\glsabbrvhyphenfont]
+\cs{glsabbrvhyphenfont}\marg{text}
+\end{definition}
+for the short form,
+\begin{definition}[\DescribeMacro\glsfirstabbrvhyphenfont]
+\cs{glsfirstabbrvhyphenfont}\marg{text}
+\end{definition}
+for the first use short form,
+\begin{definition}[\DescribeMacro\glslonghyphenfont]
+\cs{glslonghyphenfont}\marg{text}
+\end{definition}
+for the long form,
+\begin{definition}[\DescribeMacro\glsfirstlonghyphenfont]
+\cs{glsfirstlonghyphenfont}\marg{text}
+\end{definition}
+for the first use long form, and
+\begin{definition}[\DescribeMacro\glsxtrhyphensuffix]
+\cs{glsxtrhyphensuffix}
+\end{definition}
+for the short plural suffix.
+
+Similarly for the \qt{only} styles, such as
+\abbrstyle{long-only-short-only}:
+\begin{definition}[\DescribeMacro\glsabbrvonlyfont]
+\cs{glsabbrvonlyfont}\marg{text}
+\end{definition}
+for the short form,
+\begin{definition}[\DescribeMacro\glsfirstabbrvonlyfont]
+\cs{glsfirstabbrvonlyfont}\marg{text}
+\end{definition}
+for the first use short form,
+\begin{definition}[\DescribeMacro\glslongonlyfont]
+\cs{glslongonlyfont}\marg{text}
+\end{definition}
+for the long form,
+\begin{definition}[\DescribeMacro\glsfirstlongonlyfont]
+\cs{glsfirstlongonlyfont}\marg{text}
+\end{definition}
+for the first use long form, and
+\begin{definition}[\DescribeMacro\glsxtronlysuffix]
+\cs{glsxtronlysuffix}
+\end{definition}
+for the short plural suffix.
+
+Note that by default inserted material (provided in the final
+optional argument of commands like \cs{gls}), is placed outside the
+font command in the predefined styles. To move it inside, use:
+\begin{definition}[\DescribeMacro\glsxtrinsertinsidetrue]
+\cs{glsxtrinsertinsidetrue}
+\end{definition}
+This applies to all the predefined styles. For example:
+\begin{verbatim}
+\setabbreviationstyle{long-short}
+\renewcommand*{\glsfirstlongdefaultfont}[1]{\emph{#1}}
+\glsxtrinsertinsidetrue
+\end{verbatim}
+This will make the long form and the inserted text emphasized,
+whereas the default (without \cs{glsxtrinsertinsidetrue}) would
+place the inserted text outside of the emphasized font.
+
+Note that for some styles, such as the \abbrstyle{short-long}, the
+inserted text would be placed inside the font command for the short
+form (rather than the long form in the above example).
+
+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{glsabbrvscfont} to
+convert its argument to lowercase. For example:
+\begin{verbatim}
+\renewcommand*{\glsabbrvscfont}[1]{\textsc{\MakeLowercase{#1}}}
+\end{verbatim}
+
+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 case:
\begin{verbatim}
-\newcommand*{\glsfirstabbrvemfont}[1]{\glsabbrvemfont{#1}}
+\renewcommand*{\glsabbrvscfont}[1]{\textsc{\MakeTextLowercase{#1}}}
+\renewcommand*{\glsabbrvsmfont}[1]{\textsmaller{\MakeTextUppercase{#1}}}
\end{verbatim}
Some of the styles use
@@ -3074,7 +3185,7 @@ or
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}]
+\meta{field1}[\texttt{-}\meta{modifier1}]\texttt{-}[post]\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
@@ -3085,6 +3196,9 @@ 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 \texttt{post} is present then \meta{field2} is
+placed after the \gls{linktext} using the post-link hook.
+
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.)
@@ -3101,8 +3215,32 @@ 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}).
+
+ \item\abbrstyle{long-hyphen-postshort-hyphen}: the short
+form and the inserted material (provided by the final optional
+argument of commands like \cs{gls}) is moved to the post-link hook.
+The long form is formatted according to \cs{glslonghyphenfont}
+(or \cs{glsfirstlonghyphenfont} on first use).
+The short form is formatted according to \cs{glsabbrvhyphenfont}
+(or \cs{glsfirstabbrvhyphenfont} on first use).
\end{itemize}
+\item \meta{style}\texttt{-noreg}
+
+Some styles set the \catattr{regular} attribute. In some cases,
+there's a version of the style that doesn't set this attribute.
+For example, \abbrstyle{long-em-noshort-em} sets the
+\catattr{regular} attribute. The
+\abbrstyle{long-em-noshort-em-noreg} style is a minor variation
+that style that doesn't set the attribute.
+
+There are a few \qt{noshort} styles, such as
+\abbrstyle{long-hyphen-noshort-noreg}, that have
+\qt{-noreg} version without a regular version. This is because the
+style won't work properly with the \catattr{regular} set, but the
+naming scheme is maintained for consistency with the other
+\qt{noshort} styles.
+
\item
\meta{field1}[\texttt{-}\meta{modifier1}]\texttt{-}[\texttt{post}]\texttt{footnote}
@@ -3165,34 +3303,34 @@ attribute to \qt{true} for all categories that have abbreviations
defined with any of these styles.
\begin{description}
-\item[\abbrstyle{short-nolong}]
+\item[\abbrstyledef{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}] A synonym for \abbrstyle{short-nolong}.
+\item[\abbrstyledef{short}] A synonym for \abbrstyle{short-nolong}.
-\item[\abbrstyle{short-sc-nolong}]
+\item[\abbrstyledef{short-sc-nolong}]
Like \abbrstyle{short-nolong} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrscfont}.
+use \ics{glsabbrvscfont} (which defaults to \cs{textsc}).
-\item[\abbrstyle{short-sc}] A synonym for \abbrstyle{short-sc-nolong}
+\item[\abbrstyledef{short-sc}] A synonym for \abbrstyle{short-sc-nolong}
-\item[\abbrstyle{short-sm-nolong}]
+\item[\abbrstyledef{short-sm-nolong}]
Like \abbrstyle{short-nolong} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrsmfont}.
+use \ics{glsabbrvsmfont} (which defaults to \cs{textsmaller}).
-\item[\abbrstyle{short-sm}] A synonym for \abbrstyle{short-sm-nolong}.
+\item[\abbrstyledef{short-sm}] A synonym for \abbrstyle{short-sm-nolong}.
-\item[\abbrstyle{short-em-nolong}]
+\item[\abbrstyledef{short-em-nolong}]
Like \abbrstyle{short-nolong} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtremfont}.
+use \ics{glsabbrvemfont}.
-\item[\abbrstyle{short-em}] A synonym for \abbrstyle{short-em-nolong}
+\item[\abbrstyledef{short-em}] A synonym for \abbrstyle{short-em-nolong}
-\item[\abbrstyle{short-nolong-desc}]
+\item[\abbrstyledef{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-nolong} style with the
@@ -3200,31 +3338,31 @@ 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-desc}] A synonym for
+\item[\abbrstyledef{short-desc}] A synonym for
\abbrstyle{short-nolong-desc}.
-\item[\abbrstyle{short-sc-nolong-desc}]
+\item[\abbrstyledef{short-sc-nolong-desc}]
Like \abbrstyle{short-nolong} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrscfont}.
+use \ics{glsabbrvscfont} (which defaults to \cs{textsc}).
-\item[\abbrstyle{short-sc-desc}] A synonym for
+\item[\abbrstyledef{short-sc-desc}] A synonym for
\abbrstyle{short-sc-nolong-desc}.
-\item[\abbrstyle{short-sm-nolong-desc}]
+\item[\abbrstyledef{short-sm-nolong-desc}]
Like \abbrstyle{short-nolong-desc} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrsmfont}.
+use \ics{glsabbrvsmfont} (which defaults to \cs{textsmaller}).
-\item[\abbrstyle{short-sm-desc}] A synonym for
+\item[\abbrstyledef{short-sm-desc}] A synonym for
\abbrstyle{short-sm-nolong-desc}.
-\item[\abbrstyle{short-em-nolong-desc}]
+\item[\abbrstyledef{short-em-nolong-desc}]
Like \abbrstyle{short-nolong-desc} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtremfont}.
+use \ics{glsabbrvemfont}.
-\item[\abbrstyle{short-em-desc}] A synonym for
+\item[\abbrstyledef{short-em-desc}] A synonym for
\abbrstyle{short-em-nolong-desc}.
-\item[\abbrstyle{long-noshort-desc}]
+\item[\abbrstyledef{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
@@ -3237,36 +3375,36 @@ 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}] A synonym for
+\item[\abbrstyledef{long-desc}] A synonym for
\abbrstyle{long-noshort-desc}.
-\item[\abbrstyle{long-noshort-sc-desc}]
+\item[\abbrstyledef{long-noshort-sc-desc}]
Like the \abbrstyle{long-noshort-desc} style but the short form (accessed
-through commands like \ics{glsxtrshort}) use \ics{glsxtrscfont}.
+through commands like \ics{glsxtrshort}) use \ics{glsabbrvscfont}.
(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-noshort-sm-desc}]
+\item[\abbrstyledef{long-noshort-sm-desc}]
Like \abbrstyle{long-noshort-desc} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrsmfont}.
+use \ics{glsabbrvsmfont}.
(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}]
+\item[\abbrstyledef{long-noshort-em-desc}]
Like \abbrstyle{long-noshort-desc} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtremfont}. The long form isn't emphasized.
+use \ics{glsabbrvemfont}. 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}]
+\item[\abbrstyledef{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
+\cs{glsabbrvfont} to use \ics{glsabbrvemfont}. The long form uses
\ics{glsfirstlongemfont} and \ics{glslongemfont}.
-\item[\abbrstyle{long-noshort}]
+\item[\abbrstyledef{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-noshort-desc} style, but the \gloskey{name}
@@ -3274,35 +3412,37 @@ and \gloskey{sort} keys are
set to the short form and the \gloskey{description} is set to the
long form.
-\item[\abbrstyle{long}] A synonym for \abbrstyle{long-noshort}
+\item[\abbrstyledef{long}] A synonym for \abbrstyle{long-noshort}
-\item[\abbrstyle{long-noshort-sc}]
+\item[\abbrstyledef{long-noshort-sc}]
Like the \abbrstyle{long-noshort} style but the short form (accessed
-through commands like \ics{glsxtrshort}) use \ics{glsxtrscfont}.
+through commands like \ics{glsxtrshort}) use \ics{glsabbrvscfont}.
(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-noshort-sm}]
+\item[\abbrstyledef{long-noshort-sm}]
Like \abbrstyle{long-noshort} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrsmfont}.
+use \ics{glsabbrvsmfont}.
(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}]
+\item[\abbrstyledef{long-noshort-em}]
This style is like \abbrstyle{long-noshort} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtremfont}. The long form isn't emphasized.
+use \ics{glsabbrvemfont}. 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}]
+\item[\abbrstyledef{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
+use \ics{glsabbrvemfont}, \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}.
+The related style \abbrstyledef{long-em-noshort-em-noreg}
+doesn't set the \catattr{regular} attribute.
\end{description}
@@ -3316,7 +3456,7 @@ been set. If it hasn't already been set, it's left unset.
Other attributes may also be set, depending on the style.
\begin{description}
-\item[\abbrstyle{long-short}]
+\item[\abbrstyledef{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}
and \gloskey{sort} keys are set to the short form. (The
@@ -3327,23 +3467,39 @@ 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}]
+\item[\abbrstyledef{long-short-sc}]
Like \abbrstyle{long-short} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrscfont}.
+use \ics{glsabbrvscfont}.
-\item[\abbrstyle{long-short-sm}]
+\item[\abbrstyledef{long-short-sm}]
Like \abbrstyle{long-short} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrsmfont}.
+use \ics{glsabbrvsmfont}.
-\item[\abbrstyle{long-short-em}]
+\item[\abbrstyledef{long-short-em}]
Like \abbrstyle{long-short} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtremfont}.
+use \ics{glsabbrvemfont}.
-\item[\abbrstyle{long-em-short-em}]
+\item[\abbrstyledef{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}]
+\item[\abbrstyledef{long-only-short-only}]
+New to version 1.17, this style only shows the long form
+on first use and only shows the short form on subsequent use.
+The inline full form \cs{glsxtrfull} shows the long form
+followed by the short form in parentheses.
+
+\item[\abbrstyledef{long-only-short-only-desc}]
+New to version 1.17, this style is like
+\abbrstyle{long-only-short-only} but the user must supply the
+description.
+
+\item[\abbrstyledef{long-em-noshort-em-noreg}]
+New to version 1.17, this style is like
+\abbrstyle{long-em-noshort-em} but
+doesn't set the \catattr{regular} attribute.
+
+\item[\abbrstyledef{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
@@ -3364,7 +3520,9 @@ The format is governed by
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.
+a space using \cs{glsxtrfullsep} and then the parenthetical content
+(using \ics{glsxtrparen}).
+
The \meta{text} argument includes the font formatting command,
\cs{glsfirstabbrvfont}\marg{short} in the case of the
\abbrstyle{long-short-user} style and
@@ -3404,11 +3562,19 @@ 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{\glsabbruserfont}[1]{\glsabbrvscfont{#1}}
\renewcommand{\glsxtrusersuffix}{\glsxtrscsuffix}
\end{verbatim}
-\item[\abbrstyle{long-short-desc}]
+\item[\abbrstyledef{long-noshort-noreg}]
+This style is like \abbrstyle{long-noshort} but it doesn't
+set the \catattr{regular} attribute.
+
+\item[\abbrstyledef{long-noshort-desc-noreg}]
+This style is like \abbrstyle{long-noshort-desc} but it doesn't
+set the \catattr{regular} attribute.
+
+\item[\abbrstyledef{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{sort} key is set to
@@ -3425,24 +3591,29 @@ For example:
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}]
+\item[\abbrstyledef{long-short-sc-desc}]
Like \abbrstyle{long-short-desc} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrscfont}.
+use \ics{glsabbrvscfont}.
-\item[\abbrstyle{long-short-sm-desc}]
+\item[\abbrstyledef{long-short-sm-desc}]
Like \abbrstyle{long-short-desc} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrsmfont}.
+use \ics{glsabbrvsmfont}.
-\item[\abbrstyle{long-short-em-desc}]
+\item[\abbrstyledef{long-short-em-desc}]
Like \abbrstyle{long-short-desc} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtremfont}.
+use \ics{glsabbrvemfont}.
-\item[\abbrstyle{long-em-short-em-desc}]
+\item[\abbrstyledef{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[\abbrstyledef{long-em-noshort-em-desc-noreg}]
+New to version 1.17, this style is like
+\abbrstyle{long-em-noshort-em-desc} but
+doesn't set the \catattr{regular} attribute.
-\item[\abbrstyle{long-short-user-desc}]
+
+\item[\abbrstyledef{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
@@ -3452,7 +3623,11 @@ 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}]
+\item[\abbrstyledef{short-nolong-noreg}]
+This is like \abbrstyle{short-nolong} but doesn't set the
+\catattr{regular} attribute.
+
+\item[\abbrstyledef{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}
and \gloskey{sort} keys are set to the short form. The
@@ -3462,53 +3637,57 @@ 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}]
+\item[\abbrstyledef{short-sc-long}]
Like \abbrstyle{short-long} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrscfont}.
+use \ics{glsabbrvscfont}.
-\item[\abbrstyle{short-sm-long}]
+\item[\abbrstyledef{short-sm-long}]
Like \abbrstyle{short-long} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrsmfont}.
+use \ics{glsabbrvsmfont}.
-\item[\abbrstyle{short-em-long}]
+\item[\abbrstyledef{short-em-long}]
Like \abbrstyle{short-long} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtremfont}.
+use \ics{glsabbrvemfont}.
-\item[\abbrstyle{short-em-long-em}]
+\item[\abbrstyledef{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}]
+\item[\abbrstyledef{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}]
+\item[\abbrstyledef{short-nolong-desc-noreg}]
+This style is like \abbrstyle{short-nolong-desc} but it doesn't
+set the \catattr{regular} attribute.
+
+\item[\abbrstyledef{short-long-desc}]
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 full form. The
\gloskey{description} must be supplied by the user.
The short and long forms are separated by \cs{glsxtrfullsep}.
-\item[\abbrstyle{short-sc-long-desc}]
+\item[\abbrstyledef{short-sc-long-desc}]
Like \abbrstyle{short-long-desc} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrscfont}.
+use \ics{glsabbrvscfont}.
-\item[\abbrstyle{short-sm-long-desc}]
+\item[\abbrstyledef{short-sm-long-desc}]
Like \abbrstyle{short-long-desc} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrsmfont}.
+use \ics{glsabbrvsmfont}.
-\item[\abbrstyle{short-em-long-desc}]
+\item[\abbrstyledef{short-em-long-desc}]
Like \abbrstyle{short-long-desc} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtremfont}.
+use \ics{glsabbrvemfont}.
-\item[\abbrstyle{short-em-long-em-desc}]
+\item[\abbrstyledef{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}]
+\item[\abbrstyledef{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
@@ -3517,7 +3696,7 @@ as for \abbrstyle{short-long-user} and the \gloskey{name} key is as
supplied in the optional argument of \cs{newabbreviation}
(or \cs{newacronym}).
-\item[\abbrstyle{short-footnote}]
+\item[\abbrstyledef{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
@@ -3561,31 +3740,31 @@ Note that I haven't used commands like \cs{glsxtrshort} to
avoid interference (see \sectionref{sec:entryfmtmods}
and \sectionref{sec:nested}).
-\item[\abbrstyle{footnote}] A synonym for
+\item[\abbrstyledef{footnote}] A synonym for
\abbrstyle{short-footnote}.
-\item[\abbrstyle{short-sc-footnote}]
+\item[\abbrstyledef{short-sc-footnote}]
Like \abbrstyle{short-footnote} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrscfont}.
+use \ics{glsabbrvscfont}.
(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{short-sc-footnote}]
+\item[\abbrstyledef{short-sc-footnote}]
Like \abbrstyle{short-footnote} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrsmfont}.
+use \ics{glsabbrvsmfont}.
(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}]
+\item[\abbrstyledef{short-em-footnote}]
Like \abbrstyle{short-footnote} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtremfont}.
+use \ics{glsabbrvemfont}.
(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}]
+\item[\abbrstyledef{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
@@ -3600,31 +3779,31 @@ 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}] A synonym for
+\item[\abbrstyledef{postfootnote}] A synonym for
\abbrstyle{short-postfootnote}.
-\item[\abbrstyle{short-sc-postfootnote}]
+\item[\abbrstyledef{short-sc-postfootnote}]
Like \abbrstyle{short-postfootnote} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrscfont}.
+use \ics{glsabbrvscfont}.
(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{short-sm-postfootnote}]
+\item[\abbrstyledef{short-sm-postfootnote}]
Like \abbrstyle{short-postfootnote} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtrsmfont}.
+use \ics{glsabbrvsmfont}.
(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{short-em-postfootnote}]
+\item[\abbrstyledef{short-em-postfootnote}]
Like \abbrstyle{short-postfootnote} but redefines \cs{glsabbrvfont} to
-use \ics{glsxtremfont}.
+use \ics{glsabbrvemfont}.
(This style was originally called \depabbrstyle{postfootnote-em}. Renamed in version
1.04, but original name retained as a deprecated synonym for
backward-compatibility.)
-\item[\abbrstyle{short-postlong-user}]
+\item[\abbrstyledef{short-postlong-user}]
This style was introduced in version 1.12. It's like the
\abbrstyle{short-long-user} style but defers the parenthetical
material to after the link-text. This means that you don't have such
@@ -3632,22 +3811,231 @@ a long hyperlink (which can cause problems for the DVI \LaTeX\ format)
and it also means that the user supplied material can include a
hyperlink to another location.
-\item[\abbrstyle{short-postlong-user-desc}]
+\item[\abbrstyledef{short-postlong-user-desc}]
This style was introduced in version 1.12. It's like the above
\abbrstyle{short-postlong-user} style but the \gloskey{description}
must be specified.
-\item[\abbrstyle{long-postshort-user}]
+\item[\abbrstyledef{long-postshort-user}]
This style was introduced in version 1.12. It's like the above
\abbrstyle{short-postlong-user} style but the long form is shown
first and the short form is in the parenthetical material (as for
\abbrstyle{long-short-user}) style.
-\item[\abbrstyle{long-postshort-user-desc}]
+\item[\abbrstyledef{long-postshort-user-desc}]
This style was introduced in version 1.12. It's like the above
\abbrstyle{long-postshort-user} style but the \gloskey{description}
must be specified.
+\item[\abbrstyledef{long-hyphen-short-hyphen}]
+This style (new to v1.17) is designed to work with the \catattr{markwords}
+category attribute. The full form is formatted using
+\begin{definition}[\DescribeMacro\glsxtrlonghyphenshort]
+\cs{glsxtrlonghyphenshort}\marg{label}\marg{long}\marg{short}\marg{insert}
+\end{definition}
+where \meta{insert} is the inserted material
+provided in the final optional argument of commands like
+\cs{insert}. If \meta{insert} start with a hyphen, then this
+locally redefines \ics{glsxtrwordsep} to a hyphen, which means that
+if the \catattr{markwords} attribute is set then the long form
+will become hyphenated. (If this attribute isn't set, there's
+no alteration to the way the long form is displayed.)
+
+Unlike the other \meta{long} (\meta{short}) type of styles,
+such as \abbrstyle{long-short}, this style
+also repeats the insertion in the parenthetical part, so that the
+first use form is:
+\begin{quote}
+\cs{glsfirstlonghyphenfont}\marg{long}\meta{insert}
+(\cs{glsfirstabbrvhyphenfont}\marg{short}\meta{insert})
+\end{quote}
+The space before the parenthetical material is actually given by
+\cs{glsxtrfullsep}\marg{label} which defaults to a space.
+The \meta{insert} may be moved into the formatting commands
+according to the conditional \cs{ifglsxtrinsertinside}.
+
+For example, if \texttt{ip} is defined using:
+\begin{verbatim}
+\glssetcategoryattribute{english}{markwords}{true}
+\setabbreviationstyle[english]{long-hyphen-short-hyphen}
+\newabbreviation[category=english]{ip}{IP}{Internet Protocol}
+\end{verbatim}
+then
+\begin{verbatim}
+\gls{ip}[-Adressen]
+\end{verbatim}
+will do
+\begin{quote}
+Internet-Protocol-Adressen (IP-Adressen)
+\end{quote}
+on first use, whereas
+\begin{verbatim}
+\gls{ip}[ Address]
+\end{verbatim}
+will do
+\begin{quote}
+Internet Protocol Address (IP Address)
+\end{quote}
+on first use.
+
+\begin{important}
+Note that the hyphenation isn't applied when using commands like
+\cs{glsxtrlong}. This means that
+\begin{verbatim}
+\glsxtrlong{ip}[-Adressen]
+\end{verbatim}
+will do
+\begin{quote}
+Internet Protocol-Adressen
+\end{quote}
+\end{important}
+
+If the \catattr{markwords} attribute hadn't been set, then the
+first use of
+\begin{verbatim}
+\gls{ip}[-Adressen]
+\end{verbatim}
+would do
+\begin{quote}
+Internet Protocol-Adressen (IP-Adressen)
+\end{quote}
+instead.
+
+\begin{important}
+If the inserted material \meta{insert} is likely to contain commands like
+\cs{gls}, then use \abbrstyle{long-hyphen-postshort-hyphen}
+instead to avoid nested links.
+\end{important}
+
+If you want the short version in small-caps, you can
+just redefine \cs{glsabbrvhyphenfont} and \cs{glsxtrhyphensuffix}
+to use the small-caps versions. For example:
+\begin{verbatim}
+\renewcommand{\glsabbrvhyphenfont}{\glsabbrvscfont}
+\renewcommand{\glsxtrhyphensuffix}{\glsxtrscsuffix}
+\end{verbatim}
+Similarly for other font-changing variations.
+
+\item[\abbrstyledef{long-hyphen-noshort-desc-noreg}]
+New to version 1.17, this style is like
+\abbrstyle{long-hyphen-short-hyphen-desc} except that the
+parenthetical part is omitted and the long form is displayed
+on subsequent use. The short form can be accessed
+with \cs{glsxtrshort} but just uses the default abbreviation font.
+There's no regular version of this style as the regular form
+doesn't have the flexibility to deal with the hyphen switch.
+
+\item[\abbrstyledef{long-hyphen-noshort-noreg}]
+New to version 1.17, this style is like
+\abbrstyle{long-hyphen-noshort-desc-noreg} but the
+name is set to the short form and the description is set to the long
+form.
+
+\item[\abbrstyledef{long-hyphen-short-hyphen-desc}]
+
+New to version 1.17.
+This is similar to \abbrstyle{long-hyphen-short-hyphen} but the user
+supplies the description.
+
+\item[\abbrstyledef{long-hyphen-postshort-hyphen}]
+
+New to version 1.17.
+This is similar to \abbrstyle{long-hyphen-short-hyphen} but the
+inserted and parenthetical material are moved to the post-link hook.
+On first use, \cs{gls}\marg{label}\oarg{insert} will do
+\begin{display}
+\cs{glsxtrlonghyphen}\marg{long}\marg{label}\marg{insert}\cs{glsxtrposthyphenshort}\marg{label}\meta{insert}
+\end{display}
+where
+\begin{definition}[\DescribeMacro\glsxtrposthyphenshort]
+\cs{glsxtrposthyphenshort}\marg{label}\meta{insert}
+\end{definition}
+is in the post-link hook. This uses the format:
+\begin{display}
+\meta{insert} (\cs{glsfirstabbrvhyphenfont}\marg{short}\meta{isnert})
+\end{display}
+
+\begin{important}
+The singular short form is always used here, even with \cs{glspl}.
+(Unlike \abbrstyle{long-hyphen-long-hyphen}.)
+\end{important}
+
+The part in the link-text on first use:
+\begin{definition}[\DescribeMacro\glsxtrlonghyphen]
+\cs{glsxtrlonghyphen}\marg{long}\marg{label}\marg{insert}
+\end{definition}
+checks if \meta{insert} starts with a hyphen. If it does, then
+\cs{glsxtrwordsep} is locally redefined to a hyphen. This command
+only uses \meta{insert} to test if it starts with a hyphen.
+The actual insertion code isn't typeset until the post-link
+hook and it's also localised, which means that you can use
+commands like \cs{gls} in \meta{insert} for this style without
+causing nested hyperlinks, but only for commands like \cs{gls}.
+
+\begin{important}
+Don't use \cs{gls} in the \meta{insert} part for commands
+like \cs{glsxtrfull}, \cs{glsxtrshort} or \cs{glsxtrlong}.
+\end{important}
+
+The inline full display format used by commands like \cs{glsxtrfull}
+behaves differently to the first use of \cs{gls} with this style.
+It's better to use \cs{glsreset}\marg{label}\cs{gls}\marg{label}
+if you want to ensure the full format.
+
+\item[\abbrstyledef{long-hyphen-postshort-hyphen-desc}]
+
+New to version 1.17.
+This is similar to \abbrstyle{long-hyphen-postshort-hyphen} but the
+user supplies the description.
+
+
+\item[\abbrstyledef{short-hyphen-long-hyphen}]
+This style (new to v1.17) is like
+\abbrstyle{long-hyphen-short-hyphen}, except that the short form
+is displayed first followed by the long form in parentheses. The full form is formatted using
+\begin{definition}[\DescribeMacro\glsxtrshorthyphenlong]
+\cs{glsxtrshorthyphenlong}\marg{label}\marg{short}\marg{long}\marg{insert}
+\end{definition}
+which behaves in an analogous way to \cs{glsxtrlonghyphenshort}.
+
+\item[\abbrstyledef{short-hyphen-long-hyphen-desc}]
+
+New to version 1.17.
+This is similar to \abbrstyle{short-hyphen-long-hyphen} but the
+user supplies the description.
+
+\item[\abbrstyledef{short-hyphen-postlong-hyphen}]
+This style (new to v1.17) is like
+\abbrstyle{long-hyphen-postshort-hyphen}, but the
+short form is displayed first followed by the long form in
+parentheses.
+On first use, \cs{gls}\marg{label}\oarg{insert} will do
+\begin{display}
+\cs{glsxtrshorthyphen}\marg{short}\marg{label}\marg{insert}\cs{glsxtrposthyphenlong}\marg{label}\meta{insert}
+\end{display}
+where
+\begin{definition}[\DescribeMacro\glsxtrposthyphenlong]
+\cs{glsxtrposthyphenlong}\marg{label}\meta{insert}
+\end{definition}
+is in the post-link hook. These commands behave in an analogous
+manner to those used with \abbrstyle{long-hyphen-postshort-hyphen}.
+
+\begin{important}
+Don't use \cs{gls} in the \meta{insert} part for commands
+like \cs{glsxtrfull}, \cs{glsxtrshort} or \cs{glsxtrlong}.
+\end{important}
+
+The inline full display format used by commands like \cs{glsxtrfull}
+behaves differently to the first use of \cs{gls} with this style.
+It's better to use \cs{glsreset}\marg{label}\cs{gls}\marg{label}
+if you want to ensure the full format.
+
+\item[\abbrstyledef{short-hyphen-postlong-hyphen-desc}]
+
+New to version 1.17.
+This is similar to \abbrstyle{short-hyphen-postlong-hyphen} but the
+user supplies the description.
+
\end{description}
\section{Defining New Abbreviation Styles}
@@ -3698,15 +4086,24 @@ For example, the \abbrstyle{long-short} style has the following in
sort={\the\glsshorttok},
first={\protect\glsfirstlongfont{\the\glslongtok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstabbrvfont{\the\glsshorttok})},%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshorttok}}},%
firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
- plural={\protect\glsabbvfont{\the\glsshortpltok}},%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshortpltok}}},%
+ plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
description={\the\glslongtok}}%
\end{verbatim}
Note that the \gloskey{first} and \gloskey{firstplural} are
-set even though they're not used by \cs{gls}.
+set even though they're not used by \cs{gls}.
+
+The basic styles, such as \abbrstyle{long-short}, use commands like
+\cs{glsabbrvfont} (which are redefined whenever the style formatting
+is set) within \cs{CustomAbbreviationFields}. Other styles, such as
+\abbrstyle{long-em-short-em} directly use their own custom commands,
+such as \cs{glsabbrvemfont}. With these styles, commands like
+\cs{glsabbrvfont} still need to be defined as appropriate in the
+\meta{fmts} argument even if they're not used within
+\cs{CustomAbbreviationFields}.
The \meta{setup} argument may also redefine
\begin{definition}[\DescribeMacro\GlsXtrPostNewAbbreviation]
@@ -3762,6 +4159,21 @@ Long plural value (defined by \styfmt{glossaries-extra}):
through the \gloskey{longplural} key in the optional argument
of \ics{newabbreviation}.)
+The short or long values may be modified by attributes (such as
+\catattr{markwords}). The above registers reflect the modification.
+If you want to access the original (unmodified) short or long form
+(as provided in the final two arguments of \cs{newabbreviation}),
+then use the commands:
+\begin{definition}[\DescribeMacro\glsxtrorgshort]
+\cs{glsxtrorgshort}
+\end{definition}
+for the short form and
+\begin{definition}[\DescribeMacro\glsxtrorglong]
+\cs{glsxtrorglong}
+\end{definition}
+for the long form. (These may be useful for the \gloskey{sort} key
+to avoid any formatting that may be added by the attribute setting.)
+
There are two other registers available that are defined by
\styfmt{glossaries}:
@@ -3789,16 +4201,15 @@ 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{short-sc-footnote} and \abbrstyle{short-sm-footnote}
-styles both simply use
+For example, the \abbrstyle{long-noshort-sc-desc} style simply does
\begin{verbatim}
-\GlsXtrUseAbbrStyleSetup{short-footnote}
+\GlsXtrUseAbbrStyleSetup{long-noshort-desc}
\end{verbatim}
within \meta{setup}.
The \meta{fmts} argument deals with the way the entry is displayed
in the document. This argument should redefine the following
-commands:
+commands.
The default suffix for the plural short form (if not overridden by
the \gloskey{shortplural} key):
@@ -3886,6 +4297,32 @@ Inline plural first letter converted to upper case (used by
\cs{Glsxtrinlinefullplformat}\marg{label}\marg{insert}
\end{definition}
+(New to version 1.17.)
+You can also modify the way the subsequent use is formatted by
+redefining the following four commands, but these won't be used for
+abbreviations with the \catattr{regular} attribute set. If the style
+doesn't redefine these commands, the default values are used.
+
+Singular with no case-change:
+\begin{definition}[\DescribeMacro\glsxtrsubsequentfmt]
+\cs{glsxtrsubsequentfmt}\marg{label}\marg{insert}
+\end{definition}
+
+Singular with first letter upper case:
+\begin{definition}[\DescribeMacro\Glsxtrsubsequentfmt]
+\cs{Glsxtrsubsequentfmt}\marg{label}\marg{insert}
+\end{definition}
+
+Plural with no case-change:
+\begin{definition}[\DescribeMacro\glsxtrsubsequentplfmt]
+\cs{glsxtrsubsequentplfmt}\marg{label}\marg{insert}
+\end{definition}
+
+Plural with first letter upper case:
+\begin{definition}[\DescribeMacro\Glsxtrsubsequentplfmt]
+\cs{Glsxtrsubsequentplfmt}\marg{label}\marg{insert}
+\end{definition}
+
If you want to provide support for \sty{glossaries-accsupp}
use the following \cs{glsaccess\meta{xxx}} commands
(\sectionref{sec:accsupp}) within the definitions of
@@ -3897,26 +4334,32 @@ use the following \cs{glsaccess\meta{xxx}} commands
For example, the \abbrstyle{short-long} style has the following in
\meta{fmts}:
\begin{verbatim}
- \renewcommand*{\abbrvpluralsuffix}{\glspluralsuffix}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrabbrvpluralsuffix}%
\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}})%
+ \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\glsxtrfullplformat}[2]{%
- \glsfirstabbrvfont{\glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+ \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
}%
\renewcommand*{\Glsxtrfullformat}[2]{%
- \glsfirstabbrvfont{\Glsaccessshort{##1}}##2\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslong{##1}})%
+ \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\Glsxtrfullplformat}[2]{%
- \glsfirstabbrvfont{\Glsaccessshortpl{##1}}##2\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+ \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
}%
\end{verbatim}
Since the inline full commands aren't redefined, they default
@@ -3927,34 +4370,35 @@ If you want to base a style on an existing style, you can use
\cs{GlsXtrUseAbbrStyleFmts}\marg{name}
\end{definition}
within \meta{fmts}, where \meta{name} is the name of the existing
-style. For example, the \abbrstyle{short-sc-long} style has the
+style. For example, the \abbrstyle{long-short-desc} style has the
following in \meta{fmts}:
\begin{verbatim}
- \GlsXtrUseAbbrStyleFmts{short-long}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
- \renewcommand*{\glsabbrvfont}[1]{\glsxtrscfont{##1}}%
-\end{verbatim}
-and the \abbrstyle{short-sm-long} style has:
-\begin{verbatim}
- \GlsXtrUseAbbrStyleFmts{short-long-desc}%
- \renewcommand*{\glsabbrvfont}[1]{\glsxtrsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \GlsXtrUseAbbrStyleFmts{long-short}%
\end{verbatim}
-The simplest examples of creating a new style based on an
-existing style are the \qt{em} styles, such as the
-\abbrstyle{short-em-long} style, which is defined as:
+Here's an example of an abbreviation style that's based on
+\abbrstyle{long-short} that displays the short form within
+\cs{textsf}:
\begin{verbatim}
\newabbreviationstyle
-{short-em-long}% label
+{custom-sf}% label
{% setup
\GlsXtrUseAbbrStyleSetup{short-long}%
}%
{% fmts
\GlsXtrUseAbbrStyleFmts{short-long}%
- \renewcommand*{\glsabbrvfont}[1]{\glsxtremfont{##1}}%
+ \renewcommand*{\glsabbrvfont}[1]{\textsf{##1}}%
}
\end{verbatim}
+Note that this wouldn't work if it was instead based on one of the
+modified versions such as \abbrstyle{short-sc-long} as they
+explicitly use their own formatting commands, such as
+\cs{glsabbrvemfont}. The base styles, such as \abbrstyle{short-long},
+use the more generic \cs{glsabbrvfont} etc which makes them easier
+to adapt than the modified styles.
+
+For further details, see the \qt{Abbreviations} section in the documented code
+(\texttt{glossaries-extra-code.pdf}).
\chapter{Entries in Sectioning Titles, Headers, Captions and Contents}
\label{sec:headtitle}
@@ -4200,9 +4644,9 @@ default.
Additionally, if you have enabled \ics{newterm} with the
\pkgopt{index} package option that command
will set the category to \category{index} by default. If you have
-enabled \ics{glsxtrnewsymbol} with the \pkgopt{symbols} package
+enabled \ics{glsxtrnewsymbol} with the \styopt{symbols} package
option, that command will set the category to \category{symbol}. If you have
-enabled \ics{glsxtrnewnumber} with the \pkgopt{numbers} package
+enabled \ics{glsxtrnewnumber} with the \styopt{numbers} package
option, that command will set the category to \category{number}.
You can obtain the category label for a given entry using
@@ -4238,7 +4682,7 @@ Other attributes recognised by \styfmt{glossaries-extra} are:
\begin{description}
-\item[\catattr{nohyperfirst}] When using commands like \ics{gls}
+\item[\catattrdef{nohyperfirst}] When using commands like \ics{gls}
this will automatically suppress the hyperlink on \gls{firstuse} for entries with a
category that has this attribute set to \qt{true}.
(This settings can be overridden by explicitly setting
@@ -4256,22 +4700,22 @@ want commands these \cs{glsfirst} etc commands to ignore the
\end{definition}
to do nothing.
-\item[\catattr{nohyper}] When using commands like \ics{gls}
+\item[\catattrdef{nohyper}] When using commands like \ics{gls}
this will automatically suppress the hyperlink for entries with a
category that has this attribute set to \qt{true}.
(This settings can be overridden by explicitly setting
the \gloskey[glslink]{hyper} key on or off in the optional argument of
commands like \cs{gls}.)
-\item[\catattr{indexonlyfirst}] This is similar to the
+\item[\catattrdef{indexonlyfirst}] This is similar to the
\pkgopt{indexonlyfirst} package option but only for entries
that have a category with this attribute set to \qt{true}.
-\item[\catattr{wrgloss}] When using commands like \ics{gls},
+\item[\catattrdef{wrgloss}] When using commands like \ics{gls},
if this attribute is set to \qt{after}, it will automatically
implement \gloskey[glslink]{wrgloss}\optfmt{=after}. (New to v1.14.)
-\item[\catattr{discardperiod}] If set to \qt{true}, the
+\item[\catattrdef{discardperiod}] If set to \qt{true}, the
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.)
@@ -4294,26 +4738,82 @@ argument. For example:
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
+\item[\catattrdef{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
\cs{glspl} or \cs{glsplural}.
-\item[\catattr{retainfirstuseperiod}] If this attribute is set
+\item[\catattrdef{retainfirstuseperiod}] If this attribute is set
to \qt{true} then the full stop won't be discarded for
\gls{firstuse} instances, even if \catattr{discardperiod} or
\catattr{pluraldiscardperiod} are set. This is useful for
\meta{short} (\meta{long}) abbreviation styles where only the short
-form has a trailing full stop..
+form has a trailing full stop.
-\item[\catattr{insertdots}] If this attribute is set to \qt{true}
+\item[\catattrdef{markwords}] If this attribute is set to \qt{true}
+any entry defined using \ics{newabbreviation} will automatically
+have spaces in the long form replaced with
+\begin{definition}[\DescribeMacro\glsxtrwordsep]
+\cs{glsxtrwordsep}
+\end{definition}
+and each word is encapsulated with
+\begin{definition}[\DescribeMacro\glsxtrword]
+\cs{glsxtrword}\marg{word}
+\end{definition}
+For example:
+\begin{verbatim}
+\glssetcategoryattribute{abbreviation}{markwords}{true}
+\newabbreviation{ip}{IP}{Internet Protocol}
+\end{verbatim}
+is essentially the same as
+\begin{verbatim}
+\newabbreviation{ip}{IP}
+{\glsxtrword{Internet}\glsxtrwordsep\glsxtrword{Protocol}}
+\end{verbatim}
+The \qt{hyphen} styles, such as
+\abbrstyle{long-hyphen-short-hyphen}, take advantage of this
+markup. If the inserted material (provided in the final argument
+of commands like \ics{gls}) starts with a hyphen then
+\cs{glsxtrwordsep} is locally redefined to a hyphen. (The default
+value is a space). Note that this only applies to commands
+like \cs{gls} and not like \cs{glsxtrlong}. You can provide your own
+localised switch, if required. For example:
+\begin{verbatim}
+\newcommand{\hyplong}[2][]{%
+ {\def\glsxtrwordsep{-}\glsxtrlong[#1]{#2}}}
+\end{verbatim}
+
+This setting will also adjust the long plural.
+
+\begin{important}
+This setting may result in the
+\cs{glsxtrword} and \cs{glsxtrwordsep} markup ending up in the
+\gloskey{sort} field, depending on the style in use.
+\end{important}
+
+\item[\catattrdef{markshortwords}] This is similar to
+\catattr{markwords} but applies to the short form. (Only useful for
+abbreviations that contain spaces.)
+
+This setting will only adjust the short plural if the
+\gloskey{shortplural} key isn't used. This setting will
+take precedence over \catattr{insertdots}.
+
+\begin{important}
+This setting may result in the
+\cs{glsxtrword} and \cs{glsxtrwordsep} markup ending up in the
+\gloskey{sort} field, depending on the style in use.
+\end{important}
+
+\item[\catattrdef{insertdots}] If this attribute is set to \qt{true}
any entry defined using \ics{newabbreviation} 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 \meta{short} argument of \cs{newabbreviation} (rather than
inserting them every time the entry is used). The short plural
form defaults to the new dotted version of the original \meta{short}
-form with the plural suffix appended.
+form with the plural suffix appended. \emph{This setting is incompatible
+with \catattr{markshortwords}.}
\begin{important}
If you explicitly override
@@ -4326,29 +4826,29 @@ followed by a dot).
This attribute is best used with the \catattr{discardperiod}
attribute set to \qt{true}.
-\item[\catattr{aposplural}] If this attribute is set to \qt{true},
+\item[\catattrdef{aposplural}] If this attribute is set to \qt{true},
\ics{newabbreviation} will insert an apostrophe (') before
the plural suffix for the \emph{short} plural form (unless explicitly
overridden with the \gloskey{shortplural} key). The long plural form
-is unaffected by this setting.
+is unaffected by this setting. This setting overrides
+\catattr{noshortplural}.
-\item[\catattr{noshortplural}] If this attribute is set to
+\item[\catattrdef{noshortplural}] If this attribute is set to
\qt{true}, \ics{newabbreviation} won't append the plural suffix for
the short plural form. This means the \gloskey{short} and
\gloskey{shortplural} values will be the same unless explicitly
-overridden. \emph{The \catattr{aposplural} attribute trumps
-the \catattr{noshortplural} attribute.}
+overridden. \emph{This setting is incompatible with \catattr{aposplural}.}
-\item[\catattr{headuc}] If this attribute is set to \qt{true},
+\item[\catattrdef{headuc}] If this attribute is set to \qt{true},
commands like \ics{glsfmtshort} will use the upper case version
in the page headers.
-\item[\catattr{tagging}] If this attribute is set to \qt{true},
+\item[\catattrdef{tagging}] If this attribute is set to \qt{true},
the tagging command defined by \ics{GlsXtrEnableInitialTagging}
will be activated to use \ics{glsxtrtagfont} in the glossary
(see \sectionref{sec:tagging}).
-\item[\catattr{entrycount}] Unlike the above attributes,
+\item[\catattrdef{entrycount}] Unlike the above attributes,
this attribute isn't boolean but instead must be an integer
value and is used in combination with \ics{glsenableentrycount}
(see \sectionref{sec:entrycountmods}). Leave blank or undefined
@@ -4363,7 +4863,7 @@ have the \catattr{entrycount} attribute set and
where the previous usage count for that entry is less than or
equal to the value of that attribute.
-\item[\catattr{glossdesc}] The \ics{glossentrydesc} command
+\item[\catattrdef{glossdesc}] The \ics{glossentrydesc} command
(used in the predefined glossary styles) is modified by
\styfmt{glossaries-extra} to check for this attribute.
The attribute may have one of the following values:
@@ -4393,7 +4893,7 @@ that there are design limitations for both the first letter
uppercasing and the title casing commands. See the \sty{mfirstuc}
user manual for further details.
-\item[\catattr{glossdescfont}] (New to version 1.04)
+\item[\catattrdef{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
@@ -4404,16 +4904,16 @@ text. For example:
\end{verbatim}
-\item[\catattr{glossname}] As \catattr{glossdesc} but applies
+\item[\catattrdef{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.
-\item[\catattr{indexname}] If set, the \cs{glsxtrpostnamehook} hook
+\item[\catattrdef{indexname}] If set, the \cs{glsxtrpostnamehook} hook
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)
+\item[\catattrdef{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
@@ -4429,13 +4929,13 @@ 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
+\item[\catattrdef{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
line will be written to the indexing file using \ics{index}. See
\sectionref{sec:autoindex} for further details.
-\item[\catattr{targeturl}] If set, the hyperlink generated by
+\item[\catattrdef{targeturl}] If set, the hyperlink generated by
commands like \cs{gls} will be set to the URL provided by this
attributes value. For example:
\begin{verbatim}
@@ -4667,7 +5167,8 @@ commands like \ics{cgls} will generate a warning if
\cs{glsenableentrycount} hasn't been used.) The abbreviation
shortcut \ics{ab} uses \cs{cgls} (see
\sectionref{sec:abbrshortcuts}) unlike the acronym shortcut \ics{ac}
-which uses \cs{gls}.
+which uses \cs{gls} (except when it's defined through
+\styopt[ac]{shortcuts}).
All upper case versions (not provided by \styfmt{glossaries}) are
also available:
@@ -5168,12 +5669,12 @@ The \styfmt{glossaries} package advises against defining entries
in the \env{document} environment. As mentioned in
\sectionref{sec:pkgopts} above, this ability is disabled by
default with \styfmt{glossaries-extra} but can be enabled using
-the \pkgopt{docdefs} package options.
+the \styopt{docdefs} package options.
Although this can be problematic, the \styfmt{glossaries-extra}
package provides a way of defining and using entries within
the \env{document} environment without the tricks used with the
-\pkgopt{docdefs} option. \emph{There are limitations with this
+\styopt{docdefs} option. \emph{There are limitations with this
approach, so take care with it.} This function is disabled by
default, but can be enabled using the preamble-only command:
\begin{definition}[\DescribeMacro\GlsXtrEnableOnTheFly]
@@ -5272,7 +5773,8 @@ to just text.
\label{sec:bib2gls}
There is a new command line application under development called
-\gls{bib2gls}, which works in much the same way as \appfmt{bibtex}.
+\gls{bib2gls}, which works in much the same way as
+a combination of \appfmt{bibtex} and \appfmt{makeindex}.
Instead of storing all your entry definitions in a \texttt{.tex} and
loading them using \cs{input} or \cs{loadglsentries}, the entries
can instead be stored in a \texttt{.bib} file and \gls{bib2gls} can
@@ -5288,10 +5790,10 @@ hundreds of definitions, but you only use a dozen or so in your
document, then the build time is needlessly slowed by the unrequired
definitions that occur when the file is input.
-Although \gls{bib2gls} isn't ready yet, there have been some new
-commands and options added to \styfmt{glossaries-extra} to help
-assist the integration of \gls{bib2gls} into the document build
-process.
+Although \gls{bib2gls} isn't ready yet (at the time of writing
+this), there have been some new commands and options added to
+\styfmt{glossaries-extra} to help assist the integration of
+\gls{bib2gls} into the document build process.
An example of the contents of \texttt{.bib} file that stores
glossary entries that can be extracted with \gls{bib2gls}:
@@ -5362,7 +5864,7 @@ preamble{"\providecommand{\mtx}[1]{\boldsymbol{#1}}"}
\end{verbatim}
To ensure that \gls{bib2gls} can find out which entries have been
-used in the document, you need the \pkgopt{record} package. Option:
+used in the document, you need the \styopt{record} package option:
\begin{verbatim}
\usepackage[record]{glossaries-extra}
\end{verbatim}
@@ -5372,9 +5874,9 @@ collate the locations.
If you still want to use an indexing application (for example, you
need a custom \gls{xindy} rule), then just use
-\pkgopt[alsoindex]{record} and continue to use \cs{makeglossaries}
-and \cs{printglossary} (or \cs{printglossaries}), but instruct
-\gls{bib2gls} to omit sorting to save time.
+\styopt[alsoindex]{record} and continue to use \cs{makeglossaries}
+and \cs{printglossary} (or \cs{printglossaries}), but it's a good
+idea to also instruct \gls{bib2gls} to omit sorting to save time.
The \texttt{.glstex} file created by \cs{bib2gls} is loaded using:
\begin{definition}[\DescribeMacro\glsxtrresourcefile]
@@ -5418,12 +5920,28 @@ as the name of the \texttt{.bib} files and any changes to the
default behaviour.
Since the \texttt{.glstex} won't exist on the first \LaTeX\ run, the
-\pkgopt{record} package option additionally switches on
-\pkgopt[warn]{undefaction}. Any use of commands like \cs{gls} or
+\styopt{record} package option additionally switches on
+\styopt[warn]{undefaction}. Any use of commands like \cs{gls} or
\cs{glstext} will produce ?? in the document, since they are
undefined at this point. Once \gls{bib2gls} has created the
\texttt{.glstex} file the references should be resolved.
+\begin{important}
+Note that \cs{glsaddall} doesn't work with \gls{bib2gls} as the command
+has to iterate over the glossary lists, which will be empty on the first
+run and on subsequent runs will only contain those entries that have
+been selected by \gls{bib2gls}.
+\end{important}
+
+If you want to add all
+entries to the glossary, you need to tell \gls{bib2gls} this in the
+options list. For example:
+\begin{verbatim}
+\GlsXtrLoadResources[src={terms},selection={all}]
+\end{verbatim}
+See the \gls{bib2gls} user manual for more details of this and other
+available options.
+
Note that as from v1.12, \cs{glsxtrresourcefile} temporarily
switches the category code of \texttt{@} to 11 (letter) while it
reads the file to allow for any internal commands stored in the
@@ -5515,17 +6033,6 @@ locale. If this doesn't match the document language, you need to
set this in the option list, for example \verb|sort=de-CH-1996|
for Swiss German using the new orthography.)
-Note that \cs{glsaddall} doesn't work in this case as it has to
-iterate over the glossary lists, which will be empty on the first
-run and on subsequent runs will only contain those entries that have
-been selected by \gls{bib2gls}. Instead, if you want to add all
-entries to the glossary, you need to tell \gls{bib2gls} this in the
-options list:
-\begin{verbatim}
-\GlsXtrLoadResources[src={terms},selection={all}]
-\end{verbatim}
-
-The \gls{bib2gls} user manual will contain more detail.
\chapter{Miscellaneous New Commands}
\label{sec:miscnew}
@@ -5712,7 +6219,7 @@ assignment code.
This command just uses \ics{glsdoifexists}\marg{label}\marg{code}
(ignoring the \meta{field} argument), so by default it causes an
error if the entry doesn't exist. This can be changed to a warning
-with \pkgopt[warn]{undefaction}. You can redefine
+with \styopt[warn]{undefaction}. You can redefine
\cs{glsxtrsetfieldifexists} to simply do \meta{code} if you want to
skip the existence check. Alternatively you can instead use
\begin{definition}[\DescribeMacro\glsxtrdeffield]
@@ -5826,7 +6333,7 @@ See the \sty{etoolbox}'s user manual for further
details of these commands, in particular the limitations
of \cs{ifinlist}.
-When using the \pkgopt{record} option, in addition to recording the
+When using the \styopt{record} option, in addition to recording the
usual location, you can also record the current value
of another counter at the same time using the preamble-only command:
\begin{definition}[\DescribeMacro\GlsXtrRecordCounter]
@@ -5870,7 +6377,7 @@ entries and always lists all the defined entries for the given
glossary (and doesn't require \cs{makenoidxglossaries}).
There's also a starred form
-\begin{definition}[\DescribeMacro\printunsrtglossary*]
+\begin{definition}[\DescribeMacro{\printunsrtglossary*}]
\cs{printunsrtglossary}*\oarg{options}\marg{code}
\end{definition}
which is equivalent to
@@ -5888,11 +6395,18 @@ there will be no \gls{numberlist} in this case, as that has to be
set by a post-processor such as \gls{bib2gls} (see
\sectionref{sec:bib2gls}).
+\begin{important}
+No attempt is made to gather hierarchical elements.
+If child entries aren't defined immediately after their parent
+entry, they won't be together in the glossary when using
+\cs{printunsrtglossary}.
+\end{important}
+
If you have any entries with the \gloskey{see} key set, you will
need the \sty{glossaries} package option \pkgopt[ignore]{seenoindex}
or \pkgopt[warn]{seenoindex} to prevent an error occurring from the
automated \cs{glssee} normally triggered by this key. The
-\pkgopt[only]{record} package option will automatically deal with
+\styopt[only]{record} package option will automatically deal with
this.
For example:
@@ -5913,7 +6427,7 @@ For example:
In the above, zebra will be listed before ant as it was defined
first.
-If you allow document definitions with the \pkgopt{docdefs} option,
+If you allow document definitions with the \styopt{docdefs} option,
the document will require a second \LaTeX\ run if the entries are
defined after \cs{printunsrtglossary}.
@@ -6047,7 +6561,7 @@ which will start the list with a subsection header with the
title \qt{Summary} (overriding the glossary's title).
Note that this shortcut command is only available with the
-\pkgopt{record} (or \pkgopt[alsoindex]{record}) package option.
+\styopt{record} (or \styopt[alsoindex]{record}) package option.
This temporary change in the hypertarget prefix means you
need to explicitly use \cs{hyperlink} to create a link to it
@@ -6080,7 +6594,7 @@ was defined, the \gloskey{alias} key will automatically trigger
\cs{gls}\marg{entry-1} will link to \meta{entry-2}'s target. (Unless
the \catattr{targeturl} attribute has been set for \meta{entry-1}'s
category.)
-\item With \pkgopt[off]{record} or \pkgopt[alsoindex]{record}, the \gloskey[glslink]{noindex} setting will automatically be triggered
+\item With \styopt[off]{record} or \styopt[alsoindex]{record}, the \gloskey[glslink]{noindex} setting will automatically be triggered
when referencing \meta{entry-1} with commands like \cs{gls} or
\cs{glstext}. This prevents \meta{entry-1} from have a
\gls{locationlist} (aside from the cross-reference added with
@@ -6088,7 +6602,7 @@ when referencing \meta{entry-1} with commands like \cs{gls} or
if the indexing has been explicitly set using
\texttt{noindex=false}.
-Note that with \pkgopt[only]{record}, the \gls{locationlist}
+Note that with \styopt[only]{record}, the \gls{locationlist}
for aliased entries is controlled with \gls{bib2gls}['s] settings.
\end{itemize}
@@ -6098,7 +6612,7 @@ The index suppression trigger is performed by
\end{definition}
This is performed after the default options provided by
\ics{GlsXtrSetDefaultGlsOpts} have been set.
-With \pkgopt[only]{record}, \cs{glsxtrsetaliasnoindex} will
+With \styopt[only]{record}, \cs{glsxtrsetaliasnoindex} will
default to do nothing.
Within the definition of \cs{glsxtrsetaliasnoindex} you can use
@@ -6161,7 +6675,7 @@ Next use: \pgls{svm}.
\label{sec:accsupp}
The \sty{glossaries-accsupp} needs to be loaded before
-\styfmt{glossaries-extra} or through the \pkgopt{accsupp} package
+\styfmt{glossaries-extra} or through the \styopt{accsupp} package
option:
\begin{verbatim}
\usepackage[accsupp]{glossaries-extra}
@@ -6361,6 +6875,9 @@ The following sample files are provided with this package:
\item[sample.tex] Simple sample file that uses one of the dummy
files provided by the \styfmt{glossaries} package for testing.
+\item[sample-abbr-styles.tex] Demonstrates all predefined
+abbreviation styles.
+
\item[sample-mixture.tex] General entries, acronyms and initialisms
all treated differently.
@@ -6485,7 +7002,7 @@ in the supplementary file \texttt{sample-suppl-hyp.tex}.
There's only one command provided by \styfmt{glossaries-extra}
that you're likely to want to change in your document and that's
\ics{abbreviationsname} (\sectionref{sec:pkgopts}) if you use
-the \pkgopt{abbreviations} package option to automatically
+the \styopt{abbreviations} package option to automatically
create the glossary labelled \texttt{abbreviations}. If this
command doesn't already exist, it will be defined to
\qt{Abbreviations} if \sty{babel} hasn't been loaded, otherwise
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.pdf
new file mode 100644
index 00000000000..be3469aa611
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.tex b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.tex
new file mode 100644
index 00000000000..7825a22dcb2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-abbr-styles.tex
@@ -0,0 +1,425 @@
+% arara: pdflatex
+% arara: makeglossaries
+% arara: pdflatex
+% arara: pdflatex
+
+\documentclass{report}
+
+\usepackage[T1]{fontenc}
+\usepackage{relsize}
+\usepackage{etoolbox}
+\usepackage[colorlinks,linkcolor=magenta]{hyperref}
+\usepackage{glossaries-extra}
+
+% If you get any undefined control sequences or undefined
+% style errors, make sure you have the latest versions of
+% glossaries-extra.sty and glossaries.sty
+
+\makeglossaries
+
+% This command is used for short forms for styles
+% that don't have a designated command:
+\renewcommand{\glsabbrvdefaultfont}[1]{\textsf{#1}}
+
+% This command is used on first use for short forms
+% for styles that don't have a designated command:
+%\renewcommand{\glsfirstabbrvdefaultfont}[1]{\textsf{#1}}
+
+% This command is used for long forms for styles
+% that don't have a designated command:
+\renewcommand{\glslongdefaultfont}[1]{\textsf{#1}}
+
+% This command is used on first use for long forms
+% for styles that don't have a designated command:
+%\renewcommand{\glsfirstlongdefaultfont}[1]{\textsf{#1}}
+
+% These commands are used by the '-hyphen' styles.
+% For example, to switch to small-caps for the short form:
+%\renewcommand{\glsabbrvhyphenfont}{\glsabbrvscfont}
+%\renewcommand{\glsxtrhyphensuffix}{\glsxtrscsuffix}
+% and emphasize the long form
+%\renewcommand{\glslonghyphenfont}{\emph}
+
+\renewcommand{\glsxtrabbrvfootnote}[2]{%
+ \footnote{\glshyperlink[\glsfmtshort{#1}]{#1}: #2}%
+}
+
+\glssetcategoryattribute{long-hyphen-short-hyphen}{markwords}{true}
+\glssetcategoryattribute{long-hyphen-postshort-hyphen}{markwords}{true}
+\glssetcategoryattribute{long-hyphen-short-hyphen-desc}{markwords}{true}
+\glssetcategoryattribute{long-hyphen-postshort-hyphen-desc}{markwords}{true}
+\glssetcategoryattribute{short-hyphen-long-hyphen}{markwords}{true}
+\glssetcategoryattribute{short-hyphen-postlong-hyphen}{markwords}{true}
+\glssetcategoryattribute{short-hyphen-long-hyphen-desc}{markwords}{true}
+\glssetcategoryattribute{short-hyphen-postlong-hyphen-desc}{markwords}{true}
+\glssetcategoryattribute{long-hyphen-noshort-desc-noreg}{markwords}{true}
+\glssetcategoryattribute{long-hyphen-noshort-noreg}{markwords}{true}
+
+\newcommand{\stylelist}{}
+
+\newcommand{\teststyle}[1]{%
+ \listadd{\stylelist}{#1}%
+ \setabbreviationstyle[#1]{#1}%
+ \newabbreviation[category=#1,%
+ %sort={#1},% order by style name
+ user1={user text}%
+ ]{sample-#1}{short}{long form}%
+ \csdef{glsxtrpostdesc#1}{ [style: #1]}%
+}
+
+\newcommand{\testdescstyle}[1]{%
+ \listadd{\stylelist}{#1}%
+ \setabbreviationstyle[#1]{#1}%
+ \newabbreviation[category=#1,%
+ %sort={#1},% order by style name
+ user1={user text},%
+ description={sample description}]{sample-#1}{short}{long form}%
+ \csdef{glsxtrpostdesc#1}{ [style: #1]}%
+}
+
+\teststyle{long-short}
+\teststyle{short-long}
+%\teststyle{footnote}% synonym: short-footnote
+\teststyle{short-footnote}
+%\teststyle{postfootnote}% synonym: short-postfootnote
+\teststyle{short-postfootnote}
+%\teststyle{short}% synonym: short-nolong
+\teststyle{short-nolong}
+\teststyle{short-nolong-noreg}
+%\teststyle{long}% synonym: long-noshort
+\teststyle{long-noshort}
+\teststyle{long-noshort-noreg}
+\teststyle{long-only-short-only}
+\teststyle{long-short-sc}
+\teststyle{short-sc-long}
+%\teststyle{short-sc}% synonym: short-sc-nolong
+\teststyle{short-sc-nolong}
+\teststyle{long-noshort-sc}
+%\teststyle{long-sc}% deprecated synonym of long-noshort-sc
+\teststyle{short-sc-footnote}
+%\teststyle{footnote-sc}% deprecated synonym of short-sc-footnote
+\teststyle{short-sc-postfootnote}
+%\teststyle{postfootnote-sc}% deprecated synonym of short-sc-postfootnote
+\teststyle{long-short-sm}
+\teststyle{short-sm-long}
+%\teststyle{short-sm}% synonym: short-sm-nolong
+\teststyle{short-sm-nolong}
+%\teststyle{long-sm}% deprecated synonym of long-noshort-sm
+\teststyle{long-noshort-sm}
+\teststyle{short-sm-footnote}
+%\teststyle{footnote-sm}% deprecated synonym of short-sm-footnote
+\teststyle{short-sm-postfootnote}
+%\teststyle{postfootnote-sm}% deprecated synonym of short-sm-postfootnote
+\teststyle{long-short-em}
+\teststyle{long-em-short-em}
+\teststyle{short-em-long}
+\teststyle{short-em-long-em}
+\teststyle{short-em-nolong}
+%\teststyle{short-em}% synonym: short-em-nolong
+\teststyle{long-noshort-em}
+%\teststyle{long-em}% deprecated synonym of long-noshort-em
+\teststyle{long-em-noshort-em}
+\teststyle{long-em-noshort-em-noreg}
+\teststyle{short-em-footnote}
+%\teststyle{footnote-em}% deprecated synonym of short-em-footnote
+\teststyle{short-em-postfootnote}
+%\teststyle{postfootnote-em}% deprecated synonym of short-em-postfootnote
+\teststyle{long-short-user}
+\teststyle{long-postshort-user}
+\teststyle{short-long-user}
+\teststyle{short-postlong-user}
+\teststyle{long-hyphen-short-hyphen}
+\teststyle{long-hyphen-postshort-hyphen}
+\teststyle{short-hyphen-long-hyphen}
+\teststyle{short-hyphen-postlong-hyphen}
+\teststyle{long-hyphen-noshort-noreg}
+
+\testdescstyle{long-short-desc}
+\testdescstyle{short-long-desc}
+%\testdescstyle{short-desc}% synonym: short-nolong-desc
+\testdescstyle{short-nolong-desc}
+\testdescstyle{short-nolong-desc-noreg}
+%\testdescstyle{long-desc}% synonym: long-noshort-desc
+\testdescstyle{long-noshort-desc}
+\testdescstyle{long-noshort-desc-noreg}
+\testdescstyle{long-only-short-only-desc}
+\testdescstyle{long-short-sc-desc}
+\testdescstyle{short-sc-long-desc}
+%\testdescstyle{short-sc-desc}% synonym: short-sc-nolong-desc
+\testdescstyle{short-sc-nolong-desc}
+\testdescstyle{long-noshort-sc-desc}
+%\testdescstyle{long-desc-sc}% deprecated synonym of long-noshort-sc-desc
+\testdescstyle{long-short-sm-desc}
+\testdescstyle{short-sm-long-desc}
+%\testdescstyle{short-sm-desc}% synonym: short-sm-nolong-desc
+\testdescstyle{short-sm-nolong-desc}
+\testdescstyle{long-noshort-sm-desc}
+%\testdescstyle{long-desc-sm}% deprecated synonym of long-noshort-sm-desc
+\testdescstyle{long-short-em-desc}
+\testdescstyle{long-em-short-em-desc}
+\testdescstyle{short-em-long-desc}
+\testdescstyle{short-em-long-em-desc}
+%\testdescstyle{short-em-desc}% synonym: short-em-nolong-desc
+\testdescstyle{short-em-nolong-desc}
+\testdescstyle{long-noshort-em-desc}
+%\testdescstyle{long-desc-em}% deprecated synonym of long-noshort-em-desc
+\testdescstyle{long-em-noshort-em-desc}
+\testdescstyle{long-em-noshort-em-desc-noreg}
+\testdescstyle{long-short-user-desc}
+\testdescstyle{long-postshort-user-desc}
+\testdescstyle{short-long-user-desc}
+\testdescstyle{short-postlong-user-desc}
+\testdescstyle{long-hyphen-short-hyphen-desc}
+\testdescstyle{long-hyphen-postshort-hyphen-desc}
+\testdescstyle{short-hyphen-long-hyphen-desc}
+\testdescstyle{short-hyphen-postlong-hyphen-desc}
+\testdescstyle{long-hyphen-noshort-desc-noreg}
+
+\newcommand{\marg}[1]{\{\textnormal{\emph{#1}}\}}
+\pagestyle{headings}
+
+\makeatletter
+\renewcommand{\l@section}{\@dottedtocline {1}{1.5em}{3.3em}}
+\makeatother
+
+\begin{document}
+\pagenumbering{roman}
+This is a test document demonstrating abbreviation styles
+provided by the \textsf{glossaries-extra} package. Hyperlinks
+are shown in
+\makeatletter
+\textcolor{\@linkcolor}{\@linkcolor}.
+\makeatother
+
+Some of the styles just use the default formatting commands (which don't
+change the font). To make the default setting clearer, this document has done:
+\begin{verbatim}
+\renewcommand{\glslongdefaultfont}[1]{\textsf{#1}}
+\renewcommand{\glsabbrvdefaultfont}[1]{\textsf{#1}}
+\end{verbatim}
+So any text in this document that's rendered in sans-serif would normally not have any font
+change implemented.
+
+Each test entry is defined using
+\begin{verbatim}
+ \newabbreviation[category=#1,user1={user text}]%
+ {sample-#1}{short}{long form}%
+\end{verbatim}
+for the non\texttt{-desc} styles or
+\begin{verbatim}
+ \newabbreviation[category=#1,user1={user text},%
+ description={sample description}]%
+ {sample-#1}{short}{long form}%
+\end{verbatim}
+for the \texttt{-desc} styles (where \verb|#1| is the style label).
+Note that many of the entries will have duplicate sort values, so
+don't build this with \texttt{xindy}. You can change the ordering
+in the glossary to that it's sorted according to the style name
+by changing the above definitions to:
+\begin{verbatim}
+ \newabbreviation[category=#1,user1={user text},sort={#1}]%
+ {sample-#1}{short}{long form}%
+ \newabbreviation[category=#1,user1={user text},sort={#1},%
+ description={sample description}]%
+ {sample-#1}{short}{long form}%
+\end{verbatim}
+
+To assist with distinguishing between the various styles,
+the post-description hook (used after displaying the description in
+the glossary) is set to \verb*| [style: #1]| for all categories,
+and the footnote command \verb|\glsxtrabbrvfootnote| has been
+redefined to include the short form hyperlinked to the glossary.
+
+The test entries that use the \texttt{-hyphen} styles have had the
+\texttt{markwords} attribute set. This is designed to trigger
+compound word hyphenation if the inserted text (through the final
+optional argument of \verb|\gls|) starts with a hyphen.
+
+\tableofcontents
+
+\pagenumbering{arabic}
+\chapter{First Use}
+First use of \verb|\gls|.
+
+\forglsentries{\thislabel}{\glscategory{\thislabel}:
+\gls{\thislabel}.\glspar}
+
+\chapter{Next Use}
+Next use of \verb|\gls|.
+
+\forglsentries{\thislabel}{\glscategory{\thislabel}:
+\gls{\thislabel}.\glspar}
+
+\chapter{First Use With Insert}
+First use of \texttt{\string\gls\marg{label}[-insert]}. The conditional
+\verb|\ifglsxtrinsertinside| is used by some styles to
+determine whether or not to include the inserted material
+inside the font changing command used by the style.
+The default is: \ifglsxtrinsertinside true\else false\fi.
+
+In this test chapter, each entry is reset, then displayed with
+\begin{verbatim}
+\glsxtrinsertinsidefalse
+\end{verbatim}
+then reset and displayed with
+\begin{verbatim}
+\glsxtrinsertinsidetrue
+\end{verbatim}
+(following the semi-colon). Some styles may only obey this
+conditional for particular commands. (For example, the inline
+commands like \verb|\glsxtrfull| may behave differently to
+commands like \verb|\gls|.)
+
+Some of the styles just use the default font commands (which don't
+change the font) so there's no noticeable difference. To make the
+differences more noticeable this document has done:
+\begin{verbatim}
+\renewcommand{\glslongdefaultfont}[1]{\textsf{#1}}
+\renewcommand{\glsabbrvdefaultfont}[1]{\textsf{#1}}
+\end{verbatim}
+
+\forglsentries{\thislabel}{\glscategory{\thislabel}:
+\glsreset{\thislabel}\glsxtrinsertinsidefalse
+\gls{\thislabel}[-insert];
+\glsreset{\thislabel}\glsxtrinsertinsidetrue
+\gls{\thislabel}[-insert].\glspar}
+
+\chapter{Next Use With Insert}
+Next use of \texttt{\string\gls\marg{label}[-insert]}.
+
+In this test chapter, each entry is displayed
+with \verb|\glsxtrinsertinsidefalse| and then displayed with
+\verb|\glsxtrinsertinsidetrue|
+(following the semi-colon). Some styles don't check this
+conditional.
+
+\forglsentries{\thislabel}{\glscategory{\thislabel}:
+\glsxtrinsertinsidefalse
+\gls{\thislabel}[-insert];
+\glsxtrinsertinsidetrue
+\gls{\thislabel}[-insert].\glspar}
+
+\chapter{Full Form}
+Full form using \verb|\glsxtrfull| (inline full style).
+This may differ from the display form used by \verb|\gls|
+on first use, depending on the style.
+
+\forglsentries{\thislabel}{\glscategory{\thislabel}:
+\glsxtrfull{\thislabel}.\glspar}
+
+\chapter{Short Form}
+Short form using \verb|\glsxtrshort|.
+This may differ from the display form used by \verb|\gls|
+on subsequent use, depending on the style.
+
+\forglsentries{\thislabel}{\glscategory{\thislabel}:
+\glsxtrshort{\thislabel}.\glspar
+}
+
+\chapter{Long Form}
+Long form using \verb|\glsxtrlong|.
+
+\forglsentries{\thislabel}{\glscategory{\thislabel}:
+\glsxtrlong{\thislabel}.\glspar}
+
+\chapter{Full Form With Insert}
+Full form using \texttt{\string\glsxtrfull\marg{label}[-insert]} (inline full style).
+In this test chapter, each entry is displayed
+with \verb|\glsxtrinsertinsidefalse| and then displayed with
+\verb|\glsxtrinsertinsidetrue|
+(following the semi-colon).
+
+\forglsentries{\thislabel}{\glscategory{\thislabel}:
+\glsxtrinsertinsidefalse
+\glsxtrfull{\thislabel}[-insert];
+\glsxtrinsertinsidetrue
+\glsxtrfull{\thislabel}[-insert].\glspar}
+
+\chapter{Short Form With Insert}
+Short form using \texttt{\string\glsxtrshort\marg{label}[-insert]}.
+
+In this test chapter, each entry is displayed
+with \verb|\glsxtrinsertinsidefalse| and then displayed with
+\verb|\glsxtrinsertinsidetrue|
+(following the semi-colon).
+
+\forglsentries{\thislabel}{\glscategory{\thislabel}:
+\glsxtrinsertinsidefalse
+\glsxtrshort{\thislabel}[-insert];
+\glsxtrinsertinsidetrue
+\glsxtrshort{\thislabel}[-insert].\glspar}
+
+\chapter{Long Form With Insert}
+Long form using \texttt{\string\glsxtrlong\marg{label}[-insert]}.
+Note that the \texttt{hyphen} styles with the \texttt{markwords}
+attribute don't adjust in this case.
+
+In this test chapter, each entry is displayed
+with \verb|\glsxtrinsertinsidefalse| and then displayed with
+\verb|\glsxtrinsertinsidetrue|
+(following the semi-colon).
+
+\forglsentries{\thislabel}{\glscategory{\thislabel}:
+\glsxtrinsertinsidefalse
+\glsxtrlong{\thislabel}[-insert];
+\glsxtrinsertinsidetrue
+\glsxtrlong{\thislabel}[-insert].\glspar}
+
+\chapter{First Form}
+First form using \verb|\glsfirst|. This may be different
+from the first use of \verb|\gls| depending on the style.
+
+\forglsentries{\thislabel}{\glscategory{\thislabel}:
+\glsfirst{\thislabel}.\glspar}
+
+\chapter{Text Form}
+Text form using \verb|\glstext|. This may be different
+from the subsequent use of \verb|\gls| depending on the style.
+
+\forglsentries{\thislabel}{\glscategory{\thislabel}:
+\glstext{\thislabel}.\glspar}
+
+\chapter{First Form With Insert}
+First form using \texttt{\string\glsfirst\marg{label}[-insert]}.
+This is different from the first use of \verb|\gls|
+as can be seen by the location of the inserted material.
+(There's no check for the conditional
+\verb|\ifglsxtrinsertinside|.) In general it's best not
+to use \verb|\glsfirst| with abbreviations. Use either
+\verb|\gls| (possibly with a reset) or \verb|\glsxtrfull|.
+
+\forglsentries{\thislabel}{\glscategory{\thislabel}:
+\glsfirst{\thislabel}[-insert].\glspar}
+
+\chapter{Text Form With Insert}
+Text form using \texttt{\string\glstext\marg{label}[-insert]}.
+This doesn't check for the conditional
+\verb|\ifglsxtrinsertinside|.
+
+\forglsentries{\thislabel}{\glscategory{\thislabel}:
+\glstext{\thislabel}[-insert].\glspar}
+
+\chapter{Summary}
+
+\renewcommand{\do}[1]{\section{#1}
+First use \texttt{\string\gls\marg{label}}:
+\glsreset{sample-#1}\gls{sample-#1}.\par\noindent
+Next use \texttt{\string\gls\marg{label}}: \gls{sample-#1}.\par\noindent
+First use \texttt{\string\gls\marg{label}[-insert]}:
+\glsreset{sample-#1}\gls{sample-#1}[-insert].\par\noindent
+Next use \texttt{\string\gls\marg{label}[-insert]}:
+\gls{sample-#1}[-insert].\par\noindent
+\texttt{\string\glsxtrfull\marg{label}[-insert]}:
+\glsxtrfull{sample-#1}[-insert].\par\noindent
+\texttt{\string\glsxtrshort\marg{label}[-insert]}:
+\glsxtrshort{sample-#1}[-insert].\par\noindent
+\texttt{\string\glsxtrlong\marg{label}[-insert]}:
+\glsxtrlong{sample-#1}[-insert].\par\noindent
+Name: \glsentryname{sample-#1}.\par\noindent
+Sort: \texttt{\glsentrysort{sample-#1}}.\par\noindent
+Description: \glsentrydesc{sample-#1}.\par
+}
+
+\dolistloop{\stylelist}
+\printglossaries
+\end{document}
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 07a12467f7c..ed87c16fa71 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 8faeed5a65e..2f1cf0d4fdf 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-acronym-desc.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-acronym-desc.pdf
index b64f4b44d81..3afb3608d2e 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 1071fb37230..540bf8673a0 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-alias.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf
index 13bf53dbf0f..d10caf1f747 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alias.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 d0d864f2b7a..ab7bf7a86bd 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-alttree-marginpar.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf
index ee28217f909..bfe691c532a 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-marginpar.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf
index f76d9fd7da6..0d0c310ebb1 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree-sym.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf
index 1aa9e8fb0ce..67fca0e4b05 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-alttree.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 a80cebf7ffd..c545e682acf 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 1b03fbba473..e66c2a7988c 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 6f406982eb3..25f232a7bea 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-crossref2.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf
index 868aedc2c5e..59f752940c5 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-crossref2.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 02ce8a4f383..e9594619063 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 67ac21243b4..08f78f83be8 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-external.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf
index 8c36388ebbe..13b41b8260a 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-external.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf
index 633be418894..54b01dfc016 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-fmt.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 4cbbbd2466a..fa88695e96a 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 0c5e1996734..0bc99043288 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 d378caa5497..3f33aae33fa 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 f1cc4ad5d00..7930d499cde 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 b88a22bdbc3..12a0b64a6fc 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-mixedsort.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf
index 7b918de1735..2c4c9093ce9 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-mixedsort.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 7dce6a4c727..3beaf97f60d 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-name-font.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf
index ba4f88c7a3b..dc4700f8e66 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-name-font.pdf
+++ 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-nested.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-nested.pdf
index 81054dc1f7e..f157e48fc95 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-noidx-restricteddocdefs.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.pdf
index 01bb9135c6a..7dea23246b7 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-noidx-restricteddocdefs.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 f780bed07a6..dcc97527138 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 cf281d9b556..f70c3f6b84b 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 374aa603145..3cd0ed79808 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 47ddf992d2d..ef4105f02c2 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
index b819fd7a202..694229ff10b 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-pages.pdf
+++ 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-postdot.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-postdot.pdf
index e5c936e7351..382c99783e8 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 386b78f3e28..ea53c5a2126 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 54032c41937..2f19fd70677 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-record.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf
index 2c74cb25b1c..820b8053476 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-record.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf
index d7628e18e3d..52cbdae9772 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-restricteddocdefs.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf
index d74b2d1bcbf..841fb8a28d7 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-hyp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf
index b4bfdcab4ea..ed16221737b 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main-hyp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf
index 630a42cb294..cb0ee4284e1 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl-main.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf
index 2cef4c690b7..dfccb3766bc 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries-extra/sample-suppl.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
index 88700231d13..8f121b325c5 100644
--- a/Master/texmf-dist/doc/latex/glossaries-extra/sample-trans.pdf
+++ 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-undef.pdf b/Master/texmf-dist/doc/latex/glossaries-extra/sample-undef.pdf
index bb04e1afcd5..c7cc35fc662 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 0f86f395e37..550f60c14aa 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 dc364f438f5..c39a3c68445 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 ecfd2657d1b..4690b5e1791 100644
--- a/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
+++ b/Master/texmf-dist/source/latex/glossaries-extra/glossaries-extra.dtx
@@ -1,17 +1,17 @@
%\iffalse
-% glossaries-extra.dtx generated using makedtx version 1.1 (c) Nicola Talbot
+% glossaries-extra.dtx generated using makedtx version 1.2 (c) Nicola Talbot
% Command line args:
+% -comment ".*\.tex"
% -src "glossaries-extra.sty\Z=>glossaries-extra.sty"
% -src "glossaries-extra-stylemods.sty\Z=>glossaries-extra-stylemods.sty"
% -src "(example-glossaries-.+\.tex)\Z=>\1"
+% -section "chapter"
% -author "Nicola Talbot"
% -macrocode ".*\.tex"
-% -comment ".*\.tex"
-% -section "chapter"
% -codetitle "Main Package Code (\\styfmt{glossaries-extra.sty})"
% -doc "glossaries-extra-codedoc.tex"
% glossaries-extra
-% Created on 2017/6/15 12:28
+% Created on 2017/8/9 16:08
%\fi
%\iffalse
%<*package>
@@ -121,7 +121,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\setcounter{IndexColumns}{2}
-\CheckSum{11999}
+\CheckSum{17436}
\newcommand*{\ifirstuse}{\iterm{first use}}
\newcommand*{\firstuse}{\gls{firstuse}}
@@ -138,12 +138,16 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\newcommand*{\igloskey}[2][newglossaryentry]{\icsopt{#1}{#2}}
\newcommand*{\gloskey}[2][newglossaryentry]{\csopt{#1}{#2}}
-\newcommand*{\glostyle}[1]{\textsf{#1}\index{glossary styles:>#1={\protect\sffamily#1}|main}}
+\newcommand*{\stylefmt}[1]{\textsf{#1}}
+
+\newcommand*{\glostyle}[1]{\stylefmt{#1}%
+ \index{glossary styles:>#1=\protect\stylefmt{#1}|main}}
-\newcommand*{\acrstyle}[1]{\textsf{#1}\index{acronym
-styles (glossaries):>#1={\protect\ttfamily#1}|main}}
+\newcommand*{\acrstyle}[1]{\stylefmt{#1}%
+ \index{acronym styles (glossaries):>#1=\protect\stylefmt{#1}|main}}
-\newcommand*{\abbrstyle}[1]{\textsf{#1}\index{abbreviation styles:>#1={\protect\sffamily#1}|main}}
+\newcommand*{\abbrstyle}[1]{\stylefmt{#1}%
+ \index{abbreviation styles:>#1=\protect\stylefmt{#1}|main}}
\newcommand*{\category}[1]{\textsf{#1}\index{entry categories:>#1={\protect\sffamily#1}|main}}
@@ -157,13 +161,13 @@ styles (glossaries):>#1={\protect\ttfamily#1}|main}}
\raggedright
}
-\title{glossaries-extra.sty v1.16:
+\title{glossaries-extra.sty v1.17:
documented code}
\author{Nicola L.C. Talbot\\[10pt]
Dickimaw Books\\
\url{http://www.dickimaw-books.com/}}
-\date{2017-06-15}
+\date{2017-08-09}
\begin{document}
\DocInput{glossaries-extra.dtx}
@@ -208,7 +212,7 @@ Dickimaw Books\\
%\section{Package Initialisation and Options}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra}[2017/06/15 v1.16 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2017/08/09 v1.17 (NLCT)]
% \end{macrocode}
% Requires \sty{xkeyval} to define package options.
% \begin{macrocode}
@@ -887,6 +891,45 @@ Dickimaw Books\\
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\GlsXtrDefineAcShortcuts}
+% Enable shortcut commands for the abbreviations, but uses the
+% analogous commands provided by \styfmt{glossaries}.
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\GlsXtrDefineAcShortcuts}{%
+ \newcommand*{\ac}{\cgls}%
+ \newcommand*{\acp}{\cglspl}%
+ \newcommand*{\acs}{\glsxtrshort}%
+ \newcommand*{\acsp}{\glsxtrshortpl}%
+ \newcommand*{\acl}{\glsxtrlong}%
+ \newcommand*{\aclp}{\glsxtrlongpl}%
+ \newcommand*{\acf}{\glsxtrfull}%
+ \newcommand*{\acfp}{\glsxtrfullpl}%
+ \newcommand*{\Ac}{\cGls}%
+ \newcommand*{\Acp}{\cGlspl}%
+ \newcommand*{\Acs}{\Glsxtrshort}%
+ \newcommand*{\Acsp}{\Glsxtrshortpl}%
+ \newcommand*{\Acl}{\Glsxtrlong}%
+ \newcommand*{\Aclp}{\Glsxtrlongpl}%
+ \newcommand*{\Acf}{\Glsxtrfull}%
+ \newcommand*{\Acfp}{\Glsxtrfullpl}%
+ \newcommand*{\AC}{\cGLS}%
+ \newcommand*{\ACP}{\cGLSpl}%
+ \newcommand*{\ACS}{\GLSxtrshort}%
+ \newcommand*{\ACSP}{\GLSxtrshortpl}%
+ \newcommand*{\ACL}{\GLSxtrlong}%
+ \newcommand*{\ACLP}{\GLSxtrlongpl}%
+ \newcommand*{\ACF}{\GLSxtrfull}%
+ \newcommand*{\ACFP}{\GLSxtrfullpl}%
+ \newcommand*{\newabbr}{\newabbreviation}%
+% \end{macrocode}
+% Disable this command after it's been used.
+% \begin{macrocode}
+ \let\GlsXtrDefineAcShortcuts\relax
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\GlsXtrDefineOtherShortcuts}
% Similarly provide shortcut versions for the commands provided by
% the \pkgopt{symbols} and \pkgopt{numbers} options.
@@ -931,9 +974,12 @@ Dickimaw Books\\
%equivalent to \pkgopt[all]{shortcuts} and
%\pkgopt[none]{shortcuts}. Multiple use of this option in the
%\emph{same} option list will override each other.
+%New to v1.17: \pkgopt[ac]{shortcuts} which implements
+%\cs{GlsXtrDefineAcShortcuts} (not included in
+%\pkgopt[all]{shortcuts} as it conflicts with other shortcuts).
% \begin{macrocode}
\define@choicekey{glossaries-extra.sty}{shortcuts}[\val\nr]%
- {acronyms,acro,abbreviations,abbr,other,all,true,none,false}[true]{%
+ {acronyms,acro,abbreviations,abbr,other,all,true,none,false,ac}[true]{%
\let\@glsxtr@shortcutsval\val
\ifcase\nr\relax % acronyms
\renewcommand*{\@glsxtr@setupshortcuts}{%
@@ -971,8 +1017,13 @@ Dickimaw Books\\
\GlsXtrDefineAbbreviationShortcuts
\GlsXtrDefineOtherShortcuts
}%
- \else % none, false
+ \or % none, false
\renewcommand*{\@glsxtr@setupshortcuts}{}%
+ \or % ac
+ \renewcommand*{\@glsxtr@setupshortcuts}{%
+ \glsacrshortcutstrue
+ \GlsXtrDefineAcShortcuts
+ }%
\fi
}
% \end{macrocode}
@@ -6831,7 +6882,12 @@ Dickimaw Books\\
\@gls@noidxloclist@prev
}%
{%
- ??\glsdoifexists{#1}%
+% \end{macrocode}
+%\changes{1.17}{2017-08-09}{replace hard-coded ?? with
+%\cs{glsxtrundeftag}}
+% \begin{macrocode}
+ \glsxtrundeftag
+ \glsdoifexists{#1}%
{%
\GlossariesWarning{Missing location list for `#1'. Either
a rerun is required or you haven't referenced the entry.}%
@@ -6856,7 +6912,12 @@ Dickimaw Books\\
\forlistloop{\glsnoidxnumberlistloophandler}{\@gls@loclist}%
}%
{%
- ??\glsdoifexists{#1}%
+% \end{macrocode}
+%\changes{1.17}{2017-08-09}{replace hard-coded ?? with
+%\cs{glsxtrundeftag}}
+% \begin{macrocode}
+ \glsxtrundeftag
+ \glsdoifexists{#1}%
{%
\GlossariesWarning{Missing location list for `##1'. Either
a rerun is required or you haven't referenced the entry.}%
@@ -6879,7 +6940,12 @@ Dickimaw Books\\
\glsnoidxloclist{\@gls@loclist}%
}%
{%
- ??\glsdoifexists{#1}%
+% \end{macrocode}
+%\changes{1.17}{2017-08-09}{replace hard-coded ?? with
+%\cs{glsxtrundeftag}}
+% \begin{macrocode}
+ \glsxtrundeftag
+ \glsdoifexists{#1}%
{%
\GlossariesWarning{Missing location list for `#1'. Either
a rerun is required or you haven't referenced the entry.}%
@@ -10510,6 +10576,48 @@ Dickimaw Books\\
% \end{macrocode}
%\end{macro}
%
+%Similarly provide a way of replacing spaces with
+%\cs{glsxtrwordsep}, which first needs to be defined:
+%\begin{macro}{\glsxtrwordsep}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrwordsep}{\space}
+% \end{macrocode}
+%\end{macro}
+%Each word is marked with
+%\begin{macro}{\glsxtrword}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrword}[1]{#1}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@glsxtr@markwordseps}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\@glsxtr@markwordseps}[2]{%
+ \def#1{}%
+ \@glsxtr@mark@wordseps#1#2 \@nnil
+}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\@glsxtr@mark@wordseps}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\def\@glsxtr@mark@wordseps#1#2 #3{%
+ \ifdefempty{#1}%
+ {\def#1{\protect\glsxtrword{#2}}}%
+ {\appto#1{\protect\glsxtrwordsep\protect\glsxtrword{#2}}}%
+ \ifx\@nnil#3\relax
+ \let\@glsxtr@mark@wordseps@next\relax
+ \else
+ \def\@glsxtr@mark@wordseps@next{%
+ \@glsxtr@mark@wordseps#1#3}%
+ \fi
+ \@glsxtr@mark@wordseps@next
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\newabbreviation}
% Define a new generic abbreviation.
% \begin{macrocode}
@@ -10531,67 +10639,113 @@ Dickimaw Books\\
\glsshorttok{#3}%
\glslongtok{#4}%
% \end{macrocode}
+%Save the original short and long values (before attribute settings
+%modify them).
+%\changes{1.17}{2017-08-09}{added \cs{glsxtrorgshort} and \cs{glsxtrorglong}}
+% \begin{macrocode}
+ \def\glsxtrorgshort{#3}%
+ \def\glsxtrorglong{#4}%
+% \end{macrocode}
% Get the category.
%\changes{0.3}{2015-12-02}{fixed family name in \cs{setkeys}}
% \begin{macrocode}
\def\glscategorylabel{abbreviation}%
\glsxtr@applyabbrvstyle{\@glsabbrv@current@abbreviation}%
+% \end{macrocode}
+% Ignore the shortplural and longplural keys.
+% \begin{macrocode}
\setkeys*{glsxtrabbrv}[shortplural,longplural]{#1}%
% \end{macrocode}
% Set the default long plural
% \begin{macrocode}
\def\@gls@longpl{#4\glspluralsuffix}%
+ \let\@gls@default@longpl\@gls@longpl
% \end{macrocode}
-% Has the \catattr{insertdots} attribute been set?
+% Has the \catattr{markwords} attribute been set?
% \begin{macrocode}
- \glsifcategoryattribute{\glscategorylabel}{insertdots}{true}%
+ \glsifcategoryattribute{\glscategorylabel}{markwords}{true}%
{%
- \@glsxtr@insertdots\@gls@short{#3}%
- \expandafter\glsshorttok\expandafter{\@gls@short\spacefactor1000 \relax}%
- \glsifcategoryattribute{\glscategorylabel}{aposplural}{true}%
- {%
- \expandafter\def\expandafter\@gls@shortpl\expandafter{\@gls@short
- '\abbrvpluralsuffix}%
- }%
+ \@glsxtr@markwordseps\@gls@long{#4}%
+ \expandafter\def\expandafter\@gls@longpl\expandafter
+ {\@gls@long\glspluralsuffix}%
+ \let\@gls@default@longpl\@gls@longpl
+% \end{macrocode}
+% Update \cs{glslongtok}.
+% \begin{macrocode}
+ \expandafter\glslongtok\expandafter{\@gls@long}%
+ }%
+ {}%
+% \end{macrocode}
+% Has the \catattr{markshortwords} attribute been set? (Not
+% compatible with \catattr{insertdots}.)
+% \begin{macrocode}
+ \glsifcategoryattribute{\glscategorylabel}{markshortwords}{true}%
+ {%
+ \@glsxtr@markwordseps\@gls@short{#3}%
+ }%
+ {%
+% \end{macrocode}
+% Has the \catattr{insertdots} attribute been set?
+% \begin{macrocode}
+ \glsifcategoryattribute{\glscategorylabel}{insertdots}{true}%
{%
- \glsifcategoryattribute{\glscategorylabel}{noshortplural}{true}%
- {%
- \let\@gls@shortpl\@gls@short
- }%
- {%
- \expandafter\def\expandafter\@gls@shortpl\expandafter{\@gls@short
- \abbrvpluralsuffix}%
- }%
+ \@glsxtr@insertdots\@gls@short{#3}%
+ \expandafter\glsshorttok\expandafter{\@gls@short\spacefactor1000 \relax}%
}%
+ {\def\@gls@short{#3}}%
+ }%
+% \end{macrocode}
+% Has the \catattr{aposplural} attribute been set? (Not compatible
+% with \catattr{noshortplural}.)
+% \begin{macrocode}
+ \glsifcategoryattribute{\glscategorylabel}{aposplural}{true}%
+ {%
+ \expandafter\def\expandafter\@gls@shortpl\expandafter{\@gls@short
+ '\abbrvpluralsuffix}%
}%
{%
% \end{macrocode}
-% \catattr{insertdots} not true.
+% Has the \catattr{noshortplural} attribute been set?
% \begin{macrocode}
- \glsifcategoryattribute{\glscategorylabel}{aposplural}{true}%
+ \glsifcategoryattribute{\glscategorylabel}{noshortplural}{true}%
{%
- \def\@gls@shortpl{#3'\abbrvpluralsuffix}%
- }%
- {%
- \glsifcategoryattribute{\glscategorylabel}{noshortplural}{true}%
- {%
- \def\@gls@shortpl{#3}%
- }%
+ \let\@gls@shortpl\@gls@short
+ }%
{%
- \def\@gls@shortpl{#3\abbrvpluralsuffix}%
- }%
+ \expandafter\def\expandafter\@gls@shortpl\expandafter{\@gls@short
+ \abbrvpluralsuffix}%
}%
}%
% \end{macrocode}
+% Update \cs{glsshorttok}:
+% \begin{macrocode}
+ \expandafter\glsshorttok\expandafter{\@gls@short}%
+% \end{macrocode}
% Hook for further customisation if required:
% \begin{macrocode}
\glsxtrnewabbrevpresetkeyhook{#1}{#2}{#3}%
% \end{macrocode}
% Get the short and long plurals provided by user in optional
% argument to override defaults, if necessary.
+% Ignore the category key (already obtained).
% \begin{macrocode}
\setkeys*{glsxtrabbrv}[category]{#1}%
% \end{macrocode}
+% Has the plural been explicitly set?
+% \begin{macrocode}
+ \ifx\@gls@default@longpl\@gls@longpl
+ \else
+% \end{macrocode}
+% Has the \catattr{markwords} attribute been set?
+% \begin{macrocode}
+ \glsifcategoryattribute{\glscategorylabel}{markwords}{true}%
+ {%
+ \expandafter\@glsxtr@markwordseps\expandafter\@gls@longpl\expandafter
+ {\@gls@longpl}%
+ }%
+ {}%
+ \fi
+% \end{macrocode}
% Set the plural token registers so the values can be accessed by
% the abbreviation styles.
% \begin{macrocode}
@@ -10652,12 +10806,20 @@ Dickimaw Books\\
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glsxtrparen}
+%\changes{1.17}{2017-08-09}{new}
+%For the parenthetical styles.
+% \begin{macrocode}
+\newcommand*{\glsxtrparen}[1]{(#1)}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{macro}{\glsxtrfullformat}
% Full format without case change.
% \begin{macrocode}
\newcommand*{\glsxtrfullformat}[2]{%
\glsfirstlongfont{\glsaccesslong{#1}}#2\glsxtrfullsep{#1}%
- (\protect\glsfirstabbrvfont{\glsaccessshort{#1}})%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{#1}}}%
}
% \end{macrocode}
%\end{macro}
@@ -10667,7 +10829,7 @@ Dickimaw Books\\
% \begin{macrocode}
\newcommand*{\Glsxtrfullformat}[2]{%
\glsfirstlongfont{\Glsaccesslong{#1}}#2\glsxtrfullsep{#1}%
- (\protect\glsfirstabbrvfont{\glsaccessshort{#1}})%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{#1}}}%
}
% \end{macrocode}
%\end{macro}
@@ -10677,7 +10839,7 @@ Dickimaw Books\\
% \begin{macrocode}
\newcommand*{\glsxtrfullplformat}[2]{%
\glsfirstlongfont{\glsaccesslongpl{#1}}#2\glsxtrfullsep{#1}%
- (\protect\glsfirstabbrvfont{\glsaccessshortpl{#1}})%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{#1}}}%
}
% \end{macrocode}
%\end{macro}
@@ -10687,7 +10849,7 @@ Dickimaw Books\\
% \begin{macrocode}
\newcommand*{\Glsxtrfullplformat}[2]{%
\glsfirstlongfont{\Glsaccesslongpl{#1}}#2\glsxtrfullsep{#1}%
- (\protect\glsfirstabbrvfont{\glsaccessshortpl{#1}})%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{#1}}}%
}
% \end{macrocode}
%\end{macro}
@@ -11460,6 +11622,7 @@ Dickimaw Books\\
%\changes{0.5.2}{2015-12-08}{removed \cs{glsxtrabbrvfmt}}
%\begin{macro}{\glsxtrgenabbrvfmt}
% Similar to \cs{glsgenacfmt}, but for abbreviations.
+%\changes{1.17}{2017-08-09}{added check for \cs{ifglsxtrinsertinside}}
% \begin{macrocode}
\newcommand*{\glsxtrgenabbrvfmt}{%
\ifdefempty\glscustomtext
@@ -11479,20 +11642,20 @@ Dickimaw Books\\
% \end{macrocode}
% Subsequent plural form, don't adjust case:
% \begin{macrocode}
- \glsabbrvfont{\glsaccessshortpl{\glslabel}}\glsinsert
+ \glsxtrsubsequentplfmt{\glslabel}{\glsinsert}%
}%
{%
% \end{macrocode}
% Subsequent plural form, make first letter upper case:
% \begin{macrocode}
- \glsabbrvfont{\Glsaccessshortpl{\glslabel}}\glsinsert
+ \Glsxtrsubsequentplfmt{\glslabel}{\glsinsert}%
}%
{%
% \end{macrocode}
% Subsequent plural form, all caps:
% \begin{macrocode}
\mfirstucMakeUppercase
- {\glsabbrvfont{\glsaccessshortpl{\glslabel}}\glsinsert}%
+ {\glsxtrsubsequentplfmt{\glslabel}{\glsinsert}}%
}%
}%
{%
@@ -11504,20 +11667,20 @@ Dickimaw Books\\
% \end{macrocode}
% Subsequent singular form, don't adjust case:
% \begin{macrocode}
- \glsabbrvfont{\glsaccessshort{\glslabel}}\glsinsert
+ \glsxtrsubsequentfmt{\glslabel}{\glsinsert}%
}%
{%
% \end{macrocode}
% Subsequent singular form, make first letter upper case:
% \begin{macrocode}
- \glsabbrvfont{\Glsaccessshort{\glslabel}}\glsinsert
+ \Glsxtrsubsequentfmt{\glslabel}{\glsinsert}%
}%
{%
% \end{macrocode}
% Subsequent singular form, all caps:
% \begin{macrocode}
\mfirstucMakeUppercase
- {\glsabbrvfont{\glsaccessshort{\glslabel}}\glsinsert}%
+ {\glsxtrsubsequentfmt{\glslabel}{\glsinsert}}%
}%
}%
}%
@@ -11588,6 +11751,54 @@ Dickimaw Books\\
% \end{macrocode}
%\end{macro}
%
+%\begin{macro}{\glsxtrsubsequentfmt}
+% Subsequent use format (singular no case change).
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glsabbrvfont{\glsaccessshort{#1}\ifglsxtrinsertinside #2\fi}%
+ \ifglsxtrinsertinside \else#2\fi
+}
+\let\glsxtrdefaultsubsequentfmt\glsxtrsubsequentfmt
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtrsubsequentplfmt}
+% Subsequent use format (plural no case change).
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glsabbrvfont{\glsaccessshortpl{#1}\ifglsxtrinsertinside #2\fi}%
+ \ifglsxtrinsertinside \else#2\fi
+}
+\let\glsxtrdefaultsubsequentplfmt\glsxtrsubsequentplfmt
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\Glsxtrsubsequentfmt}
+% Subsequent use format (singular, first letter uppercase).
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glsabbrvfont{\Glsaccessshort{#1}\ifglsxtrinsertinside #2\fi}%
+ \ifglsxtrinsertinside \else#2\fi
+}
+\let\Glsxtrdefaultsubsequentfmt\Glsxtrsubsequentfmt
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\Glsxtrsubsequentplfmt}
+% Subsequent use format (plural, first letter uppercase).
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glsabbrvfont{\Glsaccessshortpl{#1}\ifglsxtrinsertinside #2\fi}%
+ \ifglsxtrinsertinside \else#2\fi
+}
+\let\Glsxtrdefaultsubsequentplfmt\Glsxtrsubsequentplfmt
+% \end{macrocode}
+%\end{macro}
+%
%\subsection{Abbreviation Styles Setup}
%
%\begin{macro}{\setabbreviationstyle}
@@ -11680,6 +11891,13 @@ Dickimaw Books\\
\renewcommand*{\Glsxtrinlinefullformat}{\Glsxtrfullformat}%
\renewcommand*{\glsxtrinlinefullplformat}{\glsxtrfullplformat}%
\renewcommand*{\Glsxtrinlinefullplformat}{\Glsxtrfullplformat}%
+% \end{macrocode}
+% Reset \cs{glsxtrsubsequentfmt} etc in case a style changes this.
+% \begin{macrocode}
+ \let\glsxtrsubsequentfmt\glsxtrdefaultsubsequentfmt
+ \let\glsxtrsubsequentplfmt\glsxtrdefaultsubsequentplfmt
+ \let\Glsxtrsubsequentfmt\Glsxtrdefaultsubsequentfmt
+ \let\Glsxtrsubsequentplfmt\Glsxtrdefaultsubsequentplfmt
#3}%
}%
}
@@ -11808,6 +12026,8 @@ Dickimaw Books\\
% \end{macrocode}
%\end{macro}
%
+%\changes{1.17}{2017-08-09}{removed some inconsistencies in the abbreviation
+%styles}
%\begin{abbrvstyle}{long-short}
% \begin{macrocode}
\newabbreviationstyle{long-short}%
@@ -11817,10 +12037,10 @@ Dickimaw Books\\
sort={\the\glsshorttok},
first={\protect\glsfirstlongfont{\the\glslongtok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstabbrvfont{\the\glsshorttok})},%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshorttok}}},%
firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshortpltok}}},%
% \end{macrocode}
%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
% \begin{macrocode}
@@ -11856,22 +12076,22 @@ Dickimaw Books\\
\glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
\glsxtrfullsep{##1}%
- (\glsfirstabbrvfont{\glsaccessshort{##1}})%
+ \glsxtrparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}%
}%
\renewcommand*{\glsxtrfullplformat}[2]{%
\glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstabbrvfont{\glsaccessshortpl{##1}})%
+ \glsxtrparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
}%
\renewcommand*{\Glsxtrfullformat}[2]{%
\glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstabbrvfont{\glsaccessshort{##1}})%
+ \glsxtrparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}%
}%
\renewcommand*{\Glsxtrfullplformat}[2]{%
\glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstabbrvfont{\glsaccessshortpl{##1}})%
+ \glsxtrparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
}%
}
% \end{macrocode}
@@ -11885,7 +12105,19 @@ Dickimaw Books\\
%\begin{macro}{\glsxtrlongshortdescsort}
%\changes{1.04}{2016-05-02}{new}
% \begin{macrocode}
-\newcommand*{\glsxtrlongshortdescsort}{\the\glslongtok\space(\the\glsshorttok)}
+\newcommand*{\glsxtrlongshortdescsort}{%
+ \expandonce\glsxtrorglong\space (\expandonce\glsxtrorgshort)%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtrlongshortdescname}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrlongshortdescname}{%
+ \protect\glslongfont{\the\glslongtok}
+ \glsxtrparen{\protect\glsabbrvfont{\the\glsshorttok}}%
+}
% \end{macrocode}
%\end{macro}
%
@@ -11896,14 +12128,14 @@ Dickimaw Books\\
\newabbreviationstyle{long-short-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsxtrfullformat{\the\glslabeltok}{}},
+ name={\glsxtrlongshortdescname},
sort={\glsxtrlongshortdescsort},%
first={\protect\glsfirstlongfont{\the\glslongtok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstabbrvfont{\the\glsshorttok})},%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshorttok}}},%
firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshortpltok}}},%
% \end{macrocode}
%The \gloskey{text} key should only have the short form.
%\changes{1.07}{2016-08-15}{added missing text key}
@@ -11943,10 +12175,10 @@ Dickimaw Books\\
description={\the\glslongtok},%
first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstlongfont{\the\glslongtok})},%
+ \glsxtrparen{\protect\glsfirstlongfont{\the\glslongtok}}},%
firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstlongfont{\the\glslongpltok})},%
+ \glsxtrparen{\protect\glsfirstlongfont{\the\glslongpltok}}},%
% \end{macrocode}
%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
% \begin{macrocode}
@@ -11981,28 +12213,45 @@ Dickimaw Books\\
\glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\glsxtrfullplformat}[2]{%
\glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
}%
\renewcommand*{\Glsxtrfullformat}[2]{%
\glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\Glsxtrfullplformat}[2]{%
\glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
}%
}
% \end{macrocode}
%\end{abbrvstyle}
%
+%\begin{macro}{\glsxtrshortlongdescsort}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrshortlongdescsort}{\the\glsshorttok}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtrshortlongdescname}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrshortlongdescname}{%
+ \protect\glsabbrvfont{\the\glsshorttok}
+ \glsxtrparen{\protect\glslongfont{\the\glslongtok}}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{abbrvstyle}{short-long-desc}
% User supplies description. The long form is included in the name.
%\changes{0.3}{2015-12-02}{fixed name to use \cs{glslabeltok}}
@@ -12010,14 +12259,14 @@ Dickimaw Books\\
\newabbreviationstyle{short-long-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsxtrfullformat{\the\glslabeltok}{}},
- sort={\the\glsshorttok},%
+ name={\glsxtrshortlongdescname},
+ sort={\glsxtrshortlongdescsort},
first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstlongfont{\the\glslongtok})},%
+ \glsxtrparen{\protect\glsfirstlongfont{\the\glslongtok}}},%
firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstlongfont{\the\glslongpltok})},%
+ \glsxtrparen{\protect\glsfirstlongfont{\the\glslongpltok}}},%
% \end{macrocode}
%\changes{1.07}{2016-08-15}{added text key}
% \begin{macrocode}
@@ -12159,22 +12408,22 @@ Dickimaw Books\\
\renewcommand*{\glsxtrinlinefullformat}[2]{%
\glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfootnotefont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\glsxtrinlinefullplformat}[2]{%
\glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfootnotefont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullformat}[2]{%
\glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfootnotefont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullplformat}[2]{%
\glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfootnotefont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
}%
}
% \end{macrocode}
@@ -12279,22 +12528,22 @@ Dickimaw Books\\
\renewcommand*{\glsxtrinlinefullformat}[2]{%
\glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfootnotefont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\glsxtrinlinefullplformat}[2]{%
\glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfootnotefont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullformat}[2]{%
\glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfootnotefont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullplformat}[2]{%
\glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfootnotefont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
}%
}
% \end{macrocode}
@@ -12347,25 +12596,25 @@ Dickimaw Books\\
\protect\glsfirstabbrvfont{\glsaccessshort{##1}%
\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\glsxtrinlinefullplformat}[2]{%
\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}%
\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullformat}[2]{%
\protect\glsfirstabbrvfont{\glsaccessshort{##1}%
\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\Glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\Glsaccesslong{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullplformat}[2]{%
\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}%
\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\Glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\Glsaccesslongpl{##1}}}%
}%
% \end{macrocode}
% The first use full form only displays the short form, but it
@@ -12394,6 +12643,7 @@ Dickimaw Books\\
% \begin{macrocode}
\setabbreviationstyle[acronym]{short}
% \end{macrocode}
+%
%\begin{abbrvstyle}{short-nolong}
%\changes{1.04}{2016-05-02}{new}
% \begin{macrocode}
@@ -12401,6 +12651,40 @@ Dickimaw Books\\
% \end{macrocode}
%\end{abbrvstyle}
%
+%\begin{abbrvstyle}{short-nolong-noreg}
+%\changes{1.17}{2017-08-09}{new}
+% Like \abbrstyle{short-nolong} but doesn't set the \catattr{regular} attribute.
+% \begin{macrocode}
+\newabbreviationstyle{short-nolong-noreg}%
+{%
+ \GlsXtrUseAbbrStyleSetup{short-nolong}%
+% \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}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-nolong}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%
+%\begin{macro}{\glsxtrshortdescname}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrshortdescname}{%
+ \protect\glsabbrvfont{\the\glsshorttok}%
+}
+% \end{macrocode}
+%\end{macro}
+%
%\begin{abbrvstyle}{short-desc}
% The user must supply the description in this style. The long form
% is added to the name. The \abbrstyle{short} style (possibly with the
@@ -12411,7 +12695,7 @@ Dickimaw Books\\
\newabbreviationstyle{short-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsxtrinlinefullformat{\the\glslabeltok}{}},
+ name={\glsxtrshortdescname},
sort={\the\glsshorttok},
first={\protect\glsfirstabbrvfont{\the\glsshorttok}},
firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}},
@@ -12438,22 +12722,22 @@ Dickimaw Books\\
\renewcommand*{\glsxtrinlinefullformat}[2]{%
\glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\glsxtrinlinefullplformat}[2]{%
\glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullformat}[2]{%
\glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullplformat}[2]{%
\glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
}%
% \end{macrocode}
% The first use full form only displays the short form, but it
@@ -12485,6 +12769,30 @@ Dickimaw Books\\
% \end{macrocode}
%\end{abbrvstyle}
%
+%\begin{abbrvstyle}{short-nolong-desc-noreg}
+%\changes{1.17}{2017-08-09}{new}
+% Like \abbrstyle{short-nolong-desc} but doesn't set the \catattr{regular} attribute.
+% \begin{macrocode}
+\newabbreviationstyle{short-nolong-desc-noreg}%
+{%
+ \GlsXtrUseAbbrStyleSetup{short-nolong-desc}%
+% \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}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-nolong-desc}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
%\begin{abbrvstyle}{long-desc}
% Provide a style that only displays the long form,
% but the long and short form can be displayed with the \qt{full}
@@ -12495,12 +12803,12 @@ Dickimaw Books\\
\newabbreviationstyle{long-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\protect\glsfirstlongfont{\the\glslongtok}},
+ name={\protect\protect\glslongfont{\the\glslongtok}},
sort={\the\glslongtok},
first={\protect\glsfirstlongfont{\the\glslongtok}},
firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},
- text={\the\glslongtok},
- plural={\the\glslongpltok}%
+ text={\glslongfont{\the\glslongtok}},
+ plural={\glslongfont{\the\glslongpltok}}%
}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glssetattribute{\the\glslabeltok}{regular}{true}}%
@@ -12516,28 +12824,48 @@ Dickimaw Books\\
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
% \end{macrocode}
+% The format for subsequent use (not used when the regular attribute
+% is set).
+% \begin{macrocode}
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+% \end{macrocode}
% The inline full form displays the long format followed by the
% short form in parentheses.
% \begin{macrocode}
\renewcommand*{\glsxtrinlinefullformat}[2]{%
\glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\protect\glsfirstabbrvfont{\glsaccessshort{##1}})%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{##1}}}%
}%
\renewcommand*{\glsxtrinlinefullplformat}[2]{%
\glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}})%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullformat}[2]{%
\glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\protect\glsfirstabbrvfont{\glsaccessshort{##1}})%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullplformat}[2]{%
\glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}})%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
}%
% \end{macrocode}
% The first use full form only displays the long form, but it
@@ -12570,9 +12898,34 @@ Dickimaw Books\\
% \end{macrocode}
%\end{abbrvstyle}
%
+%\begin{abbrvstyle}{long-noshort-desc-noreg}
+%\changes{1.17}{2017-08-09}{new}
+% Like long-noshort-desc but doesn't set the \catattr{regular} attribute.
+% \begin{macrocode}
+\newabbreviationstyle{long-noshort-desc-noreg}%
+{%
+ \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
+% \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}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
%\begin{abbrvstyle}{long}
% It doesn't really make a great deal of sense to have a long-only
-% style that doesn't have a description, but the best course of
+% style that doesn't have a description (unless no glossary is
+% required), but the best course of
% action here is to use the short form as the name and the long
% form as the description.
% \begin{macrocode}
@@ -12583,8 +12936,8 @@ Dickimaw Books\\
sort={\the\glsshorttok},
first={\protect\glsfirstlongfont{\the\glslongtok}},
firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},
- text={\the\glslongtok},
- plural={\the\glslongpltok},%
+ text={\glslongfont{\the\glslongtok}},
+ plural={\glslongfont{\the\glslongpltok}},%
description={\the\glslongtok}%
}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
@@ -12595,6 +12948,7 @@ Dickimaw Books\\
}
% \end{macrocode}
%\end{abbrvstyle}
+%
%\begin{abbrvstyle}{long-noshort}
%\changes{1.04}{2016-05-02}{new}
%Provide a synonym that matches similar styles.
@@ -12603,18 +12957,58 @@ Dickimaw Books\\
% \end{macrocode}
%\end{abbrvstyle}
%
+%\begin{abbrvstyle}{long-noshort-noreg}
+%\changes{1.17}{2017-08-09}{new}
+% Like long-noshort but doesn't set the \catattr{regular} attribute.
+% \begin{macrocode}
+\newabbreviationstyle{long-noshort-noreg}%
+{%
+ \GlsXtrUseAbbrStyleSetup{long-noshort}%
+% \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}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-noshort}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
%\subsection{Predefined Styles (Small Capitals)}
-%These styles use:
+%These styles use \cs{textsc} for the short form.
%\begin{macro}{\glsxtrscfont}
%\changes{0.5}{2015-12-07}{new}
+%Maintained for backward-compatibility.
% \begin{macrocode}
\newcommand*{\glsxtrscfont}[1]{\textsc{#1}}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\glsabbrvscfont}
+%\changes{1.17}{2017-08-09}{new}
+%Added for consistent naming.
+% \begin{macrocode}
+\newcommand*{\glsabbrvscfont}{\glsxtrscfont}
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\glsxtrfirstscfont}
%\changes{1.04}{2016-05-02}{new}
+%Maintained for backward-compatibility.
% \begin{macrocode}
-\newcommand*{\glsxtrfirstscfont}[1]{\glsxtrscfont{#1}}
+\newcommand*{\glsxtrfirstscfont}[1]{\glsabbrvscfont{#1}}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\glsfirstabbrvscfont}
+%\changes{1.17}{2017-08-09}{new}
+%Added for consistent naming.
+% \begin{macrocode}
+\newcommand*{\glsfirstabbrvscfont}{\glsxtrfirstscfont}
% \end{macrocode}
%\end{macro}
% and for the default short form suffix:
@@ -12629,19 +13023,62 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{long-short-sc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-short}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\the\glsshortpltok}}},%
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}},%
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
% \end{macrocode}
-% Mostly as long-short style:
-% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long-short}%
-% \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}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+% \end{macrocode}
+% Use the default long fonts.
+% \begin{macrocode}
+ \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.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+ }%
}
% \end{macrocode}
%
@@ -12649,19 +13086,35 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{long-short-sc-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-short-desc}%
-}%
-{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrlongshortdescname},
+ sort={\glsxtrlongshortdescsort},%
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\the\glsshortpltok}}},%
+ text={\protect\glsabbrvscfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}}%
+ }%
% \end{macrocode}
-% Mostly as long-short-desc style:
+%\changes{0.5.1}{2015-12-07}{switch off regular attribute if set}
+% Unset the \catattr{regular} attribute if it has been set.
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long-short-desc}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
% \end{macrocode}
-% Use smallcaps and adjust the plural suffix to revert to upright.
+% As long-short-sc style:
% \begin{macrocode}
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+ \GlsXtrUseAbbrStyleFmts{long-short-sc}%
}
% \end{macrocode}
%
@@ -12669,19 +13122,63 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-sc-long}%
{%
- \GlsXtrUseAbbrStyleSetup{short-long}%
-}%
-{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvscfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}}}%
% \end{macrocode}
-% Mostly as short-long style:
+% Unset the \catattr{regular} attribute if it has been set.
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-long}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
% \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}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##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.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -12690,19 +13187,34 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-sc-long-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-long-desc}%
-}%
-{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortlongdescname},
+ sort={\glsxtrshortlongdescsort},
+ first={\protect\glsfirstabbrvscfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvscfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}}%
+ }%
% \end{macrocode}
-% Mostly as short-long-desc style:
+% Unset the \catattr{regular} attribute if it has been set.
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-long-desc}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
% \end{macrocode}
-% Use smallcaps and adjust the plural suffix to revert to upright.
+% As short-sc-long style:
% \begin{macrocode}
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+ \GlsXtrUseAbbrStyleFmts{short-sc-long}%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -12711,19 +13223,74 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-sc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-nolong}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstabbrvscfont{\the\glsshorttok}},
+ firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}},
+ text={\protect\glsabbrvscfont{\the\glsshorttok}},
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}},
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
% \end{macrocode}
-% Mostly as short style:
-% \begin{macrocode}
- \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}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##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.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \protect\glsfirstabbrvscfont{\glsaccessshort{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \protect\glsfirstabbrvscfont{\glsaccessshort{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslongpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form only displays the short form, but it
+% typically won't be used as the \catattr{regular} attribute is set by this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -12739,19 +13306,70 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-sc-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortdescname},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstabbrvscfont{\the\glsshorttok}},
+ firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}},
+ text={\protect\glsabbrvscfont{\the\glsshorttok}},
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}},
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
% \end{macrocode}
-% Mostly as short style:
-% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-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}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##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.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form only displays the short form, but it
+% typically won't be used as the \catattr{regular} attribute is set by this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -12766,23 +13384,95 @@ Dickimaw Books\\
%\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}.
+% \cs{glsxtrshort}.
% \begin{macrocode}
\newabbreviationstyle{long-noshort-sc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-noshort}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}},
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}},
+ text={\protect\glslongdefaultfont{\the\glslongtok}},
+ plural={\protect\glslongdefaultfont{\the\glslongpltok}},%
+ description={\the\glslongtok}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
% \end{macrocode}
-% Mostly as long style:
-% \begin{macrocode}
- \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}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+% \end{macrocode}
+% The format for subsequent use (not used when the regular attribute
+% is set).
+% \begin{macrocode}
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+% \end{macrocode}
+% The inline full form displays the long format followed by the
+% short form in parentheses.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form only displays the long form, but it
+% typically won't be used as the \catattr{regular} attribute is set by this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -12805,15 +13495,77 @@ Dickimaw Books\\
}%
{%
% \end{macrocode}
-% Mostly as long style:
-% \begin{macrocode}
- \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}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+% \end{macrocode}
+% The format for subsequent use (not used when the regular attribute
+% is set).
+% \begin{macrocode}
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+% \end{macrocode}
+% The inline full form displays the long format followed by the
+% short form in parentheses.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form only displays the long form, but it
+% typically won't be used as the \catattr{regular} attribute is set by this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -12830,19 +13582,92 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-sc-footnote}%
{%
- \GlsXtrUseAbbrStyleSetup{short-footnote}%
-}%
-{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvscfont{\the\glsshorttok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}}}%
% \end{macrocode}
-% Mostly as long style:
+% Switch off hyperlinks on first use to prevent nested hyperlinks,
+% and unset the \catattr{regular} attribute if it has been set.
+%\changes{0.5.1}{2015-12-07}{switch off regular attribute if set}
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-footnote}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
% \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}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
+% \end{macrocode}
+% The full format displays the short form followed by the long form
+% as a footnote.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form and the inline full form use the short
+% (long) style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -12859,19 +13684,98 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-sc-postfootnote}%
{%
- \GlsXtrUseAbbrStyleSetup{short-postfootnote}%
-}%
-{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvscfont{\the\glsshorttok}},%
+ firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}},%
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}}}%
% \end{macrocode}
-% Mostly as long style:
+% Make this category insert a footnote after the link if this was
+% the first use, and
+% unset the \catattr{regular} attribute if it has been set.
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-postfootnote}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+% \end{macrocode}
+% Needs the specific font command here as the style may have been
+% lost by the time the footnote occurs.
+% \begin{macrocode}
+ \glsxtrdopostpunc{\protect\glsxtrabbrvfootnote{\glslabel}%
+ {\glsfirstlongfootnotefont{\glsentrylong{\glslabel}}}}%
+ }%
+ {}%
+ }%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+% \end{macrocode}
+% The footnote needs to be suppressed in the inline form, so
+% \cs{glsxtrfull} must set the first use switch off.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrsetupfulldefs}{%
+ \let\glsxtrifwasfirstuse\@secondoftwo
+ }%
+}%
+{%
% \end{macrocode}
% 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}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
+% \end{macrocode}
+% The full format displays the short form. The long form is
+% deferred.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+% \end{macrocode}
+% The first use full form and the inline full form use the short
+% (long) style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -12887,14 +13791,30 @@ Dickimaw Books\\
% loaded by the user. These styles all use:
%\begin{macro}{\glsxtrsmfont}
%\changes{0.5}{2015-12-07}{new}
+%Maintained for backward compatibility.
% \begin{macrocode}
\newcommand*{\glsxtrsmfont}[1]{\textsmaller{#1}}
% \end{macrocode}
%\end{macro}
+%\begin{macro}{\glsabbrvsmfont}
+%\changes{1.17}{2017-08-09}{new}
+%Added for consistent naming.
+% \begin{macrocode}
+\newcommand*{\glsabbrvsmfont}{\glsxtrsmfont}
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\glsxtrfirstsmfont}
%\changes{1.04}{2016-05-02}{new}
+%Maintained for backward compatibility.
+% \begin{macrocode}
+\newcommand*{\glsxtrfirstsmfont}[1]{\glsabbrvsmfont{#1}}
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\glsfirstabbrvsmfont}
+%\changes{1.17}{2017-08-09}{new}
+%Added for consistent naming.
% \begin{macrocode}
-\newcommand*{\glsxtrfirstsmfont}[1]{\glsxtrsmfont{#1}}
+\newcommand*{\glsfirstabbrvsmfont}{\glsxtrfirstsmfont}
% \end{macrocode}
%\end{macro}
% and for the default short form suffix:
@@ -12910,16 +13830,59 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{long-short-sm}%
{%
- \GlsXtrUseAbbrStyleSetup{long-short}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\the\glsshortpltok}}},%
+ plural={\protect\glsabbrvsmfont{\the\glsshortpltok}},%
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
% \end{macrocode}
-% Mostly as long-short style:
+% Use the default long fonts.
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long-short}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \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.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -12929,16 +13892,34 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{long-short-sm-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrlongshortdescname},
+ sort={\glsxtrlongshortdescsort},%
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\the\glsshortpltok}}},%
+ text={\protect\glsabbrvsmfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvsmfont{\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}
-% Mostly as long-short-desc style:
+% As long-short-sm style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long-short-desc}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \GlsXtrUseAbbrStyleFmts{long-short-sm}%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -12949,16 +13930,60 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-sm-long}%
{%
- \GlsXtrUseAbbrStyleSetup{short-long}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+ plural={\protect\glsabbrvsmfont{\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}%
+ }%
+ {}%
+ }%
}%
{%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
% \end{macrocode}
-% Mostly as short-long style:
+% The first use full form and the inline full form are the same for
+% this style.
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-long}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -12969,16 +13994,34 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-sm-long-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-long-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortlongdescname},
+ sort={\glsxtrshortlongdescsort},
+ first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvsmfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvsmfont{\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}
-% Mostly as short-long-desc style:
+% As short-sm-long style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-long-desc}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \GlsXtrUseAbbrStyleFmts{short-sm-long}%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -12988,16 +14031,71 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-sm}%
{%
- \GlsXtrUseAbbrStyleSetup{short-nolong}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}},
+ firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}},
+ text={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ plural={\protect\glsabbrvsmfont{\the\glsshortpltok}},
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
% \end{macrocode}
-% Mostly as short style:
+% The inline full form displays the short form followed by the
+% long form in parentheses.
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-nolong}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \protect\glsfirstabbrvsmfont{\glsaccessshort{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \protect\glsfirstabbrvsmfont{\glsaccessshort{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslongpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form only displays the short form, but it
+% typically won't be used as the \catattr{regular} attribute is set by this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13013,16 +14111,67 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-sm-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-nolong-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortdescname},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}},
+ firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}},
+ text={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ plural={\protect\glsabbrvsmfont{\the\glsshortpltok}},
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
% \end{macrocode}
-% Mostly as short style:
+% The inline full form displays the short format followed by the
+% long form in parentheses.
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-nolong-desc}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form only displays the short form, but it
+% typically won't be used as the \catattr{regular} attribute is set by this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13042,16 +14191,88 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{long-noshort-sm}%
{%
- \GlsXtrUseAbbrStyleSetup{long-noshort}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}},
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}},
+ text={\protect\glslongdefaultfont{\the\glslongtok}},
+ plural={\protect\glslongdefaultfont{\the\glslongpltok}},%
+ description={\the\glslongtok}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
% \end{macrocode}
-% Mostly as long style:
+% The format for subsequent use (not used when the regular attribute
+% is set).
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long-noshort}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+% \end{macrocode}
+% The inline full form displays the long format followed by the
+% short form in parentheses.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form only displays the long form, but it
+% typically won't be used as the \catattr{regular} attribute is set by this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13074,13 +14295,75 @@ Dickimaw Books\\
\GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
}%
{%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
% \end{macrocode}
-% Mostly as long style:
+% The format for subsequent use (not used when the regular attribute
+% is set).
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+% \end{macrocode}
+% The inline full form displays the long format followed by the
+% short form in parentheses.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form only displays the long form, but it
+% typically won't be used as the \catattr{regular} attribute is set by this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13097,16 +14380,89 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-sm-footnote}%
{%
- \GlsXtrUseAbbrStyleSetup{short-footnote}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+ plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}}%
+% \end{macrocode}
+% Switch off hyperlinks on first use to prevent nested hyperlinks,
+% and unset the \catattr{regular} attribute if it has been set.
+%\changes{0.5.1}{2015-12-07}{switch off regular attribute if set}
+% \begin{macrocode}
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
% \end{macrocode}
-% Mostly as long style:
+% The full format displays the short form followed by the long form
+% as a footnote.
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-footnote}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form and the inline full form use the short
+% (long) style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13123,16 +14479,95 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-sm-postfootnote}%
{%
- \GlsXtrUseAbbrStyleSetup{short-postfootnote}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}},%
+ firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}},%
+ plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}}%
+% \end{macrocode}
+% Make this category insert a footnote after the link if this was
+% the first use, and
+% unset the \catattr{regular} attribute if it has been set.
+% \begin{macrocode}
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+% \end{macrocode}
+% Needs the specific font command here as the style may have been
+% lost by the time the footnote occurs.
+% \begin{macrocode}
+ \glsxtrdopostpunc{\protect\glsxtrabbrvfootnote{\glslabel}%
+ {\glsfirstlongfootnotefont{\glsentrylong{\glslabel}}}}%
+ }%
+ {}%
+ }%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+% \end{macrocode}
+% The footnote needs to be suppressed in the inline form, so
+% \cs{glsxtrfull} must set the first use switch off.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrsetupfulldefs}{%
+ \let\glsxtrifwasfirstuse\@secondoftwo
+ }%
}%
{%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
% \end{macrocode}
-% Mostly as long style:
+% The full format displays the short form. The long form is
+% deferred.
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-postfootnote}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+% \end{macrocode}
+% The first use full form and the inline full form use the short
+% (long) style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13157,6 +14592,13 @@ Dickimaw Books\\
\newcommand*{\glsfirstabbrvemfont}[1]{\glsabbrvemfont{#1}}%
% \end{macrocode}
%\end{macro}
+% The default short form suffix:
+%\begin{macro}{\glsxtremsuffix}
+%\changes{0.5}{2015-12-07}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtremsuffix}{\glsxtrabbrvpluralsuffix}
+% \end{macrocode}
+%\end{macro}
%\begin{macro}{\glsfirstlongemfont}
%\changes{1.04}{2016-05-02}{new}
%Only used by the \qt{long-em} styles.
@@ -13175,17 +14617,63 @@ Dickimaw Books\\
%
%\begin{abbrvstyle}{long-short-em}
%\changes{0.5}{2015-12-07}{new}
+% The long form is just set in the default long font.
% \begin{macrocode}
\newabbreviationstyle{long-short-em}%
{%
- \GlsXtrUseAbbrStyleSetup{long-short}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshortpltok}}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}},%
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
% \end{macrocode}
-% Mostly as long-short style:
+% Use the default long fonts.
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long-short}%
- \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##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.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13195,14 +14683,34 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{long-short-em-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrlongshortdescname},
+ sort={\glsxtrlongshortdescsort},%
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshortpltok}}},%
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvemfont{\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}
-% Mostly as long-short-desc style:
+% As long-short-em style:
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long-short-desc}%
- \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \GlsXtrUseAbbrStyleFmts{long-short-em}%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13217,18 +14725,18 @@ Dickimaw Books\\
%doesn't set the style.
% \begin{macrocode}
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
sort={\the\glsshorttok},
- first={\protect\glsfirstlongfont{\the\glslongtok}%
+ first={\protect\glsfirstlongemfont{\the\glslongtok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstabbrvfont{\the\glsshorttok})},%
- firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshortpltok}}},%
% \end{macrocode}
%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
% \begin{macrocode}
- plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}},%
description={\protect\glslongemfont{\the\glslongtok}}}%
% \end{macrocode}
% Unset the \catattr{regular} attribute if it has been set.
@@ -13242,15 +14750,36 @@ Dickimaw Books\\
}%
}%
{%
-% \end{macrocode}
-% In case the user wants to mix and match font styles, these are
-% redefined here.
-% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long-short}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+% \end{macrocode}
+% The first use full form and the inline full form are the same for
+% this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongemfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongemfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13260,18 +14789,31 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{long-em-short-em-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-short-desc}%
-}%
-{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrlongshortdescname},
+ sort={\glsxtrlongshortdescsort},%
+ first={\protect\glsfirstlongemfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshortpltok}}},%
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}%
+ }%
% \end{macrocode}
-% In case the user wants to mix and match font styles, these are
-% redefined here.
+% Unset the \catattr{regular} attribute if it has been set.
% \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}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-em-short-em}%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13282,16 +14824,64 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-em-long}%
{%
- \GlsXtrUseAbbrStyleSetup{short-long}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+ plural={\protect\glsabbrvemfont{\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}
% Mostly as short-long style:
%\changes{1.05}{2016-06-10}{fixed incorrect font used by long form}
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-long}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvemfont{##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.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13302,17 +14892,31 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-em-long-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-long-desc}%
-}%
-{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortlongdescname},
+ sort={\glsxtrshortlongdescsort},
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}%
+ }%
% \end{macrocode}
-% Mostly as short-long-desc style:
+% Unset the \catattr{regular} attribute if it has been set.
% \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}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-em-long}%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13327,19 +14931,19 @@ Dickimaw Books\\
%doesn't set the style.
% \begin{macrocode}
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
sort={\the\glsshorttok},
description={\protect\glslongemfont{\the\glslongtok}},%
- first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstlongfont{\the\glslongtok})},%
- firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
+ \glsxtrparen{\protect\glsfirstlongemfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstlongfont{\the\glslongpltok})},%
+ \glsxtrparen{\protect\glsfirstlongemfont{\the\glslongpltok}}},%
% \end{macrocode}
%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
% \begin{macrocode}
- plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
% \end{macrocode}
% Unset the \catattr{regular} attribute if it has been set.
% \begin{macrocode}
@@ -13352,15 +14956,37 @@ Dickimaw Books\\
}%
}%
{%
-% \end{macrocode}
-% In case the user wants to mix and match font styles, these are
-% redefined here.
-% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-long}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+% \end{macrocode}
+% The first use full form and the inline full form are the same for
+% this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongemfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongemfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongemfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongemfont{\glsaccesslongpl{##1}}}%
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13370,18 +14996,31 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-em-long-em-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-long-desc}%
-}%
-{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortlongdescname},%
+ sort={\glsxtrshortlongdescsort},%
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongemfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongemfont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}%
+ }%
% \end{macrocode}
-% In case the user wants to mix and match font styles, these are
-% redefined here.
+% Unset the \catattr{regular} attribute if it has been set.
% \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}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-em-long-em}%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13391,15 +15030,71 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-em}%
{%
- \GlsXtrUseAbbrStyleSetup{short-nolong}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}},
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}},
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}},
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
-% \end{macrocode}
-% Mostly as short style:
-% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-nolong}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##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.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \protect\glsfirstabbrvemfont{\glsaccessshort{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \protect\glsfirstabbrvemfont{\glsaccessshort{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslongpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form only displays the short form, but it
+% typically won't be used as the \catattr{regular} attribute is set by this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13415,15 +15110,67 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-em-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-nolong-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortdescname},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}},
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}},
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}},
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
-% \end{macrocode}
-% Mostly as short style:
-% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-nolong-desc}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##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.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form only displays the short form, but it
+% typically won't be used as the \catattr{regular} attribute is set by this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13442,15 +15189,88 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{long-noshort-em}%
{%
- \GlsXtrUseAbbrStyleSetup{long-noshort}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}},
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}},
+ text={\protect\glslongdefaultfont{\the\glslongtok}},
+ plural={\protect\glslongdefaultfont{\the\glslongpltok}},%
+ description={\the\glslongtok}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
-% \end{macrocode}
-% Mostly as \abbrstyle{long-noshort} style:
-% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long-noshort}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+% \end{macrocode}
+% The format for subsequent use (not used when the regular attribute
+% is set).
+% \begin{macrocode}
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+% \end{macrocode}
+% The inline full form displays the long format followed by the
+% short form in parentheses.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form only displays the long form, but it
+% typically won't be used as the \catattr{regular} attribute is set by this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13469,26 +15289,111 @@ Dickimaw Books\\
\newabbreviationstyle{long-em-noshort-em}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
sort={\the\glsshorttok},
- first={\protect\glsfirstlongfont{\the\glslongtok}},
- firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},
- text={\the\glslongtok},
- plural={\the\glslongpltok},%
+ first={\protect\glsfirstlongemfont{\the\glslongtok}},
+ firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}},
+ text={\protect\glslongemfont{\the\glslongtok}},
+ plural={\protect\glslongemfont{\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*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+% \end{macrocode}
+% The format for subsequent use (not used when the regular attribute
+% is set).
+% \begin{macrocode}
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongemfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongemfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+% \end{macrocode}
+% The inline full form displays the long format followed by the
+% short form in parentheses.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongemfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongemfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form only displays the long form, but it
+% typically won't be used as the \catattr{regular} attribute is set by this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{abbrvstyle}{long-em-noshort-em-noreg}
+%\changes{1.17}{2017-08-09}{new}
+% Like long-em-noshort-em but doesn't set the \catattr{regular} attribute.
+% \begin{macrocode}
+\newabbreviationstyle{long-em-noshort-em-noreg}%
+{%
+ \GlsXtrUseAbbrStyleSetup{long-em-noshort-em}%
+% \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}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-em-noshort-em}%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13505,12 +15410,75 @@ Dickimaw Books\\
\GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
}%
{%
-% \end{macrocode}
-% Mostly as long style:
-% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+% \end{macrocode}
+% The format for subsequent use (not used when the regular attribute
+% is set).
+% \begin{macrocode}
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+% \end{macrocode}
+% The inline full form displays the long format followed by the
+% short form in parentheses.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form only displays the long form, but it
+% typically won't be used as the \catattr{regular} attribute is set by this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13528,17 +15496,111 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{long-em-noshort-em-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\protect\glslongemfont{\the\glslongtok}},
+ sort={\the\glslongtok},
+ first={\protect\glsfirstlongemfont{\the\glslongtok}},
+ firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}},
+ text={\glslongemfont{\the\glslongtok}},
+ plural={\glslongemfont{\the\glslongpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
-% \end{macrocode}
-% Mostly as long style:
-% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+% \end{macrocode}
+% The format for subsequent use (not used when the regular attribute
+% is set).
+% \begin{macrocode}
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongemfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongemfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+% \end{macrocode}
+% The inline full form displays the long format followed by the
+% short form in parentheses.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongemfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongemfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form only displays the long form, but it
+% typically won't be used as the \catattr{regular} attribute is set by this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{abbrvstyle}{long-em-noshort-em-desc-noreg}
+%\changes{1.17}{2017-08-09}{new}
+% Like long-em-noshort-em-desc but doesn't set the \catattr{regular} attribute.
+% \begin{macrocode}
+\newabbreviationstyle{long-em-noshort-em-desc-noreg}%
+{%
+ \GlsXtrUseAbbrStyleSetup{long-em-noshort-em-desc}%
+% \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}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-em-noshort-em-desc}%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13549,15 +15611,89 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-em-footnote}%
{%
- \GlsXtrUseAbbrStyleSetup{short-footnote}%
-}%
-{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
% \end{macrocode}
-% Mostly as long style:
+% Switch off hyperlinks on first use to prevent nested hyperlinks,
+% and unset the \catattr{regular} attribute if it has been set.
+%\changes{0.5.1}{2015-12-07}{switch off regular attribute if set}
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-footnote}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
+% \end{macrocode}
+% The full format displays the short form followed by the long form
+% as a footnote.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form and the inline full form use the short
+% (long) style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13574,15 +15710,95 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-em-postfootnote}%
{%
- \GlsXtrUseAbbrStyleSetup{short-postfootnote}%
-}%
-{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}},%
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
+% \end{macrocode}
+% Make this category insert a footnote after the link if this was
+% the first use, and
+% unset the \catattr{regular} attribute if it has been set.
+% \begin{macrocode}
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+% \end{macrocode}
+% Needs the specific font command here as the style may have been
+% lost by the time the footnote occurs.
+% \begin{macrocode}
+ \glsxtrdopostpunc{\protect\glsxtrabbrvfootnote{\glslabel}%
+ {\glsfirstlongfootnotefont{\glsentrylong{\glslabel}}}}%
+ }%
+ {}%
+ }%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
% \end{macrocode}
-% Mostly as long style:
+% The footnote needs to be suppressed in the inline form, so
+% \cs{glsxtrfull} must set the first use switch off.
% \begin{macrocode}
- \GlsXtrUseAbbrStyleFmts{short-postfootnote}%
+ \renewcommand*{\glsxtrsetupfulldefs}{%
+ \let\glsxtrifwasfirstuse\@secondoftwo
+ }%
+}%
+{%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
+% \end{macrocode}
+% The full format displays the short form. The long form is
+% deferred.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+% \end{macrocode}
+% The first use full form and the inline full form use the short
+% (long) style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
}
% \end{macrocode}
%\end{abbrvstyle}
@@ -13617,13 +15833,15 @@ Dickimaw Books\\
{
\newcommand*{\glsxtruserparen}[2]{%
\glsxtrfullsep{#2}%
- (#1\ifglshasfield{\glsxtruserfield}{#2}{, \glscurrentfieldvalue}{})%
+ \glsxtrparen
+ {#1\ifglshasfield{\glsxtruserfield}{#2}{, \glscurrentfieldvalue}{}}%
}
}
{
\newcommand*{\glsxtruserparen}[2]{%
\glsxtrfullsep{#2}%
- (#1\ifglshasfield{\glsxtruserfield}{#2}{, \@glo@thisvalue}{})%
+ \glsxtrparen
+ {#1\ifglshasfield{\glsxtruserfield}{#2}{, \@glo@thisvalue}{}}%
}
}
% \end{macrocode}
@@ -13631,8 +15849,9 @@ Dickimaw Books\\
% Font used for short form:
%\begin{macro}{\glsabbrvuserfont}
%\changes{1.04}{2016-05-02}{new}
+%\changes{1.17}{2017-08-09}{initialised to default font}
% \begin{macrocode}
-\newcommand*{\glsabbrvuserfont}[1]{#1}
+\newcommand*{\glsabbrvuserfont}[1]{\glsabbrvdefaultfont{#1}}
% \end{macrocode}
%\end{macro}
% Font used for short form on first use:
@@ -13645,8 +15864,9 @@ Dickimaw Books\\
% Font used for long form:
%\begin{macro}{\glslonguserfont}
%\changes{1.04}{2016-05-02}{new}
+%\changes{1.17}{2017-08-09}{initialised to default font}
% \begin{macrocode}
-\newcommand*{\glslonguserfont}[1]{#1}
+\newcommand*{\glslonguserfont}[1]{\glslongdefaultfont{#1}}
% \end{macrocode}
%\end{macro}
% Font used for long form on first use:
@@ -13669,21 +15889,19 @@ Dickimaw Books\\
% \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}},
+ name={\protect\glsabbrvuserfont{\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}},%
+ first={\protect\glsfirstlonguserfont{\the\glslongtok}%
+ \protect\glsxtruserparen{\protect\glsfirstabbrvuserfont{\the\glsshorttok}}%
+ {\the\glslabeltok}},%
+ firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}%
+ \protect\glsxtruserparen
+ {\protect\glsfirstabbrvuserfont{\the\glsshortpltok}}{\the\glslabeltok}},%
% \end{macrocode}
%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
% \begin{macrocode}
- plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
+ plural={\protect\glsabbrvuserfont{\the\glsshortpltok}},%
description={\protect\glslonguserfont{\the\glslongtok}}}%
% \end{macrocode}
% Unset the \catattr{regular} attribute if it has been set.
@@ -13711,24 +15929,24 @@ Dickimaw Books\\
% this style.
% \begin{macrocode}
\renewcommand*{\glsxtrfullformat}[2]{%
- \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshort{##1}}}{##1}%
}%
\renewcommand*{\glsxtrfullplformat}[2]{%
- \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshortpl{##1}}}{##1}%
}%
\renewcommand*{\Glsxtrfullformat}[2]{%
- \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshort{##1}}}{##1}%
}%
\renewcommand*{\Glsxtrfullplformat}[2]{%
- \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshortpl{##1}}}{##1}%
}%
}
% \end{macrocode}
@@ -13742,14 +15960,14 @@ Dickimaw Books\\
\newabbreviationstyle{long-postshort-user}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\protect\glsabbrvuserfont{\the\glsshorttok}},
sort={\the\glsshorttok},
- first={\protect\glsfirstlongfont{\the\glslongtok}},%
- firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
+ first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
% \end{macrocode}
%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
% \begin{macrocode}
- plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
+ plural={\protect\glsabbrvuserfont{\the\glsshortpltok}},%
description={\protect\glslonguserfont{\the\glslongtok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\csdef{glsxtrpostlink\glscategorylabel}{%
@@ -13782,43 +16000,43 @@ Dickimaw Books\\
%First use full form:
% \begin{macrocode}
\renewcommand*{\glsxtrfullformat}[2]{%
- \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
}%
\renewcommand*{\glsxtrfullplformat}[2]{%
- \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
}%
\renewcommand*{\Glsxtrfullformat}[2]{%
- \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
}%
\renewcommand*{\Glsxtrfullplformat}[2]{%
- \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
}%
% \end{macrocode}
% In-line format:
% \begin{macrocode}
\renewcommand*{\glsxtrinlinefullformat}[2]{%
- \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshort{##1}}}{##1}%
}%
\renewcommand*{\glsxtrinlinefullplformat}[2]{%
- \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshortpl{##1}}}{##1}%
}%
\renewcommand*{\Glsxtrinlinefullformat}[2]{%
- \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshort{##1}}}{##1}%
}%
\renewcommand*{\Glsxtrinlinefullplformat}[2]{%
- \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshortpl{##1}}}{##1}%
}%
}
% \end{macrocode}
@@ -13832,16 +16050,18 @@ Dickimaw Books\\
\newabbreviationstyle{long-postshort-user-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsfirstlongfont{\the\glslongtok}%
+ name={\protect\glslonguserfont{\the\glslongtok}%
\protect\glsxtruserparen
- {\protect\glsabbrvfont{\the\glsshorttok}}{\the\glslabeltok}},
+ {\protect\glsabbrvuserfont{\the\glsshorttok}}{\the\glslabeltok}},
sort={\the\glslongtok},
- first={\protect\glsfirstlongfont{\the\glslongtok}},%
- firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
+ first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
% \end{macrocode}
%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
% \begin{macrocode}
- plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
+ text={\protect\glsabbrvuserfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvuserfont{\the\glsshortpltok}}%
+ }%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\csdef{glsxtrpostlink\glscategorylabel}{%
\glsxtrifwasfirstuse
@@ -13873,21 +16093,21 @@ Dickimaw Books\\
\newabbreviationstyle{short-postlong-user}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\protect\glsabbrvuserfont{\the\glsshorttok}},
sort={\the\glsshorttok},
- first={\protect\glsfirstlongfont{\the\glslongtok}},%
- firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
+ first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
% \end{macrocode}
%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
% \begin{macrocode}
- plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
+ plural={\protect\glsabbrvuserfont{\the\glsshortpltok}},%
description={\protect\glslonguserfont{\the\glslongtok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\csdef{glsxtrpostlink\glscategorylabel}{%
\glsxtrifwasfirstuse
{%
\glsxtruserparen
- {\glsfirstabbrvuserfont{\glsentrylong{\glslabel}}}%
+ {\glsfirstlonguserfont{\glsentrylong{\glslabel}}}%
{\glslabel}%
}%
{}%
@@ -13913,43 +16133,43 @@ Dickimaw Books\\
%First use full form:
% \begin{macrocode}
\renewcommand*{\glsxtrfullformat}[2]{%
- \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
}%
\renewcommand*{\glsxtrfullplformat}[2]{%
- \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
}%
\renewcommand*{\Glsxtrfullformat}[2]{%
- \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
}%
\renewcommand*{\Glsxtrfullplformat}[2]{%
- \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
}%
% \end{macrocode}
% In-line format:
% \begin{macrocode}
\renewcommand*{\glsxtrinlinefullformat}[2]{%
- \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslong{##1}}}{##1}%
}%
\renewcommand*{\glsxtrinlinefullplformat}[2]{%
- \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslongpl{##1}}}{##1}%
}%
\renewcommand*{\Glsxtrinlinefullformat}[2]{%
- \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslong{##1}}}{##1}%
}%
\renewcommand*{\Glsxtrinlinefullplformat}[2]{%
- \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslongpl{##1}}}{##1}%
}%
}
% \end{macrocode}
@@ -13963,23 +16183,25 @@ Dickimaw Books\\
\newabbreviationstyle{short-postlong-user-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}%
+ name={\protect\glsabbrvuserfont{\the\glsshorttok}%
\protect\glsxtruserparen
- {\protect\glsfirstlongfont{\the\glslongpltok}}%
+ {\protect\glslonguserfont{\the\glslongpltok}}%
{\the\glslabeltok}},
sort={\the\glsshorttok},
- first={\protect\glsfirstlongfont{\the\glslongtok}},%
- firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
+ first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
% \end{macrocode}
%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
% \begin{macrocode}
- plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
+ text={\protect\glsabbrvuserfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvuserfont{\the\glsshortpltok}}%
+ }%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\csdef{glsxtrpostlink\glscategorylabel}{%
\glsxtrifwasfirstuse
{%
\glsxtruserparen
- {\glsfirstabbrvuserfont{\glsentrylong{\glslabel}}}%
+ {\glsfirstlonguserfont{\glsentrylong{\glslabel}}}%
{\glslabel}%
}%
{}%
@@ -14002,7 +16224,31 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{long-short-user-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrlongshortdescname},
+ sort={\glsxtrlongshortdescsort},%
+% \end{macrocode}
+%\changes{1.17}{2017-08-09}{corrected first forms}
+% \begin{macrocode}
+ first={\protect\glsfirstlonguserfont{\the\glslongtok}%
+ \protect\glsxtruserparen{\protect\glsfirstabbrvuserfont{\the\glsshorttok}}%
+ {\the\glslabeltok}},%
+ firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}%
+ \protect\glsxtruserparen
+ {\protect\glsfirstabbrvuserfont{\the\glsshortpltok}}{\the\glslabeltok}},%
+ text={\protect\glsabbrvfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvfont{\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}%
+ }%
+ {}%
+ }%
}%
{%
\GlsXtrUseAbbrStyleFmts{long-short-user}%
@@ -14020,17 +16266,19 @@ Dickimaw Books\\
%doesn't set the style.
% \begin{macrocode}
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\protect\glsabbrvuserfont{\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}},%
+ first={\protect\glsfirstabbrvuserfont{\the\glsshorttok}%
+ \protect\glsxtruserparen{\protect\glsfirstlonguserfont{\the\glslongtok}}%
+ {\the\glslabeltok}},%
+ firstplural={\protect\glsfirstabbrvuserfont{\the\glsshortpltok}%
+ \protect\glsxtruserparen{\protect\glsfirstlonguserfont{\the\glslongpltok}}%
+ {\the\glslabeltok}},%
% \end{macrocode}
%\changes{1.15}{2017-05-10}{fixed spelling of \cs{glsabbrvfont}}
% \begin{macrocode}
- plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
+ plural={\protect\glsabbrvuserfont{\the\glsshortpltok}}}%
% \end{macrocode}
% Unset the \catattr{regular} attribute if it has been set.
% \begin{macrocode}
@@ -14057,24 +16305,24 @@ Dickimaw Books\\
% this style.
% \begin{macrocode}
\renewcommand*{\glsxtrfullformat}[2]{%
- \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslong{##1}}}{##1}%
}%
\renewcommand*{\glsxtrfullplformat}[2]{%
- \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslongpl{##1}}}{##1}%
}%
\renewcommand*{\Glsxtrfullformat}[2]{%
- \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslong{##1}}}{##1}%
}%
\renewcommand*{\Glsxtrfullplformat}[2]{%
- \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslongpl{##1}}}{##1}%
}%
}
% \end{macrocode}
@@ -14085,7 +16333,31 @@ Dickimaw Books\\
% \begin{macrocode}
\newabbreviationstyle{short-long-user-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-long-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortlongdescname},
+ sort={\glsxtrshortlongdescsort},%
+% \end{macrocode}
+%\changes{1.17}{2017-08-09}{corrected first forms}
+% \begin{macrocode}
+ first={\protect\glsfirstabbrvuserfont{\the\glsshorttok}%
+ \protect\glsxtruserparen{\protect\glsfirstlonguserfont{\the\glslongtok}}%
+ {\the\glslabeltok}},%
+ firstplural={\protect\glsfirstabbrvuserfont{\the\glsshortpltok}%
+ \protect\glsxtruserparen{\protect\glsfirstlonguserfont{\the\glslongpltok}}%
+ {\the\glslabeltok}},%
+ text={\protect\glsabbrvfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvfont{\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}%
+ }%
+ {}%
+ }%
}%
{%
\GlsXtrUseAbbrStyleFmts{short-long-user}%
@@ -14093,6 +16365,1026 @@ Dickimaw Books\\
% \end{macrocode}
%\end{abbrvstyle}
%
+%\subsection{Predefined Styles (Hyphen)}
+%These styles are designed to work with the \catattr{markwords}
+%attribute. They check if the inserted material (provided by the final
+%optional argument of commands like \cs{gls}) starts with a hyphen.
+%If it does, the insert is added to the parenthetical material.
+%Note that commands like \cs{glsxtrlong} set \cs{glsinsert} to empty
+%with the entire link-text stored in \cs{glscustomtext}.
+%
+%\begin{macro}{\glsxtrifhyphenstart}
+%Checks if the argument starts with a hyphen. The argument may be
+%\cs{glsinsert} so check for that and expand.
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newrobustcmd*{\glsxtrifhyphenstart}[3]{%
+ \ifx\glsinsert#1\relax
+ \expandafter\@glsxtrifhyphenstart#1\relax\relax
+ \@end@glsxtrifhyphenstart{#2}{#3}%
+ \else
+ \@glsxtrifhyphenstart#1\relax\relax\@end@glsxtrifhyphenstart{#2}{#3}%
+ \fi
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\@glsxtrifhyphenstart}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\def\@glsxtrifhyphenstart#1#2\@end@glsxtrifhyphenstart#3#4{%
+ \ifx-#1\relax#3\else #4\fi
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtrlonghyphenshort}
+%\changes{1.17}{2017-08-09}{new}
+%\begin{definition}
+%\cs{glsxtrlonghyphenshort}\marg{label}\marg{long}\marg{short}\marg{insert}
+%\end{definition}
+%The \meta{long} and \meta{short} arguments may be the plural form.
+%The \meta{long} argument may also be the first letter uppercase form.
+% \begin{macrocode}
+\newcommand*{\glsxtrlonghyphenshort}[4]{%
+% \end{macrocode}
+% Grouping is needed to localise the redefinitions.
+% \begin{macrocode}
+ {%
+% \end{macrocode}
+% If \meta{insert} starts with a hyphen, redefine \ics{glsxtrwordsep}
+% to a hyphen. The inserted material is also inserted into the
+% parenthetical part. (The inserted material is grouped as a
+% precautionary measure.) No change is made to \cs{glsxtrwordsep} if
+% \meta{insert} doesn't start with a hyphen.
+% \begin{macrocode}
+ \glsxtrifhyphenstart{#4}{\def\glsxtrwordsep{-}}{}%
+ \glsfirstlonghyphenfont{#2\ifglsxtrinsertinside{#4}\fi}%
+ \ifglsxtrinsertinside\else{#4}\fi
+ \glsxtrfullsep{#1}%
+ \glsxtrparen{\glsfirstabbrvhyphenfont{#3\ifglsxtrinsertinside{#4}\fi}%
+ \ifglsxtrinsertinside\else{#4}\fi}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsabbrvhyphenfont}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsabbrvhyphenfont}{\glsabbrvdefaultfont}%
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\glsfirstabbrvhyphenfont}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsfirstabbrvhyphenfont}{\glsabbrvhyphenfont}%
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\glslonghyphenfont}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glslonghyphenfont}{\glslongdefaultfont}%
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\glsfirstlonghyphenfont}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsfirstlonghyphenfont}{\glslonghyphenfont}%
+% \end{macrocode}
+%\end{macro}
+% The default short form suffix:
+%\begin{macro}{\glsxtrhyphensuffix}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtrhyphensuffix}{\glsxtrabbrvpluralsuffix}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{abbrvstyle}{long-hyphen-short-hyphen}
+%\changes{1.17}{2017-08-09}{new}
+%Designed for use with the \catattr{markwords} attribute.
+% \begin{macrocode}
+\newabbreviationstyle{long-hyphen-short-hyphen}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlonghyphenfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}}},%
+ plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}},%
+ description={\protect\glslonghyphenfont{\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}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrhyphensuffix}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvhyphenfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvhyphenfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonghyphenfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslonghyphenfont{##1}}%
+% \end{macrocode}
+% The first use full form and the inline full form are the same for
+% this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsxtrlonghyphenshort{##1}{\glsaccesslong{##1}}{\glsaccessshort{##1}}{##2}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsxtrlonghyphenshort{##1}{\glsaccesslongpl{##1}}%
+ {\glsaccessshortpl{##1}}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsxtrlonghyphenshort{##1}{\Glsaccesslong{##1}}{\glsaccessshort{##1}}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsxtrlonghyphenshort{##1}{\Glsaccesslongpl{##1}}%
+ {\glsaccessshortpl{##1}}{##2}%
+ }%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{abbrvstyle}{long-hyphen-short-hyphen-desc}
+%\changes{1.17}{2017-08-09}{new}
+%Like \abbrstyle{long-hyphen-short-hyphen} but the description
+%must be supplied by the user.
+% \begin{macrocode}
+\newabbreviationstyle{long-hyphen-short-hyphen-desc}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrlongshortdescname},
+ sort={\glsxtrlongshortdescsort},
+ first={\protect\glsfirstlonghyphenfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}}},%
+ text={\protect\glsabbrvhyphenfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvhyphenfont{\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}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-hyphen-short-hyphen}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{macro}{\glsxtrlonghyphennoshort}
+%\changes{1.17}{2017-08-09}{new}
+%\begin{definition}
+%\cs{glsxtrlonghyphennoshort}\marg{label}\marg{long}\marg{insert}
+%\end{definition}
+% \begin{macrocode}
+\newcommand*{\glsxtrlonghyphennoshort}[3]{%
+% \end{macrocode}
+% Grouping is needed to localise the redefinitions.
+% \begin{macrocode}
+ {%
+% \end{macrocode}
+% If \meta{insert} starts with a hyphen, redefine \ics{glsxtrwordsep}
+% to a hyphen. The inserted material is also inserted into the
+% parenthetical part. (The inserted material is grouped as a
+% precautionary measure.) No change is made to \cs{glsxtrwordsep} if
+% \meta{insert} doesn't start with a hyphen.
+% \begin{macrocode}
+ \glsxtrifhyphenstart{#3}{\def\glsxtrwordsep{-}}{}%
+ \glsfirstlonghyphenfont{#2\ifglsxtrinsertinside{#3}\fi}%
+ \ifglsxtrinsertinside\else{#3}\fi
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{abbrvstyle}{long-hyphen-noshort-desc-noreg}
+%\changes{1.17}{2017-08-09}{new}
+%This version doesn't show the short form (except
+%explicitly with \cs{glsxtrshort}). Since \cs{glsxtrshort} doesn't
+%support the hyphen switch, the short form just uses the default
+%short-form font command. This style won't work with the
+%\catattr{regular} as the regular form isn't flexible enough.
+% \begin{macrocode}
+\newabbreviationstyle{long-hyphen-noshort-desc-noreg}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\protect\glslonghyphenfont{\the\glslongtok}},
+ sort={\expandonce\glsxtrorglong},
+ first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
+ plural={\protect\glslonghyphenfont{\the\glslongpltok}}%
+ }%
+% \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}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-hyphen-short-hyphen}%
+% \end{macrocode}
+% In case the user wants to mix and match font styles, these are
+% redefined here.
+% \begin{macrocode}
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrabbrvpluralsuffix}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonghyphenfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslonghyphenfont{##1}}%
+% \end{macrocode}
+% The format for subsequent use (not used when the regular attribute
+% is set).
+% \begin{macrocode}
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\glsaccesslong{##1}}{##2}%
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\glsaccesslongpl{##1}}{##2}%
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\Glsaccesslong{##1}}{##2}%
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\Glsaccesslongpl{##1}}{##2}%
+ }%
+% \end{macrocode}
+% The inline full form displays the long format followed by the
+% short form in parentheses.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\glsaccesslong{##1}}{##2}%
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\glsaccesslongpl{##1}}{##2}%
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\Glsaccesslong{##1}}{##2}%
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\Glsaccesslongpl{##1}}{##2}%
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
+ }%
+% \end{macrocode}
+% The first use full form only displays the long form.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\glsaccesslong{##1}}{##2}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\glsaccesslongpl{##1}}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\Glsaccesslong{##1}}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\Glsaccesslongpl{##1}}{##2}%
+ }%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{abbrvstyle}{long-hyphen-noshort-noreg}
+% It doesn't really make a great deal of sense to have a long-only
+% style that doesn't have a descriptionnless no glossary is
+% required), but the best course of
+% action here is to use the short form as the name and the long
+% form as the description.
+% \begin{macrocode}
+\newabbreviationstyle{long-hyphen-noshort-noreg}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
+ text={\protect\glslonghyphenfont{\the\glslongtok}},%
+ plural={\protect\glslonghyphenfont{\the\glslongpltok}},%
+ description={\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}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-desc}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{macro}{\glsxtrlonghyphen}
+%\changes{1.17}{2017-08-09}{new}
+%\begin{definition}
+%\cs{glsxtrlonghyphen}\marg{long}\marg{label}\marg{insert}
+%\end{definition}
+%Used by \abbrstyle{long-hyphen-postshort-hyphen}. The \meta{insert}
+%is check to determine if it starts with a hyphen but isn't used
+%here as it's moved to the post-link hook.
+% \begin{macrocode}
+\newcommand*{\glsxtrlonghyphen}[3]{%
+% \end{macrocode}
+% Grouping is needed to localise the redefinitions.
+% \begin{macrocode}
+ {%
+ \glsxtrifhyphenstart{#3}{\def\glsxtrwordsep{-}}{}%
+ \glsfirstlonghyphenfont{#1}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtrposthyphenshort}
+%\changes{1.17}{2017-08-09}{new}
+%\begin{definition}
+%\cs{glsxtrposthyphenshort}\marg{label}\marg{insert}
+%\end{definition}
+%Used in the post-link hook for the
+%\abbrstyle{long-hyphen-postshort-hyphen} style. Much like
+%\cs{glsxtrlonghyphenshort} but omits the \meta{long} part. This
+%always uses the singular short form.
+% \begin{macrocode}
+\newcommand*{\glsxtrposthyphenshort}[2]{%
+ {%
+ \glsxtrifhyphenstart{#2}{\def\glsxtrwordsep{-}}{}%
+ \ifglsxtrinsertinside{\glsfirstlonghyphenfont{#2}}\else{#2}\fi
+ \glsxtrfullsep{#1}%
+ \glsxtrparen
+ {\glsfirstabbrvhyphenfont{\glsentryshort{#1}\ifglsxtrinsertinside{#2}\fi}%
+ \ifglsxtrinsertinside\else{#2}\fi
+ }%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtrposthyphensubsequent}
+%\changes{1.17}{2017-08-09}{new}
+%\begin{definition}
+%\cs{glsxtrposthyphensubsequent}\marg{label}\marg{insert}
+%\end{definition}
+%Format in the post-link hook for subsequent use. The label is
+%ignored by default.
+% \begin{macrocode}
+\newcommand*{\glsxtrposthyphensubsequent}[2]{%
+ \glsabbrvfont{\ifglsxtrinsertinside {#2}\fi}%
+ \ifglsxtrinsertinside \else{#2}\fi
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{abbrvstyle}{long-hyphen-postshort-hyphen}
+%\changes{1.17}{2017-08-09}{new}
+%Like \abbrstyle{long-hyphen-short-hyphen} but shifts the insert
+%and parenthetical material to the post-link hook.
+% \begin{macrocode}
+\newabbreviationstyle{long-hyphen-postshort-hyphen}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
+ plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}},%
+ description={\protect\glslonghyphenfont{\the\glslongtok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+ \glsxtrposthyphenshort{\glslabel}{\glsinsert}%
+ }%
+ {%
+% \end{macrocode}
+% Put the insertion into the post-link:
+% \begin{macrocode}
+ \glsxtrposthyphensubsequent{\glslabel}{\glsinsert}%
+ }%
+ }%
+ \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}{\glsxtrabbrvpluralsuffix}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvhyphenfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvhyphenfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonghyphenfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslonghyphenfont{##1}}%
+% \end{macrocode}
+% Subsequent use needs to omit the insertion:
+% \begin{macrocode}
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glsabbrvfont{\glsaccessshort{##1}}%
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glsabbrvfont{\glsaccessshortpl{##1}}%
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glsabbrvfont{\Glsaccessshort{##1}}%
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glsabbrvfont{\Glsaccessshortpl{##1}}%
+ }%
+% \end{macrocode}
+% First use full form:
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsxtrlonghyphen{\glsaccesslong{##1}}{##1}{##2}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsxtrlonghyphen{\glsaccesslongpl{##1}}{##1}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsxtrlonghyphen{\Glsaccesslong{##1}}{##1}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsxtrlonghyphen{\Glsaccesslongpl{##1}}{##1}{##2}%
+ }%
+% \end{macrocode}
+% In-line format.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlonghyphenfont{\glsaccesslong{##1}%
+ \ifglsxtrinsertinside{##2}\fi}%
+ \ifglsxtrinsertinside \else{##2}\fi
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlonghyphenfont{\glsaccesslongpl{##1}%
+ \ifglsxtrinsertinside{##2}\fi}%
+ \ifglsxtrinsertinside \else{##2}\fi
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlonghyphenfont{\Glsaccesslong{##1}%
+ \ifglsxtrinsertinside{##2}\fi}%
+ \ifglsxtrinsertinside \else{##2}\fi
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlonghyphenfont{\Glsaccesslongpl{##1}%
+ \ifglsxtrinsertinside{##2}\fi}%
+ \ifglsxtrinsertinside \else{##2}\fi
+ }%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{abbrvstyle}{long-hyphen-postshort-hyphen-desc}
+%\changes{1.17}{2017-08-09}{new}
+%Like \abbrstyle{long-hyphen-postshort-hyphen} but the description
+%must be supplied by the user.
+% \begin{macrocode}
+\newabbreviationstyle{long-hyphen-postshort-hyphen-desc}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrlongshortdescname},
+ sort={\glsxtrlongshortdescsort},%
+ first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
+ text={\protect\glsabbrvhyphenfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+ \glsxtrposthyphenshort{\glslabel}{\glsinsert}%
+ }%
+ {%
+% \end{macrocode}
+% Put the insertion into the post-link:
+% \begin{macrocode}
+ \glsxtrposthyphensubsequent{\glslabel}{\glsinsert}%
+ }%
+ }%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-hyphen-postshort-hyphen}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{macro}{\glsxtrshorthyphenlong}
+%\changes{1.17}{2017-08-09}{new}
+%\begin{definition}
+%\cs{glsxtrshorthyphenlong}\marg{label}\marg{short}\marg{long}\marg{insert}
+%\end{definition}
+%The \meta{long} and \meta{short} arguments may be the plural form.
+%The \meta{long} argument may also be the first letter uppercase form.
+% \begin{macrocode}
+\newcommand*{\glsxtrshorthyphenlong}[4]{%
+% \end{macrocode}
+% Grouping is needed to localise the redefinitions.
+% \begin{macrocode}
+ {%
+% \end{macrocode}
+% If \meta{insert} starts with a hyphen, redefine \cs{glsxtrwordsep}
+% to a hyphen. The inserted material is also inserted into the
+% parenthetical part. (The inserted material is grouped as a
+% precautionary measure.)
+% \begin{macrocode}
+ \glsxtrifhyphenstart{#4}{\def\glsxtrwordsep{-}}{}%
+ \glsfirstabbrvhyphenfont{#2\ifglsxtrinsertinside{#4}\fi}%
+ \ifglsxtrinsertinside\else{#4}\fi
+ \glsxtrfullsep{#1}%
+ \glsxtrparen{\glsfirstlonghyphenfont{#3\ifglsxtrinsertinside{#4}\fi}%
+ \ifglsxtrinsertinside\else{#4}\fi}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{abbrvstyle}{short-hyphen-long-hyphen}
+%\changes{1.17}{2017-08-09}{new}
+%Designed for use with the \catattr{markwords} attribute.
+% \begin{macrocode}
+\newabbreviationstyle{short-hyphen-long-hyphen}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlonghyphenfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlonghyphenfont{\the\glslongpltok}}},%
+ plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}},%
+ description={\protect\glslonghyphenfont{\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}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrhyphensuffix}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvhyphenfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvhyphenfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonghyphenfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslonghyphenfont{##1}}%
+% \end{macrocode}
+% The first use full form and the inline full form are the same for
+% this style.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsxtrshorthyphenlong{##1}{\glsaccessshort{##1}}{\glsaccesslong{##1}}{##2}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsxtrshorthyphenlong{##1}%
+ {\glsaccessshortpl{##1}}{\glsaccesslongpl{##1}}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsxtrshorthyphenlong{##1}{\glsaccessshort{##1}}{\Glsaccesslong{##1}}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsxtrshorthyphenlong{##1}%
+ {\glsaccessshortpl{##1}}{\Glsaccesslongpl{##1}}{##2}%
+ }%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{abbrvstyle}{short-hyphen-long-hyphen-desc}
+%\changes{1.17}{2017-08-09}{new}
+%Like \abbrstyle{short-hyphen-long-hyphen} but the description
+%must be supplied by the user.
+% \begin{macrocode}
+\newabbreviationstyle{short-hyphen-long-hyphen-desc}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortlongdescname},
+ sort={\glsxtrshortlongdescsort},
+ first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlonghyphenfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlonghyphenfont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvhyphenfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvhyphenfont{\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}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-hyphen-long-hyphen}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{macro}{\glsxtrshorthyphen}
+%\changes{1.17}{2017-08-09}{new}
+%\begin{definition}
+%\cs{glsxtrshorthyphen}\marg{short}\marg{label}\marg{insert}
+%\end{definition}
+%Used by \abbrstyle{short-hyphen-postlong-hyphen}. The \meta{insert}
+%is check to determine if it starts with a hyphen but isn't used
+%here as it's moved to the post-link hook.
+% \begin{macrocode}
+\newcommand*{\glsxtrshorthyphen}[3]{%
+% \end{macrocode}
+% Grouping is needed to localise the redefinitions.
+% \begin{macrocode}
+ {%
+ \glsxtrifhyphenstart{#3}{\def\glsxtrwordsep{-}}{}%
+ \glsfirstabbrvhyphenfont{#1}%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtrposthyphenlong}
+%\changes{1.17}{2017-08-09}{new}
+%\begin{definition}
+%\cs{glsxtrposthyphenlong}\marg{label}\marg{insert}
+%\end{definition}
+%Used in the post-link hook for the
+%\abbrstyle{short-hyphen-postlong-hyphen} style. Much like
+%\cs{glsxtrshorthyphenlong} but omits the \meta{short} part. This
+%always uses the singular long form.
+% \begin{macrocode}
+\newcommand*{\glsxtrposthyphenlong}[2]{%
+ {%
+ \glsxtrifhyphenstart{#2}{\def\glsxtrwordsep{-}}{}%
+ \ifglsxtrinsertinside{\glsfirstabbrvhyphenfont{#2}}\else{#2}\fi
+ \glsxtrfullsep{#1}%
+ \glsxtrparen
+ {\glsfirstlonghyphenfont{\glsentrylong{#1}\ifglsxtrinsertinside{#2}\fi}%
+ \ifglsxtrinsertinside\else{#2}\fi
+ }%
+ }%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{abbrvstyle}{short-hyphen-postlong-hyphen}
+%\changes{1.17}{2017-08-09}{new}
+%Like \abbrstyle{short-hyphen-long-hyphen} but shifts the insert
+%and parenthetical material to the post-link hook.
+% \begin{macrocode}
+\newabbreviationstyle{short-hyphen-postlong-hyphen}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}},%
+ firstplural={\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}},%
+ plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}},%
+ description={\protect\glslonghyphenfont{\the\glslongtok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+ \glsxtrposthyphenlong{\glslabel}{\glsinsert}%
+ }%
+ {%
+% \end{macrocode}
+% Put the insertion into the post-link:
+% \begin{macrocode}
+ \glsxtrposthyphensubsequent{\glslabel}{\glsinsert}%
+ }%
+ }%
+ \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}{\glsxtrabbrvpluralsuffix}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvhyphenfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvhyphenfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonghyphenfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslonghyphenfont{##1}}%
+% \end{macrocode}
+% Subsequent use needs to omit the insertion:
+% \begin{macrocode}
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glsabbrvfont{\glsaccessshort{##1}}%
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glsabbrvfont{\glsaccessshortpl{##1}}%
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glsabbrvfont{\Glsaccessshort{##1}}%
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glsabbrvfont{\Glsaccessshortpl{##1}}%
+ }%
+% \end{macrocode}
+% First use full form:
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsxtrshorthyphen{\glsaccessshort{##1}}{##1}{##2}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsxtrshorthyphen{\glsaccessshortpl{##1}}{##1}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsxtrshorthyphen{\Glsaccessshort{##1}}{##1}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsxtrshorthyphen{\Glsaccessshortpl{##1}}{##1}{##2}%
+ }%
+% \end{macrocode}
+% In-line format. Commands like \cs{glsxtrfull} set \cs{glsinsert}
+% to empty. The entire link-text (provided by the following
+% commands) is stored in \cs{glscustomtext}.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvhyphenfont{\glsaccessshort{##1}%
+ \ifglsxtrinsertinside{##2}\fi}%
+ \ifglsxtrinsertinside \else{##2}\fi
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvhyphenfont{\glsaccessshortpl{##1}%
+ \ifglsxtrinsertinside{##2}\fi}%
+ \ifglsxtrinsertinside \else{##2}\fi
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvhyphenfont{\Glsaccessshort{##1}%
+ \ifglsxtrinsertinside{##2}\fi}%
+ \ifglsxtrinsertinside \else{##2}\fi
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvhyphenfont{\Glsaccessshortpl{##1}%
+ \ifglsxtrinsertinside{##2}\fi}%
+ \ifglsxtrinsertinside \else{##2}\fi
+ }%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{abbrvstyle}{short-hyphen-postlong-hyphen-desc}
+%\changes{1.17}{2017-08-09}{new}
+%Like \abbrstyle{short-hyphen-postlong-hyphen} but the description
+%must be supplied by the user.
+% \begin{macrocode}
+\newabbreviationstyle{short-hyphen-postlong-hyphen-desc}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortlongdescname},
+ sort={\glsxtrshortlongdescsort},%
+ first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}},%
+ firstplural={\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}},%
+ text={\protect\glsabbrvhyphenfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+ \glsxtrposthyphenlong{\glslabel}{\glsinsert}%
+ }%
+ {%
+% \end{macrocode}
+% Put the insertion into the post-link:
+% \begin{macrocode}
+ \glsxtrposthyphensubsequent{\glslabel}{\glsinsert}%
+ }%
+ }%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-hyphen-postlong-hyphen}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\subsection{Predefined Styles (No Short on First Use)}
+%These styles show only the long form on first use and only the
+%short form on subsequent use.
+%\begin{macro}{\glsabbrvonlyfont}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsabbrvonlyfont}{\glsabbrvdefaultfont}%
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\glsfirstabbrvonlyfont}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsfirstabbrvonlyfont}{\glsabbrvonlyfont}%
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\glslongonlyfont}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glslongonlyfont}{\glslongdefaultfont}%
+% \end{macrocode}
+%\end{macro}
+%\begin{macro}{\glsfirstlongonlyfont}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsfirstlongonlyfont}{\glslongonlyfont}%
+% \end{macrocode}
+%\end{macro}
+% The default short form suffix:
+%\begin{macro}{\glsxtronlysuffix}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtronlysuffix}{\glsxtrabbrvpluralsuffix}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{abbrvstyle}{long-only-short-only}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newabbreviationstyle{long-only-short-only}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvonlyfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongonlyfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlongonlyfont{\the\glslongpltok}},%
+ plural={\protect\glsabbrvonlyfont{\the\glsshortpltok}},%
+ description={\protect\glslongonlyfont{\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}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtronlysuffix}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvonlyfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvonlyfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongonlyfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongonlyfont{##1}}%
+% \end{macrocode}
+% The first use full form doesn't show the short form.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongonlyfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongonlyfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongonlyfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongonlyfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+% \end{macrocode}
+% The inline full form does show the short form.
+% \begin{macrocode}
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongonlyfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvonlyfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongonlyfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvonlyfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongonlyfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvonlyfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongonlyfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvonlyfont{\Glsaccessshortpl{##1}}}%
+ }%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
+%\begin{macro}{\glsxtronlydescsort}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtronlydescsort}{\the\glslongtok}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{macro}{\glsxtronlydescname}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newcommand*{\glsxtronlydescname}{%
+ \protect\glslongfont{\the\glslongtok}%
+}
+% \end{macrocode}
+%\end{macro}
+%
+%\begin{abbrvstyle}{long-only-short-only-desc}
+%\changes{1.17}{2017-08-09}{new}
+% \begin{macrocode}
+\newabbreviationstyle{long-only-short-only-desc}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtronlydescname},
+ sort={\glsxtronlydescsort},%
+ first={\protect\glsfirstlongonlyfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlongonlyfont{\the\glslongpltok}},%
+ text={\protect\glsabbrvonlyfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvonlyfont{\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}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-only-short-only}%
+}
+% \end{macrocode}
+%\end{abbrvstyle}
+%
%\section{Using Entries in Headings}
%
% There are four main problems with using entries in sectioning
@@ -15372,7 +18664,7 @@ Dickimaw Books\\
% First identify package:
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-extra-stylemods}[2017/06/15 v1.16 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2017/08/09 v1.17 (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 818c0c8bb9c..c1fffaf1d43 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 2017/6/15 12:28
+% glossaries-extra.ins generated using makedtx version 1.2 2017/8/9 16:08
\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 a9863bf49a8..e3b19f4f39d 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}[2017/06/15 v1.16 (NLCT)]
+\ProvidesPackage{glossaries-extra-stylemods}[2017/08/09 v1.17 (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 d6911ce06cc..c516340d069 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}[2017/06/15 v1.16 (NLCT)]
+\ProvidesPackage{glossaries-extra}[2017/08/09 v1.17 (NLCT)]
\RequirePackage{xkeyval}
\RequirePackage{etoolbox}
\@ifpackageloaded{glossaries}
@@ -352,6 +352,34 @@
\newcommand*{\newabbr}{\newabbreviation}%
\let\GlsXtrDefineAbbreviationShortcuts\relax
}
+\newcommand*{\GlsXtrDefineAcShortcuts}{%
+ \newcommand*{\ac}{\cgls}%
+ \newcommand*{\acp}{\cglspl}%
+ \newcommand*{\acs}{\glsxtrshort}%
+ \newcommand*{\acsp}{\glsxtrshortpl}%
+ \newcommand*{\acl}{\glsxtrlong}%
+ \newcommand*{\aclp}{\glsxtrlongpl}%
+ \newcommand*{\acf}{\glsxtrfull}%
+ \newcommand*{\acfp}{\glsxtrfullpl}%
+ \newcommand*{\Ac}{\cGls}%
+ \newcommand*{\Acp}{\cGlspl}%
+ \newcommand*{\Acs}{\Glsxtrshort}%
+ \newcommand*{\Acsp}{\Glsxtrshortpl}%
+ \newcommand*{\Acl}{\Glsxtrlong}%
+ \newcommand*{\Aclp}{\Glsxtrlongpl}%
+ \newcommand*{\Acf}{\Glsxtrfull}%
+ \newcommand*{\Acfp}{\Glsxtrfullpl}%
+ \newcommand*{\AC}{\cGLS}%
+ \newcommand*{\ACP}{\cGLSpl}%
+ \newcommand*{\ACS}{\GLSxtrshort}%
+ \newcommand*{\ACSP}{\GLSxtrshortpl}%
+ \newcommand*{\ACL}{\GLSxtrlong}%
+ \newcommand*{\ACLP}{\GLSxtrlongpl}%
+ \newcommand*{\ACF}{\GLSxtrfull}%
+ \newcommand*{\ACFP}{\GLSxtrfullpl}%
+ \newcommand*{\newabbr}{\newabbreviation}%
+ \let\GlsXtrDefineAcShortcuts\relax
+}
\newcommand*{\GlsXtrDefineOtherShortcuts}{%
\newcommand*{\newentry}{\newglossaryentry}%
\ifdef\printsymbols
@@ -367,7 +395,7 @@
\newcommand*{\@glsxtr@setupshortcuts}{}
\newcommand*{\@glsxtr@shortcutsval}{\ifglsacrshortcuts acro\else none\fi}%
\define@choicekey{glossaries-extra.sty}{shortcuts}[\val\nr]%
- {acronyms,acro,abbreviations,abbr,other,all,true,none,false}[true]{%
+ {acronyms,acro,abbreviations,abbr,other,all,true,none,false,ac}[true]{%
\let\@glsxtr@shortcutsval\val
\ifcase\nr\relax % acronyms
\renewcommand*{\@glsxtr@setupshortcuts}{%
@@ -405,8 +433,13 @@
\GlsXtrDefineAbbreviationShortcuts
\GlsXtrDefineOtherShortcuts
}%
- \else % none, false
+ \or % none, false
\renewcommand*{\@glsxtr@setupshortcuts}{}%
+ \or % ac
+ \renewcommand*{\@glsxtr@setupshortcuts}{%
+ \glsacrshortcutstrue
+ \GlsXtrDefineAcShortcuts
+ }%
\fi
}
\newcommand*{\@glsxtr@doaccsupp}{}
@@ -3406,7 +3439,8 @@
\@gls@noidxloclist@prev
}%
{%
- ??\glsdoifexists{#1}%
+ \glsxtrundeftag
+ \glsdoifexists{#1}%
{%
\GlossariesWarning{Missing location list for `#1'. Either
a rerun is required or you haven't referenced the entry.}%
@@ -3425,7 +3459,8 @@
\forlistloop{\glsnoidxnumberlistloophandler}{\@gls@loclist}%
}%
{%
- ??\glsdoifexists{#1}%
+ \glsxtrundeftag
+ \glsdoifexists{#1}%
{%
\GlossariesWarning{Missing location list for `##1'. Either
a rerun is required or you haven't referenced the entry.}%
@@ -3441,7 +3476,8 @@
\glsnoidxloclist{\@gls@loclist}%
}%
{%
- ??\glsdoifexists{#1}%
+ \glsxtrundeftag
+ \glsdoifexists{#1}%
{%
\GlossariesWarning{Missing location list for `#1'. Either
a rerun is required or you haven't referenced the entry.}%
@@ -5133,6 +5169,24 @@
\fi
\@glsxtr@insert@dots@next#1%
}
+\newcommand*{\glsxtrwordsep}{\space}
+\newcommand*{\glsxtrword}[1]{#1}
+\newcommand*{\@glsxtr@markwordseps}[2]{%
+ \def#1{}%
+ \@glsxtr@mark@wordseps#1#2 \@nnil
+}
+\def\@glsxtr@mark@wordseps#1#2 #3{%
+ \ifdefempty{#1}%
+ {\def#1{\protect\glsxtrword{#2}}}%
+ {\appto#1{\protect\glsxtrwordsep\protect\glsxtrword{#2}}}%
+ \ifx\@nnil#3\relax
+ \let\@glsxtr@mark@wordseps@next\relax
+ \else
+ \def\@glsxtr@mark@wordseps@next{%
+ \@glsxtr@mark@wordseps#1#3}%
+ \fi
+ \@glsxtr@mark@wordseps@next
+}
\newcommand*{\newabbreviation}[4][]{%
\glsxtr@newabbreviation{#1}{#2}{#3}{#4}%
}
@@ -5141,47 +5195,61 @@
\glslabeltok{#2}%
\glsshorttok{#3}%
\glslongtok{#4}%
+ \def\glsxtrorgshort{#3}%
+ \def\glsxtrorglong{#4}%
\def\glscategorylabel{abbreviation}%
\glsxtr@applyabbrvstyle{\@glsabbrv@current@abbreviation}%
\setkeys*{glsxtrabbrv}[shortplural,longplural]{#1}%
\def\@gls@longpl{#4\glspluralsuffix}%
- \glsifcategoryattribute{\glscategorylabel}{insertdots}{true}%
+ \let\@gls@default@longpl\@gls@longpl
+ \glsifcategoryattribute{\glscategorylabel}{markwords}{true}%
{%
- \@glsxtr@insertdots\@gls@short{#3}%
- \expandafter\glsshorttok\expandafter{\@gls@short\spacefactor1000 \relax}%
- \glsifcategoryattribute{\glscategorylabel}{aposplural}{true}%
- {%
- \expandafter\def\expandafter\@gls@shortpl\expandafter{\@gls@short
- '\abbrvpluralsuffix}%
- }%
+ \@glsxtr@markwordseps\@gls@long{#4}%
+ \expandafter\def\expandafter\@gls@longpl\expandafter
+ {\@gls@long\glspluralsuffix}%
+ \let\@gls@default@longpl\@gls@longpl
+ \expandafter\glslongtok\expandafter{\@gls@long}%
+ }%
+ {}%
+ \glsifcategoryattribute{\glscategorylabel}{markshortwords}{true}%
+ {%
+ \@glsxtr@markwordseps\@gls@short{#3}%
+ }%
+ {%
+ \glsifcategoryattribute{\glscategorylabel}{insertdots}{true}%
{%
- \glsifcategoryattribute{\glscategorylabel}{noshortplural}{true}%
- {%
- \let\@gls@shortpl\@gls@short
- }%
- {%
- \expandafter\def\expandafter\@gls@shortpl\expandafter{\@gls@short
- \abbrvpluralsuffix}%
- }%
+ \@glsxtr@insertdots\@gls@short{#3}%
+ \expandafter\glsshorttok\expandafter{\@gls@short\spacefactor1000 \relax}%
}%
+ {\def\@gls@short{#3}}%
}%
+ \glsifcategoryattribute{\glscategorylabel}{aposplural}{true}%
{%
- \glsifcategoryattribute{\glscategorylabel}{aposplural}{true}%
+ \expandafter\def\expandafter\@gls@shortpl\expandafter{\@gls@short
+ '\abbrvpluralsuffix}%
+ }%
+ {%
+ \glsifcategoryattribute{\glscategorylabel}{noshortplural}{true}%
{%
- \def\@gls@shortpl{#3'\abbrvpluralsuffix}%
+ \let\@gls@shortpl\@gls@short
}%
- {%
- \glsifcategoryattribute{\glscategorylabel}{noshortplural}{true}%
{%
- \def\@gls@shortpl{#3}%
- }%
- {%
- \def\@gls@shortpl{#3\abbrvpluralsuffix}%
- }%
+ \expandafter\def\expandafter\@gls@shortpl\expandafter{\@gls@short
+ \abbrvpluralsuffix}%
}%
}%
+ \expandafter\glsshorttok\expandafter{\@gls@short}%
\glsxtrnewabbrevpresetkeyhook{#1}{#2}{#3}%
\setkeys*{glsxtrabbrv}[category]{#1}%
+ \ifx\@gls@default@longpl\@gls@longpl
+ \else
+ \glsifcategoryattribute{\glscategorylabel}{markwords}{true}%
+ {%
+ \expandafter\@glsxtr@markwordseps\expandafter\@gls@longpl\expandafter
+ {\@gls@longpl}%
+ }%
+ {}%
+ \fi
\expandafter\glsshortpltok\expandafter{\@gls@shortpl}%
\expandafter\glslongpltok\expandafter{\@gls@longpl}%
\newabbreviationhook
@@ -5206,21 +5274,22 @@
\newcommand*{\GlsXtrPostNewAbbreviation}{}
\newcommand*{\newabbreviationhook}{}
\newcommand*{\CustomAbbreviationFields}{}
+\newcommand*{\glsxtrparen}[1]{(#1)}
\newcommand*{\glsxtrfullformat}[2]{%
\glsfirstlongfont{\glsaccesslong{#1}}#2\glsxtrfullsep{#1}%
- (\protect\glsfirstabbrvfont{\glsaccessshort{#1}})%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{#1}}}%
}
\newcommand*{\Glsxtrfullformat}[2]{%
\glsfirstlongfont{\Glsaccesslong{#1}}#2\glsxtrfullsep{#1}%
- (\protect\glsfirstabbrvfont{\glsaccessshort{#1}})%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{#1}}}%
}
\newcommand*{\glsxtrfullplformat}[2]{%
\glsfirstlongfont{\glsaccesslongpl{#1}}#2\glsxtrfullsep{#1}%
- (\protect\glsfirstabbrvfont{\glsaccessshortpl{#1}})%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{#1}}}%
}
\newcommand*{\Glsxtrfullplformat}[2]{%
\glsfirstlongfont{\Glsaccesslongpl{#1}}#2\glsxtrfullsep{#1}%
- (\protect\glsfirstabbrvfont{\glsaccessshortpl{#1}})%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{#1}}}%
}
\newcommand*{\glsxtrfullsep}[1]{\space}
\newcommand*{\glsxtrinlinefullformat}{\glsxtrfullformat}
@@ -5626,27 +5695,27 @@
{%
\glscapscase
{%
- \glsabbrvfont{\glsaccessshortpl{\glslabel}}\glsinsert
+ \glsxtrsubsequentplfmt{\glslabel}{\glsinsert}%
}%
{%
- \glsabbrvfont{\Glsaccessshortpl{\glslabel}}\glsinsert
+ \Glsxtrsubsequentplfmt{\glslabel}{\glsinsert}%
}%
{%
\mfirstucMakeUppercase
- {\glsabbrvfont{\glsaccessshortpl{\glslabel}}\glsinsert}%
+ {\glsxtrsubsequentplfmt{\glslabel}{\glsinsert}}%
}%
}%
{%
\glscapscase
{%
- \glsabbrvfont{\glsaccessshort{\glslabel}}\glsinsert
+ \glsxtrsubsequentfmt{\glslabel}{\glsinsert}%
}%
{%
- \glsabbrvfont{\Glsaccessshort{\glslabel}}\glsinsert
+ \Glsxtrsubsequentfmt{\glslabel}{\glsinsert}%
}%
{%
\mfirstucMakeUppercase
- {\glsabbrvfont{\glsaccessshort{\glslabel}}\glsinsert}%
+ {\glsxtrsubsequentfmt{\glslabel}{\glsinsert}}%
}%
}%
}%
@@ -5684,6 +5753,26 @@
\glscustomtext
}%
}
+\newcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glsabbrvfont{\glsaccessshort{#1}\ifglsxtrinsertinside #2\fi}%
+ \ifglsxtrinsertinside \else#2\fi
+}
+\let\glsxtrdefaultsubsequentfmt\glsxtrsubsequentfmt
+\newcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glsabbrvfont{\glsaccessshortpl{#1}\ifglsxtrinsertinside #2\fi}%
+ \ifglsxtrinsertinside \else#2\fi
+}
+\let\glsxtrdefaultsubsequentplfmt\glsxtrsubsequentplfmt
+\newcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glsabbrvfont{\Glsaccessshort{#1}\ifglsxtrinsertinside #2\fi}%
+ \ifglsxtrinsertinside \else#2\fi
+}
+\let\Glsxtrdefaultsubsequentfmt\Glsxtrsubsequentfmt
+\newcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glsabbrvfont{\Glsaccessshortpl{#1}\ifglsxtrinsertinside #2\fi}%
+ \ifglsxtrinsertinside \else#2\fi
+}
+\let\Glsxtrdefaultsubsequentplfmt\Glsxtrsubsequentplfmt
\newcommand*{\setabbreviationstyle}[2][abbreviation]{%
\ifcsundef{@glsabbrv@dispstyle@setup@#2}
{%
@@ -5733,6 +5822,10 @@
\renewcommand*{\Glsxtrinlinefullformat}{\Glsxtrfullformat}%
\renewcommand*{\glsxtrinlinefullplformat}{\glsxtrfullplformat}%
\renewcommand*{\Glsxtrinlinefullplformat}{\Glsxtrfullplformat}%
+ \let\glsxtrsubsequentfmt\glsxtrdefaultsubsequentfmt
+ \let\glsxtrsubsequentplfmt\glsxtrdefaultsubsequentplfmt
+ \let\Glsxtrsubsequentfmt\Glsxtrdefaultsubsequentfmt
+ \let\Glsxtrsubsequentplfmt\Glsxtrdefaultsubsequentplfmt
#3}%
}%
}
@@ -5797,10 +5890,10 @@
sort={\the\glsshorttok},
first={\protect\glsfirstlongfont{\the\glslongtok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstabbrvfont{\the\glsshorttok})},%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshorttok}}},%
firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshortpltok}}},%
plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
description={\the\glslongtok}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
@@ -5821,37 +5914,43 @@
\glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
\glsxtrfullsep{##1}%
- (\glsfirstabbrvfont{\glsaccessshort{##1}})%
+ \glsxtrparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}%
}%
\renewcommand*{\glsxtrfullplformat}[2]{%
\glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstabbrvfont{\glsaccessshortpl{##1}})%
+ \glsxtrparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
}%
\renewcommand*{\Glsxtrfullformat}[2]{%
\glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstabbrvfont{\glsaccessshort{##1}})%
+ \glsxtrparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}%
}%
\renewcommand*{\Glsxtrfullplformat}[2]{%
\glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstabbrvfont{\glsaccessshortpl{##1}})%
+ \glsxtrparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
}%
}
\setabbreviationstyle{long-short}
-\newcommand*{\glsxtrlongshortdescsort}{\the\glslongtok\space(\the\glsshorttok)}
+\newcommand*{\glsxtrlongshortdescsort}{%
+ \expandonce\glsxtrorglong\space (\expandonce\glsxtrorgshort)%
+}
+\newcommand*{\glsxtrlongshortdescname}{%
+ \protect\glslongfont{\the\glslongtok}
+ \glsxtrparen{\protect\glsabbrvfont{\the\glsshorttok}}%
+}
\newabbreviationstyle{long-short-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsxtrfullformat{\the\glslabeltok}{}},
+ name={\glsxtrlongshortdescname},
sort={\glsxtrlongshortdescsort},%
first={\protect\glsfirstlongfont{\the\glslongtok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstabbrvfont{\the\glsshorttok})},%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshorttok}}},%
firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\the\glsshortpltok}}},%
text={\protect\glsabbrvfont{\the\glsshorttok}},%
plural={\protect\glsabbrvfont{\the\glsshortpltok}}%
}%
@@ -5874,10 +5973,10 @@
description={\the\glslongtok},%
first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstlongfont{\the\glslongtok})},%
+ \glsxtrparen{\protect\glsfirstlongfont{\the\glslongtok}}},%
firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstlongfont{\the\glslongpltok})},%
+ \glsxtrparen{\protect\glsfirstlongfont{\the\glslongpltok}}},%
plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glshasattribute{\the\glslabeltok}{regular}%
@@ -5897,36 +5996,41 @@
\glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\glsxtrfullplformat}[2]{%
\glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
}%
\renewcommand*{\Glsxtrfullformat}[2]{%
\glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\Glsxtrfullplformat}[2]{%
\glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
}%
}
+\newcommand*{\glsxtrshortlongdescsort}{\the\glsshorttok}
+\newcommand*{\glsxtrshortlongdescname}{%
+ \protect\glsabbrvfont{\the\glsshorttok}
+ \glsxtrparen{\protect\glslongfont{\the\glslongtok}}%
+}
\newabbreviationstyle{short-long-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsxtrfullformat{\the\glslabeltok}{}},
- sort={\the\glsshorttok},%
+ name={\glsxtrshortlongdescname},
+ sort={\glsxtrshortlongdescsort},
first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstlongfont{\the\glslongtok})},%
+ \glsxtrparen{\protect\glsfirstlongfont{\the\glslongtok}}},%
firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstlongfont{\the\glslongpltok})},%
+ \glsxtrparen{\protect\glsfirstlongfont{\the\glslongpltok}}},%
text={\protect\glsabbrvfont{\the\glsshorttok}},%
plural={\protect\glsabbrvfont{\the\glsshortpltok}}%
}%
@@ -5999,22 +6103,22 @@
\renewcommand*{\glsxtrinlinefullformat}[2]{%
\glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfootnotefont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\glsxtrinlinefullplformat}[2]{%
\glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfootnotefont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullformat}[2]{%
\glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfootnotefont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullplformat}[2]{%
\glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfootnotefont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
}%
}
\letabbreviationstyle{short-footnote}{footnote}
@@ -6071,22 +6175,22 @@
\renewcommand*{\glsxtrinlinefullformat}[2]{%
\glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfootnotefont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\glsxtrinlinefullplformat}[2]{%
\glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfootnotefont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullformat}[2]{%
\glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfootnotefont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullplformat}[2]{%
\glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfootnotefont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
}%
}
\letabbreviationstyle{short-postfootnote}{postfootnote}
@@ -6113,25 +6217,25 @@
\protect\glsfirstabbrvfont{\glsaccessshort{##1}%
\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\glsxtrinlinefullplformat}[2]{%
\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}%
\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullformat}[2]{%
\protect\glsfirstabbrvfont{\glsaccessshort{##1}%
\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\Glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\Glsaccesslong{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullplformat}[2]{%
\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}%
\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\Glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\Glsaccesslongpl{##1}}}%
}%
\renewcommand*{\glsxtrfullformat}[2]{%
\glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
@@ -6152,10 +6256,27 @@
}
\setabbreviationstyle[acronym]{short}
\letabbreviationstyle{short-nolong}{short}
+\newabbreviationstyle{short-nolong-noreg}%
+{%
+ \GlsXtrUseAbbrStyleSetup{short-nolong}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-nolong}%
+}
+\newcommand*{\glsxtrshortdescname}{%
+ \protect\glsabbrvfont{\the\glsshorttok}%
+}
\newabbreviationstyle{short-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsxtrinlinefullformat{\the\glslabeltok}{}},
+ name={\glsxtrshortdescname},
sort={\the\glsshorttok},
first={\protect\glsfirstabbrvfont{\the\glsshorttok}},
firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}},
@@ -6174,22 +6295,22 @@
\renewcommand*{\glsxtrinlinefullformat}[2]{%
\glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\glsxtrinlinefullplformat}[2]{%
\glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullformat}[2]{%
\glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslong{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslong{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullplformat}[2]{%
\glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\glsfirstlongfont{\glsaccesslongpl{##1}})%
+ \glsxtrparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}%
}%
\renewcommand*{\glsxtrfullformat}[2]{%
\glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
@@ -6209,15 +6330,29 @@
}%
}
\letabbreviationstyle{short-nolong-desc}{short-desc}
+\newabbreviationstyle{short-nolong-desc-noreg}%
+{%
+ \GlsXtrUseAbbrStyleSetup{short-nolong-desc}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-nolong-desc}%
+}
\newabbreviationstyle{long-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\protect\glsfirstlongfont{\the\glslongtok}},
+ name={\protect\protect\glslongfont{\the\glslongtok}},
sort={\the\glslongtok},
first={\protect\glsfirstlongfont{\the\glslongtok}},
firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},
- text={\the\glslongtok},
- plural={\the\glslongpltok}%
+ text={\glslongfont{\the\glslongtok}},
+ plural={\glslongfont{\the\glslongpltok}}%
}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glssetattribute{\the\glslabeltok}{regular}{true}}%
@@ -6228,25 +6363,41 @@
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
\renewcommand*{\glsxtrinlinefullformat}[2]{%
\glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\protect\glsfirstabbrvfont{\glsaccessshort{##1}})%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{##1}}}%
}%
\renewcommand*{\glsxtrinlinefullplformat}[2]{%
\glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}})%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullformat}[2]{%
\glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\protect\glsfirstabbrvfont{\glsaccessshort{##1}})%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{##1}}}%
}%
\renewcommand*{\Glsxtrinlinefullplformat}[2]{%
\glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
- (\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}})%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
}%
\renewcommand*{\glsxtrfullformat}[2]{%
\glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
@@ -6266,6 +6417,20 @@
}%
}
\letabbreviationstyle{long-noshort-desc}{long-desc}
+\newabbreviationstyle{long-noshort-desc-noreg}%
+{%
+ \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
+}
\newabbreviationstyle{long}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
@@ -6273,8 +6438,8 @@
sort={\the\glsshorttok},
first={\protect\glsfirstlongfont{\the\glslongtok}},
firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},
- text={\the\glslongtok},
- plural={\the\glslongpltok},%
+ text={\glslongfont{\the\glslongtok}},
+ plural={\glslongfont{\the\glslongpltok}},%
description={\the\glslongtok}%
}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
@@ -6284,80 +6449,364 @@
\GlsXtrUseAbbrStyleFmts{long-desc}%
}
\letabbreviationstyle{long-noshort}{long}
+\newabbreviationstyle{long-noshort-noreg}%
+{%
+ \GlsXtrUseAbbrStyleSetup{long-noshort}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-noshort}%
+}
\newcommand*{\glsxtrscfont}[1]{\textsc{#1}}
-\newcommand*{\glsxtrfirstscfont}[1]{\glsxtrscfont{#1}}
+\newcommand*{\glsabbrvscfont}{\glsxtrscfont}
+\newcommand*{\glsxtrfirstscfont}[1]{\glsabbrvscfont{#1}}
+\newcommand*{\glsfirstabbrvscfont}{\glsxtrfirstscfont}
\newcommand*{\glsxtrscsuffix}{\glstextup{\glsxtrabbrvpluralsuffix}}
\newabbreviationstyle{long-short-sc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-short}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\the\glsshortpltok}}},%
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}},%
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-short}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+ }%
}
\newabbreviationstyle{long-short-sc-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrlongshortdescname},
+ sort={\glsxtrlongshortdescsort},%
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\the\glsshortpltok}}},%
+ text={\protect\glsabbrvscfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-short-desc}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+ \GlsXtrUseAbbrStyleFmts{long-short-sc}%
}
\newabbreviationstyle{short-sc-long}%
{%
- \GlsXtrUseAbbrStyleSetup{short-long}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvscfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-long}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
}
\newabbreviationstyle{short-sc-long-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-long-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortlongdescname},
+ sort={\glsxtrshortlongdescsort},
+ first={\protect\glsfirstabbrvscfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvscfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-long-desc}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+ \GlsXtrUseAbbrStyleFmts{short-sc-long}%
}
\newabbreviationstyle{short-sc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-nolong}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstabbrvscfont{\the\glsshorttok}},
+ firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}},
+ text={\protect\glsabbrvscfont{\the\glsshorttok}},
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}},
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-nolong}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \protect\glsfirstabbrvscfont{\glsaccessshort{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \protect\glsfirstabbrvscfont{\glsaccessshort{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
\letabbreviationstyle{short-sc-nolong}{short-sc}
\newabbreviationstyle{short-sc-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortdescname},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstabbrvscfont{\the\glsshorttok}},
+ firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}},
+ text={\protect\glsabbrvscfont{\the\glsshorttok}},
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}},
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-desc}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
\letabbreviationstyle{short-sc-nolong-desc}{short-sc-desc}
\newabbreviationstyle{long-noshort-sc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-noshort}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}},
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}},
+ text={\protect\glslongdefaultfont{\the\glslongtok}},
+ plural={\protect\glslongdefaultfont{\the\glslongpltok}},%
+ description={\the\glslongtok}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-noshort}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
\@glsxtr@deprecated@abbrstyle{long-sc}{long-noshort-sc}
\newabbreviationstyle{long-noshort-sc-desc}%
@@ -6365,108 +6814,555 @@
\GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvscfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
\@glsxtr@deprecated@abbrstyle{long-desc-sc}{long-noshort-sc-desc}
\newabbreviationstyle{short-sc-footnote}%
{%
- \GlsXtrUseAbbrStyleSetup{short-footnote}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvscfont{\the\glsshorttok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-footnote}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
}
\@glsxtr@deprecated@abbrstyle{footnote-sc}{short-sc-footnote}
\newabbreviationstyle{short-sc-postfootnote}%
{%
- \GlsXtrUseAbbrStyleSetup{short-postfootnote}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvscfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvscfont{\the\glsshorttok}},%
+ firstplural={\protect\glsfirstabbrvscfont{\the\glsshortpltok}},%
+ plural={\protect\glsabbrvscfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+ \glsxtrdopostpunc{\protect\glsxtrabbrvfootnote{\glslabel}%
+ {\glsfirstlongfootnotefont{\glsentrylong{\glslabel}}}}%
+ }%
+ {}%
+ }%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+ \renewcommand*{\glsxtrsetupfulldefs}{%
+ \let\glsxtrifwasfirstuse\@secondoftwo
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-postfootnote}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrscsuffix}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrscfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstscfont{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvscfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvscfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvscfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvscfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
}
\@glsxtr@deprecated@abbrstyle{postfootnote-sc}{short-sc-postfootnote}
\newcommand*{\glsxtrsmfont}[1]{\textsmaller{#1}}
-\newcommand*{\glsxtrfirstsmfont}[1]{\glsxtrsmfont{#1}}
+\newcommand*{\glsabbrvsmfont}{\glsxtrsmfont}
+\newcommand*{\glsxtrfirstsmfont}[1]{\glsabbrvsmfont{#1}}
+\newcommand*{\glsfirstabbrvsmfont}{\glsxtrfirstsmfont}
\newcommand*{\glsxtrsmsuffix}{\glsxtrabbrvpluralsuffix}
\newabbreviationstyle{long-short-sm}%
{%
- \GlsXtrUseAbbrStyleSetup{long-short}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\the\glsshortpltok}}},%
+ plural={\protect\glsabbrvsmfont{\the\glsshortpltok}},%
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-short}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+ }%
}
\newabbreviationstyle{long-short-sm-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrlongshortdescname},
+ sort={\glsxtrlongshortdescsort},%
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\the\glsshortpltok}}},%
+ text={\protect\glsabbrvsmfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-short-desc}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \GlsXtrUseAbbrStyleFmts{long-short-sm}%
}
\newabbreviationstyle{short-sm-long}%
{%
- \GlsXtrUseAbbrStyleSetup{short-long}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+ plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-long}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
}
\newabbreviationstyle{short-sm-long-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-long-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortlongdescname},
+ sort={\glsxtrshortlongdescsort},
+ first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvsmfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-long-desc}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
- \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \GlsXtrUseAbbrStyleFmts{short-sm-long}%
}
\newabbreviationstyle{short-sm}%
{%
- \GlsXtrUseAbbrStyleSetup{short-nolong}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}},
+ firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}},
+ text={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ plural={\protect\glsabbrvsmfont{\the\glsshortpltok}},
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-nolong}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \protect\glsfirstabbrvsmfont{\glsaccessshort{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \protect\glsfirstabbrvsmfont{\glsaccessshort{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
\letabbreviationstyle{short-sm-nolong}{short-sm}
\newabbreviationstyle{short-sm-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-nolong-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortdescname},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}},
+ firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}},
+ text={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ plural={\protect\glsabbrvsmfont{\the\glsshortpltok}},
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-nolong-desc}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
\letabbreviationstyle{short-sm-nolong-desc}{short-sm-desc}
\newabbreviationstyle{long-noshort-sm}%
{%
- \GlsXtrUseAbbrStyleSetup{long-noshort}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}},
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}},
+ text={\protect\glslongdefaultfont{\the\glslongtok}},
+ plural={\protect\glslongdefaultfont{\the\glslongpltok}},%
+ description={\the\glslongtok}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-noshort}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
\@glsxtr@deprecated@abbrstyle{long-sm}{long-noshort-sm}
\newabbreviationstyle{long-noshort-sm-desc}%
@@ -6474,66 +7370,302 @@
\GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvsmfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
\@glsxtr@deprecated@abbrstyle{long-desc-sm}{long-noshort-sm-desc}
\newabbreviationstyle{short-sm-footnote}%
{%
- \GlsXtrUseAbbrStyleSetup{short-footnote}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+ plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-footnote}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
}
\@glsxtr@deprecated@abbrstyle{footnote-sm}{short-sm-footnote}
\newabbreviationstyle{short-sm-postfootnote}%
{%
- \GlsXtrUseAbbrStyleSetup{short-postfootnote}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvsmfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvsmfont{\the\glsshorttok}},%
+ firstplural={\protect\glsfirstabbrvsmfont{\the\glsshortpltok}},%
+ plural={\protect\glsabbrvsmfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+ \glsxtrdopostpunc{\protect\glsxtrabbrvfootnote{\glslabel}%
+ {\glsfirstlongfootnotefont{\glsentrylong{\glslabel}}}}%
+ }%
+ {}%
+ }%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+ \renewcommand*{\glsxtrsetupfulldefs}{%
+ \let\glsxtrifwasfirstuse\@secondoftwo
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-postfootnote}%
- \renewcommand*\glsabbrvfont[1]{\glsxtrsmfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsxtrfirstsmfont{##1}}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvsmfont{##1}}%
+ \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvsmfont{##1}}%
\renewcommand*{\abbrvpluralsuffix}{\protect\glsxtrsmsuffix}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvsmfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvsmfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
}
\@glsxtr@deprecated@abbrstyle{postfootnote-sm}{short-sm-postfootnote}
\newcommand*{\glsabbrvemfont}[1]{\emph{#1}}%
\newcommand*{\glsfirstabbrvemfont}[1]{\glsabbrvemfont{#1}}%
+\newcommand*{\glsxtremsuffix}{\glsxtrabbrvpluralsuffix}
\newcommand*{\glsfirstlongemfont}[1]{\glslongemfont{#1}}%
\newcommand*{\glslongemfont}[1]{\emph{#1}}%
\newabbreviationstyle{long-short-em}%
{%
- \GlsXtrUseAbbrStyleSetup{long-short}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshortpltok}}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}},%
+ description={\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*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
}
\newabbreviationstyle{long-short-em-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrlongshortdescname},
+ sort={\glsxtrlongshortdescsort},%
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshortpltok}}},%
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-short-desc}%
- \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
+ \GlsXtrUseAbbrStyleFmts{long-short-em}%
}
\newabbreviationstyle{long-em-short-em}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
sort={\the\glsshorttok},
- first={\protect\glsfirstlongfont{\the\glslongtok}%
+ first={\protect\glsfirstlongemfont{\the\glslongtok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstabbrvfont{\the\glsshorttok})},%
- firstplural={\protect\glsfirstlongfont{\the\glslongpltok}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstabbrvfont{\the\glsshortpltok})},%
- plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshortpltok}}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}},%
description={\protect\glslongemfont{\the\glslongtok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glshasattribute{\the\glslabeltok}{regular}%
@@ -6544,56 +7676,146 @@
}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-short}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongemfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongemfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
}
\newabbreviationstyle{long-em-short-em-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrlongshortdescname},
+ sort={\glsxtrlongshortdescsort},%
+ first={\protect\glsfirstlongemfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\the\glsshortpltok}}},%
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-short-desc}%
- \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
- \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
- \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
- \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+ \GlsXtrUseAbbrStyleFmts{long-em-short-em}%
}
\newabbreviationstyle{short-em-long}%
{%
- \GlsXtrUseAbbrStyleSetup{short-long}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-long}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
}
\newabbreviationstyle{short-em-long-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-long-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortlongdescname},
+ sort={\glsxtrshortlongdescsort},
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongdefaultfont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-long-desc}%
- \renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
- \renewcommand*\glsfirstabbrvfont[1]{\glsfirstabbrvemfont{##1}}%
- \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
- \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+ \GlsXtrUseAbbrStyleFmts{short-em-long}%
}
\newabbreviationstyle{short-em-long-em}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
sort={\the\glsshorttok},
description={\protect\glslongemfont{\the\glslongtok}},%
- first={\protect\glsfirstabbrvfont{\the\glsshorttok}%
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstlongfont{\the\glslongtok})},%
- firstplural={\protect\glsfirstabbrvfont{\the\glsshortpltok}%
+ \glsxtrparen{\protect\glsfirstlongemfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
\protect\glsxtrfullsep{\the\glslabeltok}%
- (\protect\glsfirstlongfont{\the\glslongpltok})},%
- plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
+ \glsxtrparen{\protect\glsfirstlongemfont{\the\glslongpltok}}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glshasattribute{\the\glslabeltok}{regular}%
{%
@@ -6603,113 +7825,632 @@
}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-long}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongemfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongemfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongemfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongemfont{\glsaccesslongpl{##1}}}%
+ }%
}
\newabbreviationstyle{short-em-long-em-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-long-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortlongdescname},%
+ sort={\glsxtrshortlongdescsort},%
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongemfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlongemfont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-long-desc}%
- \renewcommand*{\glsabbrvfont}[1]{\glsabbrvemfont{##1}}%
- \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
- \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
- \renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+ \GlsXtrUseAbbrStyleFmts{short-em-long-em}%
}
\newabbreviationstyle{short-em}%
{%
- \GlsXtrUseAbbrStyleSetup{short-nolong}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}},
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}},
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}},
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-nolong}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \protect\glsfirstabbrvemfont{\glsaccessshort{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \protect\glsfirstabbrvemfont{\glsaccessshort{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}%
+ \ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\Glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
\letabbreviationstyle{short-em-nolong}{short-em}
\newabbreviationstyle{short-em-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-nolong-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortdescname},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}},
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}},
+ text={\protect\glsabbrvemfont{\the\glsshorttok}},
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}},
+ description={\the\glslongtok}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-nolong-desc}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongdefaultfont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
\letabbreviationstyle{short-em-nolong-desc}{short-em-desc}
\newabbreviationstyle{long-noshort-em}%
{%
- \GlsXtrUseAbbrStyleSetup{long-noshort}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongdefaultfont{\the\glslongtok}},
+ firstplural={\protect\glsfirstlongdefaultfont{\the\glslongpltok}},
+ text={\protect\glslongdefaultfont{\the\glslongtok}},
+ plural={\protect\glslongdefaultfont{\the\glslongpltok}},%
+ description={\the\glslongtok}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-noshort}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
\@glsxtr@deprecated@abbrstyle{long-em}{long-noshort-em}
\newabbreviationstyle{long-em-noshort-em}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
sort={\the\glsshorttok},
- first={\protect\glsfirstlongfont{\the\glslongtok}},
- firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},
- text={\the\glslongtok},
- plural={\the\glslongpltok},%
+ first={\protect\glsfirstlongemfont{\the\glslongtok}},
+ firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}},
+ text={\protect\glslongemfont{\the\glslongtok}},
+ plural={\protect\glslongemfont{\the\glslongpltok}},%
description={\protect\glslongemfont{\the\glslongtok}}%
}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-noshort}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongemfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongemfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongemfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongemfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+}
+\newabbreviationstyle{long-em-noshort-em-noreg}%
+{%
+ \GlsXtrUseAbbrStyleSetup{long-em-noshort-em}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-em-noshort-em}%
}
\newabbreviationstyle{long-noshort-em-desc}%
{%
\GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongdefaultfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongdefaultfont{##1}}%
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongdefaultfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongdefaultfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
}
\@glsxtr@deprecated@abbrstyle{long-desc-em}{long-noshort-em-desc}
\newabbreviationstyle{long-em-noshort-em-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-noshort-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\protect\glslongemfont{\the\glslongtok}},
+ sort={\the\glslongtok},
+ first={\protect\glsfirstlongemfont{\the\glslongtok}},
+ firstplural={\protect\glsfirstlongemfont{\the\glslongpltok}},
+ text={\glslongemfont{\the\glslongtok}},
+ plural={\glslongemfont{\the\glslongpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{regular}{true}}%
}%
{%
- \GlsXtrUseAbbrStyleFmts{long-noshort-desc}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongemfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslongemfont{##1}}%
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glslongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glslongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glslongemfont{\Glsaccesslong{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glslongemfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside ##2\fi}%
+ \ifglsxtrinsertinside \else##2\fi
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongemfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongemfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvemfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongemfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+}
+\newabbreviationstyle{long-em-noshort-em-desc-noreg}%
+{%
+ \GlsXtrUseAbbrStyleSetup{long-em-noshort-em-desc}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-em-noshort-em-desc}%
}
\newabbreviationstyle{short-em-footnote}%
{%
- \GlsXtrUseAbbrStyleSetup{short-footnote}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}%
+ \protect\glsxtrabbrvfootnote{\the\glslabeltok}%
+ {\protect\glsfirstlongfootnotefont{\the\glslongpltok}}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glssetattribute{\the\glslabeltok}{nohyperfirst}{true}%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-footnote}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \protect\glsxtrabbrvfootnote{##1}%
+ {\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
}
\@glsxtr@deprecated@abbrstyle{footnote-em}{short-em-footnote}
\newabbreviationstyle{short-em-postfootnote}%
{%
- \GlsXtrUseAbbrStyleSetup{short-postfootnote}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvemfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ description={\the\glslongtok},%
+ first={\protect\glsfirstabbrvemfont{\the\glsshorttok}},%
+ firstplural={\protect\glsfirstabbrvemfont{\the\glsshortpltok}},%
+ plural={\protect\glsabbrvemfont{\the\glsshortpltok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+ \glsxtrdopostpunc{\protect\glsxtrabbrvfootnote{\glslabel}%
+ {\glsfirstlongfootnotefont{\glsentrylong{\glslabel}}}}%
+ }%
+ {}%
+ }%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+ \renewcommand*{\glsxtrsetupfulldefs}{%
+ \let\glsxtrifwasfirstuse\@secondoftwo
+ }%
}%
{%
- \GlsXtrUseAbbrStyleFmts{short-postfootnote}%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtremsuffix}%
\renewcommand*\glsabbrvfont[1]{\glsabbrvemfont{##1}}%
\renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvemfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongfootnotefont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongfootnotefont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvemfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslong{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvemfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi\glsxtrfullsep{##1}%
+ \glsxtrparen{\glsfirstlongfootnotefont{\glsaccesslongpl{##1}}}%
+ }%
}
\@glsxtr@deprecated@abbrstyle{postfootnote-em}{short-em-postfootnote}
\newcommand*{\glsxtruserfield}{useri}
@@ -6717,30 +8458,34 @@
{
\newcommand*{\glsxtruserparen}[2]{%
\glsxtrfullsep{#2}%
- (#1\ifglshasfield{\glsxtruserfield}{#2}{, \glscurrentfieldvalue}{})%
+ \glsxtrparen
+ {#1\ifglshasfield{\glsxtruserfield}{#2}{, \glscurrentfieldvalue}{}}%
}
}
{
\newcommand*{\glsxtruserparen}[2]{%
\glsxtrfullsep{#2}%
- (#1\ifglshasfield{\glsxtruserfield}{#2}{, \@glo@thisvalue}{})%
+ \glsxtrparen
+ {#1\ifglshasfield{\glsxtruserfield}{#2}{, \@glo@thisvalue}{}}%
}
}
-\newcommand*{\glsabbrvuserfont}[1]{#1}
+\newcommand*{\glsabbrvuserfont}[1]{\glsabbrvdefaultfont{#1}}
\newcommand*{\glsfirstabbrvuserfont}[1]{\glsabbrvuserfont{#1}}
-\newcommand*{\glslonguserfont}[1]{#1}
+\newcommand*{\glslonguserfont}[1]{\glslongdefaultfont{#1}}
\newcommand*{\glsfirstlonguserfont}[1]{\glslonguserfont{#1}}
\newcommand*{\glsxtrusersuffix}{\glsxtrabbrvpluralsuffix}
\newabbreviationstyle{long-short-user}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\protect\glsabbrvuserfont{\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\glsabbrvfont{\the\glsshortpltok}},%
+ first={\protect\glsfirstlonguserfont{\the\glslongtok}%
+ \protect\glsxtruserparen{\protect\glsfirstabbrvuserfont{\the\glsshorttok}}%
+ {\the\glslabeltok}},%
+ firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}%
+ \protect\glsxtruserparen
+ {\protect\glsfirstabbrvuserfont{\the\glsshortpltok}}{\the\glslabeltok}},%
+ plural={\protect\glsabbrvuserfont{\the\glsshortpltok}},%
description={\protect\glslonguserfont{\the\glslongtok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glshasattribute{\the\glslabeltok}{regular}%
@@ -6757,34 +8502,34 @@
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonguserfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslonguserfont{##1}}%
\renewcommand*{\glsxtrfullformat}[2]{%
- \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshort{##1}}}{##1}%
}%
\renewcommand*{\glsxtrfullplformat}[2]{%
- \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshortpl{##1}}}{##1}%
}%
\renewcommand*{\Glsxtrfullformat}[2]{%
- \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshort{##1}}}{##1}%
}%
\renewcommand*{\Glsxtrfullplformat}[2]{%
- \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshortpl{##1}}}{##1}%
}%
}
\newabbreviationstyle{long-postshort-user}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\protect\glsabbrvuserfont{\the\glsshorttok}},
sort={\the\glsshorttok},
- first={\protect\glsfirstlongfont{\the\glslongtok}},%
- firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
- plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
+ first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
+ plural={\protect\glsabbrvuserfont{\the\glsshortpltok}},%
description={\protect\glslonguserfont{\the\glslongtok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\csdef{glsxtrpostlink\glscategorylabel}{%
@@ -6810,52 +8555,54 @@
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonguserfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslonguserfont{##1}}%
\renewcommand*{\glsxtrfullformat}[2]{%
- \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
}%
\renewcommand*{\glsxtrfullplformat}[2]{%
- \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
}%
\renewcommand*{\Glsxtrfullformat}[2]{%
- \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
}%
\renewcommand*{\Glsxtrfullplformat}[2]{%
- \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
}%
\renewcommand*{\glsxtrinlinefullformat}[2]{%
- \glsfirstlongfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshort{##1}}}{##1}%
}%
\renewcommand*{\glsxtrinlinefullplformat}[2]{%
- \glsfirstlongfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshortpl{##1}}}{##1}%
}%
\renewcommand*{\Glsxtrinlinefullformat}[2]{%
- \glsfirstlongfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshort{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshort{##1}}}{##1}%
}%
\renewcommand*{\Glsxtrinlinefullplformat}[2]{%
- \glsfirstlongfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstlonguserfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstabbrvfont{\glsaccessshortpl{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstabbrvuserfont{\glsaccessshortpl{##1}}}{##1}%
}%
}
\newabbreviationstyle{long-postshort-user-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsfirstlongfont{\the\glslongtok}%
+ name={\protect\glslonguserfont{\the\glslongtok}%
\protect\glsxtruserparen
- {\protect\glsabbrvfont{\the\glsshorttok}}{\the\glslabeltok}},
+ {\protect\glsabbrvuserfont{\the\glsshorttok}}{\the\glslabeltok}},
sort={\the\glslongtok},
- first={\protect\glsfirstlongfont{\the\glslongtok}},%
- firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
- plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
+ first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
+ text={\protect\glsabbrvuserfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvuserfont{\the\glsshortpltok}}%
+ }%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\csdef{glsxtrpostlink\glscategorylabel}{%
\glsxtrifwasfirstuse
@@ -6879,18 +8626,18 @@
\newabbreviationstyle{short-postlong-user}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\protect\glsabbrvuserfont{\the\glsshorttok}},
sort={\the\glsshorttok},
- first={\protect\glsfirstlongfont{\the\glslongtok}},%
- firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
- plural={\protect\glsabbrvfont{\the\glsshortpltok}},%
+ first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
+ plural={\protect\glsabbrvuserfont{\the\glsshortpltok}},%
description={\protect\glslonguserfont{\the\glslongtok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\csdef{glsxtrpostlink\glscategorylabel}{%
\glsxtrifwasfirstuse
{%
\glsxtruserparen
- {\glsfirstabbrvuserfont{\glsentrylong{\glslabel}}}%
+ {\glsfirstlonguserfont{\glsentrylong{\glslabel}}}%
{\glslabel}%
}%
{}%
@@ -6909,59 +8656,61 @@
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonguserfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslonguserfont{##1}}%
\renewcommand*{\glsxtrfullformat}[2]{%
- \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
}%
\renewcommand*{\glsxtrfullplformat}[2]{%
- \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
}%
\renewcommand*{\Glsxtrfullformat}[2]{%
- \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
}%
\renewcommand*{\Glsxtrfullplformat}[2]{%
- \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
}%
\renewcommand*{\glsxtrinlinefullformat}[2]{%
- \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslong{##1}}}{##1}%
}%
\renewcommand*{\glsxtrinlinefullplformat}[2]{%
- \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslongpl{##1}}}{##1}%
}%
\renewcommand*{\Glsxtrinlinefullformat}[2]{%
- \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslong{##1}}}{##1}%
}%
\renewcommand*{\Glsxtrinlinefullplformat}[2]{%
- \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslongpl{##1}}}{##1}%
}%
}
\newabbreviationstyle{short-postlong-user-desc}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}%
+ name={\protect\glsabbrvuserfont{\the\glsshorttok}%
\protect\glsxtruserparen
- {\protect\glsfirstlongfont{\the\glslongpltok}}%
+ {\protect\glslonguserfont{\the\glslongpltok}}%
{\the\glslabeltok}},
sort={\the\glsshorttok},
- first={\protect\glsfirstlongfont{\the\glslongtok}},%
- firstplural={\protect\glsfirstlongfont{\the\glslongpltok}},%
- plural={\protect\glsabbrvfont{\the\glsshortpltok}}}%
+ first={\protect\glsfirstlonguserfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}},%
+ text={\protect\glsabbrvuserfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvuserfont{\the\glsshortpltok}}%
+ }%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\csdef{glsxtrpostlink\glscategorylabel}{%
\glsxtrifwasfirstuse
{%
\glsxtruserparen
- {\glsfirstabbrvuserfont{\glsentrylong{\glslabel}}}%
+ {\glsfirstlonguserfont{\glsentrylong{\glslabel}}}%
{\glslabel}%
}%
{}%
@@ -6978,7 +8727,25 @@
}
\newabbreviationstyle{long-short-user-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{long-short-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrlongshortdescname},
+ sort={\glsxtrlongshortdescsort},%
+ first={\protect\glsfirstlonguserfont{\the\glslongtok}%
+ \protect\glsxtruserparen{\protect\glsfirstabbrvuserfont{\the\glsshorttok}}%
+ {\the\glslabeltok}},%
+ firstplural={\protect\glsfirstlonguserfont{\the\glslongpltok}%
+ \protect\glsxtruserparen
+ {\protect\glsfirstabbrvuserfont{\the\glsshortpltok}}{\the\glslabeltok}},%
+ text={\protect\glsabbrvfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
\GlsXtrUseAbbrStyleFmts{long-short-user}%
@@ -6986,14 +8753,16 @@
\newabbreviationstyle{short-long-user}%
{%
\renewcommand*{\CustomAbbreviationFields}{%
- name={\protect\glsabbrvfont{\the\glsshorttok}},
+ name={\protect\glsabbrvuserfont{\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\glsabbrvfont{\the\glsshortpltok}}}%
+ first={\protect\glsfirstabbrvuserfont{\the\glsshorttok}%
+ \protect\glsxtruserparen{\protect\glsfirstlonguserfont{\the\glslongtok}}%
+ {\the\glslabeltok}},%
+ firstplural={\protect\glsfirstabbrvuserfont{\the\glsshortpltok}%
+ \protect\glsxtruserparen{\protect\glsfirstlonguserfont{\the\glslongpltok}}%
+ {\the\glslabeltok}},%
+ plural={\protect\glsabbrvuserfont{\the\glsshortpltok}}}%
\renewcommand*{\GlsXtrPostNewAbbreviation}{%
\glshasattribute{\the\glslabeltok}{regular}%
{%
@@ -7009,33 +8778,665 @@
\renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonguserfont{##1}}%
\renewcommand*{\glslongfont}[1]{\glslonguserfont{##1}}%
\renewcommand*{\glsxtrfullformat}[2]{%
- \glsfirstabbrvfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslong{##1}}}{##1}%
}%
\renewcommand*{\glsxtrfullplformat}[2]{%
- \glsfirstabbrvfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslongpl{##1}}}{##1}%
}%
\renewcommand*{\Glsxtrfullformat}[2]{%
- \glsfirstabbrvfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\Glsaccessshort{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstlongfont{\glsaccesslong{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslong{##1}}}{##1}%
}%
\renewcommand*{\Glsxtrfullplformat}[2]{%
- \glsfirstabbrvfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \glsfirstabbrvuserfont{\Glsaccessshortpl{##1}\ifglsxtrinsertinside##2\fi}%
\ifglsxtrinsertinside\else##2\fi
- \glsxtruserparen{\glsfirstlongfont{\glsaccesslongpl{##1}}}{##1}%
+ \glsxtruserparen{\glsfirstlonguserfont{\glsaccesslongpl{##1}}}{##1}%
}%
}
\newabbreviationstyle{short-long-user-desc}%
{%
- \GlsXtrUseAbbrStyleSetup{short-long-desc}%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortlongdescname},
+ sort={\glsxtrshortlongdescsort},%
+ first={\protect\glsfirstabbrvuserfont{\the\glsshorttok}%
+ \protect\glsxtruserparen{\protect\glsfirstlonguserfont{\the\glslongtok}}%
+ {\the\glslabeltok}},%
+ firstplural={\protect\glsfirstabbrvuserfont{\the\glsshortpltok}%
+ \protect\glsxtruserparen{\protect\glsfirstlonguserfont{\the\glslongpltok}}%
+ {\the\glslabeltok}},%
+ text={\protect\glsabbrvfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
}%
{%
\GlsXtrUseAbbrStyleFmts{short-long-user}%
}
+\newrobustcmd*{\glsxtrifhyphenstart}[3]{%
+ \ifx\glsinsert#1\relax
+ \expandafter\@glsxtrifhyphenstart#1\relax\relax
+ \@end@glsxtrifhyphenstart{#2}{#3}%
+ \else
+ \@glsxtrifhyphenstart#1\relax\relax\@end@glsxtrifhyphenstart{#2}{#3}%
+ \fi
+}
+\def\@glsxtrifhyphenstart#1#2\@end@glsxtrifhyphenstart#3#4{%
+ \ifx-#1\relax#3\else #4\fi
+}
+\newcommand*{\glsxtrlonghyphenshort}[4]{%
+ {%
+ \glsxtrifhyphenstart{#4}{\def\glsxtrwordsep{-}}{}%
+ \glsfirstlonghyphenfont{#2\ifglsxtrinsertinside{#4}\fi}%
+ \ifglsxtrinsertinside\else{#4}\fi
+ \glsxtrfullsep{#1}%
+ \glsxtrparen{\glsfirstabbrvhyphenfont{#3\ifglsxtrinsertinside{#4}\fi}%
+ \ifglsxtrinsertinside\else{#4}\fi}%
+ }%
+}
+\newcommand*{\glsabbrvhyphenfont}{\glsabbrvdefaultfont}%
+\newcommand*{\glsfirstabbrvhyphenfont}{\glsabbrvhyphenfont}%
+\newcommand*{\glslonghyphenfont}{\glslongdefaultfont}%
+\newcommand*{\glsfirstlonghyphenfont}{\glslonghyphenfont}%
+\newcommand*{\glsxtrhyphensuffix}{\glsxtrabbrvpluralsuffix}
+\newabbreviationstyle{long-hyphen-short-hyphen}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlonghyphenfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}}},%
+ plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}},%
+ description={\protect\glslonghyphenfont{\the\glslongtok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrhyphensuffix}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvhyphenfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvhyphenfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonghyphenfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslonghyphenfont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsxtrlonghyphenshort{##1}{\glsaccesslong{##1}}{\glsaccessshort{##1}}{##2}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsxtrlonghyphenshort{##1}{\glsaccesslongpl{##1}}%
+ {\glsaccessshortpl{##1}}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsxtrlonghyphenshort{##1}{\Glsaccesslong{##1}}{\glsaccessshort{##1}}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsxtrlonghyphenshort{##1}{\Glsaccesslongpl{##1}}%
+ {\glsaccessshortpl{##1}}{##2}%
+ }%
+}
+\newabbreviationstyle{long-hyphen-short-hyphen-desc}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrlongshortdescname},
+ sort={\glsxtrlongshortdescsort},
+ first={\protect\glsfirstlonghyphenfont{\the\glslongtok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}}},%
+ firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}}},%
+ text={\protect\glsabbrvhyphenfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-hyphen-short-hyphen}%
+}
+\newcommand*{\glsxtrlonghyphennoshort}[3]{%
+ {%
+ \glsxtrifhyphenstart{#3}{\def\glsxtrwordsep{-}}{}%
+ \glsfirstlonghyphenfont{#2\ifglsxtrinsertinside{#3}\fi}%
+ \ifglsxtrinsertinside\else{#3}\fi
+ }%
+}
+\newabbreviationstyle{long-hyphen-noshort-desc-noreg}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\protect\glslonghyphenfont{\the\glslongtok}},
+ sort={\expandonce\glsxtrorglong},
+ first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
+ plural={\protect\glslonghyphenfont{\the\glslongpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-hyphen-short-hyphen}%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrabbrvpluralsuffix}%
+ \renewcommand*\glsabbrvfont[1]{\glsabbrvdefaultfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvdefaultfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonghyphenfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslonghyphenfont{##1}}%
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\glsaccesslong{##1}}{##2}%
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\glsaccesslongpl{##1}}{##2}%
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\Glsaccesslong{##1}}{##2}%
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\Glsaccesslongpl{##1}}{##2}%
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\glsaccesslong{##1}}{##2}%
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\glsaccesslongpl{##1}}{##2}%
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\Glsaccesslong{##1}}{##2}%
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\Glsaccesslongpl{##1}}{##2}%
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\glsaccesslong{##1}}{##2}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\glsaccesslongpl{##1}}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\Glsaccesslong{##1}}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsxtrlonghyphennoshort{##1}{\Glsaccesslongpl{##1}}{##2}%
+ }%
+}
+\newabbreviationstyle{long-hyphen-noshort-noreg}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
+ text={\protect\glslonghyphenfont{\the\glslongtok}},%
+ plural={\protect\glslonghyphenfont{\the\glslongpltok}},%
+ description={\the\glslongtok}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-desc}%
+}
+\newcommand*{\glsxtrlonghyphen}[3]{%
+ {%
+ \glsxtrifhyphenstart{#3}{\def\glsxtrwordsep{-}}{}%
+ \glsfirstlonghyphenfont{#1}%
+ }%
+}
+\newcommand*{\glsxtrposthyphenshort}[2]{%
+ {%
+ \glsxtrifhyphenstart{#2}{\def\glsxtrwordsep{-}}{}%
+ \ifglsxtrinsertinside{\glsfirstlonghyphenfont{#2}}\else{#2}\fi
+ \glsxtrfullsep{#1}%
+ \glsxtrparen
+ {\glsfirstabbrvhyphenfont{\glsentryshort{#1}\ifglsxtrinsertinside{#2}\fi}%
+ \ifglsxtrinsertinside\else{#2}\fi
+ }%
+ }%
+}
+\newcommand*{\glsxtrposthyphensubsequent}[2]{%
+ \glsabbrvfont{\ifglsxtrinsertinside {#2}\fi}%
+ \ifglsxtrinsertinside \else{#2}\fi
+}
+\newabbreviationstyle{long-hyphen-postshort-hyphen}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
+ plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}},%
+ description={\protect\glslonghyphenfont{\the\glslongtok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+ \glsxtrposthyphenshort{\glslabel}{\glsinsert}%
+ }%
+ {%
+ \glsxtrposthyphensubsequent{\glslabel}{\glsinsert}%
+ }%
+ }%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrabbrvpluralsuffix}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvhyphenfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvhyphenfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonghyphenfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslonghyphenfont{##1}}%
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glsabbrvfont{\glsaccessshort{##1}}%
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glsabbrvfont{\glsaccessshortpl{##1}}%
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glsabbrvfont{\Glsaccessshort{##1}}%
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glsabbrvfont{\Glsaccessshortpl{##1}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsxtrlonghyphen{\glsaccesslong{##1}}{##1}{##2}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsxtrlonghyphen{\glsaccesslongpl{##1}}{##1}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsxtrlonghyphen{\Glsaccesslong{##1}}{##1}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsxtrlonghyphen{\Glsaccesslongpl{##1}}{##1}{##2}%
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlonghyphenfont{\glsaccesslong{##1}%
+ \ifglsxtrinsertinside{##2}\fi}%
+ \ifglsxtrinsertinside \else{##2}\fi
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlonghyphenfont{\glsaccesslongpl{##1}%
+ \ifglsxtrinsertinside{##2}\fi}%
+ \ifglsxtrinsertinside \else{##2}\fi
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlonghyphenfont{\Glsaccesslong{##1}%
+ \ifglsxtrinsertinside{##2}\fi}%
+ \ifglsxtrinsertinside \else{##2}\fi
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlonghyphenfont{\Glsaccesslongpl{##1}%
+ \ifglsxtrinsertinside{##2}\fi}%
+ \ifglsxtrinsertinside \else{##2}\fi
+ }%
+}
+\newabbreviationstyle{long-hyphen-postshort-hyphen-desc}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrlongshortdescname},
+ sort={\glsxtrlongshortdescsort},%
+ first={\protect\glsfirstlonghyphenfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlonghyphenfont{\the\glslongpltok}},%
+ text={\protect\glsabbrvhyphenfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+ \glsxtrposthyphenshort{\glslabel}{\glsinsert}%
+ }%
+ {%
+ \glsxtrposthyphensubsequent{\glslabel}{\glsinsert}%
+ }%
+ }%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-hyphen-postshort-hyphen}%
+}
+\newcommand*{\glsxtrshorthyphenlong}[4]{%
+ {%
+ \glsxtrifhyphenstart{#4}{\def\glsxtrwordsep{-}}{}%
+ \glsfirstabbrvhyphenfont{#2\ifglsxtrinsertinside{#4}\fi}%
+ \ifglsxtrinsertinside\else{#4}\fi
+ \glsxtrfullsep{#1}%
+ \glsxtrparen{\glsfirstlonghyphenfont{#3\ifglsxtrinsertinside{#4}\fi}%
+ \ifglsxtrinsertinside\else{#4}\fi}%
+ }%
+}
+\newabbreviationstyle{short-hyphen-long-hyphen}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlonghyphenfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlonghyphenfont{\the\glslongpltok}}},%
+ plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}},%
+ description={\protect\glslonghyphenfont{\the\glslongtok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrhyphensuffix}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvhyphenfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvhyphenfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonghyphenfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslonghyphenfont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsxtrshorthyphenlong{##1}{\glsaccessshort{##1}}{\glsaccesslong{##1}}{##2}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsxtrshorthyphenlong{##1}%
+ {\glsaccessshortpl{##1}}{\glsaccesslongpl{##1}}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsxtrshorthyphenlong{##1}{\glsaccessshort{##1}}{\Glsaccesslong{##1}}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsxtrshorthyphenlong{##1}%
+ {\glsaccessshortpl{##1}}{\Glsaccesslongpl{##1}}{##2}%
+ }%
+}
+\newabbreviationstyle{short-hyphen-long-hyphen-desc}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortlongdescname},
+ sort={\glsxtrshortlongdescsort},
+ first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlonghyphenfont{\the\glslongtok}}},%
+ firstplural={\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}%
+ \protect\glsxtrfullsep{\the\glslabeltok}%
+ \glsxtrparen{\protect\glsfirstlonghyphenfont{\the\glslongpltok}}},%
+ text={\protect\glsabbrvhyphenfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-hyphen-long-hyphen}%
+}
+\newcommand*{\glsxtrshorthyphen}[3]{%
+ {%
+ \glsxtrifhyphenstart{#3}{\def\glsxtrwordsep{-}}{}%
+ \glsfirstabbrvhyphenfont{#1}%
+ }%
+}
+\newcommand*{\glsxtrposthyphenlong}[2]{%
+ {%
+ \glsxtrifhyphenstart{#2}{\def\glsxtrwordsep{-}}{}%
+ \ifglsxtrinsertinside{\glsfirstabbrvhyphenfont{#2}}\else{#2}\fi
+ \glsxtrfullsep{#1}%
+ \glsxtrparen
+ {\glsfirstlonghyphenfont{\glsentrylong{#1}\ifglsxtrinsertinside{#2}\fi}%
+ \ifglsxtrinsertinside\else{#2}\fi
+ }%
+ }%
+}
+\newabbreviationstyle{short-hyphen-postlong-hyphen}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvhyphenfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}},%
+ firstplural={\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}},%
+ plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}},%
+ description={\protect\glslonghyphenfont{\the\glslongtok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+ \glsxtrposthyphenlong{\glslabel}{\glsinsert}%
+ }%
+ {%
+ \glsxtrposthyphensubsequent{\glslabel}{\glsinsert}%
+ }%
+ }%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \renewcommand*{\abbrvpluralsuffix}{\glsxtrabbrvpluralsuffix}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvhyphenfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvhyphenfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlonghyphenfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslonghyphenfont{##1}}%
+ \renewcommand*{\glsxtrsubsequentfmt}[2]{%
+ \glsabbrvfont{\glsaccessshort{##1}}%
+ }%
+ \renewcommand*{\glsxtrsubsequentplfmt}[2]{%
+ \glsabbrvfont{\glsaccessshortpl{##1}}%
+ }%
+ \renewcommand*{\Glsxtrsubsequentfmt}[2]{%
+ \glsabbrvfont{\Glsaccessshort{##1}}%
+ }%
+ \renewcommand*{\Glsxtrsubsequentplfmt}[2]{%
+ \glsabbrvfont{\Glsaccessshortpl{##1}}%
+ }%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsxtrshorthyphen{\glsaccessshort{##1}}{##1}{##2}%
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsxtrshorthyphen{\glsaccessshortpl{##1}}{##1}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsxtrshorthyphen{\Glsaccessshort{##1}}{##1}{##2}%
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsxtrshorthyphen{\Glsaccessshortpl{##1}}{##1}{##2}%
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvhyphenfont{\glsaccessshort{##1}%
+ \ifglsxtrinsertinside{##2}\fi}%
+ \ifglsxtrinsertinside \else{##2}\fi
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvhyphenfont{\glsaccessshortpl{##1}%
+ \ifglsxtrinsertinside{##2}\fi}%
+ \ifglsxtrinsertinside \else{##2}\fi
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstabbrvhyphenfont{\Glsaccessshort{##1}%
+ \ifglsxtrinsertinside{##2}\fi}%
+ \ifglsxtrinsertinside \else{##2}\fi
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstabbrvhyphenfont{\Glsaccessshortpl{##1}%
+ \ifglsxtrinsertinside{##2}\fi}%
+ \ifglsxtrinsertinside \else{##2}\fi
+ }%
+}
+\newabbreviationstyle{short-hyphen-postlong-hyphen-desc}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtrshortlongdescname},
+ sort={\glsxtrshortlongdescsort},%
+ first={\protect\glsfirstabbrvhyphenfont{\the\glsshorttok}},%
+ firstplural={\protect\glsfirstabbrvhyphenfont{\the\glsshortpltok}},%
+ text={\protect\glsabbrvhyphenfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvhyphenfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \csdef{glsxtrpostlink\glscategorylabel}{%
+ \glsxtrifwasfirstuse
+ {%
+ \glsxtrposthyphenlong{\glslabel}{\glsinsert}%
+ }%
+ {%
+ \glsxtrposthyphensubsequent{\glslabel}{\glsinsert}%
+ }%
+ }%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{short-hyphen-postlong-hyphen}%
+}
+\newcommand*{\glsabbrvonlyfont}{\glsabbrvdefaultfont}%
+\newcommand*{\glsfirstabbrvonlyfont}{\glsabbrvonlyfont}%
+\newcommand*{\glslongonlyfont}{\glslongdefaultfont}%
+\newcommand*{\glsfirstlongonlyfont}{\glslongonlyfont}%
+\newcommand*{\glsxtronlysuffix}{\glsxtrabbrvpluralsuffix}
+\newabbreviationstyle{long-only-short-only}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\protect\glsabbrvonlyfont{\the\glsshorttok}},
+ sort={\the\glsshorttok},
+ first={\protect\glsfirstlongonlyfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlongonlyfont{\the\glslongpltok}},%
+ plural={\protect\glsabbrvonlyfont{\the\glsshortpltok}},%
+ description={\protect\glslongonlyfont{\the\glslongtok}}}%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \renewcommand*{\abbrvpluralsuffix}{\protect\glsxtronlysuffix}%
+ \renewcommand*{\glsabbrvfont}[1]{\glsabbrvonlyfont{##1}}%
+ \renewcommand*{\glsfirstabbrvfont}[1]{\glsfirstabbrvonlyfont{##1}}%
+ \renewcommand*{\glsfirstlongfont}[1]{\glsfirstlongonlyfont{##1}}%
+ \renewcommand*{\glslongfont}[1]{\glslongonlyfont{##1}}%
+ \renewcommand*{\glsxtrfullformat}[2]{%
+ \glsfirstlongonlyfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrfullplformat}[2]{%
+ \glsfirstlongonlyfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullformat}[2]{%
+ \glsfirstlongonlyfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\Glsxtrfullplformat}[2]{%
+ \glsfirstlongonlyfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ }%
+ \renewcommand*{\glsxtrinlinefullformat}[2]{%
+ \glsfirstlongonlyfont{\glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvonlyfont{\glsaccessshort{##1}}}%
+ }%
+ \renewcommand*{\glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongonlyfont{\glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvonlyfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullformat}[2]{%
+ \glsfirstlongonlyfont{\Glsaccesslong{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvonlyfont{\glsaccessshortpl{##1}}}%
+ }%
+ \renewcommand*{\Glsxtrinlinefullplformat}[2]{%
+ \glsfirstlongonlyfont{\Glsaccesslongpl{##1}\ifglsxtrinsertinside##2\fi}%
+ \ifglsxtrinsertinside\else##2\fi
+ \glsxtrfullsep{##1}%
+ \glsxtrparen{\protect\glsfirstabbrvonlyfont{\Glsaccessshortpl{##1}}}%
+ }%
+}
+\newcommand*{\glsxtronlydescsort}{\the\glslongtok}
+\newcommand*{\glsxtronlydescname}{%
+ \protect\glslongfont{\the\glslongtok}%
+}
+\newabbreviationstyle{long-only-short-only-desc}%
+{%
+ \renewcommand*{\CustomAbbreviationFields}{%
+ name={\glsxtronlydescname},
+ sort={\glsxtronlydescsort},%
+ first={\protect\glsfirstlongonlyfont{\the\glslongtok}},%
+ firstplural={\protect\glsfirstlongonlyfont{\the\glslongpltok}},%
+ text={\protect\glsabbrvonlyfont{\the\glsshorttok}},%
+ plural={\protect\glsabbrvonlyfont{\the\glsshortpltok}}%
+ }%
+ \renewcommand*{\GlsXtrPostNewAbbreviation}{%
+ \glshasattribute{\the\glslabeltok}{regular}%
+ {%
+ \glssetattribute{\the\glslabeltok}{regular}{false}%
+ }%
+ {}%
+ }%
+}%
+{%
+ \GlsXtrUseAbbrStyleFmts{long-only-short-only}%
+}
\let\@glsxtr@org@markright\markright
\renewcommand*{\markright}[1]{%
\glsxtrmarkhook