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.

3 files changed, 6 insertions, 3 deletions

diff --git a/tests/Tests/Arbitrary.hs b/tests/Tests/Arbitrary.hs
index 9d65e1f1f..d0000dcee 100644
--- a/tests/Tests/Arbitrary.hs
+++ b/tests/Tests/Arbitrary.hs
@@ -81,7 +81,7 @@ arbBlock n = frequency $ [ (10, liftM Plain $ arbInlines (n-1))
                                          ])
                          , (5,  do x1 <- choose (1 :: Int, 6)
                                    x2 <- arbInlines (n-1)
-                                   return (Header x1 x2))
+                                   return (Header x1 nullAttr x2))
                          , (2, return HorizontalRule)
                          ] ++ [x | x <- nesters, n > 0]
    where nesters = [ (5,  liftM BlockQuote $ listOf1 $ arbBlock (n-1))
diff --git a/tests/Tests/Old.hs b/tests/Tests/Old.hs
index d35620062..c5d677bac 100644
--- a/tests/Tests/Old.hs
+++ b/tests/Tests/Old.hs
@@ -147,8 +147,11 @@ lhsWriterTests format
 lhsReaderTest :: String -> Test
 lhsReaderTest format =
   testWithNormalize normalizer "lhs" ["-r", format, "-w", "native"]
-    ("lhs-test" <.> format) "lhs-test.native"
+    ("lhs-test" <.> format) norm
    where normalizer = writeNative def . normalize . readNative
+         norm = if format == "markdown+lhs"
+                   then "lhs-test-markdown.native"
+                   else "lhs-test.native"
 
 writerTests :: String -> [Test]
 writerTests format
diff --git a/tests/Tests/Writers/ConTeXt.hs b/tests/Tests/Writers/ConTeXt.hs
index 68e32cf58..1beed33bb 100644
--- a/tests/Tests/Writers/ConTeXt.hs
+++ b/tests/Tests/Writers/ConTeXt.hs
@@ -42,7 +42,7 @@ tests = [ testGroup "inline code"
           ]
         , testGroup "headers"
           [ "level 1" =:
-            header 1 "My header" =?> "\\section[my-header]{My header}"
+            headerWith ("my-header",[],[]) 1 "My header" =?> "\\section[my-header]{My header}"
           ]
         , testGroup "bullet lists"
           [ "nested" =: