From 83680430b3bda2938177d5a25e917c2e3645197a Mon Sep 17 00:00:00 2001
From: John MacFarlane <fiddlosopher@gmail.com>
Date: Fri, 30 Dec 2011 13:05:04 -0800
Subject: [PATCH] Updated ConTeXt tests.
---
src/Tests/Writers/ConTeXt.hs | 4 +-
tests/writer.context | 135 ++++++++++++++++++-----------------
2 files changed, 70 insertions(+), 69 deletions(-)
diff --git a/src/Tests/Writers/ConTeXt.hs b/src/Tests/Writers/ConTeXt.hs
index 704571e95..8cb67fe9f 100644
--- a/src/Tests/Writers/ConTeXt.hs
+++ b/src/Tests/Writers/ConTeXt.hs
@@ -43,9 +43,9 @@ tests = [ testGroup "inline code"
]
, testGroup "headers"
[ "level 1" =:
- header 1 "My header" =?> "\\subject{My header}"
+ header 1 "My header" =?> "\\section{My header}"
, property "header 1 property" $ \ils ->
- context' (header 1 ils) == "\\subject{" ++ context' ils ++ "}"
+ context' (header 1 ils) == "\\section{" ++ context' ils ++ "}"
]
, testGroup "bullet lists"
[ "nested" =:
diff --git a/tests/writer.context b/tests/writer.context
index 3d8da2a57..32183f43b 100644
--- a/tests/writer.context
+++ b/tests/writer.context
@@ -16,9 +16,9 @@
\setupwhitespace[medium]
-\setuphead[section] [style=\tfc]
-\setuphead[subsection] [style=\tfb]
-\setuphead[subsubsection][style=\bf]
+\setuphead[section] [style=\tfc,number=no]
+\setuphead[subsection] [style=\tfb,number=no]
+\setuphead[subsubsection][style=\bf,number=no]
\definedescription
[description]
@@ -53,31 +53,31 @@ markdown test suite.
\thinrule
-\subject{Headers}
+\section{Headers}
-\subsubject{Level 2 with an \useURL[1][/url][][embedded link]\from[1]}
+\subsection{Level 2 with an \useURL[url1][/url][][embedded link]\from[url1]}
-\subsubsubject{Level 3 with {\em emphasis}}
+\subsubsection{Level 3 with {\em emphasis}}
-\subsubsubsubject{Level 4}
+\subsubsubsection{Level 4}
-\subsubsubsubsubject{Level 5}
+\subsubsubsubsection{Level 5}
-\subject{Level 1}
+\section{Level 1}
-\subsubject{Level 2 with {\em emphasis}}
+\subsection{Level 2 with {\em emphasis}}
-\subsubsubject{Level 3}
+\subsubsection{Level 3}
with no blank line
-\subsubject{Level 2}
+\subsection{Level 2}
with no blank line
\thinrule
-\subject{Paragraphs}
+\section{Paragraphs}
Here's a regular paragraph.
@@ -92,7 +92,7 @@ here.
\thinrule
-\subject{Block Quotes}
+\section{Block Quotes}
E-mail style:
@@ -135,7 +135,7 @@ And a following paragraph.
\thinrule
-\subject{Code Blocks}
+\section{Code Blocks}
Code:
@@ -159,9 +159,9 @@ These should not be escaped: \$ \\ \> \[ \{
\thinrule
-\subject{Lists}
+\section{Lists}
-\subsubject{Unordered}
+\subsection{Unordered}
Asterisks tight:
@@ -229,7 +229,7 @@ Minuses loose:
Minus 3
\stopitemize
-\subsubject{Ordered}
+\subsection{Ordered}
Tight:
@@ -288,7 +288,7 @@ Multiple paragraphs:
Item 3.
\stopitemize
-\subsubject{Nested}
+\subsection{Nested}
\startitemize
\item
@@ -342,7 +342,7 @@ Same thing but with paragraphs:
Third
\stopitemize
-\subsubject{Tabs and spaces}
+\subsection{Tabs and spaces}
\startitemize
\item
@@ -358,7 +358,7 @@ Same thing but with paragraphs:
\stopitemize
\stopitemize
-\subsubject{Fancy list markers}
+\subsection{Fancy list markers}
\startitemize[n][start=2,left=(,stopper=),width=2.0em]
\item
@@ -422,7 +422,7 @@ B. Williams
\thinrule
-\subject{Definition Lists}
+\section{Definition Lists}
Tight using spaces:
@@ -533,7 +533,7 @@ Blank line after term, indented marker, alternate markers:
\stopitemize
\stopdescription
-\subject{HTML Blocks}
+\section{HTML Blocks}
Simple block on one line:
@@ -588,13 +588,13 @@ Hr's:
\thinrule
-\subject{Inline Markup}
+\section{Inline Markup}
This is {\em emphasized}, and so {\em is this}.
This is {\bf strong}, and so {\bf is this}.
-An {\em \useURL[2][/url][][emphasized link]\from[2]}.
+An {\em \useURL[url2][/url][][emphasized link]\from[url2]}.
{\bf {\em This is strong and em.}}
@@ -617,7 +617,7 @@ spaces: a\letterhat{}b c\letterhat{}d, a\lettertilde{}b c\lettertilde{}d.
\thinrule
-\subject{Smart quotes, ellipses, dashes}
+\section{Smart quotes, ellipses, dashes}
\quotation{Hello,} said the spider. \quotation{\quote{Shelob} is my name.}
@@ -629,8 +629,8 @@ spaces: a\letterhat{}b c\letterhat{}d, a\lettertilde{}b c\lettertilde{}d.
\quote{He said, \quotation{I want to go.}} Were you alive in the 70's?
Here is some quoted \quote{\type{code}} and a
-\quotation{\useURL[3][http://example.com/?foo=1&bar=2][][quoted
-link]\from[3]}.
+\quotation{\useURL[url3][http://example.com/?foo=1&bar=2][][quoted
+link]\from[url3]}.
Some dashes: one---two --- three---four --- five.
@@ -640,7 +640,7 @@ Ellipses\ldots{}and\ldots{}and\ldots{}.
\thinrule
-\subject{LaTeX}
+\section{LaTeX}
\startitemize
\item
@@ -680,7 +680,7 @@ Here's a LaTeX table:
\thinrule
-\subject{Special Characters}
+\section{Special Characters}
Here is some unicode:
@@ -741,45 +741,45 @@ Minus: -
\thinrule
-\subject{Links}
+\section{Links}
-\subsubject{Explicit}
+\subsection{Explicit}
-Just a \useURL[4][/url/][][URL]\from[4].
+Just a \useURL[url4][/url/][][URL]\from[url4].
-\useURL[5][/url/][][URL and title]\from[5].
+\useURL[url5][/url/][][URL and title]\from[url5].
-\useURL[6][/url/][][URL and title]\from[6].
+\useURL[url6][/url/][][URL and title]\from[url6].
-\useURL[7][/url/][][URL and title]\from[7].
+\useURL[url7][/url/][][URL and title]\from[url7].
-\useURL[8][/url/][][URL and title]\from[8]
+\useURL[url8][/url/][][URL and title]\from[url8]
-\useURL[9][/url/][][URL and title]\from[9]
+\useURL[url9][/url/][][URL and title]\from[url9]
-\useURL[10][/url/with_underscore][][with\letterunderscore{}underscore]\from[10]
+\useURL[url10][/url/with_underscore][][with\letterunderscore{}underscore]\from[url10]
-\useURL[11][mailto:nobody@nowhere.net][][Email link]\from[11]
+\useURL[url11][mailto:nobody@nowhere.net][][Email link]\from[url11]
-\useURL[12][][][Empty]\from[12].
+\useURL[url12][][][Empty]\from[url12].
-\subsubject{Reference}
+\subsection{Reference}
-Foo \useURL[13][/url/][][bar]\from[13].
+Foo \useURL[url13][/url/][][bar]\from[url13].
-Foo \useURL[14][/url/][][bar]\from[14].
+Foo \useURL[url14][/url/][][bar]\from[url14].
-Foo \useURL[15][/url/][][bar]\from[15].
+Foo \useURL[url15][/url/][][bar]\from[url15].
-With \useURL[16][/url/][][embedded {[}brackets{]}]\from[16].
+With \useURL[url16][/url/][][embedded {[}brackets{]}]\from[url16].
-\useURL[17][/url/][][b]\from[17] by itself should be a link.
+\useURL[url17][/url/][][b]\from[url17] by itself should be a link.
-Indented \useURL[18][/url][][once]\from[18].
+Indented \useURL[url18][/url][][once]\from[url18].
-Indented \useURL[19][/url][][twice]\from[19].
+Indented \useURL[url19][/url][][twice]\from[url19].
-Indented \useURL[20][/url][][thrice]\from[20].
+Indented \useURL[url20][/url][][thrice]\from[url20].
This should {[}not{]}{[}{]} be a link.
@@ -787,42 +787,43 @@ This should {[}not{]}{[}{]} be a link.
[not]: /url
\stoptyping
-Foo \useURL[21][/url/][][bar]\from[21].
+Foo \useURL[url21][/url/][][bar]\from[url21].
-Foo \useURL[22][/url/][][biz]\from[22].
+Foo \useURL[url22][/url/][][biz]\from[url22].
-\subsubject{With ampersands}
+\subsection{With ampersands}
-Here's a \useURL[23][http://example.com/?foo=1&bar=2][][link with an ampersand
-in the URL]\from[23].
+Here's a \useURL[url23][http://example.com/?foo=1&bar=2][][link with an
+ampersand in the URL]\from[url23].
Here's a link with an amersand in the link text:
-\useURL[24][http://att.com/][][AT\&T]\from[24].
+\useURL[url24][http://att.com/][][AT\&T]\from[url24].
-Here's an \useURL[25][/script?foo=1&bar=2][][inline link]\from[25].
+Here's an \useURL[url25][/script?foo=1&bar=2][][inline link]\from[url25].
-Here's an \useURL[26][/script?foo=1&bar=2][][inline link in pointy
-braces]\from[26].
+Here's an \useURL[url26][/script?foo=1&bar=2][][inline link in pointy
+braces]\from[url26].
-\subsubject{Autolinks}
+\subsection{Autolinks}
With an ampersand:
-\useURL[27][http://example.com/?foo=1&bar=2][][http://example.com/?foo=1\&bar=2]\from[27]
+\useURL[url27][http://example.com/?foo=1&bar=2][][\hyphenatedurl{http://example.com/?foo=1&bar=2}]\from[url27]
\startitemize
\item
In a list?
\item
- \useURL[28][http://example.com/][][http://example.com/]\from[28]
+ \useURL[url28][http://example.com/][][\hyphenatedurl{http://example.com/}]\from[url28]
\item
It should.
\stopitemize
An e-mail address:
-\useURL[29][mailto:nobody@nowhere.net][][nobody@nowhere.net]\from[29]
+\useURL[url29][mailto:nobody@nowhere.net][][nobody@nowhere.net]\from[url29]
\startblockquote
-Blockquoted: \useURL[30][http://example.com/][][http://example.com/]\from[30]
+Blockquoted:
+\useURL[url30][http://example.com/][][\hyphenatedurl{http://example.com/}]\from[url30]
\stopblockquote
Auto-links should not occur here: \type{<http://example.com/>}
@@ -833,7 +834,7 @@ or here: <http://example.com/>
\thinrule
-\subject{Images}
+\section{Images}
From \quotation{Voyage dans la Lune} by Georges Melies (1902):
@@ -843,7 +844,7 @@ Here is a movie {\externalfigure[movie.jpg]} icon.
\thinrule
-\subject{Footnotes}
+\section{Footnotes}
Here is a footnote reference,\footnote{Here is the footnote. It can go
anywhere after the footnote reference. It need not be placed at the end of
@@ -862,7 +863,7 @@ Here is a footnote reference,\footnote{Here is the footnote. It can go
should {\em not} be a footnote reference, because it contains a
space.{[}\letterhat{}my note{]} Here is an inline note.\footnote{This is
{\em easier} to type. Inline notes may contain
- \useURL[31][http://google.com][][links]\from[31] and \type{]} verbatim
+ \useURL[url31][http://google.com][][links]\from[url31] and \type{]} verbatim
characters, as well as {[}bracketed text{]}.}
\startblockquote