1 files changed, 20 insertions, 20 deletions
diff --git a/tests/markdown-reader-more.native b/tests/markdown-reader-more.native
index f574b652f..d2330b4d9 100644
--- a/tests/markdown-reader-more.native
+++ b/tests/markdown-reader-more.native
@@ -1,54 +1,54 @@
-[Header 1 [Str "Additional",Space,Str "markdown",Space,Str "reader",Space,Str "tests"]
-,Header 2 [Str "Blank",Space,Str "line",Space,Str "before",Space,Str "URL",Space,Str "in",Space,Str "link",Space,Str "reference"]
+[Header 1 ("additional-markdown-reader-tests",[],[]) [Str "Additional",Space,Str "markdown",Space,Str "reader",Space,Str "tests"]
+,Header 2 ("blank-line-before-url-in-link-reference",[],[]) [Str "Blank",Space,Str "line",Space,Str "before",Space,Str "URL",Space,Str "in",Space,Str "link",Space,Str "reference"]
 ,Para [Link [Str "foo"] ("/url",""),Space,Str "and",Space,Link [Str "bar"] ("/url","title")]
-,Header 2 [Str "Raw",Space,Str "ConTeXt",Space,Str "environments"]
+,Header 2 ("raw-context-environments",[],[]) [Str "Raw",Space,Str "ConTeXt",Space,Str "environments"]
 ,Plain [RawInline "tex" "\\placeformula "]
 ,RawBlock "context" "\\startformula\n   L_{1} = L_{2}\n   \\stopformula"
 ,RawBlock "context" "\\start[a2]\n\\start[a2]\n\\stop[a2]\n\\stop[a2]"
-,Header 2 [Str "URLs",Space,Str "with",Space,Str "spaces"]
+,Header 2 ("urls-with-spaces",[],[]) [Str "URLs",Space,Str "with",Space,Str "spaces"]
 ,Para [Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("/bar%20and%20baz",""),Space,Link [Str "foo"] ("bar%20baz","title")]
 ,Para [Link [Str "baz"] ("/foo%20foo",""),Space,Link [Str "bam"] ("/foo%20fee",""),Space,Link [Str "bork"] ("/foo/zee%20zob","title")]
-,Header 2 [Str "Horizontal",Space,Str "rules",Space,Str "with",Space,Str "spaces",Space,Str "at",Space,Str "end"]
+,Header 2 ("horizontal-rules-with-spaces-at-end",[],[]) [Str "Horizontal",Space,Str "rules",Space,Str "with",Space,Str "spaces",Space,Str "at",Space,Str "end"]
 ,HorizontalRule
 ,HorizontalRule
-,Header 2 [Str "Raw",Space,Str "HTML",Space,Str "before",Space,Str "header"]
+,Header 2 ("raw-html-before-header",[],[]) [Str "Raw",Space,Str "HTML",Space,Str "before",Space,Str "header"]
 ,Para [RawInline "html" "<a>",RawInline "html" "</a>"]
-,Header 3 [Str "my",Space,Str "header"]
-,Header 2 [Str "$",Space,Str "in",Space,Str "math"]
+,Header 3 ("my-header",[],[]) [Str "my",Space,Str "header"]
+,Header 2 ("in-math",[],[]) [Str "$",Space,Str "in",Space,Str "math"]
 ,Para [Math InlineMath "\\$2 + \\$3"]
-,Header 2 [Str "Commented-out",Space,Str "list",Space,Str "item"]
+,Header 2 ("commented-out-list-item",[],[]) [Str "Commented-out",Space,Str "list",Space,Str "item"]
 ,BulletList
  [[Plain [Str "one",Space,RawInline "html" "<!--\n- two\n-->"]]
  ,[Plain [Str "three"]]]
-,Header 2 [Str "Backslash",Space,Str "newline"]
+,Header 2 ("backslash-newline",[],[]) [Str "Backslash",Space,Str "newline"]
 ,Para [Str "hi",LineBreak,Str "there"]
-,Header 2 [Str "Code",Space,Str "spans"]
+,Header 2 ("code-spans",[],[]) [Str "Code",Space,Str "spans"]
 ,Para [Code ("",[],[]) "hi\\"]
 ,Para [Code ("",[],[]) "hi there"]
 ,Para [Code ("",[],[]) "hi````there"]
 ,Para [Str "`hi"]
 ,Para [Str "there`"]
-,Header 2 [Str "Multilingual",Space,Str "URLs"]
+,Header 2 ("multilingual-urls",[],[]) [Str "Multilingual",Space,Str "URLs"]
 ,Para [RawInline "html" "<http://\27979.com?\27979=\27979>"]
 ,Para [Link [Str "foo"] ("/bar/\27979?x=\27979","title")]
 ,Para [Link [Str "\27979@foo.\27979.baz"] ("mailto:\27979@foo.\27979.baz","")]
-,Header 2 [Str "Numbered",Space,Str "examples"]
+,Header 2 ("numbered-examples",[],[]) [Str "Numbered",Space,Str "examples"]
 ,OrderedList (1,Example,TwoParens)
  [[Plain [Str "First",Space,Str "example."]]
  ,[Plain [Str "Second",Space,Str "example."]]]
 ,Para [Str "Explanation",Space,Str "of",Space,Str "examples",Space,Str "(2)",Space,Str "and",Space,Str "(3)."]
 ,OrderedList (3,Example,TwoParens)
  [[Plain [Str "Third",Space,Str "example."]]]
-,Header 2 [Str "Macros"]
+,Header 2 ("macros",[],[]) [Str "Macros"]
 ,Para [Math InlineMath "\\langle x,y \\rangle"]
-,Header 2 [Str "Case-insensitive",Space,Str "references"]
+,Header 2 ("case-insensitive-references",[],[]) [Str "Case-insensitive",Space,Str "references"]
 ,Para [Link [Str "Fum"] ("/fum","")]
 ,Para [Link [Str "FUM"] ("/fum","")]
 ,Para [Link [Str "bat"] ("/bat","")]
-,Header 2 [Str "Curly",Space,Str "smart",Space,Str "quotes"]
+,Header 2 ("curly-smart-quotes",[],[]) [Str "Curly",Space,Str "smart",Space,Str "quotes"]
 ,Para [Quoted DoubleQuote [Str "Hi"]]
 ,Para [Quoted SingleQuote [Str "Hi"]]
-,Header 2 [Str "Consecutive",Space,Str "lists"]
+,Header 2 ("consecutive-lists",[],[]) [Str "Consecutive",Space,Str "lists"]
 ,BulletList
  [[Plain [Str "one"]]
  ,[Plain [Str "two"]]]
@@ -58,9 +58,9 @@
 ,OrderedList (1,LowerAlpha,Period)
  [[Plain [Str "one"]]
  ,[Plain [Str "two"]]]
-,Header 2 [Str "Implicit",Space,Str "header",Space,Str "references"]
-,Header 3 [Str "My",Space,Str "header"]
-,Header 3 [Str "My",Space,Str "other",Space,Str "header"]
+,Header 2 ("implicit-header-references",[],[]) [Str "Implicit",Space,Str "header",Space,Str "references"]
+,Header 3 ("my-header-1",[],[]) [Str "My",Space,Str "header"]
+,Header 3 ("my-other-header",[],[]) [Str "My",Space,Str "other",Space,Str "header"]
 ,Para [Str "A",Space,Str "link",Space,Str "to",Space,Link [Str "My",Space,Str "header"] ("#my-header",""),Str "."]
 ,Para [Str "Another",Space,Str "link",Space,Str "to",Space,Link [Str "it"] ("#my-header",""),Str "."]
 ,Para [Str "But",Space,Str "this",Space,Str "is",Space,Str "not",Space,Str "a",Space,Str "link",Space,Str "to",Space,Link [Str "My",Space,Str "other",Space,Str "header"] ("/foo",""),Str ",",Space,Str "since",Space,Str "the",Space,Str "reference",Space,Str "is",Space,Str "defined."]]