glossaries (19nov12)

git-svn-id: svn://tug.org/texlive/trunk@28305 c570f23f-e606-0410-a88d-b1316a301751

22 files changed, 13 insertions, 3 deletions

diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf
index 2ea9b2c6643..357da2bc145 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/minimalgls.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf
index ea55244c932..655c5aad9b1 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-crossref.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf
index 17074f7d9da..a011ff85c6f 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-custom-acronym.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf
index d500b9d8fb6..453d2c5c487 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample-dual.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf
index 2103f51a1a6..f7f40dcc948 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf
index dddddeeb98a..894c76c9c5e 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sample4col.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf
index b00d8168234..f0b26d6ad9f 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcr.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf
index ff2b98614df..7497c3603fb 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleAcrDesc.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf
index 70688b355cd..9df011d95ae 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDB.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf
index 2dedb592a7a..3741e4e77da 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleDesc.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf
index 5c3728965ba..2ab6c8740f9 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEq.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf
index c5d362c57cc..588e67f8895 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleEqPg.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf
index b20bd1049c0..e68a7947499 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleNtn.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf
index 6fb8a80ae06..2b528316b16 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleSec.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf
index 1c40295d436..44b6cf40390 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleaccsupp.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf
index fc3d8b5dbba..60448cc9e8c 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleacronyms.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf
index ddfa5b1fcbc..d39aeb4f188 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampletree.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf
index 2aee5b728ba..97d3abab021 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/sampleutf8.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf
index 2b2361919ef..b79a8c4392c 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy-compatible207.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf
index 828bf52f947..275e2fd34d0 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.pdf
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex
index faa5efb4ace..ec94891df1b 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy.tex
@@ -39,7 +39,7 @@
 
  % Redefine the page numbers so that they appear as a word:
 
- \renewcommand*{\thepage}{\Numberstring{page}}
+ \renewcommand*{\thepage}{\texorpdfstring{\Numberstring{page}}{\arabic{page}}}
 
  % Need to add this to the list of location styles.
  % \Numberstring{page} gets expanded to
@@ -166,7 +166,7 @@ description={SI unit of electric current named after
 first={Archimedes of Syracuse},text={Archimedes},
 description={Greek mathematician}}
 
-\newglossaryentry{archimedesprinciple}{name={Archemedes' principle},
+\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}}}
@@ -183,6 +183,11 @@ description={German mathematician}}
 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}}
@@ -209,7 +214,12 @@ coefficient named after \gls{pearson}}}
 This is a section on \gls[format=(]{gauss}. This section spans
 several pages.
 
-\newpage
+\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
diff --git a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf
index 3fd8f384a4a..4fabc5a64e0 100644
--- a/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf
+++ b/Master/texmf-dist/doc/latex/glossaries/samples/samplexdy2.pdf