diff options
author | Karl Berry <karl@freefriends.org> | 2013-12-06 22:12:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2013-12-06 22:12:47 +0000 |
commit | cfbdc127e742f1a0758482a6e7c5f00985127ff6 (patch) | |
tree | a4c682376d022ca5c3c73595a489e32f26c66948 /Master/texmf-dist/source | |
parent | 7f304fc721af7e006a9209f30840ad96bfab1e9f (diff) |
glossaries (6dec13)
git-svn-id: svn://tug.org/texlive/trunk@32341 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source')
-rw-r--r-- | Master/texmf-dist/source/latex/glossaries/glossaries.dtx | 2268 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/glossaries/glossaries.ins | 7 |
2 files changed, 1741 insertions, 534 deletions
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx index b2d038a67ae..7ced9a3d178 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx @@ -28,7 +28,7 @@ % -author "Nicola Talbot" % -codetitle "Main Package Code" % glossaries -% Created on 2013/11/16 19:05 +% Created on 2013/12/5 15:12 %\fi %\iffalse %<*package> @@ -134,10 +134,11 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \doxitem{GlsKey}{key}{glossary keys} \doxitem{Style}{style}{glossary styles} \doxitem{Counter}{counter}{glossary counters} +\doxitem{AcrStyle}{acrstyle}{acronym styles} \setcounter{IndexColumns}{2} -\CheckSum{16348} +\CheckSum{17171} \newcommand*{\ifirstuse}{\iterm{first use}} \newcommand*{\firstuse}{\gls{firstuse}} @@ -165,12 +166,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of %\MakeShortVerb{"} %\DeleteShortVerb{\|} % -% \title{Documented Code For glossaries v4.01} +% \title{Documented Code For glossaries v4.02} % \author{Nicola L.C. Talbot\\[10pt] %Dickimaw Books\\ %\url{http://www.dickimaw-books.com/}} % -% \date{2013-11-16} +% \date{2013-12-05} % \maketitle % %This is the documented code for the \styfmt{glossaries} package. @@ -186,7 +187,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.01: +%For the main user guide, read \qt{glossaries.sty v4.02: %\LaTeX2e\ Package to Assist Generating Glossaries}. % %\item[\url{mfirstuc-manual.pdf}] @@ -230,7 +231,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of % This package requires \LaTeXe. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2013/11/16 v4.01 (NLCT)] +\ProvidesPackage{glossaries}[2013/12/05 v4.02 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -429,9 +430,10 @@ subsection,subsubsection,paragraph,subparagraph}[section]{% %\end{macro} %\begin{option}{numberedsection} %\changes{1.1}{2008 Feb 22}{numberedsection package option added} +%\changes{4.02}{2013-12-05}{added nameref option} % \begin{macrocode} \define@choicekey{glossaries.sty}{numberedsection}[\val\nr]{% -false,nolabel,autolabel}[nolabel]{% +false,nolabel,autolabel,nameref}[nolabel]{% \ifcase\nr\relax \renewcommand*{\@@glossarysecstar}{*}% \renewcommand*{\@@glossaryseclabel}{}% @@ -442,6 +444,11 @@ false,nolabel,autolabel}[nolabel]{% \renewcommand*{\@@glossarysecstar}{}% \renewcommand*{\@@glossaryseclabel}{% \label{\glsautoprefix\@glo@type}}% + \or + \renewcommand*{\@@glossarysecstar}{*}% + \renewcommand*{\@@glossaryseclabel}{% + \protected@edef\@currentlabelname{\glossarytoctitle}% + \label{\glsautoprefix\@glo@type}}% \fi } % \end{macrocode} @@ -1363,7 +1370,7 @@ deprecated}% %\end{option} % % \begin{macrocode} -\define@choicekey{sanitize}{sort}{true,false}[true]{% +\define@choicekey[gls]{sanitize}{sort}{true,false}[true]{% \setbool{glssanitizesort}{#1}% \ifglssanitizesort \glssetnoexpandfield{sortvalue}% @@ -1376,6 +1383,7 @@ deprecated}% % \end{macrocode} % %\begin{option}{sanitize} +% \changes{4.02}{2013-12-05}{fixed bug that caused an error here} % \begin{macrocode} \define@key{glossaries.sty}{sanitize}[description=true,symbol=true, name=true]{% @@ -1646,6 +1654,18 @@ name=true]{% % \end{macrocode} %\end{option} % +%\begin{option}{xindynoglsnumbers} +%\changes{4.02}{2013-12-05}{new} +% Provide a synonym for \texttt{xindy={glsnumbers=false}} that can +% be passed via the document class options. +% \begin{macrocode} +\@gls@declareoption{xindynoglsnumbers}{% + \glsxindytrue + \gls@xindy@glsnumbersfalse +} +% \end{macrocode} +%\end{option} +% %\begin{option}{savewrites} %\changes{3.0}{2011/04/02}{new} % The \pkgopt{savewrites} package option is provided to save on @@ -1697,29 +1717,76 @@ name=true]{% % Create a \qt{symbols} glossary type %\changes{3.11a}{2013-10-15}{new} % \begin{macrocode} -\newcommand{\@gls@do@symbolsdef}{} \@gls@declareoption{symbols}{% - \renewcommand{\@gls@do@symbolsdef}{% - \newglossary[slg]{symbols}{sls}{slo}{\glssymbolsgroupname}% - \newcommand*{\printsymbols}[1][]{\printglossary[type=symbols,#1]}% - }% + \let\@gls@do@symbolsdef\@gls@symbolsdef } % \end{macrocode} +% Default is not to define the symbols glossary: +% \begin{macrocode} +\newcommand*{\@gls@do@symbolsdef}{} +% \end{macrocode} %\end{option} +% +%\begin{macro}{\@gls@symbolsdef} +%\changes{4.02}{2013-12-05}{new} +% \begin{macrocode} +\newcommand*{\@gls@symbolsdef}{% + \newglossary[slg]{symbols}{sls}{slo}{\glssymbolsgroupname}% + \newcommand*{\printsymbols}[1][]{\printglossary[type=symbols,##1]}% +}% +% \end{macrocode} +%\end{macro} +% %\begin{option}{numbers} % Create a \qt{symbols} glossary type %\changes{3.11a}{2013-10-15}{new} % \begin{macrocode} -\newcommand{\@gls@do@numbersdef}{} \@gls@declareoption{numbers}{% - \renewcommand{\@gls@do@numbersdef}{% - \newglossary[nlg]{numbers}{nls}{nlo}{\glsnumbersgroupname}% - \newcommand*{\printnumbers}[1][]{\printglossary[type=numbers,#1]}% - }% + \let\@gls@do@numbersdef\@gls@numbersdef } % \end{macrocode} +% Default is not to define the numbers glossary: +% \begin{macrocode} +\newcommand*{\@gls@do@numbersdef}{} +% \end{macrocode} +%\end{option} +% +%\begin{macro}{\@gls@numbersdef} +%\changes{4.02}{2013-12-05}{new} +% \begin{macrocode} +\newcommand*{\@gls@numbersdef}{% + \newglossary[nlg]{numbers}{nls}{nlo}{\glsnumbersgroupname}% + \newcommand*{\printnumbers}[1][]{\printglossary[type=numbers,##1]}% +}% +% \end{macrocode} +%\end{macro} +% +%\begin{option}{index} +% Create an \qt{index} glossary type +%\changes{4.02}{2013-12-05}{new} +% \begin{macrocode} +\@gls@declareoption{index}{% + \let\@gls@do@indexdef\@gls@indexdef +} +% \end{macrocode} +% Default is not to define index glossary: +% \begin{macrocode} +\newcommand*{\@gls@do@indexdef}{} +% \end{macrocode} %\end{option} % +%\begin{macro}{\@gls@indexdef} +%\changes{4.02}{2013-12-05}{new} +% \begin{macrocode} +\newcommand*{\@gls@indexdef}{% + \newglossary[ilg]{index}{ind}{idx}{\indexname}% + \newcommand*{\printindex}[1][]{\printglossary[type=index,##1]}% + \newcommand*{\newterm}[2][]{% + \newglossaryentry{##2}% + {type={index},name={##2},description={\nopostdesc},##1}} +}% +% \end{macrocode} +%\end{macro} % % Process package options. First process any options that have been % passed via the document class. @@ -1752,7 +1819,7 @@ name=true]{% % to be disabled: % \begin{macrocode} \disable@keys{glossaries.sty}{compatible-2.07,% - xindy,xindygloss,makeindex,% + xindy,xindygloss,xindynoglsnumbers,makeindex,% acronym,translate,notranslate,nolong,nosuper,notree,nostyles,nomain} % \end{macrocode} %Now define \cs{setupglossaries}: @@ -1771,6 +1838,7 @@ name=true]{% \glsacrshortcutsfalse \let\@gls@do@numbersdef\relax \let\@gls@do@symbolssdef\relax + \let\@gls@do@indexdef\relax \let\@gls@do@acronymsdef\relax \setkeys{glossaries.sty}{#1}% \@gls@setacrstyle @@ -1778,6 +1846,7 @@ name=true]{% \@gls@do@acronymsdef \@gls@do@numbersdef \@gls@do@symbolssdef + \@gls@do@indexdef } % \end{macrocode} %\end{macro} @@ -2442,12 +2511,17 @@ name=true]{% %\changes{1.1}{2008 Feb 22}{numbered sections and auto label added} % \begin{macrocode} \newcommand*{\@glossarysection}[2]{% - \ifx\@@glossarysecstar\@empty + \ifdefempty\@@glossarysecstar + {% \csname\@@glossarysec\endcsname{#2}% - \else + }% + {% \csname\@@glossarysec\endcsname*{#2}% \@gls@toc{#1}{\@@glossarysec}% - \fi + }% +% \end{macrocode} +% Do automatic labelling if required +% \begin{macrocode} \@@glossaryseclabel } % \end{macrocode} @@ -2464,12 +2538,17 @@ name=true]{% \newcommand*{\@p@glossarysection}[2]{% \glsclearpage \phantomsection - \ifx\@@glossarysecstar\@empty + \ifdefempty\@@glossarysecstar + {% \csname\@@glossarysec\endcsname{#2}% - \else + }% + {% \@gls@toc{#1}{\@@glossarysec}% \csname\@@glossarysec\endcsname*{#2}% - \fi + }% +% \end{macrocode} +% Do automatic labelling if required +% \begin{macrocode} \@@glossaryseclabel } % \end{macrocode} @@ -3587,10 +3666,11 @@ name=true]{% % \begin{macrocode} \@gls@do@acronymsdef % \end{macrocode} -% Define the \qt{symbols} and \qt{numbers} glossaries if required. +% Define the \qt{symbols}, \qt{numbers} and \qt{index} glossaries if required. % \begin{macrocode} \@gls@do@symbolsdef \@gls@do@numbersdef +\@gls@do@indexdef % \end{macrocode} % % @@ -5523,6 +5603,191 @@ name=true]{% % \end{macrocode} %\end{macro} % +%\begin{macro}{\glsgenacfmt} +%\changes{4.02}{2013-12-05}{new} +% Define a generic acronym format that uses the \gloskey{long} and +% \gloskey{short} keys (or their plurals) and \ics{acrfullformat}, +% \ics{firstacronymfont} and \ics{acronymfont}. +% \begin{macrocode} +\newcommand*{\glsgenacfmt}{% + \ifdefempty\glscustomtext + {% + \ifglsused\glslabel + {% +% \end{macrocode} +% Subsequent use: +% \begin{macrocode} + \glsifplural + {% +% \end{macrocode} +% Subsequent plural form: +% \begin{macrocode} + \glscapscase + {% +% \end{macrocode} +% Subsequent plural form, don't adjust case: +% \begin{macrocode} + \acronymfont{\glsentryshortpl{\glslabel}}\glsinsert + }% + {% +% \end{macrocode} +% Subsequent plural form, make first letter upper case: +% \begin{macrocode} + \acronymfont{\Glsentryshortpl{\glslabel}}\glsinsert + }% + {% +% \end{macrocode} +% Subsequent plural form, all caps: +% \begin{macrocode} + \mfirstucMakeUppercase + {\acronymfont{\glsentryshortpl{\glslabel}}\glsinsert}% + }% + }% + {% +% \end{macrocode} +% Subsequent singular form +% \begin{macrocode} + \glscapscase + {% +% \end{macrocode} +% Subsequent singular form, don't adjust case: +% \begin{macrocode} + \acronymfont{\glsentryshort{\glslabel}}\glsinsert + }% + {% +% \end{macrocode} +% Subsequent singular form, make first letter upper case: +% \begin{macrocode} + \acronymfont{\Glsentryshort{\glslabel}}\glsinsert + }% + {% +% \end{macrocode} +% Subsequent singular form, all caps: +% \begin{macrocode} + \mfirstucMakeUppercase + {\acronymfont{\glsentryshort{\glslabel}}\glsinsert}% + }% + }% + }% + {% +% \end{macrocode} +% First use: +% \begin{macrocode} + \glsifplural + {% +% \end{macrocode} +% First use plural form: +% \begin{macrocode} + \glscapscase + {% +% \end{macrocode} +% First use plural form, don't adjust case: +% \begin{macrocode} + \genplacrfullformat{\glslabel}{\glsinsert}% + }% + {% +% \end{macrocode} +% First use plural form, make first letter upper case: +% \begin{macrocode} + \Genplacrfullformat{\glslabel}{\glsinsert}% + }% + {% +% \end{macrocode} +% First use plural form, all caps: +% \begin{macrocode} + \mfirstucMakeUppercase + {\genplacrfullformat{\glslabel}{\glsinsert}}% + }% + }% + {% +% \end{macrocode} +% First use singular form +% \begin{macrocode} + \glscapscase + {% +% \end{macrocode} +% First use singular form, don't adjust case: +% \begin{macrocode} + \genacrfullformat{\glslabel}{\glsinsert}% + }% + {% +% \end{macrocode} +% First use singular form, make first letter upper case: +% \begin{macrocode} + \Genacrfullformat{\glslabel}{\glsinsert}% + }% + {% +% \end{macrocode} +% First use singular form, all caps: +% \begin{macrocode} + \mfirstucMakeUppercase + {\genacrfullformat{\glslabel}{\glsinsert}}% + }% + }% + }% + }% + {% +% \end{macrocode} +% User supplied text. +% \begin{macrocode} + \glscustomtext + }% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\genacrfullformat} +%\changes{4.02}{2013-12-05}{new} +%\begin{definition} +%\cs{genacrfullformat}\marg{label}\marg{insert} +%\end{definition} +% The full format used by \cs{glsgenacfmt} (singular). +% \begin{macrocode} +\newcommand*{\genacrfullformat}[2]{% + \glsentrylong{#1}#2\space + (\protect\firstacronymfont{\glsentryshort{#1}})% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\Genacrfullformat} +%\changes{4.02}{2013-12-05}{new} +%\begin{definition} +%\cs{Genacrfullformat}\marg{label}\marg{insert} +%\end{definition} +% As above but makes the first letter upper case. +% \begin{macrocode} +\newcommand*{\Genacrfullformat}[2]{% + \protected@edef\gls@text{\genacrfullformat{#1}{#2}}% + \xmakefirstuc\gls@text +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\genplacrfullformat} +%\changes{4.02}{2013-12-05}{new} +%\begin{definition} +%\cs{genplacrfullformat}\marg{label}\marg{insert} +%\end{definition} +% The full format used by \cs{glsgenacfmt} (plural). +% \begin{macrocode} +\newcommand*{\genplacrfullformat}[2]{% + \glsentrylongpl{#1}#2\space + (\protect\firstacronymfont{\glsentryshortpl{#1}})% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\Genplacrfullformat} +%\changes{4.02}{2013-12-05}{new} +%\begin{definition} +%\cs{Genplacrfullformat}\marg{label}\marg{insert} +%\end{definition} +% As above but makes the first letter upper case. +% \begin{macrocode} +\newcommand*{\Genplacrfullformat}[2]{% + \protected@edef\gls@text{\genplacrfullformat{#1}{#2}}% + \xmakefirstuc\gls@text +} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\glsdisplayfirst} % Deprecated. Kept for backward compatibility. %\changes{3.11a}{2013-10-15}{obsoleted} @@ -8875,8 +9140,13 @@ name=true]{% \let\glsifplural\@secondoftwo \let\glscapscase\@firstofthree \let\glsinsert\@empty +% \end{macrocode} +% Bug fix v4.02 removed \cs{acronymfont} from \cs{glscustomtext} +% (\cs{acronymfont} only designed for short form). +% \changes{4.02}{2013-12-05}{Removed \cs{acronymfont}} +% \begin{macrocode} \def\glscustomtext{% - \acronymfont{\glsentrylong{#2}}#3% + \glsentrylong{#2}#3% }% % \end{macrocode} % Call \cs{@gls@link} @@ -8920,8 +9190,13 @@ name=true]{% \let\glsifplural\@secondoftwo \let\glscapscase\@secondofthree \let\glsinsert\@empty +% \end{macrocode} +% Bug fix v4.02 removed \cs{acronymfont} from \cs{glscustomtext} +% (\cs{acronymfont} only designed for short form). +% \changes{4.02}{2013-12-05}{Removed \cs{acronymfont}} +% \begin{macrocode} \def\glscustomtext{% - \acronymfont{\Glsentrylong{#2}}#3% + \Glsentrylong{#2}#3% }% % \end{macrocode} % Call \cs{@gls@link} @@ -8965,8 +9240,13 @@ name=true]{% \let\glsifplural\@secondoftwo \let\glscapscase\@thirdofthree \let\glsinsert\@empty +% \end{macrocode} +% Bug fix v4.02 removed \cs{acronymfont} from \cs{glscustomtext} +% (\cs{acronymfont} only designed for short form). +% \changes{4.02}{2013-12-05}{Removed \cs{acronymfont}} +% \begin{macrocode} \def\glscustomtext{% - \mfirstucMakeUppercase{\acronymfont{\glsentrylong{#2}}#3}% + \mfirstucMakeUppercase{\glsentrylong{#2}#3}% }% % \end{macrocode} % Call \cs{@gls@link} @@ -9011,8 +9291,13 @@ name=true]{% \let\glsifplural\@firstoftwo \let\glscapscase\@firstofthree \let\glsinsert\@empty +% \end{macrocode} +% Bug fix v4.02 removed \cs{acronymfont} from \cs{glscustomtext} +% (\cs{acronymfont} only designed for short form). +% \changes{4.02}{2013-12-05}{Removed \cs{acronymfont}} +% \begin{macrocode} \def\glscustomtext{% - \acronymfont{\glsentrylongpl{#2}}#3% + \glsentrylongpl{#2}#3% }% % \end{macrocode} % Call \cs{@gls@link} @@ -9056,8 +9341,13 @@ name=true]{% \let\glsifplural\@firstoftwo \let\glscapscase\@secondofthree \let\glsinsert\@empty +% \end{macrocode} +% Bug fix v4.02 removed \cs{acronymfont} from \cs{glscustomtext} +% (\cs{acronymfont} only designed for short form). +% \changes{4.02}{2013-12-05}{Removed \cs{acronymfont}} +% \begin{macrocode} \def\glscustomtext{% - \acronymfont{\Glsentrylongpl{#2}}#3% + \Glsentrylongpl{#2}#3% }% % \end{macrocode} % Call \cs{@gls@link} @@ -9101,8 +9391,13 @@ name=true]{% \let\glsifplural\@firstoftwo \let\glscapscase\@thirdofthree \let\glsinsert\@empty +% \end{macrocode} +% Bug fix v4.02 removed \cs{acronymfont} from \cs{glscustomtext} +% (\cs{acronymfont} only designed for short form). +% \changes{4.02}{2013-12-05}{Removed \cs{acronymfont}} +% \begin{macrocode} \def\glscustomtext{% - \mfirstucMakeUppercase{\acronymfont{\glsentrylongpl{#2}}#3}% + \mfirstucMakeUppercase{\glsentrylongpl{#2}#3}% }% % \end{macrocode} % Call \cs{@gls@link} @@ -9491,9 +9786,10 @@ name=true]{% % Short cut macros to access full form: %\begin{macro}{\glsentryfull} %\changes{3.13a}{2013-11-05}{changed to use \cs{acrfullformat}} +%\changes{4.02}{2013-12-05}{bug fix: added missing \cs{acronymfont}} % \begin{macrocode} \newcommand*{\glsentryfull}[1]{% - \acrfullformat{\glsentrylong{#1}}{\glsentryshort{#1}}% + \acrfullformat{\glsentrylong{#1}}{\acronymfont{\glsentryshort{#1}}}% } % \end{macrocode} %\end{macro} @@ -9502,9 +9798,10 @@ name=true]{% %\changes{3.02}{2012/05/21}{fixed bug (replaced \cs{glsentryshortpl} %with \cs{glsentryshort})} %\changes{3.13a}{2013-11-05}{changed to use \cs{acrfullformat}} +%\changes{4.02}{2013-12-05}{bug fix: added missing \cs{acronymfont}} % \begin{macrocode} \newrobustcmd*{\Glsentryfull}[1]{% - \acrfullformat{\Glsentrylong{#1}}{\glsentryshort{#1}}% + \acrfullformat{\Glsentrylong{#1}}{\acronymfont{\glsentryshort{#1}}}% } % \end{macrocode} %\end{macro} @@ -9512,18 +9809,20 @@ name=true]{% %\changes{3.02}{2012/05/21}{fixed bug (replaced \cs{glsentryshort} %with \cs{glsentryshortpl})} %\changes{3.13a}{2013-11-05}{changed to use \cs{acrfullformat}} +%\changes{4.02}{2013-12-05}{bug fix: added missing \cs{acronymfont}} % \begin{macrocode} \newcommand*{\glsentryfullpl}[1]{% - \acrfullformat{\glsentrylongpl{#1}}{\glsentryshortpl{#1}}% + \acrfullformat{\glsentrylongpl{#1}}{\acronymfont{\glsentryshortpl{#1}}}% } % \end{macrocode} %\end{macro} %\begin{macro}{\Glsentryfullpl} %\changes{3.09a}{2013-10-09}{made robust} %\changes{3.13a}{2013-11-05}{changed to use \cs{acrfullformat}} +%\changes{4.02}{2013-12-05}{bug fix: added missing \cs{acronymfont}} % \begin{macrocode} \newrobustcmd*{\Glsentryfullpl}[1]{% - \acrfullformat{\Glsentrylongpl{#1}}{\glsentryshortpl{#1}}% + \acrfullformat{\Glsentrylongpl{#1}}{\acronymfont{\glsentryshortpl{#1}}}% } % \end{macrocode} %\end{macro} @@ -10284,6 +10583,11 @@ name=true]{% \fi } % \end{macrocode} +%\changes{4.02}{2013-13-05}{made preamble only} +% Must occur in the preamble: +% \begin{macrocode} +\@onlypreamble{\makeglossaries} +% \end{macrocode} %\end{macro} % % The \cs{makeglossary} command is redefined to be @@ -11092,17 +11396,23 @@ you % glossary should be in a numbered section. % \begin{macrocode} \define@choicekey{printgloss}{numberedsection}[\val\nr]{% -false,nolabel,autolabel}[nolabel]{% -\ifcase\nr\relax - \renewcommand*{\@@glossarysecstar}{*}% - \renewcommand*{\@@glossaryseclabel}{}% -\or - \renewcommand*{\@@glossarysecstar}{}% - \renewcommand*{\@@glossaryseclabel}{}% -\or - \renewcommand*{\@@glossarysecstar}{}% - \renewcommand*{\@@glossaryseclabel}{\label{\glsautoprefix\@glo@type}}% -\fi} +false,nolabel,autolabel,nameref}[nolabel]{% + \ifcase\nr\relax + \renewcommand*{\@@glossarysecstar}{*}% + \renewcommand*{\@@glossaryseclabel}{}% + \or + \renewcommand*{\@@glossarysecstar}{}% + \renewcommand*{\@@glossaryseclabel}{}% + \or + \renewcommand*{\@@glossarysecstar}{}% + \renewcommand*{\@@glossaryseclabel}{\label{\glsautoprefix\@glo@type}}% + \or + \renewcommand*{\@@glossarysecstar}{*}% + \renewcommand*{\@@glossaryseclabel}{% + \protected@edef\@currentlabelname{\glossarytoctitle}% + \label{\glsautoprefix\@glo@type}}% + \fi +} % \end{macrocode} % %\changes{3.08a}{2013-09-28}{added nogroupskip key to \cs{printglossary}} @@ -12099,9 +12409,30 @@ false,nolabel,autolabel}[nolabel]{% {\@acrfull{#1}{#2}[]}% } % \end{macrocode} +%\end{macro} +%\begin{macro}{\@acrfull} +%\changes{4.02}{2013-12-05}{now using \cs{acrfullfmt}} % Low-level macro: % \begin{macrocode} \def\@acrfull#1#2[#3]{% +% \end{macrocode} +% Make it easier for acronym styles to change this: +% \begin{macrocode} + \acrfullfmt{#1}{#2}{#3}% +} +% \end{macrocode} +%\end{macro} +% +% Using \cs{acrlinkfullformat} and \cs{acrfullformat} is now +% deprecated as it can cause complications with the first letter +% upper case variants, but the package needs to provide backward +% compatibility support. +% +%\begin{macro}{\acrfullfmt} +%\changes{4.02}{2013-12-05}{new} +% No case change full format. +% \begin{macrocode} +\newcommand*{\acrfullfmt}[3]{% \acrlinkfullformat{\@acrlong}{\@acrshort}{#1}{#2}{#3}% } % \end{macrocode} @@ -12149,6 +12480,19 @@ false,nolabel,autolabel}[nolabel]{% % Low-level macro: % \begin{macrocode} \def\@Acrfull#1#2[#3]{% +% \end{macrocode} +% Make it easier for acronym styles to change this: +% \begin{macrocode} + \Acrfullfmt{#1}{#2}{#3}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\Acrfullfmt} +%\changes{4.02}{2013-12-05}{new} +% First letter upper case full format. +% \begin{macrocode} +\newcommand*{\Acrfullfmt}[3]{% \acrlinkfullformat{\@Acrlong}{\@acrshort}{#1}{#2}{#3}% } % \end{macrocode} @@ -12175,11 +12519,25 @@ false,nolabel,autolabel}[nolabel]{% % Low-level macro: % \begin{macrocode} \def\@ACRfull#1#2[#3]{% +% \end{macrocode} +% Make it easier for acronym styles to change this: +% \begin{macrocode} + \ACRfullfmt{#1}{#2}{#3}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\ACRfullfmt} +%\changes{4.02}{2013-12-05}{new} +% All upper case full format. +% \begin{macrocode} +\newcommand*{\ACRfullfmt}[3]{% \acrlinkfullformat{\@ACRlong}{\@ACRshort}{#1}{#2}{#3}% } % \end{macrocode} %\end{macro} % +% % Plural: %\begin{macro}{\acrfullpl} %\changes{1.13}{2008 May 10}{new} @@ -12203,6 +12561,19 @@ false,nolabel,autolabel}[nolabel]{% % Low-level macro: % \begin{macrocode} \def\@acrfullpl#1#2[#3]{% +% \end{macrocode} +% Make it easier for acronym styles to change this: +% \begin{macrocode} + \acrfullplfmt{#1}{#2}{#3}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\acrfullplfmt} +%\changes{4.02}{2013-12-05}{new} +% No case change plural full format. +% \begin{macrocode} +\newcommand*{\acrfullplfmt}[3]{% \acrlinkfullformat{\@acrlongpl}{\@acrshortpl}{#1}{#2}{#3}% } % \end{macrocode} @@ -12230,11 +12601,25 @@ false,nolabel,autolabel}[nolabel]{% % Low-level macro: % \begin{macrocode} \def\@Acrfullpl#1#2[#3]{% - \acrlinkfullformat{\@Acrlongpl}{\@acrshortpl}{#1}{#2}{#3}% +% \end{macrocode} +% Make it easier for acronym styles to change this: +% \begin{macrocode} + \Acrfullplfmt{#1}{#2}{#3}% } % \end{macrocode} %\end{macro} % +%\begin{macro}{\Acrfullplfmt} +%\changes{4.02}{2013-12-05}{new} +% First letter upper case plural full format. +% \begin{macrocode} +\newcommand*{\Acrfullplfmt}[3]{% + \acrlinkfullformat{\@acrlongpl}{\@acrshortpl}{#1}{#2}{#3}% +} +% \end{macrocode} +%\end{macro} +% +% %\begin{macro}{\ACRfullpl} %\changes{1.13}{2008 May 10}{new} %\changes{3.01}{2011/04/12}{made robust} @@ -12257,6 +12642,19 @@ false,nolabel,autolabel}[nolabel]{% % Low-level macro: % \begin{macrocode} \def\@ACRfullpl#1#2[#3]{% +% \end{macrocode} +% Make it easier for acronym styles to change this: +% \begin{macrocode} + \ACRfullplfmt{#1}{#2}{#3}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\ACRfullplfmt} +%\changes{4.02}{2013-12-05}{new} +% All upper case plural full format. +% \begin{macrocode} +\newcommand*{\ACRfullplfmt}[3]{% \acrlinkfullformat{\@ACRlongpl}{\@ACRshortpl}{#1}{#2}{#3}% } % \end{macrocode} @@ -12312,6 +12710,829 @@ false,nolabel,autolabel}[nolabel]{% \newcommand*{\newacronymhook}{} % \end{macrocode} %\end{macro} +% +%\begin{macro}{\SetGenericNewAcronym} +% New improved version of setting the acronym style. +%\changes{4.02}{2013-12-05}{new} +% \begin{macrocode} +\newcommand*{\SetGenericNewAcronym}{% + \renewcommand{\newacronym}[4][]{% + \ifdefempty{\@glsacronymlists}% + {% + \def\@glo@type{\acronymtype}% + \setkeys{glossentry}{##1}% + \DeclareAcronymList{\@glo@type}% + }% + {}% + \glskeylisttok{##1}% + \glslabeltok{##2}% + \glsshorttok{##3}% + \glslongtok{##4}% + \newacronymhook + \protected@edef\@do@newglossaryentry{% + \noexpand\newglossaryentry{\the\glslabeltok}% + {% + type=\acronymtype,% + name={\expandonce{\acronymentry{##2}}},% + sort={\acronymsort{\the\glsshorttok}{\the\glslongtok}},% + text={\the\glsshorttok},% + short={\the\glsshorttok},% + shortplural={\the\glsshorttok\noexpand\acrpluralsuffix},% + long={\the\glslongtok},% + longplural={\the\glslongtok\noexpand\acrpluralsuffix},% + \GenericAcronymFields,% + \the\glskeylisttok + }% + }% + \@do@newglossaryentry + }% +% \end{macrocode} +% Make sure that \ics{acrfull} etc reflects the new style: +% \begin{macrocode} + \renewcommand*{\acrfullfmt}[3]{% + \glslink[##1]{##2}{\genacrfullformat{##2}{##3}}}% + \renewcommand*{\Acrfullfmt}[3]{% + \glslink[##1]{##2}{\Genacrfullformat{##2}{##3}}}% + \renewcommand*{\ACRfullfmt}[3]{% + \glslink[##1]{##2}{% + \mfirstucMakeUppercase{\genacrfullformat{##2}{##3}}}}% + \renewcommand*{\acrfullplfmt}[3]{% + \glslink[##1]{##2}{\genplacrfullformat{##2}{##3}}}% + \renewcommand*{\Acrfullplfmt}[3]{% + \glslink[##1]{##2}{\Genplacrfullformat{##2}{##3}}}% + \renewcommand*{\ACRfullplfmt}[3]{% + \glslink[##1]{##2}{% + \mfirstucMakeUppercase{\genplacrfullformat{##2}{##3}}}}% +% \end{macrocode} +% Make sure that \ics{glsentryfull} etc reflects the new style: +% \begin{macrocode} + \renewcommand*{\glsentryfull}[1]{\genacrfullformat{##1}{}}% + \renewcommand*{\Glsentryfull}[1]{\Genacrfullformat{##1}{}}% + \renewcommand*{\glsentryfullpl}[1]{\genplacrfullformat{##1}{}}% + \renewcommand*{\Glsentryfullpl}[1]{\Genplacrfullformat{##1}{}}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\GenericAcronymFields} +%\changes{4.02}{2013-12-05}{new} +% Fields used by \cs{SetGenericNewAcronym} that can be changed by +% the acronym style. +% \begin{macrocode} +\newcommand*{\GenericAcronymFields}{description={\the\glslongtok}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\acronymentry} +%\changes{4.02}{2013-12-05}{new} +%\begin{definition} +%\cs{acronymentry}\marg{label} +%\end{definition} +% Display style for the name field in the list of acronyms. +% \begin{macrocode} +\newcommand*{\acronymentry}[1]{\acronymfont{\glsentryshort{#1}}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\acronymsort} +%\begin{definition} +%\cs{acronymsort}\marg{short}\marg{long} +%\end{definition} +% Default sort format for acronyms. +% \begin{macrocode} +\newcommand*{\acronymsort}[2]{#1} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\setacronymstyle} +%\changes{4.02}{2013-12-05}{new} +%\begin{definition} +%\cs{setacronymstyle}\marg{style name} +%\end{definition} +% \begin{macrocode} +\newcommand*{\setacronymstyle}[1]{% + \ifcsundef{@glsacr@dispstyle@#1} + {% + \PackageError{glossaries}{Undefined acronym style `#1'}{}% + }% + {% + \ifdefempty{\@glsacronymlists}% + {% + \DeclareAcronymList{\acronymtype}% + }% + {}% + \SetGenericNewAcronym + \GlsUseAcrStyleDefs{#1}% + \@for\@gls@type:=\@glsacronymlists\do{% + \defglsentryfmt[\@gls@type]{\GlsUseAcrEntryDispStyle{#1}}% + }% + }% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\newacronymstyle} +%\changes{4.02}{2013-12-05}{new} +%\begin{definition} +%\cs{newacronymstyle}\marg{style name}\marg{entry format +%definition}\marg{display definitions} +%\end{definition} +% Defines a new acronym style called \meta{style name}. +% \begin{macrocode} +\newcommand*{\newacronymstyle}[3]{% + \ifcsdef{@glsacr@dispstyle@#1}% + {% + \PackageError{glossaries}{Acronym style `#1' already exists}{}% + }% + {% + \csdef{@glsacr@dispstyle@#1}{#2}% + \csdef{@glsacr@styledefs@#1}{#3}% + }% +} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\GlsUseAcrEntryDispStyle} +%\changes{4.02}{2013-12-05}{new} +% \begin{macrocode} +\newcommand*{\GlsUseAcrEntryDispStyle}[1]{\csuse{@glsacr@dispstyle@#1}} +% \end{macrocode} +%\end{macro} +%\begin{macro}{\GlsUseAcrStyleDefs} +%\changes{4.02}{2013-12-05}{new} +% \begin{macrocode} +\newcommand*{\GlsUseAcrStyleDefs}[1]{\csuse{@glsacr@styledefs@#1}} +% \end{macrocode} +%\end{macro} +% +%Predefined acronym styles: +%\begin{acrstyle}{long-short} +%\changes{4.02}{2013-12-05}{new} +% \meta{long} (\meta{short}) acronym style. +% \begin{macrocode} +\newacronymstyle{long-short}% +{% +% \end{macrocode} +% Check for long form in case this is a mixed glossary. +% \begin{macrocode} + \ifglshaslong{\glslabel}{\glsgenacfmt}{\glsgenentryfmt}% +}% +{% + \renewcommand*{\GenericAcronymFields}{description={\the\glslongtok}}% + \renewcommand*{\genacrfullformat}[2]{% + \glsentrylong{##1}##2\space + (\protect\firstacronymfont{\glsentryshort{##1}})% + }% + \renewcommand*{\Genacrfullformat}[2]{% + \Glsentrylong{##1}##2\space + (\protect\firstacronymfont{\glsentryshort{##1}})% + }% + \renewcommand*{\genplacrfullformat}[2]{% + \glsentrylongpl{##1}##2\space + (\protect\firstacronymfont{\glsentryshortpl{##1}})% + }% + \renewcommand*{\Genplacrfullformat}[2]{% + \Glsentrylongpl{##1}##2\space + (\protect\firstacronymfont{\glsentryshortpl{##1}})% + }% + \renewcommand*{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}} + \renewcommand*{\acronymsort}[2]{##1}% + \renewcommand*{\acronymfont}[1]{##1}% + \renewcommand*{\firstacronymfont}[1]{\acronymfont{##1}}% + \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}% +} +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{short-long} +%\changes{4.02}{2013-12-05}{new} +% \meta{short} (\meta{long}) acronym style. +% \begin{macrocode} +\newacronymstyle{short-long}% +{% +% \end{macrocode} +% Check for long form in case this is a mixed glossary. +% \begin{macrocode} + \ifglshaslong{\glslabel}{\glsgenacfmt}{\glsgenentryfmt}% +}% +{% + \renewcommand*{\GenericAcronymFields}{description={\the\glslongtok}}% + \renewcommand*{\genacrfullformat}[2]{% + \protect\firstacronymfont{\glsentryshort{##1}}##2\space + (\glsentrylong{##1})% + }% + \renewcommand*{\Genacrfullformat}[2]{% + \protect\firstacronymfont{\Glsentryshort{##1}}##2\space + (\glsentrylong{##1})% + }% + \renewcommand*{\genplacrfullformat}[2]{% + \protect\firstacronymfont{\glsentryshortpl{##1}}##2\space + (\glsentrylongpl{##1})% + }% + \renewcommand*{\Genplacrfullformat}[2]{% + \protect\firstacronymfont{\Glsentryshortpl{##1}}##2\space + (\glsentrylongpl{##1})% + }% + \renewcommand*{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}} + \renewcommand*{\acronymsort}[2]{##1}% + \renewcommand*{\acronymfont}[1]{##1}% + \renewcommand*{\firstacronymfont}[1]{\acronymfont{##1}}% + \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}% +} +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{long-sc-short} +%\changes{4.02}{2013-12-05}{new} +% \meta{long} (\cs{textsc}\marg{short}) acronym style. +% \begin{macrocode} +\newacronymstyle{long-sc-short}% +{% + \GlsUseAcrEntryDispStyle{long-short}% +}% +{% + \GlsUseAcrStyleDefs{long-short}% + \renewcommand{\acronymfont}[1]{\textsc{##1}}% + \renewcommand*{\acrpluralsuffix}{\glstextup{\glspluralsuffix}}% +} +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{long-sm-short} +%\changes{4.02}{2013-12-05}{new} +% \meta{long} (\cs{textsmaller}\marg{short}) acronym style. +% \begin{macrocode} +\newacronymstyle{long-sm-short}% +{% + \GlsUseAcrEntryDispStyle{long-short}% +}% +{% + \GlsUseAcrStyleDefs{long-short}% + \renewcommand{\acronymfont}[1]{\textsmaller{##1}}% + \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}% +} +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{sc-short-long} +%\changes{4.02}{2013-12-05}{new} +% \meta{short} (\cs{textsc}\marg{long}) acronym style. +% \begin{macrocode} +\newacronymstyle{sc-short-long}% +{% + \GlsUseAcrEntryDispStyle{short-long}% +}% +{% + \GlsUseAcrStyleDefs{short-long}% + \renewcommand{\acronymfont}[1]{\textsc{##1}}% + \renewcommand*{\acrpluralsuffix}{\glstextup{\glspluralsuffix}}% +} +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{sm-short-long} +%\changes{4.02}{2013-12-05}{new} +% \meta{short} (\cs{textsmaller}\marg{long}) acronym style. +% \begin{macrocode} +\newacronymstyle{sm-short-long}% +{% + \GlsUseAcrEntryDispStyle{short-long}% +}% +{% + \GlsUseAcrStyleDefs{short-long}% + \renewcommand{\acronymfont}[1]{\textsmaller{##1}}% + \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}% +} +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{long-short-desc} +%\changes{4.02}{2013-12-05}{new} +% \meta{long} (\marg{short}) acronym style that has an +% accompanying description (which the user needs to supply). +% \begin{macrocode} +\newacronymstyle{long-short-desc}% +{% + \GlsUseAcrEntryDispStyle{long-short}% +}% +{% + \GlsUseAcrStyleDefs{long-short}% + \renewcommand*{\GenericAcronymFields}{}% + \renewcommand*{\acronymsort}[2]{##2}% + \renewcommand*{\acronymentry}[1]{% + \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}% +} +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{long-sc-short-desc} +%\changes{4.02}{2013-12-05}{new} +% \meta{long} (\cs{textsc}\marg{short}) acronym style that has an +% accompanying description (which the user needs to supply). +% \begin{macrocode} +\newacronymstyle{long-sc-short-desc}% +{% + \GlsUseAcrEntryDispStyle{long-sc-short}% +}% +{% + \GlsUseAcrStyleDefs{long-sc-short}% + \renewcommand*{\GenericAcronymFields}{}% + \renewcommand*{\acronymsort}[2]{##2}% + \renewcommand*{\acronymentry}[1]{% + \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}% +} +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{long-sm-short-desc} +%\changes{4.02}{2013-12-05}{new} +% \meta{long} (\cs{textsmaller}\marg{short}) acronym style that has an +% accompanying description (which the user needs to supply). +% \begin{macrocode} +\newacronymstyle{long-sm-short-desc}% +{% + \GlsUseAcrEntryDispStyle{long-sm-short}% +}% +{% + \GlsUseAcrStyleDefs{long-sm-short}% + \renewcommand*{\GenericAcronymFields}{}% + \renewcommand*{\acronymsort}[2]{##2}% + \renewcommand*{\acronymentry}[1]{% + \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}% +} +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{short-long-desc} +%\changes{4.02}{2013-12-05}{new} +% \meta{short} (\marg{long}) acronym style that has an +% accompanying description (which the user needs to supply). +% \begin{macrocode} +\newacronymstyle{short-long-desc}% +{% + \GlsUseAcrEntryDispStyle{short-long}% +}% +{% + \GlsUseAcrStyleDefs{short-long}% + \renewcommand*{\GenericAcronymFields}{}% + \renewcommand*{\acronymsort}[2]{##2}% + \renewcommand*{\acronymentry}[1]{% + \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}% +} +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{sc-short-long-desc} +%\changes{4.02}{2013-12-05}{new} +% \meta{long} (\cs{textsc}\marg{short}) acronym style that has an +% accompanying description (which the user needs to supply). +% \begin{macrocode} +\newacronymstyle{sc-short-long-desc}% +{% + \GlsUseAcrEntryDispStyle{sc-short-long}% +}% +{% + \GlsUseAcrStyleDefs{sc-short-long}% + \renewcommand*{\GenericAcronymFields}{}% + \renewcommand*{\acronymsort}[2]{##2}% + \renewcommand*{\acronymentry}[1]{% + \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}% +} +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{sm-short-long-desc} +%\changes{4.02}{2013-12-05}{new} +% \meta{long} (\cs{textsmaller}\marg{short}) acronym style that has an +% accompanying description (which the user needs to supply). +% \begin{macrocode} +\newacronymstyle{sm-short-long-desc}% +{% + \GlsUseAcrEntryDispStyle{sm-short-long}% +}% +{% + \GlsUseAcrStyleDefs{sm-short-long}% + \renewcommand*{\GenericAcronymFields}{}% + \renewcommand*{\acronymsort}[2]{##2}% + \renewcommand*{\acronymentry}[1]{% + \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}% +} +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{dua} +%\changes{4.02}{2013-12-05}{new} +% \meta{long} only acronym style. +% \begin{macrocode} +\newacronymstyle{dua}% +{% +% \end{macrocode} +% Check for long form in case this is a mixed glossary. +% \begin{macrocode} + \ifdefempty\glscustomtext + {% + \ifglshaslong{\glslabel}% + {% + \glsifplural + {% +% \end{macrocode} +% Plural form: +% \begin{macrocode} + \glscapscase + {% +% \end{macrocode} +% Plural form, don't adjust case: +% \begin{macrocode} + \glsentrylongpl{\glslabel}\glsinsert + }% + {% +% \end{macrocode} +% Plural form, make first letter upper case: +% \begin{macrocode} + \Glsentrylongpl{\glslabel}\glsinsert + }% + {% +% \end{macrocode} +% Plural form, all caps: +% \begin{macrocode} + \mfirstucMakeUppercase + {\glsentrylongpl{\glslabel}\glsinsert}% + }% + }% + {% +% \end{macrocode} +% Singular form +% \begin{macrocode} + \glscapscase + {% +% \end{macrocode} +% Singular form, don't adjust case: +% \begin{macrocode} + \glsentrylong{\glslabel}\glsinsert + }% + {% +% \end{macrocode} +% Subsequent singular form, make first letter upper case: +% \begin{macrocode} + \Glsentrylong{\glslabel}\glsinsert + }% + {% +% \end{macrocode} +% Subsequent singular form, all caps: +% \begin{macrocode} + \mfirstucMakeUppercase + {\glsentrylong{\glslabel}\glsinsert}% + }% + }% + }% + {% +% \end{macrocode} +% Not an acronym: +% \begin{macrocode} + \glsgenentryfmt + }% + }% + {\glscustomtext\glsinsert}% +}% +{% + \renewcommand*{\GenericAcronymFields}{description={\the\glslongtok}}% + \renewcommand*{\acrfullfmt}[3]{% + \glslink[##1]{##2}{\glsentryshort{##2}##3\space + (\acronymfont{\glsentryshort{##2}})}}% + \renewcommand*{\Acrfullfmt}[3]{% + \glslink[##1]{##2}{\Glsentrylong{##2}##3\space + (\acronymfont{\glsentryshort{##2}})}}% + \renewcommand*{\ACRfullfmt}[3]{% + \glslink[##1]{##2}{% + \mfirstucMakeUppercase{\glsentrylong{##2}##3\space + (\acronymfont{\glsentryshort{##2}})}}}% + \renewcommand*{\acrfullplfmt}[3]{% + \glslink[##1]{##2}{\glsentryshortpl{##2}##3\space + (\acronymfont{\glsentryshortpl{##2}})}}% + \renewcommand*{\Acrfullplfmt}[3]{% + \glslink[##1]{##2}{\Glsentryshortpl{##2}##3\space + (\acronymfont{\glsentryshortpl{##2}})}}% + \renewcommand*{\ACRfullplfmt}[3]{% + \glslink[##1]{##2}{% + \mfirstucMakeUppercase{\glsentrylongpl{##2}##3\space + (\acronymfont{\glsentryshortpl{##2}})}}}% + \renewcommand*{\glsentryfull}[1]{% + \glsentrylong{##1}\space(\acronymfont{\glsentryshort{##1}})% + }% + \renewcommand*{\Glsentryfull}[1]{% + \Glsentrylong{##1}\space(\acronymfont{\glsentryshort{##1}})% + }% + \renewcommand*{\glsentryfullpl}[1]{% + \glsentrylongpl{##1}\space(\acronymfont{\glsentryshortpl{##1}})% + }% + \renewcommand*{\Glsentryfullpl}[1]{% + \Glsentrylongpl{##1}\space(\acronymfont{\glsentryshortpl{##1}})% + }% + \renewcommand*{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}}% + \renewcommand*{\acronymsort}[2]{##1}% + \renewcommand*{\acronymfont}[1]{##1}% + \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}% +} +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{dua-desc} +%\changes{4.02}{2013-12-05}{new} +% \meta{long} only acronym style with user-supplied description. +% \begin{macrocode} +\newacronymstyle{dua-desc}% +{% + \GlsUseAcrEntryDispStyle{dua}% +}% +{% + \GlsUseAcrStyleDefs{dua}% + \renewcommand*{\GenericAcronymFields}{}% + \renewcommand*{\acronymentry}[1]{\acronymfont{\glsentrylong{##1}}} + \renewcommand*{\acronymsort}[2]{##2}% +}% +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{footnote} +%\changes{4.02}{2013-12-05}{new} +% \meta{short}\cs{footnote}\marg{long} acronym style. +% \begin{macrocode} +\newacronymstyle{footnote}% +{% +% \end{macrocode} +% Check for long form in case this is a mixed glossary. +% \begin{macrocode} + \ifglshaslong{\glslabel}{\glsgenacfmt}{\glsgenentryfmt}% +}% +{% + \renewcommand*{\GenericAcronymFields}{description={\the\glslongtok}}% +% \end{macrocode} +% Need to ensure hyperlinks are switched off on first use: +% \begin{macrocode} + \glshyperfirstfalse + \renewcommand*{\genacrfullformat}[2]{% + \protect\firstacronymfont{\glsentryshort{##1}}##2% + \protect\footnote{\glsentrylong{##1}}% + }% + \renewcommand*{\Genacrfullformat}[2]{% + \firstacronymfont{\Glsentryshort{##1}}##2% + \protect\footnote{\glsentrylong{##1}}% + }% + \renewcommand*{\genplacrfullformat}[2]{% + \protect\firstacronymfont{\glsentryshortpl{##1}}##2% + \protect\footnote{\glsentrylongpl{##1}}% + }% + \renewcommand*{\Genplacrfullformat}[2]{% + \protect\firstacronymfont{\Glsentryshortpl{##1}}##2% + \protect\footnote{\glsentrylongpl{##1}}% + }% + \renewcommand*{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}}% + \renewcommand*{\acronymsort}[2]{##1}% + \renewcommand*{\acronymfont}[1]{##1}% + \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}% +% \end{macrocode} +% Don't use footnotes for \ics{acrfull}: +% \begin{macrocode} + \renewcommand*{\acrfullfmt}[3]{% + \glslink[##1]{##2}{\acronymfont{\glsentryshort{##2}}##3\space + (\glsentrylong{##2})}}% + \renewcommand*{\Acrfullfmt}[3]{% + \glslink[##1]{##2}{\acronymfont{\Glsentryshort{##2}}##3\space + (\glsentrylong{##2})}}% + \renewcommand*{\ACRfullfmt}[3]{% + \glslink[##1]{##2}{% + \mfirstucMakeUppercase{\acronymfont{\glsentryshort{##2}}##3\space + (\glsentrylong{##2})}}}% + \renewcommand*{\acrfullplfmt}[3]{% + \glslink[##1]{##2}{\acronymfont{\glsentryshortpl{##2}}##3\space + (\glsentrylongpl{##2})}}% + \renewcommand*{\Acrfullplfmt}[3]{% + \glslink[##1]{##2}{\acronymfont{\Glsentryshortpl{##2}}##3\space + (\glsentrylongpl{##2})}}% + \renewcommand*{\ACRfullplfmt}[3]{% + \glslink[##1]{##2}{% + \mfirstucMakeUppercase{\acronymfont{\glsentryshortpl{##2}}##3\space + (\glsentrylongpl{##2})}}}% +% \end{macrocode} +% Similarly for \ics{glsentryfull} etc: +% \begin{macrocode} + \renewcommand*{\glsentryfull}[1]{% + \acronymfont{\glsentryshort{##1}}\space(\glsentrylong{##1})}% + \renewcommand*{\Glsentryfull}[1]{% + \acronymfont{\Glsentryshort{##1}}\space(\glsentrylong{##1})}% + \renewcommand*{\glsentryfullpl}[1]{% + \acronymfont{\glsentryshortpl{##1}}\space(\glsentrylongpl{##1})}% + \renewcommand*{\Glsentryfullpl}[1]{% + \acronymfont{\Glsentryshortpl{##1}}\space(\glsentrylongpl{##1})}% +} +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{footnote-sc} +%\changes{4.02}{2013-12-05}{new} +% \cs{textsc}\marg{short}\cs{footnote}\marg{long} acronym style. +% \begin{macrocode} +\newacronymstyle{footnote-sc}% +{% + \GlsUseAcrEntryDispStyle{footnote}% +}% +{% + \GlsUseAcrStyleDefs{footnote}% + \renewcommand{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}} + \renewcommand{\acronymfont}[1]{\textsc{##1}}% + \renewcommand*{\acrpluralsuffix}{\glstextup{\glspluralsuffix}}% +}% +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{footnote-sm} +%\changes{4.02}{2013-12-05}{new} +% \cs{textsmaller}\marg{short}\cs{footnote}\marg{long} acronym style. +% \begin{macrocode} +\newacronymstyle{footnote-sm}% +{% + \GlsUseAcrEntryDispStyle{footnote}% +}% +{% + \GlsUseAcrStyleDefs{footnote}% + \renewcommand{\acronymentry}[1]{\acronymfont{\glsentryshort{##1}}} + \renewcommand{\acronymfont}[1]{\textsmaller{##1}}% + \renewcommand*{\acrpluralsuffix}{\glspluralsuffix}% +}% +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{footnote-desc} +%\changes{4.02}{2013-12-05}{new} +% \meta{short}\cs{footnote}\marg{long} acronym style that has an +% accompanying description (which the user needs to supply). +% \begin{macrocode} +\newacronymstyle{footnote-desc}% +{% + \GlsUseAcrEntryDispStyle{footnote}% +}% +{% + \GlsUseAcrStyleDefs{footnote}% + \renewcommand*{\GenericAcronymFields}{}% + \renewcommand*{\acronymsort}[2]{##2}% + \renewcommand*{\acronymentry}[1]{% + \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}% +} +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{footnote-sc-desc} +%\changes{4.02}{2013-12-05}{new} +% \cs{textsc}\marg{short}\cs{footnote}\marg{long} acronym style that has an +% accompanying description (which the user needs to supply). +% \begin{macrocode} +\newacronymstyle{footnote-sc-desc}% +{% + \GlsUseAcrEntryDispStyle{footnote-sc}% +}% +{% + \GlsUseAcrStyleDefs{footnote-sc}% + \renewcommand*{\GenericAcronymFields}{}% + \renewcommand*{\acronymsort}[2]{##2}% + \renewcommand*{\acronymentry}[1]{% + \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}% +} +% \end{macrocode} +%\end{acrstyle} +% +%\begin{acrstyle}{footnote-sm-desc} +%\changes{4.02}{2013-12-05}{new} +% \cs{textsmaller}\marg{short}\cs{footnote}\marg{long} acronym style that has an +% accompanying description (which the user needs to supply). +% \begin{macrocode} +\newacronymstyle{footnote-sm-desc}% +{% + \GlsUseAcrEntryDispStyle{footnote-sm}% +}% +{% + \GlsUseAcrStyleDefs{footnote-sm}% + \renewcommand*{\GenericAcronymFields}{}% + \renewcommand*{\acronymsort}[2]{##2}% + \renewcommand*{\acronymentry}[1]{% + \glsentrylong{##1}\space (\acronymfont{\glsentryshort{##1}})}% +} +% \end{macrocode} +%\end{acrstyle} +% +% +% +%\begin{macro}{\DefineAcronymSynonyms} +%\changes{2.04}{2009 November 10}{new} +% \begin{macrocode} +\newcommand*{\DefineAcronymSynonyms}{% +% \end{macrocode} +%\end{macro} +% Short form +%\begin{macro}{\acs} +% \begin{macrocode} + \let\acs\acrshort +% \end{macrocode} +%\end{macro} +% First letter uppercase short form +%\begin{macro}{\Acs} +% \begin{macrocode} + \let\Acs\Acrshort +% \end{macrocode} +%\end{macro} +% Plural short form +%\begin{macro}{\acsp} +% \begin{macrocode} + \let\acsp\acrshortpl +% \end{macrocode} +%\end{macro} +% First letter uppercase plural short form +%\begin{macro}{\Acsp} +% \begin{macrocode} + \let\Acsp\Acrshortpl +% \end{macrocode} +%\end{macro} +% Long form +%\begin{macro}{\acl} +% \begin{macrocode} + \let\acl\acrlong +% \end{macrocode} +%\end{macro} +% Plural long form +%\begin{macro}{\aclp} +% \begin{macrocode} + \let\aclp\acrlongpl +% \end{macrocode} +%\end{macro} +% First letter upper case long form +%\begin{macro}{\Acl} +% \begin{macrocode} + \let\Acl\Acrlong +% \end{macrocode} +%\end{macro} +% First letter upper case plural long form +%\begin{macro}{\Aclp} +% \begin{macrocode} + \let\Aclp\Acrlongpl +% \end{macrocode} +%\end{macro} +% Full form +%\begin{macro}{\acf} +% \begin{macrocode} + \let\acf\acrfull +% \end{macrocode} +%\end{macro} +% Plural full form +%\begin{macro}{\acfp} +% \begin{macrocode} + \let\acfp\acrfullpl +% \end{macrocode} +%\end{macro} +% First letter upper case full form +%\begin{macro}{\Acf} +% \begin{macrocode} + \let\Acf\Acrfull +% \end{macrocode} +%\end{macro} +% First letter upper case plural full form +%\begin{macro}{\Acfp} +% \begin{macrocode} + \let\Acfp\Acrfullpl +% \end{macrocode} +%\end{macro} +% Standard form +%\begin{macro}{\ac} +% \begin{macrocode} + \let\ac\gls +% \end{macrocode} +%\end{macro} +% First upper case standard form +%\begin{macro}{\Ac} +% \begin{macrocode} + \let\Ac\Gls +% \end{macrocode} +%\end{macro} +% Standard plural form +%\begin{macro}{\acp} +% \begin{macrocode} + \let\acp\glspl +% \end{macrocode} +%\end{macro} +% Standard first letter upper case plural form +%\begin{macro}{\Acp} +% \begin{macrocode} + \let\Acp\Glspl +% \end{macrocode} +%\end{macro} +% \begin{macrocode} +} +% \end{macrocode} +% Define synonyms if required +% \begin{macrocode} +\ifglsacrshortcuts + \DefineAcronymSynonyms +\fi +% \end{macrocode} +% +% These commands for setting the style are now deprecated but are +% kept for backward compatibility. +% %\begin{macro}{\SetDefaultAcronymDisplayStyle} % Sets the default acronym display style for given glossary. %\changes{2.04}{2009 November 10}{new} @@ -12441,23 +13662,31 @@ false,nolabel,autolabel}[nolabel]{% % \begin{macrocode} \newcommand*{\SetDescriptionFootnoteAcronymDisplayStyle}[1]{% \defglsentryfmt[#1]{% - \ifglsused{\glslabel}% - {% - \acronymfont{\glsgenentryfmt}% - }% - {% - \firstacronymfont{\glsgenentryfmt}% - \ifglshassymbol{\glslabel}% - {% - \expandafter\protect\expandafter\acrfootnote\expandafter - {\@gls@link@opts}{\@gls@link@label}% - {% - \glsifplural - {\glsentrysymbolplural{\glslabel}}% - {\glsentrysymbol{\glslabel}}% - }% - }% - }% +% \end{macrocode} +%\changes{4.02}{2013-12-05}{Moved check for empty custom text to prevent +%unwanted parenthetical material} +% \begin{macrocode} + \ifdefempty\glscustomtext + {% + \ifglsused{\glslabel}% + {% + \acronymfont{\glsgenentryfmt}% + }% + {% + \firstacronymfont{\glsgenentryfmt}% + \ifglshassymbol{\glslabel}% + {% + \expandafter\protect\expandafter\acrfootnote\expandafter + {\@gls@link@opts}{\@gls@link@label}% + {% + \glsifplural + {\glsentrysymbolplural{\glslabel}}% + {\glsentrysymbol{\glslabel}}% + }% + }% + }% + }% + {\glscustomtext\glsinsert}% }% } % \end{macrocode} @@ -12667,34 +13896,42 @@ false,nolabel,autolabel}[nolabel]{% % \begin{macrocode} \newcommand*{\SetDescriptionAcronymDisplayStyle}[1]{% \defglsentryfmt[#1]{% - \ifglsused{\glslabel}% +% \end{macrocode} +%\changes{4.02}{2013-12-05}{Moved check for empty custom text to prevent +%unwanted parenthetical material} +% \begin{macrocode} + \ifdefempty\glscustomtext {% + \ifglsused{\glslabel}% + {% % \end{macrocode} % Move the inserted text outside of \cs{acronymfont} % \begin{macrocode} - \let\gls@org@insert\glsinsert - \let\glsinsert\@empty - \acronymfont{\glsgenentryfmt}\gls@org@insert - }% - {% - \glsgenentryfmt - \ifglshassymbol{\glslabel}% - {% - \glsifplural - {% - \def\@glo@symbol{\glsentrysymbolplural{\glslabel}}% - }% - {% - \def\@glo@symbol{\glsentrysymbol{\glslabel}}% - }% - \space(\protect\firstacronymfont - {\glscapscase - {\@glo@symbol} - {\@glo@symbol} - {\mfirstucMakeUppercase{\@glo@symbol}}})% - }% - {}% + \let\gls@org@insert\glsinsert + \let\glsinsert\@empty + \acronymfont{\glsgenentryfmt}\gls@org@insert + }% + {% + \glsgenentryfmt + \ifglshassymbol{\glslabel}% + {% + \glsifplural + {% + \def\@glo@symbol{\glsentrysymbolplural{\glslabel}}% + }% + {% + \def\@glo@symbol{\glsentrysymbol{\glslabel}}% + }% + \space(\protect\firstacronymfont + {\glscapscase + {\@glo@symbol} + {\@glo@symbol} + {\mfirstucMakeUppercase{\@glo@symbol}}})% + }% + {}% + }% }% + {\glscustomtext\glsinsert}% }% } % \end{macrocode} @@ -12800,31 +14037,39 @@ false,nolabel,autolabel}[nolabel]{% \newcommand*{\SetFootnoteAcronymDisplayStyle}[1]{% \defglsentryfmt[#1]{% % \end{macrocode} -% Move the inserted text outside of \cs{acronymfont} +%\changes{4.02}{2013-12-05}{Moved check for empty custom text to prevent +%unwanted parenthetical material} % \begin{macrocode} - \let\gls@org@insert\glsinsert - \let\glsinsert\@empty - \ifglsused{\glslabel}% + \ifdefempty\glscustomtext {% - \acronymfont{\glsgenentryfmt}\gls@org@insert - }% - {% - \firstacronymfont{\glsgenentryfmt}\gls@org@insert - \ifglshaslong{\glslabel}% +% \end{macrocode} +% Move the inserted text outside of \cs{acronymfont} +% \begin{macrocode} + \let\gls@org@insert\glsinsert + \let\glsinsert\@empty + \ifglsused{\glslabel}% {% - \expandafter\protect\expandafter\acrfootnote\expandafter - {\@gls@link@opts}{\@gls@link@label}% - {% - \glsifplural - {\glsentrylongpl{\glslabel}}% - {\glsentrylong{\glslabel}}% - }% + \acronymfont{\glsgenentryfmt}\gls@org@insert }% + {% + \firstacronymfont{\glsgenentryfmt}\gls@org@insert + \ifglshaslong{\glslabel}% + {% + \expandafter\protect\expandafter\acrfootnote\expandafter + {\@gls@link@opts}{\@gls@link@label}% + {% + \glsifplural + {\glsentrylongpl{\glslabel}}% + {\glsentrylong{\glslabel}}% + }% + }% % \end{macrocode} %\changes{3.13a}{2013-11-05}{fixed missing argument bug} % \begin{macrocode} - {}% + {}% + }% }% + {\glscustomtext\glsinsert}% }% } % \end{macrocode} @@ -12956,33 +14201,41 @@ false,nolabel,autolabel}[nolabel]{% \newcommand*{\SetSmallAcronymDisplayStyle}[1]{% \defglsentryfmt[#1]{% % \end{macrocode} -% Move the inserted text outside of \cs{acronymfont} +%\changes{4.02}{2013-12-05}{Moved check for empty custom text to prevent +%unwanted parenthetical material} % \begin{macrocode} - \let\gls@org@insert\glsinsert - \let\glsinsert\@empty - \ifglsused{\glslabel}% - {% - \acronymfont{\glsgenentryfmt}\gls@org@insert - }% + \ifdefempty\glscustomtext {% - \glsgenentryfmt - \ifglshassymbol{\glslabel}% +% \end{macrocode} +% Move the inserted text outside of \cs{acronymfont} +% \begin{macrocode} + \let\gls@org@insert\glsinsert + \let\glsinsert\@empty + \ifglsused{\glslabel}% {% - \glsifplural - {% - \def\@glo@symbol{\glsentrysymbolplural{\glslabel}}% - }% + \acronymfont{\glsgenentryfmt}\gls@org@insert + }% + {% + \glsgenentryfmt + \ifglshassymbol{\glslabel}% {% - \def\@glo@symbol{\glsentrysymbol{\glslabel}}% + \glsifplural + {% + \def\@glo@symbol{\glsentrysymbolplural{\glslabel}}% + }% + {% + \def\@glo@symbol{\glsentrysymbol{\glslabel}}% + }% + \space + (\glscapscase + {\firstacronymfont{\@glo@symbol}}% + {\firstacronymfont{\@glo@symbol}}% + {\firstacronymfont{\mfirstucMakeUppercase{\@glo@symbol}}})% }% - \space - (\glscapscase - {\firstacronymfont{\@glo@symbol}}% - {\firstacronymfont{\@glo@symbol}}% - {\firstacronymfont{\mfirstucMakeUppercase{\@glo@symbol}}})% + {}% }% - {}% }% + {\glscustomtext\glsinsert}% }% } % \end{macrocode} @@ -13314,118 +14567,6 @@ false,nolabel,autolabel}[nolabel]{% %\end{macro} % % -%\begin{macro}{\DefineAcronymSynonyms} -%\changes{2.04}{2009 November 10}{new} -% \begin{macrocode} -\newcommand*{\DefineAcronymSynonyms}{% -% \end{macrocode} -%\end{macro} -% Short form -%\begin{macro}{\acs} -% \begin{macrocode} - \let\acs\acrshort -% \end{macrocode} -%\end{macro} -% First letter uppercase short form -%\begin{macro}{\Acs} -% \begin{macrocode} - \let\Acs\Acrshort -% \end{macrocode} -%\end{macro} -% Plural short form -%\begin{macro}{\acsp} -% \begin{macrocode} - \let\acsp\acrshortpl -% \end{macrocode} -%\end{macro} -% First letter uppercase plural short form -%\begin{macro}{\Acsp} -% \begin{macrocode} - \let\Acsp\Acrshortpl -% \end{macrocode} -%\end{macro} -% Long form -%\begin{macro}{\acl} -% \begin{macrocode} - \let\acl\acrlong -% \end{macrocode} -%\end{macro} -% Plural long form -%\begin{macro}{\aclp} -% \begin{macrocode} - \let\aclp\acrlongpl -% \end{macrocode} -%\end{macro} -% First letter upper case long form -%\begin{macro}{\Acl} -% \begin{macrocode} - \let\Acl\Acrlong -% \end{macrocode} -%\end{macro} -% First letter upper case plural long form -%\begin{macro}{\Aclp} -% \begin{macrocode} - \let\Aclp\Acrlongpl -% \end{macrocode} -%\end{macro} -% Full form -%\begin{macro}{\acf} -% \begin{macrocode} - \let\acf\acrfull -% \end{macrocode} -%\end{macro} -% Plural full form -%\begin{macro}{\acfp} -% \begin{macrocode} - \let\acfp\acrfullpl -% \end{macrocode} -%\end{macro} -% First letter upper case full form -%\begin{macro}{\Acf} -% \begin{macrocode} - \let\Acf\Acrfull -% \end{macrocode} -%\end{macro} -% First letter upper case plural full form -%\begin{macro}{\Acfp} -% \begin{macrocode} - \let\Acfp\Acrfullpl -% \end{macrocode} -%\end{macro} -% Standard form -%\begin{macro}{\ac} -% \begin{macrocode} - \let\ac\gls -% \end{macrocode} -%\end{macro} -% First upper case standard form -%\begin{macro}{\Ac} -% \begin{macrocode} - \let\Ac\Gls -% \end{macrocode} -%\end{macro} -% Standard plural form -%\begin{macro}{\acp} -% \begin{macrocode} - \let\acp\glspl -% \end{macrocode} -%\end{macro} -% Standard first letter upper case plural form -%\begin{macro}{\Acp} -% \begin{macrocode} - \let\Acp\Glspl -% \end{macrocode} -%\end{macro} -% \begin{macrocode} -} -% \end{macrocode} -% Define synonyms if required -% \begin{macrocode} -\ifglsacrshortcuts - \DefineAcronymSynonyms -\fi -% \end{macrocode} -% % \subsection{Predefined Glossary Styles}\label{sec:code:styles} % The \sty{glossaries} bundle comes with some predefined glossary % styles. These need to be loaded now for the \pkgopt{style} option @@ -21212,6 +22353,22 @@ false,nolabel,autolabel}[nolabel]{% \makeglossaries + % Setup acronym fonts (e.g. \emph for short form on first use and + % \textbf for short form on subsequent use): +\renewcommand{\firstacronymfont}[1]{\emph{#1}} +\renewcommand{\acronymfont}[1]{\textbf{#1}} + % Apply the generic acronym style to just the "acronym" glossary: +\defglsentryfmt[acronym]{\glsgenacfmt} + + % Change acronym first use so that its displayed as + % short (long) +\renewcommand{\genacrfullformat}[2]{% + \glsentryshort{#1}#2 (\glsentrylong{#1})% +} +\renewcommand{\genplacrfullformat}[2]{% + \glsentryshortpl{#1}#2 (\glsentrylongpl{#1})% +} + \longnewglossaryentry{par}{name={par}}% {% A long description with a paragraph break. @@ -21233,6 +22390,12 @@ A \gls{sample} entry and \gls{aca}. Second use: \gls{aca}. Plurals: \glspl{sample}. Reset acronym\glsreset{aca}. First use: \glspl{aca}. Second use: \glspl{aca}. +\glsresetall +First letter upper case: \Gls{sample}. First use: \Gls{aca}. +Subsequent use: \Gls{aca}. +\glsresetall +Plurals: \Glspl{sample}. First use: \Glspl{aca}. Next: \Glspl{aca}. + If you want paragraph breaks in the description use \verb|\longnewglossaryentry|, as with entry \gls{par}. @@ -21312,50 +22475,124 @@ description={sweet, fleshy product of plant containing seed}} \usepackage[colorlinks]{hyperref} \usepackage[acronym, % create list of acronyms nomain, % don't need main glossary for this example - style=tree, % need a style that displays the symbol - hyperfirst=false% don't hyperlink first use ]{glossaries} \makeglossaries % This is a sample file to illustrate how to define a custom - % acronym. This example defines the acronym so that on first use - % it displays the short form in the text and places the long form - % and its description in a footnote. In the main body of the + % 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. - % In the list of acronyms, the long form is used as the name, the - % short form is used as the symbol and the user supplies the - % description when defining the acronym. - -\renewcommand*{\CustomAcronymFields}{% - name={\the\glslongtok},% - symbol={\MakeTextUppercase{\the\glsshorttok}},% - text={\textsc{\the\glsshorttok}},% - plural={\textsc{\the\glsshorttok}\noexpand\acrpluralsuffix}% +\newacronymstyle{custom-fn}% new style name +{% Check for long form in case of a mixed glossary + \ifglshaslong{\glslabel}{\glsgenacfmt}{\glsgenentryfmt}% +}% +{% Style definitions: + % User needs to supply the description: + \renewcommand*{\GenericAcronymFields}{}% + % Need to ensure hyperlinks are switched off on first use: + \glshyperfirstfalse + % Redefine the commands used by \glsgenacfmt on first use: + \renewcommand*{\genacrfullformat}[2]{% + \firstacronymfont{\glsentryshort{##1}}##2% + \footnote{\glsentrylong{##1}: \glsentrydesc{##1}}% + }% + \renewcommand*{\Genacrfullformat}[2]{% + \firstacronymfont{\Glsentryshort{##1}}##2% + \footnote{\glsentrylong{##1}: \glsentrydesc{##1}}% + }% + \renewcommand*{\genplacrfullformat}[2]{% + \firstacronymfont{\glsentryshortpl{##1}}##2% + \footnote{\glsentrylongpl{##1}: \glsentrydesc{##1}}% + }% + \renewcommand*{\Genplacrfullformat}[2]{% + \firstacronymfont{\Glsentryshortpl{##1}}##2% + \footnote{\glsentrylongpl{##1}: \glsentrydesc{##1}}% + }% + % Redefine the no-link full forms: + \renewcommand*{\glsentryfull}[1]{% + \glsentrylong{##1}\space(\acronymfont{\glsentryshort{##1}})% + }% + \renewcommand*{\Glsentryfull}[1]{% + \Glsentrylong{##1}\space(\acronymfont{\glsentryshort{##1}})% + }% + \renewcommand*{\glsentryfullpl}[1]{% + \glsentrylongpl{##1}\space(\acronymfont{\glsentryshortpl{##1}})% + }% + \renewcommand*{\Glsentryfullpl}[1]{% + \Glsentrylongpl{##1}\space(\acronymfont{\glsentryshortpl{##1}})% + }% + % Redefine the link full forms: + \renewcommand*{\acrfullfmt}[3]{% + \glslink[##1]{##2}{% + \glsentrylong{##2}##3\space(\acronymfont{\glsentryshort{##2}})% + }% + }% + \renewcommand*{\Acrfullfmt}[3]{% + \glslink[##1]{##2}{% + \Glsentrylong{##2}##3\space(\acronymfont{\glsentryshort{##2}})% + }% + }% + \renewcommand*{\ACRfullfmt}[3]{% + \glslink[##1]{##2}{% + \MakeTextUppercase{% + \glsentrylong{##2}##3\space + (\acronymfont{\glsentryshort{##2}})% + }% + }% + }% + \renewcommand*{\acrfullplfmt}[3]{% + \glslink[##1]{##2}{% + \glsentrylongpl{##2}##3\space + (\acronymfont{\glsentryshortpl{##2}})% + }% + }% + \renewcommand*{\Acrfullplfmt}[3]{% + \glslink[##1]{##2}{% + \Glsentrylongpl{##2}##3\space + (\acronymfont{\glsentryshortpl{##2}})% + }% + }% + \renewcommand*{\ACRfullplfmt}[3]{% + \glslink[##1]{##2}{% + \MakeTextUppercase{% + \glsentrylongpl{##2}##3\space + (\acronymfont{\glsentryshortpl{##2}})% + }% + }% + }% + % 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: + \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: + \renewcommand*{\acronymentry}[1]{% + \Glsentrylong{##1}\space(\MakeTextUppercase{\glsentryshort{##1}})}% } -\renewcommand*{\SetCustomDisplayStyle}[1]{% - \defglsentryfmt[#1]{\glsgenentryfmt - \ifglsused{\glslabel}{}{\footnote{\glsentrylong{\glslabel}}}}% -} + % Now set the new acronym style (to override the default style) +\setacronymstyle{custom-fn} - % Now set the custom acronym style (to override the default style) -\SetCustomStyle + % Set an appropriate glossary style: +\setglossarystyle{altlist} % 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} +documents}]{html}{html}{hyper text markup language} \newacronym[description={language used to describe the layout of a -document written in a markup language}]{css}{css}{Cascading Style -Sheet} +document written in a markup language}]{css}{css}{cascading style +sheet} \begin{document} @@ -21363,6 +22600,18 @@ Sheet} \gls{css}. \gls{html}. +No-link full forms: \glsentryfull{css}, \Glsentryfull{css}. +Linking full forms: \acrfull{css}, \Acrfull{css}, \ACRfull{css}. +Linking with insert: \acrfull{css}['s], \Acrfull{css}['s], +\ACRfull{css}['s]. + +Now test plurals. + +No-link full forms: \glsentryfullpl{html}, \Glsentryfullpl{html}. +Linking full forms: \acrfullpl{html}, \Acrfullpl{html}, \ACRfullpl{html}. +Linking with insert: \acrfullpl{html}['s], \Acrfullpl{html}['s], +\ACRfullpl{html}['s]. + \printglossaries \end{document} % \end{macrocode} @@ -21521,27 +22770,24 @@ Next use: \gls{sample}. \documentclass{report} \usepackage[colorlinks]{hyperref} -\usepackage[toc]{glossaries} +\usepackage[toc,index,nohypertypes={index}]{glossaries} \usepackage{glossary-mcols} -\newglossary[ilg]{index}{ind}{idx}{\indexname} - \makeglossaries -\newcommand*{\newterm}[2][]{% - \newglossaryentry{#2}{type={index},name={#2},description={\nopostdesc},#1}% -} - -% 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.) \newterm[name={dinosaur}]{ind-dinosaur} \newterm[name={Triassic}]{ind-triassic} -% define terms for the main glossary + % define terms for the main glossary \newglossaryentry{dinosaur}% {% @@ -21564,13 +22810,15 @@ Next use: \gls{sample}. \gls{Triassic} period. Examples of \glspl{dinosaur} include the \gls{triceratops}, the \gls{apatosaurus} and the \gls{stegosaurus}. +Indexed term: \gls{ind-dinosaur}. + \renewcommand*{\glsnamefont}[1]{\textbf{\makefirstuc{#1}}} \printglossary[style=long,nogroupskip] \renewcommand*{\glsnamefont}[1]{\textmd{#1}} -\printglossary[type=index,style=mcolindexgroup] +\printindex[style=mcolindexgroup] \end{document} % \end{macrocode} @@ -22423,11 +23671,13 @@ measured in kilograms. \usepackage[colorlinks,plainpages=false]{hyperref} \usepackage[style=long,% use 'long' style for the glossary toc,% add glossary to table of contents - smallcaps% Use small caps for acronyms ]{glossaries} \makeglossaries + % Set the acronym style +\setacronymstyle{long-sc-short} + \newacronym{svm}% label {svm}% abbreviation {support vector machine}% long form @@ -22521,24 +23771,20 @@ You don't need to worry about makeindex's special characters: \documentclass[a4paper]{report} \usepackage[colorlinks,plainpages=false]{hyperref} - \usepackage[acronym,% create 'acronym' glossary type nomain,% 'main' glossary not needed as using 'acronym' style=altlist, % use altlist style toc, % add the glossary to the table of contents - sanitize={description=false},% want to use description in main document - smallcaps,% - description% acronyms have a user-supplied description ]{glossaries} \makeglossaries +% Change the acronym style to long-sc-short-desc: +\setacronymstyle{long-sc-short-desc} + % Change the "see" items so that they use \acronymfont: \renewcommand*{\glsseeitemformat}[1]{\acronymfont{\glsentrytext{#1}}} -% Change the default style for the "name" key: -\renewcommand*{\acrnameformat}[2]{\acronymfont{#1} (#2)} - % Not using a font that supports bold smallcaps so change the way % the name is formatted in the glossary: @@ -22648,6 +23894,130 @@ one \gls[format=hyperbf]{svm}. %\fi %\iffalse % \begin{macrocode} +%<*sampleCustomAcr.tex> +% \end{macrocode} +%\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 } +\documentclass[a4paper]{report} + +\usepackage[colorlinks,plainpages=false]{hyperref} +\usepackage[acronym,% create 'acronym' glossary type + nomain,% 'main' glossary not needed as using 'acronym' + style=altlist, % use altlist style + toc, % add the glossary to the table of contents + ]{glossaries} + +\makeglossaries + + % Define a new acronym style called "altfn" that's based on the + % footnote-sc-desc style + +\newacronymstyle + {altfn}% style name + {% Inherit display style from "footnote-sc-desc" + \GlsUseAcrEntryDispStyle{footnote-sc-desc}% + }% + {% 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: + \renewcommand*{\genacrfullformat}[2]{% + \protect\firstacronymfont{\glsentryshort{##1}}##2% + \protect\footnote{\glsentrylong{##1}: \glsentrydesc{##1}}% + }% + % First use of \Gls: + \renewcommand*{\Genacrfullformat}[2]{% + \firstacronymfont{\Glsentryshort{##1}}##2% + \protect\footnote{\glsentrylong{##1}: \glsentrydesc{##1}}% + }% + % First use of \glspl: + \renewcommand*{\genplacrfullformat}[2]{% + \protect\firstacronymfont{\glsentryshortpl{##1}}##2% + \protect\footnote{\glsentrylongpl{##1}: \glsentrydesc{##1}}% + }% + % First use of \Glspl: + \renewcommand*{\Genplacrfullformat}[2]{% + \protect\firstacronymfont{\Glsentryshortpl{##1}}##2% + \protect\footnote{\glsentrylongpl{##1}: \glsentrydesc{##1}}% + }% + % Sort according to long form: + \renewcommand*{\acronymsort}[2]{##2}% + % Set the name (as displayed in the glossary) to long (short) + \renewcommand*{\acronymentry}[1]{% + \glsentrylong{##1} (\acronymfont{\glsentryshort{##1}})}% + % Since bold small caps isn't supported with this document's + % fonts, adjust \acronymfont so that it switches to medium + % small caps: + \renewcommand{\acronymfont}[1]{\textmd{\scshape ##1}}% + } + +% Now use this new style: +\setacronymstyle{altfn} + +% 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} + +\newacronym[description={Statistical pattern recognition technique +using the ``kernel trick''},% acronym's description +see={[see also]{svm}}, +]{ksvm}{ksvm}{kernel +support vector machine} + +\begin{document} +\tableofcontents + +\chapter{Support Vector Machines} + +The \gls{svm} is used widely in the area of pattern recognition. + % plural form with initial letter in uppercase: +\Glspl{svm} are \ldots + +Short version: \acrshort{svm}. Long version: \acrlong{svm}. Full +version: \acrfull{svm}. Description: \glsentrydesc{svm}. + +This is the entry in uppercase: \GLS{svm}. + +\chapter{Kernel Support Vector Machines} + +The \gls{ksvm} is \ifglsused{svm}{an}{a} \gls{svm} that uses +the so called ``kernel trick''. This is the entry's description without +a link: \glsentrydesc{ksvm}. + +\glsresetall +(Reset all.) +Possessive: \gls{ksvm}['s]. +Make the glossary entry number bold for this +one \gls[format=hyperbf]{svm}. + +\begin{thebibliography}{1} +\bibitem{svm} \ldots +\end{thebibliography} + +\printglossary + +\end{document} +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</sampleCustomAcr.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} %<*sampleDB.tex> % \end{macrocode} %\fi @@ -23333,6 +24703,95 @@ Bessel functions $Z_\nu(z)$ are solutions of %\fi %\iffalse % \begin{macrocode} +%<*sampleFnAcrDesc.tex> +% \end{macrocode} +%\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 } +\documentclass[a4paper]{report} + +\usepackage[colorlinks,plainpages=false]{hyperref} +\usepackage[acronym,% create 'acronym' glossary type + nomain,% 'main' glossary not needed as using 'acronym' + style=altlist, % use altlist style + toc, % add the glossary to the table of contents + ]{glossaries} + +\makeglossaries + + % Change the acronym style to a small-caps footnote style: +\setacronymstyle{footnote-sc-desc} + + % 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. +\renewcommand*{\acronymfont}[1]{\textmd{\scshape #1}} + + % 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} + +\newacronym[description={Statistical pattern recognition technique +using the ``kernel trick''},% acronym's description +see={[see also]{svm}}, +]{ksvm}{ksvm}{kernel +support vector machine} + +\begin{document} +\tableofcontents + +\chapter{Support Vector Machines} + +The \gls{svm} is used widely in the area of pattern recognition. + % plural form with initial letter in uppercase: +\Glspl{svm} are \ldots + +Short version: \acrshort{svm}. Long version: \acrlong{svm}. Full +version: \acrfull{svm}. Description: \glsentrydesc{svm}. + +This is the entry in uppercase: \GLS{svm}. + +\chapter{Kernel Support Vector Machines} + +The \gls{ksvm} is \ifglsused{svm}{an}{a} \gls{svm} that uses +the so called ``kernel trick''. This is the entry's description without +a link: \glsentrydesc{ksvm}. + +\glsresetall +Possessive: \gls{ksvm}['s]. +Make the glossary entry number bold for this +one \gls[format=hyperbf]{svm}. + +\begin{thebibliography}{1} +\bibitem{svm} \ldots +\end{thebibliography} + +\printglossary + +\end{document} +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</sampleFnAcrDesc.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} %<*sampleNtn.tex> % \end{macrocode} %\fi @@ -23849,259 +25308,6 @@ description=man-eating giant} %\fi %\iffalse % \begin{macrocode} -%<*samplexdy-compatible207.tex> -% \end{macrocode} -%\fi -%\iffalse -% \begin{macrocode} - % This file is public domain. - % - % *** The latest version of xindy fails on this example*** - % If xindy gives you the error - % "PROGN: variable SAMPLEXDY-MC207.XDY has no value" - % it may be related to the issue described in - % http://www.tug.org/pipermail/tex-live/2012-August/032260.html - % This is a problem with xindy not with makeglossaries. - % - % This is a sample document illustrating how to use the - % glossaries package with xindy using the compatibility option. - % To create the document: - % - % latex samplexdy-compatible207 - % makeglossaries samplexdy-compatible207 - % latex samplexdy-compatible207 - % - % If you don't have Perl installed, then use one of the - % following instead of makeglossaries: - % - % If you want to have a separate "Mc" letter group do: - % - % xindy -I xindy -M samplexdy-mc207 -t samplexdy-compatible207.glg -o samplexdy-compatible207.gls samplexdy-compatible207.glo - % - % Otherwise do: - % - % xindy -L english -C utf8 -I xindy -M samplexdy-compatible207 -t samplexdy-compatible207.glg -o samplexdy-compatible207.gls samplexdy-compatible207.glo - % -\documentclass{article} - -\usepackage[utf8]{inputenc} -\usepackage[T1]{fontenc} -\usepackage{fmtcount} - - % remove redefinition of \thepage below if you want to uncomment - % the following line: - % \usepackage[colorlinks]{hyperref} - -\usepackage[xindy,compatible-2.07,style=altlistgroup]{glossaries} - - % Define a new command to do bold italic (it uses \hyperbf - % rather than \textbf in case I later introduce hyperlinks - % - although I would have to remove the fancy page numbering - % if I wanted to do that): - -\newcommand*{\hyperbfit}[1]{\textit{\hyperbf{#1}}} - - % Need to add this to the list of attributes in order - % to use it with xindy: - % (This command will have no effect if \noist is used) - -\GlsAddXdyAttribute{hyperbfit} - - % Redefine the page numbers so that they appear as a word: - - \renewcommand*{\thepage}{\Numberstring{page}} - - % Need to add this to the list of location styles. - % \Numberstring{page} gets expanded to - % \protect \Numberstringnum {<n>} (where <n> is the page number) - % so need to define the location in that format: - % (This command will have no effect if \noist is used) - -\GlsAddXdyLocation{Numberstring}{:sep "\string\protect\space - \string\Numberstringnum\space\glsopenbrace" - "arabic-numbers" :sep "\glsclosebrace"} - - % To have Mc as a separate group uncomment the following three - % lines: - - \setStyleFile{samplexdy-mc207} % note no extension - \noist - \GlsSetXdyLanguage{} - - % The above three lines specify to use samplexdy-mc.xdy (supplied - % with this file) and don't overwrite it. The language is - % unset using \GlsSetXdyLanguage{} as all the language - % dependent information is contained in samplexdy-mc.xdy - % Note that using \noist means that commands like - % \GlsAddXdyAttribute and \GlsAddXdyLocation will no longer have - % an effect. - - % Write the style file (if \noist isn't used) - % and activate glossary entries - -\makeglossaries - - % Define glossary entries - % \glshyperlink is used instead of \gls to prevent the glossary - % page numbers also appear in the locations, however I need - % to ensure that the referenced entries are added to the - % glossary via commands that use \glslink, \glsadd or \glssee - -\newglossaryentry{mcadam}{name={McAdam, John Loudon}, -first={John Loudon McAdam},text={McAdam}, -description={Scottish engineer}} - -\newglossaryentry{maclaurin}{name={Maclaurin, Colin}, -first={Colin Maclaurin},text={Maclaurin}, -description={Scottish mathematician best known for the -\gls{maclaurinseries}}} - -\newglossaryentry{maclaurinseries}{name={Maclaurin series}, -description={Series expansion},see={taylorstheorem}} - -\newglossaryentry{taylorstheorem}{name={Taylor's theorem}, -description={Theorem expressing a function $f(x)$ as the sum of -a polynomial and a remainder: -\[f(x) = f(a)+f'(a)(x-a)+f''(a)(x-a^2)/2!+\cdots+R_n\] -If $n\to\infty$ the expansion is a \glshyperlink{taylorseries} -and if $a=0$, the series is called a -\gls{maclaurinseries}}} - -\newglossaryentry{taylorseries}{name={Taylor series}, -description={Series expansion},see={taylorstheorem}} - -\newglossaryentry{taylor}{name={Taylor, Brook}, -first={Brook Taylor},text={Taylor}, -description={English mathematician}} - -\newglossaryentry{mcnemar}{name={McNemar, Quinn}, -first={Quinn McNemar},text={McNemar}, -description={Mathematician who introduced -\gls{mcnemarstest}. This entry has the number list -suppressed},nonumberlist} - -\newglossaryentry{mcnemarstest}{name={McNemar's test}, -description={A nonparametric test introduced by -\gls{mcnemar} in 1947}} - -\newglossaryentry{mach}{name={Mach, Ernst}, -first={Ernst Mach},text={Mach}, - % if using samplexdy-mc.xdy, the following line is needed - % to prevent this entry being put in the "Mc" group -sort={mach, Ernst}, -description={Czech/Austrian physicist and philosopher}} - -\newglossaryentry{machnumber}{name={Mach number}, - % if using samplexdy-mc.xdy, the following line is needed - % to prevent this entry being put in the "Mc" group -sort={mach number}, -description={Ratio of the speed of a body in a fluid to the -speed of sound in that fluid named after \gls{mach}}} - -\newglossaryentry{malthus}{name={Malthus, Thomas Robert}, -first={Thomas Robert Malthus},text={Malthus}, -description={English mathematician, sociologist and classicist}} - -\newglossaryentry{ampereandre}{name={Ampère, André-Marie}, -first={André-Marie Ampère},text={Ampère}, -description={French mathematician and physicist}} - -\newglossaryentry{ampere}{name={ampere}, -description={SI unit of electric current named after -\gls{ampereandre}}} - -\newglossaryentry{archimedes}{name={Archimedes of Syracuse}, -first={Archimedes of Syracuse},text={Archimedes}, -description={Greek mathematician}} - -\newglossaryentry{archimedesprinciple}{name={Archemedes' principle}, -description={Principle that if a body is submerged in a fluid -it experiences upthrust equal to the weight of the displaced -fluid. Named after \gls{archimedes}}} - -\newglossaryentry{galton}{name={Galton, Sir Francis}, -first={Sir Francis Galton},text={Galton}, -description={English anthropologist}} - -\newglossaryentry{gauss}{name={Gauss, Karl Friedrich}, -first={Karl Friedrich Gauss},text={Gauss}, -description={German mathematician}} - -\newglossaryentry{gaussianint}{name={Gaussian integer}, -description={Complex number where both real and imaginary -parts are integers}} - -\newglossaryentry{peano}{name={Peano, Giuseppe}, -first={Giuseppe Peano},text={Peano}, -description={Italian mathematician}} - -\newglossaryentry{peanoscurve}{name={Peano's curve}, -description={A space-filling curve discovered by -\gls{peano}}} - -\newglossaryentry{pearson}{name={Pearson, Karl}, -first={Karl Pearson},text={Pearson}, -description={English mathematician}} - -\newglossaryentry{pearspmcc}{name={Pearson's product moment -correlation coefficient},description={Product moment correlation -coefficient named after \gls{pearson}}} - -\begin{document} -\title{Sample Document Using the Glossaries Package With Xindy} -\author{Nicola Talbot} -\maketitle - -\section{\glsentryfirst{gauss}} - -This is a section on \gls[format=(]{gauss}. This section spans -several pages. - -\newpage - -This page talks about \glspl[format=hyperbfit]{gaussianint}. Since -it's the principle definition, the user-defined hyperbfit format is -used. - -\newpage - -The section on \gls[format=)]{gauss} ends here. - -\section{Series Expansions} - -This section is about series expansions. It mentions -\gls{maclaurin} and \gls{taylor}. It also discusses -\gls{taylorstheorem} which is related to the \gls{taylorseries}. -The \gls{maclaurinseries} is a special case of the -\gls{taylorseries}. - -\section{\glsentryname{archimedesprinciple}} - -This section discusses \gls{archimedesprinciple} which was -introduced by \gls{archimedes}. - -\section{Another section} - -This section covers \gls{mach} who introduced the \gls{machnumber}. -It also mentions \gls{ampereandre} after whom the -SI unit \gls{ampere} is named. It then discusses \gls{galton} -and \gls{malthus}. Finally it mentions \gls{mcadam}. - -\newpage -This page discusses \gls{mcnemar} who introduced -\gls{mcnemarstest} and \gls{peano} who discovered \gls{peanoscurve}. - -\printglossaries -\end{document} -% \end{macrocode} -%\fi -%\iffalse -% \begin{macrocode} -%</samplexdy-compatible207.tex> -% \end{macrocode} -%\fi -%\iffalse -% \begin{macrocode} %<*samplexdy.tex> % \end{macrocode} %\fi diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins index 9737748ccbf..b18e0255c08 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.ins +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.ins @@ -1,4 +1,4 @@ -% glossaries.ins generated using makedtx version 1.1 2013/11/16 19:05 +% glossaries.ins generated using makedtx version 1.1 2013/12/5 15:12 \input docstrip \preamble @@ -18,7 +18,7 @@ The Current Maintainer of this work is Nicola Talbot. - This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy-compatible207.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl. + This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, glossaries-dictionary-Brazilian.dict, glossaries-dictionary-Danish.dict, glossaries-dictionary-Dutch.dict, glossaries-dictionary-English.dict, glossaries-dictionary-French.dict, glossaries-dictionary-German.dict, glossaries-dictionary-Irish.dict, glossaries-dictionary-Italian.dict, glossaries-dictionary-Magyar.dict, glossaries-dictionary-Polish.dict, glossaries-dictionary-Serbian.dict, glossaries-dictionary-Spanish.dict, minimalgls.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleCustomAcr.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleFnAcrDesc.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy2.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl, mfirstuc.perl. \endpreamble @@ -103,17 +103,18 @@ \file{sampleAcr.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleAcr.tex}} \file{sampleAcrDesc.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleAcrDesc.tex}} \file{sampleacronyms.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleacronyms.tex}} +\file{sampleCustomAcr.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleCustomAcr.tex}} \file{sampleDB.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleDB.tex}} \file{sampleDesc.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleDesc.tex}} \file{sampleEq.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleEq.tex}} \file{sampleEqPg.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleEqPg.tex}} +\file{sampleFnAcrDesc.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleFnAcrDesc.tex}} \file{sampleNtn.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleNtn.tex}} \file{samplePeople.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{samplePeople.tex}} \file{sampleSec.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleSec.tex}} \file{sampleSort.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleSort.tex}} \file{sampletree.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampletree.tex}} \file{sampleutf8.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleutf8.tex}} -\file{samplexdy-compatible207.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{samplexdy-compatible207.tex}} \file{samplexdy.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{samplexdy.tex}} \file{samplexdy2.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{samplexdy2.tex}} \file{samplexdy-mc.xdy}{\nopreamble\nopostamble\from{glossaries.dtx}{samplexdy-mc.xdy}} |