glossaries

git-svn-id: svn://tug.org/texlive/trunk@34809 c570f23f-e606-0410-a88d-b1316a301751

47 files changed, 263 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf
new file mode 100644
index 00000000000..fb53885daaa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.tex b/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.tex
new file mode 100644
index 00000000000..56036e364f5
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.tex
@@ -0,0 +1,201 @@
+ % arara: pdflatex
+ % arara: makeglossaries
+ % arara: pdflatex
+ % arara: bibtex
+ % arara: pdflatex
+ % arara: pdflatex
+\documentclass{report}
+
+\usepackage{graphicx}
+\usepackage{scrwfile}
+
+\usepackage[colorlinks]{hyperref}
+\usepackage[nopostdot,toc,acronym,symbols]{glossaries}
+\usepackage{glossary-mcols}
+\usepackage{glossary-longragged}
+
+\newglossary[glg2]{long}{gls2}{glo2}{Long Descriptions}
+\newglossary[glg3]{multipar}{gls3}{glo3}{Multi-Paragraph Descriptions}
+\newglossary[glg4]{acronymdesc}{gls4}{glo4}{Acronyms with Descriptions}
+\newglossary[glg5]{images}{gls5}{glo5}{Descriptions with Images}
+\newglossary[glg6]{acronymslang}{gls6}{glo6}{Acronyms with
+Translations}
+
+\newglossary[glg7]{parent}{gls7}{glo7}{Hierarchical Entries}
+\newglossary[glg8]{homographs}{gls8}{glo8}{Homographs}
+\newglossary[glg9]{cites}{gls9}{glo9}{Entries with Citations}
+
+\DeclareAcronymList{acronymdesc,acronymslang}
+
+\makeglossaries
+
+\loadglsentries{example-glossaries-brief}
+\loadglsentries[long]{example-glossaries-long}
+\loadglsentries[multipar]{example-glossaries-multipar}
+\loadglsentries[symbols]{example-glossaries-symbols}
+\loadglsentries[images]{example-glossaries-images}
+\loadglsentries[parent]{example-glossaries-parent}
+\loadglsentries[homographs]{example-glossaries-childnoname}
+\loadglsentries[cites]{example-glossaries-cite}
+
+\setacronymstyle{long-short}
+
+\loadglsentries[acronym]{example-glossaries-acronym}
+
+\setacronymstyle{long-short-desc}
+
+\loadglsentries[acronymdesc]{example-glossaries-acronym-desc}
+
+ % define an acronym style for the acronyms with a translation:
+
+\newacronymstyle{acronymslang}%
+{%
+  \GlsUseAcrEntryDispStyle{long-short}%
+}
+{%
+  \GlsUseAcrStyleDefs{short-long}%
+  \renewcommand*{\genacrfullformat}[2]{%
+   \glsentrylong{##1}##2\space
+   (\protect\firstacronymfont{\glsentryshort{##1}}%
+    \ifglshasfield{useri}{##1}%
+    {, English: \glsentryuseri{##1}}{})%
+  }%
+  \renewcommand*{\Genacrfullformat}[2]{%
+   \Glsentrylong{##1}##2\space
+   (\protect\firstacronymfont{\glsentryshort{##1}}%
+    \ifglshasfield{useri}{##1}%
+    {, English: \glsentryuseri{##1}}{})%
+  }%
+  \renewcommand*{\genplacrfullformat}[2]{%
+   \glsentrylongpl{##1}##2\space
+   (\protect\firstacronymfont{\glsentryshortpl{##1}}%
+    \ifglshasfield{useri}{##1}%
+    {, English: \glsentryuseri{##1}}{})%
+  }%
+  \renewcommand*{\Genplacrfullformat}[2]{%
+   \Glsentrylongpl{##1}##2\space
+   (\protect\firstacronymfont{\glsentryshortpl{##1}}%
+    \ifglshasfield{useri}{##1}%
+    {, English: \glsentryuseri{##1}}{})%
+  }%
+}
+
+\setacronymstyle{acronymslang}
+
+\loadglsentries[acronymslang]{example-glossaries-acronyms-lang}
+
+ % Define a style for the "images" glossary. The image names are
+ % stored in the user1 key.
+ % (The image insertion can probably be done more neatly using an
+ % appropriate package, but this is just a sample file.)
+
+\newsavebox\glsimagebox
+\newlength\glswidth
+
+\newglossarystyle{images}%
+{%
+  \setglossarystyle{tree}%
+  \renewenvironment{theglossary}{}{}%
+  \renewcommand{\glossentry}[2]{%
+    \ifglshasfield{useri}{##1}%
+    {\savebox
+      {\glsimagebox}%
+      {\includegraphics[height=4\baselineskip]{\glsentryuseri{##1}}}%
+      \settowidth{\glswidth}{\usebox\glsimagebox}%
+      \glswidth=\dimexpr\linewidth-\glswidth-1em\relax
+      \parshape=5
+        0pt \glswidth
+        0pt \glswidth
+        0pt \glswidth
+        0pt \glswidth
+        0pt \linewidth\relax
+    }%
+    {%
+      \savebox{\glsimagebox}{}%
+    }%
+    \noindent
+    \makebox[0pt][l]{%
+     \smash{\makebox[\linewidth][r]{\raisebox{-3\baselineskip}{\usebox\glsimagebox}}}}%
+    \glsentryitem{##1}\textbf{\glstarget{##1}{\glossentryname{##1}}}%
+    \space\glossentrydesc{##1}\par
+    \indexspace
+  }%
+  \renewcommand*{\glsgroupskip}{}%
+}
+
+ % glossary style for acronyms with a translation
+
+\newglossarystyle{acronymslang}
+{%
+  \setglossarystyle{long}%
+  \renewcommand*{\glsgroupskip}{}%
+  \renewcommand{\glossentry}[2]{%
+    \glsentryitem{##1}\glstarget{##1}{\glossentryname{##1}} &
+    \glossentrydesc{##1}\glspostdescription
+    \ifglshasfield{useri}{##1}{ (English: \glsentryuseri{##1})}{}%
+    \space ##2\tabularnewline
+  }%
+}
+
+ % glossary style for the cites glossary
+
+\newglossarystyle{cites}
+{% based on list style
+  \setglossarystyle{list}%
+    \renewcommand*{\glossentry}[2]{%
+    \item[\glsentryitem{##1}%
+          \glstarget{##1}{\glossentryname{##1}}]
+       \glossentrydesc{##1}\glspostdescription
+    \ifglshasfield{useri}{##1}{\space
+     % in the event of multiple cites (as in the vestibulum2
+     % sample entry), \glsentryuseri{##1} needs to be expanded
+     % before being passed to \cite.
+     \glsletentryfield{\thiscite}{##1}{useri}%
+     (See \expandafter\cite\expandafter{\thiscite})}{}%
+    \space ##2}%
+}
+
+\begin{document}
+\tableofcontents
+
+\chapter{Sample}
+
+This is a sample document that uses the dummy glossary entries
+supplied with the glossaries bundle for testing.
+
+Here are all the entries (including acronyms):
+
+\forallglossaries{\thistype}{\section{Glossary `\thistype'}
+\forglsentries[\thistype]{\thislabel}{\gls{\thislabel}. }}
+
+\section{Acronyms Revisited}
+
+Here are just the acronyms again:
+\forallacronyms{\thistype}{\forglsentries[\thistype]{\thislabel}{\gls{\thislabel}. }}
+
+\printglossary[style=mcolindex,title={Brief Descriptions}]
+
+\printglossary[type=long,style=list]
+
+\printglossary[type=multipar,style=altlist]
+
+\printglossary[type=symbols,style=altlongragged4col,nogroupskip]
+
+\printglossary[type=acronym,style=long]
+
+\printglossary[type=acronymdesc,style=altlist]
+
+\printglossary[type=images,style=images]
+
+\printglossary[type=acronymslang,style=acronymslang]
+
+\printglossary[type=homographs,style=mcoltreenoname,subentrycounter]
+
+\printglossary[type=parent,style=tree]
+
+\printglossary[type=cites,style=cites,nopostdot=false,nogroupskip]
+
+\bibliographystyle{plain}
+\bibliography{xampl}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf
index 115601b0a5f..ad3230b65fc 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex
index 8af4fbe2c2b..384eddbe09b 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex
@@ -48,6 +48,11 @@
 \newglossaryentry{sample}{name={sample},
 description={a sample entry}}
 
+ % set the acronym style:
+\setacronymstyle{long-short}
+
+ % This contrived acronym has non-standard plural forms.
+ % These are specified in the optional argument.
 \newacronym[\glsshortpluralkey=cas,\glslongpluralkey=contrived
 acronyms]{aca}{aca}{a contrived acronym}
 
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf
index 1df9339b152..8ce1457dcbd 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf
index 48acb6a5249..ff00b6896a9 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf
index baca281c226..e9b5048588a 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf
index ae604994d38..bdaabec49eb 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf
index e2abe62bc7b..b660508b513 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf
new file mode 100644
index 00000000000..0ac0bec0be1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.tex
new file mode 100644
index 00000000000..090c755c959
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.tex
@@ -0,0 +1,25 @@
+ % 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{glossaries}
+
+\newignoredglossary{common}
+
+\makeglossaries
+
+\newglossaryentry{sample}{name={sample},description={an example}}
+
+\newglossaryentry{commonex}{type=common,name={common term}}
+
+\begin{document}
+
+\gls{sample}. \gls{commonex}.
+
+\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
index 5f5a8732ec0..102b228a668 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf
index b5c0a2e1698..38ddb7c3360 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf
index eefb551b290..01453236b20 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.pdf
index 5dcddd2ae73..889d571bab2 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.tex
index 22522a04942..0cdae525b58 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-mfirstuc.tex
@@ -3,7 +3,7 @@
  % arara: pdflatex: { synctex: on }
 \documentclass{article}
 
-\usepackage{mfirstuc}
+\usepackage{mfirstuc-english}
 
 \begin{document}
 
@@ -20,6 +20,14 @@
 \newcommand{\abc}{abc}%
 \xmakefirstuc{\abc}.
 
+\capitalisewords{the wind in the willows}
+
+\capitalisewords{a book of rhyme.}
+
+\MFUclear
+
+\capitalisewords{the wind in the willows}
+
 \capitalisewords{a book of rhyme.}
 
 \capitalisewords{a book\space of rhyme.}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf
index f6755de9d0c..857ce72394c 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf
index dad267b67bc..8bba2c746c5 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf
index 6926f3dfcb3..d773baa6718 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf
index 1ae05a99c30..ebe273e434d 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.tex
index c1efc549d07..16cc511eee7 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.tex
@@ -8,28 +8,22 @@
 \usepackage[colorlinks]{hyperref}
 \usepackage{glossaries}
 
-\makeglossaries
+\GlsDeclareNoHyperList{main}
 
- % switch off hyperlinks:
-\glsdisablehyper
+\makeglossaries
 
  % redefine \glsentryfmt so that it adds a hyperlink
- % if not in math mode
+ % if not in math mode and the hyperlinks haven't been forced on
 \renewcommand*{\glsentryfmt}{%
   \ifmmode
     \glsgenentryfmt
   \else
-    % Temporarily enable hyperlinks:
-    \glsenablehyper
-    \glshyperlink[\glsgenentryfmt]{\glslabel}%
-    % Disable hyperlinks again
-    \glsdisablehyper
+    \glsifhyperon
+    {\glsgenentryfmt}% hyperlink already on
+    {\glshyperlink[\glsgenentryfmt]{\glslabel}}%
   \fi
 }
 
-\renewcommand{\glossarypreamble}{\glsenablehyper}
-\renewcommand{\glossarypostamble}{\glsdisablehyper}
-
  % define a sample entry:
 \newglossaryentry{x}{name={x},description={sample entry}}
 
@@ -41,7 +35,8 @@ maths:
   \gls{x}
 \]
 
-Back to text mode again: \gls{x}.
+Back to text mode again: \gls{x}. Don't check the first use flag:
+\glstext{x}. Force on the hyperlink: \glstext+{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
index 371c3d30419..709bf2a1c1d 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf
index d9c28346976..86d8f0ad55b 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf
index e27cba1dbb1..baacad334f3 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf
index a58c42d1b70..289e2a10cc6 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf
index ff1882c51b5..cc406f99cd8 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf
index 8dad769377a..2706b79c96f 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf
index 9287e4d3598..a3ac443263b 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf
index e2bf3361606..bfa833f40fc 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf
index 01949abc071..c064b94d48a 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf
index 71e034dbb81..d69bcdabee7 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf
index 2fc5ae83dcf..b52a6999724 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf
index 594ddd82e35..9319e5c15d1 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf
index bba8ce3eb62..5235b146d6b 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf
index 63527a7362d..b0a5878f060 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex
index ad1312c1881..1cee32d7338 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex
@@ -6,6 +6,10 @@
  % arara: pdflatex: { synctex: on }
 \documentclass{report}
 
+ % If you want to add babel to this document, you may have to
+ % replace the : character in the labels if you are using a
+ % language setting (e.g. french) that makes : active.
+
 \usepackage[plainpages=false,colorlinks]{hyperref}
 \usepackage{html}
 \usepackage[toc,xindy]{glossaries}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf
index 5ea0673413b..41e67fdf088 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf
index c99dc037213..55089829cfe 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf
index bdb4a572378..3edb317ac7d 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.tex
index 3ea8ec5add6..ee6350a3604 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.tex
@@ -6,6 +6,10 @@
  % arara: pdflatex: { synctex: on }
 \documentclass{report}
 
+ % If you want to add babel to this document, you may have to
+ % replace the : character in the labels if you are using a
+ % language setting (e.g. french) that makes : active.
+
 \usepackage[plainpages=false,colorlinks]{hyperref}
 \usepackage[toc,acronym]{glossaries}
 
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf
index 9818ffb46ab..29ad7fddf90 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf
index 4f6bc57a7c4..705ff3272de 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex
index 45faef90cdc..f36d71ca1ef 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex
@@ -5,24 +5,30 @@
  % arara: pdflatex: { synctex: on }
 \documentclass{article}
 
-\usepackage[acronym,footnote,acronymlists={main,acronym2}]{glossaries}
+\usepackage[acronym,acronymlists={main,acronym2}]{glossaries}
 
 \newglossary[alg2]{acronym2}{acr2}{acn2}{Statistical Acronyms}
 
 \makeglossaries
 
+ % Use long (short) acronym style:
+\setacronymstyle{long-short}
+
+ % Main glossary is a list of calculus acronyms
 
 \renewcommand{\glossaryname}{Calculus Acronyms}
 
 \newacronym[type=main]{vc}{VC}{Vector Calculus}
 \newacronym[type=main]{ftoc}{FTOC}{Fundamental Theorem of Calculus}
 
+ % "acronym" glossary is a list of computer related acronyms
 
 \renewcommand{\acronymname}{Computer Acronyms}
 
 \newacronym{kb}{kb}{KiloBit}
 \newacronym{kB}{kB}{KiloByte}
 
+ % "acronym2" glossary is a list of statistical acronyms
 
 \newacronym[type=acronym2]{svm}{SVM}{Support Vector Machine}
 
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf
index 78f8fbdaf86..a16b261649c 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf
index f1a45b0335f..89d5974b9b8 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf
index 732990dd734..cd0eefeab20 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf
index 38540acacc3..4ce88cae6a0 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf