summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/README4
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/doc/CHANGES8
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/doc/glossaries.pdfbin475628 -> 500567 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/doc/glossary2glossaries.html746
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/doc/glossary2glossaries.pdfbin0 -> 158711 bytes
-rwxr-xr-xMaster/texmf-dist/doc/latex/glossaries/scripts/makeglossaries229
-rwxr-xr-xMaster/texmf-dist/doc/latex/glossaries/scripts/makeglossaries.bat3
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.dtx289
-rw-r--r--Master/texmf-dist/source/latex/glossaries/glossaries.ins2
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/glossaries.sty98
-rw-r--r--Master/texmf-dist/tex/latex/glossaries/glossary-list.sty6
11 files changed, 1363 insertions, 22 deletions
diff --git a/Master/texmf-dist/doc/latex/glossaries/README b/Master/texmf-dist/doc/latex/glossaries/README
index eb8924735a1..4e57293dab8 100644
--- a/Master/texmf-dist/doc/latex/glossaries/README
+++ b/Master/texmf-dist/doc/latex/glossaries/README
@@ -1,6 +1,6 @@
-LaTeX Package : glossaries v 1.07
+LaTeX Package : glossaries v 1.08
-Last Modified : 13 September 2007
+Last Modified : 13 October 2007
Author : Nicola Talbot
diff --git a/Master/texmf-dist/doc/latex/glossaries/doc/CHANGES b/Master/texmf-dist/doc/latex/glossaries/doc/CHANGES
index f9dce2cc0a9..4f3111053bc 100644
--- a/Master/texmf-dist/doc/latex/glossaries/doc/CHANGES
+++ b/Master/texmf-dist/doc/latex/glossaries/doc/CHANGES
@@ -1,5 +1,13 @@
glossaries change log:
+v1.08 (13 Oct 2007):
+ * Added multilingual support
+ * Fixed bug in listgroup and altlistgroup styles so that
+ \glsgroupheading uses \glsgetgrouptitle to get the group title
+ instead of displaying the label
+ * Fixed typo in error message text when the description key
+ is missing to \newglossaryentry.
+
v1.07 (13 Sep 2007):
* Fixed bug causing incorrect page number for entries in the
first paragraph of a page.
diff --git a/Master/texmf-dist/doc/latex/glossaries/doc/glossaries.pdf b/Master/texmf-dist/doc/latex/glossaries/doc/glossaries.pdf
index 7adbe440f7e..f43e59e629d 100644
--- a/Master/texmf-dist/doc/latex/glossaries/doc/glossaries.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/doc/glossaries.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/doc/glossary2glossaries.html b/Master/texmf-dist/doc/latex/glossaries/doc/glossary2glossaries.html
new file mode 100644
index 00000000000..235ac5000db
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/doc/glossary2glossaries.html
@@ -0,0 +1,746 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+
+<!--Converted with LaTeX2HTML 2002 (1.67)
+original version by: Nikos Drakos, CBLU, University of Leeds
+* revised and updated by: Marcus Hennecke, Ross Moore, Herb Swan
+* with significant contributions from:
+ Jens Lippmann, Marek Rouchal, Martin Wilck and others -->
+<HTML>
+<HEAD>
+<TITLE>Upgrading from the glossary package to the glossaries
+package</TITLE>
+<META NAME="description" CONTENT="Upgrading from the glossary package to the glossaries
+package">
+<META NAME="keywords" CONTENT="glossary2glossaries">
+<META NAME="resource-type" CONTENT="document">
+<META NAME="distribution" CONTENT="global">
+
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+<META NAME="Generator" CONTENT="LaTeX2HTML v2002">
+<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
+
+
+</HEAD>
+
+<BODY >
+<H1 ALIGN="CENTER">Upgrading from the glossary package to the glossaries
+package</H1>
+<P ALIGN="CENTER"><STRONG>Nicola L.C. Talbot</STRONG></P>
+<BR>
+
+<H2><A NAME="SECTION00010000000000000000">
+Contents</A>
+</H2>
+<!--Table of Contents-->
+
+<UL>
+<LI><A NAME="tex2html19"
+ HREF="glossary2glossaries.html#SECTION00020000000000000000">1 Package Options</A>
+<LI><A NAME="tex2html20"
+ HREF="glossary2glossaries.html#SECTION00030000000000000000">2 Defining new glossary types</A>
+<LI><A NAME="tex2html21"
+ HREF="glossary2glossaries.html#SECTION00040000000000000000">3 &#92;make&lt;glossary name&gt;</A>
+<LI><A NAME="tex2html22"
+ HREF="glossary2glossaries.html#SECTION00050000000000000000">4 Storing glossary information</A>
+<LI><A NAME="tex2html23"
+ HREF="glossary2glossaries.html#SECTION00060000000000000000">5 Adding an entry to the glossary</A>
+<UL>
+<LI><A NAME="tex2html24"
+ HREF="glossary2glossaries.html#SECTION00061000000000000000">5.1 &#92;useglosentry</A>
+<LI><A NAME="tex2html25"
+ HREF="glossary2glossaries.html#SECTION00062000000000000000">5.2 &#92;useGlosentry</A>
+<LI><A NAME="tex2html26"
+ HREF="glossary2glossaries.html#SECTION00063000000000000000">5.3 &#92;gls</A>
+<LI><A NAME="tex2html27"
+ HREF="glossary2glossaries.html#SECTION00064000000000000000">5.4 &#92;glossary</A>
+</UL>
+<BR>
+<LI><A NAME="tex2html28"
+ HREF="glossary2glossaries.html#SECTION00070000000000000000">6 Acronyms</A>
+<UL>
+<LI><A NAME="tex2html29"
+ HREF="glossary2glossaries.html#SECTION00071000000000000000">6.1 &#92;acrln and &#92;acrsh</A>
+<LI><A NAME="tex2html30"
+ HREF="glossary2glossaries.html#SECTION00072000000000000000">6.2 &#92;ifacronymfirstuse</A>
+<LI><A NAME="tex2html31"
+ HREF="glossary2glossaries.html#SECTION00073000000000000000">6.3 &#92;resetacronym and &#92;unsetacronym</A>
+</UL>
+<BR>
+<LI><A NAME="tex2html32"
+ HREF="glossary2glossaries.html#SECTION00080000000000000000">7 Displaying the glossary</A>
+<LI><A NAME="tex2html33"
+ HREF="glossary2glossaries.html#SECTION00090000000000000000">8 Using makeindex</A>
+</UL>
+<!--End of Table of Contents-->
+<P>
+
+<H3>Abstract:</H3>
+<DIV>
+The purpose of this document is to provide advice if you want
+to convert a LaTeX document from using the obsolete
+<TT>glossary</TT> package to the replacement <TT>glossaries</TT> package.
+</DIV>
+<P>
+
+<P>
+
+<H1><A NAME="SECTION00020000000000000000">
+1 Package Options</A>
+</H1>
+
+<P>
+When converting a document that currently uses the obsolete
+<TT>glossary</TT> package to the replacement <TT>glossaries</TT> package,
+it should be fairly obvious that the first thing you need to do is
+replace <code>\usepackage{glossary}</code> with
+<code>\usepackage{glossaries}</code>, however some of the package options
+are different, so you may need to change those as well.
+Table&nbsp;<A HREF="glossary2glossaries.html#tab:pkgopt">1</A> shows the mappings from the <TT>glossary</TT>
+to the <TT>glossaries</TT> package options.
+
+<P>
+<BR><P></P>
+<DIV ALIGN="CENTER">
+
+<A NAME="tab:pkgopt"></A>
+<DIV ALIGN="CENTER">
+<A NAME="457"></A>
+<TABLE CELLPADDING=3>
+<CAPTION><STRONG>Table 1:</STRONG>
+Mappings from <TT>glossary</TT> to <TT>glossaries</TT>
+package options</CAPTION>
+<TR><TH ALIGN="LEFT"><B><TT>glossary</TT> option </B></TH>
+<TH ALIGN="LEFT"><B><TT>glossaries</TT> option</B></TH>
+</TR>
+<TR><TD ALIGN="LEFT">style=list</TD>
+<TD ALIGN="LEFT">style=list</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=altlist</TD>
+<TD ALIGN="LEFT">style=altlist</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=long,header=none,border=none,cols=2</TD>
+<TD ALIGN="LEFT">style=long</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=long,header=plain,border=none,cols=2</TD>
+<TD ALIGN="LEFT">style=longheader</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=long,header=none,border=plain,cols=2</TD>
+<TD ALIGN="LEFT">style=longborder</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=long,header=plain,border=plain,cols=2</TD>
+<TD ALIGN="LEFT">style=longheaderborder</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=long,header=none,border=none,cols=3</TD>
+<TD ALIGN="LEFT">style=long3col</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=long,header=plain,border=none,cols=3</TD>
+<TD ALIGN="LEFT">style=long3colheader</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=long,header=none,border=plain,cols=3</TD>
+<TD ALIGN="LEFT">style=long3colborder</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=long,header=plain,border=plain,cols=3</TD>
+<TD ALIGN="LEFT">style=long3colheaderborder</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=super,header=none,border=none,cols=2</TD>
+<TD ALIGN="LEFT">style=super</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=super,header=plain,border=none,cols=2</TD>
+<TD ALIGN="LEFT">style=superheader</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=super,header=none,border=plain,cols=2</TD>
+<TD ALIGN="LEFT">style=superborder</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=super,header=plain,border=plain,cols=2</TD>
+<TD ALIGN="LEFT">style=superheaderborder</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=super,header=none,border=none,cols=3</TD>
+<TD ALIGN="LEFT">style=super3col</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=super,header=plain,border=none,cols=3</TD>
+<TD ALIGN="LEFT">style=super3colheader</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=super,header=none,border=plain,cols=3</TD>
+<TD ALIGN="LEFT">style=super3colborder</TD>
+</TR>
+<TR><TD ALIGN="LEFT">style=super,header=plain,border=plain,cols=3</TD>
+<TD ALIGN="LEFT">style=super3colheaderborder</TD>
+</TR>
+<TR><TD ALIGN="LEFT">number=none</TD>
+<TD ALIGN="LEFT">nonumberlist</TD>
+</TR>
+<TR><TD ALIGN="LEFT">number=&lt;<I>counter name</I>&gt;</TD>
+<TD ALIGN="LEFT">counter=&lt;<I>counter name</I>&gt;</TD>
+</TR>
+<TR><TD ALIGN="LEFT">toc</TD>
+<TD ALIGN="LEFT">toc</TD>
+</TR>
+<TR><TD ALIGN="LEFT">hypertoc</TD>
+<TD ALIGN="LEFT">toc</TD>
+</TR>
+<TR><TD ALIGN="LEFT">hyper</TD>
+<TD ALIGN="LEFT"><I>no corresponding option</I></TD>
+</TR>
+<TR><TD ALIGN="LEFT">section=true</TD>
+<TD ALIGN="LEFT">section</TD>
+</TR>
+<TR><TD ALIGN="LEFT">section=false</TD>
+<TD ALIGN="LEFT"><I>no corresponding option</I></TD>
+</TR>
+<TR><TD ALIGN="LEFT">acronym</TD>
+<TD ALIGN="LEFT">acronym</TD>
+</TR>
+<TR><TD ALIGN="LEFT">global</TD>
+<TD ALIGN="LEFT"><I>no corresponding option</I></TD>
+</TR>
+</TABLE>
+</DIV>
+</DIV>
+<BR>
+
+<P>
+
+<H1><A NAME="SECTION00030000000000000000">
+2 Defining new glossary types</A>
+</H1>
+
+<P>
+If you have created new glossary types, you will need to
+replace all instances of
+
+<P>
+<TT><TT>&#92;newglossarytype[&lt;<I>log-ext</I>&gt;]&#123;&lt;<I>type</I>&gt;&#125;&#123;&lt;<I>out-ext</I>&gt;&#125;&#123;&lt;<I>in-ext</I>&gt;&#125;[&lt;<I>style list</I>&gt;]</TT>
+<BR>
+<TT>&#92;newcommand</TT><code>{\</code>&lt;<I>type</I>&gt;name<code>}</code><TT>&#123;&lt;<I>title</I>&gt;&#125;</TT></TT>
+<P>
+with
+
+<P>
+<TT><TT>&#92;newglossary[&lt;<I>log-ext</I>&gt;]&#123;&lt;<I>type</I>&gt;&#125;&#123;&lt;<I>out-ext</I>&gt;&#125;&#123;&lt;<I>in-ext</I>&gt;&#125;&#123;&lt;<I>title</I>&gt;&#125;</TT></TT>
+<P>
+in the preamble, and
+
+<P>
+<TT><TT>&#92;glossarystyle&#123;&lt;<I>new style list</I>&gt;&#125;</TT></TT>
+<P>
+immediately before <code>\printglossary[type=</code>&lt;<I>type</I>&gt;<code>]</code>,
+if the new glossary requires a different style to the main (default)
+glossary.
+
+<P>
+The &lt;<I>style list</I>&gt; optional argument can be converted to
+&lt;<I>new style list</I>&gt; using the same mapping given in
+Table&nbsp;<A HREF="glossary2glossaries.html#tab:pkgopt">1</A>.
+
+<P>
+For example, if your document contains the following:
+<PRE>
+\newglossarytype[nlg]{notation}{not}{ntn}[style=long,header]
+\newcommand{\notationname}{Index of Notation}
+</PRE>
+You will need to replace the above two lines with:
+<PRE>
+\newglossary[nlg]{notation}{not}{ntn}{Index of Notation}
+</PRE>
+in the preamble, and
+<PRE>
+\glossarystyle{style=longheader}
+</PRE>
+immediately prior to displaying this glossary new type.
+
+<P>
+Note that the glossary title is no longer specified using
+<TT>&#92;</TT>&lt;<I>glossary-type</I>&gt;<TT>name</TT> (except for <TT>&#92;glossaryname</TT>
+and <TT>&#92;acronymname</TT>) but is instead specified in the &lt;<I>title</I>&gt;
+argument of <TT>&#92;newglossary</TT>. The short title which is specified
+in the <TT>glossary</TT> package by the command
+<TT>&#92;short</TT>&lt;<I>glossary-name</I>&gt;<TT>name</TT> is now specified
+using the <TT>toctitle</TT> key in the optional argument to
+<TT>&#92;printglossary</TT>.
+
+<P>
+
+<H1><A NAME="SECTION00040000000000000000">
+3 <TT>&#92;make</TT>&lt;<I>glossary name</I>&gt;</A>
+</H1>
+
+<P>
+All instances of <TT>&#92;make</TT>&lt;<I>glossary name</I>&gt; (e.g.
+<TT>&#92;makeglossary</TT> and <TT>&#92;makeacronym</TT>) should be replaced
+by the single command <TT>&#92;makeglossaries</TT>. For example, if
+your document contained the following:
+<PRE>
+\makeglossary
+\makeacronym
+</PRE>
+then you should replace both lines with the single line:
+<PRE>
+\makeglossaries
+</PRE>
+
+<P>
+
+<H1><A NAME="SECTION00050000000000000000">
+4 Storing glossary information</A>
+</H1>
+
+<P>
+With the old <TT>glossary</TT> package you could optionally store
+glossary information for later use, or you could simply use
+<TT>&#92;glossary</TT> whenever you wanted to add information to the glossary.
+With the new <TT>glossaries</TT> package, the latter option is no longer
+available<A NAME="tex2html2"
+ HREF="#foot459"><SUP>1</SUP></A>. If
+you have stored all the glossary information using
+<TT>&#92;storeglosentry</TT>, then you will need to convert these commands
+into the equivalent <TT>&#92;newglossaryentry</TT>. If you haven't used
+<TT>&#92;storeglosentry</TT>, then you'll have a bit more work to do!
+
+<P>
+The former approach requires substituting all instances of
+
+<P>
+<TT><TT>&#92;storeglosentry&#123;&lt;<I>label</I>&gt;&#125;&#123;&lt;<I>gls-entry</I>&gt;&#125;</TT></TT>
+<P>
+with
+
+<P>
+<TT><TT>&#92;newglossaryentry&#123;&lt;<I>label</I>&gt;&#125;&#123;&lt;<I>gls-entry</I>&gt;&#125;</TT></TT>
+<P>
+This should be fairly easy to do using the search and replace
+facility in your editor (but see notes below).
+
+<P>
+If you have used the optional argument of <TT>&#92;storeglosentry</TT>
+(i.e. you have multiple glossaries) then you will need to
+substitute
+
+<P>
+<TT><TT>&#92;storeglosentry[&lt;<I>gls-type</I>&gt;]&#123;&lt;<I>label</I>&gt;&#125;&#123;&lt;<I>gls-entry</I>&gt;&#125;</TT></TT>
+<P>
+with
+
+<P>
+<TT><TT>&#92;newglossaryentry&#123;&lt;<I>label</I>&gt;&#125;</TT><code>{</code>&lt;<I>gls-entry</I>&gt;,type=&lt;<I>gls-type</I>&gt;<code>}</code></TT>
+<P>
+
+<P>
+The glossary entry information &lt;<I>gls-entry</I>&gt; may also need
+changing. If &lt;<I>gls-entry</I>&gt; contains any of <TT>makeindex</TT>'s
+special characters (i.e. <TT>@</TT> <TT>!</TT> <code>"</code> or
+<code>|</code>) then they should no longer be escaped with <code>"</code>
+since the <TT>glossaries</TT> package deals with these characters
+internally. For example, if your document contains the following:
+<PRE>
+\storeglosentry{card}{name={$"|\mathcal{S}"|$},
+description={The cardinality of the set $\mathcal{S}$}}
+</PRE>
+then you will need to replace it with:
+<PRE>
+\newglossaryentry{card}{name={$|\mathcal{S}|$},
+description={The cardinality of the set $\mathcal{S}$}}
+</PRE>
+
+<P>
+The <TT>format</TT> and <TT>number</TT> keys available in
+<TT>&#92;storeglosentry</TT> are not available with <TT>&#92;newglossaryentry</TT>.
+Note also that the <TT>glossary</TT> package allowed you to use
+<TT>&#92;storeglosentry</TT> in the document, but <TT>&#92;newglossaryentry</TT>
+may only be used in the preamble.
+
+<P>
+
+<H1><A NAME="SECTION00060000000000000000">
+5 Adding an entry to the glossary</A>
+</H1>
+
+<P>
+The <TT>glossary</TT> package provided two basic means to add
+information to the glossary: firstly, the term was defined
+using <TT>&#92;storeglosentry</TT> and the entries for that term were
+added using <TT>&#92;useglosentry</TT>, <TT>&#92;useGlosentry</TT> and <TT>&#92;gls</TT>.
+Secondly, the term was added to the glossary using <TT>&#92;glossary</TT>.
+This second approach is unavailable with the <TT>glossaries</TT>
+package.
+
+<P>
+
+<H2><A NAME="SECTION00061000000000000000"></A>
+<A NAME="sec:useglosentry"></A>
+<BR>
+5.1 <TT>&#92;useglosentry</TT>
+</H2>
+
+<P>
+The <TT>glossary</TT> package allows you to add information to the
+glossary for a predefined term without producing any text
+in the document using
+
+<P>
+<TT><TT>&#92;useglosentry[&lt;<I>old options</I>&gt;]&#123;&lt;<I>label</I>&gt;&#125;</TT></TT>
+<P>
+Any occurrences of this command will need to be replaced with
+
+<P>
+<TT><TT>&#92;glsadd[&lt;<I>new options</I>&gt;]&#123;&lt;<I>label</I>&gt;&#125;</TT></TT>
+<P>
+The <TT>format</TT> key in &lt;<I>old options</I>&gt; remains the same
+in &lt;<I>new options</I>&gt;, the <TT>number=</TT>&lt;<I>counter name</I>&gt;
+key in &lt;<I>old options</I>&gt; should be replaced with
+<BR><TT>counter=</TT>&lt;<I>counter name</I>&gt; in &lt;<I>new options</I>&gt;.
+
+<P>
+
+<H2><A NAME="SECTION00062000000000000000">
+5.2 <TT>&#92;useGlosentry</TT></A>
+</H2>
+
+<P>
+The <TT>glossary</TT> package allows you to add information to the
+glossary for a predefined term with the given text using
+
+<P>
+<TT><TT>&#92;useGlosentry[&lt;<I>old options</I>&gt;]&#123;&lt;<I>label</I>&gt;&#125;&#123;&lt;<I>text</I>&gt;&#125;</TT></TT>
+<P>
+Any occurrences if this command will need to be replaced with
+
+<P>
+<TT><TT>&#92;glslink[&lt;<I>new options</I>&gt;]&#123;&lt;<I>label</I>&gt;&#125;&#123;&lt;<I>text</I>&gt;&#125;</TT></TT>
+<P>
+The mapping from &lt;<I>old options</I>&gt; to &lt;<I>new options</I>&gt; is
+the same as that given in section&nbsp;<A HREF="glossary2glossaries.html#sec:useglosentry">5.1</A> above.
+
+<P>
+
+<H2><A NAME="SECTION00063000000000000000">
+5.3 <TT>&#92;gls</TT></A>
+</H2>
+
+<P>
+Both the <TT>glossary</TT> and the <TT>glossaries</TT> packages define
+the command <TT>&#92;gls</TT>. In this case, the only thing you need to
+change is the <TT>number</TT> key in the optional argument
+to <TT>counter</TT>.
+
+<P>
+
+<H2><A NAME="SECTION00064000000000000000">
+5.4 <TT>&#92;glossary</TT></A>
+</H2>
+
+<P>
+If you have opted to explicitly use <TT>&#92;glossary</TT> instead of storing
+the glossary information with <TT>&#92;storeglosentry</TT>, then converting
+from <TT>glossary</TT> to <TT>glossaries</TT> will be more time-consuming,
+although in the end, I hope you will see the benefits! Using
+<TT>&#92;glossary</TT> throughout the document is time consuming, and if you
+use it more than once for the same term, there's a chance extra
+spaces may creep in which will cause <TT>makeindex</TT> to treat the
+two entries as different terms, even though they look the same in the
+document. However, if you have used <TT>&#92;glossary</TT>, you will need
+to define the term using <TT>&#92;newglossaryentry</TT>, and then use
+<TT>&#92;glsadd&#123;&lt;<I>label</I>&gt;&#125;</TT> (or <TT>&#92;glslink&#123;&lt;<I>label</I>&gt;&#125;&#123;&lt;<I>text</I>&gt;&#125;</TT>
+if you have used <TT>&#92;xglossary</TT>.)
+
+<P>
+If you don't like the idea of continually scrolling back to the
+preamble to type all your <TT>&#92;newglossaryentry</TT> commands, you may
+prefer to create a new file, in which to store all these commands,
+and then input that file in your document's preamble. Most text
+editors and front-ends allow you to have multiple files open, and
+you can tab back and forth between them.
+
+<P>
+
+<H1><A NAME="SECTION00070000000000000000">
+6 Acronyms</A>
+</H1>
+
+<P>
+In the <TT>glossary</TT> package, acronyms were treated differently
+to glossary entries. This resulted in inconsistencies and sprawling
+unmaintainable code. The new <TT>glossaries</TT> package treats
+acronyms in exactly the same way as normal glossary terms. In fact,
+in the <TT>glossaries</TT> package:
+
+<P>
+<TT><TT>&#92;newacronym[&lt;<I>options</I>&gt;]&#123;&lt;<I>label</I>&gt;&#125;&#123;&lt;<I>abbrv</I>&gt;&#125;&#123;&lt;<I>long</I>&gt;&#125;</TT></TT>
+<P>
+is a shortcut for:
+
+<P>
+<TT><TT>&#92;newglossaryentry&#123;&lt;<I>label</I>&gt;&#125;</TT>{type=<TT>&#92;acronymtype</TT>,
+name=<TT>&#123;&lt;<I>abbrv</I>&gt;&#125;</TT>,
+description=<TT>&#123;&lt;<I>long</I>&gt;&#125;</TT>,
+text=<TT>&#123;&lt;<I>abbrv</I>&gt;&#125;</TT>,
+first={&lt;<I>long</I>&gt; (&lt;<I>abbrv</I>&gt;)},
+plural={&lt;<I>abbrv</I>&gt;s},
+firstplural={&lt;<I>long</I>&gt;s (&lt;<I>abbrv</I>&gt;s)},
+&lt;<I>options</I>&gt;}</TT>
+<P>
+
+<P>
+This is different to the <TT>glossary</TT> package which set the
+<TT>name</TT> key to &lt;<I>long</I>&gt; (&lt;<I>abbrv</I>&gt;) and allowed you
+to set a description using the <TT>description</TT> key. If you want
+your document to remain like this, you can redefine <TT>&#92;newacronym</TT>
+as follows:
+<PRE>
+\renewcommand{\newacronym}[4][]{%
+\newglossaryentry{#2}{type=\acronymtype,
+name={#4 (#3)},
+text={#3},
+first={#4 (#3)},
+plural={#3s},
+firstplural={#4s (#3s)},#1}}
+</PRE>
+The <TT>description</TT> key will then need to be entered using the
+optional argument.
+
+<P>
+For example, if your document originally had the following:
+<PRE>
+\newacronym{SVM}{Support Vector Machine}{description=Statistical
+pattern recognition technique}
+</PRE>
+Then you would need to redefine <TT>&#92;newacronym</TT> as shown above,
+and change the above to:
+<PRE>
+\newacronym[description=Statistical pattern recognition
+technique]{svm}{SVM}{Support Vector Machine}
+</PRE>
+You will also need to replace all occurrences of <TT>&#92;SVM</TT> with
+<code>\gls{svm}</code>. Alternatively, you can define <TT>&#92;SVM</TT>:
+<PRE>
+\newcommand{\SVM}{\gls{svm}}
+</PRE>
+
+<P>
+If you have used <TT>&#92;useacronym</TT> instead of <TT>&#92;</TT>&lt;<I>acr-name</I>&gt;,
+then you will need to replace all occurrences of
+
+<P>
+<TT><TT>&#92;useacronym[&lt;<I>insert</I>&gt;]&#123;&lt;<I>acr-name</I>&gt;&#125;</TT></TT>
+<P>
+with
+
+<P>
+<TT><TT>&#92;gls&#123;&lt;<I>label</I>&gt;&#125;[&lt;<I>insert</I>&gt;]</TT></TT>
+<P>
+Note that the starred versions of <TT>&#92;useacronym</TT> and
+<TT>&#92;</TT>&lt;<I>acr-name</I>&gt; (which make the first letter uppercase) should
+be replaced with <TT>&#92;Gls&#123;&lt;<I>label</I>&gt;&#125;</TT>.
+
+<P>
+
+<H2><A NAME="SECTION00071000000000000000">
+6.1 <TT>&#92;acrln</TT> and <TT>&#92;acrsh</TT></A>
+</H2>
+
+<P>
+In the <TT>glossary</TT> package, it is possible to produce the
+long and short forms of an acronym without adding an entry to
+the glossary using <TT>&#92;acrln</TT> and <TT>&#92;acrsh</TT>. With the
+<TT>glossaries</TT> package, you can replace
+
+<P>
+<TT><TT>&#92;acrsh&#123;&lt;<I>acr-name</I>&gt;&#125;</TT></TT>
+<P>
+with
+
+<P>
+<TT><TT>&#92;glsentrytext&#123;&lt;<I>label</I>&gt;&#125;</TT></TT>
+<P>
+However the <TT>glossaries</TT> package provides no direct equivalent
+of <TT>&#92;acrln</TT>. Instead it provides <TT>&#92;glsentryfirst</TT> which
+produces the ``first use'' text without adding an entry to the
+glossary, or affecting the first use flag.
+
+<P>
+Alternatively, if you haven't changed the definition of
+<TT>&#92;newacronym</TT>, the long form by itself can be obtained using
+<TT>&#92;glsentrydesc</TT>, since by default the <TT>description</TT> key is
+set to the long form (but read the notes in the <TT>glossaries</TT>
+manual regarding the <TT>sanitize</TT> package option).
+
+<P>
+If you want to be able to set a description, and be able to
+independently access the description, the long form and the
+short form, you can redefine <TT>&#92;newacronym</TT> so that it uses
+the <TT>symbol</TT> key and use <TT>&#92;defglsdisplayfirst</TT>
+so that it uses this value on first use, as follows:
+<PRE>
+\renewcommand{\newacronym}[4][]{\newglossaryentry{#2}{%
+name={#4 (#3)},
+text={#3},
+first={#4},
+symbol={#3},
+}}
+\defglsdisplayfirst{\acronymtype}{##1 (##3)##4}
+</PRE>
+As before, you can access the short name via
+<TT>&#92;glsentrytext&#123;&lt;<I>label</I>&gt;&#125;</TT>, but you can now access just the long
+form via <TT>&#92;glsentryfirst&#123;&lt;<I>label</I>&gt;&#125;</TT> and the description via
+<TT>&#92;glsentrydesc&#123;&lt;<I>label</I>&gt;&#125;</TT>.
+
+<P>
+See
+the section ``Using
+glossary entries in the text'' of the <TT>glossaries</TT>
+manual for further details of how to use these commands.
+
+<P>
+
+<H2><A NAME="SECTION00072000000000000000">
+6.2 <TT>&#92;ifacronymfirstuse</TT></A>
+</H2>
+
+<P>
+The <TT>glossary</TT> package command
+
+<P>
+<TT><TT>&#92;ifacronymfirstuse&#123;&lt;<I>acr-name</I>&gt;&#125;&#123;&lt;<I>text1</I>&gt;&#125;&#123;&lt;<I>text2</I>&gt;&#125;</TT></TT>
+<P>
+can be replaced by the <TT>glossaries</TT> command:
+
+<P>
+<TT><TT>&#92;ifglsused&#123;&lt;<I>label</I>&gt;&#125;&#123;&lt;<I>text2</I>&gt;&#125;&#123;&lt;<I>text1</I>&gt;&#125;</TT></TT>
+<P>
+Note that <TT>&#92;ifglsused</TT> evaluates the opposite condition to
+that of <TT>&#92;ifacronymfirstuse</TT> which is why the last two arguments
+have been reversed.
+
+<P>
+
+<H2><A NAME="SECTION00073000000000000000">
+6.3 <TT>&#92;resetacronym</TT> and <TT>&#92;unsetacronym</TT></A>
+</H2>
+
+<P>
+The <TT>glossary</TT> package allows you to reset and unset the
+acronym flag which is used to determine whether the acronym has
+been used in the document. The <TT>glossaries</TT> package also
+provides a means to do this on either a local or global level.
+To reset an acronym, you will need to replace:
+
+<P>
+<TT><TT>&#92;resetacronym&#123;&lt;<I>acr-name</I>&gt;&#125;</TT></TT>
+<P>
+with either
+
+<P>
+<TT><TT>&#92;glsreset&#123;&lt;<I>label</I>&gt;&#125;</TT></TT>
+<P>
+or
+
+<P>
+<TT><TT>&#92;glslocalreset&#123;&lt;<I>label</I>&gt;&#125;</TT></TT>
+<P>
+
+<P>
+To unset an acronym, you will need to replace:
+
+<P>
+<TT><TT>&#92;unsetacronym&#123;&lt;<I>acr-name</I>&gt;&#125;</TT></TT>
+<P>
+with either
+
+<P>
+<TT><TT>&#92;glsunset&#123;&lt;<I>label</I>&gt;&#125;</TT></TT>
+<P>
+or
+
+<P>
+<TT><TT>&#92;glslocalunset&#123;&lt;<I>label</I>&gt;&#125;</TT></TT>
+<P>
+
+<P>
+
+<H1><A NAME="SECTION00080000000000000000">
+7 Displaying the glossary</A>
+</H1>
+
+<P>
+The <TT>glossary</TT> package provides the command <TT>&#92;printglossary</TT>
+(or <TT>&#92;print</TT>&lt;<I>type</I>&gt; for other glossary types) which
+can be used to print individual glossaries. The <TT>glossaries</TT>
+package provides the command <TT>&#92;printglossaries</TT> which
+will print all the glossaries which have been defined, or
+<TT>&#92;printglossary[&lt;<I>options</I>&gt;]</TT> to print individual glossaries.
+So if you just have <TT>&#92;printglossary</TT>, then you can leave it as
+it is, but if you have, say:
+<PRE>
+\printglossary
+\printglossary[acronym]
+</PRE>
+or
+<PRE>
+\printglossary
+\printacronym
+</PRE>
+then you will need to either replace this with either
+<PRE>
+\printglossaries
+</PRE>
+or
+<PRE>
+\printglossary
+\printglossary[type=\acronymtype]
+</PRE>
+
+<P>
+The <TT>glossary</TT> package allows you to specify a short title
+(for the table of contents and page header) by defining a command
+of the form <TT>&#92;short</TT>&lt;<I>glossary-type</I>&gt;<TT>name</TT>. The
+<TT>glossaries</TT> package doesn't do this, but instead provides
+the <TT>toctitle</TT> key which can be used in the optional
+argument to <TT>&#92;printglossary</TT>. For example, if you have created
+a new glossary type called <TT>notation</TT>, and you had
+defined
+<PRE>
+\newcommand{\shortnotationname}{Notation}
+</PRE>
+then you would need to use the <TT>toctitle</TT> key:
+<PRE>
+\printglossary[type=notation,toctitle=Notation]
+</PRE>
+The <TT>glossaries</TT> package will ignore <TT>&#92;shortnotationname</TT>,
+so unless you have used it elsewhere in the document, you may
+as well remove the definition.
+
+<P>
+
+<H1><A NAME="SECTION00090000000000000000">
+8 Using makeindex</A>
+</H1>
+
+<P>
+If you convert your document from using the <TT>glossary</TT> package
+to the <TT>glossaries</TT> package, you will need to delete any of
+the additional files, such as the <TT>.glo</TT> file, that were
+created by the <TT>glossary</TT> package, as the <TT>glossaries</TT>
+package uses a different <TT>makeindex</TT> style file.
+Remember also, that if you used the <TT>makeglos</TT> Perl script,
+you will need to use the <TT>makeglossaries</TT> Perl script
+instead.
+
+<P>
+<BR><HR><H4>Footnotes</H4>
+<DL>
+<DT><A NAME="foot459">...
+available</A><A
+ HREF="glossary2glossaries.html#tex2html2"><SUP>1</SUP></A></DT>
+<DD>mainly because having a key value list in
+<TT>&#92;glossary</TT> caused problems, but it also helps consistency.
+
+</DD>
+</DL>
+<BR><HR>
+<ADDRESS>
+<A href=http://theoval.cmp.uea.ac.uk/~nlct/>Nicola L. C. Talbot</A>.
+<A HREF=http://www.cmp.uea.ac.uk/>School of Computing Sciences</A>.
+<A HREF=http://www.uea.ac.uk/>University of East Anglia.</A>
+Last Modified: 2007-09-15
+</ADDRESS>
+</BODY>
+</HTML>
diff --git a/Master/texmf-dist/doc/latex/glossaries/doc/glossary2glossaries.pdf b/Master/texmf-dist/doc/latex/glossaries/doc/glossary2glossaries.pdf
new file mode 100644
index 00000000000..fd9d18c7c63
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/doc/glossary2glossaries.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/scripts/makeglossaries b/Master/texmf-dist/doc/latex/glossaries/scripts/makeglossaries
new file mode 100755
index 00000000000..aaa0c1b36d0
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/scripts/makeglossaries
@@ -0,0 +1,229 @@
+#!/usr/bin/perl
+
+# File : makeglossaries
+# Author : Nicola Talbot
+# Version : 1.0 (2007/05/10)
+# Description: simple Perl script that calls makeindex.
+# Intended for use with "glossaries.sty" (saves having to remember
+# all the various switches)
+
+# This file is distributed as part of the glossaries LaTeX package.
+# Copyright 2007 Nicola L.C. 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, glossary-hypernav.sty,
+# glossary-list.sty, glossary-long.sty, glossary-super.sty,
+# glossaries.perl. Also makeglossaries and makeglossaries.
+
+use Getopt::Std;
+
+if ($#ARGV < 0)
+{
+ die "Syntax : $0 [-ilqrcg] [-s sty] [-o gls] [-t log] [-p num] <filename>\n";
+}
+
+getopt('sotp');
+getopts('ilqrcg');
+
+# define known extensions
+
+ %exttype = (
+ main => {in=>'glo', out=>'gls', 'log'=>'glg'},
+ );
+
+$ext = '';
+
+if (length(@ARGV[0]) < 4)
+{
+ $name = @ARGV[0];
+}
+elsif (substr(@ARGV[0],-4,1) eq ".")
+{
+ $name = substr(@ARGV[0],0,length(@ARGV[0])-4);
+
+ $ext = substr(@ARGV[0],-3,3);
+}
+else
+{
+ $name = @ARGV[0];
+}
+
+$istfile = "$name.ist";
+
+# check log file for other glossary types
+# and for ist file name
+
+if (open AUXFILE, "$name.aux")
+{
+ while (<AUXFILE>)
+ {
+ if (m/\\\@newglossary\s*\{(.*)\}{(.*)}{(.*)}{(.*)}/
+ and ($1 ne 'main'))
+ {
+ $exttype{$1}{'log'} = $2;
+ $exttype{$1}{'out'} = $3;
+ $exttype{$1}{'in'} = $4;
+
+ if (!$opt_q)
+ {
+ print "added glossary type '$1' ($2,$3,$4)\n";
+ }
+ }
+
+ if (m/\\\@istfilename\s*{([^}]*)}/)
+ {
+ $istfile = $1;
+ }
+ }
+
+ close AUXFILE;
+}
+else
+{
+ print "unable to open $name.aux\n";
+}
+
+# save all the general makeindex switches
+
+$mkidxopts = '';
+
+if ($opt_i)
+{
+ $mkidxopts .= " -i";
+}
+
+if ($opt_l)
+{
+ $mkidxopts .= " -l";
+}
+
+if ($opt_q)
+{
+ $mkidxopts .= " -q";
+}
+
+if ($opt_r)
+{
+ $mkidxopts .= " -r";
+}
+
+if ($opt_c)
+{
+ $mkidxopts .= " -c";
+}
+
+if ($opt_g)
+{
+ $mkidxopts .= " -g";
+}
+
+unless ($opt_p eq "")
+{
+ $mkidxopts .= " -p $opt_p";
+}
+
+unless ($opt_s eq "")
+{
+ $istfile = $opt_s;
+}
+
+if ($ext ne '')
+{
+ %thistype = %{$exttype{'main'}}; #default
+
+ foreach $type (keys %exttype)
+ {
+ if ($exttype{$type}{'in'} eq $ext)
+ {
+ %thistype = %{$exttype{$type}};
+
+ last;
+ }
+ }
+
+ if ($opt_o eq "")
+ {
+ $outfile = "$name.$thistype{out}";
+ }
+ else
+ {
+ $outfile = $opt_o;
+ }
+
+ if ($opt_t eq "")
+ {
+ $transcript = "$name.$thistype{'log'}";
+ }
+ else
+ {
+ $transcript = $opt_t;
+ }
+
+ &makeindex("$name.$ext",$outfile,$transcript,$istfile,
+ $mkidxopts,$opt_q);
+}
+else
+{
+ foreach $type (keys %exttype)
+ {
+ %thistype = %{$exttype{$type}};
+
+ $inputfile = "$name.$thistype{in}";
+
+ if (-r $inputfile)
+ {
+ if ($opt_o eq "")
+ {
+ $outfile = "$name.$thistype{out}";
+ }
+ else
+ {
+ $outfile = $opt_o;
+ }
+
+ if ($opt_t eq "")
+ {
+ $transcript = "$name.$thistype{'log'}";
+ }
+ else
+ {
+ $transcript = $opt_t;
+ }
+
+ &makeindex($inputfile,$outfile,$transcript,
+ $istfile,$mkidxopts,$opt_q);
+ }
+ elsif (!$opt_q)
+ {
+ print "no read access for '$inputfile'\n";
+ }
+ }
+}
+
+sub makeindex{
+ local($in,$out,$trans,$ist,$rest,$quiet) = @_;
+ local($name,$cmdstr,$buffer,$n,$i,$j);
+ local(@stuff,@item);
+
+ $cmdstr = "$rest -s $ist -t $trans -o $out $in";
+
+ unless ($quiet)
+ {
+ print "makeindex $cmdstr\n";
+ }
+
+ `makeindex $cmdstr`;
+}
+
+1;
diff --git a/Master/texmf-dist/doc/latex/glossaries/scripts/makeglossaries.bat b/Master/texmf-dist/doc/latex/glossaries/scripts/makeglossaries.bat
new file mode 100755
index 00000000000..64a6a20750c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/scripts/makeglossaries.bat
@@ -0,0 +1,3 @@
+@rem = '-*- Perl -*-
+@echo off
+perl -S "%~dp0makeglossaries" %*
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
index a86c855cb85..a47abec2adb 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
@@ -2,9 +2,9 @@
% glossaries.dtx generated using makedtx version 0.94b (c) Nicola Talbot
% Command line args:
% -macrocode "glossaries\.perl"
-% -src "glossaries.sty=>glossaries.sty"
+% -src "glossaries.sty\Z=>glossaries.sty"
% -src "(glossary-.+)\.(sty)\Z=>\1.\2"
-% -src "glossaries\.perl=>glossaries.perl"
+% -src "glossaries\.perl\Z=>glossaries.perl"
% -author "Nicola Talbot"
% -dir "source"
% -setambles "glossaries\.perl=>\nopreamble\nopostamble"
@@ -12,7 +12,7 @@
% -doc "manual.tex"
% -codetitle "Documented Code"
% glossaries
-% Created on 2007/9/13 20:21
+% Created on 2007/10/13 15:35
%\fi
%\iffalse
%<*package>
@@ -63,7 +63,7 @@
\makeatother
\RecordChanges
\PageIndex
-\CheckSum{2826}
+\CheckSum{3027}
\CodelineNumbered
\newcommand*{\termdef}[1]{\emph{#1}\iterm{#1}}
\newcommand*{\term}[1]{#1\iterm{#1}}
@@ -96,7 +96,7 @@
%\MakeShortVerb{"}
%\DeleteShortVerb{\|}
%
-% \title{glossaries.sty v 1.07: \LaTeXe\ Package to Assist Generating Glossaries}
+% \title{glossaries.sty v 1.08: \LaTeXe\ Package to Assist Generating Glossaries}
% \author{Nicola L.C. Talbot\\[10pt]
%School of Computing Sciences\\
%University of East Anglia\\
@@ -104,7 +104,7 @@
%NR4 7TJ. United Kingdom.\\
%\url{http://theoval.cmp.uea.ac.uk/~nlct/}}
%
-% \date{13th September 2007}
+% \date{13th October 2007}
% \maketitle
%\tableofcontents
%
@@ -157,6 +157,13 @@
%defined in your document, so where possible you should use
%\appname{makeglossaries} instead to reduce the possibility of error.
%
+%As from version 1.08, the \styname{glossaries} package now has
+%limited multi-lingual support, thanks to all the people who have sent
+%me the relevant translations either via email or via comp.text.tex.
+%However, you must load \styname{babel} \emph{before}
+%\styname{glossaries}. (See \autoref{sec:predefinednames} for the
+%predefined names used by the \styname{glossaries} package.)
+%
%This documentation is structured as follows: \autoref{sec:quick}
%is for people who want a few quick pointers of how to get started,
%without having to read through lengthy descriptions,
@@ -166,6 +173,12 @@
%package works, and how to do more complicated things, such as
%changing the way glossary entries appear.
%
+%\subsection{Troubleshooting}
+%
+%There is a list of frequently asked questions for the
+%\styname{glossaries} package available at:
+%\url{http://theoval.cmp.uea.ac.uk/~nlct/latex/packages/faq/}.
+%
%\section{A Quick Guide For The Impatient}
%\label{sec:quick}
%
@@ -1089,8 +1102,6 @@
%or using the \gloskey[printglossary]{style} key in the optional
%argument to \icmdname{printglossary}, or using the command:\\[10pt]
%\cs{glossarystyle}\marg{style-name}\\[10pt]
-%For further details on creating or modifying glossary styles see
-%\autoref{sec:printglos} and \autoref{sec:styles}.
%
% \changes{1.03}{2007 July 4}{'glspostdescription added}
%All the styles except for the three and four column styles use the
@@ -1100,6 +1111,111 @@
%say a comma), you will need to redefine \cs{glspostdescription}
%before the glossary is displayed.
%
+%\subsection{Defining your own glossary style}
+%
+%If the predefined styles don't fit your requirements, you can
+%define your own style using\DescribeMacro{\newglossarystyle}:\\[10pt]
+%\cs{newglossarystyle}\marg{name}\marg{definitions}\\[10pt]
+%where \meta{name} is the name of the new glossary style (to be
+%used in \cs{glossarystyle}. The second argument \meta{definitions},
+%needs to redefine the following:
+%
+%\DescribeEnv{theglossary}
+%\noindent\envname{theglossary}\par\noindent
+%This environment defines how the main body of the glossary should
+%be typeset. Note that this does not include the section heading,
+%the glossary preamble (defined by \cs{glossarypreamble}) or the
+%glossary postamble (defined by \cs{glossarypostamble}.) For example,
+%the \glostyle{list} style uses the \envname{description} environment,
+%so the \envname{theglossary} environment is simply redefined to begin
+%and end the \envname{description} environment.
+%
+%\DescribeMacro{\glossaryheader}
+%\noindent\cs{glossaryheader}\par\noindent
+%This macro indicates what to do at the start of the main body
+%of the glossary. Note that this is not the same as
+%\cs{glossarypreamble}, which should not be affected by changes in
+%the glossary style. The \glostyle{list} glossary style redefines
+%\cs{glossaryheader} to do nothing, whereas the \glostyle{longheader}
+%glossary style redefines \cs{glossaryheader} to do a header row.
+%
+%\DescribeMacro{\glsgroupheading}
+%\noindent\cs{glsgroupheading}\marg{label}\par\noindent
+%This macro indicates what to do at the start of each logical block
+%within the main body of the glossary. The glossary is sub-divided
+%into 28 logical blocks that are determined by the first character of
+%the \gloskey{sort} key (or \gloskey{name} key if the \gloskey{sort}
+%key is omitted.) The sub-divisions are in the following order:
+%symbols, numbers, A, \ldots, Z. Note that the argument to
+%\cs{glsgroupheading} is a label, \emph{not} the group title. The
+%group title can be obtained via \cs{glsgetgrouptitle}\marg{label},
+%and a navigation hypertarget can be created using
+%\cs{glsnavhypertarget}\marg{label}. Most of the predefined glossary
+%styles redefine \cs{glsgroupheading} to simply ignore its argument.
+%The \glostyle{listhypergroup} style redefines \cs{glsgroupheading}
+%as follows:
+%\begin{verbatim}
+%\renewcommand*{\glsgroupheading}[1]{%
+%\item[\glsnavhypertarget{##1}{\glsgetgrouptitle{##1}}]}
+%\end{verbatim}
+%See also \cs{glsgroupskip} below.
+%
+%\DescribeMacro{\glossaryentryfield}
+%\cs{glossaryentryfield}\marg{label}\marg{formatted
+%name}\marg{description}\marg{symbol}
+%\marg{number list}\par\noindent
+%This macro indicates what to do for a given glossary entry.
+%Note that \meta{formatted name} will always be in the form
+%\cs{glsnamefont}\marg{name}. This allows the user to set a given
+%font for the entry name, regardless of the glossary style used.
+%Note that \meta{label} is the label used when the glossary entry
+%was defined via either \cs{newglossaryentry} or \cs{newacronym}.
+%Each time you use a glossary entry it creates a
+%link\footnote{if the document doesn't have hyperlinks enabled,
+%\cs{@glslink} ignores the label, and simply typesets the text.}
+%using \cs{@glslink}\marg{label}\marg{text} with the label
+%\texttt{glo:}\meta{label}. Your
+%new glossary style must therefore redefine \cs{glossaryentryfield}
+%so that it uses \cs{@glstarget}\{\texttt{glo:}\meta{label}\}\marg{text}
+%to ensure the hyperlinks function correctly\footnote{again, if the
+%document doesn't support hyperlinks, \cs{@glstarget} will ignore
+%the label, and just typeset the text.}.
+%
+%Note also that \meta{number list} will always be of the form\\[10pt]
+%\cs{glossaryentrynumbers}\{\cs{relax}\\
+%\cs{setentrycounter}\marg{counter name}\cs{glsnumberformat}\marg{number(s)}\}\\[10pt]
+%where \meta{number(s)}
+%may contain \cs{delimN} (to delimit individual numbers) and/or
+%\cs{delimR} (to indicate a range of numbers.) There may be
+%multiple occurrences of
+%\cs{setentrycounter}\marg{counter name}\cs{glsnumberformat}\marg{number(s)}, but note
+%that the entire number list is enclosed within the argument
+%to \cs{glossaryentrynumbers}. The user can redefine this to change
+%the way the entire number list is formatted, regardless of
+%the glossary style (although, obviously, the \gloskey{format}
+%key may over-ride this.) However the most common use of
+%\cs{glossaryentrynumbers} is to provide a means of suppressing the
+%number list altogether. (In fact, the \pkgopt{nonumberlist} option
+%redefines \cs{glossaryentrynumbers} to ignore its argument.)
+%Therefore, when you define a new glossary style, you don't need
+%to worry about whether the user has specified the
+%\pkgopt{nonumberlist} package option.
+%
+%One more thing to remember is that when you are redefining a command
+%within the argument to another command, you must use \verb|##1|,
+%\verb|##2|, etc instead of \verb|#1|, \verb|#2|, etc. For examples,
+%look at the way the predefined styles are defined in
+%\autoref{sec:styles}.
+%
+%\DescribeMacro{\glsgroupskip}
+%\noindent\cs{glsgroupskip}\par\noindent
+%This macro determines what to do after one logical group but before
+%the header for the next logical group. The \glostyle{list} glossary
+%style simply redefines \cs{glsgroupskip} to be \cs{indexspace}.
+%
+%For further details on creating or modifying glossary styles see
+%\autoref{sec:printglos} and \autoref{sec:styles}.
+%
% \StopEventually{\phantomsection\addcontentsline{toc}{section}{Index}\PrintIndex}
%
%
@@ -1116,7 +1232,7 @@
% This package requires \LaTeXe.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2007/09/13 v1.07 (NLCT)]
+\ProvidesPackage{glossaries}[2007/10/13 v1.08 (NLCT)]
% \end{macrocode}
% Required packages:
% \begin{macrocode}
@@ -1368,7 +1484,7 @@ name=true]{%
\@ifundefined{hyperdef}{}{\hyperdef{section}{\thesection}{}}}}}{}
% \end{macrocode}
%
-%\subsection{Default values}
+%\subsection{Default values}\label{sec:predefinednames}
% This section sets up default values that are used by this
% package. Some of the names may already be defined (e.g.\ by
% \styname{babel}) so \cs{providecommand} is used.
@@ -1424,6 +1540,147 @@ name=true]{%
\providecommand*{\glsnumbersgroupname}{Numbers}
% \end{macrocode}
%\end{macro}
+% Add multi-lingual support\changes{1.08}{2007 Oct 13}{Added
+% babel support}. Thanks to everyone who contributed to the
+% translations from both comp.text.tex and via email.
+% \begin{macrocode}
+\@ifpackageloaded{babel}{%
+% \end{macrocode}
+% English:
+% \begin{macrocode}
+\addto\captionsenglish{%
+\renewcommand*{\glossaryname}{Glossary}%
+\renewcommand*{\acronymname}{Acronyms}%
+\renewcommand*{\entryname}{Notation}%
+\renewcommand*{\descriptionname}{Description}%
+\renewcommand*{\symbolname}{Symbol}%
+\renewcommand*{\pagelistname}{Page List}%
+\renewcommand*{\glssymbolsgroupname}{Symbols}%
+\renewcommand*{\glsnumbersgroupname}{Numbers}%
+}%
+% \end{macrocode}
+% German (quite a few variations were suggested for German,
+% I settled on the following):
+% \begin{macrocode}
+\addto\captionsgerman{%
+\renewcommand*{\glossaryname}{Glossar}%
+\renewcommand*{\acronymname}{Akronyme}%
+\renewcommand*{\entryname}{Bezeichnung}%
+\renewcommand*{\descriptionname}{Beschreibung}%
+\renewcommand*{\symbolname}{Symbol}%
+\renewcommand*{\pagelistname}{Seiten}%
+\renewcommand*{\glssymbolsgroupname}{Symbole}%
+\renewcommand*{\glsnumbersgroupname}{Zahlen}}
+% \end{macrocode}
+% ngerman is identical to German:
+% \begin{macrocode}
+\addto\captionsngerman{%
+\renewcommand*{\glossaryname}{Glossar}%
+\renewcommand*{\acronymname}{Akronyme}%
+\renewcommand*{\entryname}{Bezeichnung}%
+\renewcommand*{\descriptionname}{Beschreibung}%
+\renewcommand*{\symbolname}{Symbol}%
+\renewcommand*{\pagelistname}{Seiten}%
+\renewcommand*{\glssymbolsgroupname}{Symbole}%
+\renewcommand*{\glsnumbersgroupname}{Zahlen}}
+% \end{macrocode}
+% Italian:
+% \begin{macrocode}
+\addto\captionsitalian{%
+\renewcommand*{\glossaryname}{Glossario}%
+\renewcommand*{\acronymname}{Acronimi}%
+\renewcommand*{\entryname}{Nomenclatura}%
+\renewcommand*{\descriptionname}{Descrizione}%
+\renewcommand*{\symbolname}{Simbolo}%
+\renewcommand*{\pagelistname}{Elenco delle pagine}%
+\renewcommand*{\glssymbolsgroupname}{Simboli}%
+\renewcommand*{\glsnumbersgroupname}{Numeri}}
+% \end{macrocode}
+% Dutch:
+% \begin{macrocode}
+\addto\captionsdutch{%
+\renewcommand*{\glossaryname}{Woordenlijst}%
+\renewcommand*{\acronymname}{Acroniemen}%
+\renewcommand*{\entryname}{Benaming}%
+\renewcommand*{\descriptionname}{Beschrijving}%
+\renewcommand*{\symbolname}{Symbool}%
+\renewcommand*{\pagelistname}{Pagina's}%
+\renewcommand*{\glssymbolsgroupname}{Symbolen}%
+\renewcommand*{\glsnumbersgroupname}{Cijfers}}
+% \end{macrocode}
+% Spanish:
+% \begin{macrocode}
+\addto\captionsspanish{%
+\renewcommand*{\glossaryname}{Glosario}%
+\renewcommand*{\acronymname}{Siglas}%
+\renewcommand*{\entryname}{Entrada}%
+\renewcommand*{\descriptionname}{Descripci\'on}%
+\renewcommand*{\symbolname}{S\'{\i}mbolo}%
+\renewcommand*{\pagelistname}{Lista de p\'aginas}%
+\renewcommand*{\glssymbolsgroupname}{S\'{\i}mbolos}%
+\renewcommand*{\glsnumbersgroupname}{N\'umeros}}
+% \end{macrocode}
+% French:
+% \begin{macrocode}
+\addto\captionsfrench{%
+\renewcommand*{\glossaryname}{Glossaire}%
+\renewcommand*{\acronymname}{Acronymes}%
+\renewcommand*{\entryname}{Terme}%
+\renewcommand*{\descriptionname}{Description}%
+\renewcommand*{\symbolname}{Symbole}%
+\renewcommand*{\pagelistname}{Pages}%
+\renewcommand*{\glssymbolsgroupname}{Symboles}%
+\renewcommand*{\glsnumbersgroupname}{Nombres}}
+% \end{macrocode}
+% Danish:
+% \begin{macrocode}
+\addto\captionsdanish{%
+\renewcommand*{\glossaryname}{Ordliste}%
+\renewcommand*{\acronymname}{Akronymer}%
+\renewcommand*{\entryname}{Symbolforklaring}%
+\renewcommand*{\descriptionname}{Beskrivelse}%
+\renewcommand*{\symbolname}{Symbol}%
+\renewcommand*{\pagelistname}{Side}%
+\renewcommand*{\glssymbolsgroupname}{Symboler}%
+\renewcommand*{\glsnumbersgroupname}{Tal}}
+% \end{macrocode}
+% Irish:
+% \begin{macrocode}
+\addto\captionsirish{%
+\renewcommand*{\glossaryname}{Gluais}%
+\renewcommand*{\acronymname}{Acrainmneacha}% 'Acronyms'
+% \end{macrocode}
+% wasn't sure whether to go for N\'ota (Note), Ciall (`Meaning',
+% `sense') ot Br\'{\i} (`Meaning'). In the end I chose Ciall.
+% \begin{macrocode}
+\renewcommand*{\entryname}{Ciall}%
+\renewcommand*{\descriptionname}{Tuairisc}%
+% \end{macrocode}
+% Again, not sure whether to use Comhartha/Comhartha\'{\i} or
+% Siombail/Siombaile, so have chosen the former.
+% \begin{macrocode}
+\renewcommand*{\symbolname}{Comhartha}%
+\renewcommand*{\glssymbolsgroupname}{Comhartha\'{\i}}%OR
+\renewcommand*{\pagelistname}{Leathanaigh}%
+\renewcommand*{\glsnumbersgroupname}{Uimhreacha}}
+% \end{macrocode}
+% Hungarian:
+% \begin{macrocode}
+\addto\captionsmagyar{%
+\renewcommand*{\glossaryname}{Sz\'ojegyz\'ek}%
+\renewcommand*{\acronymname}{Bet\H uszavak}%
+\renewcommand*{\entryname}{Kifejez\'es}%
+\renewcommand*{\descriptionname}{Magyar\'azat}%
+\renewcommand*{\symbolname}{Jel\"ol\'es}%
+\renewcommand*{\pagelistname}{Oldalsz\'am}%
+\renewcommand*{\glssymbolsgroupname}{Jelek}%
+\renewcommand*{\glsnumbersgroupname}{Sz\'amjegyek}%
+}
+% \end{macrocode}
+% babel not loaded:
+% \begin{macrocode}
+}{}
+% \end{macrocode}
% The description terminator is given by \cs{glspostdescription}
% (except for the 3 and 4 column styles). This is a full stop
% by default:
@@ -1963,10 +2220,12 @@ counter as its value}}{%
% keys are omitted, an error will be generated.
%\changes{1.05}{2007 Aug 10}{Changed the default value of the sort
% key to just the value of the name key}%
+%\changes{1.08}{2007 Oct 13}{Fixed error message to say ``description
+%key'' rather than ``desc key''}
% \begin{macrocode}
\def\@glo@name{\PackageError{glossaries}{name key required in
\string\newglossaryentry}{You haven't specified the entry name}}%
-\def\@glo@desc{\PackageError{glossaries}{desc key required in
+\def\@glo@desc{\PackageError{glossaries}{description key required in
\string\newglossaryentry}{You haven't specified the entry description}}%
\def\@glo@type{\glsdefaulttype}%
\def\@glo@symbol{\relax}%
@@ -3861,7 +4120,7 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}}
% \icmdname{item} command, it will appear in a bold font by
% default.
% \begin{macrocode}
-\ProvidesPackage{glossary-list}[2007/07/04 v1.01 (NLCT)]
+\ProvidesPackage{glossary-list}[2007/10/04 v1.02 (NLCT)]
% \end{macrocode}
% The \glostyle{list} glossary style
% uses the \envname{description} environment. The group separator
@@ -3880,10 +4139,11 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}}
% \end{macrocode}
% The \glostyle{listgroup} style is like the \glostyle{list}
% style, but the glossary groups have headings.
+%\changes{1.08}{2007 Oct 13}{changed listgroup style to use \cs{glsgetgrouptitle}}
% \begin{macrocode}
\newglossarystyle{listgroup}{%
\glossarystyle{list}%
-\renewcommand*{\glsgroupheading}[1]{\item[##1]}}
+\renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}}
% \end{macrocode}
% The \glostyle{listhypergroup} style is like the \glostyle{listgroup}
% style, but has a set of links to the groups at the
@@ -3907,10 +4167,11 @@ first={#4 (#3)},plural={#3s},firstplural={#4s (#3s)},#1}}
% \end{macrocode}
% The \glostyle{altlistgroup} glossary style is like the
% \glostyle{altlist} style, but the glossary groups have headings.
+%\changes{1.08}{2007 Oct 13}{changed altlistgroup style to use \cs{glsgetgrouptitle}}
% \begin{macrocode}
\newglossarystyle{altlistgroup}{%
\glossarystyle{altlist}%
-\renewcommand*{\glsgroupheading}[1]{\item[##1]}}
+\renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}}
% \end{macrocode}
% The \glostyle{altlisthypergroup} glossary style is like the
% \glostyle{altlisthypergroup} style, but has a
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
index c9bcf74cb43..170da75cd4e 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 0.94b 2007/9/13 20:21
+% glossaries.ins generated using makedtx version 0.94b 2007/10/13 15:35
\input docstrip
\preamble
diff --git a/Master/texmf-dist/tex/latex/glossaries/glossaries.sty b/Master/texmf-dist/tex/latex/glossaries/glossaries.sty
index e44b70ea99b..2e390251c1c 100644
--- a/Master/texmf-dist/tex/latex/glossaries/glossaries.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/glossaries.sty
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2007/09/13 v1.07 (NLCT)]
+\ProvidesPackage{glossaries}[2007/10/13 v1.08 (NLCT)]
\RequirePackage{ifthen}
\RequirePackage{xkeyval}[2006/11/18]
\RequirePackage{xspace}
@@ -106,6 +106,100 @@ name=true]{%
\providecommand*{\pagelistname}{Page List}
\providecommand*{\glssymbolsgroupname}{Symbols}
\providecommand*{\glsnumbersgroupname}{Numbers}
+\@ifpackageloaded{babel}{%
+\addto\captionsenglish{%
+\renewcommand*{\glossaryname}{Glossary}%
+\renewcommand*{\acronymname}{Acronyms}%
+\renewcommand*{\entryname}{Notation}%
+\renewcommand*{\descriptionname}{Description}%
+\renewcommand*{\symbolname}{Symbol}%
+\renewcommand*{\pagelistname}{Page List}%
+\renewcommand*{\glssymbolsgroupname}{Symbols}%
+\renewcommand*{\glsnumbersgroupname}{Numbers}%
+}%
+\addto\captionsgerman{%
+\renewcommand*{\glossaryname}{Glossar}%
+\renewcommand*{\acronymname}{Akronyme}%
+\renewcommand*{\entryname}{Bezeichnung}%
+\renewcommand*{\descriptionname}{Beschreibung}%
+\renewcommand*{\symbolname}{Symbol}%
+\renewcommand*{\pagelistname}{Seiten}%
+\renewcommand*{\glssymbolsgroupname}{Symbole}%
+\renewcommand*{\glsnumbersgroupname}{Zahlen}}
+\addto\captionsngerman{%
+\renewcommand*{\glossaryname}{Glossar}%
+\renewcommand*{\acronymname}{Akronyme}%
+\renewcommand*{\entryname}{Bezeichnung}%
+\renewcommand*{\descriptionname}{Beschreibung}%
+\renewcommand*{\symbolname}{Symbol}%
+\renewcommand*{\pagelistname}{Seiten}%
+\renewcommand*{\glssymbolsgroupname}{Symbole}%
+\renewcommand*{\glsnumbersgroupname}{Zahlen}}
+\addto\captionsitalian{%
+\renewcommand*{\glossaryname}{Glossario}%
+\renewcommand*{\acronymname}{Acronimi}%
+\renewcommand*{\entryname}{Nomenclatura}%
+\renewcommand*{\descriptionname}{Descrizione}%
+\renewcommand*{\symbolname}{Simbolo}%
+\renewcommand*{\pagelistname}{Elenco delle pagine}%
+\renewcommand*{\glssymbolsgroupname}{Simboli}%
+\renewcommand*{\glsnumbersgroupname}{Numeri}}
+\addto\captionsdutch{%
+\renewcommand*{\glossaryname}{Woordenlijst}%
+\renewcommand*{\acronymname}{Acroniemen}%
+\renewcommand*{\entryname}{Benaming}%
+\renewcommand*{\descriptionname}{Beschrijving}%
+\renewcommand*{\symbolname}{Symbool}%
+\renewcommand*{\pagelistname}{Pagina's}%
+\renewcommand*{\glssymbolsgroupname}{Symbolen}%
+\renewcommand*{\glsnumbersgroupname}{Cijfers}}
+\addto\captionsspanish{%
+\renewcommand*{\glossaryname}{Glosario}%
+\renewcommand*{\acronymname}{Siglas}%
+\renewcommand*{\entryname}{Entrada}%
+\renewcommand*{\descriptionname}{Descripci\'on}%
+\renewcommand*{\symbolname}{S\'{\i}mbolo}%
+\renewcommand*{\pagelistname}{Lista de p\'aginas}%
+\renewcommand*{\glssymbolsgroupname}{S\'{\i}mbolos}%
+\renewcommand*{\glsnumbersgroupname}{N\'umeros}}
+\addto\captionsfrench{%
+\renewcommand*{\glossaryname}{Glossaire}%
+\renewcommand*{\acronymname}{Acronymes}%
+\renewcommand*{\entryname}{Terme}%
+\renewcommand*{\descriptionname}{Description}%
+\renewcommand*{\symbolname}{Symbole}%
+\renewcommand*{\pagelistname}{Pages}%
+\renewcommand*{\glssymbolsgroupname}{Symboles}%
+\renewcommand*{\glsnumbersgroupname}{Nombres}}
+\addto\captionsdanish{%
+\renewcommand*{\glossaryname}{Ordliste}%
+\renewcommand*{\acronymname}{Akronymer}%
+\renewcommand*{\entryname}{Symbolforklaring}%
+\renewcommand*{\descriptionname}{Beskrivelse}%
+\renewcommand*{\symbolname}{Symbol}%
+\renewcommand*{\pagelistname}{Side}%
+\renewcommand*{\glssymbolsgroupname}{Symboler}%
+\renewcommand*{\glsnumbersgroupname}{Tal}}
+\addto\captionsirish{%
+\renewcommand*{\glossaryname}{Gluais}%
+\renewcommand*{\acronymname}{Acrainmneacha}% 'Acronyms'
+\renewcommand*{\entryname}{Ciall}%
+\renewcommand*{\descriptionname}{Tuairisc}%
+\renewcommand*{\symbolname}{Comhartha}%
+\renewcommand*{\glssymbolsgroupname}{Comhartha\'{\i}}%OR
+\renewcommand*{\pagelistname}{Leathanaigh}%
+\renewcommand*{\glsnumbersgroupname}{Uimhreacha}}
+\addto\captionsmagyar{%
+\renewcommand*{\glossaryname}{Sz\'ojegyz\'ek}%
+\renewcommand*{\acronymname}{Bet\H uszavak}%
+\renewcommand*{\entryname}{Kifejez\'es}%
+\renewcommand*{\descriptionname}{Magyar\'azat}%
+\renewcommand*{\symbolname}{Jel\"ol\'es}%
+\renewcommand*{\pagelistname}{Oldalsz\'am}%
+\renewcommand*{\glssymbolsgroupname}{Jelek}%
+\renewcommand*{\glsnumbersgroupname}{Sz\'amjegyek}%
+}
+}{}
\newcommand*{\glspostdescription}{.}
\providecommand*{\istfilename}{\jobname.ist}
\newcommand*{\@istfilename}[1]{}
@@ -218,7 +312,7 @@ counter as its value}}{%
\glsdoifnoexists{#1}{%
\def\@glo@name{\PackageError{glossaries}{name key required in
\string\newglossaryentry}{You haven't specified the entry name}}%
-\def\@glo@desc{\PackageError{glossaries}{desc key required in
+\def\@glo@desc{\PackageError{glossaries}{description key required in
\string\newglossaryentry}{You haven't specified the entry description}}%
\def\@glo@type{\glsdefaulttype}%
\def\@glo@symbol{\relax}%
diff --git a/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty b/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty
index 09f70c677e2..fe07f6ae2ab 100644
--- a/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty
+++ b/Master/texmf-dist/tex/latex/glossaries/glossary-list.sty
@@ -38,7 +38,7 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\ProvidesPackage{glossary-list}[2007/07/04 v1.01 (NLCT)]
+\ProvidesPackage{glossary-list}[2007/10/04 v1.02 (NLCT)]
\newglossarystyle{list}{%
\renewenvironment{theglossary}{\begin{description}}{\end{description}}%
\renewcommand*{\glossaryheader}{}%
@@ -48,7 +48,7 @@
\renewcommand*{\glsgroupskip}{\indexspace}}
\newglossarystyle{listgroup}{%
\glossarystyle{list}%
-\renewcommand*{\glsgroupheading}[1]{\item[##1]}}
+\renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}}
\newglossarystyle{listhypergroup}{%
\glossarystyle{list}%
\renewcommand*{\glossaryheader}{%
@@ -62,7 +62,7 @@
}
\newglossarystyle{altlistgroup}{%
\glossarystyle{altlist}%
-\renewcommand*{\glsgroupheading}[1]{\item[##1]}}
+\renewcommand*{\glsgroupheading}[1]{\item[\glsgetgrouptitle{##1}]}}
\newglossarystyle{altlisthypergroup}{%
\glossarystyle{altlist}%
\renewcommand*{\glossaryheader}{%