@@ -53,31 +53,32 @@ markdown test suite.
5353
5454\thinrule
5555
56−\section{Headers}
56+\section[headers]{Headers}
5757
58−\subsection{Level 2 with an \useURL[url1][/url][][embedded link]\from[url1]}
58+\subsection[level-2-with-an-embedded-link]{Level 2 with an
59+\useURL[url1][/url][][embedded link]\from[url1]}
5960
60−\subsubsection{Level 3 with {\em emphasis}}
61+\subsubsection[level-3-with-emphasis]{Level 3 with {\em emphasis}}
6162
62−\subsubsubsection{Level 4}
63+\subsubsubsection[level-4]{Level 4}
6364
64−\subsubsubsubsection{Level 5}
65+\subsubsubsubsection[level-5]{Level 5}
6566
66−\section{Level 1}
67+\section[level-1]{Level 1}
6768
68−\subsection{Level 2 with {\em emphasis}}
69+\subsection[level-2-with-emphasis]{Level 2 with {\em emphasis}}
6970
70−\subsubsection{Level 3}
71+\subsubsection[level-3]{Level 3}
7172
7273with no blank line
7374
74−\subsection{Level 2}
75+\subsection[level-2]{Level 2}
7576
7677with no blank line
7778
7879\thinrule
7980
80−\section{Paragraphs}
81+\section[paragraphs]{Paragraphs}
8182
8283Here's a regular paragraph.
8384
@@ -92,7 +93,7 @@ here.
9293
9394\thinrule
9495
95−\section{Block Quotes}
96+\section[block-quotes]{Block Quotes}
9697
9798E-mail style:
9899
@@ -135,7 +136,7 @@ And a following paragraph.
135136
136137\thinrule
137138
138−\section{Code Blocks}
139+\section[code-blocks]{Code Blocks}
139140
140141Code:
141142
@@ -159,9 +160,9 @@ These should not be escaped: \$ \\ \> \[ \{
159160
160161\thinrule
161162
162−\section{Lists}
163+\section[lists]{Lists}
163164
164−\subsection{Unordered}
165+\subsection[unordered]{Unordered}
165166
166167Asterisks tight:
167168
@@ -229,7 +230,7 @@ Minuses loose:
229230 Minus 3
230231\stopitemize
231232
232−\subsection{Ordered}
233+\subsection[ordered]{Ordered}
233234
234235Tight:
235236
@@ -288,7 +289,7 @@ Multiple paragraphs:
288289 Item 3.
289290\stopitemize
290291
291−\subsection{Nested}
292+\subsection[nested]{Nested}
292293
293294\startitemize
294295\item
@@ -342,7 +343,7 @@ Same thing but with paragraphs:
342343 Third
343344\stopitemize
344345
345−\subsection{Tabs and spaces}
346+\subsection[tabs-and-spaces]{Tabs and spaces}
346347
347348\startitemize
348349\item
@@ -358,7 +359,7 @@ Same thing but with paragraphs:
358359 \stopitemize
359360\stopitemize
360361
361−\subsection{Fancy list markers}
362+\subsection[fancy-list-markers]{Fancy list markers}
362363
363364\startitemize[n][start=2,left=(,stopper=),width=2.0em]
364365\item
@@ -422,7 +423,7 @@ B. Williams
422423
423424\thinrule
424425
425−\section{Definition Lists}
426+\section[definition-lists]{Definition Lists}
426427
427428Tight using spaces:
428429
@@ -533,7 +534,7 @@ Blank line after term, indented marker, alternate markers:
533534 \stopitemize
534535\stopdescription
535536
536−\section{HTML Blocks}
537+\section[html-blocks]{HTML Blocks}
537538
538539Simple block on one line:
539540
@@ -588,7 +589,7 @@ Hr's:
588589
589590\thinrule
590591
591−\section{Inline Markup}
592+\section[inline-markup]{Inline Markup}
592593
593594This is {\em emphasized}, and so {\em is this}.
594595
@@ -617,7 +618,7 @@ spaces: a\letterhat{}b c\letterhat{}d, a\lettertilde{}b c\lettertilde{}d.
617618
618619\thinrule
619620
620−\section{Smart quotes, ellipses, dashes}
621+\section[smart-quotes-ellipses-dashes]{Smart quotes, ellipses, dashes}
621622
622623\quotation{Hello,} said the spider. \quotation{\quote{Shelob} is my name.}
623624
@@ -640,7 +641,7 @@ Ellipses\ldots{}and\ldots{}and\ldots{}.
640641
641642\thinrule
642643
643−\section{LaTeX}
644+\section[latex]{LaTeX}
644645
645646\startitemize
646647\item
@@ -680,7 +681,7 @@ Here's a LaTeX table:
680681
681682\thinrule
682683
683−\section{Special Characters}
684+\section[special-characters]{Special Characters}
684685
685686Here is some unicode:
686687
@@ -741,9 +742,9 @@ Minus: -
741742
742743\thinrule
743744
744−\section{Links}
745+\section[links]{Links}
745746
746−\subsection{Explicit}
747+\subsection[explicit]{Explicit}
747748
748749Just a \useURL[url4][/url/][][URL]\from[url4].
749750
@@ -763,7 +764,7 @@ Just a \useURL[url4][/url/][][URL]\from[url4].
763764
764765\useURL[url12][][][Empty]\from[url12].
765766
766−\subsection{Reference}
767+\subsection[reference]{Reference}
767768
768769Foo \useURL[url13][/url/][][bar]\from[url13].
769770
@@ -791,7 +792,7 @@ Foo \useURL[url21][/url/][][bar]\from[url21].
791792
792793Foo \useURL[url22][/url/][][biz]\from[url22].
793794
794−\subsection{With ampersands}
795+\subsection[with-ampersands]{With ampersands}
795796
796797Here's a \useURL[url23][http://example.com/?foo=1&bar=2][][link with an
797798ampersand in the URL]\from[url23].
@@ -804,10 +805,10 @@ Here's an \useURL[url25][/script?foo=1&bar=2][][inline link]\from[url25].
804805Here's an \useURL[url26][/script?foo=1&bar=2][][inline link in pointy
805806braces]\from[url26].
806807
807−\subsection{Autolinks}
808+\subsection[autolinks]{Autolinks}
808809
809810With an ampersand:
810−\useURL[url27][http://example.com/?foo=1&bar=2][][\hyphenatedurl{http://example.com/?foo=1&bar=2}]\from[url27]
811+\useURL[url27][http://example.com/?foo=1&bar=2][][\hyphenatedurl{http://example.com/?foo=1\&bar=2}]\from[url27]
811812
812813\startitemize
813814\item
@@ -819,7 +820,7 @@ With an ampersand:
819820\stopitemize
820821
821822An e-mail address:
822−\useURL[url29][mailto:nobody@nowhere.net][][nobody@nowhere.net]\from[url29]
823+\useURL[url29][mailto:nobody@nowhere.net][][\hyphenatedurl{nobody@nowhere.net}]\from[url29]
823824
824825\startblockquote
825826Blockquoted:
@@ -834,7 +835,7 @@ or here: <http://example.com/>
834835
835836\thinrule
836837
837−\section{Images}
838+\section[images]{Images}
838839
839840From \quotation{Voyage dans la Lune} by Georges Melies (1902):
840841
@@ -844,7 +845,7 @@ Here is a movie {\externalfigure[movie.jpg]} icon.
844845
845846\thinrule
846847
847−\section{Footnotes}
848+\section[footnotes]{Footnotes}
848849
849850Here is a footnote reference,\footnote{Here is the footnote. It can go
850851 anywhere after the footnote reference. It need not be placed at the end of