diff options
Diffstat (limited to 'Master/texmf-dist/doc/latex/glossaries/samples')
95 files changed, 336 insertions, 126 deletions
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf Binary files differindex 76744ff2dab..6d29420797d 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/glossary-lipsum-examples.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf Binary files differindex e81068446ac..778390fb7de 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex index 816007fd2e1..3116ad36a18 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex @@ -1,5 +1,8 @@ % This file is public domain. % +% For further details about this file, see +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#minimalgls +% % This is a minimal file for testing and debugging % the glossaries package. Change the class file as % desired, and add the relevant package options to @@ -19,6 +22,12 @@ % 1. latex minimalgls % 2. makeglossaries minimalgls (note no extension) % 3. latex minimalgls +% +% Alternatively: +% 1. latex minimalgls +% 2. makeglossaries-lite minimalgls (note no extension) +% 3. latex minimalgls +% % A further run through LaTeX will be required to ensure that % the table of contents is up to date if the toc option % is used. @@ -28,6 +37,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +% (Alternatively replace "makeglossaries" with "makeglossaries-lite") % If you require multilingual support you must also install % the appropriate glossaries language module. The language @@ -37,8 +48,9 @@ \listfiles \usepackage[colorlinks]{hyperref} -%\usepackage{glossaries} % abbreviation will go in main glossary - \usepackage[acronym]{glossaries} % make a separate list of acronyms +\usepackage[ + % acronym % make a separate list of acronyms +]{glossaries} \makeglossaries @@ -59,8 +71,7 @@ description={a sample entry}} % These are specified in the optional argument. % Remove the optional argument to revert to the default % plurals. -\newacronym[\glsshortpluralkey=cas,\glslongpluralkey=contrived -acronyms]{aca}{aca}{a contrived acronym} +\newacronym[shortplural=cas,longplural=contrived acronyms]{aca}{aca}{a contrived acronym} % Keep all definitions in the preamble! diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdf Binary files differindex 06ebb2b46c9..d87c391ba6d 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.tex index be64f5cafa9..19611cf7635 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr-desc.tex @@ -3,6 +3,9 @@ % arara: pdflatex % arara: makeglossaries % arara: pdflatex +% +%See also +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#minimalgls \documentclass{article} \usepackage{glossaries} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdf Binary files differindex 02f3e50e863..74bfe9d3d0a 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.tex b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.tex index d7dd581f601..cc16301f688 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-acr.tex @@ -3,6 +3,9 @@ % arara: pdflatex % arara: makeglossaries % arara: pdflatex +% +%See also +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#minimalgls \documentclass{article} \usepackage{glossaries} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdf Binary files differindex 14208cc5da8..1102d17ddae 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.tex b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.tex index 59dacdd4d10..a2e34dee72e 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/mwe-gls.tex @@ -3,6 +3,9 @@ % arara: pdflatex % arara: makeglossaries % arara: pdflatex +% +%See also +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#minimalgls \documentclass{article} \usepackage{glossaries} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf Binary files differindex 0ac18e640f1..1d60e8b3aa4 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.tex index 746eb7b858c..2cd18560f35 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-FnDesc.tex @@ -3,6 +3,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleFnDesc \documentclass{report} \usepackage[colorlinks]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdf Binary files differindex 891ae8db658..c8f7619280a 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.tex index 619519e6857..eeb04c6faa5 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-chap-hyperfirst.tex @@ -3,6 +3,8 @@ % arara: pdflatex % arara: makeglossaries % arara: pdflatex +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-chap-hyperfirst \documentclass{report} \usepackage[colorlinks]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf Binary files differindex 7033120a7bc..470d21abeb6 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex index 4843b4d1b1c..3a26233f66b 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex @@ -3,6 +3,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-crossref \documentclass{article} \usepackage[colorlinks]{hyperref} @@ -10,6 +12,8 @@ \makeglossaries +\providecommand{\alsoname}{see also} + \renewcommand{\glsseeitemformat}[1]{\textsc{\glsentryname{#1}}} \newglossaryentry{pear}{name=pear, @@ -17,7 +21,7 @@ description={an oddly shaped fruit}} \newglossaryentry{apple}{name=apple, description={firm, round fruit}, -see=[see also]{pear}} +see=[\alsoname]{pear}} \newglossaryentry{banana}{name=banana, description={a yellow fruit with an even odder shape than @@ -26,10 +30,23 @@ a \gls{pear}}} \newglossaryentry{fruit}{name=fruit, description={sweet, fleshy product of plant containing seed}} +% An alternative to using the 'see' key: \glssee{fruit}{pear,apple,banana} +\newglossaryentry{courgette}{name={courgette}, + description={type of long, green summer squash}} + +% The 'see' key automatically triggers \glssee so this entry will be +% included even though it's not referenced in the document. +\newglossaryentry{marrow}{name={marrow}, + description={long vegetable with thin green skin and white flesh}, + see={[\alsoname]courgette}} + +\newglossaryentry{zucchini}{name={zucchini},description={\nopostdesc}, + see={courgette}} + \begin{document} -\gls{pear}, \gls{apple} and \gls{banana}. +\gls{pear}, \gls{apple}, \gls{banana} and \gls{courgette}. \printglossaries diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf Binary files differindex 37de7552bb7..dff41fe7d05 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex index 74ea7606656..b148363a25f 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex @@ -3,6 +3,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-custom-acronym \documentclass{report} \usepackage[colorlinks]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdf Binary files differindex 4722172d2cc..5aa9bd92add 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.tex index 3fd3cf7cbad..cf8f9c44ae2 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dot-abbr.tex @@ -3,6 +3,8 @@ % arara: pdflatex % arara: makeglossaries % arara: pdflatex +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-dot-abbr \documentclass{article} \usepackage{glossaries} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf Binary files differindex 44eb610a1c3..89b2c1bd14c 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex index 4a1fc9a9539..03406d1e569 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex @@ -3,10 +3,14 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-dual \documentclass{article} \usepackage[acronym]{glossaries} +\makeglossaries + % \newdualentry[main options]{label}{short}{long}{description} \newcommand*{\newdualentry}[5][]{% @@ -25,8 +29,6 @@ {support vector machine}% long form {Statistical pattern recognition technique}% description -\makeglossaries - \begin{document} \gls{svm}. diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdf Binary files differindex c7e9ec1a23a..ad043608c77 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.tex index 0a37f54974f..56ca18d492e 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entrycount.tex @@ -4,6 +4,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-entrycount \documentclass{article} \usepackage[colorlinks]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf Binary files differindex 869b9204a51..352558f6fde 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.tex index d3bcfe36594..3018244964b 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-entryfmt.tex @@ -3,6 +3,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-entryfmt \documentclass{article} \usepackage[colorlinks]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdf Binary files differindex 046347b87e2..f681c18f326 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.tex index 43b744f8f1b..9d20843f28b 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-font-abbr.tex @@ -3,6 +3,8 @@ % arara: pdflatex % arara: makeglossaries % arara: pdflatex +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-font-abbr \documentclass{article} \usepackage{glossaries} @@ -40,7 +42,7 @@ \setacronymstyle{long-font-short} \newcommand*{\newitabbr}[1][]{\newacronym[font=\em,#1]} -\newcommand*{\newupabbr}[1][]{\newacronym[#1]} +\newcommand*{\newupabbr}{\newacronym} \newitabbr{eg}{e.g.}{exempli gratia} \newitabbr{ie}{i.e.}{id est} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf Binary files differindex 2344c44f545..50c9524d6e8 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.tex index f552aff44a9..32a30ef0030 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-ignored.tex @@ -3,6 +3,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-ignored \documentclass{article} \usepackage[colorlinks]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf Binary files differindex 5baa6494f98..5ec92b819c5 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.tex index 9842bacc2f7..899ea649fdf 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-index.tex @@ -5,6 +5,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-index \documentclass{report} \usepackage[colorlinks]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf Binary files differindex df6e6f65565..c0c3acfae11 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.tex index e6a6e94c877..cfe2a383ce0 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-inline.tex @@ -4,6 +4,8 @@ % arara: makeglossaries % arara: pdflatex: { synctex: on } % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-inline \documentclass[a4paper]{report} \usepackage[plainpages=false,colorlinks]{hyperref} @@ -17,7 +19,9 @@ \makeglossaries -\newglossaryentry{Perl}{name=\texttt{Perl}, +\newcommand{\scriptlang}[1]{\textsf{#1}} + +\newglossaryentry{Perl}{name=\scriptlang{Perl}, sort=Perl, % need a sort key because name contains a command description=A scripting language} @@ -59,6 +63,7 @@ writing. Beginning on new, usually indented, line}} % this isn't necessary, as this form (appending an s) is % the default plural=cows, +user1=kine, % description: description={(\emph{pl.}\ cows, \emph{archaic} kine) an adult female of any bovine animal}} @@ -123,9 +128,16 @@ must be used, e.g.\ in the description of \gls{pagelist}. Plurals are assumed to have the letter s appended, but if this is not the case, as in \glspl{mtrx}, then you need to specify the plural when you define the entry. If a term may have multiple -plurals (for example \glspl{cow}/\glslink{cow}{kine}) then -define the entry with the plural form most likely to be used and -explicitly specify the alternative form using \verb|\glslink|. +plurals (for example \glspl{cow}/\glsuseri{cow}) then +define the entry with the plural form most likely to be used. +The alternative can simply be referenced with \verb|\glslink| +(e.g.\ \glslink{cow}{kine}) +or \verb|\glsdisp| (e.g.\ \glsdisp{cow}{kine}). +Another option is to save the alternative plural in another key. In +this case, the ``user1'' key has been used, but a custom key can be +defined instead. + + \Glspl{seal} and \glspl{sealion} have regular plural forms. \Gls{bravo} is a homograph, but the plural forms are spelt diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf Binary files differindex 585c4a96ea7..0e47ca4e2ed 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.tex index c5bf52fc7d8..a15b19980ae 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-langdict.tex @@ -7,6 +7,8 @@ % This file also requires the glossaries-english % and glossaries-french language modules. These must % be installed in addition to installing the glossaries package. +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-langdict \documentclass[english,french]{article} \usepackage[utf8]{inputenc} @@ -29,14 +31,14 @@ } \newword{cat}{cat}{le}{chat} -\newword{mat}{mat}{la}{natte} +\newword{chair}{chair}{la}{chaise} \begin{document} \selectlanguage{english} -The \gls{en-cat} sat on the \gls{en-mat}. +The \gls{en-cat} sat on the \gls{en-chair}. \selectlanguage{french} -Le \gls{fr-cat} s'est repos\'e sur la \gls{fr-mat}. +Le \gls{fr-cat} s'est repos\'e sur la \gls{fr-chair}. \selectlanguage{english} \printglossary[type=english] diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf Binary files differindex b9d3912b1b1..9f1760b8d55 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.tex index ee93bcb22e0..41d75c33a13 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-newkeys.tex @@ -3,6 +3,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-newkeys \documentclass{article} \usepackage[colorlinks]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf Binary files differindex d94e24a152d..da250c769a1 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.tex index 78d4f400a1b..cec83e1d986 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp-utf8.tex @@ -2,6 +2,8 @@ % If you want to use arara, you need the following directives: % arara: pdflatex % arara: pdflatex +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-noidxapp-utf8 \documentclass{report} \usepackage[utf8]{inputenc} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf Binary files differindex ed705c0fe40..cc8e5870398 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.tex index 29f3655587b..d675c795fc5 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-noidxapp.tex @@ -2,6 +2,8 @@ % If you want to use arara, you need the following directives: % arara: pdflatex % arara: pdflatex +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-noidxapp \documentclass{report} \usepackage[colorlinks]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf Binary files differindex 0954a5014cc..f7b1087f4c0 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.tex index 7ac3f82e8f9..21c797c3a4c 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-nomathhyper.tex @@ -3,6 +3,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-nomathhyper \documentclass{report} \usepackage[colorlinks]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf Binary files differindex 9e46a428b64..c139c1728ce 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.tex index 5c26c64b5a1..01ed70f872e 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-numberlist.tex @@ -4,20 +4,25 @@ % arara: makeglossaries % arara: pdflatex: { synctex: on } % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-numberlist \documentclass{report} -\usepackage[colorlinks]{hyperref} +%\usepackage[colorlinks]{hyperref} \usepackage[savenumberlist,counter=chapter]{glossaries} \makeglossaries +%\makenoidxglossaries % option 1 ("noidx") + \newglossaryentry{sample}{name=sample,description=an example} \begin{document} \chapter{Introduction} -This is a \glsentryname{sample} document. \Glsentryplural{sample} -are discussed in chapters~\glsdisplaynumberlist{sample}. +This is a \gls{sample} document. \Glspl{sample} +are discussed in chapters~\glsdisplaynumberlist{sample} +(or \glsentrynumberlist{sample}). \chapter{Sample Documents} @@ -36,5 +41,10 @@ A chapter about something else. Here's some more information about \glspl{sample}. +\chapter{And Another Sample Chapter} + +Here's another \glspl{sample}. + \printglossaries +%\printnoidxglossaries % option 1 ("noidx") \end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf Binary files differindex 881252f4583..4abf0d0d215 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.tex index 40372cbad7b..535a6519f46 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-prefix.tex @@ -4,6 +4,8 @@ % arara: makeglossaries % arara: pdflatex: { synctex: on } % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-prefix \documentclass{article} @@ -26,15 +28,23 @@ \newacronym [% - prefix={an\space},prefixfirst={a~}% + prefix={an\space},% + prefixfirst={a~}% ]{svm}{SVM}{support vector machine} +\newglossaryentry{noprefix}{name={no prefix},plural={no prefixes}, + description={entry without prefix}} + \newglossarystyle{plist}{% \setglossarystyle{list}% \renewcommand*{\glossentry}[2]{% \item[\glsentryitem{##1}% - \Glsentryprefix{##1}% - \glstarget{##1}{\glossentryname{##1}}] + \glstarget{##1}% + {% + \ifglshasprefix{##1}% + {\Glsentryprefix{##1}\glsprefixsep\glossentryname{##1}}% + {\Glossentryname{##1}}% + }] \glossentrydesc{##1}\glspostdescription\space ##2}% } @@ -44,30 +54,34 @@ \section{Sample} -First use: \pgls{sample}, \pgls{svm}, \pgls{oeil}. Next use: \pgls{sample}, \pgls{svm}, \pgls{oeil}. +First use: \pgls{sample}, \pgls{svm}, \pgls{oeil}, \pgls{noprefix}. Next use: +\pgls{sample}, \pgls{svm}, \pgls{oeil}, \pgls{noprefix}. Reset. \glsresetall -First use: \pglspl{sample}, \pglspl{svm}, \pglspl{oeil}. Next use: -\pglspl{sample}, \pglspl{svm}, \pglspl{oeil}. +First use: \pglspl{sample}, \pglspl{svm}, \pglspl{oeil}, \pglspl{noprefix}. Next use: +\pglspl{sample}, \pglspl{svm}, \pglspl{oeil}, \pglspl{noprefix}. Reset. \glsresetall -First use: \Pgls{sample}, \Pgls{svm}. Next use: \Pgls{sample}, \Pgls{svm}. +First use: \Pgls{sample}, \Pgls{svm}, \Pgls{oeil}, \Pgls{noprefix}. Next use: +\Pgls{sample}, \Pgls{svm}, \Pgls{oeil}, \Pgls{noprefix}. Reset. \glsresetall -First use: \Pglspl{sample}, \Pglspl{svm}. Next use: \Pglspl{sample}, \Pglspl{svm}. +First use: \Pglspl{sample}, \Pglspl{svm}, \Pglspl{oeil}, \Pglspl{noprefix}. Next use: +\Pglspl{sample}, \Pglspl{svm}, \Pglspl{oeil}, \Pglspl{noprefix}. Reset. \glsresetall -First use: \PGLS{sample}, \PGLS{svm}. Next use: \PGLS{sample}, \PGLS{svm}. +First use: \PGLS{sample}, \PGLS{svm}, \PGLS{oeil}, \PGLS{noprefix}. Next use: +\PGLS{sample}, \PGLS{svm}, \PGLS{oeil}, \PGLS{noprefix}. Reset. \glsresetall -First use: \PGLSpl{sample}, \PGLSpl{svm}. Next use: \PGLSpl{sample}, \PGLSpl{svm}. +First use: \PGLSpl{sample}, \PGLSpl{svm}, \PGLSpl{oeil}, \PGLSpl{noprefix}. Next use: +\PGLSpl{sample}, \PGLSpl{svm}, \PGLSpl{oeil}, \PGLSpl{noprefix}. \printglossary[style=plist] - \printacronyms \end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf Binary files differindex c2aef74cdec..ba749704a6e 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.tex index e1afeae6226..a5d6ed7d7f8 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-si.tex @@ -3,6 +3,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-si \documentclass{article} \usepackage{siunitx} \usepackage[style=long4col]{glossaries} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdf Binary files differindex 3b517bf24fe..340ff6f9f16 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.tex index 39fcb8c8dd4..9ff45423406 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr-desc.tex @@ -3,6 +3,8 @@ % arara: pdflatex % arara: makeglossaries % arara: pdflatex +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-storage-abbr-desc \documentclass{article} \usepackage{glossaries} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdf Binary files differindex d8115a22dad..bc995c55f42 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.tex index fbde7ef10b2..6b6ed6bd046 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-storage-abbr.tex @@ -3,6 +3,8 @@ % arara: pdflatex % arara: makeglossaries % arara: pdflatex +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample-storage-abbr \documentclass{article} \usepackage{glossaries} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf Binary files differindex 2bf39bd56e7..3d4e2a49ae6 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex index eca14645854..6b9e19069b3 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex @@ -4,16 +4,20 @@ % arara: makeglossaries % arara: pdflatex: { synctex: on } % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample \documentclass[a4paper]{report} \usepackage[plainpages=false,colorlinks]{hyperref} -\usepackage[toc,style=treenoname,order=word,subentrycounter]{glossaries} +\usepackage[toc,style=treenonamegroup,subentrycounter]{glossaries} \makeglossaries -\newglossaryentry{Perl}{name=\texttt{Perl}, +\newcommand{\scriptlang}[1]{\textsf{#1}} + +\newglossaryentry{Perl}{name=\scriptlang{Perl}, sort=Perl, % need a sort key because name contains a command -description=A scripting language} +description={A scripting language}} \newglossaryentry{glossary}{name=glossary, description={\nopostdesc}, @@ -53,12 +57,15 @@ distinct section of a piece of writing. Beginning on new, usually indented, line} % entry with two types of plural. Set the plural form to the -% form most likely to be used. If you want to use a different -% plural, you will need to explicity specify it in \glslink +% form most likely to be used. The alternative plural is stored in +% the 'user1' key. Another option is to define your own custom +% storage key for alternative plurals. \newglossaryentry{cow}{name=cow, % this isn't necessary, as this form (appending an s) is % the default plural=cows, +% alternative plural: +user1=kine, % description: description={(\emph{pl.}\ cows, \emph{archaic} kine) an adult female of any bovine animal}} @@ -66,12 +73,11 @@ female of any bovine animal}} \newglossaryentry{bravo}{name={bravo}, description={\nopostdesc}} -\newglossaryentry{bravo1}{description={cry of approval (pl.\ bravos)}, +\newglossaryentry{bravocry}{description={cry of approval (pl.\ bravos)}, sort={1}, -plural={bravos}, parent=bravo} -\newglossaryentry{bravo2}{description={hired ruffian or killer (pl.\ bravoes)}, +\newglossaryentry{bravoruffian}{description={hired ruffian or killer (pl.\ bravoes)}, sort={2}, plural={bravoes}, parent=bravo} @@ -112,11 +118,12 @@ uncommented line breaks or attempts to pretty-print the \LaTeX\ code} \chapter{Introduction} \pagenumbering{arabic} -A \gls{glossarylist} (definition~\glsrefentry{glossarylist}) is a -very useful addition to any technical document, although a -\gls{glossarycol} (definition~\glsrefentry{glossarycol}) can also -simply be a collection of glosses, which is another thing entirely. -Some documents have multiple \glspl{glossarylist}. +A \gls{glossarylist} (definition~\glsrefentry{glossarylist}, plural +\glspl{glossarylist}) is a very useful addition to any technical +document, although a \gls{glossarycol} +(definition~\glsrefentry{glossarycol}, plural \glspl{glossarycol}) +can also simply be a collection of glosses, which is another thing +entirely. Some documents have multiple \glspl{glossarylist}. Once you have run your document through \LaTeX, you will then need to run the \texttt{.glo} file through \texttt{makeindex} (default) @@ -136,21 +143,25 @@ Be careful about \glspl{spuriousspace} appearing in your code. \chapter{Plurals and Paragraphs} -Plurals are assumed to have the letter s appended, but if this is +Plurals are assumed to have the letter ``s'' appended, but if this is not the case, as in \glspl{mtrx}, then you need to specify the plural when you define the entry. If a term may have multiple -plurals (for example \glspl{cow}/\glslink{cow}{kine}) then -define the entry with the plural form most likely to be used and -explicitly specify the alternative form using \verb|\glslink| +plurals (for example \glspl{cow}/\glsuseri{cow}) then +define the entry with the plural form most likely to be used. +The alternative can simply be referenced with \verb|\glslink| (e.g.\ \glslink{cow}{kine}) or \verb|\glsdisp| (e.g.\ \glsdisp{cow}{kine}). +Another option is to save the alternative plural in another key. In +this case, the ``user1'' key has been used, but a custom key can be +defined instead. + \Glspl{seal} and \glspl{sealion} have regular plural forms. \Gls{bravo} is a homograph, but the plural forms are spelt -differently. The plural of \gls{bravo1}, a cry of approval -(definition~\glsrefentry{bravo1}), is \glspl{bravo1}, whereas the -plural of \gls{bravo2}, a hired ruffian or killer -(definition~\glsrefentry{bravo2}), is \glspl{bravo2}. +differently. The plural of \gls{bravocry}, a cry of approval +(definition~\glsrefentry{bravocry}), is \glspl{bravocry}, whereas the +plural of \gls{bravoruffian}, a hired ruffian or killer +(definition~\glsrefentry{bravoruffian}), is \glspl{bravoruffian}. \Glspl{par} can cause a problem in commands, so care is needed when having a paragraph break in a \gls{glossarylist} entry. diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf Binary files differindex a9e88dfadf7..ee58db42821 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex index 19789541231..71e8c442cc2 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex @@ -3,8 +3,12 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample4col \documentclass[a4paper]{article} +% Other 4 column styles are available. The ones that use +% booktabs.sty are recommended over the "headerborder" styles \usepackage[style=long4colheaderborder]{glossaries} \makeglossaries diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf Binary files differindex cef9f80d86d..8a80268474d 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex index 572b95d6eaa..905aa943f37 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex @@ -4,6 +4,8 @@ % arara: makeglossaries % arara: pdflatex: { synctex: on } % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleAcr \documentclass[a4paper]{report} \usepackage[colorlinks,plainpages=false]{hyperref} @@ -39,6 +41,9 @@ This is the entry in uppercase: \GLS{svm}. \chapter{Kernel Support Vector Machines} +% Instead of using the clumsy \ifglsused, you might find it simpler +% to use glossaries-prefix.sty + The \gls{ksvm} is \ifglsused{svm}{an}{a} \gls{svm} that uses the so called ``kernel trick''. Plural: \glspl{ksvm}. Resetting acronyms. diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf Binary files differindex 96222c6f12f..65899e6a7b7 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex index e2170feb16c..03490057a27 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex @@ -4,8 +4,11 @@ % arara: makeglossaries % arara: pdflatex: { synctex: on } % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleAcrDesc \documentclass[a4paper]{report} +\usepackage[T1]{fontenc}% need support for bold smallcaps \usepackage[colorlinks,plainpages=false]{hyperref} \usepackage[acronym,% create 'acronym' glossary type % The package option "nomain" is used here to suppress the @@ -24,19 +27,14 @@ % Change the "see" items so that they use \acronymfont: \renewcommand*{\glsseeitemformat}[1]{\acronymfont{\glsentrytext{#1}}} -% Not using a font that supports bold smallcaps so change the way -% the name is formatted in the glossary: - -\renewcommand*{\glsnamefont}[1]{\textmd{#1}} - \newacronym[description={Statistical pattern recognition -technique~\protect\cite{svm}}, % acronym's description +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}}, + see={[see also]{svm}} ] {ksvm}{ksvm}{kernel support vector machine} @@ -58,6 +56,9 @@ This is the entry in uppercase: \GLS{svm}. \chapter{Kernel Support Vector Machines} +% Instead of using the clumsy \ifglsused, you might find it simpler +% to use glossaries-prefix.sty + 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}. diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf Binary files differindex a7d8af989ae..22f1bb19901 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.tex index eda408e02c1..5af8cdb747c 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleCustomAcr.tex @@ -4,8 +4,11 @@ % arara: makeglossaries % arara: pdflatex: { synctex: on } % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleCustomAcr \documentclass[a4paper]{report} +\usepackage[T1]{fontenc}% need support for bold smallcaps \usepackage[colorlinks,plainpages=false]{hyperref} \usepackage[acronym,% create 'acronym' glossary type % The package option "nomain" is used here to suppress the @@ -56,10 +59,6 @@ % 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: diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf Binary files differindex 9a06139e72e..4bceb441f4b 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex index 522ca63562f..6c9ccb97dd3 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex @@ -3,17 +3,19 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleDB \documentclass{article} \usepackage[colorlinks,plainpages=false]{hyperref} \usepackage[nonumberlist]{glossaries} -\newglossary[nlg]{symbols}{not}{ntn}{Symbols} +\newglossary[nlg]{punc}{not}{ntn}{Punctuation Characters} \makeglossaries \loadglsentries{database1} -\loadglsentries[symbols]{database2} +\loadglsentries[punc]{database2} \begin{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf Binary files differindex 9eb6db48149..d6ec5a570d8 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex index bcf7e4444e2..fe881e387c9 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex @@ -7,6 +7,8 @@ % arara: makeglossaries % arara: pdflatex: { synctex: on } % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleDesc \documentclass[a4paper]{report} \usepackage[colorlinks,plainpages=false]{hyperref} @@ -17,6 +19,11 @@ \makeglossaries +% This sample file demonstrates the use of the first and text keys +% but in general it's better to use \newacronym (as in +% sampleAcrDesc.tex) instead as it's more flexible. For even greater +% flexibility use \newabbreviation provided by glossaries-extra.sty + \newglossaryentry{svm}{ % how the entry name should appear in the glossary name={Support vector machine (SVM)}, diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf Binary files differindex ebcb74a2967..576b164ffed 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex index 403930a97e9..aea88cb456f 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex @@ -3,6 +3,8 @@ % arara: pdflatex % arara: makeglossaries % arara: pdflatex +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleEq \documentclass[a4paper,12pt]{report} \usepackage{amsmath} @@ -27,6 +29,9 @@ \renewcommand{\descriptionname}{Function Name} \renewcommand{\pagelistname}{Number of Formula} +% Change the width of the number list column: +\setlength{\glspagelistwidth}{0.75\textwidth} + % define glossary entries \newglossaryentry{Gamma}{name=\ensuremath{\Gamma(z)}, @@ -34,11 +39,11 @@ description=Gamma function, sort=Gamma} \newglossaryentry{gamma}{name={\ensuremath{\gamma(\alpha,x)}}, -description=Incomplete gamma function, +description=Lower incomplete gamma function, sort=gamma1} \newglossaryentry{iGamma}{name={\ensuremath{\Gamma(\alpha,x)}}, -description=Incomplete gamma function, +description=Upper incomplete gamma function, sort=Gamma2} \newglossaryentry{psi}{name=\ensuremath{\psi(x)}, @@ -115,7 +120,7 @@ option. \verb|\ensuremath| is only required here if using hyperlinks. \begin{equation} -\glslink{Gamma}{\ensuremath{\Gamma(x+1)}} = x\Gamma(x) +\glslink{Gamma}{\Gamma(x+1)} = x\Gamma(x) \end{equation} \begin{equation} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf Binary files differindex 1285f4cc16b..fc9ad3deaae 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex index 6061bb72d92..fde88006337 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex @@ -21,6 +21,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleEgPg \documentclass[a4paper,12pt]{report} \usepackage{amsmath} @@ -67,10 +69,10 @@ numbers in bold indicate page numbers where the main definition occurs.\par} description=Gamma function,sort=Gamma} \newglossaryentry{gamma}{name=\ensuremath{\gamma(\alpha,x)}, -description=Incomplete gamma function,sort=gamma} +description=Lower incomplete gamma function,sort=gamma1} \newglossaryentry{iGamma}{name=\ensuremath{\Gamma(\alpha,x)}, -description=Incomplete gamma function,sort=Gamma} +description=Upper incomplete gamma function,sort=Gamma2} \newglossaryentry{psi}{name=\ensuremath{\psi(x)}, description=Psi function,sort=psi} @@ -81,7 +83,7 @@ description=Error function,sort=erf} \newglossaryentry{erfc}{name=\ensuremath{\erfc(x)}, description=Complementary error function,sort=erfc} -\newglossaryentry{beta}{name=\ensuremath{B(x,y)}, +\newglossaryentry{B}{name=\ensuremath{B(x,y)}, description=Beta function,sort=B} \newglossaryentry{Bx}{name=\ensuremath{B_x(p,q)}, @@ -98,22 +100,22 @@ sort=Un} \newglossaryentry{Hn}{name=\ensuremath{H_n(x)}, description=Hermite polynomials,sort=Hn} -\newglossaryentry{Lna}{name=\ensuremath{L_n^\alpha(x)}, +\newglossaryentry{Ln}{name=\ensuremath{L_n^\alpha(x)}, description=Laguerre polynomials,sort=Lna} \newglossaryentry{Znu}{name=\ensuremath{Z_\nu(z)}, description=Bessel functions,sort=Z} -\newglossaryentry{Pagz}{name=\ensuremath{\Phi(\alpha,\gamma;z)}, +\newglossaryentry{Phi}{name=\ensuremath{\Phi(\alpha,\gamma;z)}, description=confluent hypergeometric function,sort=Pagz} -\newglossaryentry{kv}{name=\ensuremath{k_\nu(x)}, +\newglossaryentry{knu}{name=\ensuremath{k_\nu(x)}, description=Bateman's function,sort=kv} \newglossaryentry{Dp}{name=\ensuremath{D_p(z)}, description=Parabolic cylinder functions,sort=Dp} -\newglossaryentry{Fpk}{name=\ensuremath{F(\phi,k)}, +\newglossaryentry{F}{name=\ensuremath{F(\phi,k)}, description=Elliptical integral of the first kind,sort=Fpk} \newglossaryentry{C}{name=\ensuremath{C}, @@ -163,7 +165,7 @@ defined as \end{equation} \begin{equation} -\glslink{Gamma}{\ensuremath{\Gamma(x+1)}} = x\Gamma(x) +\glslink{Gamma}{\Gamma(x+1)} = x\Gamma(x) \end{equation} \begin{equation} @@ -177,7 +179,7 @@ defined as \newpage \begin{equation} -\glslink{Gamma}{\ensuremath{\Gamma(\alpha)}} = +\glslink{Gamma}{\Gamma(\alpha)} = \Gamma(\alpha, x) + \gamma(\alpha, x) \end{equation} @@ -199,15 +201,15 @@ The \glslink[format=hyperbf,counter=page]{erf}{error function} is defined as: \chapter{Beta Function} \begin{equation} -\gls{beta} = 2\int_0^1 t^{x-1}(1-t^2)^{y-1}\,dt +\gls{B} = 2\int_0^1 t^{x-1}(1-t^2)^{y-1}\,dt \end{equation} Alternatively: \begin{equation} -\gls{beta} = 2\int_0^{\frac\pi2}\sin^{2x-1}\phi\cos^{2y-1}\phi\,d\phi +\gls{B} = 2\int_0^{\frac\pi2}\sin^{2x-1}\phi\cos^{2y-1}\phi\,d\phi \end{equation} \begin{equation} -\gls{beta} = \frac{\Gamma(x)\Gamma(y)}{\Gamma(x+y)} = B(y,x) +\gls{B} = \frac{\Gamma(x)\Gamma(y)}{\Gamma(x+y)} = B(y,x) \end{equation} \begin{equation} @@ -233,7 +235,7 @@ Alternatively: \chapter{Laguerre polynomials} \begin{equation} -\gls{Lna} = \frac{1}{n!}e^x x^{-\alpha} +\gls{Ln} = \frac{1}{n!}e^x x^{-\alpha} \frac{d^n}{dx^n}(e^{-x}x^{n+\alpha}) \end{equation} @@ -250,7 +252,7 @@ Bessel functions $Z_\nu(z)$ are solutions of \chapter{Confluent hypergeometric function} \begin{equation} -\gls{Pagz} = 1 + \frac{\alpha}{\gamma}\,\frac{z}{1!} +\gls{Phi} = 1 + \frac{\alpha}{\gamma}\,\frac{z}{1!} + \frac{\alpha(\alpha+1)}{\gamma(\gamma+1)}\,\frac{z^2}{2!} +\frac{\alpha(\alpha+1)(\alpha+2)} {\gamma(\gamma+1)(\gamma+2)} @@ -259,7 +261,7 @@ Bessel functions $Z_\nu(z)$ are solutions of \end{equation} \begin{equation} -\gls{kv} = \frac{2}{\pi}\int_0^{\pi/2} +\gls{knu} = \frac{2}{\pi}\int_0^{\pi/2} \cos(x \tan\theta - \nu\theta)\,d\theta \end{equation} @@ -278,7 +280,7 @@ Bessel functions $Z_\nu(z)$ are solutions of \chapter{Elliptical Integral of the First Kind} \begin{equation} -\gls{Fpk} = \int_0^\phi +\gls{F} = \int_0^\phi \frac{d\alpha}{\sqrt{1-k^2\sin^2\alpha}} \end{equation} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf Binary files differindex e6545084538..f7fff7a0800 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.tex index 0f3d868166d..6df02d687e7 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleFnAcrDesc.tex @@ -4,8 +4,11 @@ % arara: makeglossaries % arara: pdflatex: { synctex: on } % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleFnAcrDesc \documentclass[a4paper]{report} +\usepackage[T1]{fontenc}% need support for bold smallcaps \usepackage[colorlinks,plainpages=false]{hyperref} \usepackage[acronym,% create 'acronym' glossary type % The package option "nomain" is used here to suppress the @@ -26,10 +29,6 @@ \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}}} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf Binary files differindex 3db806aea93..149c40c7965 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex index 9b3841cc33d..23ddfcd4090 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex @@ -4,6 +4,8 @@ % arara: makeglossaries % arara: pdflatex: { synctex: on } % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleNtn \documentclass{report} % If you want to add babel to this document, you may have to @@ -12,7 +14,7 @@ \usepackage[plainpages=false,colorlinks]{hyperref} \usepackage{html} -\usepackage[toc,xindy]{glossaries} +\usepackage[toc]{glossaries} % Define a new glossary type called notation \newglossary[nlg]{notation}{not}{ntn}{Notation} @@ -22,22 +24,22 @@ % Notation definitions \newglossaryentry{not:set}{type=notation, % glossary type -name={$\mathcal{S}$}, -description={A set}, +name={\ensuremath{\mathcal{S}}}, +description={A \gls{gls:set}}, sort={S}} \newglossaryentry{not:U}{type=notation, -name={$\mathcal{U}$}, -description={The universal set}, +name={\ensuremath{\mathcal{U}}}, +description={The universal \gls{gls:set}}, sort=U} \newglossaryentry{not:card}{type=notation, -name={$|\mathcal{S}|$}, -description={cardinality of $\mathcal{S}$}, +name={\ensuremath{\mid\mathcal{S}\mid}}, +description={The \gls{gls:card} of $\mathcal{S}$}, sort=cardinality} \newglossaryentry{not:fact}{type=notation, -name={$!$}, +name={\ensuremath{!}}, description={factorial}, sort=factorial} @@ -61,8 +63,7 @@ description={The number of elements in the specified set}} This is a sample document illustrating the use of the \textsf{glossaries} package. In this example, a new glossary type called \texttt{notation} is defined, so that the document can have a -separate glossary of terms and index of notation. The index of notation -doesn't have associated numbers. +separate glossary of terms and index of notation. \end{abstract} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf Binary files differindex bdd7bb5d2a5..cbc7beaed03 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.tex b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.tex index 4182dcabc18..b192bca6b2d 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplePeople.tex @@ -5,6 +5,8 @@ % arara: makeglossaries % arara: pdflatex: { synctex: on } % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#samplePeople \documentclass{report} \usepackage[colorlinks]{hyperref} @@ -16,7 +18,7 @@ \newcommand{\textname}[2]{#1 #2} % Syntax: \name{first name}{surname} - \let\name\textname +\let\name\textname \renewcommand{\glsprestandardsort}[3]{% \let\name\sortname diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf Binary files differindex 219ec0f5353..710ab4ab77b 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex index 975c51076da..112775bfe9a 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex @@ -4,6 +4,10 @@ % arara: makeglossaries % arara: pdflatex: { synctex: on } % arara: pdflatex: { synctex: on } +% +% Note that you will get a different result if you use +% makeglossaries-lite or explicitly use makeindex for this example. See +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleSec \documentclass{report} \usepackage[plainpages=false,colorlinks]{hyperref} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf Binary files differindex d771b7d591f..5e60c52d169 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.tex index 960dc22f0f0..e55ff77cd03 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSort.tex @@ -4,6 +4,8 @@ % arara: makeglossaries % arara: pdflatex: { synctex: on } % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleSort \documentclass{report} % If you want to add babel to this document, you may have to @@ -44,8 +46,8 @@ text={\emptyset}, description={The empty set}} \newglossaryentry{not:card}{type=notation, -name={$|\mathcal{S}|$}, -text={|\mathcal{S}|}, +name={$\mid\mathcal{S}\mid$}, +text={\mid\mathcal{S}\mid}, description={cardinality of $\mathcal{S}$}} % Main glossary definitions @@ -58,6 +60,8 @@ description={The number of elements in the specified set}} % Acronym definitions +\setacronymstyle{long-short} + \newacronym{zfc}{ZFC}{Zermelo-Fraenkel set theory} \newacronym{ad}{AD}{axiom of determinacy} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf Binary files differindex 185bfcd745e..b16f7690060 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex index ad1eb7bef16..26708ca37c3 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex @@ -3,42 +3,84 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleaccsupp +% +% Note that this document isn't fully accessible as it's not tagged. +% See the accessibility or tagpdf packages for examples of how to tag the document. \documentclass[a4paper]{article} -\usepackage[margin=0.5in]{geometry} -\usepackage{booktabs} +\usepackage[includemp,marginpar=1.5in,textwidth=5in]{geometry} +\usepackage{graphicx} +% use debug=showaccsupp to show replacement text in the margin \usepackage[acronym]{glossaries-accsupp} \makeglossaries -\newglossaryentry{dr}{name=Dr,description={Doctor},access={Doctor}} +\setacronymstyle{long-short} -\newacronym[shortaccess=S V M]{svm}{svm}{support vector machine} +% These will use 'ActualText' rather than 'E' because the +% abbreviation is in the 'name' field. +\newglossaryentry{Doctor}{name=Dr,description={Doctor},access={Doctor}} +\newglossaryentry{Drive}{name={Dr.},description={Drive},access={Drive}, + plural={Drvs}} + +% These will use 'E' \newacronym{eg}{e.g.}{for example} -\newcommand*{\samplerow}[1]{% - \gls{#1} & \gls{#1} & \acrshort{#1} & \acrlong{#1}\\ - \glsreset{#1}\Gls{#1} & \Gls{#1} & \Acrshort{#1} & \Acrlong{#1}\\ - \glsreset{#1}\GLS{#1} & \GLS{#1} & \ACRshort{#1} & \ACRlong{#1}\\ +\newacronym[shortaccess={TiKZ ist kein Zeichenprogramm}] +{tikz}{Ti\emph{k}Z}{Ti\emph{k}Z ist \emph{kein} Zeichenprogramm} + + +% The symbol key needs to use 'ActualText' but the replacement text +% needs to be supplied as the hexadecimal character code. + +\newcommand{\glssymbolaccsupp}[2]{% + \glsaccessibility[method=hex,unicode]{ActualText}{#1}{#2}% +} + +\newglossaryentry{int}{name={int},description={integral}, + symbol={\ensuremath{\int}},symbolaccess={222B} +} + +% The user1 key needs to use 'Alt': +\newcommand{\glsuseriaccsupp}[2]{% + \glsaccessibility{Alt}{#1}{#2}% +} + +\newglossaryentry{sampleimage}{name={sample image}, + description={an example image}, +% \protect is needed unless \glsnoexpandfields has been used + user1={\protect\includegraphics[height=20pt]{example-image}}, + user1access={a boilerplate image used in examples} } \begin{document} -\begin{center} -\begin{tabular}{lllll} -\toprule -\bfseries First & \bfseries Next & \bfseries Short & \bfseries Long -\\\midrule -\samplerow{dr} -\midrule -\samplerow{eg} -\midrule -\samplerow{svm} -\bottomrule -\end{tabular} -\end{center} +\section{General Terms} + +Testing general terms that are really abbreviations. + +\gls{Doctor} Smith lives at 2, Blueberry \gls{Drive} + +\section{Symbols and Images} + +Symbol: \glssymbol{int} (\gls{int}). + +Image: \glsuseri{sampleimage} (\gls{sampleimage}). + +\section{Abbreviations} + +First use: \gls{eg}, \gls{tikz}. + +Next use: \gls{eg}, \gls{tikz}. + +Short: \acrshort{eg}, \acrshort{tikz}. + +Long: \acrlong{eg}, \acrlong{tikz}. +Full: \acrfull{eg}, \acrfull{tikz}. \printglossaries \end{document} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf Binary files differindex 15a119ffc26..ea045bb0813 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex index 38fb336de7b..b261887d15c 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex @@ -3,6 +3,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleacronyms \documentclass{article} \usepackage[acronym,acronymlists={main,acronym2}]{glossaries} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf Binary files differindex 1d1e1dcc2e4..f884d9fd893 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex index 43c21518e46..dc8554504c8 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex @@ -3,6 +3,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampletree \documentclass{report} \usepackage[colorlinks]{hyperref} @@ -13,6 +15,9 @@ \glssetwidest{Roman letters} % level 0 widest name \glssetwidest[1]{Sigma} % level 1 widest name +\setglossarypreamble{This is a contrived example to demonstrate the +alttreehypergroup style.} + \makeglossaries \newglossaryentry{greekletter}{name={Greek letters}, @@ -22,14 +27,12 @@ description={\nopostdesc}} \newglossaryentry{sigma}{name={Sigma}, text={\ensuremath{\Sigma}}, first={\ensuremath{\Sigma} (uppercase sigma)}, -symbol={\ensuremath{\Sigma}}, description={Used to indicate summation}, parent=greekletter} \newglossaryentry{pi}{name={pi}, text={\ensuremath{\pi}}, first={\ensuremath{\pi} (lowercase pi)}, -symbol={\ensuremath{\pi}}, description={Transcendental number}, parent=greekletter} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf Binary files differindex 93e155d97f5..155441d4fea 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex index 94deb79ef92..82f59420d71 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex @@ -3,6 +3,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sampleutf8 \documentclass{article} \usepackage[utf8]{inputenc} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf Binary files differindex 8db6ac5ddfb..69261d7c8b2 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex index 2effb0da1b9..08d407027e5 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex @@ -22,6 +22,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#sample \documentclass{article} \usepackage[utf8]{inputenc} @@ -45,7 +47,7 @@ % package for the dice commands): % \tallynum{n} displays a die or dice where the dots add up to n -\newrobustcmd{\tallynum}[1]{% +\newrobustcmd*{\tallynum}[1]{% \ifnum\number#1<7 $\csname dice\romannumeral#1\endcsname$% \else @@ -59,7 +61,7 @@ % a very specific format. (See the glossaries user manual for more % details.) -\newcommand{\tally}[1]{\tallynum{\arabic{page}}} +\newcommand*{\tally}[1]{\tallynum{\arabic{#1}}} % Now redefine \thepage % (\texorpdfstring is used in case the page number ends up in a PDF diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf Binary files differindex de19ce8acb5..854bf4e3c2c 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex index 6225fb4d9fb..867fe717fdf 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex @@ -13,6 +13,8 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#samplexdy2 \documentclass{report} \usepackage[utf8]{inputenc} diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy3.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy3.pdf Binary files differindex b715c047b40..290f85b163a 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy3.pdf +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy3.pdf diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy3.tex b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy3.tex index 8a28f1c3f91..0ef2694fd4a 100644 --- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy3.tex +++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy3.tex @@ -22,7 +22,9 @@ % arara: pdflatex: { synctex: on } % arara: makeglossaries % arara: pdflatex: { synctex: on } - \documentclass{article} +% +%http://mirrors.ctan.org/macros/latex/contrib/glossaries/glossaries-user.html#samplexdy3 +\documentclass{article} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} |