is the page number)
-% so need to define the location in that format:
-% (This command will have no effect if \noist is used)
-
-\GlsAddXdyLocation{customfmt}{:sep "\string\customfmtnum\space\glsopenbrace"
- "arabic-numbers" :sep "\glsclosebrace"}
-
-% (Need to redefine \glsXpageXhyperbfit and
-% \glsXpageXglsnumberformat after \makeglossaries to get the
-% hyperlinks working correctly.)
-
-% To have Mc as a separate group uncomment the following three
-% lines:
-
-%\setStyleFile{samplexdy-mc} % note no extension
-%\noist
-%\GlsSetXdyLanguage{}
-
-% The above three lines specify to use samplexdy-mc.xdy (supplied
-% with this file) and don't overwrite it. The language is
-% unset using \GlsSetXdyLanguage{} as all the language
-% dependent information is contained in samplexdy-mc.xdy
-% Note that using \noist means that commands like
-% \GlsAddXdyAttribute and \GlsAddXdyLocation will no longer have
-% an effect.
-
-% Write the style file (if \noist isn't used)
-% and activate glossary entries
-
-\makeglossaries
-
-% Each page location will be specified in the form:
-%
-% "\glsXpageXglsnumberformat{}{\customfmtnum "\marg{n}"}"
-% or
-% "\glsXpageXhyperbfit{}{\customfmtnum "\marg{n}"}"
-%
-% Redefine to allow hyperlinks:
-
-\renewcommand{\glsXpageXglsnumberformat}[2]{%
- \linkpagenumber#2%
-}
-
-\renewcommand{\glsXpageXhyperbfit}[2]{%
- \textbf{\em\linkpagenumber#2}%
-}
-
-% The arguments of \linkpagenumber will be
-% #1 -> \customfmtnum
-% #2 -> n
-% This means that the page number (n) can be used to
-% form the hyperlink target.
-\newcommand{\linkpagenumber}[2]{\hyperlink{page.#2}{#1{#2}}}
-
-% Define glossary entries
-% \glshyperlink is used instead of \gls to prevent the glossary
-% page numbers also appear in the locations, however I need
-% to ensure that the referenced entries are added to the
-% glossary via commands that use \glslink, \glsadd or \glssee
-
-\newglossaryentry{mcadam}{name={McAdam, John Loudon},
-first={John Loudon McAdam},text={McAdam},
-description={Scottish engineer}}
-
-\newglossaryentry{maclaurin}{name={Maclaurin, Colin},
-first={Colin Maclaurin},text={Maclaurin},
-description={Scottish mathematician best known for the
-\gls{maclaurinseries}}}
-
-\newglossaryentry{maclaurinseries}{name={Maclaurin series},
-description={Series expansion},see={taylorstheorem}}
-
-\newglossaryentry{taylorstheorem}{name={Taylor's theorem},
-description={Theorem expressing a function $f(x)$ as the sum of
-a polynomial and a remainder:
-\[f(x) = f(a)+f'(a)(x-a)+f''(a)(x-a^2)/2!+\cdots+R_n\]
-If $n\to\infty$ the expansion is a \glshyperlink{taylorseries}
-and if $a=0$, the series is called a
-\gls{maclaurinseries}}}
-
-\newglossaryentry{taylorseries}{name={Taylor series},
-description={Series expansion},see={taylorstheorem}}
-
-\newglossaryentry{taylor}{name={Taylor, Brook},
-first={Brook Taylor},text={Taylor},
-description={English mathematician}}
-
-\newglossaryentry{mcnemar}{name={McNemar, Quinn},
-first={Quinn McNemar},text={McNemar},
-description={Mathematician who introduced
-\gls{mcnemarstest}. This entry has the number list
-suppressed},nonumberlist}
-
-\newglossaryentry{mcnemarstest}{name={McNemar's test},
-description={A nonparametric test introduced by
-\gls{mcnemar} in 1947}}
-
-\newglossaryentry{mach}{name={Mach, Ernst},
-first={Ernst Mach},text={Mach},
-% if using samplexdy-mc.xdy, the following line is needed
-% to prevent this entry being put in the "Mc" group
-sort={mach, Ernst},
-description={Czech/Austrian physicist and philosopher}}
-
-\newglossaryentry{machnumber}{name={Mach number},
-% if using samplexdy-mc.xdy, the following line is needed
-% to prevent this entry being put in the "Mc" group
-sort={mach number},
-description={Ratio of the speed of a body in a fluid to the
-speed of sound in that fluid named after \gls{mach}}}
-
-\newglossaryentry{malthus}{name={Malthus, Thomas Robert},
-first={Thomas Robert Malthus},text={Malthus},
-description={English mathematician, sociologist and classicist}}
-
-\newglossaryentry{ampereandre}{name={Ampère, André-Marie},
-first={André-Marie Ampère},text={Ampère},
-description={French mathematician and physicist}}
-
-\newglossaryentry{ampere}{name={ampere},
-description={SI unit of electric current named after
-\gls{ampereandre}}}
-
-\newglossaryentry{archimedes}{name={Archimedes of Syracuse},
-first={Archimedes of Syracuse},text={Archimedes},
-description={Greek mathematician}}
-
-\newglossaryentry{archimedesprinciple}{name={Archimedes' principle},
-description={Principle that if a body is submerged in a fluid
-it experiences upthrust equal to the weight of the displaced
-fluid. Named after \gls{archimedes}}}
-
-\newglossaryentry{galton}{name={Galton, Sir Francis},
-first={Sir Francis Galton},text={Galton},
-description={English anthropologist}}
-
-\newglossaryentry{gauss}{name={Gauss, Karl Friedrich},
-first={Karl Friedrich Gauss},text={Gauss},
-description={German mathematician}}
-
-\newglossaryentry{gaussianint}{name={Gaussian integer},
-description={Complex number where both real and imaginary
-parts are integers}}
-
-\newglossaryentry{gaussianfn}{name={Gaussian function},
- description={A function of the form:
- \[f(x) = a \exp\left(-\frac{(x-b)^2}{2c^2}\right)\]
- for some constants $a$, $b$ and $c$}}
-
-\newglossaryentry{peano}{name={Peano, Giuseppe},
-first={Giuseppe Peano},text={Peano},
-description={Italian mathematician}}
-
-\newglossaryentry{peanoscurve}{name={Peano's curve},
-description={A space-filling curve discovered by
-\gls{peano}}}
-
-\newglossaryentry{pearson}{name={Pearson, Karl},
-first={Karl Pearson},text={Pearson},
-description={English mathematician}}
-
-\newglossaryentry{pearspmcc}{name={Pearson's product moment
-correlation coefficient},description={Product moment correlation
-coefficient named after \gls{pearson}}}
-
-\begin{document}
-\title{Sample Document Using the Glossaries Package With Xindy}
-\author{Nicola Talbot}
-\maketitle
-
-\section{\glsentryfirst{gauss}}
-
-This is a section on
-\gls[format=(]{gauss}. This section spans
-several pages.
-
-\rule{1pt}{0.6\textheight}
-
-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}.
-
-This page talks about \glspl[format=hyperbfit]{gaussianint}. Since
-it's the principle definition, the user-defined hyperbfit format is
-used.
-
-\newpage
-
-The section on \gls[format=)]{gauss} ends here.
-
-\section{Series Expansions}
-
-This section is about series expansions. It mentions
-\gls{maclaurin} and \gls{taylor}. It also discusses
-\gls{taylorstheorem} which is related to the \gls{taylorseries}.
-The \gls{maclaurinseries} is a special case of the
-\gls{taylorseries}.
-
-\section{\glsentryname{archimedesprinciple}}
-
-This section discusses \gls{archimedesprinciple} which was
-introduced by \gls{archimedes}.
-
-\section{Another section}
-
-This section covers \gls{mach} who introduced the \gls{machnumber}.
-It also mentions \gls{ampereandre} after whom the
-SI unit \gls{ampere} is named. It then discusses \gls{galton}
-and \gls{malthus}. Finally it mentions \gls{mcadam}.
-
-\newpage
-This page discusses \gls{mcnemar} who introduced
-\gls{mcnemarstest} and \gls{peano} who discovered \gls{peanoscurve}.
-
-\printglossaries
-\end{document}
-%COMMENT
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*mwe-acr-desc.tex>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex
- % arara: makeglossaries
- % arara: pdflatex
-\documentclass{article}
-
-\usepackage{glossaries}
-
-\makeglossaries
-
-\setacronymstyle{short-long-desc}
-
-\newacronym[description={a device that emits a narrow beam of
-light}]{laser}{laser}{light amplification by stimulated
-emission of radiation}
-
-\begin{document}
-
-First use: \gls{laser}.
-
-Next use: \gls{laser} or \glspl{laser}.
-
-\printglossaries
-
-\end{document}
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*mwe-acr.tex>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex
- % arara: makeglossaries
- % arara: pdflatex
-\documentclass{article}
-
-\usepackage{glossaries}
-
-\makeglossaries
-
-\setacronymstyle{long-short}
-
-\newacronym{laser}{laser}{light amplification by stimulated
-emission of radiation}
-
-\begin{document}
-
-First use: \gls{laser}.
-
-Next use: \gls{laser} or \glspl{laser}.
-
-\printglossaries
-
-\end{document}
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*mwe-gls.tex>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
- % This file is public domain
- % If you want to use arara, you need the following directives:
- % arara: pdflatex
- % arara: makeglossaries
- % arara: pdflatex
-\documentclass{article}
-
-\usepackage{glossaries}
-
-\makeglossaries
-
-\newglossaryentry{apple}{name={apple},description={a fruit}}
-
-\begin{document}
-
-\Gls{apple} or \gls{apple} or \glspl{apple}.
-
-\printglossaries
-
-\end{document}
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*samplexdy-mc.xdy>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-;; xindy style file for samplexdy.tex that has Mc letter group
-
-(define-letter-group "A" :prefixes (""))
-(define-letter-group "B" :after "A" :prefixes (""))
-(define-letter-group "C" :after "B" :prefixes (""))
-(define-letter-group "D" :after "C" :prefixes (""))
-(define-letter-group "E" :after "D" :prefixes (""))
-(define-letter-group "F" :after "E" :prefixes (""))
-(define-letter-group "G" :after "F" :prefixes (""))
-(define-letter-group "H" :after "G" :prefixes ("¤"))
-(define-letter-group "I" :after "H" :prefixes ("¨"))
-(define-letter-group "J" :after "I" :prefixes ("¬"))
-(define-letter-group "K" :after "J" :prefixes ("®"))
-(define-letter-group "L" :after "K" :prefixes ("´"))
-(define-letter-group "Mc" :after "L" :prefixes ("»"))
-(define-letter-group "M" :after "Mc" :prefixes ("»"))
-(define-letter-group "N" :after "M" :prefixes ("¼"))
-(define-letter-group "O" :after "N" :prefixes ("Ã"))
-(define-letter-group "P" :after "O" :prefixes ("È"))
-(define-letter-group "Q" :after "P" :prefixes ("Ê"))
-(define-letter-group "R" :after "Q" :prefixes ("Ë"))
-(define-letter-group "S" :after "R" :prefixes ("Ð"))
-(define-letter-group "T" :after "S" :prefixes ("Ú"))
-(define-letter-group "U" :after "T" :prefixes ("à"))
-(define-letter-group "V" :after "U" :prefixes ("å"))
-(define-letter-group "W" :after "V" :prefixes ("æ"))
-(define-letter-group "X" :after "W" :prefixes ("ë"))
-(define-letter-group "Y" :after "X" :prefixes ("í"))
-(define-letter-group "È" :after "Y" :prefixes ("ï"))
-(define-letter-group "Z" :after "È" :prefixes ("ð"))
-(define-letter-group "Ã" :after "Z" :prefixes ("ö"))
-(define-letter-group "Æ¿" :after "Ã" :prefixes ("÷"))
-
-(define-rule-set "en-alphabetize"
-
- :rules (("Ã " "" :string)
- ("Ã" "" :string)
- ("Ã" "" :string)
- ("æ" "" :string)
- ("Ã" "" :string)
- ("ç" "" :string)
- ("ð" "" :string)
- ("Ã" "" :string)
- ("Ã" "" :string)
- ("Ã" "" :string)
- ("Ã" "" :string)
- ("Ã" "" :string)
- ("è" "" :string)
- ("ë" "" :string)
- ("ê" "" :string)
- ("é" "" :string)
- ("Ã" "¨" :string)
- ("ï" "¨" :string)
- ("Ã" "¼" :string)
- ("ñ" "¼" :string)
- ("Ã" "Ã" :string)
- ("Ã" "Ã" :string)
- ("ô" "Ã" :string)
- ("ö" "Ã" :string)
- ("Å" "Ã" :string)
- ("Å" "Ã" :string)
- ("È" "ï" :string)
- ("È" "ï" :string)
- ("þ" "ö" :string)
- ("Ã" "ö" :string)
- ("Ç·" "÷" :string)
- ("Æ¿" "÷" :string)
- ("a" "" :string)
- ("A" "" :string)
- ("b" "" :string)
- ("B" "" :string)
- ("C" "" :string)
- ("c" "" :string)
- ("d" "" :string)
- ("D" "" :string)
- ("E" "" :string)
- ("e" "" :string)
- ("F" "" :string)
- ("f" "" :string)
- ("g" "" :string)
- ("G" "" :string)
- ("H" "¤" :string)
- ("h" "¤" :string)
- ("I" "¨" :string)
- ("i" "¨" :string)
- ("J" "¬" :string)
- ("j" "¬" :string)
- ("K" "®" :string)
- ("k" "®" :string)
- ("L" "´" :string)
- ("l" "´" :string)
- ("Mc" "»" :string)
- ("Mac" "»" :string)
- ("M" "»" :string)
- ("m" "»" :string)
- ("N" "¼" :string)
- ("n" "¼" :string)
- ("O" "Ã" :string)
- ("o" "Ã" :string)
- ("P" "È" :string)
- ("p" "È" :string)
- ("q" "Ê" :string)
- ("Q" "Ê" :string)
- ("r" "Ë" :string)
- ("R" "Ë" :string)
- ("S" "Ð" :string)
- ("s" "Ð" :string)
- ("T" "Ú" :string)
- ("t" "Ú" :string)
- ("u" "à" :string)
- ("U" "à" :string)
- ("v" "å" :string)
- ("V" "å" :string)
- ("w" "æ" :string)
- ("W" "æ" :string)
- ("X" "ë" :string)
- ("x" "ë" :string)
- ("Y" "í" :string)
- ("y" "í" :string)
- ("z" "ð" :string)
- ("Z" "ð" :string)
- ))
-
-(define-rule-set "en-resolve-diacritics"
-
- :rules (("È" "¢" :string)
- ("þ" "¢" :string)
- ("Ç·" "¢" :string)
- ("Ã" "¢" :string)
- ("È" "¢" :string)
- ("Æ¿" "¢" :string)
- ("Ã" "£" :string)
- ("Ã" "£" :string)
- ("ð" "£" :string)
- ("Ã" "£" :string)
- ("Ã" "£" :string)
- ("Ã" "£" :string)
- ("ï" "£" :string)
- ("ö" "£" :string)
- ("ñ" "£" :string)
- ("ç" "£" :string)
- ("Ã " "£" :string)
- ("Ã" "£" :string)
- ("é" "£" :string)
- ("Ã" "£" :string)
- ("Ã" "¤" :string)
- ("ô" "¤" :string)
- ("Ã" "¤" :string)
- ("è" "¤" :string)
- ("Ã" "¥" :string)
- ("ë" "¥" :string)
- ("Ã" "¦" :string)
- ("ê" "¦" :string)
- ("Å" "ÿ" :string)
- ("Ã" "ÿ" :string)
- ("Å" "ÿ" :string)
- ("æ" "ÿ" :string)
- ("S" "¢" :string)
- ("K" "¢" :string)
- ("d" "¢" :string)
- ("Y" "¢" :string)
- ("E" "¢" :string)
- ("y" "¢" :string)
- ("g" "¢" :string)
- ("e" "¢" :string)
- ("J" "¢" :string)
- ("q" "¢" :string)
- ("D" "¢" :string)
- ("b" "¢" :string)
- ("z" "¢" :string)
- ("w" "¢" :string)
- ("Q" "¢" :string)
- ("M" "¢" :string)
- ("C" "¢" :string)
- ("L" "¢" :string)
- ("X" "¢" :string)
- ("P" "¢" :string)
- ("T" "¢" :string)
- ("a" "¢" :string)
- ("N" "¢" :string)
- ("j" "¢" :string)
- ("Z" "¢" :string)
- ("u" "¢" :string)
- ("k" "¢" :string)
- ("t" "¢" :string)
- ("W" "¢" :string)
- ("v" "¢" :string)
- ("s" "¢" :string)
- ("B" "¢" :string)
- ("H" "¢" :string)
- ("c" "¢" :string)
- ("I" "¢" :string)
- ("G" "¢" :string)
- ("U" "¢" :string)
- ("F" "¢" :string)
- ("r" "¢" :string)
- ("x" "¢" :string)
- ("V" "¢" :string)
- ("h" "¢" :string)
- ("f" "¢" :string)
- ("i" "¢" :string)
- ("A" "¢" :string)
- ("O" "¢" :string)
- ("n" "¢" :string)
- ("m" "¢" :string)
- ("l" "¢" :string)
- ("p" "¢" :string)
- ("R" "¢" :string)
- ("o" "¢" :string)
- ))
-
-(define-rule-set "en-resolve-case"
-
- :rules (("Ã" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "8" :string)
- ("Ç·" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "8" :string)
- ("È" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "89" :string)
- ("Å" "89" :string)
- ("ð" "9" :string)
- ("ô" "9" :string)
- ("È" "9" :string)
- ("ï" "9" :string)
- ("ö" "9" :string)
- ("ñ" "9" :string)
- ("ç" "9" :string)
- ("Ã " "9" :string)
- ("þ" "9" :string)
- ("è" "9" :string)
- ("ë" "9" :string)
- ("ê" "9" :string)
- ("é" "9" :string)
- ("Æ¿" "9" :string)
- ("Å" "99" :string)
- ("æ" "99" :string)
- ("S" "8" :string)
- ("K" "8" :string)
- ("Y" "8" :string)
- ("E" "8" :string)
- ("J" "8" :string)
- ("D" "8" :string)
- ("Q" "8" :string)
- ("M" "8" :string)
- ("C" "8" :string)
- ("L" "8" :string)
- ("X" "8" :string)
- ("P" "8" :string)
- ("T" "8" :string)
- ("N" "8" :string)
- ("Z" "8" :string)
- ("W" "8" :string)
- ("B" "8" :string)
- ("H" "8" :string)
- ("I" "8" :string)
- ("G" "8" :string)
- ("U" "8" :string)
- ("F" "8" :string)
- ("V" "8" :string)
- ("A" "8" :string)
- ("O" "8" :string)
- ("R" "8" :string)
- ("d" "9" :string)
- ("y" "9" :string)
- ("g" "9" :string)
- ("e" "9" :string)
- ("q" "9" :string)
- ("b" "9" :string)
- ("z" "9" :string)
- ("w" "9" :string)
- ("a" "9" :string)
- ("j" "9" :string)
- ("u" "9" :string)
- ("k" "9" :string)
- ("t" "9" :string)
- ("v" "9" :string)
- ("s" "9" :string)
- ("c" "9" :string)
- ("r" "9" :string)
- ("x" "9" :string)
- ("h" "9" :string)
- ("f" "9" :string)
- ("i" "9" :string)
- ("n" "9" :string)
- ("m" "9" :string)
- ("l" "9" :string)
- ("p" "9" :string)
- ("o" "9" :string)
- ))
-
-(define-rule-set "en-ignore-special"
-
- :rules (("-" "" :string)
- ("!" "" :string)
- ("{" "" :string)
- ("'" "" :string)
- ("}" "" :string)
- ("?" "" :string)
- ("." "" :string)
- ))
-
-(define-rule-set "en-resolve-special"
-
- :rules (("Ã" "¤" :string)
- ("Ã" "¤" :string)
- ("ð" "¤" :string)
- ("Ã" "¤" :string)
- ("Ã" "¤" :string)
- ("Ã" "¤" :string)
- ("ô" "¤" :string)
- ("Ã" "¤" :string)
- ("È" "¤" :string)
- ("ï" "¤" :string)
- ("Ã" "¤" :string)
- ("ö" "¤" :string)
- ("ñ" "¤" :string)
- ("Ã" "¤" :string)
- ("ç" "¤" :string)
- ("Ã" "¤" :string)
- ("Ã " "¤" :string)
- ("þ" "¤" :string)
- ("Ç·" "¤" :string)
- ("è" "¤" :string)
- ("Ã" "¤" :string)
- ("ë" "¤" :string)
- ("Ã" "¤" :string)
- ("ê" "¤" :string)
- ("é" "¤" :string)
- ("È" "¤" :string)
- ("Æ¿" "¤" :string)
- ("Ã" "¤" :string)
- ("Å" "¤¤" :string)
- ("Ã" "¤¤" :string)
- ("Å" "¤¤" :string)
- ("æ" "¤¤" :string)
- ("?" "¡" :string)
- ("!" "¢" :string)
- ("." "£" :string)
- ("S" "¤" :string)
- ("K" "¤" :string)
- ("d" "¤" :string)
- ("Y" "¤" :string)
- ("E" "¤" :string)
- ("y" "¤" :string)
- ("g" "¤" :string)
- ("e" "¤" :string)
- ("J" "¤" :string)
- ("q" "¤" :string)
- ("D" "¤" :string)
- ("b" "¤" :string)
- ("z" "¤" :string)
- ("w" "¤" :string)
- ("Q" "¤" :string)
- ("M" "¤" :string)
- ("C" "¤" :string)
- ("L" "¤" :string)
- ("X" "¤" :string)
- ("P" "¤" :string)
- ("T" "¤" :string)
- ("a" "¤" :string)
- ("N" "¤" :string)
- ("j" "¤" :string)
- ("Z" "¤" :string)
- ("u" "¤" :string)
- ("k" "¤" :string)
- ("t" "¤" :string)
- ("W" "¤" :string)
- ("v" "¤" :string)
- ("s" "¤" :string)
- ("B" "¤" :string)
- ("H" "¤" :string)
- ("c" "¤" :string)
- ("I" "¤" :string)
- ("G" "¤" :string)
- ("U" "¤" :string)
- ("F" "¤" :string)
- ("r" "¤" :string)
- ("x" "¤" :string)
- ("V" "¤" :string)
- ("h" "¤" :string)
- ("f" "¤" :string)
- ("i" "¤" :string)
- ("A" "¤" :string)
- ("O" "¤" :string)
- ("n" "¤" :string)
- ("m" "¤" :string)
- ("l" "¤" :string)
- ("p" "¤" :string)
- ("R" "¤" :string)
- ("o" "¤" :string)
- ("-" "¥" :string)
- ("'" "¦" :string)
- ("{" "§" :string)
- ("}" "¨" :string)
- ))
-
-; The following section is customised for samplexdy.tex
-; (copied from samplexdy.xdy automatically generated by
-; samplexdy.tex)
-
-; required styles
-
-(require "tex.xdy")
-
-; list of allowed attributes (number formats)
-
-(define-attributes (("default"
- "hyperbfit"
- "pagehyperbfit"
- "glsnumberformat"
- "pageglsnumberformat"
- "textrm"
- "pagetextrm"
- "textsf"
- "pagetextsf"
- "texttt"
- "pagetexttt"
- "textbf"
- "pagetextbf"
- "textmd"
- "pagetextmd"
- "textit"
- "pagetextit"
- "textup"
- "pagetextup"
- "textsl"
- "pagetextsl"
- "textsc"
- "pagetextsc"
- "emph"
- "pageemph"
- "glshypernumber"
- "pageglshypernumber"
- "hyperrm"
- "pagehyperrm"
- "hypersf"
- "pagehypersf"
- "hypertt"
- "pagehypertt"
- "hyperbf"
- "pagehyperbf"
- "hypermd"
- "pagehypermd"
- "hyperit"
- "pagehyperit"
- "hyperup"
- "pagehyperup"
- "hypersl"
- "pagehypersl"
- "hypersc"
- "pagehypersc"
- "hyperemph"
- "pagehyperemph")))
-
-; user defined alphabets
-
-
-
-; location class definitions
-
-(define-location-class "roman-page-numbers"
- ( :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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(define-location-class "Roman-page-numbers"
- ( :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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(define-location-class "arabic-page-numbers"
- ( :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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(define-location-class "alpha-page-numbers"
- ( :sep "{}{" "alpha" :sep "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :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 "}" )
- :min-range-length 2
-)
-(define-location-class "arabic-section-numbers"
- ( :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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :min-range-length 2
-)
-(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 "}" )
- :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 "}" )
- :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 "}" )
- :min-range-length 2
-)
-
-; user defined location classes
-
-(define-location-class "Numberstring"
- (:sep "{}{" :sep "\protect \Numberstringnum {" "arabic-numbers" :sep "}" :sep "}"))
-
-; define cross-reference class
-
-(define-crossref-class "see" :unverified )
-(markup-crossref-list :class "see"
- :open "\glsseeformat" :close "{}")
-
-; define the order of the location classes
-(define-location-class-order (
- "roman-page-numbers"
- "arabic-page-numbers"
- "arabic-section-numbers"
- "alpha-page-numbers"
- "Roman-page-numbers"
- "Alpha-page-numbers"
- "Appendix-page-numbers"
- "see" ))
-
-; define the glossary markup
-
-(markup-index
- :open "\glossarysection[\glossarytoctitle]{\glossarytitle}\glossarypreamble
-\providecommand*\glsXpageXhyperbfit[2]{\setentrycounter[#1]{page}\hyperbfit{#2}}
-\providecommand*\glsXpageXglsnumberformat[2]{\setentrycounter[#1]{page}\glsnumberformat{#2}}
-\providecommand*\glsXpageXtextrm[2]{\setentrycounter[#1]{page}\textrm{#2}}
-\providecommand*\glsXpageXtextsf[2]{\setentrycounter[#1]{page}\textsf{#2}}
-\providecommand*\glsXpageXtexttt[2]{\setentrycounter[#1]{page}\texttt{#2}}
-\providecommand*\glsXpageXtextbf[2]{\setentrycounter[#1]{page}\textbf{#2}}
-\providecommand*\glsXpageXtextmd[2]{\setentrycounter[#1]{page}\textmd{#2}}
-\providecommand*\glsXpageXtextit[2]{\setentrycounter[#1]{page}\textit{#2}}
-\providecommand*\glsXpageXtextup[2]{\setentrycounter[#1]{page}\textup{#2}}
-\providecommand*\glsXpageXtextsl[2]{\setentrycounter[#1]{page}\textsl{#2}}
-\providecommand*\glsXpageXtextsc[2]{\setentrycounter[#1]{page}\textsc{#2}}
-\providecommand*\glsXpageXemph[2]{\setentrycounter[#1]{page}\emph{#2}}
-\providecommand*\glsXpageXglshypernumber[2]{\setentrycounter[#1]{page}\glshypernumber{#2}}
-\providecommand*\glsXpageXhyperrm[2]{\setentrycounter[#1]{page}\hyperrm{#2}}
-\providecommand*\glsXpageXhypersf[2]{\setentrycounter[#1]{page}\hypersf{#2}}
-\providecommand*\glsXpageXhypertt[2]{\setentrycounter[#1]{page}\hypertt{#2}}
-\providecommand*\glsXpageXhyperbf[2]{\setentrycounter[#1]{page}\hyperbf{#2}}
-\providecommand*\glsXpageXhypermd[2]{\setentrycounter[#1]{page}\hypermd{#2}}
-\providecommand*\glsXpageXhyperit[2]{\setentrycounter[#1]{page}\hyperit{#2}}
-\providecommand*\glsXpageXhyperup[2]{\setentrycounter[#1]{page}\hyperup{#2}}
-\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"
- :tree)
-(markup-letter-group-list :sep "\glsgroupskip~n")
-(markup-indexentry :open "\relax\glsresetentrylist~n")
-(markup-locclass-list :open "{\glossaryentrynumbers{\relax "
- :sep ", " :close "}}")
-(markup-locref-list :sep "\delimN ")
-(markup-range :sep "\delimR ")
-
-; define format to use for locations
-
-
-(markup-locref :open "~n\glsXpageXhyperbfit"
- :close ""
- :attr "pagehyperbfit")
-(markup-locref :open "~n\glsXpageXglsnumberformat"
- :close ""
- :attr "pageglsnumberformat")
-(markup-locref :open "~n\glsXpageXtextrm"
- :close ""
- :attr "pagetextrm")
-(markup-locref :open "~n\glsXpageXtextsf"
- :close ""
- :attr "pagetextsf")
-(markup-locref :open "~n\glsXpageXtexttt"
- :close ""
- :attr "pagetexttt")
-(markup-locref :open "~n\glsXpageXtextbf"
- :close ""
- :attr "pagetextbf")
-(markup-locref :open "~n\glsXpageXtextmd"
- :close ""
- :attr "pagetextmd")
-(markup-locref :open "~n\glsXpageXtextit"
- :close ""
- :attr "pagetextit")
-(markup-locref :open "~n\glsXpageXtextup"
- :close ""
- :attr "pagetextup")
-(markup-locref :open "~n\glsXpageXtextsl"
- :close ""
- :attr "pagetextsl")
-(markup-locref :open "~n\glsXpageXtextsc"
- :close ""
- :attr "pagetextsc")
-(markup-locref :open "~n\glsXpageXemph"
- :close ""
- :attr "pageemph")
-(markup-locref :open "~n\glsXpageXglshypernumber"
- :close ""
- :attr "pageglshypernumber")
-(markup-locref :open "~n\glsXpageXhyperrm"
- :close ""
- :attr "pagehyperrm")
-(markup-locref :open "~n\glsXpageXhypersf"
- :close ""
- :attr "pagehypersf")
-(markup-locref :open "~n\glsXpageXhypertt"
- :close ""
- :attr "pagehypertt")
-(markup-locref :open "~n\glsXpageXhyperbf"
- :close ""
- :attr "pagehyperbf")
-(markup-locref :open "~n\glsXpageXhypermd"
- :close ""
- :attr "pagehypermd")
-(markup-locref :open "~n\glsXpageXhyperit"
- :close ""
- :attr "pagehyperit")
-(markup-locref :open "~n\glsXpageXhyperup"
- :close ""
- :attr "pagehyperup")
-(markup-locref :open "~n\glsXpageXhypersl"
- :close ""
- :attr "pagehypersl")
-(markup-locref :open "~n\glsXpageXhypersc"
- :close ""
- :attr "pagehypersc")
-(markup-locref :open "~n\glsXpageXhyperemph"
- :close ""
- :attr "pagehyperemph")
-
-; define letter group list format
-
-(markup-letter-group-list :sep "\glsgroupskip~n")
-
-; letter group headings
-
-(markup-letter-group :open-head "\glsgroupheading{"
- :close-head "}")
-
-; additional letter groups
-
-(define-letter-group "glsnumbers"
- :prefixes ("0" "1" "2" "3" "4" "5" "6" "7" "8" "9")
- :before "A")
-
-; 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"))
-(use-rule-set :run 1
- :rule-set ("en-resolve-diacritics" "en-ignore-special"))
-(use-rule-set :run 2
- :rule-set ("en-resolve-case" "en-ignore-special"))
-(use-rule-set :run 3
- :rule-set ("en-resolve-special"))
-
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*samplexdy-mc207.xdy>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-;; xindy style file for samplexdy.tex that has Mc letter group
-
-(define-letter-group "A" :prefixes (""))
-(define-letter-group "B" :after "A" :prefixes (""))
-(define-letter-group "C" :after "B" :prefixes (""))
-(define-letter-group "D" :after "C" :prefixes (""))
-(define-letter-group "E" :after "D" :prefixes (""))
-(define-letter-group "F" :after "E" :prefixes (""))
-(define-letter-group "G" :after "F" :prefixes (""))
-(define-letter-group "H" :after "G" :prefixes ("¤"))
-(define-letter-group "I" :after "H" :prefixes ("¨"))
-(define-letter-group "J" :after "I" :prefixes ("¬"))
-(define-letter-group "K" :after "J" :prefixes ("®"))
-(define-letter-group "L" :after "K" :prefixes ("´"))
-(define-letter-group "Mc" :after "L" :prefixes ("»"))
-(define-letter-group "M" :after "Mc" :prefixes ("»"))
-(define-letter-group "N" :after "M" :prefixes ("¼"))
-(define-letter-group "O" :after "N" :prefixes ("Ã"))
-(define-letter-group "P" :after "O" :prefixes ("È"))
-(define-letter-group "Q" :after "P" :prefixes ("Ê"))
-(define-letter-group "R" :after "Q" :prefixes ("Ë"))
-(define-letter-group "S" :after "R" :prefixes ("Ð"))
-(define-letter-group "T" :after "S" :prefixes ("Ú"))
-(define-letter-group "U" :after "T" :prefixes ("à"))
-(define-letter-group "V" :after "U" :prefixes ("å"))
-(define-letter-group "W" :after "V" :prefixes ("æ"))
-(define-letter-group "X" :after "W" :prefixes ("ë"))
-(define-letter-group "Y" :after "X" :prefixes ("í"))
-(define-letter-group "È" :after "Y" :prefixes ("ï"))
-(define-letter-group "Z" :after "È" :prefixes ("ð"))
-(define-letter-group "Ã" :after "Z" :prefixes ("ö"))
-(define-letter-group "Æ¿" :after "Ã" :prefixes ("÷"))
-
-(define-rule-set "en-alphabetize"
-
- :rules (("Ã " "" :string)
- ("Ã" "" :string)
- ("Ã" "" :string)
- ("æ" "" :string)
- ("Ã" "" :string)
- ("ç" "" :string)
- ("ð" "" :string)
- ("Ã" "" :string)
- ("Ã" "" :string)
- ("Ã" "" :string)
- ("Ã" "" :string)
- ("Ã" "" :string)
- ("è" "" :string)
- ("ë" "" :string)
- ("ê" "" :string)
- ("é" "" :string)
- ("Ã" "¨" :string)
- ("ï" "¨" :string)
- ("Ã" "¼" :string)
- ("ñ" "¼" :string)
- ("Ã" "Ã" :string)
- ("Ã" "Ã" :string)
- ("ô" "Ã" :string)
- ("ö" "Ã" :string)
- ("Å" "Ã" :string)
- ("Å" "Ã" :string)
- ("È" "ï" :string)
- ("È" "ï" :string)
- ("þ" "ö" :string)
- ("Ã" "ö" :string)
- ("Ç·" "÷" :string)
- ("Æ¿" "÷" :string)
- ("a" "" :string)
- ("A" "" :string)
- ("b" "" :string)
- ("B" "" :string)
- ("C" "" :string)
- ("c" "" :string)
- ("d" "" :string)
- ("D" "" :string)
- ("E" "" :string)
- ("e" "" :string)
- ("F" "" :string)
- ("f" "" :string)
- ("g" "" :string)
- ("G" "" :string)
- ("H" "¤" :string)
- ("h" "¤" :string)
- ("I" "¨" :string)
- ("i" "¨" :string)
- ("J" "¬" :string)
- ("j" "¬" :string)
- ("K" "®" :string)
- ("k" "®" :string)
- ("L" "´" :string)
- ("l" "´" :string)
- ("Mc" "»" :string)
- ("Mac" "»" :string)
- ("M" "»" :string)
- ("m" "»" :string)
- ("N" "¼" :string)
- ("n" "¼" :string)
- ("O" "Ã" :string)
- ("o" "Ã" :string)
- ("P" "È" :string)
- ("p" "È" :string)
- ("q" "Ê" :string)
- ("Q" "Ê" :string)
- ("r" "Ë" :string)
- ("R" "Ë" :string)
- ("S" "Ð" :string)
- ("s" "Ð" :string)
- ("T" "Ú" :string)
- ("t" "Ú" :string)
- ("u" "à" :string)
- ("U" "à" :string)
- ("v" "å" :string)
- ("V" "å" :string)
- ("w" "æ" :string)
- ("W" "æ" :string)
- ("X" "ë" :string)
- ("x" "ë" :string)
- ("Y" "í" :string)
- ("y" "í" :string)
- ("z" "ð" :string)
- ("Z" "ð" :string)
- ))
-
-(define-rule-set "en-resolve-diacritics"
-
- :rules (("È" "¢" :string)
- ("þ" "¢" :string)
- ("Ç·" "¢" :string)
- ("Ã" "¢" :string)
- ("È" "¢" :string)
- ("Æ¿" "¢" :string)
- ("Ã" "£" :string)
- ("Ã" "£" :string)
- ("ð" "£" :string)
- ("Ã" "£" :string)
- ("Ã" "£" :string)
- ("Ã" "£" :string)
- ("ï" "£" :string)
- ("ö" "£" :string)
- ("ñ" "£" :string)
- ("ç" "£" :string)
- ("Ã " "£" :string)
- ("Ã" "£" :string)
- ("é" "£" :string)
- ("Ã" "£" :string)
- ("Ã" "¤" :string)
- ("ô" "¤" :string)
- ("Ã" "¤" :string)
- ("è" "¤" :string)
- ("Ã" "¥" :string)
- ("ë" "¥" :string)
- ("Ã" "¦" :string)
- ("ê" "¦" :string)
- ("Å" "ÿ" :string)
- ("Ã" "ÿ" :string)
- ("Å" "ÿ" :string)
- ("æ" "ÿ" :string)
- ("S" "¢" :string)
- ("K" "¢" :string)
- ("d" "¢" :string)
- ("Y" "¢" :string)
- ("E" "¢" :string)
- ("y" "¢" :string)
- ("g" "¢" :string)
- ("e" "¢" :string)
- ("J" "¢" :string)
- ("q" "¢" :string)
- ("D" "¢" :string)
- ("b" "¢" :string)
- ("z" "¢" :string)
- ("w" "¢" :string)
- ("Q" "¢" :string)
- ("M" "¢" :string)
- ("C" "¢" :string)
- ("L" "¢" :string)
- ("X" "¢" :string)
- ("P" "¢" :string)
- ("T" "¢" :string)
- ("a" "¢" :string)
- ("N" "¢" :string)
- ("j" "¢" :string)
- ("Z" "¢" :string)
- ("u" "¢" :string)
- ("k" "¢" :string)
- ("t" "¢" :string)
- ("W" "¢" :string)
- ("v" "¢" :string)
- ("s" "¢" :string)
- ("B" "¢" :string)
- ("H" "¢" :string)
- ("c" "¢" :string)
- ("I" "¢" :string)
- ("G" "¢" :string)
- ("U" "¢" :string)
- ("F" "¢" :string)
- ("r" "¢" :string)
- ("x" "¢" :string)
- ("V" "¢" :string)
- ("h" "¢" :string)
- ("f" "¢" :string)
- ("i" "¢" :string)
- ("A" "¢" :string)
- ("O" "¢" :string)
- ("n" "¢" :string)
- ("m" "¢" :string)
- ("l" "¢" :string)
- ("p" "¢" :string)
- ("R" "¢" :string)
- ("o" "¢" :string)
- ))
-
-(define-rule-set "en-resolve-case"
-
- :rules (("Ã" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "8" :string)
- ("Ç·" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "8" :string)
- ("È" "8" :string)
- ("Ã" "8" :string)
- ("Ã" "89" :string)
- ("Å" "89" :string)
- ("ð" "9" :string)
- ("ô" "9" :string)
- ("È" "9" :string)
- ("ï" "9" :string)
- ("ö" "9" :string)
- ("ñ" "9" :string)
- ("ç" "9" :string)
- ("Ã " "9" :string)
- ("þ" "9" :string)
- ("è" "9" :string)
- ("ë" "9" :string)
- ("ê" "9" :string)
- ("é" "9" :string)
- ("Æ¿" "9" :string)
- ("Å" "99" :string)
- ("æ" "99" :string)
- ("S" "8" :string)
- ("K" "8" :string)
- ("Y" "8" :string)
- ("E" "8" :string)
- ("J" "8" :string)
- ("D" "8" :string)
- ("Q" "8" :string)
- ("M" "8" :string)
- ("C" "8" :string)
- ("L" "8" :string)
- ("X" "8" :string)
- ("P" "8" :string)
- ("T" "8" :string)
- ("N" "8" :string)
- ("Z" "8" :string)
- ("W" "8" :string)
- ("B" "8" :string)
- ("H" "8" :string)
- ("I" "8" :string)
- ("G" "8" :string)
- ("U" "8" :string)
- ("F" "8" :string)
- ("V" "8" :string)
- ("A" "8" :string)
- ("O" "8" :string)
- ("R" "8" :string)
- ("d" "9" :string)
- ("y" "9" :string)
- ("g" "9" :string)
- ("e" "9" :string)
- ("q" "9" :string)
- ("b" "9" :string)
- ("z" "9" :string)
- ("w" "9" :string)
- ("a" "9" :string)
- ("j" "9" :string)
- ("u" "9" :string)
- ("k" "9" :string)
- ("t" "9" :string)
- ("v" "9" :string)
- ("s" "9" :string)
- ("c" "9" :string)
- ("r" "9" :string)
- ("x" "9" :string)
- ("h" "9" :string)
- ("f" "9" :string)
- ("i" "9" :string)
- ("n" "9" :string)
- ("m" "9" :string)
- ("l" "9" :string)
- ("p" "9" :string)
- ("o" "9" :string)
- ))
-
-(define-rule-set "en-ignore-special"
-
- :rules (("-" "" :string)
- ("!" "" :string)
- ("{" "" :string)
- ("'" "" :string)
- ("}" "" :string)
- ("?" "" :string)
- ("." "" :string)
- ))
-
-(define-rule-set "en-resolve-special"
-
- :rules (("Ã" "¤" :string)
- ("Ã" "¤" :string)
- ("ð" "¤" :string)
- ("Ã" "¤" :string)
- ("Ã" "¤" :string)
- ("Ã" "¤" :string)
- ("ô" "¤" :string)
- ("Ã" "¤" :string)
- ("È" "¤" :string)
- ("ï" "¤" :string)
- ("Ã" "¤" :string)
- ("ö" "¤" :string)
- ("ñ" "¤" :string)
- ("Ã" "¤" :string)
- ("ç" "¤" :string)
- ("Ã" "¤" :string)
- ("Ã " "¤" :string)
- ("þ" "¤" :string)
- ("Ç·" "¤" :string)
- ("è" "¤" :string)
- ("Ã" "¤" :string)
- ("ë" "¤" :string)
- ("Ã" "¤" :string)
- ("ê" "¤" :string)
- ("é" "¤" :string)
- ("È" "¤" :string)
- ("Æ¿" "¤" :string)
- ("Ã" "¤" :string)
- ("Å" "¤¤" :string)
- ("Ã" "¤¤" :string)
- ("Å" "¤¤" :string)
- ("æ" "¤¤" :string)
- ("?" "¡" :string)
- ("!" "¢" :string)
- ("." "£" :string)
- ("S" "¤" :string)
- ("K" "¤" :string)
- ("d" "¤" :string)
- ("Y" "¤" :string)
- ("E" "¤" :string)
- ("y" "¤" :string)
- ("g" "¤" :string)
- ("e" "¤" :string)
- ("J" "¤" :string)
- ("q" "¤" :string)
- ("D" "¤" :string)
- ("b" "¤" :string)
- ("z" "¤" :string)
- ("w" "¤" :string)
- ("Q" "¤" :string)
- ("M" "¤" :string)
- ("C" "¤" :string)
- ("L" "¤" :string)
- ("X" "¤" :string)
- ("P" "¤" :string)
- ("T" "¤" :string)
- ("a" "¤" :string)
- ("N" "¤" :string)
- ("j" "¤" :string)
- ("Z" "¤" :string)
- ("u" "¤" :string)
- ("k" "¤" :string)
- ("t" "¤" :string)
- ("W" "¤" :string)
- ("v" "¤" :string)
- ("s" "¤" :string)
- ("B" "¤" :string)
- ("H" "¤" :string)
- ("c" "¤" :string)
- ("I" "¤" :string)
- ("G" "¤" :string)
- ("U" "¤" :string)
- ("F" "¤" :string)
- ("r" "¤" :string)
- ("x" "¤" :string)
- ("V" "¤" :string)
- ("h" "¤" :string)
- ("f" "¤" :string)
- ("i" "¤" :string)
- ("A" "¤" :string)
- ("O" "¤" :string)
- ("n" "¤" :string)
- ("m" "¤" :string)
- ("l" "¤" :string)
- ("p" "¤" :string)
- ("R" "¤" :string)
- ("o" "¤" :string)
- ("-" "¥" :string)
- ("'" "¦" :string)
- ("{" "§" :string)
- ("}" "¨" :string)
- ))
-
-; The following section is customised for samplexdy.tex
-; (copied from samplexdy.xdy automatically generated by
-; samplexdy.tex)
-
-; required styles
-
-(require "tex.xdy")
-
-; list of allowed attributes (number formats)
-
-(define-attributes (("default"
- "glsnumberformat"
- "textrm"
- "textsf"
- "texttt"
- "textbf"
- "textmd"
- "textit"
- "textup"
- "textsl"
- "textsc"
- "emph"
- "glshypernumber"
- "hyperrm"
- "hypersf"
- "hypertt"
- "hyperbf"
- "hypermd"
- "hyperit"
- "hyperup"
- "hypersl"
- "hypersc"
- "hyperemph"
- "hyperbfit")))
-
-; user defined alphabets
-
-
-
-; location class definitions
-
-(define-location-class "roman-page-numbers"
- ("roman-numbers-lowercase"))
-(define-location-class "Roman-page-numbers"
- ("roman-numbers-uppercase"))
-(define-location-class "arabic-page-numbers"
- ("arabic-numbers"))
-(define-location-class "alpha-page-numbers"
- ("alpha"))
-(define-location-class "Alpha-page-numbers"
- ("ALPHA"))
-(define-location-class "Appendix-page-numbers"
- ("ALPHA" :sep "." "arabic-numbers"))
-(define-location-class "arabic-section-numbers"
- ("arabic-numbers" :sep "." "arabic-numbers"))
-
-; user defined location classes
-
-(define-location-class "Numberstring"
- (:sep "\protect \Numberstringnum {" "arabic-numbers" :sep "}"))
-
-; define cross-reference class
-
-(define-crossref-class "see" :unverified )
-(markup-crossref-list :class "see"
- :open "\glsseeformat" :close "{}")
-
-; define the order of the location classes
-(define-location-class-order (
- "roman-page-numbers"
- "arabic-page-numbers"
- "arabic-section-numbers"
- "alpha-page-numbers"
- "Roman-page-numbers"
- "Alpha-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"
- :tree)
-(markup-letter-group-list :sep "\glsgroupskip~n")
-(markup-indexentry :open "~n" :depth 0)
-(markup-locclass-list :open "{\glossaryentrynumbers{\relax "
- :sep ", " :close "}}")
-(markup-locref-list :sep "\delimN ")
-(markup-range :sep "\delimR ")
-
-; define format to use for locations
-
-
-(markup-locref :open "~n\setentrycounter{page}\glsnumberformat{"
- :close "}"
- :attr "glsnumberformat")
-(markup-locref :open "~n\setentrycounter{page}\textrm{"
- :close "}"
- :attr "textrm")
-(markup-locref :open "~n\setentrycounter{page}\textsf{"
- :close "}"
- :attr "textsf")
-(markup-locref :open "~n\setentrycounter{page}\texttt{"
- :close "}"
- :attr "texttt")
-(markup-locref :open "~n\setentrycounter{page}\textbf{"
- :close "}"
- :attr "textbf")
-(markup-locref :open "~n\setentrycounter{page}\textmd{"
- :close "}"
- :attr "textmd")
-(markup-locref :open "~n\setentrycounter{page}\textit{"
- :close "}"
- :attr "textit")
-(markup-locref :open "~n\setentrycounter{page}\textup{"
- :close "}"
- :attr "textup")
-(markup-locref :open "~n\setentrycounter{page}\textsl{"
- :close "}"
- :attr "textsl")
-(markup-locref :open "~n\setentrycounter{page}\textsc{"
- :close "}"
- :attr "textsc")
-(markup-locref :open "~n\setentrycounter{page}\emph{"
- :close "}"
- :attr "emph")
-(markup-locref :open "~n\setentrycounter{page}\glshypernumber{"
- :close "}"
- :attr "glshypernumber")
-(markup-locref :open "~n\setentrycounter{page}\hyperrm{"
- :close "}"
- :attr "hyperrm")
-(markup-locref :open "~n\setentrycounter{page}\hypersf{"
- :close "}"
- :attr "hypersf")
-(markup-locref :open "~n\setentrycounter{page}\hypertt{"
- :close "}"
- :attr "hypertt")
-(markup-locref :open "~n\setentrycounter{page}\hyperbf{"
- :close "}"
- :attr "hyperbf")
-(markup-locref :open "~n\setentrycounter{page}\hypermd{"
- :close "}"
- :attr "hypermd")
-(markup-locref :open "~n\setentrycounter{page}\hyperit{"
- :close "}"
- :attr "hyperit")
-(markup-locref :open "~n\setentrycounter{page}\hyperup{"
- :close "}"
- :attr "hyperup")
-(markup-locref :open "~n\setentrycounter{page}\hypersl{"
- :close "}"
- :attr "hypersl")
-(markup-locref :open "~n\setentrycounter{page}\hypersc{"
- :close "}"
- :attr "hypersc")
-(markup-locref :open "~n\setentrycounter{page}\hyperemph{"
- :close "}"
- :attr "hyperemph")
-(markup-locref :open "~n\setentrycounter{page}\hyperbfit{"
- :close "}"
- :attr "hyperbfit")
-
-; define letter group list format
-
-(markup-letter-group-list :sep "\glsgroupskip~n")
-
-; letter group headings
-
-(markup-letter-group :open-head "\glsgroupheading{"
- :close-head "}")
-
-(define-letter-group "glsnumbers"
- :prefixes ("0" "1" "2" "3" "4" "5" "6" "7" "8" "9")
- :before "A")
-
-; 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"))
-(use-rule-set :run 1
- :rule-set ("en-resolve-diacritics" "en-ignore-special"))
-(use-rule-set :run 2
- :rule-set ("en-resolve-case" "en-ignore-special"))
-(use-rule-set :run 3
- :rule-set ("en-resolve-special"))
-
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*database1.tex>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
- % 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}}
-
-\newglossaryentry{binary}{name=binary,
-description={Pertaining to numbers represented in base 2}}
-
-\newglossaryentry{comment}{name=comment,
-description={A remark that doesn't affect the meaning of the
-code}}
-
-\newglossaryentry{global}{name=global,
-description={Something that maintains its state when it leaves
-the current group}}
-
-\newglossaryentry{local}{name=local,
-description={Something that only maintains its state until
-it leaves the group in which it was defined/changed}}
-
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%<*database2.tex>
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
- % 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
-\newglossaryentry{quote}{name={"},
-description={the double quote symbol}}
-
-\newglossaryentry{at}{name={@},
-description={the ``at'' symbol}}
-
-\newglossaryentry{excl}{name={!},
-description={the exclamation mark symbol}}
-
-\newglossaryentry{bar}{name={\ensuremath{|}},
-description={the vertical bar symbol}}
-
-\newglossaryentry{hash}{name={\#},
-description={the hash symbol}}
-
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
-%
-% \end{macrocode}
-%\fi
-%\iffalse
-% \begin{macrocode}
%<*glossaries.perl>
% \end{macrocode}
%\fi
diff --git a/macros/latex/contrib/glossaries/glossaries.ins b/macros/latex/contrib/glossaries/glossaries.ins
index f46dd99a7a..6539fc8046 100644
--- a/macros/latex/contrib/glossaries/glossaries.ins
+++ b/macros/latex/contrib/glossaries/glossaries.ins
@@ -1,4 +1,4 @@
-% glossaries.ins generated using makedtx version 1.2 2019/9/28 15:01
+% glossaries.ins generated using makedtx version 1.2 2019/12/6 14:57
\input docstrip
\preamble
@@ -18,7 +18,7 @@
The Current Maintainer of this work is Nicola Talbot.
- This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longbooktabs.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, minimalgls.tex, glossary-lipsum-examples.tex, example-glossaries-acronym-desc.tex, example-glossaries-acronym.tex, example-glossaries-acronyms-lang.tex, example-glossaries-brief.tex, example-glossaries-childnoname.tex, example-glossaries-cite.tex, example-glossaries-images.tex, example-glossaries-long.tex, example-glossaries-multipar.tex, example-glossaries-parent.tex, example-glossaries-symbolnames.tex, example-glossaries-symbols.tex, example-glossaries-url.tex, sample-chap-hyperfirst.tex, sample-crossref.tex, sample-custom-acronym.tex, sample-dot-abbr.tex, sample-dual.tex, sample-entrycount.tex, sample-entryfmt.tex, sample-FnDesc.tex, sample-font-abbr.tex, sample-ignored.tex, sample-index.tex, sample-inline.tex, sample-langdict.tex, sample-newkeys.tex, sample-noidxapp-utf8.tex, sample-noidxapp.tex, sample-nomathhyper.tex, sample-numberlist.tex, sample-prefix.tex, sample-si.tex, sample-storage-abbr-desc.tex, sample-storage-abbr.tex, sample.tex, sample4col.tex, sampleaccsupp.tex, sampleAcr.tex, sampleAcrDesc.tex, sampleacronyms.tex, sampleCustomAcr.tex, sampleDB.tex, sampleDesc.tex, sampleEq.tex, sampleEqPg.tex, sampleFnAcrDesc.tex, sampleNtn.tex, samplePeople.tex, sampleSec.tex, sampleSort.tex, sampletree.tex, sampleutf8.tex, samplexdy.tex, samplexdy2.tex, samplexdy3.tex, mwe-acr-desc.tex, mwe-acr.tex, mwe-gls.tex, samplexdy-mc.xdy, samplexdy-mc207.xdy, database1.tex, database2.tex, glossaries.perl.
+ This work consists of the files glossaries.dtx and glossaries.ins and the derived files glossaries.sty, glossaries-prefix.sty, glossary-hypernav.sty, glossary-inline.sty, glossary-list.sty, glossary-long.sty, glossary-longbooktabs.sty, glossary-longragged.sty, glossary-mcols.sty, glossary-super.sty, glossary-superragged.sty, glossary-tree.sty, glossaries-compatible-207.sty, glossaries-compatible-307.sty, glossaries-accsupp.sty, glossaries-babel.sty, glossaries-polyglossia.sty, example-glossaries-acronym-desc.tex, example-glossaries-acronym.tex, example-glossaries-acronyms-lang.tex, example-glossaries-brief.tex, example-glossaries-childnoname.tex, example-glossaries-cite.tex, example-glossaries-images.tex, example-glossaries-long.tex, example-glossaries-multipar.tex, example-glossaries-parent.tex, example-glossaries-symbolnames.tex, example-glossaries-symbols.tex, example-glossaries-url.tex, glossaries.perl.
\endpreamble
@@ -58,8 +58,6 @@
\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-babel.sty,package}}
\file{glossaries-polyglossia.sty}{\usepreamble\defaultpreamble
\usepostamble\defaultpostamble\from{glossaries.dtx}{glossaries-polyglossia.sty,package}}
-\file{minimalgls.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{minimalgls.tex}}
-\file{glossary-lipsum-examples.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{glossary-lipsum-examples.tex}}
\file{example-glossaries-acronym-desc.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{example-glossaries-acronym-desc.tex}}
\file{example-glossaries-acronym.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{example-glossaries-acronym.tex}}
\file{example-glossaries-acronyms-lang.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{example-glossaries-acronyms-lang.tex}}
@@ -73,56 +71,6 @@
\file{example-glossaries-symbolnames.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{example-glossaries-symbolnames.tex}}
\file{example-glossaries-symbols.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{example-glossaries-symbols.tex}}
\file{example-glossaries-url.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{example-glossaries-url.tex}}
-\file{sample-chap-hyperfirst.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-chap-hyperfirst.tex}}
-\file{sample-crossref.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-crossref.tex}}
-\file{sample-custom-acronym.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-custom-acronym.tex}}
-\file{sample-dot-abbr.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-dot-abbr.tex}}
-\file{sample-dual.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-dual.tex}}
-\file{sample-entrycount.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-entrycount.tex}}
-\file{sample-entryfmt.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-entryfmt.tex}}
-\file{sample-FnDesc.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-FnDesc.tex}}
-\file{sample-font-abbr.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-font-abbr.tex}}
-\file{sample-ignored.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-ignored.tex}}
-\file{sample-index.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-index.tex}}
-\file{sample-inline.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-inline.tex}}
-\file{sample-langdict.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-langdict.tex}}
-\file{sample-newkeys.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-newkeys.tex}}
-\file{sample-noidxapp-utf8.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-noidxapp-utf8.tex}}
-\file{sample-noidxapp.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-noidxapp.tex}}
-\file{sample-nomathhyper.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-nomathhyper.tex}}
-\file{sample-numberlist.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-numberlist.tex}}
-\file{sample-prefix.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-prefix.tex}}
-\file{sample-si.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-si.tex}}
-\file{sample-storage-abbr-desc.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-storage-abbr-desc.tex}}
-\file{sample-storage-abbr.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample-storage-abbr.tex}}
-\file{sample.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample.tex}}
-\file{sample4col.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sample4col.tex}}
-\file{sampleaccsupp.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleaccsupp.tex}}
-\file{sampleAcr.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleAcr.tex}}
-\file{sampleAcrDesc.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleAcrDesc.tex}}
-\file{sampleacronyms.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleacronyms.tex}}
-\file{sampleCustomAcr.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleCustomAcr.tex}}
-\file{sampleDB.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleDB.tex}}
-\file{sampleDesc.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleDesc.tex}}
-\file{sampleEq.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleEq.tex}}
-\file{sampleEqPg.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleEqPg.tex}}
-\file{sampleFnAcrDesc.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleFnAcrDesc.tex}}
-\file{sampleNtn.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleNtn.tex}}
-\file{samplePeople.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{samplePeople.tex}}
-\file{sampleSec.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleSec.tex}}
-\file{sampleSort.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleSort.tex}}
-\file{sampletree.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampletree.tex}}
-\file{sampleutf8.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{sampleutf8.tex}}
-\file{samplexdy.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{samplexdy.tex}}
-\file{samplexdy2.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{samplexdy2.tex}}
-\file{samplexdy3.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{samplexdy3.tex}}
-\file{mwe-acr-desc.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{mwe-acr-desc.tex}}
-\file{mwe-acr.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{mwe-acr.tex}}
-\file{mwe-gls.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{mwe-gls.tex}}
-\file{samplexdy-mc.xdy}{\nopreamble\nopostamble\from{glossaries.dtx}{samplexdy-mc.xdy}}
-\file{samplexdy-mc207.xdy}{\nopreamble\nopostamble\from{glossaries.dtx}{samplexdy-mc207.xdy}}
-\file{database1.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{database1.tex}}
-\file{database2.tex}{\nopreamble\nopostamble\from{glossaries.dtx}{database2.tex}}
\file{glossaries.perl}{\nopreamble\nopostamble\from{glossaries.dtx}{glossaries.perl}}
}
diff --git a/macros/latex/contrib/glossaries/glossariesbegin.html b/macros/latex/contrib/glossaries/glossariesbegin.html
index b45260805c..a3835bfd2e 100644
--- a/macros/latex/contrib/glossaries/glossariesbegin.html
+++ b/macros/latex/contrib/glossaries/glossariesbegin.html
@@ -109,7 +109,9 @@ td.td01{ padding-left:0pt; padding-right:5pt; }
td.td10{ padding-left:5pt; padding-right:0pt; }
td.td11{ padding-left:5pt; padding-right:5pt; }
table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
-.hline hr, .cline hr{ height : 1px; margin:0px; }
+.hline hr, .cline hr{ height : 0px; margin:0px; }
+.hline td, .cline td{ padding: 0; }
+.hline hr, .cline hr{border:none;border-top:1px solid black;}
.tabbing-right {text-align:right;}
span.TEX {letter-spacing: -0.125em; }
span.TEX span.E{ position:relative;top:0.5ex;left:-0.0417em;}
@@ -119,8 +121,9 @@ span.LATEX span.TEX{ position:relative; left: -0.4em; }
div.float, div.figure {margin-left: auto; margin-right: auto;}
div.float img {text-align:center;}
div.figure img {text-align:center;}
-.marginpar {width:20%; float:right; text-align:left; margin-left:auto; margin-top:0.5em; font-size:85%; text-decoration:underline;}
-.marginpar p{margin-top:0.4em; margin-bottom:0.4em;}
+.marginpar,.reversemarginpar {width:20%; float:right; text-align:left; margin-left:auto; margin-top:0.5em; font-size:85%; text-decoration:underline;}
+.marginpar p,.reversemarginpar p{margin-top:0.4em; margin-bottom:0.4em;}
+.reversemarginpar{float:left;}
table.equation {width:100%;}
.equation td{text-align:center; }
td.equation { margin-top:1em; margin-bottom:1em; }
@@ -173,7 +176,9 @@ td.td01{ padding-left:0pt; padding-right:5pt; }
td.td10{ padding-left:5pt; padding-right:0pt; }
td.td11{ padding-left:5pt; padding-right:5pt; }
table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
-.hline hr, .cline hr{ height : 1px; margin:0px; }
+.hline hr, .cline hr{ height : 0px; margin:0px; }
+.hline td, .cline td{ padding: 0; }
+.hline hr, .cline hr{border:none;border-top:1px solid black;}
div.array {text-align:center;}
.equation td{text-align:center; }
.equation-star td{text-align:center; }
@@ -190,6 +195,7 @@ table.gather {width:100%;}
div.gather-star {text-align:center;}
table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
div.longtable{text-align:center;}
+table.longtable{margin-left:auto; margin-right: auto;}
.supertabular {text-align:center}
div.important { border : solid red; }
div.verbatim { font-family: monospace; white-space: nowrap; text-align:left; clear:both; padding-top: 2ex; padding-bottom: 2ex;}
@@ -255,7 +261,7 @@ span#textcolor40{color:#00FF00}
>
The glossaries package v4.43: a guide for
+class="cmr-17">The glossaries package v4.44: a guide for
beginners
@@ -268,7 +274,7 @@ class="td11"> Nicola L.C. Talbot
2019-09-28
+class="cmr-12">2019-12-06
diff --git a/macros/latex/contrib/glossaries/glossariesbegin.pdf b/macros/latex/contrib/glossaries/glossariesbegin.pdf
index 0a03bf1c66..b541ca9147 100644
Binary files a/macros/latex/contrib/glossaries/glossariesbegin.pdf and b/macros/latex/contrib/glossaries/glossariesbegin.pdf differ
diff --git a/macros/latex/contrib/glossaries/glossariesbegin.tex b/macros/latex/contrib/glossaries/glossariesbegin.tex
index 50a0bfccd9..03ab7be4ab 100644
--- a/macros/latex/contrib/glossaries/glossariesbegin.tex
+++ b/macros/latex/contrib/glossaries/glossariesbegin.tex
@@ -31,10 +31,10 @@
\texorpdfstring{{\frenchspacing\obeyspaces\ttfamily#1}}{#1}}
\newcommand*{\file}[1]{\texorpdfstring{\texttt{#1}}{#1}}
-\title{The glossaries package v4.43:
+\title{The glossaries package v4.44:
a guide for beginners}
\author{Nicola L.C. Talbot}
-\date{2019-09-28}
+\date{2019-12-06}
\ifpdf
\externaldocument{glossaries-user}
diff --git a/macros/latex/contrib/glossaries/glossary2glossaries.html b/macros/latex/contrib/glossaries/glossary2glossaries.html
index bc00961cad..38391e1d5a 100644
--- a/macros/latex/contrib/glossaries/glossary2glossaries.html
+++ b/macros/latex/contrib/glossaries/glossary2glossaries.html
@@ -116,7 +116,9 @@ td.td01{ padding-left:0pt; padding-right:5pt; }
td.td10{ padding-left:5pt; padding-right:0pt; }
td.td11{ padding-left:5pt; padding-right:5pt; }
table[rules] {border-left:solid black 0.4pt; border-right:solid black 0.4pt; }
-.hline hr, .cline hr{ height : 1px; margin:0px; }
+.hline hr, .cline hr{ height : 0px; margin:0px; }
+.hline td, .cline td{ padding: 0; }
+.hline hr, .cline hr{border:none;border-top:1px solid black;}
.tabbing-right {text-align:right;}
span.TEX {letter-spacing: -0.125em; }
span.TEX span.E{ position:relative;top:0.5ex;left:-0.0417em;}
@@ -201,7 +203,7 @@ class="td11">Nicola L.C. Talbot
2019-09-28
+class="cmr-12">2019-12-06
diff --git a/macros/latex/contrib/glossaries/glossary2glossaries.pdf b/macros/latex/contrib/glossaries/glossary2glossaries.pdf
index 81d25e73d5..c3e3b4f504 100644
Binary files a/macros/latex/contrib/glossaries/glossary2glossaries.pdf and b/macros/latex/contrib/glossaries/glossary2glossaries.pdf differ
diff --git a/macros/latex/contrib/glossaries/glossary2glossaries.tex b/macros/latex/contrib/glossaries/glossary2glossaries.tex
index f49eb809de..9dc8492091 100644
--- a/macros/latex/contrib/glossaries/glossary2glossaries.tex
+++ b/macros/latex/contrib/glossaries/glossary2glossaries.tex
@@ -34,7 +34,7 @@
\title{Upgrading from the glossary package to the glossaries
package}
\author{Nicola L.C. Talbot}
-\date{2019-09-28}
+\date{2019-12-06}
\newenvironment{oldway}{%
\begin{labelledbox}{\styfmt{glossary}}\ttfamily\obeylines
diff --git a/macros/latex/contrib/glossaries/makeglossaries b/macros/latex/contrib/glossaries/makeglossaries
index 643e36b3c1..d42214c5ff 100755
--- a/macros/latex/contrib/glossaries/makeglossaries
+++ b/macros/latex/contrib/glossaries/makeglossaries
@@ -2,13 +2,13 @@
# File : makeglossaries
# Author : Nicola Talbot
-# Version : 4.41
+# Version : 4.44
# Description: simple Perl script that calls makeindex or xindy.
# Intended for use with "glossaries.sty" (saves having to remember
# all the various switches)
# This file is distributed as part of the glossaries LaTeX package.
-# Copyright 2007 Nicola L.C. Talbot
+# Copyright 2019 Nicola L.C. Talbot
# This work may be distributed and/or modified under the
# conditions of the LaTeX Project Public License, either version 1.3
# of this license or any later version.
@@ -31,9 +31,11 @@
# glossaries-babel.sty, glossaries-polyglossia.sty, glossaries.perl.
# Also makeglossaries and makeglossaries-lite.lua.
-my $version="4.41 (2018-07-23)";
+my $version="4.44 (2019-12-06)";
# History:
+# v4.43:
+# * No change.
# v4.41:
# * No change.
# v4.40:
diff --git a/macros/latex/contrib/glossaries/makeglossaries-lite.1 b/macros/latex/contrib/glossaries/makeglossaries-lite.1
index 6d4e3c1261..e94ad592da 100644
--- a/macros/latex/contrib/glossaries/makeglossaries-lite.1
+++ b/macros/latex/contrib/glossaries/makeglossaries-lite.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.12 (Pod::Simple 3.39)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "MAKEGLOSSARIES-LITE 1"
-.TH MAKEGLOSSARIES-LITE 1 "2019-09-28" "perl v5.28.1" "makeglossaries-lite Lua Script"
+.TH MAKEGLOSSARIES-LITE 1 "2019-12-06" "perl v5.30.1" "makeglossaries-lite Lua Script"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/macros/latex/contrib/glossaries/makeglossaries-lite.lua b/macros/latex/contrib/glossaries/makeglossaries-lite.lua
index f812edacee..22b1c75147 100755
--- a/macros/latex/contrib/glossaries/makeglossaries-lite.lua
+++ b/macros/latex/contrib/glossaries/makeglossaries-lite.lua
@@ -14,7 +14,7 @@
use the Perl makeglossaries script.
This file is distributed as part of the glossaries LaTeX package.
- Copyright 2015 Nicola L.C. Talbot
+ Copyright 2019 Nicola L.C. Talbot
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
of this license or any later version.
@@ -36,6 +36,8 @@
Also makeglossaries and makeglossaries-lite.lua.
History:
+ * 4.44:
+ - no change.
* 4.41:
- no change.
* 4.40:
@@ -64,7 +66,7 @@
- changed first line from lua to texlua
--]]
-thisversion = "4.41 (2018-07-23)"
+thisversion = "4.44 (2019-12-06)"
quiet = false
dryrun = false
diff --git a/macros/latex/contrib/glossaries/makeglossaries.1 b/macros/latex/contrib/glossaries/makeglossaries.1
index b2606ee432..c6f103fe49 100644
--- a/macros/latex/contrib/glossaries/makeglossaries.1
+++ b/macros/latex/contrib/glossaries/makeglossaries.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35)
+.\" Automatically generated by Pod::Man 4.12 (Pod::Simple 3.39)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "MAKEGLOSSARIES 1"
-.TH MAKEGLOSSARIES 1 "2019-09-28" "perl v5.28.1" "makeglossaries Perl Script"
+.TH MAKEGLOSSARIES 1 "2019-12-06" "perl v5.30.1" "makeglossaries Perl Script"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/macros/latex/contrib/glossaries/samples/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
index af2c27e7db..76744ff2da 100644
Binary files a/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf and b/macros/latex/contrib/glossaries/samples/glossary-lipsum-examples.pdf differ
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
index 613b44b89b..e81068446a 100644
Binary files a/macros/latex/contrib/glossaries/samples/minimalgls.pdf and b/macros/latex/contrib/glossaries/samples/minimalgls.pdf differ
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
index 2eef686216..06ebb2b46c 100644
Binary files a/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf and b/macros/latex/contrib/glossaries/samples/mwe-acr-desc.pdf differ
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
index dc4f70c518..02f3e50e86 100644
Binary files a/macros/latex/contrib/glossaries/samples/mwe-acr.pdf and b/macros/latex/contrib/glossaries/samples/mwe-acr.pdf differ
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
index 75781ecb5b..14208cc5da 100644
Binary files a/macros/latex/contrib/glossaries/samples/mwe-gls.pdf and b/macros/latex/contrib/glossaries/samples/mwe-gls.pdf differ
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
index e7b5016362..0ac18e640f 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf and b/macros/latex/contrib/glossaries/samples/sample-FnDesc.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf b/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf
index 5ae0a14a80..891ae8db65 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf and b/macros/latex/contrib/glossaries/samples/sample-chap-hyperfirst.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-crossref.pdf b/macros/latex/contrib/glossaries/samples/sample-crossref.pdf
index bd89fff0b2..7033120a7b 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-crossref.pdf and b/macros/latex/contrib/glossaries/samples/sample-crossref.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf b/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf
index 5ea60ec873..37de7552bb 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf and b/macros/latex/contrib/glossaries/samples/sample-custom-acronym.pdf differ
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
index 59e6a1b940..4722172d2c 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf and b/macros/latex/contrib/glossaries/samples/sample-dot-abbr.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-dual.pdf b/macros/latex/contrib/glossaries/samples/sample-dual.pdf
index b3948a464c..44eb610a1c 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-dual.pdf and b/macros/latex/contrib/glossaries/samples/sample-dual.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf b/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf
index 9b28627e43..c7e9ec1a23 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf and b/macros/latex/contrib/glossaries/samples/sample-entrycount.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf b/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf
index 64deb3490c..869b9204a5 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf and b/macros/latex/contrib/glossaries/samples/sample-entryfmt.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf b/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf
index 45e6dd0584..046347b87e 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf and b/macros/latex/contrib/glossaries/samples/sample-font-abbr.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-ignored.pdf b/macros/latex/contrib/glossaries/samples/sample-ignored.pdf
index 7185f4d455..2344c44f54 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-ignored.pdf and b/macros/latex/contrib/glossaries/samples/sample-ignored.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-index.pdf b/macros/latex/contrib/glossaries/samples/sample-index.pdf
index 18a83dfcd2..5baa6494f9 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-index.pdf and b/macros/latex/contrib/glossaries/samples/sample-index.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-inline.pdf b/macros/latex/contrib/glossaries/samples/sample-inline.pdf
index cadd7af539..df6e6f6556 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-inline.pdf and b/macros/latex/contrib/glossaries/samples/sample-inline.pdf differ
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
index 5d85d6c143..585c4a96ea 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-langdict.pdf and b/macros/latex/contrib/glossaries/samples/sample-langdict.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf b/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf
index a15f6e32c6..b9d3912b1b 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf and b/macros/latex/contrib/glossaries/samples/sample-newkeys.pdf differ
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
index 5cac8cf6e8..d94e24a152 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf and b/macros/latex/contrib/glossaries/samples/sample-noidxapp-utf8.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf b/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf
index 16c254d9ed..ed705c0fe4 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf and b/macros/latex/contrib/glossaries/samples/sample-noidxapp.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf b/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf
index 67fc47f4b0..0954a5014c 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf and b/macros/latex/contrib/glossaries/samples/sample-nomathhyper.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf b/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf
index 5b8fa5e678..9e46a428b6 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf and b/macros/latex/contrib/glossaries/samples/sample-numberlist.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-prefix.pdf b/macros/latex/contrib/glossaries/samples/sample-prefix.pdf
index 2fe7792920..881252f458 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-prefix.pdf and b/macros/latex/contrib/glossaries/samples/sample-prefix.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-si.pdf b/macros/latex/contrib/glossaries/samples/sample-si.pdf
index af7aa9f693..c2aef74cde 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-si.pdf and b/macros/latex/contrib/glossaries/samples/sample-si.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf b/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf
index 2da749d357..3b517bf24f 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf and b/macros/latex/contrib/glossaries/samples/sample-storage-abbr-desc.pdf differ
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
index c547306b25..d8115a22da 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf and b/macros/latex/contrib/glossaries/samples/sample-storage-abbr.pdf differ
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
index f5736bbae1..2bf39bd56e 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample.pdf and b/macros/latex/contrib/glossaries/samples/sample.pdf differ
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
index 9942f1b6af..a9e88dfadf 100644
Binary files a/macros/latex/contrib/glossaries/samples/sample4col.pdf and b/macros/latex/contrib/glossaries/samples/sample4col.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleAcr.pdf b/macros/latex/contrib/glossaries/samples/sampleAcr.pdf
index 8c346877a0..cef9f80d86 100644
Binary files a/macros/latex/contrib/glossaries/samples/sampleAcr.pdf and b/macros/latex/contrib/glossaries/samples/sampleAcr.pdf differ
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
index bd045debe9..96222c6f12 100644
Binary files a/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf and b/macros/latex/contrib/glossaries/samples/sampleAcrDesc.pdf differ
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
index f3a6c9f22f..a7d8af989a 100644
Binary files a/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf and b/macros/latex/contrib/glossaries/samples/sampleCustomAcr.pdf differ
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
index 44217f42b9..9a06139e72 100644
Binary files a/macros/latex/contrib/glossaries/samples/sampleDB.pdf and b/macros/latex/contrib/glossaries/samples/sampleDB.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleDesc.pdf b/macros/latex/contrib/glossaries/samples/sampleDesc.pdf
index 788bb043e6..9eb6db4814 100644
Binary files a/macros/latex/contrib/glossaries/samples/sampleDesc.pdf and b/macros/latex/contrib/glossaries/samples/sampleDesc.pdf differ
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
index e8c8bbdfab..ebcb74a296 100644
Binary files a/macros/latex/contrib/glossaries/samples/sampleEq.pdf and b/macros/latex/contrib/glossaries/samples/sampleEq.pdf differ
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
index d8f45efa45..1285f4cc16 100644
Binary files a/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf and b/macros/latex/contrib/glossaries/samples/sampleEqPg.pdf differ
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
index c29aff931f..e654508453 100644
Binary files a/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf and b/macros/latex/contrib/glossaries/samples/sampleFnAcrDesc.pdf differ
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
index c0ff5ea069..3db806aea9 100644
Binary files a/macros/latex/contrib/glossaries/samples/sampleNtn.pdf and b/macros/latex/contrib/glossaries/samples/sampleNtn.pdf differ
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
index d5c7d3a3fc..bdd7bb5d2a 100644
Binary files a/macros/latex/contrib/glossaries/samples/samplePeople.pdf and b/macros/latex/contrib/glossaries/samples/samplePeople.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleSec.pdf b/macros/latex/contrib/glossaries/samples/sampleSec.pdf
index 10f71ff8bc..219ec0f535 100644
Binary files a/macros/latex/contrib/glossaries/samples/sampleSec.pdf and b/macros/latex/contrib/glossaries/samples/sampleSec.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleSort.pdf b/macros/latex/contrib/glossaries/samples/sampleSort.pdf
index 4b3be13c50..d771b7d591 100644
Binary files a/macros/latex/contrib/glossaries/samples/sampleSort.pdf and b/macros/latex/contrib/glossaries/samples/sampleSort.pdf differ
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
index b4b75549e1..185bfcd745 100644
Binary files a/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf and b/macros/latex/contrib/glossaries/samples/sampleaccsupp.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf b/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf
index c89060bb16..15a119ffc2 100644
Binary files a/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf and b/macros/latex/contrib/glossaries/samples/sampleacronyms.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sampletree.pdf b/macros/latex/contrib/glossaries/samples/sampletree.pdf
index fe99e848e0..1d1e1dcc2e 100644
Binary files a/macros/latex/contrib/glossaries/samples/sampletree.pdf and b/macros/latex/contrib/glossaries/samples/sampletree.pdf differ
diff --git a/macros/latex/contrib/glossaries/samples/sampleutf8.pdf b/macros/latex/contrib/glossaries/samples/sampleutf8.pdf
index 888b1a9928..93e155d97f 100644
Binary files a/macros/latex/contrib/glossaries/samples/sampleutf8.pdf and b/macros/latex/contrib/glossaries/samples/sampleutf8.pdf differ
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
index 93a35e09cc..8db6ac5ddf 100644
Binary files a/macros/latex/contrib/glossaries/samples/samplexdy.pdf and b/macros/latex/contrib/glossaries/samples/samplexdy.pdf differ
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
index 7519f29bae..de19ce8acb 100644
Binary files a/macros/latex/contrib/glossaries/samples/samplexdy2.pdf and b/macros/latex/contrib/glossaries/samples/samplexdy2.pdf differ
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
index 323bc80c80..b715c047b4 100644
Binary files a/macros/latex/contrib/glossaries/samples/samplexdy3.pdf and b/macros/latex/contrib/glossaries/samples/samplexdy3.pdf differ
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}}}
--
cgit v1.2.3