summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-08-10 21:21:54 +0000
committerKarl Berry <karl@freefriends.org>2017-08-10 21:21:54 +0000
commit75203398cd63828ec3ddd066e69ac01ac3c03262 (patch)
treecfb5cab1d45377e4a284eb03065a0ae98004621c
parent7632db03e7814976aa5e919276513ae0b4e442b8 (diff)
glossaries (10aug17)
git-svn-id: svn://tug.org/texlive/trunk@45010 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/CHANGES8
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/README4
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdfbin1164242 -> 1161735 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/glossaries-user.html16
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdfbin766665 -> 766664 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex8
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html4
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdfbin156677 -> 156676 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex4
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html2
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdfbin142456 -> 142454 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex2
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdfbin252930 -> 252930 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdfbin49969 -> 49969 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdfbin37969 -> 37969 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdfbin33661 -> 33661 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdfbin29951 -> 29951 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdfbin58829 -> 58829 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdfbin54834 -> 54834 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdfbin53468 -> 53468 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdfbin82200 -> 82200 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdfbin52806 -> 52806 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdfbin36467 -> 36467 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdfbin36851 -> 36851 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdfbin34916 -> 34916 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdfbin50715 -> 50715 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdfbin31821 -> 31821 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdfbin43388 -> 43388 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdfbin146849 -> 147066 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdfbin38866 -> 38866 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdfbin39209 -> 39209 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdfbin96013 -> 96013 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdfbin67092 -> 67092 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdfbin41759 -> 41759 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdfbin41990 -> 41990 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdfbin43273 -> 43273 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdfbin21722 -> 21722 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdfbin39905 -> 39905 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdfbin37671 -> 37671 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample.pdfbin102520 -> 102733 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdfbin43333 -> 43333 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdfbin65517 -> 65517 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdfbin65625 -> 65625 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdfbin93623 -> 93623 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdfbin47055 -> 47055 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdfbin48407 -> 48407 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdfbin155768 -> 155610 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdfbin169231 -> 169073 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdfbin91354 -> 91354 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdfbin98477 -> 98695 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdfbin47470 -> 47470 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdfbin65680 -> 65680 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdfbin94862 -> 95075 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdfbin41167 -> 41167 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdfbin37213 -> 37213 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdfbin66925 -> 66925 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdfbin44951 -> 44951 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdfbin178595 -> 178878 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdfbin68412 -> 68412 bytes
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.dtx89
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.ins2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty12
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty2
78 files changed, 104 insertions, 79 deletions
diff --git a/Master/texmf-dist/doc/latex/glossaries/CHANGES b/Master/texmf-dist/doc/latex/glossaries/CHANGES
index 72a17349b86..cfabe9cc936 100644
--- a/Master/texmf-dist/doc/latex/glossaries/CHANGES
+++ b/Master/texmf-dist/doc/latex/glossaries/CHANGES
@@ -1,5 +1,13 @@
glossaries change log:
+v4.31 (2017-08-10):
+
+ * glossaries.sty:
+
+ - Bug fix: 'nolist' option sets default style to \relax
+ if currently set to 'list' to prevent trying to set an
+ undefined style.
+
v4.30 (2017-06-11):
* glossaries.sty:
diff --git a/Master/texmf-dist/doc/latex/glossaries/README b/Master/texmf-dist/doc/latex/glossaries/README
index ade6ef25905..70aaf07bb17 100644
--- a/Master/texmf-dist/doc/latex/glossaries/README
+++ b/Master/texmf-dist/doc/latex/glossaries/README
@@ -1,6 +1,6 @@
-LaTeX Package : glossaries v4.30
+LaTeX Package : glossaries v4.31
-Last Modified : 2017-06-11
+Last Modified : 2017-08-10
Author : Nicola Talbot
diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdf b/Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdf
index a6a62ffb597..8cb5ed91b28 100644
--- a/Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html
index 6db4672d6ef..c465883a9af 100644
--- a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html
+++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html
@@ -235,7 +235,7 @@ div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; cle
>
<!--l. 406--><p class="noindent" >
</p><!--l. 406--><p class="noindent" ><span
-class="cmr-17">User Manual for glossaries.sty v4.30</span>
+class="cmr-17">User Manual for glossaries.sty v4.31</span>
</p>
<div class="tabular"> <table id="TBL-1" class="tabular"
cellspacing="0" cellpadding="0"
@@ -251,7 +251,7 @@ href="http://www.dickimaw-books.com/" class="url" ><span
class="cmtt-12">http://www.dickimaw-books.com/</span></a> </td></tr></table>
</div>
<!--l. 406--><p class="noindent" ><span
-class="cmr-12">2017-06-11</span></p></div>
+class="cmr-12">2017-08-10</span></p></div>
<div
class="abstract"
>
@@ -378,7 +378,7 @@ class="cmtt-10">glossaries-code.pdf</span></a> </dt><dd
class="description">Advanced users wishing to know more about the inner workings
of all the packages provided in the <span
class="cmss-10">glossaries </span>bundle should read &#8220;Documented
- Code for glossaries v4.30&#8221;.
+ Code for glossaries v4.31&#8221;.
</dd><dt class="description">
<span
class="cmbx-10">INSTALL</span> </dt><dd
@@ -9847,13 +9847,13 @@ reluctantly removed this restriction in version 1.13, but there are issues with
commands in the <span
class="cmss-10">document</span><a
id="dx1-40003"></a><a
- id="dx1-40004"></a> environment instead of the preamble, which is why the
-restriction is maintained for newer commands. This restriction is also reimposed for
-<span
-class="cmtt-10">\newglossaryentry </span>by the new <a
+ id="dx1-40004"></a> environment instead of the preamble, which is why the restriction
+is maintained for newer commands. This restriction is also reimposed for <span
+class="cmtt-10">\newglossaryentry</span>
+by the new <a
href="#option1">Option&#x00A0;1</a>. (The <a
href="#glo:glossaries-extra"><span
-class="cmss-10">glossaries-extra</span></a> automatically reimposes this
+class="cmss-10">glossaries-extra</span></a> package automatically reimposes this
restriction for Options&#x00A0;<a
href="#option2">2</a> and&#x00A0;<a
href="#option3">3</a> but provides a package option to allow document
diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf
index 62af75bd095..483383c682b 100644
--- a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex
index 09f5b8d9449..1a2cac34955 100644
--- a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex
@@ -398,11 +398,11 @@ and~\hyperlink{option#2}{#2}}
\MakeShortVerb{"}
\DeleteShortVerb{\|}
- \title{User Manual for glossaries.sty v4.30}
+ \title{User Manual for glossaries.sty v4.31}
\author{Nicola L.C. Talbot\\%
\url{http://www.dickimaw-books.com/}}
- \date{2017-06-11}
+ \date{2017-08-10}
\maketitle
\begin{abstract}
@@ -480,7 +480,7 @@ package.
\item[\url{glossaries-code.pdf}]
Advanced users wishing to know more about the inner workings of all the
packages provided in the \styfmt{glossaries} bundle should read
-\qt{Documented Code for glossaries v4.30}.
+\qt{Documented Code for glossaries v4.31}.
\item[INSTALL] Installation instructions.
@@ -5090,7 +5090,7 @@ but there are issues with defining commands in the \env{document}
environment instead of the preamble, which is why the restriction is
maintained for newer commands. This restriction is also reimposed
for \cs{newglossaryentry} by the new \opt1. (The
-\gls{glossaries-extra} automatically reimposes this restriction for
+\gls{glossaries-extra} package automatically reimposes this restriction for
\optsand23 but provides a package option to allow document
definitions.)
diff --git a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html
index 7ab6372b823..d58ed282596 100644
--- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html
+++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html
@@ -208,7 +208,7 @@ div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; cle
>
<!--l. 44--><p class="noindent" >
</p><!--l. 44--><p class="noindent" ><span
-class="cmr-17">The glossaries package v4.30: a guide for</span>
+class="cmr-17">The glossaries package v4.31: a guide for</span>
<span
class="cmr-17">beginners</span>
</p>
@@ -221,7 +221,7 @@ class="td11"> <span
class="cmr-12">Nicola L.C. Talbot </span></td></tr></table>
</div>
<!--l. 44--><p class="noindent" ><span
-class="cmr-12">2017-06-11</span></p></div>
+class="cmr-12">2017-08-10</span></p></div>
<div
class="abstract"
>
diff --git a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf
index 9a41094ffcf..0c4fc87f40e 100644
--- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex
index 07b629b0ced..31161dc660a 100644
--- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex
@@ -20,10 +20,10 @@
\newcommand*{\yes}{\ding{52}}
\newcommand*{\no}{\ding{56}}
-\title{The glossaries package v4.30:
+\title{The glossaries package v4.31:
a guide for beginners}
\author{Nicola L.C. Talbot}
-\date{2017-06-11}
+\date{2017-08-10}
\ifpdf
\externaldocument{glossaries-user}
diff --git a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html
index 8628abf7409..7b2c51e749b 100644
--- a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html
+++ b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html
@@ -200,7 +200,7 @@ class="td11"><span
class="cmr-12">Nicola L.C. Talbot</span></td></tr></table>
</div>
<!--l. 51--><p class="noindent" ><span
-class="cmr-12">2017-06-11</span></p></div>
+class="cmr-12">2017-08-10</span></p></div>
<div
class="abstract"
>
diff --git a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf
index 4264e816a78..c5df8b6f6c5 100644
--- a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex
index 56f8353584f..368009d0c13 100644
--- a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex
@@ -33,7 +33,7 @@
\title{Upgrading from the glossary package to the glossaries
package}
\author{Nicola L.C. Talbot}
-\date{2017-06-11}
+\date{2017-08-10}
\newenvironment{oldway}{%
\begin{labelledbox}{\styfmt{glossary}}\ttfamily\obeylines
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf
index 9895ba6b6bb..62b4747e705 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf
index b161187cc36..4a6a867da07 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdf
index e97940224b6..0d784c6a485 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdf
index b81c71c685c..1ece7bd4c26 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdf
index 0d02a336eaa..c466f5eeab7 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf
index c297a260dc5..2e22fa2050c 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdf
index 69c41c07082..8b32c1930c1 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf
index 452e3f53d4e..39777a58232 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf
index 77daad81ba8..63bdc9145bb 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdf
index 9bf2b5a8188..10b88f19b12 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf
index 18a10a1f685..7c1a5dc29ab 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdf
index f72ccde9691..787f2c4b2d6 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf
index 5d9bacbe104..b6fad365865 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdf
index 7e13c7e3b94..cdc0f272c7b 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf
index 816af5fd65e..d7df0dda454 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf
index 3817a80f616..de9d1a85e02 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf
index 338e6b35063..daece559f36 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf
index 3d12bf32a08..334f9b3dd0e 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf
index 5f4ebcd4686..2a7118032f1 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf
index b222f0e271e..805ee7733bc 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf
index 8286b2e3fca..1508b899cbe 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf
index dd7dde4f12c..20a3860aa83 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf
index cff3bc426f4..4241f249f63 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf
index cbcda953012..bccf6d90f7b 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf
index a6169c9f228..7da5491bc2b 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdf
index 58fd550f5e4..bae0b4c07ac 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdf
index 955420f6b18..a0d782d7173 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf
index 89a4de4b2a7..174c53fff89 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf
index 8239ef826b5..bce954e5625 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf
index 4928c84658d..340eaef67c5 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf
index 9568fab6a4a..9a66c1934b5 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf
index 2a53761cd06..286df91fad0 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf
index 83d2c964875..9c544b56de0 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf
index 880d25da07a..f4e9d934799 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf
index eef2313926b..323990deb87 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf
index 11aefa83f54..e2b5c0ea07e 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf
index b9ffa5ed89c..f0bc6308b95 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf
index 545035cb373..57eb951d986 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf
index cbd816cfd0b..8da2bf6c61c 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf
index 505f23d3e96..894e2129a84 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf
index 1d242356b7b..057e8488313 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf
index b4832093c6d..e9f2fe47110 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf
index 6f0566f2b32..c68b8392ea8 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf
index 51bfcbdc964..3279d8a0b08 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf
index 5361e4bcd67..8f83fe8a352 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf
index a9bfeeeb4ba..d9a4cfdf81f 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf
index 8b99ccf89de..3dcb5903365 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
index 73ace503d2d..7ac7d934d34 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
@@ -1,19 +1,7 @@
%\iffalse
-% glossaries.dtx generated using makedtx version 1.1 (c) Nicola Talbot
+% glossaries.dtx generated using makedtx version 1.2 (c) Nicola Talbot
% Command line args:
-% -setambles ".*\.perl=>\nopreamble\nopostamble"
-% -setambles ".*\.tex=>\nopreamble\nopostamble"
-% -setambles ".*\.xdy=>\nopreamble\nopostamble"
% -codetitle "Main Package Code"
-% -section "chapter"
-% -macrocode ".*\.perl"
-% -macrocode ".*\.tex"
-% -macrocode ".*\.xdy"
-% -author "Nicola Talbot"
-% -doc "glossaries-manual.tex"
-% -comment ".*\.perl"
-% -comment ".*\.tex"
-% -comment ".*\.xdy"
% -src "glossaries\.sty\Z=>glossaries.sty"
% -src "glossaries-prefix.sty\Z=>glossaries-prefix.sty"
% -src "(glossary-.+)\.(sty)\Z=>\1.\2"
@@ -30,8 +18,20 @@
% -src "(samplexdy-mc.*\.xdy)\Z=>\1"
% -src "(database.*\.tex)\Z=>\1"
% -src "(.*\.perl)\Z=>\1"
+% -macrocode ".*\.perl"
+% -macrocode ".*\.tex"
+% -macrocode ".*\.xdy"
+% -section "chapter"
+% -author "Nicola Talbot"
+% -doc "glossaries-manual.tex"
+% -comment ".*\.perl"
+% -comment ".*\.tex"
+% -comment ".*\.xdy"
+% -setambles ".*\.perl=>\nopreamble\nopostamble"
+% -setambles ".*\.tex=>\nopreamble\nopostamble"
+% -setambles ".*\.xdy=>\nopreamble\nopostamble"
% glossaries
-% Created on 2017/6/11 13:36
+% Created on 2017/8/10 16:07
%\fi
%\iffalse
%<*package>
@@ -145,7 +145,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\setcounter{IndexColumns}{2}
-\CheckSum{19312}
+\CheckSum{19317}
\newcommand*{\ifirstuse}{\iterm{first use}}
\newcommand*{\firstuse}{\gls{firstuse}}
@@ -172,12 +172,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
%\fi
%\MakeShortVerb{"}
%
-% \title{Documented Code For glossaries v4.30}
+% \title{Documented Code For glossaries v4.31}
% \author{Nicola L.C. Talbot\\[10pt]
%Dickimaw Books\\
%\url{http://www.dickimaw-books.com/}}
%
-% \date{2017-06-11}
+% \date{2017-08-10}
% \maketitle
%
%This is the documented code for the \styfmt{glossaries} package.
@@ -193,7 +193,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
%glossaries package}.
%
%\item[\url{glossaries-user.pdf}]
-%For the main user guide, read \qt{glossaries.sty v4.30:
+%For the main user guide, read \qt{glossaries.sty v4.31:
%\LaTeX2e\ Package to Assist Generating Glossaries}.
%
%\item[\url{mfirstuc-manual.pdf}]
@@ -248,7 +248,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
% This package requires \LaTeXe.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossaries}[2017/08/10 v4.31 (NLCT)]
% \end{macrocode}
%\changes{4.18}{2015-09-09}{split mfirstuc into separate bundle}
% Required packages:
@@ -517,9 +517,12 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% set a style that is defined in another package. This package comes
% with some predefined styles that are defined in
% \autoref{sec:code:styles}.
+%\changes{4.31}{2017-09-10}{changed \cs{renewcommand} to \cs{def}}
+%This now uses \cs{def} instead of \cs{renewcommand} as
+% \cs{@glossary@default@style} may have been set to \cs{relax}.
% \begin{macrocode}
\define@key{glossaries.sty}{style}{%
- \renewcommand*{\@glossary@default@style}{#1}%
+ \def\@glossary@default@style{#1}%
}
% \end{macrocode}
%\end{option}
@@ -640,9 +643,17 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% This option prevents \isty{glossary-list} from being loaded
% (to reduce overheads if required). Naturally, the styles defined
% in \isty{glossary-list} will not be available if this option
-% is used.
-% \begin{macrocode}
-\@gls@declareoption{nolist}{\renewcommand*{\@gls@loadlist}{}}
+% is used. If the style is still set to \glostyle{list}, the default
+% must be set to \cs{relax}.
+%\changes{4.31}{2017-08-10}{added check for \qt{list} style}
+% \begin{macrocode}
+\@gls@declareoption{nolist}{%
+ \renewcommand*{\@gls@loadlist}{%
+ \ifdefstring{\@glossary@default@style}{list}%
+ {\let\@glossary@default@style\relax}%
+ {}%
+ }%
+}
% \end{macrocode}
%\end{option}
%
@@ -18558,7 +18569,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \cs{gls}\marg{label}} on subsequent use.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-prefix}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossaries-prefix}[2017/08/10 v4.31 (NLCT)]
% \end{macrocode}
% Pass all options to \sty{glossaries}:
% \begin{macrocode}
@@ -18973,7 +18984,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%\label{sec:code:hypernav}
% Package Definition:
% \begin{macrocode}
-\ProvidesPackage{glossary-hypernav}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-hypernav}[2017/08/10 v4.31 (NLCT)]
% \end{macrocode}
%
% The commands defined in this package are provided to
@@ -19153,7 +19164,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% This defines an in-line style where the entries are
% comma-separated with just the name and description displayed.
% \begin{macrocode}
-\ProvidesPackage{glossary-inline}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-inline}[2017/08/10 v4.31 (NLCT)]
% \end{macrocode}
%
%\begin{style}{inline}
@@ -19344,7 +19355,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \ics{item} command, it will appear in a bold font by
% default.
% \begin{macrocode}
-\ProvidesPackage{glossary-list}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-list}[2017/08/10 v4.31 (NLCT)]
% \end{macrocode}
%\begin{macro}{\indexspace}
%\changes{4.13}{2015-02-03}{new}
@@ -19626,7 +19637,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% The glossary styles defined in the \isty{glossary-long} package
% used the \env{longtable} environment in the glossary.
% \begin{macrocode}
-\ProvidesPackage{glossary-long}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-long}[2017/08/10 v4.31 (NLCT)]
% \end{macrocode}
% Requires the \isty{longtable} package:
% \begin{macrocode}
@@ -20123,7 +20134,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \url{http://tex.stackexchange.com/a/56890}
%
% \begin{macrocode}
-\ProvidesPackage{glossary-longbooktabs}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-longbooktabs}[2017/08/10 v4.31 (NLCT)]
% \end{macrocode}
% Requires \sty{booktabs} package:
% \begin{macrocode}
@@ -20464,7 +20475,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% used the \env{longtable} environment in the glossary and use
% ragged right formatting for the multiline columns.
% \begin{macrocode}
-\ProvidesPackage{glossary-longragged}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-longragged}[2017/08/10 v4.31 (NLCT)]
% \end{macrocode}
% Requires the \isty{array} package:
% \begin{macrocode}
@@ -20897,7 +20908,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%use the \sty{multicol} package. These use the tree-like glossary
%styles in a multicol environment.
% \begin{macrocode}
-\ProvidesPackage{glossary-mcols}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-mcols}[2017/08/10 v4.31 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -21333,7 +21344,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% The glossary styles defined in the \isty{glossary-super} package
% use the \env{supertabular} environment.
% \begin{macrocode}
-\ProvidesPackage{glossary-super}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-super}[2017/08/10 v4.31 (NLCT)]
% \end{macrocode}
% Requires the \isty{supertabular} package:
% \begin{macrocode}
@@ -21865,7 +21876,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% are like those provided by the \isty{glossary-super} package,
% except that the multiline columns have ragged right justification.
% \begin{macrocode}
-\ProvidesPackage{glossary-superragged}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-superragged}[2017/08/10 v4.31 (NLCT)]
% \end{macrocode}
% Requires the \isty{array} package:
% \begin{macrocode}
@@ -22305,7 +22316,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% that have a tree-like structure. These are designed for
% hierarchical glossaries.
% \begin{macrocode}
-\ProvidesPackage{glossary-tree}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-tree}[2017/08/10 v4.31 (NLCT)]
% \end{macrocode}
%
%\begin{macro}{\indexspace}
@@ -23026,7 +23037,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% hyperlinks may not work properly.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-207}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossaries-compatible-207}[2017/08/10 v4.31 (NLCT)]
% \end{macrocode}
%\begin{macro}{\GlsAddXdyAttribute}
% Adds an attribute in old format.
@@ -23387,7 +23398,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
%\section{glossaries-compatible-307}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-307}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossaries-compatible-307}[2017/08/10 v4.31 (NLCT)]
% \end{macrocode}
%
% Compatibility macros for predefined glossary styles:
@@ -24195,7 +24206,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% \end{macrocode}
% Package version number now in line with main glossaries package number.
% \begin{macrocode}
-\ProvidesPackage{glossaries-accsupp}[2017/06/11 v4.30 (NLCT)
+\ProvidesPackage{glossaries-accsupp}[2017/08/10 v4.31 (NLCT)
Experimental glossaries accessibility]
% \end{macrocode}
% Pass all options to \sty{glossaries}:
@@ -26634,7 +26645,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% modules.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2017/08/10 v4.31 (NLCT)]
% \end{macrocode}
% Load \sty{tracklang} to obtain language settings.
% \begin{macrocode}
@@ -26678,7 +26689,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
% modules.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-polyglossia}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossaries-polyglossia}[2017/08/10 v4.31 (NLCT)]
% \end{macrocode}
% Load \sty{tracklang} to obtain language settings.
% \begin{macrocode}
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
index 0baa886fc4c..fdfcb893648 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.ins
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
@@ -1,4 +1,4 @@
-% glossaries.ins generated using makedtx version 1.1 2017/6/11 13:36
+% glossaries.ins generated using makedtx version 1.2 2017/8/10 16:07
\input docstrip
\preamble
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
index d5fedaa56b7..95dc5e6d4b6 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2017/08/10 v4.31 (NLCT)]
\RequirePackage{tracklang}
\let\glsifusetranslator\@secondoftwo
\AnyTrackedLanguages
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty
index 7b2bb887878..20ab735ff5f 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-207}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossaries-compatible-207}[2017/08/10 v4.31 (NLCT)]
\ifglsxindy
\renewcommand*\GlsAddXdyAttribute[1]{%
\edef\@xdyattributes{\@xdyattributes ^^J \string"#1\string"}%
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty
index f99cd8b2a91..592dd42e806 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-307}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossaries-compatible-307}[2017/08/10 v4.31 (NLCT)]
\newcommand{\compatglossarystyle}[2]{%
\ifcsundef{@glscompstyle@#1}%
{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
index c1cd4ded1a1..9b19f94d605 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-polyglossia}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossaries-polyglossia}[2017/08/10 v4.31 (NLCT)]
\RequirePackage{tracklang}
\let\glsifusetranslator\@secondoftwo
\AnyTrackedLanguages
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty
index 14b310edae3..4b0fda58799 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-prefix}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossaries-prefix}[2017/08/10 v4.31 (NLCT)]
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}}
\ProcessOptions
\RequirePackage{glossaries}
diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
index e6041bfae35..c9f7c96a53d 100644
--- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossaries}[2017/08/10 v4.31 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}[2006/11/18]
\RequirePackage{mfirstuc}
@@ -142,7 +142,7 @@ false,nolabel,autolabel,nameref}[nolabel]{%
{\newcommand*{\@glossary@default@style}{index}}
{\newcommand*{\@glossary@default@style}{list}}
\define@key{glossaries.sty}{style}{%
- \renewcommand*{\@glossary@default@style}{#1}%
+ \def\@glossary@default@style{#1}%
}
\newcommand*{\@gls@declareoption}[2]{%
\DeclareOptionX{#1}{#2}%
@@ -167,7 +167,13 @@ false,nolabel,autolabel,nameref}[nolabel]{%
\newcommand*{\@gls@loadsuper}{}}
\@gls@declareoption{nosuper}{\renewcommand*{\@gls@loadsuper}{}}
\newcommand*{\@gls@loadlist}{\RequirePackage{glossary-list}}
-\@gls@declareoption{nolist}{\renewcommand*{\@gls@loadlist}{}}
+\@gls@declareoption{nolist}{%
+ \renewcommand*{\@gls@loadlist}{%
+ \ifdefstring{\@glossary@default@style}{list}%
+ {\let\@glossary@default@style\relax}%
+ {}%
+ }%
+}
\newcommand*{\@gls@loadtree}{\RequirePackage{glossary-tree}}
\@gls@declareoption{notree}{\renewcommand*{\@gls@loadtree}{}}
\@gls@declareoption{nostyles}{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
index fefd20c880f..37807b63595 100644
--- a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-accsupp}[2017/06/11 v4.30 (NLCT)
+\ProvidesPackage{glossaries-accsupp}[2017/08/10 v4.31 (NLCT)
Experimental glossaries accessibility]
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}}
\ProcessOptions
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
index b134d5c75b6..f9574fa7309 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-hypernav}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-hypernav}[2017/08/10 v4.31 (NLCT)]
\newcommand*{\glsnavhyperlink}[3][\@glo@type]{%
\edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}%
\@glslink{\glsnavhyperlinkname{#1}{#2}}{#3}}
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty
index 5159c203e92..e9662abecfb 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-inline}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-inline}[2017/08/10 v4.31 (NLCT)]
\newglossarystyle{inline}{%
\renewenvironment{theglossary}%
{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
index 6d16fa8a94c..ce37a937b2a 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-list}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-list}[2017/08/10 v4.31 (NLCT)]
\providecommand{\indexspace}{%
\par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax
}
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
index 80d9dc5150c..c342f9b430a 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-long}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-long}[2017/08/10 v4.31 (NLCT)]
\RequirePackage{longtable}
\@ifundefined{glsdescwidth}{%
\newlength\glsdescwidth
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty
index 18a8571ff51..a8683445e7f 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longbooktabs.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-longbooktabs}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-longbooktabs}[2017/08/10 v4.31 (NLCT)]
\RequirePackage{booktabs}
\RequirePackage{glossary-long}
\RequirePackage{glossary-longragged}
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty
index cabde17def0..7dc7f8dadde 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-longragged}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-longragged}[2017/08/10 v4.31 (NLCT)]
\RequirePackage{array}
\RequirePackage{longtable}
\@ifundefined{glsdescwidth}{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty
index c75f25216f9..329d8853f0f 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-mcols}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-mcols}[2017/08/10 v4.31 (NLCT)]
\RequirePackage{multicol}
\RequirePackage{glossary-tree}
\providecommand{\indexspace}{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
index 2451935af69..d5e16986ae6 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-super}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-super}[2017/08/10 v4.31 (NLCT)]
\RequirePackage{supertabular}
\@ifundefined{glsdescwidth}{%
\newlength\glsdescwidth
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty
index c85c8792135..2820a4f37cd 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-superragged}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-superragged}[2017/08/10 v4.31 (NLCT)]
\RequirePackage{array}
\RequirePackage{supertabular}
\@ifundefined{glsdescwidth}{%
diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
index 610edc78d35..34e2d460b53 100644
--- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-tree}[2017/06/11 v4.30 (NLCT)]
+\ProvidesPackage{glossary-tree}[2017/08/10 v4.31 (NLCT)]
\providecommand{\indexspace}{%
\par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax
}