2014-06-11 15:54:00

5 files changed, 126 insertions, 74 deletions

diff --git a/tex/context/sample/dawkins.tex b/tex/context/sample/dawkins.tex
index 3490b79b0..c0acd3157 100644
--- a/tex/context/sample/dawkins.tex
+++ b/tex/context/sample/dawkins.tex
@@ -8,13 +8,13 @@ individual out. \quotation {Let's first establish,} I said,
 right half of the lecture hall.} I invited everybody to
 stand up while my assistant tossed a coin. Everybody on the
 left of the hall was asked to \quote {will} the coin to
-come down head. Everybody on the right had to will it to be
+come down heads. Everybody on the right had to will it to be
 tails. Obviously one side had to lose, and they were asked
-to sit down. Then those who remained were divided into two,
+to sit down. Then those that remained were divided into two,
 with half \quote {willing} heads and the other half tails.
 Again the losers sat down. And so on by successive halvings
 until, inevitably, after seven or eight tosses, one
 individual was left standing. \quotation {A big round of
 applause for our psychic.} He must be psychic, mustn't he,
 because he successfully influenced the coin eight times in
-a row?
\ No newline at end of file
+a row?
diff --git a/tex/context/sample/douglas.tex b/tex/context/sample/douglas.tex
index 7d986d484..838c6d24d 100644
--- a/tex/context/sample/douglas.tex
+++ b/tex/context/sample/douglas.tex
@@ -1,18 +1,18 @@
 Donald Knuth has spent the past several years working on a
 system allowing him to control many aspects of the design
-of his forthcoming books, from the typesetting and layout
+of his forthcoming books|=|from the typesetting and layout
 down to the very shapes of the letters! Seldom has an
 author had anything remotely like this power to control the
 final appearance of his or her work. Knuth's \TEX\
-typesetting system has become well|-|known and available in
+typesetting system has become well|-|known and as available in
 many countries around the world. By contrast, his
 \METAFONT\ system for designing families of typefaces has
-not become as well known or available.
+not become as well known or as available.
 
 In his article \quotation {The Concept of a Meta|-|Font},
 Knuth sets forth for the first time the underlying
 philosophy of \METAFONT, as well as some of its products.
-Not only is the concept exiting and clearly well executed,
+Not only is the concept exciting and clearly well executed,
 but in my opinion the article is charmingly written as well.
 However, despite my overall enthusiasm for Knuth's idea and
 article, there are some points in it that I feel might be
diff --git a/tex/context/sample/sample.tex b/tex/context/sample/sample.tex
index 5f97ea009..ef31153a1 100644
--- a/tex/context/sample/sample.tex
+++ b/tex/context/sample/sample.tex
@@ -1,75 +1,21 @@
-\starttext
-
-The sample directory contains a few files with quotes that can be used
-while testing styles.
-
-I'll complete this file when I've reorganized my books and audio cd's.
-
-If someone makes a nice bibtex file of these, the quotes can also be
-used in testing bibliographic references and citations.
-
-\starttabulate[|l|l|p|]
-\NC \bf file           \NC \bf author            \NC \bf source \NC \NR
-\HL
-%NC stork.tex          \NC David   F. Stork      \NC \NC \NR
-\NC knuth.tex          \NC Donald  E. Knuth      \NC \NC \NR
-\NC tufte.tex          \NC Edward  R. Tufte      \NC \NC \NR
-\NC reich.tex          \NC Steve      Reich      \NC \NC \NR
-\NC materie.tex        \NC Louis      Andriessen \NC De Materie \NC \NR
-\NC douglas.tex        \NC Douglas R. Hofstadter \NC \NC \NR
-\NC dawkins.tex        \NC            Dawkins    \NC \NC \NR
-\NC ward.tex           \NC Peter   D. Ward       \NC The Life and Death of Planet Earth \NC \NR
-\NC zapf.tex           \NC Hermann    Zapf       \NC About micro-typography and the hz-program, \endgraf
-                                                     Electronic Publishing, vol. 6(3), \endgraf
-                                                     283-288 (September 1993) \NC \NR
-\NC bryson.tex         \NC Bill       Bryson     \NC A Short History of Nearly Everything, \endgraf
-                                                     Random House, 2003 \NC \NR
-\NC davis.tex          \NC Kenneth C. Davis      \NC Don't Know Much About History, \endgraf
-                                                     Everything You Need to Know About American
-                                                     History but Never Learned, \endgraf
-                                                     HarperCollins, 2003 \NC \NR
-\NC thuan.tex          \NC Trinh Xuan Thuan      \NC Chaos and Harmony, Perspectives on Scientific
-                                                     Revolutions of the Twentieth Century, \endgraf
-                                                     Oxford University Press, 2001 \NC \NR
-\NC hawking.tex        \NC Steve W. Hawking      \NC The Universe in a Nutshell, Bantam Books
-                                                     Random House, 2001 \NC \NR
-\NC linden.tex         \NC Eugene Linden         \NC The Winds of Change, Climate, Weather, and the
-                                                     Destruction of Civilizations, \endgraf
-                                                     Simon \& Schuster, 2006, p.106 \NC \NR
-\NC weisman.tex        \NC Alan Weisman          \NC The World Without Us, \endgraf
-                                                     Thomas Dunne Books, 2007, p.160 \NC \NR
-\NC montgomery.tex     \NC David R Montgomery    \NC Dirt, The Erosion of Civilizations, \endgraf
-                                                     University of California Press, 2007, p.199 \NC \NR
-\NC carrol.tex         \NC Sean B. Carrol        \NC The Making of the Fittest, \endgraf
-                                                     Quercus, London, 2006 \NC \NR
-%NC schwarzenegger.tex \NC Arnold Schwarzenegger \NC Several place on the World Wide Web. \NC \NR
-\stoptabulate
+% this original file has been renamed to samples.tex and describes the
+% short quotes that can be used in test files
 
-% Tufte: This quote will always produce hyphenated text, apart from the content,
-% it's a pretty good test case for protruding.
-
-% Ward: I should find a quote in the extremely well written Rare Earth as well. All Wards
-% books excell.
-
-% A Short History of Nearly Everything: I wish that I had the memory to remember this book
-% verbatim.
-
-% Chaos and Harmony: very nice and well written book, but the typography is rather bad:
-% quite visible inter-character spacing in a text that can be typeset quite well by \TeX.
+\starttext
 
-% The Universe in a Nutshell: a beautiful designed book, (companion of A Short History
-% of Time).
+see \type {samples.tex}
 
-% The World Without Us: A properly typeset, very readable book. Read it and you'll look at
-% the world around you differently (and a bit more freightened).
+\blank
 
-% Dirt, The Erosion of Civilizations: one of those books that you buy immediately after
-% reading a few sentences. Also one of those books that every politician should read.
+\startluacode
+    context("see \\type {samples.tex}")
+\stopluacode
 
-% The Making of the Fittest: nice sample for color ans subsentence testing. A very
-% readable book but unfortunately it has inter-character spacing.
+\blank
 
-% The Schwarzenegger letter was originally typeset at a width equivalent to 16.1cm in
-% a default ConTeXt setup.
+\startMPcode
+    draw textext("see \type {samples.tex}") ;
+    draw boundingbox currentpicture enlarged 2pt ;
+\stopMPcode
 
 \stoptext
diff --git a/tex/context/sample/samples.bib b/tex/context/sample/samples.bib
new file mode 100644
index 000000000..e54092aae
--- /dev/null
+++ b/tex/context/sample/samples.bib
@@ -0,0 +1,29 @@
+% The following entries were provided by Rik Kabel:
+
+@book{dawkins2000unweaving,
+    title     = {Unweaving the Rainbow: Science, Delusion and the Appetite for Wonder},
+    author    = {Dawkins, R.},
+    isbn      = {9780547347356},
+    url       = {http://books.google.com/books?id=ZudTchiioUoC},
+    year      = {2000},
+    publisher = {Houghton Mifflin Harcourt},
+    pages     = {145--146},
+}
+
+@book{Hofstadter:1985:MTQ:537101,
+    author    = {Hofstadter, Douglas R.},
+    title     = {Metamagical Themas: Questing for the Essence of Mind and Pattern},
+    year      = {1985},
+    isbn      = {0465045405},
+    publisher = {Basic Books, Inc.},
+    address   = {New York, NY, USA},
+}
+
+@book{Tufte:1990:EI:78223,
+    author    = {Tufte, Edward},
+    title     = {Envisioning Information},
+    year      = {1990},
+    isbn      = {0-9613921-1-8},
+    publisher = {Graphics Press},
+    address   = {Cheshire, CT, USA},
+}
diff --git a/tex/context/sample/samples.tex b/tex/context/sample/samples.tex
new file mode 100644
index 000000000..d8640055a
--- /dev/null
+++ b/tex/context/sample/samples.tex
@@ -0,0 +1,77 @@
+\starttext
+
+The sample directory contains a few files with quotes that can be used
+while testing styles.
+
+I'll complete this file when I've reorganized my books and audio cd's.
+
+If someone makes a nice bibtex file of these, the quotes can also be
+used in testing bibliographic references and citations.
+
+\starttabulate[|l|l|p|]
+\NC \bf file           \NC \bf author            \NC \bf source \NC \NR
+\HL
+%NC stork.tex          \NC David   F. Stork      \NC \NC \NR
+\NC knuth.tex          \NC Donald  E. Knuth      \NC \NC \NR
+\NC tufte.tex          \NC Edward  R. Tufte      \NC \NC \NR
+\NC reich.tex          \NC Steve      Reich      \NC City Life (1995) \NC \NR
+\NC materie.tex        \NC Louis      Andriessen \NC De Materie \NC \NR
+\NC douglas.tex        \NC Douglas R. Hofstadter \NC \NC \NR
+\NC dawkins.tex        \NC            Dawkins    \NC \NC \NR
+\NC ward.tex           \NC Peter   D. Ward       \NC The Life and Death of Planet Earth \NC \NR
+\NC zapf.tex           \NC Hermann    Zapf       \NC About micro-typography and the hz-program, \endgraf
+                                                     Electronic Publishing, vol. 6(3), \endgraf
+                                                     283-288 (September 1993) \NC \NR
+\NC bryson.tex         \NC Bill       Bryson     \NC A Short History of Nearly Everything, \endgraf
+                                                     Random House, 2003 \NC \NR
+\NC davis.tex          \NC Kenneth C. Davis      \NC Don't Know Much About History, \endgraf
+                                                     Everything You Need to Know About American
+                                                     History but Never Learned, \endgraf
+                                                     HarperCollins, 2003 \NC \NR
+\NC thuan.tex          \NC Trinh Xuan Thuan      \NC Chaos and Harmony, Perspectives on Scientific
+                                                     Revolutions of the Twentieth Century, \endgraf
+                                                     Oxford University Press, 2001 \NC \NR
+\NC hawking.tex        \NC Steve W. Hawking      \NC The Universe in a Nutshell, Bantam Books
+                                                     Random House, 2001 \NC \NR
+\NC linden.tex         \NC Eugene Linden         \NC The Winds of Change, Climate, Weather, and the
+                                                     Destruction of Civilizations, \endgraf
+                                                     Simon \& Schuster, 2006, p.106 \NC \NR
+\NC weisman.tex        \NC Alan Weisman          \NC The World Without Us, \endgraf
+                                                     Thomas Dunne Books, 2007, p.160 \NC \NR
+\NC montgomery.tex     \NC David R Montgomery    \NC Dirt, The Erosion of Civilizations, \endgraf
+                                                     University of California Press, 2007, p.199 \NC \NR
+\NC carrol.tex         \NC Sean B. Carrol        \NC The Making of the Fittest, \endgraf
+                                                     Quercus, London, 2006 \NC \NR
+%NC schwarzenegger.tex \NC Arnold Schwarzenegger \NC Several place on the World Wide Web. \NC \NR
+\stoptabulate
+
+% Tufte: This quote will always produce hyphenated text, apart from the content,
+% it's a pretty good test case for protruding.
+
+% Reich: This is a list of the voice samples from Steve Reich's 1995 composition City Life.
+
+% Ward: I should find a quote in the extremely well written Rare Earth as well. All Wards
+% books excell.
+
+% A Short History of Nearly Everything: I wish that I had the memory to remember this book
+% verbatim.
+
+% Chaos and Harmony: very nice and well written book, but the typography is rather bad:
+% quite visible inter-character spacing in a text that can be typeset quite well by \TeX.
+
+% The Universe in a Nutshell: a beautiful designed book, (companion of A Short History
+% of Time).
+
+% The World Without Us: A properly typeset, very readable book. Read it and you'll look at
+% the world around you differently (and a bit more freightened).
+
+% Dirt, The Erosion of Civilizations: one of those books that you buy immediately after
+% reading a few sentences. Also one of those books that every politician should read.
+
+% The Making of the Fittest: nice sample for color ans subsentence testing. A very
+% readable book but unfortunately it has inter-character spacing.
+
+% The Schwarzenegger letter was originally typeset at a width equivalent to 16.1cm in
+% a default ConTeXt setup.
+
+\stoptext