summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/doc/latex/glossaries/samples
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-04-04 23:19:17 +0000
committerKarl Berry <karl@freefriends.org>2011-04-04 23:19:17 +0000
commitd49526563e8a66d6774a086ad2a91fbf249b35b3 (patch)
treeaecb9254e4f4db280b2f7ab8a9dc9f154fa08dd7 /Master/texmf-dist/doc/latex/glossaries/samples
parentaeb22f958bf3b465bb5e3f085176c7fe0f2ef562 (diff)
glossaries 3.0 (4apr11)
git-svn-id: svn://tug.org/texlive/trunk@21968 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc/latex/glossaries/samples')
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/database2.tex2
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdfbin0 -> 37449 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex2
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdfbin0 -> 58460 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex31
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdfbin0 -> 82678 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex11
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdfbin0 -> 38192 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex29
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample.pdfbin0 -> 116456 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample.tex42
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdfbin0 -> 45565 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex1
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdfbin0 -> 79256 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex50
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdfbin0 -> 74238 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex24
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdfbin0 -> 51086 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex1
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdfbin0 -> 55522 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex3
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdfbin0 -> 168163 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex3
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdfbin0 -> 202690 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex2
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdfbin0 -> 109487 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex3
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdfbin0 -> 75689 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex1
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdfbin0 -> 48285 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex10
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdfbin0 -> 67704 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex1
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdfbin0 -> 74333 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex1
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdfbin0 -> 47388 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex1
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdfbin0 -> 175034 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.tex232
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-mc.xdy423
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-mc207.xdy591
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdfbin0 -> 191487 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex34
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdfbin0 -> 74992 bytes
-rw-r--r--Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex66
45 files changed, 1428 insertions, 136 deletions
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/database2.tex b/Master/texmf-dist/doc/latex/glossaries/samples/database2.tex
index 1fb3042e36b..55bc08a1c47 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/database2.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/database2.tex
@@ -14,7 +14,7 @@ description={the ``at'' symbol}}
\newglossaryentry{excl}{name={!},
description={the exclamation mark symbol}}
-\newglossaryentry{bar}{name={$|$},
+\newglossaryentry{bar}{name={\ensuremath{|}},
description={the vertical bar symbol}}
\newglossaryentry{hash}{name={\#},
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf
new file mode 100644
index 00000000000..cf3b7b30f64
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex
index db5a04d7f77..d2e575aaec8 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.tex
@@ -1,3 +1,5 @@
+ % This file is public domain.
+ %
% 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
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf
new file mode 100644
index 00000000000..85a7fb542f6
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex
new file mode 100644
index 00000000000..1dbf3154bfa
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.tex
@@ -0,0 +1,31 @@
+\documentclass{article}
+
+\usepackage[colorlinks]{hyperref}
+\usepackage[sanitize={description=false}]{glossaries}
+
+\makeglossaries
+
+\renewcommand{\glsseeitemformat}[1]{\textsc{\glsentryname{#1}}}
+
+\newglossaryentry{pear}{name=pear,
+description={an oddly shaped fruit}}
+
+\newglossaryentry{apple}{name=apple,
+description={firm, round fruit},
+see=[see also]{pear}}
+
+\newglossaryentry{banana}{name=banana,
+description={a yellow fruit with an even odder shape than
+a \protect\gls{pear}}}
+
+\newglossaryentry{fruit}{name=fruit,
+description={sweet, fleshy product of plant containing seed}}
+
+\glssee{fruit}{pear,apple,banana}
+
+\begin{document}
+\gls{pear}, \gls{apple} and \gls{banana}.
+
+\printglossaries
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf
new file mode 100644
index 00000000000..57008b6f803
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex
index bd63d817500..a0de228a23f 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.tex
@@ -1,3 +1,4 @@
+ % This file is public domain
\documentclass{report}
\usepackage[colorlinks]{hyperref}
@@ -38,14 +39,14 @@
% ##3 corresponds to the 'symbol' key
% ##4 is the inserted text given by the final optional argument to
% commands like \gls
- % The short form can be obtained via \glsentryuseri{\glslabel}
+ % The short form can be obtained via \glsentryshort{\glslabel}
% The plural short form can be obtained via
- % \glsentryuserii{\glslabel}
- % The long form can be obtained via \glsentryuseriii{\glslabel}
+ % \glsentryshortplural{\glslabel}
+ % The long form can be obtained via \glsentrylong{\glslabel}
% The plural long form can be obtained via
- % \glsentryuseriv{\glslabel}
+ % \glsentrylongplural{\glslabel}
\defglsdisplayfirst[#1]{##1##4\protect\footnote{%
- \glsentryuseriii{\glslabel}: ##2}}%
+ \glsentrylong{\glslabel}: ##2}}%
% ##1 corresponds to the 'text' key
% the rest as above
\defglsdisplay[#1]{##1##4}%
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf
new file mode 100644
index 00000000000..408f4315c72
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex
new file mode 100644
index 00000000000..0da681150ed
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.tex
@@ -0,0 +1,29 @@
+ % This file is public domain
+\documentclass{article}
+
+\usepackage[acronym]{glossaries}
+
+ % \newdualentry[main options]{label}{short}{long}{description}
+
+\newcommand*{\newdualentry}[5][]{%
+ \newglossaryentry{main-#2}{name={#4},%
+ text={#3\protect\glsadd{#2}},%
+ description={#5},%
+ #1
+ }%
+ \newacronym{#2}{#3\protect\glsadd{main-#2}}{#4}
+}
+
+\newdualentry{svm}% label
+ {SVM}% abbreviation
+ {support vector machine}% long form
+ {Statistical pattern recognition technique}% description
+
+\makeglossaries
+
+\begin{document}
+
+\gls{svm}.
+
+\printglossaries
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf
new file mode 100644
index 00000000000..82cc6a96a6a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex
index bfea39f9672..86b299ab7a4 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample.tex
@@ -1,27 +1,28 @@
+ % This file is public domain
\documentclass[a4paper]{report}
\usepackage[plainpages=false,colorlinks]{hyperref}
-\usepackage[toc,style=treenoname,order=word,acronym]{glossaries}
+\usepackage[toc,style=treenoname,order=word,subentrycounter]{glossaries}
\makeglossaries
+\newglossaryentry{Perl}{name=\texttt{Perl},
+sort=Perl, % need a sort key because name contains a command
+description=A scripting language}
+
\newglossaryentry{glossary}{name=glossary,
description={\nopostdesc},
plural={glossaries}}
-\newglossaryentry{glossarylist}{
-description={1) list of technical words},
-sort={1},
-parent={glossary}}
-
\newglossaryentry{glossarycol}{
-description={2) collection of glosses},
+description={collection of glosses},
sort={2},
parent={glossary}}
-\newglossaryentry{Perl}{name=\texttt{Perl},
-sort=Perl, % need a sort key because name contains a command
-description=A scripting language}
+\newglossaryentry{glossarylist}{
+description={list of technical words},
+sort={1},
+parent={glossary}}
\newglossaryentry{pagelist}{name=page list,
% description value has to be enclosed in braces
@@ -54,12 +55,12 @@ female of any bovine animal}}
\newglossaryentry{bravo}{name={bravo},
description={\nopostdesc}}
-\newglossaryentry{bravo1}{description={1) cry of approval (pl.\ bravos)},
+\newglossaryentry{bravo1}{description={cry of approval (pl.\ bravos)},
sort={1},
plural={bravos},
parent=bravo}
-\newglossaryentry{bravo2}{description={2) hired ruffian or killer (pl.\ bravoes)},
+\newglossaryentry{bravo2}{description={hired ruffian or killer (pl.\ bravoes)},
sort={2},
plural={bravoes},
parent=bravo}
@@ -83,11 +84,11 @@ description={large seal}}
\chapter{Introduction}
\pagenumbering{arabic}
-A \gls{glossarylist} is a very useful addition to any
-technical document, although a \gls{glossarycol} can
-also simply be a collection of glosses, which is
-another thing entirely. Some documents have
-multiple \glspl{glossarylist}.
+A \gls{glossarylist} (definition~\glsrefentry{glossarylist}) is a
+very useful addition to any technical document, although a
+\gls{glossarycol} (definition~\glsrefentry{glossarycol}) can also
+simply be a collection of glosses, which is another thing entirely.
+Some documents have multiple \glspl{glossarylist}.
Once you have run your document through \LaTeX, you
will then need to run the \texttt{.glo} file through
@@ -115,9 +116,10 @@ explicitly specify the alternative form using \verb|\glslink|.
\Glspl{seal} and \glspl{sealion} have regular plural forms.
\Gls{bravo} is a homograph, but the plural forms are spelt
-differently. The plural of \gls{bravo1}, a cry of approval,
-is \glspl{bravo1}, whereas the plural of \gls{bravo2}, a hired
-ruffian or killer, is \glspl{bravo2}.
+differently. The plural of \gls{bravo1}, a cry of approval
+(definition~\glsrefentry{bravo1}), is \glspl{bravo1}, whereas the
+plural of \gls{bravo2}, a hired ruffian or killer
+(definition~\glsrefentry{bravo2}), is \glspl{bravo2}.
\Glspl{par} can cause a problem in commands, so care is needed
when having a paragraph break in a \gls{glossarylist} entry.
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf
new file mode 100644
index 00000000000..5f6a43ba02c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex
index 8467841b6e3..846a5056571 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.tex
@@ -1,3 +1,4 @@
+ % This file is public domain
\documentclass[a4paper]{article}
\usepackage[style=long4colheaderborder]{glossaries}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf
new file mode 100644
index 00000000000..c7a5f27ad9b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex
index 3addc9d8a47..9dcd5f69e84 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.tex
@@ -1,7 +1,11 @@
+ % This file is public domain
\documentclass[a4paper]{report}
\usepackage[colorlinks,plainpages=false]{hyperref}
-\usepackage[style=long,toc]{glossaries}
+\usepackage[style=long,% use 'long' style for the glossary
+ toc,% add glossary to table of contents
+ smallcaps% Use small caps for acronyms
+ ]{glossaries}
\makeglossaries
@@ -19,29 +23,59 @@
\chapter{Support Vector Machines}
\Glspl{svm} are used widely in the area of pattern recognition.
+Subsequent use: \gls{svm}.
-This is the text produced without a link: \glsentrytext{svm}.
-This is the text produced on first use without a link:
-\glsentryfirst{svm}. This is the entry's description without
-a link: \glsentrydesc{svm}.
+Short version: \acrshort{svm}. Long version: \acrlong{svm}. Full
+version: \acrfull{svm}. Description: \glsentrydesc{svm}.
This is the entry in uppercase: \GLS{svm}.
\chapter{Kernel Support Vector Machines}
The \gls{ksvm} is \ifglsused{svm}{an}{a} \gls{svm} that uses
-the so called ``kernel trick''. Plural: \glspl{ksvm}.
+the so called ``kernel trick''. Plural: \glspl{ksvm}. Resetting
+acronyms.
\glsresetall
Possessive: \gls{ksvm}['s].
Make the glossary entry number bold for this
-one \gls[format=hyperbf]{svm}.
+one \gls[format=hyperbf]{ksvm}.
+
+\chapter{Short, Long and Full Forms}
+
+These commands don't affect the first use flag:
+
+\begin{center}
+\begin{tabular}{lll}
+ & Unstarred & Starred\\
+acrshort & \acrshort{svm} & \acrshort*{svm}\\
+Acrshort & \Acrshort{svm} & \Acrshort*{svm}\\
+ACRshort & \ACRshort{svm} & \ACRshort*{svm}\\
+acrlong & \acrlong{svm} & \acrlong*{svm}\\
+Acrlong & \Acrlong{svm} & \Acrlong*{svm}\\
+ACRlong & \ACRlong{svm} & \ACRlong*{svm}\\
+acrfull & \acrfull{svm} & \acrfull*{svm}\\
+Acrfull & \Acrfull{svm} & \Acrfull*{svm}\\
+ACRfull & \ACRfull{svm} & \ACRfull*{svm}\\
+\\
+& Insert Unstarred & Insert Starred\\
+acrshort & \acrshort{svm}['s] & \acrshort*{svm}['s]\\
+Acrshort & \Acrshort{svm}['s] & \Acrshort*{svm}['s]\\
+ACRshort & \ACRshort{svm}['s] & \ACRshort*{svm}['s]\\
+acrlong & \acrlong{svm}['s] & \acrlong*{svm}['s]\\
+Acrlong & \Acrlong{svm}['s] & \Acrlong*{svm}['s]\\
+ACRlong & \ACRlong{svm}['s] & \ACRlong*{svm}['s]\\
+acrfull & \acrfull{svm}['s] & \acrfull*{svm}['s]\\
+Acrfull & \Acrfull{svm}['s] & \Acrfull*{svm}['s]\\
+ACRfull & \ACRfull{svm}['s] & \ACRfull*{svm}['s]
+\end{tabular}
+\end{center}
\chapter{Another chapter}
You don't need to worry about makeindex's special characters:
\gls{rna}.
-\printglossary[title={Acronyms}]
+\printglossary[title={List of Acronyms}]
\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf
new file mode 100644
index 00000000000..858149b703c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex
index 3ff8cd0ad83..e57550ce872 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.tex
@@ -1,23 +1,33 @@
+ % This file is public domain
\documentclass[a4paper]{report}
\usepackage[colorlinks,plainpages=false]{hyperref}
-\usepackage[style=altlist, % use altlist style
+\usepackage[acronym,% create 'acronym' glossary type
+ nomain,% 'main' glossary not needed as using 'acronym'
+ style=altlist, % use altlist style
toc, % add the glossary to the table of contents
sanitize={description=false},% want to use description in main document
+ smallcaps,%
description% acronyms have a user-supplied description
]{glossaries}
\makeglossaries
+\renewcommand*{\glsseeitemformat}[1]{\acronymfont{\glsentrytext{#1}}}
+
+\renewcommand*{\acrnameformat}[2]{\acronymfont{#1} (#2)}
+
+
+\renewcommand*{\glsnamefont}[1]{\textmd{#1}}
+
\newacronym[description={Statistical pattern recognition
technique~\protect\cite{svm}}, % acronym's description
-name={Support vector machine (svm)}% change the default way of displaying the entry name in the list of acronyms
]{svm}{svm}{support vector machine}
\newacronym[description={Statistical pattern recognition technique
-using the ``kernel trick'' (see also \glshyperlink[SVM]{svm})},% acronym's description
-name={Kernel support vector machine (ksvm)}% change the default way of displaying the entry name in the list of acronyms
+using the ``kernel trick''},% acronym's description
+see={[see also]{svm}},
]{ksvm}{ksvm}{kernel
support vector machine}
@@ -30,10 +40,8 @@ The \gls{svm} is used widely in the area of pattern recognition.
% plural form with initial letter in uppercase:
\Glspl{svm} are \ldots
-This is the text produced without a link: \glsentrytext{svm}.
-This is the text produced on first use without a link:
-\glsentryfirst{svm}. This is the entry's description without
-a link: \glsentrydesc{svm}.
+Short version: \acrshort{svm}. Long version: \acrlong{svm}. Full
+version: \acrfull{svm}. Description: \glsentrydesc{svm}.
This is the entry in uppercase: \GLS{svm}.
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf
new file mode 100644
index 00000000000..82e40cd570c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex
index 651e4694551..a19501afad7 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.tex
@@ -1,3 +1,4 @@
+ % This file is public domain
\documentclass{article}
\usepackage[colorlinks,plainpages=false]{hyperref}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf
new file mode 100644
index 00000000000..9327d851c54
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex
index 8802d88d1b9..c1a3aadc015 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.tex
@@ -1,3 +1,6 @@
+ % This file is public domain
+ %
+ % See also sampleAcrDesc.tex
\documentclass[a4paper]{report}
\usepackage[colorlinks,plainpages=false]{hyperref}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf
new file mode 100644
index 00000000000..02e0d7db571
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex
index d7f43bc7952..53b84ddc551 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.tex
@@ -1,3 +1,4 @@
+ % This file is public domain
\documentclass[a4paper,12pt]{report}
\usepackage{amsmath}
@@ -12,7 +13,7 @@
% redefine the way hyperref creates the target for equations
% so that the glossary links to equation numbers work
-\renewcommand*\theHequation{\thechapter.\arabic{equation}}
+ \renewcommand*\theHequation{\theHchapter.\arabic{equation}}
% Change the glossary headings
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf
new file mode 100644
index 00000000000..73eb8983d61
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex
index c29175f5416..63af21a2bc9 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.tex
@@ -1,3 +1,5 @@
+ % This file is public domain
+ %
% To ensure that the page numbers are up-to-date:
%
% latex sampleEqPg
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf
new file mode 100644
index 00000000000..7fe700a622d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex
index 9901c7ab61d..cd682b4e230 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.tex
@@ -1,8 +1,9 @@
+ % This file is public domain
\documentclass{report}
\usepackage[plainpages=false,colorlinks]{hyperref}
\usepackage{html}
-\usepackage[toc]{glossaries}
+\usepackage[toc,savewrites,xindy]{glossaries}
% Define a new glossary type called notation
\newglossary[nlg]{notation}{not}{ntn}{Notation}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf
new file mode 100644
index 00000000000..fb906f8b3da
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex
index ccefe8c19e1..e6d5a11cce0 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.tex
@@ -1,3 +1,4 @@
+ % This file is public domain
\documentclass{report}
\usepackage[plainpages=false,colorlinks]{hyperref}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf
new file mode 100644
index 00000000000..33d606336b2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex
index 0ebf51dbe5a..b22b08fbe5d 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.tex
@@ -1,3 +1,4 @@
+ % This file is public domain
\documentclass{article}
\usepackage[acronym,smallcaps]{glossaries-accsupp}
@@ -6,7 +7,7 @@
\newglossaryentry{dr}{name=Dr,description={Doctor},access={Doctor}}
-\newacronym[\glsshortaccesskey=S V M]{svm}{svm}{support vector machine}
+\newacronym[shortaccess=S V M]{svm}{svm}{support vector machine}
\newacronym{eg}{e.g.}{for example}
@@ -14,9 +15,12 @@
\gls{dr}~Jones.
\gls{dr}~Jones.
-\Gls{eg}, \gls{eg}
+\Gls{eg}, \gls{eg}, \acrshort{eg}, \acrlong{eg}, \acrfull{eg}.
-\gls{svm}. \gls{svm}.
+\Acrshort{eg}, \ACRshort{eg}. \Acrlong{eg}, \ACRlong{eg}.
+\Acrfull{eg}, \ACRfull{eg}.
+
+\gls{svm}. \gls{svm}, \acrshort{svm}, \acrlong{svm}, \acrfull{svm}.
\printglossaries
\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf
new file mode 100644
index 00000000000..145ebedbf99
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex
index bd6219b8519..fd7099e1dbf 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.tex
@@ -1,3 +1,4 @@
+ % This file is public domain
\documentclass{article}
\usepackage[acronym,footnote,acronymlists={main,acronym2}]{glossaries}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf
new file mode 100644
index 00000000000..2906295efc4
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex
index 529e19baa42..98d667d7ca9 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.tex
@@ -1,3 +1,4 @@
+ % This file is public domain
\documentclass{report}
\usepackage[colorlinks]{hyperref}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf
new file mode 100644
index 00000000000..af383ebc00b
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex
index 7f885e678b2..e249fee0214 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.tex
@@ -1,3 +1,4 @@
+ % This file is public domain
\documentclass{article}
\usepackage[utf8]{inputenc}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf
new file mode 100644
index 00000000000..bd668751104
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.tex b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.tex
new file mode 100644
index 00000000000..de97247c19f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.tex
@@ -0,0 +1,232 @@
+ % This file is public domain.
+ %
+ % This is a sample document illustrating how to use the
+ % glossaries package with xindy using the compatibility option.
+ % To create the document:
+ %
+ % latex samplexdy-compatible207
+ % makeglossaries samplexdy-compatible207
+ % latex samplexdy-compatible207
+ %
+ % If you don't have Perl installed, then use one of the
+ % following instead of makeglossaries:
+ %
+ % If you want to have a separate "Mc" letter group do:
+ %
+ % xindy -I xindy -M samplexdy-mc207 -t samplexdy-compatible207.glg -o samplexdy-compatible207.gls samplexdy-compatible207.glo
+ %
+ % Otherwise do:
+ %
+ % xindy -L english -C utf8 -I xindy -M samplexdy-compatible207 -t samplexdy-compatible207.glg -o samplexdy-compatible207.gls samplexdy-compatible207.glo
+ %
+\documentclass{article}
+
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage{fmtcount}
+
+ % remove redefinition of \thepage below if you want to uncomment
+ % the following line:
+ % \usepackage[colorlinks]{hyperref}
+
+\usepackage[xindy,compatible-2.07,style=altlistgroup]{glossaries}
+
+ % Define a new command to do bold italic (it uses \hyperbf
+ % rather than \textbf in case I later introduce hyperlinks
+ % - although I would have to remove the fancy page numbering
+ % if I wanted to do that):
+
+\newcommand*{\hyperbfit}[1]{\textit{\hyperbf{#1}}}
+
+ % Need to add this to the list of attributes in order
+ % to use it with xindy:
+ % (This command will have no effect if \noist is used)
+
+\GlsAddXdyAttribute{hyperbfit}
+
+ % Redefine the page numbers so that they appear as a word:
+
+ \renewcommand*{\thepage}{\Numberstring{page}}
+
+ % Need to add this to the list of location styles.
+ % \Numberstring{page} gets expanded to
+ % \protect \Numberstringnum {<n>} (where <n> is the page number)
+ % so need to define the location in that format:
+ % (This command will have no effect if \noist is used)
+
+\GlsAddXdyLocation{Numberstring}{:sep "\string\protect\space
+ \string\Numberstringnum\space\glsopenbrace"
+ "arabic-numbers" :sep "\glsclosebrace"}
+
+ % To have Mc as a separate group uncomment the following three
+ % lines:
+
+ \setStyleFile{samplexdy-mc207} % note no extension
+ \noist
+ \GlsSetXdyLanguage{}
+
+ % The above three lines specify to use samplexdy-mc.xdy (supplied
+ % with this file) and don't overwrite it. The language is
+ % unset using \GlsSetXdyLanguage{} as all the language
+ % dependent information is contained in samplexdy-mc.xdy
+ % Note that using \noist means that commands like
+ % \GlsAddXdyAttribute and \GlsAddXdyLocation will no longer have
+ % an effect.
+
+ % Write the style file (if \noist isn't used)
+ % and activate glossary entries
+
+\makeglossaries
+
+ % Define glossary entries
+ % \glshyperlink is used instead of \gls to prevent the glossary
+ % page numbers also appear in the locations, however I need
+ % to ensure that the referenced entries are added to the
+ % glossary via commands that use \glslink, \glsadd or \glssee
+
+\newglossaryentry{mcadam}{name={McAdam, John Loudon},
+first={John Loudon McAdam},text={McAdam},
+description={Scottish engineer}}
+
+\newglossaryentry{maclaurin}{name={Maclaurin, Colin},
+first={Colin Maclaurin},text={Maclaurin},
+description={Scottish mathematician best known for the
+\gls{maclaurinseries}}}
+
+\newglossaryentry{maclaurinseries}{name={Maclaurin series},
+description={Series expansion},see={taylorstheorem}}
+
+\newglossaryentry{taylorstheorem}{name={Taylor's theorem},
+description={Theorem expressing a function $f(x)$ as the sum of
+a polynomial and a remainder:
+\[f(x) = f(a)+f'(a)(x-a)+f''(a)(x-a^2)/2!+\cdots+R_n\]
+If $n\to\infty$ the expansion is a \glshyperlink{taylorseries}
+and if $a=0$, the series is called a
+\gls{maclaurinseries}}}
+
+\newglossaryentry{taylorseries}{name={Taylor series},
+description={Series expansion},see={taylorstheorem}}
+
+\newglossaryentry{taylor}{name={Taylor, Brook},
+first={Brook Taylor},text={Taylor},
+description={English mathematician}}
+
+\newglossaryentry{mcnemar}{name={McNemar, Quinn},
+first={Quinn McNemar},text={McNemar},
+description={Mathematician who introduced
+\gls{mcnemarstest}. This entry has the number list
+suppressed},nonumberlist}
+
+\newglossaryentry{mcnemarstest}{name={McNemar's test},
+description={A nonparametric test introduced by
+\gls{mcnemar} in 1947}}
+
+\newglossaryentry{mach}{name={Mach, Ernst},
+first={Ernst Mach},text={Mach},
+ % if using samplexdy-mc.xdy, the following line is needed
+ % to prevent this entry being put in the "Mc" group
+sort={mach, Ernst},
+description={Czech/Austrian physicist and philosopher}}
+
+\newglossaryentry{machnumber}{name={Mach number},
+ % if using samplexdy-mc.xdy, the following line is needed
+ % to prevent this entry being put in the "Mc" group
+sort={mach number},
+description={Ratio of the speed of a body in a fluid to the
+speed of sound in that fluid named after \gls{mach}}}
+
+\newglossaryentry{malthus}{name={Malthus, Thomas Robert},
+first={Thomas Robert Malthus},text={Malthus},
+description={English mathematician, sociologist and classicist}}
+
+\newglossaryentry{ampereandre}{name={Ampère, André-Marie},
+first={André-Marie Ampère},text={Ampère},
+description={French mathematician and physicist}}
+
+\newglossaryentry{ampere}{name={ampere},
+description={SI unit of electric current named after
+\gls{ampereandre}}}
+
+\newglossaryentry{archimedes}{name={Archimedes of Syracuse},
+first={Archimedes of Syracuse},text={Archimedes},
+description={Greek mathematician}}
+
+\newglossaryentry{archimedesprinciple}{name={Archemedes' principle},
+description={Principle that if a body is submerged in a fluid
+it experiences upthrust equal to the weight of the displaced
+fluid. Named after \gls{archimedes}}}
+
+\newglossaryentry{galton}{name={Galton, Sir Francis},
+first={Sir Francis Galton},text={Galton},
+description={English anthropologist}}
+
+\newglossaryentry{gauss}{name={Gauss, Karl Friedrich},
+first={Karl Friedrich Gauss},text={Gauss},
+description={German mathematician}}
+
+\newglossaryentry{gaussianint}{name={Gaussian integer},
+description={Complex number where both real and imaginary
+parts are integers}}
+
+\newglossaryentry{peano}{name={Peano, Giuseppe},
+first={Giuseppe Peano},text={Peano},
+description={Italian mathematician}}
+
+\newglossaryentry{peanoscurve}{name={Peano's curve},
+description={A space-filling curve discovered by
+\gls{peano}}}
+
+\newglossaryentry{pearson}{name={Pearson, Karl},
+first={Karl Pearson},text={Pearson},
+description={English mathematician}}
+
+\newglossaryentry{pearspmcc}{name={Pearson's product moment
+correlation coefficient},description={Product moment correlation
+coefficient named after \gls{pearson}}}
+
+\begin{document}
+\title{Sample Document Using the Glossaries Package With Xindy}
+\author{Nicola Talbot}
+\maketitle
+
+\section{\glsentryfirst{gauss}}
+
+This is a section on \gls[format=(]{gauss}. This section spans
+several pages.
+
+\newpage
+
+This page talks about \glspl[format=hyperbfit]{gaussianint}. Since
+it's the principle definition, the user-defined hyperbfit format is
+used.
+
+\newpage
+
+The section on \gls[format=)]{gauss} ends here.
+
+\section{Series Expansions}
+
+This section is about series expansions. It mentions
+\gls{maclaurin} and \gls{taylor}. It also discusses
+\gls{taylorstheorem} which is related to the \gls{taylorseries}.
+The \gls{maclaurinseries} is a special case of the
+\gls{taylorseries}.
+
+\section{\glsentryname{archimedesprinciple}}
+
+This section discusses \gls{archimedesprinciple} which was
+introduced by \gls{archimedes}.
+
+\section{Another section}
+
+This section covers \gls{mach} who introduced the \gls{machnumber}.
+It also mentions \gls{ampereandre} after whom the
+SI unit \gls{ampere} is named. It then discusses \gls{galton}
+and \gls{malthus}. Finally it mentions \gls{mcadam}.
+
+\newpage
+This page discusses \gls{mcnemar} who introduced
+\gls{mcnemarstest} and \gls{peano} who discovered \gls{peanoscurve}.
+
+\printglossaries
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-mc.xdy b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-mc.xdy
index 7c8d2b9e484..22f392f9aa9 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-mc.xdy
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-mc.xdy
@@ -414,53 +414,286 @@
; 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"
- "hyperbfit")))
+ "pagehyperemph")))
; user defined alphabets
; location class definitions
(define-location-class "roman-page-numbers"
- ("roman-numbers-lowercase"))
+ ( :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"
- ("roman-numbers-uppercase"))
+ ( :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"
- ("arabic-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"
- ("alpha"))
+ ( :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"
- ("ALPHA"))
+ ( :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"
- ("ALPHA" :sep "." "arabic-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"
- ("arabic-numbers" :sep "." "arabic-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 "\protect \Numberstringnum {" "arabic-numbers" :sep "}"))
+ (:sep "{}{" :sep "\protect \Numberstringnum {" "arabic-numbers" :sep "}" :sep "}"))
; define cross-reference class
@@ -482,11 +715,35 @@
; 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
+\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 "~n" :depth 0)
+(markup-indexentry :open "\relax\glsresetentrylist~n")
(markup-locclass-list :open "{\glossaryentrynumbers{\relax "
:sep ", " :close "}}")
(markup-locref-list :sep "\delimN ")
@@ -494,75 +751,75 @@
; 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")
+(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
@@ -573,10 +830,14 @@
(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))
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-mc207.xdy b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-mc207.xdy
new file mode 100644
index 00000000000..7c8d2b9e484
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-mc207.xdy
@@ -0,0 +1,591 @@
+;; 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"))
+
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf
new file mode 100644
index 00000000000..518290e3a2f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex
index 548c8021198..faa5efb4ace 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex
@@ -1,3 +1,5 @@
+ % This file is public domain.
+ %
% This is a sample document illustrating how to use the
% glossaries package with xindy. To create the document:
%
@@ -22,16 +24,10 @@
\usepackage[T1]{fontenc}
\usepackage{fmtcount}
- % remove redefinition of \thepage below if you want to uncomment
- % the following line:
- % \usepackage[colorlinks]{hyperref}
-
+\usepackage[colorlinks,plainpages]{hyperref}
\usepackage[xindy,style=altlistgroup]{glossaries}
- % Define a new command to do bold italic (it uses \hyperbf
- % rather than \textbf in case I later introduce hyperlinks
- % - although I would have to remove the fancy page numbering
- % if I wanted to do that):
+ % Define a new command to do bold italic:
\newcommand*{\hyperbfit}[1]{\textit{\hyperbf{#1}}}
@@ -55,6 +51,10 @@
\string\Numberstringnum\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:
@@ -75,6 +75,24 @@
\makeglossaries
+ % Each page location will be specified in the form:
+ %
+ % "\glsXpageXglsnumberformat{}{\protect \Numberstringnum "\marg{n}"}"
+ % or
+ % "\glsXpageXhyperbfit{}{\protect \Numberstringnum "\marg{n}"}"
+ %
+ % Redefine to allow hyperlinks:
+
+\renewcommand{\glsXpageXglsnumberformat}[2]{%
+ \linkpagenumber#2%
+}
+
+\renewcommand{\glsXpageXhyperbfit}[2]{%
+ \textbf{\em\linkpagenumber#2}%
+}
+
+\newcommand{\linkpagenumber}[3]{\hyperlink{page.#3}{#1#2{#3}}}
+
% Define glossary entries
% \glshyperlink is used instead of \gls to prevent the glossary
% page numbers also appear in the locations, however I need
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf
new file mode 100644
index 00000000000..3078c980405
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex
new file mode 100644
index 00000000000..d6d12d8087d
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.tex
@@ -0,0 +1,66 @@
+ % This file is public domain
+ %
+ % This is a sample document illustrating how to use the
+ % glossaries package with xindy. To create the document:
+ %
+ % pdflatex samplexdy2
+ % makeglossaries samplexdy2
+ % pdflatex samplexdy2
+ %
+ % This sample file won't work with makeindex
+ %
+\documentclass{report}
+
+\usepackage[utf8]{inputenc}
+\usepackage[T1]{fontenc}
+\usepackage[colorlinks]{hyperref}
+\usepackage[xindy,counter=section]{glossaries}
+
+ % Set up somewhat eccentric section numbering system:
+
+\renewcommand*{\thesection}{[\thechapter]\arabic{section}}
+
+\renewcommand*{\theHsection}{\thepart.\thesection}
+\renewcommand*{\thepart}{\Roman{part}}
+
+\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 "["
+ "arabic-numbers" :sep "]" "arabic-numbers"
+}
+
+ % (Note that the above will stop xindy giving a warning, but the
+ % location hyper links will be invalid if no \part is used.)
+
+\makeglossaries
+
+\newglossaryentry{sample}{name=sample,description={an example}}
+\newglossaryentry{sample2}{name=sample2,description={another example}}
+
+\begin{document}
+This is a sample document illustrating Xindy specific commands in
+the glossaries package.
+
+\part{First Part}
+
+\chapter{Sample Chapter}
+
+\section{First Section}
+
+\gls{sample}. \gls{sample2}.
+
+\section{Second Section}
+
+\gls{sample2}.
+
+\section{Third Section}
+
+\gls{sample}. \gls{sample2}.
+
+\printglossaries
+\end{document}