diff options
| -rw-r--r-- | pandoc.cabal | 4 | ||||
| -rw-r--r-- | stack.yaml | 1 | ||||
| -rw-r--r-- | test/command/1881.md | 5 | ||||
| -rw-r--r-- | test/command/3533-rst-csv-tables.md | 3 | ||||
| -rw-r--r-- | test/html-reader.native | 16 | ||||
| -rw-r--r-- | test/textile-reader.native | 8 | ||||
| -rw-r--r-- | test/txt2tags.native | 81 |
7 files changed, 97 insertions, 21 deletions
diff --git a/pandoc.cabal b/pandoc.cabal index 4d93ea2b9..0907ed82f 100644 --- a/pandoc.cabal +++ b/pandoc.cabal @@ -303,7 +303,7 @@ Library xml >= 1.3.12 && < 1.4, split >= 0.2 && < 0.3, random >= 1 && < 1.2, - pandoc-types >= 1.17 && < 1.18, + pandoc-types >= 1.17.1 && < 1.18, aeson >= 0.7 && < 1.3, aeson-pretty >= 0.8 && < 0.9, tagsoup >= 0.13.7 && < 0.15, @@ -538,7 +538,7 @@ Test-Suite test-pandoc Build-Depends: base >= 4.2 && < 5, syb >= 0.1 && < 0.8, pandoc, - pandoc-types >= 1.17 && < 1.18, + pandoc-types >= 1.17.1 && < 1.18, bytestring >= 0.9 && < 0.11, text >= 0.11 && < 1.3, directory >= 1 && < 1.4, diff --git a/stack.yaml b/stack.yaml index 6b4ba2277..e348ce4c1 100644 --- a/stack.yaml +++ b/stack.yaml @@ -13,4 +13,5 @@ extra-deps: - QuickCheck-2.10.0.1 - tasty-quickcheck-0.9.1 - haddock-library-1.4.3 +- pandoc-types-1.17.1 resolver: lts-9.0 diff --git a/test/command/1881.md b/test/command/1881.md index 0d43997e2..c0902de71 100644 --- a/test/command/1881.md +++ b/test/command/1881.md @@ -43,7 +43,10 @@ </table> ^D [Table [] [AlignRight,AlignLeft,AlignCenter,AlignRight] [0.0,0.0,0.0,0.0] - [] + [[] + ,[] + ,[] + ,[]] [[[Plain [Str "12"]] ,[Plain [Str "12"]] ,[Plain [Str "12"]] diff --git a/test/command/3533-rst-csv-tables.md b/test/command/3533-rst-csv-tables.md index 0e6ed4fea..181462f7f 100644 --- a/test/command/3533-rst-csv-tables.md +++ b/test/command/3533-rst-csv-tables.md @@ -48,7 +48,8 @@ "1","\"" ^D [Table [Str "Test"] [AlignDefault,AlignDefault] [0.0,0.0] - [] + [[] + ,[]] [[[Plain [Str "1"]] ,[Plain [Str "\""]]]]] ``` diff --git a/test/html-reader.native b/test/html-reader.native index 6b7799a88..ed2cd084f 100644 --- a/test/html-reader.native +++ b/test/html-reader.native @@ -425,7 +425,9 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl ,[Plain [Str "6"]]]] ,Header 2 ("tables-without-headers",[],[]) [Str "Tables",Space,Str "without",Space,Str "Headers"] ,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] - [] + [[] + ,[] + ,[]] [[[Plain [Str "1"]] ,[Plain [Str "2"]] ,[Plain [Str "3"]]] @@ -434,7 +436,9 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl ,[Plain [Str "6"]]]] ,HorizontalRule ,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] - [] + [[] + ,[] + ,[]] [[[Plain [Str "1"]] ,[Plain [Str "2"]] ,[Plain [Str "3"]]] @@ -443,7 +447,9 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl ,[Plain [Str "6"]]]] ,HorizontalRule ,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] - [] + [[] + ,[] + ,[]] [[[Plain [Str "1"]] ,[Plain [Str "2"]] ,[Plain [Str "3"]]] @@ -452,7 +458,9 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl ,[Plain [Str "6"]]]] ,HorizontalRule ,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] - [] + [[] + ,[] + ,[]] [[[Plain [Str "1"]] ,[Plain [Str "2"]] ,[Plain [Str "3"]]] diff --git a/test/textile-reader.native b/test/textile-reader.native index 8b3100ffa..a1f3ebb3c 100644 --- a/test/textile-reader.native +++ b/test/textile-reader.native @@ -104,7 +104,9 @@ Pandoc (Meta {unMeta = fromList []}) ,Para [Str "Textile",Space,Str "allows",Space,Str "tables",Space,Str "with",Space,Str "and",Space,Str "without",Space,Str "headers",Space,Str ":"] ,Header 2 ("without-headers",[],[]) [Str "Without",Space,Str "headers"] ,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] - [] + [[] + ,[] + ,[]] [[[Plain [Str "name"]] ,[Plain [Str "age"]] ,[Plain [Str "sex"]]] @@ -142,7 +144,9 @@ Pandoc (Meta {unMeta = fromList []}) ,Para [Str "as",Space,Str "well",Space,Str "as",Space,Strong [Span ("",["foo"],[]) [Str "inline",Space,Str "attributes"]],Space,Str "of",Space,Span ("",[],[("style","color:red;")]) [Str "all",Space,Str "kind"]] ,Para [Str "and",Space,Str "paragraph",Space,Str "attributes,",Space,Str "and",Space,Str "table",Space,Str "attributes."] ,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] - [] + [[] + ,[] + ,[]] [[[Plain [Str "name"]] ,[Plain [Str "age"]] ,[Plain [Str "sex"]]] diff --git a/test/txt2tags.native b/test/txt2tags.native index 2eb795fde..982e727f5 100644 --- a/test/txt2tags.native +++ b/test/txt2tags.native @@ -302,21 +302,27 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]] [[Plain [Str "just",Space,Str "like",Space,Str "when",Space,Str "using",Space,Str "the",Space,Str "two",Space,Str "blank",Space,Str "lines."]]]]]]] ,Header 1 ("table",[],[]) [Str "Table"] ,Table [] [AlignRight] [0.0] - [] + [[]] [[[Plain [Str "Cell",Space,Str "1"]]]] ,Table [] [AlignCenter,AlignCenter,AlignRight] [0.0,0.0,0.0] - [] + [[] + ,[] + ,[]] [[[Plain [Str "Cell",Space,Str "1"]] ,[Plain [Str "Cell",Space,Str "2"]] ,[Plain [Str "Cell",Space,Str "3"]]]] ,Table [] [AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0] - [] + [[] + ,[] + ,[]] [[[Plain [Str "Cell",Space,Str "1"]] ,[Plain [Str "Cell",Space,Str "2"]] ,[Plain [Str "Cell",Space,Str "3"]]]] ,Para [Str "||",Space,Str "Cell",Space,Str "1",Space,Str "|",Space,Str "Cell",Space,Str "2",Space,Str "|",Space,Str "Cell",Space,Str "3",Space,Str "|"] ,Table [] [AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0] - [] + [[] + ,[] + ,[]] [[[Plain [Str "Cell",Space,Str "1"]] ,[Plain [Str "Cell",Space,Str "2"]] ,[Plain [Str "Cell",Space,Str "3"]]]] @@ -355,7 +361,10 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]] ,[] ,[]]] ,Table [] [AlignCenter,AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0] - [] + [[] + ,[] + ,[] + ,[]] [[[Plain [Str "0"]] ,[Plain [Str "1"]] ,[Plain [Str "2"]] @@ -373,7 +382,11 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]] ,[Plain [Str "E"]] ,[Plain [Str "F"]]]] ,Table [] [AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0,0.0] - [] + [[] + ,[] + ,[] + ,[] + ,[]] [[[Plain [Str "1"]] ,[] ,[] @@ -400,7 +413,11 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]] ,[Plain [Str "4"]] ,[Plain [Str "5"]]]] ,Table [] [AlignDefault,AlignCenter,AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0,0.0] - [] + [[] + ,[] + ,[] + ,[] + ,[]] [[[Plain [Str "Jan"]] ,[] ,[] @@ -432,7 +449,11 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]] ,[Plain [Str "80%"]] ,[Plain [Str "100%"]]]] ,Table [] [AlignCenter,AlignDefault,AlignDefault,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0,0.0] - [] + [[] + ,[] + ,[] + ,[] + ,[]] [[[] ,[] ,[Plain [Str "/"]] @@ -464,7 +485,14 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]] ,[] ,[]]] ,Table [] [AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0] - [] + [[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[]] [[[Plain [Str "01"]] ,[Plain [Str "02"]] ,[] @@ -506,7 +534,38 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]] ,[Plain [Str "39"]] ,[Plain [Str "40"]]]] ,Table [] [AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0] - [] + [[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[] + ,[]] [[[Plain [Str "0"]] ,[Plain [Str "1"]] ,[Plain [Str "2"]] @@ -540,7 +599,7 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]] ,[Plain [Str "E"]] ,[Plain [Str "F"]]]] ,Table [] [AlignCenter] [0.0] - [] + [[]] [[[]] ,[[]] ,[[]]] |