diff options
author | Norbert Preining <norbert@preining.info> | 2019-12-07 03:00:49 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2019-12-07 03:00:49 +0000 |
commit | f158c892f4714e2dfef87c5edf8cd679fd09bb2b (patch) | |
tree | f8cae0221bb28490d61fc9a531ac4d087186e273 /macros/latex/contrib/glossaries/samples | |
parent | ac57c892e88b77eb217641d4a1059da681320633 (diff) |
CTAN sync 201912070300
Diffstat (limited to 'macros/latex/contrib/glossaries/samples')
75 files changed, 415 insertions, 408 deletions
diff --git a/macros/latex/contrib/glossaries/samples/database1.tex b/macros/latex/contrib/glossaries/samples/database1.tex index f9ecc9a420..8a78ad6d78 100644 --- a/macros/latex/contrib/glossaries/samples/database1.tex +++ b/macros/latex/contrib/glossaries/samples/database1.tex @@ -1,8 +1,8 @@ - % This is a sample database of glossary entries - % Only those entries used in the document with \glslink, \gls, - % \glspl, and uppercase variants will have entries in the - % glossary. Note that the type key is not used, as the - % glossary type can be specified in \loadglsentries +% This is a sample database of glossary entries +% Only those entries used in the document with \glslink, \gls, +% \glspl, and uppercase variants will have entries in the +% glossary. Note that the type key is not used, as the +% glossary type can be specified in \loadglsentries \newglossaryentry{array}{name=array, description={A list of values identified by a numeric value}} @@ -11,7 +11,7 @@ description={A list of values identified by a numeric value}} description={Pertaining to numbers represented in base 2}} \newglossaryentry{comment}{name=comment, -description={A remark that doesn't affect the meaning of the +description={A remark that doesn't affect the meaning of the code}} \newglossaryentry{global}{name=global, diff --git a/macros/latex/contrib/glossaries/samples/database2.tex b/macros/latex/contrib/glossaries/samples/database2.tex index 55bc08a1c4..7b0e2995be 100644 --- a/macros/latex/contrib/glossaries/samples/database2.tex +++ b/macros/latex/contrib/glossaries/samples/database2.tex @@ -1,10 +1,10 @@ - % This is a sample database of glossary entries - % Only those entries used in the document with \glslink, \gls, - % \glspl, and uppercase variants will have entries in the - % glossary. Note that the type key is not used, as the - % glossary type can be specified in \loadglsentries +% This is a sample database of glossary entries +% Only those entries used in the document with \glslink, \gls, +% \glspl, and uppercase variants will have entries in the +% glossary. Note that the type key is not used, as the +% glossary type can be specified in \loadglsentries - % Don't need to worry about makeindex special characters +% Don't need to worry about makeindex special characters \newglossaryentry{quote}{name={"}, description={the double quote symbol}} diff --git a/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf b/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf Binary files differindex af2c27e7db..76744ff2da 100644 --- a/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf +++ b/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf diff --git a/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.tex b/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.tex index c8fa373feb..b75e0c6761 100644 --- a/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.tex +++ b/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.tex @@ -1,9 +1,9 @@ - % arara: pdflatex - % arara: makeglossaries - % arara: pdflatex - % arara: bibtex - % arara: pdflatex - % arara: pdflatex +% arara: pdflatex +% arara: makeglossaries +% arara: pdflatex +% arara: bibtex +% arara: pdflatex +% arara: pdflatex \documentclass{report} \usepackage{graphicx} diff --git a/macros/latex/contrib/glossaries/samples/minimalgls.pdf b/macros/latex/contrib/glossaries/samples/minimalgls.pdf Binary files differindex 613b44b89b..e81068446a 100644 --- a/macros/latex/contrib/glossaries/samples/minimalgls.pdf +++ b/macros/latex/contrib/glossaries/samples/minimalgls.pdf diff --git a/macros/latex/contrib/glossaries/samples/minimalgls.tex b/macros/latex/contrib/glossaries/samples/minimalgls.tex index 195b4a04e9..816007fd2e 100644 --- a/macros/latex/contrib/glossaries/samples/minimalgls.tex +++ b/macros/latex/contrib/glossaries/samples/minimalgls.tex @@ -1,7 +1,7 @@ % This file is public domain. % -% This is a minimal file for testing and debugging -% the glossaries package. Change the class file as +% This is a minimal file for testing and debugging +% the glossaries package. Change the class file as % desired, and add the relevant package options to % both the class file and the glossaries package. % Change the sample glossary entry and acronym if @@ -9,7 +9,7 @@ % glossary, add in the relevant \newglossary command % and a sample entry. % -% Only add extra packages or commands if they +% Only add extra packages or commands if they % contribute to whatever problem you are trying to % test. % @@ -57,9 +57,9 @@ description={a sample entry}} % This contrived acronym has non-standard plural forms. % These are specified in the optional argument. -% Remove the optional argument to revert to the default +% Remove the optional argument to revert to the default % plurals. -\newacronym[\glsshortpluralkey=cas,\glslongpluralkey=contrived +\newacronym[\glsshortpluralkey=cas,\glslongpluralkey=contrived acronyms]{aca}{aca}{a contrived acronym} % Keep all definitions in the preamble! diff --git a/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf b/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf Binary files differindex 2eef686216..06ebb2b46c 100644 --- a/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf +++ b/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf diff --git a/macros/latex/contrib/glossaries/samples/mwe-acr-desc.tex b/macros/latex/contrib/glossaries/samples/mwe-acr-desc.tex index 1cb34e284f..be64f5cafa 100644 --- a/macros/latex/contrib/glossaries/samples/mwe-acr-desc.tex +++ b/macros/latex/contrib/glossaries/samples/mwe-acr-desc.tex @@ -1,8 +1,8 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex - % arara: makeglossaries - % arara: pdflatex +% This file is public domain +% If you want to use arara, you need the following directives: +% arara: pdflatex +% arara: makeglossaries +% arara: pdflatex \documentclass{article} \usepackage{glossaries} @@ -11,7 +11,7 @@ \setacronymstyle{short-long-desc} -\newacronym[description={a device that emits a narrow beam of +\newacronym[description={a device that emits a narrow beam of light}]{laser}{laser}{light amplification by stimulated emission of radiation} diff --git a/macros/latex/contrib/glossaries/samples/mwe-acr.pdf b/macros/latex/contrib/glossaries/samples/mwe-acr.pdf Binary files differindex dc4f70c518..02f3e50e86 100644 --- a/macros/latex/contrib/glossaries/samples/mwe-acr.pdf +++ b/macros/latex/contrib/glossaries/samples/mwe-acr.pdf diff --git a/macros/latex/contrib/glossaries/samples/mwe-acr.tex b/macros/latex/contrib/glossaries/samples/mwe-acr.tex index 46b36dcc25..d7dd581f60 100644 --- a/macros/latex/contrib/glossaries/samples/mwe-acr.tex +++ b/macros/latex/contrib/glossaries/samples/mwe-acr.tex @@ -1,8 +1,8 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex - % arara: makeglossaries - % arara: pdflatex +% This file is public domain +% If you want to use arara, you need the following directives: +% arara: pdflatex +% arara: makeglossaries +% arara: pdflatex \documentclass{article} \usepackage{glossaries} diff --git a/macros/latex/contrib/glossaries/samples/mwe-gls.pdf b/macros/latex/contrib/glossaries/samples/mwe-gls.pdf Binary files differindex 75781ecb5b..14208cc5da 100644 --- a/macros/latex/contrib/glossaries/samples/mwe-gls.pdf +++ b/macros/latex/contrib/glossaries/samples/mwe-gls.pdf diff --git a/macros/latex/contrib/glossaries/samples/mwe-gls.tex b/macros/latex/contrib/glossaries/samples/mwe-gls.tex index 9c5e7c6bc4..59dacdd4d1 100644 --- a/macros/latex/contrib/glossaries/samples/mwe-gls.tex +++ b/macros/latex/contrib/glossaries/samples/mwe-gls.tex @@ -1,8 +1,8 @@ - % This file is public domain - % If you want to use arara, you need the following directives: - % arara: pdflatex - % arara: makeglossaries - % arara: pdflatex +% This file is public domain +% If you want to use arara, you need the following directives: +% arara: pdflatex +% arara: makeglossaries +% arara: pdflatex \documentclass{article} \usepackage{glossaries} diff --git a/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf b/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf Binary files differindex e7b5016362..0ac18e640f 100644 --- a/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf b/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf Binary files differindex 5ae0a14a80..891ae8db65 100644 --- a/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-crossref.pdf b/macros/latex/contrib/glossaries/samples/sample-crossref.pdf Binary files differindex bd89fff0b2..7033120a7b 100644 --- a/macros/latex/contrib/glossaries/samples/sample-crossref.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-crossref.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf b/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf Binary files differindex 5ea60ec873..37de7552bb 100644 --- a/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-custom-acronym.tex b/macros/latex/contrib/glossaries/samples/sample-custom-acronym.tex index 992187f671..74ea760665 100644 --- a/macros/latex/contrib/glossaries/samples/sample-custom-acronym.tex +++ b/macros/latex/contrib/glossaries/samples/sample-custom-acronym.tex @@ -10,7 +10,7 @@ % The package option "nomain" is used here to suppress the % main glossary, since this example doesn't use it. If you % want to use the main glossary, remove the "nomain" option. - nomain + nomain ]{glossaries} \makeglossaries diff --git a/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf b/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf Binary files differindex 59e6a1b940..4722172d2c 100644 --- a/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-dual.pdf b/macros/latex/contrib/glossaries/samples/sample-dual.pdf Binary files differindex b3948a464c..44eb610a1c 100644 --- a/macros/latex/contrib/glossaries/samples/sample-dual.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-dual.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf b/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf Binary files differindex 9b28627e43..c7e9ec1a23 100644 --- a/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf b/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf Binary files differindex 64deb3490c..869b9204a5 100644 --- a/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf b/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf Binary files differindex 45e6dd0584..046347b87e 100644 --- a/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-ignored.pdf b/macros/latex/contrib/glossaries/samples/sample-ignored.pdf Binary files differindex 7185f4d455..2344c44f54 100644 --- a/macros/latex/contrib/glossaries/samples/sample-ignored.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-ignored.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-index.pdf b/macros/latex/contrib/glossaries/samples/sample-index.pdf Binary files differindex 18a83dfcd2..5baa6494f9 100644 --- a/macros/latex/contrib/glossaries/samples/sample-index.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-index.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-inline.pdf b/macros/latex/contrib/glossaries/samples/sample-inline.pdf Binary files differindex cadd7af539..df6e6f6556 100644 --- a/macros/latex/contrib/glossaries/samples/sample-inline.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-inline.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-inline.tex b/macros/latex/contrib/glossaries/samples/sample-inline.tex index c5d7220945..e6a6e94c87 100644 --- a/macros/latex/contrib/glossaries/samples/sample-inline.tex +++ b/macros/latex/contrib/glossaries/samples/sample-inline.tex @@ -38,7 +38,7 @@ parent={glossary}} \newglossaryentry{pagelist}{name=page list, % description value has to be enclosed in braces % because it contains commas -description={a list of individual pages or page ranges +description={a list of individual pages or page ranges (e.g.\ 1,2,4,7-9)}} \newglossaryentry{mtrx}{name=matrix, @@ -49,10 +49,10 @@ plural=matrices} % entry with a paragraph break in the description \newglossaryentry{par}{name=paragraph, -description={distinct section of piece of +description={distinct section of piece of writing. Beginning on new, usually indented, line}} -% entry with two types of plural. Set the plural form to the +% entry with two types of plural. Set the plural form to the % form most likely to be used. If you want to use a different % plural, you will need to explicity specify it in \glslink \newglossaryentry{cow}{name=cow, @@ -107,9 +107,9 @@ Once you have run your document through \LaTeX, you will then need to run the \texttt{.glo} file through \texttt{makeindex}. You will need to set the output file so that it creates a \texttt{.gls} file instead -of an \texttt{.ind} file, and change the name of +of an \texttt{.ind} file, and change the name of the log file so that it doesn't overwrite the index -log file (if you have an index for your document). +log file (if you have an index for your document). Rather than having to remember all the command line switches, you can call the \gls{Perl} script \texttt{makeglossaries} which provides a convenient @@ -123,7 +123,7 @@ 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 +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|. \Glspl{seal} and \glspl{sealion} have regular plural forms. diff --git a/macros/latex/contrib/glossaries/samples/sample-langdict.pdf b/macros/latex/contrib/glossaries/samples/sample-langdict.pdf Binary files differindex 5d85d6c143..585c4a96ea 100644 --- a/macros/latex/contrib/glossaries/samples/sample-langdict.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-langdict.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf b/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf Binary files differindex a15f6e32c6..b9d3912b1b 100644 --- a/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-newkeys.tex b/macros/latex/contrib/glossaries/samples/sample-newkeys.tex index d2830fc6bf..ee93bcb22e 100644 --- a/macros/latex/contrib/glossaries/samples/sample-newkeys.tex +++ b/macros/latex/contrib/glossaries/samples/sample-newkeys.tex @@ -52,11 +52,11 @@ The duck was \glsing{waddle} round the dog. The dog \glsed{run} away from the duck. -First letter uppercase: \Glsed{jump}, \Glsing{jump}, +First letter uppercase: \Glsed{jump}, \Glsing{jump}, \Glsed{waddle}, \Glsing{waddle}, \Glsed{run}, \Glsing{run}. -All uppercase: \GLSed{jump}, \GLSing{jump}, +All uppercase: \GLSed{jump}, \GLSing{jump}, \GLSed{waddle}, \GLSing{waddle}, \GLSed{run}, \GLSing{run}. diff --git a/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf b/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf Binary files differindex 5cac8cf6e8..d94e24a152 100644 --- a/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf b/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf Binary files differindex 16c254d9ed..ed705c0fe4 100644 --- a/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf b/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf Binary files differindex 67fc47f4b0..0954a5014c 100644 --- a/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf b/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf Binary files differindex 5b8fa5e678..9e46a428b6 100644 --- a/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-prefix.pdf b/macros/latex/contrib/glossaries/samples/sample-prefix.pdf Binary files differindex 2fe7792920..881252f458 100644 --- a/macros/latex/contrib/glossaries/samples/sample-prefix.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-prefix.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-si.pdf b/macros/latex/contrib/glossaries/samples/sample-si.pdf Binary files differindex af7aa9f693..c2aef74cde 100644 --- a/macros/latex/contrib/glossaries/samples/sample-si.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-si.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf b/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf Binary files differindex 2da749d357..3b517bf24f 100644 --- a/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.tex b/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.tex index 39a6eb6721..39fcb8c8dd 100644 --- a/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.tex +++ b/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.tex @@ -87,15 +87,15 @@ % The default for "abbrtype" is "acronym" so we don't need % this new key for acronyms: -\newacronym[description={system for detecting the position and -speed of aircraft, ships, etc}]{radar}{radar}{radio detecting +\newacronym[description={system for detecting the position and +speed of aircraft, ships, etc}]{radar}{radar}{radio detecting and ranging} \newacronym[description={device that creates a narrow beam -of intense light}]{laser}{laser}{light amplification by +of intense light}]{laser}{laser}{light amplification by stimulated emission of radiation} -\newacronym[description={portable breathing device for +\newacronym[description={portable breathing device for divers}]{scuba}{scuba}{self-contained underwater breathing apparatus} @@ -105,7 +105,7 @@ apparatus} \newinitialism[description={mathematical manipulation of an information signal}]{dsp}{DSP}{digital signal processing} -\newinitialism[description={device that allows customers of +\newinitialism[description={device that allows customers of financial institutions to perform transactions, such as cash withdrawal, without the need for a teller}]{atm}{ATM} {automated teller machine} diff --git a/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf b/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf Binary files differindex c547306b25..d8115a22da 100644 --- a/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf +++ b/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample-storage-abbr.tex b/macros/latex/contrib/glossaries/samples/sample-storage-abbr.tex index 7ea6faadd1..fbde7ef10b 100644 --- a/macros/latex/contrib/glossaries/samples/sample-storage-abbr.tex +++ b/macros/latex/contrib/glossaries/samples/sample-storage-abbr.tex @@ -88,7 +88,7 @@ % The default for "abbrtype" is "acronym" so we don't need % this new key for acronyms: \newacronym{radar}{radar}{radio detecting and ranging} -\newacronym{laser}{laser}{light amplification by stimulated +\newacronym{laser}{laser}{light amplification by stimulated emission of radiation} \newacronym{scuba}{scuba}{self-contained underwater breathing apparatus} diff --git a/macros/latex/contrib/glossaries/samples/sample.pdf b/macros/latex/contrib/glossaries/samples/sample.pdf Binary files differindex f5736bbae1..2bf39bd56e 100644 --- a/macros/latex/contrib/glossaries/samples/sample.pdf +++ b/macros/latex/contrib/glossaries/samples/sample.pdf diff --git a/macros/latex/contrib/glossaries/samples/sample.tex b/macros/latex/contrib/glossaries/samples/sample.tex index 9478e16f2e..eca1464585 100644 --- a/macros/latex/contrib/glossaries/samples/sample.tex +++ b/macros/latex/contrib/glossaries/samples/sample.tex @@ -32,7 +32,7 @@ parent={glossary}} \newglossaryentry{pagelist}{name=page list, % description value has to be enclosed in braces % because it contains commas -description={a list of individual pages or page ranges +description={a list of individual pages or page ranges (e.g.\ 1,2,4,7-9)}} \newglossaryentry{mtrx}{name=matrix, @@ -52,7 +52,7 @@ 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 +% entry with two types of plural. Set the plural form to the % form most likely to be used. If you want to use a different % plural, you will need to explicity specify it in \glslink \newglossaryentry{cow}{name=cow, @@ -91,7 +91,7 @@ parent=bravo} % accidentally introducing unwanted space as leading and trailing % spaces within the braces aren't stripped. For example, % text={ spurious space } will result in extra space appearing -% when the entry is referenced. +% when the entry is referenced. \newglossaryentry{spuriousspace}{% name={space, spurious}, text={spurious space}, @@ -139,7 +139,7 @@ Be careful about \glspl{spuriousspace} appearing in your code. 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 +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| (e.g.\ \glslink{cow}{kine}) diff --git a/macros/latex/contrib/glossaries/samples/sample4col.pdf b/macros/latex/contrib/glossaries/samples/sample4col.pdf Binary files differindex 9942f1b6af..a9e88dfadf 100644 --- a/macros/latex/contrib/glossaries/samples/sample4col.pdf +++ b/macros/latex/contrib/glossaries/samples/sample4col.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleAcr.pdf b/macros/latex/contrib/glossaries/samples/sampleAcr.pdf Binary files differindex 8c346877a0..cef9f80d86 100644 --- a/macros/latex/contrib/glossaries/samples/sampleAcr.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleAcr.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleAcr.tex b/macros/latex/contrib/glossaries/samples/sampleAcr.tex index 12801f7d95..572b95d6ea 100644 --- a/macros/latex/contrib/glossaries/samples/sampleAcr.tex +++ b/macros/latex/contrib/glossaries/samples/sampleAcr.tex @@ -45,7 +45,7 @@ acronyms. \glsresetall Possessive: \gls{ksvm}['s]. -Make the glossary entry number bold for this +Make the glossary entry number bold for this one \gls[format=hyperbf]{ksvm}. \chapter{Short, Long and Full Forms} diff --git a/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf b/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf Binary files differindex bd045debe9..96222c6f12 100644 --- a/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleAcrDesc.tex b/macros/latex/contrib/glossaries/samples/sampleAcrDesc.tex index 0bec67636f..e2170feb16 100644 --- a/macros/latex/contrib/glossaries/samples/sampleAcrDesc.tex +++ b/macros/latex/contrib/glossaries/samples/sampleAcrDesc.tex @@ -11,7 +11,7 @@ % The package option "nomain" is used here to suppress the % main glossary, since this example doesn't use it. If you % want to use the main glossary, remove the "nomain" option. - nomain,% + nomain,% style=altlist, % use altlist style toc, % add the glossary to the table of contents ]{glossaries} @@ -29,7 +29,7 @@ \renewcommand*{\glsnamefont}[1]{\textmd{#1}} -\newacronym[description={Statistical pattern recognition +\newacronym[description={Statistical pattern recognition technique~\protect\cite{svm}}, % acronym's description ]{svm}{svm}{support vector machine} @@ -48,10 +48,10 @@ technique~\protect\cite{svm}}, % acronym's description The \gls{svm} is used widely in the area of pattern recognition. % plural form with initial letter in uppercase: \Glspl{svm} are \ldots\ (but beware, converting the initial letter to -upper case for a small caps acronym is sometimes considered +upper case for a small caps acronym is sometimes considered poor style). -Short version: \acrshort{svm}. Long version: \acrlong{svm}. Full +Short version: \acrshort{svm}. Long version: \acrlong{svm}. Full version: \acrfull{svm}. Description: \glsentrydesc{svm}. This is the entry in uppercase: \GLS{svm}. @@ -64,7 +64,7 @@ a link: \glsentrydesc{ksvm}. \glsresetall Possessive: \gls{ksvm}['s]. -Make the glossary entry number bold for this +Make the glossary entry number bold for this one \gls[format=hyperbf]{svm}. \begin{thebibliography}{1} diff --git a/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf b/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf Binary files differindex f3a6c9f22f..a7d8af989a 100644 --- a/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleCustomAcr.tex b/macros/latex/contrib/glossaries/samples/sampleCustomAcr.tex index bc32d1329a..eda408e02c 100644 --- a/macros/latex/contrib/glossaries/samples/sampleCustomAcr.tex +++ b/macros/latex/contrib/glossaries/samples/sampleCustomAcr.tex @@ -11,7 +11,7 @@ % The package option "nomain" is used here to suppress the % main glossary, since this example doesn't use it. If you % want to use the main glossary, remove the "nomain" option. - nomain, + nomain, style=altlist, % use altlist style toc, % add the glossary to the table of contents ]{glossaries} @@ -68,14 +68,14 @@ % Change the "see" items so that they use \acronymfont: \renewcommand*{\glsseeitemformat}[1]{\acronymfont{\glsentrytext{#1}}} -\newacronym[description={Statistical pattern recognition +\newacronym[description={Statistical pattern recognition technique~\protect\cite{svm}}, % acronym's description ]{svm}{svm}{support vector machine} \newacronym[description={Statistical pattern recognition technique using the ``kernel trick''},% acronym's description see={[see also]{svm}}, -]{ksvm}{ksvm}{kernel +]{ksvm}{ksvm}{kernel support vector machine} \begin{document} @@ -86,10 +86,10 @@ 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\ (but beware, converting the initial letter to -upper case for a small caps acronym is sometimes considered +upper case for a small caps acronym is sometimes considered poor style). -Short version: \acrshort{svm}. Long version: \acrlong{svm}. Full +Short version: \acrshort{svm}. Long version: \acrlong{svm}. Full version: \acrfull{svm}. Description: \glsentrydesc{svm}. This is the entry in uppercase: \GLS{svm}. @@ -103,7 +103,7 @@ a link: \glsentrydesc{ksvm}. \glsresetall (Reset all.) Possessive: \gls{ksvm}['s]. -Make the glossary entry number bold for this +Make the glossary entry number bold for this one \gls[format=hyperbf]{svm}. \begin{thebibliography}{1} diff --git a/macros/latex/contrib/glossaries/samples/sampleDB.pdf b/macros/latex/contrib/glossaries/samples/sampleDB.pdf Binary files differindex 44217f42b9..9a06139e72 100644 --- a/macros/latex/contrib/glossaries/samples/sampleDB.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleDB.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleDesc.pdf b/macros/latex/contrib/glossaries/samples/sampleDesc.pdf Binary files differindex 788bb043e6..9eb6db4814 100644 --- a/macros/latex/contrib/glossaries/samples/sampleDesc.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleDesc.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleDesc.tex b/macros/latex/contrib/glossaries/samples/sampleDesc.tex index 09e408f906..bcf7e4444e 100644 --- a/macros/latex/contrib/glossaries/samples/sampleDesc.tex +++ b/macros/latex/contrib/glossaries/samples/sampleDesc.tex @@ -59,7 +59,7 @@ the so called ``kernel trick''. \glsresetall Possessive: \gls{ksvm}['s]. -Make the glossary entry number bold for this +Make the glossary entry number bold for this one \gls[format=hyperbf]{svm}. \begin{thebibliography}{1} diff --git a/macros/latex/contrib/glossaries/samples/sampleEq.pdf b/macros/latex/contrib/glossaries/samples/sampleEq.pdf Binary files differindex e8c8bbdfab..ebcb74a296 100644 --- a/macros/latex/contrib/glossaries/samples/sampleEq.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleEq.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleEq.tex b/macros/latex/contrib/glossaries/samples/sampleEq.tex index fb577e9874..403930a97e 100644 --- a/macros/latex/contrib/glossaries/samples/sampleEq.tex +++ b/macros/latex/contrib/glossaries/samples/sampleEq.tex @@ -98,8 +98,8 @@ description=Catalan's constant,sort=G} This is a sample document illustrating the use of the \textsf{glossaries} package. The functions here have been taken from ``Tables of Integrals, Series, and Products'' by I.S.~Gradshteyn and I.M~Ryzhik. -The glossary is a list of special functions, so -the equation number has been used rather than the page number. This +The glossary is a list of special functions, so +the equation number has been used rather than the page number. This can be done using the \texttt{counter=equation} package option. \end{abstract} @@ -112,7 +112,7 @@ option. \gls{Gamma} = \int_{0}^{\infty}e^{-t}t^{z-1}\,dt \end{equation} -\verb|\ensuremath| is only required here if using +\verb|\ensuremath| is only required here if using hyperlinks. \begin{equation} \glslink{Gamma}{\ensuremath{\Gamma(x+1)}} = x\Gamma(x) @@ -185,7 +185,7 @@ Alternatively: \section{Laguerre polynomials} \begin{equation} -L_n^{\alpha} (x) = \frac{1}{n!}e^x x^{-\alpha} +L_n^{\alpha} (x) = \frac{1}{n!}e^x x^{-\alpha} \frac{d^n}{dx^n}(e^{-x}x^{n+\alpha}) \end{equation} @@ -193,8 +193,8 @@ L_n^{\alpha} (x) = \frac{1}{n!}e^x x^{-\alpha} Bessel functions $Z_\nu$ are solutions of \begin{equation} -\frac{d^2\glslink{Znu}{Z_\nu}}{dz^2} -+ \frac{1}{z}\,\frac{dZ_\nu}{dz} + +\frac{d^2\glslink{Znu}{Z_\nu}}{dz^2} ++ \frac{1}{z}\,\frac{dZ_\nu}{dz} + \left( 1-\frac{\nu^2}{z^2}Z_\nu = 0 \right) \end{equation} diff --git a/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf b/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf Binary files differindex d8f45efa45..1285f4cc16 100644 --- a/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleEqPg.tex b/macros/latex/contrib/glossaries/samples/sampleEqPg.tex index 980cb82f34..6061bb72d9 100644 --- a/macros/latex/contrib/glossaries/samples/sampleEqPg.tex +++ b/macros/latex/contrib/glossaries/samples/sampleEqPg.tex @@ -137,15 +137,15 @@ This is a sample document illustrating the use of the \textsf{glossaries} package. The functions here have been taken from ``Tables of Integrals, Series, and Products'' by I.S.~Gradshteyn and I.M~Ryzhik. -The glossary lists both page numbers and equation numbers. +The glossary lists both page numbers and equation numbers. Since the majority of the entries use the equation number, \texttt{counter=equation} was used as a package option. Note that this example will only work where the -page number and equation number compositor is the same. So -it won't work if, say, the page numbers are of the form -2-4 and the equation numbers are of the form 4.6. -As most of the glossary entries should have an italic -format, it is easiest to set the default format to +page number and equation number compositor is the same. So +it won't work if, say, the page numbers are of the form +2-4 and the equation numbers are of the form 4.6. +As most of the glossary entries should have an italic +format, it is easiest to set the default format to italic. \end{abstract} @@ -156,7 +156,7 @@ italic. \chapter{Gamma Functions} -The \glslink[format=hyperbf,counter=page]{Gamma}{gamma function} is +The \glslink[format=hyperbf,counter=page]{Gamma}{gamma function} is defined as \begin{equation} \gls{Gamma} = \int_{0}^{\infty}e^{-t}t^{z-1}\,dt @@ -177,7 +177,7 @@ defined as \newpage \begin{equation} -\glslink{Gamma}{\ensuremath{\Gamma(\alpha)}} = +\glslink{Gamma}{\ensuremath{\Gamma(\alpha)}} = \Gamma(\alpha, x) + \gamma(\alpha, x) \end{equation} @@ -233,7 +233,7 @@ Alternatively: \chapter{Laguerre polynomials} \begin{equation} -\gls{Lna} = \frac{1}{n!}e^x x^{-\alpha} +\gls{Lna} = \frac{1}{n!}e^x x^{-\alpha} \frac{d^n}{dx^n}(e^{-x}x^{n+\alpha}) \end{equation} @@ -241,7 +241,7 @@ Alternatively: Bessel functions $Z_\nu(z)$ are solutions of \begin{equation} -\frac{d^2\glslink{Znu}{Z_\nu}}{dz^2} + \frac{1}{z}\,\frac{dZ_\nu}{dz} + +\frac{d^2\glslink{Znu}{Z_\nu}}{dz^2} + \frac{1}{z}\,\frac{dZ_\nu}{dz} + \left( 1-\frac{\nu^2}{z^2}Z_\nu = 0 \right) @@ -278,7 +278,7 @@ Bessel functions $Z_\nu(z)$ are solutions of \chapter{Elliptical Integral of the First Kind} \begin{equation} -\gls{Fpk} = \int_0^\phi +\gls{Fpk} = \int_0^\phi \frac{d\alpha}{\sqrt{1-k^2\sin^2\alpha}} \end{equation} diff --git a/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf b/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf Binary files differindex c29aff931f..e654508453 100644 --- a/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.tex b/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.tex index c1a24c8f17..0f3d868166 100644 --- a/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.tex +++ b/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.tex @@ -34,14 +34,14 @@ \renewcommand*{\glsseeitemformat}[1]{\acronymfont{\glsentrytext{#1}}} -\newacronym[description={Statistical pattern recognition +\newacronym[description={Statistical pattern recognition technique~\protect\cite{svm}}, % acronym's description ]{svm}{svm}{support vector machine} \newacronym[description={Statistical pattern recognition technique using the ``kernel trick''},% acronym's description see={[see also]{svm}}, -]{ksvm}{ksvm}{kernel +]{ksvm}{ksvm}{kernel support vector machine} \begin{document} @@ -52,10 +52,10 @@ 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\ (but beware, converting the initial letter to -upper case for a small caps acronym is sometimes considered +upper case for a small caps acronym is sometimes considered poor style). -Short version: \acrshort{svm}. Long version: \acrlong{svm}. Full +Short version: \acrshort{svm}. Long version: \acrlong{svm}. Full version: \acrfull{svm}. Description: \glsentrydesc{svm}. This is the entry in uppercase: \GLS{svm}. @@ -68,7 +68,7 @@ a link: \glsentrydesc{ksvm}. \glsresetall Possessive: \gls{ksvm}['s]. -Make the glossary entry number bold for this +Make the glossary entry number bold for this one \gls[format=hyperbf]{svm}. \begin{thebibliography}{1} diff --git a/macros/latex/contrib/glossaries/samples/sampleNtn.pdf b/macros/latex/contrib/glossaries/samples/sampleNtn.pdf Binary files differindex c0ff5ea069..3db806aea9 100644 --- a/macros/latex/contrib/glossaries/samples/sampleNtn.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleNtn.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleNtn.tex b/macros/latex/contrib/glossaries/samples/sampleNtn.tex index 997f518f9a..9b3841cc33 100644 --- a/macros/latex/contrib/glossaries/samples/sampleNtn.tex +++ b/macros/latex/contrib/glossaries/samples/sampleNtn.tex @@ -7,7 +7,7 @@ \documentclass{report} % If you want to add babel to this document, you may have to -% replace the : character in the labels if you are using a +% replace the : character in the labels if you are using a % language setting (e.g. french) that makes : active. \usepackage[plainpages=false,colorlinks]{hyperref} @@ -60,7 +60,7 @@ description={The number of elements in the specified set}} \pagenumbering{Alph} 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 +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. \end{abstract} @@ -74,12 +74,12 @@ doesn't have associated numbers. \chapter{Introduction} \pagenumbering{arabic} -\Glspl{gls:set} are denoted by a calligraphic font +\Glspl{gls:set} are denoted by a calligraphic font e.g.\ \gls{not:set}. Let \gls[format=hyperit]{not:U} denote the universal set. -The \gls{gls:card} of a set $\mathcal{S}$ is denoted +The \gls{gls:card} of a set $\mathcal{S}$ is denoted \gls{not:card}. \chapter{Another Chapter} diff --git a/macros/latex/contrib/glossaries/samples/samplePeople.pdf b/macros/latex/contrib/glossaries/samples/samplePeople.pdf Binary files differindex d5c7d3a3fc..bdd7bb5d2a 100644 --- a/macros/latex/contrib/glossaries/samples/samplePeople.pdf +++ b/macros/latex/contrib/glossaries/samples/samplePeople.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleSec.pdf b/macros/latex/contrib/glossaries/samples/sampleSec.pdf Binary files differindex 10f71ff8bc..219ec0f535 100644 --- a/macros/latex/contrib/glossaries/samples/sampleSec.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleSec.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleSort.pdf b/macros/latex/contrib/glossaries/samples/sampleSort.pdf Binary files differindex 4b3be13c50..d771b7d591 100644 --- a/macros/latex/contrib/glossaries/samples/sampleSort.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleSort.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleSort.tex b/macros/latex/contrib/glossaries/samples/sampleSort.tex index 6f83926710..960dc22f0f 100644 --- a/macros/latex/contrib/glossaries/samples/sampleSort.tex +++ b/macros/latex/contrib/glossaries/samples/sampleSort.tex @@ -7,7 +7,7 @@ \documentclass{report} % If you want to add babel to this document, you may have to -% replace the : character in the labels if you are using a +% replace the : character in the labels if you are using a % language setting (e.g. french) that makes : active. \usepackage[plainpages=false,colorlinks]{hyperref} @@ -75,7 +75,7 @@ description={The number of elements in the specified set}} \pagenumbering{Alph} 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 +called \texttt{notation} is defined, so that the document can have a separate glossary of terms, list of acronyms and index of notation. \end{abstract} @@ -88,10 +88,10 @@ separate glossary of terms, list of acronyms and index of notation. \chapter{Introduction} \pagenumbering{arabic} -\Glspl{gls:set} are denoted by a calligraphic font +\Glspl{gls:set} are denoted by a calligraphic font e.g.\ $\gls{not:set}$. -The \gls{gls:card} of a set $\mathcal{S}$ is denoted +The \gls{gls:card} of a set $\mathcal{S}$ is denoted $\gls{not:card}$. The empty set is denoted $\gls{not:emptyset}$. diff --git a/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf b/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf Binary files differindex b4b75549e1..185bfcd745 100644 --- a/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf b/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf Binary files differindex c89060bb16..15a119ffc2 100644 --- a/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampletree.pdf b/macros/latex/contrib/glossaries/samples/sampletree.pdf Binary files differindex fe99e848e0..1d1e1dcc2e 100644 --- a/macros/latex/contrib/glossaries/samples/sampletree.pdf +++ b/macros/latex/contrib/glossaries/samples/sampletree.pdf diff --git a/macros/latex/contrib/glossaries/samples/sampleutf8.pdf b/macros/latex/contrib/glossaries/samples/sampleutf8.pdf Binary files differindex 888b1a9928..93e155d97f 100644 --- a/macros/latex/contrib/glossaries/samples/sampleutf8.pdf +++ b/macros/latex/contrib/glossaries/samples/sampleutf8.pdf diff --git a/macros/latex/contrib/glossaries/samples/samplexdy-mc.xdy b/macros/latex/contrib/glossaries/samples/samplexdy-mc.xdy index 22f392f9aa..8e9c52deb7 100644 --- a/macros/latex/contrib/glossaries/samples/samplexdy-mc.xdy +++ b/macros/latex/contrib/glossaries/samples/samplexdy-mc.xdy @@ -414,286 +414,288 @@ ; list of allowed attributes (number formats) (define-attributes (("default" - "hyperbfit" + "hyperbfit" "pagehyperbfit" - "glsnumberformat" + "glsnumberformat" "pageglsnumberformat" - "textrm" + "textrm" "pagetextrm" - "textsf" + "textsf" "pagetextsf" - "texttt" + "texttt" "pagetexttt" - "textbf" + "textbf" "pagetextbf" - "textmd" + "textmd" "pagetextmd" - "textit" + "textit" "pagetextit" - "textup" + "textup" "pagetextup" - "textsl" + "textsl" "pagetextsl" - "textsc" + "textsc" "pagetextsc" - "emph" + "emph" "pageemph" - "glshypernumber" + "glshypernumber" "pageglshypernumber" - "hyperrm" + "hyperrm" "pagehyperrm" - "hypersf" + "hypersf" "pagehypersf" - "hypertt" + "hypertt" "pagehypertt" - "hyperbf" + "hyperbf" "pagehyperbf" - "hypermd" + "hypermd" "pagehypermd" - "hyperit" + "hyperit" "pagehyperit" - "hyperup" + "hyperup" "pagehyperup" - "hypersl" + "hypersl" "pagehypersl" - "hypersc" + "hypersc" "pagehypersc" - "hyperemph" + "hyperemph" "pagehyperemph"))) ; user defined alphabets + + ; location class definitions (define-location-class "roman-page-numbers" - ( :sep "{}{" "roman-numbers-lowercase" :sep "}" ) + ( :sep "{}{" "roman-numbers-lowercase" :sep "}" ) :min-range-length 2 -) -(define-location-class "roman-page-numbers-roman-page-numbers" - ( :sep "{" "roman-numbers-lowercase" :sep "}{" "roman-numbers-lowercase" :sep "}" ) +) +(define-location-class "roman-page-numbers-roman-page-numbers" + ( :sep "{" "roman-numbers-lowercase" :sep "}{" "roman-numbers-lowercase" :sep "}" ) :min-range-length 2 -) -(define-location-class "Roman-page-numbers-roman-page-numbers" - ( :sep "{" "roman-numbers-uppercase" :sep "}{" "roman-numbers-lowercase" :sep "}" ) +) +(define-location-class "Roman-page-numbers-roman-page-numbers" + ( :sep "{" "roman-numbers-uppercase" :sep "}{" "roman-numbers-lowercase" :sep "}" ) :min-range-length 2 -) -(define-location-class "arabic-page-numbers-roman-page-numbers" - ( :sep "{" "arabic-numbers" :sep "}{" "roman-numbers-lowercase" :sep "}" ) +) +(define-location-class "arabic-page-numbers-roman-page-numbers" + ( :sep "{" "arabic-numbers" :sep "}{" "roman-numbers-lowercase" :sep "}" ) :min-range-length 2 -) -(define-location-class "alpha-page-numbers-roman-page-numbers" - ( :sep "{" "alpha" :sep "}{" "roman-numbers-lowercase" :sep "}" ) +) +(define-location-class "alpha-page-numbers-roman-page-numbers" + ( :sep "{" "alpha" :sep "}{" "roman-numbers-lowercase" :sep "}" ) :min-range-length 2 -) -(define-location-class "Alpha-page-numbers-roman-page-numbers" - ( :sep "{" "ALPHA" :sep "}{" "roman-numbers-lowercase" :sep "}" ) +) +(define-location-class "Alpha-page-numbers-roman-page-numbers" + ( :sep "{" "ALPHA" :sep "}{" "roman-numbers-lowercase" :sep "}" ) :min-range-length 2 -) -(define-location-class "Appendix-page-numbers-roman-page-numbers" - ( :sep "{" "ALPHA" :sep "." "arabic-numbers" :sep "}{" "roman-numbers-lowercase" :sep "}" ) +) +(define-location-class "Appendix-page-numbers-roman-page-numbers" + ( :sep "{" "ALPHA" :sep "." "arabic-numbers" :sep "}{" "roman-numbers-lowercase" :sep "}" ) :min-range-length 2 -) -(define-location-class "arabic-section-numbers-roman-page-numbers" - ( :sep "{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}{" "roman-numbers-lowercase" :sep "}" ) +) +(define-location-class "arabic-section-numbers-roman-page-numbers" + ( :sep "{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}{" "roman-numbers-lowercase" :sep "}" ) :min-range-length 2 -) +) (define-location-class "Roman-page-numbers" - ( :sep "{}{" "roman-numbers-uppercase" :sep "}" ) + ( :sep "{}{" "roman-numbers-uppercase" :sep "}" ) :min-range-length 2 -) -(define-location-class "roman-page-numbers-Roman-page-numbers" - ( :sep "{" "roman-numbers-lowercase" :sep "}{" "roman-numbers-uppercase" :sep "}" ) +) +(define-location-class "roman-page-numbers-Roman-page-numbers" + ( :sep "{" "roman-numbers-lowercase" :sep "}{" "roman-numbers-uppercase" :sep "}" ) :min-range-length 2 -) -(define-location-class "Roman-page-numbers-Roman-page-numbers" - ( :sep "{" "roman-numbers-uppercase" :sep "}{" "roman-numbers-uppercase" :sep "}" ) +) +(define-location-class "Roman-page-numbers-Roman-page-numbers" + ( :sep "{" "roman-numbers-uppercase" :sep "}{" "roman-numbers-uppercase" :sep "}" ) :min-range-length 2 -) -(define-location-class "arabic-page-numbers-Roman-page-numbers" - ( :sep "{" "arabic-numbers" :sep "}{" "roman-numbers-uppercase" :sep "}" ) +) +(define-location-class "arabic-page-numbers-Roman-page-numbers" + ( :sep "{" "arabic-numbers" :sep "}{" "roman-numbers-uppercase" :sep "}" ) :min-range-length 2 -) -(define-location-class "alpha-page-numbers-Roman-page-numbers" - ( :sep "{" "alpha" :sep "}{" "roman-numbers-uppercase" :sep "}" ) +) +(define-location-class "alpha-page-numbers-Roman-page-numbers" + ( :sep "{" "alpha" :sep "}{" "roman-numbers-uppercase" :sep "}" ) :min-range-length 2 -) -(define-location-class "Alpha-page-numbers-Roman-page-numbers" - ( :sep "{" "ALPHA" :sep "}{" "roman-numbers-uppercase" :sep "}" ) +) +(define-location-class "Alpha-page-numbers-Roman-page-numbers" + ( :sep "{" "ALPHA" :sep "}{" "roman-numbers-uppercase" :sep "}" ) :min-range-length 2 -) -(define-location-class "Appendix-page-numbers-Roman-page-numbers" - ( :sep "{" "ALPHA" :sep "." "arabic-numbers" :sep "}{" "roman-numbers-uppercase" :sep "}" ) +) +(define-location-class "Appendix-page-numbers-Roman-page-numbers" + ( :sep "{" "ALPHA" :sep "." "arabic-numbers" :sep "}{" "roman-numbers-uppercase" :sep "}" ) :min-range-length 2 -) -(define-location-class "arabic-section-numbers-Roman-page-numbers" - ( :sep "{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}{" "roman-numbers-uppercase" :sep "}" ) +) +(define-location-class "arabic-section-numbers-Roman-page-numbers" + ( :sep "{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}{" "roman-numbers-uppercase" :sep "}" ) :min-range-length 2 -) +) (define-location-class "arabic-page-numbers" - ( :sep "{}{" "arabic-numbers" :sep "}" ) + ( :sep "{}{" "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "roman-page-numbers-arabic-page-numbers" - ( :sep "{" "roman-numbers-lowercase" :sep "}{" "arabic-numbers" :sep "}" ) +) +(define-location-class "roman-page-numbers-arabic-page-numbers" + ( :sep "{" "roman-numbers-lowercase" :sep "}{" "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "Roman-page-numbers-arabic-page-numbers" - ( :sep "{" "roman-numbers-uppercase" :sep "}{" "arabic-numbers" :sep "}" ) +) +(define-location-class "Roman-page-numbers-arabic-page-numbers" + ( :sep "{" "roman-numbers-uppercase" :sep "}{" "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "arabic-page-numbers-arabic-page-numbers" - ( :sep "{" "arabic-numbers" :sep "}{" "arabic-numbers" :sep "}" ) +) +(define-location-class "arabic-page-numbers-arabic-page-numbers" + ( :sep "{" "arabic-numbers" :sep "}{" "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "alpha-page-numbers-arabic-page-numbers" - ( :sep "{" "alpha" :sep "}{" "arabic-numbers" :sep "}" ) +) +(define-location-class "alpha-page-numbers-arabic-page-numbers" + ( :sep "{" "alpha" :sep "}{" "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "Alpha-page-numbers-arabic-page-numbers" - ( :sep "{" "ALPHA" :sep "}{" "arabic-numbers" :sep "}" ) +) +(define-location-class "Alpha-page-numbers-arabic-page-numbers" + ( :sep "{" "ALPHA" :sep "}{" "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "Appendix-page-numbers-arabic-page-numbers" - ( :sep "{" "ALPHA" :sep "." "arabic-numbers" :sep "}{" "arabic-numbers" :sep "}" ) +) +(define-location-class "Appendix-page-numbers-arabic-page-numbers" + ( :sep "{" "ALPHA" :sep "." "arabic-numbers" :sep "}{" "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "arabic-section-numbers-arabic-page-numbers" - ( :sep "{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}{" "arabic-numbers" :sep "}" ) +) +(define-location-class "arabic-section-numbers-arabic-page-numbers" + ( :sep "{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}{" "arabic-numbers" :sep "}" ) :min-range-length 2 -) +) (define-location-class "alpha-page-numbers" - ( :sep "{}{" "alpha" :sep "}" ) + ( :sep "{}{" "alpha" :sep "}" ) :min-range-length 2 -) -(define-location-class "roman-page-numbers-alpha-page-numbers" - ( :sep "{" "roman-numbers-lowercase" :sep "}{" "alpha" :sep "}" ) +) +(define-location-class "roman-page-numbers-alpha-page-numbers" + ( :sep "{" "roman-numbers-lowercase" :sep "}{" "alpha" :sep "}" ) :min-range-length 2 -) -(define-location-class "Roman-page-numbers-alpha-page-numbers" - ( :sep "{" "roman-numbers-uppercase" :sep "}{" "alpha" :sep "}" ) +) +(define-location-class "Roman-page-numbers-alpha-page-numbers" + ( :sep "{" "roman-numbers-uppercase" :sep "}{" "alpha" :sep "}" ) :min-range-length 2 -) -(define-location-class "arabic-page-numbers-alpha-page-numbers" - ( :sep "{" "arabic-numbers" :sep "}{" "alpha" :sep "}" ) +) +(define-location-class "arabic-page-numbers-alpha-page-numbers" + ( :sep "{" "arabic-numbers" :sep "}{" "alpha" :sep "}" ) :min-range-length 2 -) -(define-location-class "alpha-page-numbers-alpha-page-numbers" - ( :sep "{" "alpha" :sep "}{" "alpha" :sep "}" ) +) +(define-location-class "alpha-page-numbers-alpha-page-numbers" + ( :sep "{" "alpha" :sep "}{" "alpha" :sep "}" ) :min-range-length 2 -) -(define-location-class "Alpha-page-numbers-alpha-page-numbers" - ( :sep "{" "ALPHA" :sep "}{" "alpha" :sep "}" ) +) +(define-location-class "Alpha-page-numbers-alpha-page-numbers" + ( :sep "{" "ALPHA" :sep "}{" "alpha" :sep "}" ) :min-range-length 2 -) -(define-location-class "Appendix-page-numbers-alpha-page-numbers" - ( :sep "{" "ALPHA" :sep "." "arabic-numbers" :sep "}{" "alpha" :sep "}" ) +) +(define-location-class "Appendix-page-numbers-alpha-page-numbers" + ( :sep "{" "ALPHA" :sep "." "arabic-numbers" :sep "}{" "alpha" :sep "}" ) :min-range-length 2 -) -(define-location-class "arabic-section-numbers-alpha-page-numbers" - ( :sep "{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}{" "alpha" :sep "}" ) +) +(define-location-class "arabic-section-numbers-alpha-page-numbers" + ( :sep "{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}{" "alpha" :sep "}" ) :min-range-length 2 -) +) (define-location-class "Alpha-page-numbers" - ( :sep "{}{" "ALPHA" :sep "}" ) + ( :sep "{}{" "ALPHA" :sep "}" ) :min-range-length 2 -) -(define-location-class "roman-page-numbers-Alpha-page-numbers" - ( :sep "{" "roman-numbers-lowercase" :sep "}{" "ALPHA" :sep "}" ) +) +(define-location-class "roman-page-numbers-Alpha-page-numbers" + ( :sep "{" "roman-numbers-lowercase" :sep "}{" "ALPHA" :sep "}" ) :min-range-length 2 -) -(define-location-class "Roman-page-numbers-Alpha-page-numbers" - ( :sep "{" "roman-numbers-uppercase" :sep "}{" "ALPHA" :sep "}" ) +) +(define-location-class "Roman-page-numbers-Alpha-page-numbers" + ( :sep "{" "roman-numbers-uppercase" :sep "}{" "ALPHA" :sep "}" ) :min-range-length 2 -) -(define-location-class "arabic-page-numbers-Alpha-page-numbers" - ( :sep "{" "arabic-numbers" :sep "}{" "ALPHA" :sep "}" ) +) +(define-location-class "arabic-page-numbers-Alpha-page-numbers" + ( :sep "{" "arabic-numbers" :sep "}{" "ALPHA" :sep "}" ) :min-range-length 2 -) -(define-location-class "alpha-page-numbers-Alpha-page-numbers" - ( :sep "{" "alpha" :sep "}{" "ALPHA" :sep "}" ) +) +(define-location-class "alpha-page-numbers-Alpha-page-numbers" + ( :sep "{" "alpha" :sep "}{" "ALPHA" :sep "}" ) :min-range-length 2 -) -(define-location-class "Alpha-page-numbers-Alpha-page-numbers" - ( :sep "{" "ALPHA" :sep "}{" "ALPHA" :sep "}" ) +) +(define-location-class "Alpha-page-numbers-Alpha-page-numbers" + ( :sep "{" "ALPHA" :sep "}{" "ALPHA" :sep "}" ) :min-range-length 2 -) -(define-location-class "Appendix-page-numbers-Alpha-page-numbers" - ( :sep "{" "ALPHA" :sep "." "arabic-numbers" :sep "}{" "ALPHA" :sep "}" ) +) +(define-location-class "Appendix-page-numbers-Alpha-page-numbers" + ( :sep "{" "ALPHA" :sep "." "arabic-numbers" :sep "}{" "ALPHA" :sep "}" ) :min-range-length 2 -) -(define-location-class "arabic-section-numbers-Alpha-page-numbers" - ( :sep "{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}{" "ALPHA" :sep "}" ) +) +(define-location-class "arabic-section-numbers-Alpha-page-numbers" + ( :sep "{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}{" "ALPHA" :sep "}" ) :min-range-length 2 -) +) (define-location-class "Appendix-page-numbers" - ( :sep "{}{" "ALPHA" :sep "." "arabic-numbers" :sep "}" ) + ( :sep "{}{" "ALPHA" :sep "." "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "roman-page-numbers-Appendix-page-numbers" - ( :sep "{" "roman-numbers-lowercase" :sep "}{" "ALPHA" :sep "." "arabic-numbers" :sep "}" ) +) +(define-location-class "roman-page-numbers-Appendix-page-numbers" + ( :sep "{" "roman-numbers-lowercase" :sep "}{" "ALPHA" :sep "." "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "Roman-page-numbers-Appendix-page-numbers" - ( :sep "{" "roman-numbers-uppercase" :sep "}{" "ALPHA" :sep "." "arabic-numbers" :sep "}" ) +) +(define-location-class "Roman-page-numbers-Appendix-page-numbers" + ( :sep "{" "roman-numbers-uppercase" :sep "}{" "ALPHA" :sep "." "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "arabic-page-numbers-Appendix-page-numbers" - ( :sep "{" "arabic-numbers" :sep "}{" "ALPHA" :sep "." "arabic-numbers" :sep "}" ) +) +(define-location-class "arabic-page-numbers-Appendix-page-numbers" + ( :sep "{" "arabic-numbers" :sep "}{" "ALPHA" :sep "." "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "alpha-page-numbers-Appendix-page-numbers" - ( :sep "{" "alpha" :sep "}{" "ALPHA" :sep "." "arabic-numbers" :sep "}" ) +) +(define-location-class "alpha-page-numbers-Appendix-page-numbers" + ( :sep "{" "alpha" :sep "}{" "ALPHA" :sep "." "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "Alpha-page-numbers-Appendix-page-numbers" - ( :sep "{" "ALPHA" :sep "}{" "ALPHA" :sep "." "arabic-numbers" :sep "}" ) +) +(define-location-class "Alpha-page-numbers-Appendix-page-numbers" + ( :sep "{" "ALPHA" :sep "}{" "ALPHA" :sep "." "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "Appendix-page-numbers-Appendix-page-numbers" - ( :sep "{" "ALPHA" :sep "." "arabic-numbers" :sep "}{" "ALPHA" :sep "." "arabic-numbers" :sep "}" ) +) +(define-location-class "Appendix-page-numbers-Appendix-page-numbers" + ( :sep "{" "ALPHA" :sep "." "arabic-numbers" :sep "}{" "ALPHA" :sep "." "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "arabic-section-numbers-Appendix-page-numbers" - ( :sep "{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}{" "ALPHA" :sep "." "arabic-numbers" :sep "}" ) +) +(define-location-class "arabic-section-numbers-Appendix-page-numbers" + ( :sep "{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}{" "ALPHA" :sep "." "arabic-numbers" :sep "}" ) :min-range-length 2 -) +) (define-location-class "arabic-section-numbers" - ( :sep "{}{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}" ) + ( :sep "{}{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "roman-page-numbers-arabic-section-numbers" - ( :sep "{" "roman-numbers-lowercase" :sep "}{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}" ) +) +(define-location-class "roman-page-numbers-arabic-section-numbers" + ( :sep "{" "roman-numbers-lowercase" :sep "}{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "Roman-page-numbers-arabic-section-numbers" - ( :sep "{" "roman-numbers-uppercase" :sep "}{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}" ) +) +(define-location-class "Roman-page-numbers-arabic-section-numbers" + ( :sep "{" "roman-numbers-uppercase" :sep "}{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "arabic-page-numbers-arabic-section-numbers" - ( :sep "{" "arabic-numbers" :sep "}{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}" ) +) +(define-location-class "arabic-page-numbers-arabic-section-numbers" + ( :sep "{" "arabic-numbers" :sep "}{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "alpha-page-numbers-arabic-section-numbers" - ( :sep "{" "alpha" :sep "}{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}" ) +) +(define-location-class "alpha-page-numbers-arabic-section-numbers" + ( :sep "{" "alpha" :sep "}{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "Alpha-page-numbers-arabic-section-numbers" - ( :sep "{" "ALPHA" :sep "}{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}" ) +) +(define-location-class "Alpha-page-numbers-arabic-section-numbers" + ( :sep "{" "ALPHA" :sep "}{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "Appendix-page-numbers-arabic-section-numbers" - ( :sep "{" "ALPHA" :sep "." "arabic-numbers" :sep "}{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}" ) +) +(define-location-class "Appendix-page-numbers-arabic-section-numbers" + ( :sep "{" "ALPHA" :sep "." "arabic-numbers" :sep "}{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}" ) :min-range-length 2 -) -(define-location-class "arabic-section-numbers-arabic-section-numbers" - ( :sep "{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}" ) +) +(define-location-class "arabic-section-numbers-arabic-section-numbers" + ( :sep "{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}{" "arabic-numbers" :sep "." "arabic-numbers" :sep "}" ) :min-range-length 2 -) +) ; user defined location classes (define-location-class "Numberstring" - (:sep "{}{" :sep "\protect \Numberstringnum {" "arabic-numbers" :sep "}" :sep "}")) + (:sep "{}{" :sep "\protect \Numberstringnum {" "arabic-numbers" :sep "}" :sep "}")) ; define cross-reference class @@ -709,7 +711,7 @@ "alpha-page-numbers" "Roman-page-numbers" "Alpha-page-numbers" - "Appendix-page-numbers" + "Appendix-page-numbers" "see" )) ; define the glossary markup @@ -739,8 +741,8 @@ \providecommand*\glsXpageXhypersl[2]{\setentrycounter[#1]{page}\hypersl{#2}} \providecommand*\glsXpageXhypersc[2]{\setentrycounter[#1]{page}\hypersc{#2}} \providecommand*\glsXpageXhyperemph[2]{\setentrycounter[#1]{page}\hyperemph{#2}} -\begin{theglossary}\glossaryheader~n" - :close "%~n\end{theglossary}\glossarypostamble~n" +\begin{theglossary}\glossaryheader~n" + :close "%~n\end{theglossary}\glossarypostamble~n" :tree) (markup-letter-group-list :sep "\glsgroupskip~n") (markup-indexentry :open "\relax\glsresetentrylist~n") @@ -751,74 +753,75 @@ ; define format to use for locations -(markup-locref :open "~n\glsXpageXhyperbfit" - :close "" + +(markup-locref :open "~n\glsXpageXhyperbfit" + :close "" :attr "pagehyperbfit") -(markup-locref :open "~n\glsXpageXglsnumberformat" - :close "" +(markup-locref :open "~n\glsXpageXglsnumberformat" + :close "" :attr "pageglsnumberformat") -(markup-locref :open "~n\glsXpageXtextrm" - :close "" +(markup-locref :open "~n\glsXpageXtextrm" + :close "" :attr "pagetextrm") -(markup-locref :open "~n\glsXpageXtextsf" - :close "" +(markup-locref :open "~n\glsXpageXtextsf" + :close "" :attr "pagetextsf") -(markup-locref :open "~n\glsXpageXtexttt" - :close "" +(markup-locref :open "~n\glsXpageXtexttt" + :close "" :attr "pagetexttt") -(markup-locref :open "~n\glsXpageXtextbf" - :close "" +(markup-locref :open "~n\glsXpageXtextbf" + :close "" :attr "pagetextbf") -(markup-locref :open "~n\glsXpageXtextmd" - :close "" +(markup-locref :open "~n\glsXpageXtextmd" + :close "" :attr "pagetextmd") -(markup-locref :open "~n\glsXpageXtextit" - :close "" +(markup-locref :open "~n\glsXpageXtextit" + :close "" :attr "pagetextit") -(markup-locref :open "~n\glsXpageXtextup" - :close "" +(markup-locref :open "~n\glsXpageXtextup" + :close "" :attr "pagetextup") -(markup-locref :open "~n\glsXpageXtextsl" - :close "" +(markup-locref :open "~n\glsXpageXtextsl" + :close "" :attr "pagetextsl") -(markup-locref :open "~n\glsXpageXtextsc" - :close "" +(markup-locref :open "~n\glsXpageXtextsc" + :close "" :attr "pagetextsc") -(markup-locref :open "~n\glsXpageXemph" - :close "" +(markup-locref :open "~n\glsXpageXemph" + :close "" :attr "pageemph") -(markup-locref :open "~n\glsXpageXglshypernumber" - :close "" +(markup-locref :open "~n\glsXpageXglshypernumber" + :close "" :attr "pageglshypernumber") -(markup-locref :open "~n\glsXpageXhyperrm" - :close "" +(markup-locref :open "~n\glsXpageXhyperrm" + :close "" :attr "pagehyperrm") -(markup-locref :open "~n\glsXpageXhypersf" - :close "" +(markup-locref :open "~n\glsXpageXhypersf" + :close "" :attr "pagehypersf") -(markup-locref :open "~n\glsXpageXhypertt" - :close "" +(markup-locref :open "~n\glsXpageXhypertt" + :close "" :attr "pagehypertt") -(markup-locref :open "~n\glsXpageXhyperbf" - :close "" +(markup-locref :open "~n\glsXpageXhyperbf" + :close "" :attr "pagehyperbf") -(markup-locref :open "~n\glsXpageXhypermd" - :close "" +(markup-locref :open "~n\glsXpageXhypermd" + :close "" :attr "pagehypermd") -(markup-locref :open "~n\glsXpageXhyperit" - :close "" +(markup-locref :open "~n\glsXpageXhyperit" + :close "" :attr "pagehyperit") -(markup-locref :open "~n\glsXpageXhyperup" - :close "" +(markup-locref :open "~n\glsXpageXhyperup" + :close "" :attr "pagehyperup") -(markup-locref :open "~n\glsXpageXhypersl" - :close "" +(markup-locref :open "~n\glsXpageXhypersl" + :close "" :attr "pagehypersl") -(markup-locref :open "~n\glsXpageXhypersc" - :close "" +(markup-locref :open "~n\glsXpageXhypersc" + :close "" :attr "pagehypersc") -(markup-locref :open "~n\glsXpageXhyperemph" - :close "" +(markup-locref :open "~n\glsXpageXhyperemph" + :close "" :attr "pagehyperemph") ; define letter group list format @@ -838,15 +841,16 @@ ; additional sort rules + ; The following is copied from xindy/lang/english/utf8-lang.xdy (define-sort-rule-orientations (forward backward forward forward)) (use-rule-set :run 0 - :rule-set ("en-alphabetize" "en-ignore-special")) + :rule-set ("en-alphabetize" "en-ignore-special")) (use-rule-set :run 1 - :rule-set ("en-resolve-diacritics" "en-ignore-special")) + :rule-set ("en-resolve-diacritics" "en-ignore-special")) (use-rule-set :run 2 - :rule-set ("en-resolve-case" "en-ignore-special")) + :rule-set ("en-resolve-case" "en-ignore-special")) (use-rule-set :run 3 - :rule-set ("en-resolve-special")) + :rule-set ("en-resolve-special")) diff --git a/macros/latex/contrib/glossaries/samples/samplexdy-mc207.xdy b/macros/latex/contrib/glossaries/samples/samplexdy-mc207.xdy index 7c8d2b9e48..318205d8ff 100644 --- a/macros/latex/contrib/glossaries/samples/samplexdy-mc207.xdy +++ b/macros/latex/contrib/glossaries/samples/samplexdy-mc207.xdy @@ -440,6 +440,8 @@ ; user defined alphabets + + ; location class definitions (define-location-class "roman-page-numbers" @@ -460,7 +462,7 @@ ; user defined location classes (define-location-class "Numberstring" - (:sep "\protect \Numberstringnum {" "arabic-numbers" :sep "}")) + (:sep "\protect \Numberstringnum {" "arabic-numbers" :sep "}")) ; define cross-reference class @@ -476,14 +478,14 @@ "alpha-page-numbers" "Roman-page-numbers" "Alpha-page-numbers" - "Appendix-page-numbers" + "Appendix-page-numbers" "see" )) ; define the glossary markup (markup-index - :open "\glossarysection[\glossarytoctitle]{\glossarytitle}\glossarypreamble~n\begin{theglossary}\glossaryheader~n" - :close "~n\end{theglossary}~n\glossarypostamble~n" + :open "\glossarysection[\glossarytoctitle]{\glossarytitle}\glossarypreamble~n\begin{theglossary}\glossaryheader~n" + :close "~n\end{theglossary}~n\glossarypostamble~n" :tree) (markup-letter-group-list :sep "\glsgroupskip~n") (markup-indexentry :open "~n" :depth 0) @@ -494,74 +496,75 @@ ; define format to use for locations -(markup-locref :open "~n\setentrycounter{page}\glsnumberformat{" - :close "}" + +(markup-locref :open "~n\setentrycounter{page}\glsnumberformat{" + :close "}" :attr "glsnumberformat") -(markup-locref :open "~n\setentrycounter{page}\textrm{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\textrm{" + :close "}" :attr "textrm") -(markup-locref :open "~n\setentrycounter{page}\textsf{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\textsf{" + :close "}" :attr "textsf") -(markup-locref :open "~n\setentrycounter{page}\texttt{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\texttt{" + :close "}" :attr "texttt") -(markup-locref :open "~n\setentrycounter{page}\textbf{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\textbf{" + :close "}" :attr "textbf") -(markup-locref :open "~n\setentrycounter{page}\textmd{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\textmd{" + :close "}" :attr "textmd") -(markup-locref :open "~n\setentrycounter{page}\textit{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\textit{" + :close "}" :attr "textit") -(markup-locref :open "~n\setentrycounter{page}\textup{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\textup{" + :close "}" :attr "textup") -(markup-locref :open "~n\setentrycounter{page}\textsl{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\textsl{" + :close "}" :attr "textsl") -(markup-locref :open "~n\setentrycounter{page}\textsc{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\textsc{" + :close "}" :attr "textsc") -(markup-locref :open "~n\setentrycounter{page}\emph{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\emph{" + :close "}" :attr "emph") -(markup-locref :open "~n\setentrycounter{page}\glshypernumber{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\glshypernumber{" + :close "}" :attr "glshypernumber") -(markup-locref :open "~n\setentrycounter{page}\hyperrm{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\hyperrm{" + :close "}" :attr "hyperrm") -(markup-locref :open "~n\setentrycounter{page}\hypersf{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\hypersf{" + :close "}" :attr "hypersf") -(markup-locref :open "~n\setentrycounter{page}\hypertt{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\hypertt{" + :close "}" :attr "hypertt") -(markup-locref :open "~n\setentrycounter{page}\hyperbf{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\hyperbf{" + :close "}" :attr "hyperbf") -(markup-locref :open "~n\setentrycounter{page}\hypermd{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\hypermd{" + :close "}" :attr "hypermd") -(markup-locref :open "~n\setentrycounter{page}\hyperit{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\hyperit{" + :close "}" :attr "hyperit") -(markup-locref :open "~n\setentrycounter{page}\hyperup{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\hyperup{" + :close "}" :attr "hyperup") -(markup-locref :open "~n\setentrycounter{page}\hypersl{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\hypersl{" + :close "}" :attr "hypersl") -(markup-locref :open "~n\setentrycounter{page}\hypersc{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\hypersc{" + :close "}" :attr "hypersc") -(markup-locref :open "~n\setentrycounter{page}\hyperemph{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\hyperemph{" + :close "}" :attr "hyperemph") -(markup-locref :open "~n\setentrycounter{page}\hyperbfit{" - :close "}" +(markup-locref :open "~n\setentrycounter{page}\hyperbfit{" + :close "}" :attr "hyperbfit") ; define letter group list format @@ -581,11 +584,11 @@ (define-sort-rule-orientations (forward backward forward forward)) (use-rule-set :run 0 - :rule-set ("en-alphabetize" "en-ignore-special")) + :rule-set ("en-alphabetize" "en-ignore-special")) (use-rule-set :run 1 - :rule-set ("en-resolve-diacritics" "en-ignore-special")) + :rule-set ("en-resolve-diacritics" "en-ignore-special")) (use-rule-set :run 2 - :rule-set ("en-resolve-case" "en-ignore-special")) + :rule-set ("en-resolve-case" "en-ignore-special")) (use-rule-set :run 3 - :rule-set ("en-resolve-special")) + :rule-set ("en-resolve-special")) diff --git a/macros/latex/contrib/glossaries/samples/samplexdy.pdf b/macros/latex/contrib/glossaries/samples/samplexdy.pdf Binary files differindex 93a35e09cc..8db6ac5ddf 100644 --- a/macros/latex/contrib/glossaries/samples/samplexdy.pdf +++ b/macros/latex/contrib/glossaries/samples/samplexdy.pdf diff --git a/macros/latex/contrib/glossaries/samples/samplexdy.tex b/macros/latex/contrib/glossaries/samples/samplexdy.tex index 808a1ac5ee..2effb0da1b 100644 --- a/macros/latex/contrib/glossaries/samples/samplexdy.tex +++ b/macros/latex/contrib/glossaries/samples/samplexdy.tex @@ -17,7 +17,7 @@ % Otherwise do: % % xindy -L english -C utf8 -I xindy -M samplexdy -t samplexdy.glg -o samplexdy.gls samplexdy.glo -% +% % If you want to use arara, you need the following directives: % arara: pdflatex: { synctex: on } % arara: makeglossaries @@ -74,7 +74,7 @@ % (This command will have no effect if \noist is used) \GlsAddXdyLocation{tally}{% tally location format - :sep "\string\tallynum\space\glsopenbrace" % -> \tallynum { + :sep "\string\tallynum\space\glsopenbrace" % -> \tallynum { "arabic-numbers" % -> arabic number (0, 1, 2, etc) :sep "\glsclosebrace" % -> } } @@ -96,7 +96,7 @@ % The above three lines specify to use samplexdy-mc.xdy (supplied % with this file) and don't overwrite it. The language is -% unset using \GlsSetXdyLanguage{} as all the language +% unset using \GlsSetXdyLanguage{} as all the language % dependent information is contained in samplexdy-mc.xdy % Note that using \noist means that commands like % \GlsAddXdyAttribute and \GlsAddXdyLocation will no longer have @@ -138,7 +138,7 @@ % Define glossary entries % \glshyperlink is used instead of \gls to prevent the glossary % page numbers also appear in the locations, however I need -% to ensure that the referenced entries are added to the +% to ensure that the referenced entries are added to the % glossary via commands that use \glslink, \glsadd or \glssee \newglossaryentry{mcadam}{name={McAdam, John Loudon}, @@ -158,7 +158,7 @@ description={Theorem expressing a function $f(x)$ as the sum of a polynomial and a remainder: \[f(x) = f(a)+f'(a)(x-a)+f''(a)(x-a^2)/2!+\cdots+R_n\] If $n\to\infty$ the expansion is a \glshyperlink{taylorseries} -and if $a=0$, the series is called a +and if $a=0$, the series is called a \gls{maclaurinseries}}} \newglossaryentry{taylorseries}{name={Taylor series}, @@ -170,7 +170,7 @@ description={English mathematician}} \newglossaryentry{mcnemar}{name={McNemar, Quinn}, first={Quinn McNemar},text={McNemar}, -description={Mathematician who introduced +description={Mathematician who introduced \gls{mcnemarstest}. This entry has the number list suppressed},nonumberlist} @@ -235,7 +235,7 @@ first={Giuseppe Peano},text={Peano}, description={Italian mathematician}} \newglossaryentry{peanoscurve}{name={Peano's curve}, -description={A space-filling curve discovered by +description={A space-filling curve discovered by \gls{peano}}} \newglossaryentry{pearson}{name={Pearson, Karl}, @@ -258,14 +258,14 @@ several pages. \rule{1pt}{0.6\textheight} -This paragraph has been shoved to the bottom of the page using a rule. +This paragraph has been shoved to the bottom of the page using a rule. This paragraph spans a page break for testing purposes to ensure the glossary entry in this paragraph has the correct location. Here's the glossary entry: \gls{gaussianfn}. Check that the location is correct. This page talks about \glspl[format=hyperbfit]{gaussianint}. Since -it's the principle definition, the user-defined hyperbfit format is +it's the principle definition, the user-defined hyperbfit format is used. \newpage @@ -275,7 +275,7 @@ The section on \gls[format=)]{gauss} ends here. \section{Series Expansions} This section is about series expansions. It mentions -\gls{maclaurin} and \gls{taylor}. It also discusses +\gls{maclaurin} and \gls{taylor}. It also discusses \gls{taylorstheorem} which is related to the \gls{taylorseries}. The \gls{maclaurinseries} is a special case of the \gls{taylorseries}. diff --git a/macros/latex/contrib/glossaries/samples/samplexdy2.pdf b/macros/latex/contrib/glossaries/samples/samplexdy2.pdf Binary files differindex 7519f29bae..de19ce8acb 100644 --- a/macros/latex/contrib/glossaries/samples/samplexdy2.pdf +++ b/macros/latex/contrib/glossaries/samples/samplexdy2.pdf diff --git a/macros/latex/contrib/glossaries/samples/samplexdy2.tex b/macros/latex/contrib/glossaries/samples/samplexdy2.tex index f8d707849f..6225fb4d9f 100644 --- a/macros/latex/contrib/glossaries/samples/samplexdy2.tex +++ b/macros/latex/contrib/glossaries/samples/samplexdy2.tex @@ -1,6 +1,6 @@ % This file is public domain % -% This is a sample document illustrating how to use the +% This is a sample document illustrating how to use the % glossaries package with xindy. To create the document: % % pdflatex samplexdy2 @@ -27,14 +27,14 @@ \renewcommand*{\theHsection}{\thepart.\thesection} \renewcommand*{\thepart}{\Roman{part}} -\GlsAddXdyLocation["roman-numbers-uppercase"]{section}{:sep "[" +\GlsAddXdyLocation["roman-numbers-uppercase"]{section}{:sep "[" "arabic-numbers" :sep "]" "arabic-numbers" } % If part is 0, then \thepart will be empty, so add an extra % case to catch this: -\GlsAddXdyLocation{zero.section}{:sep "[" +\GlsAddXdyLocation{zero.section}{:sep "[" "arabic-numbers" :sep "]" "arabic-numbers" } diff --git a/macros/latex/contrib/glossaries/samples/samplexdy3.pdf b/macros/latex/contrib/glossaries/samples/samplexdy3.pdf Binary files differindex 323bc80c80..b715c047b4 100644 --- a/macros/latex/contrib/glossaries/samples/samplexdy3.pdf +++ b/macros/latex/contrib/glossaries/samples/samplexdy3.pdf diff --git a/macros/latex/contrib/glossaries/samples/samplexdy3.tex b/macros/latex/contrib/glossaries/samples/samplexdy3.tex index dcdc327b37..8a28f1c3f9 100644 --- a/macros/latex/contrib/glossaries/samples/samplexdy3.tex +++ b/macros/latex/contrib/glossaries/samples/samplexdy3.tex @@ -98,9 +98,9 @@ } % The arguments of \linkpagenumber will be -% #1 -> \customfmtnum +% #1 -> \customfmtnum % #2 -> n -% This means that the page number (n) can be used to +% This means that the page number (n) can be used to % form the hyperlink target. \newcommand{\linkpagenumber}[2]{\hyperlink{page.#2}{#1{#2}}} |