Updated context tests.

1 files changed, 34 insertions, 33 deletions

diff --git a/tests/writer.context b/tests/writer.context
index 32183f43b..3aaf8c14b 100644
--- a/tests/writer.context
+++ b/tests/writer.context
@@ -53,31 +53,32 @@ markdown test suite.
 
 \thinrule
 
-\section{Headers}
+\section[headers]{Headers}
 
-\subsection{Level 2 with an \useURL[url1][/url][][embedded link]\from[url1]}
+\subsection[level-2-with-an-embedded-link]{Level 2 with an
+\useURL[url1][/url][][embedded link]\from[url1]}
 
-\subsubsection{Level 3 with {\em emphasis}}
+\subsubsection[level-3-with-emphasis]{Level 3 with {\em emphasis}}
 
-\subsubsubsection{Level 4}
+\subsubsubsection[level-4]{Level 4}
 
-\subsubsubsubsection{Level 5}
+\subsubsubsubsection[level-5]{Level 5}
 
-\section{Level 1}
+\section[level-1]{Level 1}
 
-\subsection{Level 2 with {\em emphasis}}
+\subsection[level-2-with-emphasis]{Level 2 with {\em emphasis}}
 
-\subsubsection{Level 3}
+\subsubsection[level-3]{Level 3}
 
 with no blank line
 
-\subsection{Level 2}
+\subsection[level-2]{Level 2}
 
 with no blank line
 
 \thinrule
 
-\section{Paragraphs}
+\section[paragraphs]{Paragraphs}
 
 Here's a regular paragraph.
 
@@ -92,7 +93,7 @@ here.
 
 \thinrule
 
-\section{Block Quotes}
+\section[block-quotes]{Block Quotes}
 
 E-mail style:
 
@@ -135,7 +136,7 @@ And a following paragraph.
 
 \thinrule
 
-\section{Code Blocks}
+\section[code-blocks]{Code Blocks}
 
 Code:
 
@@ -159,9 +160,9 @@ These should not be escaped:  \$ \\ \> \[ \{
 
 \thinrule
 
-\section{Lists}
+\section[lists]{Lists}
 
-\subsection{Unordered}
+\subsection[unordered]{Unordered}
 
 Asterisks tight:
 
@@ -229,7 +230,7 @@ Minuses loose:
   Minus 3
 \stopitemize
 
-\subsection{Ordered}
+\subsection[ordered]{Ordered}
 
 Tight:
 
@@ -288,7 +289,7 @@ Multiple paragraphs:
   Item 3.
 \stopitemize
 
-\subsection{Nested}
+\subsection[nested]{Nested}
 
 \startitemize
 \item
@@ -342,7 +343,7 @@ Same thing but with paragraphs:
   Third
 \stopitemize
 
-\subsection{Tabs and spaces}
+\subsection[tabs-and-spaces]{Tabs and spaces}
 
 \startitemize
 \item
@@ -358,7 +359,7 @@ Same thing but with paragraphs:
   \stopitemize
 \stopitemize
 
-\subsection{Fancy list markers}
+\subsection[fancy-list-markers]{Fancy list markers}
 
 \startitemize[n][start=2,left=(,stopper=),width=2.0em]
 \item
@@ -422,7 +423,7 @@ B. Williams
 
 \thinrule
 
-\section{Definition Lists}
+\section[definition-lists]{Definition Lists}
 
 Tight using spaces:
 
@@ -533,7 +534,7 @@ Blank line after term, indented marker, alternate markers:
   \stopitemize
 \stopdescription
 
-\section{HTML Blocks}
+\section[html-blocks]{HTML Blocks}
 
 Simple block on one line:
 
@@ -588,7 +589,7 @@ Hr's:
 
 \thinrule
 
-\section{Inline Markup}
+\section[inline-markup]{Inline Markup}
 
 This is {\em emphasized}, and so {\em is this}.
 
@@ -617,7 +618,7 @@ spaces: a\letterhat{}b c\letterhat{}d, a\lettertilde{}b c\lettertilde{}d.
 
 \thinrule
 
-\section{Smart quotes, ellipses, dashes}
+\section[smart-quotes-ellipses-dashes]{Smart quotes, ellipses, dashes}
 
 \quotation{Hello,} said the spider. \quotation{\quote{Shelob} is my name.}
 
@@ -640,7 +641,7 @@ Ellipses\ldots{}and\ldots{}and\ldots{}.
 
 \thinrule
 
-\section{LaTeX}
+\section[latex]{LaTeX}
 
 \startitemize
 \item
@@ -680,7 +681,7 @@ Here's a LaTeX table:
 
 \thinrule
 
-\section{Special Characters}
+\section[special-characters]{Special Characters}
 
 Here is some unicode:
 
@@ -741,9 +742,9 @@ Minus: -
 
 \thinrule
 
-\section{Links}
+\section[links]{Links}
 
-\subsection{Explicit}
+\subsection[explicit]{Explicit}
 
 Just a \useURL[url4][/url/][][URL]\from[url4].
 
@@ -763,7 +764,7 @@ Just a \useURL[url4][/url/][][URL]\from[url4].
 
 \useURL[url12][][][Empty]\from[url12].
 
-\subsection{Reference}
+\subsection[reference]{Reference}
 
 Foo \useURL[url13][/url/][][bar]\from[url13].
 
@@ -791,7 +792,7 @@ Foo \useURL[url21][/url/][][bar]\from[url21].
 
 Foo \useURL[url22][/url/][][biz]\from[url22].
 
-\subsection{With ampersands}
+\subsection[with-ampersands]{With ampersands}
 
 Here's a \useURL[url23][http://example.com/?foo=1&bar=2][][link with an
 ampersand in the URL]\from[url23].
@@ -804,10 +805,10 @@ Here's an \useURL[url25][/script?foo=1&bar=2][][inline link]\from[url25].
 Here's an \useURL[url26][/script?foo=1&bar=2][][inline link in pointy
 braces]\from[url26].
 
-\subsection{Autolinks}
+\subsection[autolinks]{Autolinks}
 
 With an ampersand:
-\useURL[url27][http://example.com/?foo=1&bar=2][][\hyphenatedurl{http://example.com/?foo=1&bar=2}]\from[url27]
+\useURL[url27][http://example.com/?foo=1&bar=2][][\hyphenatedurl{http://example.com/?foo=1\&bar=2}]\from[url27]
 
 \startitemize
 \item
@@ -819,7 +820,7 @@ With an ampersand:
 \stopitemize
 
 An e-mail address:
-\useURL[url29][mailto:nobody@nowhere.net][][nobody@nowhere.net]\from[url29]
+\useURL[url29][mailto:nobody@nowhere.net][][\hyphenatedurl{nobody@nowhere.net}]\from[url29]
 
 \startblockquote
 Blockquoted:
@@ -834,7 +835,7 @@ or here: <http://example.com/>
 
 \thinrule
 
-\section{Images}
+\section[images]{Images}
 
 From \quotation{Voyage dans la Lune} by Georges Melies (1902):
 
@@ -844,7 +845,7 @@ Here is a movie {\externalfigure[movie.jpg]} icon.
 
 \thinrule
 
-\section{Footnotes}
+\section[footnotes]{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