summaryrefslogtreecommitdiff
path: root/macros/latex
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex')
-rw-r--r--macros/latex/contrib/glossaries/CHANGES10
-rw-r--r--macros/latex/contrib/glossaries/README.md2
-rw-r--r--macros/latex/contrib/glossaries/glossaries-code.pdfbin1583705 -> 1577360 bytes
-rw-r--r--macros/latex/contrib/glossaries/glossaries-user.html114
-rw-r--r--macros/latex/contrib/glossaries/glossaries-user.pdfbin1290651 -> 1290631 bytes
-rw-r--r--macros/latex/contrib/glossaries/glossaries-user.tex8
-rw-r--r--macros/latex/contrib/glossaries/glossaries.dtx157
-rw-r--r--macros/latex/contrib/glossaries/glossaries.ins6
-rw-r--r--macros/latex/contrib/glossaries/glossariesbegin.html470
-rw-r--r--macros/latex/contrib/glossaries/glossariesbegin.pdfbin199352 -> 199339 bytes
-rw-r--r--macros/latex/contrib/glossaries/glossariesbegin.tex4
-rw-r--r--macros/latex/contrib/glossaries/glossary2glossaries.html2
-rw-r--r--macros/latex/contrib/glossaries/glossary2glossaries.pdfbin150980 -> 150971 bytes
-rw-r--r--macros/latex/contrib/glossaries/glossary2glossaries.tex2
-rwxr-xr-xmacros/latex/contrib/glossaries/makeglossaries6
-rw-r--r--macros/latex/contrib/glossaries/makeglossaries-lite.12
-rwxr-xr-xmacros/latex/contrib/glossaries/makeglossaries-lite.lua4
-rw-r--r--macros/latex/contrib/glossaries/makeglossaries.12
-rw-r--r--macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdfbin253763 -> 253751 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/minimalgls.pdfbin52292 -> 52281 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdfbin40465 -> 40453 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/mwe-acr.pdfbin36154 -> 36142 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/mwe-gls.pdfbin32446 -> 32434 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-FnDesc.pdfbin63852 -> 63839 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdfbin57374 -> 57363 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-crossref.pdfbin60867 -> 60854 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdfbin87966 -> 87954 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdfbin56062 -> 56048 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-dual.pdfbin38963 -> 38951 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-entrycount.pdfbin39340 -> 39327 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-entryfmt.pdfbin37408 -> 37396 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-font-abbr.pdfbin54892 -> 54880 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-ignored.pdfbin34318 -> 34306 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-index.pdfbin45918 -> 45908 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-inline.pdfbin157653 -> 157981 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-langdict.pdfbin41698 -> 41686 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-newkeys.pdfbin41704 -> 41693 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdfbin102938 -> 102925 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-noidxapp.pdfbin71472 -> 71461 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdfbin45042 -> 45028 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-numberlist.pdfbin44612 -> 44600 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-prefix.pdfbin48819 -> 48812 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-si.pdfbin23394 -> 23382 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdfbin42402 -> 42390 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdfbin40167 -> 40153 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample.pdfbin127784 -> 128111 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample4col.pdfbin46610 -> 46597 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleAcr.pdfbin68921 -> 68907 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdfbin99395 -> 99383 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdfbin160568 -> 160556 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleDB.pdfbin51300 -> 51288 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleDesc.pdfbin50967 -> 50956 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleEq.pdfbin167865 -> 167747 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleEqPg.pdfbin181781 -> 181661 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdfbin158228 -> 158217 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleNtn.pdfbin105795 -> 106120 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/samplePeople.pdfbin50000 -> 49986 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleSec.pdfbin69922 -> 69909 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleSort.pdfbin101397 -> 101736 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleaccsupp.pdfbin86117 -> 86105 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleacronyms.pdfbin39707 -> 39695 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampletree.pdfbin72397 -> 72384 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleutf8.pdfbin47778 -> 47767 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/samplexdy.pdfbin144075 -> 144217 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/samplexdy2.pdfbin73171 -> 73159 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/samplexdy3.pdfbin190743 -> 190880 bytes
-rw-r--r--macros/latex/contrib/mathalpha/README10
-rw-r--r--macros/latex/contrib/mathalpha/tex/mathalpha.sty10
-rw-r--r--macros/latex/contrib/pdfoverlay/pdfoverlay.dtx29
-rw-r--r--macros/latex/contrib/pdfoverlay/pdfoverlay.ins2
-rw-r--r--macros/latex/contrib/pdfoverlay/pdfoverlay.pdfbin547326 -> 579134 bytes
-rw-r--r--macros/latex/contrib/suftesi/suftesi.dtx57
-rw-r--r--macros/latex/contrib/suftesi/suftesi.pdfbin847637 -> 848184 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/README.md3
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-DHBW.pdfbin43998 -> 43998 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-JT-Aufsaetze.pdfbin41265 -> 41265 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-JT-Geschichte.pdfbin38251 -> 38251 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-JT-Typography.pdfbin26903 -> 26903 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-KIT.pdfbin42149 -> 42149 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-KOMAScript.pdfbin166494 -> 166494 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-Markus-1.pdfbin119780 -> 119780 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-Markus-2.pdfbin128796 -> 128796 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-Spacer.pdfbin127996 -> 127996 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-TU-DD.pdfbin40396 -> 40396 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-TU-HH.pdfbin54017 -> 54017 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-UKoLa.pdfbin103389 -> 103389 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/titlepage-WWUM.pdfbin58935 -> 58935 bytes
-rw-r--r--macros/latex/contrib/uni-titlepage/uni-titlepage.dtx10
-rw-r--r--macros/latex/contrib/uni-titlepage/uni-titlepage.pdfbin865279 -> 865075 bytes
-rw-r--r--macros/latex/contrib/xcolor/ChangeLog12
-rw-r--r--macros/latex/contrib/xcolor/README3
-rw-r--r--macros/latex/contrib/xcolor/xcolor.dtx104
-rw-r--r--macros/latex/contrib/xcolor/xcolor.pdfbin706269 -> 858670 bytes
-rw-r--r--macros/latex/contrib/xcolor/xcolor2.pdfbin96760 -> 94138 bytes
94 files changed, 497 insertions, 532 deletions
diff --git a/macros/latex/contrib/glossaries/CHANGES b/macros/latex/contrib/glossaries/CHANGES
index 8e3787453b..729b3f2c67 100644
--- a/macros/latex/contrib/glossaries/CHANGES
+++ b/macros/latex/contrib/glossaries/CHANGES
@@ -1,5 +1,15 @@
glossaries change log:
+v4.49 (2021-11-01):
+
+ * glossary-list.sty:
+
+ - bug fix #187: Compilation fails if hyperref is loaded and the style is listhypergroup
+ https://www.dickimaw-books.com/bugtracker.php?key=187
+
+ - bug fix #188: Glossary style `list' undefined with v4.46 rollback
+ https://www.dickimaw-books.com/bugtracker.php?key=188
+
v4.48 (2021-10-19):
* glossary-list.sty:
diff --git a/macros/latex/contrib/glossaries/README.md b/macros/latex/contrib/glossaries/README.md
index 502378c9ff..9471f71aa0 100644
--- a/macros/latex/contrib/glossaries/README.md
+++ b/macros/latex/contrib/glossaries/README.md
@@ -1,4 +1,4 @@
-# glossaries v4.48 (2021-10-19)
+# glossaries v4.49 (2021-11-01)
Author: Nicola Talbot ([contact](http://www.dickimaw-books.com/contact))
diff --git a/macros/latex/contrib/glossaries/glossaries-code.pdf b/macros/latex/contrib/glossaries/glossaries-code.pdf
index 17be975db3..2b2f585673 100644
--- a/macros/latex/contrib/glossaries/glossaries-code.pdf
+++ b/macros/latex/contrib/glossaries/glossaries-code.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/glossaries-user.html b/macros/latex/contrib/glossaries/glossaries-user.html
index 9fb5ff0ba1..c3e01f1d7c 100644
--- a/macros/latex/contrib/glossaries/glossaries-user.html
+++ b/macros/latex/contrib/glossaries/glossaries-user.html
@@ -1340,7 +1340,7 @@ span#textcolor3{color:#008080}
>
<!--l. 690--><p class="noindent" >
</p><!--l. 690--><p class="noindent" ><span
-class="cmr-17">User Manual for glossaries.sty v4.48</span>
+class="cmr-17">User Manual for glossaries.sty v4.49</span>
</p>
<div class="tabular"> <table id="TBL-1" class="tabular"
@@ -1356,7 +1356,7 @@ href="http://www.dickimaw-books.com/contact" ><span
class="cmtt-12">dickimaw-books.com/contact</span></a> </td></tr></table>
</div>
<!--l. 690--><p class="noindent" ><span
-class="cmr-12">2021-10-19</span></p></div>
+class="cmr-12">2021-11-01</span></p></div>
<div
class="abstract"
>
@@ -1500,7 +1500,7 @@ class="cmtt-10">glossaries-code.pdf</span></a> </p></dt><dd
class="description">
<!--l. 775--><p class="noindent" >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.48&#8221;.
+class="cmss-10">glossaries </span>bundle should read &#8220;Documented Code for glossaries v4.49&#8221;.
</p></dd><dt class="description">
<!--l. 780--><p class="noindent" >
<span
@@ -1937,13 +1937,13 @@ class="cmtt-10">glossaries</span><span
class="cmsy-10">}</span></td></tr></table>
<!--l. 1--><p class="indent" >
</p><dl class="description"><dt class="description">
- <!--l. 89--><p class="noindent" >
+ <!--l. 88--><p class="noindent" >
<a
id="glo:bib2gls"></a><span
class="cmtt-10">bib2gls</span><a
id="dx1-3001"></a> </p></dt><dd
class="description">
- <!--l. 89--><p class="noindent" ><br
+ <!--l. 88--><p class="noindent" ><br
class="newline" />An <a
href="#glo:indexingapp">indexing application</a> that combines two functions in one: (1) fetches entry definition from a <span
class="cmtt-10">bib</span><a
@@ -1966,24 +1966,24 @@ class="cmss-10">glossaries </span>package. See <a
href="#option4">Option&#x00A0;4</a>. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 95--><p class="noindent" >
+ <!--l. 93--><p class="noindent" >
<a
id="glo:cli"></a><span
class="cmbx-10">Command Line Interface (CLI)</span> </p></dt><dd
class="description">
- <!--l. 95--><p class="noindent" ><br
+ <!--l. 93--><p class="noindent" ><br
class="newline" />An application that doesn&#8217;t have a graphical user interface. That is, an application that doesn&#8217;t
have any windows, buttons or menus and can be run in <a
href="http://www.dickimaw-books.com/latex/novices/html/terminal.html" >a command prompt or terminal</a>. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 108--><p class="noindent" >
+ <!--l. 105--><p class="noindent" >
<a
id="glo:convertgls2bib"></a><span
class="cmtt-10">convertgls2bib</span><a
id="dx1-3006"></a> </p></dt><dd
class="description">
- <!--l. 108--><p class="noindent" ><br
+ <!--l. 105--><p class="noindent" ><br
class="newline" />An application provided with <a
href="#glo:bib2gls"><span
class="cmtt-10">bib2gls</span><a
@@ -2011,24 +2011,24 @@ class="cmtt-10">bib2gls</span><a
v2.0). <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 112--><p class="noindent" >
+ <!--l. 108--><p class="noindent" >
<a
id="glo:entrylocation"></a><span
class="cmbx-10">Entry location</span><a
id="dx1-3013"></a> </p></dt><dd
class="description">
- <!--l. 112--><p class="noindent" ><br
+ <!--l. 108--><p class="noindent" ><br
class="newline" />The location of the entry in the document. This defaults to the page number on which the entry
appears. An entry may have multiple locations. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 120--><p class="noindent" >
+ <!--l. 115--><p class="noindent" >
<a
id="glo:exlatinalph"></a><span
class="cmbx-10">Extended Latin Alphabet</span><a
id="dx1-3014"></a> </p></dt><dd
class="description">
- <!--l. 120--><p class="noindent" ><br
+ <!--l. 115--><p class="noindent" ><br
class="newline" />An alphabet consisting of <a
href="#glo:latinchar">Latin character<a
id="dx1-3015"></a>s</a> and <a
@@ -2036,13 +2036,13 @@ href="#glo:exlatinchar">extended Latin character<a
id="dx1-3016"></a>s</a>. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 125--><p class="noindent" >
+ <!--l. 118--><p class="noindent" >
<a
id="glo:exlatinchar"></a><span
class="cmbx-10">Extended Latin Character</span><a
id="dx1-3017"></a> </p></dt><dd
class="description">
- <!--l. 125--><p class="noindent" ><br
+ <!--l. 118--><p class="noindent" ><br
class="newline" />A character that&#8217;s created by combining <a
href="#glo:latinchar">Latin character<a
id="dx1-3018"></a>s</a> to form ligatures (e.g.&#x00A0;&aelig;) or by applying
@@ -2052,13 +2052,13 @@ href="#glo:nonlatinchar">non-Latin character<a
id="dx1-3020"></a></a>. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 160--><p class="noindent" >
+ <!--l. 152--><p class="noindent" >
<a
id="glo:firstuse"></a><span
class="cmbx-10">First use</span><a
id="dx1-3021"></a> </p></dt><dd
class="description">
- <!--l. 160--><p class="noindent" ><br
+ <!--l. 152--><p class="noindent" ><br
class="newline" />The first time a glossary entry is used (from the start of the document or after a reset) with one
of the following commands: <span
class="cmtt-10">\gls</span><a
@@ -2080,13 +2080,13 @@ href="#glo:firstuseflag">first use
href="#glo:firstusetext">first use text</a>.) <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 179--><p class="noindent" >
+ <!--l. 171--><p class="noindent" >
<a
id="glo:firstuseflag"></a><span
class="cmbx-10">First use flag</span><a
id="dx1-3029"></a> </p></dt><dd
class="description">
- <!--l. 179--><p class="noindent" ><br
+ <!--l. 171--><p class="noindent" ><br
class="newline" />A conditional that determines whether or not the entry has been used according to the rules of
<a
href="#glo:firstuse">first use</a>. Commands to unset or reset this conditional are described in <a
@@ -2098,13 +2098,13 @@ class="newline" />
</p></dd><dt class="description">
- <!--l. 181--><p class="noindent" >
+ <!--l. 173--><p class="noindent" >
<a
id="glo:firstusetext"></a><span
class="cmbx-10">First use text</span><a
id="dx1-3030"></a> </p></dt><dd
class="description">
- <!--l. 181--><p class="noindent" ><br
+ <!--l. 173--><p class="noindent" ><br
class="newline" />The text that is displayed on <a
href="#glo:firstuse">first use</a>, which is governed by the <span
class="cmtt-10">first</span><a
@@ -2120,12 +2120,12 @@ class="cmtt-10">\defglsentry</span><a
id="dx1-3035"></a>.) <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 277--><p class="noindent" >
+ <!--l. 268--><p class="noindent" >
<a
id="glo:glossaries-extra"></a><span
class="cmssbx-10">glossaries-extra</span> </p></dt><dd
class="description">
- <!--l. 277--><p class="noindent" ><br
+ <!--l. 268--><p class="noindent" ><br
class="newline" />A separate package that extends the <span
class="cmss-10">glossaries </span>package, providing new features or improving existing
features. If you want to use <span
@@ -2135,12 +2135,12 @@ class="cmss-10">glossaries </span>package and the
class="cmss-10">glossaries-extra </span>package installed. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 298--><p class="noindent" >
+ <!--l. 286--><p class="noindent" >
<a
id="glo:indexingapp"></a><span
class="cmbx-10">Indexing application</span> </p></dt><dd
class="description">
- <!--l. 298--><p class="noindent" ><br
+ <!--l. 286--><p class="noindent" ><br
class="newline" />An application (piece of software) separate from TeX/LaTeX&#x00A0;that collates and sorts information
that has an associated page reference. Generally the information is an index entry but in this case
the information is a glossary entry. There are two main indexing applications that are used with
@@ -2154,26 +2154,26 @@ class="cmtt-10">xindy</span><a
href="#glo:cli">command line interface (CLI)</a> applications. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 302--><p class="noindent" >
+ <!--l. 290--><p class="noindent" >
<a
id="glo:latinalph"></a><span
class="cmbx-10">Latin Alphabet</span><a
id="dx1-3038"></a> </p></dt><dd
class="description">
- <!--l. 302--><p class="noindent" ><br
+ <!--l. 290--><p class="noindent" ><br
class="newline" />The alphabet consisting of <a
href="#glo:latinchar">Latin character<a
id="dx1-3039"></a>s</a>. See also <a
href="#glo:exlatinalph">extended Latin alphabet</a>. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 306--><p class="noindent" >
+ <!--l. 292--><p class="noindent" >
<a
id="glo:latinchar"></a><span
class="cmbx-10">Latin Character</span><a
id="dx1-3040"></a> </p></dt><dd
class="description">
- <!--l. 306--><p class="noindent" ><br
+ <!--l. 292--><p class="noindent" ><br
class="newline" />One of the letters <span
class="cmtt-10">a</span>, &#x2026;, <span
class="cmtt-10">z</span>, <span
@@ -2183,7 +2183,7 @@ href="#glo:exlatinchar">extended Latin character<a
id="dx1-3041"></a></a>. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 326--><p class="noindent" >
+ <!--l. 312--><p class="noindent" >
<a
id="glo:linktext"></a><span
class="cmbx-10">Link text</span><a
@@ -2191,20 +2191,20 @@ class="cmbx-10">Link text</span><a
class="description">
- <!--l. 326--><p class="noindent" ><br
+ <!--l. 312--><p class="noindent" ><br
class="newline" />The text produced by commands such as <span
class="cmtt-10">\gls</span><a
id="dx1-3043"></a>. It may or may not be a hyperlink to the glossary.
<br
class="newline" />
</p></dd><dt class="description">
- <!--l. 361--><p class="noindent" >
+ <!--l. 346--><p class="noindent" >
<a
id="glo:makeglossaries"></a><span
class="cmtt-10">makeglossaries</span><a
id="dx1-3044"></a> </p></dt><dd
class="description">
- <!--l. 361--><p class="noindent" ><br
+ <!--l. 346--><p class="noindent" ><br
class="newline" />A custom designed Perl script interface to <a
href="#glo:xindy"><span
class="cmtt-10">xindy</span><a
@@ -2219,13 +2219,13 @@ class="cmtt-10">makeglossaries </span>script into an
class="cmtt-10">makeglossaries.exe </span>for convenience (but Perl is still required). <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 364--><p class="noindent" >
+ <!--l. 349--><p class="noindent" >
<a
id="glo:makeglossariesgui"></a><span
class="cmtt-10">makeglossariesgui</span><a
id="dx1-3047"></a> </p></dt><dd
class="description">
- <!--l. 364--><p class="noindent" ><br
+ <!--l. 349--><p class="noindent" ><br
class="newline" />A Java GUI alternative to <a
href="#glo:makeglossaries"><span
class="cmtt-10">makeglossaries</span><a
@@ -2234,13 +2234,13 @@ class="cmtt-10">makeglossaries</span><a
href="http://ctan.org/pkg/makeglossariesgui" >CTAN</a>. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 383--><p class="noindent" >
+ <!--l. 368--><p class="noindent" >
<a
id="glo:makeglossaries-lite.lua"></a><span
class="cmtt-10">makeglossaries-lite</span><a
id="dx1-3049"></a> </p></dt><dd
class="description">
- <!--l. 383--><p class="noindent" ><br
+ <!--l. 368--><p class="noindent" ><br
class="newline" />A custom designed Lua script interface to <a
href="#glo:xindy"><span
class="cmtt-10">xindy</span><a
@@ -2263,19 +2263,19 @@ class="cmtt-10">makeglossaries-lite.lua</span>
script. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 436--><p class="noindent" >
+ <!--l. 419--><p class="noindent" >
<a
id="glo:makeindex"></a><span
class="cmtt-10">makeindex</span><a
id="dx1-3053"></a> </p></dt><dd
class="description">
- <!--l. 436--><p class="noindent" ><br
+ <!--l. 419--><p class="noindent" ><br
class="newline" />An <a
href="#glo:indexingapp">indexing application</a>. See <a
href="#option2">Option&#x00A0;2</a>. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 444--><p class="noindent" >
+ <!--l. 427--><p class="noindent" >
<a
id="glo:nonlatinalph"></a><span
class="cmbx-10">Non-Latin Alphabet</span><a
@@ -2283,19 +2283,19 @@ class="cmbx-10">Non-Latin Alphabet</span><a
class="description">
- <!--l. 444--><p class="noindent" ><br
+ <!--l. 427--><p class="noindent" ><br
class="newline" />An alphabet consisting of <a
href="#glo:nonlatinchar">non-Latin character<a
id="dx1-3055"></a>s</a>. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 454--><p class="noindent" >
+ <!--l. 435--><p class="noindent" >
<a
id="glo:nonlatinchar"></a><span
class="cmbx-10">Non-Latin Character</span><a
id="dx1-3056"></a> </p></dt><dd
class="description">
- <!--l. 454--><p class="noindent" ><br
+ <!--l. 435--><p class="noindent" ><br
class="newline" />An <a
href="#glo:exlatinchar">extended Latin character<a
id="dx1-3057"></a></a> or a&#x00A0;character that isn&#8217;t a&#x00A0;<a
@@ -2303,13 +2303,13 @@ href="#glo:latinchar">Latin character<a
id="dx1-3058"></a></a>. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 502--><p class="noindent" >
+ <!--l. 483--><p class="noindent" >
<a
id="glo:numberlist"></a><span
class="cmbx-10">Number list</span><a
id="dx1-3059"></a> </p></dt><dd
class="description">
- <!--l. 502--><p class="noindent" ><br
+ <!--l. 483--><p class="noindent" ><br
class="newline" />A list of <a
href="#glo:entrylocation">entry locations</a> (also called a location list). The number list can be suppressed using the
<span
@@ -2317,13 +2317,13 @@ class="cmss-10">nonumberlist</span><a
id="dx1-3060"></a> package option. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 508--><p class="noindent" >
+ <!--l. 489--><p class="noindent" >
<a
id="glo:sanitize"></a><span
class="cmbx-10">Sanitize</span><a
id="dx1-3061"></a> </p></dt><dd
class="description">
- <!--l. 508--><p class="noindent" ><br
+ <!--l. 489--><p class="noindent" ><br
class="newline" />Converts command names into character sequences. That is, a command called, say, <span
class="cmtt-10">\foo</span>, is
converted into the sequence of characters: <span
@@ -2333,7 +2333,7 @@ class="cmtt-10">o</span>, <span
class="cmtt-10">o</span>. Depending on the font, the backslash character
may appear as a dash when used in the main document text, so <span
class="cmtt-10">\foo </span>will appear as: &#8212;foo.
- </p><!--l. 508--><p class="noindent" >Earlier versions of <span
+ </p><!--l. 489--><p class="noindent" >Earlier versions of <span
class="cmss-10">glossaries </span>used this technique to write information to the files used by the indexing
applications to prevent problems caused by fragile commands. Now, this is only used for the <span
class="cmtt-10">sort</span><a
@@ -2341,13 +2341,13 @@ class="cmtt-10">sort</span><a
key. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 517--><p class="noindent" >
+ <!--l. 498--><p class="noindent" >
<a
id="glo:smallcaps"></a><span
class="cmbx-10">Small caps</span><a
id="dx1-3063"></a> </p></dt><dd
class="description">
- <!--l. 517--><p class="noindent" ><br
+ <!--l. 498--><p class="noindent" ><br
class="newline" />Small capitals. The LaTeX&#x00A0;kernel provides <span
class="cmtt-10">\textsc</span><a
id="dx1-3064"></a><span
@@ -2374,14 +2374,14 @@ class="newline" />
</p></dd><dt class="description">
- <!--l. 521--><p class="noindent" >
+ <!--l. 502--><p class="noindent" >
<a
id="glo:latexexlatinchar"></a><span
class="cmbx-10">Standard LaTeX</span><span
class="cmbx-10">&#x00A0;Extended Latin Character</span><a
id="dx1-3067"></a> </p></dt><dd
class="description">
- <!--l. 521--><p class="noindent" ><br
+ <!--l. 502--><p class="noindent" ><br
class="newline" />An <a
href="#glo:exlatinchar">extended Latin character<a
id="dx1-3068"></a></a> that can be created by a&#x00A0;core LaTeX&#x00A0;command, such as <span
@@ -2390,13 +2390,13 @@ class="cmtt-10">\o </span>(&oslash;) or
class="cmtt-10">\&#8217;e </span>(&eacute;). That is, the character can be produced without the need to load a&#x00A0;particular package. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 531--><p class="noindent" >
+ <!--l. 512--><p class="noindent" >
<a
id="glo:UTF-8"></a><span
class="cmbx-10">UTF-8</span><a
id="dx1-3069"></a> </p></dt><dd
class="description">
- <!--l. 531--><p class="noindent" ><br
+ <!--l. 512--><p class="noindent" ><br
class="newline" />A variable-width character encoding. This means that some characters are represented by more
that one byte. XeLaTeX&#x00A0;and LuaLaTeX&#x00A0;treat the multi-byte sequence as a single token, but the
older LaTeX&#x00A0;formats have single-byte tokens, which causes complications. Related blog article:
@@ -2404,13 +2404,13 @@ class="newline" />A variable-width character encoding. This means that some char
href="https://www.dickimaw-books.com/blog/binary-files-text-files-and-file-encodings/" >Binary Files, Text Files and File Encodings</a>. <br
class="newline" />
</p></dd><dt class="description">
- <!--l. 586--><p class="noindent" >
+ <!--l. 565--><p class="noindent" >
<a
id="glo:xindy"></a><span
class="cmtt-10">xindy</span><a
id="dx1-3070"></a> </p></dt><dd
class="description">
- <!--l. 586--><p class="noindent" ><br
+ <!--l. 565--><p class="noindent" ><br
class="newline" />A flexible <a
href="#glo:indexingapp">indexing application</a> with multilingual support written in Perl. See <a
href="#option3">Option&#x00A0;3</a>. <br
@@ -7533,7 +7533,7 @@ class="cmss-10">glossaries </span>package, make sure you also upgrade your versi
href="#glo:makeglossaries"><span
class="cmtt-10">makeglossaries</span><a
id="dx1-18034"></a></a>. The
-current version is 4.48. </div>
+current version is 4.49. </div>
</p><!--l. 3280--><p class="noindent" >
</p><!--l. 3282--><p class="noindent" >
</p>
diff --git a/macros/latex/contrib/glossaries/glossaries-user.pdf b/macros/latex/contrib/glossaries/glossaries-user.pdf
index 168ad1ac63..c69d8fb532 100644
--- a/macros/latex/contrib/glossaries/glossaries-user.pdf
+++ b/macros/latex/contrib/glossaries/glossaries-user.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/glossaries-user.tex b/macros/latex/contrib/glossaries/glossaries-user.tex
index fdb8721a03..1e489709b6 100644
--- a/macros/latex/contrib/glossaries/glossaries-user.tex
+++ b/macros/latex/contrib/glossaries/glossaries-user.tex
@@ -682,11 +682,11 @@ and~\hyperlink{option#2}{#2}}
\MakeShortVerb{"}
\DeleteShortVerb{\|}
- \title{User Manual for glossaries.sty v4.48}
+ \title{User Manual for glossaries.sty v4.49}
\author{Nicola L.C. Talbot\\%
\href{http://www.dickimaw-books.com/contact}{\nolinkurl{dickimaw-books.com/contact}}}
- \date{2021-10-19}
+ \date{2021-11-01}
\maketitle
\begin{abstract}
@@ -775,7 +775,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.48}.
+\qt{Documented Code for glossaries v4.49}.
\item[CHANGES] Change log.
@@ -3276,7 +3276,7 @@ For a complete list of options do \texttt{makeglossaries -{}-help}.
\begin{important}
When upgrading the \styfmt{glossaries} package, make sure you also
upgrade your version of \gls{makeglossaries}. The current version is
-4.48.
+4.49.
\end{important}
\subsection{Using the makeglossaries-lite Lua Script}
diff --git a/macros/latex/contrib/glossaries/glossaries.dtx b/macros/latex/contrib/glossaries/glossaries.dtx
index 110cdf5361..5c71fbc95a 100644
--- a/macros/latex/contrib/glossaries/glossaries.dtx
+++ b/macros/latex/contrib/glossaries/glossaries.dtx
@@ -1,7 +1,8 @@
%\iffalse
% glossaries.dtx generated using makedtx version 1.2 (c) Nicola Talbot
% Command line args:
-% -section "chapter"
+% -comment ".*\.perl"
+% -comment ".*\.tex"
% -src "glossaries\.sty\Z=>glossaries.sty"
% -src "glossaries-prefix.sty\Z=>glossaries-prefix.sty"
% -src "(glossary-.+)\.(sty)\Z=>\1.\2"
@@ -11,19 +12,18 @@
% -src "(glossaries-babel)\.(sty)\Z=>\1.\2"
% -src "(glossaries-polyglossia)\.(sty)\Z=>\1.\2"
% -src "(example-glossaries-.*\.tex)\Z=>\1"
-% -src "(glossar.*-2020-03-19\.sty)\Z=>\1"
+% -src "(glossaries-2020-03-19\.sty)\Z=>\1"
% -src "(.*\.perl)\Z=>\1"
-% -setambles ".*\.perl=>\nopreamble\nopostamble"
-% -setambles ".*\.tex=>\nopreamble\nopostamble"
-% -doc "glossaries-manual.tex"
-% -comment ".*\.perl"
-% -comment ".*\.tex"
-% -author "Nicola Talbot"
+% -codetitle "Main Package Code"
% -macrocode ".*\.perl"
% -macrocode ".*\.tex"
-% -codetitle "Main Package Code"
+% -author "Nicola Talbot"
+% -doc "glossaries-manual.tex"
+% -setambles ".*\.perl=>\nopreamble\nopostamble"
+% -setambles ".*\.tex=>\nopreamble\nopostamble"
+% -section "chapter"
% glossaries
-% Created on 2021/10/20 10:44
+% Created on 2021/11/1 18:45
%\fi
%\iffalse
%<*package>
@@ -137,7 +137,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
\setcounter{IndexColumns}{2}
-\CheckSum{34471}
+\CheckSum{34319}
\newcommand*{\ifirstuse}{\iterm{first use}}
\newcommand*{\firstuse}{\gls{firstuse}}
@@ -164,12 +164,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
%\fi
%\MakeShortVerb{"}
%
-% \title{Documented Code For glossaries v4.48}
+% \title{Documented Code For glossaries v4.49}
% \author{Nicola L.C. Talbot\\[10pt]
%Dickimaw Books\\
%\url{http://www.dickimaw-books.com/}}
%
-% \date{2021-10-19}
+% \date{2021-11-01}
% \maketitle
%
%This is the documented code for the \styfmt{glossaries} package.
@@ -185,7 +185,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.48:
+%For the main user guide, read \qt{glossaries.sty v4.49:
%\LaTeX2e\ Package to Assist Generating Glossaries}.
%
%\item[\url{mfirstuc-manual.pdf}]
@@ -244,11 +244,11 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
% Rollback releases:
% \begin{macrocode}
\DeclareRelease{v4.46}{2020-03-19}{glossaries-2020-03-19.sty}
-\DeclareCurrentRelease{v4.48}{2021-10-19}
+\DeclareCurrentRelease{v4.49}{2021-11-01}
% \end{macrocode}
% Declare package:
% \begin{macrocode}
-\ProvidesPackage{glossaries}[2021/10/19 v4.48 (NLCT)]
+\ProvidesPackage{glossaries}[2021/11/01 v4.49 (NLCT)]
% \end{macrocode}
%\changes{4.18}{2015-09-09}{split mfirstuc into separate bundle}
% Required packages:
@@ -19893,7 +19893,7 @@ you
% \cs{gls}\marg{label}} on subsequent use.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-prefix}[2021/10/19 v4.48 (NLCT)]
+\ProvidesPackage{glossaries-prefix}[2021/11/01 v4.49 (NLCT)]
% \end{macrocode}
% Pass all options to \sty{glossaries}:
% \begin{macrocode}
@@ -20358,7 +20358,7 @@ you
%\label{sec:code:hypernav}
% Package Definition:
% \begin{macrocode}
-\ProvidesPackage{glossary-hypernav}[2021/10/19 v4.48 (NLCT)]
+\ProvidesPackage{glossary-hypernav}[2021/11/01 v4.49 (NLCT)]
% \end{macrocode}
%
% The commands defined in this package are provided to
@@ -20557,7 +20557,7 @@ you
% This defines an in-line style where the entries are
% comma-separated with just the name and description displayed.
% \begin{macrocode}
-\ProvidesPackage{glossary-inline}[2021/10/19 v4.48 (NLCT)]
+\ProvidesPackage{glossary-inline}[2021/11/01 v4.49 (NLCT)]
% \end{macrocode}
%
%\begin{style}{inline}
@@ -20842,11 +20842,11 @@ you
% Rollback releases:
% \begin{macrocode}
\DeclareRelease{v4.46}{2020-03-19}{glossary-list-2020-03-19.sty}
-\DeclareCurrentRelease{v4.48}{2021-10-19}
+\DeclareCurrentRelease{v4.49}{2021-11-01}
% \end{macrocode}
%Declare package:
% \begin{macrocode}
-\ProvidesPackage{glossary-list}[2021/10/19 v4.48 (NLCT)]
+\ProvidesPackage{glossary-list}[2021/11/01 v4.49 (NLCT)]
% \end{macrocode}
%\begin{macro}{\indexspace}
%\changes{4.13}{2015-02-03}{new}
@@ -20883,6 +20883,7 @@ you
%
%\begin{macro}{\glslistinit}
%\changes{4.48}{2021-10-19}{new}
+%\changes{4.49}{2021-11-01}{added \cs{glsnavigation}}
%Provide a way to ensure appropriate expansion of the name if
%\pkgopt{entrycounter} is used with \sty{gettitlestring}:
% \begin{macrocode}
@@ -20897,6 +20898,7 @@ you
\let\glslistgroupheaderfmt\@firstofone
\let\glsgetgrouptitle\@firstofone
\let\glsnavhypertarget\@secondoftwo
+ \let\glsnavigation\relax
}%
}%
{}%
@@ -21160,7 +21162,7 @@ you
% The glossary styles defined in the \isty{glossary-long} package
% used the \env{longtable} environment in the glossary.
% \begin{macrocode}
-\ProvidesPackage{glossary-long}[2021/10/19 v4.48 (NLCT)]
+\ProvidesPackage{glossary-long}[2021/11/01 v4.49 (NLCT)]
% \end{macrocode}
% Requires the \isty{longtable} package:
% \begin{macrocode}
@@ -21657,7 +21659,7 @@ you
% \url{http://tex.stackexchange.com/a/56890}
%
% \begin{macrocode}
-\ProvidesPackage{glossary-longbooktabs}[2021/10/19 v4.48 (NLCT)]
+\ProvidesPackage{glossary-longbooktabs}[2021/11/01 v4.49 (NLCT)]
% \end{macrocode}
% Requires \sty{booktabs} package:
% \begin{macrocode}
@@ -21998,7 +22000,7 @@ you
% used the \env{longtable} environment in the glossary and use
% ragged right formatting for the multiline columns.
% \begin{macrocode}
-\ProvidesPackage{glossary-longragged}[2021/10/19 v4.48 (NLCT)]
+\ProvidesPackage{glossary-longragged}[2021/11/01 v4.49 (NLCT)]
% \end{macrocode}
% Requires the \isty{array} package:
% \begin{macrocode}
@@ -22431,7 +22433,7 @@ you
%use the \sty{multicol} package. These use the tree-like glossary
%styles in a multicol environment.
% \begin{macrocode}
-\ProvidesPackage{glossary-mcols}[2021/10/19 v4.48 (NLCT)]
+\ProvidesPackage{glossary-mcols}[2021/11/01 v4.49 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -22868,7 +22870,7 @@ you
% The glossary styles defined in the \isty{glossary-super} package
% use the \env{supertabular} environment.
% \begin{macrocode}
-\ProvidesPackage{glossary-super}[2021/10/19 v4.48 (NLCT)]
+\ProvidesPackage{glossary-super}[2021/11/01 v4.49 (NLCT)]
% \end{macrocode}
% Requires the \isty{supertabular} package:
% \begin{macrocode}
@@ -23400,7 +23402,7 @@ you
% are like those provided by the \isty{glossary-super} package,
% except that the multiline columns have ragged right justification.
% \begin{macrocode}
-\ProvidesPackage{glossary-superragged}[2021/10/19 v4.48 (NLCT)]
+\ProvidesPackage{glossary-superragged}[2021/11/01 v4.49 (NLCT)]
% \end{macrocode}
% Requires the \isty{array} package:
% \begin{macrocode}
@@ -23840,7 +23842,7 @@ you
% that have a tree-like structure. These are designed for
% hierarchical glossaries.
% \begin{macrocode}
-\ProvidesPackage{glossary-tree}[2021/10/19 v4.48 (NLCT)]
+\ProvidesPackage{glossary-tree}[2021/11/01 v4.49 (NLCT)]
% \end{macrocode}
%
%\begin{macro}{\indexspace}
@@ -24561,7 +24563,7 @@ you
% hyperlinks may not work properly.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-207}[2021/10/19 v4.48 (NLCT)]
+\ProvidesPackage{glossaries-compatible-207}[2021/11/01 v4.49 (NLCT)]
% \end{macrocode}
%\begin{macro}{\GlsAddXdyAttribute}
% Adds an attribute in old format.
@@ -24922,7 +24924,7 @@ you
%\section{glossaries-compatible-307}
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-307}[2021/10/19 v4.48 (NLCT)]
+\ProvidesPackage{glossaries-compatible-307}[2021/11/01 v4.49 (NLCT)]
% \end{macrocode}
%
% Compatibility macros for predefined glossary styles:
@@ -25730,7 +25732,7 @@ you
% \end{macrocode}
% Package version number now in line with main glossaries package number.
% \begin{macrocode}
-\ProvidesPackage{glossaries-accsupp}[2021/10/19 v4.48 (NLCT)
+\ProvidesPackage{glossaries-accsupp}[2021/11/01 v4.49 (NLCT)
Experimental glossaries accessibility]
% \end{macrocode}
% Pass all options to \sty{glossaries}:
@@ -29038,7 +29040,7 @@ you
% modules.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2021/10/19 v4.48 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2021/11/01 v4.49 (NLCT)]
% \end{macrocode}
% Load \sty{tracklang} to obtain language settings.
% \begin{macrocode}
@@ -29082,7 +29084,7 @@ you
% modules.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-polyglossia}[2021/10/19 v4.48 (NLCT)]
+\ProvidesPackage{glossaries-polyglossia}[2021/11/01 v4.49 (NLCT)]
% \end{macrocode}
% Load \sty{tracklang} to obtain language settings.
% \begin{macrocode}
@@ -38974,95 +38976,6 @@ you
%\fi
%\iffalse
% \begin{macrocode}
-%<*glossary-list-2020-03-19.sty>
-% \end{macrocode}
-%\fi
-% \section{Rollback v4.46 (glossary-list-2020-03-19.sty)}
-% Version 4.46 preserved for rollback.
-% \begin{macrocode}
-\ProvidesPackage{glossary-list}[2020/03/19 v4.46 (NLCT)]
-\providecommand{\indexspace}{%
- \par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax
-}
-\newcommand*{\glslistgroupheaderfmt}[1]{#1}
-\newcommand*{\glslistnavigationitem}[1]{\item[#1]}
-\newglossarystyle{list}{%
- \renewenvironment{theglossary}%
- {\begin{description}}{\end{description}}%
- \renewcommand*{\glossaryheader}{}%
- \renewcommand*{\glsgroupheading}[1]{}%
- \renewcommand*{\glossentry}[2]{%
- \item[\glsentryitem{##1}%
- \glstarget{##1}{\glossentryname{##1}}]
- \glossentrydesc{##1}\glspostdescription\space ##2}%
- \renewcommand*{\subglossentry}[3]{%
- \glssubentryitem{##2}%
- \glstarget{##2}{\strut}\space
- \glossentrydesc{##2}\glspostdescription\space ##3.}%
- \renewcommand*{\glsgroupskip}{\ifglsnogroupskip\else\indexspace\fi}%
-}
-\newglossarystyle{listgroup}{%
- \setglossarystyle{list}%
- \renewcommand*{\glsgroupheading}[1]{%
- \item[\glslistgroupheaderfmt{\glsgetgrouptitle{##1}}]}}
-\newglossarystyle{listhypergroup}{%
- \setglossarystyle{list}%
- \renewcommand*{\glossaryheader}{%
- \glslistnavigationitem{\glsnavigation}}%
- \renewcommand*{\glsgroupheading}[1]{%
- \item[\glslistgroupheaderfmt
- {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}]}}
-\newglossarystyle{altlist}{%
- \setglossarystyle{list}%
- \renewcommand*{\glossentry}[2]{%
- \item[\glsentryitem{##1}%
- \glstarget{##1}{\glossentryname{##1}}]%
- \mbox{}\par\nobreak\@afterheading
- \glossentrydesc{##1}\glspostdescription\space ##2}%
- \renewcommand{\subglossentry}[3]{%
- \par
- \glssubentryitem{##2}%
- \glstarget{##2}{\strut}\glossentrydesc{##2}\glspostdescription\space ##3}%
-}
-\newglossarystyle{altlistgroup}{%
- \setglossarystyle{altlist}%
- \renewcommand*{\glsgroupheading}[1]{%
- \item[\glslistgroupheaderfmt{\glsgetgrouptitle{##1}}]}}
-\newglossarystyle{altlisthypergroup}{%
- \setglossarystyle{altlist}%
- \renewcommand*{\glossaryheader}{%
- \glslistnavigationitem{\glsnavigation}}%
- \renewcommand*{\glsgroupheading}[1]{%
- \item[\glslistgroupheaderfmt
- {\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}}]}}
-\newglossarystyle{listdotted}{%
- \setglossarystyle{list}%
- \renewcommand*{\glossentry}[2]{%
- \item[]\makebox[\glslistdottedwidth][l]{%
- \glsentryitem{##1}%
- \glstarget{##1}{\glossentryname{##1}}%
- \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}\glossentrydesc{##1}}%
- \renewcommand*{\subglossentry}[3]{%
- \item[]\makebox[\glslistdottedwidth][l]{%
- \glssubentryitem{##2}%
- \glstarget{##2}{\glossentryname{##2}}%
- \unskip\leaders\hbox to 2.9mm{\hss.}\hfill\strut}\glossentrydesc{##2}}%
-}
-\newlength\glslistdottedwidth
-\setlength{\glslistdottedwidth}{.5\hsize}
-\newglossarystyle{sublistdotted}{%
- \setglossarystyle{listdotted}%
- \renewcommand*{\glossentry}[2]{%
- \item[\glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}}]}%
-}
-% \end{macrocode}
-%\iffalse
-% \begin{macrocode}
-%</glossary-list-2020-03-19.sty>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
%<*glossaries.perl>
% \end{macrocode}
%\fi
diff --git a/macros/latex/contrib/glossaries/glossaries.ins b/macros/latex/contrib/glossaries/glossaries.ins
index 7c92550963..4f90432115 100644
--- a/macros/latex/contrib/glossaries/glossaries.ins
+++ b/macros/latex/contrib/glossaries/glossaries.ins
@@ -1,4 +1,4 @@
-% glossaries.ins generated using makedtx version 1.2 2021/10/20 10:44
+% glossaries.ins generated using makedtx version 1.2 2021/11/1 18:45
\input docstrip
\preamble
@@ -18,7 +18,7 @@
The Current Maintainer of this work is Nicola Talbot.
- This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list-2020-03-19.sty, glossary-list.sty, glossary-long.sty, glossary-longbooktabs.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, example-glossaries-acronym-desc.tex, example-glossaries-acronym.tex, example-glossaries-acronyms-lang.tex, example-glossaries-brief.tex, example-glossaries-childmultipar.tex, example-glossaries-childnoname.tex, example-glossaries-cite.tex, example-glossaries-images.tex, example-glossaries-long.tex, example-glossaries-longchild.tex, example-glossaries-multipar.tex, example-glossaries-parent.tex, example-glossaries-symbolnames.tex, example-glossaries-symbols.tex, example-glossaries-url.tex, glossaries-2020-03-19.sty, glossary-list-2020-03-19.sty, glossaries.perl.
+ This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list-2020-03-19.sty, glossary-list.sty, glossary-long.sty, glossary-longbooktabs.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, example-glossaries-acronym-desc.tex, example-glossaries-acronym.tex, example-glossaries-acronyms-lang.tex, example-glossaries-brief.tex, example-glossaries-childmultipar.tex, example-glossaries-childnoname.tex, example-glossaries-cite.tex, example-glossaries-images.tex, example-glossaries-long.tex, example-glossaries-longchild.tex, example-glossaries-multipar.tex, example-glossaries-parent.tex, example-glossaries-symbolnames.tex, example-glossaries-symbols.tex, example-glossaries-url.tex, glossaries-2020-03-19.sty, glossaries.perl.
\endpreamble
@@ -77,8 +77,6 @@
\file{example-glossaries-url.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{example-glossaries-url.tex}}
\file{glossaries-2020-03-19.sty}{\usepreamble\defaultpreamble
\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-2020-03-19.sty,package}}
-\file{glossary-list-2020-03-19.sty}{\usepreamble\defaultpreamble
-\usepostamble\defaultpostamble\from{glossaries.dtx}{glossary-list-2020-03-19.sty,package}}
\file{glossaries.perl}{\nopreamble\nopostamble\from{glossaries.dtx}{glossaries.perl}}
}
diff --git a/macros/latex/contrib/glossaries/glossariesbegin.html b/macros/latex/contrib/glossaries/glossariesbegin.html
index 04ea3b6b3f..36b22ec2f1 100644
--- a/macros/latex/contrib/glossaries/glossariesbegin.html
+++ b/macros/latex/contrib/glossaries/glossariesbegin.html
@@ -10,242 +10,238 @@
<meta name="originator" content="TeX4ht (https://tug.org/tex4ht/)" />
<!-- xhtml,fn-in,css-in,uni-html4,utf8 -->
<meta name="src" content="glossariesbegin.tex" />
+<style type="text/css">
-<style type="text/css">
-<!--
-
-/* start css.sty */
-.cmr-17{font-size:170%;}
-.cmr-12{font-size:120%;}
-.cmr-8{font-size:80%;}
-.cmtt-12{font-size:120%;font-family: monospace,monospace;}
-.cmtt-12{font-family: monospace,monospace;}
-.cmtt-12{font-family: monospace,monospace;}
-.cmtt-12{font-family: monospace,monospace;}
-.cmr-9{font-size:90%;}
-.cmbx-9{font-size:90%; font-weight: bold;}
-.cmbx-9{ font-weight: bold;}
-.cmss-9{font-size:90%; font-family: sans-serif;}
-.cmss-9{ font-family: sans-serif;}
-.cmss-9{ font-family: sans-serif;}
-.cmtt-10{font-family: monospace,monospace;}
-.cmtt-10{font-family: monospace,monospace;}
-.cmtt-10{font-family: monospace,monospace;}
-.cmtt-10{font-family: monospace,monospace;}
-.cmss-10{ font-family: sans-serif;}
-.cmss-10{ font-family: sans-serif;}
-.cmss-10{ font-family: sans-serif;}
-.cmti-10{ font-style: italic;}
-.cmtt-9{font-size:90%;font-family: monospace,monospace;}
-.cmtt-9{font-family: monospace,monospace;}
-.cmtt-9{font-family: monospace,monospace;}
-.cmtt-9{font-family: monospace,monospace;}
-.cmbx-10{ font-weight: bold;}
-.cmbx-10{ font-weight: bold;}
-.cmitt-10{font-family: monospace,monospace; font-style: italic;}
-.tcrm-0900{font-size:90%;}
-.cmss-8{font-size:80%; font-family: sans-serif;}
-.cmss-8{ font-family: sans-serif;}
-.cmss-8{ font-family: sans-serif;}
-.small-caps{font-variant: small-caps; }
-p{margin-top:0;margin-bottom:0}
-p.indent{text-indent:0;}
-p + p{margin-top:1em;}
-p + div, p + pre {margin-top:1em;}
-div + p, pre + p {margin-top:1em;}
-a { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; hyphens: auto; }
-@media print {div.crosslinks {visibility:hidden;}}
-a img { border-top: 0; border-left: 0; border-right: 0; }
-center { margin-top:1em; margin-bottom:1em; }
-td center { margin-top:0em; margin-bottom:0em; }
-.Canvas { position:relative; }
-img.math{vertical-align:middle;}
-div.par-math-display, div.math-display{text-align:center;}
-li p.indent { text-indent: 0em }
-li p:first-child{ margin-top:0em; }
-li p:last-child, li div:last-child { margin-bottom:0.5em; }
-li p:first-child{ margin-bottom:0; }
-li p~ul:last-child, li p~ol:last-child{ margin-bottom:0.5em; }
-.enumerate1 {list-style-type:decimal;}
-.enumerate2 {list-style-type:lower-alpha;}
-.enumerate3 {list-style-type:lower-roman;}
-.enumerate4 {list-style-type:upper-alpha;}
-div.newtheorem { margin-bottom: 2em; margin-top: 2em;}
-.obeylines-h,.obeylines-v {white-space: nowrap; }
-div.obeylines-v p { margin-top:0; margin-bottom:0; }
-.overline{ text-decoration:overline; }
-.overline img{ border-top: 1px solid black; }
-td.displaylines {text-align:center; white-space:nowrap;}
-.centerline {text-align:center;}
-.rightline {text-align:right;}
-pre.verbatim {font-family: monospace,monospace; text-align:left; clear:both; }
-.fbox {padding-left:3.0pt; padding-right:3.0pt; text-indent:0pt; border:solid black 0.4pt; }
-div.fbox {display:table}
-div.center div.fbox {text-align:center; clear:both; padding-left:3.0pt; padding-right:3.0pt; text-indent:0pt; border:solid black 0.4pt; }
-div.minipage{width:100%;}
-div.center, div.center div.center {text-align: center; margin-left:1em; margin-right:1em;}
-div.center div {text-align: left;}
-div.flushright, div.flushright div.flushright {text-align: right;}
-div.flushright div {text-align: left;}
-div.flushleft {text-align: left;}
-.underline{ text-decoration:underline; }
-.underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
-.framebox-c, .framebox-l, .framebox-r { padding-left:3.0pt; padding-right:3.0pt; text-indent:0pt; border:solid black 0.4pt; }
-.framebox-c {text-align:center;}
-.framebox-l {text-align:left;}
-.framebox-r {text-align:right;}
-span.thank-mark{ vertical-align: super }
-span.footnote-mark sup.textsuperscript, span.footnote-mark a sup.textsuperscript{ font-size:80%; }
-div.footnotes{border-top:solid 1px black; border-bottom:solid 1px black; padding-bottom:1ex; padding-top:0.5ex; margin-right:15%; margin-top:2ex; font-style:italic; font-size:85%;}
-div.footnotes p{margin-top:0; margin-bottom:0; text-indent:0;}
-div.tabular, div.center div.tabular {text-align: center; margin-top:0.5em; margin-bottom:0.5em; }
-table.tabular td p{margin-top:0em;}
-table.tabular {margin-left: auto; margin-right: auto;}
-td p:first-child{ margin-top:0em; }
-td p:last-child{ margin-bottom:0em; }
-div.td00{ margin-left:0pt; margin-right:0pt; }
-div.td01{ margin-left:0pt; margin-right:5pt; }
-div.td10{ margin-left:5pt; margin-right:0pt; }
-div.td11{ margin-left:5pt; margin-right:5pt; }
-table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
-td.td00{ padding-left:0pt; padding-right:0pt; }
-td.td01{ padding-left:0pt; padding-right:5pt; }
-td.td10{ padding-left:5pt; padding-right:0pt; }
-td.td11{ padding-left:5pt; padding-right:5pt; }
-table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
-.hline hr, .cline hr{ height : 0px; margin:0px; }
-.hline td, .cline td{ padding: 0; }
-.hline hr, .cline hr{border:none;border-top:1px solid black;}
-.hline {border-top: 1px solid black;}
-.tabbing-right {text-align:right;}
-div.float, div.figure {margin-left: auto; margin-right: auto;}
-div.float img {text-align:center;}
-div.figure img {text-align:center;}
-.marginpar,.reversemarginpar {width:20%; float:right; text-align:left; margin-left:auto; margin-top:0.5em; font-size:85%; text-decoration:underline;}
-.marginpar p,.reversemarginpar p{margin-top:0.4em; margin-bottom:0.4em;}
-.reversemarginpar{float:left;}
-table.equation {width:100%;}
-.equation td{text-align:center; }
-td.equation { margin-top:1em; margin-bottom:1em; }
-td.equation-label { width:5%; text-align:center; }
-td.eqnarray4 { width:5%; white-space: normal; }
-td.eqnarray2 { width:5%; }
-table.eqnarray-star, table.eqnarray {width:100%;}
-div.eqnarray{text-align:center;}
-div.array {text-align:center;}
-div.pmatrix {text-align:center;}
-table.pmatrix {width:100%;}
-span.pmatrix img{vertical-align:middle;}
-div.pmatrix {text-align:center;}
-table.pmatrix {width:100%;}
-span.bar-css {text-decoration:overline;}
-img.cdots{vertical-align:middle;}
-.partToc a, .partToc, .likepartToc a, .likepartToc {line-height: 200%; font-weight:bold; font-size:110%;}
-.chapterToc a, .chapterToc, .likechapterToc a, .likechapterToc, .appendixToc a, .appendixToc {line-height: 200%; font-weight:bold;}
-.index-item, .index-subitem, .index-subsubitem {display:block}
-div.caption {text-indent:-2em; margin-left:3em; margin-right:1em; text-align:left;}
-div.caption span.id{font-weight: bold; white-space: nowrap; }
-h1.partHead{text-align: center}
-p.bibitem { text-indent: -2em; margin-left: 2em; margin-top:0.6em; margin-bottom:0.6em; }
-p.bibitem-p { text-indent: 0em; margin-left: 2em; margin-top:0.6em; margin-bottom:0.6em; }
-.paragraphHead, .likeparagraphHead { margin-top:2em; font-weight: bold;}
-.subparagraphHead, .likesubparagraphHead { font-weight: bold;}
-.verse{white-space:nowrap; margin-left:2em}
-div.maketitle {text-align:center;}
-h2.titleHead{text-align:center;}
-div.maketitle{ margin-bottom: 2em; }
-div.author, div.date {text-align:center;}
-div.thanks{text-align:left; margin-left:10%; font-size:85%; font-style:italic; }
-div.abstract p {margin-left:5%; margin-right:5%;}
-div.abstract {width:100%;}
-.abstracttitle{text-align:center;margin-bottom:1em;}
-.alltt P { margin-bottom : 0em; margin-top : 0em; }
-.alltt { margin-bottom : 1em; margin-top : 1em; font-family:monospace,monospace; }
-div.tabular, div.center div.tabular {text-align: center; margin-top:0.5em; margin-bottom:0.5em; }
-table.tabular td p{margin-top:0em;}
-table.tabular {margin-left: auto; margin-right: auto;}
-td p:first-child{ margin-top:0em; }
-td p:last-child{ margin-bottom:0em; }
-div.td00{ margin-left:0pt; margin-right:0pt; }
-div.td01{ margin-left:0pt; margin-right:5pt; }
-div.td10{ margin-left:5pt; margin-right:0pt; }
-div.td11{ margin-left:5pt; margin-right:5pt; }
-table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
-td.td00{ padding-left:0pt; padding-right:0pt; }
-td.td01{ padding-left:0pt; padding-right:5pt; }
-td.td10{ padding-left:5pt; padding-right:0pt; }
-td.td11{ padding-left:5pt; padding-right:5pt; }
-table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
-.hline hr, .cline hr{ height : 0px; margin:0px; }
-.hline td, .cline td{ padding: 0; }
-.hline hr, .cline hr{border:none;border-top:1px solid black;}
-.hline {border-top: 1px solid black;}
-div.array {text-align:center;}
-.equation td{text-align:center; }
-.equation-star td{text-align:center; }
-table.equation-star { width:100%; }
-table.equation { width:100%; }
-table.align, table.alignat, table.xalignat, table.xxalignat, table.flalign {width:95%; margin-left:5%; white-space: nowrap;}
-table.align-star, table.alignat-star, table.xalignat-star, table.flalign-star {margin-left:auto; margin-right:auto; white-space: nowrap;}
-td.align-label { width:5%; text-align:center; }
-td.align-odd { text-align:right; padding-right:0.3em;}
-td.align-even { text-align:left; padding-right:0.6em;}
-table.multline, table.multline-star {width:100%;}
-td.gather {text-align:center; }
-table.gather {width:100%;}
-div.gather-star {text-align:center;}
-table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
-div.longtable{text-align:center;}
-table.longtable{margin-left:auto; margin-right: auto;}
-.supertabular {text-align:center}
-.warningsymbol { color: red; font-weight: bold;}
-div.important { border : solid red; }
-div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; clear:both; padding-top: 2ex; padding-bottom: 2ex;}
-span#textcolor1{color:#00FF00}
-span#textcolor2{color:#00FF00}
-span#textcolor3{color:#00FF00}
-span#textcolor4{color:#FF0000}
-span#textcolor5{color:#00FF00}
-span#textcolor6{color:#FF0000}
-span#textcolor7{color:#FF0000}
-span#textcolor8{color:#FF0000}
-span#textcolor9{color:#00FF00}
-span#textcolor10{color:#00FF00}
-span#textcolor11{color:#FF0000}
-span#textcolor12{color:#00FF00}
-span#textcolor13{color:#00FF00}
-span#textcolor14{color:#00FF00}
-span#textcolor15{color:#00FF00}
-span#textcolor16{color:#FF0000}
-span#textcolor17{color:#FF0000}
-span#textcolor18{color:#FF0000}
-span#textcolor19{color:#00FF00}
-span#textcolor20{color:#00FF00}
-span#textcolor21{color:#FF0000}
-span#textcolor22{color:#00FF00}
-span#textcolor23{color:#00FF00}
-span#textcolor24{color:#00FF00}
-span#textcolor25{color:#00FF00}
-span#textcolor26{color:#FF0000}
-span#textcolor27{color:#FF0000}
-span#textcolor28{color:#00FF00}
-span#textcolor29{color:#FF0000}
-span#textcolor30{color:#FF0000}
-span#textcolor31{color:#FF0000}
-span#textcolor32{color:#00FF00}
-span#textcolor33{color:#FF0000}
-span#textcolor34{color:#00FF00}
-span#textcolor35{color:#00FF00}
-span#textcolor36{color:#00FF00}
-span#textcolor37{color:#00FF00}
-span#textcolor38{color:#FF0000}
-span#textcolor39{color:#00FF00}
-span#textcolor40{color:#00FF00}
-/* end css.sty */
-
-
--->
-</style>
+/* start css.sty */
+.cmr-17{font-size:170%;}
+.cmr-12{font-size:120%;}
+.cmr-8{font-size:80%;}
+.cmtt-12{font-size:120%;font-family: monospace,monospace;}
+.cmtt-12{font-family: monospace,monospace;}
+.cmtt-12{font-family: monospace,monospace;}
+.cmtt-12{font-family: monospace,monospace;}
+.cmr-9{font-size:90%;}
+.cmbx-9{font-size:90%; font-weight: bold;}
+.cmbx-9{ font-weight: bold;}
+.cmss-9{font-size:90%; font-family: sans-serif;}
+.cmss-9{ font-family: sans-serif;}
+.cmss-9{ font-family: sans-serif;}
+.cmtt-10{font-family: monospace,monospace;}
+.cmtt-10{font-family: monospace,monospace;}
+.cmtt-10{font-family: monospace,monospace;}
+.cmtt-10{font-family: monospace,monospace;}
+.cmss-10{ font-family: sans-serif;}
+.cmss-10{ font-family: sans-serif;}
+.cmss-10{ font-family: sans-serif;}
+.cmti-10{ font-style: italic;}
+.cmtt-9{font-size:90%;font-family: monospace,monospace;}
+.cmtt-9{font-family: monospace,monospace;}
+.cmtt-9{font-family: monospace,monospace;}
+.cmtt-9{font-family: monospace,monospace;}
+.cmbx-10{ font-weight: bold;}
+.cmbx-10{ font-weight: bold;}
+.cmitt-10{font-family: monospace,monospace; font-style: italic;}
+.tcrm-0900{font-size:90%;}
+.cmss-8{font-size:80%; font-family: sans-serif;}
+.cmss-8{ font-family: sans-serif;}
+.cmss-8{ font-family: sans-serif;}
+.small-caps{font-variant: small-caps; }
+p{margin-top:0;margin-bottom:0}
+p.indent{text-indent:0;}
+p + p{margin-top:1em;}
+p + div, p + pre {margin-top:1em;}
+div + p, pre + p {margin-top:1em;}
+a { overflow-wrap: break-word; word-wrap: break-word; word-break: break-word; hyphens: auto; }
+@media print {div.crosslinks {visibility:hidden;}}
+a img { border-top: 0; border-left: 0; border-right: 0; }
+center { margin-top:1em; margin-bottom:1em; }
+td center { margin-top:0em; margin-bottom:0em; }
+.Canvas { position:relative; }
+img.math{vertical-align:middle;}
+div.par-math-display, div.math-display{text-align:center;}
+li p.indent { text-indent: 0em }
+li p:first-child{ margin-top:0em; }
+li p:last-child, li div:last-child { margin-bottom:0.5em; }
+li p:first-child{ margin-bottom:0; }
+li p~ul:last-child, li p~ol:last-child{ margin-bottom:0.5em; }
+.enumerate1 {list-style-type:decimal;}
+.enumerate2 {list-style-type:lower-alpha;}
+.enumerate3 {list-style-type:lower-roman;}
+.enumerate4 {list-style-type:upper-alpha;}
+div.newtheorem { margin-bottom: 2em; margin-top: 2em;}
+.obeylines-h,.obeylines-v {white-space: nowrap; }
+div.obeylines-v p { margin-top:0; margin-bottom:0; }
+.overline{ text-decoration:overline; }
+.overline img{ border-top: 1px solid black; }
+td.displaylines {text-align:center; white-space:nowrap;}
+.centerline {text-align:center;}
+.rightline {text-align:right;}
+pre.verbatim {font-family: monospace,monospace; text-align:left; clear:both; }
+.fbox {padding-left:3.0pt; padding-right:3.0pt; text-indent:0pt; border:solid black 0.4pt; }
+div.fbox {display:table}
+div.center div.fbox {text-align:center; clear:both; padding-left:3.0pt; padding-right:3.0pt; text-indent:0pt; border:solid black 0.4pt; }
+div.minipage{width:100%;}
+div.center, div.center div.center {text-align: center; margin-left:1em; margin-right:1em;}
+div.center div {text-align: left;}
+div.flushright, div.flushright div.flushright {text-align: right;}
+div.flushright div {text-align: left;}
+div.flushleft {text-align: left;}
+.underline{ text-decoration:underline; }
+.underline img{ border-bottom: 1px solid black; margin-bottom:1pt; }
+.framebox-c, .framebox-l, .framebox-r { padding-left:3.0pt; padding-right:3.0pt; text-indent:0pt; border:solid black 0.4pt; }
+.framebox-c {text-align:center;}
+.framebox-l {text-align:left;}
+.framebox-r {text-align:right;}
+span.thank-mark{ vertical-align: super }
+span.footnote-mark sup.textsuperscript, span.footnote-mark a sup.textsuperscript{ font-size:80%; }
+div.footnotes{border-top:solid 1px black; border-bottom:solid 1px black; padding-bottom:1ex; padding-top:0.5ex; margin-right:15%; margin-top:2ex; font-style:italic; font-size:85%;}
+div.footnotes p{margin-top:0; margin-bottom:0; text-indent:0;}
+div.tabular, div.center div.tabular {text-align: center; margin-top:0.5em; margin-bottom:0.5em; }
+table.tabular td p{margin-top:0em;}
+table.tabular {margin-left: auto; margin-right: auto;}
+td p:first-child{ margin-top:0em; }
+td p:last-child{ margin-bottom:0em; }
+div.td00{ margin-left:0pt; margin-right:0pt; }
+div.td01{ margin-left:0pt; margin-right:5pt; }
+div.td10{ margin-left:5pt; margin-right:0pt; }
+div.td11{ margin-left:5pt; margin-right:5pt; }
+table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
+td.td00{ padding-left:0pt; padding-right:0pt; }
+td.td01{ padding-left:0pt; padding-right:5pt; }
+td.td10{ padding-left:5pt; padding-right:0pt; }
+td.td11{ padding-left:5pt; padding-right:5pt; }
+table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
+.hline hr, .cline hr{ height : 0px; margin:0px; }
+.hline td, .cline td{ padding: 0; }
+.hline hr, .cline hr{border:none;border-top:1px solid black;}
+.hline {border-top: 1px solid black;}
+.tabbing-right {text-align:right;}
+div.float, div.figure {margin-left: auto; margin-right: auto;}
+div.float img {text-align:center;}
+div.figure img {text-align:center;}
+.marginpar,.reversemarginpar {width:20%; float:right; text-align:left; margin-left:auto; margin-top:0.5em; font-size:85%; text-decoration:underline;}
+.marginpar p,.reversemarginpar p{margin-top:0.4em; margin-bottom:0.4em;}
+.reversemarginpar{float:left;}
+table.equation {width:100%;}
+.equation td{text-align:center; }
+td.equation { margin-top:1em; margin-bottom:1em; }
+td.equation-label { width:5%; text-align:center; }
+td.eqnarray4 { width:5%; white-space: normal; }
+td.eqnarray2 { width:5%; }
+table.eqnarray-star, table.eqnarray {width:100%;}
+div.eqnarray{text-align:center;}
+div.array {text-align:center;}
+div.pmatrix {text-align:center;}
+table.pmatrix {width:100%;}
+span.pmatrix img{vertical-align:middle;}
+div.pmatrix {text-align:center;}
+table.pmatrix {width:100%;}
+span.bar-css {text-decoration:overline;}
+img.cdots{vertical-align:middle;}
+.partToc a, .partToc, .likepartToc a, .likepartToc {line-height: 200%; font-weight:bold; font-size:110%;}
+.chapterToc a, .chapterToc, .likechapterToc a, .likechapterToc, .appendixToc a, .appendixToc {line-height: 200%; font-weight:bold;}
+.index-item, .index-subitem, .index-subsubitem {display:block}
+div.caption {text-indent:-2em; margin-left:3em; margin-right:1em; text-align:left;}
+div.caption span.id{font-weight: bold; white-space: nowrap; }
+h1.partHead{text-align: center}
+p.bibitem { text-indent: -2em; margin-left: 2em; margin-top:0.6em; margin-bottom:0.6em; }
+p.bibitem-p { text-indent: 0em; margin-left: 2em; margin-top:0.6em; margin-bottom:0.6em; }
+.paragraphHead, .likeparagraphHead { margin-top:2em; font-weight: bold;}
+.subparagraphHead, .likesubparagraphHead { font-weight: bold;}
+.verse{white-space:nowrap; margin-left:2em}
+div.maketitle {text-align:center;}
+h2.titleHead{text-align:center;}
+div.maketitle{ margin-bottom: 2em; }
+div.author, div.date {text-align:center;}
+div.thanks{text-align:left; margin-left:10%; font-size:85%; font-style:italic; }
+div.abstract p {margin-left:5%; margin-right:5%;}
+div.abstract {width:100%;}
+.abstracttitle{text-align:center;margin-bottom:1em;}
+.alltt P { margin-bottom : 0em; margin-top : 0em; }
+.alltt { margin-bottom : 1em; margin-top : 1em; font-family:monospace,monospace; }
+div.tabular, div.center div.tabular {text-align: center; margin-top:0.5em; margin-bottom:0.5em; }
+table.tabular td p{margin-top:0em;}
+table.tabular {margin-left: auto; margin-right: auto;}
+td p:first-child{ margin-top:0em; }
+td p:last-child{ margin-bottom:0em; }
+div.td00{ margin-left:0pt; margin-right:0pt; }
+div.td01{ margin-left:0pt; margin-right:5pt; }
+div.td10{ margin-left:5pt; margin-right:0pt; }
+div.td11{ margin-left:5pt; margin-right:5pt; }
+table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
+td.td00{ padding-left:0pt; padding-right:0pt; }
+td.td01{ padding-left:0pt; padding-right:5pt; }
+td.td10{ padding-left:5pt; padding-right:0pt; }
+td.td11{ padding-left:5pt; padding-right:5pt; }
+table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
+.hline hr, .cline hr{ height : 0px; margin:0px; }
+.hline td, .cline td{ padding: 0; }
+.hline hr, .cline hr{border:none;border-top:1px solid black;}
+.hline {border-top: 1px solid black;}
+div.array {text-align:center;}
+.equation td{text-align:center; }
+.equation-star td{text-align:center; }
+table.equation-star { width:100%; }
+table.equation { width:100%; }
+table.align, table.alignat, table.xalignat, table.xxalignat, table.flalign {width:95%; margin-left:5%; white-space: nowrap;}
+table.align-star, table.alignat-star, table.xalignat-star, table.flalign-star {margin-left:auto; margin-right:auto; white-space: nowrap;}
+td.align-label { width:5%; text-align:center; }
+td.align-odd { text-align:right; padding-right:0.3em;}
+td.align-even { text-align:left; padding-right:0.6em;}
+table.multline, table.multline-star {width:100%;}
+td.gather {text-align:center; }
+table.gather {width:100%;}
+div.gather-star {text-align:center;}
+table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
+div.longtable{text-align:center;}
+table.longtable{margin-left:auto; margin-right: auto;}
+.supertabular {text-align:center}
+.warningsymbol { color: red; font-weight: bold;}
+div.important { border : solid red; }
+div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; clear:both; padding-top: 2ex; padding-bottom: 2ex;}
+span#textcolor1{color:#00FF00}
+span#textcolor2{color:#00FF00}
+span#textcolor3{color:#00FF00}
+span#textcolor4{color:#FF0000}
+span#textcolor5{color:#00FF00}
+span#textcolor6{color:#FF0000}
+span#textcolor7{color:#FF0000}
+span#textcolor8{color:#FF0000}
+span#textcolor9{color:#00FF00}
+span#textcolor10{color:#00FF00}
+span#textcolor11{color:#FF0000}
+span#textcolor12{color:#00FF00}
+span#textcolor13{color:#00FF00}
+span#textcolor14{color:#00FF00}
+span#textcolor15{color:#00FF00}
+span#textcolor16{color:#FF0000}
+span#textcolor17{color:#FF0000}
+span#textcolor18{color:#FF0000}
+span#textcolor19{color:#00FF00}
+span#textcolor20{color:#00FF00}
+span#textcolor21{color:#FF0000}
+span#textcolor22{color:#00FF00}
+span#textcolor23{color:#00FF00}
+span#textcolor24{color:#00FF00}
+span#textcolor25{color:#00FF00}
+span#textcolor26{color:#FF0000}
+span#textcolor27{color:#FF0000}
+span#textcolor28{color:#00FF00}
+span#textcolor29{color:#FF0000}
+span#textcolor30{color:#FF0000}
+span#textcolor31{color:#FF0000}
+span#textcolor32{color:#00FF00}
+span#textcolor33{color:#FF0000}
+span#textcolor34{color:#00FF00}
+span#textcolor35{color:#00FF00}
+span#textcolor36{color:#00FF00}
+span#textcolor37{color:#00FF00}
+span#textcolor38{color:#FF0000}
+span#textcolor39{color:#00FF00}
+span#textcolor40{color:#00FF00}
+/* end css.sty */
+
+</style>
</head><body
>
<!--l. 59--><p class="noindent" ><a
@@ -263,7 +259,7 @@ span#textcolor40{color:#00FF00}
>
<!--l. 59--><p class="noindent" >
</p><!--l. 59--><p class="noindent" ><span
-class="cmr-17">The glossaries package v4.48: a guide for</span>
+class="cmr-17">The glossaries package v4.49: a guide for</span>
<span
class="cmr-17">beginners</span>
</p>
@@ -281,7 +277,7 @@ href="https://www.dickimaw-books.com/" ><span
class="cmtt-12">dickimaw-books.com</span></a> </td></tr></table>
</div>
<!--l. 59--><p class="noindent" ><span
-class="cmr-12">2021-10-19</span></p></div>
+class="cmr-12">2021-11-01</span></p></div>
<div
class="abstract"
>
diff --git a/macros/latex/contrib/glossaries/glossariesbegin.pdf b/macros/latex/contrib/glossaries/glossariesbegin.pdf
index ac5f923c2c..df97b42bca 100644
--- a/macros/latex/contrib/glossaries/glossariesbegin.pdf
+++ b/macros/latex/contrib/glossaries/glossariesbegin.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/glossariesbegin.tex b/macros/latex/contrib/glossaries/glossariesbegin.tex
index a4068d1edb..00b3a872c0 100644
--- a/macros/latex/contrib/glossaries/glossariesbegin.tex
+++ b/macros/latex/contrib/glossaries/glossariesbegin.tex
@@ -35,10 +35,10 @@
\texorpdfstring{{\frenchspacing\obeyspaces\ttfamily#1}}{#1}}
\newcommand*{\file}[1]{\texorpdfstring{\texttt{#1}}{#1}}
-\title{The glossaries package v4.48:
+\title{The glossaries package v4.49:
a guide for beginners}
\author{Nicola L.C. Talbot\\\href{https://www.dickimaw-books.com/}{\nolinkurl{dickimaw-books.com}}}
-\date{2021-10-19}
+\date{2021-11-01}
\ifpdf
\externaldocument{glossaries-user}
diff --git a/macros/latex/contrib/glossaries/glossary2glossaries.html b/macros/latex/contrib/glossaries/glossary2glossaries.html
index eb61e00fc3..747c533b00 100644
--- a/macros/latex/contrib/glossaries/glossary2glossaries.html
+++ b/macros/latex/contrib/glossaries/glossary2glossaries.html
@@ -204,7 +204,7 @@ class="td11"><span
class="cmr-12">Nicola L.C. Talbot</span></td></tr></table>
</div>
<!--l. 52--><p class="noindent" ><span
-class="cmr-12">2021-10-19</span></p></div>
+class="cmr-12">2021-11-01</span></p></div>
<div
class="abstract"
>
diff --git a/macros/latex/contrib/glossaries/glossary2glossaries.pdf b/macros/latex/contrib/glossaries/glossary2glossaries.pdf
index 5883ad0f66..f9a189ad1b 100644
--- a/macros/latex/contrib/glossaries/glossary2glossaries.pdf
+++ b/macros/latex/contrib/glossaries/glossary2glossaries.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/glossary2glossaries.tex b/macros/latex/contrib/glossaries/glossary2glossaries.tex
index e8671059a3..268d3c997a 100644
--- a/macros/latex/contrib/glossaries/glossary2glossaries.tex
+++ b/macros/latex/contrib/glossaries/glossary2glossaries.tex
@@ -34,7 +34,7 @@
\title{Upgrading from the glossary package to the glossaries
package}
\author{Nicola L.C. Talbot}
-\date{2021-10-19}
+\date{2021-11-01}
\newenvironment{oldway}{%
\begin{labelledbox}{\styfmt{glossary}}\ttfamily\obeylines
diff --git a/macros/latex/contrib/glossaries/makeglossaries b/macros/latex/contrib/glossaries/makeglossaries
index 08f9c2047d..b37d882285 100755
--- a/macros/latex/contrib/glossaries/makeglossaries
+++ b/macros/latex/contrib/glossaries/makeglossaries
@@ -2,7 +2,7 @@
# File : makeglossaries
# Author : Nicola Talbot
-# Version : 4.48
+# Version : 4.49
# Description: simple Perl script that calls makeindex or xindy.
# Intended for use with "glossaries.sty" (saves having to remember
# all the various switches)
@@ -31,10 +31,10 @@
# glossaries-babel.sty, glossaries-polyglossia.sty, glossaries.perl.
# Also makeglossaries and makeglossaries-lite.lua.
-my $version="4.48 (2021-10-19)";
+my $version="4.49 (2021-11-01)";
# History:
-# v4.48:
+# v4.48-4.49:
# * No change. (Version number updated in line with glossaries.sty)
# v4.47:
# * Added hybrid instructions if record option detected but not
diff --git a/macros/latex/contrib/glossaries/makeglossaries-lite.1 b/macros/latex/contrib/glossaries/makeglossaries-lite.1
index 8908f9ea8b..24b1f7253b 100644
--- a/macros/latex/contrib/glossaries/makeglossaries-lite.1
+++ b/macros/latex/contrib/glossaries/makeglossaries-lite.1
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "MAKEGLOSSARIES-LITE 1"
-.TH MAKEGLOSSARIES-LITE 1 "2021-10-19" "perl v5.32.1" "makeglossaries-lite Lua Script"
+.TH MAKEGLOSSARIES-LITE 1 "2021-11-01" "perl v5.32.1" "makeglossaries-lite Lua Script"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/macros/latex/contrib/glossaries/makeglossaries-lite.lua b/macros/latex/contrib/glossaries/makeglossaries-lite.lua
index 1d820a5e59..3f735b6625 100755
--- a/macros/latex/contrib/glossaries/makeglossaries-lite.lua
+++ b/macros/latex/contrib/glossaries/makeglossaries-lite.lua
@@ -36,7 +36,7 @@
Also makeglossaries and makeglossaries-lite.lua.
History:
- * 4.48:
+ * 4.48 - 4.49:
- no change.
* 4.47:
- Added hybrid instructions if record option detected but not \makeglossaries
@@ -70,7 +70,7 @@
- changed first line from lua to texlua
--]]
-thisversion = "4.48 (2021-10-19)"
+thisversion = "4.49 (2021-11-01)"
quiet = false
dryrun = false
diff --git a/macros/latex/contrib/glossaries/makeglossaries.1 b/macros/latex/contrib/glossaries/makeglossaries.1
index ed38ab0006..93fd8e53cc 100644
--- a/macros/latex/contrib/glossaries/makeglossaries.1
+++ b/macros/latex/contrib/glossaries/makeglossaries.1
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "MAKEGLOSSARIES 1"
-.TH MAKEGLOSSARIES 1 "2021-10-19" "perl v5.32.1" "makeglossaries Perl Script"
+.TH MAKEGLOSSARIES 1 "2021-11-01" "perl v5.32.1" "makeglossaries Perl Script"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf b/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf
index 3095d669b4..1c122be642 100644
--- a/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf
+++ b/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/minimalgls.pdf b/macros/latex/contrib/glossaries/samples/minimalgls.pdf
index d3fdcc87b4..3cc3933031 100644
--- a/macros/latex/contrib/glossaries/samples/minimalgls.pdf
+++ b/macros/latex/contrib/glossaries/samples/minimalgls.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf b/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf
index ec38fcfa95..25e33fb118 100644
--- a/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf
+++ b/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/mwe-acr.pdf b/macros/latex/contrib/glossaries/samples/mwe-acr.pdf
index a83957fb36..b791a5edd3 100644
--- a/macros/latex/contrib/glossaries/samples/mwe-acr.pdf
+++ b/macros/latex/contrib/glossaries/samples/mwe-acr.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/mwe-gls.pdf b/macros/latex/contrib/glossaries/samples/mwe-gls.pdf
index acd4d643e3..82529c18c4 100644
--- a/macros/latex/contrib/glossaries/samples/mwe-gls.pdf
+++ b/macros/latex/contrib/glossaries/samples/mwe-gls.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf b/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf
index 6d45dc1394..2b8cefeedf 100644
--- a/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf b/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf
index 799e534ed2..a72f7f531c 100644
--- a/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-crossref.pdf b/macros/latex/contrib/glossaries/samples/sample-crossref.pdf
index 7ec8e402e9..c785978e59 100644
--- a/macros/latex/contrib/glossaries/samples/sample-crossref.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-crossref.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf b/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf
index 1af96a0426..bf869b5812 100644
--- a/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf b/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf
index 70cbddbb93..e487ccebb0 100644
--- a/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-dual.pdf b/macros/latex/contrib/glossaries/samples/sample-dual.pdf
index 6737b49fd3..f32bd5aab9 100644
--- a/macros/latex/contrib/glossaries/samples/sample-dual.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-dual.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf b/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf
index 7e49082cee..072b30e709 100644
--- a/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf b/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf
index 89593e49a9..6cd63f1b08 100644
--- a/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf b/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf
index bc823c789a..f08dd19aa9 100644
--- a/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-ignored.pdf b/macros/latex/contrib/glossaries/samples/sample-ignored.pdf
index cabbe7a65b..ac12cd6b91 100644
--- a/macros/latex/contrib/glossaries/samples/sample-ignored.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-ignored.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-index.pdf b/macros/latex/contrib/glossaries/samples/sample-index.pdf
index 8daf3a909c..18aca297db 100644
--- a/macros/latex/contrib/glossaries/samples/sample-index.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-index.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-inline.pdf b/macros/latex/contrib/glossaries/samples/sample-inline.pdf
index ec66a71c8c..6698179ca6 100644
--- a/macros/latex/contrib/glossaries/samples/sample-inline.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-inline.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-langdict.pdf b/macros/latex/contrib/glossaries/samples/sample-langdict.pdf
index 73fa79cd1e..b977efca8e 100644
--- a/macros/latex/contrib/glossaries/samples/sample-langdict.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-langdict.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf b/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf
index a90219ba91..09848adde7 100644
--- a/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf b/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf
index 59f43eec1b..a1b54f5bda 100644
--- a/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf b/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf
index fc50936463..582a44bdb2 100644
--- a/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf b/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf
index 462d07eee0..ad89563aee 100644
--- a/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf b/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf
index eec39aac3e..11a2b3cb9d 100644
--- a/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-prefix.pdf b/macros/latex/contrib/glossaries/samples/sample-prefix.pdf
index 55b68d153f..d767daf03f 100644
--- a/macros/latex/contrib/glossaries/samples/sample-prefix.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-prefix.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-si.pdf b/macros/latex/contrib/glossaries/samples/sample-si.pdf
index de1b6531fd..7016990ab5 100644
--- a/macros/latex/contrib/glossaries/samples/sample-si.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-si.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf b/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf
index ca0906d9bd..b214d3e259 100644
--- a/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf b/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf
index c89298d927..a38071e11c 100644
--- a/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample.pdf b/macros/latex/contrib/glossaries/samples/sample.pdf
index 7308e76e9c..d44df95547 100644
--- a/macros/latex/contrib/glossaries/samples/sample.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample4col.pdf b/macros/latex/contrib/glossaries/samples/sample4col.pdf
index 18bd974c29..861d052dde 100644
--- a/macros/latex/contrib/glossaries/samples/sample4col.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample4col.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleAcr.pdf b/macros/latex/contrib/glossaries/samples/sampleAcr.pdf
index 2cb3f4df33..7c4dbaf66f 100644
--- a/macros/latex/contrib/glossaries/samples/sampleAcr.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleAcr.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf b/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf
index 39cbb82261..64e1381697 100644
--- a/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf b/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf
index 154cdef90c..2c16b300f4 100644
--- a/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleDB.pdf b/macros/latex/contrib/glossaries/samples/sampleDB.pdf
index 1c733aa875..b5d26b403c 100644
--- a/macros/latex/contrib/glossaries/samples/sampleDB.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleDB.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleDesc.pdf b/macros/latex/contrib/glossaries/samples/sampleDesc.pdf
index 199dc02062..c26618e248 100644
--- a/macros/latex/contrib/glossaries/samples/sampleDesc.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleDesc.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleEq.pdf b/macros/latex/contrib/glossaries/samples/sampleEq.pdf
index a20f686e1a..21b90887d4 100644
--- a/macros/latex/contrib/glossaries/samples/sampleEq.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleEq.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf b/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf
index 955b4dd2a1..cedfdafb11 100644
--- a/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf b/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf
index ef040cb2d7..6598cf1a09 100644
--- a/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleNtn.pdf b/macros/latex/contrib/glossaries/samples/sampleNtn.pdf
index 82dc07cebf..12b4afdd61 100644
--- a/macros/latex/contrib/glossaries/samples/sampleNtn.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleNtn.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/samplePeople.pdf b/macros/latex/contrib/glossaries/samples/samplePeople.pdf
index ab12d2c182..f6375699ad 100644
--- a/macros/latex/contrib/glossaries/samples/samplePeople.pdf
+++ b/macros/latex/contrib/glossaries/samples/samplePeople.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleSec.pdf b/macros/latex/contrib/glossaries/samples/sampleSec.pdf
index c10ecf2c80..ea80da55ca 100644
--- a/macros/latex/contrib/glossaries/samples/sampleSec.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleSec.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleSort.pdf b/macros/latex/contrib/glossaries/samples/sampleSort.pdf
index 31bbfc606c..582c187a5c 100644
--- a/macros/latex/contrib/glossaries/samples/sampleSort.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleSort.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf b/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf
index 6343c9e1a1..83b823d4a5 100644
--- a/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf b/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf
index b4e5ba7e14..fd34b28d6e 100644
--- a/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampletree.pdf b/macros/latex/contrib/glossaries/samples/sampletree.pdf
index 3507645ec6..1018d8008f 100644
--- a/macros/latex/contrib/glossaries/samples/sampletree.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampletree.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleutf8.pdf b/macros/latex/contrib/glossaries/samples/sampleutf8.pdf
index 4b14d2f0aa..01bc7cd9ad 100644
--- a/macros/latex/contrib/glossaries/samples/sampleutf8.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleutf8.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/samplexdy.pdf b/macros/latex/contrib/glossaries/samples/samplexdy.pdf
index dcdde1352a..ec59009b20 100644
--- a/macros/latex/contrib/glossaries/samples/samplexdy.pdf
+++ b/macros/latex/contrib/glossaries/samples/samplexdy.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/samplexdy2.pdf b/macros/latex/contrib/glossaries/samples/samplexdy2.pdf
index 5802357a77..24d2486123 100644
--- a/macros/latex/contrib/glossaries/samples/samplexdy2.pdf
+++ b/macros/latex/contrib/glossaries/samples/samplexdy2.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/samplexdy3.pdf b/macros/latex/contrib/glossaries/samples/samplexdy3.pdf
index 5bc0728c30..36d2201509 100644
--- a/macros/latex/contrib/glossaries/samples/samplexdy3.pdf
+++ b/macros/latex/contrib/glossaries/samples/samplexdy3.pdf
Binary files differ
diff --git a/macros/latex/contrib/mathalpha/README b/macros/latex/contrib/mathalpha/README
index 3fc8cff092..5eaefbe63f 100644
--- a/macros/latex/contrib/mathalpha/README
+++ b/macros/latex/contrib/mathalpha/README
@@ -5,13 +5,15 @@ As of version 1.12, the name of the package mathalfa was changed to mathalpha. (
This package provides a standard means of setting math alphabets
associated with the macros \mathcal, \mathbb, \mathfrak and \mathscr
-and, where available, their bold counterparts \mathbcal, \mathbbb,
-\mathbfrak and \mathbscr.
+and, where available, their bold counterparts \mathbcal (now \mathbfcal),
+\mathbbb (now \mathbfbb), \mathbfrak (now \mathbffrak)and \mathbscr (now \mathbfscr.)
It mostly bypasses the usual fd and sty files used to load these
alphabets in order to allow each to be scaled independently and
without silently quantizing the sizes.
-Current version: 1.14 2021-10-29
+Current version: 1.142 2021-11-01
+
+Version 1.142 corrects for missing \fi in a number of \mathfrak definitions due, I think, to an erroneous mass copy and paste in 1.14.
Version 1.14 marks a rather major revision, incorporating a number of suggestions from Frank Mittelbach.
(a) A number of alphabets have been added, including bboldx (an extension of bbold Blackboard Bold) and several from the STIX and STIX2 fonts.
@@ -31,7 +33,7 @@ Version 1.09 adds two more calligraphic/script alphabets, both upright---txupr i
Version 1.08 adds two more alphabets---bb=libus sets blackboard bold to the double-struck alphabet from LibertinusT1Math, and cal=stix sets the calligraphic alphabet to the one in stix-mathcal.pfb.
-Copyright 2012--2019 Michael Sharpe
+Copyright (c) 2012--2021 Michael Sharpe
msharpe at ucsd dot edu
License:
diff --git a/macros/latex/contrib/mathalpha/tex/mathalpha.sty b/macros/latex/contrib/mathalpha/tex/mathalpha.sty
index bde30690ab..16d2a5e83d 100644
--- a/macros/latex/contrib/mathalpha/tex/mathalpha.sty
+++ b/macros/latex/contrib/mathalpha/tex/mathalpha.sty
@@ -1,6 +1,6 @@
\NeedsTeXFormat{LaTeX2e}
-\def\mathalphaVersion{1.14}
-\def\mathalphaDate{2021/10/29}
+\def\mathalphaVersion{1.142}
+\def\mathalphaDate{2021/11/01}
\ProvidesPackage{mathalpha}[\mathalphaDate\space-\space\mathalphaVersion
mathalpha (License LPPL) Michael Sharpe]
\message{`mathalpha' v\mathalphaVersion, \mathalphaDate, a renaming of mathalfa (msharpe)}
@@ -711,6 +711,7 @@ frak: lucida, esstix, mathpi^^J
\ifmathalfa@bfrak\else%
\SetMathAlphabet{\mathfrak}{bold}{U}{euf}{b}{n}
\DeclareMathAlphabet{\mathbffrak}{U}{euf}{b}{n}
+ \fi
\or % lucida
\iflucid@loaded \PackageError{mathalpha}{Do not use lucida as an option to mathalpha after loading a lucida package}{}\fi
\ifmathalfa@bbb\mathalpha@boldError{lucida}{frak}\fi
@@ -734,6 +735,7 @@ frak: lucida, esstix, mathpi^^J
\ifmathalfa@bfrak\else%
\SetMathAlphabet{\mathfrak}{bold}{U}{mmamfrak}{b}{n}
\DeclareMathAlphabet{\mathbffrak}{U}{mmamfrak}{b}{n}
+ \fi
\or % mt
%\@ifpackageloaded{mtpro2}{\mtp@loadedError}{} %allow use with mtpro2
\DeclareFontFamily{U}{mt2mf}{}%
@@ -747,6 +749,7 @@ frak: lucida, esstix, mathpi^^J
\ifmathalfa@bfrak\else%
\SetMathAlphabet{\mathfrak}{bold}{U}{mt2mf}{b}{n}
\DeclareMathAlphabet{\mathbffrak}{U}{mt2mf}{b}{n}
+ \fi
\or % esstix
\ifmathalfa@bbb\mathalpha@boldError{esstix}{frak}\fi
\DeclareFontFamily{U}{esstixfrak}{\skewchar \font =45}
@@ -763,6 +766,7 @@ frak: lucida, esstix, mathpi^^J
\ifmathalfa@bfrak\else%
\SetMathAlphabet{\mathfrak}{bold}{U}{BOONDOX-frak}{b}{n}
\DeclareMathAlphabet{\mathbffrak} {U}{BOONDOX-frak}{b}{n}
+ \fi
\or % pxtx
\DeclareFontFamily{U}{txfrak}{\skewchar \font =127}
\DeclareFontShape{U}{txfrak}{m}{n}{
@@ -773,6 +777,7 @@ frak: lucida, esstix, mathpi^^J
\ifmathalfa@bfrak\else%
\SetMathAlphabet{\mathfrak}{bold}{U}{txfrak}{b}{n}
\DeclareMathAlphabet{\mathbffrak} {U}{txfrak}{b}{n}
+ \fi
\or % stixtwo
\DeclareFontFamily{U}{stix2frak}{\skewchar\font127 }
\DeclareFontShape{U}{stix2frak}{m}{n} {
@@ -783,6 +788,7 @@ frak: lucida, esstix, mathpi^^J
\ifmathalfa@bfrak\else%
\SetMathAlphabet{\mathfrak}{bold}{U}{stix2frak}{b}{n}
\DeclareMathAlphabet{\mathbffrak} {U}{stix2frak}{b}{n}
+ \fi
\fi
%%%%%%%%%%%%%%%%%% END \mathfrak
diff --git a/macros/latex/contrib/pdfoverlay/pdfoverlay.dtx b/macros/latex/contrib/pdfoverlay/pdfoverlay.dtx
index 82fb0e35e3..1ae9d9ded0 100644
--- a/macros/latex/contrib/pdfoverlay/pdfoverlay.dtx
+++ b/macros/latex/contrib/pdfoverlay/pdfoverlay.dtx
@@ -22,10 +22,11 @@
% \changes{v1.1}{2019/11/03}{Fix deprecated macros}
% \changes{v1.2}{2020/10/29}{Update to use \pkg{l3hooks}}
% \changes{v1.2a}{2021/02/25}{Ensure backend loaded before counting pages}
+% \changes{v1.2b}{2021/11/01}{Protect unexpandable macros}
%
% \title{The \pkg{pdfoverlay} package}
% \author{David Purton\thanks{Email: \url{dcpurton@marshwiggle.net}}}
-% \date{2021/02/25 v1.2a}
+% \date{2021/11/01 v1.2b}
%
% \maketitle
%
@@ -164,7 +165,7 @@
%
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[2020-10-01]
-\ProvidesExplPackage{pdfoverlay}{2021/02/25}{1.2a}
+\ProvidesExplPackage{pdfoverlay}{2021/11/01}{1.2b}
{Overlay text on an existing PDF document (DCP)}
% \end{macrocode}
%
@@ -322,7 +323,7 @@
% Main function to output the current page of the PDF file. This is called
% before every page is shipped using the \texttt{shipout/background} hook.
% \begin{macrocode}
-\cs_new:Nn \@@_output_pdf_page:
+\cs_new_protected:Nn \@@_output_pdf_page:
{
% \end{macrocode}
% Check if we are currently outputting pages, a PDF file has been set, and
@@ -361,7 +362,7 @@
% Format the PDF page with options from \cs{g_@@_graphics_options_clist} and
% place it in \cs{g_@@_pdf_page_coffin}.
% \begin{macrocode}
-\cs_new:Nn \@@_format_pdf_page:
+\cs_new_protected:Nn \@@_format_pdf_page:
{
\hcoffin_gset:Nn \g_@@_pdf_page_coffin
{
@@ -409,7 +410,7 @@
% with \cs{pdfoverlay_set_pdf} then \cs{g_@@_pdf_page_count_int} is set to
% zero.
% \begin{macrocode}
-\cs_new:Nn \@@_count_pdf_pages:
+\cs_new_protected:Nn \@@_count_pdf_pages:
{
\int_gzero:N \g_@@_page_count_int
\str_if_empty:NTF \g_@@_pdf_file_name_str
@@ -467,7 +468,7 @@
% Check if a PDF file has been set and the requested page is valid. If not,
% generate suitable error messages.
% \begin{macrocode}
-\prg_new_conditional:Npnn \@@_if_page_exists:n #1 { p, T, F, TF }
+\prg_new_conditional:Nnn \@@_if_page_exists:n { p, T, F, TF }
{
\str_if_empty:NTF \g_@@_pdf_file_name_str
{
@@ -500,7 +501,7 @@
% \begin{macro}{\pdfoverlay_set_pdf:n}
% Specify a PDF file to overlay text on to.
% \begin{macrocode}
-\cs_new:Npn \pdfoverlay_set_pdf:n #1
+\cs_new_protected:Nn \pdfoverlay_set_pdf:n
{
% \end{macrocode}
% Test if the file exists and generate a suitable error if it doesn't.
@@ -532,7 +533,7 @@
% \texttt{page} option is appended automatically in the
% correct format.
% \begin{macrocode}
-\cs_new:Nn \pdfoverlay_set_graphics_options:n
+\cs_new_protected:Nn \pdfoverlay_set_graphics_options:n
{
\clist_gset:Nn \g_@@_graphics_options_clist { #1 }
\clist_gput_right:Nn \g_@@_graphics_options_clist
@@ -549,7 +550,7 @@
% \texttt{shipout/background} hook, we just insert the required number of
% blank pages into the document.
% \begin{macrocode}
-\cs_new:Npn \pdfoverlay_include_to_page:n #1
+\cs_new_protected:Nn \pdfoverlay_include_to_page:n
{
% \end{macrocode}
% Check if a PDF file is set and the requested page exists.
@@ -606,7 +607,7 @@
% \begin{macro}{\pdfoverlay_include_to_last_page:}
% Output all remaining pages in the PDF file.
% \begin{macrocode}
-\cs_new:Nn \pdfoverlay_include_to_last_page:
+\cs_new_protected:Nn \pdfoverlay_include_to_last_page:
{
\pdfoverlay_include_to_page:n { \g_@@_page_count_int }
}
@@ -616,8 +617,8 @@
% \begin{macro}{\pdfoverlay_skip_to_page:n}
% Skip to the specified page number in the PDF file.
% \begin{macrocode}
-\cs_new:Npn \pdfoverlay_skip_to_page:n #1
- {
+\cs_new_protected:Nn \pdfoverlay_skip_to_page:n
+ {
\@@_if_page_exists:nT { #1 }
{
% \end{macrocode}
@@ -645,7 +646,7 @@
% \begin{macro}{\pdfoverlay_pause_output:}
% Pause outputting pages from the PDF file.
% \begin{macrocode}
-\cs_new:Nn \pdfoverlay_pause_output:
+\cs_new_protected:Nn \pdfoverlay_pause_output:
{
\bool_gset_false:N \g_@@_output_active_bool
}
@@ -655,7 +656,7 @@
% \begin{macro}{\pdfoverlay_resume_output:}
% Resume outputting pages from the PDF file.
% \begin{macrocode}
-\cs_new:Nn \pdfoverlay_resume_output:
+\cs_new_protected:Nn \pdfoverlay_resume_output:
{
\bool_gset_true:N \g_@@_output_active_bool
}
diff --git a/macros/latex/contrib/pdfoverlay/pdfoverlay.ins b/macros/latex/contrib/pdfoverlay/pdfoverlay.ins
index bca2324684..9ed5fedbb4 100644
--- a/macros/latex/contrib/pdfoverlay/pdfoverlay.ins
+++ b/macros/latex/contrib/pdfoverlay/pdfoverlay.ins
@@ -19,7 +19,7 @@ version 2005/12/01 or later.
This is a generated file.
-Copyright (c) 2018-2020 David Purton <dcpurton@marshwiggle.net>
+Copyright (c) 2018-2021 David Purton <dcpurton@marshwiggle.net>
This work may be distributed and/or modified under the conditions of
the LaTeX Project2 Public License, either version 1.3c of this license
diff --git a/macros/latex/contrib/pdfoverlay/pdfoverlay.pdf b/macros/latex/contrib/pdfoverlay/pdfoverlay.pdf
index 0be43b9f9e..fc25f7bd7e 100644
--- a/macros/latex/contrib/pdfoverlay/pdfoverlay.pdf
+++ b/macros/latex/contrib/pdfoverlay/pdfoverlay.pdf
Binary files differ
diff --git a/macros/latex/contrib/suftesi/suftesi.dtx b/macros/latex/contrib/suftesi/suftesi.dtx
index 02fec48f52..3898fbeaba 100644
--- a/macros/latex/contrib/suftesi/suftesi.dtx
+++ b/macros/latex/contrib/suftesi/suftesi.dtx
@@ -56,7 +56,7 @@ This work has the LPPL maintenance status "author-maintained".
%<class>\NeedsTeXFormat{LaTeX2e}[2005/12/01]
%<class>\ProvidesClass{suftesi}
%<*class>
- [2021/06/06 v3.1.3 A class for typesetting theses, books and articles]
+ [2021/11/01 v3.2.0 A class for typesetting theses, books and articles]
%</class>
%<*driver>
\documentclass[12pt]{ltxdoc}
@@ -248,7 +248,7 @@ cochineal,mathpazo,bera,amsthm}
\draw[draw=gray!10,thick] (\expaperwidth,0) -- (\expaperwidth,\expaperheight);
\draw[xshift=\exxshift,body] (0,0) rectangle (\extextwidth,\extextheight);
\draw[xshift=\exzshift,body] (0,0) rectangle (\extextwidth,\extextheight);
- \node at (\expaperwidth,-4) (caption) {\parbox{2.5cm}{\centering\footnotesize\texttt{#2}\par (\sufgetlength[cm]{2}{\expaperwidth} $\times$ \sufgetlength[cm]{2}{\expaperheight})\par}};
+ \node at (\expaperwidth,-4) (caption) {\parbox{3cm}{\centering\footnotesize\texttt{#2}\par (\sufgetlength[cm]{2}{\expaperwidth} $\times$ \sufgetlength[cm]{2}{\expaperheight})\par}};
\end{tikzpicture}}
% --------------------------------------------------------
% OTHER THUMBNAILS
@@ -338,7 +338,7 @@ cochineal,mathpazo,bera,amsthm}
%</driver>
% \fi
%
-% \CheckSum{5686}
+% \CheckSum{5685}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -356,6 +356,8 @@ cochineal,mathpazo,bera,amsthm}
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
+% \changes{v3.2.0}{2021/11/01}{Fixed a bug in \cmd{xfootnote} command.
+% Fixed a bug occurring when using the \cmd{geometry} command.}
% \changes{v3.1.3}{2021/06/06}{Maintenance release.
% Moved commands for breaking titles after \opt{titletoc} settings.
% Corrected a bug in \cmd{maketitle} with the \opt{collection} structure.
@@ -485,7 +487,7 @@ cochineal,mathpazo,bera,amsthm}
% on the basis of Sebastian Kosch's Crimson.
% The \texttt{typewriter} font is Inconsolata,
% designed by Raph Levien and the \textsf{sans serif} text
-% is typeset in Linux Biolinum, created by Philipp H.~Pol.
+% is typeset in Linux Biolinum, created by Philipp H.~Poll.
%\end{minipage}
%
% \vfill
@@ -912,7 +914,7 @@ cochineal,mathpazo,bera,amsthm}
% The default roman font is Cochineal by Michael Sharpe,
% the sans serif font is Linux Biolinum, designed by Philipp H.
% Poll,\index{Poll, Philipp H.} and the typewriter face is Inconsolata
-% by Michael Sharpe. Cochineal is a fork of Crimson, by Sebastian Kosch,
+% by Raph Levien. Cochineal is a fork of Crimson, by Sebastian Kosch,
% a font inspired by masterpieces like Sabon (Jan Tschichold) and Minion
% (Robert Slimbach). It is a very complete typeface and it offers full
% support for Greek and Cyrillic, real small caps (even in italic shape)
@@ -960,15 +962,19 @@ cochineal,mathpazo,bera,amsthm}
%
% \optitem[10\OR 10pt]{fontsize}{\meta{dimen}}
% Sets the main font sizes for the document, changing the \cmd{baselineskip}
-% accordingly. This option is based on the \sty{fontsize} package \parencite{fontsize}. The \meta{fontsize} can be given in any unit recognized
+% accordingly. This option is based on the \sty{fontsize} package \parencite{fontsize}.
+% The \meta{fontsize} can be given in any unit recognized
% by TeX (for example: \opt{6mm}, \opt{1ex}, \opt{11.5pt}).
% If the unit is not declared it defaults to \texttt{pt}.
% If you want to set a specific value for \cmd{baselineskip}
% you have to use the \cmd{changefontsize}\oarm{baselineskip}\arm{fontsize} command.
%
% \optitem[low]{smallcapsstyle}{\opt{low}\OR\opt{upper}}
-% Effective only with \opt{\meta{level}font=smallcaps} and \opt{toc\meta{level}font=smallcaps} options (see sections \ref{sec:titles} and \ref{sec:toc}).
-% With \hologo{XeLaTeX} or \hologo{LuaLaTeX} this option is effective only if a font selection command (such as \cmd{setmainfont}) is given.
+% Effective only with \opt{\meta{level}font=smallcaps} and
+% \opt{toc\meta{level}font=smallcaps} options (see sections \ref{sec:titles}
+% and \ref{sec:toc}).
+% With \hologo{XeLaTeX} or \hologo{LuaLaTeX} this option is effective only if a font
+% selection command (such as \cmd{setmainfont}) is given.
% \begin{valuelist}
% \item[low] Prints lowercase spaced \textsc{\lsstyle small capitals}.
% \item[upper] Prints spaced \textsc{\lsstyle Small Capitals} with uppercase initials.
@@ -1593,8 +1599,7 @@ cochineal,mathpazo,bera,amsthm}
% \scriptsize\@thefnmark.\hskip.5em}%
%}\hfill
%\fakefootnote{\renewcommand\@makefntext{%
-% \textsuperscript{\scriptsize\@thefnmark}\hskip.3em}
-%}
+% \raisebox{3pt}{\scriptsize\@thefnmark}\hskip.3em}\vspace*{5pt}}
%\makeatother
%\caption{The four styles for the footnotes: \opt{bulged}, \opt{hung}, \opt{dotted}, \opt{superscript}}\label{fig:fakefootnote}
%\end{figure}
@@ -1656,7 +1661,7 @@ cochineal,mathpazo,bera,amsthm}
% \changes{v0.9b}{2012/09/23}{New command \cmd{xfootnote}}
%
% Aa command to print a footnote with a discretionary
-% symbols given in the optional argument (default:\texttt{*}).
+% symbols given in the optional argument (default:~\texttt{*}).
% It does not increment the footnote counter.
%
% \cmditem{marginpar}{text}
@@ -5334,10 +5339,6 @@ cochineal,mathpazo,bera,amsthm}
\else
\let\SUF@versionof\relax
\fi
-\AtBeginDocument{%
- \pagestyle{fancy}
- \renewcommand{\headrulewidth}{0pt}
- \renewcommand{\footnoterule}{}}
% \end{macrocode}
% \paragraph{The \opt{default} headers}
% In previous versions \cmd{SUF@HEAD@thechapter} and
@@ -5384,9 +5385,24 @@ cochineal,mathpazo,bera,amsthm}
\fi
\def\SUF@leftrightmark{%
\if@mainmatter\leftmark\else\rightmark\fi}
-\pagestyle{sufdefault}
- \ifsuftesi@centerheader\pagestyle{centerheader}\else\fi
- \ifsuftesi@sufplain\pagestyle{sufplain}\else\fi
+% \end{macrocode}
+% The \cmd{geometry} command gives the expected result
+% only if used \textit{before} the page style assignment.
+% So this must be declared at the beginning of the document:
+% \begin{macrocode}
+\AtBeginDocument{%
+ \renewcommand{\headrulewidth}{0pt}
+ \renewcommand{\footnoterule}{}
+ \ifsuftesi@centerheader
+ \pagestyle{centerheader}
+ \else
+ \ifsuftesi@sufplain
+ \pagestyle{sufplain}
+ \else
+ \pagestyle{sufdefault}
+ \fi
+ \fi
+}
% \end{macrocode}
% \subsection{Notes and quotations}
% \paragraph{Block Quotations}
@@ -5441,10 +5457,11 @@ cochineal,mathpazo,bera,amsthm}
\fi
% \end{macrocode}
% \paragraph{The \cmd{xfootnote} command} Prints a footnote with discretionary
-% symbol give in the first argument.
+% symbol give in the first argument. Since version 1.3.4 \cmd{protected@xdef}
+% replaces \cmd{xdef}.
% \begin{macrocode}
\newcommand*\xfootnote[1][*]{%
- \xdef\@thefnmark{#1}%
+ \protected@xdef\@thefnmark{#1}%
\@footnotemark\@footnotetext}
% \end{macrocode}
% \paragraph{Marginal notes}
diff --git a/macros/latex/contrib/suftesi/suftesi.pdf b/macros/latex/contrib/suftesi/suftesi.pdf
index ec961c454b..6fcd730d42 100644
--- a/macros/latex/contrib/suftesi/suftesi.pdf
+++ b/macros/latex/contrib/suftesi/suftesi.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/README.md b/macros/latex/contrib/uni-titlepage/README.md
index 9386dbe962..b19aa7a798 100644
--- a/macros/latex/contrib/uni-titlepage/README.md
+++ b/macros/latex/contrib/uni-titlepage/README.md
@@ -2,12 +2,11 @@
Copyright (c) Markus Kohm <komascript at gmx.info>
-Release: 2021/09/01 v0.7
+Release: 2021/11/01 v0.7a
License: LPPL 1.3c
KOMA presents the title page project
-
----------------------------------------------------------------------------
This work may be distributed and/or modified under the conditions of
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-DHBW.pdf b/macros/latex/contrib/uni-titlepage/titlepage-DHBW.pdf
index 02068b9734..aa3ad68ba4 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-DHBW.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-DHBW.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-JT-Aufsaetze.pdf b/macros/latex/contrib/uni-titlepage/titlepage-JT-Aufsaetze.pdf
index 2f566a32fd..1873873a61 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-JT-Aufsaetze.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-JT-Aufsaetze.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-JT-Geschichte.pdf b/macros/latex/contrib/uni-titlepage/titlepage-JT-Geschichte.pdf
index 7e0707a6e5..a052cc2694 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-JT-Geschichte.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-JT-Geschichte.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-JT-Typography.pdf b/macros/latex/contrib/uni-titlepage/titlepage-JT-Typography.pdf
index f4624aa528..43c45f9645 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-JT-Typography.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-JT-Typography.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-KIT.pdf b/macros/latex/contrib/uni-titlepage/titlepage-KIT.pdf
index fe2204f7bc..bfc51f8783 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-KIT.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-KIT.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-KOMAScript.pdf b/macros/latex/contrib/uni-titlepage/titlepage-KOMAScript.pdf
index fef8094c68..ab91b6dfcb 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-KOMAScript.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-KOMAScript.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-Markus-1.pdf b/macros/latex/contrib/uni-titlepage/titlepage-Markus-1.pdf
index 0df124c56a..a1ab770936 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-Markus-1.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-Markus-1.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-Markus-2.pdf b/macros/latex/contrib/uni-titlepage/titlepage-Markus-2.pdf
index 0a3da486d0..bcd61ea691 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-Markus-2.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-Markus-2.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-Spacer.pdf b/macros/latex/contrib/uni-titlepage/titlepage-Spacer.pdf
index 4d81e0f293..bffe9cdb0b 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-Spacer.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-Spacer.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-TU-DD.pdf b/macros/latex/contrib/uni-titlepage/titlepage-TU-DD.pdf
index b3e01d9bfa..9207512271 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-TU-DD.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-TU-DD.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-TU-HH.pdf b/macros/latex/contrib/uni-titlepage/titlepage-TU-HH.pdf
index 19afe66206..b928b2cdb8 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-TU-HH.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-TU-HH.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-UKoLa.pdf b/macros/latex/contrib/uni-titlepage/titlepage-UKoLa.pdf
index 0eafc0d6f3..a3243acd02 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-UKoLa.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-UKoLa.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/titlepage-WWUM.pdf b/macros/latex/contrib/uni-titlepage/titlepage-WWUM.pdf
index 50eb4a7abd..dd4aa86e12 100644
--- a/macros/latex/contrib/uni-titlepage/titlepage-WWUM.pdf
+++ b/macros/latex/contrib/uni-titlepage/titlepage-WWUM.pdf
Binary files differ
diff --git a/macros/latex/contrib/uni-titlepage/uni-titlepage.dtx b/macros/latex/contrib/uni-titlepage/uni-titlepage.dtx
index cb5d3bf669..c4f9295b72 100644
--- a/macros/latex/contrib/uni-titlepage/uni-titlepage.dtx
+++ b/macros/latex/contrib/uni-titlepage/uni-titlepage.dtx
@@ -81,10 +81,10 @@
}[%
%</!README>
%<README>
-%<README>Release: 2021/09/01 v0.7
+%<README>Release: 2021/11/01 v0.7a
%<README>
%<README>License: LPPL 1.3c
-%<!README>2021/09/01 v0.7
+%<!README>2021/11/01 v0.7a
%<README>
KOMA presents the title page project
%<*!README>
@@ -2293,8 +2293,10 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
% \changes{v0.7}{2021/08/18}{changed value also for \texttt{UKoLa}}
% \begin{macro}{\ordinalmalerefereename}
% \changes{v0.7}{2021/08/18}{changed value for \texttt{UKoLa}}
+% \changes{v0.7a}{2021/10/26}{typofix for \texttt{austrian}}
% \begin{macro}{\ordinalfemalerefereename}
% \changes{v0.7}{2021/08/18}{changed value for \texttt{UKoLa}}
+% \changes{v0.7a}{2021/10/26}{typofix for \texttt{austrian}}
% \begin{macrocode}
%<*WWUM|UKoLa>
\NowButAfterBeginDocument
@@ -2315,9 +2317,9 @@ You may however distribute the file `uni-titlepage.dtx' without this file.
}%
\scr@ifundefinedorrelax{captionsaustrian}{}{%
\renewcaptionname{austrian}{\presentedbyname}{vorgelegt von}%
- \renewcaptionname{austrian}{\ordinalmalerefereeename}{%
+ \renewcaptionname{austrian}{\ordinalmalerefereename}{%
\germanordinalmalecorrectorname}%
- \renewcaptionname{austrian}{\ordinalfemalerefereeename}{%
+ \renewcaptionname{austrian}{\ordinalfemalerefereename}{%
\germanordinalfemalecorrectorname}%
}%
\scr@ifundefinedorrelax{captionsnaustrian}{}{%
diff --git a/macros/latex/contrib/uni-titlepage/uni-titlepage.pdf b/macros/latex/contrib/uni-titlepage/uni-titlepage.pdf
index 4df09a5ca2..3b2c381650 100644
--- a/macros/latex/contrib/uni-titlepage/uni-titlepage.pdf
+++ b/macros/latex/contrib/uni-titlepage/uni-titlepage.pdf
Binary files differ
diff --git a/macros/latex/contrib/xcolor/ChangeLog b/macros/latex/contrib/xcolor/ChangeLog
index 630eff06d9..1e613111c2 100644
--- a/macros/latex/contrib/xcolor/ChangeLog
+++ b/macros/latex/contrib/xcolor/ChangeLog
@@ -1,9 +1,17 @@
Package `xcolor' by Dr. Uwe Kern
-(xcolor at ukern dot de)
+https://github.com/latex3/xcolor/issues
History
=======
-
+2021/10/31 v2.13
+* Bugfixes (LaTeX Team)
+ - use \@backslashchar color rather than \string\color to
+ generate internal csnames, to avoid relying on the
+ current setting of \escapechar
+ - Declare dvisvgm option to match graphics and color packages.
+ Make dvipdfm an alias for dvipdfmx
+ - Modify \XC@info to avoid spurious text from \colorlet{foo}{.!50}
+
2016/05/11 v2.12
* New features:
- \nopagecolor command as introduced in `color' v1.1a
diff --git a/macros/latex/contrib/xcolor/README b/macros/latex/contrib/xcolor/README
index c81492b5d4..fa4b7dc333 100644
--- a/macros/latex/contrib/xcolor/README
+++ b/macros/latex/contrib/xcolor/README
@@ -1,7 +1,6 @@
Package `xcolor' by Dr. Uwe Kern
-(xcolor at ukern dot de)
+Maintained by the LaTeX Project https://github.com/latex3/xcolor/issues
-v2.12 (2016/05/11)
`xcolor' provides easy driver-independent access to several kinds of
colors, tints, shades, tones, and mixes of arbitrary colors by means of
diff --git a/macros/latex/contrib/xcolor/xcolor.dtx b/macros/latex/contrib/xcolor/xcolor.dtx
index 48ab957f48..8162c8f863 100644
--- a/macros/latex/contrib/xcolor/xcolor.dtx
+++ b/macros/latex/contrib/xcolor/xcolor.dtx
@@ -1,12 +1,13 @@
% \iffalse meta-comment
%%
%% ----------------------------------------------------------------
-%% Copyright (C) 2003-2016 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% Copyright (C) 2003-2021 by Dr. Uwe Kern <xcolor at ukern dot de>
+%% 2021 LaTeX Project https://github.com/latex3/xcolor/issues
%% ----------------------------------------------------------------
%%
%<*package>
%% Please send error reports and suggestions for
-%% improvements to the above email address.
+%% improvements to https://github.com/latex3/xcolor/issues.
%%
%% This package contains code copied from
%%
@@ -17,19 +18,19 @@
%%
%</package>
%<*extract|driver|test1|test2|test3|test4>
-\def\XCfileversion{v2.12}%
-\def\XCfiledate{2016/05/11}%
+\def\XCfileversion{v2.13}%
+\def\XCfiledate{2021/10/31}%
%</extract|driver|test1|test2|test3|test4>
%
% This file may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.2
+% conditions of the LaTeX Project Public License, either version 1.3c
% of this license or (at your option) any later version.
% The latest version of this license is in:
%
% http://www.latex-project.org/lppl.txt
%
-% and version 1.2 or later is part of all distributions of LaTeX
-% version 1999/12/01 or later.
+% and version 1.3c or later is part of all distributions of LaTeX
+% version 2008-05-04 or later.
%
% \fi
%
@@ -231,8 +232,8 @@
% \date{\XCfileversion{} (\XCfiledate)
% \thanks{This package can be downloaded from \CTAN{macros/latex/contrib/xcolor/}{}.
% There is also an \textsf{xcolor} homepage: \XCW.
-% Please send error reports and suggestions for improvements to the author:
-% \texttt{\href{mailto:xcolor@ukern.de}{xcolor@ukern.de}}.}}
+% Please send error reports and suggestions for improvements to:
+% \url{https://github.com/latex3/xcolor/issues}.}}
% \maketitle
%
% \begin{abstract}
@@ -376,7 +377,7 @@
%
% In general, there are several types of options:
% \begin{itemize}
-% \item options that determine the color driver as explained in \cite{dpc} and \cite{color}, currently: \Option{dvips}, \Option{xdvi}, \Option{dvipdf}, \Option{dvipdfm}, \Option{dvipdfmx}, \Option{luatex}, \Option{pdftex}, \Option{dvipsone}, \Option{dviwindo}, \Option{emtex}, \Option{dviwin}, \Option{oztex}, \Option{textures}, \Option{pctexps}, \Option{pctexwin}, \Option{pctexhp}, \Option{pctex32}, \Option{truetex}, \Option{tcidvi}, \Option{vtex}, \Option{xetex},
+% \item options that determine the color driver as explained in \cite{dpc} and \cite{color}, currently: \Option{dvips}, \Option{xdvi}, \Option{dvipdf}, \Option{dvipdfm}, \Option{dvipdfmx}, \Option{luatex}, \Option{pdftex}, \Option{dvipsone}, \Option{dviwindo}, \Option{emtex}, \Option{dviwin}, \Option{oztex}, \Option{textures}, \Option{pctexps}, \Option{pctexwin}, \Option{pctexhp}, \Option{pctex32}, \Option{truetex}, \Option{tcidvi}, \Option{vtex}, \Option{xetex}, \Option{dvisvgm},
% \item options that determine the target color model\footnote{Section \vref{sec.tgt} explains how this setting can be overridden at any point in a document.} (\Option{natural}, \Option{rgb}, \Option{cmy}, \Option{cmyk}, \Option{hsb}, \Option{gray}, \Option{RGB}, \Option{HTML}, \Option{HSB}, \Option{Gray}) or disable colored output (\Option{monochrome}),
% \item options that control whether and how certain sets of predefined colors are being loaded: \Option{dvipsnames}, \Option{dvipsnames*}, \Option{svgnames}, \Option{svgnames*}, \Option{x11names}, \Option{x11names*},
% \item options that determine which other packages are to be loaded or supported: \Option{table}, \Option{fixpdftex},
@@ -3144,6 +3145,16 @@
% \subsection*{History}
% \addcontentsline{toc}{subsection}{History}
%
+% \subsubsection*{2021/10/31 v2.13}
+% \begin{itemize}
+% \item Bug Fixes:
+% \begin{itemize}
+% \item Avoid use of |\string| to generate csnames
+% \item Declare |dvisvgm| option and make |dvipdfm| an alias to |dvipdfmx| to match graphics and color packages.
+% \item Modify |\XC@info| to avoid spurious text from |\colorlet{foo}{.!50}|
+% \end{itemize}
+% \end{itemize}
+%
% \subsubsection*{2016/05/11 v2.12}
% \begin{itemize}
% \item New features:
@@ -3596,7 +3607,7 @@
% \begin{macro}{\XC@@}
% Macro consisting of the macro |\\XC@@|, serves as a delimiter.
% \begin{macrocode}
-\edef\XC@@{\expandafter\noexpand\csname\string\XC@@\endcsname}
+\edef\XC@@{\expandafter\noexpand\csname\@backslashchar XC@@\endcsname}
% \end{macrocode}
% \end{macro}
%
@@ -4044,9 +4055,9 @@
%
% Drivers that come with their individual definition files:
% \begin{macrocode}
-\@tfor\@@tmp:={dvipdf}{dvipdfm}{dvipdfmx}{dvips}{dvipsone}{dviwin}%
+\@tfor\@@tmp:={dvipdf}{dvipdfmx}{dvips}{dvipsone}{dviwin}%
{emtex}{luatex}{pctex32}{pctexhp}{pctexps}{pctexwin}{pdftex}%
- {tcidvi}{textures}{truetex}{vtex}{xetex}\do
+ {tcidvi}{textures}{truetex}{vtex}{xetex}{dvisvgm}\do
{\edef\@@tmp{\noexpand\DeclareOption{\@@tmp}%
{\def\noexpand\Gin@driver{\@@tmp.def}}}%
\@@tmp}
@@ -4057,6 +4068,7 @@
\DeclareOption{dviwindo}{\ExecuteOptions{dvipsone}}
\DeclareOption{oztex}{\ExecuteOptions{dvips}}
\DeclareOption{xdvi}{\ExecuteOptions{dvips,monochrome}}
+\DeclareOption{dvipdfm}{\ExecuteOptions{dvipdfmx}}
% \end{macrocode}
%
% Options used by (some) drivers.
@@ -4890,7 +4902,7 @@
\toks@\expandafter{\@@drv}%
\edef\@@tmp
{\ifglobalcolors\global\else\xglobal@\fi
- \noexpand\@namedef{\string\color@\@@nam}%
+ \noexpand\@namedef{\@backslashchar color@\@@nam}%
{\noexpand\xcolor@{\@@cls}{\the\toks@}{\@@mod}{\@@clr}}}%
\fi}%
\expandafter\endgroup\@@tmp\xglobal@stop}
@@ -5026,7 +5038,7 @@
\else
\edef\@@tmp
{\expandafter\expandafter\expandafter\@secondoffive
- \csname\string\color@\@@clr\endcsname}%
+ \csname\@backslashchar color@\@@clr\endcsname}%
\ifx\@@cls\@@tmp\XC@@tsttrue\fi
\fi
\fi\fi
@@ -5048,7 +5060,7 @@
{\c@lor@error{`#2'}\let\@@tmp\@empty}%
{\edef\@@tmp
{\ifglobalcolors\global\else\xglobal@\fi
- \noexpand\XC@let@cc{\string\color@#1}{\string\color@#2}}}}
+ \noexpand\XC@let@cc{\@backslashchar color@#1}{\@backslashchar color@#2}}}}
% \end{macrocode}
% \end{macro}
%
@@ -5194,7 +5206,7 @@
\XC@sdef\@@mod{#2}%
\@ifxempty{#4}{\extractcolorspec{#5}\@@clr}{\edef\@@clr{{#4}{#5}}}%
\expandafter\convertcolorspec\@@clr\@@mod\@@clr
- \@namexdef{\string\colorB@#1}{{\@@mod}{\@@clr}}%
+ \@namexdef{\@backslashchar colorB@#1}{{\@@mod}{\@@clr}}%
\edef\@@met{#3}%
\ifx\@@met\XC@met@last
\@ifxempty{#6}{\extractcolorspec{#7}\@@tmp}{\edef\@@tmp{{#6}{#7}}}%
@@ -5204,7 +5216,7 @@
\else
\edef\@@tmp{#7}%
\fi
- \@namexdef{\string\colorD@#1}{{\@@met}{\@@tmp}}%
+ \@namexdef{\@backslashchar colorD@#1}{{\@@met}{\@@tmp}}%
\endgroup}
% \end{macrocode}
% \end{macro}
@@ -5216,15 +5228,15 @@
\def\XC@resetcolorseries[#1]#2%
{\begingroup
\@namexdef
- {\string\color@#2}{\noexpand\xcolor@{}{}\@nameuse{\string\colorB@#2}}%
- \XC@let@Nc\@@tmp{\string\colorD@#2}%
+ {\@backslashchar color@#2}{\noexpand\xcolor@{}{}\@nameuse{\@backslashchar colorB@#2}}%
+ \XC@let@Nc\@@tmp{\@backslashchar colorD@#2}%
\edef\@@met{\expandafter\@firstoftwo\@@tmp}%
\edef\@@tmp{\expandafter\@secondoftwo\@@tmp}%
\ifx\@@met\XC@met@step\else
\edef\@@scl{\@ifxempty{#1}\colorseriescycle{#1}}%
\expandafter\XC@calc@\@@tmp,,,,:D%
\fi
- \@namexdef{\string\colorS@#2}{\@@tmp}%
+ \@namexdef{\@backslashchar colorS@#2}{\@@tmp}%
\endgroup}
% \end{macrocode}
% \end{macro}
@@ -5236,14 +5248,14 @@
% In the relative case, the (non-negative) number of single steps is supposed to be stored in |\@tempcnta|.
% \begin{macrocode}
\def\XC@step#1%
- {\let\xcolor@\@gobbletwo\edef\@@tmp{\@nameuse{\string\color@#1}}%
+ {\let\xcolor@\@gobbletwo\edef\@@tmp{\@nameuse{\@backslashchar color@#1}}%
\expandafter\XC@st@p\@@tmp{#1}%
- \@namexdef{\string\color@#1}{\noexpand\xcolor@{}{}{\@@mod}{\@@tmp}}}
+ \@namexdef{\@backslashchar color@#1}{\noexpand\xcolor@{}{}{\@@mod}{\@@tmp}}}
% \end{macrocode}
%
% \begin{macrocode}
\def\XC@st@p#1#2#3%
- {\def\@@mod{#1}\def\@@tmp{#2}\edef\@@vec{\@nameuse{\string\colorS@#3}}%
+ {\def\@@mod{#1}\def\@@tmp{#2}\edef\@@vec{\@nameuse{\@backslashchar colorS@#3}}%
\@whilenum\@tempcnta>\z@\do
{\XC@inflate\@@mod\@@tmp\@@vec\@@tmp
\expandafter\XC@add\@@tmp,\@@tmp \expandafter\XC@calc@\@@tmp,,,,:U%
@@ -5252,7 +5264,7 @@
%
% \begin{macrocode}
\def\XC@stepabs#1%
- {\edef\@@tmp{\@nameuse{\string\colorB@#1}}%
+ {\edef\@@tmp{\@nameuse{\@backslashchar colorB@#1}}%
\expandafter\XC@st@p\@@tmp{#1}%
\edef\@@tmp
{\def\noexpand\@@mod{\@@mod}\def\noexpand\@@clr{\@@tmp}}}
@@ -5406,7 +5418,7 @@
%
% \begin{macrocode}
\def\XC@declaredc@lor
- {\XC@let@Nc\XC@current@color{\string\color@\XC@@tmp}%
+ {\XC@let@Nc\XC@current@color{\@backslashchar color@\XC@@tmp}%
\edef\current@color{\XC@current@color}%
\XC@display}
% \end{macrocode}
@@ -5444,7 +5456,7 @@
% \begin{macrocode}
\def\nopagecolor
{\@ifundefined{no@page@color}%
- {\PackageInfo{xcolor}{\string\nopagecolor\space is not supported}}%
+ {\PackageInfo{xcolor}{\@backslashchar nopagecolor\space is not supported}}%
{\no@page@color}}
% \end{macrocode}
% \end{macro}
@@ -5778,7 +5790,7 @@
\ifodd\count@\@tempswatrue\else\@tempswafalse\fi
\@ifundefinedcolor\@@nam
{\c@lor@error{`\@@nam'}\def\@@nam{black}}{}%
- \let\xcolor@\@xcolor@\@nameuse{\string\color@\@@nam}}
+ \let\xcolor@\@xcolor@\@nameuse{\@backslashchar color@\@@nam}}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -5852,11 +5864,11 @@
% Write information to log file and display the current color.
% \begin{macrocode}
\def\XC@display
- {\XC@bcolor\XC@let@cN{\string\color@.}\XC@current@color
+ {\XC@bcolor\XC@let@cN{\@backslashchar color@.}\XC@current@color
\ifnum\XC@type{.}=1
\PackageWarning{xcolor}{Incompatible color definition}\else
\ifnum\XC@tracing>2
- \begingroup \let\xcolor@\@empty \def\@nil{\string\@nil}%
+ \begingroup \let\xcolor@\@empty \def\@nil{\@backslashchar @nil}%
\PackageInfo{xcolor}{Setting color `\XC@current@color'}%
\endgroup
\fi\fi
@@ -6058,7 +6070,7 @@
% \marg{name}\marg{undefined}\marg{defined}\\
% Checks whether \Meta{name} is a defined color name and executes the respective code.
% \begin{macrocode}
-\def\@ifundefinedcolor#1{\@ifundefined{\string\color@#1}}
+\def\@ifundefinedcolor#1{\@ifundefined{\@backslashchar color@#1}}
% \end{macrocode}
% \end{macro}
%
@@ -6086,7 +6098,7 @@
% \begin{macrocode}
\def\XC@type#1%
{\expandafter\expandafter\expandafter\XC@typ@
- \csname\string\color@#1\endcsname\@empty\@empty\@empty\XC@@}
+ \csname\@backslashchar color@#1\endcsname\@empty\@empty\@empty\XC@@}
% \end{macrocode}
%
% \begin{macrocode}
@@ -6117,11 +6129,13 @@
% \begin{macrocode}
\def\XC@info#1#2%
{\XC@edef#2{#1}%
- \if.#2\def#2{0}\else\expandafter\in@\expandafter>\expandafter{#2}%
+ \expandafter\in@\expandafter>\expandafter{#2}%
\ifin@\def#2{4}\else\expandafter\in@\expandafter:\expandafter{#2}%
\ifin@\def#2{3}\else\expandafter\in@\expandafter!\expandafter{#2}%
- \ifin@\def#2{2}\else\edef#2{\noexpand\in@{/-}{/#2}}#2%
- \edef#2{\ifin@2\else1\fi}\fi\fi\fi\fi}
+ \ifin@\def#2{2}\else % now there's no >,:,!
+ \if-\expandafter\@car#2\@nil\def#2{2}\else % catches -red
+ \edef#2{\noexpand\in@{/./}{/#2/}}#2%
+ \edef#2{\ifin@0\else1\fi}\fi\fi\fi\fi}
% \end{macrocode}
% \end{macro}
%
@@ -6925,7 +6939,7 @@
\expandafter\expandafter\expandafter\c@lor@to@ps#1#2\@@
\else
\expandafter\expandafter\expandafter\expandafter\expandafter\expandafter
- \expandafter\c@lor@to@ps\csname\string\color@#1#2\endcsname\@@
+ \expandafter\c@lor@to@ps\csname\@backslashchar color@#1#2\endcsname\@@
\fi
\space}
% \end{macrocode}
@@ -6986,18 +7000,18 @@
{{dvipdf,dvipdfm,dvipdfmx,dvips,pctex32}%
{\def\c@lor@@named#1,#2,#3\@@#4%
{\edef#4{\expandafter\expandafter\expandafter\@thirdoffive
- \csname\string\color@#1\endcsname}}
+ \csname\@backslashchar color@#1\endcsname}}
\def\define@color@named#1#2%
- {\@namedef{\string\color@#1}{{}{}{ \colornameprefix#1}{}{}}}}%
+ {\@namedef{\@backslashchar color@#1}{{}{}{ \colornameprefix#1}{}{}}}}%
% \end{macrocode}
%
% \begin{macrocode}
{dvipsone,luatex,pctexps,pdftex,tcidvi,truetex,vtex,xetex}%
{\def\c@lor@@named#1,#2,#3\@@#4%
{\edef#4{\expandafter\expandafter\expandafter\@thirdoffive
- \csname\string\color@#1\endcsname}}
+ \csname\@backslashchar color@#1\endcsname}}
\def\define@color@named#1#2%
- {\let\@@cls\@empty\@namedef{\string\color@#1}{{}{}{#2}{}{}}}}%
+ {\let\@@cls\@empty\@namedef{\@backslashchar color@#1}{{}{}{#2}{}{}}}}%
% \end{macrocode}
%
% \begin{macrocode}
@@ -7010,7 +7024,7 @@
\def\c@lor@ps@#1 #2\@@
{\expandafter\expandafter\expandafter\expandafter\expandafter
\expandafter\expandafter\c@lor@to@ps@
- \csname\string\color@#1\expandafter\endcsname\space
+ \csname\@backslashchar color@#1\expandafter\endcsname\space
#2. \@@{#1}}}%
% \end{macrocode}
%
@@ -7768,7 +7782,7 @@ Purple0,.628,.125,.94}
\begin{document}
\title{Color conversion with the \textsf{xcolor} package --- Examples}
-\author{Dr. Uwe Kern\thanks{This file is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors (\texttt{macros/latex/contrib/xcolor/}) or the homepage \texttt{www.ukern.de/tex/xcolor.html}. Please send error reports and suggestions for improvements to \texttt{xcolor@ukern.de}.}}
+\author{Dr. Uwe Kern\thanks{This file is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors (\texttt{macros/latex/contrib/xcolor/}) or the homepage \texttt{www.ukern.de/tex/xcolor.html}. Please send error reports and suggestions for improvements to \texttt{https://github.com/latex3/xcolor/issues}.}}
\date{\XCfileversion{} (\XCfiledate)}
\maketitle
@@ -7820,7 +7834,7 @@ Purple0,.628,.125,.94}
\usepackage{pstricks,pst-tree,pst-slpe,multido}
\makeatletter
\makeatother
-\usepackage{fvrb-ex}
+\usepackage{fancyvrb-ex}
\def\textfraction{0.01}
\def\topfraction{0.99}
@@ -7832,7 +7846,7 @@ Purple0,.628,.125,.94}
\begin{document}
\title{Color extensions with the \textsf{xcolor} package --- \textsf{pstricks} examples}
-\author{Dr. Uwe Kern\thanks{This file is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors (\texttt{macros/latex/contrib/xcolor/}) or the homepage \texttt{www.ukern.de/tex/xcolor.html}. Please send error reports and suggestions for improvements to \texttt{xcolor@ukern.de}.}}
+\author{Dr. Uwe Kern\thanks{This file is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors (\texttt{macros/latex/contrib/xcolor/}) or the homepage \texttt{www.ukern.de/tex/xcolor.html}. Please send error reports and suggestions for improvements to \texttt{https://github.com/latex3/xcolor/issues}.}}
\date{\XCfileversion{} (\XCfiledate)}
\maketitle
@@ -7964,7 +7978,7 @@ Purple0,.628,.125,.94}
\title{Color extensions with the \textsf{xcolor} package --- various examples}
\author{\href{mailto:xcolor@ukern.de}{\fboxrule0pt\fboxsep2pt\fbox{Dr. Uwe Kern}}}
\date{\XCfileversion{} (\XCfiledate)
-\thanks{This file (\texttt{\jobname.tex}) is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors \texttt{\href{http://www.ctan.org/tex-archive/macros/latex/contrib/xcolor/}{CTAN/macros/latex/contrib/xcolor/}} or the homepage \texttt{\href{http://www.ukern.de/tex/xcolor.html}{www.ukern.de/tex/xcolor.html}}. Please send error reports and suggestions for improvements to \texttt{\href{mailto:xcolor@ukern.de}{xcolor@ukern.de}}.}}
+\thanks{This file (\texttt{\jobname.tex}) is part of the \textsf{xcolor} distribution which can be downloaded from the CTAN mirrors \texttt{\href{http://www.ctan.org/tex-archive/macros/latex/contrib/xcolor/}{CTAN/macros/latex/contrib/xcolor/}} or the homepage \texttt{\href{http://www.ukern.de/tex/xcolor.html}{www.ukern.de/tex/xcolor.html}}. Please send error reports and suggestions for improvements to \url{https://github.com/latex3/xcolor/issues}.}}
\maketitle
The purpose of this file is to demonstrate a variety of capabilities including the logging facilities of the \textsf{xcolor} package.
diff --git a/macros/latex/contrib/xcolor/xcolor.pdf b/macros/latex/contrib/xcolor/xcolor.pdf
index 0f5cdff702..ac7a3d3ef8 100644
--- a/macros/latex/contrib/xcolor/xcolor.pdf
+++ b/macros/latex/contrib/xcolor/xcolor.pdf
Binary files differ
diff --git a/macros/latex/contrib/xcolor/xcolor2.pdf b/macros/latex/contrib/xcolor/xcolor2.pdf
index d9ed84b653..2391e374e8 100644
--- a/macros/latex/contrib/xcolor/xcolor2.pdf
+++ b/macros/latex/contrib/xcolor/xcolor2.pdf
Binary files differ