summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/glossaries/samples
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-11-14 22:52:09 +0000
committerKarl Berry <karl@freefriends.org>2013-11-14 22:52:09 +0000
commit033271bfdf58e2563bd3fbdbeb0f1facfb0c02e5 (patch)
tree1ca0cddf673e09a878c83db761e4dc52c65ba48b /Master/texmf-dist/doc/latex/glossaries/samples
parente537bba01fd3f3a532b7fc1f6186c24065208638 (diff)
glossaries (14nov13)
git-svn-id: svn://tug.org/texlive/trunk@32147 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/glossaries/samples')
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/README-samples52
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdfbin34464 -> 48464 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex21
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdfbin0 -> 58845 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.tex29
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdfbin47074 -> 53480 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex7
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdfbin77284 -> 75487 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex30
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdfbin36486 -> 36474 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex8
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdfbin0 -> 34915 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.tex28
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdfbin0 -> 43211 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-index.tex60
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdfbin0 -> 147358 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.tex7
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdfbin0 -> 38853 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.tex5
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.pdfbin0 -> 23740 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.tex3
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdfbin0 -> 35496 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.tex56
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdfbin0 -> 40532 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.tex47
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdfbin0 -> 41998 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.tex6
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdfbin0 -> 43275 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.tex73
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdfbin0 -> 21716 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-si.tex17
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample.pdfbin102755 -> 102984 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample.tex5
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdfbin43346 -> 43335 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex4
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdfbin66099 -> 68668 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex5
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdfbin65557 -> 67725 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex5
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdfbin47069 -> 47058 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex4
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdfbin48468 -> 48456 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex13
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdfbin155835 -> 155671 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex2
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdfbin169316 -> 169148 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex7
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdfbin98720 -> 98952 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex7
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdfbin0 -> 47464 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.tex57
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdfbin65976 -> 65965 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex5
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdfbin0 -> 95338 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.tex101
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdfbin46079 -> 41179 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex37
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdfbin64429 -> 64417 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex4
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdfbin66959 -> 66946 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex4
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdfbin44950 -> 44942 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex10
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdfbin165573 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdfbin178799 -> 178794 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex4
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdfbin67647 -> 67872 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex5
68 files changed, 684 insertions, 44 deletions
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/README-samples b/Master/texmf-dist/doc/latex/glossaries/samples/README-samples
new file mode 100644
index 00000000000..508aa54f981
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/README-samples
@@ -0,0 +1,52 @@
+These are sample files illustrating the use of the glossaries
+package. If you are new to this package, start with minimalgls.tex
+to check you have glossaries correctly installed and to check that
+you understand how to use it.
+
+1. Run minimalgls.tex through LaTeX ("compile the document") either
+by typing
+
+ latex minimalgls
+
+in a terminal or by using the relevant button or menu item in your
+text editor or front-end. This will create the required associated
+files but you will not see the glossary. If you use PDFLaTeX you
+will also get warnings about non-existent references that look
+something like:
+
+pdfTeX warning (dest): name{glo:aca} has been referenced but does
+not exist,
+replaced by a fixed one
+
+These warnings may be ignored on the first run.
+
+If you get a "Missing \begin{document}" error, then it's most likely
+that your version of xkeyval.sty is out of date. Check the log file
+for a warning of that nature. If this is the case, please update
+your TeX distribution.
+
+2. Run makeglossaries on the document. This can be done on a
+terminal either by typing
+
+ makeglossaries minimalgls
+
+or by typing
+
+ perl makeglossaries minimalgls
+
+If you don't have Perl installed you will need to run makeindex
+directly:
+
+ makeindex -s minimalgls.ist -t minimalgls.glg -o minimalgls.gls minimalgls.glo
+
+Another alternative is to use the Java application makeglossariesgui
+(http://ctan.org/pkg/makeglossariesgui) which has diagnostic tools
+to help determine what has gone wrong if there's a problem.
+
+3. Repeat step 1. Your document minimalgls.pdf should now have a
+glossary.
+
+If the above seems complicated, you can automate the process using
+tools such as latexmk or arara. See
+http://www.dickimaw-books.com/latex/thesis/html/build.html for
+further details.
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf
index 2e65e9f41e3..e0f22a08124 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex
index d2e575aaec8..91b70b8bc02 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex
@@ -22,15 +22,29 @@
% A further run through LaTeX will be required to ensure that
% the table of contents is up to date if the toc option
% is used.
+ % Alternatively, if you use arara, you can add the following
+ % directives in your document:
+ %
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+
\documentclass{article}
\listfiles
\usepackage[colorlinks]{hyperref}
- \usepackage{glossaries} % acronym will go in main glossary
- %\usepackage[acronym]{glossaries} % make a separate list of acronyms
+ %\usepackage{glossaries} % acronym will go in main glossary
+ \usepackage[acronym]{glossaries} % make a separate list of acronyms
\makeglossaries
+\longnewglossaryentry{par}{name={par}}%
+{%
+ A long description with a paragraph break.
+
+ This is the next paragraph.
+}
+
\newglossaryentry{sample}{name={sample},
description={a sample entry}}
@@ -43,5 +57,8 @@ A \gls{sample} entry and \gls{aca}. Second use: \gls{aca}.
Plurals: \glspl{sample}. Reset acronym\glsreset{aca}.
First use: \glspl{aca}. Second use: \glspl{aca}.
+If you want paragraph breaks in the description use
+\verb|\longnewglossaryentry|, as with entry \gls{par}.
+
\printglossaries
\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf
new file mode 100644
index 00000000000..f83b5970852
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.tex
new file mode 100644
index 00000000000..e4c5d87d3d8
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.tex
@@ -0,0 +1,29 @@
+ % This file is public domain
+ % If you are using arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+\documentclass{report}
+
+\usepackage[colorlinks]{hyperref}
+\usepackage[hyperfirst=false]{glossaries}
+
+\makeglossaries
+
+\renewcommand*{\glsentryfmt}{%
+ \glsgenentryfmt
+ \ifglsused{\glslabel}{}{\footnote{\glsentrydesc{\glslabel}}}%
+}
+
+\newglossaryentry{sample}{name={sample},description={an example
+description}}
+
+\begin{document}
+\chapter{Sample Chapter}
+
+First use: \gls{sample}.
+
+Next use: \gls{sample}.
+
+\printglossaries
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf
index e466ab412b7..330c13f5c8a 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex
index 29effbe6085..8aaca674dad 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex
@@ -1,3 +1,8 @@
+ % This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
\documentclass{article}
\usepackage[colorlinks]{hyperref}
@@ -21,8 +26,10 @@ a \gls{pear}}}
\newglossaryentry{fruit}{name=fruit,
description={sweet, fleshy product of plant containing seed}}
+\glssee{fruit}{pear,apple,banana}
\begin{document}
+\gls{pear}, \gls{apple} and \gls{banana}.
\printglossaries
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf
index 692b6f6ded3..06ee48a0913 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex
index a0de228a23f..c6a9c5d8612 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex
@@ -1,13 +1,15 @@
% This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
\documentclass{report}
\usepackage[colorlinks]{hyperref}
\usepackage[acronym, % create list of acronyms
nomain, % don't need main glossary for this example
style=tree, % need a style that displays the symbol
- hyperfirst=false,% don't hyperlink first use
- sanitize=none % switch off sanitization as description
- % will be used in the main text
+ hyperfirst=false% don't hyperlink first use
]{glossaries}
\makeglossaries
@@ -19,7 +21,7 @@
% document the short form will be displayed in small caps, but in
% the list of acronyms the short form is displayed in normal
% capitals. To ensure this, the short form should be written in
- % lower case when the acronym is defined, and \MakeUppercase is
+ % lower case when the acronym is defined, and \MakeTextUppercase is
% used when it's displayed in the list of acronyms.
% In the list of acronyms, the long form is used as the name, the
@@ -28,28 +30,14 @@
\renewcommand*{\CustomAcronymFields}{%
name={\the\glslongtok},%
- symbol={\MakeUppercase{\the\glsshorttok}},%
+ symbol={\MakeTextUppercase{\the\glsshorttok}},%
text={\textsc{\the\glsshorttok}},%
plural={\textsc{\the\glsshorttok}\noexpand\acrpluralsuffix}%
}
\renewcommand*{\SetCustomDisplayStyle}[1]{%
- % ##1 corresponds to the 'first' key
- % ##2 corresponds to the 'description' key
- % ##3 corresponds to the 'symbol' key
- % ##4 is the inserted text given by the final optional argument to
- % commands like \gls
- % The short form can be obtained via \glsentryshort{\glslabel}
- % The plural short form can be obtained via
- % \glsentryshortplural{\glslabel}
- % The long form can be obtained via \glsentrylong{\glslabel}
- % The plural long form can be obtained via
- % \glsentrylongplural{\glslabel}
- \defglsdisplayfirst[#1]{##1##4\protect\footnote{%
- \glsentrylong{\glslabel}: ##2}}%
- % ##1 corresponds to the 'text' key
- % the rest as above
- \defglsdisplay[#1]{##1##4}%
+ \defglsentryfmt[#1]{\glsgenentryfmt
+ \ifglsused{\glslabel}{}{\footnote{\glsentrylong{\glslabel}}}}%
}
% Now set the custom acronym style (to override the default style)
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf
index b67bb0e45a0..2c3fc72edd7 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex
index 0da681150ed..0015f9385a7 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex
@@ -1,4 +1,8 @@
% This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
\documentclass{article}
\usepackage[acronym]{glossaries}
@@ -7,11 +11,11 @@
\newcommand*{\newdualentry}[5][]{%
\newglossaryentry{main-#2}{name={#4},%
- text={#3\protect\glsadd{#2}},%
+ text={#3\glsadd{#2}},%
description={#5},%
#1
}%
- \newacronym{#2}{#3\protect\glsadd{main-#2}}{#4}
+ \newacronym{#2}{#3\glsadd{main-#2}}{#4}
}
\newdualentry{svm}% label
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf
new file mode 100644
index 00000000000..f08d62b9e7b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.tex
new file mode 100644
index 00000000000..a057805db1a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.tex
@@ -0,0 +1,28 @@
+ % This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+\documentclass{article}
+
+\usepackage[colorlinks]{hyperref}
+\usepackage[style=tree]{glossaries}
+
+\makeglossaries
+
+\renewcommand*{\glsentryfmt}{%
+ \glsgenentryfmt
+ \ifglsused{\glslabel}{}{\space (\glsentrysymbol{\glslabel})}%
+}
+
+\newglossaryentry{distance}{name=distance,
+description={The length between two points},
+symbol={km}}
+
+\begin{document}
+
+First use: \gls{distance}. Next use: \gls{distance}.
+
+\printglossaries
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf
new file mode 100644
index 00000000000..ec58ceee2c1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.tex
new file mode 100644
index 00000000000..c33ca87c160
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.tex
@@ -0,0 +1,60 @@
+ % This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+\documentclass{report}
+
+\usepackage[colorlinks]{hyperref}
+\usepackage[toc]{glossaries}
+\usepackage{glossary-mcols}
+
+\newglossary[ilg]{index}{ind}{idx}{\indexname}
+
+\makeglossaries
+
+\newcommand*{\newterm}[2][]{%
+ \newglossaryentry{#2}{type={index},name={#2},description={\nopostdesc},#1}%
+}
+
+
+\newterm[plural={stegosauruses}]{stegosaurus}
+\newterm[plural={triceratopses}]{triceratops}
+\newterm[plural={apatosauruses}]{apatosaurus}
+
+\newterm[name={dinosaur}]{ind-dinosaur}
+\newterm[name={Triassic}]{ind-triassic}
+
+
+\newglossaryentry{dinosaur}%
+{%
+ name={dinosaur\glsadd{ind-dinosaur}},%
+ description={One of a group of dinosauria}%
+}
+
+\newglossaryentry{Triassic}%
+{%
+ name={Triassic\glsadd{ind-triassic}},%
+ description={The first period of the Mesozoic Era}
+}
+
+\begin{document}
+\tableofcontents
+
+\chapter{Dinosaurs}
+
+\Glspl{dinosaur} are now extinct. They first appeared during the
+\gls{Triassic} period. Examples of \glspl{dinosaur} include the
+\gls{triceratops}, the \gls{apatosaurus} and the \gls{stegosaurus}.
+
+\renewcommand*{\glsnamefont}[1]{\textbf{\makefirstuc{#1}}}
+
+\printglossary[style=long,nogroupskip]
+
+\renewcommand*{\glsnamefont}[1]{\textmd{#1}}
+
+\printglossary[type=index,style=mcolindexgroup]
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf
new file mode 100644
index 00000000000..82734c9a991
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.tex
index 88ae07a23a1..08a4198aa51 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.tex
@@ -1,4 +1,9 @@
% This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+ % arara: pdflatex: { synctex: on }
\documentclass[a4paper]{report}
\usepackage[plainpages=false,colorlinks]{hyperref}
@@ -8,7 +13,7 @@
\renewcommand*{\glossarysection}[2][]{\textbf{#1}: }
\renewcommand{\glsnamefont}[1]{\textsc{#1}}
-\glossarystyle{inline}
+\setglossarystyle{inline}
\makeglossaries
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf
new file mode 100644
index 00000000000..c8fa4a5fc6c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.tex
index f7675f8b6c6..94ff5659ae0 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.tex
@@ -1,3 +1,8 @@
+ % This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
\documentclass[english,french]{article}
\usepackage[utf8]{inputenc}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.pdf
new file mode 100644
index 00000000000..1dec2b40193
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.tex
index 71f35e1acbc..22522a04942 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.tex
@@ -1,3 +1,6 @@
+ % This file is public domain
+ % If you want to use arara, you need the following directive:
+ % arara: pdflatex: { synctex: on }
\documentclass{article}
\usepackage{mfirstuc}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf
new file mode 100644
index 00000000000..88e358ab486
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.tex
new file mode 100644
index 00000000000..6a3f3d5af26
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.tex
@@ -0,0 +1,56 @@
+ % This file is public domain
+ % If you are using arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+\documentclass{article}
+
+\usepackage[colorlinks]{hyperref}
+\usepackage[nopostdot,nogroupskip]{glossaries}
+
+\glsaddkey*% star version needed as default value needs expanding
+ {ed}% key
+ {\glsentrytext{\glslabel}ed}% default value
+ {\glsentryed}% command analogous to \glsentrytext
+ {\Glsentryed}% command analogous to \Glsentrytext
+ {\glsed}% command analogous to \glstext
+ {\Glsed}% command analogous to \Glstext
+ {\GLSed}% command analogous to \GLStext
+
+\glsaddkey*
+ {ing}% key
+ {\glsentrytext{\glslabel}ing}% default value
+ {\glsentrying}% command analogous to \glsentrytext
+ {\Glsentrying}% command analogous to \Glsentrytext
+ {\glsing}% command analogous to \glstext
+ {\Glsing}% command analogous to \Glstext
+ {\GLSing}% command analogous to \GLStext
+
+\makeglossaries
+
+\newglossaryentry{jump}{name={jump},description={}}
+
+\newglossaryentry{run}{name={run},%
+ ed={ran},%
+ ing={running},
+ description={}}
+
+\newglossaryentry{waddle}{name={waddle},%
+ ed={waddled},%
+ ing={waddling},%
+ description={}}
+
+\begin{document}
+
+This is a sample document illustrating how to add new glossary entry
+keys.
+
+The dog \glsed{jump} over the duck.
+
+The duck was \glsing{waddle} round the dog.
+
+The dog \glsed{run} away from the duck.
+
+\printglossaries
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf
new file mode 100644
index 00000000000..c6b29209d6a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.tex
new file mode 100644
index 00000000000..c1efc549d07
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.tex
@@ -0,0 +1,47 @@
+ % This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+\documentclass{report}
+
+\usepackage[colorlinks]{hyperref}
+\usepackage{glossaries}
+
+\makeglossaries
+
+ % switch off hyperlinks:
+\glsdisablehyper
+
+ % redefine \glsentryfmt so that it adds a hyperlink
+ % if not in math mode
+\renewcommand*{\glsentryfmt}{%
+ \ifmmode
+ \glsgenentryfmt
+ \else
+ % Temporarily enable hyperlinks:
+ \glsenablehyper
+ \glshyperlink[\glsgenentryfmt]{\glslabel}%
+ % Disable hyperlinks again
+ \glsdisablehyper
+ \fi
+}
+
+\renewcommand{\glossarypreamble}{\glsenablehyper}
+\renewcommand{\glossarypostamble}{\glsdisablehyper}
+
+ % define a sample entry:
+\newglossaryentry{x}{name={x},description={sample entry}}
+
+\begin{document}
+\chapter{Sample}
+In text mode: \gls{x}. Inline maths: $\gls{x}$. Displayed
+maths:
+\[
+ \gls{x}
+\]
+
+Back to text mode again: \gls{x}.
+
+\printglossaries
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf
new file mode 100644
index 00000000000..0a1393e507b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.tex
index 32a4bd86cd0..24b93edb498 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.tex
@@ -1,3 +1,9 @@
+ % This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+ % arara: pdflatex: { synctex: on }
\documentclass{report}
\usepackage[colorlinks]{hyperref}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf
new file mode 100644
index 00000000000..1f751257d72
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.tex
new file mode 100644
index 00000000000..ab1260cc727
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.tex
@@ -0,0 +1,73 @@
+ % This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+ % arara: pdflatex: { synctex: on }
+
+\documentclass{article}
+
+\usepackage[colorlinks]{hyperref}
+\usepackage[toc,acronym]{glossaries-prefix}
+
+\makeglossaries
+
+\newglossaryentry{sample}{name={sample},
+ description={an example},
+ prefix={a~},
+ prefixplural={the\space}%
+}
+
+\newglossaryentry{oeil}{name={oeil},
+ plural={yeux},
+ description={eye},
+ prefix={l'},
+ prefixplural={les\space}}
+
+\newacronym
+ [%
+ prefix={an\space},prefixfirst={a~}%
+ ]{svm}{SVM}{support vector machine}
+
+\newglossarystyle{plist}{%
+ \setglossarystyle{list}%
+ \renewcommand*{\glossentry}[2]{%
+ \item[\glsentryitem{##1}%
+ \Glsentryprefix{##1}%
+ \glstarget{##1}{\glossentryname{##1}}]
+ \glossentrydesc{##1}\glspostdescription\space ##2}%
+}
+
+\begin{document}
+
+\tableofcontents
+
+\section{Sample}
+
+First use: \pgls{sample}, \pgls{svm}, \pgls{oeil}. Next use: \pgls{sample}, \pgls{svm}, \pgls{oeil}.
+
+Reset. \glsresetall
+
+First use: \pglspl{sample}, \pglspl{svm}, \pglspl{oeil}. Next use:
+\pglspl{sample}, \pglspl{svm}, \pglspl{oeil}.
+
+Reset. \glsresetall
+
+First use: \Pgls{sample}, \Pgls{svm}. Next use: \Pgls{sample}, \Pgls{svm}.
+
+Reset. \glsresetall
+
+First use: \Pglspl{sample}, \Pglspl{svm}. Next use: \Pglspl{sample}, \Pglspl{svm}.
+
+Reset. \glsresetall
+
+First use: \PGLS{sample}, \PGLS{svm}. Next use: \PGLS{sample}, \PGLS{svm}.
+
+Reset. \glsresetall
+
+First use: \PGLSpl{sample}, \PGLSpl{svm}. Next use: \PGLSpl{sample}, \PGLSpl{svm}.
+
+\printglossary[style=plist]
+
+\printacronyms
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf
new file mode 100644
index 00000000000..1e05192921b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.tex
new file mode 100644
index 00000000000..d65b46f0f3a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.tex
@@ -0,0 +1,17 @@
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+\documentclass{article}
+\usepackage{siunitx}
+\usepackage[style=long4col]{glossaries}
+\makeglossaries
+\newglossaryentry{ohm}{%
+ name=ohm,
+ symbol={\si{\ohm}},
+ description=unit of electrical resistance%
+}
+\begin{document}
+\glsaddallunused
+\printglossaries
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf
index aa6dde8642f..f8efe8420fa 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex
index 8cbe6d42068..7f7a616e109 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex
@@ -1,4 +1,9 @@
% This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+ % arara: pdflatex: { synctex: on }
\documentclass[a4paper]{report}
\usepackage[plainpages=false,colorlinks]{hyperref}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf
index 4cfdbfd3745..4a74fc9589f 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex
index 846a5056571..1f6125dc1d9 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex
@@ -1,4 +1,8 @@
% This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
\documentclass[a4paper]{article}
\usepackage[style=long4colheaderborder]{glossaries}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf
index 76f1490b3fb..5068fd13644 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex
index 9dcd5f69e84..048cb7ab44f 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex
@@ -1,4 +1,9 @@
% This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+ % arara: pdflatex: { synctex: on }
\documentclass[a4paper]{report}
\usepackage[colorlinks,plainpages=false]{hyperref}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf
index 33ce9b8a39f..968ca13ec3e 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex
index e57550ce872..70905f05b3e 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex
@@ -1,4 +1,9 @@
% This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+ % arara: pdflatex: { synctex: on }
\documentclass[a4paper]{report}
\usepackage[colorlinks,plainpages=false]{hyperref}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf
index a1fc0b0f59a..5dc3ff4a686 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex
index a19501afad7..cbcd1723b9c 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex
@@ -1,4 +1,8 @@
% This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
\documentclass{article}
\usepackage[colorlinks,plainpages=false]{hyperref}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf
index 3b084ece857..924a7d43a55 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex
index c1a3aadc015..4f69d980a03 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex
@@ -1,13 +1,18 @@
% This file is public domain
%
% See also sampleAcrDesc.tex
+ %
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+ % arara: pdflatex: { synctex: on }
\documentclass[a4paper]{report}
\usepackage[colorlinks,plainpages=false]{hyperref}
\usepackage[style=altlist, % use altlist style
- toc, % add the glossary to the table of contents
- sanitize={description=false}% don't sanitize description
+ toc % add the glossary to the table of contents
]{glossaries}
\makeglossaries
@@ -16,10 +21,8 @@
% how the entry name should appear in the glossary
name={Support vector machine (SVM)},
% how the description should appear in the glossary
- % since I have used sanitize={description=false}
- % I have to protect fragile commands
description={Statistical pattern recognition
-technique~\protect\cite{svm}},
+technique~\cite{svm}},
% how the entry should appear in the document text
text={svm},
% how the entry should appear the first time it is
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf
index 21c26d4f161..303b4eddeb8 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex
index 9cee73eade9..715bdc504d3 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex
@@ -3,7 +3,7 @@
\usepackage{amsmath}
\usepackage[colorlinks]{hyperref}
-\usepackage[toc,ucmark,style=long3colheader,counter=equation]{glossaries}
+\usepackage[xindy,toc,ucmark,style=long3colheader,counter=equation]{glossaries}
\makeglossaries
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf
index 14365f86aa0..1371a16d0ae 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex
index 63af21a2bc9..d00d89ccaff 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex
@@ -14,6 +14,13 @@
% (Note that this problem is avoided if the page numbering is
% reset after the glossary. For example, if the glossary has
% roman numbering and the subsequent pages have arabic numbering)
+ %
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
\documentclass[a4paper,12pt]{report}
\usepackage{amsmath}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf
index 6b551a3a015..b8dc7693ec1 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex
index cd682b4e230..ad1312c1881 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex
@@ -1,9 +1,14 @@
% This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+ % arara: pdflatex: { synctex: on }
\documentclass{report}
\usepackage[plainpages=false,colorlinks]{hyperref}
\usepackage{html}
-\usepackage[toc,savewrites,xindy]{glossaries}
+\usepackage[toc,xindy]{glossaries}
% Define a new glossary type called notation
\newglossary[nlg]{notation}{not}{ntn}{Notation}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf
new file mode 100644
index 00000000000..c22f64b2e70
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.tex b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.tex
new file mode 100644
index 00000000000..bda4a4bd258
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.tex
@@ -0,0 +1,57 @@
+ % This file is public domain
+ % If you are using arara, you need the following directives:
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+ % arara: pdflatex: { synctex: on }
+\documentclass{report}
+
+\usepackage[colorlinks]{hyperref}
+\usepackage[toc]{glossaries}
+
+\makeglossaries
+
+\newcommand{\sortname}[2]{#2, #1}
+\newcommand{\textname}[2]{#1 #2}
+
+ % Syntax: \name{first name}{surname}
+ \let\name\textname
+
+\renewcommand{\glsprestandardsort}[3]{%
+ \let\name\sortname
+ \edef#1{\expandafter\expandonce\expandafter{#1}}%
+ \let\name\textname
+ \glsdosanitizesort
+}
+
+\newglossaryentry{joebloggs}{name={\name{Joe}{Bloggs}},description={\nopostdesc}}
+
+\newglossaryentry{johnsmith}{name={\name{John}{Smith}},description={\nopostdesc}}
+
+\newglossaryentry{zoeadams}{name={\name{Zo\'e}{Adams}},description={\nopostdesc}}
+
+\newglossaryentry{maryadams}{name={\name{Mary}{Adams}},description={\nopostdesc}}
+
+\begin{document}
+\tableofcontents
+
+\chapter{\glsentrytext{joebloggs}}
+
+\gls{joebloggs} was a fairly ordinary person.
+
+\chapter{\glsentrytext{johnsmith}}
+
+\gls{johnsmith} was great friends with \gls{joebloggs}.
+
+\chapter{\glsentrytext{maryadams}}
+
+\gls{maryadams} worked with \gls{johnsmith} but never met
+\gls{joebloggs}.
+
+\chapter{\glsentrytext{zoeadams}}
+
+\gls{zoeadams} was \gls{maryadams}['s] sister.
+\printglossaries
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf
index e02779b103f..72e6deced22 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex
index e6d5a11cce0..f9e56966716 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex
@@ -1,4 +1,9 @@
% This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+ % arara: pdflatex: { synctex: on }
\documentclass{report}
\usepackage[plainpages=false,colorlinks]{hyperref}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf
new file mode 100644
index 00000000000..70b4731d157
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.tex
new file mode 100644
index 00000000000..3ea8ec5add6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.tex
@@ -0,0 +1,101 @@
+ % This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+ % arara: pdflatex: { synctex: on }
+\documentclass{report}
+
+\usepackage[plainpages=false,colorlinks]{hyperref}
+\usepackage[toc,acronym]{glossaries}
+
+ % Define a new glossary type called notation
+\newglossary[nlg]{notation}{not}{ntn}{Notation}
+
+\makeglossaries
+
+\newcounter{sortcount}
+
+\renewcommand{\glsprestandardsort}[3]{%
+ \ifdefstring{#2}{notation}%
+ {%
+ \stepcounter{sortcount}%
+ \edef#1{\glssortnumberfmt{\arabic{sortcount}}}%
+ }%
+ {%
+ \glsdosanitizesort
+ }%
+}
+
+ % Notation definitions
+
+\newglossaryentry{not:set}{type=notation, % glossary type
+name={$\mathcal{S}$},
+text={\mathcal{S}},
+description={A set}}
+
+\newglossaryentry{not:emptyset}{type=notation,
+name={$\emptyset$},
+text={\emptyset},
+description={The empty set}}
+
+\newglossaryentry{not:card}{type=notation,
+name={$|\mathcal{S}|$},
+text={|\mathcal{S}|},
+description={cardinality of $\mathcal{S}$}}
+
+ % Main glossary definitions
+
+\newglossaryentry{gls:set}{name=set,
+description={A collection of distinct objects}}
+
+\newglossaryentry{gls:card}{name=cardinality,
+description={The number of elements in the specified set}}
+
+ % Acronym definitions
+
+\newacronym{zfc}{ZFC}{Zermelo-Fraenkel set theory}
+
+\newacronym{ad}{AD}{axiom of determinacy}
+
+\newacronym{nf}{NF}{new foundations}
+
+\begin{document}
+\title{Sample Document using the glossaries Package}
+\author{Nicola Talbot}
+\pagenumbering{alph}
+\maketitle
+
+\begin{abstract}
+ %stop hyperref complaining about duplicate page identifiers:
+\pagenumbering{Alph}
+This is a sample document illustrating the use of the
+\textsf{glossaries} package. In this example, a new glossary type
+called \texttt{notation} is defined, so that the document can have a
+separate glossary of terms, list of acronyms and index of notation.
+\end{abstract}
+
+\pagenumbering{roman}
+\tableofcontents
+
+\printglossaries
+
+\chapter{Introduction}
+\pagenumbering{arabic}
+
+\Glspl{gls:set} are denoted by a calligraphic font
+e.g.\ $\gls{not:set}$.
+
+The \gls{gls:card} of a set $\mathcal{S}$ is denoted
+$\gls{not:card}$. The empty set is denoted
+$\gls{not:emptyset}$.
+
+Here are some acronyms: \gls{nf}, \gls{zfc} and \gls{ad}.
+
+\chapter{Another Chapter}
+
+Another mention of the empty set $\gls{not:emptyset}$.
+
+Here are the acronyms again: \gls{nf}, \gls{zfc} and \gls{ad}.
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf
index 227e50e110e..78e0f868e3a 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex
index b22b08fbe5d..342902d8e55 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex
@@ -1,7 +1,13 @@
% This file is public domain
-\documentclass{article}
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
+\documentclass[a4paper]{article}
-\usepackage[acronym,smallcaps]{glossaries-accsupp}
+\usepackage[margin=0.5in]{geometry}
+\usepackage{booktabs}
+\usepackage[acronym]{glossaries-accsupp}
\makeglossaries
@@ -11,16 +17,27 @@
\newacronym{eg}{e.g.}{for example}
-\begin{document}
-\gls{dr}~Jones.
-\gls{dr}~Jones.
-
-\Gls{eg}, \gls{eg}, \acrshort{eg}, \acrlong{eg}, \acrfull{eg}.
+\newcommand*{\samplerow}[1]{%
+ \gls{#1} & \gls{#1} & \acrshort{#1} & \acrlong{#1}\\
+ \glsreset{#1}\Gls{#1} & \Gls{#1} & \Acrshort{#1} & \Acrlong{#1}\\
+ \glsreset{#1}\GLS{#1} & \GLS{#1} & \ACRshort{#1} & \ACRlong{#1}\\
+}
-\Acrshort{eg}, \ACRshort{eg}. \Acrlong{eg}, \ACRlong{eg}.
-\Acrfull{eg}, \ACRfull{eg}.
+\begin{document}
-\gls{svm}. \gls{svm}, \acrshort{svm}, \acrlong{svm}, \acrfull{svm}.
+\begin{center}
+\begin{tabular}{lllll}
+\toprule
+\bfseries First & \bfseries Next & \bfseries Short & \bfseries Long
+\\\midrule
+\samplerow{dr}
+\midrule
+\samplerow{eg}
+\midrule
+\samplerow{svm}
+\bottomrule
+\end{tabular}
+\end{center}
\printglossaries
\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf
index 3c90543a477..698712dca9a 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex
index fd7099e1dbf..45faef90cdc 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex
@@ -1,4 +1,8 @@
% This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
\documentclass{article}
\usepackage[acronym,footnote,acronymlists={main,acronym2}]{glossaries}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf
index 10b3ab04b5d..83144e1d79d 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex
index 98d667d7ca9..59f8ecd4904 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex
@@ -1,4 +1,8 @@
% This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
\documentclass{report}
\usepackage[colorlinks]{hyperref}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf
index 8acf6eacb7f..7f7e7557312 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex
index e249fee0214..fc01afc87e6 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex
@@ -1,4 +1,8 @@
% This file is public domain
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
\documentclass{article}
\usepackage[utf8]{inputenc}
@@ -7,6 +11,9 @@
\makeglossaries
+ % Note that because the é is the first letter of the
+ % name, it needs to be grouped or it will cause a
+ % problem for \makefirstuc due to expansion issues.
\newglossaryentry{elite}{name={{é}lite},
description={select group or class}}
@@ -19,6 +26,8 @@ description=large deer}
\newglossaryentry{mannerly}{name=mannerly,
description=polite}
+ % The œ is not the first letter, so it doesn't need to
+ % be grouped.
\newglossaryentry{manoeuvre}{name={manœuvre},
description=planned and controlled movement}
@@ -36,7 +45,6 @@ description={canal from mouth to stomach}}
description=man-eating giant}
\begin{document}
-\null % ensure that the first run produces some output
\glsaddall
\printglossaries
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf
deleted file mode 100644
index b79a8c4392c..00000000000
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf
index 94c94944c82..47899d9da0f 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex
index ec94891df1b..2c7182eec36 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex
@@ -18,6 +18,10 @@
%
% xindy -L english -C utf8 -I xindy -M samplexdy -t samplexdy.glg -o samplexdy.gls samplexdy.glo
%
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
\documentclass{article}
\usepackage[utf8]{inputenc}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf
index fef8d06422d..ed47e7a1c1c 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex
index d6d12d8087d..1321e3ff94c 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex
@@ -9,6 +9,10 @@
%
% This sample file won't work with makeindex
%
+ % If you want to use arara, you need the following directives:
+ % arara: pdflatex: { synctex: on }
+ % arara: makeglossaries
+ % arara: pdflatex: { synctex: on }
\documentclass{report}
\usepackage[utf8]{inputenc}
@@ -49,6 +53,7 @@ the glossaries package.
\part{First Part}
\chapter{Sample Chapter}
+This example document has an eccentric section numbering system.
\section{First Section}