@@ -16,9 +16,9 @@
1616
1717\setupwhitespace[medium]
1818
19−\setuphead[section] [style=\tfc]
20−\setuphead[subsection] [style=\tfb]
21−\setuphead[subsubsection][style=\bf]
19+\setuphead[section] [style=\tfc,number=no]
20+\setuphead[subsection] [style=\tfb,number=no]
21+\setuphead[subsubsection][style=\bf,number=no]
2222
2323\definedescription
2424 [description]
@@ -53,31 +53,31 @@ markdown test suite.
5353
5454\thinrule
5555
56−\subject{Headers}
56+\section{Headers}
5757
58−\subsubject{Level 2 with an \useURL[1][/url][][embedded link]\from[1]}
58+\subsection{Level 2 with an \useURL[url1][/url][][embedded link]\from[url1]}
5959
60−\subsubsubject{Level 3 with {\em emphasis}}
60+\subsubsection{Level 3 with {\em emphasis}}
6161
62−\subsubsubsubject{Level 4}
62+\subsubsubsection{Level 4}
6363
64−\subsubsubsubsubject{Level 5}
64+\subsubsubsubsection{Level 5}
6565
66−\subject{Level 1}
66+\section{Level 1}
6767
68−\subsubject{Level 2 with {\em emphasis}}
68+\subsection{Level 2 with {\em emphasis}}
6969
70−\subsubsubject{Level 3}
70+\subsubsection{Level 3}
7171
7272with no blank line
7373
74−\subsubject{Level 2}
74+\subsection{Level 2}
7575
7676with no blank line
7777
7878\thinrule
7979
80−\subject{Paragraphs}
80+\section{Paragraphs}
8181
8282Here's a regular paragraph.
8383
@@ -92,7 +92,7 @@ here.
9292
9393\thinrule
9494
95−\subject{Block Quotes}
95+\section{Block Quotes}
9696
9797E-mail style:
9898
@@ -135,7 +135,7 @@ And a following paragraph.
135135
136136\thinrule
137137
138−\subject{Code Blocks}
138+\section{Code Blocks}
139139
140140Code:
141141
@@ -159,9 +159,9 @@ These should not be escaped: \$ \\ \> \[ \{
159159
160160\thinrule
161161
162−\subject{Lists}
162+\section{Lists}
163163
164−\subsubject{Unordered}
164+\subsection{Unordered}
165165
166166Asterisks tight:
167167
@@ -229,7 +229,7 @@ Minuses loose:
229229 Minus 3
230230\stopitemize
231231
232−\subsubject{Ordered}
232+\subsection{Ordered}
233233
234234Tight:
235235
@@ -288,7 +288,7 @@ Multiple paragraphs:
288288 Item 3.
289289\stopitemize
290290
291−\subsubject{Nested}
291+\subsection{Nested}
292292
293293\startitemize
294294\item
@@ -342,7 +342,7 @@ Same thing but with paragraphs:
342342 Third
343343\stopitemize
344344
345−\subsubject{Tabs and spaces}
345+\subsection{Tabs and spaces}
346346
347347\startitemize
348348\item
@@ -358,7 +358,7 @@ Same thing but with paragraphs:
358358 \stopitemize
359359\stopitemize
360360
361−\subsubject{Fancy list markers}
361+\subsection{Fancy list markers}
362362
363363\startitemize[n][start=2,left=(,stopper=),width=2.0em]
364364\item
@@ -422,7 +422,7 @@ B. Williams
422422
423423\thinrule
424424
425−\subject{Definition Lists}
425+\section{Definition Lists}
426426
427427Tight using spaces:
428428
@@ -533,7 +533,7 @@ Blank line after term, indented marker, alternate markers:
533533 \stopitemize
534534\stopdescription
535535
536−\subject{HTML Blocks}
536+\section{HTML Blocks}
537537
538538Simple block on one line:
539539
@@ -588,13 +588,13 @@ Hr's:
588588
589589\thinrule
590590
591−\subject{Inline Markup}
591+\section{Inline Markup}
592592
593593This is {\em emphasized}, and so {\em is this}.
594594
595595This is {\bf strong}, and so {\bf is this}.
596596
597−An {\em \useURL[2][/url][][emphasized link]\from[2]}.
597+An {\em \useURL[url2][/url][][emphasized link]\from[url2]}.
598598
599599{\bf {\em This is strong and em.}}
600600
@@ -617,7 +617,7 @@ spaces: a\letterhat{}b c\letterhat{}d, a\lettertilde{}b c\lettertilde{}d.
617617
618618\thinrule
619619
620−\subject{Smart quotes, ellipses, dashes}
620+\section{Smart quotes, ellipses, dashes}
621621
622622\quotation{Hello,} said the spider. \quotation{\quote{Shelob} is my name.}
623623
@@ -629,8 +629,8 @@ spaces: a\letterhat{}b c\letterhat{}d, a\lettertilde{}b c\lettertilde{}d.
629629\quote{He said, \quotation{I want to go.}} Were you alive in the 70's?
630630
631631Here is some quoted \quote{\type{code}} and a
632−\quotation{\useURL[3][http://example.com/?foo=1&bar=2][][quoted
633−link]\from[3]}.
632+\quotation{\useURL[url3][http://example.com/?foo=1&bar=2][][quoted
633+link]\from[url3]}.
634634
635635Some dashes: one---two --- three---four --- five.
636636
@@ -640,7 +640,7 @@ Ellipses\ldots{}and\ldots{}and\ldots{}.
640640
641641\thinrule
642642
643−\subject{LaTeX}
643+\section{LaTeX}
644644
645645\startitemize
646646\item
@@ -680,7 +680,7 @@ Here's a LaTeX table:
680680
681681\thinrule
682682
683−\subject{Special Characters}
683+\section{Special Characters}
684684
685685Here is some unicode:
686686
@@ -741,45 +741,45 @@ Minus: -
741741
742742\thinrule
743743
744−\subject{Links}
744+\section{Links}
745745
746−\subsubject{Explicit}
746+\subsection{Explicit}
747747
748−Just a \useURL[4][/url/][][URL]\from[4].
748+Just a \useURL[url4][/url/][][URL]\from[url4].
749749
750−\useURL[5][/url/][][URL and title]\from[5].
750+\useURL[url5][/url/][][URL and title]\from[url5].
751751
752−\useURL[6][/url/][][URL and title]\from[6].
752+\useURL[url6][/url/][][URL and title]\from[url6].
753753
754−\useURL[7][/url/][][URL and title]\from[7].
754+\useURL[url7][/url/][][URL and title]\from[url7].
755755
756−\useURL[8][/url/][][URL and title]\from[8]
756+\useURL[url8][/url/][][URL and title]\from[url8]
757757
758−\useURL[9][/url/][][URL and title]\from[9]
758+\useURL[url9][/url/][][URL and title]\from[url9]
759759
760−\useURL[10][/url/with_underscore][][with\letterunderscore{}underscore]\from[10]
760+\useURL[url10][/url/with_underscore][][with\letterunderscore{}underscore]\from[url10]
761761
762−\useURL[11][mailto:nobody@nowhere.net][][Email link]\from[11]
762+\useURL[url11][mailto:nobody@nowhere.net][][Email link]\from[url11]
763763
764−\useURL[12][][][Empty]\from[12].
764+\useURL[url12][][][Empty]\from[url12].
765765
766−\subsubject{Reference}
766+\subsection{Reference}
767767
768−Foo \useURL[13][/url/][][bar]\from[13].
768+Foo \useURL[url13][/url/][][bar]\from[url13].
769769
770−Foo \useURL[14][/url/][][bar]\from[14].
770+Foo \useURL[url14][/url/][][bar]\from[url14].
771771
772−Foo \useURL[15][/url/][][bar]\from[15].
772+Foo \useURL[url15][/url/][][bar]\from[url15].
773773
774−With \useURL[16][/url/][][embedded {[}brackets{]}]\from[16].
774+With \useURL[url16][/url/][][embedded {[}brackets{]}]\from[url16].
775775
776−\useURL[17][/url/][][b]\from[17] by itself should be a link.
776+\useURL[url17][/url/][][b]\from[url17] by itself should be a link.
777777
778−Indented \useURL[18][/url][][once]\from[18].
778+Indented \useURL[url18][/url][][once]\from[url18].
779779
780−Indented \useURL[19][/url][][twice]\from[19].
780+Indented \useURL[url19][/url][][twice]\from[url19].
781781
782−Indented \useURL[20][/url][][thrice]\from[20].
782+Indented \useURL[url20][/url][][thrice]\from[url20].
783783
784784This should {[}not{]}{[}{]} be a link.
785785
@@ -787,42 +787,43 @@ This should {[}not{]}{[}{]} be a link.
787787[not]: /url
788788\stoptyping
789789
790−Foo \useURL[21][/url/][][bar]\from[21].
790+Foo \useURL[url21][/url/][][bar]\from[url21].
791791
792−Foo \useURL[22][/url/][][biz]\from[22].
792+Foo \useURL[url22][/url/][][biz]\from[url22].
793793
794−\subsubject{With ampersands}
794+\subsection{With ampersands}
795795
796−Here's a \useURL[23][http://example.com/?foo=1&bar=2][][link with an ampersand
797−in the URL]\from[23].
796+Here's a \useURL[url23][http://example.com/?foo=1&bar=2][][link with an
797+ampersand in the URL]\from[url23].
798798
799799Here's a link with an amersand in the link text:
800−\useURL[24][http://att.com/][][AT\&T]\from[24].
800+\useURL[url24][http://att.com/][][AT\&T]\from[url24].
801801
802−Here's an \useURL[25][/script?foo=1&bar=2][][inline link]\from[25].
802+Here's an \useURL[url25][/script?foo=1&bar=2][][inline link]\from[url25].
803803
804−Here's an \useURL[26][/script?foo=1&bar=2][][inline link in pointy
805−braces]\from[26].
804+Here's an \useURL[url26][/script?foo=1&bar=2][][inline link in pointy
805+braces]\from[url26].
806806
807−\subsubject{Autolinks}
807+\subsection{Autolinks}
808808
809809With an ampersand:
810−\useURL[27][http://example.com/?foo=1&bar=2][][http://example.com/?foo=1\&bar=2]\from[27]
810+\useURL[url27][http://example.com/?foo=1&bar=2][][\hyphenatedurl{http://example.com/?foo=1&bar=2}]\from[url27]
811811
812812\startitemize
813813\item
814814 In a list?
815815\item
816− \useURL[28][http://example.com/][][http://example.com/]\from[28]
816+ \useURL[url28][http://example.com/][][\hyphenatedurl{http://example.com/}]\from[url28]
817817\item
818818 It should.
819819\stopitemize
820820
821821An e-mail address:
822−\useURL[29][mailto:nobody@nowhere.net][][nobody@nowhere.net]\from[29]
822+\useURL[url29][mailto:nobody@nowhere.net][][nobody@nowhere.net]\from[url29]
823823
824824\startblockquote
825−Blockquoted: \useURL[30][http://example.com/][][http://example.com/]\from[30]
825+Blockquoted:
826+\useURL[url30][http://example.com/][][\hyphenatedurl{http://example.com/}]\from[url30]
826827\stopblockquote
827828
828829Auto-links should not occur here: \type{<http://example.com/>}
@@ -833,7 +834,7 @@ or here: <http://example.com/>
833834
834835\thinrule
835836
836−\subject{Images}
837+\section{Images}
837838
838839From \quotation{Voyage dans la Lune} by Georges Melies (1902):
839840
@@ -843,7 +844,7 @@ Here is a movie {\externalfigure[movie.jpg]} icon.
843844
844845\thinrule
845846
846−\subject{Footnotes}
847+\section{Footnotes}
847848
848849Here is a footnote reference,\footnote{Here is the footnote. It can go
849850 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
862863should {\em not} be a footnote reference, because it contains a
863864space.{[}\letterhat{}my note{]} Here is an inline note.\footnote{This is
864865 {\em easier} to type. Inline notes may contain
865− \useURL[31][http://google.com][][links]\from[31] and \type{]} verbatim
866+ \useURL[url31][http://google.com][][links]\from[url31] and \type{]} verbatim
866867 characters, as well as {[}bracketed text{]}.}
867868
868869\startblockquote