diff options
-rw-r--r-- | src/Text/Pandoc/Definition.hs | 6 | ||||
-rw-r--r-- | tests/html-reader.native | 2 | ||||
-rw-r--r-- | tests/latex-reader.native | 2 | ||||
-rw-r--r-- | tests/lhs-test.native | 2 | ||||
-rw-r--r-- | tests/markdown-reader-more.native | 2 | ||||
-rw-r--r-- | tests/rst-reader.native | 2 | ||||
-rw-r--r-- | tests/s5.native | 2 | ||||
-rw-r--r-- | tests/tables-rstsubset.native | 2 | ||||
-rw-r--r-- | tests/tables.native | 2 | ||||
-rw-r--r-- | tests/testsuite.native | 2 | ||||
-rw-r--r-- | tests/writer.native | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/src/Text/Pandoc/Definition.hs b/src/Text/Pandoc/Definition.hs index 76d8712a0..02bf5efbb 100644 --- a/src/Text/Pandoc/Definition.hs +++ b/src/Text/Pandoc/Definition.hs @@ -36,9 +36,9 @@ import Data.Generics data Pandoc = Pandoc Meta [Block] deriving (Eq, Read, Show, Typeable, Data) -- | Bibliographic information for the document: title, authors, date. -data Meta = Meta [Inline] -- title - [[Inline]] -- list of authors - [Inline] -- date +data Meta = Meta { docTitle :: [Inline] + , docAuthors :: [[Inline]] + , docDate :: [Inline] } deriving (Eq, Show, Read, Typeable, Data) -- | Alignment of a table column. diff --git a/tests/html-reader.native b/tests/html-reader.native index 26bbd6693..5eb74768c 100644 --- a/tests/html-reader.native +++ b/tests/html-reader.native @@ -1,4 +1,4 @@ -Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] [] []) +Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docAuthors = [], docDate = []}) [ Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",Space,Str "Gruber's",Space,Str "markdown",Space,Str "test",Space,Str "suite."] , HorizontalRule , Header 1 [Str "Headers"] diff --git a/tests/latex-reader.native b/tests/latex-reader.native index efd911daf..76e5daf08 100644 --- a/tests/latex-reader.native +++ b/tests/latex-reader.native @@ -1,4 +1,4 @@ -Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] [[Str "John",Space,Str "MacFarlane"],[Str "Anonymous"]] [Str "July",Space,Str "17,",Space,Str "2006"]) +Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docAuthors = [[Str "John",Space,Str "MacFarlane"],[Str "Anonymous"]], docDate = [Str "July",Space,Str "17,",Space,Str "2006"]}) [ Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc.",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",Space,Str "Gruber",Apostrophe,Str "s",Space,Str "markdown",Space,Str "test",Space,Str "suite."] , HorizontalRule , Header 1 [Str "Headers"] diff --git a/tests/lhs-test.native b/tests/lhs-test.native index d5538598c..51274399b 100644 --- a/tests/lhs-test.native +++ b/tests/lhs-test.native @@ -1,4 +1,4 @@ -Pandoc (Meta [] [] []) +Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []}) [ Header 1 [Str "lhs",Space,Str "test"] , Para [Code "unsplit",Space,Str "is",Space,Str "an",Space,Str "arrow",Space,Str "that",Space,Str "takes",Space,Str "a",Space,Str "pair",Space,Str "of",Space,Str "values",Space,Str "and",Space,Str "combines",Space,Str "them",Space,Str "to",Space,Str "return",Space,Str "a",Space,Str "single",Space,Str "value:"] , CodeBlock ("",["sourceCode","literate","haskell"],[]) "unsplit :: (Arrow a) => (b -> c -> d) -> a (b, c) d\nunsplit = arr . uncurry \n -- arr (\\op (x,y) -> x `op` y) " diff --git a/tests/markdown-reader-more.native b/tests/markdown-reader-more.native index 5483e4c4d..1db191c16 100644 --- a/tests/markdown-reader-more.native +++ b/tests/markdown-reader-more.native @@ -1,4 +1,4 @@ -Pandoc (Meta [] [] []) +Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []}) [ 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"] , Para [Link [Str "foo"] ("/url",""),Space,Str "and",Space,Link [Str "bar"] ("/url","title")] diff --git a/tests/rst-reader.native b/tests/rst-reader.native index 8b7ce24c4..eddeb6e8d 100644 --- a/tests/rst-reader.native +++ b/tests/rst-reader.native @@ -1,4 +1,4 @@ -Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ":",Space,Str "Subtitle"] [[Str "John",Space,Str "MacFarlane"],[Str "Anonymous"]] [Str "July",Space,Str "17,",Space,Str "2006"]) +Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite",Str ":",Space,Str "Subtitle"], docAuthors = [[Str "John",Space,Str "MacFarlane"],[Str "Anonymous"]], docDate = [Str "July",Space,Str "17,",Space,Str "2006"]}) [ DefinitionList [ ([Str "Revision"], [ [ Plain [Str "3"] ] diff --git a/tests/s5.native b/tests/s5.native index 6d2ebb127..c6175478d 100644 --- a/tests/s5.native +++ b/tests/s5.native @@ -1,4 +1,4 @@ -Pandoc (Meta [Str "My",Space,Str "S5",Space,Str "Document"] [[Str "Sam",Space,Str "Smith"],[Str "Jen",Space,Str "Jones"]] [Str "July",Space,Str "15,",Space,Str "2006"]) +Pandoc (Meta {docTitle = [Str "My",Space,Str "S5",Space,Str "Document"], docAuthors = [[Str "Sam",Space,Str "Smith"],[Str "Jen",Space,Str "Jones"]], docDate = [Str "July",Space,Str "15,",Space,Str "2006"]}) [ Header 1 [Str "First",Space,Str "slide"] , BulletList [ [ Plain [Str "first",Space,Str "bullet"] ] diff --git a/tests/tables-rstsubset.native b/tests/tables-rstsubset.native index 10b638243..fb01230c7 100644 --- a/tests/tables-rstsubset.native +++ b/tests/tables-rstsubset.native @@ -1,4 +1,4 @@ -Pandoc (Meta [] [] []) +Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []}) [ Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption",Str ":"] , Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.125,0.1125,0.1375,0.15] [ [ Plain [Str "Right"] ] diff --git a/tests/tables.native b/tests/tables.native index 7852ee3a7..aa967318d 100644 --- a/tests/tables.native +++ b/tests/tables.native @@ -1,4 +1,4 @@ -Pandoc (Meta [] [] []) +Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []}) [ Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"] , Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax",Str "."] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0] [ [ Plain [Str "Right"] ] diff --git a/tests/testsuite.native b/tests/testsuite.native index 9de43d403..7560317c5 100644 --- a/tests/testsuite.native +++ b/tests/testsuite.native @@ -1,4 +1,4 @@ -Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] [[Str "John",Space,Str "MacFarlane"],[Str "Anonymous"]] [Str "July",Space,Str "17,",Space,Str "2006"]) +Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docAuthors = [[Str "John",Space,Str "MacFarlane"],[Str "Anonymous"]], docDate = [Str "July",Space,Str "17,",Space,Str "2006"]}) [ Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc",Str ".",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",Space,Str "Gruber",Apostrophe,Str "s",Space,Str "markdown",Space,Str "test",Space,Str "suite",Str "."] , HorizontalRule , Header 1 [Str "Headers"] diff --git a/tests/writer.native b/tests/writer.native index 9de43d403..7560317c5 100644 --- a/tests/writer.native +++ b/tests/writer.native @@ -1,4 +1,4 @@ -Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] [[Str "John",Space,Str "MacFarlane"],[Str "Anonymous"]] [Str "July",Space,Str "17,",Space,Str "2006"]) +Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docAuthors = [[Str "John",Space,Str "MacFarlane"],[Str "Anonymous"]], docDate = [Str "July",Space,Str "17,",Space,Str "2006"]}) [ Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "set",Space,Str "of",Space,Str "tests",Space,Str "for",Space,Str "pandoc",Str ".",Space,Str "Most",Space,Str "of",Space,Str "them",Space,Str "are",Space,Str "adapted",Space,Str "from",Space,Str "John",Space,Str "Gruber",Apostrophe,Str "s",Space,Str "markdown",Space,Str "test",Space,Str "suite",Str "."] , HorizontalRule , Header 1 [Str "Headers"] |