diff options
Diffstat (limited to 'macros/latex')
141 files changed, 3211 insertions, 2154 deletions
diff --git a/macros/latex/contrib/acrotex/README.md b/macros/latex/contrib/acrotex/README.md index 0ab4acdba4..8e149839d5 100644 --- a/macros/latex/contrib/acrotex/README.md +++ b/macros/latex/contrib/acrotex/README.md @@ -1,6 +1,6 @@ The AcroTeX eDucation Bundle Author: D. P. Story -Dated: 2019-05-24 +Dated: 2019-08-13 AeB contains the following: @@ -19,6 +19,9 @@ AeB contains the following: 6) Documentation for AeB (AcroTeX eDucatation Bundle) and eForms (including insdljs and dljslib). +What's New (2019-08-13) Use \protect when formatting a enhanced preview value. +Other minor changes and bug fixes. + What's New (2019-05-24) Added the enhanced preview feature. When in effect along with ordinary preview, captions of buttons and initial values of other fields are viewable in non-conforming PDF readers. diff --git a/macros/latex/contrib/acrotex/acrotex.ins b/macros/latex/contrib/acrotex/acrotex.ins index 99459c8a64..3afd02ab57 100644 --- a/macros/latex/contrib/acrotex/acrotex.ins +++ b/macros/latex/contrib/acrotex/acrotex.ins @@ -55,29 +55,29 @@ % Install the Exerquiz Package % \generate{% - \file{exerquiz.sty}{\from{exerquiz.dtx}{copyright,package}} - \file{aebjs.def}{\from{exerquiz.dtx}{copyright,aebjs}} -% \file{eqexam.def}{\from{exerquiz.dtx}{eqexam}} - \file{aebrandom.def}{\from{exerquiz.dtx}{copyright,randomize}} - \file{aebsumrytbls.def}{\from{exerquiz.dtx}{copyright,sumrytbls}} - \file{usemcfi.def}{\from{exerquiz.dtx}{copyright,mcfi}} - \file{eqcolor.def}{\from{exerquiz.dtx}{copyright,eqcolor}} - \file{template.def}{\from{exerquiz.dtx}{copyright,template}} - \file{eqfr.def}{\from{exerquiz.dtx}{copyright,eqfr}} - \file{eqde.def}{\from{exerquiz.dtx}{copyright,eqde}} - \file{eqno.def}{\from{exerquiz.dtx}{copyright,eqno}} - \file{eqnl.def}{\from{exerquiz.dtx}{copyright,eqnl}} - \file{eqes.def}{\from{exerquiz.dtx}{copyright,eqes}} - \file{eqit.def}{\from{exerquiz.dtx}{copyright,eqit}} - \file{eqru.def}{\from{exerquiz.dtx}{copyright,eqru}} - \file{eqda.def}{\from{exerquiz.dtx}{copyright,eqda}} - \file{eqpo.def}{\from{exerquiz.dtx}{copyright,eqpo}} - \file{eqfin.def}{\from{exerquiz.dtx}{copyright,eqfin}} - \file{eqcat.def}{\from{exerquiz.dtx}{copyright,eqcat}} - \file{eqcz.def}{\from{exerquiz.dtx}{copyright,eqcz}} - \file{eqbr.def}{\from{exerquiz.dtx}{copyright,eqbr}} - \file{eqtr.def}{\from{exerquiz.dtx}{copyright,eqtr}} -% \file{exerquiz.drv}{\from{exerquiz.dtx}{copyright,driver}} + \file{exerquiz.sty}{\from{exerquiz.dtx}{copyright,package}} + \file{aebjs.def}{\from{exerquiz.dtx}{copyright,aebjs}} +% \file{eqexam.def}{\from{exerquiz.dtx}{eqexam}} + \file{aebrandom.def}{\from{exerquiz.dtx}{copyright,randomize}} + \file{aebsumrytbls.def}{\from{exerquiz.dtx}{copyright,sumrytbls}} + \file{usemcfi.def}{\from{exerquiz.dtx}{copyright,mcfi}} + \file{eqcolor.def}{\from{exerquiz.dtx}{copyright,eqcolor}} + \file{template.def}{\from{exerquiz.dtx}{copyright,template}} + \file{eqfr.def}{\from{exerquiz.dtx}{copyright,eqfr}} + \file{eqde.def}{\from{exerquiz.dtx}{copyright,eqde}} + \file{eqno.def}{\from{exerquiz.dtx}{copyright,eqno}} + \file{eqnl.def}{\from{exerquiz.dtx}{copyright,eqnl}} + \file{eqes.def}{\from{exerquiz.dtx}{copyright,eqes}} + \file{eqit.def}{\from{exerquiz.dtx}{copyright,eqit}} + \file{eqru.def}{\from{exerquiz.dtx}{copyright,eqru}} + \file{eqda.def}{\from{exerquiz.dtx}{copyright,eqda}} + \file{eqpo.def}{\from{exerquiz.dtx}{copyright,eqpo}} + \file{eqfin.def}{\from{exerquiz.dtx}{copyright,eqfin}} + \file{eqcat.def}{\from{exerquiz.dtx}{copyright,eqcat}} + \file{eqcz.def}{\from{exerquiz.dtx}{copyright,eqcz}} + \file{eqbr.def}{\from{exerquiz.dtx}{copyright,eqbr}} + \file{eqtr.def}{\from{exerquiz.dtx}{copyright,eqtr}} +% \file{exerquiz.drv}{\from{exerquiz.dtx}{copyright,driver}} } % % Install eForms Package @@ -89,6 +89,7 @@ \file{edvipdfm.def}{\from{eforms.dtx}{copyright,edvipdfm}} \file{uieforms.def}{\from{eforms.dtx}{copyright,userinterface}} \file{setcorder.def}{\from{eforms.dtx}{copyright,setcorder}} + \file{pdfdochex.def}{\from{eforms.dtx}{copyright,hexoctcodes}} } % % Install the Insdljs Package diff --git a/macros/latex/contrib/acrotex/doc/aeb_man.pdf b/macros/latex/contrib/acrotex/doc/aeb_man.pdf Binary files differindex a9d5a9fc24..794013af9e 100644 --- a/macros/latex/contrib/acrotex/doc/aeb_man.pdf +++ b/macros/latex/contrib/acrotex/doc/aeb_man.pdf diff --git a/macros/latex/contrib/acrotex/doc/aeb_man.tex b/macros/latex/contrib/acrotex/doc/aeb_man.tex index ecc2638b1a..679358f2e0 100644 --- a/macros/latex/contrib/acrotex/doc/aeb_man.tex +++ b/macros/latex/contrib/acrotex/doc/aeb_man.tex @@ -232,10 +232,10 @@ \university{{\AcroT} Software Development Team} \email{dpstory@acrotex.net} \versionLabel{Dated:} -\version{2019/05/24} +\version{2019/08/13} \copyrightyears{1999-\the\year} \nocopyright -\prepared{2019/05/24} +\prepared{2019/08/13} \revisionLabel{Distribution Dated:} \copyrightStatus{True} @@ -1695,7 +1695,7 @@ The syntax \cs{optionalPageMatter} is\dots \begin{dCmd}[commandchars=!()]{\bxSize} \optionalPageMatter[!ameta(vspace)]{!ameta(content)} \end{dCmd} -\eVerb where \ameta{content} content to be displayed in middle title region, and +\smallskip\eVerb where \ameta{content} content to be displayed in middle title region, and \texttt{[\ameta{vspace}]} consists of one (or more) \cs{vspace} commands. The default is \begin{Verbatim}[xleftmargin=\amtIndent] @@ -8087,7 +8087,25 @@ credit of zero, and may as well not be included in the list of words. extensive examples, and discusses techniques of searching using regular expressions. +\subsubsection{\texorpdfstring{\protect\cs{RespBoxEssay}}% + {\textbackslash RespBoxEssay}: Extended Responses}\label{ss:respboxessay} +The \cs{RespBoxEssay} command is used to provide space for the student to +type in an extended response to a question. The student's response is not +evaluated, it must be reviewed by the instructor, who can assign additional +credit. +\aebdimen0pt\bVerb\takeMeasure{\string\RespBoxEssay[\ameta{options}]\ameta{dest}\darg{\ameta{wd}}\darg{\ameta{ht}}}% +\begin{dCmd}[commandchars=!()]{\bxSize} +\RespBoxEssay[!ameta(options)]!ameta(dest){!ameta(wd)}{!ameta(ht)} +\end{dCmd} +\medskip\eVerb The first (optional) parameter (\ameta{options}) is used to pass key-value +pairs to the form field. The second (optional) argument (\ameta{dest}) takes +on one of two forms: (1) a named destination \texttt{[\meta{dest}]} to the +solution (if provided), were \meta{dest} is a string the document author +specifies; or (2) an asterisk (\texttt*), where the named destination is +automatically generated by \pkg{exerquiz}. The third and fourth parameters +are the width and height of the field. The field is, by default, a +multi-line text field. \subsection{Some Enhancements}\label{enhancements} @@ -8110,7 +8128,7 @@ than the default variable of $x$. \begin{oQuestion}{sine2} \redpoint Differentiate\\[1ex] $\dfrac d{dt} \sin^2(t) =$ -\RespBoxMath{2*sin(t)*cos(t)}(t){4}{.0001}{0}{1}\cgBdry\CorrAnsButton{2*sin(t)*cos(t)} +\RespBoxMath{2*sin(t)*cos(t)}(t){4}{.0001}{0}{1}\olBdry\CorrAnsButton{2*sin(t)*cos(t)} \end{oQuestion} \medskip\noindent @@ -8118,14 +8136,14 @@ The listing follows: \begin{Verbatim}[xleftmargin=\amtIndent] \begin{oQuestion}{sine2}\\[1ex] \redpoint Differentiate $\dfrac d{dt} \sin^2(t) =$ -\RespBoxMath{2*sin(t)*cos(t)}(t){4}{.0001}{0}{1}\cgBdry +\RespBoxMath{2*sin(t)*cos(t)}(t){4}{.0001}{0}{1}\olBdry \CorrAnsButton{2*sin(t)*cos(t)} \end{oQuestion} \end{Verbatim} \noindent The \cs{CorrAnsButton} takes one parameter, the correct answer. This answer is (usually) the same as the one given as the second -argument (the optional argument is the first) in the \cs{RespBoxMath} +argument (the optional argument is the first) in the \cs{RespBoxMath}r command. \redpoint The \cs{CorrAnsButton} also controls access to the (optional) solution, see @@ -8196,7 +8214,7 @@ An example of this optional parameter is \redpoint Perform the indicated operation, and enter result into the box.\\[1ex] $ \text{9} + \text{8} =$ -\RespBoxMath{9 + 8}{1}{.0001}{[0,1]}\cgBdry\CorrAnsButton{9 + 8}*{EvalCorrAnsButton}\cgBdry +\RespBoxMath{9 + 8}{1}{.0001}{[0,1]}\olBdry\CorrAnsButton{9 + 8}*{EvalCorrAnsButton}\olBdry \sqTallyBox \end{oQuestion} @@ -8207,8 +8225,8 @@ The listing follows: \redpoint Perform the indicated operation, and enter result into the box.\\[1ex] $ 9 + 8 = $ -\RespBoxMath{9 + 8}{1}{.0001}{[0,1]}\cgBdry - \CorrAnsButton{9 + 8}*{EvalCorrAnsButton}\cgBdry +\RespBoxMath{9 + 8}{1}{.0001}{[0,1]}\olBdry + \CorrAnsButton{9 + 8}*{EvalCorrAnsButton}\olBdry \sqTallyBox \end{oQuestion} \end{Verbatim} @@ -8224,7 +8242,7 @@ For example, \begin{oQuestion}{sine4} \redpoint \hypertarget{exofT}{Differentiate}\\[1ex] $\dfrac d{dx} \sin^2(x) =$ -\RespBoxMath{2*sin(x)*cos(x)}{4}{.0001}{0}{1}\cgBdry\CorrAnsButton{2*sin(x)*cos(x)}\cgBdry +\RespBoxMath{2*sin(x)*cos(x)}{4}{.0001}{0}{1}\olBdry\CorrAnsButton{2*sin(x)*cos(x)}\olBdry \sqTallyBox \end{oQuestion} @@ -8234,8 +8252,8 @@ The listing follows: \begin{oQuestion}{sine4} \redpoint Differentiate\\[1ex] $\dfrac d{dx} \sin^2(x) =$ -\RespBoxMath{2*sin(x)*cos(x)}{4}{.0001}{0}{1}\cgBdry -\CorrAnsButton{2*sin(x)*cos(x)}\cgBdry +\RespBoxMath{2*sin(x)*cos(x)}{4}{.0001}{0}{1}\olBdry +\CorrAnsButton{2*sin(x)*cos(x)}\olBdry \sqTallyBox \end{oQuestion} \end{Verbatim} @@ -8254,8 +8272,8 @@ insert \cs{sqClearButton}. \begin{oQuestion}{sine5} \redpoint Differentiate\\[1ex] $\dfrac d{dx} \sin^2(x) =$ -\RespBoxMath{2*sin(x)*cos(x)}{4}{.0001}{0}{1}\kern1bp\CorrAnsButton{2*sin(x)*cos(x)}\cgBdry -\sqTallyBox\cgBdry\sqClearButton +\RespBoxMath{2*sin(x)*cos(x)}{4}{.0001}{0}{1}\olBdry\CorrAnsButton{2*sin(x)*cos(x)}\olBdry +\sqTallyBox\olBdry\sqClearButton \end{oQuestion} @@ -8266,8 +8284,8 @@ The listing follows: \redpoint Differentiate\\[1ex] $\dfrac d{dx} \sin^2(x) =$ \RespBoxMath{2*sin(x)*cos(x)}{4}{.0001}{0}{1}% -\CorrAnsButton{2*sin(x)*cos(x)}\cgBdry -\sqTallyBox\cgBdry\sqClearButton +\CorrAnsButton{2*sin(x)*cos(x)}\olBdry +\sqTallyBox\olBdry\sqClearButton \end{oQuestion} \end{Verbatim} diff --git a/macros/latex/contrib/acrotex/doc/eformman.pdf b/macros/latex/contrib/acrotex/doc/eformman.pdf Binary files differindex 7bdd9b3f7d..c3532cfb43 100644 --- a/macros/latex/contrib/acrotex/doc/eformman.pdf +++ b/macros/latex/contrib/acrotex/doc/eformman.pdf diff --git a/macros/latex/contrib/acrotex/doc/eformman.tex b/macros/latex/contrib/acrotex/doc/eformman.tex index 7538e0a20c..ecfbb3d835 100644 --- a/macros/latex/contrib/acrotex/doc/eformman.tex +++ b/macros/latex/contrib/acrotex/doc/eformman.tex @@ -6,8 +6,10 @@ forcolorpaper,latextoc,pro,useui}, exerquiz,aebxmp ]{aeb_pro} +\usepackage{forms16be} \usepackage[dblevel=0]{aeb_mlink} \usepackage[altbullet]{lucidbry} +\usepackage{pifont} %\usepackage{myriadpro} \setlength{\marginparpush}{3pt} @@ -79,7 +81,7 @@ subject={Documentation for the eforms and insdljs packages}, talksite={\url{www.acrotex.net}}, version={2.0}, - prepared={2019/05/24}, + prepared={2019/08/06}, preparedLabel={Distribution Dated:}, keywords={LaTeX, hyperref, PDF, exercises, quizzes}, copyrightStatus=True, @@ -517,13 +519,27 @@ declarative command \cs{pmpvMrk\darg{\ameta{mrk}}} that takes one argument \amet to be used. The package declares \verb|\pmpvMrk{X}|, another good choice is \verb|\pmpvMrk{$\checkmark$}|. +\newtopic\indent\textbf{Finer control over enhanced preview.} When enhanced +preview is on (\cs{previewOn}\allowbreak \cs{pmpvOn}), the caption for {\pbs} +may be turned off with \cs{pmpvCAOff}\FmtMP{\cs{pmpvCAOff}} (and may be +turned back on again with \cs{pmpvCAOn}). Enhanced preview for all other +field types is controlled with \cs{pmpvVOff}\FmtMP{\cs{pmpvVOff}} (and +\cs{pmpvVOn}). Turning off enhanced preview may be become an issue when the +preview text is too wide for the preview rectangle +{\previewOn\pmpvOn\textField[\autoCenter{y}\BC{}\Ff{\FfReadOnly}\V{We initialize this field}\DV{We +initialize this field}]{V2Big}{1in}{11bp}}. We can turn off enhanced preview +for this field only by passing \cs{cmd\darg{\cs{pmpvVOff}}} in the optional +argument of the field, or turn it off globally by expanding \cs{pmpvVOff} +prior to expanding the \cs{textField} command. + \newtopic\textbf{\textcolor{red}{Final Preparation.}} In the modern era of {\LaTeX}, it is customary by some to use \app{sumatraPDF} or some other non-conforming {\PDF} reader during development; however, you should always open your final {\PDF} (which was built with \cs{previewOff}\cs{pmpvOff}) in \app{Adobe Reader DC} (or in \app{Acrobat}), save it to obtain the correct appearances of the fields -placed in the document. +placed in the document. Other suggestions can be found in the +\href{\urlAcroTeXBlog}{\AcroBlog} article cited below. %http://www.acrotex.net/blog/?p=1404 \exAeBBlogPDF{p=1404} Refer to the article titled \textit{\href{\urlAcroTeXBlog/?p=1404}{eforms: Enhanced Previews}} for more technical @@ -2841,7 +2857,7 @@ The \hypertarget{\pkg{insdljs}}{insdljsPkg} package provides support to {\LaTeX} for inserting \app{Acrobat} JavaScript into a PDF file created from a \LaTeX{} source. This package works correctly for users of \textsf{pdftex} (and \app{luatex}), \textsf{dvipdfm}, \textsf{dvipdfmx}, and \texttt{xetex}. -For\marginpar{\small\raggedleft\app{Acrobat} required for +For\FmtMP{\app{Acrobat} required for \app{dvips}} those who use either \app{dvips} or \app{dvipsone} to produce a postscript file, which is then distilled, you are required to have \app{Acrobat}~5.0 (or later). @@ -2862,12 +2878,20 @@ of the JavaScripts. JavaScript. This might be useful, for creating a paper document that is not interactive. For a non-interactive paper document, no JS is needed. -\item\NH\texttt{execJS} is a very useful option/feature if you know how to use - it. Any JavaScript that is written in an \env{execJS} environment is - executed once when the document is first opened in \app{Acrobat}, then - discarded. AeB uses this for post-distillation document processing. The - default is that the JavaScript in an \texttt{execJS} environment is not - executed; using this option turns on this feature. +\item\NH\texttt{execJS} is a very useful option/feature if you know how to + use it. Any JavaScript that is written in an \env{execJS} environment + is executed once when the document is first opened in \app{Acrobat}, + then discarded. AeB uses this for post-creation document processing. + The default is that the JavaScript in an \texttt{execJS} environment is + not executed; using this option turns on this feature. Two convenience + commands are also defined: \FmtMP{\cs{execJSOn}} \cs{execJSOn} (the + equivalent of passing the \opt{execJS} option to the \pkg{insdljs} + package) and \FmtMP{\cs{execJSOff}}\cs{execJSOff} (for turning off + JavaScript execution within an \env{execJS} environment). Both have no + effect outside the preamble of the document. + + For information on the \env{execJS} environment, read + Section~\ref{s:execJS} on page~\pageref{s:execJS}. \end{description} \section{The \texttt{insDLJS} and \texttt{insDLJS*} Environments} @@ -3235,8 +3259,20 @@ When \cs{thisPageAction} is executed in the preamble, the \texttt{<open\_action>} argument gets passed to the \cs{OpenAction} command. -\section{The \textsf{execJS} Environment} +\section{The \textsf{execJS} Environment}\label{s:execJS} + +\textbf{Purpose.} The\FmtMP{`\texttt{\eqbs}' and `\texttt{\%}' characters available} \env{execJS} takes JavaScript as content. This +JavaScript is executed the first time the newly created PDF is opened in +\app{Acrobat}. This environment is a variation on \env{insDLJS}; +consequently, +the escape character is `\texttt{\eqbs}' and the comment character is +`\texttt{\%}'. +\newtopic +\textbf{Requirements.} For the script to be executed, the document must be compiled under +the \opt{execJS} option of \pkg{eforms}. + +\newtopic This is an environment useful to PDF developers who want to tap into the power of JavaScript. To use this environment, the developer needs \app{Acrobat}~5.0 or higher. \textsf{pdftex} or \textsf{dvipdfm} can @@ -3244,8 +3280,8 @@ be used to produce the PDF document, but the developer needs the \app{Acrobat} product for this environment to do anything. The \texttt{execJS} is used primarily for post-distillation -processing (post-creation processing, in the case of \textsf{pdftex} -and \textsf{dvipdfm}). The \texttt{execJS} environment can be used, +processing (post-creation processing, in the case of \textsf{pdflatex} +and \textsf{xelatex}). The \texttt{execJS} environment can be used, for example, to automatically import named icons into the document, which can, in turn, be used for an animation. @@ -3259,18 +3295,22 @@ by the \textsf{execJS} environment is imported, and the JavaScript executed. This JavaScript is \emph{not} saved with the document. The syntax of this environment is\dots -\settowidth{\aebdimen}{\ttfamily\string\begin\darg{execJS}\darg{\meta{name}}} +\settowidth{\aebdimen}{\ttfamily\string\begin\darg{execJS}[\ameta{\cs{cmd}}]\darg{\meta{name}}} \begin{dCmd}[commandchars=!()]{\aebdimen+2\fboxsep+2\fboxrule} -\begin{execJS}{!meta(name)} +\begin{execJS}[!ameta(\cmd)]{!meta(name)} .... -!anglemeta(JavaScript code) +!ameta(JavaScript code) .... \end{execJS} \end{dCmd} -\PD The environment takes one required argument, the base name of the -auxiliary files to be generated. +\PD The environment takes one required argument (\meta{name}), the base name +of the auxiliary files to be generated. The \env{execJS} environment now has +an optional argument, the optional argument must be a command +\ameta{\cs{cmd}}. The purpose of \ameta{\cs{cmd}} is to make special +definitions at the time the script is expanded. +\newtopic\indent Many of the more useful JavaScript methods have security restrictions, the developer must create folder JavaScript that can be used to \emph{raise the privilege} of the methods. @@ -3331,6 +3371,31 @@ app.endPriv(); \end{Verbatim} \newtopic AeB Pro, the {Acro\!\TeX} Presentation Bundle and @EASE use these execJS techniques. +\Example In this example, we give a simple example of the use of the optional argument (\ameta{\cs{cmd}}). +We define a command \cs{myDefns} which gives a special meaning to \cs{oct}. This definition +are made within a group so it has no effect outside the environment. +\begin{Verbatim}[xleftmargin=\amtIndent,commandchars={!~@}] +... +\execJSOn +!textbf~\def\myDefns{\let\oct\eqbs}@ +\begin{execJS}[!textbf~\myDefns@]{tst} +var str="Hello J!textbf~\oct@374rgen! \u263A"; // \u already defined +console.show(); +console.println(str); +\end{execJS} +\begin{document} +... +\end{document} +\end{Verbatim} +\defUniStr{myInitValue}{Hello J\u00FCrgen! \u263A}% +%\previewOn\pmpvOn +When the document is first opened, the console window appears and the message, \ding{172} +\begin{quote} +\textField[\cmd{\let\pmpvFmt\footnotesize}\Ff\FfReadOnly\BC{}\V{\tops{Hello J\"{u}rgen! \protect\ding{172}}{\unicodeStr(myInitValue)}} +\DV{\unicodeStr(myInitValue)}]{HJSmiley}{67.68bp}{11bp} +\end{quote} +is written to the console window. + \section{The \textsf{defineJS} Environment}\label{defineJS} When you create a form element (button, text field, etc.), you diff --git a/macros/latex/contrib/acrotex/doc/install_jsfiles.pdf b/macros/latex/contrib/acrotex/doc/install_jsfiles.pdf Binary files differindex 7b2d3fab78..221ba16fdb 100644 --- a/macros/latex/contrib/acrotex/doc/install_jsfiles.pdf +++ b/macros/latex/contrib/acrotex/doc/install_jsfiles.pdf diff --git a/macros/latex/contrib/acrotex/eforms.dtx b/macros/latex/contrib/acrotex/eforms.dtx index dcfcbd78cb..d3e63f2950 100644 --- a/macros/latex/contrib/acrotex/eforms.dtx +++ b/macros/latex/contrib/acrotex/eforms.dtx @@ -16,7 +16,7 @@ %</copyright> %<package>\NeedsTeXFormat{LaTeX2e} %<package>\ProvidesPackage{eforms} -%<package> [2019/05/24 v2.11 Provides general eforms support (dps)] +%<package> [2019/06/14 v2.3 Provides general eforms support (dps)] %<*driver> \documentclass{ltxdoc} \usepackage[colorlinks,hyperindex=false]{hyperref}[2012/10/12] @@ -89,6 +89,9 @@ % \textsf{web}; in this case, the options below must explicitly included. % Set the driver dependent code for the |quiz| environments. % +% \changes{v2.2v2.2}{2019/06/12}{Added fields to fields dict, conforming to hyperref} +% \changes{v2.13}{2019/06/10}{Added various fields to the fields dictionary so they +% can get appearances in non-conforming PDF viewers.} % \changes{v2.5o}{2012/06/18}{Added required package \string\textsf{ifpdf}} % \changes{v2.9m}{2017/09/03}{Added the ifluatex package} % \begin{macrocode} @@ -96,6 +99,7 @@ \RequirePackage{ifxetex}[2006/08/21] \RequirePackage{ifluatex} % \end{macrocode} +% The \pkg{calc} package is now required (2014/02/18). % \changes{v2.6c}{2014/02/18}{Added the \string\textsf{calc} package as required package.} % \begin{macrocode} \RequirePackage{calc} @@ -251,6 +255,8 @@ \MessageBreak in the option list of the eforms package.}% }{} \fi +\edef\ef@CatChngs{\the\catcode`\$} +\@makeother\$\relax \newlength\eflength \@ifundefined{ifpdfmarkup}{\newif\ifpdfmarkup}{}\pdfmarkupfalse \ifpdf\else\ifxetex\else\pdfmarkuptrue\fi\fi @@ -308,6 +314,7 @@ % around the \textit{inner} bounding rectangle. % \begin{macrocode} %<*package> +\def\csarg#1#2{\expandafter#1\csname#2\endcsname} \@ifundefined{eq@tmpbox}{\newsavebox{\eq@tmpbox}}{} \@ifundefined{eq@tmpdima}{\newdimen\eq@tmpdima}{} \@ifundefined{eq@tmpdimb}{\newdimen\eq@tmpdimb}{} @@ -362,6 +369,7 @@ \hb@xt@\noexpand\z@{\hss#1\hss}}\fi} \let\@PMPV\@empty \let\pmpvFmt\@empty +\let\pmpvFmtCtrl\relax % \end{macrocode} % The preview bounding box, visible when \cs{previewOn} is expanded. Incorporated into the center % of the box is \cs{pmpvFmt\darg{\cs{@PMPV}}}. \cs{pmpvFmt} can be used to format its argument (\cs{@PMPV}); @@ -376,7 +384,7 @@ \ifdim\@tempdimb<2\fboxrule\else \advance\@tempdimb by-2\fboxrule\fi \ckbox@Color\fbox{\parbox[b][\@tempdimb][c]{\@tempdima}% - {\vfil\hfil\pmpvFmt{\@PMPV}\hfil\vfil}}\else + {\vfil\hfil\pmpvFmtCtrl\pmpvFmt{\@PMPV}\hfil\vfil}}\else \parbox[b][#2][c]{#1}{\vfil\hfil\hfil\vfil}\fi}% } % \end{macrocode} @@ -481,6 +489,9 @@ \@tempcnta=\eq@FfValue \def\eq@arg{#2}% \ifx\eq@arg\@empty\else + \def\x{\FfRadiosInUnison}% + \ifx\eq@arg\x\let\isRadiosInUnison\ef@YES + \else\let\isRadiosInUnison\ef@NO\fi \advance\@tempcnta by#2\fi \edef\eq@Ff{/Ff \the\@tempcnta}% \def\ef@next{\processAppArgs}% @@ -502,7 +513,7 @@ % (has a flag of 2 or 32), if yes we \cs{let} \DescribeMacro\ef@isHidden\cs{ef@isHidden} to \cs{ef@YES}, otherwise % it is \cs{let} to \cs{ef@NO}. % \begin{macrocode} - \ifnum#2=2\relax % dpstoday + \ifnum#2=2\relax \let\ef@isHidden\ef@YES\else \ifnum#2=32\relax \let\ef@isHidden\ef@YES\else @@ -1127,11 +1138,26 @@ % \begin{macrocode} \let\pmpvV\@empty \let\eq@VSAVE\@empty +% \end{macrocode} +% Finer control over enhanced preview: for the \cs{V} entry, we can turn the enhanced +% preview on with \DescribeMacro\pmpvVOn\cmd{\pmpvVOn} and off again with +% \DescribeMacro\pmpvVOff\cmd\pmpvVOff. +% \changes{v2.12}{2019/06/07}{Added finer control: \string\cs{pmpvVOff} and +% \string\cs{pmpvVOn}} +% \begin{macrocode} +\let\ef@Vpv\ef@YES +\def\pmpvVOff{\let\ef@Vpv\ef@NO\let\pmpvFmtCtrl\@gobble} +\def\pmpvVOn{\let\ef@Vpv\ef@YES\let\pmpvFmtCtrl\relax} +\def\noexpand@iii{\noexpand\noexpand\noexpand} \def\@eqV#1{\Hy@pdfstringfalse % \end{macrocode} % We define \DescribeMacro\pmpvV\cmd{\pmpvV} to hold the preview value of the field. +% \changes{v2.3}{2019/06/14}{Special definition of \string\cs{protect} to suppress +% expansion within first argument of \string\cs{tops} within \string\cs{@eqV}} % \begin{macrocode} - \edef\pmpvV{#1}% + \let\x\protect + \let\protect\noexpand@iii\edef\pmpvV{#1}% + \edef\pmpvV{#1}\let\protect\x % \end{macrocode} % There is a problem with detecting unicode, if the author wants to use unicode, % he should use \cs{unicodeStr}, which we try to detect, but we not allow @@ -1278,6 +1304,18 @@ % enhanced preview, described above in the definition of \cs{@eqV}. % \changes{v2.11}{2019/05/24}{Modified \string\cs{@eqCA} to enhance preview} % \begin{macrocode} +% \end{macrocode} +% Finer control over enhanced preview: for the \cs{CA} entry, we can turn the enhanced +% preview on with \DescribeMacro\pmpvCAOn\cmd{\pmpvCAOn} and off again with +% \DescribeMacro\pmpvCAOff\cmd\pmpvCAOff. +% \changes{v2.12}{2019/06/07}{Added finer control: \string\cs{pmpvCAOff} and +% \string\cs{pmpvCAOn}} +% \changes{v2.3}{2019/06/14}{Special definition of \string\cs{protect} to suppress +% expansion within first argument of \string\cs{tops} within \string\cs{@eqCA}} +% \begin{macrocode} +\let\ef@CApv\ef@YES +\def\pmpvCAOff{\let\ef@CApv\ef@NO\let\pmpvFmtCtrl\@gobble} +\def\pmpvCAOn{\let\ef@CApv\ef@YES\let\pmpvFmtCtrl\relax} \def\@eqCA#1{\let\unicodeStrSAVE\unicodeStr \Hy@pdfstringtrue\let\unicodeStr\relax \edef\x{#1}\let\unicodeStr\unicodeStrSAVE @@ -1292,7 +1330,8 @@ % the caption. It should be something that can be typeset, if not use % \cs{tops} to offer an alternative. % \begin{macrocode} - \edef\pmpvCA{#1}\def\eq@CA{#1}% + \let\x\protect\let\protect\noexpand@iii + \edef\pmpvCA{#1}\def\eq@CA{#1}\let\protect\x \edef\ef@kvCA{/CA(\ef@uni@temp)}% \makespecialJS \fi @@ -1711,6 +1750,14 @@ % the parsing mechanism. \cs{protectedKeys} is used in the \pkg{bargraph-js} package. % \changes{v2.10}{2019/03/16}{Added \string\cs{protectedKeys}} % \begin{macrocode} +% \end{macrocode} +% \DescribeMacro{\multigroupradios} Declares whether there are multiple sets of radio button groups +% with the same names and values, +% \begin{macrocode} +\def\@eqmultigroupradios#1{\let\ef@multigroupradios\ef@YES} +\let\ef@multigroupradios\ef@NO +% \end{macrocode} +% \begin{macrocode} \def\ef@stop{\relax} %\def\ef@relax{\relax} \def\protectedKeys#1#2{\ef@scratchtoks={}% \@ifundefined{#1}{}{\PackageWarning{eforms} @@ -2558,7 +2605,7 @@ % \begin{macrocode} \ifx\ef@isBGtransparent\ef@YES \let\ef@kvCA\@empty\fi - \PMPV{\eq@CA}\fi + \ifx\ef@CApv\ef@YES\PMPV{\eq@CA}\fi\fi \ef@djXPD#1% } % \end{macrocode} @@ -2587,6 +2634,7 @@ % \end{macrocode} % (2016/12/22) \cs{ef@djXPD} adjusts the size of the field dimensions, if \cs{makeXasPD} is true. % \begin{macrocode} + \ef@lateWidgetOpts \ifefpmpv\Hy@pdfstringfalse % \end{macrocode} % Having an enhanced preview generates several problems. Text fields are sometimes hidden and their values @@ -2600,8 +2648,9 @@ % value now that we know this field is hidden. % \begin{macrocode} \let\eq@V\eq@VSAVE\else - \PMPV{\pmpvV}\fi + \ifx\ef@Vpv\ef@YES\PMPV{\pmpvV}\fi\fi \fi + \global\let\ef@lateWidgetOpts\relax \ef@djXPD#1% } % \end{macrocode} @@ -2968,7 +3017,52 @@ % \end{macrocode} % Here is the field template for check boxes and radio button fields fields. % \begin{macrocode} -\def\common@RadioCheckCode{% +\def\radio@parent{% + /DA (\eq@DA)% + /FT/Btn% + \eq@Ff% + \eq@TU% + \eq@DV% +\expandafter\ifx\csname kids@\Fld@name\endcsname\relax\else + /Kids [\@nameuse{kids@\Fld@name}]% +\fi +\ifx\ef@multigroupradios\ef@YES +\expandafter\ifx\csname radio@\Fld@name\endcsname\relax\else + /Opt[\@nameuse{radio@\Fld@name}]\fi\fi + /T(\Fld@name)% + \eq@V +} +% \end{macrocode} +% \begin{macrocode} +\def\common@RadioCode{% + /Subtype/Widget +\ifuseNewRadios + \expandafter\ifx\csname radio@\Fld@name\endcsname\relax\else + /Parent \@nameuse{parent@\Fld@name}\fi +\else + /T (\Fld@name) + /FT/Btn + \eq@Ff + \eq@F + \eq@TU + \eq@DV\eq@V + /DA (\eq@DA) +\fi + /BS <<\eq@W\eq@S>> +\ifx\eq@AP\@empty + /AP<< /N <<\eq@On<<>>>> >> + \eq@MK +\else + \eq@AP +\fi + \eq@AS +% \eq@DV\eq@V + \eq@A\eq@AA + \eq@rawPDF +} +% \end{macrocode} +% \begin{macrocode} +\def\common@CheckCode{% /Subtype/Widget /T (\Fld@name) /FT/Btn @@ -3089,8 +3183,8 @@ \def\checkBoxDefaults{\F{\FPrint}\W{1}\S{S}\BC{0 0 0}} % \end{macrocode} % \begin{macrocode} -\bgroup\obeyspaces -\gdef\checkBox{\begingroup\global\let =\pdfSP +\bgroup\obeyspaces% +\gdef\checkBox{\begingroup\global\let =\pdfSP% \ef@sanitize@toks\ef@checkbox}\egroup % \end{macrocode} % End the sanitizing group, and get the argument, pass them on to @@ -3098,30 +3192,204 @@ % \begin{macrocode} \newcommand{\ef@checkbox}[5][]{\endgroup \mbox{\check@@Box{#1}{#2}{#3}{#4}{#5}{}{\eq@setWidgetProps - \eq@RadioCheck@driver}{\checkBoxDefaults\every@CheckBox}}} + \eq@Check@driver}{\checkBoxDefaults\every@CheckBox}}} % \end{macrocode} % \end{macro} % \subsubsection{Radio Button}\label{radiobutton} -% The basic command for creating radio button fields. -% \begin{macrocode} +% The basic command for creating radio button fields. As of the version dated 2019/06/14, +% radio button code was re-written so they operate in certain non-conforming PDF readers. The old code, +% which has proven to be reliable for many years. The old code +% is available when \DescribeMacro\useNewRadiosOff\cmd{\useNewRadiosOff} is expanded. This is the default. +% +% When \DescribeMacro\useNewRadiosOn\cmd{\useNewRadiosOn} is expanded, the new code for radio buttons is used. +% As a result, you need t\emph{hree compiles} to bring the AUX files up to date. The AUX files now +% contain PDF object references to radio buttons. Because this new scheme degrades the experience +% of creating radio buttons (heavy I/O usage), use this option if you and the consumers of your PDF\emph{ do not use} +% Adobe PDF viewers (on a desktop/laptop). +% +% Use the default setting (\cmd{\useNewRadiosOff}) when you will view the PDF in AA/AR and save it; otherwise, if the PDF is to be viewed in non-conforming +% PDF readers, never having been saved using AA/AR, use the \cmd{\useNewRadiosOn} setting. +% \changes{v2.3}{2019/06/14}{Rewrote radio buttons so they work in non-conforming PDF readers} +% +% \medskip\noindent\textbf{Discussion.} The default scheme is to create the radio buttons \begin{quote}\footnotesize +% \cs{radioButton\darg{\ameta{name}}\darg{\ameta{width}}\darg{\ameta{height}}} ...\\ +% ... \cs{radioButton\darg{\ameta{name}}\darg{\ameta{width}}\darg{\ameta{height}}}\end{quote} as separate widgets. +% When loaded by AA/AR, these viewers do some internal arranging automatically; they build appearances, among other things. Saving +% the PDF from AA/AR save this appearances within the PDF file, so that those using non-conforming PDF viewers will see +% a correct representation of the fields. (The fields themselves may not be functional, depending on the PDF viewer.) +% +% \def\Odict{<<}\def\Cdict{>>} +% +% When \cs{useNewRadiosOn} is expanded, instead of creating separate widgets, we create a radio button field, +%\begin{quote}\offinterlineskip\ttfamily\obeyspaces\obeylines +%14 0 obj +%\Odict\space/DA (/ZaDb 9 Tf 0 g)/FT/Btn/Ff 32768/DV/Three +%/Kids [15 0 R 16 0 R 17 0 R ]/T(Group1)/V/Two \Cdict +%endobj +%\end{quote} +% \texttt{/FT} and \texttt{Ff} entries declare this field to be a radio button field. Note that +% the object has a \texttt{/Kids} entry that references the individual widgets. The field contains +% the default value (\texttt{/DV}), if any, and the initial value (\texttt{/V}), if any. +% A typical widget referenced by the \texttt{/Kids} entry is, +%\begin{quote}\offinterlineskip\ttfamily\obeyspaces\obeylines +%15 0 obj +%\Odict +%/Type /Annot +%/Rect [172.716 654.735 185.716 667.735] +%/Subtype/Widget /Parent 14 0 R/BS \Odict\space/W 1/S/S\Cdict +%/AP\Odict\space/N\Odict/One\Odict\Cdict\space\Cdict\space\Cdict /MK \Odict\space/BC [0 0 0]/CA(l) \Cdict +%/AS/Off +%\Cdict +%endobj +%\end{quote} +%This is a widget annotation with \texttt{/Rect} entry, as well as other entries. The \cs{/AS} key determines +%whether this widget is `on' or not. This one is off. Some of the non-conforming PDF viewers parse this +%structure better than the old scheme. +% +%The next six lines are new (2019/06/14), to support the new radio button structure. +% \begin{macrocode} +\newif\ifuseNewRadios \useNewRadiosfalse +\def\useNewRadiosOn{\useNewRadiostrue} +\def\useNewRadiosOff{\useNewRadiosfalse} +\let\ef@OptArray\@empty +\let\ef@KidsArray\@empty +\let\ef@lateWidgetOpts\relax \def\annot@type@radio{radiobtn} +% \end{macrocode} +% You can create one or more copies of a group of radio buttons, whether more copies of a +% group is not known until the end of the document, so we must set some properties at +% the end of the document. This command stores information as a function of the field name +% for later use at the end of the document. +% \begin{macrocode} +\def\ef@NewRadiosLateOpts{% +% \end{macrocode} +% We do nothing if the new scheme is not being used. +% \begin{macrocode} + \ifuseNewRadios +% \end{macrocode} +% If this is a multi-group radio button field that work independently, we adjust the `on' value, as in this case, +% the `on' value is referenced by an index, 0, 1, 2,... +% \begin{macrocode} + \@nameuse{multigroup@\Fld@name}% + \ifx\ef@multigroupradios\ef@YES + \ifpdfmarkup + \def\eq@On{(\@nameuse{radioindex@\Fld@name}) cvn }\else + \def\eq@On{/\@nameuse{radioindex@\Fld@name}}\fi + \expandafter\ifx\csname OnVal@\Fld@name\endcsname\relax + \@eqAS{Off}\else % today + \ifnum\@nameuse{OnVal@\Fld@name}=% + \@nameuse{radioindex@\Fld@name}\relax + \@eqAS{\@nameuse{radioindex@\Fld@name}}\else\@eqAS{Off}\fi\fi + \else + \edef\x{\@nameuse{OnVal@\Fld@name}}% + \ifx\x\ef@thisChoice\@eqAS{\@nameuse{OnVal@\Fld@name}}\else + \@eqAS{Off}\fi + \fi +% \end{macrocode} +% If these are groups of radio button fields that light up in unison, we +% take to get the \cs{/AS} entry right. +% \begin{macrocode} + \@nameuse{uniradios@\Fld@name}% + \ifx\isRadiosInUnison\ef@YES + \edef\x{\@nameuse{value@\Fld@name}}% + \ifx\x\ef@thisChoice\expandafter\@eqAS + \expandafter{\ef@thisChoice}\else\@eqAS{Off}\fi + \fi + \fi +} +% \end{macrocode} +% We track the widget belonging to a given field name (\cs{Fld@name}), these radio +% indices are used when we have multiple groups if independent radios. +% \begin{macrocode} +\def\ef@advanceRadioIndex#1{\bgroup + \@tempcnta\@nameuse{radioindex@#1}\relax + \advance\@tempcnta\@ne + \csarg\xdef{radioindex@#1}{\the\@tempcnta}\egroup} +% \end{macrocode} +% Some utility commands that are written to the AUX file. +% \begin{macrocode} +\def\radioChoices#1{\csarg\xdef{radio@#1}} +\def\radioKids#1{\csarg\xdef{kids@#1}} +% \end{macrocode} +% A warning message when not all the PDF objects have +% been resolved. We try to emit only one message per +% compile. +% \begin{macrocode} +\def\ef@radioWarning{\PackageWarningNoLine{eforms} + {Not all PDF object references have\MessageBreak + been resolved, keep compiling}} +% \end{macrocode} +% The command that detects whether any object reference is not defined. +% \begin{macrocode} +\def\ef@@radioWarning{% + \ifx\ef@radioWarning\relax\else + \@ifundefined{kids@\Fld@name} + {\ef@radioWarning\global\let\ef@radioWarning\relax}{}\fi + \ifx\ef@radioWarning\relax\else + \@ifundefined{radio@\Fld@name} + {\ef@radioWarning\global\let\ef@radioWarning\relax}{}\fi + \ifx\ef@radioWarning\relax\else + \@ifundefined{parent@\Fld@name} + {\ef@radioWarning\global\let\ef@radioWarning\relax}{}\fi +} +% \end{macrocode} +% Finally, we arrive at the low-level radio button command, where +% changes for the 2019/06/14 version have been made. +% \begin{macrocode} \newcommand\radio@@Button[8]{\begingroup\let\#\ef@Hx \let\nameuse\@nameuse\let\tops\texorpdfstring \edef\annot@type{\annot@type@radio}% - \pdfstringdef\Fld@name{#2}\@eqAS{Off}\dl@paramlocal + \pdfstringdef\Fld@name{#2}% +% \end{macrocode} +% Additional code for the new scheme. +% \begin{macrocode} + \ifuseNewRadios + \ef@@radioWarning + \@ifundefined{rad@\Fld@name}{\let\isRadioParent\ef@YES + \global\let\ef@OptArray\@empty + \global\let\ef@KidsArray\@empty + \csarg\gdef{radioindex@\Fld@name}{-1}\expandafter + \global\csarg\let{rad@\Fld@name}\@empty}% + {\let\isRadioParent\ef@NO}% + \edef\ef@OptArray{\@nameuse{rad@\Fld@name}}% + \g@addto@macro\ef@OptArray{(#5)}% opt + \csarg\xdef{rad@\Fld@name}{\ef@OptArray}% + \ifx\isRadioParent\ef@YES + \def\y{\expandafter\string\noexpand}% + \edef\x{\noexpand\immediate\noexpand\write\noexpand\@auxout + {\y\radioChoices{\Fld@name}{\noexpand + \@nameuse{rad@\Fld@name}}}}% + \def\z{\expandafter\AtEndDocument\expandafter{\x}}\z + \edef\x{\noexpand\immediate\noexpand\write\noexpand\@auxout + {\y\radioKids{\Fld@name}{\noexpand + \@nameuse{kid@\Fld@name}}}}% + \def\z{\expandafter\AtEndDocument\expandafter{\x}}\z + \fi + \ef@advanceRadioIndex{\Fld@name}% + \@nameuse{multigroup@\Fld@name}% + \fi + \@eqAS{Off}\dl@paramlocal \def\@eqDV##1{\def\eq@arg{##1}\ifx\eq@arg\@empty\let\eq@DV\@empty \else\ifpdfmarkup\def\eq@DV{/DV(##1) cvn }\else \def\eq@DV{/DV/##1}\fi\fi}% - \def\@eqV##1{\def\eq@arg{##1}\ifx\eq@arg\@empty -% \end{macrocode} -% Provide enhanced preview for radio buttons -% \begin{macrocode} - \let\eq@V\@empty\else\def\pmpvV{\pmpv@mrk}\ifpdfmarkup - \def\eq@V{/V(##1) cvn }\else - \def\eq@V{/V/##1}\fi\@eqAS{##1}\fi - \ifefpmpv\let\eq@V\@empty\fi}% + \def\@eqV##1{\Hy@pdfstringfalse\edef\pmpvV{##1}% + \Hy@pdfstringtrue + \edef\eq@arg{##1}% + \if$\eq@arg$\else + \ifpdfmarkup + \edef\eq@V{/V(##1) cvn }\else + \edef\eq@V{/V/##1}\fi + \@eqAS{##1}\fi + \if$\eq@arg$% + \else + \csarg\xdef{OnVal@\Fld@name}{##1}\fi + \ifefpmpv + \gdef\ef@lateWidgetOpts{\if$\pmpvV$\else\def\pmpvV{\pmpv@mrk}\fi}% + \let\eq@V\@empty\else\global\let\ef@lateWidgetOpts\relax\fi + }% \eqf@setDimens{#3}{#4}% \ifpdfmarkup\def\eq@On{(#5) cvn }\else\def\eq@On{/#5}\fi + \def\ef@thisChoice{#5}% \def\eq@Ff{/Ff \FfRadio}\@eqtextFont{ZaDb}% \def\eq@DA{\eq@textFont\space\eq@textSize\space Tf \eq@textColor}% \@eqMK{\eq@R\eq@BC\eq@BG/CA(\symbol@choice)\eq@mkIns}% @@ -3150,7 +3418,7 @@ % \begin{macrocode} \newcommand{\ef@radiobutton}[5][]{\endgroup \mbox{\radio@@Button{#1}{#2}{#3}{#4}{#5}{}{\eq@setWidgetProps - \eq@RadioCheck@driver}{\radioButtonDefaults\every@RadioButton}}} + \eq@Radio@driver}{\radioButtonDefaults\every@RadioButton}}} % \end{macrocode} % \end{macro} % @@ -4355,6 +4623,18 @@ \def\noPeek#1#2{\literalps@out{% \AEB@psMrk{ThisPage} << \noPeekAction{#1}{#2} >> /PUT pdfmark}} % \end{macrocode} +% We create an object definition for each field, there is an option for +% the author to specify a objdef name, and for a calculation field, this +% is done automatically. +% \begin{macrocode} +\def\ef@getobjdef{% + \HyField@AdvanceAnnotCount + \ifisCalculate\edef\eq@objdefName{\Fld@name}\else + \ifx\eq@objdef\@empty + \edef\eq@objdefName{\annot@type\HyField@TheAnnotCount}\fi\fi + \edef\eq@objdef{/_objdef \string{\eq@objdefName\string}}% +} +% \end{macrocode} % Driver dependent code (distiller) for choice fields, list and combo. % \begin{macrocode} \def\eq@choice@driver @@ -4364,13 +4644,14 @@ \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \ef@getobjdef \pdf@rect{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% \literalps@out{\AEB@psMrk - \ifisCalculate/_objdef {\Fld@name}\else\eq@objdef\fi - /Rect [pdf@llx pdf@lly pdf@urx pdf@ury] - \common@choiceCode - /ANN pdfmark - \ifisCalculate\AEB@psMrk{corder} {\Fld@name} /APPEND pdfmark\fi + \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] + \common@choiceCode + /ANN pdfmark + \AEB@psMrk{afields} {\eq@objdefName} /APPEND pdfmark + \ifisCalculate\AEB@psMrk{corder} {\Fld@name} /APPEND pdfmark\fi }\to@insertStrucTabOrder{Form}\endgroup \dl@restorespcs } @@ -4384,38 +4665,113 @@ \ifx\@vertRotate\ef@One\let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \ef@getobjdef \pdf@rect{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% \literalps@out{\AEB@psMrk \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] - \common@pushButtonCode - /ANN pdfmark}\to@insertStrucTabOrder{Form}\endgroup + \common@pushButtonCode + /ANN pdfmark + \AEB@psMrk{afields} {\eq@objdefName} /APPEND pdfmark + }\to@insertStrucTabOrder{Form}\endgroup \dl@restorespcs } % \end{macrocode} % Driver dependent code (distiller) for radio and button fields. % \begin{macrocode} -\def\eq@RadioCheck@driver +\def\parentRef#1#2{\csarg\gdef{parent@#1}{#2}} +\def\ef@radioData#1#2{\immediate + \write\@mainaux{\string\parentRef{#1}{#2}}} +\def\eq@Radio@driver {% \Hy@pdfstringtrue \ifx\@vertRotate\ef@One \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \ef@getobjdef +% \end{macrocode} +% Additional code version dated 2019/06/14 or later. +% \begin{macrocode} + \ifuseNewRadios + \ifx\isRadioParent\ef@YES\expandafter + \ifx\csname radio@\Fld@name\endcsname\relax\else + \literalps@out{\AEB@psMrk + /_objdef{parent@rad\HyField@TheAnnotCount} + /type/dict/OBJ pdfmark + \AEB@psMrk{parent@rad\HyField@TheAnnotCount} + << \radio@parent\space >>/PUT pdfmark + }\ef@radioData{\Fld@name}{{parent@rad\HyField@TheAnnotCount}}% + \ifx\eq@V\@empty\else + \csarg\xdef{value@\Fld@name}% + {\@nameuse{OnVal@\Fld@name}}% + \fi + \fi + \ifx\ef@multigroupradios\ef@YES + \csarg\gdef{multigroup@\Fld@name}% + {\let\ef@multigroupradios\ef@YES}% + \else + \csarg\gdef{multigroup@\Fld@name}% + {\let\ef@multigroupradios\ef@NO}% + \fi + \ifx\isRadiosInUnison\ef@YES + \csarg\gdef{uniradios@\Fld@name}% + {\let\isRadiosInUnison\ef@YES}% + \else + \csarg\gdef{uniradios@\Fld@name}% + {\let\isRadiosInUnison\ef@NO}% + \fi + \fi + \fi + \ef@NewRadiosLateOpts \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi \pdf@rect{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% \literalps@out{\AEB@psMrk \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] - \common@RadioCheckCode - /ANN pdfmark}\to@insertStrucTabOrder{Form}\endgroup + \common@RadioCode + /ANN pdfmark + \ifuseNewRadios\else + \AEB@psMrk{afields} {\eq@objdefName} /APPEND pdfmark + \fi + }\to@insertStrucTabOrder{Form}% +% \end{macrocode} +% Save the object reference to this kid +% \begin{macrocode} + \ifuseNewRadios + \edef\x{\noexpand\g@addto@macro\noexpand + \ef@KidsArray{{\eq@objdefName}\space}}\x + \csarg\xdef{kid@\Fld@name}{\ef@KidsArray}% + \fi + \endgroup + \dl@restorespcs +} +\def\eq@Check@driver +{% + \Hy@pdfstringtrue + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \ef@getobjdef + \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi + \pdf@rect{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% + \literalps@out{\AEB@psMrk + \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] + \common@CheckCode + /ANN pdfmark + \AEB@psMrk{afields} {\eq@objdefName} /APPEND pdfmark + }\to@insertStrucTabOrder{Form}\endgroup \dl@restorespcs } \def\eq@l@check@driver {% + \ef@getobjdef \pdf@rect{\makebox[\eq@tmpdima]{\phantom{\link@@Content}}}% \literalps@out{\AEB@psMrk \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] - \common@RadioCheckCode - /ANN pdfmark}\endgroup + \common@CheckCode + /ANN pdfmark + \AEB@psMrk{afields} {\eq@objdefName} /APPEND pdfmark + }\endgroup \dl@restorespcs } % \end{macrocode} @@ -4426,13 +4782,14 @@ \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \ef@getobjdef \pdf@rect{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% \literalps@out{\AEB@psMrk - \ifisCalculate/_objdef {\Fld@name}\else\eq@objdef\fi - /Rect [pdf@llx pdf@lly pdf@urx pdf@ury] - \common@TextFieldCode - /ANN pdfmark - \ifisCalculate\AEB@psMrk{corder} {\Fld@name} /APPEND pdfmark\fi + \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] + \common@TextFieldCode + /ANN pdfmark + \AEB@psMrk{afields} {\eq@objdefName} /APPEND pdfmark + \ifisCalculate\AEB@psMrk{corder} {\Fld@name} /APPEND pdfmark\fi }\to@insertStrucTabOrder{Form}\endgroup \dl@restorespcs } @@ -4445,11 +4802,13 @@ \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi + \ef@getobjdef \pdf@rect{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% \literalps@out{\AEB@psMrk \eq@objdef/Rect [pdf@llx pdf@lly pdf@urx pdf@ury] - \common@SigFieldCode - /ANN pdfmark + \common@SigFieldCode + /ANN pdfmark + \AEB@psMrk{afields} {\eq@objdefName} /APPEND pdfmark }\to@insertStrucTabOrder{Form}\endgroup \dl@restorespcs } @@ -4561,10 +4920,68 @@ \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi \hbox{\pdfstartlink user{\common@pushButtonCode}% \lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}\pdfendlink}% + \HyField@AddToFields \endgroup \dl@restorespcs } -\def\eq@RadioCheck@driver +% \end{macrocode} +% \begin{macrocode} +\def\parentRef#1#2{\csarg\gdef{parent@#1}{#2 0 R}} +\def\ef@radioData#1#2{\expandafter + \HyField@@AddToFields\expandafter{#2}% + \immediate\write\@mainaux{\string\parentRef{#1}{#2}}} +\def\eq@Radio@driver{\Hy@pdfstringtrue + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi +% \end{macrocode} +% Additional code version dated 2019/06/14 or later. +% \begin{macrocode} + \ifuseNewRadios + \ifx\isRadioParent\ef@YES\expandafter + \ifx\csname radio@\Fld@name\endcsname\relax\else + \immediate\pdfobj{<< \radio@parent\space >>}% + \ef@radioData{\Fld@name}{\the\pdflastobj}% + \ifx\eq@V\@empty\else + \csarg\xdef{value@\Fld@name}% + {\@nameuse{OnVal@\Fld@name}}% + \fi + \fi + \ifx\ef@multigroupradios\ef@YES + \csarg\gdef{multigroup@\Fld@name}% + {\let\ef@multigroupradios\ef@YES}% + \else + \csarg\gdef{multigroup@\Fld@name}% + {\let\ef@multigroupradios\ef@NO}% + \fi + \ifx\isRadiosInUnison\ef@YES + \csarg\gdef{uniradios@\Fld@name}% + {\let\isRadiosInUnison\ef@YES}% + \else + \csarg\gdef{uniradios@\Fld@name}% + {\let\isRadiosInUnison\ef@NO}% + \fi + \fi + \fi + \ef@NewRadiosLateOpts + \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi + \hbox{\pdfstartlink user{\common@RadioCode}% + \lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}\pdfendlink}% +% \end{macrocode} +% Save the object reference to this kid +% \begin{macrocode} + \ifuseNewRadios + \edef\x{\noexpand\g@addto@macro\noexpand + \ef@KidsArray{\the\pdflastlink\space 0 R\space}}\x + \csarg\xdef{kid@\Fld@name}{\ef@KidsArray}% + \else + \HyField@AddToFields + \fi + \endgroup + \dl@restorespcs +} +\def\eq@Check@driver {% \Hy@pdfstringtrue \ifx\@vertRotate\ef@One @@ -4572,16 +4989,17 @@ \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi - \hbox{\pdfstartlink user{\common@RadioCheckCode}% + \hbox{\pdfstartlink user{\common@CheckCode}% \lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}\pdfendlink}% + \HyField@AddToFields \endgroup \dl@restorespcs } \def\eq@l@check@driver {% - \pdfstartlink user{\common@RadioCheckCode}% + \pdfstartlink user{\common@CheckCode}% \makebox[\eq@tmpdima]{\phantom{\link@@Content}}% - \pdfendlink\endgroup + \pdfendlink\HyField@AddToFields\endgroup \dl@restorespcs } \def\eq@TextField{\Hy@pdfstringtrue @@ -4603,6 +5021,7 @@ \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi \leavevmode\hbox{\pdfstartlink user{\common@SigFieldCode}% \lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}\pdfendlink}% + \HyField@AddToFields \endgroup \dl@restorespcs } @@ -4673,24 +5092,99 @@ \endgroup \dl@restorespcs } -\def\eq@RadioCheck@driver{\ef@adjHWxetex\Hy@pdfstringtrue +% \end{macrocode} +% \begin{macrocode} +\def\parentRef#1#2{\csarg\gdef{parent@#1}{#2}} +\def\ef@radioData#1#2{%\expandafter +% \HyField@@AddToFields\expandafter{#2}% + \immediate\write\@mainaux{\string\parentRef{#1}{#2}}} +% \end{macrocode} +% \begin{macrocode} +\def\eq@Radio@driver{\ef@adjHWxetex\Hy@pdfstringtrue + \ifx\@vertRotate\ef@One + \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% + \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH + \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi +% \end{macrocode} +% Additional code version dated 2019/06/14 or later. +% \begin{macrocode} + \ifuseNewRadios + \ifx\isRadioParent\ef@YES\expandafter + \ifx\csname radio@\Fld@name\endcsname\relax\else + \immediate\@pdfm@mark{obj @parentobj\HyField@TheAnnotCount + << \radio@parent\space >>}% + \ef@radioData{\Fld@name}{@parentobj\HyField@TheAnnotCount}% + \ifx\eq@V\@empty\else + \csarg\xdef{value@\Fld@name}% + {\@nameuse{OnVal@\Fld@name}}% + \fi + \fi + \ifx\ef@multigroupradios\ef@YES + \csarg\gdef{multigroup@\Fld@name}% + {\let\ef@multigroupradios\ef@YES}% + \else + \csarg\gdef{multigroup@\Fld@name}% + {\let\ef@multigroupradios\ef@NO}% + \fi + \ifx\isRadiosInUnison\ef@YES + \csarg\gdef{uniradios@\Fld@name}% + {\let\isRadiosInUnison\ef@YES}% + \else + \csarg\gdef{uniradios@\Fld@name}% + {\let\isRadiosInUnison\ef@NO}% + \fi + \fi + \fi + \ef@NewRadiosLateOpts + \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi + \HyField@AdvanceAnnotCount + \setbox\pdfm@box=% + \hbox{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% + \ifx\annot@type\annot@type@checkbox\def\btn@type{check}\else + \def\btn@type{radio}\fi + \@pdfm@mark{ann @\btn@type\HyField@TheAnnotCount\space\dvipdfm@setdim + <<\common@RadioCode>>}\unhbox\pdfm@box\relax% +% \end{macrocode} +% Save the object reference to this kid +% \begin{macrocode} + \ifuseNewRadios + \edef\x{\noexpand\g@addto@macro\noexpand + \ef@KidsArray{@parentobj\HyField@TheAnnotCount\space}}\x + \csarg\xdef{kid@\Fld@name}{\ef@KidsArray}% + \else + \@pdfm@mark{put @afields @\btn@type\HyField@TheAnnotCount}% + \fi + \endgroup + \dl@restorespcs +} +% \end{macrocode} +% \begin{macrocode} +\def\eq@Check@driver{\ef@adjHWxetex\Hy@pdfstringtrue \ifx\@vertRotate\ef@One \let\W@temp\eq@rectW\edef\eq@rectW{\eq@rectH}% \edef\eq@rectH{\W@temp}\fi\centerWidget\eq@rectH \ifx\autoCenter\ef@n\eqcenterWidget=0pt\fi \ifx\eq@rectW\@empty\def\eq@rectW{\wd\eq@tmpbox}\fi + \HyField@AdvanceAnnotCount \setbox\pdfm@box=% \hbox{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% - \@pdfm@mark{ann \dvipdfm@setdim - <<\common@RadioCheckCode>>}\unhbox\pdfm@box\relax% + \ifx\annot@type\annot@type@checkbox\def\btn@type{check}\else + \def\btn@type{radio}\fi + \@pdfm@mark{ann @\btn@type\HyField@TheAnnotCount\space\dvipdfm@setdim + <<\common@CheckCode>>}\unhbox\pdfm@box\relax% + \@pdfm@mark{put @afields @\btn@type\HyField@TheAnnotCount}% \endgroup \dl@restorespcs } \def\eq@l@check@driver{% - \setbox\pdfm@box=% - \hbox{\makebox[\eq@tmpdima]{\phantom{\link@@Content}}}% - \@pdfm@mark{ann \dvipdfm@setdim<<\common@RadioCheckCode>>}% - \unhbox\pdfm@box\relax\endgroup + \HyField@AdvanceAnnotCount + \setbox\pdfm@box=% + \hbox{\makebox[\eq@tmpdima]{\phantom{\link@@Content}}}% + \@pdfm@mark{ann @check\HyField@TheAnnotCount\space + \dvipdfm@setdim<<\common@CheckCode>>}% + \unhbox\pdfm@box\relax + \@pdfm@mark{put @afields @check\HyField@TheAnnotCount}% + \endgroup } \def\eq@TextField{\ef@adjHWxetex\Hy@pdfstringtrue \ifx\@vertRotate\ef@One @@ -4715,6 +5209,7 @@ \hbox{\lower\eqcenterWidget\ef@Bbox{\eq@rectW}{\eq@rectH}}% \@pdfm@mark{ann @\Fld@name\space\dvipdfm@setdim << \common@SigFieldCode >>}\unhbox\pdfm@box\relax% + \@pdfm@mark{put @afields @\Fld@name}% record in @afields array \endgroup \dl@restorespcs } @@ -4788,6 +5283,7 @@ ef_setCalcOrder(_EfCalcOrder); % \begin{macrocode} %<*package> \inputCalcOrderJS +\catcode`\$=\ef@CatChngs %</package> % \end{macrocode} % \Finale diff --git a/macros/latex/contrib/acrotex/examples/jquiztst.pdf b/macros/latex/contrib/acrotex/examples/jquiztst.pdf Binary files differindex 30175b4f39..d000d0ddca 100644 --- a/macros/latex/contrib/acrotex/examples/jquiztst.pdf +++ b/macros/latex/contrib/acrotex/examples/jquiztst.pdf diff --git a/macros/latex/contrib/acrotex/examples/jquiztst.tex b/macros/latex/contrib/acrotex/examples/jquiztst.tex index 7bb468051a..e6d3a0aa29 100644 --- a/macros/latex/contrib/acrotex/examples/jquiztst.tex +++ b/macros/latex/contrib/acrotex/examples/jquiztst.tex @@ -247,7 +247,7 @@ buttons that have a green boundary to get a solution. \NoPeeking % or put in preamble -\begin{quiz}{mathquiz} Answer each of the following. Passing +\begin{quiz*}{mathquiz} Answer each of the following. Passing is 100\%. \begin{questions} @@ -280,7 +280,7 @@ the power rule: In the syntax of this document, \js{2*x*e^(x^2)}. \end{solution} \end{questions} -\end{quiz}\quad\ScoreField\currQuiz\olBdry\CorrButton\currQuiz +\end{quiz*}\quad\ScoreField\currQuiz\olBdry\CorrButton\currQuiz \noindent Answers: \AnswerField\currQuiz diff --git a/macros/latex/contrib/acrotex/examples/jtxttst.pdf b/macros/latex/contrib/acrotex/examples/jtxttst.pdf Binary files differindex 8638f825f2..298a75f321 100644 --- a/macros/latex/contrib/acrotex/examples/jtxttst.pdf +++ b/macros/latex/contrib/acrotex/examples/jtxttst.pdf diff --git a/macros/latex/contrib/acrotex/examples/jtxttst.tex b/macros/latex/contrib/acrotex/examples/jtxttst.tex index 2311e2170b..ed7b937fa7 100644 --- a/macros/latex/contrib/acrotex/examples/jtxttst.tex +++ b/macros/latex/contrib/acrotex/examples/jtxttst.tex @@ -37,11 +37,11 @@ Department of Mathematics} \section{Text Fill-in Questions} -\textsf{Exerquiz} can now create text fill-in questions, questions -in which the response is text (as opposed to a mathematical -expression). The underlying JavaScript compares the user's -response against acceptable alternatives, as supplied by the -author of the question. If there is a match, the response is +\textsf{Exerquiz} can now create text fill-in questions, +questions in which the response is text (as opposed to a +mathematical expression). The underlying JavaScript compares the +user's response against acceptable alternatives, as supplied by +the author of the question. If there is a match, the response is deemed correct. For example: \redpoint\begin{oQuestion}{ex1}% @@ -51,52 +51,59 @@ Who was the first President\footnote{of the United States}?\ \end{oQuestion} \medskip\noindent -The command \cs{RespBoxTxt} is the one that creates a text fill-in question. Its -syntax is +The command \cs{RespBoxTxt} is the one that creates a text +fill-in question. Its syntax is \begin{verbatim} \RespBoxTxt[#1]#2#3[#4]#5<plus listing of alternatives> \end{verbatim} \noindent\textbf{\hypertarget{paraRespBoxTxt}{Parameters:}} \begin{enumerate} -\item[\ttfamily\#1:]Optional parameter used to modify the appearance of the - text field. -\item[\ttfamily\#2:]This required parameter is a number that indicates -the filtering method to be used. Permissible values of this parameter are +\item[\ttfamily\#1:]Optional parameter used to modify the + appearance of the text field. +\item[\ttfamily\#2:]This required parameter is a number that + indicates the filtering method to be used. Permissible + values of this parameter are \begin{enumerate} - \item[\ttfamily-1:] (The default) The author's and user's answers are not filtered - in any way. (Spaces, case, and punctuation are preserved.) - \item[\ttfamily0:] The author's and user's answers are converted to - lower case, any white space and non-word characters are removed. - \item[\ttfamily1:] The author's and user's answers are converted to - lower case, any white space is removed. - \item[\ttfamily2:] The author's and user's answers are stripped of - white space. + \item[\ttfamily-1:] (The default) The author's and + user's answers are not filtered in any way. (Spaces, + case, and punctuation are preserved.) + \item[\ttfamily0:] The author's and user's answers are + converted to lower case, any white space and + non-word characters are removed. + \item[\ttfamily1:] The author's and user's answers are + converted to lower case, any white space is removed. + \item[\ttfamily2:] The author's and user's answers are + stripped of white space. \end{enumerate} -See the JavaScript function \texttt{eqFilter} in \texttt{exerquiz.dtx} for -program code details. Additional filtering options may be added. +See the JavaScript function \texttt{eqFilter} in +\texttt{exerquiz.dtx} for program code details. Additional +filtering options may be added. -\item[\ttfamily\#3:] This parameter is a number that indicates the compare -method to be used. Permissible values of this parameter are +\item[\ttfamily\#3:] This parameter is a number that indicates + the compare method to be used. Permissible values of this + parameter are \begin{enumerate} - \item[\ttfamily0:] (The default) The author's and user's answers are - compared for an exact match. (These answers are filtered before they are - compared.) - \item[\ttfamily1:] The user's response is searched in an attempt to - get a substring match with the author's alternatives. Additional comparison - methods may be added. + \item[\ttfamily0:] (The default) The author's and user's + answers are compared for an exact match. (These + answers are filtered before they are compared.) + \item[\ttfamily1:] The user's response is searched in an + attempt to get a substring match with the author's + alternatives. Additional comparison methods may be + added. \end{enumerate} See the JavaScript function \texttt{compareTxt} in \texttt{exerquiz.dtx} for the program code details. \item[\ttfamily\#4:] Optional, a named destination to the -solution to the question. If this parameter appears, then a -solution must follow the question, enclosed in a \texttt{solution} -environment. If the forth parameter is a `\texttt*', then an automatic -naming scheme is used instead. -\item[\ttfamily\#5:] This required parameter is the -number of alternative answers that are acceptable. The alternative -answers are listed immediately after this parameter. (The example -above specified that $4$ alternatives follow.) + solution to the question. If this parameter appears, then + a solution must follow the question, enclosed in a + \texttt{solution} environment. If the forth parameter is + a `\texttt*', then an automatic naming scheme is used + instead. +\item[\ttfamily\#5:] This required parameter is the number of + alternative answers that are acceptable. The alternative + answers are listed immediately after this parameter. (The + example above specified that $4$ alternatives follow.) \end{enumerate} \makeatletter diff --git a/macros/latex/contrib/acrotex/examples/webeqtst.pdf b/macros/latex/contrib/acrotex/examples/webeqtst.pdf Binary files differindex c3cd409075..17f62734cc 100644 --- a/macros/latex/contrib/acrotex/examples/webeqtst.pdf +++ b/macros/latex/contrib/acrotex/examples/webeqtst.pdf diff --git a/macros/latex/contrib/acrotex/exerquiz.dtx b/macros/latex/contrib/acrotex/exerquiz.dtx index 5f7dc9305c..b2f61b7870 100644 --- a/macros/latex/contrib/acrotex/exerquiz.dtx +++ b/macros/latex/contrib/acrotex/exerquiz.dtx @@ -4,7 +4,7 @@ %<*copyright> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Exerquiz.sty package, %% -%% Copyright (C) 1999-2018 D. P. Story %% +%% Copyright (C) 1999-2019 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% @@ -22,7 +22,7 @@ %<randomize>\ProvidesFile{aebrandom.def} %<sumrytbls>\ProvidesFile{aebsumrytbls.def} %<template>\ProvidesFile{template.def} -%<package|driver|aebjs|eqexam|randomize|sumrytbls|template> [2019/02/11 v8.2.9 % +%<package|driver|aebjs|eqexam|randomize|sumrytbls|template> [2019/08/13 v8.3 % %<package> Exerquiz: Exercises and Quizzes for LaTeX/PDF package (dps)] %<driver> Exerquiz documentation driver file (dps)] %<aebjs> Exerquiz document level JavaScript (dps)] @@ -2415,7 +2415,7 @@ % yet to be determined, there are problems when using the \texttt{fortextbook} % option when hiding solutions. %} -%\changes{v8.2.9}{2019/02/11}{\string\let\eqSavedComment\string\dlcomment, \string\dlcomment\space +%\changes{v8.2.9}{2019/02/11}{\string\cs{eqSavedComment}\string\cs{dlcomment}, \string\cs{dlcomment}\space %is not defined in \string\pkg{insdljs}} % \begin{macrocode} \let\eqSavedComment\dlcomment @@ -3927,27 +3927,35 @@ %</package|eqexam> %<*package> \def\sq@IDTxtField{\makebox[0pt][l]{\textField[\autoCenter{n}\BC{}\BG{} - \S{S}\textSize{0}\Ff{\FfReadOnly} - \AA{\AAFormat{% - var \oField=new Object;\r - \oField.Grp={}; - \ifx\defaultColorJSLoc\@empty\else\r - \oField.DefaultColorJSLoc=\defaultColorJSLoc;\fi - \ifx\rghtColorJSLoc\@empty\else\r - \oField.RightColorJSLoc=\rghtColorJSLoc;\fi - \ifx\wrngColorJSLoc\@empty\else\r - \oField.WrongColorJSLoc=\wrngColorJSLoc;\fi - \ifx\rghtAnsSymbJSLoc\@empty\else\r - \oField.RightAnsSymbJSLoc=\rghtAnsSymbJSLoc;\fi - \ifx\wrngAnsSymbJSLoc\@empty\else\r - \oField.WrongAnsSymbJSLoc=\wrngAnsSymbJSLoc;\fi - }}]{sqID\oField}{2bp}{2bp}}% + \S{S}\textSize{0}\Ff{\FfReadOnly} + \AA{\AAFormat{% + if (typeof \oField=="undefined")\r\t + var \oField=new Object;\r + \oField.Grp={}; + \ifx\defaultColorJSLoc\@empty\else\r + \oField.DefaultColorJSLoc=\defaultColorJSLoc;\fi + \ifx\rghtColorJSLoc\@empty\else\r + \oField.RightColorJSLoc=\rghtColorJSLoc;\fi + \ifx\wrngColorJSLoc\@empty\else\r + \oField.WrongColorJSLoc=\wrngColorJSLoc;\fi + \ifx\rghtAnsSymbJSLoc\@empty\else\r + \oField.RightAnsSymbJSLoc=\rghtAnsSymbJSLoc;\fi + \ifx\wrngAnsSymbJSLoc\@empty\else\r + \oField.WrongAnsSymbJSLoc=\wrngAnsSymbJSLoc;\fi +}}]{sqID\oField}{2bp}{2bp}}% } \def\qz@IDTxtField{\makebox[0pt][l]{\textField[\autoCenter{n}\BC{}\BG{} \S{S}\textSize{0}\Ff{\FfReadOnly} \AA{\AAFormat{if(typeof aQuizzesInDoc=="undefined")\r\t var aQuizzesInDoc=new Array();\r - if (aQuizzesInDoc.indexOf("\oField")) aQuizzesInDoc.push("\oField"); + if (aQuizzesInDoc.indexOf("\oField")) + aQuizzesInDoc.push("\oField");\r +% \end{macrocode} +% (2019/06/22) Added in declaration of quiz object. +%\changes{v8.2.12}{2019/06/22}{Added declaration of quiz object} +% \begin{macrocode} + if (typeof \oField=="undefined")\r\t + var \oField=new Object;\r }}]{qzID\oField}{2bp}{2bp}}} %</package> %<*package|eqexam> @@ -4955,7 +4963,7 @@ \mbox{\check@@Box{#1\V{Yes}\DV{Yes}}% {rbmarkup.\Fld@name}% {\RadioFieldSize}{\RadioFieldSize}{Yes}{}% - {\eq@setWidgetProps\eq@RadioCheck@driver}% + {\eq@setWidgetProps\eq@Check@driver}% {\rbMarkup@Defaults\every@CheckBox\every@rbMarkup}}}% % \end{macrocode} % \end{macro} @@ -5193,7 +5201,7 @@ % \begin{macrocode} \def\DeclareQuiz#1{\edef\oField{#1}% \edef\thisQuiz{#1}\edef\curr@quiz{#1}% - \edef\currQuiz{#1}\edef\curr@quiz{#1}} + \edef\currQuiz{#1}} \let\Quiz\DeclareQuiz % \end{macrocode} % \end{macro} @@ -5957,7 +5965,8 @@ \def\@@Ans@sq@f@Defaults {% \BC{0 0 0}\Ff{\FfNoToggleToOff}\W{1} - \F{\FPrint}\textSize{12}\textColor{0 g} +% \F{\FPrint} + \textSize{12}\textColor{0 g} } % \end{macrocode} % For short quizzes, refine the type of responses: turn off the alert @@ -6072,16 +6081,13 @@ \Ans@sq@f@driver %</eqexam> %<*package> -% \end{macrocode} -%\changes{v6.7d}{2013/05/27}{new \cs{rbf@Opts} option.} -% \begin{macrocode} \mbox{\expandafter\radio@@Button\expandafter{\rbf@Opts}% - {mc.\oField.\thequestionno}% - {\RadioFieldSize}% 11/16/05 changed from \oField to mc.\oField - {\RadioFieldSize}{\Ans@choice\alph{quizno}}{\eq@protect\A}% - {\eq@setWidgetProps\eq@RadioCheck@driver}% - {\@@Ans@sq@f@Defaults\Ans@sq@f@Actions\every@RadioButton - \every@sqRadioButton}}% + {mc.\oField.\thequestionno}% + {\RadioFieldSize}{\RadioFieldSize}% + {\Ans@choice\alph{quizno}}{\eq@protect\A}% + {\eq@setWidgetProps\eq@Radio@driver}% + {\@@Ans@sq@f@Defaults\Ans@sq@f@Actions\every@RadioButton + \every@sqRadioButton}}% \Ans@proofing{\RadioFieldSize}% %</package> %<*package|eqexam> @@ -6170,7 +6176,7 @@ {mc.\oField.\thequestionno.\arabic{quizno}}% {\RadioFieldSize}{\RadioFieldSize} {\Ans@choice\alph{quizno}}{\eq@protect\A}% - {\eq@setWidgetProps\eq@RadioCheck@driver}% + {\eq@setWidgetProps\eq@Check@driver}% {\@@Ans@ck@sq@f@Defaults\Ans@ck@sq@f@Actions\every@CheckBox \every@sqCheckBox}}% \Ans@proofing{\RadioFieldSize}% @@ -6607,7 +6613,7 @@ if (_bOK) {\jsR\jsT \mbox{\expandafter\radio@@Button\expandafter{\rbf@Opts}% {mc.\curr@quiz.\thequestionno}% {\RadioFieldSize}{\RadioFieldSize}{\Ans@choice\alph{quizno}}% - {\eq@protect\A}{\eq@setWidgetProps\eq@RadioCheck@driver}% + {\eq@protect\A}{\eq@setWidgetProps\eq@Radio@driver}% {\Ans@r@f@Defaults\Ans@r@f@Actions\every@RadioButton \every@qRadioButton\insert@circlesymbol}}% \let\late@options\@empty @@ -6642,7 +6648,7 @@ if (_bOK) {\jsR\jsT \makebox[0pt][r]{\check@@Box{}% {mcq.\curr@quiz.\thequestionno.\arabic{quizno}}% {\RadioFieldSize}{\RadioFieldSize}{Yes}{}% - {\eq@setWidgetProps\eq@RadioCheck@driver}% + {\eq@setWidgetProps\eq@Check@driver}% {\Ans@c@f@Defaults\Ans@c@f@Choice\every@CheckBox \every@qCheckBox\late@options}}% \fi @@ -6719,7 +6725,7 @@ if (_bOK) {\jsR\jsT \mbox{\expandafter\check@@Box\expandafter{\cbf@Opts}% {mck.\curr@quiz.\thequestionno.\arabic{quizno}}% {\RadioFieldSize}{\RadioFieldSize}{\Ans@choice\alph{quizno}}% - {\eq@protect\A}{\eq@setWidgetProps\eq@RadioCheck@driver}% + {\eq@protect\A}{\eq@setWidgetProps\eq@Check@driver}% {\Ans@ck@f@Defaults\Ans@ck@f@Actions\every@RadioButton \every@qckCheckbox}}% \ifnocorrections\else @@ -6751,7 +6757,7 @@ if (_bOK) {\jsR\jsT \makebox[0pt][r]{\check@@Box{}% {mcq.\curr@quiz.\thequestionno.\arabic{quizno}}% {\RadioFieldSize}{\RadioFieldSize}{Yes}{}% - {\eq@setWidgetProps\eq@RadioCheck@driver}% + {\eq@setWidgetProps\eq@Check@driver}% {\Ans@c@f@Defaults\Ans@c@f@Choice\every@CheckBox % \end{macrocode} % (2012/12/22) Replace \cs{every@qRadioButton} with \cs{every@qCheckBox}. @@ -8482,7 +8488,7 @@ if (!isQuizInitialized("@currQuiz")) { % \par\medskip % \noindent Usage: %\begin{verbatim} -% \RespBoxTxt[#1]#2[#3]#4[<num1>]{<word1>}...[<num_n>]{<word_n>} +% \RespBoxTxtPC[#1]#2[#3]#4[<num1>]{<word1>}...[<num_n>]{<word_n>} %\end{verbatim} % \begin{description} % \item[\ttfamily\#1 :] Optional parameter used to modify the appearance of the @@ -8644,7 +8650,17 @@ if (!isQuizInitialized("@currQuiz")) { % essay-type questions. This question will not be graded by JavaScript, % of course; ideally, the response will be submitted to a CGI for storage % in a database. The instructor can later bring up the student's response -% and assign a grade. +% and assign a grade. Syntax: +%\begin{quote}\ttfamily +% \string\RespBoxEssay[\ameta{opts}][\ameta{dest}]\darg{\ameta{wd}}\darg{\ameta{ht}}\\[3pt] +% \string\RespBoxEssay[\ameta{opts}]*\darg{\ameta{wd}}\darg{\ameta{ht}} +% \end{quote} +% The second argument declares the problem has a \env{solution} file; we define the target +% of the solution twh ways: an explicite \ameta{dest} string, or an star (\texttt*), where +% the destination is automatically named. If you use \ameta{dest}, you must have +% a frist optional, even if its only \texttt{[]}, to correctly parse this construction. +% \changes{v8.3}{2019/08/13}{\string\env{solution} environment now defined for +% \string\cs{RespBoxEssay}} % \begin{macrocode} \def\RespBoxEssayDefaults {% @@ -8656,10 +8672,10 @@ if (!isQuizInitialized("@currQuiz")) { \AAKeystroke{% if(event.willCommit){\jsR\jsT RecordPointValue(\eqPTs,\thequestionno);\jsR\jsT - RecordProblemType("\eqQT",\thequestionno);\jsR\jsT + RecordProblemType("\eqQT",\thequestionno);\jsR %\jsT }\jsR if (!isQuizInitialized("\curr@quiz")) {\jsR\jsT - @eqObjAlert\space eqAppAlert(% + \eqObjAlert\space eqAppAlert(% InitMsg("\bqlabelISO"),3);\jsR\jsT event.rc = false;\jsR }% @@ -8667,14 +8683,29 @@ if (!isQuizInitialized("@currQuiz")) { \fi } } -\newcommand\RespBoxEssay[3][] +% \RespBoxEssay[opt][dest]|*{wd}{ht} +\newcommand\RespBoxEssay[1][]{\def\rbe@rgi{#1}\RespBoxEssay@i} +\def\RespBoxEssay@i{\@ifnextchar[%] + {\RespBoxEssay@ii} + {\@ifstar{\RespBoxEssay@ii[\curr@quiz.\thequestionno]}}% + {\RespBoxEssay@ii[]}% +} +% \RespBoxEssay#1[dest]{wd}{ht} +\newcommand\RespBoxEssay@ii[3][] {% \smallskip\addtocounter{eqpointvalue}{\eqPTs}% +% \end{macrocode} +% (2019/06/26) Added \cs{eq@AddProbToQzQuesList} for \cs{RespBoxEssay} +% \changes{v8.2.13}{2019/06/26}{Added \string\cs{eq@AddProbToQzQuesList} for \string\cs{RespBoxEssay}} +% \begin{macrocode} + \eq@AddProbToQzQuesList \stepcounter{questionno}% - \mbox{\text@@Field{#1}{essay.\curr@quiz.\thequestionno}{#2}{#3}% + \xdef\@qzsolndest{#1}% \edef\eqtmp{\aPointType}\xdef\aPointType{\eqtmp,[\eqPTs,"essay"]}% - {\eq@protect\AA}{\eq@setWidgetProps\@@RespBoxEssayActions - \eq@TextField}{\RespBoxEssayDefaults\every@eqTextField}}% + \expandafter\mbox\expandafter{\expandafter\text@@Field\expandafter{\rbe@rgi}{essay.\curr@quiz.\thequestionno}{#2}{#3}% + {\eq@protect\AA}{\eq@setWidgetProps + \eq@TextField}{\RespBoxEssayDefaults\@@RespBoxEssayActions + \every@eqTextField}}% } % \end{macrocode} % \end{macro} @@ -9192,8 +9223,13 @@ if (!isQuizInitialized("@currQuiz")) { \let\eqQzQuesList\@empty \def\eq@AddProbToQzQuesList{% \edef\eq@tmpExp{\noexpand\g@addto@macro% - \noexpand\eqQzQuesList{% - \noexpand\@eqListExp{\@currentQues}{\thepage}}}% +% \end{macrocode} +% Cosmetic change replaced \cs{noexpand} with \cs{string}. +% \changes{v8.2.15}{2019/08/06}{replace \string\cs{noexpand} with \string\cs{string}} +% \begin{macrocode} + \noexpand\eqQzQuesList{\string + \@eqListExp{\@currentQues}{\the\c@page}}}% +% \@eqListExp{\@currentQues}{\thepage}}}% % \end{macrocode} % We add to the list only if we are not within a \texttt{mathGrp} environment. % \begin{macrocode} @@ -9346,22 +9382,22 @@ if (!isQuizInitialized("@currQuiz")) { \edef\eq@p{\the\@tempcnta}% \@tempcnta=\eq@n \advance\@tempcnta-\eq@p\relax - \ifnum\@tempcnta=0 - \@tempcntb=\eq@q \advance\@tempcntb1 + \ifnum\@tempcnta=\z@ + \@tempcntb=\eq@q \advance\@tempcntb\@ne \xdef\@beginSecCol{\the\@tempcntb}% \advance\@tempcntb\eq@q\relax \xdef\@beginThrdCol{\the\@tempcntb}% - \else\ifnum\@tempcnta=1 - \@tempcntb=\eq@q \advance\@tempcntb1 + \else\ifnum\@tempcnta=\@ne + \@tempcntb=\eq@q \advance\@tempcntb\@ne \edef\nB@lCols{\the\@tempcntb}% - \advance\@tempcntb1\relax + \advance\@tempcntb\@ne \xdef\@beginSecCol{\the\@tempcntb}% \advance\@tempcntb\eq@q\relax \xdef\@beginThrdCol{\the\@tempcntb}% - \else\ifnum\@tempcnta=2 + \else\ifnum\@tempcnta=2\relax \@tempcntb=\eq@q \advance\@tempcntb1 \edef\nB@lCols{\the\@tempcntb}% - \advance\@tempcntb1 + \advance\@tempcntb\@ne \xdef\@beginSecCol{\the\@tempcntb}% \advance\@tempcntb\nB@lCols \xdef\@beginThrdCol{\the\@tempcntb}% @@ -9397,8 +9433,7 @@ if (!isQuizInitialized("@currQuiz")) { % \begin{macrocode} \def\eq@begintab{% \begin{tabular}[t]{lcc}\sumryTblQ&\sumryTblR&\sumryTblP\\\sthline - {\Large\strut}% -} + {\Large\strut}} % \end{macrocode} % \DescribeMacro{\sthline}\cmd{\sthline} % is a user hook to change the appearance of the horizontal line, such @@ -9512,12 +9547,10 @@ if (!isQuizInitialized("@currQuiz")) { % total number of questions. % \begin{macrocode} \def\writeProListAux{% - \eq@IWAuxOut{\string\expandafter\string\gdef - \string\csname\space\currQuiz QzQuesList\string\endcsname - {\eqQzQuesList}}% - \eq@IWAuxOut{\string\expandafter\string\gdef - \string\csname\space\currQuiz nQuestions\string\endcsname - {\thequestionno}}% + \eq@IWAuxOut{\string + \csarg\string\gdef{\currQuiz QzQuesList}{\eqQzQuesList}}% + \eq@IWAuxOut{\string + \csarg\string\gdef{\currQuiz nQuestions}{\thequestionno}}% } % \end{macrocode} % \end{macro} @@ -12633,6 +12666,11 @@ partialColor:wrongColor; // find the next non-null field var g=this.getField(qtfield+"SanityCheckPts."+i); var qpts=(ProbDist[i]==undefined) ? 0 : ProbDist[i]; +% \end{macrocode} +% (2019/06/30) if negative points are not allowed, make qpts zero if necessary +% \changes{v8.2.14}{2019/06/30}{Added a condition if negPointsAllowed} +% \begin{macrocode} + if ( !negPointsAllowed && (qpts < 0) ) qpts=0; var thesePts= qpts + (( qpts == 1 )?% " \eqptLabel":" \eqptsLabel"); g.value = thesePts; @@ -12648,6 +12686,7 @@ partialColor:wrongColor; // find the next non-null field var g=this.getField(qtfield+"SanityCheckOOPts."+i); var qpts=(ProbDist[i]==undefined) ? 0 : ProbDist[i]; + if ( !negPointsAllowed && (qpts < 0) ) qpts=0; var ptValue = oQName.PtValues[i]; var probPts = ptValue + (( ptValue == 1 )?% " \eqptLabel":" \eqptsLabel"); diff --git a/macros/latex/contrib/acrotex/insdljs.dtx b/macros/latex/contrib/acrotex/insdljs.dtx index 204a4b2824..d6bc80b523 100644 --- a/macros/latex/contrib/acrotex/insdljs.dtx +++ b/macros/latex/contrib/acrotex/insdljs.dtx @@ -4,7 +4,7 @@ %<*copyright> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% insdljs.sty package, %% -%% Copyright (C) 2001-2018 D. P. Story %% +%% Copyright (C) 2001-2019 D. P. Story %% %% dpstory@uakron.edu %% %% %% %% This program can redistributed and/or modified under %% @@ -16,7 +16,7 @@ %</copyright> %<package>\NeedsTeXFormat{LaTeX2e} %<package>\ProvidesPackage{insdljs} -%<package> [2019/03/16 v2.4.2 Insert Document Level JavaScripts (dps)] +%<package> [2019/08/06 v2.4.6 Insert Document Level JavaScripts (dps)] %<*driver> \documentclass{ltxdoc} \usepackage[colorlinks,hyperindex=false]{hyperref} @@ -475,14 +475,22 @@ \DeclareOptionX{debug}{\let\dljs@debug\dl@YES} \let\dljs@debug\dl@NO % \end{macrocode} -% \IndexOpt{execJS} -% If the execution of JavaScript code is permitted following distillation. The default is no. -% \begin{macrocode} -\DeclareOptionX{execJS}{\let\execjs\dl@YES} -\let\execjs\dl@NO +% If the option \IndexOpt{execJS}\opt{execJS} is taken, then the JavaScript code for any \env{execJS} environment +% will be executed following PDF creation (\app{Acrobat} required). The default is no. +% More recently (2019/08/06) \DescribeMacro\execJSOn\cs{execJSOn} and \DescribeMacro\execJSOff\cs{execJSOff} +% were added to turn on (or off) execution of JS in this way. Useful when \pkg{insdljs} is loaded by other +% packages and you cannot access the optional arguments of \cs{usepackage}. These commands are only effective +% in the preamble. +% \changes{v2.4.6}{2019/08/06}{Added \string\cs{execJSOn} and \string\cs{execJSOff}} +% \begin{macrocode} +\DeclareOptionX{execJS}{\execJSOn} +\def\execJSOn{\let\execjs\dl@YES} +\def\execJSOff{\let\execjs\dl@NO} +\execJSOff \DeclareOptionX{nopro}{\let\dl@gopro\dl@NO} \let\dl@gopro\dl@YES % \end{macrocode} +% We set the driver, according to the following algorithm. % \begin{macrocode} \@ifpackageloaded{web}{% \ExecuteOptionsX{\eq@driver@name}% @@ -497,7 +505,7 @@ }% } % \end{macrocode} -% \IndexOpt{reqjs} +% \leavevmode\IndexOpt{reqjs} % Beginning with PDF 1.7, a document can specify requirements, here we declare % the document uses JavaScripts. The option \texttt{reqjs} is taken by default, % that is, JavaScripts are required for this document @@ -519,14 +527,18 @@ % function is the same, but begins with `\texttt{EF}'. For example, the keystroke function % \texttt{AFNumber\_Keystroke} is also known under the name of \texttt{EFNumber\_Keystroke}. % See \hyperref[s:AltAdbFncs]{Section~\ref*{s:AltAdbFncs}} for the list of functions. +% \changes{v2.4.6}{2019/08/06}{Added switch \string\cs{usedAdbFuncs} to help detect +% the usealtadobe option} % \begin{macrocode} -\DeclareOptionX{usealtadobe}{\def\inputAltAdbFncs{% - \InputIfFileExists{altadbfncs.def}% - {\PackageInfo{insdljs}{Inputting code for usealtadobe option}}% +\DeclareOptionX{usealtadobe}{\let\usedAdbFuncs\dl@YES + \def\inputAltAdbFncs{\InputIfFileExists{altadbfncs.def} + {\PackageInfo{insdljs}{Inputting code for usealtadobe option}} {\PackageWarning{insdljs}{Cannot find altadbfncs.def.\MessageBreak Reinstall or refresh your file name database.}}}} +\let\usedAdbFuncs\dl@NO \let\inputAltAdbFncs\relax -% \paragraph*{Process the package options} +% \end{macrocode} +% \textbf{Process the package options} % \begin{macrocode} \ProcessOptionsX % \end{macrocode} @@ -634,7 +646,8 @@ % do not. The \textbf{\textsf{Requirements}} dictionary goes in the document \textbf{\textsf{Catalog}}. % \changes{v2.2d}{2016/04/06}{Code to support \texttt{reqjs} and \texttt{{\string\EXPT}reqjs} options.} % \begin{macrocode} -\def\AEB@psMrk{[\space} +\def\AEB@psMrk{[%] + \space} \ifx\dl@reqJS\dl@YES \def\dl@@reqJS{/Type/Requirement/S/EnableJavaScripts} \ifpdf\pdfcatalog{\dl@@reqJS}\else @@ -1201,9 +1214,9 @@ \global\let\aebpFA\dl@YES \let\@pdfstartview\@empty \else - \edef\aebp@dljstmp{\aebp@rightDelimiters}% - \xdef\aebp@rightDelimiters{\aebp@dljstmp >> }% - \g@addto@macro\aebpopentoks{/Next << #1 }% + \edef\aebp@dljstmp{\aebp@rightDelimiters}% + \xdef\aebp@rightDelimiters{\aebp@dljstmp >> }% + \g@addto@macro\aebpopentoks{/Next << #1 }% \fi } \def\dljs@OpenActions{/OpenAction \addActionObj} @@ -1680,10 +1693,9 @@ % \textsf{aeb\_pro}. % \begin{macrocode} \let\DLspecialDefs\@empty -\def\fdfAfterheader -{% +\def\fdfAfterheader#1{% \iwvo{\string\begingroup\string\efdlspecials} - \iwvo{\string\DLspecialDefs} + \iwvo{\string\DLspecialDefs\string#1} \iwvo{\string\isdljstrue} \iwvo{\string\makeatletter} \iwvo{\string\immediate\string\openout\string @@ -1710,13 +1722,25 @@ } % \end{macrocode} % \begin{environment}{execJS} -% The parameter \texttt{\#1} is the base name for this environment. -% The base name will be used to create -% a filename to save the \texttt{.fdf} file under. -% \begin{macrocode} -\newenvironment{execJS}[1] +% \hskip-\marginparsep\texttt{[\ameta{\cs{cmd}}]\darg{\ameta{base-name}}} +% The parameter \texttt{\#2} (\ameta{base-name}) is the base name for this environment. +% The base name will be used to create a filename to save the \texttt{.fdf} file under. +% \begin{macrocode} +% \end{macrocode} +% Added \DescribeMacro\restoreDLspecialsDefs\cs{restoreDLspecialsDefs} to restore +% \DescribeMacro\DLspecialDefs\cs{DLspecialDefs} to its default of \cs{@empty}. +% \changes{v2.4.4}{2019/07/14}{Added \string\cs{restoreDLspecialsDefs}} +% The \env{execJS} environment now has an optional argument, the optional argument must be +% a command (\ameta{\cs{cmd}}) that is then passed on to \cs{fdfAfterheader}, which then writes it to +% \cs{dljsBase.djs}. The purpose is to make special definitions at the time the script +% is expanded. +% \changes{v2.4.5}{2019/07/15}{\string\env{execJS} now has an optional argument} +% \begin{macrocode} +\def\restoreDLspecialDefs{\let\DLspecialDefs\@empty} +\newenvironment{execJS}[2][\relax] {% - \gdef\detectdljs{\string_#1}\gdef\dljsBase{#1}% + \def\x{#1}\ifx\x\@empty\def\x{\relax}\fi + \gdef\detectdljs{\string_#2}\gdef\dljsBase{#2}% \global\dljsobjtoks={}% \expandafter\gdef\csname dljs\dljsBase\endcsname{}% \ifx\importdljs\dl@YES\ifx\execjs\dl@YES @@ -1728,12 +1752,17 @@ \fi\fi \fi\fi \immediate\openout \js@verbatim@out \js@Path\dljsBase.djs - \fdfAfterheader + \expandafter\fdfAfterheader\expandafter{\x}% \js@verbatimwrite }{% \fdfendstreamobj \endjs@verbatimwrite \fdftrailer +% \end{macrocode} +% Added \cs{restoreDLspecialsDefs} to restore \cs{DLspecialDefs} to its default of \cs{@empty}. +% \changes{v2.4.4}{2019/07/14}{Added \string\cs{restoreDLspecialsDefs}} +% \begin{macrocode} + \iwvo{\string\restoreDLspecialDefs}% \closejs@verbatim@out \expandafter\xdef\csname\dljsBase OBJ\endcsname{\the\dljsobjtoks}% \edef\@dljstmp{\noexpand\AtBeginDocument{% @@ -1840,7 +1869,7 @@ \edef\csname\p@r@m\the\c@dljs@cnt\endcsname{\the\JStoks}}} % \end{macrocode} % Beginning with \pkg{insdljs} dated 2019/03/16, we solve an age-old problem with \app{dvips}: This problem -% is that is wraps code around to th next line, according to some unknown algorithm. Normally this is not +% is that is wraps code around to the next line, according to some unknown algorithm. Normally this is not % a problem, but occassionally it will wrap some JavaScript code that breaks the code. Solve this problem, % we make the space character active, and replace it with \cs{pdfSP} (\cs{040}), which is octal for the space % character. Now there are no free spaces for \app{dvips} to break the line at in the PS file. The feature @@ -1850,10 +1879,21 @@ \def\pdfSpacesOn{\let\pdfSP\pdfSPDef} \def\pdfSpacesOff{\let\pdfSP\dl@sp@ce} % \end{macrocode} +% \DescribeMacro{\dlcombine}\hskip-\marginparsep\texttt{(\#1)(\#2)} +% Within the \env{defineJS} environment, spaces are obeyed, at time, we want to says +% \verb*|@currQuiz MyField|, for example. which within \env{defineJS} gets expanded to +% \verb*|q1 MyField|, not \texttt{q1MyField} as it should be. To solve this and other +% problems like it, use \verb|@dlcombine(@currQuiz)(MyField)| which does expand +% to the intended expression. (In this discussion, it is assumed \texttt{@} is the escape character +% within \env{defineJS}.) +% \changes{v2.4.3}{2019/06/27}{Added \string\cs{dlcombine}} +% \begin{macrocode} +\def\dlcombine(#1)(#2){#1#2} +% \end{macrocode} % When you declare a character to be an escape within the optional argument of \env{defineJS}, % that character may be needed in the code; for example if we say |\catcode`\!=0\relax|, and % within the JavaScript code you have \texttt{if (x != 0 ) ...}, there is a problem: the JavaScript -% code is broken. As a fix for this problem, you can declare \DescribeMacro\escIs|\escIS{!}|, +% code is broken. As a fix for this problem, you can declare \DescribeMacro\escIs|\escIs{!}|, % which in turn defines \DescribeMacro\Eschr\cs{Eschr}. the above code % should then be written as \texttt{if (x !Eschr= 0 ) ...}; messy, but it works. The lines % below is the recommended method of declaring \cs{escIs}: @@ -1865,9 +1905,18 @@ % \begin{macrocode} \def\escIs#1{\def\Eschr{#1}} % \end{macrocode} +% \DescribeMacro\makeesc\hskip-\marginparsep\texttt{\cs{\ameta{char}}} +% \cs{dl@makeesc} is a helper command that sets the escape character, +% Within the \env{defineJS} environments, it is \cs{let} to \DescribeMacro\makeesc\cs{makeesc}; +% eg, |\makeesc\@| +% \changes{v2.4.3}{2019/06/27}{Added \string\cs{dl@makeesc}} +% \begin{macrocode} +\def\dl@makeesc#1{\catcode`#1=0\relax} +% \end{macrocode} % Finally, we get to the definition of \env{defineJS}, and its compatriates. % \begin{macrocode} \newenvironment{defineJS}[2][]{% + \let\makeesc\dl@makeesc \expandafter\@ifundefined\expandafter{% \expandafter\@gobble\string#2}{}{% \PackageWarning{insdljs}{The command @@ -1894,6 +1943,7 @@ % \begin{macrocode} \newenvironment{@defineJS}[2][] {% + \let\makeesc\dl@makeesc \gdef\defineJSArg{#2}\JStoks={}% \def\verbatim@processline{% \xdef\JS@temp{\the\JStoks\the\verbatim@line\defineJSjsR}% diff --git a/macros/latex/contrib/acrotex/web.dtx b/macros/latex/contrib/acrotex/web.dtx index 605c2f5226..de0477d519 100644 --- a/macros/latex/contrib/acrotex/web.dtx +++ b/macros/latex/contrib/acrotex/web.dtx @@ -2951,8 +2951,10 @@ % \end{macrocode} % \begin{macrocode} \def\aebwritelastpage{% - \immediate\write\@auxout{\string\expandafter\string\gdef - \string\csname\space aebLastPage\string\endcsname{\arabic{page}}}% + \immediate\write\@auxout{% +% \string\expandafter\string\gdef +% \string\csname\space aebLastPage\string\endcsname{\arabic{page}}}% + \string\w@csarg\string\gdef{aebLastPage}{\arabic{page}}}% } % \end{macrocode} % \begin{macrocode} diff --git a/macros/latex/contrib/ducksay/ducksay.dtx b/macros/latex/contrib/ducksay/ducksay.dtx index 2f6a8f70c2..a6479e46ff 100644 --- a/macros/latex/contrib/ducksay/ducksay.dtx +++ b/macros/latex/contrib/ducksay/ducksay.dtx @@ -202,8 +202,8 @@ and the derived files ducksay.pdf \NeedsTeXFormat{LaTeX2e} \RequirePackage{xparse,l3keys2e} -\def\ducksay@version{2.4} -\def\ducksay@date{2019-06-11} +\def\ducksay@version{2.4.1} +\def\ducksay@date{2019-09-28} \ProvidesExplPackage {ducksay} {\ducksay@date} @@ -1662,7 +1662,7 @@ and the derived files ducksay.pdf ,body-align / r .meta:n = { body-to-msg = r , msg-to-body = r } ,body-align .initial:n = l ,body-bigger .int_set:N = \l_ducksay_body_bigger_int - ,body-bigger .initial:n = \c_zero + ,body-bigger .initial:n = \c_zero_int ,msg-align .choice: ,msg-align / l .code:n = { \tl_set:Nn \l_ducksay_msg_align_tl { l } } ,msg-align / c .code:n = { \tl_set:Nn \l_ducksay_msg_align_tl { c } } diff --git a/macros/latex/contrib/ducksay/ducksay.pdf b/macros/latex/contrib/ducksay/ducksay.pdf Binary files differindex fc1444ae24..f92d20fca5 100644 --- a/macros/latex/contrib/ducksay/ducksay.pdf +++ b/macros/latex/contrib/ducksay/ducksay.pdf diff --git a/macros/latex/contrib/duckuments/duckuments.dtx b/macros/latex/contrib/duckuments/duckuments.dtx index 0460a3f1dc..6359862efc 100644 --- a/macros/latex/contrib/duckuments/duckuments.dtx +++ b/macros/latex/contrib/duckuments/duckuments.dtx @@ -61,8 +61,8 @@ and the derived files duckuments.pdf, %<*driver|pkg> \RequirePackage{xparse}[2019-05-03] \RequirePackage{letltxmacro,l3keys2e} -\def\duckuments@version{0.4d} -\def\duckuments@date{2019/06/02} +\def\duckuments@version{0.4e} +\def\duckuments@date{2019-09-28} %</driver|pkg> % %<*driver> @@ -71,6 +71,7 @@ and the derived files duckuments.pdf, \documentclass{l3doc} \usepackage{duckuments} \usepackage{enumitem} +\usepackage{l3color} \newenvironment{options} {\begin{description}[style=nextline,font=\normalfont\ttfamily]} {\end{description}} @@ -429,7 +430,7 @@ and the derived files duckuments.pdf, % Stores the paragraph with which \cs{blindduck} should start. % \begin{macrocode} \int_new:N \g_duckuments_blindduck_start_int -\int_gset:Nn \g_duckuments_blindduck_start_int { \c_one } +\int_gset:Nn \g_duckuments_blindduck_start_int { \c_one_int } % \end{macrocode} % \end{variable}^^A<<< % @@ -465,7 +466,7 @@ and the derived files duckuments.pdf, % % \begin{variable}{\c_duckuments_blindduck_pars_int}^^A>>> % \begin{macrocode} -\int_const:Nn \c_duckuments_blindduck_pars_int { \c_five } +\int_const:Nn \c_duckuments_blindduck_pars_int { 5 } % \end{macrocode} % \end{variable}^^A<<< % @@ -476,7 +477,7 @@ and the derived files duckuments.pdf, \str_if_eq_p:Vn \c_sys_jobname_str { example-image-duck } || \str_if_eq_p:Vn \c_sys_jobname_str { example-image-duck-portrait } } - { \int_const:Nn \c_duckuments_example_pages_int { 1 } } + { \int_const:Nn \c_duckuments_example_pages_int { \c_one_int } } { \group_begin: \sys_if_engine_pdftex:T @@ -895,16 +896,16 @@ and the derived files duckuments.pdf, { >{\duckuments_starred:n}s O{} o m } { \IfValueTF { ##3 } - { \duckuments@includegraphicsBAK##1[##2][##3]{##4} } + { \duckuments@includegraphicsBAK##1[{##2}][{##3}]{##4} } { \regex_match:NnTF \c_duckuments_example_regex { ##4 } { \duckuments@includegraphicsBAK##1 - [page=\duckuments_random_page:,##2] + [{page=\duckuments_random_page:,##2}] { ##4 } } { - \duckuments@includegraphicsBAK##1[##2]{##4} + \duckuments@includegraphicsBAK##1[{##2}]{##4} } } } @@ -921,7 +922,8 @@ and the derived files duckuments.pdf, \regex_match:NnTF \c_duckuments_range_regex { #1 } { \seq_set_split:Nnn \l_duckuments_range_seq { - } { #1 } - \int_compare:nNnTF { 1 } = { \seq_count:N \l_duckuments_range_seq } + \int_compare:nNnTF + { \c_one_int } = { \seq_count:N \l_duckuments_range_seq } { \cs_set:Npn \duckuments@blindduck@text { @@ -932,13 +934,14 @@ and the derived files duckuments.pdf, { \bool_set_true:N \l_duckuments_blindduck_pars_bool \exp_args:Nx - \tl_if_empty:nF { \seq_item:Nn \l_duckuments_range_seq { \c_one } } + \tl_if_empty:nF + { \seq_item:Nn \l_duckuments_range_seq { \c_one_int } } { \int_gset:Nn \g_duckuments_blindduck_start_int - { \seq_item:Nn \l_duckuments_range_seq { \c_one } } + { \seq_item:Nn \l_duckuments_range_seq { \c_one_int } } } \exp_args:Nx - \tl_if_empty:nTF { \seq_item:Nn \l_duckuments_range_seq { \c_two } } + \tl_if_empty:nTF { \seq_item:Nn \l_duckuments_range_seq { 2 } } { \int_gset_eq:NN \g_duckuments_blindduck_end_int @@ -946,7 +949,7 @@ and the derived files duckuments.pdf, } { \int_set:Nn \g_duckuments_blindduck_end_int - { \seq_item:Nn \l_duckuments_range_seq { \c_two } } + { \seq_item:Nn \l_duckuments_range_seq { 2 } } } \duckuments_blindduck_set_text:xx { \int_use:N \g_duckuments_blindduck_start_int } @@ -968,7 +971,7 @@ and the derived files duckuments.pdf, {%>>> \def \duckuments@blindduck@text { - \int_step_function:nnnN { #1 } { \c_one } { #2 } + \int_step_function:nnnN { #1 } { \c_one_int } { #2 } \duckuments_blindduck_par_loop:n \duckuments_blindduck_set_next_start:n { #2 } } @@ -982,7 +985,7 @@ and the derived files duckuments.pdf, \cs_new:Npn \duckuments_blindduck_set_next_start:n #1 {%>>> \int_gset:Nn \g_duckuments_blindduck_start_int - { \int_mod:nn { #1 } { \c_duckuments_blindduck_pars_int } + \c_one } + { \int_mod:nn { #1 } { \c_duckuments_blindduck_pars_int } + \c_one_int } }%<<< % \end{macrocode} % \end{macro}^^A<<< @@ -994,7 +997,7 @@ and the derived files duckuments.pdf, \bool_if:nTF { \int_compare_p:nNn { #1 } > { \c_duckuments_blindduck_pars_int } - || \int_compare_p:nNn { #1 } < { \c_one } + || \int_compare_p:nNn { #1 } < { \c_one_int } } { \msg_error:nnxxxx { duckuments } { out~of~range } @@ -1200,7 +1203,7 @@ and the derived files duckuments.pdf, % \llap % { % \group_begin: -% \driver_color_gray:n { 0.5 } +% \color_select:nn { gray } { 0.5 } % \rlap % { % \smash diff --git a/macros/latex/contrib/duckuments/duckuments.pdf b/macros/latex/contrib/duckuments/duckuments.pdf Binary files differindex 0edc456889..02bce56712 100644 --- a/macros/latex/contrib/duckuments/duckuments.pdf +++ b/macros/latex/contrib/duckuments/duckuments.pdf diff --git a/macros/latex/contrib/duckuments/example-image-duck-portrait.pdf b/macros/latex/contrib/duckuments/example-image-duck-portrait.pdf Binary files differindex ce7bc8262e..ef895dbf68 100644 --- a/macros/latex/contrib/duckuments/example-image-duck-portrait.pdf +++ b/macros/latex/contrib/duckuments/example-image-duck-portrait.pdf diff --git a/macros/latex/contrib/duckuments/example-image-duck.pdf b/macros/latex/contrib/duckuments/example-image-duck.pdf Binary files differindex c9ee8019d1..78924c0120 100644 --- a/macros/latex/contrib/duckuments/example-image-duck.pdf +++ b/macros/latex/contrib/duckuments/example-image-duck.pdf diff --git a/macros/latex/contrib/glossaries/CHANGES b/macros/latex/contrib/glossaries/CHANGES index fb9bc0861a..1ddbd44ab6 100644 --- a/macros/latex/contrib/glossaries/CHANGES +++ b/macros/latex/contrib/glossaries/CHANGES @@ -1,5 +1,12 @@ glossaries change log: +v4.43 (2019-09-28): + + * glossaries.sty: + + - added check for LaTeX kernel 2019/10/01 (new kernel affects + accent stripping of UTF-8 characters with \makenoidxglossaries) + v4.42 (2019-01-06): * glossaries.sty: diff --git a/macros/latex/contrib/glossaries/README b/macros/latex/contrib/glossaries/README index 4f0e0ea8e5..57f06c7d5c 100644 --- a/macros/latex/contrib/glossaries/README +++ b/macros/latex/contrib/glossaries/README @@ -1,6 +1,6 @@ -LaTeX Package : glossaries v4.42 +LaTeX Package : glossaries v4.43 -Last Modified : 2019-01-06 +Last Modified : 2019-09-28 Author : Nicola Talbot diff --git a/macros/latex/contrib/glossaries/glossaries-code.pdf b/macros/latex/contrib/glossaries/glossaries-code.pdf Binary files differindex 4401858727..0b01413312 100644 --- a/macros/latex/contrib/glossaries/glossaries-code.pdf +++ b/macros/latex/contrib/glossaries/glossaries-code.pdf diff --git a/macros/latex/contrib/glossaries/glossaries-user.html b/macros/latex/contrib/glossaries/glossaries-user.html index df8866e01c..5692dfce9e 100644 --- a/macros/latex/contrib/glossaries/glossaries-user.html +++ b/macros/latex/contrib/glossaries/glossaries-user.html @@ -151,8 +151,9 @@ span.LATEX span.TEX{ position:relative; left: -0.4em; } div.float, div.figure {margin-left: auto; margin-right: auto;} div.float img {text-align:center;} div.figure img {text-align:center;} -.marginpar {width:20%; float:right; text-align:left; margin-left:auto; margin-top:0.5em; font-size:85%; text-decoration:underline;} -.marginpar p{margin-top:0.4em; margin-bottom:0.4em;} +.marginpar,.reversemarginpar {width:20%; float:right; text-align:left; margin-left:auto; margin-top:0.5em; font-size:85%; text-decoration:underline;} +.marginpar p,.reversemarginpar p{margin-top:0.4em; margin-bottom:0.4em;} +.reversemarginpar{float:left;} table.equation {width:100%;} .equation td{text-align:center; } td.equation { margin-top:1em; margin-bottom:1em; } @@ -224,6 +225,7 @@ table.gather {width:100%;} div.gather-star {text-align:center;} table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; } div.longtable{text-align:center;} +table.longtable{margin-left:auto; margin-right: auto;} .supertabular {text-align:center} div.important { border : solid red; } div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; clear:both; padding-top: 2ex; padding-bottom: 2ex;} @@ -309,7 +311,7 @@ span#textcolor62{color:#00FF00} > <!--l. 458--><p class="noindent" > </p><!--l. 458--><p class="noindent" ><span -class="cmr-17">User Manual for glossaries.sty v4.42</span> +class="cmr-17">User Manual for glossaries.sty v4.43</span> </p> <div class="tabular"> <table id="TBL-1" class="tabular" cellspacing="0" cellpadding="0" @@ -325,7 +327,7 @@ href="http://www.dickimaw-books.com/" class="url" ><span class="cmtt-12">http://www.dickimaw-books.com/</span></a> </td></tr></table> </div> <!--l. 458--><p class="noindent" ><span -class="cmr-12">2019-01-06</span></p></div> +class="cmr-12">2019-09-28</span></p></div> <div class="abstract" > @@ -482,7 +484,7 @@ class="cmtt-10">glossaries-code.pdf</span></a> </dt><dd class="description">Advanced users wishing to know more about the inner workings of all the packages provided in the <span class="cmss-10">glossaries </span>bundle should read “Documented - Code for glossaries v4.42”. + Code for glossaries v4.43”. </dd><dt class="description"> <span class="cmbx-10">INSTALL</span> </dt><dd @@ -1183,7 +1185,7 @@ class="cmtt-10">o</span>. Depending on the font, the backslash character may appear as a dash when used in the main document text, so <span class="cmtt-10">\foo </span>will appear as: —foo. - <!--l. 304--><p class="noindent" >Earlier versions of <span + <!--l. 306--><p class="noindent" >Earlier versions of <span class="cmss-10">glossaries </span>used this technique to write information to the files used by the indexing applications to prevent problems caused by fragile commands. Now, this is only used for the <span @@ -1412,7 +1414,7 @@ id="TBL-2-3" /><col id="TBL-2-4" /><col id="TBL-2-5" /><col id="TBL-2-6" /></colgroup><tr - style="vertical-align:baseline;" id="TBL-2-1-"><td style="white-space:wrap; text-align:left;" id="TBL-2-1-1" + style="vertical-align:baseline;" id="TBL-2-1-"><td style="white-space:normal; text-align:left;" id="TBL-2-1-1" class="td01"><!--l. 769--><p class="noindent" > </p></td><td style="white-space:nowrap; text-align:center;" id="TBL-2-1-2" class="td11"> <a href="#option1"><span @@ -1435,7 +1437,7 @@ href="#option5"><span class="cmbx-10">Option</span><span class="cmbx-10"> 5</span></a></td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-2-"><td style="white-space:wrap; text-align:left;" id="TBL-2-2-1" + style="vertical-align:baseline;" id="TBL-2-2-"><td style="white-space:normal; text-align:left;" id="TBL-2-2-1" class="td01"><!--l. 771--><p class="noindent" ><span class="cmr-9">Requires</span> <a @@ -1453,7 +1455,7 @@ class="pzdr-">✔</span></span> </td><td style="white-space:nowrap; class="td10"> <span id="textcolor5"><span class="pzdr-">✔</span></span> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-3-"><td style="white-space:wrap; text-align:left;" id="TBL-2-3-1" + style="vertical-align:baseline;" id="TBL-2-3-"><td style="white-space:normal; text-align:left;" id="TBL-2-3-1" class="td01"><!--l. 773--><p class="noindent" ><span class="cmr-9">Requires</span> <span @@ -1473,7 +1475,7 @@ class="pzdr-">✔</span></span> </td><td style="white-space:nowrap; class="td10"> <span id="textcolor10"><span class="pzdr-">✘</span></span> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-4-"><td style="white-space:wrap; text-align:left;" id="TBL-2-4-1" + style="vertical-align:baseline;" id="TBL-2-4-"><td style="white-space:normal; text-align:left;" id="TBL-2-4-1" class="td01"><!--l. 775--><p class="noindent" ><span class="cmr-9">Requires</span> <span @@ -1489,7 +1491,7 @@ class="pzdr-">✘</span></span> </td><td style="white-space:nowrap; class="td10"> <span id="textcolor15"><span class="pzdr-">✘</span></span> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-5-"><td style="white-space:wrap; text-align:left;" id="TBL-2-5-1" + style="vertical-align:baseline;" id="TBL-2-5-"><td style="white-space:normal; text-align:left;" id="TBL-2-5-1" class="td01"><!--l. 777--><p class="noindent" ><span class="cmr-9">Requires</span> <span @@ -1505,7 +1507,7 @@ class="pzdr-">✔</span></span> </td><td style="white-space:nowrap; class="td10"> <span id="textcolor20"><span class="pzdr-">✘</span></span> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-6-"><td style="white-space:wrap; text-align:left;" id="TBL-2-6-1" + style="vertical-align:baseline;" id="TBL-2-6-"><td style="white-space:normal; text-align:left;" id="TBL-2-6-1" class="td01"><!--l. 779--><p class="noindent" ><span class="cmr-9">Can</span> <span @@ -1536,7 +1538,7 @@ class="td11"> <span id="textcolor24"><span class="pzdr-">✔</span></span> </td><td style="white-space:nowrap; text-align:center;" id="TBL-2-6-6" class="td10"> N/A </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-7-"><td style="white-space:wrap; text-align:left;" id="TBL-2-7-1" + style="vertical-align:baseline;" id="TBL-2-7-"><td style="white-space:normal; text-align:left;" id="TBL-2-7-1" class="td01"><!--l. 782--><p class="noindent" ><span class="cmr-9">Efficient</span> <span @@ -1553,7 +1555,7 @@ class="td11"> <span id="textcolor28"><span class="pzdr-">✔</span></span> </td><td style="white-space:nowrap; text-align:center;" id="TBL-2-7-6" class="td10"> N/A </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-8-"><td style="white-space:wrap; text-align:left;" id="TBL-2-8-1" + style="vertical-align:baseline;" id="TBL-2-8-"><td style="white-space:normal; text-align:left;" id="TBL-2-8-1" class="td01"><!--l. 784--><p class="noindent" ><span class="cmr-9">Can</span> <span @@ -1584,7 +1586,7 @@ class="td11"> <span id="textcolor32"><span class="pzdr-">✔</span></span> </td><td style="white-space:nowrap; text-align:center;" id="TBL-2-8-6" class="td10"> N/A </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-9-"><td style="white-space:wrap; text-align:left;" id="TBL-2-9-1" + style="vertical-align:baseline;" id="TBL-2-9-"><td style="white-space:normal; text-align:left;" id="TBL-2-9-1" class="td01"><!--l. 788--><p class="noindent" ><span class="cmr-9">Any</span> <span @@ -1605,7 +1607,7 @@ class="td10"> <span id="textcolor37"><span class="pzdr-">✘</span></span><sup class="textsuperscript"><span class="tcrm-0900">‡</span></sup> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-10-"><td style="white-space:wrap; text-align:left;" id="TBL-2-10-1" + style="vertical-align:baseline;" id="TBL-2-10-"><td style="white-space:normal; text-align:left;" id="TBL-2-10-1" class="td01"><!--l. 790--><p class="noindent" ><span class="cmr-9">Are</span> <span @@ -1640,7 +1642,7 @@ class="pzdr-">✔</span></span> </td><td style="white-space:nowrap; class="td10"> <span id="textcolor42"><span class="pzdr-">✔</span></span> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-11-"><td style="white-space:wrap; text-align:left;" id="TBL-2-11-1" + style="vertical-align:baseline;" id="TBL-2-11-"><td style="white-space:normal; text-align:left;" id="TBL-2-11-1" class="td01"><!--l. 793--><p class="noindent" ><span class="cmr-9">Can</span> <span @@ -1668,7 +1670,7 @@ class="pzdr-">✔</span></span> </td><td style="white-space:nowrap; class="td10"> <span id="textcolor47"><span class="pzdr-">✘</span></span> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-12-"><td style="white-space:wrap; text-align:left;" id="TBL-2-12-1" + style="vertical-align:baseline;" id="TBL-2-12-"><td style="white-space:normal; text-align:left;" id="TBL-2-12-1" class="td01"><!--l. 795--><p class="noindent" ><span class="cmr-9">Can</span> <span @@ -1698,7 +1700,7 @@ class="td10"> <span id="textcolor52"><span class="pzdr-">✔</span></span><sup class="textsuperscript"><span class="tcrm-0900">¶</span></sup> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-13-"><td style="white-space:wrap; text-align:left;" id="TBL-2-13-1" + style="vertical-align:baseline;" id="TBL-2-13-"><td style="white-space:normal; text-align:left;" id="TBL-2-13-1" class="td01"><!--l. 800--><p class="noindent" ><span class="cmr-9">Maximum</span> <span @@ -1718,7 +1720,7 @@ class="cmsy-10">∞ </span></td><td style="white-space:nowrap; text-alig class="td10"> <span class="cmsy-10">∞ </span></td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-14-"><td style="white-space:wrap; text-align:left;" id="TBL-2-14-1" + style="vertical-align:baseline;" id="TBL-2-14-"><td style="white-space:normal; text-align:left;" id="TBL-2-14-1" class="td01"><!--l. 802--><p class="noindent" ><span class="cmtt-9">\glsdisplaynumberlist</span><a id="dx1-5002"></a> @@ -1735,7 +1737,7 @@ class="pzdr-">✔</span></span> </td><td style="white-space:nowrap; class="td10"> <span id="textcolor57"><span class="pzdr-">✘</span></span> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-15-"><td style="white-space:wrap; text-align:left;" id="TBL-2-15-1" + style="vertical-align:baseline;" id="TBL-2-15-"><td style="white-space:normal; text-align:left;" id="TBL-2-15-1" class="td01"><!--l. 804--><p class="noindent" ><span class="cmtt-9">\newglossaryentry</span><a id="dx1-5003"></a> @@ -1765,7 +1767,7 @@ class="tcrm-0900">※</span></sup> </td><td style="white-space:nowrap class="td10"> <span class="pzdr-">✔</span><sup class="textsuperscript">⁑</sup> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-16-"><td style="white-space:wrap; text-align:left;" id="TBL-2-16-1" + style="vertical-align:baseline;" id="TBL-2-16-"><td style="white-space:normal; text-align:left;" id="TBL-2-16-1" class="td01"><!--l. 807--><p class="noindent" ><span class="cmr-9">Requires</span> <span @@ -1786,7 +1788,7 @@ class="td10"> <span id="textcolor62"><span class="pzdr-">✘</span></span><sup class="textsuperscript"><span class="cmmi-9">⋆</span></sup> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-17-"><td style="white-space:wrap; text-align:left;" id="TBL-2-17-1" + style="vertical-align:baseline;" id="TBL-2-17-"><td style="white-space:normal; text-align:left;" id="TBL-2-17-1" class="td01"><!--l. 809--><p class="noindent" ><span class="cmr-9">Default</span> <span @@ -4439,7 +4441,7 @@ need to change <a href="#glo:makeindex"><span class="cmtt-10">makeindex</span><a id="dx1-13037"></a>’s</a> quote character using: -</p><!--l. 2079--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 2079--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GlsSetQuote</span><span class="cmtt-9"> </span></span><a id="dx1-13038"></a> <span @@ -4634,22 +4636,22 @@ id="TBL-3-2" /><col id="TBL-3-3" /></colgroup><tr style="vertical-align:baseline;" id="TBL-3-1-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-1-1" class="td01"><span -class="cmbx-10">Command Name </span></td><td style="white-space:wrap; text-align:left;" id="TBL-3-1-2" +class="cmbx-10">Command Name </span></td><td style="white-space:normal; text-align:left;" id="TBL-3-1-2" class="td11"> <!--l. 2189--><p class="noindent" ><span class="cmbx-10">Translator</span> <span class="cmbx-10">Key</span> <span -class="cmbx-10">Word</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-1-3" +class="cmbx-10">Word</span> </p></td><td style="white-space:normal; text-align:left;" id="TBL-3-1-3" class="td10"> <!--l. 2190--><p class="noindent" ><span class="cmbx-10">Purpose</span> </p></td> </tr><tr style="vertical-align:baseline;" id="TBL-3-2-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-2-1" class="td01"><span class="cmtt-10">\glossaryname</span><a - id="dx1-14024"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-2-2" + id="dx1-14024"></a> </td><td style="white-space:normal; text-align:left;" id="TBL-3-2-2" class="td11"> <!--l. 2191--><p class="noindent" ><span -class="cmtt-10">Glossary</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-2-3" +class="cmtt-10">Glossary</span> </p></td><td style="white-space:normal; text-align:left;" id="TBL-3-2-3" class="td10"> <!--l. 2191--><p class="noindent" >Title of the @@ -4659,9 +4661,9 @@ class="td10"> <!--l. 2191--><p class="noindent" >Title style="vertical-align:baseline;" id="TBL-3-3-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-3-1" class="td01"><span class="cmtt-10">\acronymname</span><a - id="dx1-14025"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-3-2" + id="dx1-14025"></a> </td><td style="white-space:normal; text-align:left;" id="TBL-3-3-2" class="td11"> <!--l. 2192--><p class="noindent" ><span -class="cmtt-10">Acronyms</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-3-3" +class="cmtt-10">Acronyms</span> </p></td><td style="white-space:normal; text-align:left;" id="TBL-3-3-3" class="td10"> <!--l. 2192--><p class="noindent" >Title of the @@ -4680,11 +4682,11 @@ class="cmss-10">acronym</span><a style="vertical-align:baseline;" id="TBL-3-4-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-4-1" class="td01"><span class="cmtt-10">\entryname</span><a - id="dx1-14027"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-4-2" + id="dx1-14027"></a> </td><td style="white-space:normal; text-align:left;" id="TBL-3-4-2" class="td11"> <!--l. 2194--><p class="noindent" ><span class="cmtt-10">Notation</span> <span -class="cmtt-10">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-4-3" +class="cmtt-10">(glossaries)</span> </p></td><td style="white-space:normal; text-align:left;" id="TBL-3-4-3" class="td10"> <!--l. 2195--><p class="noindent" >Header for first @@ -4706,11 +4708,11 @@ class="td10"> <!--l. 2195--><p class="noindent" >Header style="vertical-align:baseline;" id="TBL-3-5-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-5-1" class="td01"><span class="cmtt-10">\descriptionname</span><a - id="dx1-14028"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-5-2" + id="dx1-14028"></a> </td><td style="white-space:normal; text-align:left;" id="TBL-3-5-2" class="td11"> <!--l. 2197--><p class="noindent" ><span class="cmtt-10">Description</span> <span -class="cmtt-10">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-5-3" +class="cmtt-10">(glossaries)</span> </p></td><td style="white-space:normal; text-align:left;" id="TBL-3-5-3" class="td10"> <!--l. 2198--><p class="noindent" >Header for second @@ -4732,11 +4734,11 @@ class="td10"> <!--l. 2198--><p class="noindent" >Header style="vertical-align:baseline;" id="TBL-3-6-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-6-1" class="td01"><span class="cmtt-10">\symbolname</span><a - id="dx1-14029"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-6-2" + id="dx1-14029"></a> </td><td style="white-space:normal; text-align:left;" id="TBL-3-6-2" class="td11"> <!--l. 2200--><p class="noindent" ><span class="cmtt-10">Symbol</span> <span -class="cmtt-10">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-6-3" +class="cmtt-10">(glossaries)</span> </p></td><td style="white-space:normal; text-align:left;" id="TBL-3-6-3" class="td10"> <!--l. 2200--><p class="noindent" >Header for symbol @@ -4755,13 +4757,13 @@ class="td10"> <!--l. 2200--><p class="noindent" >Header style="vertical-align:baseline;" id="TBL-3-7-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-7-1" class="td01"><span class="cmtt-10">\pagelistname</span><a - id="dx1-14030"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-7-2" + id="dx1-14030"></a> </td><td style="white-space:normal; text-align:left;" id="TBL-3-7-2" class="td11"> <!--l. 2202--><p class="noindent" ><span class="cmtt-10">Page</span> <span class="cmtt-10">List</span> <span -class="cmtt-10">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-7-3" +class="cmtt-10">(glossaries)</span> </p></td><td style="white-space:normal; text-align:left;" id="TBL-3-7-3" class="td10"> <!--l. 2203--><p class="noindent" >Header for page @@ -4780,11 +4782,11 @@ class="td10"> <!--l. 2203--><p class="noindent" >Header style="vertical-align:baseline;" id="TBL-3-8-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-8-1" class="td01"><span class="cmtt-10">\glssymbolsgroupname</span><a - id="dx1-14031"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-8-2" + id="dx1-14031"></a> </td><td style="white-space:normal; text-align:left;" id="TBL-3-8-2" class="td11"> <!--l. 2205--><p class="noindent" ><span class="cmtt-10">Symbols</span> <span -class="cmtt-10">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-8-3" +class="cmtt-10">(glossaries)</span> </p></td><td style="white-space:normal; text-align:left;" id="TBL-3-8-3" class="td10"> <!--l. 2206--><p class="noindent" >Header for symbols @@ -4803,11 +4805,11 @@ class="td10"> <!--l. 2206--><p class="noindent" >Header style="vertical-align:baseline;" id="TBL-3-9-"><td style="white-space:nowrap; text-align:left;" id="TBL-3-9-1" class="td01"><span class="cmtt-10">\glsnumbersgroupname</span><a - id="dx1-14032"></a> </td><td style="white-space:wrap; text-align:left;" id="TBL-3-9-2" + id="dx1-14032"></a> </td><td style="white-space:normal; text-align:left;" id="TBL-3-9-2" class="td11"> <!--l. 2208--><p class="noindent" ><span class="cmtt-10">Numbers</span> <span -class="cmtt-10">(glossaries)</span> </p></td><td style="white-space:wrap; text-align:left;" id="TBL-3-9-3" +class="cmtt-10">(glossaries)</span> </p></td><td style="white-space:normal; text-align:left;" id="TBL-3-9-3" class="td10"> <!--l. 2208--><p class="noindent" >Header for numbers @@ -6320,7 +6322,7 @@ information can be gathered by a front-end, editor or script to make the glossar appropriate. This section describes how the information is stored in the auxiliary file. </p><!--l. 3022--><p class="indent" > The file extensions used by each defined glossary are given by -</p><!--l. 3023--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3023--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\@newglossary</span><span class="cmtt-9"> </span></span><a id="dx1-21003"></a> <span @@ -6360,7 +6362,7 @@ as: <!--l. 3038--><p class="nopar" > </p><!--l. 3040--><p class="indent" > The <a href="#glo:indexingapp">indexing application’s</a> style file is specified by -</p><!--l. 3041--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3041--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\@istfilename</span><span class="cmtt-9"> </span></span><a id="dx1-21004"></a> <span @@ -6383,7 +6385,7 @@ Note that the glossary information is formatted differently depending on which indexing application is supposed to be used, so it’s important to call the correct one. </p><!--l. 3050--><p class="indent" > Word or letter ordering is specified by: -</p><!--l. 3051--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3051--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\@glsorder</span><span class="cmtt-9"> </span></span><a id="dx1-21009"></a> <span @@ -6400,10 +6402,10 @@ href="#glo:xindy"><span class="cmtt-10">xindy</span><a id="dx1-21010"></a></a> should be used, the language and code page for each glossary is specified by -</p><!--l. 3058--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 3058--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\@xdylanguage</span><span class="cmtt-9"> </span></span><a - id="dx1-21011"></a><span class="marginpar"><span + id="dx1-21011"></a><span class="reversemarginpar"><span class="cmtt-9">\@gls@codepage</span><span class="cmtt-9"> </span></span><a id="dx1-21012"></a> <span @@ -6495,9 +6497,9 @@ href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span cla id="sec:pkgopts-general"></a>General Options</h3> <dl class="description"><dt class="description"> <a - id="pkgopt:nowarn"><span + id="pkgopt:nowarn"></a><span class="cmssbx-10">nowarn</span><a - id="dx1-23001"></a></a> </dt><dd + id="dx1-23001"></a> </dt><dd class="description">This suppresses all warnings generated by the <span class="cmss-10">glossaries </span>package. Don’t use this option if you’re new to using <span @@ -6512,15 +6514,15 @@ class="cmss-10">debug=showtargets</span><a id="dx1-23004"></a> will override this option. </dd><dt class="description"> <a - id="pkgopt:nolangwarn"><span + id="pkgopt:nolangwarn"></a><span class="cmssbx-10">nolangwarn</span><a - id="dx1-23005"></a></a> </dt><dd + id="dx1-23005"></a> </dt><dd class="description">This suppresses the warning generated by a missing language module. </dd><dt class="description"> <a - id="pkgopt:noredefwarn"><span + id="pkgopt:noredefwarn"></a><span class="cmssbx-10">noredefwarn</span><a - id="dx1-23006"></a></a> </dt><dd + id="dx1-23006"></a> </dt><dd class="description">If you load <span class="cmss-10">glossaries </span>with a class or another package that already defines glossary related commands, by default <span @@ -6534,9 +6536,9 @@ class="cmss-10">nowarn</span><a id="dx1-23007"></a> option described above. </dd><dt class="description"> <a - id="pkgopt:debug"><span + id="pkgopt:debug"></a><span class="cmssbx-10">debug</span><a - id="dx1-23008"></a></a> </dt><dd + id="dx1-23008"></a> </dt><dd class="description">Introduced in version 4.24. The default setting is <span class="cmss-10">debug=false</span><a id="dx1-23009"></a>. This was a @@ -6558,7 +6560,7 @@ class="cmss-10">nowarn</span><a class="cmss-10">debug=showtargets</span><a id="dx1-23014"></a> option will additionally use - <!--l. 3126--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 3126--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsshowtarget</span><span class="cmtt-9"> </span></span><a id="dx1-23015"></a> <span @@ -6665,9 +6667,9 @@ class="cmss-10">debug</span><a file. </p></dd><dt class="description"> <a - id="pkgopt:seenoindex"><span + id="pkgopt:seenoindex"></a><span class="cmssbx-10">seenoindex</span><a - id="dx1-23021"></a></a> </dt><dd + id="dx1-23021"></a> </dt><dd class="description">Introduced in version 4.24, this option may take one of three values: <span class="cmss-10">error</span>, <span class="cmss-10">warn </span>or @@ -6695,9 +6697,9 @@ class="cmtt-10">\makeglossaries </span>to speed up the compilation of a draft do indexing. </dd><dt class="description"> <a - id="pkgopt:nomain"><span + id="pkgopt:nomain"></a><span class="cmssbx-10">nomain</span><a - id="dx1-23026"></a></a> </dt><dd + id="dx1-23026"></a> </dt><dd class="description">This suppresses the creation of the main glossary and associated <span class="cmtt-10">.glo </span>file, if unrequired. Note that if you use this option, you must create another glossary in which @@ -6780,9 +6782,9 @@ class="cmtt-10">\gls</span><a id="dx1-23034"></a>. </dd><dt class="description"> <a - id="pkgopt:sanitizesort"><span + id="pkgopt:sanitizesort"></a><span class="cmssbx-10">sanitizesort</span><a - id="dx1-23035"></a></a> </dt><dd + id="dx1-23035"></a> </dt><dd class="description">This is a boolean option that determines whether or not to <a href="#glo:sanitize">sanitize<a id="dx1-23036"></a></a> the sort @@ -6827,55 +6829,97 @@ class="cmss-10">sanitizesort=false</span><a id="dx1-23039"></a>. </p></dd><dt class="description"> <a - id="pkgopt:savewrites"><span + id="pkgopt:esclocations"></a><span +class="cmssbx-10">esclocations</span><a + id="dx1-23040"></a> </dt><dd +class="description">This is a boolean option. (The default is <span +class="cmss-10">esclocations=true</span><a + id="dx1-23041"></a>, but + <span +class="cmtt-10">\makenoidxglossaries</span><a + id="dx1-23042"></a> changes it to <span +class="cmss-10">esclocations=false</span><a + id="dx1-23043"></a>.) Both <a +href="#glo:makeindex"><span +class="cmtt-10">makeindex</span><a + id="dx1-23044"></a></a> and <a +href="#glo:xindy"><span +class="cmtt-10">xindy</span><a + id="dx1-23045"></a></a> + are fussy about the location formats (<a +href="#glo:makeindex"><span +class="cmtt-10">makeindex</span><a + id="dx1-23046"></a></a> more so than <a +href="#glo:xindy"><span +class="cmtt-10">xindy</span><a + id="dx1-23047"></a></a>) so the <span +class="cmss-10">glossaries</span> + package tries to ensure that special characters are escaped and allows for the location to + be substituted for a format that’s more acceptable to the indexing application. This + requires a bit of trickery to circumvent the problem posed by <span class="TEX">T<span +class="E">E</span>X</span>’s asynchronous + output routine, which can go wrong and also adds to the complexity of the document + build. + <!--l. 3271--><p class="noindent" >If you’re sure that your locations will always expand to an acceptable format (or you’re + prepared to post-process the glossary file before passing it to the relevant indexing + application) then use <span +class="cmss-10">esclocations=false</span><a + id="dx1-23048"></a> to avoid the complex escaping of location values. + (See “Writing information to associated files” in the documented code for further + details.) + </p></dd><dt class="description"> +<a + id="pkgopt:savewrites"></a><span class="cmssbx-10">savewrites</span><a - id="dx1-23040"></a></a> </dt><dd + id="dx1-23049"></a> </dt><dd class="description">This is a boolean option to minimise the number of write registers used by the <span class="cmss-10">glossaries </span>package. (Default is <span class="cmss-10">savewrites=false</span><a - id="dx1-23041"></a>.) There are only a limited number of + id="dx1-23050"></a>.) There are only a limited number of write registers, and if you have a large number of glossaries or if you are using a class or other packages that create a lot of external files, you may exceed the maximum number of available registers. If <span class="cmss-10">savewrites</span><a - id="dx1-23042"></a> is set, the glossary information will be stored in token + id="dx1-23051"></a> is set, the glossary information will be stored in token registers until the end of the document when they will be written to the external files. - <!--l. 3270--><p class="noindent" ><div class="important" title="Important Note"> This option can significantly slow document compilation and may cause the indexing to + <!--l. 3288--><p class="noindent" ><div class="important" title="Important Note"> This option can significantly slow document compilation and may cause the indexing to fail. Page numbers in the <a href="#glo:numberlist">number list<a - id="dx1-23043"></a></a> will be incorrect on page boundaries due + id="dx1-23052"></a></a> will be incorrect on page boundaries due to <span class="TEX">T<span class="E">E</span>X</span>’s asynchronous output routine. As an alternative, you can use the <span class="cmss-10">scrwfile</span><a - id="dx1-23044"></a> package (part of the KOMA-Script bundle) and not use this option. + id="dx1-23053"></a> package (part of the KOMA-Script bundle) and not use this option. </div> - </p><!--l. 3276--><p class="noindent" > - </p><!--l. 3278--><p class="noindent" >You can also reduce the number of write registers by using Options <a + </p><!--l. 3294--><p class="noindent" > + + + </p><!--l. 3296--><p class="noindent" >You can also reduce the number of write registers by using Options <a href="#option1">1</a> or <a href="#option4">4</a> or by ensuring you define all your glossary entries in the preamble. - </p><!--l. 3282--><p class="noindent" ><div class="important" title="Important Note"> If you want to use <span class="TEX">T<span + </p><!--l. 3300--><p class="noindent" ><div class="important" title="Important Note"> If you want to use <span class="TEX">T<span class="E">E</span>X</span>’s <span class="cmtt-10">\write18</span><a - id="dx1-23045"></a> mechanism to call <a + id="dx1-23054"></a> mechanism to call <a href="#glo:makeindex"><span class="cmtt-10">makeindex</span><a - id="dx1-23046"></a></a> or <a + id="dx1-23055"></a></a> or <a href="#glo:xindy"><span class="cmtt-10">xindy</span><a - id="dx1-23047"></a></a> from + id="dx1-23056"></a></a> from your document and use <span class="cmss-10">savewrites</span><a - id="dx1-23048"></a>, you must create the external files with + id="dx1-23057"></a>, you must create the external files with <span class="cmtt-10">\glswritefiles </span>before you call <span class="cmtt-10">makeindex</span><a - id="dx1-23049"></a>/<span + id="dx1-23058"></a>/<span class="cmtt-10">xindy</span><a - id="dx1-23050"></a>. Also set <span + id="dx1-23059"></a>. Also set <span class="cmtt-10">\glswritefiles </span>to nothing or <span class="cmtt-10">\relax </span>before the end of the document to avoid rewriting the files. For @@ -6889,105 +6933,105 @@ class="cmtt-10">\relax </span>before the end of the document to avoid rewriting  <br />-t \jobname.glg -o \jobname.gls \jobname}  <br />\let\glswritefiles\relax </div> - <!--l. 3294--><p class="nopar" > </div> - </p><!--l. 3295--><p class="noindent" > + <!--l. 3312--><p class="nopar" > </div> + </p><!--l. 3313--><p class="noindent" > In general, this package option is best avoided. </p></dd><dt class="description"> <a - id="pkgopt:translate"><span + id="pkgopt:translate"></a><span class="cmssbx-10">translate</span><a - id="dx1-23051"></a></a> </dt><dd + id="dx1-23060"></a> </dt><dd class="description">This can take the following values: <dl class="description"><dt class="description"> <span class="cmssbx-10">translate=true</span><a - id="dx1-23052"></a> </dt><dd + id="dx1-23061"></a> </dt><dd class="description">If <span class="cmss-10">babel</span><a - id="dx1-23053"></a> has been loaded and the <span + id="dx1-23062"></a> has been loaded and the <span class="cmss-10">translator</span><a - id="dx1-23054"></a> package is installed, + id="dx1-23063"></a> package is installed, <span class="cmss-10">translator</span><a - id="dx1-23055"></a> will be loaded and the translations will be provided by the <span + id="dx1-23064"></a> will be loaded and the translations will be provided by the <span class="cmss-10">translator</span><a - id="dx1-23056"></a> + id="dx1-23065"></a> package interface. You can modify the translations by providing your own dictionary. If the <span class="cmss-10">translator</span><a - id="dx1-23057"></a> package isn’t installed and <span + id="dx1-23066"></a> package isn’t installed and <span class="cmss-10">babel</span><a - id="dx1-23058"></a> is loaded, the + id="dx1-23067"></a> is loaded, the <span class="cmss-10">glossaries-babel</span><a - id="dx1-23059"></a> package will be loaded and the translations will be provided + id="dx1-23068"></a> package will be loaded and the translations will be provided using <span class="cmss-10">babel</span>’s <span class="cmtt-10">\addto\caption</span>⟨<span class="cmti-10">language</span>⟩ mechanism. If <span class="cmss-10">polyglossia</span><a - id="dx1-23060"></a> has been + id="dx1-23069"></a> has been loaded, <span class="cmss-10">glossaries-polyglossia</span><a - id="dx1-23061"></a> will be loaded. + id="dx1-23070"></a> will be loaded. </dd><dt class="description"> <span class="cmssbx-10">translate=false</span><a - id="dx1-23062"></a> </dt><dd + id="dx1-23071"></a> </dt><dd class="description">Don’t provide translations, even if <span class="cmss-10">babel</span><a - id="dx1-23063"></a> or <span + id="dx1-23072"></a> or <span class="cmss-10">polyglossia</span><a - id="dx1-23064"></a> has been + id="dx1-23073"></a> has been loaded. (Note that <span class="cmss-10">babel</span><a - id="dx1-23065"></a> provides the command <span + id="dx1-23074"></a> provides the command <span class="cmtt-10">\glossaryname</span><a - id="dx1-23066"></a> so that will + id="dx1-23075"></a> so that will still be translated if you have loaded <span class="cmss-10">babel</span><a - id="dx1-23067"></a>.) + id="dx1-23076"></a>.) </dd><dt class="description"> <span class="cmssbx-10">translate=babel</span><a - id="dx1-23068"></a> </dt><dd + id="dx1-23077"></a> </dt><dd class="description">Don’t load the <span class="cmss-10">translator</span><a - id="dx1-23069"></a> package. Instead load <span + id="dx1-23078"></a> package. Instead load <span class="cmss-10">glossaries-babel</span><a - id="dx1-23070"></a>. - <!--l. 3321--><p class="noindent" ><div class="important" title="Important Note"> I recommend you use <span + id="dx1-23079"></a>. + <!--l. 3339--><p class="noindent" ><div class="important" title="Important Note"> I recommend you use <span class="cmss-10">translate=babel</span><a - id="dx1-23071"></a> if you have any problems with the + id="dx1-23080"></a> if you have any problems with the translations or with PDF bookmarks, but to maintain backward compatibility, if <span class="cmss-10">babel</span><a - id="dx1-23072"></a> has been loaded the default is <span + id="dx1-23081"></a> has been loaded the default is <span class="cmss-10">translate=true</span><a - id="dx1-23073"></a>. </div> - </p><!--l. 3326--><p class="noindent" > + id="dx1-23082"></a>. </div> + </p><!--l. 3344--><p class="noindent" > </p> </dd></dl> - <!--l. 3330--><p class="noindent" >If <span + <!--l. 3348--><p class="noindent" >If <span class="cmss-10">translate</span><a - id="dx1-23074"></a> is specified without a value, <span + id="dx1-23083"></a> is specified without a value, <span class="cmss-10">translate=true</span><a - id="dx1-23075"></a> is assumed. If <span + id="dx1-23084"></a> is assumed. If <span class="cmss-10">translate</span><a - id="dx1-23076"></a> isn’t + id="dx1-23085"></a> isn’t specified, <span class="cmss-10">translate=true</span><a - id="dx1-23077"></a> is assumed if <span + id="dx1-23086"></a> is assumed if <span class="cmss-10">babel</span><a - id="dx1-23078"></a>, <span + id="dx1-23087"></a>, <span class="cmss-10">polyglossia</span><a - id="dx1-23079"></a> or <span + id="dx1-23088"></a> or <span class="cmss-10">translator</span><a - id="dx1-23080"></a> have been loaded. + id="dx1-23089"></a> have been loaded. Otherwise <span class="cmss-10">translate=false</span><a - id="dx1-23081"></a> is assumed. - </p><!--l. 3336--><p class="noindent" >See <a + id="dx1-23090"></a> is assumed. + </p><!--l. 3354--><p class="noindent" >See <a href="#sec:fixednames"><span class="tcrm-1000">§</span>1.4.1 </a><a href="#sec:fixednames">Changing the Fixed Names<!--tex4ht:ref: sec:fixednames --></a> for further details. @@ -6995,23 +7039,23 @@ href="#sec:fixednames">Changing the Fixed Names<!--tex4ht:ref: sec:fixednames -- </p></dd><dt class="description"> <a - id="pkgopt:notranslate"><span + id="pkgopt:notranslate"></a><span class="cmssbx-10">notranslate</span><a - id="dx1-23082"></a></a> </dt><dd + id="dx1-23091"></a> </dt><dd class="description">This is equivalent to <span class="cmss-10">translate=false</span><a - id="dx1-23083"></a> and may be passed via the document class + id="dx1-23092"></a> and may be passed via the document class options. </dd><dt class="description"> <a - id="pkgopt:nohypertypes"><span + id="pkgopt:nohypertypes"></a><span class="cmssbx-10">nohypertypes</span><a - id="dx1-23084"></a></a> </dt><dd + id="dx1-23093"></a> </dt><dd class="description">Use this option if you have multiple glossaries and you want to suppress the entry hyperlinks for a particular glossary or glossaries. The value of this option should be a comma-separated list of glossary types where <span class="cmtt-10">\gls</span><a - id="dx1-23085"></a> etc shouldn’t have hyperlinks + id="dx1-23094"></a> etc shouldn’t have hyperlinks by default. Make sure you enclose the value in braces if it contains any commas. Example: @@ -7021,77 +7065,77 @@ class="cmtt-10">\gls</span><a  <br />  {glossaries}  <br />\newglossary[nlg]{notation}{not}{ntn}{Notation} </div> - <!--l. 3352--><p class="nopar" > The values must be fully expanded, so <span + <!--l. 3370--><p class="nopar" > The values must be fully expanded, so <span class="cmbx-10">don’t </span>try <span class="cmtt-10">nohypertypes=\acronymtype</span><a - id="dx1-23086"></a>. You + id="dx1-23095"></a>. You may also use - </p><!--l. 3356--><p class="noindent" ><hr><div title="Definition"><span + </p><!--l. 3374--><p class="noindent" ><hr><div title="Definition"><span class="cmtt-10">\GlsDeclareNoHyperList</span><a - id="dx1-23087"></a><span + id="dx1-23096"></a><span class="cmtt-10">{</span>⟨<span class="cmitt-10">list</span>⟩<span class="cmtt-10">} </span></div><hr> - </p><!--l. 3357--><p class="noindent" > + </p><!--l. 3375--><p class="noindent" > instead or additionally. See <a href="#sec:glslink"><span class="tcrm-1000">§</span>6 </a><a href="#sec:glslink">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a> for further details. </p></dd><dt class="description"> <a - id="pkgopt:hyperfirst"><span + id="pkgopt:hyperfirst"></a><span class="cmssbx-10">hyperfirst</span><a - id="dx1-23088"></a></a> </dt><dd + id="dx1-23097"></a> </dt><dd class="description">This is a boolean option that specifies whether each term has a hyperlink on <a href="#glo:firstuse">first use</a>. The default is <span class="cmss-10">hyperfirst=true</span><a - id="dx1-23089"></a> (terms on <a + id="dx1-23098"></a> (terms on <a href="#glo:firstuse">first use</a> have a hyperlink, unless explicitly suppressed using starred versions of commands such as <span class="cmtt-10">\gls*</span><a - id="dx1-23090"></a> or + id="dx1-23099"></a> or by identifying the glossary with <span class="cmss-10">nohypertypes</span><a - id="dx1-23091"></a>, described above). Note that + id="dx1-23100"></a>, described above). Note that <span class="cmss-10">nohypertypes</span><a - id="dx1-23092"></a> overrides <span + id="dx1-23101"></a> overrides <span class="cmss-10">hyperfirst=true</span><a - id="dx1-23093"></a>. This option only affects commands that + id="dx1-23102"></a>. This option only affects commands that check the <a href="#glo:firstuseflag">first use flag</a>, such as the <a href="#sec:gls-like"><span class="cmtt-10">\gls</span>-like</a> commands (for example, <span class="cmtt-10">\gls</span><a - id="dx1-23094"></a> or + id="dx1-23103"></a> or <span class="cmtt-10">\glsdisp</span><a - id="dx1-23095"></a>), but not the <a + id="dx1-23104"></a>), but not the <a href="#sec:glstext-like"><span class="cmtt-10">\glstext</span>-like</a> commands (for example, <span class="cmtt-10">\glslink</span><a - id="dx1-23096"></a> or + id="dx1-23105"></a> or <span class="cmtt-10">\glstext</span><a - id="dx1-23097"></a>). - <!--l. 3373--><p class="noindent" >The <span + id="dx1-23106"></a>). + <!--l. 3391--><p class="noindent" >The <span class="cmss-10">hyperfirst</span><a - id="dx1-23098"></a> setting applies to all glossary types (unless identified by <span + id="dx1-23107"></a> setting applies to all glossary types (unless identified by <span class="cmss-10">nohypertypes</span><a - id="dx1-23099"></a> or + id="dx1-23108"></a> or defined with <span class="cmtt-10">\newignoredglossary</span><a - id="dx1-23100"></a>). It can be overridden on an individual basis by + id="dx1-23109"></a>). It can be overridden on an individual basis by explicitly setting the <span class="cmss-10">hyper</span><a - id="dx1-23101"></a> key when referencing an entry (or by using the plus or + id="dx1-23110"></a> key when referencing an entry (or by using the plus or starred version of the referencing command). - </p><!--l. 3380--><p class="noindent" >It may be that you only want to apply this to just the acronyms (where the first use + </p><!--l. 3398--><p class="noindent" >It may be that you only want to apply this to just the acronyms (where the first use explains the meaning of the acronym) but not for ordinary glossary entries (where the first use is identical to subsequent uses). In this case, you can use <span class="cmss-10">hyperfirst=false</span><a - id="dx1-23102"></a> + id="dx1-23111"></a> and apply <span class="cmtt-10">\glsunsetall </span>to all the regular (non-acronym) glossaries. For example: @@ -7104,32 +7148,32 @@ class="cmtt-10">\glsunsetall </span>to all the regular (non-acronym) glossaries.  <br /> % at the end of the preamble  <br /> \glsunsetall[main] </div> - <!--l. 3392--><p class="nopar" > - </p><!--l. 3394--><p class="noindent" >Alternatively you can redefine the hook - </p><!--l. 3395--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 3410--><p class="nopar" > + </p><!--l. 3412--><p class="noindent" >Alternatively you can redefine the hook + </p><!--l. 3413--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glslinkcheckfirsthyperhook</span><span class="cmtt-9"> </span></span><a - id="dx1-23103"></a> <span + id="dx1-23112"></a> <span class="cmtt-10">\glslinkcheckfirsthyperhook </span></div><hr> - </p><!--l. 3397--><p class="noindent" > + </p><!--l. 3415--><p class="noindent" > which is used by the commands that check the <a href="#glo:firstuseflag">first use flag</a>, such as <span class="cmtt-10">\gls</span><a - id="dx1-23104"></a>. Within the + id="dx1-23113"></a>. Within the definition of this command, you can use <span class="cmtt-10">\glslabel</span><a - id="dx1-23105"></a> to reference the entry label and + id="dx1-23114"></a> to reference the entry label and <span class="cmtt-10">\glstype</span><a - id="dx1-23106"></a> to reference the glossary type. You can also use <span + id="dx1-23115"></a> to reference the glossary type. You can also use <span class="cmtt-10">\ifglsused</span><a - id="dx1-23107"></a> to determine if + id="dx1-23116"></a> to determine if the entry has been used. You can test if an entry is an acronym by checking if it has the <span class="cmss-10">long</span><a - id="dx1-23108"></a> key set using <span + id="dx1-23117"></a> key set using <span class="cmtt-10">\ifglshaslong</span><a - id="dx1-23109"></a>. For example, to switch off the hyperlink on first use + id="dx1-23118"></a>. For example, to switch off the hyperlink on first use just for acronyms: @@ -7142,14 +7186,14 @@ class="cmtt-10">\ifglshaslong</span><a  <br /> }%  <br />} </div> - <!--l. 3413--><p class="nopar" > - </p><!--l. 3415--><p class="noindent" >Note that this hook isn’t used by the commands that don’t check the <a + <!--l. 3431--><p class="nopar" > + </p><!--l. 3433--><p class="noindent" >Note that this hook isn’t used by the commands that don’t check the <a href="#glo:firstuseflag">first use flag</a>, such as <span class="cmtt-10">\glstext</span><a - id="dx1-23110"></a>. (You can, instead, redefine <span + id="dx1-23119"></a>. (You can, instead, redefine <span class="cmtt-10">\glslinkpostsetkeys</span><a - id="dx1-23111"></a>, which is used by both + id="dx1-23120"></a>, which is used by both the <a href="#sec:gls-like"><span class="cmtt-10">\gls</span>-like</a> and <a @@ -7157,14 +7201,14 @@ href="#sec:glstext-like"><span class="cmtt-10">\glstext</span>-like</a> commands.) </p></dd><dt class="description"> <a - id="pkgopt:indexonlyfirst"><span + id="pkgopt:indexonlyfirst"></a><span class="cmssbx-10">indexonlyfirst</span><a - id="dx1-23112"></a></a> </dt><dd + id="dx1-23121"></a> </dt><dd class="description">This is a boolean option that specifies whether to only add information to the external glossary file on <a href="#glo:firstuse">first use</a>. The default is <span class="cmss-10">indexonlyfirst=false</span><a - id="dx1-23113"></a>, which will add a + id="dx1-23122"></a>, which will add a line to the file every time one of the <a href="#sec:gls-like"><span class="cmtt-10">\gls</span>-like</a> or <a @@ -7172,22 +7216,22 @@ href="#sec:glstext-like"><span class="cmtt-10">\glstext</span>-like</a> commands are used. Note that <span class="cmtt-10">\glsadd</span><a - id="dx1-23114"></a> will always add information to the external glossary + id="dx1-23123"></a> will always add information to the external glossary file<span class="footnote-mark"><a href="#fn1x2" id="fn1x2-bk"><sup class="textsuperscript">2.1</sup></a></span><a - id="x1-23115f1"></a> (since + id="x1-23124f1"></a> (since that’s the purpose of that command). - <!--l. 3429--><p class="noindent" >You can customise this by redefining - </p><!--l. 3430--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 3447--><p class="noindent" >You can customise this by redefining + </p><!--l. 3448--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glswriteentry</span><span class="cmtt-9"> </span></span><a - id="dx1-23116"></a> <span + id="dx1-23125"></a> <span class="cmtt-10">\glswriteentry{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">}{</span>⟨<span class="cmitt-10">wr-code</span>⟩<span class="cmtt-10">} </span></div><hr> - </p><!--l. 3432--><p class="noindent" > + </p><!--l. 3450--><p class="noindent" > where ⟨<span class="cmti-10">label</span>⟩ is the entry’s label and ⟨<span class="cmti-10">wr-code</span>⟩ is the code that writes the entry’s @@ -7206,16 +7250,16 @@ class="cmtt-10">\glswriteentry</span>  <br />  \fi  <br />} </div> - <!--l. 3444--><p class="nopar" > This checks the <span + <!--l. 3462--><p class="nopar" > This checks the <span class="cmss-10">indexonlyfirst</span><a - id="dx1-23117"></a> package option (using <span + id="dx1-23126"></a> package option (using <span class="cmtt-10">\ifglsindexonlyfirst</span>) and does ⟨<span class="cmti-10">wr-code</span>⟩ if this is <span class="cmss-10">false </span>otherwise it only does ⟨<span class="cmti-10">wr-code</span>⟩ of the entry hasn’t been used. - </p><!--l. 3450--><p class="noindent" >For example, suppose you only want to index the first use for entries in the <span + </p><!--l. 3468--><p class="noindent" >For example, suppose you only want to index the first use for entries in the <span class="cmtt-10">acronym</span> glossary and not in the <span class="cmtt-10">main </span>(or any other) glossary: @@ -7229,64 +7273,64 @@ class="cmtt-10">main </span>(or any other) glossary:  <br /> {#2}%  <br />} </div> - <!--l. 3459--><p class="nopar" > Here I’ve used <span + <!--l. 3477--><p class="nopar" > Here I’ve used <span class="cmtt-10">\ifthenelse </span>to ensure the arguments of <span class="cmtt-10">\equal </span>are fully expanded before the comparison is made. </p></dd><dt class="description"> <a - id="pkgopt:savenumberlist"><span + id="pkgopt:savenumberlist"></a><span class="cmssbx-10">savenumberlist</span><a - id="dx1-23118"></a></a> </dt><dd + id="dx1-23127"></a> </dt><dd class="description">This is a boolean option that specifies whether or not to gather and store the <a href="#glo:numberlist">number list<a - id="dx1-23119"></a></a> for each entry. The default is <span + id="dx1-23128"></a></a> for each entry. The default is <span class="cmss-10">savenumberlist=false</span><a - id="dx1-23120"></a>. (See + id="dx1-23129"></a>. (See <span class="cmtt-10">\glsentrynumberlist</span><a - id="dx1-23121"></a> and <span + id="dx1-23130"></a> and <span class="cmtt-10">\glsdisplaynumberlist</span><a - id="dx1-23122"></a> in <a + id="dx1-23131"></a> in <a href="#sec:glsnolink"><span class="tcrm-1000">§</span>9 </a><a href="#sec:glsnolink">Using Glossary Terms Without Links<!--tex4ht:ref: sec:glsnolink --></a>.) This is always true if you use <a href="#option1">Option 1</a>. </dd></dl> -<!--l. 3472--><p class="noindent" > +<!--l. 3490--><p class="noindent" > </p> -<!--l. 3472--><p class="noindent" ><a +<!--l. 3490--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">2.2 </span> <a id="sec:pkgopts-sec"></a>Sectioning, Headings and TOC Options</h3> <dl class="description"><dt class="description"> <a - id="pkgopt:toc"><span + id="pkgopt:toc"></a><span class="cmssbx-10">toc</span><a - id="dx1-24001"></a></a> </dt><dd + id="dx1-24001"></a> </dt><dd class="description">Add the glossaries to the table of contents. Note that an extra <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> run is required with this option. Alternatively, you can switch this function on and off using - <!--l. 3479--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 3497--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glstoctrue</span><span class="cmtt-9"> </span></span><a id="dx1-24002"></a> <span class="cmtt-10">\glstoctrue </span></div><hr> - </p><!--l. 3481--><p class="noindent" > + </p><!--l. 3499--><p class="noindent" > and - </p><!--l. 3483--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 3501--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glstocfalse</span><span class="cmtt-9"> </span></span><a id="dx1-24003"></a> <span class="cmtt-10">\glstocfalse </span></div><hr> - </p><!--l. 3485--><p class="noindent" > + </p><!--l. 3503--><p class="noindent" > </p></dd><dt class="description"> <a - id="pkgopt:numberline"><span + id="pkgopt:numberline"></a><span class="cmssbx-10">numberline</span><a - id="dx1-24004"></a></a> </dt><dd + id="dx1-24004"></a> </dt><dd class="description">When used with <span class="cmss-10">toc</span><a id="dx1-24005"></a>, this will add <span @@ -7309,9 +7353,9 @@ class="cmss-10">numberline</span><a </dd><dt class="description"> <a - id="pkgopt:section"><span + id="pkgopt:section"></a><span class="cmssbx-10">section</span><a - id="dx1-24011"></a></a> </dt><dd + id="dx1-24011"></a> </dt><dd class="description">This is a ⟨<span class="cmti-10">key</span>⟩=⟨<span class="cmti-10">value</span>⟩ option. Its value should be the name of a sectional unit @@ -7323,40 +7367,40 @@ class="cmti-10">value</span>⟩ option. Its value should be the name of a s <div class="verbatim" id="verbatim-80"> \usepackage[section=subsection]{glossaries} </div> - <!--l. 3503--><p class="nopar" > You can omit the value if you want to use sections, i.e.  + <!--l. 3521--><p class="nopar" > You can omit the value if you want to use sections, i.e.  </p> <div class="verbatim" id="verbatim-81"> \usepackage[section]{glossaries} </div> - <!--l. 3507--><p class="nopar" > is equivalent to + <!--l. 3525--><p class="nopar" > is equivalent to </p> <div class="verbatim" id="verbatim-82"> \usepackage[section=section]{glossaries} </div> - <!--l. 3511--><p class="nopar" > You can change this value later in the document using - </p><!--l. 3513--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 3529--><p class="nopar" > You can change this value later in the document using + </p><!--l. 3531--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\setglossarysection</span><span class="cmtt-9"> </span></span><a id="dx1-24012"></a> <span class="cmtt-10">\setglossarysection{</span>⟨<span class="cmitt-10">name</span>⟩<span class="cmtt-10">} </span></div><hr> - </p><!--l. 3515--><p class="noindent" > + </p><!--l. 3533--><p class="noindent" > where ⟨<span class="cmti-10">name</span>⟩ is the sectional unit. - </p><!--l. 3518--><p class="noindent" >The start of each glossary adds information to the page header via - </p><!--l. 3519--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 3536--><p class="noindent" >The start of each glossary adds information to the page header via + </p><!--l. 3537--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsglossarymark</span><span class="cmtt-9"> </span></span><a id="dx1-24013"></a> <span class="cmtt-10">\glsglossarymark{</span>⟨<span class="cmitt-10">glossary title</span>⟩<span class="cmtt-10">} </span></div><hr> - </p><!--l. 3521--><p class="noindent" > + </p><!--l. 3539--><p class="noindent" > By default this uses <span class="cmtt-10">\@mkboth</span><span class="footnote-mark"><a href="#fn2x2" id="fn2x2-bk"><sup class="textsuperscript">2.2</sup></a></span><a @@ -7368,23 +7412,23 @@ href="#fn2x2" id="fn2x2-bk"><sup class="textsuperscript">2.2</sup></a></span><a <div class="verbatim" id="verbatim-83"> \renewcommand{\glsglossarymark}[1]{\markright{#1}} </div> - <!--l. 3528--><p class="nopar" > or to prevent it from changing the headers: + <!--l. 3546--><p class="nopar" > or to prevent it from changing the headers: </p> <div class="verbatim" id="verbatim-84"> \renewcommand{\glsglossarymark}[1]{} </div> - <!--l. 3532--><p class="nopar" > If you want <span + <!--l. 3550--><p class="nopar" > If you want <span class="cmtt-10">\glsglossarymark </span>to use <span class="cmtt-10">\MakeUppercase </span>in the header, use the <span class="cmss-10">ucmark</span><a id="dx1-24017"></a> option described below. - </p><!--l. 3536--><p class="noindent" >Occasionally you may find that another package defines <span + </p><!--l. 3554--><p class="noindent" >Occasionally you may find that another package defines <span class="cmtt-10">\cleardoublepage </span>when it is not required. This may cause an unwanted blank page to appear before each glossary. - This can be fixed by redefining <span class="marginpar"><span + This can be fixed by redefining <span class="reversemarginpar"><span class="cmtt-9">\glsclearpage</span><span class="cmtt-9"> </span></span><a id="dx1-24018"></a><span @@ -7395,12 +7439,12 @@ class="cmtt-10">\glsclearpage</span>: <div class="verbatim" id="verbatim-85"> \renewcommand*{\glsclearpage}{\clearpage} </div> - <!--l. 3542--><p class="nopar" > + <!--l. 3560--><p class="nopar" > </p></dd><dt class="description"> <a - id="pkgopt:ucmark"><span + id="pkgopt:ucmark"></a><span class="cmssbx-10">ucmark</span><a - id="dx1-24019"></a></a> </dt><dd + id="dx1-24019"></a> </dt><dd class="description">This is a boolean option (default: <span class="cmss-10">ucmark=false</span><a id="dx1-24020"></a>, unless <span @@ -7417,7 +7461,7 @@ class="cmtt-10">\MakeTextUppercase</span><a href="#fn3x2" id="fn3x2-bk"><sup class="textsuperscript">2.3</sup></a></span><a id="x1-24025f3"></a>. You can test whether this option has been set or not using - <!--l. 3555--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 3573--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglsucmark</span><span class="cmtt-9"> </span></span><a id="dx1-24030"></a> <span @@ -7426,7 +7470,7 @@ class="cmitt-10">true part</span>⟩<span class="cmtt-10">\else </span>⟨<span class="cmitt-10">false part</span>⟩<span class="cmtt-10">\fi </span></div><hr> - </p><!--l. 3557--><p class="noindent" > + </p><!--l. 3575--><p class="noindent" > For example: @@ -7439,7 +7483,7 @@ class="cmtt-10">\fi </span></div><hr>  <br />    \markright{#1}%  <br />  \fi} </div> - <!--l. 3566--><p class="nopar" > If <span + <!--l. 3584--><p class="nopar" > If <span class="cmss-10">memoir</span><a id="dx1-24031"></a> has been loaded and <span class="cmss-10">ucfirst</span><a @@ -7451,9 +7495,9 @@ class="cmtt-10">\memUChead</span><a used. </p></dd><dt class="description"> <a - id="pkgopt:numberedsection"><span + id="pkgopt:numberedsection"></a><span class="cmssbx-10">numberedsection</span><a - id="dx1-24035"></a></a> </dt><dd + id="dx1-24035"></a> </dt><dd class="description">The glossaries are placed in unnumbered sectional units by default, but this can be changed using <span class="cmss-10">numberedsection</span><a @@ -7484,13 +7528,13 @@ class="cmtt-10">\section</span>) and is assigned a label (via <span class="cmtt-10">\label</span><a id="dx1-24040"></a>). The label is formed from - <!--l. 3587--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 3605--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsautoprefix</span><span class="cmtt-9"> </span></span><a id="dx1-24041"></a> <span class="cmtt-10">\glsautoprefix </span>⟨<span class="cmitt-10">type</span>⟩ </div><hr> - </p><!--l. 3589--><p class="noindent" > + </p><!--l. 3607--><p class="noindent" > where ⟨<span class="cmti-10">type</span>⟩ is the label identifying that glossary. The default value of <span @@ -7503,7 +7547,7 @@ class="cmss-10">glossaries </span>using: \usepackage[section,numberedsection=autolabel]  <br />  {glossaries} </div> - <!--l. 3597--><p class="nopar" > then each glossary will appear in a numbered section, and can be referenced using + <!--l. 3615--><p class="nopar" > then each glossary will appear in a numbered section, and can be referenced using something like: @@ -7512,7 +7556,7 @@ class="cmss-10">glossaries </span>using: The main glossary is in section~\ref{main} and  <br />the list of acronyms is in section~\ref{acronym}. </div> - <!--l. 3603--><p class="nopar" > If you can’t decide whether to have the acronyms in the main glossary or a + <!--l. 3621--><p class="nopar" > If you can’t decide whether to have the acronyms in the main glossary or a separate list of acronyms, you can use <span class="cmtt-10">\acronymtype</span><a id="dx1-24042"></a> which is set to <span @@ -7530,7 +7574,7 @@ class="cmss-10">acronym</span><a <div class="verbatim" id="verbatim-89"> The list of acronyms is in section~\ref{\acronymtype}. </div> - <!--l. 3611--><p class="nopar" > You can redefine the prefix if the default label clashes with another label in your + <!--l. 3629--><p class="nopar" > You can redefine the prefix if the default label clashes with another label in your document. For example: @@ -7538,7 +7582,7 @@ class="cmss-10">acronym</span><a <div class="verbatim" id="verbatim-90"> \renewcommand*{\glsautoprefix}{glo:} </div> - <!--l. 3617--><p class="nopar" > will add <span + <!--l. 3635--><p class="nopar" > will add <span class="cmtt-10">glo: </span>to the automatically generated label, so you can then, for example, refer to the list of acronyms as follows: @@ -7548,7 +7592,7 @@ class="cmtt-10">glo: </span>to the automatically generated label, so you can the The list of acronyms is in  <br />section~\ref{glo:\acronymtype}. </div> - <!--l. 3623--><p class="nopar" > Or, if you are undecided on a prefix: + <!--l. 3641--><p class="nopar" > Or, if you are undecided on a prefix: </p> @@ -7556,7 +7600,7 @@ class="cmtt-10">glo: </span>to the automatically generated label, so you can the The list of acronyms is in  <br />section~\ref{\glsautoprefix\acronymtype}. </div> - <!--l. 3628--><p class="nopar" > + <!--l. 3646--><p class="nopar" > </p></li> <li class="itemize"><span class="cmss-10">nameref</span><a @@ -7577,43 +7621,43 @@ class="cmss-10">nameref</span><a \usepackage{nameref}  <br />\usepackage[numberedsection=nameref]{glossaries} </div> - <!--l. 3637--><p class="nopar" > Now <span class="obeylines-h"><span class="verb"><span + <!--l. 3655--><p class="nopar" > Now <span class="obeylines-h"><span class="verb"><span class="cmtt-10">\nameref{main}</span></span></span> will display the (TOC) section title associated with the <span class="cmtt-10">main </span>glossary. As above, you can redefine <span class="cmtt-10">\glsautoprefix </span>to provide a prefix for the label.</p></li></ul> </dd></dl> -<!--l. 3645--><p class="noindent" > +<!--l. 3663--><p class="noindent" > </p> -<!--l. 3645--><p class="noindent" ><a +<!--l. 3663--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">2.3 </span> <a id="sec:pkgopts-printglos"></a>Glossary Appearance Options</h3> <dl class="description"><dt class="description"> <a - id="pkgopt:entrycounter"><span + id="pkgopt:entrycounter"></a><span class="cmssbx-10">entrycounter</span><a - id="dx1-25001"></a></a> </dt><dd + id="dx1-25001"></a> </dt><dd class="description">This is a boolean option. (Default is <span class="cmss-10">entrycounter=false</span><a id="dx1-25002"></a>.) If set, each main (level 0) glossary entry will be numbered when using the standard glossary styles. - This option creates the counter <span class="marginpar"><span + This option creates the counter <span class="reversemarginpar"><span class="cmtt-9">glossaryentry</span><span class="cmtt-9"> </span></span><a id="dx1-25003"></a><a id="dx1-25004"></a><span class="cmss-10">glossaryentry</span>. - <!--l. 3655--><p class="noindent" >If you use this option, you can reference the entry number within the document + <!--l. 3673--><p class="noindent" >If you use this option, you can reference the entry number within the document using - </p><!--l. 3657--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 3675--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsrefentry</span><span class="cmtt-9"> </span></span><a id="dx1-25005"></a> <span class="cmtt-10">\glsrefentry{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> - </p><!--l. 3659--><p class="noindent" > + </p><!--l. 3677--><p class="noindent" > where ⟨<span class="cmti-10">label</span>⟩ is the label associated with that glossary entry. The labelling systems uses ⟨<span @@ -7622,15 +7666,15 @@ class="cmti-10">label</span>⟩, where ⟨<span class="cmti-10">label</span>⟩ is the entry’s label and ⟨<span class="cmti-10">prefix</span>⟩ is given by - </p><!--l. 3663--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 3681--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GlsEntryCounterLabelPrefix</span><span class="cmtt-9"> </span></span><a id="dx1-25006"></a> <span class="cmtt-10">\GlsEntryCounterLabelPrefix </span></div><hr> - </p><!--l. 3665--><p class="noindent" > + </p><!--l. 3683--><p class="noindent" > (which defaults to <span class="cmtt-10">glsentry-</span>). - </p><!--l. 3668--><p class="noindent" ><div class="important" title="Important Note"> If you use <span + </p><!--l. 3686--><p class="noindent" ><div class="important" title="Important Note"> If you use <span class="cmtt-10">\glsrefentry</span>, you must run <span class="LATEX">L<span class="A">A</span><span class="TEX">T<span class="E">E</span>X</span></span> twice after creating the glossary files using <a @@ -7644,12 +7688,12 @@ href="#glo:xindy"><span class="cmtt-10">xindy</span><a id="dx1-25009"></a></a> to ensure the cross-references are up-to-date. </div> - </p><!--l. 3673--><p class="noindent" > + </p><!--l. 3691--><p class="noindent" > </p></dd><dt class="description"> <a - id="pkgopt:counterwithin"><span + id="pkgopt:counterwithin"></a><span class="cmssbx-10">counterwithin</span><a - id="dx1-25010"></a></a> </dt><dd + id="dx1-25010"></a> </dt><dd class="description">This is a ⟨<span class="cmti-10">key</span>⟩=⟨<span class="cmti-10">value</span>⟩ option where ⟨<span @@ -7661,7 +7705,7 @@ class="cmss-10">glossaryentry</span><a id="dx1-25012"></a> counter will be reset every time ⟨<span class="cmti-10">value</span>⟩ is incremented. - <!--l. 3682--><p class="noindent" ><div class="important" title="Important Note"> The <span + <!--l. 3700--><p class="noindent" ><div class="important" title="Important Note"> The <span class="cmss-10">glossaryentry</span><a id="dx1-25013"></a> counter isn’t automatically reset at the start of each glossary, except when glossary section numbering is on and the counter used by <span @@ -7670,17 +7714,17 @@ class="cmss-10">counterwithin</span><a same as the counter used in the glossary’s sectioning command. </div> - </p><!--l. 3687--><p class="noindent" > - </p><!--l. 3689--><p class="noindent" >If you want the counter reset at the start of each glossary, you can redefine + </p><!--l. 3705--><p class="noindent" > + </p><!--l. 3707--><p class="noindent" >If you want the counter reset at the start of each glossary, you can redefine <span class="cmtt-10">\glossarypreamble</span><a id="dx1-25015"></a> to use - </p><!--l. 3691--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 3709--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsresetentrycounter</span><span class="cmtt-9"> </span></span><a id="dx1-25016"></a> <span class="cmtt-10">\glsresetentrycounter </span></div><hr> - </p><!--l. 3693--><p class="noindent" > + </p><!--l. 3711--><p class="noindent" > which sets <span class="cmss-10">glossaryentry</span><a id="dx1-25017"></a> to zero: @@ -7692,7 +7736,7 @@ class="cmss-10">glossaryentry</span><a  <br />  \glsresetentrycounter  <br />} </div> - <!--l. 3699--><p class="nopar" > or if you are using <span + <!--l. 3717--><p class="nopar" > or if you are using <span class="cmtt-10">\setglossarypreamble</span><a id="dx1-25018"></a>, add it to each glossary preamble, as required. For example: @@ -7709,17 +7753,17 @@ class="cmtt-10">\setglossarypreamble</span><a  <br />  The preamble text here for the main glossary.  <br />} </div> - <!--l. 3711--><p class="nopar" > + <!--l. 3729--><p class="nopar" > </p></dd><dt class="description"> <a - id="pkgopt:subentrycounter"><span + id="pkgopt:subentrycounter"></a><span class="cmssbx-10">subentrycounter</span><a - id="dx1-25019"></a></a> </dt><dd + id="dx1-25019"></a> </dt><dd class="description">This is a boolean option. (Default is <span class="cmss-10">subentrycounter=false</span><a id="dx1-25020"></a>.) If set, each level 1 glossary entry will be numbered when using the standard glossary - styles. This option creates the counter <span class="marginpar"><span + styles. This option creates the counter <span class="reversemarginpar"><span class="cmtt-9">glossarysubentry</span><span class="cmtt-9"> </span></span><a id="dx1-25021"></a><a @@ -7739,9 +7783,9 @@ class="cmti-10">label</span>⟩ is the label associated with the sub-entry. </dd><dt class="description"> <a - id="pkgopt:style"><span + id="pkgopt:style"></a><span class="cmssbx-10">style</span><a - id="dx1-25025"></a></a> </dt><dd + id="dx1-25025"></a> </dt><dd class="description">This is a ⟨<span class="cmti-10">key</span>⟩=⟨<span class="cmti-10">value</span>⟩ option. (Default is <span @@ -7763,20 +7807,20 @@ class="cmss-10">glossary-super</span><a class="cmss-10">glossary-tree</span><a id="dx1-25032"></a>. Alternatively, you can set the style using - <!--l. 3732--><p class="noindent" ><hr><div title="Definition"><span + <!--l. 3750--><p class="noindent" ><hr><div title="Definition"><span class="cmtt-10">\setglossarystyle{</span>⟨<span class="cmitt-10">style name</span>⟩<span class="cmtt-10">} </span></div><hr> - </p><!--l. 3733--><p class="noindent" > + </p><!--l. 3751--><p class="noindent" > (See <a href="#sec:styles"><span class="tcrm-1000">§</span>15 </a><a href="#sec:styles">Glossary Styles<!--tex4ht:ref: sec:styles --></a> for further details.) </p></dd><dt class="description"> <a - id="pkgopt:nolong"><span + id="pkgopt:nolong"></a><span class="cmssbx-10">nolong</span><a - id="dx1-25033"></a></a> </dt><dd + id="dx1-25033"></a> </dt><dd class="description">This prevents the <span class="cmss-10">glossaries </span>package from automatically loading <span class="cmss-10">glossary-long</span><a @@ -7792,9 +7836,9 @@ class="cmss-10">glossary-long</span><a id="dx1-25036"></a>). </dd><dt class="description"> <a - id="pkgopt:nosuper"><span + id="pkgopt:nosuper"></a><span class="cmssbx-10">nosuper</span><a - id="dx1-25037"></a></a> </dt><dd + id="dx1-25037"></a> </dt><dd class="description">This prevents the <span class="cmss-10">glossaries </span>package from automatically loading <span class="cmss-10">glossary-super</span><a @@ -7812,9 +7856,9 @@ class="cmss-10">glossary-super</span><a </dd><dt class="description"> <a - id="pkgopt:nolist"><span + id="pkgopt:nolist"></a><span class="cmssbx-10">nolist</span><a - id="dx1-25041"></a></a> </dt><dd + id="dx1-25041"></a> </dt><dd class="description">This prevents the <span class="cmss-10">glossaries </span>package from automatically loading <span class="cmss-10">glossary-list</span><a @@ -7835,9 +7879,9 @@ class="cmss-10">style</span><a to something else. </dd><dt class="description"> <a - id="pkgopt:notree"><span + id="pkgopt:notree"></a><span class="cmssbx-10">notree</span><a - id="dx1-25047"></a></a> </dt><dd + id="dx1-25047"></a> </dt><dd class="description">This prevents the <span class="cmss-10">glossaries </span>package from automatically loading <span class="cmss-10">glossary-tree</span><a @@ -7858,9 +7902,9 @@ class="cmss-10">glossary-tree</span><a id="dx1-25052"></a>. </dd><dt class="description"> <a - id="pkgopt:nostyles"><span + id="pkgopt:nostyles"></a><span class="cmssbx-10">nostyles</span><a - id="dx1-25053"></a></a> </dt><dd + id="dx1-25053"></a> </dt><dd class="description">This prevents all the predefined styles from being loaded. If you use this option, you need to load a glossary style package (such as <span class="cmss-10">glossary-mcols</span><a @@ -7886,55 +7930,15 @@ class="cmtt-10">\printglossary</span><a  <br />\usepackage{glossary-mcols}  <br />\setglossarystyle{mcoltree} </div> - <!--l. 3783--><p class="nopar" > - </p></dd><dt class="description"> -<a - id="pkgopt:esclocations"><span -class="cmssbx-10">esclocations</span><a - id="dx1-25059"></a></a> </dt><dd -class="description">This is a boolean option. (The default is <span -class="cmss-10">esclocations=true</span><a - id="dx1-25060"></a>, but - <span -class="cmtt-10">\makenoidxglossaries</span><a - id="dx1-25061"></a> changes it to <span -class="cmss-10">esclocations=false</span><a - id="dx1-25062"></a>.) Both <a -href="#glo:makeindex"><span -class="cmtt-10">makeindex</span><a - id="dx1-25063"></a></a> and <a -href="#glo:xindy"><span -class="cmtt-10">xindy</span><a - id="dx1-25064"></a></a> - are fussy about the location formats (<a -href="#glo:makeindex"><span -class="cmtt-10">makeindex</span><a - id="dx1-25065"></a></a> more so than <a -href="#glo:xindy"><span -class="cmtt-10">xindy</span><a - id="dx1-25066"></a></a>) so the <span -class="cmss-10">glossaries</span> - package tries to ensure that special characters are escaped and allows for the location to - be substituted for a format that’s more acceptable to the indexing application. This - requires a bit of trickery to circumvent the problem posed by <span class="TEX">T<span -class="E">E</span>X</span>’s asynchronous - output routine, which can go wrong and also adds to the complexity of the document - build. - <!--l. 3796--><p class="noindent" >If you’re sure that your locations will always expand to an acceptable format (or you’re - prepared to post-process the glossary file before passing it to the relevant indexing - application) then use <span -class="cmss-10">esclocations=false</span><a - id="dx1-25067"></a> to avoid the complex escaping of location values. - (See “Writing information to associated files” in the documented code for further - details.) + <!--l. 3801--><p class="nopar" > </p></dd><dt class="description"> <a - id="pkgopt:nonumberlist"><span + id="pkgopt:nonumberlist"></a><span class="cmssbx-10">nonumberlist</span><a - id="dx1-25068"></a></a> </dt><dd + id="dx1-25059"></a> </dt><dd class="description">This option will suppress the associated <a href="#glo:numberlist">number list<a - id="dx1-25069"></a>s</a> in the glossaries (see also + id="dx1-25060"></a>s</a> in the glossaries (see also <a href="#sec:numberlists"><span class="tcrm-1000">§</span>5 </a><a @@ -7943,52 +7947,52 @@ href="#option2">2</a> or <a href="#option3">3</a> (<a href="#glo:makeindex"><span class="cmtt-10">makeindex</span><a - id="dx1-25070"></a></a> or <a + id="dx1-25061"></a></a> or <a href="#glo:xindy"><span class="cmtt-10">xindy</span><a - id="dx1-25071"></a></a>) then the + id="dx1-25062"></a></a>) then the locations must still be valid. This package option merely prevents the <a href="#glo:numberlist">number list<a - id="dx1-25072"></a></a> from + id="dx1-25063"></a></a> from being displayed, but both <a href="#glo:makeindex"><span class="cmtt-10">makeindex</span><a - id="dx1-25073"></a></a> and <a + id="dx1-25064"></a></a> and <a href="#glo:xindy"><span class="cmtt-10">xindy</span><a - id="dx1-25074"></a></a> still require a location or + id="dx1-25065"></a></a> still require a location or cross-reference for each term that’s indexed. Remember that <a href="#glo:numberlist">number list<a - id="dx1-25075"></a></a> includes any + id="dx1-25066"></a></a> includes any cross-references, so suppressing the <a href="#glo:numberlist">number list<a - id="dx1-25076"></a></a> will also hide the cross-references (see + id="dx1-25067"></a></a> will also hide the cross-references (see below). </dd><dt class="description"> <a - id="pkgopt:seeautonumberlist"><span + id="pkgopt:seeautonumberlist"></a><span class="cmssbx-10">seeautonumberlist</span><a - id="dx1-25077"></a></a> </dt><dd + id="dx1-25068"></a> </dt><dd class="description">If you suppress the <a href="#glo:numberlist">number list<a - id="dx1-25078"></a>s</a> with <span + id="dx1-25069"></a>s</a> with <span class="cmss-10">nonumberlist</span><a - id="dx1-25079"></a>, described + id="dx1-25070"></a>, described above, this will also suppress any cross-referencing information supplied by the <span class="cmss-10">see</span><a - id="dx1-25080"></a> key in <span + id="dx1-25071"></a> key in <span class="cmtt-10">\newglossaryentry</span><a - id="dx1-25081"></a> or <span + id="dx1-25072"></a> or <span class="cmtt-10">\glssee</span><a - id="dx1-25082"></a>. If you use <span + id="dx1-25073"></a>. If you use <span class="cmss-10">seeautonumberlist</span><a - id="dx1-25083"></a>, + id="dx1-25074"></a>, the <span class="cmss-10">see</span><a - id="dx1-25084"></a> key will automatically implement <span + id="dx1-25075"></a> key will automatically implement <span class="cmss-10">nonumberlist=false</span><a - id="dx1-25085"></a> for that entry. + id="dx1-25076"></a> for that entry. (Note this doesn’t affect <span class="cmtt-10">\glssee</span>.) For further details see <a href="#sec:crossref"><span @@ -7997,48 +8001,48 @@ href="#sec:crossref">Cross-Referencing Entries<!--tex4ht:ref: sec:crossref --></a>. </dd><dt class="description"> <a - id="pkgopt:counter"><span + id="pkgopt:counter"></a><span class="cmssbx-10">counter</span><a - id="dx1-25086"></a></a> </dt><dd + id="dx1-25077"></a> </dt><dd class="description">This is a ⟨<span class="cmti-10">key</span>⟩=⟨<span class="cmti-10">value</span>⟩ option. (Default is <span class="cmss-10">counter=page</span><a - id="dx1-25087"></a>.) The value should be + id="dx1-25078"></a>.) The value should be the name of the default counter to use in the <a href="#glo:numberlist">number list<a - id="dx1-25088"></a>s</a> (see <a + id="dx1-25079"></a>s</a> (see <a href="#sec:numberlists"><span class="tcrm-1000">§</span>5 </a><a href="#sec:numberlists">Number lists<!--tex4ht:ref: sec:numberlists --></a>). - - </dd><dt class="description"> <a - id="pkgopt:nopostdot"><span + id="pkgopt:nopostdot"></a><span class="cmssbx-10">nopostdot</span><a - id="dx1-25089"></a></a> </dt><dd + id="dx1-25080"></a> </dt><dd class="description">This is a boolean option. If no value is specified, <span class="cmtt-10">true </span>is assumed. When set to <span class="cmtt-10">true</span>, this option suppresses the default post description dot used by some of the predefined styles. The default setting is <span class="cmss-10">nopostdot=false</span><a - id="dx1-25090"></a>. + id="dx1-25081"></a>. </dd><dt class="description"> <a - id="pkgopt:nogroupskip"><span + id="pkgopt:nogroupskip"></a><span class="cmssbx-10">nogroupskip</span><a - id="dx1-25091"></a></a> </dt><dd + id="dx1-25082"></a> </dt><dd class="description">This is a boolean option. If no value is specified, <span class="cmtt-10">true </span>is assumed. When set to <span class="cmtt-10">true</span>, this option suppresses the default vertical gap between groups used by some of the predefined styles. The default setting is <span class="cmss-10">nogroupskip=false</span><a - id="dx1-25092"></a>. + id="dx1-25083"></a>. </dd></dl> + + <!--l. 3842--><p class="noindent" > </p> <!--l. 3842--><p class="noindent" ><a @@ -8046,9 +8050,9 @@ href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span cla id="sec:pkgopts-sort"></a>Sorting Options</h3> <dl class="description"><dt class="description"> <a - id="pkgopt:sort"><span + id="pkgopt:sort"></a><span class="cmssbx-10">sort</span><a - id="dx1-26001"></a></a> </dt><dd + id="dx1-26001"></a> </dt><dd class="description">If you use Options <a href="#option2">2</a> or <a href="#option3">3</a>, this package option is the only way of specifying how to @@ -8106,7 +8110,7 @@ class="cmss-10">sort=def</span><a id="dx1-26015"></a> and <span class="cmss-10">sort=use</span><a id="dx1-26016"></a> set the sort key to a six digit number via - </p><!--l. 3874--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 3874--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glssortnumberfmt</span><span class="cmtt-9"> </span></span><a id="dx1-26017"></a> <span @@ -8131,8 +8135,6 @@ href="#option2">2</a> or <a href="#option3">3</a>) or <span class="cmtt-10">\makenoidxglossaries </span>(<a href="#option1">Option 1</a>). It - - omits the code used to sanitize or escape the sort value, since it’s not required. This can help to improve the document build speed, especially if there are a large number of entries. This option can’t be used with @@ -8159,7 +8161,7 @@ class="cmss-10">sort=def</span><a class="cmss-10">sort=standard</span><a id="dx1-26025"></a>. When the standard sort option is in use, you can hook into the sort mechanism by redefining: - </p><!--l. 3900--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 3900--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsprestandardsort</span><span class="cmtt-9"> </span></span><a id="dx1-26026"></a> <span @@ -8170,6 +8172,8 @@ class="cmitt-10">type</span>⟩<span class="cmtt-10">}{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> + + </p><!--l. 3902--><p class="noindent" > where ⟨<span class="cmti-10">sort cs</span>⟩ is a temporary control sequence that stores the sort value (which was @@ -8187,7 +8191,7 @@ class="cmtt-10">xindy</span><a id="dx1-26030"></a></a> special characters is performed. By default <span class="cmtt-10">\glsprestandardsort </span>just does: - </p><!--l. 3908--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 3908--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsdosanitizesort</span><span class="cmtt-9"> </span></span><a id="dx1-26031"></a> <span @@ -8398,9 +8402,9 @@ class="cmtt-10">samplePeople.tex</span></a>. </p> </p><!--l. 4022--><p class="noindent" >____________________________</p></div> </dd><dt class="description"> <a - id="pkgopt:order"><span + id="pkgopt:order"></a><span class="cmssbx-10">order</span><a - id="dx1-26047"></a></a> </dt><dd + id="dx1-26047"></a> </dt><dd class="description">This may take two values: <span class="cmss-10">word</span><a id="dx1-26048"></a> or <span @@ -8439,9 +8443,9 @@ class="cmtt-10">\printnoidxglossary</span><a <!--l. 4043--><p class="nopar" > </p></dd><dt class="description"> <a - id="pkgopt:makeindex"><span + id="pkgopt:makeindex"></a><span class="cmssbx-10">makeindex</span><a - id="dx1-26054"></a></a> </dt><dd + id="dx1-26054"></a> </dt><dd class="description">(<a href="#option2">Option 2</a>) The glossary information and indexing style file will be written in <a @@ -8473,9 +8477,9 @@ class="cmss-10">xindy</span><a package option list. </p></dd><dt class="description"> <a - id="pkgopt:xindy"><span + id="pkgopt:xindy"></a><span class="cmssbx-10">xindy</span><a - id="dx1-26063"></a></a> </dt><dd + id="dx1-26063"></a> </dt><dd class="description">(<a href="#option3">Option 3</a>) The glossary information and indexing style file will be written in <a @@ -8533,9 +8537,9 @@ class="cmss-10">glossaries</span> package. </p></dd><dt class="description"> <a - id="pkgopt:xindygloss"><span + id="pkgopt:xindygloss"></a><span class="cmssbx-10">xindygloss</span><a - id="dx1-26072"></a></a> </dt><dd + id="dx1-26072"></a> </dt><dd class="description">(<a href="#option3">Option 3</a>) This is equivalent to <span class="obeylines-h"><span class="verb"><span class="cmtt-10">xindy={}</span></span></span> (that is, the <span @@ -8553,18 +8557,18 @@ class="tcrm-1000">§</span>11.1 href="#sec:langenc">Language and Encodings<!--tex4ht:ref: sec:langenc --></a>.) </dd><dt class="description"> <a - id="pkgopt:xindynoglsnumbers"><span + id="pkgopt:xindynoglsnumbers"></a><span class="cmssbx-10">xindynoglsnumbers</span><a - id="dx1-26076"></a></a> </dt><dd + id="dx1-26076"></a> </dt><dd class="description">(<a href="#option3">Option 3</a>) This is equivalent to <span class="obeylines-h"><span class="verb"><span class="cmtt-10">xindy={glsnumbers=false}</span></span></span> and may be used as a document class option. </dd><dt class="description"> <a - id="pkgopt:automake"><span + id="pkgopt:automake"></a><span class="cmssbx-10">automake</span><a - id="dx1-26077"></a></a> </dt><dd + id="dx1-26077"></a> </dt><dd class="description">This is option was introduced to version 4.08 as a boolean option. As from version 4.42 it may now take three values: <span class="cmtt-10">false </span>(default), <span @@ -8676,9 +8680,9 @@ href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span cla id="sec:pkgopts-acronym"></a>Acronym Options</h3> <dl class="description"><dt class="description"> <a - id="pkgopt:acronym"><span + id="pkgopt:acronym"></a><span class="cmssbx-10">acronym</span><a - id="dx1-27001"></a></a> </dt><dd + id="dx1-27001"></a> </dt><dd class="description">This creates a new glossary with the label <span class="cmtt-10">acronym</span>. This is equivalent to: @@ -8688,7 +8692,7 @@ class="cmtt-10">acronym</span>. This is equivalent \newglossary[alg]{acronym}{acr}{acn}{\acronymname} </div> <!--l. 4152--><p class="nopar" > It will also define - </p><!--l. 4154--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 4154--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\printacronyms</span><span class="cmtt-9"> </span></span><a id="dx1-27002"></a> <span @@ -8746,18 +8750,18 @@ class="cmtt-10">main </span>glossary.) </p><!--l. 4184--><p class="noindent" > </p></dd><dt class="description"> <a - id="pkgopt:acronyms"><span + id="pkgopt:acronyms"></a><span class="cmssbx-10">acronyms</span><a - id="dx1-27017"></a></a> </dt><dd + id="dx1-27017"></a> </dt><dd class="description">This is equivalent to <span class="cmss-10">acronym=true</span><a id="dx1-27018"></a> and may be used in the document class option list. </dd><dt class="description"> <a - id="pkgopt:acronymlists"><span + id="pkgopt:acronymlists"></a><span class="cmssbx-10">acronymlists</span><a - id="dx1-27019"></a></a> </dt><dd + id="dx1-27019"></a> </dt><dd class="description">By default, only the <span class="cmtt-10">\acronymtype </span>glossary is considered to be a list of acronyms. If you have other lists of acronyms, you can specify them as a @@ -8786,7 +8790,7 @@ class="cmtt-10">main </span>glossary to also contain a list of acronyms,  <br />  {Statistical Acronyms} </div> <!--l. 4206--><p class="nopar" > You can use - </p><!--l. 4208--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 4208--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\DeclareAcronymList</span><span class="cmtt-9"> </span></span><a id="dx1-27022"></a> <span @@ -8800,7 +8804,7 @@ class="cmss-10">acronymlists</span><a ⟨<span class="cmti-10">list</span>⟩ to the list of glossaries that are identified as lists of acronyms. To replace the list of acronym lists with a new list use: - </p><!--l. 4215--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 4215--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\SetAcronymLists</span><span class="cmtt-9"> </span></span><a id="dx1-27024"></a> <span @@ -8810,7 +8814,7 @@ class="cmtt-10">} </span></div><hr> </p><!--l. 4217--><p class="noindent" > </p><!--l. 4219--><p class="noindent" >You can determine if a glossary has been identified as being a list of acronyms using: - </p><!--l. 4221--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 4221--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsIfListOfAcronyms</span><span class="cmtt-9"> </span></span><a id="dx1-27025"></a> <span @@ -8825,15 +8829,15 @@ class="cmtt-10">}</span> </p><!--l. 4223--><p class="noindent" > </p></dd><dt class="description"> <a - id="pkgopt:shortcuts"><span + id="pkgopt:shortcuts"></a><span class="cmssbx-10">shortcuts</span><a - id="dx1-27026"></a></a> </dt><dd + id="dx1-27026"></a> </dt><dd class="description">This option provides shortcut commands for acronyms. See <a href="#sec:acronyms"><span class="tcrm-1000">§</span>13 </a><a href="#sec:acronyms">Acronyms and Other Abbreviations<!--tex4ht:ref: sec:acronyms --></a> for further details. Alternatively you can use: - <!--l. 4228--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 4228--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\DefineAcronymSynonyms</span><span class="cmtt-9"> </span></span><a id="dx1-27027"></a> <span @@ -8855,9 +8859,9 @@ href="#sec:acronyms">Acronyms and Other Abbreviations<!--tex4ht:ref: sec:acronyms --></a> for further details. </p><dl class="description"><dt class="description"> <a - id="pkgopt:description"><span + id="pkgopt:description"></a><span class="cmssbx-10">description</span><a - id="dx1-28002"></a></a> </dt><dd + id="dx1-28002"></a> </dt><dd class="description">This option changes the definition of <span class="cmtt-10">\newacronym</span><a id="dx1-28003"></a> to allow a description. This @@ -8928,9 +8932,9 @@ class="cmss-10">dua</span><a <!--l. 4270--><p class="nopar" > </p></dd><dt class="description"> <a - id="pkgopt:smallcaps"><span + id="pkgopt:smallcaps"></a><span class="cmssbx-10">smallcaps</span><a - id="dx1-28012"></a></a> </dt><dd + id="dx1-28012"></a> </dt><dd class="description">This option changes the definition of <span class="cmtt-10">\newacronym</span><a id="dx1-28013"></a> and the way that acronyms are @@ -8963,9 +8967,9 @@ class="cmss-10">footnote</span><a <!--l. 4285--><p class="nopar" > </p></dd><dt class="description"> <a - id="pkgopt:smaller"><span + id="pkgopt:smaller"></a><span class="cmssbx-10">smaller</span><a - id="dx1-28017"></a></a> </dt><dd + id="dx1-28017"></a> </dt><dd class="description">This option changes the definition of <span class="cmtt-10">\newacronym</span><a id="dx1-28018"></a> and the way that acronyms are @@ -9009,9 +9013,9 @@ class="cmss-10">footnote</span><a <!--l. 4305--><p class="nopar" > </p></dd><dt class="description"> <a - id="pkgopt:footnote"><span + id="pkgopt:footnote"></a><span class="cmssbx-10">footnote</span><a - id="dx1-28025"></a></a> </dt><dd + id="dx1-28025"></a> </dt><dd class="description">This option changes the definition of <span class="cmtt-10">\newacronym</span><a id="dx1-28026"></a> and the way that acronyms are @@ -9073,9 +9077,9 @@ class="cmss-10">description</span><a <!--l. 4332--><p class="nopar" > </p></dd><dt class="description"> <a - id="pkgopt:dua"><span + id="pkgopt:dua"></a><span class="cmssbx-10">dua</span><a - id="dx1-28034"></a></a> </dt><dd + id="dx1-28034"></a> </dt><dd class="description">This option changes the definition of <span class="cmtt-10">\newacronym</span><a id="dx1-28035"></a> so that acronyms are always @@ -9105,9 +9109,9 @@ href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span cla <!--l. 4351--><p class="noindent" >Other available options that don’t fit any of the above categories are: </p><dl class="description"><dt class="description"> <a - id="pkgopt:symbols"><span + id="pkgopt:symbols"></a><span class="cmssbx-10">symbols</span><a - id="dx1-29001"></a></a> </dt><dd + id="dx1-29001"></a> </dt><dd class="description">This option defines a new glossary type with the label <span class="cmtt-10">symbols </span>via @@ -9116,7 +9120,7 @@ class="cmtt-10">symbols </span>via \newglossary[slg]{symbols}{sls}{slo}{\glssymbolsgroupname} </div> <!--l. 4358--><p class="nopar" > It also defines - </p><!--l. 4360--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 4360--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\printsymbols</span><span class="cmtt-9"> </span></span><a id="dx1-29002"></a> <span @@ -9161,9 +9165,9 @@ class="cmtt-10">\glsxtrnewsymbol</span><a class="cmss-10">glossaries-extra </span>manual for further details. </p></dd><dt class="description"> <a - id="pkgopt:numbers"><span + id="pkgopt:numbers"></a><span class="cmssbx-10">numbers</span><a - id="dx1-29007"></a></a> </dt><dd + id="dx1-29007"></a> </dt><dd class="description">This option defines a new glossary type with the label <span class="cmtt-10">numbers </span>via @@ -9172,7 +9176,7 @@ class="cmtt-10">numbers </span>via \newglossary[nlg]{numbers}{nls}{nlo}{\glsnumbersgroupname} </div> <!--l. 4389--><p class="nopar" > It also defines - </p><!--l. 4391--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 4391--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\printnumbers</span><span class="cmtt-9"> </span></span><a id="dx1-29008"></a> <span @@ -9217,9 +9221,9 @@ class="cmtt-10">\glsxtrnewnumber</span><a class="cmss-10">glossaries-extra </span>manual for further details. </p></dd><dt class="description"> <a - id="pkgopt:index"><span + id="pkgopt:index"></a><span class="cmssbx-10">index</span><a - id="dx1-29013"></a></a> </dt><dd + id="dx1-29013"></a> </dt><dd class="description">This option defines a new glossary type with the label <span class="cmtt-10">index </span>via @@ -9228,7 +9232,7 @@ class="cmtt-10">index </span>via \newglossary[ilg]{index}{ind}{idx}{\indexname}% </div> <!--l. 4420--><p class="nopar" > It also defines - </p><!--l. 4422--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 4422--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\newterm</span><span class="cmtt-9"> </span></span><a id="dx1-29014"></a> <span @@ -9256,7 +9260,7 @@ class="cmitt-10">options</span>⟩<span class="cmtt-10">]</span> </div> </div> and - <!--l. 4431--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 4431--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\printindex</span><span class="cmtt-9"> </span></span><a id="dx1-29017"></a> <span @@ -9328,9 +9332,9 @@ class="cmss-10">index</span><a option. </p></dd><dt class="description"> <a - id="pkgopt:noglossaryindex"><span + id="pkgopt:noglossaryindex"></a><span class="cmssbx-10">noglossaryindex</span><a - id="dx1-29029"></a></a> </dt><dd + id="dx1-29029"></a> </dt><dd class="description">This option switches off <span class="cmss-10">index</span><a id="dx1-29030"></a> if <span @@ -9341,23 +9345,23 @@ class="cmss-10">index</span><a class="cmtt-10">\setupglossaries</span>. </dd><dt class="description"> <a - id="pkgopt:compatible-2.07"><span + id="pkgopt:compatible-2.07"></a><span class="cmssbx-10">compatible-2.07</span><a - id="dx1-29032"></a></a> </dt><dd + id="dx1-29032"></a> </dt><dd class="description">Compatibility mode for old documents created using version 2.07 or below. </dd><dt class="description"> <a - id="pkgopt:compatible-3.07"><span + id="pkgopt:compatible-3.07"></a><span class="cmssbx-10">compatible-3.07</span><a - id="dx1-29033"></a></a> </dt><dd + id="dx1-29033"></a> </dt><dd class="description">Compatibility mode for old documents created using version 3.07 or below. </dd><dt class="description"> <a - id="pkgopt:kernelglossredefs"><span + id="pkgopt:kernelglossredefs"></a><span class="cmssbx-10">kernelglossredefs</span><a - id="dx1-29034"></a></a> </dt><dd + id="dx1-29034"></a> </dt><dd class="description">As a legacy from the precursor <span class="cmss-10">glossary</span><a id="dx1-29035"></a> package, the standard glossary @@ -9436,7 +9440,7 @@ href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span cla <!--l. 4525--><p class="noindent" >Some of the options described above may also be set after the <span class="cmss-10">glossaries </span>package has been loaded using -</p><!--l. 4527--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4527--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\setupglossaries</span><span class="cmtt-9"> </span></span><a id="dx1-30001"></a> <span @@ -9523,7 +9527,7 @@ class="cmss-10">glossaries-extra</span></a> manuals.) href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">3.1 </span> <a id="sec:setupopt1"></a>Option 1</h3> <!--l. 4563--><p class="noindent" >The command -</p><!--l. 4564--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4564--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\makenoidxglossaries</span><span class="cmtt-9"> </span></span><a id="dx1-32001"></a> <span @@ -9543,7 +9547,7 @@ class="cmbx-10">displayed.</span> href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">3.2 </span> <a id="sec:setupopt23"></a>Options 2 and 3</h3> <!--l. 4575--><p class="noindent" >The command -</p><!--l. 4576--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4576--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\makeglossaries</span><span class="cmtt-9"> </span></span><a id="dx1-33001"></a> <span @@ -9588,7 +9592,7 @@ href="#glo:makeindex"><span class="cmtt-10">makeindex</span><a id="dx1-33007"></a></a> style file using -</p><!--l. 4599--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4599--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\noist</span><span class="cmtt-9"> </span></span><a id="dx1-33008"></a> <span @@ -9618,7 +9622,7 @@ class="cmtt-10">\jobname</span><a class="cmtt-10">.xdy</span><a id="dx1-33014"></a> (<a href="#option3">Option 3</a>). This name may be changed using: -</p><!--l. 4613--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4613--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\setStyleFile</span><span class="cmtt-9"> </span></span><a id="dx1-33015"></a> <span @@ -9639,7 +9643,7 @@ class="cmss-10">counter</span><a id="dx1-33017"></a> package option. The default form of the location number assumes a full stop compositor (e.g. 1.2), but if your location numbers use a different compositor (e.g. 1-2) you need to set this using -</p><!--l. 4627--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4627--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsSetCompositor</span><span class="cmtt-9"> </span></span><a id="dx1-33018"></a> <span @@ -9659,7 +9663,7 @@ class="cmtt-10">\makeglossaries</span>. </p><!--l. 4636--><p class="indent" > If you use <a href="#option3">Option 3</a>, you can have a different compositor for page numbers starting with an upper case alphabetical character using: -</p><!--l. 4638--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4638--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsSetAlphaCompositor</span><span class="cmtt-9"> </span></span><a id="dx1-33019"></a> <span @@ -9739,7 +9743,7 @@ class="tcrm-1000">§</span>10 </a><a href="#sec:printglossary">Displaying a glossary<!--tex4ht:ref: sec:printglossary --></a> to find out how to display the glossary. </p><!--l. 4678--><p class="indent" > New glossary entries are defined using the command: -</p><!--l. 4679--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4679--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\newglossaryentry</span><span class="cmtt-9"> </span></span><a id="dx1-34003"></a> <span @@ -9757,7 +9761,7 @@ class="cmtt-10">=</span>) with braces to hide them from the key=value list parser. Be careful to ensure that no spurious spaces are included at the start and end of the braces. </p><!--l. 4688--><p class="indent" > If you have a long description that needs to span multiple paragraphs, use -</p><!--l. 4690--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4690--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\longnewglossaryentry</span><span class="cmtt-9"> </span></span><a id="dx1-34004"></a> <span @@ -9789,7 +9793,7 @@ class="cmtt-10">\unskip </span>or class="cmtt-10">\nopostdesc</span>. </p><!--l. 4704--><p class="indent" > There are also commands that will only define the entry if it hasn’t already been defined: -</p><!--l. 4706--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4706--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\provideglossaryentry</span><span class="cmtt-9"> </span></span><a id="dx1-34006"></a> <span @@ -9801,7 +9805,7 @@ class="cmtt-10">}</span> </div><hr> </p><!--l. 4708--><p class="noindent" > and -</p><!--l. 4710--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 4710--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\longprovideglossaryentry</span><span class="cmtt-9"> </span></span><a id="dx1-34007"></a> <span @@ -9905,7 +9909,7 @@ class="cmssbx-10">description</span><a id="dx1-34021"></a> </dt><dd class="description">A brief description of this term (to appear in the glossary). Within this value, you can use - <!--l. 4763--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 4763--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\nopostdesc</span><span class="cmtt-9"> </span></span><a id="dx1-34022"></a> <span @@ -9916,7 +9920,7 @@ class="cmtt-10">\nopostdesc </span></div><hr> <span class="obeylines-h"><span class="verb"><span class="cmtt-10">description={\nopostdesc}</span></span></span>. If you want a paragraph break in the description use - </p><!--l. 4771--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 4771--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glspar</span><span class="cmtt-9"> </span></span><a id="dx1-34023"></a> <span @@ -10541,7 +10545,7 @@ href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span cla id="sec:plurals"></a>Plurals</h3> <!--l. 5019--><p class="noindent" >You may have noticed from above that you can specify the plural form when you define a term. If you omit this, the plural will be obtained by appending -</p><!--l. 5022--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5022--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glspluralsuffix</span><span class="cmtt-9"> </span></span><a id="dx1-35001"></a> <span @@ -10696,7 +10700,7 @@ entries are defined. href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><span class="titlemark">4.3.1 </span> <a id="sec:glsaddkey"></a>Document Keys</h4> <!--l. 5134--><p class="noindent" >A custom key that can be used in the document is defined using: -</p><!--l. 5135--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5135--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsaddkey</span><span class="cmtt-9"> </span></span><a id="dx1-38001"></a> <span @@ -10847,7 +10851,7 @@ class="cmtt-10">sample-newkeys.tex</span></a>. </p> href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><span class="titlemark">4.3.2 </span> <a id="sec:glsaddstoragekey"></a>Storage Keys</h4> <!--l. 5227--><p class="noindent" >A custom key that can be used for simply storing information is defined using: -</p><!--l. 5229--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5229--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsaddstoragekey</span><span class="cmtt-9"> </span></span><a id="dx1-39001"></a> <span @@ -11235,7 +11239,7 @@ class="cmss-10">sort</span><a suppressed via <span class="cmtt-10">\glssetnoexpandfield</span>). </p><!--l. 5504--><p class="indent" > You can switch expansion on or off for individual keys using -</p><!--l. 5505--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5505--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glssetexpandfield</span><span class="cmtt-9"> </span></span><a id="dx1-40007"></a> <span @@ -11244,7 +11248,7 @@ class="cmitt-10">field</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 5507--><p class="noindent" > or -</p><!--l. 5509--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5509--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glssetnoexpandfield</span><span class="cmtt-9"> </span></span><a id="dx1-40008"></a> <span @@ -11370,14 +11374,14 @@ class="cmtt-10">shortpl </span></td></tr></table> class="cmtt-10">\glssetexpandfield </span>or <span class="cmtt-10">\glssetnoexpandfield </span>are governed by -</p><!--l. 5539--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5539--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsexpandfields</span><span class="cmtt-9"> </span></span><a id="dx1-40022"></a> <span class="cmtt-10">\glsexpandfields </span></div><hr> </p><!--l. 5541--><p class="noindent" > and -</p><!--l. 5543--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5543--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsnoexpandfields</span><span class="cmtt-9"> </span></span><a id="dx1-40023"></a> <span @@ -11564,7 +11568,7 @@ sub-entries have different plurals, they will need to be specified. For example: href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">4.6 </span> <a id="sec:loadglsentries"></a>Loading Entries From a File</h3> <!--l. 5679--><p class="noindent" >You can store all your glossary entry definitions in another file and use: -</p><!--l. 5681--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5681--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\loadglsentries</span><span class="cmtt-9"> </span></span><a id="dx1-44001"></a> <span @@ -11626,10 +11630,10 @@ class="tcrm-1000">§</span>4.8 </a><a href="#sec:docdefs">Drawbacks With Defining Entries in the Document Environment<!--tex4ht:ref: sec:docdefs --></a>.) </div> </p><!--l. 5708--><p class="noindent" > -<a - id="x1-44016r7"></a> +<a + id="x1-44016r7"></a> </p><!--l. 5710--><p class="noindent" ><span class="cmbx-12">Example 7</span><span class="cmbx-12"> (Loading Entries from Another File)</span><a @@ -11785,7 +11789,7 @@ class="cmtt-10">terms.tex </span>file will be ignored. href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">4.7 </span> <a id="sec:moveentry"></a>Moving Entries to Another Glossary</h3> <!--l. 5812--><p class="noindent" >As from version 3.02, you can move an entry from one glossary to another using: -</p><!--l. 5814--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 5814--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsmoveentry</span><span class="cmtt-9"> </span></span><a id="dx1-45001"></a> <span @@ -12381,7 +12385,7 @@ class="cmtt-10">\c@page</span> class="cmtt-10">\tally{page}</span></span></span> expands to <span class="obeylines-h"><span class="verb"><span class="cmtt-10">\tallynum\c@page</span></span></span>) then you need to use: -</p><!--l. 6142--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6142--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsaddprotectedpagefmt</span><span class="cmtt-9"> </span></span><a id="dx1-51015"></a> <span @@ -12552,7 +12556,7 @@ class="cmtt-10">\the</span><a class="cmtt-10">\number</span><a id="dx1-51025"></a> while it processes the location. If this causes a problem you can disallow it using -</p><!--l. 6236--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6236--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glswrallowprimitivemodsfalse</span><span class="cmtt-9"> </span></span><a id="dx1-51026"></a> <span @@ -12608,7 +12612,7 @@ class="cmtt-10">xindy</span><a href="#option2">2</a> and <a href="#option3">3</a>), you can replace the separator and the closing number in the range using: -</p><!--l. 6260--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6260--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsSetSuffixF</span><span class="cmtt-9"> </span></span><a id="dx1-52009"></a> <span @@ -12616,7 +12620,7 @@ class="cmtt-10">\glsSetSuffixF{</span>⟨<span class="cmitt-10">suffix</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 6262--><p class="noindent" > -</p><!--l. 6263--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6263--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsSetSuffixFF</span><span class="cmtt-9"> </span></span><a id="dx1-52010"></a> <span @@ -12686,7 +12690,7 @@ href="#option1">Option 1</a> doesn’t form ranges. However, with thi <a href="#glo:numberlist">number list<a id="dx1-52018"></a></a> using: -</p><!--l. 6301--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6301--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsnumberlistloop</span><span class="cmtt-9"> </span></span><a id="dx1-52019"></a> <span @@ -12772,7 +12776,7 @@ href="#option1">Option 1</a>.) <!--l. 6340--><p class="nopar" > There is a predefined handler that’s used to display the <a href="#glo:numberlist">number list<a id="dx1-52021"></a></a> in the glossary: -</p><!--l. 6343--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6343--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsnoidxdisplayloc</span><span class="cmtt-9"> </span></span><a id="dx1-52022"></a> <span @@ -12815,7 +12819,7 @@ href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span cla class="cmtt-10">\writeist</span><a id="dx1-53001"></a> before the file is closed. You can set the code to be performed then using: -</p><!--l. 6362--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6362--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GlsSetWriteIstHook</span><span class="cmtt-9"> </span></span><a id="dx1-53002"></a> <span @@ -12825,7 +12829,7 @@ class="cmtt-10">} </span></div><hr> </p><!--l. 6364--><p class="noindent" > If you want the ⟨<span class="cmti-10">code</span>⟩ to write any information to the file, you need to use -</p><!--l. 6367--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6367--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glswrite</span><span class="cmtt-9"> </span></span><a id="dx1-53003"></a> <span @@ -13027,7 +13031,7 @@ details. </p><!--l. 6476--><p class="indent" > The way the <a href="#glo:linktext">link text<a id="dx1-54024"></a></a> is displayed depends on -</p><!--l. 6477--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6477--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glstextformat</span><span class="cmtt-9"> </span></span><a id="dx1-54025"></a> <span @@ -13481,7 +13485,7 @@ apply a patch to <span class="cmss-10">tabularx</span><a id="dx1-55007"></a> by placing the following command (new to v4.28) in the preamble: -</p><!--l. 6690--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6690--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glspatchtabularx</span><span class="cmtt-9"> </span></span><a id="dx1-55008"></a> <span @@ -13496,7 +13500,7 @@ class="cmss-10">beamer</span><a href="#sec:glsunset"><span class="tcrm-1000">§</span>14 </a><a href="#sec:glsunset">Unsetting and Resetting Entry Flags<!--tex4ht:ref: sec:glsunset --></a> for more details. -</p><!--l. 6697--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6697--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\gls</span><span class="cmtt-9"> </span></span><a id="dx1-55011"></a> <span @@ -13530,7 +13534,7 @@ class="cmss-10">long</span><a class="cmss-10">short</span><a id="dx1-55020"></a> keys. </p><!--l. 6707--><p class="indent" > There are two upper case variants: -</p><!--l. 6708--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6708--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Gls</span><span class="cmtt-9"> </span></span><a id="dx1-55021"></a> <span @@ -13543,7 +13547,7 @@ class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 6710--><p class="noindent" > and -</p><!--l. 6712--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6712--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GLS</span><span class="cmtt-9"> </span></span><a id="dx1-55022"></a> <span @@ -13817,7 +13821,7 @@ class="cmss-10">mfirstuc</span><a id="dx1-55046"></a> user manual. </p><!--l. 6879--><p class="indent" > There are plural forms that are analogous to <span class="cmtt-10">\gls</span>: -</p><!--l. 6880--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6880--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glspl</span><span class="cmtt-9"> </span></span><a id="dx1-55047"></a> <span @@ -13829,7 +13833,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 6882--><p class="noindent" > -</p><!--l. 6883--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6883--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glspl</span><span class="cmtt-9"> </span></span><a id="dx1-55048"></a> <span @@ -13841,7 +13845,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 6885--><p class="noindent" > -</p><!--l. 6886--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6886--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GLSpl</span><span class="cmtt-9"> </span></span><a id="dx1-55049"></a> <span @@ -13903,7 +13907,7 @@ $\gls{Falpha}[^2]$ </div> <!--l. 6913--><p class="nopar" > </div> </p><!--l. 6914--><p class="noindent" > -</p><!--l. 6916--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6916--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsdisp</span><span class="cmtt-9"> </span></span><a id="dx1-55056"></a> <span @@ -13969,7 +13973,7 @@ class="tcrm-1000">§</span>6.1 </a><a href="#sec:gls-like">The <span class="cmtt-10">\gls</span>-Like Commands (First Use Flag Queried)<!--tex4ht:ref: sec:gls-like --></a>. -</p><!--l. 6947--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6947--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glslink</span><span class="cmtt-9"> </span></span><a id="dx1-56004"></a> <span @@ -13995,7 +13999,7 @@ used to form <a href="#glo:linktext">link text<a id="dx1-56006"></a></a>. </div> </p><!--l. 6958--><p class="noindent" > -</p><!--l. 6960--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6960--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glstext</span><span class="cmtt-9"> </span></span><a id="dx1-56007"></a> <span @@ -14015,7 +14019,7 @@ href="#glo:linktext">link text<a </p><!--l. 6966--><p class="indent" > There are also analogous commands: -</p><!--l. 6967--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6967--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glstext</span><span class="cmtt-9"> </span></span><a id="dx1-56010"></a> <span @@ -14027,7 +14031,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 6969--><p class="noindent" > -</p><!--l. 6970--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6970--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GLStext</span><span class="cmtt-9"> </span></span><a id="dx1-56011"></a> <span @@ -14058,7 +14062,7 @@ class="cmtt-10">\glslink</span>. For example: href="#sec:glsnolink"><span class="tcrm-1000">§</span>9 </a><a href="#sec:glsnolink">Using Glossary Terms Without Links<!--tex4ht:ref: sec:glsnolink --></a>.) -</p><!--l. 6985--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6985--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsfirst</span><span class="cmtt-9"> </span></span><a id="dx1-56013"></a> <span @@ -14076,7 +14080,7 @@ class="cmss-10">first</span><a href="#glo:linktext">link text<a id="dx1-56015"></a></a>. </p><!--l. 6991--><p class="indent" > There are also analogous uppercasing commands: -</p><!--l. 6992--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6992--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsfirst</span><span class="cmtt-9"> </span></span><a id="dx1-56016"></a> <span @@ -14088,7 +14092,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 6994--><p class="noindent" > -</p><!--l. 6995--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 6995--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GLSfirst</span><span class="cmtt-9"> </span></span><a id="dx1-56017"></a> <span @@ -14128,7 +14132,7 @@ class="cmtt-10">\gls </span>or <span class="cmtt-10">\glspl </span>on subsequent use.) </div> </p><!--l. 7007--><p class="noindent" > -</p><!--l. 7009--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7009--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsplural</span><span class="cmtt-9"> </span></span><a id="dx1-56028"></a> <span @@ -14146,7 +14150,7 @@ class="cmss-10">plural</span><a href="#glo:linktext">link text<a id="dx1-56030"></a></a>. </p><!--l. 7015--><p class="indent" > There are also analogous uppercasing commands: -</p><!--l. 7016--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7016--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsplural</span><span class="cmtt-9"> </span></span><a id="dx1-56031"></a> <span @@ -14158,7 +14162,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7018--><p class="noindent" > -</p><!--l. 7019--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7019--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GLSplural</span><span class="cmtt-9"> </span></span><a id="dx1-56032"></a> <span @@ -14170,7 +14174,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7021--><p class="noindent" > -</p><!--l. 7023--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7023--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsfirstplural</span><span class="cmtt-9"> </span></span><a id="dx1-56033"></a> <span @@ -14188,7 +14192,7 @@ class="cmss-10">firstplural</span><a href="#glo:linktext">link text<a id="dx1-56035"></a></a>. </p><!--l. 7029--><p class="indent" > There are also analogous uppercasing commands: -</p><!--l. 7030--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7030--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsfirstplural</span><span class="cmtt-9"> </span></span><a id="dx1-56036"></a> <span @@ -14200,7 +14204,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7032--><p class="noindent" > -</p><!--l. 7033--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7033--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GLSfirstplural</span><span class="cmtt-9"> </span></span><a id="dx1-56037"></a> <span @@ -14212,7 +14216,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7035--><p class="noindent" > -</p><!--l. 7037--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7037--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsname</span><span class="cmtt-9"> </span></span><a id="dx1-56038"></a> <span @@ -14241,7 +14245,7 @@ class="cmtt-10">\glstext </span>or class="cmtt-10">\glsfirst </span>instead of <span class="cmtt-10">\glsname</span>. </p><!--l. 7045--><p class="indent" > There are also analogous uppercasing commands: -</p><!--l. 7046--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7046--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsname</span><span class="cmtt-9"> </span></span><a id="dx1-56043"></a> <span @@ -14253,7 +14257,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7048--><p class="noindent" > -</p><!--l. 7049--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7049--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GLSname</span><span class="cmtt-9"> </span></span><a id="dx1-56044"></a> <span @@ -14272,7 +14276,7 @@ class="cmtt-10">\Acrlong</span>, class="cmtt-10">\Acrshort </span>or <span class="cmtt-10">\Acrfull</span>. </div> </p><!--l. 7056--><p class="noindent" > -</p><!--l. 7058--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7058--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glssymbol</span><span class="cmtt-9"> </span></span><a id="dx1-56045"></a> <span @@ -14290,7 +14294,7 @@ class="cmss-10">symbol</span><a href="#glo:linktext">link text<a id="dx1-56047"></a></a>. </p><!--l. 7064--><p class="indent" > There are also analogous uppercasing commands: -</p><!--l. 7065--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7065--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glssymbol</span><span class="cmtt-9"> </span></span><a id="dx1-56048"></a> <span @@ -14302,7 +14306,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7067--><p class="noindent" > -</p><!--l. 7068--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7068--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GLSsymbol</span><span class="cmtt-9"> </span></span><a id="dx1-56049"></a> <span @@ -14314,7 +14318,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7070--><p class="noindent" > -</p><!--l. 7072--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7072--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsdesc</span><span class="cmtt-9"> </span></span><a id="dx1-56050"></a> <span @@ -14332,7 +14336,7 @@ class="cmss-10">description</span><a href="#glo:linktext">link text<a id="dx1-56052"></a></a>. </p><!--l. 7078--><p class="indent" > There are also analogous uppercasing commands: -</p><!--l. 7079--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7079--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsdesc</span><span class="cmtt-9"> </span></span><a id="dx1-56053"></a> <span @@ -14344,7 +14348,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7081--><p class="noindent" > -</p><!--l. 7082--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7082--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GLSdesc</span><span class="cmtt-9"> </span></span><a id="dx1-56054"></a> <span @@ -14364,7 +14368,7 @@ class="cmtt-10">] </span></div><hr> \glslink{sample}{\glsentrytitlecase{sample}{desc}} </div> <!--l. 7089--><p class="nopar" > -</p><!--l. 7091--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7091--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsuseri</span><span class="cmtt-9"> </span></span><a id="dx1-56055"></a> <span @@ -14382,7 +14386,7 @@ class="cmss-10">user1</span><a href="#glo:linktext">link text<a id="dx1-56057"></a></a>. </p><!--l. 7097--><p class="indent" > There are also analogous uppercasing commands: -</p><!--l. 7098--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7098--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsuseri</span><span class="cmtt-9"> </span></span><a id="dx1-56058"></a> <span @@ -14394,7 +14398,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7100--><p class="noindent" > -</p><!--l. 7101--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7101--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GLSuseri</span><span class="cmtt-9"> </span></span><a id="dx1-56059"></a> <span @@ -14406,7 +14410,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7103--><p class="noindent" > -</p><!--l. 7105--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7105--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsuserii</span><span class="cmtt-9"> </span></span><a id="dx1-56060"></a> <span @@ -14424,7 +14428,7 @@ class="cmss-10">user2</span><a href="#glo:linktext">link text<a id="dx1-56062"></a></a>. </p><!--l. 7111--><p class="indent" > There are also analogous uppercasing commands: -</p><!--l. 7112--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7112--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsuserii</span><span class="cmtt-9"> </span></span><a id="dx1-56063"></a> <span @@ -14436,7 +14440,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7114--><p class="noindent" > -</p><!--l. 7115--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7115--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GLSuserii</span><span class="cmtt-9"> </span></span><a id="dx1-56064"></a> <span @@ -14448,7 +14452,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7117--><p class="noindent" > -</p><!--l. 7119--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7119--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsuseriii</span><span class="cmtt-9"> </span></span><a id="dx1-56065"></a> <span @@ -14466,7 +14470,7 @@ class="cmss-10">user3</span><a href="#glo:linktext">link text<a id="dx1-56067"></a></a>. </p><!--l. 7125--><p class="indent" > There are also analogous uppercasing commands: -</p><!--l. 7126--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7126--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsuseriii</span><span class="cmtt-9"> </span></span><a id="dx1-56068"></a> <span @@ -14478,7 +14482,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7128--><p class="noindent" > -</p><!--l. 7129--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7129--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GLSuseriii</span><span class="cmtt-9"> </span></span><a id="dx1-56069"></a> <span @@ -14490,7 +14494,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7131--><p class="noindent" > -</p><!--l. 7133--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7133--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsuseriv</span><span class="cmtt-9"> </span></span><a id="dx1-56070"></a> <span @@ -14508,7 +14512,7 @@ class="cmss-10">user4</span><a href="#glo:linktext">link text<a id="dx1-56072"></a></a>. </p><!--l. 7139--><p class="indent" > There are also analogous uppercasing commands: -</p><!--l. 7140--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7140--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsuseriv</span><span class="cmtt-9"> </span></span><a id="dx1-56073"></a> <span @@ -14520,7 +14524,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7142--><p class="noindent" > -</p><!--l. 7143--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7143--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GLSuseriv</span><span class="cmtt-9"> </span></span><a id="dx1-56074"></a> <span @@ -14534,7 +14538,7 @@ class="cmtt-10">] </span></div><hr> </p><!--l. 7145--><p class="noindent" > -</p><!--l. 7147--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7147--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsuserv</span><span class="cmtt-9"> </span></span><a id="dx1-56075"></a> <span @@ -14552,7 +14556,7 @@ class="cmss-10">user5</span><a href="#glo:linktext">link text<a id="dx1-56077"></a></a>. </p><!--l. 7153--><p class="indent" > There are also analogous uppercasing commands: -</p><!--l. 7154--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7154--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsuserv</span><span class="cmtt-9"> </span></span><a id="dx1-56078"></a> <span @@ -14564,7 +14568,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7156--><p class="noindent" > -</p><!--l. 7157--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7157--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GLSuserv</span><span class="cmtt-9"> </span></span><a id="dx1-56079"></a> <span @@ -14576,7 +14580,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7159--><p class="noindent" > -</p><!--l. 7161--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7161--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsuservi</span><span class="cmtt-9"> </span></span><a id="dx1-56080"></a> <span @@ -14594,7 +14598,7 @@ class="cmss-10">user6</span><a href="#glo:linktext">link text<a id="dx1-56082"></a></a>. </p><!--l. 7167--><p class="indent" > There are also analogous uppercasing commands: -</p><!--l. 7168--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7168--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsuservi</span><span class="cmtt-9"> </span></span><a id="dx1-56083"></a> <span @@ -14606,7 +14610,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 7170--><p class="noindent" > -</p><!--l. 7171--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7171--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GLSuservi</span><span class="cmtt-9"> </span></span><a id="dx1-56084"></a> <span @@ -14631,7 +14635,7 @@ class="cmtt-10">\gls</span>-like</a> commands is governed by<span class="footnote-mark"><a href="#fn3x6" id="fn3x6-bk"><sup class="textsuperscript">6.3</sup></a></span><a id="x1-57002f3"></a>: -</p><!--l. 7182--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7182--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryfmt</span><span class="cmtt-9"> </span></span><a id="dx1-57006"></a> <span @@ -14639,7 +14643,7 @@ class="cmtt-10">\glsentryfmt </span></div><hr> </p><!--l. 7184--><p class="noindent" > This may be redefined but if you only want the change the display style for a given glossary, then you need to use -</p><!--l. 7187--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7187--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\defglsentryfmt</span><span class="cmtt-9"> </span></span><a id="dx1-57007"></a> <span @@ -14683,7 +14687,7 @@ class="cmti-10">definition</span>⟩ argument of <span class="cmtt-10">\defglsentryfmt</span>, or if you want to redefine <span class="cmtt-10">\glsentryfmt</span>, you may use the following commands: -</p><!--l. 7211--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7211--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glslabel</span><span class="cmtt-9"> </span></span><a id="dx1-57012"></a> <span @@ -14691,7 +14695,7 @@ class="cmtt-10">\glslabel </span></div><hr> </p><!--l. 7213--><p class="noindent" > This is the label of the entry being referenced. As from version 4.08, you can also access the glossary entry type using: -</p><!--l. 7216--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7216--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glstype</span><span class="cmtt-9"> </span></span><a id="dx1-57013"></a> <span @@ -14702,7 +14706,7 @@ class="cmtt-10">\edef</span><a id="dx1-57014"></a> so the replacement text is the actual glossary type rather than <span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glsentrytype{\glslabel}</span></span></span>. -</p><!--l. 7222--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7222--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glscustomtext</span><span class="cmtt-9"> </span></span><a id="dx1-57015"></a> <span @@ -14720,7 +14724,7 @@ class="cmss-10">etoolbox</span><a class="cmtt-10">\ifdefempty </span>to determine if <span class="cmtt-10">\glscustomtext </span>is empty.) -</p><!--l. 7230--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7230--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsinsert</span><span class="cmtt-9"> </span></span><a id="dx1-57019"></a> <span @@ -14730,7 +14734,7 @@ The custom text supplied in the final optional argument to <span class="cmtt-10">\gls</span>, <span class="cmtt-10">\glspl </span>and their upper case variants. -</p><!--l. 7236--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7236--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsifplural</span><span class="cmtt-9"> </span></span><a id="dx1-57020"></a> <span @@ -14748,7 +14752,7 @@ class="cmti-10">true text</span>⟩ otherwise it does ⟨<span class="cmti-10">false</span> <span class="cmti-10">text</span>⟩. -</p><!--l. 7242--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7242--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glscapscase</span><span class="cmtt-9"> </span></span><a id="dx1-57021"></a> <span @@ -14772,7 +14776,7 @@ class="cmti-10">first uc</span>⟩. If <span class="cmtt-10">\GLS </span>or <span class="cmtt-10">\GLSpl </span>were used, this does ⟨<span class="cmti-10">all caps</span>⟩. -</p><!--l. 7249--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7249--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsifhyperon</span><span class="cmtt-9"> </span></span><a id="dx1-57022"></a> <span @@ -14804,7 +14808,7 @@ use. class="cmtt-10">\glsifhyper</span><a id="dx1-57027"></a> is now deprecated. If you want to know if the command used to reference this entry was used with the star or plus variant, you can use: -</p><!--l. 7265--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7265--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glslinkvar</span><span class="cmtt-9"> </span></span><a id="dx1-57028"></a> <span @@ -14886,7 +14890,7 @@ class="cmtt-10">\glslabel</span>. </div> </p><!--l. 7295--><p class="noindent" > </p><!--l. 7297--><p class="indent" > If you only want to make minor modifications to <span class="cmtt-10">\glsentryfmt</span>, you can use -</p><!--l. 7299--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7299--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsgenentryfmt</span><span class="cmtt-9"> </span></span><a id="dx1-57044"></a> <span @@ -14906,7 +14910,7 @@ custom text) with the insert text appended. <span class="cmtt-10">\newacronym</span><a id="dx1-57049"></a>) you can use: -</p><!--l. 7308--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7308--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsgenacfmt</span><span class="cmtt-9"> </span></span><a id="dx1-57050"></a> <span @@ -14931,7 +14935,7 @@ class="cmss-10">first</span><a class="cmss-10">firstplural</span><a id="dx1-57058"></a> keys. The first use singular text is obtained via: -</p><!--l. 7315--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7315--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\genacrfullformat</span><span class="cmtt-9"> </span></span><a id="dx1-57059"></a> <span @@ -14944,7 +14948,7 @@ class="cmtt-10">} </span></div><hr> instead of from the <span class="cmss-10">first</span><a id="dx1-57060"></a> key, and the first use plural text is obtained via: -</p><!--l. 7320--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7320--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\genplacrfullformat</span><span class="cmtt-9"> </span></span><a id="dx1-57061"></a> <span @@ -14969,7 +14973,7 @@ is in the argument of <span class="cmtt-10">\firstacronymfont</span><a id="dx1-57064"></a>. There are also first letter upper case versions: -</p><!--l. 7331--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7331--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Genacrfullformat</span><span class="cmtt-9"> </span></span><a id="dx1-57065"></a> <span @@ -14980,7 +14984,7 @@ class="cmitt-10">insert</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 7333--><p class="noindent" > and -</p><!--l. 7335--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7335--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Genplacrfullformat</span><span class="cmtt-9"> </span></span><a id="dx1-57066"></a> <span @@ -15027,7 +15031,7 @@ href="#sec:gls-like"><span class="cmtt-10">\gls</span>-like</a> and <a href="#sec:glstext-like"><span class="cmtt-10">\glstext</span>-like</a> commands use -</p><!--l. 7356--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7356--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glslinkpostsetkeys</span><span class="cmtt-9"> </span></span><a id="dx1-57073"></a> <span @@ -15037,7 +15041,7 @@ after the ⟨<span class="cmti-10">options</span>⟩ are set. This macro does nothing by default but can be redefined. (For example, to switch off the hyperlink under certain conditions.) This version also introduces -</p><!--l. 7362--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7362--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glspostlinkhook</span><span class="cmtt-9"> </span></span><a id="dx1-57074"></a> <span @@ -15203,14 +15207,14 @@ implicit means, such as via the <span class="cmss-10">nohypertypes</span><a id="dx1-58004"></a> package option). </p><!--l. 7455--><p class="indent" > You can disable or enable links using: -</p><!--l. 7456--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7456--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsdisablehyper</span><span class="cmtt-9"> </span></span><a id="dx1-58005"></a> <span class="cmtt-10">\glsdisablehyper </span></div><hr> </p><!--l. 7458--><p class="noindent" > and -</p><!--l. 7460--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7460--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsenablehyper</span><span class="cmtt-9"> </span></span><a id="dx1-58006"></a> <span @@ -15466,7 +15470,7 @@ href="#top">Top</a><div class="chapter"><h2 class="chapterHead">7. <a id="sec:glsadd"></a>Adding an Entry to the Glossary Without Generating Text</h2> </p><!--l. 7597--><p class="indent" > It is possible to add a line to the glossary file without generating any text at that point in the document using: -</p><!--l. 7599--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7599--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsadd</span><span class="cmtt-9"> </span></span><a id="dx1-59001"></a> <span @@ -15500,7 +15504,7 @@ class="cmtt-10">set</span>: </div> <!--l. 7612--><p class="nopar" > </p><!--l. 7614--><p class="indent" > To add all entries that have been defined, use: -</p><!--l. 7615--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7615--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsaddall</span><span class="cmtt-9"> </span></span><a id="dx1-59003"></a> <span @@ -15544,7 +15548,7 @@ href="#sec:numberlists">5<!--tex4ht:ref: sec:numberlists --></a>.) </div> </p><!--l. 7639--><p class="indent" > There is now a variation of <span class="cmtt-10">\glsaddall </span>that skips any entries that have already been used: -</p><!--l. 7641--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7641--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsaddallunused</span><span class="cmtt-9"> </span></span><a id="dx1-59008"></a> <span @@ -15765,7 +15769,7 @@ class="cmtt-10">\newterm</span><a </p></li> <li class="enumerate" id="x1-60016x3">After you have defined the entry, use - <!--l. 7773--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 7773--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glssee</span><span class="cmtt-9"> </span></span><a id="dx1-60017"></a> <span @@ -15829,7 +15833,7 @@ class="cmss-10">see</span><a id="dx1-61001"></a> key or the command <span class="cmtt-10">\glssee</span>, the cross-referencing information will be typeset in the glossary according to: -</p><!--l. 7807--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7807--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsseeformat</span><span class="cmtt-9"> </span></span><a id="dx1-61002"></a> <span @@ -15868,14 +15872,14 @@ href="#fn2x8" id="fn2x8-bk"><sup class="textsuperscript">8.2</sup></a></span><a </p><!--l. 7828--><p class="indent" > The list of labels is dealt with by <span class="cmtt-10">\glsseelist</span>, which iterates through the list and typesets each entry in the label. The entries are separated by -</p><!--l. 7831--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7831--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsseesep</span><span class="cmtt-9"> </span></span><a id="dx1-61008"></a> <span class="cmtt-10">\glsseesep </span></div><hr> </p><!--l. 7833--><p class="noindent" > or (for the last pair) -</p><!--l. 7835--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7835--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsseelastsep</span><span class="cmtt-9"> </span></span><a id="dx1-61009"></a> <span @@ -15887,7 +15891,7 @@ class="cmtt-10">\space\andname</span><a id="dx1-61010"></a><span class="cmtt-10">\space</span>” respectively. The list entry text is displayed using: -</p><!--l. 7841--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7841--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsseeitemformat</span><span class="cmtt-9"> </span></span><a id="dx1-61011"></a> <span @@ -15959,7 +15963,7 @@ case aren’t expandable. The other commands depend on whether their corresp were assigned non-expandable values. </div> </p><!--l. 7883--><p class="noindent" > </p><!--l. 7885--><p class="indent" > If you want to title case a field, you can use: -</p><!--l. 7886--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7886--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentrytitlecase</span><span class="cmtt-9"> </span></span><a id="dx1-62005"></a> <span @@ -15995,7 +15999,7 @@ href="#sec:gls-like"><span class="tcrm-1000">§</span>6.1 </a><a href="#sec:gls-like">The <span class="cmtt-10">\gls</span>-Like Commands (First Use Flag Queried)<!--tex4ht:ref: sec:gls-like --></a>). -</p><!--l. 7902--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7902--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryname</span><span class="cmtt-9"> </span></span><a id="dx1-62007"></a> <span @@ -16003,7 +16007,7 @@ class="cmtt-10">\glsentryname{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 7904--><p class="noindent" > -</p><!--l. 7905--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7905--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryname</span><span class="cmtt-9"> </span></span><a id="dx1-62008"></a> <span @@ -16037,7 +16041,7 @@ class="cmtt-10">\Glsentrylong</span>, <span class="cmtt-10">\Glsentryshort </span>or <span class="cmtt-10">\Glsentryfull</span>. </div> </p><!--l. 7921--><p class="noindent" > -</p><!--l. 7923--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7923--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glossentryname</span><span class="cmtt-9"> </span></span><a id="dx1-62012"></a> <span @@ -16064,7 +16068,7 @@ the required fonts. For example: \renewcommand*{\glsnamefont}[1]{\textmd{\sffamily #1}} </div> <!--l. 7934--><p class="nopar" > -</p><!--l. 7935--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7935--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glossentryname</span><span class="cmtt-9"> </span></span><a id="dx1-62013"></a> <span @@ -16074,7 +16078,7 @@ class="cmtt-10">} </span></div><hr> </p><!--l. 7937--><p class="noindent" > This is like <span class="cmtt-10">\glossentryname </span>but makes the first letter of the name upper case. -</p><!--l. 7941--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7941--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentrytext</span><span class="cmtt-9"> </span></span><a id="dx1-62014"></a> <span @@ -16082,7 +16086,7 @@ class="cmtt-10">\glsentrytext{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 7943--><p class="noindent" > -</p><!--l. 7944--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7944--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentrytext</span><span class="cmtt-9"> </span></span><a id="dx1-62015"></a> <span @@ -16099,7 +16103,7 @@ class="cmtt-10">\Glsentrytext </span>makes the first letter upper case. The firs expandable (unless the text contains unexpandable commands). The second form is not expandable. Neither checks for the existence of ⟨<span class="cmti-10">label</span>⟩. -</p><!--l. 7954--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7954--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryplural</span><span class="cmtt-9"> </span></span><a id="dx1-62017"></a> <span @@ -16107,7 +16111,7 @@ class="cmtt-10">\glsentryplural{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 7956--><p class="noindent" > -</p><!--l. 7957--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7957--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryplural</span><span class="cmtt-9"> </span></span><a id="dx1-62018"></a> <span @@ -16125,7 +16129,7 @@ The first form is expandable (unless the value of that key contains unexpandable commands). The second form is not expandable. Neither checks for the existence of ⟨<span class="cmti-10">label</span>⟩. -</p><!--l. 7968--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7968--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryfirst</span><span class="cmtt-9"> </span></span><a id="dx1-62020"></a> <span @@ -16133,7 +16137,7 @@ class="cmtt-10">\glsentryfirst{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 7970--><p class="noindent" > -</p><!--l. 7971--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7971--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryfirst</span><span class="cmtt-9"> </span></span><a id="dx1-62021"></a> <span @@ -16152,7 +16156,7 @@ The first form is expandable (unless the value of that key contains unexpandable commands). The second form is not expandable. Neither checks for the existence of ⟨<span class="cmti-10">label</span>⟩. -</p><!--l. 7981--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7981--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryfirstplural</span><span class="cmtt-9"> </span></span><a id="dx1-62023"></a> <span @@ -16160,7 +16164,7 @@ class="cmtt-10">\glsentryfirstplural{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 7983--><p class="noindent" > -</p><!--l. 7984--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7984--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryfirstplural</span><span class="cmtt-9"> </span></span><a id="dx1-62024"></a> <span @@ -16181,7 +16185,7 @@ case. The first form is expandable (unless the value of that key contains unexpa commands). The second form is not expandable. Neither checks for the existence of ⟨<span class="cmti-10">label</span>⟩. -</p><!--l. 7995--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7995--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentrydesc</span><span class="cmtt-9"> </span></span><a id="dx1-62026"></a> <span @@ -16189,7 +16193,7 @@ class="cmtt-10">\glsentrydesc{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 7997--><p class="noindent" > -</p><!--l. 7998--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 7998--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentrydesc</span><span class="cmtt-9"> </span></span><a id="dx1-62027"></a> <span @@ -16204,7 +16208,7 @@ makes the first letter upper case. The first form is expandable (unless the valu contains unexpandable commands). The second form is not expandable. Neither checks for the existence of ⟨<span class="cmti-10">label</span>⟩. -</p><!--l. 8007--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8007--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glossentrydesc</span><span class="cmtt-9"> </span></span><a id="dx1-62028"></a> <span @@ -16219,7 +16223,7 @@ class="cmtt-10">} </span>but also checks for the existence of ⟨<span class="cmti-10">label</span>⟩. This command is not expandable. It’s used in the predefined glossary styles to display the description. -</p><!--l. 8014--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8014--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glossentrydesc</span><span class="cmtt-9"> </span></span><a id="dx1-62029"></a> <span @@ -16230,7 +16234,7 @@ class="cmtt-10">} </span></div><hr> This is like <span class="cmtt-10">\glossentrydesc </span>but converts the first letter to upper case. This command is not expandable. -</p><!--l. 8020--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8020--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentrydescplural</span><span class="cmtt-9"> </span></span><a id="dx1-62030"></a> <span @@ -16238,7 +16242,7 @@ class="cmtt-10">\glsentrydescplural{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 8022--><p class="noindent" > -</p><!--l. 8023--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8023--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentrydescplural</span><span class="cmtt-9"> </span></span><a id="dx1-62031"></a> <span @@ -16253,7 +16257,7 @@ class="cmtt-10">\Glsentrydescplural </span>makes the first letter upper case. Th the value of that key contains unexpandable commands). The second form is not expandable. Neither checks for the existence of ⟨<span class="cmti-10">label</span>⟩. -</p><!--l. 8034--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8034--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentrysymbol</span><span class="cmtt-9"> </span></span><a id="dx1-62032"></a> <span @@ -16261,7 +16265,7 @@ class="cmtt-10">\glsentrysymbol{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 8036--><p class="noindent" > -</p><!--l. 8037--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8037--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentrysymbol</span><span class="cmtt-9"> </span></span><a id="dx1-62033"></a> <span @@ -16276,7 +16280,7 @@ makes the first letter upper case. The first form is expandable (unless the valu contains unexpandable commands). The second form is not expandable. Neither checks for the existence of ⟨<span class="cmti-10">label</span>⟩. -</p><!--l. 8047--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8047--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsletentryfield</span><span class="cmtt-9"> </span></span><a id="dx1-62034"></a> <span @@ -16302,7 +16306,7 @@ class="cmtt-10">\tmp</span></span></span>: \glsletentryfield{\tmp}{apple}{desc} </div> <!--l. 8058--><p class="nopar" > -</p><!--l. 8060--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8060--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glossentrysymbol</span><span class="cmtt-9"> </span></span><a id="dx1-62035"></a> <span @@ -16317,7 +16321,7 @@ class="cmtt-10">} </span>but also checks for the existence of ⟨<span class="cmti-10">label</span>⟩. This command is not expandable. It’s used in some of the predefined glossary styles to display the symbol. -</p><!--l. 8067--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8067--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glossentrysymbol</span><span class="cmtt-9"> </span></span><a id="dx1-62036"></a> <span @@ -16328,7 +16332,7 @@ class="cmtt-10">} </span></div><hr> This is like <span class="cmtt-10">\glossentrysymbol </span>but converts the first letter to upper case. This command is not expandable. -</p><!--l. 8073--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8073--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentrysymbolplural</span><span class="cmtt-9"> </span></span><a id="dx1-62037"></a> <span @@ -16336,7 +16340,7 @@ class="cmtt-10">\glsentrysymbolplural{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 8075--><p class="noindent" > -</p><!--l. 8076--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8076--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentrysymbolplural</span><span class="cmtt-9"> </span></span><a id="dx1-62038"></a> <span @@ -16351,7 +16355,7 @@ class="cmtt-10">\Glsentrysymbolplural </span>makes the first letter upper case. (unless the value of that key contains unexpandable commands). The second form is not expandable. Neither checks for the existence of ⟨<span class="cmti-10">label</span>⟩. -</p><!--l. 8086--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8086--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryuseri</span><span class="cmtt-9"> </span></span><a id="dx1-62039"></a> <span @@ -16359,7 +16363,7 @@ class="cmtt-10">\glsentryuseri{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 8088--><p class="noindent" > -</p><!--l. 8089--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8089--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryuseri</span><span class="cmtt-9"> </span></span><a id="dx1-62040"></a> <span @@ -16367,7 +16371,7 @@ class="cmtt-10">\Glsentryuseri{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 8091--><p class="noindent" > -</p><!--l. 8092--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8092--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryuserii</span><span class="cmtt-9"> </span></span><a id="dx1-62041"></a> <span @@ -16375,7 +16379,7 @@ class="cmtt-10">\glsentryuserii{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 8094--><p class="noindent" > -</p><!--l. 8095--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8095--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryuserii</span><span class="cmtt-9"> </span></span><a id="dx1-62042"></a> <span @@ -16383,7 +16387,7 @@ class="cmtt-10">\Glsentryuserii{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 8097--><p class="noindent" > -</p><!--l. 8098--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8098--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryuseriii</span><span class="cmtt-9"> </span></span><a id="dx1-62043"></a> <span @@ -16391,7 +16395,7 @@ class="cmtt-10">\glsentryuseriii{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 8100--><p class="noindent" > -</p><!--l. 8101--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8101--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryuseriii</span><span class="cmtt-9"> </span></span><a id="dx1-62044"></a> <span @@ -16399,7 +16403,7 @@ class="cmtt-10">\Glsentryuseriii{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 8103--><p class="noindent" > -</p><!--l. 8104--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8104--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryuseriv</span><span class="cmtt-9"> </span></span><a id="dx1-62045"></a> <span @@ -16407,7 +16411,7 @@ class="cmtt-10">\glsentryuseriv{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 8106--><p class="noindent" > -</p><!--l. 8107--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8107--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryuseriv</span><span class="cmtt-9"> </span></span><a id="dx1-62046"></a> <span @@ -16417,7 +16421,7 @@ class="cmtt-10">} </span></div><hr> </p><!--l. 8109--><p class="noindent" > -</p><!--l. 8110--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8110--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryuserv</span><span class="cmtt-9"> </span></span><a id="dx1-62047"></a> <span @@ -16425,7 +16429,7 @@ class="cmtt-10">\glsentryuserv{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 8112--><p class="noindent" > -</p><!--l. 8113--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8113--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryuserv</span><span class="cmtt-9"> </span></span><a id="dx1-62048"></a> <span @@ -16433,7 +16437,7 @@ class="cmtt-10">\Glsentryuserv{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 8115--><p class="noindent" > -</p><!--l. 8116--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8116--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryuservi</span><span class="cmtt-9"> </span></span><a id="dx1-62049"></a> <span @@ -16441,7 +16445,7 @@ class="cmtt-10">\glsentryuservi{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 8118--><p class="noindent" > -</p><!--l. 8119--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8119--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryuservi</span><span class="cmtt-9"> </span></span><a id="dx1-62050"></a> <span @@ -16456,7 +16460,7 @@ commands). The commands beginning with an upper case letter convert the first le required value to upper case and are not expandable. None of these commands check for the existence of ⟨<span class="cmti-10">label</span>⟩. -</p><!--l. 8130--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8130--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glshyperlink</span><span class="cmtt-9"> </span></span><a id="dx1-62051"></a> <span @@ -16503,7 +16507,7 @@ href="#option1">Option 1</a> or with the <span class="cmss-10">savenumberlist</span><a id="dx1-62059"></a> package option: -</p><!--l. 8152--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8152--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentrynumberlist</span><span class="cmtt-9"> </span></span><a id="dx1-62060"></a> <span @@ -16511,7 +16515,7 @@ class="cmtt-10">\glsentrynumberlist{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 8154--><p class="noindent" > -</p><!--l. 8155--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8155--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsdisplaynumberlist</span><span class="cmtt-9"> </span></span><a id="dx1-62061"></a> <span @@ -16543,7 +16547,7 @@ required. class="cmtt-10">\glsentrynumberlist</span>, simply displays the number list as is. The second command, <span class="cmtt-10">\glsdisplaynumberlist</span>, formats the list using: -</p><!--l. 8167--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8167--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsnumlistsep</span><span class="cmtt-9"> </span></span><a id="dx1-62066"></a> <span @@ -16552,7 +16556,7 @@ class="cmtt-10">\glsnumlistsep </span></div><hr> </p><!--l. 8169--><p class="noindent" > as the separator between all but the last two elements and -</p><!--l. 8171--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8171--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsnumlistlastsep</span><span class="cmtt-9"> </span></span><a id="dx1-62067"></a> <span @@ -16600,7 +16604,7 @@ class="cmbx-10">Option</span><span class="cmbx-10"> 1</span></a><span class="cmbx-10">:</span> </dt><dd class="description"> - <!--l. 8197--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 8197--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\printnoidxglossaries</span><span class="cmtt-9"> </span></span><a id="dx1-63001"></a> <span @@ -16621,7 +16625,7 @@ href="#option3"><span class="cmbx-10">3</span></a><span class="cmbx-10">:</span> </dt><dd class="description"> - <!--l. 8203--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 8203--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\printglossaries</span><span class="cmtt-9"> </span></span><a id="dx1-63003"></a> <span @@ -16685,7 +16689,7 @@ class="cmbx-10">Option</span><span class="cmbx-10"> 1</span></a><span class="cmbx-10">:</span> </dt><dd class="description"> - <!--l. 8232--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 8232--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\printnoidxglossary</span><span class="cmtt-9"> </span></span><a id="dx1-63012"></a> <span @@ -16708,7 +16712,7 @@ href="#option3"><span class="cmbx-10">3</span></a><span class="cmbx-10">:</span> </dt><dd class="description"> - <!--l. 8238--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 8238--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\printglossary</span><span class="cmtt-9"> </span></span><a id="dx1-63014"></a> <span @@ -16966,7 +16970,7 @@ the <span class="cmss-10">numberedsection</span><a id="dx1-63060"></a> package option. Each glossary sets the page header via the command -</p><!--l. 8348--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8348--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsglossarymark</span><span class="cmtt-9"> </span></span><a id="dx1-63061"></a> <span @@ -16986,7 +16990,7 @@ class="tcrm-1000">§</span>2.2 </a><a href="#sec:pkgopts-sec">Sectioning, Headings and TOC Options<!--tex4ht:ref: sec:pkgopts-sec --></a>. </p><!--l. 8356--><p class="indent" > Information can be added to the start of the glossary (after the title and before the main body of the glossary) by redefining -</p><!--l. 8358--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8358--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glossarypreamble</span><span class="cmtt-9"> </span></span><a id="dx1-63064"></a> <span @@ -17002,7 +17006,7 @@ For example: </div> <!--l. 8365--><p class="nopar" > This needs to be done before the glossary is displayed. </p><!--l. 8368--><p class="indent" > If you want a different preamble per glossary you can use -</p><!--l. 8369--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8369--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\setglossarypreamble</span><span class="cmtt-9"> </span></span><a id="dx1-63065"></a> <span @@ -17027,7 +17031,7 @@ class="cmtt-10">\glsdefaulttype </span>is used. for any other glossaries. </p><!--l. 8382--><p class="indent" > There is an analogous command to <span class="cmtt-10">\glossarypreamble </span>called -</p><!--l. 8383--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8383--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glossarypostamble</span><span class="cmtt-9"> </span></span><a id="dx1-63066"></a> <span @@ -17066,7 +17070,7 @@ back to one column mode, you could do: <!--l. 8405--><p class="noindent" > </p><!--l. 8405--><p class="noindent" >____________________________</p></div> <!--l. 8407--><p class="indent" > Within each glossary, each entry name is formatted according to -</p><!--l. 8408--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8408--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsnamefont</span><span class="cmtt-9"> </span></span><a id="dx1-63074"></a> <span @@ -17163,13 +17167,13 @@ class="cmtt-10">xindy</span><a id="dx1-64006"></a></a> style file, the <span class="cmss-10">glossaries </span>package provides the following commands: -</p><!--l. 8458--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8458--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsopenbrace</span><span class="cmtt-9"> </span></span><a id="dx1-64007"></a> <span class="cmtt-10">\glsopenbrace </span></div><hr> </p><!--l. 8460--><p class="noindent" > -</p><!--l. 8461--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8461--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsclosebrace</span><span class="cmtt-9"> </span></span><a id="dx1-64008"></a> <span @@ -17180,14 +17184,14 @@ class="cmtt-10">\{</span></span></span> and <span class="obeylines-h"><span clas class="cmtt-10">\}</span></span></span> don’t expand to a simple brace character when written to a file.) Similarly, you can write a percent character using: -</p><!--l. 8468--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8468--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glspercentchar</span><span class="cmtt-9"> </span></span><a id="dx1-64009"></a> <span class="cmtt-10">\glspercentchar </span></div><hr> </p><!--l. 8470--><p class="noindent" > and a tilde character using: -</p><!--l. 8472--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8472--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glstildechar</span><span class="cmtt-9"> </span></span><a id="dx1-64010"></a> <span @@ -17202,7 +17206,7 @@ class="cmtt-10">~n</span></span></span> so you can use class="cmtt-10">\glstildechar n </span>to write this correctly (or you can do <span class="obeylines-h"><span class="verb"><span class="cmtt-10">\string~n</span></span></span>). A backslash can be written to a file using -</p><!--l. 8479--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8479--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsbackslash</span><span class="cmtt-9"> </span></span><a id="dx1-64012"></a> <span @@ -17212,7 +17216,7 @@ class="cmtt-10">\glsbackslash </span></div><hr> <span class="cmss-10">ngerman</span><a id="dx1-64013"></a>) you can use: -</p><!--l. 8485--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8485--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsquote</span><span class="cmtt-9"> </span></span><a id="dx1-64014"></a> <span @@ -17283,7 +17287,7 @@ language given your document settings, but in the event that it gets it wrong or class="cmtt-10">xindy</span><a id="dx1-65006"></a> doesn’t support that language, then you can specify the required language using: -</p><!--l. 8516--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8516--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GlsSetXdyLanguage</span><span class="cmtt-9"> </span></span><a id="dx1-65007"></a> <span @@ -17306,7 +17310,7 @@ class="cmss-10">inputenc</span><a <span class="cmtt-10">\inputencodingname</span><a id="dx1-65009"></a>. Alternatively, you can specify the encoding using: -</p><!--l. 8529--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8529--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GlsSetXdyCodePage</span><span class="cmtt-9"> </span></span><a id="dx1-65010"></a> <span @@ -17401,7 +17405,7 @@ class="cmti-10">before </span><span class="cmtt-10">\makeglossaries</span><a id="dx1-66008"></a> using: -</p><!--l. 8573--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8573--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GlsAddXdyCounters</span><span class="cmtt-9"> </span></span><a id="dx1-66009"></a> <span @@ -17423,7 +17427,7 @@ href="#glo:xindy"><span class="cmtt-10">xindy</span><a id="dx1-66013"></a></a> style file, but if you want to use another attribute, you need to add it using: -</p><!--l. 8582--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8582--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GlsAddXdyAttribute</span><span class="cmtt-9"> </span></span><a id="dx1-66014"></a> <span @@ -17514,7 +17518,7 @@ class="cmtt-10">\GlsAddXdyAttribute</span>. </div> </p><!--l. 8630--><p class="noindent" > </p><!--l. 8632--><p class="indent" > If the location numbers include formatting commands, then you need to add a location style in the appropriate format using -</p><!--l. 8634--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8634--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GlsAddXdyLocation</span><span class="cmtt-9"> </span></span><a id="dx1-66024"></a> <span @@ -18001,7 +18005,7 @@ entries).<span class="footnote-mark"><a href="#fn3x11" id="fn3x11-bk"><sup class="textsuperscript">11.3</sup></a></span><a id="x1-66057f3"></a> This ordering can be changed using: -</p><!--l. 8885--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8885--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GlsSetXdyLocationClassOrder</span><span class="cmtt-9"> </span></span><a id="dx1-66058"></a> <span @@ -18048,7 +18052,7 @@ href="#glo:numberlist">number list<a id="dx1-66062"></a></a> consists of a sequence of consecutive numbers, the range will be concatenated. The number of consecutive locations that causes a range formation defaults to 2, but can be changed using: -</p><!--l. 8917--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8917--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GlsSetXdyMinRangeLength</span><span class="cmtt-9"> </span></span><a id="dx1-66063"></a> <span @@ -18123,7 +18127,7 @@ class="cmtt-10">numeric-sort </span>module: class="cmtt-10">glsnumbers=false</span>, the default behaviour is to locate the number group before the “A” letter group. If you are not using a Roman alphabet, you need to change this using: -</p><!--l. 8959--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8959--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GlsSetXdyFirstLetterAfterDigits</span><span class="cmtt-9"> </span></span><a id="dx1-67004"></a> <span @@ -18141,7 +18145,7 @@ the native UTF-8 engines and <span class="cmss-10">fontspec</span><a id="dx1-67006"></a>.) The starred form will sanitize the argument to prevent expansion. Alternatively you can use: -</p><!--l. 8970--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 8970--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GlsSetXdyNumberGroupOrder</span><span class="cmtt-9"> </span></span><a id="dx1-67007"></a> <span @@ -18199,7 +18203,7 @@ class="cmtt-10">\makeglossaries</span><a href="#top">Top</a><div class="chapter"><h2 class="chapterHead">12. <a id="sec:newglossary"></a>Defining New Glossaries</h2> </p><!--l. 8999--><p class="indent" > A new glossary can be defined using: -</p><!--l. 9000--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9000--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\newglossary</span><span class="cmtt-9"> </span></span><a id="dx1-68001"></a> <span @@ -18261,7 +18265,7 @@ character<a class="E">E</span>X</span></span>). </div> </p><!--l. 9021--><p class="noindent" > </p><!--l. 9023--><p class="indent" > There is also a starred version (new to v4.08): -</p><!--l. 9024--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9024--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\newglossary*</span><span class="cmtt-9"> </span></span><a id="dx1-68007"></a> <span @@ -18295,7 +18299,7 @@ class="cmitt-10">counter</span>⟩<span class="cmtt-10">]</span> </div> </div> or you can also use: -<!--l. 9032--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 9032--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\altnewglossary</span><span class="cmtt-9"> </span></span><a id="dx1-68008"></a> <span @@ -18338,7 +18342,7 @@ over all the glossaries, such as <span class="cmtt-10">\printglossaries</span><a id="dx1-68009"></a>. To define an ignored glossary, use -</p><!--l. 9046--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9046--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\newignoredglossary</span><span class="cmtt-9"> </span></span><a id="dx1-68010"></a> <span @@ -18358,7 +18362,7 @@ href="#x1-11114r38"><span class="cmtt-10">sample-entryfmt.tex</span></a> defines an ignored glossary.) </p><!--l. 9055--><p class="indent" > You can test if a glossary is an ignored one using: -</p><!--l. 9056--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9056--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifignoredglossary</span><span class="cmtt-9"> </span></span><a id="dx1-68012"></a> <span @@ -18399,7 +18403,7 @@ class="cmtt-10">acronym</span>. If you are not sure whether the <span class="cmss-10">acronym</span><a id="dx1-68015"></a> option has been used, you can identify the list of acronyms by the command -<span class="marginpar"><span +<span class="reversemarginpar"><span class="cmtt-9">\acronymtype</span><span class="cmtt-9"> </span></span><a id="dx1-68016"></a><span @@ -18511,7 +18515,7 @@ href="#glo:firstuse">first used</a> in the document. This provides a useful means to define abbreviations. For convenience, the <span class="cmss-10">glossaries </span>package defines the command: -</p><!--l. 9137--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9137--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\newacronym</span><span class="cmtt-9"> </span></span><a id="dx1-69007"></a> <span @@ -18817,7 +18821,7 @@ href="#glo:linktext">link text<a <span class="cmtt-10">\glstextformat</span><a id="dx1-69051"></a>. -</p><!--l. 9288--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9288--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\acrshort</span><span class="cmtt-9"> </span></span><a id="dx1-69052"></a> <span @@ -18842,7 +18846,7 @@ class="cmtt-10">\newacronym</span><a id="dx1-69056"></a> implicitly sets. </p><!--l. 9296--><p class="indent" > There are also analogous upper case variants: -</p><!--l. 9297--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9297--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Acrshort</span><span class="cmtt-9"> </span></span><a id="dx1-69057"></a> <span @@ -18854,7 +18858,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 9299--><p class="noindent" > -</p><!--l. 9300--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9300--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ACRshort</span><span class="cmtt-9"> </span></span><a id="dx1-69058"></a> <span @@ -18867,7 +18871,7 @@ class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 9302--><p class="noindent" > There are also plural versions: -</p><!--l. 9304--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9304--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\acrshortpl</span><span class="cmtt-9"> </span></span><a id="dx1-69059"></a> <span @@ -18879,7 +18883,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 9306--><p class="noindent" > -</p><!--l. 9307--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9307--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Acrshortpl</span><span class="cmtt-9"> </span></span><a id="dx1-69060"></a> <span @@ -18891,7 +18895,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 9309--><p class="noindent" > -</p><!--l. 9310--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9310--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ACRshortpl</span><span class="cmtt-9"> </span></span><a id="dx1-69061"></a> <span @@ -18909,7 +18913,7 @@ class="cmss-10">shortplural</span><a class="cmtt-10">\newacronym</span><a id="dx1-69063"></a> implicitly sets. -</p><!--l. 9316--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9316--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\acrlong</span><span class="cmtt-9"> </span></span><a id="dx1-69064"></a> <span @@ -18933,7 +18937,7 @@ class="cmss-10">long</span><a class="cmtt-10">\newacronym</span><a id="dx1-69067"></a> implicitly sets. </p><!--l. 9323--><p class="indent" > There are also analogous upper case variants: -</p><!--l. 9324--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9324--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Acrlong</span><span class="cmtt-9"> </span></span><a id="dx1-69068"></a> <span @@ -18945,7 +18949,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 9326--><p class="noindent" > -</p><!--l. 9327--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9327--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ACRlong</span><span class="cmtt-9"> </span></span><a id="dx1-69069"></a> <span @@ -18958,7 +18962,7 @@ class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 9329--><p class="noindent" > Again there are also plural versions: -</p><!--l. 9331--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9331--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\acrlongpl</span><span class="cmtt-9"> </span></span><a id="dx1-69070"></a> <span @@ -18970,7 +18974,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 9333--><p class="noindent" > -</p><!--l. 9334--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9334--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Acrlongpl</span><span class="cmtt-9"> </span></span><a id="dx1-69071"></a> <span @@ -18982,7 +18986,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 9336--><p class="noindent" > -</p><!--l. 9337--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9337--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ACRlongpl</span><span class="cmtt-9"> </span></span><a id="dx1-69072"></a> <span @@ -19008,7 +19012,7 @@ href="#glo:linktext">link text<a id="dx1-69075"></a></a> from the complete full form. These full-form commands have star and plus variants and optional arguments that are passed to the above commands. -</p><!--l. 9350--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9350--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\acrfull</span><span class="cmtt-9"> </span></span><a id="dx1-69076"></a> <span @@ -19021,7 +19025,7 @@ class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 9352--><p class="noindent" > This is a shortcut for -</p><!--l. 9354--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9354--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\acrfullfmt</span><span class="cmtt-9"> </span></span><a id="dx1-69077"></a> <span @@ -19059,7 +19063,7 @@ class="cmtt-10">}</span><span class="cmsy-10">}</span> </div> </div> where -<!--l. 9364--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 9364--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\acrfullformat</span><span class="cmtt-9"> </span></span><a id="dx1-69078"></a> <span @@ -19081,7 +19085,7 @@ Abbreviation Style<!--tex4ht:ref: sec:setacronymstyle --></a>) hasn’t been documented code, <span class="cmtt-10">glossaries-code.pdf</span>.) </p><!--l. 9375--><p class="indent" > There are also analogous upper case variants: -</p><!--l. 9376--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9376--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Acrfull</span><span class="cmtt-9"> </span></span><a id="dx1-69079"></a> <span @@ -19095,7 +19099,7 @@ class="cmtt-10">] </span></div><hr> </p><!--l. 9378--><p class="noindent" > -</p><!--l. 9379--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9379--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ACRfull</span><span class="cmtt-9"> </span></span><a id="dx1-69080"></a> <span @@ -19108,7 +19112,7 @@ class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 9381--><p class="noindent" > and plural versions: -</p><!--l. 9383--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9383--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\acrfullpl</span><span class="cmtt-9"> </span></span><a id="dx1-69081"></a> <span @@ -19120,7 +19124,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 9385--><p class="noindent" > -</p><!--l. 9386--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9386--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Acrfullpl</span><span class="cmtt-9"> </span></span><a id="dx1-69082"></a> <span @@ -19132,7 +19136,7 @@ class="cmtt-10">}[</span>⟨<span class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 9388--><p class="noindent" > -</p><!--l. 9389--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9389--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ACRfullpl</span><span class="cmtt-9"> </span></span><a id="dx1-69083"></a> <span @@ -19324,7 +19328,7 @@ class="tcrm-1000">§</span>9 href="#sec:glsnolink">Using Glossary Terms Without Links<!--tex4ht:ref: sec:glsnolink --></a>. </div> </p><!--l. 9433--><p class="noindent" > </p><!--l. 9435--><p class="indent" > The long form can be accessed using: -</p><!--l. 9436--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9436--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentrylong</span><span class="cmtt-9"> </span></span><a id="dx1-69120"></a> <span @@ -19333,7 +19337,7 @@ class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 9438--><p class="noindent" > or, with the first letter converted to upper case: -</p><!--l. 9440--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9440--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentrylong</span><span class="cmtt-9"> </span></span><a id="dx1-69121"></a> <span @@ -19342,7 +19346,7 @@ class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 9442--><p class="noindent" > Plural forms: -</p><!--l. 9444--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9444--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentrylongpl</span><span class="cmtt-9"> </span></span><a id="dx1-69122"></a> <span @@ -19350,7 +19354,7 @@ class="cmtt-10">\glsentrylongpl{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 9446--><p class="noindent" > -</p><!--l. 9447--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9447--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentrylongpl</span><span class="cmtt-9"> </span></span><a id="dx1-69123"></a> <span @@ -19359,7 +19363,7 @@ class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 9449--><p class="noindent" > </p><!--l. 9451--><p class="indent" > Similarly, to access the short form: -</p><!--l. 9452--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9452--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryshort</span><span class="cmtt-9"> </span></span><a id="dx1-69124"></a> <span @@ -19368,7 +19372,7 @@ class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 9454--><p class="noindent" > or, with the first letter converted to upper case: -</p><!--l. 9456--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9456--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryshort</span><span class="cmtt-9"> </span></span><a id="dx1-69125"></a> <span @@ -19377,7 +19381,7 @@ class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 9458--><p class="noindent" > Plural forms: -</p><!--l. 9460--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9460--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryshortpl</span><span class="cmtt-9"> </span></span><a id="dx1-69126"></a> <span @@ -19385,7 +19389,7 @@ class="cmtt-10">\glsentryshortpl{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 9462--><p class="noindent" > -</p><!--l. 9463--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9463--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryshortpl</span><span class="cmtt-9"> </span></span><a id="dx1-69127"></a> <span @@ -19394,7 +19398,7 @@ class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 9465--><p class="noindent" > </p><!--l. 9467--><p class="indent" > And the full form can be obtained using: -</p><!--l. 9468--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9468--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryfull</span><span class="cmtt-9"> </span></span><a id="dx1-69128"></a> <span @@ -19402,7 +19406,7 @@ class="cmtt-10">\glsentryfull{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 9470--><p class="noindent" > -</p><!--l. 9471--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9471--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryfull</span><span class="cmtt-9"> </span></span><a id="dx1-69129"></a> <span @@ -19410,7 +19414,7 @@ class="cmtt-10">\Glsentryfull{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 9473--><p class="noindent" > -</p><!--l. 9474--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9474--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryfullpl</span><span class="cmtt-9"> </span></span><a id="dx1-69130"></a> <span @@ -19420,7 +19424,7 @@ class="cmtt-10">} </span></div><hr> </p><!--l. 9476--><p class="noindent" > -</p><!--l. 9477--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9477--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryfullpl</span><span class="cmtt-9"> </span></span><a id="dx1-69131"></a> <span @@ -19438,7 +19442,7 @@ href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span cla id="sec:setacronymstyle"></a>Changing the Abbreviation Style</h3> <!--l. 9487--><p class="noindent" >It may be that the default style doesn’t suit your requirements in which case you can switch to another style using -</p><!--l. 9489--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9489--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\setacronymstyle</span><span class="cmtt-9"> </span></span><a id="dx1-70001"></a> <span @@ -19497,7 +19501,7 @@ class="cmtt-10">\genacrfullformat</span><a class="cmtt-10">\setacronymstyle </span>the <span class="cmss-10">name</span><a id="dx1-70009"></a> key is set to -</p><!--l. 9530--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9530--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\acronymentry</span><span class="cmtt-9"> </span></span><a id="dx1-70010"></a> <span @@ -19508,7 +19512,7 @@ class="cmtt-10">} </span></div><hr> and the <span class="cmss-10">sort</span><a id="dx1-70011"></a> key is set to -</p><!--l. 9534--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9534--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\acronymsort</span><span class="cmtt-9"> </span></span><a id="dx1-70012"></a> <span @@ -19530,7 +19534,7 @@ href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><sp id="sec:predefinedacrstyles"></a>Predefined Acronym Styles</h4> <!--l. 9545--><p class="noindent" >The <span class="cmss-10">glossaries </span>package provides a number of predefined styles. These styles apply -</p><!--l. 9547--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9547--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\firstacronymfont</span><span class="cmtt-9"> </span></span><a id="dx1-71001"></a> <span @@ -19539,7 +19543,7 @@ class="cmitt-10">text</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 9549--><p class="noindent" > to the short form on first use and -</p><!--l. 9551--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9551--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\acronymfont</span><span class="cmtt-9"> </span></span><a id="dx1-71002"></a> <span @@ -19682,7 +19686,7 @@ class="cmss-10">description</span><a </p><!--l. 9622--><p class="noindent" >The <span class="cmss-10">long-sp-short</span><a id="dx1-71027"></a> style was introduced in version 4.16 and uses - </p><!--l. 9624--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 9624--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsacspace</span><span class="cmtt-9"> </span></span><a id="dx1-71028"></a> <span @@ -19988,7 +19992,7 @@ href="#top">Top</a><h4 class="subsectionHead"></p><h4 class="subsectionHead"><sp class="cmss-10">glossaries</span> package don’t suit your requirements. In this case you can define your own style using: -</p><!--l. 9759--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9759--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\newacronymstyle</span><span class="cmtt-9"> </span></span><a id="dx1-72001"></a> <span @@ -20079,7 +20083,7 @@ class="cmti-10">definitions</span>⟩. </p><!--l. 9793--><p class="indent" > Within <span class="cmtt-10">\newacronymstyle</span>’s ⟨<span class="cmti-10">definitions</span>⟩ argument you can also redefine -</p><!--l. 9795--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9795--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GenericAcronymFields</span><span class="cmtt-9"> </span></span><a id="dx1-72022"></a> <span @@ -20088,16 +20092,16 @@ class="cmtt-10">\GenericAcronymFields </span></div><hr> This is a list of additional fields to be set in <span class="cmtt-10">\newacronym</span><a id="dx1-72023"></a>. You can use the following token -registers to access the entry label, long form and short form: <span class="marginpar"><span +registers to access the entry label, long form and short form: <span class="reversemarginpar"><span class="cmtt-9">\glslabeltok</span><span class="cmtt-9"> </span></span><a id="dx1-72024"></a><span class="cmtt-10">\glslabeltok</span>, -<span class="marginpar"><span +<span class="reversemarginpar"><span class="cmtt-9">\glslongtok</span><span class="cmtt-9"> </span></span><a id="dx1-72025"></a><span -class="cmtt-10">\glslongtok </span>and <span class="marginpar"><span +class="cmtt-10">\glslongtok </span>and <span class="reversemarginpar"><span class="cmtt-9">\glsshorttok</span><span class="cmtt-9"> </span></span><a id="dx1-72026"></a><span @@ -20132,7 +20136,7 @@ style does: </p><!--l. 9816--><p class="indent" > It may be that you want to define a new acronym style that’s based on an existing style. Within ⟨<span class="cmti-10">display</span>⟩ you can use -</p><!--l. 9818--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9818--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GlsUseAcrEntryDispStyle</span><span class="cmtt-9"> </span></span><a id="dx1-72031"></a> <span @@ -20145,7 +20149,7 @@ class="cmti-10">display</span>⟩ definition from the style given by ɾ class="cmti-10">style name</span>⟩. Within ⟨<span class="cmti-10">definitions</span>⟩ you can use -</p><!--l. 9823--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 9823--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\GlsUseAcrStyleDefs</span><span class="cmtt-9"> </span></span><a id="dx1-72032"></a> <span @@ -20180,7 +20184,7 @@ class="cmti-10">definitions</span>⟩):  <br />  \renewcommand*{\acrpluralsuffix}{\glstextup{\glspluralsuffix}}%  <br />} </div> -<!--l. 9842--><p class="nopar" > (<span class="marginpar"><span +<!--l. 9842--><p class="nopar" > (<span class="reversemarginpar"><span class="cmtt-9">\glstextup</span><span class="cmtt-9"> </span></span><a id="dx1-72035"></a><span @@ -21104,7 +21108,7 @@ package<span class="footnote-mark"><a href="#fn1x13" id="fn1x13-bk"><sup class="textsuperscript">13.1</sup></a></span><a id="x1-74003f1"></a> provides the command: -</p><!--l. 10434--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10434--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\oldacronym</span><span class="cmtt-9"> </span></span><a id="dx1-74004"></a> <span @@ -21315,7 +21319,7 @@ class="cmss-10">text</span><a id="dx1-75002"></a> key, even though you haven’t used the glossary entry. The former can be achieved by one of the following commands: -</p><!--l. 10513--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10513--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsreset</span><span class="cmtt-9"> </span></span><a id="dx1-75003"></a> <span @@ -21323,7 +21327,7 @@ class="cmtt-10">\glsreset{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 10515--><p class="noindent" > -</p><!--l. 10516--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10516--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glslocalreset</span><span class="cmtt-9"> </span></span><a id="dx1-75004"></a> <span @@ -21332,7 +21336,7 @@ class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 10518--><p class="noindent" > while the latter can be achieved by one of the following commands: -</p><!--l. 10520--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10520--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsunset</span><span class="cmtt-9"> </span></span><a id="dx1-75005"></a> <span @@ -21340,7 +21344,7 @@ class="cmtt-10">\glsunset{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 10522--><p class="noindent" > -</p><!--l. 10523--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10523--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glslocalunset</span><span class="cmtt-9"> </span></span><a id="dx1-75006"></a> <span @@ -21349,7 +21353,7 @@ class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 10525--><p class="noindent" > You can also reset or unset all entries for a given glossary or list of glossaries using: -</p><!--l. 10528--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10528--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsresetall</span><span class="cmtt-9"> </span></span><a id="dx1-75007"></a> <span @@ -21357,7 +21361,7 @@ class="cmtt-10">\glsresetall[</span>⟨<span class="cmitt-10">glossary list</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 10530--><p class="noindent" > -</p><!--l. 10531--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10531--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glslocalresetall</span><span class="cmtt-9"> </span></span><a id="dx1-75008"></a> <span @@ -21365,7 +21369,7 @@ class="cmtt-10">\glslocalresetall[</span>⟨<span class="cmitt-10">glossary list</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 10533--><p class="noindent" > -</p><!--l. 10534--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10534--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsunsetall</span><span class="cmtt-9"> </span></span><a id="dx1-75009"></a> <span @@ -21373,7 +21377,7 @@ class="cmtt-10">\glsunsetall[</span>⟨<span class="cmitt-10">glossary list</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 10536--><p class="noindent" > -</p><!--l. 10537--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10537--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glslocalunsetall</span><span class="cmtt-9"> </span></span><a id="dx1-75010"></a> <span @@ -21394,7 +21398,7 @@ main glossary and the list of acronyms: <!--l. 10547--><p class="nopar" > </p><!--l. 10549--><p class="indent" > You can determine whether an entry’s <a href="#glo:firstuseflag">first use flag</a> is set using: -</p><!--l. 10550--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10550--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglsused</span><span class="cmtt-9"> </span></span><a id="dx1-75011"></a> <span @@ -21537,7 +21541,7 @@ class="cmtt-10">\newacronym</span><a command. </div> </p><!--l. 10660--><p class="noindent" > </p><!--l. 10662--><p class="indent" > To enable this function, use -</p><!--l. 10663--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10663--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsenableentrycount</span><span class="cmtt-9"> </span></span><a id="dx1-76003"></a> <span @@ -21574,7 +21578,7 @@ class="cmss-10">document</span><a </p><!--l. 10682--><p class="indent" > You can access these fields using -</p><!--l. 10683--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10683--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentrycurrcount</span><span class="cmtt-9"> </span></span><a id="dx1-76006"></a> <span @@ -21584,7 +21588,7 @@ class="cmtt-10">} </span></div><hr> </p><!--l. 10685--><p class="noindent" > for the <span class="cmtt-10">currcount </span>field, and -</p><!--l. 10687--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10687--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryprevcount</span><span class="cmtt-9"> </span></span><a id="dx1-76007"></a> <span @@ -21642,7 +21646,7 @@ run. </p><!--l. 10724--><p class="indent" > When you enable the entry count using <span class="cmtt-10">\glsenableentrycount</span>, you also enable the following commands: -</p><!--l. 10726--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10726--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\cgls</span><span class="cmtt-9"> </span></span><a id="dx1-76008"></a> <span @@ -21655,7 +21659,7 @@ class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 10728--><p class="noindent" > (no case-change, singular) -</p><!--l. 10730--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10730--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\cglspl</span><span class="cmtt-9"> </span></span><a id="dx1-76009"></a> <span @@ -21668,7 +21672,7 @@ class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 10732--><p class="noindent" > (no case-change, plural) -</p><!--l. 10734--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10734--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\cGls</span><span class="cmtt-9"> </span></span><a id="dx1-76010"></a> <span @@ -21681,7 +21685,7 @@ class="cmitt-10">insert</span>⟩<span class="cmtt-10">] </span></div><hr> </p><!--l. 10736--><p class="noindent" > (first letter uppercase, singular), and -</p><!--l. 10738--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10738--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\cGlspl</span><span class="cmtt-9"> </span></span><a id="dx1-76011"></a> <span @@ -21736,7 +21740,7 @@ class="cmtt-10">\cgls</span>, <span class="cmtt-10">\cglspl</span>, <span class="cmtt-10">\cGls </span>or <span class="cmtt-10">\cGlspl</span>. -<!--l. 10760--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 10760--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\cglsformat</span><span class="cmtt-9"> </span></span><a id="dx1-76012"></a> <span @@ -21765,7 +21769,7 @@ class="cmtt-10">}</span>⟨<span class="cmitt-10">insert</span>⟩ </div> </div> otherwise. -<!--l. 10774--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 10774--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\cglsplformat</span><span class="cmtt-9"> </span></span><a id="dx1-76013"></a> <span @@ -21794,7 +21798,7 @@ class="cmtt-10">}</span>⟨<span class="cmitt-10">insert</span>⟩ </div> </div> otherwise. -<!--l. 10788--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 10788--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\cGlsformat</span><span class="cmtt-9"> </span></span><a id="dx1-76014"></a> <span @@ -21825,7 +21829,7 @@ class="cmtt-10">}</span>⟨<span class="cmitt-10">insert</span>⟩ </div> </div> otherwise. -<!--l. 10801--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +<!--l. 10801--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\cGlsplformat</span><span class="cmtt-9"> </span></span><a id="dx1-76015"></a> <span @@ -21963,7 +21967,7 @@ class="cmtt-10">\printglossary</span><a href="#option2">2</a> and <a href="#option3">3</a>) or using the command: -</p><!--l. 10888--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 10888--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\setglossarystyle</span><span class="cmtt-9"> </span></span><a id="dx1-77004"></a> <span @@ -22228,12 +22232,12 @@ class="td11"> </td></tr></table></div> </div><hr class="endfloat" /> </div> <!--l. 10969--><p class="indent" > The tabular-like styles that allow multi-line descriptions and page lists use the length -<span class="marginpar"><span +<span class="reversemarginpar"><span class="cmtt-9">\glsdescwidth</span><span class="cmtt-9"> </span></span><a id="dx1-78016"></a><span class="cmtt-10">\glsdescwidth </span>to set the width of the description column and the -length <span class="marginpar"><span +length <span class="reversemarginpar"><span class="cmtt-9">\glspagelistwidth</span><span class="cmtt-9"> </span></span><a id="dx1-78017"></a><span @@ -22330,7 +22334,7 @@ class="cmtt-10">\glsgroupskip</span>. class="cmss-10">listdotted</span><a id="dx1-78038"></a> style use the command -</p><!--l. 11027--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11027--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glspostdescription</span><span class="cmtt-9"> </span></span><a id="dx1-78039"></a> <span @@ -22446,7 +22450,7 @@ class="cmss-10">listgroup</span><a class="E">E</span>X</span></span> to ensure the group information is up to date. In the navigation line, each group is separated by - <!--l. 11086--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 11086--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glshypernavsep</span><span class="cmtt-9"> </span></span><a id="dx1-79021"></a> <span @@ -22467,7 +22471,7 @@ class="cmtt-10">\item</span><a id="dx1-79022"></a> instead of after it to prevent a spurious space at the start. This can cause a problem if the navigation line is too long. As from v4.22, if you need to adjust this, you can redefine - </p><!--l. 11100--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 11100--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glslistnavigationitem</span><span class="cmtt-9"> </span></span><a id="dx1-79023"></a> <span @@ -22552,7 +22556,7 @@ class="cmtt-10">\item[]</span></span></span>, followed by the name followed by a href="#glo:numberlist">number list<a id="dx1-79038"></a></a> and the symbol. The length - <!--l. 11139--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 11139--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glslistdottedwidth</span><span class="cmtt-9"> </span></span><a id="dx1-79039"></a> <span @@ -23059,7 +23063,7 @@ is checked by these styles.) class="cmss-10">longtable</span><a id="dx1-82021"></a><a id="dx1-82022"></a> behaviour with: -</p><!--l. 11388--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11388--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsrestoreLToutput</span><span class="cmtt-9"> </span></span><a id="dx1-82023"></a> <span @@ -23535,7 +23539,7 @@ class="cmss-10">nostyles</span><a id="dx1-85003"></a> package options. </p><!--l. 11619--><p class="indent" > These styles all format the entry name using: -</p><!--l. 11620--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11620--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glstreenamefmt</span><span class="cmtt-9"> </span></span><a id="dx1-85004"></a> <span @@ -23556,7 +23560,7 @@ class="cmtt-10">\glstreenamefont </span>may be counteracted by another font chan class="cmtt-10">\glsnamefont </span>(or in <span class="cmtt-10">\acronymfont</span>). The tree-like styles that also display the header use -</p><!--l. 11628--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11628--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glstreegroupheaderfmt</span><span class="cmtt-9"> </span></span><a id="dx1-85006"></a> <span @@ -23572,7 +23576,7 @@ display navigation links to the groups (such as <span class="cmss-10">indexhypergroup</span><a id="dx1-85007"></a>), format the navigation line using -</p><!--l. 11635--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11635--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glstreenavigationfmt</span><span class="cmtt-9"> </span></span><a id="dx1-85008"></a> <span @@ -23596,7 +23600,7 @@ class="cmtt-10">\item</span>. class="cmss-10">alttree</span><a id="dx1-85010"></a> style (and those derived from it), the space before the description for top-level entries is produced with -</p><!--l. 11645--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11645--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glstreepredesc</span><span class="cmtt-9"> </span></span><a id="dx1-85011"></a> <span @@ -23610,7 +23614,7 @@ class="cmss-10">treenoname</span><a class="cmss-10">alttree</span><a id="dx1-85013"></a> styles (and those derived from them), the space before the description for child entries is produced with -</p><!--l. 11654--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11654--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glstreechildpredesc</span><span class="cmtt-9"> </span></span><a id="dx1-85014"></a> <span @@ -23640,21 +23644,21 @@ class="cmss-10">index</span><a class="cmtt-10">\indexspace</span><a id="dx1-85018"></a>. <!--l. 11676--><p class="noindent" >Each main level item is started with - </p><!--l. 11677--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 11677--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glstreeitem</span><span class="cmtt-9"> </span></span><a id="dx1-85019"></a> <span class="cmtt-10">\glstreeitem </span></div><hr> </p><!--l. 11679--><p class="noindent" > The level 1 entries are started with - </p><!--l. 11681--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 11681--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glstreesubitem</span><span class="cmtt-9"> </span></span><a id="dx1-85020"></a> <span class="cmtt-10">\glstreesubitem </span></div><hr> </p><!--l. 11683--><p class="noindent" > </p><!--l. 11685--><p class="noindent" >The level 2 entries are started with - </p><!--l. 11686--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 11686--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glstreesubsubitem</span><span class="cmtt-9"> </span></span><a id="dx1-85021"></a> <span @@ -23729,7 +23733,7 @@ class="cmtt-10">makeindex</span><a href="#glo:xindy"><span class="cmtt-10">xindy</span><a id="dx1-85032"></a></a> if you want - more than three levels.) Each sub-level is indented by <span class="marginpar"><span + more than three levels.) Each sub-level is indented by <span class="reversemarginpar"><span class="cmtt-9">\glstreeindent</span><span class="cmtt-9"> </span></span><a id="dx1-85033"></a><span @@ -23803,7 +23807,7 @@ class="cmss-10">alttree</span><a class="cmss-10">tree</span><a id="dx1-85048"></a> style except that the indentation for each level is determined by the width of the text specified by - <!--l. 11754--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + <!--l. 11754--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glssetwidest</span><span class="cmtt-9"> </span></span><a id="dx1-85049"></a> <span @@ -23823,7 +23827,7 @@ class="cmti-10">level</span>⟩ is omitted, 0 is </p><!--l. 11763--><p class="noindent" >As from v4.22, the <span class="cmss-10">glossary-tree</span><a id="dx1-85050"></a> package also provides - </p><!--l. 11764--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 11764--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsfindwidesttoplevelname</span><span class="cmtt-9"> </span></span><a id="dx1-85051"></a> <span @@ -23870,7 +23874,7 @@ class="cmss-10">glossary-mcols</span><a </p><!--l. 11798--><p class="noindent" >The name is placed inside a left-aligned <span class="cmtt-10">\makebox</span>. As from v4.19, this can now be adjusted by redefining - </p><!--l. 11800--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span + </p><!--l. 11800--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glstreenamebox</span><span class="cmtt-9"> </span></span><a id="dx1-85054"></a> <span @@ -23969,7 +23973,7 @@ class="cmtt-10">\setglossarystyle</span><a id="dx1-86014"></a>. </div> </p><!--l. 11844--><p class="noindent" > </p><!--l. 11846--><p class="indent" > The default number of columns is 2, but can be changed by redefining -</p><!--l. 11847--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11847--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsmcols</span><span class="cmtt-9"> </span></span><a id="dx1-86015"></a> <span @@ -24173,7 +24177,7 @@ class="cmtt-10">\setglossarystyle</span><a </p><!--l. 11920--><p class="indent" > The <span class="cmss-10">inline</span><a id="dx1-87007"></a> style is governed by the following: -</p><!--l. 11921--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11921--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsinlineseparator</span><span class="cmtt-9"> </span></span><a id="dx1-87008"></a> <span @@ -24182,7 +24186,7 @@ class="cmtt-10">\glsinlineseparator</span><a </p><!--l. 11923--><p class="noindent" > This defaults to “<span class="cmtt-10">; </span>” and is used between main (i.e. level 0) entries. -</p><!--l. 11926--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11926--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsinlinesubseparator</span><span class="cmtt-9"> </span></span><a id="dx1-87010"></a> <span @@ -24191,7 +24195,7 @@ class="cmtt-10">\glsinlinesubseparator</span><a </p><!--l. 11928--><p class="noindent" > This defaults to “<span class="cmtt-10">, </span>” and is used between sub-entries. -</p><!--l. 11931--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11931--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsinlineparentchildseparator</span><span class="cmtt-9"> </span></span><a id="dx1-87012"></a> <span @@ -24200,7 +24204,7 @@ class="cmtt-10">\glsinlineparentchildseparator</span><a </p><!--l. 11933--><p class="noindent" > This defaults to “<span class="cmtt-10">: </span>” and is used between a parent main entry and its first sub-entry. -</p><!--l. 11936--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11936--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glspostinline</span><span class="cmtt-9"> </span></span><a id="dx1-87014"></a> <span @@ -24209,7 +24213,7 @@ class="cmtt-10">\glspostinline</span><a </p><!--l. 11938--><p class="noindent" > This defaults to “<span class="cmtt-10">; </span>” and is used at the end of the glossary. -</p><!--l. 11941--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11941--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsinlinenameformat</span><span class="cmtt-9"> </span></span><a id="dx1-87016"></a> <span @@ -24239,7 +24243,7 @@ example, if you want the name to appear in smallcaps: \renewcommand*{\glsinlinenameformat}[2]{\glstarget{#1}{\textsc{#2}}} </div> <!--l. 11951--><p class="nopar" > Sub-entry names are formatted according to -</p><!--l. 11953--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11953--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsinlinesubnameformat</span><span class="cmtt-9"> </span></span><a id="dx1-87017"></a> <span @@ -24257,7 +24261,7 @@ class="cmtt-10">{}</span></span></span> so the sub-entry name is ignored. </p><!--l. 11959--><p class="indent" > If the description has been suppressed (according to <span class="cmtt-10">\ifglsdescsuppressed</span>) then -</p><!--l. 11961--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11961--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsinlineemptydescformat</span><span class="cmtt-9"> </span></span><a id="dx1-87018"></a> <span @@ -24270,7 +24274,7 @@ class="cmtt-10">}</span> </p><!--l. 11963--><p class="noindent" > (which defaults to nothing) is used, otherwise the description is formatted according to -</p><!--l. 11966--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11966--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsinlinedescformat</span><span class="cmtt-9"> </span></span><a id="dx1-87019"></a> <span @@ -24299,7 +24303,7 @@ used instead. </div> <!--l. 11979--><p class="nopar" > </p><!--l. 11981--><p class="indent" > The sub-entry description is formatted according to: -</p><!--l. 11982--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11982--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsinlinesubdescformat</span><span class="cmtt-9"> </span></span><a id="dx1-87020"></a> <span @@ -24322,7 +24326,7 @@ href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span cla id="sec:newglossarystyle"></a>Defining your own glossary style</h3> <!--l. 11991--><p class="noindent" >If the predefined styles don’t fit your requirements, you can define your own style using: -</p><!--l. 11993--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 11993--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\newglossarystyle</span><span class="cmtt-9"> </span></span><a id="dx1-88001"></a> <span @@ -24337,7 +24341,7 @@ class="cmti-10">name</span>⟩ is the name of the new glossary style (to be class="cmtt-10">\setglossarystyle</span>). The second argument ⟨<span class="cmti-10">definitions</span>⟩ needs to redefine all of the following: -</p><!--l. 12000--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12000--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">theglossary</span><span class="cmtt-9"> </span></span><a id="dx1-88002"></a><a @@ -24366,7 +24370,7 @@ end the <span class="cmss-10">description</span><a id="dx1-88013"></a><a id="dx1-88014"></a> environment. -</p><!--l. 12011--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12011--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glossaryheader</span><span class="cmtt-9"> </span></span><a id="dx1-88015"></a> <span @@ -24386,7 +24390,7 @@ class="cmss-10">longheader</span><a id="dx1-88019"></a> glossary style redefines <span class="cmtt-10">\glossaryheader </span>to do a header row. -</p><!--l. 12021--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12021--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsgroupheading</span><span class="cmtt-9"> </span></span><a id="dx1-88020"></a> <span @@ -24418,7 +24422,7 @@ settings. class="cmtt-10">\glsgroupheading </span>is a label <span class="cmti-10">not </span>the group title. The group title can be obtained via -</p><!--l. 12037--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12037--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsgetgrouptitle</span><span class="cmtt-9"> </span></span><a id="dx1-88026"></a> <span @@ -24455,7 +24459,7 @@ class="cmti-10">label</span>⟩. You can redefine <span class="cmtt-10">\glsgetgrouptitle </span>if this is unsuitable for your document. </p><!--l. 12053--><p class="indent" > A navigation hypertarget can be created using -</p><!--l. 12054--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12054--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsnavhypertarget</span><span class="cmtt-9"> </span></span><a id="dx1-88030"></a> <span @@ -24467,7 +24471,7 @@ class="cmtt-10">} </span></div><hr> </p><!--l. 12056--><p class="noindent" > This typically requires <span class="cmtt-10">\glossaryheader </span>to be redefined to use -</p><!--l. 12058--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12058--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsnavigation</span><span class="cmtt-9"> </span></span><a id="dx1-88031"></a> <span @@ -24498,7 +24502,7 @@ class="cmtt-10">\newglossarystyle</span><a must use <span class="obeylines-h"><span class="verb"><span class="cmtt-10">##1</span></span></span> instead of <span class="obeylines-h"><span class="verb"><span class="cmtt-10">#1</span></span></span> etc.) -</p><!--l. 12077--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12077--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsgroupskip</span><span class="cmtt-9"> </span></span><a id="dx1-88034"></a> <span @@ -24518,7 +24522,7 @@ row. class="cmss-10">nogroupskip</span><a id="dx1-88037"></a> can be used to suppress this default gap for the predefined styles. -</p><!--l. 12089--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12089--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glossentry</span><span class="cmtt-9"> </span></span><a id="dx1-88038"></a> <span @@ -24564,7 +24568,7 @@ class="tcrm-1000">§</span>9 </a><a href="#sec:glsnolink">Using Glossary Terms Without Links<!--tex4ht:ref: sec:glsnolink --></a> for further details.) You can also use the following commands: -</p><!--l. 12102--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12102--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryitem</span><span class="cmtt-9"> </span></span><a id="dx1-88045"></a> <span @@ -24582,7 +24586,7 @@ called by <span class="cmtt-10">\glossentry </span>before <span class="cmtt-10">\glstarget</span>. The format of the counter is controlled by the macro -</p><!--l. 12110--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12110--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentrycounterlabel</span><span class="cmtt-9"> </span></span><a id="dx1-88048"></a> <span @@ -24592,7 +24596,7 @@ class="cmtt-10">\glsentrycounterlabel </span></div><hr> relevant line in the glossary. Your new glossary style must therefore redefine <span class="cmtt-10">\glossentry </span>to set the appropriate target. This is done using -</p><!--l. 12119--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12119--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glstarget</span><span class="cmtt-9"> </span></span><a id="dx1-88049"></a> <span @@ -24681,7 +24685,7 @@ style, you don’t need to worry about whether the user has specified the <s class="cmss-10">nonumberlist</span><a id="dx1-88061"></a> package option. -</p><!--l. 12156--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12156--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\subglossentry</span><span class="cmtt-9"> </span></span><a id="dx1-88062"></a> <span @@ -24699,7 +24703,7 @@ This must be an integer from 1 (first sub-level) onwards. The remaining argument analogous to those for <span class="cmtt-10">\glossentry</span><a id="dx1-88063"></a> described above. -</p><!--l. 12165--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12165--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glssubentryitem</span><span class="cmtt-9"> </span></span><a id="dx1-88064"></a> <span @@ -24716,7 +24720,7 @@ class="cmtt-10">\subglossentry </span>before <span class="cmtt-10">\glstarget</span><a id="dx1-88066"></a>. The format of the counter is controlled by the macro -</p><!--l. 12173--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12173--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glssubentrycounterlabel</span><span class="cmtt-9"> </span></span><a id="dx1-88067"></a> <span @@ -24727,7 +24731,7 @@ class="cmtt-10">\printglossary</span><a id="dx1-88068"></a> (which <span class="cmtt-10">\printglossaries</span><a id="dx1-88069"></a> calls) sets -</p><!--l. 12179--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12179--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\currentglossary</span><span class="cmtt-9"> </span></span><a id="dx1-88070"></a> <span @@ -24738,10 +24742,10 @@ the glossary type. </p><!--l. 12185--><p class="indent" > For further details of these commands, see “Displaying the glossary” in the documented code (<span class="cmtt-10">glossaries-code.pdf</span>). -<a - id="x1-88071r27"></a> +<a + id="x1-88071r27"></a> </p><!--l. 12189--><p class="noindent" ><span class="cmbx-12">Example 27</span><span class="cmbx-12"> (Creating a completely new style)</span><a @@ -24987,7 +24991,7 @@ class="tcrm-1000">§</span>2.7.2 of “<span class="LATEX">L<span class= class="E">E</span>X</span></span> for Administrative Work”</a>.) </div> </p><!--l. 12347--><p class="noindent" > -</p><!--l. 12349--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12349--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\forallglossaries</span><span class="cmtt-9"> </span></span><a id="dx1-90001"></a> <span @@ -25008,7 +25012,7 @@ class="cmti-10">body</span>⟩ is performed. If ⟨<span class="cmti-10">glossary list</span>⟩ is omitted, the default is to iterate over all glossaries (except the ignored ones). -</p><!--l. 12359--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12359--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\forallacronyms</span><span class="cmtt-9"> </span></span><a id="dx1-90002"></a> <span @@ -25028,7 +25032,7 @@ class="cmss-10">acronymlists</span><a This command doesn’t have an optional argument. If you want to explicitly say which lists to iterate over, just use the optional argument of <span class="cmtt-10">\forallglossaries</span>. -</p><!--l. 12369--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12369--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\forglsentries</span><span class="cmtt-9"> </span></span><a id="dx1-90005"></a> <span @@ -25050,7 +25054,7 @@ class="cmti-10">glossary label</span>⟩ is omitted, <span class="cmtt-10">\glsdefaulttype</span><a id="dx1-90006"></a> (usually the main glossary) is used. -</p><!--l. 12378--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12378--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\forallglsentries</span><span class="cmtt-9"> </span></span><a id="dx1-90007"></a> <span @@ -25081,7 +25085,7 @@ class="cmti-10">body</span>⟩.) <!--l. 12389--><p class="noindent" ><a href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">16.2 </span> <a id="sec:conditionals"></a>Conditionals</h3> -<!--l. 12392--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +<!--l. 12392--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglossaryexists</span><span class="cmtt-9"> </span></span><a id="dx1-91001"></a> <span @@ -25097,7 +25101,7 @@ class="cmti-10">label</span>⟩ exists. If it does ⟨<span class="cmti-10">true part</span>⟩ is performed, otherwise ⟨<span class="cmti-10">false part</span>⟩. -</p><!--l. 12399--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12399--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglsentryexists</span><span class="cmtt-9"> </span></span><a id="dx1-91002"></a> <span @@ -25123,7 +25127,7 @@ href="#sec:techissues"><span class="tcrm-1000">§</span>4.8.1 </a><a href="#sec:techissues">Technical Issues<!--tex4ht:ref: sec:techissues --></a> for further details.) -</p><!--l. 12412--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12412--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsdoifexists</span><span class="cmtt-9"> </span></span><a id="dx1-91005"></a> <span @@ -25138,7 +25142,7 @@ class="cmti-10">code</span>⟩ if the entry given by ⟨<span class="cmti-10">label</span>⟩ exists. If it doesn’t exist, an error is generated. (This command uses <span class="cmtt-10">\ifglsentryexists</span>.) -</p><!--l. 12419--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12419--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsdoifnoexists</span><span class="cmtt-9"> </span></span><a id="dx1-91006"></a> <span @@ -25151,7 +25155,7 @@ class="cmtt-10">} </span></div><hr> Does the reverse of <span class="cmtt-10">\glsdoifexists</span>. (This command uses <span class="cmtt-10">\ifglsentryexists</span>.) -</p><!--l. 12425--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12425--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsdoifexistsorwarn</span><span class="cmtt-9"> </span></span><a id="dx1-91007"></a> <span @@ -25164,7 +25168,7 @@ class="cmtt-10">} </span></div><hr> As <span class="cmtt-10">\glsdoifexists </span>but issues a warning rather than an error if the entry doesn’t exist. -</p><!--l. 12431--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12431--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsdoifexistsordo</span><span class="cmtt-9"> </span></span><a id="dx1-91008"></a> <span @@ -25182,7 +25186,7 @@ class="cmti-10">label</span>⟩ exists otherwise generate an error and do & class="cmti-10">else</span> <span class="cmti-10">code</span>⟩. -</p><!--l. 12437--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12437--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsdoifnoexistsordo</span><span class="cmtt-9"> </span></span><a id="dx1-91009"></a> <span @@ -25200,7 +25204,7 @@ class="cmti-10">label</span>⟩ doesn’t exist otherwise generate an e class="cmti-10">else</span> <span class="cmti-10">code</span>⟩. -</p><!--l. 12443--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12443--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglsused</span><span class="cmtt-9"> </span></span><a id="dx1-91010"></a> <span @@ -25213,7 +25217,7 @@ See <a href="#sec:glsunset"><span class="tcrm-1000">§</span>14 </a><a href="#sec:glsunset">Unsetting and Resetting Entry Flags<!--tex4ht:ref: sec:glsunset --></a>. -</p><!--l. 12449--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12449--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglshaschildren</span><span class="cmtt-9"> </span></span><a id="dx1-91011"></a> <span @@ -25227,7 +25231,7 @@ class="cmti-10">label</span>⟩ has any sub-entries. If it does, ⟨<s class="cmti-10">true part</span>⟩ is performed, otherwise ⟨<span class="cmti-10">false part</span>⟩. -</p><!--l. 12457--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12457--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglshasparent</span><span class="cmtt-9"> </span></span><a id="dx1-91012"></a> <span @@ -25241,7 +25245,7 @@ class="cmti-10">label</span>⟩ has a parent entry. If it does, ⟨<sp class="cmti-10">true part</span>⟩ is performed, otherwise ⟨<span class="cmti-10">false part</span>⟩. -</p><!--l. 12465--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12465--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglshassymbol</span><span class="cmtt-9"> </span></span><a id="dx1-91013"></a> <span @@ -25260,7 +25264,7 @@ class="cmss-10">symbol</span><a class="cmti-10">true part</span>⟩ is performed, otherwise ⟨<span class="cmti-10">false part</span>⟩. -</p><!--l. 12472--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12472--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglshaslong</span><span class="cmtt-9"> </span></span><a id="dx1-91015"></a> <span @@ -25285,7 +25289,7 @@ class="cmti-10">false part</span>⟩. This should be true for any entry tha class="cmtt-10">\newacronym</span><a id="dx1-91017"></a>. There is no check for the existence of ⟨<span class="cmti-10">label</span>⟩. -</p><!--l. 12481--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12481--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglshasshort</span><span class="cmtt-9"> </span></span><a id="dx1-91018"></a> <span @@ -25308,7 +25312,7 @@ class="cmti-10">false part</span>⟩. This should be true for any entry tha class="cmtt-10">\newacronym</span><a id="dx1-91020"></a>. There is no check for the existence of ⟨<span class="cmti-10">label</span>⟩. -</p><!--l. 12490--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12490--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglshasdesc</span><span class="cmtt-9"> </span></span><a id="dx1-91021"></a> <span @@ -25327,7 +25331,7 @@ class="cmti-10">label</span>⟩. If it has, ⟨<span class="cmti-10">true part</span>⟩ is performed, otherwise ⟨<span class="cmti-10">false part</span>⟩. Compare with: -</p><!--l. 12496--><p class="noindent" ><hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12496--><p class="noindent" ><hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglsdescsuppressed</span><span class="cmtt-9"> </span></span><a id="dx1-91023"></a> <span @@ -25352,7 +25356,7 @@ class="cmti-10">false part</span>⟩. There is no check for the existence of ⟨<span class="cmti-10">label</span>⟩. </p><!--l. 12504--><p class="noindent" >For all other fields you can use: -</p><!--l. 12505--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12505--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglshasfield</span><span class="cmtt-9"> </span></span><a id="dx1-91026"></a> <span @@ -25381,7 +25385,7 @@ class="cmtt-10">\ifglshasshort</span>, an error occurs if the entry is undefined. </p><!--l. 12517--><p class="indent" > As from version 4.23, within ⟨<span class="cmti-10">true part</span>⟩ you can use -</p><!--l. 12518--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12518--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glscurrentfieldvalue</span><span class="cmtt-9"> </span></span><a id="dx1-91027"></a> <span @@ -25403,7 +25407,7 @@ class="cmss-10">user1</span><a whose label is <span class="cmtt-10">sample</span>. </p><!--l. 12532--><p class="indent" > You can test if the value of the field is equal to a given string using: -</p><!--l. 12534--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12534--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglsfieldeq</span><span class="cmtt-9"> </span></span><a id="dx1-91029"></a> <span @@ -25509,7 +25513,7 @@ class="cmtt-10">\foo</span>” with “<span class="cmtt-10">\foo</span>”). </p><!--l. 12622--><p class="indent" > You can test if the value of a field is equal to the replacement text of a command using: -</p><!--l. 12624--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12624--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglsfielddefeq</span><span class="cmtt-9"> </span></span><a id="dx1-91032"></a> <span @@ -25586,7 +25590,7 @@ class="cmtt-10">\foo</span>” is equal to class="cmtt-10">\foo</span>”. </p><!--l. 12672--><p class="indent" > There is a similar command that requires the control sequence name (without the leading backslash) instead of the actual control sequence: -</p><!--l. 12674--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12674--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglsfieldcseq</span><span class="cmtt-9"> </span></span><a id="dx1-91034"></a> <span @@ -25614,7 +25618,7 @@ class="cmtt-10">\ifdefstrequal</span>. href="#top">Top</a><h3 class="sectionHead"></p><h3 class="sectionHead"><span class="titlemark">16.3 </span> <a id="sec:fetchset"></a>Fetching and Updating the Value of a Field</h3> <!--l. 12683--><p class="noindent" >You can fetch the value of a given field and store it in a control sequence using: -</p><!--l. 12685--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12685--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsfieldfetch</span><span class="cmtt-9"> </span></span><a id="dx1-92001"></a> <span @@ -25655,7 +25659,7 @@ class="cmti-10">label</span>⟩ and ⟨<span class="cmti-10">field</span>⟩ are as above and ⟨<span class="cmti-10">definition</span>⟩ is the new value of the field. -</p><!--l. 12706--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12706--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsfielddef</span><span class="cmtt-9"> </span></span><a id="dx1-92006"></a> <span @@ -25669,7 +25673,7 @@ class="cmtt-10">} </span></div><hr> </p><!--l. 12708--><p class="noindent" > This uses <span class="cmtt-10">\def </span>to change the value of the field (so it will be localised by any grouping). -</p><!--l. 12712--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12712--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsfieldedef</span><span class="cmtt-9"> </span></span><a id="dx1-92007"></a> <span @@ -25685,7 +25689,7 @@ This uses <span class="cmtt-10">\edef </span>to change the value of the field (so it will be localised by any grouping). Any fragile commands contained in the ⟨<span class="cmti-10">definition</span>⟩ must be protected. -</p><!--l. 12719--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12719--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsfieldgdef</span><span class="cmtt-9"> </span></span><a id="dx1-92008"></a> <span @@ -25701,7 +25705,7 @@ This uses <span class="cmtt-10">\gdef </span>to change the value of the field. -</p><!--l. 12724--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12724--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsfieldxdef</span><span class="cmtt-9"> </span></span><a id="dx1-92009"></a> <span @@ -25852,7 +25856,7 @@ href="#sec:glslink"><span class="tcrm-1000">§</span>6 </a><a href="#sec:glslink">Links to Glossary Entries<!--tex4ht:ref: sec:glslink --></a> for further details.) -</p><!--l. 12809--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12809--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\pgls</span><span class="cmtt-9"> </span></span><a id="dx1-93020"></a> <span @@ -25879,7 +25883,7 @@ class="cmti-10">label</span>⟩<span class="cmtt-10">}[</span>⟨<span class="cmti-10">insert</span>⟩<span class="cmtt-10">]</span>. -</p><!--l. 12816--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12816--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Pgls</span><span class="cmtt-9"> </span></span><a id="dx1-93023"></a> <span @@ -25917,7 +25921,7 @@ class="cmtt-10">}</span> class="cmtt-10">[</span>⟨<span class="cmti-10">insert</span>⟩<span class="cmtt-10">]</span>. -</p><!--l. 12826--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12826--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\PGLS</span><span class="cmtt-9"> </span></span><a id="dx1-93027"></a> <span @@ -25934,7 +25938,7 @@ class="cmtt-10">\pgls </span>but converts the prefix to upper case and uses <spa class="cmtt-10">\GLS</span><a id="dx1-93028"></a> instead of <span class="cmtt-10">\gls</span>. -</p><!--l. 12832--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12832--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\pglspl</span><span class="cmtt-9"> </span></span><a id="dx1-93029"></a> <span @@ -25960,7 +25964,7 @@ class="cmti-10">label</span>⟩<span class="cmtt-10">}[</span>⟨<span class="cmti-10">insert</span>⟩<span class="cmtt-10">]</span>. -</p><!--l. 12839--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12839--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Pglspl</span><span class="cmtt-9"> </span></span><a id="dx1-93032"></a> <span @@ -25998,7 +26002,7 @@ class="cmtt-10">}</span> class="cmtt-10">[</span>⟨<span class="cmti-10">insert</span>⟩<span class="cmtt-10">]</span>. -</p><!--l. 12849--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12849--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\PGLSpl</span><span class="cmtt-9"> </span></span><a id="dx1-93036"></a> <span @@ -26047,7 +26051,7 @@ class="cmtt-10">sample-prefix.tex</span></a>. </p> </p><!--l. 12870--><p class="noindent" >____________________________</p></div> <!--l. 12872--><p class="indent" > This package also provides the commands described below, none of which perform any check to determine the entry’s existence. -</p><!--l. 12875--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12875--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglshasprefix</span><span class="cmtt-9"> </span></span><a id="dx1-93040"></a> <span @@ -26066,7 +26070,7 @@ class="cmss-10">prefix</span><a id="dx1-93041"></a> key. </p><!--l. 12881--><p class="indent" > This package also provides the following commands: -</p><!--l. 12882--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12882--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglshasprefixplural</span><span class="cmtt-9"> </span></span><a id="dx1-93042"></a> <span @@ -26085,7 +26089,7 @@ class="cmti-10">label</span>⟩ has a non-empty value for the <span class="cmss-10">prefixplural</span><a id="dx1-93043"></a> key. -</p><!--l. 12888--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12888--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglshasprefixfirst</span><span class="cmtt-9"> </span></span><a id="dx1-93044"></a> <span @@ -26104,7 +26108,7 @@ class="cmti-10">label</span>⟩ has a non-empty value for the <span class="cmss-10">prefixfirst</span><a id="dx1-93045"></a> key. -</p><!--l. 12894--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12894--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\ifglshasprefixfirstplural</span><span class="cmtt-9"> </span></span><a id="dx1-93046"></a> <span @@ -26124,7 +26128,7 @@ class="cmti-10">label</span>⟩ has a non-empty value for the <span class="cmss-10">prefixfirstplural</span><a id="dx1-93047"></a> key. -</p><!--l. 12900--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12900--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryprefix</span><span class="cmtt-9"> </span></span><a id="dx1-93048"></a> <span @@ -26136,7 +26140,7 @@ Displays the value of the <span class="cmss-10">prefix</span><a id="dx1-93049"></a> key for the entry given by ⟨<span class="cmti-10">label</span>⟩. -</p><!--l. 12906--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12906--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryprefixfirst</span><span class="cmtt-9"> </span></span><a id="dx1-93050"></a> <span @@ -26150,7 +26154,7 @@ class="cmss-10">prefixfirst</span><a class="cmti-10">label</span>⟩. -</p><!--l. 12912--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12912--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryprefixplural</span><span class="cmtt-9"> </span></span><a id="dx1-93052"></a> <span @@ -26163,7 +26167,7 @@ class="cmss-10">prefixplural</span><a id="dx1-93053"></a> key for the entry given by ⟨<span class="cmti-10">label</span>⟩. (No check is performed to determine if the entry exists.) -</p><!--l. 12919--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12919--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\glsentryprefixfirstplural</span><span class="cmtt-9"> </span></span><a id="dx1-93054"></a> <span @@ -26180,7 +26184,7 @@ performed to determine if the entry exists.) case<span class="footnote-mark"><a href="#fn2x17" id="fn2x17-bk"><sup class="textsuperscript">17.2</sup></a></span><a id="x1-93056f2"></a>: -</p><!--l. 12929--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12929--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryprefix</span><span class="cmtt-9"> </span></span><a id="dx1-93057"></a> <span @@ -26188,7 +26192,7 @@ class="cmtt-10">\Glsentryprefix{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 12931--><p class="noindent" > -</p><!--l. 12932--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12932--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryprefixfirst</span><span class="cmtt-9"> </span></span><a id="dx1-93058"></a> <span @@ -26196,7 +26200,7 @@ class="cmtt-10">\Glsentryprefixfirst{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 12934--><p class="noindent" > -</p><!--l. 12935--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12935--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryprefixplural</span><span class="cmtt-9"> </span></span><a id="dx1-93059"></a> <span @@ -26204,7 +26208,7 @@ class="cmtt-10">\Glsentryprefixplural{</span>⟨<span class="cmitt-10">label</span>⟩<span class="cmtt-10">} </span></div><hr> </p><!--l. 12937--><p class="noindent" > -</p><!--l. 12939--><p class="indent" > <hr><div title="Definition"><span class="marginpar"><span +</p><!--l. 12939--><p class="indent" > <hr><div title="Definition"><span class="reversemarginpar"><span class="cmtt-9">\Glsentryprefixfirstplural</span><span class="cmtt-9"> </span></span><a id="dx1-93060"></a> <span @@ -26703,13 +26707,13 @@ href="glossaries-user.html#dx1-14034" >103</a>, <a href="glossaries-user.html#dx1-14037" >104</a>, <a href="glossaries-user.html#dx1-14040" >105</a>, <a href="glossaries-user.html#dx1-14047" >106</a>, <a -href="glossaries-user.html#dx1-23053" >107</a>, <a -href="glossaries-user.html#dx1-23058" >108</a>, <a -href="glossaries-user.html#dx1-23063" >109</a>, <a -href="glossaries-user.html#dx1-23065" >110</a>, <a -href="glossaries-user.html#dx1-23067" >111</a>, <a -href="glossaries-user.html#dx1-23072" >112</a>, <a -href="glossaries-user.html#dx1-23078" >113</a>, <a +href="glossaries-user.html#dx1-23062" >107</a>, <a +href="glossaries-user.html#dx1-23067" >108</a>, <a +href="glossaries-user.html#dx1-23072" >109</a>, <a +href="glossaries-user.html#dx1-23074" >110</a>, <a +href="glossaries-user.html#dx1-23076" >111</a>, <a +href="glossaries-user.html#dx1-23081" >112</a>, <a +href="glossaries-user.html#dx1-23087" >113</a>, <a href="glossaries-user.html#dx1-34010" >114</a>, <a href="glossaries-user.html#dx1-44012" >115</a>, <a href="glossaries-user.html#dx1-47007" >116</a>, <a @@ -27021,8 +27025,8 @@ href="glossaries-user.html#dx1-94001" >273</a>, <a href="glossaries-user.html#dx1-94033" >274</a> <br /></span> <span class="index-item"><span class="cmss-10">glossaries-babel </span>package  <a -href="glossaries-user.html#dx1-23059" >275</a>, <a -href="glossaries-user.html#dx1-23070" >276</a> <br /></span> +href="glossaries-user.html#dx1-23068" >275</a>, <a +href="glossaries-user.html#dx1-23079" >276</a> <br /></span> <span class="index-item"><span class="cmss-10">glossaries-extra </span>package  <a href="glossaries-user.html#dx1-5008" >277</a>, <a @@ -27055,7 +27059,7 @@ class="cmss-10">glossaries-extra-stylemods </span>package  <a href="glossaries-user.html#dx1-78045" >302</a> <br /></span> <span class="index-item"><span class="cmss-10">glossaries-polyglossia </span>package  <a -href="glossaries-user.html#dx1-23061" >303</a> <br /></span> +href="glossaries-user.html#dx1-23070" >303</a> <br /></span> <span class="index-item"><span class="cmss-10">glossaries-prefix </span>package  <a href="glossaries-user.html#dx1-11116" >304</a>, <a @@ -28209,7 +28213,7 @@ href="glossaries-user.html#dx1-66015" >770</a>, <a href="glossaries-user.html#dx1-66016" >771</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">hyper</span>  <a -href="glossaries-user.html#dx1-23101" >772</a>, <a +href="glossaries-user.html#dx1-23110" >772</a>, <a href="glossaries-user.html#dx1-54030" >773</a>, <a href="glossaries-user.html#dx1-54036" >774</a>, <a href="glossaries-user.html#dx1-57023" >775</a>, <a @@ -28221,7 +28225,7 @@ class="cmss-10">local</span>  <a href="glossaries-user.html#dx1-54072" >779</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glslinkcheckfirsthyperhook</span></span></span>  <a -href="glossaries-user.html#dx1-23103" ><span +href="glossaries-user.html#dx1-23112" ><span class="cmti-10">780</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glslinkpostsetkeys</span></span></span>  <a @@ -28693,7 +28697,7 @@ href="glossaries-user.html#dx1-53003" ><span class="cmti-10">896</span></a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\glswriteentry</span></span></span>  <a -href="glossaries-user.html#dx1-23116" ><span +href="glossaries-user.html#dx1-23125" ><span class="cmti-10">897</span></a> <br /></span> </p><p class="theindex"> <span class="cmbx-10">H</span> @@ -29138,13 +29142,13 @@ href="glossaries-user.html#dx1-20021" >1199</a>, <a href="glossaries-user.html#dx1-21002" >1200</a>, <a href="glossaries-user.html#dx1-21005" >1201</a>, <a href="glossaries-user.html#dx1-21013" >1202</a>, <a -href="glossaries-user.html#dx1-23046" >1203</a>, <a -href="glossaries-user.html#dx1-23049" >1204</a>, <a -href="glossaries-user.html#dx1-25008" >1205</a>, <a -href="glossaries-user.html#dx1-25063" >1206</a>, <a -href="glossaries-user.html#dx1-25065" >1207</a>, <a -href="glossaries-user.html#dx1-25070" >1208</a>, <a -href="glossaries-user.html#dx1-25073" >1209</a>, <a +href="glossaries-user.html#dx1-23044" >1203</a>, <a +href="glossaries-user.html#dx1-23046" >1204</a>, <a +href="glossaries-user.html#dx1-23055" >1205</a>, <a +href="glossaries-user.html#dx1-23058" >1206</a>, <a +href="glossaries-user.html#dx1-25008" >1207</a>, <a +href="glossaries-user.html#dx1-25061" >1208</a>, <a +href="glossaries-user.html#dx1-25064" >1209</a>, <a href="glossaries-user.html#dx1-26029" >1210</a>, <a href="glossaries-user.html#dx1-26055" >1211</a>, <a href="glossaries-user.html#dx1-26057" >1212</a>, <a @@ -29343,7 +29347,7 @@ class="cmss-10">format</span>  <a href="glossaries-user.html#dx1-54068" >1347</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">long</span>  <a -href="glossaries-user.html#dx1-23108" >1348</a>, <a +href="glossaries-user.html#dx1-23117" >1348</a>, <a href="glossaries-user.html#dx1-34128" >1349</a>, <a href="glossaries-user.html#dx1-34135" >1350</a>, <a href="glossaries-user.html#dx1-39005" >1351</a>, <a @@ -29482,8 +29486,8 @@ class="cmss-10">see</span>  <a href="glossaries-user.html#dx1-23018" >1456</a>, <a href="glossaries-user.html#dx1-23022" >1457</a>, <a href="glossaries-user.html#dx1-23023" >1458</a>, <a -href="glossaries-user.html#dx1-25080" >1459</a>, <a -href="glossaries-user.html#dx1-25084" >1460</a>, <a +href="glossaries-user.html#dx1-25071" >1459</a>, <a +href="glossaries-user.html#dx1-25075" >1460</a>, <a href="glossaries-user.html#dx1-34112" >1461</a>, <a href="glossaries-user.html#dx1-34113" >1462</a>, <a href="glossaries-user.html#dx1-34120" >1463</a>, <a @@ -29721,14 +29725,14 @@ href="glossaries-user.html#dx1-11047" >1633</a>, <a href="glossaries-user.html#dx1-11109" >1634</a>, <a href="glossaries-user.html#dx1-16006" >1635</a>, <a href="glossaries-user.html#dx1-16074" >1636</a>, <a -href="glossaries-user.html#dx1-23043" >1637</a>, <a -href="glossaries-user.html#dx1-23119" >1638</a>, <a -href="glossaries-user.html#dx1-25069" >1639</a>, <a -href="glossaries-user.html#dx1-25072" >1640</a>, <a -href="glossaries-user.html#dx1-25075" >1641</a>, <a -href="glossaries-user.html#dx1-25076" >1642</a>, <a -href="glossaries-user.html#dx1-25078" >1643</a>, <a -href="glossaries-user.html#dx1-25088" >1644</a>, <a +href="glossaries-user.html#dx1-23052" >1637</a>, <a +href="glossaries-user.html#dx1-23128" >1638</a>, <a +href="glossaries-user.html#dx1-25060" >1639</a>, <a +href="glossaries-user.html#dx1-25063" >1640</a>, <a +href="glossaries-user.html#dx1-25066" >1641</a>, <a +href="glossaries-user.html#dx1-25067" >1642</a>, <a +href="glossaries-user.html#dx1-25069" >1643</a>, <a +href="glossaries-user.html#dx1-25079" >1644</a>, <a href="glossaries-user.html#dx1-33016" >1645</a>, <a href="glossaries-user.html#dx1-33020" >1646</a>, <a href="glossaries-user.html#dx1-33021" >1647</a>, <a @@ -29862,14 +29866,14 @@ href="glossaries-user.html#dx1-29033" >1744</a>, <a href="glossaries-user.html#dx1-57005" >1745</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">counter</span>  <a -href="glossaries-user.html#dx1-25086" >1746</a>, <a +href="glossaries-user.html#dx1-25077" >1746</a>, <a href="glossaries-user.html#dx1-33017" >1747</a>, <a href="glossaries-user.html#dx1-49003" >1748</a>, <a href="glossaries-user.html#dx1-66004" >1749</a>, <a href="glossaries-user.html#dx1-66038" >1750</a> <br /></span> <span class="index-subsubitem">        <span class="cmss-10">page</span>  <a -href="glossaries-user.html#dx1-25087" >1751</a> <br /></span> +href="glossaries-user.html#dx1-25078" >1751</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">counterwithin</span>  <a href="glossaries-user.html#dx1-25010" >1752</a>, <a @@ -29925,15 +29929,15 @@ class="cmss-10">true</span>  <a href="glossaries-user.html#dx1-25011" >1784</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">esclocations</span>  <a -href="glossaries-user.html#dx1-25059" >1785</a> <br /></span> +href="glossaries-user.html#dx1-23040" >1785</a> <br /></span> <span class="index-subsubitem">        <span class="cmss-10">false</span>  <a -href="glossaries-user.html#dx1-25062" >1786</a>, <a -href="glossaries-user.html#dx1-25067" >1787</a>, <a +href="glossaries-user.html#dx1-23043" >1786</a>, <a +href="glossaries-user.html#dx1-23048" >1787</a>, <a href="glossaries-user.html#dx1-51001" >1788</a> <br /></span> <span class="index-subsubitem">        <span class="cmss-10">true</span>  <a -href="glossaries-user.html#dx1-25060" >1789</a> <br /></span> +href="glossaries-user.html#dx1-23041" >1789</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">footnote</span>  <a href="glossaries-user.html#dx1-28006" >1790</a>, <a @@ -29944,21 +29948,21 @@ href="glossaries-user.html#dx1-28024" >1794</a>, <a href="glossaries-user.html#dx1-28025" >1795</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">hyperfirst</span>  <a -href="glossaries-user.html#dx1-23088" >1796</a>, <a -href="glossaries-user.html#dx1-23098" >1797</a>, <a +href="glossaries-user.html#dx1-23097" >1796</a>, <a +href="glossaries-user.html#dx1-23107" >1797</a>, <a href="glossaries-user.html#dx1-58015" >1798</a>, <a href="glossaries-user.html#dx1-58017" >1799</a> <br /></span> <span class="index-subsubitem">        <span class="cmss-10">false</span>  <a -href="glossaries-user.html#dx1-23102" >1800</a>, <a +href="glossaries-user.html#dx1-23111" >1800</a>, <a href="glossaries-user.html#dx1-54037" >1801</a>, <a href="glossaries-user.html#dx1-58010" >1802</a>, <a href="glossaries-user.html#dx1-58013" >1803</a>, <a href="glossaries-user.html#dx1-71072" >1804</a> <br /></span> <span class="index-subsubitem">        <span class="cmss-10">true</span>  <a -href="glossaries-user.html#dx1-23089" >1805</a>, <a -href="glossaries-user.html#dx1-23093" >1806</a> <br /></span> +href="glossaries-user.html#dx1-23098" >1805</a>, <a +href="glossaries-user.html#dx1-23102" >1806</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">index</span>  <a href="glossaries-user.html#dx1-23031" >1807</a>, <a @@ -29970,12 +29974,12 @@ href="glossaries-user.html#dx1-29031" >1812</a>, <a href="glossaries-user.html#dx1-68021" >1813</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">indexonlyfirst</span>  <a -href="glossaries-user.html#dx1-23112" >1814</a>, <a -href="glossaries-user.html#dx1-23117" >1815</a>, <a +href="glossaries-user.html#dx1-23121" >1814</a>, <a +href="glossaries-user.html#dx1-23126" >1815</a>, <a href="glossaries-user.html#dx1-49009" >1816</a> <br /></span> <span class="index-subsubitem">        <span class="cmss-10">false</span>  <a -href="glossaries-user.html#dx1-23113" >1817</a> <br /></span> +href="glossaries-user.html#dx1-23122" >1817</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">kernelglossredefs</span>  <a href="glossaries-user.html#dx1-29034" >1818</a> <br /></span> @@ -29996,7 +30000,7 @@ href="glossaries-user.html#dx1-29029" >1824</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">nogroupskip</span>  <a href="glossaries-user.html#dx1-11018" >1825</a>, <a -href="glossaries-user.html#dx1-25091" >1826</a>, <a +href="glossaries-user.html#dx1-25082" >1826</a>, <a href="glossaries-user.html#dx1-63044" >1827</a>, <a href="glossaries-user.html#dx1-78009" >1828</a>, <a href="glossaries-user.html#dx1-78037" >1829</a>, <a @@ -30005,13 +30009,13 @@ href="glossaries-user.html#dx1-88037" >1831</a>, <a href="glossaries-user.html#dx1-88096" >1832</a> <br /></span> <span class="index-subsubitem">        <span class="cmss-10">false</span>  <a -href="glossaries-user.html#dx1-25092" >1833</a> <br /></span> +href="glossaries-user.html#dx1-25083" >1833</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">nohypertypes</span>  <a -href="glossaries-user.html#dx1-23084" >1834</a>, <a -href="glossaries-user.html#dx1-23091" >1835</a>, <a -href="glossaries-user.html#dx1-23092" >1836</a>, <a -href="glossaries-user.html#dx1-23099" >1837</a>, <a +href="glossaries-user.html#dx1-23093" >1834</a>, <a +href="glossaries-user.html#dx1-23100" >1835</a>, <a +href="glossaries-user.html#dx1-23101" >1836</a>, <a +href="glossaries-user.html#dx1-23108" >1837</a>, <a href="glossaries-user.html#dx1-54022" >1838</a>, <a href="glossaries-user.html#dx1-54029" >1839</a>, <a href="glossaries-user.html#dx1-57026" >1840</a>, <a @@ -30049,8 +30053,8 @@ href="glossaries-user.html#dx1-27013" >1861</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">nonumberlist</span>  <a href="glossaries-user.html#dx1-3048" >1862</a>, <a -href="glossaries-user.html#dx1-25068" >1863</a>, <a -href="glossaries-user.html#dx1-25079" >1864</a>, <a +href="glossaries-user.html#dx1-25059" >1863</a>, <a +href="glossaries-user.html#dx1-25070" >1864</a>, <a href="glossaries-user.html#dx1-34109" >1865</a>, <a href="glossaries-user.html#dx1-49002" >1866</a>, <a href="glossaries-user.html#dx1-49008" >1867</a>, <a @@ -30060,11 +30064,11 @@ href="glossaries-user.html#dx1-88059" >1870</a>, <a href="glossaries-user.html#dx1-88061" >1871</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">nopostdot</span>  <a -href="glossaries-user.html#dx1-25089" >1872</a>, <a +href="glossaries-user.html#dx1-25080" >1872</a>, <a href="glossaries-user.html#dx1-78043" >1873</a> <br /></span> <span class="index-subsubitem">        <span class="cmss-10">false</span>  <a -href="glossaries-user.html#dx1-25090" >1874</a> <br /></span> +href="glossaries-user.html#dx1-25081" >1874</a> <br /></span> <span class="index-subitem">    <span @@ -30088,7 +30092,7 @@ href="glossaries-user.html#dx1-78020" >1886</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">notranslate</span>  <a href="glossaries-user.html#dx1-14010" >1887</a>, <a -href="glossaries-user.html#dx1-23082" >1888</a>, <a +href="glossaries-user.html#dx1-23091" >1888</a>, <a href="glossaries-user.html#dx1-30014" >1889</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">notree</span>  <a @@ -30176,27 +30180,27 @@ href="glossaries-user.html#dx1-34148" >1940</a>, <a href="glossaries-user.html#dx1-63053" >1941</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">savenumberlist</span>  <a -href="glossaries-user.html#dx1-23118" >1942</a>, <a +href="glossaries-user.html#dx1-23127" >1942</a>, <a href="glossaries-user.html#dx1-62059" >1943</a> <br /></span> <span class="index-subsubitem">        <span class="cmss-10">false</span>  <a -href="glossaries-user.html#dx1-23120" >1944</a> <br /></span> +href="glossaries-user.html#dx1-23129" >1944</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">savewrites</span>  <a -href="glossaries-user.html#dx1-23040" >1945</a>, <a -href="glossaries-user.html#dx1-23042" >1946</a>, <a -href="glossaries-user.html#dx1-23048" >1947</a> <br /></span> +href="glossaries-user.html#dx1-23049" >1945</a>, <a +href="glossaries-user.html#dx1-23051" >1946</a>, <a +href="glossaries-user.html#dx1-23057" >1947</a> <br /></span> <span class="index-subsubitem">        <span class="cmss-10">false</span>  <a -href="glossaries-user.html#dx1-23041" >1948</a> <br /></span> +href="glossaries-user.html#dx1-23050" >1948</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">section</span>  <a href="glossaries-user.html#dx1-24011" >1949</a>, <a href="glossaries-user.html#dx1-63058" >1950</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">seeautonumberlist</span>  <a -href="glossaries-user.html#dx1-25077" >1951</a>, <a -href="glossaries-user.html#dx1-25083" >1952</a>, <a +href="glossaries-user.html#dx1-25068" >1951</a>, <a +href="glossaries-user.html#dx1-25074" >1952</a>, <a href="glossaries-user.html#dx1-34117" >1953</a>, <a href="glossaries-user.html#dx1-60026" >1954</a> <br /></span> <span class="index-subitem">    <span @@ -30310,9 +30314,9 @@ href="glossaries-user.html#dx1-24009" >2026</a>, <a href="glossaries-user.html#dx1-63021" >2027</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">translate</span>  <a -href="glossaries-user.html#dx1-23051" >2028</a>, <a -href="glossaries-user.html#dx1-23074" >2029</a>, <a -href="glossaries-user.html#dx1-23076" >2030</a>, <a +href="glossaries-user.html#dx1-23060" >2028</a>, <a +href="glossaries-user.html#dx1-23083" >2029</a>, <a +href="glossaries-user.html#dx1-23085" >2030</a>, <a href="glossaries-user.html#dx1-30013" >2031</a> <br /></span> <span class="index-subsubitem">        <span class="cmss-10">babel</span>  <a @@ -30320,22 +30324,22 @@ href="glossaries-user.html#dx1-14012" >2032</a>, <a href="glossaries-user.html#dx1-14017" >2033</a>, <a href="glossaries-user.html#dx1-14041" >2034</a>, <a href="glossaries-user.html#dx1-14049" >2035</a>, <a -href="glossaries-user.html#dx1-23068" >2036</a>, <a -href="glossaries-user.html#dx1-23071" >2037</a> <br /></span> +href="glossaries-user.html#dx1-23077" >2036</a>, <a +href="glossaries-user.html#dx1-23080" >2037</a> <br /></span> <span class="index-subsubitem">        <span class="cmss-10">false</span>  <a href="glossaries-user.html#dx1-14011" >2038</a>, <a -href="glossaries-user.html#dx1-23062" >2039</a>, <a -href="glossaries-user.html#dx1-23081" >2040</a>, <a -href="glossaries-user.html#dx1-23083" >2041</a> <br /></span> +href="glossaries-user.html#dx1-23071" >2039</a>, <a +href="glossaries-user.html#dx1-23090" >2040</a>, <a +href="glossaries-user.html#dx1-23092" >2041</a> <br /></span> <span class="index-subsubitem">        <span class="cmss-10">true</span>  <a -href="glossaries-user.html#dx1-23052" >2042</a>, <a -href="glossaries-user.html#dx1-23073" >2043</a>, <a -href="glossaries-user.html#dx1-23075" >2044</a>, <a -href="glossaries-user.html#dx1-23077" >2045</a> <br /></span> +href="glossaries-user.html#dx1-23061" >2042</a>, <a +href="glossaries-user.html#dx1-23082" >2043</a>, <a +href="glossaries-user.html#dx1-23084" >2044</a>, <a +href="glossaries-user.html#dx1-23086" >2045</a> <br /></span> <span class="index-subitem">    <span class="cmss-10">ucfirst</span>  <a href="glossaries-user.html#dx1-24032" >2046</a> <br /></span> @@ -30416,9 +30420,9 @@ href="glossaries-user.html#dx1-14002" >2081</a>, <a href="glossaries-user.html#dx1-14004" >2082</a>, <a href="glossaries-user.html#dx1-14006" >2083</a>, <a href="glossaries-user.html#dx1-14039" >2084</a>, <a -href="glossaries-user.html#dx1-23060" >2085</a>, <a -href="glossaries-user.html#dx1-23064" >2086</a>, <a -href="glossaries-user.html#dx1-23079" >2087</a> <br /></span> +href="glossaries-user.html#dx1-23069" >2085</a>, <a +href="glossaries-user.html#dx1-23073" >2086</a>, <a +href="glossaries-user.html#dx1-23088" >2087</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\printacronyms</span></span></span>  <a href="glossaries-user.html#dx1-27002" ><span @@ -30523,7 +30527,7 @@ href="glossaries-user.html#dx1-61015" >2125</a>, <a href="glossaries-user.html#dx1-62056" >2126</a> <br /></span> <span class="index-item"><span class="cmss-10">scrwfile </span>package  <a -href="glossaries-user.html#dx1-23044" >2127</a> <br /></span> +href="glossaries-user.html#dx1-23053" >2127</a> <br /></span> <span class="index-item"><span class="obeylines-h"><span class="verb"><span class="cmtt-10">\SetAcronymLists</span></span></span>  <a href="glossaries-user.html#dx1-27024" ><span @@ -30606,12 +30610,12 @@ href="glossaries-user.html#dx1-15003" >2165</a>, <a href="glossaries-user.html#dx1-15004" >2166</a>, <a href="glossaries-user.html#dx1-15005" >2167</a>, <a href="glossaries-user.html#dx1-15010" >2168</a>, <a -href="glossaries-user.html#dx1-23054" >2169</a>, <a -href="glossaries-user.html#dx1-23055" >2170</a>, <a -href="glossaries-user.html#dx1-23056" >2171</a>, <a -href="glossaries-user.html#dx1-23057" >2172</a>, <a -href="glossaries-user.html#dx1-23069" >2173</a>, <a -href="glossaries-user.html#dx1-23080" >2174</a>, <a +href="glossaries-user.html#dx1-23063" >2169</a>, <a +href="glossaries-user.html#dx1-23064" >2170</a>, <a +href="glossaries-user.html#dx1-23065" >2171</a>, <a +href="glossaries-user.html#dx1-23066" >2172</a>, <a +href="glossaries-user.html#dx1-23078" >2173</a>, <a +href="glossaries-user.html#dx1-23089" >2174</a>, <a href="glossaries-user.html#dx1-68024" >2175</a> <br /></span> </p><p class="theindex"> <span class="cmbx-10">X</span> @@ -30700,13 +30704,13 @@ href="glossaries-user.html#dx1-19024" >2252</a>, <a href="glossaries-user.html#dx1-21001" >2253</a>, <a href="glossaries-user.html#dx1-21007" >2254</a>, <a href="glossaries-user.html#dx1-21010" >2255</a>, <a -href="glossaries-user.html#dx1-23047" >2256</a>, <a -href="glossaries-user.html#dx1-23050" >2257</a>, <a -href="glossaries-user.html#dx1-25009" >2258</a>, <a -href="glossaries-user.html#dx1-25064" >2259</a>, <a -href="glossaries-user.html#dx1-25066" >2260</a>, <a -href="glossaries-user.html#dx1-25071" >2261</a>, <a -href="glossaries-user.html#dx1-25074" >2262</a>, <a +href="glossaries-user.html#dx1-23045" >2256</a>, <a +href="glossaries-user.html#dx1-23047" >2257</a>, <a +href="glossaries-user.html#dx1-23056" >2258</a>, <a +href="glossaries-user.html#dx1-23059" >2259</a>, <a +href="glossaries-user.html#dx1-25009" >2260</a>, <a +href="glossaries-user.html#dx1-25062" >2261</a>, <a +href="glossaries-user.html#dx1-25065" >2262</a>, <a href="glossaries-user.html#dx1-26030" >2263</a>, <a href="glossaries-user.html#dx1-26060" >2264</a>, <a href="glossaries-user.html#dx1-26064" >2265</a>, <a @@ -30893,10 +30897,10 @@ class="cmr-8"> distributions for Windows</span> class="cmr-8">provide </span><span class="cmtt-8">makeglossaries.exe</span><span class="cmr-8">.</span></p> -<!--l. 3427--><p class="noindent" ><span class="footnote-mark"><a +<!--l. 3445--><p class="noindent" ><span class="footnote-mark"><a href="#fn1x2-bk" id="fn1x2"><sup class="textsuperscript">2.1</sup></a></span><span class="cmr-8">bug fix in v4.16 has corrected the code to ensure this.</span></p> -<!--l. 3523--><p class="noindent" ><span class="footnote-mark"><a +<!--l. 3541--><p class="noindent" ><span class="footnote-mark"><a href="#fn2x2-bk" id="fn2x2"><sup class="textsuperscript">2.2</sup></a></span><span class="cmr-8">unless </span><span class="cmss-8">memoir</span><a @@ -30904,7 +30908,7 @@ class="cmss-8">memoir</span><a class="cmr-8">is loaded, which case it uses </span><span class="cmtt-8">\markboth</span><a id="dx1-24016"></a></p> -<!--l. 3553--><p class="noindent" ><span class="footnote-mark"><a +<!--l. 3571--><p class="noindent" ><span class="footnote-mark"><a href="#fn3x2-bk" id="fn3x2"><sup class="textsuperscript">2.3</sup></a></span><span class="cmr-8">Actually it uses </span><span class="cmtt-8">\mfirstucMakeUppercase</span><a diff --git a/macros/latex/contrib/glossaries/glossaries-user.pdf b/macros/latex/contrib/glossaries/glossaries-user.pdf Binary files differindex 7f160c9fb7..f3a00dc86f 100644 --- a/macros/latex/contrib/glossaries/glossaries-user.pdf +++ b/macros/latex/contrib/glossaries/glossaries-user.pdf diff --git a/macros/latex/contrib/glossaries/glossaries-user.tex b/macros/latex/contrib/glossaries/glossaries-user.tex index 698933ac27..7aeaac090d 100644 --- a/macros/latex/contrib/glossaries/glossaries-user.tex +++ b/macros/latex/contrib/glossaries/glossaries-user.tex @@ -450,11 +450,11 @@ and~\hyperlink{option#2}{#2}} \MakeShortVerb{"} \DeleteShortVerb{\|} - \title{User Manual for glossaries.sty v4.42} + \title{User Manual for glossaries.sty v4.43} \author{Nicola L.C. Talbot\\% \url{http://www.dickimaw-books.com/}} - \date{2019-01-06} + \date{2019-09-28} \maketitle \begin{abstract} @@ -545,7 +545,7 @@ package. \item[\url{glossaries-code.pdf}] Advanced users wishing to know more about the inner workings of all the packages provided in the \styfmt{glossaries} bundle should read -\qt{Documented Code for glossaries v4.42}. +\qt{Documented Code for glossaries v4.43}. \item[INSTALL] Installation instructions. @@ -3257,6 +3257,24 @@ is sorted according to \texttt{AAA}, then use the package option The default for \optsand23 is \pkgopt[true]{sanitizesort}, and the default for \opt1 is \pkgopt[false]{sanitizesort}. +\item[\pkgoptdef{esclocations}] This is a boolean option. (The default +is \pkgopt[true]{esclocations}, but \ics{makenoidxglossaries} +changes it to \pkgopt[false]{esclocations}.) Both \gls{makeindex} and \gls{xindy} +are fussy about the location formats (\gls{makeindex} more so than +\gls{xindy}) so the \styfmt{glossaries} package tries to ensure that +special characters are escaped and allows for the location to be +substituted for a format that's more acceptable to the indexing +application. This requires a bit of trickery to circumvent the +problem posed by \TeX's asynchronous output routine, which can go +wrong and also adds to the complexity of the document build. + +If you're sure that your locations will always expand to an +acceptable format (or you're prepared to post-process the glossary +file before passing it to the relevant indexing application) then +use \pkgopt[false]{esclocations} to avoid the complex escaping +of location values. (See \ifpdf section~\ref*{sec:wrgloss}\fi \qt{Writing information to associated files} in the documented +code for further details.) + \item[\pkgoptdef{savewrites}] This is a boolean option to minimise the number of write registers used by the \styfmt{glossaries} package. (Default is \pkgopt[false]{savewrites}.) There are only a limited @@ -3782,24 +3800,6 @@ Instead you must either use \ics{setglossarystyle}\marg{style} or the \setglossarystyle{mcoltree} \end{verbatim} -\item[\pkgoptdef{esclocations}] This is a boolean option. (The default -is \pkgopt[true]{esclocations}, but \ics{makenoidxglossaries} -changes it to \pkgopt[false]{esclocations}.) Both \gls{makeindex} and \gls{xindy} -are fussy about the location formats (\gls{makeindex} more so than -\gls{xindy}) so the \styfmt{glossaries} package tries to ensure that -special characters are escaped and allows for the location to be -substituted for a format that's more acceptable to the indexing -application. This requires a bit of trickery to circumvent the -problem posed by \TeX's asynchronous output routine, which can go -wrong and also adds to the complexity of the document build. - -If you're sure that your locations will always expand to an -acceptable format (or you're prepared to post-process the glossary -file before passing it to the relevant indexing application) then -use \pkgopt[false]{esclocations} to avoid the complex escaping -of location values. (See \ifpdf section~\ref*{sec:wrgloss}\fi \qt{Writing information to associated files} in the documented -code for further details.) - \item[\pkgoptdef{nonumberlist}] This option will suppress the associated \glspl{numberlist} in the glossaries (see also \sectionref{sec:numberlists}). Note that if you use \optsor23 diff --git a/macros/latex/contrib/glossaries/glossaries.dtx b/macros/latex/contrib/glossaries/glossaries.dtx index 6da667da8b..124662d6a6 100644 --- a/macros/latex/contrib/glossaries/glossaries.dtx +++ b/macros/latex/contrib/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/macros/latex/contrib/glossaries/glossaries.ins b/macros/latex/contrib/glossaries/glossaries.ins index 14ad799bbb..f46dd99a7a 100644 --- a/macros/latex/contrib/glossaries/glossaries.ins +++ b/macros/latex/contrib/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 diff --git a/macros/latex/contrib/glossaries/glossariesbegin.html b/macros/latex/contrib/glossaries/glossariesbegin.html index ff79fcb0ef..b45260805c 100644 --- a/macros/latex/contrib/glossaries/glossariesbegin.html +++ b/macros/latex/contrib/glossaries/glossariesbegin.html @@ -255,7 +255,7 @@ span#textcolor40{color:#00FF00} > <!--l. 55--><p class="noindent" > </p><!--l. 55--><p class="noindent" ><span -class="cmr-17">The glossaries package v4.42: a guide for</span> +class="cmr-17">The glossaries package v4.43: a guide for</span> <span class="cmr-17">beginners</span> </p> @@ -268,7 +268,7 @@ class="td11"> <span class="cmr-12">Nicola L.C. Talbot </span></td></tr></table> </div> <!--l. 55--><p class="noindent" ><span -class="cmr-12">2019-01-06</span></p></div> +class="cmr-12">2019-09-28</span></p></div> <div class="abstract" > @@ -1762,7 +1762,7 @@ id="TBL-2-2" /><col id="TBL-2-3" /><col id="TBL-2-4" /><col id="TBL-2-5" /></colgroup><tr - style="vertical-align:baseline;" id="TBL-2-1-"><td style="white-space:wrap; text-align:left;" id="TBL-2-1-1" + style="vertical-align:baseline;" id="TBL-2-1-"><td style="white-space:normal; text-align:left;" id="TBL-2-1-1" class="td11"> <!--l. 931--><p class="noindent" > </p></td><td style="white-space:nowrap; text-align:center;" id="TBL-2-1-2" class="td11"> <a href="#option1"><span @@ -1781,7 +1781,7 @@ href="#option4"><span class="cmbx-10">Option</span><span class="cmbx-10"> 4</span></a> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-2-"><td style="white-space:wrap; text-align:left;" id="TBL-2-2-1" + style="vertical-align:baseline;" id="TBL-2-2-"><td style="white-space:normal; text-align:left;" id="TBL-2-2-1" class="td11"> <!--l. 933--><p class="noindent" >Requires <span class="cmss-10">glossaries-extra</span><a @@ -1795,7 +1795,7 @@ class="pzdr-">✘</span></span> </td><td style="white-space:nowrap class="td11"> <span id="textcolor4"><span class="pzdr-">✔</span></span> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-3-"><td style="white-space:wrap; text-align:left;" id="TBL-2-3-1" + style="vertical-align:baseline;" id="TBL-2-3-"><td style="white-space:normal; text-align:left;" id="TBL-2-3-1" class="td11"> <!--l. 935--><p class="noindent" >Requires an external @@ -1809,7 +1809,7 @@ class="pzdr-">✔</span></span> </td><td style="white-space:nowrap class="td11"> <span id="textcolor8"><span class="pzdr-">✔</span></span> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-4-"><td style="white-space:wrap; text-align:left;" id="TBL-2-4-1" + style="vertical-align:baseline;" id="TBL-2-4-"><td style="white-space:normal; text-align:left;" id="TBL-2-4-1" class="td11"> <!--l. 937--><p class="noindent" >Requires Perl? </p></td><td style="white-space:nowrap; text-align:center;" id="TBL-2-4-2" class="td11"> <span id="textcolor9"><span @@ -1821,7 +1821,7 @@ class="pzdr-">✔</span></span> </td><td style="white-space:nowrap class="td11"> <span id="textcolor12"><span class="pzdr-">✘</span></span> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-5-"><td style="white-space:wrap; text-align:left;" id="TBL-2-5-1" + style="vertical-align:baseline;" id="TBL-2-5-"><td style="white-space:normal; text-align:left;" id="TBL-2-5-1" class="td11"> <!--l. 939--><p class="noindent" >Requires Java? </p></td><td style="white-space:nowrap; text-align:center;" id="TBL-2-5-2" class="td11"> <span id="textcolor13"><span @@ -1833,7 +1833,7 @@ class="pzdr-">✘</span></span> </td><td style="white-space:nowrap class="td11"> <span id="textcolor16"><span class="pzdr-">✔</span></span> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-6-"><td style="white-space:wrap; text-align:left;" id="TBL-2-6-1" + style="vertical-align:baseline;" id="TBL-2-6-"><td style="white-space:normal; text-align:left;" id="TBL-2-6-1" class="td11"> <!--l. 941--><p class="noindent" >Can sort extended @@ -1850,7 +1850,7 @@ class="pzdr-">✔</span></span> </td><td style="white-space:nowrap class="td11"> <span id="textcolor20"><span class="pzdr-">✔</span></span> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-7-"><td style="white-space:wrap; text-align:left;" id="TBL-2-7-1" + style="vertical-align:baseline;" id="TBL-2-7-"><td style="white-space:normal; text-align:left;" id="TBL-2-7-1" class="td11"> <!--l. 944--><p class="noindent" >Efficient sort algorithm? </p></td><td style="white-space:nowrap; text-align:center;" id="TBL-2-7-2" @@ -1863,7 +1863,7 @@ class="pzdr-">✔</span></span> </td><td style="white-space:nowrap class="td11"> <span id="textcolor24"><span class="pzdr-">✔</span></span> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-8-"><td style="white-space:wrap; text-align:left;" id="TBL-2-8-1" + style="vertical-align:baseline;" id="TBL-2-8-"><td style="white-space:normal; text-align:left;" id="TBL-2-8-1" class="td11"> <!--l. 946--><p class="noindent" >Can use different @@ -1881,7 +1881,7 @@ class="pzdr-">✘</span></span> </td><td style="white-space:nowrap class="td11"> <span id="textcolor28"><span class="pzdr-">✔</span></span> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-9-"><td style="white-space:wrap; text-align:left;" id="TBL-2-9-1" + style="vertical-align:baseline;" id="TBL-2-9-"><td style="white-space:normal; text-align:left;" id="TBL-2-9-1" class="td11"> <!--l. 948--><p class="noindent" >Any problematic sort @@ -1895,7 +1895,7 @@ class="pzdr-">✔</span></span> </td><td style="white-space:nowrap class="td11"> <span id="textcolor32"><span class="pzdr-">✘</span></span> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-10-"><td style="white-space:wrap; text-align:left;" id="TBL-2-10-1" + style="vertical-align:baseline;" id="TBL-2-10-"><td style="white-space:normal; text-align:left;" id="TBL-2-10-1" class="td11"> <!--l. 950--><p class="noindent" >Can form ranges @@ -1912,7 +1912,7 @@ class="pzdr-">✔</span></span> </td><td style="white-space:nowrap class="td11"> <span id="textcolor36"><span class="pzdr-">✔</span></span> </td> </tr><tr - style="vertical-align:baseline;" id="TBL-2-11-"><td style="white-space:wrap; text-align:left;" id="TBL-2-11-1" + style="vertical-align:baseline;" id="TBL-2-11-"><td style="white-space:normal; text-align:left;" id="TBL-2-11-1" class="td11"> <!--l. 952--><p class="noindent" >Can have non-standard diff --git a/macros/latex/contrib/glossaries/glossariesbegin.pdf b/macros/latex/contrib/glossaries/glossariesbegin.pdf Binary files differindex 456669e405..0a03bf1c66 100644 --- a/macros/latex/contrib/glossaries/glossariesbegin.pdf +++ b/macros/latex/contrib/glossaries/glossariesbegin.pdf diff --git a/macros/latex/contrib/glossaries/glossariesbegin.tex b/macros/latex/contrib/glossaries/glossariesbegin.tex index d630031205..50a0bfccd9 100644 --- a/macros/latex/contrib/glossaries/glossariesbegin.tex +++ b/macros/latex/contrib/glossaries/glossariesbegin.tex @@ -31,10 +31,10 @@ \texorpdfstring{{\frenchspacing\obeyspaces\ttfamily#1}}{#1}} \newcommand*{\file}[1]{\texorpdfstring{\texttt{#1}}{#1}} -\title{The glossaries package v4.42: +\title{The glossaries package v4.43: a guide for beginners} \author{Nicola L.C. Talbot} -\date{2019-01-06} +\date{2019-09-28} \ifpdf \externaldocument{glossaries-user} diff --git a/macros/latex/contrib/glossaries/glossary2glossaries.html b/macros/latex/contrib/glossaries/glossary2glossaries.html index 56312bb11a..bc00961cad 100644 --- a/macros/latex/contrib/glossaries/glossary2glossaries.html +++ b/macros/latex/contrib/glossaries/glossary2glossaries.html @@ -126,8 +126,9 @@ span.LATEX span.TEX{ position:relative; left: -0.4em; } div.float, div.figure {margin-left: auto; margin-right: auto;} div.float img {text-align:center;} div.figure img {text-align:center;} -.marginpar {width:20%; float:right; text-align:left; margin-left:auto; margin-top:0.5em; font-size:85%; text-decoration:underline;} -.marginpar p{margin-top:0.4em; margin-bottom:0.4em;} +.marginpar,.reversemarginpar {width:20%; float:right; text-align:left; margin-left:auto; margin-top:0.5em; font-size:85%; text-decoration:underline;} +.marginpar p,.reversemarginpar p{margin-top:0.4em; margin-bottom:0.4em;} +.reversemarginpar{float:left;} table.equation {width:100%;} .equation td{text-align:center; } td.equation { margin-top:1em; margin-bottom:1em; } @@ -200,7 +201,7 @@ class="td11"><span class="cmr-12">Nicola L.C. Talbot</span></td></tr></table> </div> <!--l. 52--><p class="noindent" ><span -class="cmr-12">2019-01-06</span></p></div> +class="cmr-12">2019-09-28</span></p></div> <div class="abstract" > @@ -517,7 +518,7 @@ href="#top">Top</a><h2 class="sectionHead"></p><h3 class="sectionHead"><span cla id="x1-40003"></a>Defining new glossary types</h3> <!--l. 164--><p class="noindent" >If you have created new glossary types, you will need to replace all instances of -</p><!--l. 166--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 166--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossary</span></span><span class="obeylines-h"> <span class="cmtt-10">\newglossarytype</span><a @@ -548,7 +549,7 @@ class="cmtt-10">}</span> <br /></div><hr> <br /></span> with -</p><!--l. 171--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 171--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\newglossary</span><a @@ -568,7 +569,7 @@ class="cmtt-10">}</span> <br /></span> in the preamble, and, if the new glossary requires a different style to the main (default) glossary, you will also need to put -</p><!--l. 176--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 176--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\setglossarystyle</span><a @@ -714,7 +715,7 @@ class="cmsy-10">§</span>6.4 </a><a href="#sec:csglossary"><span class="cmtt-10">\glossary</span><!--tex4ht:ref: sec:csglossary --></a>. </p><!--l. 245--><p class="indent" > Substitute all instances of -</p><!--l. 246--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 246--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossary</span></span><span class="obeylines-h"> <span class="cmtt-10">\storeglosentry</span><a @@ -727,7 +728,7 @@ class="cmtt-10">}</span> <br /></div><hr> <br /></span> with -</p><!--l. 250--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 250--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\newglossaryentry</span><a @@ -745,7 +746,7 @@ This should be fairly easy to do using the search and replace facility in your e class="cmtt-10">\storeglosentry</span><a id="dx1-6009"></a> (i.e. you have multiple glossaries) then you will need to substitute -</p><!--l. 259--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 259--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossary</span></span><span class="obeylines-h"> <span class="cmtt-10">\storeglosentry</span><a @@ -760,7 +761,7 @@ class="cmtt-10">}</span> <br /></div><hr> <br /></span> with -</p><!--l. 263--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 263--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\newglossaryentry</span><a @@ -850,7 +851,7 @@ class="cmtt-10">\useglosentry</span></h4> <!--l. 301--><p class="noindent" >The <span class="cmss-10">glossary </span>package allows you to add information to the glossary for a predefined term without producing any text in the document using -</p><!--l. 304--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 304--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossary</span></span><span class="obeylines-h"> <span class="cmtt-10">\useglosentry</span><a @@ -863,7 +864,7 @@ class="cmtt-10">}</span> <br /></div><hr> <br /></span> Any occurrences of this command will need to be replaced with -</p><!--l. 308--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 308--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\glsadd</span><a @@ -905,7 +906,7 @@ class="cmtt-10">\useGlosentry</span></h4> <!--l. 321--><p class="noindent" >The <span class="cmss-10">glossary </span>package allows you to add information to the glossary for a predefined term with the given text using -</p><!--l. 323--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 323--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossary</span></span><span class="obeylines-h"> <span class="cmtt-10">\useGlosentry</span><a @@ -920,7 +921,7 @@ class="cmtt-10">}</span> <br /></div><hr> <br /></span> Any occurrences of this command will need to be replaced with -</p><!--l. 327--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 327--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\glslink</span><a @@ -1023,7 +1024,7 @@ class="cmss-10">glossaries</span> package treats acronyms in exactly the same way as normal glossary terms. In fact, in the <span class="cmss-10">glossaries </span>package, the default definition of: -</p><!--l. 382--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 382--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\newacronym</span><a @@ -1040,7 +1041,7 @@ class="cmtt-10">}</span> <br /></div><hr> <br /></span> is a shortcut for: -</p><!--l. 386--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 386--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\newglossaryentry</span><a @@ -1166,7 +1167,7 @@ class="cmtt-10">\useacronym</span><a class="cmtt-10">\</span>⟨<span class="cmti-10">acr-name</span>⟩, then you will need to replace all occurrences of -</p><!--l. 435--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 435--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossary</span></span><span class="obeylines-h"> <span class="cmtt-10">\useacronym</span><a @@ -1179,7 +1180,7 @@ class="cmtt-10">}</span> <br /></div><hr> <br /></span> with -</p><!--l. 439--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 439--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\gls</span><a @@ -1214,7 +1215,7 @@ also defines <span class="cmtt-10">\</span>⟨<span class="cmti-10">acr-name</span>⟩. For example, if your document originally had the following: -</p><!--l. 451--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 451--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossary</span></span><span class="obeylines-h"> @@ -1228,7 +1229,7 @@ class="cmss-10">glossary</span></span><span class="obeylines-h"> </div><hr> </p><!--l. 456--><p class="noindent" ></p></span> then you can change this to: -</p><!--l. 458--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 458--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> @@ -1289,7 +1290,7 @@ class="cmtt-10">\oldacronym</span><a class="cmtt-10">\newacronym</span><a id="dx1-13005"></a>) you can replace -</p><!--l. 487--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 487--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossary</span></span><span class="obeylines-h"> <span class="cmtt-10">\acrsh</span><a @@ -1300,7 +1301,7 @@ class="cmtt-10">}</span> <br /></div><hr> <br /></span> with -</p><!--l. 491--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 491--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\acrshort</span><a @@ -1311,7 +1312,7 @@ class="cmtt-10">}</span> <br /></div><hr> <br /></span> and you can replace -</p><!--l. 495--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 495--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossary</span></span><span class="obeylines-h"> <span class="cmtt-10">\acrln</span><a @@ -1325,7 +1326,7 @@ class="cmtt-10">}</span> <br /></span> with -</p><!--l. 499--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 499--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\acrlong</span><a @@ -1365,7 +1366,7 @@ href="#top">Top</a><h3 class="subsectionHead"></p><h4 class="subsectionHead"><sp class="cmtt-10">\ifacronymfirstuse</span></h4> <!--l. 517--><p class="noindent" >The <span class="cmss-10">glossary </span>package command -</p><!--l. 518--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 518--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossary</span></span><span class="obeylines-h"> <span class="cmtt-10">\ifacronymfirstuse</span><a @@ -1381,7 +1382,7 @@ class="cmtt-10">}</span> <br /></span> can be replaced by the <span class="cmss-10">glossaries </span>command: -</p><!--l. 522--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 522--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\ifglsused</span><a @@ -1414,7 +1415,7 @@ determine whether the acronym has been used in the document. The <span class="cmss-10">glossaries</span> package also provides a means to do this on either a local or a global level. To reset an acronym, you will need to replace: -</p><!--l. 538--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 538--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossary</span></span><span class="obeylines-h"> <span class="cmtt-10">\resetacronym</span><a @@ -1428,7 +1429,7 @@ class="cmtt-10">}</span> <br /></span> with either -</p><!--l. 542--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 542--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\glsreset</span><a @@ -1439,7 +1440,7 @@ class="cmtt-10">}</span> <br /></div><hr> <br /></span> or -</p><!--l. 546--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 546--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\glslocalreset</span><a @@ -1450,7 +1451,7 @@ class="cmtt-10">}</span> <br /></div><hr> <br /></span> </p><!--l. 550--><p class="indent" > To unset an acronym, you will need to replace: -</p><!--l. 551--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 551--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossary</span></span><span class="obeylines-h"> <span class="cmtt-10">\unsetacronym</span><a @@ -1461,7 +1462,7 @@ class="cmtt-10">}</span> <br /></div><hr> <br /></span> with either -</p><!--l. 555--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 555--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\glsunset</span><a @@ -1472,7 +1473,7 @@ class="cmtt-10">}</span> <br /></div><hr> <br /></span> or -</p><!--l. 559--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 559--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\glslocalunset</span><a @@ -1483,7 +1484,7 @@ class="cmtt-10">}</span> <br /></div><hr> <br /></span> </p><!--l. 563--><p class="indent" > To reset all acronyms, you will need to replace: -</p><!--l. 564--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 564--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossary</span></span><span class="obeylines-h"> <span class="cmtt-10">\resetallacronyms</span><a @@ -1491,7 +1492,7 @@ class="cmtt-10">\resetallacronyms</span><a <br /></div><hr> <br /></span> with -</p><!--l. 568--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 568--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\glsresetall</span><a @@ -1505,7 +1506,7 @@ class="cmtt-10">]</span> or -</p><!--l. 572--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 572--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\glslocalresetall</span><a @@ -1516,7 +1517,7 @@ class="cmtt-10">]</span> <br /></div><hr> <br /></span> To unset all acronyms, you will need to replace: -</p><!--l. 576--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 576--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossary</span></span><span class="obeylines-h"> <span class="cmtt-10">\unsetallacronyms</span><a @@ -1524,7 +1525,7 @@ class="cmtt-10">\unsetallacronyms</span><a <br /></div><hr> <br /></span> with -</p><!--l. 580--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 580--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\glsunsetall</span><a @@ -1535,7 +1536,7 @@ class="cmtt-10">]</span> <br /></div><hr> <br /></span> or -</p><!--l. 584--><p class="indent" > <hr><div><span class="marginpar"><span +</p><!--l. 584--><p class="indent" > <hr><div><span class="reversemarginpar"><span class="cmss-10">glossaries</span></span><span class="obeylines-h"> <span class="cmtt-10">\glslocalunsetall</span><a diff --git a/macros/latex/contrib/glossaries/glossary2glossaries.pdf b/macros/latex/contrib/glossaries/glossary2glossaries.pdf Binary files differindex 3300082598..81d25e73d5 100644 --- a/macros/latex/contrib/glossaries/glossary2glossaries.pdf +++ b/macros/latex/contrib/glossaries/glossary2glossaries.pdf diff --git a/macros/latex/contrib/glossaries/glossary2glossaries.tex b/macros/latex/contrib/glossaries/glossary2glossaries.tex index f555c71db5..f49eb809de 100644 --- a/macros/latex/contrib/glossaries/glossary2glossaries.tex +++ b/macros/latex/contrib/glossaries/glossary2glossaries.tex @@ -34,7 +34,7 @@ \title{Upgrading from the glossary package to the glossaries package} \author{Nicola L.C. Talbot} -\date{2019-01-06} +\date{2019-09-28} \newenvironment{oldway}{% \begin{labelledbox}{\styfmt{glossary}}\ttfamily\obeylines diff --git a/macros/latex/contrib/glossaries/makeglossaries-lite.1 b/macros/latex/contrib/glossaries/makeglossaries-lite.1 index 94a5df5d94..6d4e3c1261 100644 --- a/macros/latex/contrib/glossaries/makeglossaries-lite.1 +++ b/macros/latex/contrib/glossaries/makeglossaries-lite.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "MAKEGLOSSARIES-LITE 1" -.TH MAKEGLOSSARIES-LITE 1 "2019-01-06" "perl v5.28.1" "makeglossaries-lite Lua Script" +.TH MAKEGLOSSARIES-LITE 1 "2019-09-28" "perl v5.28.1" "makeglossaries-lite Lua Script" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/macros/latex/contrib/glossaries/makeglossaries.1 b/macros/latex/contrib/glossaries/makeglossaries.1 index 640cf541d3..b2606ee432 100644 --- a/macros/latex/contrib/glossaries/makeglossaries.1 +++ b/macros/latex/contrib/glossaries/makeglossaries.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "MAKEGLOSSARIES 1" -.TH MAKEGLOSSARIES 1 "2019-01-06" "perl v5.28.1" "makeglossaries Perl Script" +.TH MAKEGLOSSARIES 1 "2019-09-28" "perl v5.28.1" "makeglossaries Perl Script" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l diff --git a/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf b/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf Binary files differindex e42dac1305..af2c27e7db 100644 --- a/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf +++ b/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf diff --git a/macros/latex/contrib/glossaries/samples/minimalgls.pdf b/macros/latex/contrib/glossaries/samples/minimalgls.pdf Binary files differindex fc55ed5575..613b44b89b 100644 --- a/macros/latex/contrib/glossaries/samples/minimalgls.pdf +++ b/macros/latex/contrib/glossaries/samples/minimalgls.pdf diff --git a/macros/latex/contrib/glossaries/samples/minimalgls.tex b/macros/latex/contrib/glossaries/samples/minimalgls.tex index 5053aa0a12..195b4a04e9 100644 --- a/macros/latex/contrib/glossaries/samples/minimalgls.tex +++ b/macros/latex/contrib/glossaries/samples/minimalgls.tex @@ -1,43 +1,43 @@ - % 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. +% 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. \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 @@ -52,17 +52,17 @@ \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} diff --git a/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf b/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf Binary files differindex 7d39d828cb..2eef686216 100644 --- a/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf +++ b/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf diff --git a/macros/latex/contrib/glossaries/samples/mwe-acr.pdf b/macros/latex/contrib/glossaries/samples/mwe-acr.pdf Binary files differindex 0056b9f4af..dc4f70c518 100644 --- a/macros/latex/contrib/glossaries/samples/mwe-acr.pdf +++ b/macros/latex/contrib/glossaries/samples/mwe-acr.pdf diff --git a/macros/latex/contrib/glossaries/samples/mwe-gls.pdf b/macros/latex/contrib/glossaries/samples/mwe-gls.pdf Binary files differindex 4a1f8d2516..75781ecb5b 100644 --- a/macros/latex/contrib/glossaries/samples/mwe-gls.pdf +++ b/macros/latex/contrib/glossaries/samples/mwe-gls.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf b/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf Binary files differindex 00eaff2cf3..e7b5016362 100644 --- a/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-FnDesc.tex b/macros/latex/contrib/glossaries/samples/sample-FnDesc.tex index e4c5d87d3d..746eb7b858 100644 --- a/macros/latex/contrib/glossaries/samples/sample-FnDesc.tex +++ b/macros/latex/contrib/glossaries/samples/sample-FnDesc.tex @@ -1,8 +1,8 @@ - % 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 } +% 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} diff --git a/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf b/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf Binary files differindex 8ad12720ae..5ae0a14a80 100644 --- a/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.tex b/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.tex index 4e74e2e059..619519e685 100644 --- a/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.tex +++ b/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.tex @@ -1,8 +1,8 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex - % arara: makeglossaries - % arara: pdflatex +% 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} @@ -17,13 +17,13 @@ \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}% diff --git a/macros/latex/contrib/glossaries/samples/sample-crossref.pdf b/macros/latex/contrib/glossaries/samples/sample-crossref.pdf Binary files differindex 1037320f51..bd89fff0b2 100644 --- a/macros/latex/contrib/glossaries/samples/sample-crossref.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-crossref.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-crossref.tex b/macros/latex/contrib/glossaries/samples/sample-crossref.tex index 8aaca674da..4843b4d1b1 100644 --- a/macros/latex/contrib/glossaries/samples/sample-crossref.tex +++ b/macros/latex/contrib/glossaries/samples/sample-crossref.tex @@ -1,8 +1,8 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } +% 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} diff --git a/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf b/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf Binary files differindex f84073b018..5ea60ec873 100644 --- a/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-custom-acronym.tex b/macros/latex/contrib/glossaries/samples/sample-custom-acronym.tex index 95b78a2773..992187f671 100644 --- a/macros/latex/contrib/glossaries/samples/sample-custom-acronym.tex +++ b/macros/latex/contrib/glossaries/samples/sample-custom-acronym.tex @@ -1,29 +1,29 @@ - % 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 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 @@ -103,13 +103,13 @@ }% }% }% - % 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}})}% } @@ -117,11 +117,11 @@ % 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} diff --git a/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf b/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf Binary files differindex c5a28552ae..59e6a1b940 100644 --- a/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-dot-abbr.tex b/macros/latex/contrib/glossaries/samples/sample-dot-abbr.tex index 094fcf76dd..3fd3cf7cba 100644 --- a/macros/latex/contrib/glossaries/samples/sample-dot-abbr.tex +++ b/macros/latex/contrib/glossaries/samples/sample-dot-abbr.tex @@ -1,6 +1,8 @@ - % arara: pdflatex - % arara: makeglossaries - % arara: pdflatex +% 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} @@ -23,8 +25,8 @@ \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}{% diff --git a/macros/latex/contrib/glossaries/samples/sample-dual.pdf b/macros/latex/contrib/glossaries/samples/sample-dual.pdf Binary files differindex a2061a2b9b..b3948a464c 100644 --- a/macros/latex/contrib/glossaries/samples/sample-dual.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-dual.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-dual.tex b/macros/latex/contrib/glossaries/samples/sample-dual.tex index 0015f9385a..4a1fc9a953 100644 --- a/macros/latex/contrib/glossaries/samples/sample-dual.tex +++ b/macros/latex/contrib/glossaries/samples/sample-dual.tex @@ -1,21 +1,23 @@ - % 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 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 diff --git a/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf b/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf Binary files differindex af2438de51..9b28627e43 100644 --- a/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-entrycount.tex b/macros/latex/contrib/glossaries/samples/sample-entrycount.tex index 01f331440c..0a37f54974 100644 --- a/macros/latex/contrib/glossaries/samples/sample-entrycount.tex +++ b/macros/latex/contrib/glossaries/samples/sample-entrycount.tex @@ -1,9 +1,9 @@ - % 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 } +% 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} diff --git a/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf b/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf Binary files differindex 407ea6961f..64deb3490c 100644 --- a/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-entryfmt.tex b/macros/latex/contrib/glossaries/samples/sample-entryfmt.tex index a057805db1..d3bcfe3659 100644 --- a/macros/latex/contrib/glossaries/samples/sample-entryfmt.tex +++ b/macros/latex/contrib/glossaries/samples/sample-entryfmt.tex @@ -1,8 +1,8 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } +% 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} diff --git a/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf b/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf Binary files differindex 8a9ee959e1..45e6dd0584 100644 --- a/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-font-abbr.tex b/macros/latex/contrib/glossaries/samples/sample-font-abbr.tex index c7b04e192b..43b744f8f1 100644 --- a/macros/latex/contrib/glossaries/samples/sample-font-abbr.tex +++ b/macros/latex/contrib/glossaries/samples/sample-font-abbr.tex @@ -1,6 +1,8 @@ - % arara: pdflatex - % arara: makeglossaries - % arara: pdflatex +% 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} diff --git a/macros/latex/contrib/glossaries/samples/sample-ignored.pdf b/macros/latex/contrib/glossaries/samples/sample-ignored.pdf Binary files differindex 23bf60a938..7185f4d455 100644 --- a/macros/latex/contrib/glossaries/samples/sample-ignored.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-ignored.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-ignored.tex b/macros/latex/contrib/glossaries/samples/sample-ignored.tex index 090c755c95..f552aff44a 100644 --- a/macros/latex/contrib/glossaries/samples/sample-ignored.tex +++ b/macros/latex/contrib/glossaries/samples/sample-ignored.tex @@ -1,8 +1,8 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } +% 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} diff --git a/macros/latex/contrib/glossaries/samples/sample-index.pdf b/macros/latex/contrib/glossaries/samples/sample-index.pdf Binary files differindex 80f293a51b..18a83dfcd2 100644 --- a/macros/latex/contrib/glossaries/samples/sample-index.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-index.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-index.tex b/macros/latex/contrib/glossaries/samples/sample-index.tex index 1f2441dbed..9842bacc2f 100644 --- a/macros/latex/contrib/glossaries/samples/sample-index.tex +++ b/macros/latex/contrib/glossaries/samples/sample-index.tex @@ -1,10 +1,10 @@ - % 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 } +% 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} @@ -13,19 +13,19 @@ \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}% {% diff --git a/macros/latex/contrib/glossaries/samples/sample-inline.pdf b/macros/latex/contrib/glossaries/samples/sample-inline.pdf Binary files differindex b6050b20cc..cadd7af539 100644 --- a/macros/latex/contrib/glossaries/samples/sample-inline.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-inline.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-inline.tex b/macros/latex/contrib/glossaries/samples/sample-inline.tex index 08a4198aa5..c5d7220945 100644 --- a/macros/latex/contrib/glossaries/samples/sample-inline.tex +++ b/macros/latex/contrib/glossaries/samples/sample-inline.tex @@ -1,9 +1,9 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } - % arara: pdflatex: { synctex: on } +% 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} @@ -36,30 +36,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}} diff --git a/macros/latex/contrib/glossaries/samples/sample-langdict.pdf b/macros/latex/contrib/glossaries/samples/sample-langdict.pdf Binary files differindex 300afc33cf..5d85d6c143 100644 --- a/macros/latex/contrib/glossaries/samples/sample-langdict.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-langdict.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-langdict.tex b/macros/latex/contrib/glossaries/samples/sample-langdict.tex index 5c1484c93e..c5bf52fc7d 100644 --- a/macros/latex/contrib/glossaries/samples/sample-langdict.tex +++ b/macros/latex/contrib/glossaries/samples/sample-langdict.tex @@ -1,20 +1,20 @@ - % 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 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. \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} @@ -22,7 +22,7 @@ \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}}% diff --git a/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf b/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf Binary files differindex 300767a45d..a15f6e32c6 100644 --- a/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-newkeys.tex b/macros/latex/contrib/glossaries/samples/sample-newkeys.tex index 323b28665c..d2830fc6bf 100644 --- a/macros/latex/contrib/glossaries/samples/sample-newkeys.tex +++ b/macros/latex/contrib/glossaries/samples/sample-newkeys.tex @@ -1,8 +1,8 @@ - % 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 } +% 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} @@ -26,6 +26,7 @@ {\Glsing}% command analogous to \Glstext {\GLSing}% command analogous to \GLStext + \makeglossaries \newglossaryentry{jump}{name={jump},description={}} diff --git a/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf b/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf Binary files differindex 7a922cd6ea..5cac8cf6e8 100644 --- a/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.tex b/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.tex index e8d2bfb8b6..78d4f400a1 100644 --- a/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.tex +++ b/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.tex @@ -1,7 +1,7 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex - % arara: pdflatex +% 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} @@ -15,9 +15,11 @@ \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} } @@ -38,7 +40,7 @@ especially for political reasons} } - % Symbols +% Symbols \newglossaryentry{set}{% type=symbols, @@ -68,7 +70,7 @@ sort={!}, description={factorial}} - % index entries +% index entries \newterm{seal} @@ -116,6 +118,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} diff --git a/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf b/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf Binary files differindex 9ed8e6191a..16c254d9ed 100644 --- a/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-noidxapp.tex b/macros/latex/contrib/glossaries/samples/sample-noidxapp.tex index d2891729d3..29f3655587 100644 --- a/macros/latex/contrib/glossaries/samples/sample-noidxapp.tex +++ b/macros/latex/contrib/glossaries/samples/sample-noidxapp.tex @@ -1,7 +1,7 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex - % arara: pdflatex +% 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} @@ -12,9 +12,12 @@ \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} } @@ -35,7 +38,7 @@ especially for political reasons} } - % Symbols +% Symbols \newglossaryentry{set}{% type=symbols, @@ -65,7 +68,7 @@ sort={!}, description={factorial}} - % index entries +% index entries \newterm{seal} diff --git a/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf b/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf Binary files differindex 68f48c57ab..67fc47f4b0 100644 --- a/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-nomathhyper.tex b/macros/latex/contrib/glossaries/samples/sample-nomathhyper.tex index 16cc511eee..7ac3f82e8f 100644 --- a/macros/latex/contrib/glossaries/samples/sample-nomathhyper.tex +++ b/macros/latex/contrib/glossaries/samples/sample-nomathhyper.tex @@ -1,8 +1,8 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } +% 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} @@ -12,8 +12,8 @@ \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 @@ -24,7 +24,7 @@ \fi } - % define a sample entry: +% define a sample entry: \newglossaryentry{x}{name={x},description={sample entry}} \begin{document} diff --git a/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf b/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf Binary files differindex b9a77de1ad..5b8fa5e678 100644 --- a/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-numberlist.tex b/macros/latex/contrib/glossaries/samples/sample-numberlist.tex index 24b93edb49..5c26c64b5a 100644 --- a/macros/latex/contrib/glossaries/samples/sample-numberlist.tex +++ b/macros/latex/contrib/glossaries/samples/sample-numberlist.tex @@ -1,9 +1,9 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } - % arara: pdflatex: { synctex: on } +% This file is public domain +% If you want to use arara, you need the following directives: +% arara: pdflatex: { synctex: on } +% arara: makeglossaries +% arara: pdflatex: { synctex: on } +% arara: pdflatex: { synctex: on } \documentclass{report} \usepackage[colorlinks]{hyperref} diff --git a/macros/latex/contrib/glossaries/samples/sample-prefix.pdf b/macros/latex/contrib/glossaries/samples/sample-prefix.pdf Binary files differindex 661bdee4eb..2fe7792920 100644 --- a/macros/latex/contrib/glossaries/samples/sample-prefix.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-prefix.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-prefix.tex b/macros/latex/contrib/glossaries/samples/sample-prefix.tex index ab1260cc72..40372cbad7 100644 --- a/macros/latex/contrib/glossaries/samples/sample-prefix.tex +++ b/macros/latex/contrib/glossaries/samples/sample-prefix.tex @@ -1,9 +1,9 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } - % arara: pdflatex: { synctex: on } +% 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} diff --git a/macros/latex/contrib/glossaries/samples/sample-si.pdf b/macros/latex/contrib/glossaries/samples/sample-si.pdf Binary files differindex f8214a62e4..af7aa9f693 100644 --- a/macros/latex/contrib/glossaries/samples/sample-si.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-si.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-si.tex b/macros/latex/contrib/glossaries/samples/sample-si.tex index f304dab711..e1afeae622 100644 --- a/macros/latex/contrib/glossaries/samples/sample-si.tex +++ b/macros/latex/contrib/glossaries/samples/sample-si.tex @@ -1,8 +1,8 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } +% 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} diff --git a/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf b/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf Binary files differindex 85f8fdb628..2da749d357 100644 --- a/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.tex b/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.tex index cccfad6397..39a6eb6721 100644 --- a/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.tex +++ b/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.tex @@ -1,8 +1,8 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex - % arara: makeglossaries - % arara: pdflatex +% 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} @@ -85,8 +85,8 @@ \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} diff --git a/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf b/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf Binary files differindex 8b5d4e4ff9..c547306b25 100644 --- a/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-storage-abbr.tex b/macros/latex/contrib/glossaries/samples/sample-storage-abbr.tex index 36949a2a6c..7ea6faadd1 100644 --- a/macros/latex/contrib/glossaries/samples/sample-storage-abbr.tex +++ b/macros/latex/contrib/glossaries/samples/sample-storage-abbr.tex @@ -1,8 +1,8 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex - % arara: makeglossaries - % arara: pdflatex +% 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} @@ -85,8 +85,8 @@ \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} diff --git a/macros/latex/contrib/glossaries/samples/sample.pdf b/macros/latex/contrib/glossaries/samples/sample.pdf Binary files differindex 9b1748e0da..f5736bbae1 100644 --- a/macros/latex/contrib/glossaries/samples/sample.pdf +++ b/macros/latex/contrib/glossaries/samples/sample.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample.tex b/macros/latex/contrib/glossaries/samples/sample.tex index 282eb7912b..9478e16f2e 100644 --- a/macros/latex/contrib/glossaries/samples/sample.tex +++ b/macros/latex/contrib/glossaries/samples/sample.tex @@ -1,9 +1,9 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } - % arara: pdflatex: { synctex: on } +% 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} @@ -30,20 +30,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 @@ -52,14 +52,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}} @@ -86,12 +86,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}, diff --git a/macros/latex/contrib/glossaries/samples/sample4col.pdf b/macros/latex/contrib/glossaries/samples/sample4col.pdf Binary files differindex be3e4a1b2a..9942f1b6af 100644 --- a/macros/latex/contrib/glossaries/samples/sample4col.pdf +++ b/macros/latex/contrib/glossaries/samples/sample4col.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample4col.tex b/macros/latex/contrib/glossaries/samples/sample4col.tex index 1f6125dc1d..1978954123 100644 --- a/macros/latex/contrib/glossaries/samples/sample4col.tex +++ b/macros/latex/contrib/glossaries/samples/sample4col.tex @@ -1,8 +1,8 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } +% This file is public domain +% If you want to use arara, you need the following directives: +% arara: pdflatex: { synctex: on } +% arara: makeglossaries +% arara: pdflatex: { synctex: on } \documentclass[a4paper]{article} \usepackage[style=long4colheaderborder]{glossaries} diff --git a/macros/latex/contrib/glossaries/samples/sampleAcr.pdf b/macros/latex/contrib/glossaries/samples/sampleAcr.pdf Binary files differindex 94e1cad38a..8c346877a0 100644 --- a/macros/latex/contrib/glossaries/samples/sampleAcr.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleAcr.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleAcr.tex b/macros/latex/contrib/glossaries/samples/sampleAcr.tex index 41ae5fab96..12801f7d95 100644 --- a/macros/latex/contrib/glossaries/samples/sampleAcr.tex +++ b/macros/latex/contrib/glossaries/samples/sampleAcr.tex @@ -1,9 +1,9 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } - % arara: pdflatex: { synctex: on } +% 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} @@ -13,7 +13,7 @@ \makeglossaries - % Set the acronym style +% Set the acronym style \setacronymstyle{long-sc-short} \newacronym{svm}% label diff --git a/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf b/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf Binary files differindex e5e2bc6c4a..bd045debe9 100644 --- a/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleAcrDesc.tex b/macros/latex/contrib/glossaries/samples/sampleAcrDesc.tex index 896bbbb1fb..0bec67636f 100644 --- a/macros/latex/contrib/glossaries/samples/sampleAcrDesc.tex +++ b/macros/latex/contrib/glossaries/samples/sampleAcrDesc.tex @@ -1,16 +1,16 @@ - % 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 } +% 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 @@ -18,14 +18,14 @@ \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}} @@ -46,7 +46,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). diff --git a/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf b/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf Binary files differindex 04654f3a9e..f3a6c9f22f 100644 --- a/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleCustomAcr.tex b/macros/latex/contrib/glossaries/samples/sampleCustomAcr.tex index 084f5b7c98..bc32d1329a 100644 --- a/macros/latex/contrib/glossaries/samples/sampleCustomAcr.tex +++ b/macros/latex/contrib/glossaries/samples/sampleCustomAcr.tex @@ -1,16 +1,16 @@ - % 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 } +% 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 @@ -18,8 +18,8 @@ \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 @@ -28,44 +28,44 @@ }% {% 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 @@ -84,7 +84,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). diff --git a/macros/latex/contrib/glossaries/samples/sampleDB.pdf b/macros/latex/contrib/glossaries/samples/sampleDB.pdf Binary files differindex 6845e69aca..44217f42b9 100644 --- a/macros/latex/contrib/glossaries/samples/sampleDB.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleDB.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleDB.tex b/macros/latex/contrib/glossaries/samples/sampleDB.tex index cbcd1723b9..522ca63562 100644 --- a/macros/latex/contrib/glossaries/samples/sampleDB.tex +++ b/macros/latex/contrib/glossaries/samples/sampleDB.tex @@ -1,8 +1,8 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } +% This file is public domain +% If you want to use arara, you need the following directives: +% arara: pdflatex: { synctex: on } +% arara: makeglossaries +% arara: pdflatex: { synctex: on } \documentclass{article} \usepackage[colorlinks,plainpages=false]{hyperref} diff --git a/macros/latex/contrib/glossaries/samples/sampleDesc.pdf b/macros/latex/contrib/glossaries/samples/sampleDesc.pdf Binary files differindex e7c833d7a2..788bb043e6 100644 --- a/macros/latex/contrib/glossaries/samples/sampleDesc.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleDesc.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleDesc.tex b/macros/latex/contrib/glossaries/samples/sampleDesc.tex index 4f69d980a0..09e408f906 100644 --- a/macros/latex/contrib/glossaries/samples/sampleDesc.tex +++ b/macros/latex/contrib/glossaries/samples/sampleDesc.tex @@ -1,12 +1,12 @@ - % 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 } +% 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} @@ -18,15 +18,15 @@ \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}{ @@ -42,7 +42,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}. diff --git a/macros/latex/contrib/glossaries/samples/sampleEq.pdf b/macros/latex/contrib/glossaries/samples/sampleEq.pdf Binary files differindex 37a7d5cfe8..e8c8bbdfab 100644 --- a/macros/latex/contrib/glossaries/samples/sampleEq.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleEq.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleEq.tex b/macros/latex/contrib/glossaries/samples/sampleEq.tex index 9fb85acaad..fb577e9874 100644 --- a/macros/latex/contrib/glossaries/samples/sampleEq.tex +++ b/macros/latex/contrib/glossaries/samples/sampleEq.tex @@ -1,4 +1,8 @@ - % This file is public domain +% 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} @@ -12,18 +16,18 @@ \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, diff --git a/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf b/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf Binary files differindex 48cf778f0a..d8f45efa45 100644 --- a/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleEqPg.tex b/macros/latex/contrib/glossaries/samples/sampleEqPg.tex index d00d89ccaf..980cb82f34 100644 --- a/macros/latex/contrib/glossaries/samples/sampleEqPg.tex +++ b/macros/latex/contrib/glossaries/samples/sampleEqPg.tex @@ -1,26 +1,26 @@ - % 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 } +% 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} @@ -31,8 +31,8 @@ \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}} @@ -41,27 +41,27 @@ \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} diff --git a/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf b/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf Binary files differindex 72b64c8359..c29aff931f 100644 --- a/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.tex b/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.tex index 8ea1f3883c..c1a24c8f17 100644 --- a/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.tex +++ b/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.tex @@ -1,16 +1,16 @@ - % 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 } +% 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 @@ -18,21 +18,22 @@ \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}}} + \newacronym[description={Statistical pattern recognition technique~\protect\cite{svm}}, % acronym's description ]{svm}{svm}{support vector machine} @@ -49,7 +50,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). diff --git a/macros/latex/contrib/glossaries/samples/sampleNtn.pdf b/macros/latex/contrib/glossaries/samples/sampleNtn.pdf Binary files differindex 27c58518cc..c0ff5ea069 100644 --- a/macros/latex/contrib/glossaries/samples/sampleNtn.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleNtn.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleNtn.tex b/macros/latex/contrib/glossaries/samples/sampleNtn.tex index 639e6d0c7a..997f518f9a 100644 --- a/macros/latex/contrib/glossaries/samples/sampleNtn.tex +++ b/macros/latex/contrib/glossaries/samples/sampleNtn.tex @@ -1,25 +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 } - % arara: pdflatex: { synctex: on } +% 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}$}, @@ -41,7 +41,7 @@ name={$!$}, description={factorial}, sort=factorial} - % Main glossary definitions +% Main glossary definitions \newglossaryentry{gls:set}{name=set, description={A collection of distinct objects}} @@ -56,7 +56,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 @@ -65,6 +65,7 @@ separate glossary of terms and index of notation. The index of notation doesn't have associated numbers. \end{abstract} + \pagenumbering{roman} \tableofcontents diff --git a/macros/latex/contrib/glossaries/samples/samplePeople.pdf b/macros/latex/contrib/glossaries/samples/samplePeople.pdf Binary files differindex 48760f5264..d5c7d3a3fc 100644 --- a/macros/latex/contrib/glossaries/samples/samplePeople.pdf +++ b/macros/latex/contrib/glossaries/samples/samplePeople.pdf diff --git a/macros/latex/contrib/glossaries/samples/samplePeople.tex b/macros/latex/contrib/glossaries/samples/samplePeople.tex index 258dc3e8eb..4182dcabc1 100644 --- a/macros/latex/contrib/glossaries/samples/samplePeople.tex +++ b/macros/latex/contrib/glossaries/samples/samplePeople.tex @@ -1,10 +1,10 @@ - % 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 } +% 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} @@ -15,7 +15,7 @@ \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]{% diff --git a/macros/latex/contrib/glossaries/samples/sampleSec.pdf b/macros/latex/contrib/glossaries/samples/sampleSec.pdf Binary files differindex cd9ac522fe..10f71ff8bc 100644 --- a/macros/latex/contrib/glossaries/samples/sampleSec.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleSec.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleSec.tex b/macros/latex/contrib/glossaries/samples/sampleSec.tex index f9e5696671..975c51076d 100644 --- a/macros/latex/contrib/glossaries/samples/sampleSec.tex +++ b/macros/latex/contrib/glossaries/samples/sampleSec.tex @@ -1,9 +1,9 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } - % arara: pdflatex: { synctex: on } +% This file is public domain +% If you want to use arara, you need the following directives: +% arara: pdflatex: { synctex: on } +% arara: makeglossaries +% arara: pdflatex: { synctex: on } +% arara: pdflatex: { synctex: on } \documentclass{report} \usepackage[plainpages=false,colorlinks]{hyperref} diff --git a/macros/latex/contrib/glossaries/samples/sampleSort.pdf b/macros/latex/contrib/glossaries/samples/sampleSort.pdf Binary files differindex 107107912e..4b3be13c50 100644 --- a/macros/latex/contrib/glossaries/samples/sampleSort.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleSort.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleSort.tex b/macros/latex/contrib/glossaries/samples/sampleSort.tex index ee6350a360..6f83926710 100644 --- a/macros/latex/contrib/glossaries/samples/sampleSort.tex +++ b/macros/latex/contrib/glossaries/samples/sampleSort.tex @@ -1,19 +1,19 @@ - % 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 } +% 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 @@ -31,7 +31,7 @@ }% } - % Notation definitions +% Notation definitions \newglossaryentry{not:set}{type=notation, % glossary type name={$\mathcal{S}$}, @@ -48,7 +48,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}} @@ -56,7 +56,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} @@ -71,7 +71,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 @@ -79,6 +79,7 @@ called \texttt{notation} is defined, so that the document can have a separate glossary of terms, list of acronyms and index of notation. \end{abstract} + \pagenumbering{roman} \tableofcontents diff --git a/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf b/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf Binary files differindex 13b261d835..b4b75549e1 100644 --- a/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleaccsupp.tex b/macros/latex/contrib/glossaries/samples/sampleaccsupp.tex index 342902d8e5..ad1eb7bef1 100644 --- a/macros/latex/contrib/glossaries/samples/sampleaccsupp.tex +++ b/macros/latex/contrib/glossaries/samples/sampleaccsupp.tex @@ -1,8 +1,8 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } +% 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} @@ -39,5 +39,6 @@ \end{tabular} \end{center} + \printglossaries \end{document} diff --git a/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf b/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf Binary files differindex 3c1aef6115..c89060bb16 100644 --- a/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleacronyms.tex b/macros/latex/contrib/glossaries/samples/sampleacronyms.tex index f36d71ca1e..38fb336de7 100644 --- a/macros/latex/contrib/glossaries/samples/sampleacronyms.tex +++ b/macros/latex/contrib/glossaries/samples/sampleacronyms.tex @@ -1,8 +1,8 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } +% 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} @@ -11,24 +11,24 @@ \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} diff --git a/macros/latex/contrib/glossaries/samples/sampletree.pdf b/macros/latex/contrib/glossaries/samples/sampletree.pdf Binary files differindex ff20680ff1..fe99e848e0 100644 --- a/macros/latex/contrib/glossaries/samples/sampletree.pdf +++ b/macros/latex/contrib/glossaries/samples/sampletree.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampletree.tex b/macros/latex/contrib/glossaries/samples/sampletree.tex index 59f8ecd490..43c21518e4 100644 --- a/macros/latex/contrib/glossaries/samples/sampletree.tex +++ b/macros/latex/contrib/glossaries/samples/sampletree.tex @@ -1,15 +1,15 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } +% 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 diff --git a/macros/latex/contrib/glossaries/samples/sampleutf8.pdf b/macros/latex/contrib/glossaries/samples/sampleutf8.pdf Binary files differindex 935922047a..888b1a9928 100644 --- a/macros/latex/contrib/glossaries/samples/sampleutf8.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleutf8.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleutf8.tex b/macros/latex/contrib/glossaries/samples/sampleutf8.tex index ae3fea7ed0..94deb79ef9 100644 --- a/macros/latex/contrib/glossaries/samples/sampleutf8.tex +++ b/macros/latex/contrib/glossaries/samples/sampleutf8.tex @@ -1,8 +1,8 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex: { synctex: on } - % arara: makeglossaries - % arara: pdflatex: { synctex: on } +% 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} @@ -11,9 +11,9 @@ \makeglossaries - % Note that because the é is the first letter of the - % name, it needs to be grouped or it will cause a - % problem for \makefirstuc due to expansion issues. +% 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}} @@ -26,8 +26,8 @@ description=large deer} \newglossaryentry{mannerly}{name=mannerly, description=polite} - % The œ is not the first letter, so it doesn't need to - % be grouped. +% The œ is not the first letter, so it doesn't need to +% be grouped. \newglossaryentry{manoeuvre}{name={manœuvre}, description=planned and controlled movement} diff --git a/macros/latex/contrib/glossaries/samples/samplexdy.pdf b/macros/latex/contrib/glossaries/samples/samplexdy.pdf Binary files differindex 09ed5d568e..93a35e09cc 100644 --- a/macros/latex/contrib/glossaries/samples/samplexdy.pdf +++ b/macros/latex/contrib/glossaries/samples/samplexdy.pdf diff --git a/macros/latex/contrib/glossaries/samples/samplexdy2.pdf b/macros/latex/contrib/glossaries/samples/samplexdy2.pdf Binary files differindex 029f4bfb79..7519f29bae 100644 --- a/macros/latex/contrib/glossaries/samples/samplexdy2.pdf +++ b/macros/latex/contrib/glossaries/samples/samplexdy2.pdf diff --git a/macros/latex/contrib/glossaries/samples/samplexdy2.tex b/macros/latex/contrib/glossaries/samples/samplexdy2.tex index 4ed7bd7244..f8d707849f 100644 --- a/macros/latex/contrib/glossaries/samples/samplexdy2.tex +++ b/macros/latex/contrib/glossaries/samples/samplexdy2.tex @@ -1,18 +1,18 @@ - % 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 } +% 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} @@ -20,7 +20,7 @@ \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}} @@ -31,15 +31,15 @@ "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 diff --git a/macros/latex/contrib/glossaries/samples/samplexdy3.pdf b/macros/latex/contrib/glossaries/samples/samplexdy3.pdf Binary files differindex 14c420dcf3..323bc80c80 100644 --- a/macros/latex/contrib/glossaries/samples/samplexdy3.pdf +++ b/macros/latex/contrib/glossaries/samples/samplexdy3.pdf diff --git a/macros/latex/contrib/poemscol/poemscol.dtx b/macros/latex/contrib/poemscol/poemscol.dtx index a5ccbb380e..bc64abcd69 100644 --- a/macros/latex/contrib/poemscol/poemscol.dtx +++ b/macros/latex/contrib/poemscol/poemscol.dtx @@ -23,7 +23,7 @@ % \iffalse %<package>\NeedsTeXFormat{LaTeX2e}[1997/12/01] %<package>\ProvidesPackage{poemscol} -%<package> [2019/09/15 v3.13 poemscol file] +%<package> [2019/09/27 v3.14 poemscol file] % %<*driver> \documentclass{ltxdoc} @@ -38,7 +38,7 @@ %</driver> % \fi % -% \CheckSum{9913} +% \CheckSum{9920} % % \CharacterTable % {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -257,6 +257,7 @@ % of titles.} % \changes{v3.12}{2019/09/05}{Bug fix. Fix command clash with titlesec Manual revision} % \changes{v3.13}{2019/09/15}{Fixed subtitles in emendations and explanations, Fixed bug in sequencesectiontitlefirstline, changed sequence hierarchy of indentations, subsubsections of sequences no longer appear in contents} +% \changes{v3.14}{2019/09/27}{Bug fix: ifpagenumberinnotesfalse, Manual revision} % \DoNotIndex{\newcommand,\newenvironment,\def,\edef,\else,\renewcommand,\makeatletter,\makeatother} % \DoNotIndex{\abovedisplayskip,\belowdisplayskip,\abovedisplayshortskip,\belowdisplayshortskip} % \DoNotIndex{\newcommand, \section, \subsection, \subsubsection, @@ -289,15 +290,15 @@ % \textsc, \unskip} % \setcounter{IndexColumns}{2} % \MakeShortVerb{|} -% \def\fileversion{3.13} -% \def\filedate{15 September 2019} -% \def\docdate{15 September 2019} +% \def\fileversion{3.14} +% \def\filedate{27 September 2019} +% \def\docdate{27 September 2019} % \title{Typesetting Poetry Collections with % \textsf{poemscol}\thanks{This document corresponds to % \textsf{poemscol}~\fileversion, dated \filedate.}} % \author{John Burt % \\ \texttt{burt@brandeis.edu}} -% \date{15 September 2019} +% \date{27 September 2019} % \maketitle % \begin{abstract} \textsf{poemscol} provides commands for \LaTeX\ for % setting collections of poetry. It is especially suited for setting @@ -1857,7 +1858,10 @@ % the notes. To turn off the appearance of the page number in the % notes, issue |\putpagenumberinnotesfalse|. You may also not wish to % put the poem's title in the notes. To turn off the appearance of the -% poem's title in the notes, issue |\puttitleinnotesfalse|. +% poem's title in the notes, issue |\puttitleinnotesfalse|. \textsf{poemscol} assumes +% that the notes to a poem will begin with either the poem's title, or its page number, or both, +% so although you can set either boolean to ``false,'' don't set both of them to ``false." +% \textsf{poemscol} will let you do this, but the results will be strange. % % \goodbreak % \DescribeMacro{\contentsendnotesindent} @@ -3055,8 +3059,8 @@ %Extra Lines & |\poemtitlesecondlineindentamount| & |0pt| \\ %Poem Subtitle & |\poemsubtitleindentamount| & |\titleindentamount| \\ %Poem Section & |\poemsectiontitleindentamount| & |\titleindentamount| \\ -%Poem Subsection & |\poemsubsectiontitleindentamount| & |2 *\titleindentamount| \\ %Extra Lines & |\poemsectiontitlesecondlineindentamount| & |\titleindentamount| \\ +%Poem Subsection & |\poemsubsectiontitleindentamount| & | \titleindenttwoamount| \\ %Sequence & |\sequencetitleindentamount| & |0pt| \\ %Extra Lines & |\sequencetitlesecondlineindentamount| & |0pt| \\ %Sequence Subtitle & |\sequencesubtitleindent | & |\titleindentamount| \\ @@ -3096,19 +3100,13 @@ %Extra Lines & |\contentsvolumesectiontitlesecondlineindentamount| & |0pt| \\ %Poem & |\contentspoemtitleindentamount| & |\contentsindentoneamount| \\ %Extra Lines & |\contentspoemtitlesecondlineindentamount| & |\contentsindentoneamount| \\ -%Poem Subtitle & |\contentspoemsubtitleindentindentamount| & |\contentsindenttwoamount| \\ %Poem Section & |\contentspoemsectiontitleindentamount| & |\contentsindenttwoamount| \\ %Extra Lines & |\poemsectiontitlesecondlineindentamount| & |\contentsindenttwoamount| \\ %Sequence & |\contentssequencetitleindentamount| & |\contentsindentoneamount|\ \\ %Extra Lines & |\contentssequencetitlesecondlineindentamount| & |\contentsindentoneamount| \\ -%Sequence Subtitle & |\contentssequencesubtitleindenamountt | & |\contentsindentotwoamount| \\ -%Extra Lines & |\contentssequencesubtitlesecondlineindentamount| & |\contentsindenttwoamount| \\ %Sequence Section & |\contentssequencesectiontitleindentamount| & |\contentsindenttwoamount| \\ %Extra Lines & |\contentssequencesectiontitlesecondlineindentamount| & |\contentsindenttwoamount| \\ -%Sequence Section Subtitle & |\contentssequencesectionsubtitleindentamount| & |\contentsindentthreeamount| \\ -%Extra Lines & |\contentssequencesectionsubtitlesecondlineindentamount| & |\contentsindenthtreeamount| \\ %Sequence Subsection & |\contentssequencesubsectiontitleindentamount| & |\contentsindentthreeamount| \\ -%Sequence Subsubsection & |\contentssequencesubsubsectiontitleindentamount| & |\contentsindentfouramount| \\ %Appendix or Foreword & |\contentsappendixtitleindentamount| & |0pt| \\ %Notes Sections & |\contentsnotestitleindentamount| & |0pt| % @@ -5999,7 +5997,12 @@ \newcommand{\@poempagetotextnotes}[1]{% \immediate\write\textnotes{\string\par\string\argpageref\string{#1\string}\string\unskip}% \@pagemarktotextnotes{#1}} -\newcommand{\@poemtitletotextnotes}[1]{\literaltextnote{\textbf{#1}}} +\newcommand{\@poemtitletotextnotes}[1]{% +\ifputpagenumberinnotes% +\literaltextnote{\textbf{#1}}% +\else% +\literaltextnote{\par}\literaltextnote{\textbf{#1}}% +\fi} % \end{macrocode} % % \subsection{~Appendices, Forewords, Contents Entries} diff --git a/macros/latex/contrib/poemscol/poemscol.pdf b/macros/latex/contrib/poemscol/poemscol.pdf Binary files differindex 9a353d345c..ae971e19b9 100644 --- a/macros/latex/contrib/poemscol/poemscol.pdf +++ b/macros/latex/contrib/poemscol/poemscol.pdf diff --git a/macros/latex/contrib/upmethodology/src/UPMVERSION.def b/macros/latex/contrib/upmethodology/src/UPMVERSION.def index fbd7b4b22f..267de19319 100644 --- a/macros/latex/contrib/upmethodology/src/UPMVERSION.def +++ b/macros/latex/contrib/upmethodology/src/UPMVERSION.def @@ -1 +1 @@ -\def\UPMVERSION{20190917} +\def\UPMVERSION{20190928} diff --git a/macros/latex/contrib/upmethodology/src/upm_caution.pdf b/macros/latex/contrib/upmethodology/src/upm_caution.pdf Binary files differnew file mode 100644 index 0000000000..eb0fa4957a --- /dev/null +++ b/macros/latex/contrib/upmethodology/src/upm_caution.pdf diff --git a/macros/latex/contrib/upmethodology/src/upm_caution.png b/macros/latex/contrib/upmethodology/src/upm_caution.png Binary files differindex 892e28aad5..51c62e371f 100644 --- a/macros/latex/contrib/upmethodology/src/upm_caution.png +++ b/macros/latex/contrib/upmethodology/src/upm_caution.png diff --git a/macros/latex/contrib/upmethodology/src/upm_caution.svg b/macros/latex/contrib/upmethodology/src/upm_caution.svg new file mode 100644 index 0000000000..2e0e833f9c --- /dev/null +++ b/macros/latex/contrib/upmethodology/src/upm_caution.svg @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="459.36514mm" + height="403.86578mm" + viewBox="0 0 459.36514 403.86578" + version="1.1" + id="svg8" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="upm_caution.svg"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.35" + inkscape:cx="752.37725" + inkscape:cy="438.39011" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + showgrid="false" + fit-margin-top="1" + fit-margin-left="1" + fit-margin-right="1" + fit-margin-bottom="1" + inkscape:window-width="1920" + inkscape:window-height="1016" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Calque 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(266.72422,139.04175)"> + <path + style="fill:#000000;stroke-width:0.62582618" + d="m -212.60337,263.42429 c -20.40713,-2.18391 -38.15074,-14.72666 -47.23856,-33.39241 -4.4232,-9.08493 -5.88229,-15.5486 -5.88229,-26.05812 0,-9.97926 1.38896,-16.61129 5.16106,-24.64315 2.13063,-4.53669 170.094856,-285.58754 174.872396,-292.61014 2.80467,-4.12262 10.14804,-11.27841 14.78013,-14.40257 5.70158,-3.84549 13.43076,-7.30997 19.86487,-8.90409 7.84855,-1.94456 20.16195,-1.94025 28.0852,0.01 14.0265597,3.45225 27.3429997,12.69057 35.32656,24.50787 5.20966,7.71139 171.908824,286.69932 174.114994,291.39909 3.77147,8.03431 5.15993,14.66542 5.15993,24.64315 0,10.49408 -1.46147,16.98488 -5.84784,25.97179 -8.02871,16.44946 -21.03035,27.05403 -39.39326,32.13045 l -6.01974,1.66416 -174.292604,0.0774 c -95.860926,0.0426 -176.271806,-0.13441 -178.690846,-0.39328 z m 353.41703,-41.18362 c 4.09926,-2.01916 7.84833,-5.86726 9.77569,-10.03393 2.26834,-4.90381 2.30606,-11.50764 0.0924,-16.17113 -0.84707,-1.78445 -39.69986,-66.93911 -86.339554,-144.788154 -54.32854,-90.682917 -85.69897,-142.454558 -87.30276,-144.078583 -7.62051,-7.716653 -20.54911,-7.715273 -28.16218,0.0031 -1.60072,1.622843 -33.07831,53.57449 -87.302746,144.087313 -46.6397,77.852064 -85.49249,143.005384 -86.33954,144.785024 -1.22003,2.56328 -1.53635,4.21116 -1.52209,7.92942 0.0266,6.93942 2.9323,12.73748 8.19953,16.36143 5.60714,3.85782 -8.39743,3.59061 181.671766,3.46619 l 174.292594,-0.1141 z M -41.997334,182.98534 c -4.38549,-1.22063 -6.93988,-2.8342 -10.01226,-6.32461 -4.46309,-5.07034 -5.814,-12.64867 -3.49706,-19.61775 1.57453,-4.73601 6.82348,-9.99491 11.5871,-11.60905 7.68828,-2.60516 15.09255,-0.93488 20.69614,4.66871 7.87961,7.87961 7.87961,19.75688 0,27.63648 -5.18434,5.18435 -12.07655,7.11032 -18.77392,5.24622 z m 0,-80.10576 c -4.38549,-1.22062 -6.93988,-2.83419 -10.01226,-6.324604 -4.90404,-5.57129 -4.74558,-3.80848 -4.74558,-52.79273 0,-50.4000303 -0.29789,-47.6779503 5.89528,-53.87111 7.92613,-7.92613 19.71036,-7.92613 27.63648,0 6.19317,6.1931597 5.89529,3.4710797 5.89529,53.87111 0,50.40003 0.29788,47.67795 -5.89529,53.87112 -5.18434,5.184354 -12.07655,7.110324 -18.77392,5.246214 z" + id="path826" + inkscape:connector-curvature="0" /> + </g> +</svg> diff --git a/macros/latex/contrib/upmethodology/src/upm_info.pdf b/macros/latex/contrib/upmethodology/src/upm_info.pdf Binary files differnew file mode 100644 index 0000000000..09ff0ef1b4 --- /dev/null +++ b/macros/latex/contrib/upmethodology/src/upm_info.pdf diff --git a/macros/latex/contrib/upmethodology/src/upm_info.png b/macros/latex/contrib/upmethodology/src/upm_info.png Binary files differindex ea470f49af..ede9860e95 100644 --- a/macros/latex/contrib/upmethodology/src/upm_info.png +++ b/macros/latex/contrib/upmethodology/src/upm_info.png diff --git a/macros/latex/contrib/upmethodology/src/upm_info.svg b/macros/latex/contrib/upmethodology/src/upm_info.svg new file mode 100644 index 0000000000..a247c9d685 --- /dev/null +++ b/macros/latex/contrib/upmethodology/src/upm_info.svg @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="483.41724mm" + height="483.58493mm" + viewBox="0 0 483.41724 483.58493" + version="1.1" + id="svg8" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="upm_info.svg"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.35" + inkscape:cx="786.40841" + inkscape:cy="738.47373" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + showgrid="false" + fit-margin-top="1" + fit-margin-left="1" + fit-margin-right="1" + fit-margin-bottom="1" + inkscape:window-width="1920" + inkscape:window-height="1016" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Calque 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(275.7283,139.36375)"> + <path + style="fill:#000000;stroke-width:0.94228286" + d="M -50.629174,342.63035 C -148.23295,335.6258 -231.66491,270.94797 -262.44275,178.42896 c -13.72051,-41.24422 -16.01412,-86.353786 -6.55164,-128.854516 14.61802,-65.65686 56.78878,-122.656827 115.77775,-156.490604 51.23814,-29.38821 113.509446,-38.7035 171.966626,-25.72484 65.35134,14.50931 122.724244,56.898004 156.323384,115.496065 29.53965,51.518189 38.88881,113.716409 25.89205,172.255055 C 187.74026,214.67757 150.67357,268.6707 99.786306,302.4925 55.206316,332.12222 1.7426262,346.38883 -50.629174,342.63035 Z M 1.7888862,310.71155 C 90.655376,294.58538 158.39702,226.83612 174.33204,138.14903 176.82229,124.28935 177.75515,95.574844 176.19823,80.705324 165.8096,-18.51181 88.446736,-96.298711 -11.307384,-107.82805 c -14.32949,-1.65617 -44.71464,-0.70735 -58.72313,1.83371 -88.725516,16.094288 -156.229676,83.59845 -172.323966,172.323964 -2.54106,14.00849 -3.48988,44.393636 -1.83371,58.723136 5.62974,48.70962 26.59842,92.35266 60.8347,126.61795 33.57995,33.6084 77.34927,54.90662 124.836276,60.74555 12.49887,1.53685 47.96805,0.53421 60.3061002,-1.70471 z M -72.180314,222.05146 c -5.84584,-1.09145 -8.3517,-2.4051 -11.561623,-6.06101 -5.72662,-6.52227 -6.122841,-14.84656 -1.564029,-32.85907 2.988384,-11.80753 6.517502,-21.47779 23.878282,-65.42978 7.81983,-19.797306 14.21787,-37.076416 14.21787,-38.398026 0,-2.89548 -3.35806,-6.53144 -5.33249,-5.77378 -0.77969,0.2992 -1.94629,0.544 -2.59243,0.544 -2.98701,0 -11.02384,6.93723 -20.09923,17.34926 -10.479228,12.022606 -13.223316,14.391016 -15.611805,13.474466 -5.25969,-2.01833 -3.06198,-7.989866 7.276694,-19.771926 18.025341,-20.54187 36.562011,-31.87892 56.704351,-34.68047 8.94164,-1.24366 14.34434,-0.5838 20.8810302,2.55033 8.9149,4.2744 12.44687,14.77514 9.69678,28.82902 -0.99107,5.06472 -12.83123,38.496196 -31.0451802,87.658136 -5.07705,13.70363 -5.89677,19.26179 -3.23353,21.92503 3.93427,3.93427 11.28544,-1.04288 26.5802802,-17.99635 10.23477,-11.34466 12.58354,-12.99952 15.0086098,-10.57445 3.52307,3.52307 -1.3112798,12.59349 -13.3445798,25.03766 -22.9692802,23.75357 -51.3418102,37.63419 -69.8590002,34.17696 z m 56.16454,-189.094266 c -14.58873,-7.26987 -16.60484,-29.0672942 -3.86671,-41.8054222 13.9393902,-13.9393878 37.00993,-11.0148908 44.06881,5.586296 2.21956,5.22003 1.88071,15.5571272 -0.70558,21.5244162 -2.69677,6.222195 -10.50783,13.5736 -16.6437098,15.66431 -7.10534001,2.42104 -16.8810102,2.00627 -22.8528102,-0.9696 z" + id="path826" + inkscape:connector-curvature="0" /> + </g> +</svg> diff --git a/macros/latex/contrib/upmethodology/src/upm_question.pdf b/macros/latex/contrib/upmethodology/src/upm_question.pdf Binary files differnew file mode 100644 index 0000000000..d77f42de75 --- /dev/null +++ b/macros/latex/contrib/upmethodology/src/upm_question.pdf diff --git a/macros/latex/contrib/upmethodology/src/upm_question.png b/macros/latex/contrib/upmethodology/src/upm_question.png Binary files differindex a959004aa7..a69a07dee7 100644 --- a/macros/latex/contrib/upmethodology/src/upm_question.png +++ b/macros/latex/contrib/upmethodology/src/upm_question.png diff --git a/macros/latex/contrib/upmethodology/src/upm_question.svg b/macros/latex/contrib/upmethodology/src/upm_question.svg new file mode 100644 index 0000000000..88911f8f37 --- /dev/null +++ b/macros/latex/contrib/upmethodology/src/upm_question.svg @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="272.62253mm" + height="272.69568mm" + viewBox="0 0 272.62253 272.69568" + version="1.1" + id="svg8" + inkscape:version="0.92.3 (2405546, 2018-03-11)" + sodipodi:docname="upm_question.svg"> + <defs + id="defs2" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.7" + inkscape:cx="284.24507" + inkscape:cy="557.15914" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + showgrid="false" + fit-margin-top="1" + fit-margin-left="1" + fit-margin-right="1" + fit-margin-bottom="1" + inkscape:window-width="1920" + inkscape:window-height="1016" + inkscape:window-x="0" + inkscape:window-y="27" + inkscape:window-maximized="1" /> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Calque 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(82.263126,11.644881)"> + <path + style="fill:#000000;stroke-width:0.26458332" + d="m 47.696668,259.83414 c -53.2068575,-2.50997 -99.768707,-35.83013 -119.592857,-85.58191 -10.87333,-27.2883 -12.3394,-58.55107 -4.08835,-87.180208 6.35254,-22.041762 17.96837,-41.669022 34.37821,-58.088835 21.37988,-21.3928775 48.4781595,-34.7253809 78.45901,-38.6022619 10.57707,-1.3677421 23.818756,-1.3677421 34.395829,0 29.89096,3.865258 57.06573,17.2143174 78.32385,38.4750189 14.21716,14.218887 24.74675,30.620937 31.59834,49.221067 9.68204,26.283999 10.82247,56.070249 3.18588,83.210629 -13.78275,48.98375 -54.38371,86.46101 -104.157021,96.14355 -7.278023,1.41581 -12.464017,2.02753 -20.460424,2.41345 -5.734372,0.27673 -5.95754,0.27654 -12.042467,-0.0106 z m 13.100801,-17.1949 c 36.472887,-2.16696 69.087171,-20.41893 90.287381,-50.52764 4.57375,-6.49567 9.66356,-15.92252 12.71417,-23.54791 12.50792,-31.26516 11.05543,-66.66762 -3.9666,-96.68055 -4.15086,-8.293118 -9.3939,-16.257772 -15.51756,-23.572575 C 141.45109,44.889743 133.27988,36.789707 129.72142,33.844244 102.4261,11.25089 67.362146,2.0589791 32.619341,8.3892255 12.849791,11.991298 -5.6954795,20.677504 -21.487939,33.731923 c -3.65673,3.022738 -11.80419,11.088814 -14.72573,14.578642 -27.3699,32.69377 -35.23711,76.390085 -20.9576,116.403355 9.19158,25.75615 27.93914,48.19964 51.9551995,62.19775 19.8162305,11.55018 43.0712805,17.09064 66.0135385,15.72757 z M 41.350595,190.5241 v -14.81667 h 14.816666 14.816665 v 14.81667 14.81667 H 56.167261 41.350595 Z m 0.0083,-34.99114 c 0.01468,-11.40727 1.317902,-18.13398 4.816347,-24.85992 3.258116,-6.2639 9.041895,-12.42289 21.236857,-22.61458 8.492331,-7.09729 13.036478,-11.248854 14.510549,-13.256938 2.629585,-3.58222 3.877989,-7.514201 3.877989,-12.214151 0,-5.697254 -1.732084,-10.008327 -5.744389,-14.297511 -5.60139,-5.987925 -13.707874,-8.848492 -23.756651,-8.383103 -8.213103,0.380376 -14.533218,2.898172 -19.833516,7.901239 -4.52386,4.270176 -7.34469,9.27224 -9.55034,16.935277 -0.51121,1.776079 -0.96859,3.26835 -1.0164,3.316158 -0.0478,0.04781 -0.90684,-0.03297 -1.90896,-0.179502 -1.00212,-0.146536 -7.29891,-0.927512 -13.9928605,-1.735505 -6.69396,-0.807992 -12.45352,-1.53112 -12.79903,-1.606949 -0.6121,-0.13434 -0.62347,-0.186661 -0.44402,-2.042808 0.84075,-8.696415 4.09672005,-17.077285 9.43042,-24.273885 1.94824,-2.628707 6.4672905,-7.345351 9.1285605,-9.527704 6.16061,-5.052002 13.69744,-8.821935 21.88403,-10.946455 14.294481,-3.709588 33.357741,-2.837921 46.720577,2.136301 5.68738,2.117085 12.154873,5.926008 16.438422,9.681142 9.33319,8.181831 14.59731,17.045373 16.30313,27.450643 0.60341,3.680675 0.54209,10.001533 -0.13014,13.413864 -2.33014,11.828257 -8.65027,20.065057 -28.43589,37.059477 -7.810084,6.7083 -9.259411,8.05632 -11.85419,11.02559 -4.216066,4.82455 -5.380249,8.59564 -5.703308,18.47452 L 70.37385,161.9491 H 55.862222 41.350595 Z" + id="path826" + inkscape:connector-curvature="0" /> + </g> +</svg> diff --git a/macros/latex/contrib/upmethodology/src/upmethodology-fmt.sty b/macros/latex/contrib/upmethodology/src/upmethodology-fmt.sty index bbdd4bce1e..776022789d 100644 --- a/macros/latex/contrib/upmethodology/src/upmethodology-fmt.sty +++ b/macros/latex/contrib/upmethodology/src/upmethodology-fmt.sty @@ -1,6 +1,6 @@ % Layout and Pagraph Format for Unified Process Methodology % -% Copyright (c) 2006-2009, 2012-2015 Stephane GALLAND <galland@arakhne.org> +% Copyright (c) 2006-2009, 2012-2019 Stephane GALLAND <galland@arakhne.org> % % This program is free library; you can redistribute it and/or modify % it under the terms of the GNU Lesser General Public License as @@ -17,7 +17,7 @@ % write to the Free Software Foundation, Inc., 59 Temple Place - Suite % 330, Boston, MA 02111-1307, USA. -\global\edef\upm@package@fmt@ver{2019/08/04} +\global\edef\upm@package@fmt@ver{2019/09/28} \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver] @@ -1370,34 +1370,54 @@ \newsavebox{\upm@highlight@box@save} -\newenvironment{upm@highligh@box}[2]{% +% Parameters are: +% #1: the width of the box +% #2: the name of the picture +% #3: the name of the border color +% #4: the name of the background color +% #5: the name of the text color +\newenvironment{upm@highligh@box}[5]{% \par \vspace{.5cm} \begin{tabular}{|p{#1}|} - \hline - \begin{window}[0,l,{\mbox{\includegraphics[width=1cm]{#2}}},{}] -}{% - \end{window}\\ \hline \end{tabular} + \arrayrulecolor{#3}% + \hline + \cellcolor{#4} + \begin{window}[0,l,{\mbox{\includegraphics[width=1cm]{#2}}},{}] + \color{#5} + }{% + \normalcolor\end{window}\\ \hline \end{tabular} \vspace{.5cm} \par } -\newenvironment{upmcaution}[1][\linewidth]{% - \upm@highligh@box{#1}{upm_caution.png}% +% Colors for the highligh boxes +\colorlet{highlightboxbackground_caution}{white} +\colorlet{highlightboxforeground_caution}{black} +\colorlet{highlightboxborder_caution}{black} +\colorlet{highlightboxbackground_info}{white} +\colorlet{highlightboxforeground_info}{black} +\colorlet{highlightboxborder_info}{black} +\colorlet{highlightboxbackground_question}{white} +\colorlet{highlightboxforeground_question}{black} +\colorlet{highlightboxborder_question}{black} + +\newenvironment{upmcaution}[1][.8\linewidth]{% + \bgroup\centering\upm@highligh@box{#1}{upm_caution.pdf}{highlightboxborder_caution}{highlightboxbackground_caution}{highlightboxforeground_caution}% }{% - \endupm@highligh@box% + \endupm@highligh@box\egroup% } -\newenvironment{upminfo}[1][\linewidth]{% - \upm@highligh@box{#1}{upm_info.png}% +\newenvironment{upminfo}[1][.8\linewidth]{% + \bgroup\centering\upm@highligh@box{#1}{upm_info.pdf}{highlightboxborder_info}{highlightboxbackground_info}{highlightboxforeground_info}% }{% - \endupm@highligh@box% + \endupm@highligh@box\egroup% } -\newenvironment{upmquestion}[1][\linewidth]{% - \upm@highligh@box{#1}{upm_question.png}% +\newenvironment{upmquestion}[1][.8\linewidth]{% + \bgroup\centering\upm@highligh@box{#1}{upm_question.pdf}{highlightboxborder_question}{highlightboxbackground_question}{highlightboxforeground_question}% }{% - \endupm@highligh@box% + \endupm@highligh@box\egroup% } %---------------------------------------- |