glossaries (28sep19)

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

2 files changed, 610 insertions, 492 deletions

diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
index 6da667da8b2..124662d6a67 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx
@@ -1,9 +1,10 @@
 %\iffalse
 % glossaries.dtx generated using makedtx version 1.2 (c) Nicola Talbot
 % Command line args:
-%   -setambles ".*\.perl=>\nopreamble\nopostamble"
-%   -setambles ".*\.tex=>\nopreamble\nopostamble"
-%   -setambles ".*\.xdy=>\nopreamble\nopostamble"
+%   -author "Nicola Talbot"
+%   -comment ".*\.perl"
+%   -comment ".*\.tex"
+%   -comment ".*\.xdy"
 %   -src "glossaries\.sty\Z=>glossaries.sty"
 %   -src "glossaries-prefix.sty\Z=>glossaries-prefix.sty"
 %   -src "(glossary-.+)\.(sty)\Z=>\1.\2"
@@ -20,18 +21,17 @@
 %   -src "(samplexdy-mc.*\.xdy)\Z=>\1"
 %   -src "(database.*\.tex)\Z=>\1"
 %   -src "(.*\.perl)\Z=>\1"
-%   -codetitle "Main Package Code"
-%   -author "Nicola Talbot"
 %   -macrocode ".*\.perl"
 %   -macrocode ".*\.tex"
 %   -macrocode ".*\.xdy"
 %   -section "chapter"
+%   -codetitle "Main Package Code"
 %   -doc "glossaries-manual.tex"
-%   -comment ".*\.perl"
-%   -comment ".*\.tex"
-%   -comment ".*\.xdy"
+%   -setambles ".*\.perl=>\nopreamble\nopostamble"
+%   -setambles ".*\.tex=>\nopreamble\nopostamble"
+%   -setambles ".*\.xdy=>\nopreamble\nopostamble"
 %   glossaries
-% Created on 2019/1/6 19:06
+% Created on 2019/9/28 15:01
 %\fi
 %\iffalse
 %<*package>
@@ -145,7 +145,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 
 \setcounter{IndexColumns}{2}
 
-\CheckSum{19625}
+\CheckSum{19658}
 
 \newcommand*{\ifirstuse}{\iterm{first use}}
 \newcommand*{\firstuse}{\gls{firstuse}}
@@ -172,12 +172,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 %\fi
 %\MakeShortVerb{"}
 %
-% \title{Documented Code For glossaries v4.42}
+% \title{Documented Code For glossaries v4.43}
 % \author{Nicola L.C. Talbot\\[10pt]
 %Dickimaw Books\\
 %\url{http://www.dickimaw-books.com/}}
 %
-% \date{2019-01-06}
+% \date{2019-09-28}
 % \maketitle
 %
 %This is the documented code for the \styfmt{glossaries} package.
@@ -193,7 +193,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 %glossaries package}.
 %
 %\item[\url{glossaries-user.pdf}]
-%For the main user guide, read \qt{glossaries.sty v4.42:
+%For the main user guide, read \qt{glossaries.sty v4.43:
 %\LaTeX2e\ Package to Assist Generating Glossaries}.
 %
 %\item[\url{mfirstuc-manual.pdf}]
@@ -248,7 +248,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 % This package requires \LaTeXe.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries}[2019/01/06 v4.42 (NLCT)]
+\ProvidesPackage{glossaries}[2019/09/28 v4.43 (NLCT)]
 %    \end{macrocode}
 %\changes{4.18}{2015-09-09}{split mfirstuc into separate bundle}
 % Required packages:
@@ -282,7 +282,8 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of
 \RequirePackage{amsgen}
 %    \end{macrocode}
 %\changes{3.0}{2011-04-02}{etoolbox now loaded}
-% As from v3.0, now loading \sty{etoolbox}:
+% As from v3.0, now loading \sty{etoolbox} (this is now redundant as
+% \sty{datatool-base} loads \sty{etoolbox}):
 %    \begin{macrocode}
 \RequirePackage{etoolbox}
 %    \end{macrocode}
@@ -1739,10 +1740,18 @@ false,nolabel,autolabel,nameref}[nolabel]{%
 %just do their argument. (This will be localised since
 %\cs{glsnoidxstripaccents} is used within a group.) Anything outside
 %this standard set really shouldn't be using
-%\cs{makenoidxglossaries}.
+%\cs{makenoidxglossaries}. It's much better to use \app{xindy} or
+%\app{bib2gls} with the correct language setting.
 %    \begin{macrocode}
 \newcommand*\glsnoidxstripaccents{%
   \let\IeC\@firstofone
+  \let\add@accent@\@secondoftwo
+  \let\@text@composite@x\@secondoftwo
+  \let\@tabacckludge\@secondoftwo
+  \expandafter\def\csname \encodingdefault-cmd\endcsname##1##2##3{##3}%
+  \expandafter\def\csname OT1-cmd\endcsname##1##2##3{##3}%
+  \expandafter\def\csname T1-cmd\endcsname##1##2##3{##3}%
+  \expandafter\def\csname PD1-cmd\endcsname##1##2##3{##3}%
   \let\'\@firstofone
   \let\`\@firstofone
   \let\^\@firstofone
@@ -1783,6 +1792,16 @@ false,nolabel,autolabel,nameref}[nolabel]{%
   \def\DH{DH}%
 }
 %    \end{macrocode}
+%\changes{4.43}{2019-09-28}{add check for LaTeX version 2019/10/01}
+%Need to check if the LaTeX kernel is at least version 2019/10/01 as
+%that changes the way that UTF-8 characters expand.
+%    \begin{macrocode}
+\@ifl@t@r\fmtversion{2019/10/01}
+{%
+ \appto\glsnoidxstripaccents{\let\UTFviii@two@octets\UTFviii@two@octets@combine}%
+}
+{}
+%    \end{macrocode}
 %\end{macro}
 %
 % Before defining the \pkgopt{sanitize} package option, The 
@@ -19177,7 +19196,7 @@ you
 % \cs{gls}\marg{label}} on subsequent use.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-prefix}[2019/01/06 v4.42 (NLCT)]
+\ProvidesPackage{glossaries-prefix}[2019/09/28 v4.43 (NLCT)]
 %    \end{macrocode}
 % Pass all options to \sty{glossaries}:
 %    \begin{macrocode}
@@ -19592,7 +19611,7 @@ you
 %\label{sec:code:hypernav}
 % Package Definition:
 %    \begin{macrocode}
-\ProvidesPackage{glossary-hypernav}[2019/01/06 v4.42 (NLCT)]
+\ProvidesPackage{glossary-hypernav}[2019/09/28 v4.43 (NLCT)]
 %    \end{macrocode}
 %
 % The commands defined in this package are provided to 
@@ -19785,7 +19804,7 @@ you
 % This defines an in-line style where the entries are
 % comma-separated with just the name and description displayed.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-inline}[2019/01/06 v4.42 (NLCT)]
+\ProvidesPackage{glossary-inline}[2019/09/28 v4.43 (NLCT)]
 %    \end{macrocode}
 %
 %\begin{style}{inline}
@@ -19976,7 +19995,7 @@ you
 % \ics{item} command, it will appear in a bold font by
 % default.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-list}[2019/01/06 v4.42 (NLCT)]
+\ProvidesPackage{glossary-list}[2019/09/28 v4.43 (NLCT)]
 %    \end{macrocode}
 %\begin{macro}{\indexspace}
 %\changes{4.13}{2015-02-03}{new}
@@ -20258,7 +20277,7 @@ you
 % The glossary styles defined in the \isty{glossary-long} package
 % used the \env{longtable} environment in the glossary.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-long}[2019/01/06 v4.42 (NLCT)]
+\ProvidesPackage{glossary-long}[2019/09/28 v4.43 (NLCT)]
 %    \end{macrocode}
 % Requires the \isty{longtable} package:
 %    \begin{macrocode}
@@ -20755,7 +20774,7 @@ you
 % \url{http://tex.stackexchange.com/a/56890}
 %
 %    \begin{macrocode}
-\ProvidesPackage{glossary-longbooktabs}[2019/01/06 v4.42 (NLCT)]
+\ProvidesPackage{glossary-longbooktabs}[2019/09/28 v4.43 (NLCT)]
 %    \end{macrocode}
 % Requires \sty{booktabs} package:
 %    \begin{macrocode}
@@ -21096,7 +21115,7 @@ you
 % used the \env{longtable} environment in the glossary and use
 % ragged right formatting for the multiline columns.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-longragged}[2019/01/06 v4.42 (NLCT)]
+\ProvidesPackage{glossary-longragged}[2019/09/28 v4.43 (NLCT)]
 %    \end{macrocode}
 % Requires the \isty{array} package:
 %    \begin{macrocode}
@@ -21529,7 +21548,7 @@ you
 %use the \sty{multicol} package. These use the tree-like glossary
 %styles in a multicol environment.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-mcols}[2019/01/06 v4.42 (NLCT)]
+\ProvidesPackage{glossary-mcols}[2019/09/28 v4.43 (NLCT)]
 %    \end{macrocode}
 % Required packages:
 %    \begin{macrocode}
@@ -21966,7 +21985,7 @@ you
 % The glossary styles defined in the \isty{glossary-super} package
 % use the \env{supertabular} environment.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-super}[2019/01/06 v4.42 (NLCT)]
+\ProvidesPackage{glossary-super}[2019/09/28 v4.43 (NLCT)]
 %    \end{macrocode}
 % Requires the \isty{supertabular} package:
 %    \begin{macrocode}
@@ -22498,7 +22517,7 @@ you
 % are like those provided by the \isty{glossary-super} package, 
 % except that the multiline columns have ragged right justification.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-superragged}[2019/01/06 v4.42 (NLCT)]
+\ProvidesPackage{glossary-superragged}[2019/09/28 v4.43 (NLCT)]
 %    \end{macrocode}
 % Requires the \isty{array} package:
 %    \begin{macrocode}
@@ -22938,7 +22957,7 @@ you
 % that have a tree-like structure. These are designed for
 % hierarchical glossaries.
 %    \begin{macrocode}
-\ProvidesPackage{glossary-tree}[2019/01/06 v4.42 (NLCT)]
+\ProvidesPackage{glossary-tree}[2019/09/28 v4.43 (NLCT)]
 %    \end{macrocode}
 %
 %\begin{macro}{\indexspace}
@@ -23659,7 +23678,7 @@ you
 % hyperlinks may not work properly.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-207}[2019/01/06 v4.42 (NLCT)]
+\ProvidesPackage{glossaries-compatible-207}[2019/09/28 v4.43 (NLCT)]
 %    \end{macrocode}
 %\begin{macro}{\GlsAddXdyAttribute}
 % Adds an attribute in old format.
@@ -24020,7 +24039,7 @@ you
 %\section{glossaries-compatible-307}
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-compatible-307}[2019/01/06 v4.42 (NLCT)]
+\ProvidesPackage{glossaries-compatible-307}[2019/09/28 v4.43 (NLCT)]
 %    \end{macrocode}
 %
 % Compatibility macros for predefined glossary styles:
@@ -24828,7 +24847,7 @@ you
 %    \end{macrocode}
 % Package version number now in line with main glossaries package number.
 %    \begin{macrocode}
-\ProvidesPackage{glossaries-accsupp}[2019/01/06 v4.42 (NLCT)
+\ProvidesPackage{glossaries-accsupp}[2019/09/28 v4.43 (NLCT)
   Experimental glossaries accessibility]
 %    \end{macrocode}
 % Pass all options to \sty{glossaries}:
@@ -27271,7 +27290,7 @@ you
 % modules.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-babel}[2019/01/06 v4.42 (NLCT)]
+\ProvidesPackage{glossaries-babel}[2019/09/28 v4.43 (NLCT)]
 %    \end{macrocode}
 % Load \sty{tracklang} to obtain language settings.
 %    \begin{macrocode}
@@ -27315,7 +27334,7 @@ you
 % modules.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{glossaries-polyglossia}[2019/01/06 v4.42 (NLCT)]
+\ProvidesPackage{glossaries-polyglossia}[2019/09/28 v4.43 (NLCT)]
 %    \end{macrocode}
 % Load \sty{tracklang} to obtain language settings.
 %    \begin{macrocode}
@@ -27356,46 +27375,47 @@ you
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain.
- %
- % 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
- % both the class file and the glossaries package.
- % Change the sample glossary entry and acronym if
- % required. If the problem occurs with an additional
- % glossary, add in the relevant \newglossary command
- % and a sample entry.
- %
- % Only add extra packages or commands if they 
- % contribute to whatever problem you are trying to
- % test.
- %
- % Remember that the document will not be complete
- % until you have successfully completed all of the
- % following steps:
- % 1. latex minimalgls
- % 2. makeglossaries 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.
- % Alternatively, if you use arara, you can add the following
- % directives in your document:
- %
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain.
+%
+% 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
+% both the class file and the glossaries package.
+% Change the sample glossary entry and acronym if
+% required. If the problem occurs with an additional
+% glossary, add in the relevant \newglossary command
+% and a sample entry.
+%
+% Only add extra packages or commands if they 
+% contribute to whatever problem you are trying to
+% test.
+%
+% Remember that the document will not be complete
+% until you have successfully completed all of the
+% following steps:
+% 1. latex minimalgls
+% 2. makeglossaries 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.
+% Alternatively, if you use arara, you can add the following
+% directives in your document:
+%
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
 
- % If you require multilingual support you must also install
- % the appropriate glossaries language module. The language
- % modules are distributed separately.
+% If you require multilingual support you must also install
+% the appropriate glossaries language module. The language
+% modules are distributed separately.
 
 \documentclass{article}
 \listfiles
 
 \usepackage[colorlinks]{hyperref}
- %\usepackage{glossaries} % abbreviation will go in main glossary
+%\usepackage{glossaries} % abbreviation will go in main glossary
  \usepackage[acronym]{glossaries} % make a separate list of acronyms
 
 \makeglossaries
@@ -27410,17 +27430,17 @@ you
 \newglossaryentry{sample}{name={sample},
 description={a sample entry}}
 
- % set the acronym style:
+% set the acronym style:
 \setacronymstyle{long-short}
 
- % This contrived acronym has non-standard plural forms.
- % These are specified in the optional argument.
- % Remove the optional argument to revert to the default 
- % plurals.
+% This contrived acronym has non-standard plural forms.
+% 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}
 
- % Keep all definitions in the preamble!
+% Keep all definitions in the preamble!
 
 \begin{document}
 
@@ -27443,6 +27463,7 @@ Title case a particular field:
 
 \printglossaries
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -29038,11 +29059,12 @@ amet, libero},
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex
- % arara: makeglossaries
- % arara: pdflatex
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex
+% arara: makeglossaries
+% arara: pdflatex
 \documentclass{report}
 
 \usepackage[colorlinks]{hyperref}
@@ -29057,13 +29079,13 @@ amet, libero},
 \renewcommand*{\glslinkpostsetkeys}{%
  \edef\currentchap{\arabic{chapter}}%
  \ifnum\currentchap=\glschapnum{\glslabel}\relax
- % Already used this entry in the current chapter, so switch
- % off the hyperlink.
+% Already used this entry in the current chapter, so switch
+% off the hyperlink.
   \setkeys{glslink}{hyper=false}%
  \else
- % Hasn't been used in the current chapter. Update the value
- % of the "chapter" field unless the hyperlink has been switched
- % off.
+% Hasn't been used in the current chapter. Update the value
+% of the "chapter" field unless the hyperlink has been switched
+% off.
   \glsifhyperon
   {%
     \glsfieldxdef{\glslabel}{chapter}{\currentchap}%
@@ -29097,6 +29119,7 @@ Use them again:  \forglsentries{\thislabel}{\gls{\thislabel}. }
 \printglossaries
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -29111,11 +29134,12 @@ Use them again:  \forglsentries{\thislabel}{\gls{\thislabel}. }
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % 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 }
+%<<COMMENT
+% 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}
@@ -29147,6 +29171,7 @@ description={sweet, fleshy product of plant containing seed}}
 \printglossaries
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -29161,32 +29186,33 @@ description={sweet, fleshy product of plant containing seed}}
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % 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 }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
 \documentclass{report}
 
 \usepackage[colorlinks]{hyperref}
 \usepackage[acronym,% create list of acronyms
- % The package option "nomain" is used here to suppress the
- % main glossary, since this example doesn't use it. If you
- % want to use the main glossary, remove the "nomain" option.
+% The package option "nomain" is used here to suppress the
+% main glossary, since this example doesn't use it. If you
+% want to use the main glossary, remove the "nomain" option.
             nomain 
             ]{glossaries}
 
 \makeglossaries
 
-  % This is a sample file to illustrate how to define a custom
-  % acronym style. This example defines the acronyms so that on first use
-  % they display the short form in the text and with the long form
-  % and description in a footnote. In the main body of the
-  % document the short form will be displayed in small caps, but in
-  % the list of acronyms the short form is displayed in normal
-  % capitals. To ensure this, the short form should be written in
-  % lower case when the acronym is defined, and \MakeTextUppercase is
-  % used when it's displayed in the list of acronyms.
+% This is a sample file to illustrate how to define a custom
+% acronym style. This example defines the acronyms so that on first use
+% they display the short form in the text and with the long form
+% and description in a footnote. In the main body of the
+% document the short form will be displayed in small caps, but in
+% the list of acronyms the short form is displayed in normal
+% capitals. To ensure this, the short form should be written in
+% lower case when the acronym is defined, and \MakeTextUppercase is
+% used when it's displayed in the list of acronyms.
 
 \newacronymstyle{custom-fn}% new style name
 {% Check for long form in case of a mixed glossary
@@ -29266,13 +29292,13 @@ description={sweet, fleshy product of plant containing seed}}
      }%
     }%
   }%
- % Use smallcaps for the acronym in the document text:
+% Use smallcaps for the acronym in the document text:
   \renewcommand*{\acronymfont}[1]{\textsc{##1}}%
   \renewcommand*{\acrpluralsuffix}{\glstextup{\glspluralsuffix}}%
- % Sort acronyms according to the long form:
+% Sort acronyms according to the long form:
   \renewcommand*{\acronymsort}[2]{##2}%
- % Set the name in the list of acronyms to the long form followed by
- % the short form (in upper case) in parentheses:
+% Set the name in the list of acronyms to the long form followed by
+% the short form (in upper case) in parentheses:
  \renewcommand*{\acronymentry}[1]{%
    \Glsentrylong{##1}\space(\MakeTextUppercase{\glsentryshort{##1}})}%
 }
@@ -29280,11 +29306,11 @@ description={sweet, fleshy product of plant containing seed}}
  % Now set the new acronym style (to override the default style)
 \setacronymstyle{custom-fn}
 
- % Set an appropriate glossary style:
+% Set an appropriate glossary style:
 \setglossarystyle{altlist}
 
- % Now define the acronyms (must be done after setting the custom
- % style)
+% Now define the acronyms (must be done after setting the custom
+% style)
 
 \newacronym[description={set of tags for use in developing hypertext
 documents}]{html}{html}{hyper text markup language}
@@ -29313,6 +29339,7 @@ Linking with insert: \acrfullpl{html}['s], \Acrfullpl{html}['s],
 
 \printglossaries
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -29327,9 +29354,12 @@ Linking with insert: \acrfullpl{html}['s], \Acrfullpl{html}['s],
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % arara: pdflatex
- % arara: makeglossaries
- % arara: pdflatex
+%<<COMMENT
+% This file is public domain.
+% If you want to use arara you need the following directives:
+% arara: pdflatex
+% arara: makeglossaries
+% arara: pdflatex
 \documentclass{article}
 
 \usepackage{glossaries}
@@ -29352,8 +29382,8 @@ Linking with insert: \acrfullpl{html}['s], \Acrfullpl{html}['s],
 \newacronym{laser}{laser}{light amplification by stimulated
 emission of radiation}
 
- % See the sample-initialisms.tex example file provided with
- % glossaries-extra.sty for a better way of doing this.
+% See the sample-initialisms.tex example file provided with
+% glossaries-extra.sty for a better way of doing this.
 
 \makeatletter
 \renewcommand{\glspostlinkhook}{%
@@ -29419,6 +29449,7 @@ Done.
 \rmfamily
 \printglossaries
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -29433,24 +29464,27 @@ Done.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % 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 }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
 \documentclass{article}
 
 \usepackage[acronym]{glossaries}
 
- % \newdualentry[main options]{label}{short}{long}{description}
+% \newdualentry[main options]{label}{short}{long}{description}
 
 \newcommand*{\newdualentry}[5][]{%
+  % main entry:
   \newglossaryentry{main-#2}{name={#4},%
   text={#3\glsadd{#2}},%
   description={#5},%
-  #1
+  #1% additional options for main entry
   }%
-  \newacronym{#2}{#3\glsadd{main-#2}}{#4}
+  % abbreviation:
+  \newacronym{#2}{#3\glsadd{main-#2}}{#4}%
 }
 
 \newdualentry{svm}% label
@@ -29466,6 +29500,7 @@ Done.
 
 \printglossaries
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -29480,12 +29515,13 @@ Done.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
 \documentclass{article}
 
 \usepackage[colorlinks]{hyperref}
@@ -29515,6 +29551,7 @@ These entries are only used once: \cgls{sql}, \cgls{rdbms},
 
 \printglossaries
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -29529,11 +29566,12 @@ These entries are only used once: \cgls{sql}, \cgls{rdbms},
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % 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 }
+%<<COMMENT
+% 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}
@@ -29557,6 +29595,7 @@ First use: \gls{distance}. Next use: \gls{distance}.
 \printglossaries
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -29571,11 +29610,12 @@ First use: \gls{distance}. Next use: \gls{distance}.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you are using arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+% If you are using arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
 \documentclass{report}
 
 \usepackage[colorlinks]{hyperref}
@@ -29600,6 +29640,7 @@ Next use: \gls{sample}.
 
 \printglossaries
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -29614,9 +29655,12 @@ Next use: \gls{sample}.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % arara: pdflatex
- % arara: makeglossaries
- % arara: pdflatex
+%<<COMMENT
+% This file is public domain.
+% If you want to use arara you need the following directives:
+% arara: pdflatex
+% arara: makeglossaries
+% arara: pdflatex
 \documentclass{article}
 
 \usepackage{glossaries}
@@ -29677,6 +29721,7 @@ Full: \acrfull{eg} \acrfull{ie} \acrfull{bsc} \acrfull{ba}
 
 \printglossaries
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -29691,11 +29736,12 @@ Full: \acrfull{eg} \acrfull{ie} \acrfull{bsc} \acrfull{ba}
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % 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 }
+%<<COMMENT
+% 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}
@@ -29716,6 +29762,7 @@ Full: \acrfull{eg} \acrfull{ie} \acrfull{bsc} \acrfull{ba}
 \printglossaries
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -29730,13 +29777,14 @@ Full: \acrfull{eg} \acrfull{ie} \acrfull{bsc} \acrfull{ba}
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
 \documentclass{report}
 
 \usepackage[colorlinks]{hyperref}
@@ -29745,19 +29793,19 @@ Full: \acrfull{eg} \acrfull{ie} \acrfull{bsc} \acrfull{ba}
 
 \makeglossaries
 
- % define terms for the index
+% define terms for the index
 
 \newterm[plural={stegosauruses}]{stegosaurus}
 \newterm[plural={triceratopses}]{triceratops}
 \newterm[plural={apatosauruses}]{apatosaurus}
 
- % To avoid labels conflicting with the same name in the main glossary
- % prefix the index label with "ind-". (This means that the name must
- % be set independently.)
+% To avoid labels conflicting with the same name in the main glossary
+% prefix the index label with "ind-". (This means that the name must
+% be set independently.)
 \newterm[name={dinosaur}]{ind-dinosaur}
 \newterm[name={Triassic}]{ind-triassic}
 
- % define terms for the main glossary
+% define terms for the main glossary
 
 \newglossaryentry{dinosaur}%
 {%
@@ -29791,6 +29839,7 @@ Indexed term: \gls{ind-dinosaur}.
 \printindex[style=mcolindexgroup]
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -29805,12 +29854,13 @@ Indexed term: \gls{ind-dinosaur}.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
+% arara: pdflatex: { synctex: on }
 \documentclass[a4paper]{report}
 
 \usepackage[plainpages=false,colorlinks]{hyperref}
@@ -29843,30 +29893,30 @@ sort={1},
 parent={glossary}}
 
 \newglossaryentry{pagelist}{name=page list,
- % description value has to be enclosed in braces
- % because it contains commas
+% description value has to be enclosed in braces
+% because it contains commas
 description={a list of individual pages or page ranges 
 (e.g.\ 1,2,4,7-9)}}
 
 \newglossaryentry{mtrx}{name=matrix,
 description={rectangular array of quantities},
- % plural is not simply obtained by appending an s, so specify
+% plural is not simply obtained by appending an s, so specify
 plural=matrices}
 
- % entry with a paragraph break in the description
+% entry with a paragraph break in the description
 
 \newglossaryentry{par}{name=paragraph,
 description={distinct section of 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
+% 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
 \newglossaryentry{cow}{name=cow,
- % this isn't necessary, as this form (appending an s) is
- % the default
+% this isn't necessary, as this form (appending an s) is
+% the default
 plural=cows,
- % description:
+% description:
 description={(\emph{pl.}\ cows, \emph{archaic} kine) an adult
 female of any bovine animal}}
 
@@ -29950,9 +30000,8 @@ There are two types of ordering: word ordering (which places
 ``\gls{sealion}'' before ``\gls{seal}'') and letter ordering
 (which places ``\gls{seal}'' before ``\gls{sealion}'').
 
-
-
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -29967,23 +30016,24 @@ There are two types of ordering: word ordering (which places
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % 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 }
+%<<COMMENT
+% 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 }
 
- % This file also requires the glossaries-english
- % and glossaries-french language modules. These must
- % be installed in addition to installing the glossaries package.
+% This file also requires the glossaries-english
+% and glossaries-french language modules. These must
+% be installed in addition to installing the glossaries package.
 \documentclass[english,french]{article}
 
 \usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
 \usepackage{babel}
- % The package option "nomain" is used here to suppress the
- % main glossary, since this example doesn't use it. If you
- % want to use the main glossary, remove the "nomain" option.
+% The package option "nomain" is used here to suppress the
+% main glossary, since this example doesn't use it. If you
+% want to use the main glossary, remove the "nomain" option.
 \usepackage[nomain]{glossaries}
 
 \newglossary[glg]{english}{gls}{glo}{English to French}
@@ -29991,7 +30041,7 @@ There are two types of ordering: word ordering (which places
 
 \makeglossaries
 
- % \newword{label}{english}{determiner}{french}
+% \newword{label}{english}{determiner}{french}
 \newcommand*{\newword}[4]{%
    \newglossaryentry{en-#1}{type=english,name={#2},description={#3 #4}}%
    \newglossaryentry{fr-#1}{type=french,name={#3 #4},text={#4},sort={#4},description={#2}}%
@@ -30013,6 +30063,7 @@ Le \gls{fr-cat} s'est repos\'e sur la \gls{fr-mat}.
 \selectlanguage{french}
 \printglossary[type=french]
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -30027,11 +30078,12 @@ Le \gls{fr-cat} s'est repos\'e sur la \gls{fr-mat}.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you are using arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+% If you are using arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
 \documentclass{article}
 
 \usepackage[colorlinks]{hyperref}
@@ -30092,6 +30144,7 @@ All uppercase: \GLSed{jump}, \GLSing{jump},
 \printglossaries
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -30106,10 +30159,11 @@ All uppercase: \GLSed{jump}, \GLSing{jump},
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex
- % arara: pdflatex
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex
+% arara: pdflatex
 \documentclass{report}
 
 \usepackage[utf8]{inputenc}
@@ -30123,9 +30177,11 @@ All uppercase: \GLSed{jump}, \GLSing{jump},
 
 \renewcommand{\theHequation}{\theequation}
 
- % main entries
+% main entries
 
 \newglossaryentry{elite}{%
+% first character needs to be grouped if its an extended character
+% otherwise first letter uppercasing (\Gls etc) won't work:
   name={{é}lite},
   description={select group of people}
 }
@@ -30146,7 +30202,7 @@ All uppercase: \GLSed{jump}, \GLSing{jump},
    especially for political reasons}
 }
 
- % Symbols
+% Symbols
 
 \newglossaryentry{set}{%
   type=symbols,
@@ -30176,7 +30232,7 @@ All uppercase: \GLSed{jump}, \GLSing{jump},
   sort={!},
   description={factorial}}
 
- % index entries
+% index entries
 
 \newterm{seal}
 
@@ -30224,6 +30280,8 @@ Set: \glsdisplaynumberlist{set}.
 
 \Gls{elite}: \glsdisplaynumberlist{elite}.
 
+\Gls{emigre}: \glsdisplaynumberlist{emigre}.
+
 \begin{equation}
 3\gls[counter=equation]{factorial} = 3 \times 2 \times 1
 \end{equation}
@@ -30254,6 +30312,7 @@ Sea lion locations:
 \printnoidxglossary[type=index,style=mcolindexgroup,sort=word]
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -30268,10 +30327,11 @@ Sea lion locations:
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex
- % arara: pdflatex
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex
+% arara: pdflatex
 \documentclass{report}
 
 \usepackage[colorlinks]{hyperref}
@@ -30282,9 +30342,12 @@ Sea lion locations:
 
 \renewcommand{\theHequation}{\theequation}
 
- % main entries
+% main entries
 
 \newglossaryentry{elite}{%
+% First letter must be grouped if it isn't a single character in
+% order for the first letter uppercasing commands (\Gls etc) to
+% work.
   name={{\'e}lite},
   description={select group of people}
 }
@@ -30305,7 +30368,7 @@ Sea lion locations:
    especially for political reasons}
 }
 
- % Symbols
+% Symbols
 
 \newglossaryentry{set}{%
   type=symbols,
@@ -30335,7 +30398,7 @@ Sea lion locations:
   sort={!},
   description={factorial}}
 
- % index entries
+% index entries
 
 \newterm{seal}
 
@@ -30413,6 +30476,7 @@ Sea lion locations:
 \printnoidxglossary[type=index,style=mcolindexgroup,sort=letter]
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -30427,11 +30491,12 @@ Sea lion locations:
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % 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 }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
 \documentclass{report}
 
 \usepackage[colorlinks]{hyperref}
@@ -30441,8 +30506,8 @@ Sea lion locations:
 
 \makeglossaries
 
- % redefine \glsentryfmt so that it adds a hyperlink
- % if not in math mode and the hyperlinks haven't been forced on
+% redefine \glsentryfmt so that it adds a hyperlink
+% if not in math mode and the hyperlinks haven't been forced on
 \renewcommand*{\glsentryfmt}{%
   \ifmmode
     \glsgenentryfmt
@@ -30453,7 +30518,7 @@ Sea lion locations:
   \fi
 }
 
- % define a sample entry:
+% define a sample entry:
 \newglossaryentry{x}{name={x},description={sample entry}}
 
 \begin{document}
@@ -30469,6 +30534,7 @@ Back to text mode again: \gls{x}. Don't check the first use flag:
 
 \printglossaries
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -30483,12 +30549,13 @@ Back to text mode again: \gls{x}. Don't check the first use flag:
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
+% arara: pdflatex: { synctex: on }
 \documentclass{report}
 
 \usepackage[colorlinks]{hyperref}
@@ -30523,6 +30590,7 @@ Here's some more information about \glspl{sample}.
 
 \printglossaries
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -30537,12 +30605,13 @@ Here's some more information about \glspl{sample}.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
+% arara: pdflatex: { synctex: on }
 
 \documentclass{article}
 
@@ -30610,6 +30679,7 @@ First use: \PGLSpl{sample}, \PGLSpl{svm}. Next use: \PGLSpl{sample}, \PGLSpl{svm
 
 \printacronyms
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -30624,11 +30694,12 @@ First use: \PGLSpl{sample}, \PGLSpl{svm}. Next use: \PGLSpl{sample}, \PGLSpl{svm
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % 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 }
+%<<COMMENT
+% 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{siunitx}
 \usepackage[style=long4col]{glossaries}
@@ -30646,6 +30717,7 @@ First use: \PGLSpl{sample}, \PGLSpl{svm}. Next use: \PGLSpl{sample}, \PGLSpl{svm
 
 \printglossaries
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -30660,11 +30732,12 @@ First use: \PGLSpl{sample}, \PGLSpl{svm}. Next use: \PGLSpl{sample}, \PGLSpl{svm
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex
- % arara: makeglossaries
- % arara: pdflatex
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex
+% arara: makeglossaries
+% arara: pdflatex
 \documentclass{article}
 
 \usepackage{glossaries}
@@ -30747,8 +30820,8 @@ First use: \PGLSpl{sample}, \PGLSpl{svm}. Next use: \PGLSpl{sample}, \PGLSpl{svm
 
 \setacronymstyle{mystyle}
 
- % The default for "abbrtype" is "acronym" so we don't need
- % this new key for acronyms:
+% The default for "abbrtype" is "acronym" so we don't need
+% this new key for acronyms:
 \newacronym[description={system for detecting the position and 
 speed of aircraft, ships, etc}]{radar}{radar}{radio detecting 
 and ranging}
@@ -30807,6 +30880,7 @@ Regular term: \gls{apple}.
 
 \printglossaries
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -30821,11 +30895,12 @@ Regular term: \gls{apple}.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex
- % arara: makeglossaries
- % arara: pdflatex
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex
+% arara: makeglossaries
+% arara: pdflatex
 \documentclass{article}
 
 \usepackage{glossaries}
@@ -30908,8 +30983,8 @@ Regular term: \gls{apple}.
 
 \setacronymstyle{mystyle}
 
- % The default for "abbrtype" is "acronym" so we don't need
- % this new key for acronyms:
+% The default for "abbrtype" is "acronym" so we don't need
+% this new key for acronyms:
 \newacronym{radar}{radar}{radio detecting and ranging}
 \newacronym{laser}{laser}{light amplification by stimulated 
 emission of radiation}
@@ -30933,6 +31008,7 @@ Next use: \gls{radar}, \gls{laser}, \gls{scuba}, \gls{dsp},
 
 \printglossaries
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -30947,12 +31023,13 @@ Next use: \gls{radar}, \gls{laser}, \gls{scuba}, \gls{dsp},
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
+% arara: pdflatex: { synctex: on }
 \documentclass[a4paper]{report}
 
 \usepackage[plainpages=false,colorlinks]{hyperref}
@@ -30979,20 +31056,20 @@ sort={1},
 parent={glossary}}
 
 \newglossaryentry{pagelist}{name=page list,
- % description value has to be enclosed in braces
- % because it contains commas
+% description value has to be enclosed in braces
+% because it contains commas
 description={a list of individual pages or page ranges 
 (e.g.\ 1,2,4,7-9)}}
 
 \newglossaryentry{mtrx}{name=matrix,
 description={rectangular array of quantities},
- % plural is not simply obtained by appending an s, so specify
+% plural is not simply obtained by appending an s, so specify
 plural=matrices}
 
- % Entry with a paragraph break in the description:
- % (If you use \newglossaryentry, the paragraph break
- % must be identified with \glspar not with \par or a blank line.
- % It's easier to use \longnewglossaryentry.)
+% Entry with a paragraph break in the description:
+% (If you use \newglossaryentry, the paragraph break
+% must be identified with \glspar not with \par or a blank line.
+% It's easier to use \longnewglossaryentry.)
 
 \longnewglossaryentry{par}% label
 {name=paragraph}% options
@@ -31001,14 +31078,14 @@ 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
+% 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
 \newglossaryentry{cow}{name=cow,
- % this isn't necessary, as this form (appending an s) is
- % the default
+% this isn't necessary, as this form (appending an s) is
+% the default
 plural=cows,
- % description:
+% description:
 description={(\emph{pl.}\ cows, \emph{archaic} kine) an adult
 female of any bovine animal}}
 
@@ -31035,12 +31112,12 @@ parent=bravo}
  description={large seal}%
 }
 
- % If a value contains a comma, you must use braces to hide
- % it from the key=value list parser. Take care to avoid
- % accidentally introducing unwanted space as leading and trailing
- % spaces within the braces aren't stripped. For example,
- % text={ spurious space } will result in extra space appearing
- % when the entry is referenced.  
+% If a value contains a comma, you must use braces to hide
+% it from the key=value list parser. Take care to avoid
+% accidentally introducing unwanted space as leading and trailing
+% spaces within the braces aren't stripped. For example,
+% text={ spurious space } will result in extra space appearing
+% when the entry is referenced.  
 \newglossaryentry{spuriousspace}{%
   name={space, spurious},
   text={spurious space},
@@ -31113,6 +31190,7 @@ There are two types of ordering: word ordering (which places
 \printglossaries
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -31127,11 +31205,12 @@ There are two types of ordering: word ordering (which places
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % 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 }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
 \documentclass[a4paper]{article}
 
 \usepackage[style=long4colheaderborder]{glossaries}
@@ -31156,6 +31235,7 @@ The width, \gls{w}, is measured in meters. The mass, \gls{M} is
 measured in kilograms.
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -31170,11 +31250,12 @@ measured in kilograms.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % 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 }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
 \documentclass[a4paper]{article}
 
 \usepackage[margin=0.5in]{geometry}
@@ -31214,6 +31295,7 @@ measured in kilograms.
 
 \printglossaries
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -31228,12 +31310,13 @@ measured in kilograms.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
+% arara: pdflatex: { synctex: on }
 \documentclass[a4paper]{report}
 
 \usepackage[colorlinks,plainpages=false]{hyperref}
@@ -31243,7 +31326,7 @@ measured in kilograms.
 
 \makeglossaries
 
- % Set the acronym style
+% Set the acronym style
 \setacronymstyle{long-sc-short}
 
 \newacronym{svm}% label
@@ -31316,6 +31399,7 @@ You don't need to worry about makeindex's special characters:
 \printglossary[title={List of Acronyms}]
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -31330,19 +31414,20 @@ You don't need to worry about makeindex's special characters:
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
+% arara: pdflatex: { synctex: on }
 \documentclass[a4paper]{report}
 
 \usepackage[colorlinks,plainpages=false]{hyperref}
 \usepackage[acronym,% create 'acronym' glossary type
- % The package option "nomain" is used here to suppress the
- % main glossary, since this example doesn't use it. If you
- % want to use the main glossary, remove the "nomain" option.
+% The package option "nomain" is used here to suppress the
+% main glossary, since this example doesn't use it. If you
+% want to use the main glossary, remove the "nomain" option.
             nomain,% 
             style=altlist, % use altlist style
             toc, % add the glossary to the table of contents
@@ -31350,14 +31435,14 @@ You don't need to worry about makeindex's special characters:
 
 \makeglossaries
 
- % Change the acronym style to long-sc-short-desc:
+% Change the acronym style to long-sc-short-desc:
 \setacronymstyle{long-sc-short-desc}
 
- % Change the "see" items so that they use \acronymfont:
+% 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:
+% Not using a font that supports bold smallcaps so change the way
+% the name is formatted in the glossary:
 
 \renewcommand*{\glsnamefont}[1]{\textmd{#1}}
 
@@ -31378,7 +31463,7 @@ technique~\protect\cite{svm}}, % acronym's description
 \chapter{Support Vector Machines}
 
 The \gls{svm} is used widely in the area of pattern recognition.
- % plural form with initial letter in uppercase:
+% plural form with initial letter in uppercase:
 \Glspl{svm} are \ldots\ (but beware, converting the initial letter to
 upper case for a small caps acronym is sometimes considered 
 poor style).
@@ -31406,6 +31491,7 @@ one \gls[format=hyperbf]{svm}.
 \printglossary
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -31420,11 +31506,12 @@ one \gls[format=hyperbf]{svm}.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % 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 }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
 \documentclass{article}
 
 \usepackage[acronym,acronymlists={main,acronym2}]{glossaries}
@@ -31433,24 +31520,24 @@ one \gls[format=hyperbf]{svm}.
 
 \makeglossaries
 
- % Use long (short) acronym style:
+% Use long (short) acronym style:
 \setacronymstyle{long-short}
 
- % Main glossary is a list of calculus acronyms
+% 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
+% "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
+% "acronym2" glossary is a list of statistical acronyms
 
 \newacronym[type=acronym2]{svm}{SVM}{Support Vector Machine}
 
@@ -31462,6 +31549,7 @@ one \gls[format=hyperbf]{svm}.
 
 \printglossaries
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -31476,19 +31564,20 @@ one \gls[format=hyperbf]{svm}.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
+% arara: pdflatex: { synctex: on }
 \documentclass[a4paper]{report}
 
 \usepackage[colorlinks,plainpages=false]{hyperref}
 \usepackage[acronym,% create 'acronym' glossary type
- % The package option "nomain" is used here to suppress the
- % main glossary, since this example doesn't use it. If you
- % want to use the main glossary, remove the "nomain" option.
+% The package option "nomain" is used here to suppress the
+% main glossary, since this example doesn't use it. If you
+% want to use the main glossary, remove the "nomain" option.
             nomain, 
             style=altlist, % use altlist style
             toc, % add the glossary to the table of contents
@@ -31496,8 +31585,8 @@ one \gls[format=hyperbf]{svm}.
 
 \makeglossaries
 
- % Define a new acronym style called "altfn" that's based on the
- % footnote-sc-desc style
+% Define a new acronym style called "altfn" that's based on the
+% footnote-sc-desc style
 
 \newacronymstyle
  {altfn}% style name
@@ -31506,44 +31595,44 @@ one \gls[format=hyperbf]{svm}.
  }%
  {% Inherit definitions from "footnote-sc-desc"
     \GlsUseAcrStyleDefs{footnote-sc-desc}%
- % Modify the first use display styles so they put the long form
- % followed by the description in the footnote:
- %
- % First use of \gls:
+% Modify the first use display styles so they put the long form
+% followed by the description in the footnote:
+%
+% First use of \gls:
   \renewcommand*{\genacrfullformat}[2]{%
    \protect\firstacronymfont{\glsentryshort{##1}}##2%
    \protect\footnote{\glsentrylong{##1}: \glsentrydesc{##1}}%
   }%
- % First use of \Gls:
+% First use of \Gls:
   \renewcommand*{\Genacrfullformat}[2]{%
    \firstacronymfont{\Glsentryshort{##1}}##2%
    \protect\footnote{\glsentrylong{##1}: \glsentrydesc{##1}}%
   }%
- % First use of \glspl:
+% First use of \glspl:
   \renewcommand*{\genplacrfullformat}[2]{%
    \protect\firstacronymfont{\glsentryshortpl{##1}}##2%
    \protect\footnote{\glsentrylongpl{##1}: \glsentrydesc{##1}}%
   }%
- % First use of \Glspl:
+% First use of \Glspl:
   \renewcommand*{\Genplacrfullformat}[2]{%
    \protect\firstacronymfont{\Glsentryshortpl{##1}}##2%
    \protect\footnote{\glsentrylongpl{##1}: \glsentrydesc{##1}}%
   }%
- % Sort according to long form:
+% Sort according to long form:
   \renewcommand*{\acronymsort}[2]{##2}%
- % Set the name (as displayed in the glossary) to long (short)
+% 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:
+% 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:
+% Now use this new style:
 \setacronymstyle{altfn}
 
- % Change the "see" items so that they use \acronymfont:
+% Change the "see" items so that they use \acronymfont:
 \renewcommand*{\glsseeitemformat}[1]{\acronymfont{\glsentrytext{#1}}}
 
 \newacronym[description={Statistical pattern recognition 
@@ -31562,7 +31651,7 @@ support vector machine}
 \chapter{Support Vector Machines}
 
 The \gls{svm} is used widely in the area of pattern recognition.
- % plural form with initial letter in uppercase:
+% plural form with initial letter in uppercase:
 \Glspl{svm} are \ldots\ (but beware, converting the initial letter to
 upper case for a small caps acronym is sometimes considered 
 poor style).
@@ -31591,6 +31680,7 @@ one \gls[format=hyperbf]{svm}.
 \printglossary
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -31605,11 +31695,12 @@ one \gls[format=hyperbf]{svm}.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % 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 }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
 \documentclass{article}
 
 \usepackage[colorlinks,plainpages=false]{hyperref}
@@ -31629,6 +31720,7 @@ one \gls[format=hyperbf]{svm}.
 \printglossaries
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -31643,15 +31735,16 @@ one \gls[format=hyperbf]{svm}.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- %
- % See also sampleAcrDesc.tex
- %
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+%
+% See also sampleAcrDesc.tex
+%
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
+% arara: pdflatex: { synctex: on }
 \documentclass[a4paper]{report}
 
 \usepackage[colorlinks,plainpages=false]{hyperref}
@@ -31663,15 +31756,15 @@ one \gls[format=hyperbf]{svm}.
 \makeglossaries
 
 \newglossaryentry{svm}{
- % how the entry name should appear in the glossary
+% how the entry name should appear in the glossary
 name={Support vector machine (SVM)},
- % how the description should appear in the glossary
+% how the description should appear in the glossary
 description={Statistical pattern recognition
 technique~\cite{svm}},
- % how the entry should appear in the document text
+% how the entry should appear in the document text
 text={svm},
- % how the entry should appear the first time it is
- % used in the document text
+% how the entry should appear the first time it is
+% used in the document text
 first={support vector machine (svm)}}
 
 \newglossaryentry{ksvm}{
@@ -31687,7 +31780,7 @@ first={kernel support vector machine}}
 \chapter{Support Vector Machines}
 
 The \gls{svm} is used widely in the area of pattern recognition.
- % plural form with initial letter in uppercase:
+% plural form with initial letter in uppercase:
 \Glspl{svm} are \ldots
 
 This is the text produced without a link: \glsentrytext{svm}.
@@ -31714,6 +31807,7 @@ one \gls[format=hyperbf]{svm}.
 \printglossary[title={Acronyms}]
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -31728,7 +31822,12 @@ one \gls[format=hyperbf]{svm}.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
+%<<COMMENT
+% This file is public domain
+% If you want to use arara you need the following directives:
+% arara: pdflatex
+% arara: makeglossaries
+% arara: pdflatex
 \documentclass[a4paper,12pt]{report}
 
 \usepackage{amsmath}
@@ -31742,18 +31841,18 @@ one \gls[format=hyperbf]{svm}.
 
 \pagestyle{headings}
 
- % redefine the way hyperref creates the target for equations
- % so that the glossary links to equation numbers work
+% redefine the way hyperref creates the target for equations
+% so that the glossary links to equation numbers work
 
  \renewcommand*\theHequation{\theHchapter.\arabic{equation}}
 
- % Change the glossary headings
+% Change the glossary headings
 
 \renewcommand{\entryname}{Notation}
 \renewcommand{\descriptionname}{Function Name}
 \renewcommand{\pagelistname}{Number of Formula}
 
- % define glossary entries
+% define glossary entries
 
 \newglossaryentry{Gamma}{name=\ensuremath{\Gamma(z)},
 description=Gamma function,
@@ -31967,6 +32066,7 @@ Bessel functions $Z_\nu$ are solutions of
 \end{equation}
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -31981,29 +32081,30 @@ Bessel functions $Z_\nu$ are solutions of
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- %
- % To ensure that the page numbers are up-to-date:
- %
- % latex sampleEqPg
- % makeglossaries sampleEqPg
- % latex sampleEqPg
- % makeglossaries sampleEqPg
- % latex sampleEqPg
- %
- % The extra makeglossaries run is required because adding the
- % glossary in the second LaTeX run shifts the page numbers on
- % which means that the glossary needs to be updated again.
- % (Note that this problem is avoided if the page numbering is
- % reset after the glossary. For example, if the glossary has
- % roman numbering and the subsequent pages have arabic numbering)
- %
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+%
+% To ensure that the page numbers are up-to-date:
+%
+% latex sampleEqPg
+% makeglossaries sampleEqPg
+% latex sampleEqPg
+% makeglossaries sampleEqPg
+% latex sampleEqPg
+%
+% The extra makeglossaries run is required because adding the
+% glossary in the second LaTeX run shifts the page numbers on
+% which means that the glossary needs to be updated again.
+% (Note that this problem is avoided if the page numbering is
+% reset after the glossary. For example, if the glossary has
+% roman numbering and the subsequent pages have arabic numbering)
+%
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
 \documentclass[a4paper,12pt]{report}
 
 \usepackage{amsmath}
@@ -32014,8 +32115,8 @@ Bessel functions $Z_\nu$ are solutions of
 \newcommand{\erf}{\operatorname{erf}}
 \newcommand{\erfc}{\operatorname{erfc}}
 
- % redefine the way hyperref creates the target for equations
- % so that the glossary links to equation numbers work
+% redefine the way hyperref creates the target for equations
+% so that the glossary links to equation numbers work
 
 \renewcommand*\theHequation{\thechapter.\arabic{equation}}
 
@@ -32024,27 +32125,27 @@ Bessel functions $Z_\nu$ are solutions of
 \renewcommand{\glossarypreamble}{Numbers in italic indicate the equation number,
 numbers in bold indicate page numbers where the main definition occurs.\par}
 
- % set the glossary number style to italic
- % hyperit is used instead of textit because
- % the hyperref package is being used.
+% set the glossary number style to italic
+% hyperit is used instead of textit because
+% the hyperref package is being used.
 \renewcommand{\glsnumberformat}[1]{\hyperit{#1}}
 
- % 1st column heading
+% 1st column heading
 \renewcommand{\entryname}{Notation}
 
- % 2nd column heading
+% 2nd column heading
 \renewcommand{\descriptionname}{Function Name}
 
- % 3rd column heading
+% 3rd column heading
 \renewcommand{\pagelistname}{}
 
- % Redefine header row so that it
- % adds a blank row after the title row
+% Redefine header row so that it
+% adds a blank row after the title row
 \renewcommand{\glossaryheader}{\bfseries\entryname &
 \bfseries\descriptionname&\bfseries\pagelistname\\
 & & \\\endhead}
 
- % Define glossary entries
+% Define glossary entries
 
 \newglossaryentry{Gamma}{name=\ensuremath{\Gamma(z)},
 description=Gamma function,sort=Gamma}
@@ -32276,6 +32377,7 @@ Bessel functions $Z_\nu(z)$ are solutions of
 \end{equation}
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -32290,19 +32392,20 @@ Bessel functions $Z_\nu(z)$ are solutions of
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
+% arara: pdflatex: { synctex: on }
 \documentclass[a4paper]{report}
 
 \usepackage[colorlinks,plainpages=false]{hyperref}
 \usepackage[acronym,% create 'acronym' glossary type
- % The package option "nomain" is used here to suppress the
- % main glossary, since this example doesn't use it. If you
- % want to use the main glossary, remove the "nomain" option.
+% The package option "nomain" is used here to suppress the
+% main glossary, since this example doesn't use it. If you
+% want to use the main glossary, remove the "nomain" option.
             nomain,
             style=altlist, % use altlist style
             toc, % add the glossary to the table of contents
@@ -32310,19 +32413,19 @@ Bessel functions $Z_\nu(z)$ are solutions of
 
 \makeglossaries
 
- % Change the acronym style to a small-caps footnote style:
+% Change the acronym style to a small-caps footnote style:
 \setacronymstyle{footnote-sc-desc}
 
- % Make some minor adjustments to the style:
+% Make some minor adjustments to the style:
 \renewcommand*{\acronymsort}[2]{#1}% sort by short form
 \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.
+% 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:
+% Change the "see" items so that they use \acronymfont:
 \renewcommand*{\glsseeitemformat}[1]{\acronymfont{\glsentrytext{#1}}}
 
 
@@ -32342,7 +32445,7 @@ support vector machine}
 \chapter{Support Vector Machines}
 
 The \gls{svm} is used widely in the area of pattern recognition.
- % plural form with initial letter in uppercase:
+% plural form with initial letter in uppercase:
 \Glspl{svm} are \ldots\ (but beware, converting the initial letter to
 upper case for a small caps acronym is sometimes considered 
 poor style).
@@ -32370,6 +32473,7 @@ one \gls[format=hyperbf]{svm}.
 \printglossary
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -32384,28 +32488,29 @@ one \gls[format=hyperbf]{svm}.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
+% arara: pdflatex: { synctex: on }
 \documentclass{report}
 
- % 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.
+% 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}
 
- % Define a new glossary type called notation
+% Define a new glossary type called notation
 \newglossary[nlg]{notation}{not}{ntn}{Notation}
 
 \makeglossaries
 
- % Notation definitions
+% Notation definitions
 
 \newglossaryentry{not:set}{type=notation, % glossary type
 name={$\mathcal{S}$},
@@ -32427,7 +32532,7 @@ name={$!$},
 description={factorial},
 sort=factorial}
 
- % Main glossary definitions
+% Main glossary definitions
 
 \newglossaryentry{gls:set}{name=set,
 description={A collection of distinct objects}}
@@ -32442,7 +32547,7 @@ description={The number of elements in the specified set}}
 \maketitle
 
 \begin{abstract}
- %stop hyperref complaining about duplicate page identifiers:
+%stop hyperref complaining about duplicate page identifiers:
 \pagenumbering{Alph}
 This is a sample document illustrating the use of the
 \textsf{glossaries} package.  In this example, a new glossary type
@@ -32475,6 +32580,7 @@ Another mention of the universal set \gls{not:U}.
 The factorial symbol: \gls{not:fact}.
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -32489,13 +32595,14 @@ The factorial symbol: \gls{not:fact}.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you are using arara, you need the following directives:
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+% If you are using arara, you need the following directives:
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
+% arara: pdflatex: { synctex: on }
 \documentclass{report}
 
 \usepackage[colorlinks]{hyperref}
@@ -32506,7 +32613,7 @@ The factorial symbol: \gls{not:fact}.
 \newcommand{\sortname}[2]{#2, #1}
 \newcommand{\textname}[2]{#1 #2}
 
- % Syntax: \name{first name}{surname}
+% Syntax: \name{first name}{surname}
  \let\name\textname
 
 \renewcommand{\glsprestandardsort}[3]{%
@@ -32546,6 +32653,7 @@ The factorial symbol: \gls{not:fact}.
 \printglossaries
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -32560,12 +32668,13 @@ The factorial symbol: \gls{not:fact}.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
+% arara: pdflatex: { synctex: on }
 \documentclass{report}
 
 \usepackage[plainpages=false,colorlinks]{hyperref}
@@ -32624,6 +32733,7 @@ a \gls{sing}['s] dimensions are not necessarily equal.
 Another \gls{ident} entry.
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -32638,22 +32748,23 @@ Another \gls{ident} entry.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
+% arara: pdflatex: { synctex: on }
 \documentclass{report}
 
- % 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.
+% 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}
 
- % Define a new glossary type called notation
+% Define a new glossary type called notation
 \newglossary[nlg]{notation}{not}{ntn}{Notation}
 
 \makeglossaries
@@ -32671,7 +32782,7 @@ Another \gls{ident} entry.
   }%
 }
 
- % Notation definitions
+% Notation definitions
 
 \newglossaryentry{not:set}{type=notation, % glossary type
 name={$\mathcal{S}$},
@@ -32688,7 +32799,7 @@ name={$|\mathcal{S}|$},
 text={|\mathcal{S}|},
 description={cardinality of $\mathcal{S}$}}
 
- % Main glossary definitions
+% Main glossary definitions
 
 \newglossaryentry{gls:set}{name=set,
 description={A collection of distinct objects}}
@@ -32696,7 +32807,7 @@ description={A collection of distinct objects}}
 \newglossaryentry{gls:card}{name=cardinality,
 description={The number of elements in the specified set}}
 
- % Acronym definitions
+% Acronym definitions
 
 \newacronym{zfc}{ZFC}{Zermelo-Fraenkel set theory}
 
@@ -32711,7 +32822,7 @@ description={The number of elements in the specified set}}
 \maketitle
 
 \begin{abstract}
- %stop hyperref complaining about duplicate page identifiers:
+%stop hyperref complaining about duplicate page identifiers:
 \pagenumbering{Alph}
 This is a sample document illustrating the use of the
 \textsf{glossaries} package.  In this example, a new glossary type
@@ -32744,6 +32855,7 @@ Another mention of the empty set $\gls{not:emptyset}$.
 Here are the acronyms again: \gls{nf}, \gls{zfc} and \gls{ad}.
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -32758,18 +32870,19 @@ Here are the acronyms again: \gls{nf}, \gls{zfc} and \gls{ad}.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % 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 }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
 \documentclass{report}
 
 \usepackage[colorlinks]{hyperref}
 \usepackage[style=alttreehypergroup,nolong,nosuper]{glossaries}
 
- % The alttree type of glossary styles need to know the
- % widest entry name for each level
+% The alttree type of glossary styles need to know the
+% widest entry name for each level
 \glssetwidest{Roman letters} % level 0 widest name
 \glssetwidest[1]{Sigma}      % level 1 widest name
 
@@ -32827,6 +32940,7 @@ The letter \gls{C} represents Euler's constant.
 \printglossaries
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -32841,11 +32955,12 @@ The letter \gls{C} represents Euler's constant.
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % 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 }
+%<<COMMENT
+% This file is public domain
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
 \documentclass{article}
 
 \usepackage[utf8]{inputenc}
@@ -32854,9 +32969,9 @@ The letter \gls{C} represents Euler's constant.
 
 \makeglossaries
 
- % Note that because the é is the first letter of the
- % name, it needs to be grouped or it will cause a
- % problem for \makefirstuc due to expansion issues.
+% Note that because the é is the first letter of the
+% name, it needs to be grouped or it will cause a
+% problem for \makefirstuc due to expansion issues.
 \newglossaryentry{elite}{name={{é}lite},
 description={select group or class}}
 
@@ -32869,8 +32984,8 @@ description=large deer}
 \newglossaryentry{mannerly}{name=mannerly,
 description=polite}
 
- % The œ is not the first letter, so it doesn't need to
- % be grouped.
+% The œ is not the first letter, so it doesn't need to
+% be grouped.
 \newglossaryentry{manoeuvre}{name={manœuvre},
 description=planned and controlled movement}
 
@@ -32894,6 +33009,7 @@ description=man-eating giant}
 \printglossaries
 
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
@@ -33224,21 +33340,22 @@ This page discusses \gls{mcnemar} who introduced
 %\fi
 %\iffalse
 %    \begin{macrocode}
- % This file is public domain
- %
- % This is a sample document illustrating how to use the 
- % glossaries package with xindy. To create the document:
- %
- % pdflatex samplexdy2
- % makeglossaries samplexdy2
- % pdflatex samplexdy2
- %
- % This sample file won't work with makeindex
- %
- % If you want to use arara, you need the following directives:
- % arara: pdflatex: { synctex: on }
- % arara: makeglossaries
- % arara: pdflatex: { synctex: on }
+%<<COMMENT
+% This file is public domain
+%
+% This is a sample document illustrating how to use the 
+% glossaries package with xindy. To create the document:
+%
+% pdflatex samplexdy2
+% makeglossaries samplexdy2
+% pdflatex samplexdy2
+%
+% This sample file won't work with makeindex
+%
+% If you want to use arara, you need the following directives:
+% arara: pdflatex: { synctex: on }
+% arara: makeglossaries
+% arara: pdflatex: { synctex: on }
 \documentclass{report}
 
 \usepackage[utf8]{inputenc}
@@ -33246,7 +33363,7 @@ This page discusses \gls{mcnemar} who introduced
 \usepackage[colorlinks]{hyperref}
 \usepackage[xindy,counter=section]{glossaries}
 
- % Set up somewhat eccentric section numbering system:
+% Set up somewhat eccentric section numbering system:
 
 \renewcommand*{\thesection}{[\thechapter]\arabic{section}}
 
@@ -33257,15 +33374,15 @@ This page discusses \gls{mcnemar} who introduced
   "arabic-numbers" :sep "]" "arabic-numbers"
 }
 
- % If part is 0, then \thepart will be empty, so add an extra
- % case to catch this:
+% If part is 0, then \thepart will be empty, so add an extra
+% case to catch this:
 
 \GlsAddXdyLocation{zero.section}{:sep "[" 
   "arabic-numbers" :sep "]" "arabic-numbers"
 }
 
- % (Note that the above will stop xindy giving a warning, but the
- % location hyper links will be invalid if no \part is used.)
+% (Note that the above will stop xindy giving a warning, but the
+% location hyper links will be invalid if no \part is used.)
 
 \makeglossaries
 
@@ -33297,6 +33414,7 @@ brackets.
 
 \printglossaries
 \end{document}
+%COMMENT
 %    \end{macrocode}
 %\fi
 %\iffalse
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
index 14ad799bbbb..f46dd99a7ae 100644
--- a/Master/texmf-dist/source/latex/glossaries/glossaries.ins
+++ b/Master/texmf-dist/source/latex/glossaries/glossaries.ins
@@ -1,4 +1,4 @@
-% glossaries.ins generated using makedtx version 1.2 2019/1/6 19:06
+% glossaries.ins generated using makedtx version 1.2 2019/9/28 15:01
 \input docstrip
 
 \preamble