diff options
author | Karl Berry <karl@freefriends.org> | 2014-08-28 22:36:38 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-08-28 22:36:38 +0000 |
commit | 5012ec6af83fdf681b2e966abc49b64b85bd9b1f (patch) | |
tree | e54ddb07936a0311f38f74732706b796fb2c3041 /Master/texmf-dist/source/latex/glossaries | |
parent | f8760b32d5812f8c1d935e53d6e19ed6d0d7fae2 (diff) |
glossaries (28aug14)
git-svn-id: svn://tug.org/texlive/trunk@35055 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/glossaries')
-rw-r--r-- | Master/texmf-dist/source/latex/glossaries/glossaries.dtx | 322 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/glossaries/glossaries.ins | 5 |
2 files changed, 263 insertions, 64 deletions
diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx index 89c64a46137..7d645e5acd0 100644 --- a/Master/texmf-dist/source/latex/glossaries/glossaries.dtx +++ b/Master/texmf-dist/source/latex/glossaries/glossaries.dtx @@ -31,7 +31,7 @@ % -author "Nicola Talbot" % -codetitle "Main Package Code" % glossaries -% Created on 2014/8/12 14:54 +% Created on 2014/8/27 15:20 %\fi %\iffalse %<*package> @@ -141,7 +141,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of \setcounter{IndexColumns}{2} -\CheckSum{18594} +\CheckSum{18625} \newcommand*{\ifirstuse}{\iterm{first use}} \newcommand*{\firstuse}{\gls{firstuse}} @@ -169,12 +169,12 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of %\MakeShortVerb{"} %\DeleteShortVerb{\|} % -% \title{Documented Code For glossaries v4.09} +% \title{Documented Code For glossaries v4.10} % \author{Nicola L.C. Talbot\\[10pt] %Dickimaw Books\\ %\url{http://www.dickimaw-books.com/}} % -% \date{2014-08-12} +% \date{2014-08-27} % \maketitle % %This is the documented code for the \styfmt{glossaries} package. @@ -190,7 +190,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.09: +%For the main user guide, read \qt{glossaries.sty v4.10: %\LaTeX2e\ Package to Assist Generating Glossaries}. % %\item[\url{mfirstuc-manual.pdf}] @@ -234,7 +234,7 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of % This package requires \LaTeXe. % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{glossaries}[2014/08/12 v4.09 (NLCT)] +\ProvidesPackage{glossaries}[2014/08/27 v4.10 (NLCT)] % \end{macrocode} % Required packages: % \begin{macrocode} @@ -321,7 +321,8 @@ governed by the \gloskey{first} and \gloskey{firstplural} keys of %\end{macro} %\begin{macro}{\changes} % Now we need to redefine \cs{changes} so that it uses the original -% definition of \cs{glossary}. +% definition of \cs{glossary}. (As from v4.10, this isn't actually +% needed any more, but it's kept for backward compatibility.) % \begin{macrocode} \let\glsorg@changes\changes \renewcommand{\changes}[3]{% @@ -2979,7 +2980,7 @@ name=true]{% \expandafter\toks@\expandafter{\@xdylocref}% \edef\@xdylocref{\the\toks@ ^^J% (markup-locref - :open \string"\string~n% + :open \string"\glstildechar n% \expandafter\string\csname glsX#2X#1\endcsname \string" ^^J :close \string"\string" ^^J @@ -4744,11 +4745,10 @@ name=true]{% \newcommand*{\@gls@writedef}[1]{% \immediate\write\@gls@deffile {% - \string\ifglsentryexists{#1}{}\expandafter\@gobble\string\%^^J% - \expandafter\@gobble\string\{\expandafter\@gobble\string\%^^J% - \string\gls@defglossaryentry{\glsdetoklabel{#1}}\expandafter - \@gobble\string\%^^J% - \expandafter\@gobble\string\{\expandafter\@gobble\string\%% + \string\ifglsentryexists{#1}{}\glspercentchar^^J% + \expandafter\@gobble\string\{\glspercentchar^^J% + \string\gls@defglossaryentry{\glsdetoklabel{#1}}\glspercentchar^^J% + \expandafter\@gobble\string\{\glspercentchar% }% % \end{macrocode} % Write key value information: @@ -4763,7 +4763,7 @@ name=true]{% {% \expandafter\@firstoftwo\@gls@map =\expandafter\@gobble\string\{\glo@value\expandafter\@gobble\string\},% - \expandafter\@gobble\string\%% + \glspercentchar% }% }% % \end{macrocode} @@ -4772,9 +4772,9 @@ name=true]{% \glswritedefhook \immediate\write\@gls@deffile {% - \expandafter\@gobble\string\%^^J% - \expandafter\@gobble\string\}\expandafter\@gobble\string\%^^J% - \expandafter\@gobble\string\}\expandafter\@gobble\string\%% + \glspercentchar^^J% + \expandafter\@gobble\string\}\glspercentchar^^J% + \expandafter\@gobble\string\}\glspercentchar% }% } % \end{macrocode} @@ -9645,7 +9645,16 @@ name=true]{% % \begin{macrocode} \newcommand*{\@Gls@entry@field}[2]{% \letcs\@glo@text{glo@\glsdetoklabel{#1}@#2}% - \xmakefirstuc{\@glo@text}% + \ifdef\@glo@text + {% + \xmakefirstuc{\@glo@text}% + }% + {% + \PackageError{glossaries}{Either glossary entry + `\glsdetoklabel{#1}' doesn't exist or the field `#2' + doesn't exist}{Check you have correctly spelt the entry + label and the field name}% + }% } % \end{macrocode} %\end{macro} @@ -9665,10 +9674,64 @@ name=true]{% %\changes{3.09a}{2013-10-09}{made robust} % \begin{macrocode} \newrobustcmd*{\Glsentryname}[1]{% + \@Gls@entryname{#1}% +} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\@Gls@entryname} +%\changes{4.10}{2014-08-27}{new} +% This is a workaround in the event that the user defies the warning +% in the manual about not using \cs{Glsname} or \cs{Glsentryname} with acronyms. +% First the default behaviour: +% \begin{macrocode} +\newcommand*{\@Gls@entryname}[1]{% \@Gls@entry@field{#1}{name}% } % \end{macrocode} %\end{macro} +%\begin{macro}{\@Gls@acrentryname} +%\changes{4.10}{2014-08-27}{new} +% Now the behaviour when \cs{setacronymstyle} is used: +% \begin{macrocode} +\newcommand*{\@Gls@acrentryname}[1]{% + \ifglshaslong{#1}% + {% + \letcs\@glo@text{glo@\glsdetoklabel{#1}@name}% + \expandafter\@gls@getbody\@glo@text{}\@nil + \expandafter\ifx\@gls@body\glsentrylong\relax + \expandafter\Glsentrylong\@gls@rest + \else + \expandafter\ifx\@gls@body\glsentryshort\relax + \expandafter\Glsentryshort\@gls@rest + \else + \expandafter\ifx\@gls@body\acronymfont\relax +% \end{macrocode} +% Temporarily make \cs{glsentryshort} behave like +% \cs{Glsentryshort}. (This is on the assumption that the argument +% of \cs{acronymfont} is \cs{glsentryshort}\marg{label}, as that's +% the behaviour of the predefined acronym styles.) +% This is scoped to localise the effect of the assignment. +% \begin{macrocode} + {% + \let\glsentryshort\Glsentryshort + \@glo@text + }% + \else + \xmakefirstuc{\@glo@text}% + \fi + \fi + \fi + }% + {% +% \end{macrocode} +% Not an acronym +% \begin{macrocode} + \@Gls@entry@field{#1}{name}% + }% +} +% \end{macrocode} +%\end{macro} % % Get the entry description (as specified by the % \gloskey{description} when the entry was defined). The argument @@ -10319,6 +10382,24 @@ name=true]{% % \end{macrocode} %\end{macro} % +%\begin{macro}{\glspercentchar} +%\changes{4.10}{2014-08-27}{new} +% Define \cs{glspercentchar} to make it easier to write a percent +% character to a file. +% \begin{macrocode} +\edef\glspercentchar{\expandafter\@gobble\string\%} +% \end{macrocode} +%\end{macro} +% +%\begin{macro}{\glstildechar} +%\changes{4.10}{2014-08-27}{new} +% Define \cs{glstildechar} to make it easier to write a tilde +% character to a file. +% \begin{macrocode} +\edef\glstildechar{\string~} +% \end{macrocode} +%\end{macro} +% %\begin{macro}{\@glsfirstletter} % Define the first letter to come after the digits 0,\ldots,9. % Only required for \app{xindy}. @@ -10534,23 +10615,22 @@ name=true]{% % \begin{macrocode} \write\glswrite{% \string\begin - {theglossary}\string\glossaryheader\string~n\string" ^^J\space - \space\space:close \string"\expandafter\@gobble - \string\%\string~n\string + {theglossary}\string\glossaryheader\glstildechar n\string" ^^J\space + \space\space:close \string"\glspercentchar\glstildechar n\string \end{theglossary}\string\glossarypostamble - \string~n\string" ^^J\space\space\space + \glstildechar n\string" ^^J\space\space\space :tree)}% % \end{macrocode} % Specify what to put between letter groups % \begin{macrocode} \write\glswrite{(markup-letter-group-list - :sep \string"\string\glsgroupskip\string~n\string")}% + :sep \string"\string\glsgroupskip\glstildechar n\string")}% % \end{macrocode} % Specify what to put between entries % \begin{macrocode} \write\glswrite{(markup-indexentry :open \string"\string\relax \string\glsresetentrylist - \string~n\string")}% + \glstildechar n\string")}% % \end{macrocode} % Specify how to format entries % \begin{macrocode} @@ -10597,7 +10677,7 @@ name=true]{% % \begin{macrocode} \write\glswrite{^^J; define letter group list format^^J}% \write\glswrite{(markup-letter-group-list - :sep \string"\string\glsgroupskip\string~n\string")}% + :sep \string"\string\glsgroupskip\glstildechar n\string")}% % \end{macrocode} % Define letter group headings. % \begin{macrocode} @@ -10638,9 +10718,9 @@ name=true]{% \def\writeist{\relax \ifundef{\glswrite}{\newwrite\glswrite}{}\relax \openout\glswrite=\istfilename - \write\glswrite{\expandafter\@gobble\string\% makeindex style file + \write\glswrite{\glspercentchar\space makeindex style file created by the glossaries package} - \write\glswrite{\expandafter\@gobble\string\% for document + \write\glswrite{\glspercentchar\space for document '\jobname' on \the\year-\the\month-\the\day} \write\glswrite{actual '\@gls@actualchar'} \write\glswrite{encap '\@gls@encapchar'} @@ -11302,39 +11382,47 @@ you % \end{macrocode} %\end{macro} % -% The \cs{glossary} command is redefined so that it takes an -% optional argument \meta{type} to specify the glossary type (use -% \cs{glsdefaulttype} glossary by default). -% This shouldn't be used at user level -% as \cs{glslink} sets the correct format. The associated -% number should be stored in \cs{theglsentrycounter} -% before using \cs{glossary}. -%\begin{macro}{\glossary} +% As from v4.10, the \cs{glossary} command is no longer redefined +% and no longer used by the \styfmt{glossaries} package. Since the +% user isn't expected to use this command (as \styfmt{glossaries} +% takes care of the particular format required for +% \gls{makeindex}\slash\gls{xindy}) there's no need for a user level +% command. Using a custom internal command prevents any conflict +% with other packages (and with the \cs{mark} mechanism). +% +% The associated number should be stored in \cs{theglsentrycounter} +% before using \cs{gls@glossary}. +%\begin{macro}{\gls@glossary} % \begin{macrocode} -\renewcommand*{\glossary}[1][\glsdefaulttype]{% - \@glossary[#1]% +\newcommand*{\gls@glossary}[1]{% + \@gls@glossary{#1}% } % \end{macrocode} %\end{macro} % +%\begin{macro}{\@gls@glossary} +% (In v4.10, \cs{@glossary} was redefined to \cs{@gls@glossary} to +% avoid conflict with other packages.) % Define internal \cs{@glossary} to ignore its argument. % This gets redefined in \cs{@makeglossary}. This is % defined to just \cs{index} as \cls{memoir} changes the definition of % \cs{@index}. (Thanks to Dan Luecking for pointing this out.) -%\begin{macro}{\@glossary} +%\begin{macro}{\gls@glossary} %\changes{1.17}{2008 December 26}{changed definition to use %\cs{index} instead of \cs{@index}} +%\changes{4.10}{2014-08-27}{Renamed \cs{@glossary} to \cs{@gls@glossary}} % \begin{macrocode} -\def\@glossary[#1]{\index} +\newcommand*{\@gls@glossary}[1]{\index} % \end{macrocode} %\end{macro} -% This is a convenience command to set \cs{@glossary}. -% It is used by \cs{@makeglossary} and then redefined to +%\end{macro} +% This is a convenience command to set \cs{@gls@glossary}. +% It's used by \cs{@makeglossary} and then redefined to % do nothing, as it only needs to be done once. %\begin{macro}{\@gls@renewglossary} % \begin{macrocode} \newcommand{\@gls@renewglossary}{% - \gdef\@glossary[##1]{\@bsphack\begingroup\@wrglossary{##1}}% + \gdef\@gls@glossary##1{\@bsphack\begingroup\@wrglossary{##1}}% \let\@gls@renewglossary\@empty } % \end{macrocode} @@ -11542,7 +11630,7 @@ you % \end{macrocode} % Write to the glossary file using \app{xindy} syntax. % \begin{macrocode} - \glossary[\csname glo@\@gls@label @type\endcsname]{% + \gls@glossary{\csname glo@\@gls@label @type\endcsname}{% (indexentry :tkey (\csname glo@\@gls@label @index\endcsname) % \end{macrocode} %\changes{3.02}{2012/05/21}{changed \cs{@glslocref} to \cs{theglsentrycounter}} @@ -11563,7 +11651,7 @@ you % \end{macrocode} % Write to the glossary file using \app{makeindex} syntax. % \begin{macrocode} - \glossary[\csname glo@\@gls@label @type\endcsname]{% + \gls@glossary{\csname glo@\@gls@label @type\endcsname}{% \string\glossaryentry{\csname glo@\@gls@label @index\endcsname \@gls@encapchar\@glo@numfmt}{\@glslocref}}% \fi @@ -11625,7 +11713,7 @@ you \@onelevel@sanitize\@gls@xref \@gls@checkmkidxchars\@gls@xref \ifglsxindy - \glossary[\csname glo@#1@type\endcsname]{% + \gls@glossary{\csname glo@#1@type\endcsname}{% (indexentry :tkey (\csname glo@#1@index\endcsname) :xref (\string"\@gls@xref\string") @@ -11633,7 +11721,7 @@ you ) }% \else - \glossary[\csname glo@#1@type\endcsname]{% + \gls@glossary{\csname glo@#1@type\endcsname}{% \string\glossaryentry{\csname glo@#1@index\endcsname \@gls@encapchar glsseeformat\@gls@xref}{Z}}% \fi @@ -14190,6 +14278,14 @@ false,nolabel,autolabel,nameref}[nolabel]{% %\changes{4.02}{2013-12-05}{new} % \begin{macrocode} \newcommand*{\SetGenericNewAcronym}{% +% \end{macrocode} +% Change the behaviour of \cs{Glsentryname} to workaround expansion +% issues that cause a problem for \cs{makefirstuc} +% \begin{macrocode} + \let\@Gls@entryname\@Gls@acrentryname +% \end{macrocode} +% Change the way acronyms are defined: +% \begin{macrocode} \renewcommand{\newacronym}[4][]{% \ifdefempty{\@glsacronymlists}% {% @@ -17089,7 +17185,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \end{macrocode} %\end{macro} % -% Get the first grouped argument and stores in \cs{@gls@body}. +% Get the first grouped argument and store in \cs{@gls@body}. % \begin{macrocode} \def\@gls@getbody#1#{\def\@gls@body{#1}\@gls@gobbletonil} % \end{macrocode} @@ -19963,7 +20059,7 @@ false,nolabel,autolabel,nameref}[nolabel]{% % that have a tree-like structure. These are designed for % hierarchical glossaries. % \begin{macrocode} -\ProvidesPackage{glossary-tree}[2014/07/30 v4.08 (NLCT)] +\ProvidesPackage{glossary-tree}[2014/08/27 v4.10 (NLCT)] % \end{macrocode} % %\begin{macro}{\glstreenamefmt} @@ -20378,8 +20474,9 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \end{macrocode} % If the symbol is missing, ignore it, otherwise put it in % brackets. +%\changes{4.10}{2014-08-27}{moved space after symbol} % \begin{macrocode} - \ifglshassymbol{##1}{\space(\glossentrysymbol{##1})}{}% + \ifglshassymbol{##1}{(\glossentrysymbol{##1})\space}{}% % \end{macrocode} % Do the description followed by the description terminator and % location list. @@ -20459,8 +20556,9 @@ false,nolabel,autolabel,nameref}[nolabel]{% % \end{macrocode} % If the symbol is missing, ignore it, otherwise put it in % brackets. +%\changes{4.10}{2014-08-27}{moved space after symbol} % \begin{macrocode} - \ifglshassymbol{##2}{\space(\glossentrysymbol{##2})}{}% + \ifglshassymbol{##2}{(\glossentrysymbol{##2})\space}{}% % \end{macrocode} % Do the description followed by the description terminator and % location list. @@ -25042,10 +25140,10 @@ If you want paragraph breaks in the description use \documentclass{report} \usepackage{graphicx} -\usepackage{scrwfile} +%\usepackage{scrwfile} \usepackage[colorlinks]{hyperref} -\usepackage[nopostdot,toc,acronym,symbols]{glossaries} +\usepackage[savewrites,nopostdot,toc,acronym,symbols]{glossaries} \usepackage{glossary-mcols} \usepackage{glossary-longragged} @@ -25059,6 +25157,7 @@ Translations} \newglossary[glg7]{parent}{gls7}{glo7}{Hierarchical Entries} \newglossary[glg8]{homographs}{gls8}{glo8}{Homographs} \newglossary[glg9]{cites}{gls9}{glo9}{Entries with Citations} +\newglossary[glg10]{urls}{gls10}{glo10}{Entries with URLs} \DeclareAcronymList{acronymdesc,acronymslang} @@ -25072,6 +25171,7 @@ Translations} \loadglsentries[parent]{example-glossaries-parent} \loadglsentries[homographs]{example-glossaries-childnoname} \loadglsentries[cites]{example-glossaries-cite} +\loadglsentries[urls]{example-glossaries-url} \setacronymstyle{long-short} @@ -25190,6 +25290,20 @@ Translations} \space ##2}% } + % glossary style for the urls glossary + +\newglossarystyle{urls} +{% based on list style + \setglossarystyle{list}% + \renewcommand{\glossentry}[2]{% + \item[\glsentryitem{##1}% + \glstarget{##1}{\glossentryname{##1}}] + \glossentrydesc{##1}\glspostdescription\space##2% + \ifglshasfield{useri}{##1}{\glspar + \glsletentryfield{\thisurl}{##1}{useri}% + \expandafter\url\expandafter{\thisurl}}{}}% +} + \begin{document} \tableofcontents @@ -25230,6 +25344,8 @@ Here are just the acronyms again: \printglossary[type=cites,style=cites,nopostdot=false,nogroupskip] +\printglossary[type=urls,style=urls,nopostdot=false,nogroupskip] + \bibliographystyle{plain} \bibliography{xampl} @@ -26426,6 +26542,79 @@ description={Mauris tempor ligula sed lacus.}} %\fi %\iffalse % \begin{macrocode} +%<*example-glossaries-url.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} + % This file is part of the glossaries bundle + % These are test glossary entries with URLs stored in + % the user1 field. + +\newglossaryentry{aenean-url}{name={aenean}, + description={adipiscing auctor est}, + user1={http://uk.tug.org/}} + +\newglossaryentry{morbi-url}{name={morbi}, + description={quam arcu, malesuada sed, volutpat et, elementum sit +amet, libero}, + user1={http://www.ctan.org/}} + +\newglossaryentry{duis-url}{name={duis}, + description={mattis}, + user1={http://www.tug.org/}} + + % Now try an active character +\newglossaryentry{sed-url}{name={sed}, + description={cursus lectus quis odio (uses +\texttt{\string\protect\string~})}, + user1={http://theoval.cmp.uea.ac.uk/\protect~nlct/}} + +\newglossaryentry{sed2-url}{name={sed}, + description={cursus lectus quis odio (uses +\texttt{\string\string\string~})}, + user1={http://theoval.cmp.uea.ac.uk/\string~nlct/}} + +\newglossaryentry{sed3-url}{name={sed}, + description={cursus lectus quis odio (uses +\texttt{\string\glstildechar})}, + user1={http://theoval.cmp.uea.ac.uk/\glstildechar nlct/}} + + % How do we deal with a percent character? + + % Temporarily change the category code + +\catcode`\%=12 +\newglossaryentry{phasellus-url}{name={phasellus}, + description={arcu (catcode change)}, + user1=http://theoval.cmp.uea.ac.uk/%7Enlct +} +\catcode`\%=14 + + % Use \% + +\newglossaryentry{phasellus2-url}{name={phasellus}, + description={arcu (uses \texttt{\string\%})}, + user1=http://theoval.cmp.uea.ac.uk/\%7Enlct +} + + % Use \glspercentchar + +\newglossaryentry{phasellus3-url}{name={phasellus}, + description={arcu (uses + \texttt{\string\glspercentchar})}, + user1=http://theoval.cmp.uea.ac.uk/\glspercentchar 7Enlct +} + +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} +%</example-glossaries-url.tex> +% \end{macrocode} +%\fi +%\iffalse +% \begin{macrocode} %<*sample-crossref.tex> % \end{macrocode} %\fi @@ -28181,11 +28370,12 @@ You don't need to worry about makeindex's special characters: 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} +\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 @@ -28194,7 +28384,9 @@ support vector machine} The \gls{svm} is used widely in the area of pattern recognition. % plural form with initial letter in uppercase: -\Glspl{svm} are \ldots +\Glspl{svm} are \ldots\ (but beware, converting the initial letter to +upper case for a small caps acronym is sometimes considered +poor style). Short version: \acrshort{svm}. Long version: \acrlong{svm}. Full version: \acrfull{svm}. Description: \glsentrydesc{svm}. @@ -28373,7 +28565,9 @@ support vector machine} The \gls{svm} is used widely in the area of pattern recognition. % plural form with initial letter in uppercase: -\Glspl{svm} are \ldots +\Glspl{svm} are \ldots\ (but beware, converting the initial letter to +upper case for a small caps acronym is sometimes considered +poor style). Short version: \acrshort{svm}. Long version: \acrlong{svm}. Full version: \acrfull{svm}. Description: \glsentrydesc{svm}. @@ -29148,7 +29342,9 @@ support vector machine} The \gls{svm} is used widely in the area of pattern recognition. % plural form with initial letter in uppercase: -\Glspl{svm} are \ldots +\Glspl{svm} are \ldots\ (but beware, converting the initial letter to +upper case for a small caps acronym is sometimes considered +poor style). Short version: \acrshort{svm}. Long version: \acrlong{svm}. Full version: \acrfull{svm}. Description: \glsentrydesc{svm}. @@ -29303,7 +29499,7 @@ The factorial symbol: \gls{not:fact}. \documentclass{report} \usepackage[colorlinks]{hyperref} -\usepackage[toc]{glossaries} +\usepackage[toc,style=listgroup]{glossaries} \makeglossaries @@ -30042,7 +30238,9 @@ the glossaries package. \part{First Part} \chapter{Sample Chapter} -This example document has an eccentric section numbering system. +This example document has an eccentric section numbering system +where the section number is prefixed by the chapter number in square +brackets. \section{First Section} diff --git a/Master/texmf-dist/source/latex/glossaries/glossaries.ins b/Master/texmf-dist/source/latex/glossaries/glossaries.ins index 86c0eaa7948..816febfb96c 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 2014/8/12 14:54 +% glossaries.ins generated using makedtx version 1.1 2014/8/27 15:20 \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, mfirstuc-english.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, glossary-lipsum-examples.tex, example-glossaries-acronym-desc.tex, example-glossaries-acronym.tex, example-glossaries-acronyms-lang.tex, example-glossaries-brief.tex, example-glossaries-childnoname.tex, example-glossaries-cite.tex, example-glossaries-images.tex, example-glossaries-long.tex, example-glossaries-multipar.tex, example-glossaries-parent.tex, example-glossaries-symbols.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-ignored.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-noidxapp-utf8.tex, sample-noidxapp.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. + This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, mfirstuc.sty, mfirstuc-english.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, glossary-lipsum-examples.tex, example-glossaries-acronym-desc.tex, example-glossaries-acronym.tex, example-glossaries-acronyms-lang.tex, example-glossaries-brief.tex, example-glossaries-childnoname.tex, example-glossaries-cite.tex, example-glossaries-images.tex, example-glossaries-long.tex, example-glossaries-multipar.tex, example-glossaries-parent.tex, example-glossaries-symbols.tex, example-glossaries-url.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dual.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-ignored.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-mfirstuc.tex, sample-newkeys.tex, sample-noidxapp-utf8.tex, sample-noidxapp.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 @@ -97,6 +97,7 @@ \file{example-glossaries-multipar.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{example-glossaries-multipar.tex}} \file{example-glossaries-parent.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{example-glossaries-parent.tex}} \file{example-glossaries-symbols.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{example-glossaries-symbols.tex}} +\file{example-glossaries-url.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{example-glossaries-url.tex}} \file{sample-crossref.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-crossref.tex}} \file{sample-custom-acronym.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-custom-acronym.tex}} \file{sample-dual.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-dual.tex}} |