diff options
author | Karl Berry <karl@freefriends.org> | 2014-03-11 22:16:52 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-03-11 22:16:52 +0000 |
commit | da1cdc98ee437aab0f962bae0e48a6b02a0b27c2 (patch) | |
tree | 3bf88c625d7db84ddd04e65213a9d3d5026da58e | |
parent | 3b25faeb2fe6b2ff7384da9a80e6c535103db004 (diff) |
glossaries (9mar14)
git-svn-id: svn://tug.org/texlive/trunk@33153 c570f23f-e606-0410-a88d-b1316a301751
56 files changed, 299 insertions, 31 deletions
diff --git a/Master/texmf-dist/doc/latex/glossaries/CHANGES b/Master/texmf-dist/doc/latex/glossaries/CHANGES index e106ef91880..89d92e48754 100644 --- a/Master/texmf-dist/doc/latex/glossaries/CHANGES +++ b/Master/texmf-dist/doc/latex/glossaries/CHANGES @@ -1,5 +1,9 @@ glossaries change log: +v4.05: + + - Added missing glossaries-prefix.sty to tds + v4.04: * glossaries.sty: diff --git a/Master/texmf-dist/doc/latex/glossaries/README b/Master/texmf-dist/doc/latex/glossaries/README index a6ad875b23b..764a8b0da04 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.04 +LaTeX Package : glossaries v4.05 -Last Modified : 2014-03-06 +Last Modified : 2014-03-11 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 61436fcee14..c0146590b69 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 72369e5e0a6..c92d8309c57 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.04</title> +<head><title>User Manual for glossaries.sty v4.05</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="2014-03-07 17:43:00" /> +<meta name="date" content="2014-03-11 09:29:00" /> <style type="text/css"> <!-- @@ -229,14 +229,14 @@ div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; cle -<h2 class="titleHead">User Manual for glossaries.sty v4.04</h2> +<h2 class="titleHead">User Manual for glossaries.sty v4.05</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">2014-03-06</span></div> +class="cmr-12">2014-03-11</span></div> </div> @@ -322,7 +322,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.04”. This includes the documented + “Documented Code for glossaries v4.05”. This includes the documented code for the <span class="cmss-10">mfirstuc</span><a id="dx1-6"></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 12ed1e68eef..5a9b54bec2e 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 8da3d8bcaf0..568d979b729 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex +++ b/Master/texmf-dist/doc/latex/glossaries/glossaries-user.tex @@ -362,11 +362,11 @@ and~\hyperlink{option#2}{#2}} \MakeShortVerb{"} \DeleteShortVerb{\|} - \title{User Manual for glossaries.sty v4.04} + \title{User Manual for glossaries.sty v4.05} \author{Nicola L.C. Talbot\\% \url{http://www.dickimaw-books.com/}} - \date{2014-03-06} + \date{2014-03-11} \maketitle \begin{abstract} @@ -419,7 +419,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.04}. +\qt{Documented Code for glossaries v4.05}. 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 5f6142320e7..032a9a5b0de 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.html +++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.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="glossariesbegin.tex" /> -<meta name="date" content="2014-03-07 17:43:00" /> +<meta name="date" content="2014-03-11 09:29:00" /> <style type="text/css"> <!-- @@ -202,7 +202,7 @@ div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; cle <div class="author" ><span class="cmr-12">Nicola L.C. Talbot</span></div><br /> <div class="date" ><span -class="cmr-12">2014-03-06</span></div> +class="cmr-12">2014-03-11</span></div> </div> <div class="abstract" @@ -419,7 +419,7 @@ class="cmtt-10">fishage</span>:  <br />  A common name for the Devonian geologic period  <br />  spanning from the end of the Silurian Period to  <br />  the beginning of the Carboniferous Period. -  <br /><br />  This age was known for its remarkable variety of +  <br />  This age was known for its remarkable variety of  <br />  fish species.  <br />} </div> diff --git a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.pdf Binary files differindex 0b1b6883c6f..98412ea5ee3 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 c8d9905bde2..99c7df2ddab 100644 --- a/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex +++ b/Master/texmf-dist/doc/latex/glossaries/glossariesbegin.tex @@ -22,7 +22,7 @@ \title{The glossaries package: a guide for beginners} \author{Nicola L.C. Talbot} -\date{2014-03-06} +\date{2014-03-11} \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 f9ce5bc72fe..c4c72b7d032 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="2014-03-07 17:43:00" /> +<meta name="date" content="2014-03-11 09:29:00" /> <style type="text/css"> <!-- @@ -181,7 +181,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">2014-03-06</span></div> +class="cmr-12">2014-03-11</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 5b400eb9742..ce7a9b31a69 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 e4375de7774..83e23e42ccc 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{2014-03-06} +\date{2014-03-11} \newenvironment{oldway}{% \begin{labelledbox}{\styfmt{glossary}}\ttfamily\obeylines diff --git a/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.html b/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.html index de875b993c6..0c59bd0487b 100644 --- a/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.html +++ b/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.html @@ -10,7 +10,7 @@ <meta name="originator" content="TeX4ht (http://www.tug.org/tex4ht/)" /> <!-- xhtml,fn-in,css-in,uni-html4,utf8 --> <meta name="src" content="mfirstuc-manual.tex" /> -<meta name="date" content="2014-03-07 17:43:00" /> +<meta name="date" content="2014-03-11 09:29:00" /> <style type="text/css"> <!-- diff --git a/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.pdf b/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.pdf Binary files differindex d0e269bfdf1..a5a0cfbbfd7 100644 --- a/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/mfirstuc-manual.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 96ecf8af5ad..a9b74698111 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/sample-FnDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf Binary files differindex 45577c77f98..38d1d7c9ff0 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-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf Binary files differindex 39646883e57..8ac5fba79be 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 82bdafa07c5..b0a35257a6b 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-dual.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf Binary files differindex 221ca9437d9..f172d0d6541 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-entryfmt.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf Binary files differindex 1c0899af097..0c8a07afc4b 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-index.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf Binary files differindex 7693160f1c6..1e9580f5515 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 5fcce8ff549..4eba7f2e1db 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 faab9a78ab0..39abaceca88 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-mfirstuc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.pdf Binary files differindex 24e22a37f30..3eb94a1849c 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.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 bd4b49a9424..d512dca5500 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 13b007217f7..3b5d474755a 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 66229934031..12a6e328118 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 c1d8ff654df..aea258fee1d 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 510a9f23252..8d0cebd3496 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 d98a44cbded..4c843e50626 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 24aefb930eb..cc8fb563c8b 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.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf Binary files differindex e65aa3f534c..73a81381d93 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 e003b2a9dcd..b353339c043 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 d423e5af5f2..95e02448ad6 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 5567e4c3f44..fc4c8d2a511 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 4ad586d6272..89658cf8dfa 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 47c7cb598f8..3f9973cc910 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 78f269bb7ba..f56521018c5 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 5dea94737c9..4522ec4f607 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 9cb8cd818df..178f8cc7367 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 5a4ca148e2a..de35fb463fe 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 29104b21cb8..61f30587243 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 044d2111c85..ad5ca300310 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 6b41bcda0a4..31b40dd9948 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 5411dbaa266..0197188f1e6 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 a7d12becfc6..2b20649582d 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 40315ec6a56..f7475e7fa69 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 d905a69c5e8..66f5dc5abf6 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 93230a93a8d..ba03135f056 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 f9814f9c7bb..f734b197dfd 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 9817366968f..d794968060e 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/glossaries.perl b/Master/texmf-dist/scripts/glossaries/glossaries.perl index d615d83ab08..ba6fdd5c5a8 100644 --- a/Master/texmf-dist/scripts/glossaries/glossaries.perl +++ b/Master/texmf-dist/scripts/glossaries/glossaries.perl @@ -1532,7 +1532,7 @@ sub do_cmd_glsnamefont{ sub do_cmd_newacronym{ local($_) = @_; - local($label,$abbrev,$long,$opt); + local($label,$abbrev,$long,$opt,$shortplural,$longplural); ($opt,$pat) = &get_next_optional_argument; @@ -1543,6 +1543,12 @@ sub do_cmd_newacronym{ $long = &missing_braces unless (s/$next_pair_pr_rx/$long=$2;''/eo); + ($longplural,$opt) = &get_keyval('longplural', $opt); + ($shortplural,$opt) = &get_keyval('shortplural', $opt); + + $longplural = $long.'s' unless ($longplural); + $shortplural = $abbrv.'s' unless ($shortplural); + local($cmd) = "\\newglossaryentry"; local($id); $id = ++$global{'max_id'}; @@ -1558,9 +1564,9 @@ sub do_cmd_newacronym{ $id = ++$global{'max_id'}; $entry .= "first=$OP$id$CP$long ($abbrv)$OP$id$CP,"; $id = ++$global{'max_id'}; - $entry .= "plural=$OP$id$CP${abbrv}s$OP$id$CP,"; + $entry .= "plural=$OP$id$CP$shortplural$OP$id$CP,"; $id = ++$global{'max_id'}; - $entry .= "firstplural=$OP$id$CP${long}s (${abbrv}s)$OP$id$CP"; + $entry .= "firstplural=$OP$id$CP$longplural ($shortplural)$OP$id$CP"; $id = ++$global{'max_id'}; $cmd .= "$OP$id$CP$entry,$opt$OP$id$CP"; diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx index b924ebf41da..1593189eb98 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx @@ -28,7 +28,7 @@ % -author "Nicola Talbot" % -codetitle "Main Package Code" % glossaries -% Created on 2014/3/7 17:43 +% Created on 2014/3/11 9:29 %\fi %\iffalse %<*package> @@ -166,12 +166,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of %\MakeShortVerb{"} %\DeleteShortVerb{\|} % -% \title{Documented Code For glossaries v4.04} +% \title{Documented Code For glossaries v4.05} % \author{Nicola L.C. Talbot\\[10pt] %Dickimaw Books\\ %\url{http://www.dickimaw-books.com/}} % -% \date{2014-03-06} +% \date{2014-03-11} % \maketitle % %This is the documented code for the \styfmt{glossaries} package. @@ -187,7 +187,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.04: +%For the main user guide, read \qt{glossaries.sty v4.05: %\LaTeX2e\ Package to Assist Generating Glossaries}. % %\item[\url{mfirstuc-manual.pdf}] @@ -231,7 +231,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of % This package requires \LaTeXe. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2014/03/06 v4.04 (NLCT)] +\ProvidesPackage{glossaries}[2014/03/11 v4.05 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -31273,7 +31273,7 @@ sub do_cmd_glsnamefont{ sub do_cmd_newacronym{ local($_) = @_; - local($label,$abbrev,$long,$opt); + local($label,$abbrev,$long,$opt,$shortplural,$longplural); ($opt,$pat) = &get_next_optional_argument; @@ -31284,6 +31284,12 @@ sub do_cmd_newacronym{ $long = &missing_braces unless (s/$next_pair_pr_rx/$long=$2;''/eo); + ($longplural,$opt) = &get_keyval('longplural', $opt); + ($shortplural,$opt) = &get_keyval('shortplural', $opt); + + $longplural = $long.'s' unless ($longplural); + $shortplural = $abbrv.'s' unless ($shortplural); + local($cmd) = "\\newglossaryentry"; local($id); $id = ++$global{'max_id'}; @@ -31299,9 +31305,9 @@ sub do_cmd_newacronym{ $id = ++$global{'max_id'}; $entry .= "first=$OP$id$CP$long ($abbrv)$OP$id$CP,"; $id = ++$global{'max_id'}; - $entry .= "plural=$OP$id$CP${abbrv}s$OP$id$CP,"; + $entry .= "plural=$OP$id$CP$shortplural$OP$id$CP,"; $id = ++$global{'max_id'}; - $entry .= "firstplural=$OP$id$CP${long}s (${abbrv}s)$OP$id$CP"; + $entry .= "firstplural=$OP$id$CP$longplural ($shortplural)$OP$id$CP"; $id = ++$global{'max_id'}; $cmd .= "$OP$id$CP$entry,$opt$OP$id$CP"; diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins index 45f2aa64784..b1ea64244b1 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 2014/3/7 17:43 +% glossaries.ins generated using makedtx version 1.1 2014/3/11 9:29 \input docstrip \preamble diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty new file mode 100644 index 00000000000..367d73c550a --- /dev/null +++ b/Master/texmf-dist/tex/latex/glossaries/base/glossaries-prefix.sty @@ -0,0 +1,252 @@ +%% +%% This is file `glossaries-prefix.sty', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% glossaries.dtx (with options: `glossaries-prefix.sty,package') +%% +%% glossaries.dtx +%% Copyright 2014 Nicola Talbot +%% +%% This work may be distributed and/or modified under the +%% conditions of the LaTeX Project Public License, either version 1.3 +%% of this license of (at your option) any later version. +%% The latest version of this license is in +%% http://www.latex-project.org/lppl.txt +%% and version 1.3 or later is part of all distributions of LaTeX +%% version 2005/12/01 or later. +%% +%% This work has the LPPL maintenance status `maintained'. +%% +%% 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, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.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, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-noidxapp-utf8.tex, sample-noidxapp.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleCustomAcr.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleFnAcrDesc.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl. +%% +%% \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 +%% Lower-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 +%% Digits \0\1\2\3\4\5\6\7\8\9 +%% Exclamation \! Double quote \" Hash (number) \# +%% Dollar \$ Percent \% Ampersand \& +%% Acute accent \' Left paren \( Right paren \) +%% Asterisk \* Plus \+ Comma \, +%% Minus \- Point \. Solidus \/ +%% Colon \: Semicolon \; Less than \< +%% Equals \= Greater than \> Question mark \? +%% Commercial at \@ Left bracket \[ Backslash \\ +%% Right bracket \] Circumflex \^ Underscore \_ +%% Grave accent \` Left brace \{ Vertical bar \| +%% Right brace \} Tilde \~} +\NeedsTeXFormat{LaTeX2e} +\ProvidesPackage{glossaries-prefix}[2013/11/14 v4.0 (NLCT)] +\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{glossaries}} +\ProcessOptions +\RequirePackage{glossaries} +\define@key{glossentry}{prefixfirst}{\def\@glo@entryprefixfirst{#1}}% +\define@key{glossentry}{prefixfirstplural}{\def\@glo@entryprefixfirstplural{#1}}% +\define@key{glossentry}{prefix}{\def\@glo@entryprefix{#1}}% +\define@key{glossentry}{prefixplural}{\def\@glo@entryprefixplural{#1}}% +\appto\@gls@keymap{,% + {prefixfirst}{prefixfirst},% + {prefixfirstplural}{prefixfirstplural},% + {prefix}{prefix},% + {prefixplural}{prefixplural}% + } +\appto\@newglossaryentryprehook{% + \def\@glo@entryprefix{}% + \def\@glo@entryprefixplural{}% + \let\@glo@entryprefixfirst\@gls@default@value + \let\@glo@entryprefixfirstplural\@gls@default@value +} +\appto\@newglossaryentryposthook{% + \gls@assign@field{}{\@glo@label}{prefix}{\@glo@entryprefix}% + \gls@assign@field{}{\@glo@label}{prefixplural}{\@glo@entryprefixplural}% + \expandafter\gls@assign@field\expandafter + {\csname glo@\@glo@label @prefix\endcsname}{\@glo@label}{prefixfirst}% + {\@glo@entryprefixfirst}% + \expandafter\gls@assign@field\expandafter + {\csname glo@\@glo@label @prefixplural\endcsname}{\@glo@label}% + {prefixfirstplural}{\@glo@entryprefixfirstplural}% +} +\newcommand*{\glsentryprefixfirst}[1]{\csuse{glo@#1@prefixfirst}} +\newcommand*{\glsentryprefixfirstplural}[1]{\csuse{glo@#1@prefixfirstplural}} +\newcommand*{\glsentryprefix}[1]{\csuse{glo@#1@prefix}} +\newcommand*{\glsentryprefixplural}[1]{\csuse{glo@#1@prefixplural}} +\newrobustcmd*{\Glsentryprefixfirst}[1]{% + \protected@edef\@glo@text{\csname glo@#1@prefixfirst\endcsname}% + \xmakefirstuc\@glo@text +} +\newrobustcmd*{\Glsentryprefixfirstplural}[1]{% + \protected@edef\@glo@text{\csname glo@#1@prefixfirstplural\endcsname}% + \xmakefirstuc\@glo@text +} +\newrobustcmd*{\Glsentryprefix}[1]{% + \protected@edef\@glo@text{\csname glo@#1@prefix\endcsname}% + \xmakefirstuc\@glo@text +} +\newrobustcmd*{\Glsentryprefixplural}[1]{% + \protected@edef\@glo@text{\csname glo@#1@prefixplural\endcsname}% + \xmakefirstuc\@glo@text +} +\newcommand*{\ifglshasprefix}[3]{% + \ifcsempty{glo@#1@prefix}% + {#3}% + {#2}% +} +\newcommand*{\ifglshasprefixplural}[3]{% + \ifcsempty{glo@#1@prefixplural}% + {#3}% + {#2}% +} +\newcommand*{\ifglshasprefixfirst}[3]{% + \ifcsempty{glo@#1@prefixfirst}% + {#3}% + {#2}% +} +\newcommand*{\ifglshasprefixfirstplural}[3]{% + \ifcsempty{glo@#1@prefixfirstplural}% + {#3}% + {#2}% +} +\newrobustcmd{\pgls}{\@ifstar\@spgls\@pgls} +\newcommand*{\@spgls}[2][]{\@pgls@{hyper=false,#1}{#2}} +\newcommand*{\@pgls}[2][]{% + \new@ifnextchar[% + {\@pgls@{#1}{#2}}% + {\@pgls@{#1}{#2}[]}% +} +\def\@pgls@#1#2[#3]{% + \glsdoifexists{#2}% + {% + \ifglsused{#2}% + {% + \glsentryprefix{#2}% + }% + {% + \glsentryprefixfirst{#2}% + }% + \@gls@{#1}{#2}[#3]% + }% +} +\newrobustcmd{\pglspl}{\@ifstar\@spglspl\@pglspl} +\newcommand*{\@spglspl}[2][]{\@pglspl@{hyper=false,#1}{#2}} +\newcommand*{\@pglspl}[2][]{% + \new@ifnextchar[% + {\@pglspl@{#1}{#2}}% + {\@pglspl@{#1}{#2}[]}% +} +\def\@pglspl@#1#2[#3]{% + \glsdoifexists{#2}% + {% + \ifglsused{#2}% + {% + \glsentryprefixplural{#2}% + }% + {% + \glsentryprefixfirstplural{#2}% + }% + \@glspl@{#1}{#2}[#3]% + }% +} +\newrobustcmd{\Pgls}{\@ifstar\@sPgls\@Pgls} +\newcommand*{\@sPgls}[2][]{\@Pgls@{hyper=false,#1}{#2}} +\newcommand*{\@Pgls}[2][]{% + \new@ifnextchar[% + {\@Pgls@{#1}{#2}}% + {\@Pgls@{#1}{#2}[]}% +} +\def\@Pgls@#1#2[#3]{% + \glsdoifexists{#2}% + {% + \ifglsused{#2}% + {% + \ifglshasprefix{#2}% + {% + \Glsentryprefix{#2}% + \@gls@{#1}{#2}[#3]% + }% + {\@Gls@{#1}{#2}[#3]}% + }% + {% + \ifglshasprefixfirst{#2}% + {% + \Glsentryprefixfirst{#2}% + \@gls@{#1}{#2}[#3]% + }% + {\@Gls@{#1}{#2}[#3]}% + }% + }% +} +\newrobustcmd{\Pglspl}{\@ifstar\@sPglspl\@Pglspl} +\newcommand*{\@sPglspl}[2][]{\@Pglspl@{hyper=false,#1}{#2}} +\newcommand*{\@Pglspl}[2][]{% + \new@ifnextchar[% + {\@Pglspl@{#1}{#2}}% + {\@Pglspl@{#1}{#2}[]}% +} +\def\@Pglspl@#1#2[#3]{% + \glsdoifexists{#2}% + {% + \ifglsused{#2}% + {% + \ifglshasprefixplural{#2}% + {% + \Glsentryprefixplural{#2}% + \@glspl@{#1}{#2}[#3]% + }% + {\@Glspl@{#1}{#2}[#3]}% + }% + {% + \ifglshasprefixfirstplural{#2}% + {% + \Glsentryprefixfirstplural{#2}% + \@glspl@{#1}{#2}[#3]% + }% + {\@Glspl@{#1}{#2}[#3]}% + }% + }% +} +\newrobustcmd{\PGLS}{\@ifstar\@sPGLS\@PGLS} +\newcommand*{\@sPGLS}[2][]{\@PGLS@{hyper=false,#1}{#2}} +\newcommand*{\@PGLS}[2][]{% + \new@ifnextchar[% + {\@PGLS@{#1}{#2}}% + {\@PGLS@{#1}{#2}[]}% +} +\def\@PGLS@#1#2[#3]{% + \glsdoifexists{#2}% + {% + \ifglsused{#2}% + {% + \mfirstucMakeUppercase{\glsentryprefix{#2}}% + }% + {% + \mfirstucMakeUppercase{\glsentryprefixfirst{#2}}% + }% + \@GLS@{#1}{#2}[#3]% + }% +} +\newrobustcmd{\PGLSpl}{\@ifstar\@sPGLSpl\@PGLSpl} +\newcommand*{\@sPGLSpl}[2][]{\@PGLSpl@{hyper=false,#1}{#2}} +\newcommand*{\@PGLSpl}[2][]{% + \new@ifnextchar[% + {\@PGLSpl@{#1}{#2}}% + {\@PGLSpl@{#1}{#2}[]}% +} +\def\@PGLSpl@#1#2[#3]{% + \glsdoifexists{#2}% + {% + \ifglsused{#2}% + {% + \mfirstucMakeUppercase{\glsentryprefixplural{#2}}% + }% + {% + \mfirstucMakeUppercase{\glsentryprefixfirstplural{#2}}% + }% + \@GLSpl@{#1}{#2}[#3]% + }% +} +\endinput +%% +%% End of file `glossaries-prefix.sty'. diff --git a/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/base/glossaries.sty index f76a40bd4a5..9ed3b7a9acc 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}[2014/03/06 v4.04 (NLCT)] +\ProvidesPackage{glossaries}[2014/03/11 v4.05 (NLCT)] \RequirePackage{ifthen} \RequirePackage{xkeyval}[2006/11/18] \RequirePackage{mfirstuc} |