summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/glossaries/samples
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-02-15 03:01:17 +0000
committerNorbert Preining <norbert@preining.info>2020-02-15 03:01:17 +0000
commit6e362e815ea119b3f6db97b21c10fee3279b5c6b (patch)
tree536b6a92aa0abbc06d83b0b03850caeebf82d65e /macros/latex/contrib/glossaries/samples
parentdc072b1cb0427be056e747cdbfd6b7a4f1e02e56 (diff)
CTAN sync 202002150301
Diffstat (limited to 'macros/latex/contrib/glossaries/samples')
-rw-r--r--macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdfbin248661 -> 248661 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/minimalgls.pdfbin49952 -> 49023 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/minimalgls.tex19
-rw-r--r--macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdfbin37957 -> 37957 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/mwe-acr-desc.tex3
-rw-r--r--macros/latex/contrib/glossaries/samples/mwe-acr.pdfbin33649 -> 33649 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/mwe-acr.tex3
-rw-r--r--macros/latex/contrib/glossaries/samples/mwe-gls.pdfbin29939 -> 29939 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/mwe-gls.tex3
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-FnDesc.pdfbin58812 -> 58812 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-FnDesc.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdfbin54816 -> 54816 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-crossref.pdfbin53450 -> 56716 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-crossref.tex21
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdfbin82178 -> 82178 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-custom-acronym.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdfbin52796 -> 52796 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-dot-abbr.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-dual.pdfbin36455 -> 36455 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-dual.tex6
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-entrycount.pdfbin36834 -> 36834 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-entrycount.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-entryfmt.pdfbin34899 -> 34899 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-entryfmt.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-font-abbr.pdfbin50703 -> 50703 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-font-abbr.tex4
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-ignored.pdfbin31808 -> 31808 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-ignored.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-index.pdfbin43373 -> 43373 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-index.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-inline.pdfbin147206 -> 147456 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-inline.tex20
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-langdict.pdfbin38855 -> 38866 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-langdict.tex8
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-newkeys.pdfbin39192 -> 39192 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-newkeys.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdfbin96316 -> 96316 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-noidxapp.pdfbin67177 -> 67177 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-noidxapp.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdfbin41741 -> 41741 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-nomathhyper.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-numberlist.pdfbin41972 -> 42099 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-numberlist.tex16
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-prefix.pdfbin43254 -> 46274 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-prefix.tex36
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-si.pdfbin21710 -> 21710 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-si.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdfbin39892 -> 39892 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdfbin37659 -> 37659 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample-storage-abbr.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/sample.pdfbin104092 -> 120028 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample.tex53
-rw-r--r--macros/latex/contrib/glossaries/samples/sample4col.pdfbin43320 -> 43320 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sample4col.tex4
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleAcr.pdfbin65501 -> 65501 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleAcr.tex5
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdfbin65607 -> 92747 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleAcrDesc.tex15
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdfbin93606 -> 151108 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleCustomAcr.tex7
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleDB.pdfbin47037 -> 47801 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleDB.tex6
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleDesc.pdfbin48390 -> 48390 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleDesc.tex7
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleEq.pdfbin155651 -> 156215 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleEq.tex11
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleEqPg.pdfbin169202 -> 169434 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleEqPg.tex34
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdfbin91335 -> 148775 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.tex7
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleNtn.pdfbin98826 -> 98650 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleNtn.tex21
-rw-r--r--macros/latex/contrib/glossaries/samples/samplePeople.pdfbin47452 -> 47452 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/samplePeople.tex4
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleSec.pdfbin65662 -> 65662 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleSec.tex4
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleSort.pdfbin95209 -> 95162 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleSort.tex8
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleaccsupp.pdfbin41155 -> 81349 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleaccsupp.tex84
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleacronyms.pdfbin37201 -> 37201 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleacronyms.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/sampletree.pdfbin59809 -> 60185 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampletree.tex7
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleutf8.pdfbin44939 -> 44939 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/sampleutf8.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/samplexdy.pdfbin133571 -> 133467 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/samplexdy.tex6
-rw-r--r--macros/latex/contrib/glossaries/samples/samplexdy2.pdfbin68393 -> 68393 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/samplexdy2.tex2
-rw-r--r--macros/latex/contrib/glossaries/samples/samplexdy3.pdfbin178630 -> 178519 bytes
-rw-r--r--macros/latex/contrib/glossaries/samples/samplexdy3.tex4
95 files changed, 336 insertions, 126 deletions
diff --git a/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf b/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf
index 76744ff2da..6d29420797 100644
--- a/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf
+++ b/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/minimalgls.pdf b/macros/latex/contrib/glossaries/samples/minimalgls.pdf
index e81068446a..778390fb7d 100644
--- a/macros/latex/contrib/glossaries/samples/minimalgls.pdf
+++ b/macros/latex/contrib/glossaries/samples/minimalgls.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/minimalgls.tex b/macros/latex/contrib/glossaries/samples/minimalgls.tex
index 816007fd2e..3116ad36a1 100644
--- a/macros/latex/contrib/glossaries/samples/minimalgls.tex
+++ b/macros/latex/contrib/glossaries/samples/minimalgls.tex
@@ -1,5 +1,8 @@
% This file is public domain.
%
+% For further details about this file, see
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#minimalgls
+%
% This is a minimal file for testing and debugging
% the glossaries package. Change the class file as
% desired, and add the relevant package options to
@@ -19,6 +22,12 @@
% 1. latex minimalgls
% 2. makeglossaries minimalgls (note no extension)
% 3. latex minimalgls
+%
+% Alternatively:
+% 1. latex minimalgls
+% 2. makeglossaries-lite minimalgls (note no extension)
+% 3. latex minimalgls
+%
% 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.
@@ -28,6 +37,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+% (Alternatively replace "makeglossaries" with "makeglossaries-lite")
% If you require multilingual support you must also install
% the appropriate glossaries language module. The language
@@ -37,8 +48,9 @@
\listfiles
\usepackage[colorlinks]{hyperref}
-%\usepackage{glossaries} % abbreviation will go in main glossary
- \usepackage[acronym]{glossaries} % make a separate list of acronyms
+\usepackage[
+ % acronym % make a separate list of acronyms
+]{glossaries}
\makeglossaries
@@ -59,8 +71,7 @@ description={a sample entry}}
% These are specified in the optional argument.
% Remove the optional argument to revert to the default
% plurals.
-\newacronym[\glsshortpluralkey=cas,\glslongpluralkey=contrived
-acronyms]{aca}{aca}{a contrived acronym}
+\newacronym[shortplural=cas,longplural=contrived acronyms]{aca}{aca}{a contrived acronym}
% Keep all definitions in the preamble!
diff --git a/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf b/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf
index 06ebb2b46c..d87c391ba6 100644
--- a/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf
+++ b/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/mwe-acr-desc.tex b/macros/latex/contrib/glossaries/samples/mwe-acr-desc.tex
index be64f5cafa..19611cf763 100644
--- a/macros/latex/contrib/glossaries/samples/mwe-acr-desc.tex
+++ b/macros/latex/contrib/glossaries/samples/mwe-acr-desc.tex
@@ -3,6 +3,9 @@
% arara: pdflatex
% arara: makeglossaries
% arara: pdflatex
+%
+%See also
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#minimalgls
\documentclass{article}
\usepackage{glossaries}
diff --git a/macros/latex/contrib/glossaries/samples/mwe-acr.pdf b/macros/latex/contrib/glossaries/samples/mwe-acr.pdf
index 02f3e50e86..74bfe9d3d0 100644
--- a/macros/latex/contrib/glossaries/samples/mwe-acr.pdf
+++ b/macros/latex/contrib/glossaries/samples/mwe-acr.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/mwe-acr.tex b/macros/latex/contrib/glossaries/samples/mwe-acr.tex
index d7dd581f60..cc16301f68 100644
--- a/macros/latex/contrib/glossaries/samples/mwe-acr.tex
+++ b/macros/latex/contrib/glossaries/samples/mwe-acr.tex
@@ -3,6 +3,9 @@
% arara: pdflatex
% arara: makeglossaries
% arara: pdflatex
+%
+%See also
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#minimalgls
\documentclass{article}
\usepackage{glossaries}
diff --git a/macros/latex/contrib/glossaries/samples/mwe-gls.pdf b/macros/latex/contrib/glossaries/samples/mwe-gls.pdf
index 14208cc5da..1102d17dda 100644
--- a/macros/latex/contrib/glossaries/samples/mwe-gls.pdf
+++ b/macros/latex/contrib/glossaries/samples/mwe-gls.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/mwe-gls.tex b/macros/latex/contrib/glossaries/samples/mwe-gls.tex
index 59dacdd4d1..a2e34dee72 100644
--- a/macros/latex/contrib/glossaries/samples/mwe-gls.tex
+++ b/macros/latex/contrib/glossaries/samples/mwe-gls.tex
@@ -3,6 +3,9 @@
% arara: pdflatex
% arara: makeglossaries
% arara: pdflatex
+%
+%See also
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#minimalgls
\documentclass{article}
\usepackage{glossaries}
diff --git a/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf b/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf
index 0ac18e640f..1d60e8b3aa 100644
--- a/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-FnDesc.tex b/macros/latex/contrib/glossaries/samples/sample-FnDesc.tex
index 746eb7b858..2cd18560f3 100644
--- a/macros/latex/contrib/glossaries/samples/sample-FnDesc.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-FnDesc.tex
@@ -3,6 +3,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleFnDesc
\documentclass{report}
\usepackage[colorlinks]{hyperref}
diff --git a/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf b/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf
index 891ae8db65..c8f7619280 100644
--- a/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.tex b/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.tex
index 619519e685..eeb04c6faa 100644
--- a/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.tex
@@ -3,6 +3,8 @@
% arara: pdflatex
% arara: makeglossaries
% arara: pdflatex
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-chap-hyperfirst
\documentclass{report}
\usepackage[colorlinks]{hyperref}
diff --git a/macros/latex/contrib/glossaries/samples/sample-crossref.pdf b/macros/latex/contrib/glossaries/samples/sample-crossref.pdf
index 7033120a7b..470d21abeb 100644
--- a/macros/latex/contrib/glossaries/samples/sample-crossref.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-crossref.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-crossref.tex b/macros/latex/contrib/glossaries/samples/sample-crossref.tex
index 4843b4d1b1..3a26233f66 100644
--- a/macros/latex/contrib/glossaries/samples/sample-crossref.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-crossref.tex
@@ -3,6 +3,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-crossref
\documentclass{article}
\usepackage[colorlinks]{hyperref}
@@ -10,6 +12,8 @@
\makeglossaries
+\providecommand{\alsoname}{see also}
+
\renewcommand{\glsseeitemformat}[1]{\textsc{\glsentryname{#1}}}
\newglossaryentry{pear}{name=pear,
@@ -17,7 +21,7 @@ description={an oddly shaped fruit}}
\newglossaryentry{apple}{name=apple,
description={firm, round fruit},
-see=[see also]{pear}}
+see=[\alsoname]{pear}}
\newglossaryentry{banana}{name=banana,
description={a yellow fruit with an even odder shape than
@@ -26,10 +30,23 @@ a \gls{pear}}}
\newglossaryentry{fruit}{name=fruit,
description={sweet, fleshy product of plant containing seed}}
+% An alternative to using the 'see' key:
\glssee{fruit}{pear,apple,banana}
+\newglossaryentry{courgette}{name={courgette},
+ description={type of long, green summer squash}}
+
+% The 'see' key automatically triggers \glssee so this entry will be
+% included even though it's not referenced in the document.
+\newglossaryentry{marrow}{name={marrow},
+ description={long vegetable with thin green skin and white flesh},
+ see={[\alsoname]courgette}}
+
+\newglossaryentry{zucchini}{name={zucchini},description={\nopostdesc},
+ see={courgette}}
+
\begin{document}
-\gls{pear}, \gls{apple} and \gls{banana}.
+\gls{pear}, \gls{apple}, \gls{banana} and \gls{courgette}.
\printglossaries
diff --git a/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf b/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf
index 37de7552bb..dff41fe7d0 100644
--- a/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-custom-acronym.tex b/macros/latex/contrib/glossaries/samples/sample-custom-acronym.tex
index 74ea760665..b148363a25 100644
--- a/macros/latex/contrib/glossaries/samples/sample-custom-acronym.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-custom-acronym.tex
@@ -3,6 +3,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-custom-acronym
\documentclass{report}
\usepackage[colorlinks]{hyperref}
diff --git a/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf b/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf
index 4722172d2c..5aa9bd92ad 100644
--- a/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-dot-abbr.tex b/macros/latex/contrib/glossaries/samples/sample-dot-abbr.tex
index 3fd3cf7cba..cf8f9c44ae 100644
--- a/macros/latex/contrib/glossaries/samples/sample-dot-abbr.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-dot-abbr.tex
@@ -3,6 +3,8 @@
% arara: pdflatex
% arara: makeglossaries
% arara: pdflatex
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-dot-abbr
\documentclass{article}
\usepackage{glossaries}
diff --git a/macros/latex/contrib/glossaries/samples/sample-dual.pdf b/macros/latex/contrib/glossaries/samples/sample-dual.pdf
index 44eb610a1c..89b2c1bd14 100644
--- a/macros/latex/contrib/glossaries/samples/sample-dual.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-dual.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-dual.tex b/macros/latex/contrib/glossaries/samples/sample-dual.tex
index 4a1fc9a953..03406d1e56 100644
--- a/macros/latex/contrib/glossaries/samples/sample-dual.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-dual.tex
@@ -3,10 +3,14 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-dual
\documentclass{article}
\usepackage[acronym]{glossaries}
+\makeglossaries
+
% \newdualentry[main options]{label}{short}{long}{description}
\newcommand*{\newdualentry}[5][]{%
@@ -25,8 +29,6 @@
{support vector machine}% long form
{Statistical pattern recognition technique}% description
-\makeglossaries
-
\begin{document}
\gls{svm}.
diff --git a/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf b/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf
index c7e9ec1a23..ad043608c7 100644
--- a/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-entrycount.tex b/macros/latex/contrib/glossaries/samples/sample-entrycount.tex
index 0a37f54974..56ca18d492 100644
--- a/macros/latex/contrib/glossaries/samples/sample-entrycount.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-entrycount.tex
@@ -4,6 +4,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-entrycount
\documentclass{article}
\usepackage[colorlinks]{hyperref}
diff --git a/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf b/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf
index 869b9204a5..352558f6fd 100644
--- a/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-entryfmt.tex b/macros/latex/contrib/glossaries/samples/sample-entryfmt.tex
index d3bcfe3659..3018244964 100644
--- a/macros/latex/contrib/glossaries/samples/sample-entryfmt.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-entryfmt.tex
@@ -3,6 +3,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-entryfmt
\documentclass{article}
\usepackage[colorlinks]{hyperref}
diff --git a/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf b/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf
index 046347b87e..f681c18f32 100644
--- a/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-font-abbr.tex b/macros/latex/contrib/glossaries/samples/sample-font-abbr.tex
index 43b744f8f1..9d20843f28 100644
--- a/macros/latex/contrib/glossaries/samples/sample-font-abbr.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-font-abbr.tex
@@ -3,6 +3,8 @@
% arara: pdflatex
% arara: makeglossaries
% arara: pdflatex
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-font-abbr
\documentclass{article}
\usepackage{glossaries}
@@ -40,7 +42,7 @@
\setacronymstyle{long-font-short}
\newcommand*{\newitabbr}[1][]{\newacronym[font=\em,#1]}
-\newcommand*{\newupabbr}[1][]{\newacronym[#1]}
+\newcommand*{\newupabbr}{\newacronym}
\newitabbr{eg}{e.g.}{exempli gratia}
\newitabbr{ie}{i.e.}{id est}
diff --git a/macros/latex/contrib/glossaries/samples/sample-ignored.pdf b/macros/latex/contrib/glossaries/samples/sample-ignored.pdf
index 2344c44f54..50c9524d6e 100644
--- a/macros/latex/contrib/glossaries/samples/sample-ignored.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-ignored.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-ignored.tex b/macros/latex/contrib/glossaries/samples/sample-ignored.tex
index f552aff44a..32a30ef003 100644
--- a/macros/latex/contrib/glossaries/samples/sample-ignored.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-ignored.tex
@@ -3,6 +3,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-ignored
\documentclass{article}
\usepackage[colorlinks]{hyperref}
diff --git a/macros/latex/contrib/glossaries/samples/sample-index.pdf b/macros/latex/contrib/glossaries/samples/sample-index.pdf
index 5baa6494f9..5ec92b819c 100644
--- a/macros/latex/contrib/glossaries/samples/sample-index.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-index.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-index.tex b/macros/latex/contrib/glossaries/samples/sample-index.tex
index 9842bacc2f..899ea649fd 100644
--- a/macros/latex/contrib/glossaries/samples/sample-index.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-index.tex
@@ -5,6 +5,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-index
\documentclass{report}
\usepackage[colorlinks]{hyperref}
diff --git a/macros/latex/contrib/glossaries/samples/sample-inline.pdf b/macros/latex/contrib/glossaries/samples/sample-inline.pdf
index df6e6f6556..c0c3acfae1 100644
--- a/macros/latex/contrib/glossaries/samples/sample-inline.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-inline.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-inline.tex b/macros/latex/contrib/glossaries/samples/sample-inline.tex
index e6a6e94c87..cfe2a383ce 100644
--- a/macros/latex/contrib/glossaries/samples/sample-inline.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-inline.tex
@@ -4,6 +4,8 @@
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-inline
\documentclass[a4paper]{report}
\usepackage[plainpages=false,colorlinks]{hyperref}
@@ -17,7 +19,9 @@
\makeglossaries
-\newglossaryentry{Perl}{name=\texttt{Perl},
+\newcommand{\scriptlang}[1]{\textsf{#1}}
+
+\newglossaryentry{Perl}{name=\scriptlang{Perl},
sort=Perl, % need a sort key because name contains a command
description=A scripting language}
@@ -59,6 +63,7 @@ writing. Beginning on new, usually indented, line}}
% this isn't necessary, as this form (appending an s) is
% the default
plural=cows,
+user1=kine,
% description:
description={(\emph{pl.}\ cows, \emph{archaic} kine) an adult
female of any bovine animal}}
@@ -123,9 +128,16 @@ must be used, e.g.\ in the description of \gls{pagelist}.
Plurals are assumed to have the letter s appended, but if this is
not the case, as in \glspl{mtrx}, then you need to specify the
plural when you define the entry. If a term may have multiple
-plurals (for example \glspl{cow}/\glslink{cow}{kine}) then
-define the entry with the plural form most likely to be used and
-explicitly specify the alternative form using \verb|\glslink|.
+plurals (for example \glspl{cow}/\glsuseri{cow}) then
+define the entry with the plural form most likely to be used.
+The alternative can simply be referenced with \verb|\glslink|
+(e.g.\ \glslink{cow}{kine})
+or \verb|\glsdisp| (e.g.\ \glsdisp{cow}{kine}).
+Another option is to save the alternative plural in another key. In
+this case, the ``user1'' key has been used, but a custom key can be
+defined instead.
+
+
\Glspl{seal} and \glspl{sealion} have regular plural forms.
\Gls{bravo} is a homograph, but the plural forms are spelt
diff --git a/macros/latex/contrib/glossaries/samples/sample-langdict.pdf b/macros/latex/contrib/glossaries/samples/sample-langdict.pdf
index 585c4a96ea..0e47ca4e2e 100644
--- a/macros/latex/contrib/glossaries/samples/sample-langdict.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-langdict.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-langdict.tex b/macros/latex/contrib/glossaries/samples/sample-langdict.tex
index c5bf52fc7d..a15b19980a 100644
--- a/macros/latex/contrib/glossaries/samples/sample-langdict.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-langdict.tex
@@ -7,6 +7,8 @@
% This file also requires the glossaries-english
% and glossaries-french language modules. These must
% be installed in addition to installing the glossaries package.
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-langdict
\documentclass[english,french]{article}
\usepackage[utf8]{inputenc}
@@ -29,14 +31,14 @@
}
\newword{cat}{cat}{le}{chat}
-\newword{mat}{mat}{la}{natte}
+\newword{chair}{chair}{la}{chaise}
\begin{document}
\selectlanguage{english}
-The \gls{en-cat} sat on the \gls{en-mat}.
+The \gls{en-cat} sat on the \gls{en-chair}.
\selectlanguage{french}
-Le \gls{fr-cat} s'est repos\'e sur la \gls{fr-mat}.
+Le \gls{fr-cat} s'est repos\'e sur la \gls{fr-chair}.
\selectlanguage{english}
\printglossary[type=english]
diff --git a/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf b/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf
index b9d3912b1b..9f1760b8d5 100644
--- a/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-newkeys.tex b/macros/latex/contrib/glossaries/samples/sample-newkeys.tex
index ee93bcb22e..41d75c33a1 100644
--- a/macros/latex/contrib/glossaries/samples/sample-newkeys.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-newkeys.tex
@@ -3,6 +3,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-newkeys
\documentclass{article}
\usepackage[colorlinks]{hyperref}
diff --git a/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf b/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf
index d94e24a152..da250c769a 100644
--- a/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.tex b/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.tex
index 78d4f400a1..cec83e1d98 100644
--- a/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.tex
@@ -2,6 +2,8 @@
% If you want to use arara, you need the following directives:
% arara: pdflatex
% arara: pdflatex
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-noidxapp-utf8
\documentclass{report}
\usepackage[utf8]{inputenc}
diff --git a/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf b/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf
index ed705c0fe4..cc8e587039 100644
--- a/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-noidxapp.tex b/macros/latex/contrib/glossaries/samples/sample-noidxapp.tex
index 29f3655587..d675c795fc 100644
--- a/macros/latex/contrib/glossaries/samples/sample-noidxapp.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-noidxapp.tex
@@ -2,6 +2,8 @@
% If you want to use arara, you need the following directives:
% arara: pdflatex
% arara: pdflatex
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-noidxapp
\documentclass{report}
\usepackage[colorlinks]{hyperref}
diff --git a/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf b/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf
index 0954a5014c..f7b1087f4c 100644
--- a/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-nomathhyper.tex b/macros/latex/contrib/glossaries/samples/sample-nomathhyper.tex
index 7ac3f82e8f..21c797c3a4 100644
--- a/macros/latex/contrib/glossaries/samples/sample-nomathhyper.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-nomathhyper.tex
@@ -3,6 +3,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-nomathhyper
\documentclass{report}
\usepackage[colorlinks]{hyperref}
diff --git a/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf b/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf
index 9e46a428b6..c139c1728c 100644
--- a/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-numberlist.tex b/macros/latex/contrib/glossaries/samples/sample-numberlist.tex
index 5c26c64b5a..01ed70f872 100644
--- a/macros/latex/contrib/glossaries/samples/sample-numberlist.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-numberlist.tex
@@ -4,20 +4,25 @@
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-numberlist
\documentclass{report}
-\usepackage[colorlinks]{hyperref}
+%\usepackage[colorlinks]{hyperref}
\usepackage[savenumberlist,counter=chapter]{glossaries}
\makeglossaries
+%\makenoidxglossaries % option 1 ("noidx")
+
\newglossaryentry{sample}{name=sample,description=an example}
\begin{document}
\chapter{Introduction}
-This is a \glsentryname{sample} document. \Glsentryplural{sample}
-are discussed in chapters~\glsdisplaynumberlist{sample}.
+This is a \gls{sample} document. \Glspl{sample}
+are discussed in chapters~\glsdisplaynumberlist{sample}
+(or \glsentrynumberlist{sample}).
\chapter{Sample Documents}
@@ -36,5 +41,10 @@ A chapter about something else.
Here's some more information about \glspl{sample}.
+\chapter{And Another Sample Chapter}
+
+Here's another \glspl{sample}.
+
\printglossaries
+%\printnoidxglossaries % option 1 ("noidx")
\end{document}
diff --git a/macros/latex/contrib/glossaries/samples/sample-prefix.pdf b/macros/latex/contrib/glossaries/samples/sample-prefix.pdf
index 881252f458..4abf0d0d21 100644
--- a/macros/latex/contrib/glossaries/samples/sample-prefix.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-prefix.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-prefix.tex b/macros/latex/contrib/glossaries/samples/sample-prefix.tex
index 40372cbad7..535a6519f4 100644
--- a/macros/latex/contrib/glossaries/samples/sample-prefix.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-prefix.tex
@@ -4,6 +4,8 @@
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-prefix
\documentclass{article}
@@ -26,15 +28,23 @@
\newacronym
[%
- prefix={an\space},prefixfirst={a~}%
+ prefix={an\space},%
+ prefixfirst={a~}%
]{svm}{SVM}{support vector machine}
+\newglossaryentry{noprefix}{name={no prefix},plural={no prefixes},
+ description={entry without prefix}}
+
\newglossarystyle{plist}{%
\setglossarystyle{list}%
\renewcommand*{\glossentry}[2]{%
\item[\glsentryitem{##1}%
- \Glsentryprefix{##1}%
- \glstarget{##1}{\glossentryname{##1}}]
+ \glstarget{##1}%
+ {%
+ \ifglshasprefix{##1}%
+ {\Glsentryprefix{##1}\glsprefixsep\glossentryname{##1}}%
+ {\Glossentryname{##1}}%
+ }]
\glossentrydesc{##1}\glspostdescription\space ##2}%
}
@@ -44,30 +54,34 @@
\section{Sample}
-First use: \pgls{sample}, \pgls{svm}, \pgls{oeil}. Next use: \pgls{sample}, \pgls{svm}, \pgls{oeil}.
+First use: \pgls{sample}, \pgls{svm}, \pgls{oeil}, \pgls{noprefix}. Next use:
+\pgls{sample}, \pgls{svm}, \pgls{oeil}, \pgls{noprefix}.
Reset. \glsresetall
-First use: \pglspl{sample}, \pglspl{svm}, \pglspl{oeil}. Next use:
-\pglspl{sample}, \pglspl{svm}, \pglspl{oeil}.
+First use: \pglspl{sample}, \pglspl{svm}, \pglspl{oeil}, \pglspl{noprefix}. Next use:
+\pglspl{sample}, \pglspl{svm}, \pglspl{oeil}, \pglspl{noprefix}.
Reset. \glsresetall
-First use: \Pgls{sample}, \Pgls{svm}. Next use: \Pgls{sample}, \Pgls{svm}.
+First use: \Pgls{sample}, \Pgls{svm}, \Pgls{oeil}, \Pgls{noprefix}. Next use:
+\Pgls{sample}, \Pgls{svm}, \Pgls{oeil}, \Pgls{noprefix}.
Reset. \glsresetall
-First use: \Pglspl{sample}, \Pglspl{svm}. Next use: \Pglspl{sample}, \Pglspl{svm}.
+First use: \Pglspl{sample}, \Pglspl{svm}, \Pglspl{oeil}, \Pglspl{noprefix}. Next use:
+\Pglspl{sample}, \Pglspl{svm}, \Pglspl{oeil}, \Pglspl{noprefix}.
Reset. \glsresetall
-First use: \PGLS{sample}, \PGLS{svm}. Next use: \PGLS{sample}, \PGLS{svm}.
+First use: \PGLS{sample}, \PGLS{svm}, \PGLS{oeil}, \PGLS{noprefix}. Next use:
+\PGLS{sample}, \PGLS{svm}, \PGLS{oeil}, \PGLS{noprefix}.
Reset. \glsresetall
-First use: \PGLSpl{sample}, \PGLSpl{svm}. Next use: \PGLSpl{sample}, \PGLSpl{svm}.
+First use: \PGLSpl{sample}, \PGLSpl{svm}, \PGLSpl{oeil}, \PGLSpl{noprefix}. Next use:
+\PGLSpl{sample}, \PGLSpl{svm}, \PGLSpl{oeil}, \PGLSpl{noprefix}.
\printglossary[style=plist]
-
\printacronyms
\end{document}
diff --git a/macros/latex/contrib/glossaries/samples/sample-si.pdf b/macros/latex/contrib/glossaries/samples/sample-si.pdf
index c2aef74cde..ba749704a6 100644
--- a/macros/latex/contrib/glossaries/samples/sample-si.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-si.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-si.tex b/macros/latex/contrib/glossaries/samples/sample-si.tex
index e1afeae622..a5d6ed7d7f 100644
--- a/macros/latex/contrib/glossaries/samples/sample-si.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-si.tex
@@ -3,6 +3,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-si
\documentclass{article}
\usepackage{siunitx}
\usepackage[style=long4col]{glossaries}
diff --git a/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf b/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf
index 3b517bf24f..340ff6f9f1 100644
--- a/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.tex b/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.tex
index 39fcb8c8dd..9ff4542340 100644
--- a/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.tex
@@ -3,6 +3,8 @@
% arara: pdflatex
% arara: makeglossaries
% arara: pdflatex
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-storage-abbr-desc
\documentclass{article}
\usepackage{glossaries}
diff --git a/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf b/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf
index d8115a22da..bc995c55f4 100644
--- a/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-storage-abbr.tex b/macros/latex/contrib/glossaries/samples/sample-storage-abbr.tex
index fbde7ef10b..6b6ed6bd04 100644
--- a/macros/latex/contrib/glossaries/samples/sample-storage-abbr.tex
+++ b/macros/latex/contrib/glossaries/samples/sample-storage-abbr.tex
@@ -3,6 +3,8 @@
% arara: pdflatex
% arara: makeglossaries
% arara: pdflatex
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-storage-abbr
\documentclass{article}
\usepackage{glossaries}
diff --git a/macros/latex/contrib/glossaries/samples/sample.pdf b/macros/latex/contrib/glossaries/samples/sample.pdf
index 2bf39bd56e..3d4e2a49ae 100644
--- a/macros/latex/contrib/glossaries/samples/sample.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample.tex b/macros/latex/contrib/glossaries/samples/sample.tex
index eca1464585..6b9e19069b 100644
--- a/macros/latex/contrib/glossaries/samples/sample.tex
+++ b/macros/latex/contrib/glossaries/samples/sample.tex
@@ -4,16 +4,20 @@
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample
\documentclass[a4paper]{report}
\usepackage[plainpages=false,colorlinks]{hyperref}
-\usepackage[toc,style=treenoname,order=word,subentrycounter]{glossaries}
+\usepackage[toc,style=treenonamegroup,subentrycounter]{glossaries}
\makeglossaries
-\newglossaryentry{Perl}{name=\texttt{Perl},
+\newcommand{\scriptlang}[1]{\textsf{#1}}
+
+\newglossaryentry{Perl}{name=\scriptlang{Perl},
sort=Perl, % need a sort key because name contains a command
-description=A scripting language}
+description={A scripting language}}
\newglossaryentry{glossary}{name=glossary,
description={\nopostdesc},
@@ -53,12 +57,15 @@ distinct section of a piece of writing.
Beginning on new, usually indented, line}
% entry with two types of plural. Set the plural form to the
-% form most likely to be used. If you want to use a different
-% plural, you will need to explicity specify it in \glslink
+% form most likely to be used. The alternative plural is stored in
+% the 'user1' key. Another option is to define your own custom
+% storage key for alternative plurals.
\newglossaryentry{cow}{name=cow,
% this isn't necessary, as this form (appending an s) is
% the default
plural=cows,
+% alternative plural:
+user1=kine,
% description:
description={(\emph{pl.}\ cows, \emph{archaic} kine) an adult
female of any bovine animal}}
@@ -66,12 +73,11 @@ female of any bovine animal}}
\newglossaryentry{bravo}{name={bravo},
description={\nopostdesc}}
-\newglossaryentry{bravo1}{description={cry of approval (pl.\ bravos)},
+\newglossaryentry{bravocry}{description={cry of approval (pl.\ bravos)},
sort={1},
-plural={bravos},
parent=bravo}
-\newglossaryentry{bravo2}{description={hired ruffian or killer (pl.\ bravoes)},
+\newglossaryentry{bravoruffian}{description={hired ruffian or killer (pl.\ bravoes)},
sort={2},
plural={bravoes},
parent=bravo}
@@ -112,11 +118,12 @@ uncommented line breaks or attempts to pretty-print the \LaTeX\ code}
\chapter{Introduction}
\pagenumbering{arabic}
-A \gls{glossarylist} (definition~\glsrefentry{glossarylist}) is a
-very useful addition to any technical document, although a
-\gls{glossarycol} (definition~\glsrefentry{glossarycol}) can also
-simply be a collection of glosses, which is another thing entirely.
-Some documents have multiple \glspl{glossarylist}.
+A \gls{glossarylist} (definition~\glsrefentry{glossarylist}, plural
+\glspl{glossarylist}) is a very useful addition to any technical
+document, although a \gls{glossarycol}
+(definition~\glsrefentry{glossarycol}, plural \glspl{glossarycol})
+can also simply be a collection of glosses, which is another thing
+entirely. Some documents have multiple \glspl{glossarylist}.
Once you have run your document through \LaTeX, you will then need
to run the \texttt{.glo} file through \texttt{makeindex} (default)
@@ -136,21 +143,25 @@ Be careful about \glspl{spuriousspace} appearing in your code.
\chapter{Plurals and Paragraphs}
-Plurals are assumed to have the letter s appended, but if this is
+Plurals are assumed to have the letter ``s'' appended, but if this is
not the case, as in \glspl{mtrx}, then you need to specify the
plural when you define the entry. If a term may have multiple
-plurals (for example \glspl{cow}/\glslink{cow}{kine}) then
-define the entry with the plural form most likely to be used and
-explicitly specify the alternative form using \verb|\glslink|
+plurals (for example \glspl{cow}/\glsuseri{cow}) then
+define the entry with the plural form most likely to be used.
+The alternative can simply be referenced with \verb|\glslink|
(e.g.\ \glslink{cow}{kine})
or \verb|\glsdisp| (e.g.\ \glsdisp{cow}{kine}).
+Another option is to save the alternative plural in another key. In
+this case, the ``user1'' key has been used, but a custom key can be
+defined instead.
+
\Glspl{seal} and \glspl{sealion} have regular plural forms.
\Gls{bravo} is a homograph, but the plural forms are spelt
-differently. The plural of \gls{bravo1}, a cry of approval
-(definition~\glsrefentry{bravo1}), is \glspl{bravo1}, whereas the
-plural of \gls{bravo2}, a hired ruffian or killer
-(definition~\glsrefentry{bravo2}), is \glspl{bravo2}.
+differently. The plural of \gls{bravocry}, a cry of approval
+(definition~\glsrefentry{bravocry}), is \glspl{bravocry}, whereas the
+plural of \gls{bravoruffian}, a hired ruffian or killer
+(definition~\glsrefentry{bravoruffian}), is \glspl{bravoruffian}.
\Glspl{par} can cause a problem in commands, so care is needed
when having a paragraph break in a \gls{glossarylist} entry.
diff --git a/macros/latex/contrib/glossaries/samples/sample4col.pdf b/macros/latex/contrib/glossaries/samples/sample4col.pdf
index a9e88dfadf..ee58db4282 100644
--- a/macros/latex/contrib/glossaries/samples/sample4col.pdf
+++ b/macros/latex/contrib/glossaries/samples/sample4col.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sample4col.tex b/macros/latex/contrib/glossaries/samples/sample4col.tex
index 1978954123..71e8c442cc 100644
--- a/macros/latex/contrib/glossaries/samples/sample4col.tex
+++ b/macros/latex/contrib/glossaries/samples/sample4col.tex
@@ -3,8 +3,12 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample4col
\documentclass[a4paper]{article}
+% Other 4 column styles are available. The ones that use
+% booktabs.sty are recommended over the "headerborder" styles
\usepackage[style=long4colheaderborder]{glossaries}
\makeglossaries
diff --git a/macros/latex/contrib/glossaries/samples/sampleAcr.pdf b/macros/latex/contrib/glossaries/samples/sampleAcr.pdf
index cef9f80d86..8a80268474 100644
--- a/macros/latex/contrib/glossaries/samples/sampleAcr.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleAcr.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleAcr.tex b/macros/latex/contrib/glossaries/samples/sampleAcr.tex
index 572b95d6ea..905aa943f3 100644
--- a/macros/latex/contrib/glossaries/samples/sampleAcr.tex
+++ b/macros/latex/contrib/glossaries/samples/sampleAcr.tex
@@ -4,6 +4,8 @@
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleAcr
\documentclass[a4paper]{report}
\usepackage[colorlinks,plainpages=false]{hyperref}
@@ -39,6 +41,9 @@ This is the entry in uppercase: \GLS{svm}.
\chapter{Kernel Support Vector Machines}
+% Instead of using the clumsy \ifglsused, you might find it simpler
+% to use glossaries-prefix.sty
+
The \gls{ksvm} is \ifglsused{svm}{an}{a} \gls{svm} that uses
the so called ``kernel trick''. Plural: \glspl{ksvm}. Resetting
acronyms.
diff --git a/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf b/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf
index 96222c6f12..65899e6a7b 100644
--- a/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleAcrDesc.tex b/macros/latex/contrib/glossaries/samples/sampleAcrDesc.tex
index e2170feb16..03490057a2 100644
--- a/macros/latex/contrib/glossaries/samples/sampleAcrDesc.tex
+++ b/macros/latex/contrib/glossaries/samples/sampleAcrDesc.tex
@@ -4,8 +4,11 @@
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleAcrDesc
\documentclass[a4paper]{report}
+\usepackage[T1]{fontenc}% need support for bold smallcaps
\usepackage[colorlinks,plainpages=false]{hyperref}
\usepackage[acronym,% create 'acronym' glossary type
% The package option "nomain" is used here to suppress the
@@ -24,19 +27,14 @@
% Change the "see" items so that they use \acronymfont:
\renewcommand*{\glsseeitemformat}[1]{\acronymfont{\glsentrytext{#1}}}
-% Not using a font that supports bold smallcaps so change the way
-% the name is formatted in the glossary:
-
-\renewcommand*{\glsnamefont}[1]{\textmd{#1}}
-
\newacronym[description={Statistical pattern recognition
-technique~\protect\cite{svm}}, % acronym's description
+technique~\protect\cite{svm}} % acronym's description
]{svm}{svm}{support vector machine}
\newacronym
[description={Statistical pattern recognition technique
using the ``kernel trick''},% acronym's description
- see={[see also]{svm}},
+ see={[see also]{svm}}
]
{ksvm}{ksvm}{kernel support vector machine}
@@ -58,6 +56,9 @@ This is the entry in uppercase: \GLS{svm}.
\chapter{Kernel Support Vector Machines}
+% Instead of using the clumsy \ifglsused, you might find it simpler
+% to use glossaries-prefix.sty
+
The \gls{ksvm} is \ifglsused{svm}{an}{a} \gls{svm} that uses
the so called ``kernel trick''. This is the entry's description without
a link: \glsentrydesc{ksvm}.
diff --git a/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf b/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf
index a7d8af989a..22f1bb1990 100644
--- a/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleCustomAcr.tex b/macros/latex/contrib/glossaries/samples/sampleCustomAcr.tex
index eda408e02c..5af8cdb747 100644
--- a/macros/latex/contrib/glossaries/samples/sampleCustomAcr.tex
+++ b/macros/latex/contrib/glossaries/samples/sampleCustomAcr.tex
@@ -4,8 +4,11 @@
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleCustomAcr
\documentclass[a4paper]{report}
+\usepackage[T1]{fontenc}% need support for bold smallcaps
\usepackage[colorlinks,plainpages=false]{hyperref}
\usepackage[acronym,% create 'acronym' glossary type
% The package option "nomain" is used here to suppress the
@@ -56,10 +59,6 @@
% Set the name (as displayed in the glossary) to long (short)
\renewcommand*{\acronymentry}[1]{%
\glsentrylong{##1} (\acronymfont{\glsentryshort{##1}})}%
-% Since bold small caps isn't supported with this document's
-% fonts, adjust \acronymfont so that it switches to medium
-% small caps:
- \renewcommand{\acronymfont}[1]{\textmd{\scshape ##1}}%
}
% Now use this new style:
diff --git a/macros/latex/contrib/glossaries/samples/sampleDB.pdf b/macros/latex/contrib/glossaries/samples/sampleDB.pdf
index 9a06139e72..4bceb441f4 100644
--- a/macros/latex/contrib/glossaries/samples/sampleDB.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleDB.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleDB.tex b/macros/latex/contrib/glossaries/samples/sampleDB.tex
index 522ca63562..6c9ccb97dd 100644
--- a/macros/latex/contrib/glossaries/samples/sampleDB.tex
+++ b/macros/latex/contrib/glossaries/samples/sampleDB.tex
@@ -3,17 +3,19 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleDB
\documentclass{article}
\usepackage[colorlinks,plainpages=false]{hyperref}
\usepackage[nonumberlist]{glossaries}
-\newglossary[nlg]{symbols}{not}{ntn}{Symbols}
+\newglossary[nlg]{punc}{not}{ntn}{Punctuation Characters}
\makeglossaries
\loadglsentries{database1}
-\loadglsentries[symbols]{database2}
+\loadglsentries[punc]{database2}
\begin{document}
diff --git a/macros/latex/contrib/glossaries/samples/sampleDesc.pdf b/macros/latex/contrib/glossaries/samples/sampleDesc.pdf
index 9eb6db4814..d6ec5a570d 100644
--- a/macros/latex/contrib/glossaries/samples/sampleDesc.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleDesc.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleDesc.tex b/macros/latex/contrib/glossaries/samples/sampleDesc.tex
index bcf7e4444e..fe881e387c 100644
--- a/macros/latex/contrib/glossaries/samples/sampleDesc.tex
+++ b/macros/latex/contrib/glossaries/samples/sampleDesc.tex
@@ -7,6 +7,8 @@
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleDesc
\documentclass[a4paper]{report}
\usepackage[colorlinks,plainpages=false]{hyperref}
@@ -17,6 +19,11 @@
\makeglossaries
+% This sample file demonstrates the use of the first and text keys
+% but in general it's better to use \newacronym (as in
+% sampleAcrDesc.tex) instead as it's more flexible. For even greater
+% flexibility use \newabbreviation provided by glossaries-extra.sty
+
\newglossaryentry{svm}{
% how the entry name should appear in the glossary
name={Support vector machine (SVM)},
diff --git a/macros/latex/contrib/glossaries/samples/sampleEq.pdf b/macros/latex/contrib/glossaries/samples/sampleEq.pdf
index ebcb74a296..576b164ffe 100644
--- a/macros/latex/contrib/glossaries/samples/sampleEq.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleEq.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleEq.tex b/macros/latex/contrib/glossaries/samples/sampleEq.tex
index 403930a97e..aea88cb456 100644
--- a/macros/latex/contrib/glossaries/samples/sampleEq.tex
+++ b/macros/latex/contrib/glossaries/samples/sampleEq.tex
@@ -3,6 +3,8 @@
% arara: pdflatex
% arara: makeglossaries
% arara: pdflatex
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleEq
\documentclass[a4paper,12pt]{report}
\usepackage{amsmath}
@@ -27,6 +29,9 @@
\renewcommand{\descriptionname}{Function Name}
\renewcommand{\pagelistname}{Number of Formula}
+% Change the width of the number list column:
+\setlength{\glspagelistwidth}{0.75\textwidth}
+
% define glossary entries
\newglossaryentry{Gamma}{name=\ensuremath{\Gamma(z)},
@@ -34,11 +39,11 @@ description=Gamma function,
sort=Gamma}
\newglossaryentry{gamma}{name={\ensuremath{\gamma(\alpha,x)}},
-description=Incomplete gamma function,
+description=Lower incomplete gamma function,
sort=gamma1}
\newglossaryentry{iGamma}{name={\ensuremath{\Gamma(\alpha,x)}},
-description=Incomplete gamma function,
+description=Upper incomplete gamma function,
sort=Gamma2}
\newglossaryentry{psi}{name=\ensuremath{\psi(x)},
@@ -115,7 +120,7 @@ option.
\verb|\ensuremath| is only required here if using
hyperlinks.
\begin{equation}
-\glslink{Gamma}{\ensuremath{\Gamma(x+1)}} = x\Gamma(x)
+\glslink{Gamma}{\Gamma(x+1)} = x\Gamma(x)
\end{equation}
\begin{equation}
diff --git a/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf b/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf
index 1285f4cc16..fc9ad3deaa 100644
--- a/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleEqPg.tex b/macros/latex/contrib/glossaries/samples/sampleEqPg.tex
index 6061bb72d9..fde8800633 100644
--- a/macros/latex/contrib/glossaries/samples/sampleEqPg.tex
+++ b/macros/latex/contrib/glossaries/samples/sampleEqPg.tex
@@ -21,6 +21,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleEgPg
\documentclass[a4paper,12pt]{report}
\usepackage{amsmath}
@@ -67,10 +69,10 @@ numbers in bold indicate page numbers where the main definition occurs.\par}
description=Gamma function,sort=Gamma}
\newglossaryentry{gamma}{name=\ensuremath{\gamma(\alpha,x)},
-description=Incomplete gamma function,sort=gamma}
+description=Lower incomplete gamma function,sort=gamma1}
\newglossaryentry{iGamma}{name=\ensuremath{\Gamma(\alpha,x)},
-description=Incomplete gamma function,sort=Gamma}
+description=Upper incomplete gamma function,sort=Gamma2}
\newglossaryentry{psi}{name=\ensuremath{\psi(x)},
description=Psi function,sort=psi}
@@ -81,7 +83,7 @@ description=Error function,sort=erf}
\newglossaryentry{erfc}{name=\ensuremath{\erfc(x)},
description=Complementary error function,sort=erfc}
-\newglossaryentry{beta}{name=\ensuremath{B(x,y)},
+\newglossaryentry{B}{name=\ensuremath{B(x,y)},
description=Beta function,sort=B}
\newglossaryentry{Bx}{name=\ensuremath{B_x(p,q)},
@@ -98,22 +100,22 @@ sort=Un}
\newglossaryentry{Hn}{name=\ensuremath{H_n(x)},
description=Hermite polynomials,sort=Hn}
-\newglossaryentry{Lna}{name=\ensuremath{L_n^\alpha(x)},
+\newglossaryentry{Ln}{name=\ensuremath{L_n^\alpha(x)},
description=Laguerre polynomials,sort=Lna}
\newglossaryentry{Znu}{name=\ensuremath{Z_\nu(z)},
description=Bessel functions,sort=Z}
-\newglossaryentry{Pagz}{name=\ensuremath{\Phi(\alpha,\gamma;z)},
+\newglossaryentry{Phi}{name=\ensuremath{\Phi(\alpha,\gamma;z)},
description=confluent hypergeometric function,sort=Pagz}
-\newglossaryentry{kv}{name=\ensuremath{k_\nu(x)},
+\newglossaryentry{knu}{name=\ensuremath{k_\nu(x)},
description=Bateman's function,sort=kv}
\newglossaryentry{Dp}{name=\ensuremath{D_p(z)},
description=Parabolic cylinder functions,sort=Dp}
-\newglossaryentry{Fpk}{name=\ensuremath{F(\phi,k)},
+\newglossaryentry{F}{name=\ensuremath{F(\phi,k)},
description=Elliptical integral of the first kind,sort=Fpk}
\newglossaryentry{C}{name=\ensuremath{C},
@@ -163,7 +165,7 @@ defined as
\end{equation}
\begin{equation}
-\glslink{Gamma}{\ensuremath{\Gamma(x+1)}} = x\Gamma(x)
+\glslink{Gamma}{\Gamma(x+1)} = x\Gamma(x)
\end{equation}
\begin{equation}
@@ -177,7 +179,7 @@ defined as
\newpage
\begin{equation}
-\glslink{Gamma}{\ensuremath{\Gamma(\alpha)}} =
+\glslink{Gamma}{\Gamma(\alpha)} =
\Gamma(\alpha, x) + \gamma(\alpha, x)
\end{equation}
@@ -199,15 +201,15 @@ The \glslink[format=hyperbf,counter=page]{erf}{error function} is defined as:
\chapter{Beta Function}
\begin{equation}
-\gls{beta} = 2\int_0^1 t^{x-1}(1-t^2)^{y-1}\,dt
+\gls{B} = 2\int_0^1 t^{x-1}(1-t^2)^{y-1}\,dt
\end{equation}
Alternatively:
\begin{equation}
-\gls{beta} = 2\int_0^{\frac\pi2}\sin^{2x-1}\phi\cos^{2y-1}\phi\,d\phi
+\gls{B} = 2\int_0^{\frac\pi2}\sin^{2x-1}\phi\cos^{2y-1}\phi\,d\phi
\end{equation}
\begin{equation}
-\gls{beta} = \frac{\Gamma(x)\Gamma(y)}{\Gamma(x+y)} = B(y,x)
+\gls{B} = \frac{\Gamma(x)\Gamma(y)}{\Gamma(x+y)} = B(y,x)
\end{equation}
\begin{equation}
@@ -233,7 +235,7 @@ Alternatively:
\chapter{Laguerre polynomials}
\begin{equation}
-\gls{Lna} = \frac{1}{n!}e^x x^{-\alpha}
+\gls{Ln} = \frac{1}{n!}e^x x^{-\alpha}
\frac{d^n}{dx^n}(e^{-x}x^{n+\alpha})
\end{equation}
@@ -250,7 +252,7 @@ Bessel functions $Z_\nu(z)$ are solutions of
\chapter{Confluent hypergeometric function}
\begin{equation}
-\gls{Pagz} = 1 + \frac{\alpha}{\gamma}\,\frac{z}{1!}
+\gls{Phi} = 1 + \frac{\alpha}{\gamma}\,\frac{z}{1!}
+ \frac{\alpha(\alpha+1)}{\gamma(\gamma+1)}\,\frac{z^2}{2!}
+\frac{\alpha(\alpha+1)(\alpha+2)}
{\gamma(\gamma+1)(\gamma+2)}
@@ -259,7 +261,7 @@ Bessel functions $Z_\nu(z)$ are solutions of
\end{equation}
\begin{equation}
-\gls{kv} = \frac{2}{\pi}\int_0^{\pi/2}
+\gls{knu} = \frac{2}{\pi}\int_0^{\pi/2}
\cos(x \tan\theta - \nu\theta)\,d\theta
\end{equation}
@@ -278,7 +280,7 @@ Bessel functions $Z_\nu(z)$ are solutions of
\chapter{Elliptical Integral of the First Kind}
\begin{equation}
-\gls{Fpk} = \int_0^\phi
+\gls{F} = \int_0^\phi
\frac{d\alpha}{\sqrt{1-k^2\sin^2\alpha}}
\end{equation}
diff --git a/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf b/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf
index e654508453..f7fff7a080 100644
--- a/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.tex b/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.tex
index 0f3d868166..6df02d687e 100644
--- a/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.tex
+++ b/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.tex
@@ -4,8 +4,11 @@
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleFnAcrDesc
\documentclass[a4paper]{report}
+\usepackage[T1]{fontenc}% need support for bold smallcaps
\usepackage[colorlinks,plainpages=false]{hyperref}
\usepackage[acronym,% create 'acronym' glossary type
% The package option "nomain" is used here to suppress the
@@ -26,10 +29,6 @@
\renewcommand*{\acronymentry}[1]{%
\acronymfont{\glsentryshort{#1}}\space (\glsentrylong{#1})}
-% Not using a font that supports bold smallcaps so ensure
-% the acronym is always in medium weight.
-\renewcommand*{\acronymfont}[1]{\textmd{\scshape #1}}
-
% Change the "see" items so that they use \acronymfont:
\renewcommand*{\glsseeitemformat}[1]{\acronymfont{\glsentrytext{#1}}}
diff --git a/macros/latex/contrib/glossaries/samples/sampleNtn.pdf b/macros/latex/contrib/glossaries/samples/sampleNtn.pdf
index 3db806aea9..149c40c796 100644
--- a/macros/latex/contrib/glossaries/samples/sampleNtn.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleNtn.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleNtn.tex b/macros/latex/contrib/glossaries/samples/sampleNtn.tex
index 9b3841cc33..23ddfcd409 100644
--- a/macros/latex/contrib/glossaries/samples/sampleNtn.tex
+++ b/macros/latex/contrib/glossaries/samples/sampleNtn.tex
@@ -4,6 +4,8 @@
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleNtn
\documentclass{report}
% If you want to add babel to this document, you may have to
@@ -12,7 +14,7 @@
\usepackage[plainpages=false,colorlinks]{hyperref}
\usepackage{html}
-\usepackage[toc,xindy]{glossaries}
+\usepackage[toc]{glossaries}
% Define a new glossary type called notation
\newglossary[nlg]{notation}{not}{ntn}{Notation}
@@ -22,22 +24,22 @@
% Notation definitions
\newglossaryentry{not:set}{type=notation, % glossary type
-name={$\mathcal{S}$},
-description={A set},
+name={\ensuremath{\mathcal{S}}},
+description={A \gls{gls:set}},
sort={S}}
\newglossaryentry{not:U}{type=notation,
-name={$\mathcal{U}$},
-description={The universal set},
+name={\ensuremath{\mathcal{U}}},
+description={The universal \gls{gls:set}},
sort=U}
\newglossaryentry{not:card}{type=notation,
-name={$|\mathcal{S}|$},
-description={cardinality of $\mathcal{S}$},
+name={\ensuremath{\mid\mathcal{S}\mid}},
+description={The \gls{gls:card} of $\mathcal{S}$},
sort=cardinality}
\newglossaryentry{not:fact}{type=notation,
-name={$!$},
+name={\ensuremath{!}},
description={factorial},
sort=factorial}
@@ -61,8 +63,7 @@ description={The number of elements in the specified set}}
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 and index of notation. The index of notation
-doesn't have associated numbers.
+separate glossary of terms and index of notation.
\end{abstract}
diff --git a/macros/latex/contrib/glossaries/samples/samplePeople.pdf b/macros/latex/contrib/glossaries/samples/samplePeople.pdf
index bdd7bb5d2a..cbc7beaed0 100644
--- a/macros/latex/contrib/glossaries/samples/samplePeople.pdf
+++ b/macros/latex/contrib/glossaries/samples/samplePeople.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/samplePeople.tex b/macros/latex/contrib/glossaries/samples/samplePeople.tex
index 4182dcabc1..b192bca6b2 100644
--- a/macros/latex/contrib/glossaries/samples/samplePeople.tex
+++ b/macros/latex/contrib/glossaries/samples/samplePeople.tex
@@ -5,6 +5,8 @@
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#samplePeople
\documentclass{report}
\usepackage[colorlinks]{hyperref}
@@ -16,7 +18,7 @@
\newcommand{\textname}[2]{#1 #2}
% Syntax: \name{first name}{surname}
- \let\name\textname
+\let\name\textname
\renewcommand{\glsprestandardsort}[3]{%
\let\name\sortname
diff --git a/macros/latex/contrib/glossaries/samples/sampleSec.pdf b/macros/latex/contrib/glossaries/samples/sampleSec.pdf
index 219ec0f535..710ab4ab77 100644
--- a/macros/latex/contrib/glossaries/samples/sampleSec.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleSec.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleSec.tex b/macros/latex/contrib/glossaries/samples/sampleSec.tex
index 975c51076d..112775bfe9 100644
--- a/macros/latex/contrib/glossaries/samples/sampleSec.tex
+++ b/macros/latex/contrib/glossaries/samples/sampleSec.tex
@@ -4,6 +4,10 @@
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
% arara: pdflatex: { synctex: on }
+%
+% Note that you will get a different result if you use
+% makeglossaries-lite or explicitly use makeindex for this example. See
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleSec
\documentclass{report}
\usepackage[plainpages=false,colorlinks]{hyperref}
diff --git a/macros/latex/contrib/glossaries/samples/sampleSort.pdf b/macros/latex/contrib/glossaries/samples/sampleSort.pdf
index d771b7d591..5e60c52d16 100644
--- a/macros/latex/contrib/glossaries/samples/sampleSort.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleSort.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleSort.tex b/macros/latex/contrib/glossaries/samples/sampleSort.tex
index 960dc22f0f..e55ff77cd0 100644
--- a/macros/latex/contrib/glossaries/samples/sampleSort.tex
+++ b/macros/latex/contrib/glossaries/samples/sampleSort.tex
@@ -4,6 +4,8 @@
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleSort
\documentclass{report}
% If you want to add babel to this document, you may have to
@@ -44,8 +46,8 @@ text={\emptyset},
description={The empty set}}
\newglossaryentry{not:card}{type=notation,
-name={$|\mathcal{S}|$},
-text={|\mathcal{S}|},
+name={$\mid\mathcal{S}\mid$},
+text={\mid\mathcal{S}\mid},
description={cardinality of $\mathcal{S}$}}
% Main glossary definitions
@@ -58,6 +60,8 @@ description={The number of elements in the specified set}}
% Acronym definitions
+\setacronymstyle{long-short}
+
\newacronym{zfc}{ZFC}{Zermelo-Fraenkel set theory}
\newacronym{ad}{AD}{axiom of determinacy}
diff --git a/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf b/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf
index 185bfcd745..b16f769006 100644
--- a/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleaccsupp.tex b/macros/latex/contrib/glossaries/samples/sampleaccsupp.tex
index ad1eb7bef1..26708ca37c 100644
--- a/macros/latex/contrib/glossaries/samples/sampleaccsupp.tex
+++ b/macros/latex/contrib/glossaries/samples/sampleaccsupp.tex
@@ -3,42 +3,84 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleaccsupp
+%
+% Note that this document isn't fully accessible as it's not tagged.
+% See the accessibility or tagpdf packages for examples of how to tag the document.
\documentclass[a4paper]{article}
-\usepackage[margin=0.5in]{geometry}
-\usepackage{booktabs}
+\usepackage[includemp,marginpar=1.5in,textwidth=5in]{geometry}
+\usepackage{graphicx}
+% use debug=showaccsupp to show replacement text in the margin
\usepackage[acronym]{glossaries-accsupp}
\makeglossaries
-\newglossaryentry{dr}{name=Dr,description={Doctor},access={Doctor}}
+\setacronymstyle{long-short}
-\newacronym[shortaccess=S V M]{svm}{svm}{support vector machine}
+% These will use 'ActualText' rather than 'E' because the
+% abbreviation is in the 'name' field.
+\newglossaryentry{Doctor}{name=Dr,description={Doctor},access={Doctor}}
+\newglossaryentry{Drive}{name={Dr.},description={Drive},access={Drive},
+ plural={Drvs}}
+
+% These will use 'E'
\newacronym{eg}{e.g.}{for example}
-\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}\\
+\newacronym[shortaccess={TiKZ ist kein Zeichenprogramm}]
+{tikz}{Ti\emph{k}Z}{Ti\emph{k}Z ist \emph{kein} Zeichenprogramm}
+
+
+% The symbol key needs to use 'ActualText' but the replacement text
+% needs to be supplied as the hexadecimal character code.
+
+\newcommand{\glssymbolaccsupp}[2]{%
+ \glsaccessibility[method=hex,unicode]{ActualText}{#1}{#2}%
+}
+
+\newglossaryentry{int}{name={int},description={integral},
+ symbol={\ensuremath{\int}},symbolaccess={222B}
+}
+
+% The user1 key needs to use 'Alt':
+\newcommand{\glsuseriaccsupp}[2]{%
+ \glsaccessibility{Alt}{#1}{#2}%
+}
+
+\newglossaryentry{sampleimage}{name={sample image},
+ description={an example image},
+% \protect is needed unless \glsnoexpandfields has been used
+ user1={\protect\includegraphics[height=20pt]{example-image}},
+ user1access={a boilerplate image used in examples}
}
\begin{document}
-\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}
+\section{General Terms}
+
+Testing general terms that are really abbreviations.
+
+\gls{Doctor} Smith lives at 2, Blueberry \gls{Drive}
+
+\section{Symbols and Images}
+
+Symbol: \glssymbol{int} (\gls{int}).
+
+Image: \glsuseri{sampleimage} (\gls{sampleimage}).
+
+\section{Abbreviations}
+
+First use: \gls{eg}, \gls{tikz}.
+
+Next use: \gls{eg}, \gls{tikz}.
+
+Short: \acrshort{eg}, \acrshort{tikz}.
+
+Long: \acrlong{eg}, \acrlong{tikz}.
+Full: \acrfull{eg}, \acrfull{tikz}.
\printglossaries
\end{document}
diff --git a/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf b/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf
index 15a119ffc2..ea045bb081 100644
--- a/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleacronyms.tex b/macros/latex/contrib/glossaries/samples/sampleacronyms.tex
index 38fb336de7..b261887d15 100644
--- a/macros/latex/contrib/glossaries/samples/sampleacronyms.tex
+++ b/macros/latex/contrib/glossaries/samples/sampleacronyms.tex
@@ -3,6 +3,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleacronyms
\documentclass{article}
\usepackage[acronym,acronymlists={main,acronym2}]{glossaries}
diff --git a/macros/latex/contrib/glossaries/samples/sampletree.pdf b/macros/latex/contrib/glossaries/samples/sampletree.pdf
index 1d1e1dcc2e..f884d9fd89 100644
--- a/macros/latex/contrib/glossaries/samples/sampletree.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampletree.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampletree.tex b/macros/latex/contrib/glossaries/samples/sampletree.tex
index 43c21518e4..dc8554504c 100644
--- a/macros/latex/contrib/glossaries/samples/sampletree.tex
+++ b/macros/latex/contrib/glossaries/samples/sampletree.tex
@@ -3,6 +3,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampletree
\documentclass{report}
\usepackage[colorlinks]{hyperref}
@@ -13,6 +15,9 @@
\glssetwidest{Roman letters} % level 0 widest name
\glssetwidest[1]{Sigma} % level 1 widest name
+\setglossarypreamble{This is a contrived example to demonstrate the
+alttreehypergroup style.}
+
\makeglossaries
\newglossaryentry{greekletter}{name={Greek letters},
@@ -22,14 +27,12 @@ description={\nopostdesc}}
\newglossaryentry{sigma}{name={Sigma},
text={\ensuremath{\Sigma}},
first={\ensuremath{\Sigma} (uppercase sigma)},
-symbol={\ensuremath{\Sigma}},
description={Used to indicate summation},
parent=greekletter}
\newglossaryentry{pi}{name={pi},
text={\ensuremath{\pi}},
first={\ensuremath{\pi} (lowercase pi)},
-symbol={\ensuremath{\pi}},
description={Transcendental number},
parent=greekletter}
diff --git a/macros/latex/contrib/glossaries/samples/sampleutf8.pdf b/macros/latex/contrib/glossaries/samples/sampleutf8.pdf
index 93e155d97f..155441d4fe 100644
--- a/macros/latex/contrib/glossaries/samples/sampleutf8.pdf
+++ b/macros/latex/contrib/glossaries/samples/sampleutf8.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleutf8.tex b/macros/latex/contrib/glossaries/samples/sampleutf8.tex
index 94deb79ef9..82f59420d7 100644
--- a/macros/latex/contrib/glossaries/samples/sampleutf8.tex
+++ b/macros/latex/contrib/glossaries/samples/sampleutf8.tex
@@ -3,6 +3,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleutf8
\documentclass{article}
\usepackage[utf8]{inputenc}
diff --git a/macros/latex/contrib/glossaries/samples/samplexdy.pdf b/macros/latex/contrib/glossaries/samples/samplexdy.pdf
index 8db6ac5ddf..69261d7c8b 100644
--- a/macros/latex/contrib/glossaries/samples/samplexdy.pdf
+++ b/macros/latex/contrib/glossaries/samples/samplexdy.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/samplexdy.tex b/macros/latex/contrib/glossaries/samples/samplexdy.tex
index 2effb0da1b..08d407027e 100644
--- a/macros/latex/contrib/glossaries/samples/samplexdy.tex
+++ b/macros/latex/contrib/glossaries/samples/samplexdy.tex
@@ -22,6 +22,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample
\documentclass{article}
\usepackage[utf8]{inputenc}
@@ -45,7 +47,7 @@
% package for the dice commands):
% \tallynum{n} displays a die or dice where the dots add up to n
-\newrobustcmd{\tallynum}[1]{%
+\newrobustcmd*{\tallynum}[1]{%
\ifnum\number#1<7
$\csname dice\romannumeral#1\endcsname$%
\else
@@ -59,7 +61,7 @@
% a very specific format. (See the glossaries user manual for more
% details.)
-\newcommand{\tally}[1]{\tallynum{\arabic{page}}}
+\newcommand*{\tally}[1]{\tallynum{\arabic{#1}}}
% Now redefine \thepage
% (\texorpdfstring is used in case the page number ends up in a PDF
diff --git a/macros/latex/contrib/glossaries/samples/samplexdy2.pdf b/macros/latex/contrib/glossaries/samples/samplexdy2.pdf
index de19ce8acb..854bf4e3c2 100644
--- a/macros/latex/contrib/glossaries/samples/samplexdy2.pdf
+++ b/macros/latex/contrib/glossaries/samples/samplexdy2.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/samplexdy2.tex b/macros/latex/contrib/glossaries/samples/samplexdy2.tex
index 6225fb4d9f..867fe717fd 100644
--- a/macros/latex/contrib/glossaries/samples/samplexdy2.tex
+++ b/macros/latex/contrib/glossaries/samples/samplexdy2.tex
@@ -13,6 +13,8 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#samplexdy2
\documentclass{report}
\usepackage[utf8]{inputenc}
diff --git a/macros/latex/contrib/glossaries/samples/samplexdy3.pdf b/macros/latex/contrib/glossaries/samples/samplexdy3.pdf
index b715c047b4..290f85b163 100644
--- a/macros/latex/contrib/glossaries/samples/samplexdy3.pdf
+++ b/macros/latex/contrib/glossaries/samples/samplexdy3.pdf
Binary files differ
diff --git a/macros/latex/contrib/glossaries/samples/samplexdy3.tex b/macros/latex/contrib/glossaries/samples/samplexdy3.tex
index 8a28f1c3f9..0ef2694fd4 100644
--- a/macros/latex/contrib/glossaries/samples/samplexdy3.tex
+++ b/macros/latex/contrib/glossaries/samples/samplexdy3.tex
@@ -22,7 +22,9 @@
% arara: pdflatex: { synctex: on }
% arara: makeglossaries
% arara: pdflatex: { synctex: on }
- \documentclass{article}
+%
+%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#samplexdy3
+\documentclass{article}
\usepackage[utf8]{inputenc}
\usepackage[T1]{fontenc}