36675bd · typeable/pandoc

git.iko.soy/typeable/pandoc

Added accessors (docTitle, docAuthors, docDate) to Meta type.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1853 788f1e2b-df1e-0410-8736-df70ead52e1b

commit36675bd20612fc75df97dda3a3c0d2a5b694f83c authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateSun 28 Feb 2010, 08:13 (17 years ago) parent76ab888

11 files changed+13−13

compare with master

unifiedsplit

src/Text/Pandoc/Definition.hs+3−3 tests/html-reader.native+1−1 tests/latex-reader.native+1−1 tests/lhs-test.native+1−1 tests/markdown-reader-more.native+1−1 tests/rst-reader.native+1−1 tests/s5.native+1−1 tests/tables-rstsubset.native+1−1 tests/tables.native+1−1 tests/testsuite.native+1−1 tests/writer.native+1−1

src/Text/Pandoc/Definition.hs+3−3

@@ -36,9 +36,9 @@ import Data.Generics

3636data Pandoc = Pandoc Meta [Block] deriving (Eq, Read, Show, Typeable, Data)

3737

3838-- | Bibliographic information for the document: title, authors, date.

39−data Meta = Meta [Inline] -- title

40− [[Inline]] -- list of authors

41− [Inline] -- date

39+data Meta = Meta { docTitle :: [Inline]

40+ , docAuthors :: [[Inline]]

41+ , docDate :: [Inline] }

4242 deriving (Eq, Show, Read, Typeable, Data)

4343

4444-- | Alignment of a table column.

tests/html-reader.native+1−1

@@ -1,4 +1,4 @@

1−Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] [] [])

1+Pandoc (Meta {docTitle = [Str "Pandoc",Space,Str "Test",Space,Str "Suite"], docAuthors = [], docDate = []})

22[ 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."]

33, HorizontalRule

44, Header 1 [Str "Headers"]

tests/latex-reader.native+1−1

@@ -1,4 +1,4 @@

1−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"])

1+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"]})

22[ 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."]

33, HorizontalRule

44, Header 1 [Str "Headers"]

tests/lhs-test.native+1−1

@@ -1,4 +1,4 @@

1−Pandoc (Meta [] [] [])

1+Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []})

22[ Header 1 [Str "lhs",Space,Str "test"]

33, 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:"]

44, 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) "

tests/markdown-reader-more.native+1−1

@@ -1,4 +1,4 @@

1−Pandoc (Meta [] [] [])

1+Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []})

22[ Header 1 [Str "Additional",Space,Str "markdown",Space,Str "reader",Space,Str "tests"]

33, Header 2 [Str "Blank",Space,Str "line",Space,Str "before",Space,Str "URL",Space,Str "in",Space,Str "link",Space,Str "reference"]

44, Para [Link [Str "foo"] ("/url",""),Space,Str "and",Space,Link [Str "bar"] ("/url","title")]

tests/rst-reader.native+1−1

@@ -1,4 +1,4 @@

1−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"])

1+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"]})

22[ DefinitionList

33 [ ([Str "Revision"],

44 [ [ Plain [Str "3"] ]

tests/s5.native+1−1

@@ -1,4 +1,4 @@

1−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"])

1+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"]})

22[ Header 1 [Str "First",Space,Str "slide"]

33, BulletList

44 [ [ Plain [Str "first",Space,Str "bullet"] ]

tests/tables-rstsubset.native+1−1

@@ -1,4 +1,4 @@

1−Pandoc (Meta [] [] [])

1+Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []})

22[ Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption",Str ":"]

33, Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.125,0.1125,0.1375,0.15]

44 [ [ Plain [Str "Right"] ]

tests/tables.native+1−1

@@ -1,4 +1,4 @@

1−Pandoc (Meta [] [] [])

1+Pandoc (Meta {docTitle = [], docAuthors = [], docDate = []})

22[ Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"]

33, 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]

44 [ [ Plain [Str "Right"] ]

tests/testsuite.native+1−1

@@ -1,4 +1,4 @@

1−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"])

22[ 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 "."]

33, HorizontalRule

44, Header 1 [Str "Headers"]

tests/writer.native+1−1

@@ -1,4 +1,4 @@

1−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"])

33, HorizontalRule

44, Header 1 [Str "Headers"]