git.iko.soy/typeable/pandoc
on master help sign in
Use pandoc-types 1.17.1. Tests updated for new simpleTable behavior...

with empty headers.

commitd70b89c0d9f2636814fc85232b017751a5469f75 authorJohn MacFarlane <jgm@berkeley.edu> dateSun 20 Aug 2017, 23:24 (9 years ago) parent9cc128b
7 files changed+97−21
compare with master
unifiedsplit
pandoc.cabal+2−2 stack.yaml+1 test/command/1881.md+4−1 test/command/3533-rst-csv-tables.md+2−1 test/html-reader.native+12−4 test/textile-reader.native+6−2 test/txt2tags.native+70−11
pandoc.cabal+2−2
@@ -303,7 +303,7 @@ Library
303303 xml >= 1.3.12 && < 1.4,
304304 split >= 0.2 && < 0.3,
305305 random >= 1 && < 1.2,
306− pandoc-types >= 1.17 && < 1.18,
306+ pandoc-types >= 1.17.1 && < 1.18,
307307 aeson >= 0.7 && < 1.3,
308308 aeson-pretty >= 0.8 && < 0.9,
309309 tagsoup >= 0.13.7 && < 0.15,
@@ -538,7 +538,7 @@ Test-Suite test-pandoc
538538 Build-Depends: base >= 4.2 && < 5,
539539 syb >= 0.1 && < 0.8,
540540 pandoc,
541− pandoc-types >= 1.17 && < 1.18,
541+ pandoc-types >= 1.17.1 && < 1.18,
542542 bytestring >= 0.9 && < 0.11,
543543 text >= 0.11 && < 1.3,
544544 directory >= 1 && < 1.4,
stack.yaml+1
@@ -13,4 +13,5 @@ extra-deps:
1313- QuickCheck-2.10.0.1
1414- tasty-quickcheck-0.9.1
1515- haddock-library-1.4.3
16+- pandoc-types-1.17.1
1617resolver: lts-9.0
test/command/1881.md+4−1
@@ -43,7 +43,10 @@
4343</table>
4444^D
4545[Table [] [AlignRight,AlignLeft,AlignCenter,AlignRight] [0.0,0.0,0.0,0.0]
46− []
46+ [[]
47+ ,[]
48+ ,[]
49+ ,[]]
4750 [[[Plain [Str "12"]]
4851 ,[Plain [Str "12"]]
4952 ,[Plain [Str "12"]]
test/command/3533-rst-csv-tables.md+2−1
@@ -48,7 +48,8 @@
4848 "1","\""
4949^D
5050[Table [Str "Test"] [AlignDefault,AlignDefault] [0.0,0.0]
51− []
51+ [[]
52+ ,[]]
5253 [[[Plain [Str "1"]]
5354 ,[Plain [Str "\""]]]]]
5455```
test/html-reader.native+12−4
@@ -425,7 +425,9 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl
425425 ,[Plain [Str "6"]]]]
426426,Header 2 ("tables-without-headers",[],[]) [Str "Tables",Space,Str "without",Space,Str "Headers"]
427427,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
428− []
428+ [[]
429+ ,[]
430+ ,[]]
429431 [[[Plain [Str "1"]]
430432 ,[Plain [Str "2"]]
431433 ,[Plain [Str "3"]]]
@@ -434,7 +436,9 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl
434436 ,[Plain [Str "6"]]]]
435437,HorizontalRule
436438,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
437− []
439+ [[]
440+ ,[]
441+ ,[]]
438442 [[[Plain [Str "1"]]
439443 ,[Plain [Str "2"]]
440444 ,[Plain [Str "3"]]]
@@ -443,7 +447,9 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl
443447 ,[Plain [Str "6"]]]]
444448,HorizontalRule
445449,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
446− []
450+ [[]
451+ ,[]
452+ ,[]]
447453 [[[Plain [Str "1"]]
448454 ,[Plain [Str "2"]]
449455 ,[Plain [Str "3"]]]
@@ -452,7 +458,9 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl
452458 ,[Plain [Str "6"]]]]
453459,HorizontalRule
454460,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
455− []
461+ [[]
462+ ,[]
463+ ,[]]
456464 [[[Plain [Str "1"]]
457465 ,[Plain [Str "2"]]
458466 ,[Plain [Str "3"]]]
test/textile-reader.native+6−2
@@ -104,7 +104,9 @@ Pandoc (Meta {unMeta = fromList []})
104104,Para [Str "Textile",Space,Str "allows",Space,Str "tables",Space,Str "with",Space,Str "and",Space,Str "without",Space,Str "headers",Space,Str ":"]
105105,Header 2 ("without-headers",[],[]) [Str "Without",Space,Str "headers"]
106106,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
107− []
107+ [[]
108+ ,[]
109+ ,[]]
108110 [[[Plain [Str "name"]]
109111 ,[Plain [Str "age"]]
110112 ,[Plain [Str "sex"]]]
@@ -142,7 +144,9 @@ Pandoc (Meta {unMeta = fromList []})
142144,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"]]
143145,Para [Str "and",Space,Str "paragraph",Space,Str "attributes,",Space,Str "and",Space,Str "table",Space,Str "attributes."]
144146,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]
145− []
147+ [[]
148+ ,[]
149+ ,[]]
146150 [[[Plain [Str "name"]]
147151 ,[Plain [Str "age"]]
148152 ,[Plain [Str "sex"]]]
test/txt2tags.native+70−11
@@ -302,21 +302,27 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]]
302302 [[Plain [Str "just",Space,Str "like",Space,Str "when",Space,Str "using",Space,Str "the",Space,Str "two",Space,Str "blank",Space,Str "lines."]]]]]]]
303303,Header 1 ("table",[],[]) [Str "Table"]
304304,Table [] [AlignRight] [0.0]
305− []
305+ [[]]
306306 [[[Plain [Str "Cell",Space,Str "1"]]]]
307307,Table [] [AlignCenter,AlignCenter,AlignRight] [0.0,0.0,0.0]
308− []
308+ [[]
309+ ,[]
310+ ,[]]
309311 [[[Plain [Str "Cell",Space,Str "1"]]
310312 ,[Plain [Str "Cell",Space,Str "2"]]
311313 ,[Plain [Str "Cell",Space,Str "3"]]]]
312314,Table [] [AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0]
313− []
315+ [[]
316+ ,[]
317+ ,[]]
314318 [[[Plain [Str "Cell",Space,Str "1"]]
315319 ,[Plain [Str "Cell",Space,Str "2"]]
316320 ,[Plain [Str "Cell",Space,Str "3"]]]]
317321,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 "|"]
318322,Table [] [AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0]
319− []
323+ [[]
324+ ,[]
325+ ,[]]
320326 [[[Plain [Str "Cell",Space,Str "1"]]
321327 ,[Plain [Str "Cell",Space,Str "2"]]
322328 ,[Plain [Str "Cell",Space,Str "3"]]]]
@@ -355,7 +361,10 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]]
355361 ,[]
356362 ,[]]]
357363,Table [] [AlignCenter,AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0]
358− []
364+ [[]
365+ ,[]
366+ ,[]
367+ ,[]]
359368 [[[Plain [Str "0"]]
360369 ,[Plain [Str "1"]]
361370 ,[Plain [Str "2"]]
@@ -373,7 +382,11 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]]
373382 ,[Plain [Str "E"]]
374383 ,[Plain [Str "F"]]]]
375384,Table [] [AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0,0.0]
376− []
385+ [[]
386+ ,[]
387+ ,[]
388+ ,[]
389+ ,[]]
377390 [[[Plain [Str "1"]]
378391 ,[]
379392 ,[]
@@ -400,7 +413,11 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]]
400413 ,[Plain [Str "4"]]
401414 ,[Plain [Str "5"]]]]
402415,Table [] [AlignDefault,AlignCenter,AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0,0.0]
403− []
416+ [[]
417+ ,[]
418+ ,[]
419+ ,[]
420+ ,[]]
404421 [[[Plain [Str "Jan"]]
405422 ,[]
406423 ,[]
@@ -432,7 +449,11 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]]
432449 ,[Plain [Str "80%"]]
433450 ,[Plain [Str "100%"]]]]
434451,Table [] [AlignCenter,AlignDefault,AlignDefault,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0,0.0]
435− []
452+ [[]
453+ ,[]
454+ ,[]
455+ ,[]
456+ ,[]]
436457 [[[]
437458 ,[]
438459 ,[Plain [Str "/"]]
@@ -464,7 +485,14 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]]
464485 ,[]
465486 ,[]]]
466487,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]
467− []
488+ [[]
489+ ,[]
490+ ,[]
491+ ,[]
492+ ,[]
493+ ,[]
494+ ,[]
495+ ,[]]
468496 [[[Plain [Str "01"]]
469497 ,[Plain [Str "02"]]
470498 ,[]
@@ -506,7 +534,38 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]]
506534 ,[Plain [Str "39"]]
507535 ,[Plain [Str "40"]]]]
508536,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]
509− []
537+ [[]
538+ ,[]
539+ ,[]
540+ ,[]
541+ ,[]
542+ ,[]
543+ ,[]
544+ ,[]
545+ ,[]
546+ ,[]
547+ ,[]
548+ ,[]
549+ ,[]
550+ ,[]
551+ ,[]
552+ ,[]
553+ ,[]
554+ ,[]
555+ ,[]
556+ ,[]
557+ ,[]
558+ ,[]
559+ ,[]
560+ ,[]
561+ ,[]
562+ ,[]
563+ ,[]
564+ ,[]
565+ ,[]
566+ ,[]
567+ ,[]
568+ ,[]]
510569 [[[Plain [Str "0"]]
511570 ,[Plain [Str "1"]]
512571 ,[Plain [Str "2"]]
@@ -540,7 +599,7 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]]
540599 ,[Plain [Str "E"]]
541600 ,[Plain [Str "F"]]]]
542601,Table [] [AlignCenter] [0.0]
543− []
602+ [[]]
544603 [[[]]
545604 ,[[]]
546605 ,[[]]]