Added Attr field to Header.

Previously header ids were autogenerated by the writers.
Now they are generated (unless supplied explicitly) in the
markdown parser, if the `header_identifiers` extension is
selected.

In addition, the textile reader now supports id attributes on
headers.

1 files changed, 29 insertions, 29 deletions

diff --git a/tests/mediawiki-reader.native b/tests/mediawiki-reader.native
index 122b52545..a3dc2a08c 100644
--- a/tests/mediawiki-reader.native
+++ b/tests/mediawiki-reader.native
@@ -1,39 +1,39 @@
 Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []})
-[Header 1 [Str "header"]
-,Header 2 [Str "header",Space,Str "level",Space,Str "two"]
-,Header 3 [Str "header",Space,Str "level",Space,Str "3"]
-,Header 4 [Str "header",Space,Emph [Str "level"],Space,Str "four"]
-,Header 5 [Str "header",Space,Str "level",Space,Str "5"]
-,Header 6 [Str "header",Space,Str "level",Space,Str "6"]
+[Header 1 ("",[],[]) [Str "header"]
+,Header 2 ("",[],[]) [Str "header",Space,Str "level",Space,Str "two"]
+,Header 3 ("",[],[]) [Str "header",Space,Str "level",Space,Str "3"]
+,Header 4 ("",[],[]) [Str "header",Space,Emph [Str "level"],Space,Str "four"]
+,Header 5 ("",[],[]) [Str "header",Space,Str "level",Space,Str "5"]
+,Header 6 ("",[],[]) [Str "header",Space,Str "level",Space,Str "6"]
 ,Para [Str "=======",Space,Str "not",Space,Str "a",Space,Str "header",Space,Str "========"]
 ,Para [Code ("",[],[]) "==\160not\160a\160header\160=="]
-,Header 2 [Str "emph",Space,Str "and",Space,Str "strong"]
+,Header 2 ("",[],[]) [Str "emph",Space,Str "and",Space,Str "strong"]
 ,Para [Emph [Str "emph"],Space,Strong [Str "strong"]]
 ,Para [Strong [Emph [Str "strong",Space,Str "and",Space,Str "emph"]]]
 ,Para [Strong [Emph [Str "emph",Space,Str "inside"],Space,Str "strong"]]
 ,Para [Strong [Str "strong",Space,Str "with",Space,Emph [Str "emph"]]]
 ,Para [Emph [Strong [Str "strong",Space,Str "inside"],Space,Str "emph"]]
-,Header 2 [Str "horizontal",Space,Str "rule"]
+,Header 2 ("",[],[]) [Str "horizontal",Space,Str "rule"]
 ,Para [Str "top"]
 ,HorizontalRule
 ,Para [Str "bottom"]
 ,HorizontalRule
-,Header 2 [Str "nowiki"]
+,Header 2 ("",[],[]) [Str "nowiki"]
 ,Para [Str "''not",Space,Str "emph''"]
-,Header 2 [Str "strikeout"]
+,Header 2 ("",[],[]) [Str "strikeout"]
 ,Para [Strikeout [Str "This",Space,Str "is",Space,Emph [Str "struck",Space,Str "out"]]]
-,Header 2 [Str "entities"]
+,Header 2 ("",[],[]) [Str "entities"]
 ,Para [Str "hi",Space,Str "&",Space,Str "low"]
 ,Para [Str "hi",Space,Str "&",Space,Str "low"]
 ,Para [Str "G\246del"]
 ,Para [Str "\777\2730"]
-,Header 2 [Str "comments"]
+,Header 2 ("",[],[]) [Str "comments"]
 ,Para [Str "inline",Space,Str "comment"]
 ,Para [Str "between",Space,Str "blocks"]
-,Header 2 [Str "linebreaks"]
+,Header 2 ("",[],[]) [Str "linebreaks"]
 ,Para [Str "hi",LineBreak,Str "there"]
 ,Para [Str "hi",LineBreak,Str "there"]
-,Header 2 [Str ":",Space,Str "indents"]
+,Header 2 ("",[],[]) [Str ":",Space,Str "indents"]
 ,Para [Str "hi"]
 ,DefinitionList
  [([],
@@ -46,36 +46,36 @@ Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []})
      [([],
        [[Plain [Str "there"]]])]]])]
 ,Para [Str "bud"]
-,Header 2 [Str "p",Space,Str "tags"]
+,Header 2 ("",[],[]) [Str "p",Space,Str "tags"]
 ,Para [Str "hi",Space,Str "there"]
 ,Para [Str "bud"]
 ,Para [Str "another"]
-,Header 2 [Str "raw",Space,Str "html"]
+,Header 2 ("",[],[]) [Str "raw",Space,Str "html"]
 ,Para [Str "hi",Space,RawInline "html" "<span style=\"color:red\">",Emph [Str "there"],RawInline "html" "</span>",Str "."]
 ,Para [RawInline "html" "<ins>",Str "inserted",RawInline "html" "</ins>"]
 ,RawBlock "html" "<div class=\"special\">"
 ,Para [Str "hi",Space,Emph [Str "there"]]
 ,RawBlock "html" "</div>"
-,Header 2 [Str "sup,",Space,Str "sub,",Space,Str "del"]
+,Header 2 ("",[],[]) [Str "sup,",Space,Str "sub,",Space,Str "del"]
 ,Para [Str "H",Subscript [Str "2"],Str "O",Space,Str "base",Superscript [Emph [Str "exponent"]],Space,Strikeout [Str "hello"]]
-,Header 2 [Str "inline",Space,Str "code"]
+,Header 2 ("",[],[]) [Str "inline",Space,Str "code"]
 ,Para [Code ("",[],[]) "*\8594*",Space,Code ("",[],[]) "typed",Space,Code ("",["haskell"],[]) ">>="]
-,Header 2 [Str "code",Space,Str "blocks"]
+,Header 2 ("",[],[]) [Str "code",Space,Str "blocks"]
 ,CodeBlock ("",[],[]) "case xs of\n     (_:_) -> reverse xs\n     []    -> ['*']"
 ,CodeBlock ("",["haskell"],[]) "case xs of\n     (_:_) -> reverse xs\n     []    -> ['*']"
 ,CodeBlock ("",["ruby","numberLines"],[("startFrom","100")]) "widgets.each do |w|\n  print w.price\nend"
-,Header 2 [Str "block",Space,Str "quotes"]
+,Header 2 ("",[],[]) [Str "block",Space,Str "quotes"]
 ,Para [Str "Regular",Space,Str "paragraph"]
 ,BlockQuote
  [Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "block",Space,Str "quote."]
  ,Para [Str "With",Space,Str "two",Space,Str "paragraphs."]]
 ,Para [Str "Nother",Space,Str "paragraph."]
-,Header 2 [Str "external",Space,Str "links"]
+,Header 2 ("",[],[]) [Str "external",Space,Str "links"]
 ,Para [Link [Emph [Str "Google"],Space,Str "search",Space,Str "engine"] ("http://google.com","")]
 ,Para [Link [Str "http://johnmacfarlane.net/pandoc/"] ("http://johnmacfarlane.net/pandoc/","")]
 ,Para [Link [Str "1"] ("http://google.com",""),Space,Link [Str "2"] ("http://yahoo.com","")]
 ,Para [Link [Str "email",Space,Str "me"] ("mailto:info@example.org","")]
-,Header 2 [Str "internal",Space,Str "links"]
+,Header 2 ("",[],[]) [Str "internal",Space,Str "links"]
 ,Para [Link [Str "Help"] ("Help","wikilink")]
 ,Para [Link [Str "the",Space,Str "help",Space,Str "page"] ("Help","wikilink")]
 ,Para [Link [Str "Helpers"] ("Help","wikilink")]
@@ -83,12 +83,12 @@ Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []})
 ,Para [Link [Str "Contents"] ("Help:Contents","wikilink")]
 ,Para [Link [Str "#My",Space,Str "anchor"] ("#My_anchor","wikilink")]
 ,Para [Link [Str "and",Space,Str "text"] ("Page#with_anchor","wikilink")]
-,Header 2 [Str "images"]
+,Header 2 ("",[],[]) [Str "images"]
 ,Para [Image [Str "caption"] ("example.jpg","image")]
 ,Para [Image [Str "the",Space,Emph [Str "caption"],Space,Str "with",Space,Link [Str "external",Space,Str "link"] ("http://google.com","")] ("example.jpg","image")]
 ,Para [Image [Str "caption"] ("example.jpg","image")]
 ,Para [Image [Str "example.jpg"] ("example.jpg","image")]
-,Header 2 [Str "lists"]
+,Header 2 ("",[],[]) [Str "lists"]
 ,BulletList
  [[Plain [Str "Start",Space,Str "each",Space,Str "line"]]
  ,[Plain [Str "with",Space,Str "an",Space,Str "asterisk",Space,Str "(*)."]
@@ -161,21 +161,21 @@ Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []})
  [[Plain [Str "Amsterdam"]]
  ,[Plain [Str "Rotterdam"]]
  ,[Plain [Str "The",Space,Str "Hague"]]]
-,Header 2 [Str "math"]
+,Header 2 ("",[],[]) [Str "math"]
 ,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Math InlineMath "x=\\frac{y^\\pi}{z}",Str "."]
-,Header 2 [Str "preformatted",Space,Str "blocks"]
+,Header 2 ("",[],[]) [Str "preformatted",Space,Str "blocks"]
 ,Para [Code ("",[],[]) "Start\160each\160line\160with\160a\160space.",LineBreak,Code ("",[],[]) "Text\160is\160",Strong [Code ("",[],[]) "preformatted"],Code ("",[],[]) "\160and",LineBreak,Emph [Code ("",[],[]) "markups"],Code ("",[],[]) "\160",Strong [Emph [Code ("",[],[]) "can"]],Code ("",[],[]) "\160be\160done."]
 ,Para [Code ("",[],[]) "\160hell\160\160\160\160\160\160yeah"]
 ,Para [Code ("",[],[]) "Start\160with\160a\160space\160in\160the\160first\160column,",LineBreak,Code ("",[],[]) "(before\160the\160<nowiki>).",LineBreak,Code ("",[],[]) "",LineBreak,Code ("",[],[]) "Then\160your\160block\160format\160will\160be",LineBreak,Code ("",[],[]) "\160\160\160\160maintained.",LineBreak,Code ("",[],[]) "",LineBreak,Code ("",[],[]) "This\160is\160good\160for\160copying\160in\160code\160blocks:",LineBreak,Code ("",[],[]) "",LineBreak,Code ("",[],[]) "def\160function():",LineBreak,Code ("",[],[]) "\160\160\160\160\"\"\"documentation\160string\"\"\"",LineBreak,Code ("",[],[]) "",LineBreak,Code ("",[],[]) "\160\160\160\160if\160True:",LineBreak,Code ("",[],[]) "\160\160\160\160\160\160\160\160print\160True",LineBreak,Code ("",[],[]) "\160\160\160\160else:",LineBreak,Code ("",[],[]) "\160\160\160\160\160\160\160\160print\160False"]
 ,Para [Str "Not"]
 ,RawBlock "html" "<hr/>"
 ,Para [Str "preformatted"]
-,Header 2 [Str "templates"]
+,Header 2 ("",[],[]) [Str "templates"]
 ,RawBlock "mediawiki" "{{Welcome}}"
 ,RawBlock "mediawiki" "{{Foo:Bar}}"
 ,RawBlock "mediawiki" "{{Thankyou|all your effort|Me}}"
 ,Para [Str "Written",Space,RawInline "mediawiki" "{{{date}}}",Space,Str "by",Space,RawInline "mediawiki" "{{{name}}}",Str "."]
-,Header 2 [Str "tables"]
+,Header 2 ("",[],[]) [Str "tables"]
 ,Table [] [AlignDefault,AlignDefault] [0.0,0.0]
  [[]
  ,[]]
@@ -237,5 +237,5 @@ Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []})
      ,[Para [Str "ice",Space,Str "cream"]]]]]]
  ,[[Para [Str "Butter"]]
   ,[Para [Str "Ice",Space,Str "cream"]]]]
-,Header 2 [Str "notes"]
+,Header 2 ("",[],[]) [Str "notes"]
 ,Para [Str "My",Space,Str "note!",Note [Plain [Str "This."]]]]