diff options
79 files changed, 102 insertions, 79 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries b/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries index d540043cfb6..f92d1b990cc 100755 --- a/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries +++ b/Build/source/texk/texlive/linked_scripts/glossaries/makeglossaries @@ -26,9 +26,12 @@ # glossary-super.sty, glossaries.perl. # Also makeglossaries and makeglossaries. -my $version="2.16 (2015-06-28)"; +my $version="2.17 (2015-11-30)"; # History: +# v2.17 (2015/11/30) +# * Escaped { in regular expressions. +# http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=101 # v2.16 (2015/06/28) # * Added check for "german" and codepage that doesn't contain # "din5007", "duden" or "braille". If missing, "din5007-" is @@ -635,7 +638,8 @@ sub scan_aux{ } # v1.9 added - if (m/\\\@input{(.+)\.aux}/) + # v2.17 escaped { in regex + if (m/\\\@input\{(.+)\.aux\}/) { &scan_aux($1); @@ -644,7 +648,8 @@ sub scan_aux{ next; } - if (m/\\\@newglossary\s*\{(.*)\}{(.*)}{(.*)}{(.*)}/) + # v2.17 escaped { in regex + if (m/\\\@newglossary\s*\{(.*)\}\{(.*)\}\{(.*)\}\{(.*)\}/) { $exttype{$1}{'log'} = $2; $exttype{$1}{'out'} = $3; @@ -656,7 +661,8 @@ sub scan_aux{ } } - if (m/\\\@istfilename\s*{([^}]*)}/) + # v2.17 escaped { in regex + if (m/\\\@istfilename\s*\{([^}]*)\}/) { $istfile = $1; @@ -675,13 +681,15 @@ sub scan_aux{ } # v1.5 added - if (m/\\\@xdylanguage\s*{([^}]+)}{([^}]*)}/) + # v2.17 escaped { in regex + if (m/\\\@xdylanguage\s*\{([^}]+)\}\{([^}]*)\}/) { $language{$1} = $2; } # v1.5 added - if (m/\\\@gls\@codepage\s*{([^}]+)}{([^}]*)}/) + # v2.17 escaped { in regex + if (m/\\\@gls\@codepage\s*\{([^}]+)\}\{([^}]*)\}/) { $codepage{$1} = $2; } @@ -690,7 +698,8 @@ sub scan_aux{ # Allow -l switch to override specification in aux file unless (defined($opt_l)) { - if (m/\\\@glsorder\s*{([^}]+)}/) + # v2.17 escaped { in regex + if (m/\\\@glsorder\s*\{([^}]+)\}/) { my $ordering = $1; diff --git a/Master/texmf-dist/doc/latex/glossaries/CHANGES b/Master/texmf-dist/doc/latex/glossaries/CHANGES index b0954f32ea2..19382cc830b 100644 --- a/Master/texmf-dist/doc/latex/glossaries/CHANGES +++ b/Master/texmf-dist/doc/latex/glossaries/CHANGES @@ -1,5 +1,12 @@ glossaries change log: +v4.20: + + * makeglossaries (2.17) bug fix + http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=101 + + (No changes to any of the *.sty files, except the version number.) + v4.19: * glossaries.sty: diff --git a/Master/texmf-dist/doc/latex/glossaries/README b/Master/texmf-dist/doc/latex/glossaries/README index d47eab1a5f9..2c60264d3cd 100644 --- a/Master/texmf-dist/doc/latex/glossaries/README +++ b/Master/texmf-dist/doc/latex/glossaries/README @@ -1,6 +1,6 @@ -LaTeX Package : glossaries v4.19 +LaTeX Package : glossaries v4.20 -Last Modified : 2015-11-22 +Last Modified : 2015-11-30 Author : Nicola Talbot diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdf b/Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdf Binary files differindex d8fa617111d..25141661589 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-code.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html index 33c8f2980ee..97251bb9507 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.html @@ -4,13 +4,13 @@ <!--http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd--> <html xmlns="http://www.w3.org/1999/xhtml" > -<head><title>User Manual for glossaries.sty v4.19</title> +<head><title>User Manual for glossaries.sty v4.20</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="generator" content="TeX4ht (http://www.tug.org/tex4ht/)" /> <meta name="originator" content="TeX4ht (http://www.tug.org/tex4ht/)" /> <!-- xhtml,fn-in,css-in,uni-html4,utf8 --> <meta name="src" content="glossaries-user.tex" /> -<meta name="date" content="2015-11-22 15:07:00" /> +<meta name="date" content="2015-11-30 12:19:00" /> <style type="text/css"> <!-- @@ -228,14 +228,14 @@ div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; cle -<h2 class="titleHead">User Manual for glossaries.sty v4.19</h2> +<h2 class="titleHead">User Manual for glossaries.sty v4.20</h2> <div class="author" ><span class="cmr-12">Nicola L.C. Talbot</span> <br /> <a href="http://www.dickimaw-books.com/" class="url" ><span class="cmtt-12">http://www.dickimaw-books.com/</span></a></div><br /> <div class="date" ><span -class="cmr-12">2015-11-22</span></div> +class="cmr-12">2015-11-30</span></div> </div> @@ -335,7 +335,7 @@ class="cmtt-10">glossaries-code.pdf</span></a> </dt><dd class="description">Advanced users wishing to know more about the inner workings of all the packages provided in the <span class="cmss-10">glossaries </span>bundle should read - “Documented Code for glossaries v4.19”. This includes the documented + “Documented Code for glossaries v4.20”. This includes the documented code for the <span class="cmss-10">mfirstuc</span><a id="dx1-4"></a> package. diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf Binary files differindex 7b6a27792ed..7cf448a4217 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex index 42845e3c37a..37419b2fae6 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex @@ -378,11 +378,11 @@ and~\hyperlink{option#2}{#2}} \MakeShortVerb{"} \DeleteShortVerb{\|} - \title{User Manual for glossaries.sty v4.19} + \title{User Manual for glossaries.sty v4.20} \author{Nicola L.C. Talbot\\% \url{http://www.dickimaw-books.com/}} - \date{2015-11-22} + \date{2015-11-30} \maketitle \begin{abstract} @@ -444,7 +444,7 @@ letter}{mfirstuc-manual}. \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.19}. +\qt{Documented Code for glossaries v4.20}. This includes the documented code for the \sty{mfirstuc} package. \item[INSTALL] Installation instructions. diff --git a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html index f3cb2f908e2..4df38cac1c2 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html +++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html @@ -4,13 +4,13 @@ <!--http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd--> <html xmlns="http://www.w3.org/1999/xhtml" > -<head><title>The glossaries package v4.19: a guide for beginners</title> +<head><title>The glossaries package v4.20: a guide for beginners</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="generator" content="TeX4ht (http://www.tug.org/tex4ht/)" /> <meta name="originator" content="TeX4ht (http://www.tug.org/tex4ht/)" /> <!-- xhtml,fn-in,css-in,uni-html4,utf8 --> <meta name="src" content="glossariesbegin.tex" /> -<meta name="date" content="2015-11-22 15:07:00" /> +<meta name="date" content="2015-11-30 12:19:00" /> <style type="text/css"> <!-- @@ -197,11 +197,11 @@ div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; cle -<h2 class="titleHead">The glossaries package v4.19: a guide for beginners</h2> +<h2 class="titleHead">The glossaries package v4.20: a guide for beginners</h2> <div class="author" ><span class="cmr-12">Nicola L.C. Talbot</span></div><br /> <div class="date" ><span -class="cmr-12">2015-11-22</span></div> +class="cmr-12">2015-11-30</span></div> </div> <div class="abstract" diff --git a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf Binary files differindex 2d93cb50174..0e96cdfd20a 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex index d8dc79ef6b3..f9b646cb507 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex +++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex @@ -20,10 +20,10 @@ \newcommand*{\yes}{\ding{52}} \newcommand*{\no}{\ding{56}} -\title{The glossaries package v4.19: +\title{The glossaries package v4.20: a guide for beginners} \author{Nicola L.C. Talbot} -\date{2015-11-22} +\date{2015-11-30} \ifpdf \externaldocument{glossaries-user} diff --git a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html index 9694c6f07a3..411bff47ee2 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html +++ b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.html @@ -10,7 +10,7 @@ <meta name="originator" content="TeX4ht (http://www.tug.org/tex4ht/)" /> <!-- xhtml,fn-in,css-in,uni-html4,utf8 --> <meta name="src" content="glossary2glossaries.tex" /> -<meta name="date" content="2015-11-22 15:07:00" /> +<meta name="date" content="2015-11-30 12:19:00" /> <style type="text/css"> <!-- @@ -179,7 +179,7 @@ glossaries package</h2> <div class="author" ><span class="cmr-12">Nicola L.C. Talbot</span></div><br /> <div class="date" ><span -class="cmr-12">2015-11-22</span></div> +class="cmr-12">2015-11-30</span></div> </div> <div class="abstract" diff --git a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf Binary files differindex 23da9f4bebf..15890359932 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex index e405029dc01..e7947360fc5 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex +++ b/Master/texmf-dist/doc/latex/glossaries/glossary2glossaries.tex @@ -33,7 +33,7 @@ \title{Upgrading from the glossary package to the glossaries package} \author{Nicola L.C. Talbot} -\date{2015-11-22} +\date{2015-11-30} \newenvironment{oldway}{% \begin{labelledbox}{\styfmt{glossary}}\ttfamily\obeylines diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf Binary files differindex cd098cc0676..c45c178c47b 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf Binary files differindex e7f5bbf7617..29257e69f8e 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdf Binary files differindex 637f97a88c8..7eb117e7d27 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdf Binary files differindex 9ddda024ac6..fea5d8a5a8d 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdf Binary files differindex f552a218ed8..0c83db56027 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf Binary files differindex 8327d057eae..589893246d7 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdf Binary files differindex 25e59ba5c09..49351f64a70 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf Binary files differindex 8958886e4c4..d51de5243e0 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf Binary files differindex d07011fd9c2..6ece67a0d60 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdf Binary files differindex b6d71604abb..2cf1c2a2cd6 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf Binary files differindex 1bb020cbf1c..92e3616d817 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdf Binary files differindex 213067bc9f2..ebc251b4f30 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf Binary files differindex 5ff5886d442..7467f184f57 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdf Binary files differindex dc173f6f66b..1cb8a1004fe 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf Binary files differindex dcf6c64b23c..be66009a29f 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf Binary files differindex 48c60250ffe..fa56ebb803f 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf Binary files differindex 57e4de59381..398569da8d0 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf Binary files differindex 8f4f11a9ed3..6e6f4d8bbab 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf Binary files differindex 116285b662d..c9d1dcf5155 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf Binary files differindex fc28ccd4b1b..eb19f82070a 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf Binary files differindex 8c96e5c2e37..374f3a40fa5 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf Binary files differindex cef10a12742..74fae88f9da 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf Binary files differindex 5bb5381b85c..9152f76ba94 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf Binary files differindex dd4231f6a78..4cfca18b13d 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf Binary files differindex 4761efba29c..4c096b20509 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdf Binary files differindex b2083eb06af..1864b9232e0 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdf Binary files differindex c936960b14a..2e7dde0d635 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf Binary files differindex aa509ae0b25..772e1ef6354 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf Binary files differindex b0dbd6e8440..f6a15b26797 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf Binary files differindex 4c0e8934f60..020e14e650e 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf Binary files differindex e677c734a34..8941693ec54 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf Binary files differindex 9e6dc584d3b..3fc207b4a71 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf Binary files differindex beac8e2975f..34bf42c7d62 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf Binary files differindex 05d456c90fa..ef1c1974a88 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf Binary files differindex f8eb1e03148..a7b6041fc69 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf Binary files differindex 8e6f9129c43..eba6215e3e3 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf Binary files differindex 2873194d0f0..023c192edf4 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf Binary files differindex 41968268af2..fe0e5912639 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf Binary files differindex f87935b8b41..34f57214d4d 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf Binary files differindex 05bf63f0c34..28bc855bc03 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf Binary files differindex e70a238d2aa..884c4fb2eb2 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf Binary files differindex ba327b72101..d4a55d40fac 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf Binary files differindex d4d2689a6cd..26759c78663 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf Binary files differindex 446ad20fac9..a56ae83ef98 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf Binary files differindex 1aea12f218c..15389c6bfc1 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf Binary files differindex faa9e20e6bc..28e1fddf71f 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf Binary files differindex 678e831e776..d874be08475 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf diff --git a/Master/texmf-dist/scripts/glossaries/makeglossaries b/Master/texmf-dist/scripts/glossaries/makeglossaries index d540043cfb6..f92d1b990cc 100755 --- a/Master/texmf-dist/scripts/glossaries/makeglossaries +++ b/Master/texmf-dist/scripts/glossaries/makeglossaries @@ -26,9 +26,12 @@ # glossary-super.sty, glossaries.perl. # Also makeglossaries and makeglossaries. -my $version="2.16 (2015-06-28)"; +my $version="2.17 (2015-11-30)"; # History: +# v2.17 (2015/11/30) +# * Escaped { in regular expressions. +# http://www.dickimaw-books.com/cgi-bin/bugtracker.cgi?action=view&key=101 # v2.16 (2015/06/28) # * Added check for "german" and codepage that doesn't contain # "din5007", "duden" or "braille". If missing, "din5007-" is @@ -635,7 +638,8 @@ sub scan_aux{ } # v1.9 added - if (m/\\\@input{(.+)\.aux}/) + # v2.17 escaped { in regex + if (m/\\\@input\{(.+)\.aux\}/) { &scan_aux($1); @@ -644,7 +648,8 @@ sub scan_aux{ next; } - if (m/\\\@newglossary\s*\{(.*)\}{(.*)}{(.*)}{(.*)}/) + # v2.17 escaped { in regex + if (m/\\\@newglossary\s*\{(.*)\}\{(.*)\}\{(.*)\}\{(.*)\}/) { $exttype{$1}{'log'} = $2; $exttype{$1}{'out'} = $3; @@ -656,7 +661,8 @@ sub scan_aux{ } } - if (m/\\\@istfilename\s*{([^}]*)}/) + # v2.17 escaped { in regex + if (m/\\\@istfilename\s*\{([^}]*)\}/) { $istfile = $1; @@ -675,13 +681,15 @@ sub scan_aux{ } # v1.5 added - if (m/\\\@xdylanguage\s*{([^}]+)}{([^}]*)}/) + # v2.17 escaped { in regex + if (m/\\\@xdylanguage\s*\{([^}]+)\}\{([^}]*)\}/) { $language{$1} = $2; } # v1.5 added - if (m/\\\@gls\@codepage\s*{([^}]+)}{([^}]*)}/) + # v2.17 escaped { in regex + if (m/\\\@gls\@codepage\s*\{([^}]+)\}\{([^}]*)\}/) { $codepage{$1} = $2; } @@ -690,7 +698,8 @@ sub scan_aux{ # Allow -l switch to override specification in aux file unless (defined($opt_l)) { - if (m/\\\@glsorder\s*{([^}]+)}/) + # v2.17 escaped { in regex + if (m/\\\@glsorder\s*\{([^}]+)\}/) { my $ordering = $1; diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx index 12b79cffba3..710d73d2b69 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx @@ -1,18 +1,14 @@ %\iffalse % glossaries.dtx generated using makedtx version 1.1 (c) Nicola Talbot % Command line args: -% -codetitle "Main Package Code" -% -doc "glossaries-manual.tex" % -comment ".*\.perl" % -comment ".*\.tex" % -comment ".*\.xdy" -% -author "Nicola Talbot" -% -setambles ".*\.perl=>\nopreamble\nopostamble" -% -setambles ".*\.tex=>\nopreamble\nopostamble" -% -setambles ".*\.xdy=>\nopreamble\nopostamble" % -macrocode ".*\.perl" % -macrocode ".*\.tex" % -macrocode ".*\.xdy" +% -codetitle "Main Package Code" +% -doc "glossaries-manual.tex" % -src "glossaries.sty\Z=>glossaries.sty" % -src "glossaries-prefix.sty\Z=>glossaries-prefix.sty" % -src "(glossary-.+)\.(sty)\Z=>\1.\2" @@ -28,8 +24,12 @@ % -src "(samplexdy-mc.*\.xdy)\Z=>\1" % -src "(database.*\.tex)\Z=>\1" % -src "(.*\.perl)\Z=>\1" +% -setambles ".*\.perl=>\nopreamble\nopostamble" +% -setambles ".*\.tex=>\nopreamble\nopostamble" +% -setambles ".*\.xdy=>\nopreamble\nopostamble" +% -author "Nicola Talbot" % glossaries -% Created on 2015/11/22 15:06 +% Created on 2015/11/30 12:18 %\fi %\iffalse %<*package> @@ -167,12 +167,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of %\MakeShortVerb{"} %\DeleteShortVerb{\|} % -% \title{Documented Code For glossaries v4.19} +% \title{Documented Code For glossaries v4.20} % \author{Nicola L.C. Talbot\\[10pt] %Dickimaw Books\\ %\url{http://www.dickimaw-books.com/}} % -% \date{2015-11-22} +% \date{2015-11-30} % \maketitle % %This is the documented code for the \styfmt{glossaries} package. @@ -188,7 +188,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.19: +%For the main user guide, read \qt{glossaries.sty v4.20: %\LaTeX2e\ Package to Assist Generating Glossaries}. % %\item[\url{mfirstuc-manual.pdf}] @@ -247,7 +247,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of % This package requires \LaTeXe. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossaries}[2015/11/30 v4.20 (NLCT)] % \end{macrocode} %\changes{4.18}{2015-09-09}{split mfirstuc into separate bundle} % Required packages: @@ -17823,7 +17823,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \cs{gls}\marg{label}'' on subsequent use. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-prefix}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossaries-prefix}[2015/11/30 v4.20 (NLCT)] % \end{macrocode} % Pass all options to \sty{glossaries}: % \begin{macrocode} @@ -18238,7 +18238,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% %\label{sec:code:hypernav} % Package Definition: % \begin{macrocode} -\ProvidesPackage{glossary-hypernav}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-hypernav}[2015/11/30 v4.20 (NLCT)] % \end{macrocode} % % The commands defined in this package are provided to @@ -18406,7 +18406,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % This defines an in-line style where the entries are % comma-separated with just the name and description displayed. % \begin{macrocode} -\ProvidesPackage{glossary-inline}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-inline}[2015/11/30 v4.20 (NLCT)] % \end{macrocode} % %\begin{style}{inline} @@ -18597,7 +18597,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \ics{item} command, it will appear in a bold font by % default. % \begin{macrocode} -\ProvidesPackage{glossary-list}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-list}[2015/11/30 v4.20 (NLCT)] % \end{macrocode} %\begin{macro}{\indexspace} %\changes{4.13}{2015-02-03}{new} @@ -18851,7 +18851,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % The glossary styles defined in the \isty{glossary-long} package % used the \env{longtable} environment in the glossary. % \begin{macrocode} -\ProvidesPackage{glossary-long}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-long}[2015/11/30 v4.20 (NLCT)] % \end{macrocode} % Requires the \isty{longtable} package: % \begin{macrocode} @@ -19326,7 +19326,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % used the \env{longtable} environment in the glossary and use % ragged right formatting for the multiline columns. % \begin{macrocode} -\ProvidesPackage{glossary-longragged}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-longragged}[2015/11/30 v4.20 (NLCT)] % \end{macrocode} % Requires the \isty{array} package: % \begin{macrocode} @@ -19737,7 +19737,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% %use the \sty{multicol} package. These use the tree-like glossary %styles in a multicol environment. % \begin{macrocode} -\ProvidesPackage{glossary-mcols}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-mcols}[2015/11/30 v4.20 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -20044,7 +20044,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % The glossary styles defined in the \isty{glossary-super} package % use the \env{supertabular} environment. % \begin{macrocode} -\ProvidesPackage{glossary-super}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-super}[2015/11/30 v4.20 (NLCT)] % \end{macrocode} % Requires the \isty{supertabular} package: % \begin{macrocode} @@ -20554,7 +20554,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % are like those provided by the \isty{glossary-super} package, % except that the multiline columns have ragged right justification. % \begin{macrocode} -\ProvidesPackage{glossary-superragged}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-superragged}[2015/11/30 v4.20 (NLCT)] % \end{macrocode} % Requires the \isty{array} package: % \begin{macrocode} @@ -20970,7 +20970,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % that have a tree-like structure. These are designed for % hierarchical glossaries. % \begin{macrocode} -\ProvidesPackage{glossary-tree}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-tree}[2015/11/30 v4.20 (NLCT)] % \end{macrocode} % %\begin{macro}{\indexspace} @@ -21580,7 +21580,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % hyperlinks may not work properly. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-207}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossaries-compatible-207}[2015/11/30 v4.20 (NLCT)] % \end{macrocode} %\begin{macro}{\GlsAddXdyAttribute} % Adds an attribute in old format. @@ -21941,7 +21941,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % Compatibility macros. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-307}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossaries-compatible-307}[2015/11/30 v4.20 (NLCT)] % \end{macrocode} % % Compatibility macros for predefined glossary styles: @@ -22747,11 +22747,9 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} % \end{macrocode} -% Package version number now in line with main glossaries package number -% but will only be updated when \texttt{glossaries-accsupp.sty} is -% modified. +% Package version number now in line with main glossaries package number. % \begin{macrocode} -\ProvidesPackage{glossaries-accsupp}[2015/11/22 v4.19 (NLCT) +\ProvidesPackage{glossaries-accsupp}[2015/11/30 v4.20 (NLCT) Experimental glossaries accessibility] % \end{macrocode} % Pass all options to \sty{glossaries}: @@ -25167,7 +25165,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % modules. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-babel}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossaries-babel}[2015/11/30 v4.20 (NLCT)] % \end{macrocode} % Load \sty{tracklang} to obtain language settings. % \begin{macrocode} @@ -25211,7 +25209,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % modules. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-polyglossia}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossaries-polyglossia}[2015/11/30 v4.20 (NLCT)] % \end{macrocode} % Load \sty{tracklang} to obtain language settings. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins index fb5ee844c59..4c02cfd11df 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.ins +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.ins @@ -1,4 +1,4 @@ -% glossaries.ins generated using makedtx version 1.1 2015/11/22 15:06 +% glossaries.ins generated using makedtx version 1.1 2015/11/30 12:18 \input docstrip \preamble diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty index 1adbee65f03..b039bf5af41 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-babel.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-babel}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossaries-babel}[2015/11/30 v4.20 (NLCT)] \RequirePackage{tracklang} \let\glsifusetranslator\@secondoftwo \AnyTrackedLanguages diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty index 3b580195b08..ca219a20991 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-207.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-207}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossaries-compatible-207}[2015/11/30 v4.20 (NLCT)] \ifglsxindy \renewcommand*\GlsAddXdyAttribute[1]{% \edef\@xdyattributes{\@xdyattributes ^^J \string"#1\string"}% diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty index 9d9dcfc52a1..69dc51bbb8f 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-compatible-307.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-compatible-307}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossaries-compatible-307}[2015/11/30 v4.20 (NLCT)] \newcommand{\compatglossarystyle}[2]{% \ifcsundef{@glscompstyle@#1}% {% diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty index 8b879b0a832..d5ba6a3e4e9 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-polyglossia.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-polyglossia}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossaries-polyglossia}[2015/11/30 v4.20 (NLCT)] \RequirePackage{tracklang} \let\glsifusetranslator\@secondoftwo \AnyTrackedLanguages diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty index 0622affabed..864e44cefe4 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-prefix}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossaries-prefix}[2015/11/30 v4.20 (NLCT)] \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}} \ProcessOptions \RequirePackage{glossaries} diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty index 3cf9b5fac70..630715293b8 100644 --- a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossaries}[2015/11/30 v4.20 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} diff --git a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty index 2a5cd8f5577..d032254bf88 100644 --- a/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty +++ b/Master/texmf-dist/tex/latex/glossaries/expl/glossaries-accsupp.sty @@ -39,7 +39,7 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries-accsupp}[2015/11/22 v4.19 (NLCT) +\ProvidesPackage{glossaries-accsupp}[2015/11/30 v4.20 (NLCT) Experimental glossaries accessibility] \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}} \ProcessOptions diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty index f49de6deaba..9572d1c7005 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-hypernav.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-hypernav}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-hypernav}[2015/11/30 v4.20 (NLCT)] \newcommand*{\glsnavhyperlink}[3][\@glo@type]{% \edef\gls@grplabel{#2}\protected@edef\@gls@grptitle{#3}% \@glslink{glsn:#1@#2}{#3}} diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty index 9a6f6e9ae85..9f67015c610 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-inline.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-inline}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-inline}[2015/11/30 v4.20 (NLCT)] \newglossarystyle{inline}{% \renewenvironment{theglossary}% {% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty index 7d70e1a0844..9c0c6e51342 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-list.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-list}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-list}[2015/11/30 v4.20 (NLCT)] \providecommand{\indexspace}{% \par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax } diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty index 392753f826a..4120bee26d4 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-long.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-long}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-long}[2015/11/30 v4.20 (NLCT)] \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty index 465a496f775..81001c99d50 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-longragged.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-longragged}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-longragged}[2015/11/30 v4.20 (NLCT)] \RequirePackage{array} \RequirePackage{longtable} \@ifundefined{glsdescwidth}{% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty index 3f0ca12f8a6..e610f4c163d 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-mcols.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-mcols}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-mcols}[2015/11/30 v4.20 (NLCT)] \RequirePackage{multicol} \RequirePackage{glossary-tree} \providecommand{\indexspace}{% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty index d59a157cbbc..1140568de83 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-super.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-super}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-super}[2015/11/30 v4.20 (NLCT)] \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% \newlength\glsdescwidth diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty index aca4b7c81c2..23359a6b507 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-superragged.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-superragged}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-superragged}[2015/11/30 v4.20 (NLCT)] \RequirePackage{array} \RequirePackage{supertabular} \@ifundefined{glsdescwidth}{% diff --git a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty index 6fc18752afc..8666b5a278d 100644 --- a/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty +++ b/Master/texmf-dist/tex/latex/glossaries/styles/glossary-tree.sty @@ -38,7 +38,7 @@ %% Right bracket \] Circumflex \^ Underscore \_ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} -\ProvidesPackage{glossary-tree}[2015/11/22 v4.19 (NLCT)] +\ProvidesPackage{glossary-tree}[2015/11/30 v4.20 (NLCT)] \providecommand{\indexspace}{% \par \vskip 10\p@ \@plus 5\p@ \@minus 3\p@ \relax } |