7254a2a · typeable/pandoc

git.iko.soy/typeable/pandoc

Implement the new Table type

commit7254a2ae0ba40b29c04b8924f27739614229432b authordespresc <christian.j.j.despres@gmail.com> dateSat 28 Mar 2020, 18:22 (7 years ago) parent83c1ce1

114 files changed+4842−2180

compare with master

unifiedsplit

src/Text/Pandoc/Lua/Marshaling/AST.hs+16−3

@@ -21,6 +21,7 @@ import Foreign.Lua (Lua, Peekable, Pushable, StackIndex)

2121import Text.Pandoc.Definition

2222import Text.Pandoc.Lua.Util (defineHowTo, pushViaConstructor)

2323import Text.Pandoc.Lua.Marshaling.CommonState ()

24+import Text.Pandoc.Shared (toLegacyTable)

2425

2526import qualified Foreign.Lua as Lua

2627import qualified Text.Pandoc.Lua.Util as LuaUtil

@@ -167,8 +168,9 @@ pushBlock = \case

167168 Para blcks -> pushViaConstructor "Para" blcks

168169 Plain blcks -> pushViaConstructor "Plain" blcks

169170 RawBlock f cs -> pushViaConstructor "RawBlock" f cs

170− Table capt aligns widths headers rows ->

171− pushViaConstructor "Table" capt aligns widths headers rows

171+ Table _ blkCapt specs _ thead tbody tfoot ->

172+ let (capt, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

173+ in pushViaConstructor "Table" capt aligns widths headers rows

172174

173175-- | Return the value at the given index as block if possible.

174176peekBlock :: StackIndex -> Lua Block

@@ -192,7 +194,13 @@ peekBlock idx = defineHowTo "get Block value" $ do

192194 "Plain" -> Plain <$> elementContent

193195 "RawBlock" -> uncurry RawBlock <$> elementContent

194196 "Table" -> (\(capt, aligns, widths, headers, body) ->

195− Table capt aligns widths headers body)

197+ Table nullAttr

198+ (Caption Nothing $ maybePara capt)

199+ (zip aligns (map strictPos widths))

200+ 0

201+ [toRow headers]

202+ (map toRow body)

203+ [])

196204 <$> elementContent

197205 _ -> Lua.throwException ("Unknown block type: " <> tag)

198206 where

@@ -200,6 +208,11 @@ peekBlock idx = defineHowTo "get Block value" $ do

200208 elementContent :: Peekable a => Lua a

201209 elementContent = LuaUtil.rawField idx "c"

202210

211+ strictPos w = if w > 0 then Just w else Nothing

212+ maybePara [] = []

213+ maybePara x = [Para x]

214+ toRow = Row nullAttr . map (\blk -> Cell nullAttr Nothing 1 1 blk)

215+

203216-- | Push an inline element to the top of the lua stack.

204217pushInline :: Inline -> Lua ()

205218pushInline = \case

src/Text/Pandoc/Lua/Walk.hs+24

@@ -55,6 +55,18 @@ instance Walkable (SingletonsList Inline) Block where

5555 walkM = walkBlockM

5656 query = queryBlock

5757

58+instance Walkable (SingletonsList Inline) Row where

59+ walkM = walkRowM

60+ query = queryRow

61+

62+instance Walkable (SingletonsList Inline) Caption where

63+ walkM = walkCaptionM

64+ query = queryCaption

65+

66+instance Walkable (SingletonsList Inline) Cell where

67+ walkM = walkCellM

68+ query = queryCell

69+

5870instance Walkable (SingletonsList Inline) MetaValue where

5971 walkM = walkMetaValueM

6072 query = queryMetaValue

@@ -86,6 +98,18 @@ instance Walkable (SingletonsList Block) Block where

8698 walkM = walkBlockM

8799 query = queryBlock

88100

101+instance Walkable (SingletonsList Block) Row where

102+ walkM = walkRowM

103+ query = queryRow

104+

105+instance Walkable (SingletonsList Block) Caption where

106+ walkM = walkCaptionM

107+ query = queryCaption

108+

109+instance Walkable (SingletonsList Block) Cell where

110+ walkM = walkCellM

111+ query = queryCell

112+

89113instance Walkable (SingletonsList Block) MetaValue where

90114 walkM = walkMetaValueM

91115 query = queryMetaValue

src/Text/Pandoc/Parsing.hs+5−1

@@ -925,7 +925,11 @@ tableWith :: (Stream s m Char, HasReaderOptions st, Monad mf)

925925tableWith headerParser rowParser lineParser footerParser = try $ do

926926 (aligns, widths, heads, rows) <- tableWith' headerParser rowParser

927927 lineParser footerParser

928− return $ B.table mempty (zip aligns widths) <$> heads <*> rows

928+ return $ B.table mempty (zip aligns (map fromWidth widths)) <$> heads <*> rows

929+ where

930+ fromWidth n

931+ | n > 0 = Just n

932+ | otherwise = Nothing

929933

930934type TableComponents mf = ([Alignment], [Double], mf [Blocks], mf [[Blocks]])

931935

src/Text/Pandoc/Readers/CSV.hs+1−1

@@ -37,6 +37,6 @@ readCSV _opts s =

3737 hdrs = map toplain r

3838 rows = map (map toplain) rs

3939 aligns = replicate numcols AlignDefault

40− widths = replicate numcols 0

40+ widths = replicate numcols Nothing

4141 Right [] -> return $ B.doc mempty

4242 Left e -> throwError $ PandocParsecError s e

src/Text/Pandoc/Readers/CommonMark.hs+10−8

@@ -111,31 +111,33 @@ addBlock opts (Node _ (LIST listAttrs) nodes) =

111111 PAREN_DELIM -> OneParen

112112 exts = readerExtensions opts

113113addBlock opts (Node _ (TABLE alignments) nodes) =

114− (Table [] aligns widths headers rows :)

114+ (Table nullAttr (Caption Nothing []) (zip aligns widths) 0 headers rows [] :)

115115 where aligns = map fromTableCellAlignment alignments

116116 fromTableCellAlignment NoAlignment = AlignDefault

117117 fromTableCellAlignment LeftAligned = AlignLeft

118118 fromTableCellAlignment RightAligned = AlignRight

119119 fromTableCellAlignment CenterAligned = AlignCenter

120− widths = replicate numcols 0.0

120+ widths = replicate numcols Nothing

121121 numcols = if null rows'

122122 then 0

123− else maximum $ map length rows'

123+ else maximum $ map rowLength rows'

124124 rows' = map toRow $ filter isRow nodes

125125 (headers, rows) = case rows' of

126− (h:rs) -> (h, rs)

126+ (h:rs) -> ([h], rs)

127127 [] -> ([], [])

128128 isRow (Node _ TABLE_ROW _) = True

129129 isRow _ = False

130130 isCell (Node _ TABLE_CELL _) = True

131131 isCell _ = False

132− toRow (Node _ TABLE_ROW ns) = map toCell $ filter isCell ns

132+ toRow (Node _ TABLE_ROW ns) = Row nullAttr $ map toCell $ filter isCell ns

133133 toRow (Node _ t _) = error $ "toRow encountered non-row " ++ show t

134− toCell (Node _ TABLE_CELL []) = []

134+ toCell (Node _ TABLE_CELL []) = fromSimpleCell []

135135 toCell (Node _ TABLE_CELL (n:ns))

136− | isBlockNode n = addBlocks opts (n:ns)

137− | otherwise = [Plain (addInlines opts (n:ns))]

136+ | isBlockNode n = fromSimpleCell $ addBlocks opts (n:ns)

137+ | otherwise = fromSimpleCell [Plain (addInlines opts (n:ns))]

138138 toCell (Node _ t _) = error $ "toCell encountered non-cell " ++ show t

139+ fromSimpleCell = Cell nullAttr Nothing 1 1

140+ rowLength (Row _ body) = length body -- all cells are 1×1

139141addBlock _ (Node _ TABLE_ROW _) = id -- handled in TABLE

140142addBlock _ (Node _ TABLE_CELL _) = id -- handled in TABLE

141143addBlock _ _ = id

src/Text/Pandoc/Readers/DocBook.hs+18−18

@@ -676,10 +676,10 @@ getMediaobject e = do

676676 Just z -> mconcat <$>

677677 mapM parseInline (elContent z)

678678 figTitle <- gets dbFigureTitle

679− let (caption, title) = if isNull figTitle

680− then (getCaption e, "")

681− else (return figTitle, "fig:")

682− fmap (imageWith attr imageUrl title) caption

679+ let (capt, title) = if isNull figTitle

680+ then (getCaption e, "")

681+ else (return figTitle, "fig:")

682+ fmap (imageWith attr imageUrl title) capt

683683

684684getBlocks :: PandocMonad m => Element -> DB m Blocks

685685getBlocks e = mconcat <$>

@@ -844,9 +844,9 @@ parseBlock (Elem e) =

844844 return (mconcat $ intersperse (str "; ") terms', items')

845845 parseTable = do

846846 let isCaption x = named "title" x || named "caption" x

847− caption <- case filterChild isCaption e of

848− Just t -> getInlines t

849− Nothing -> return mempty

847+ capt <- case filterChild isCaption e of

848+ Just t -> getInlines t

849+ Nothing -> return mempty

850850 let e' = fromMaybe e $ filterChild (named "tgroup") e

851851 let isColspec x = named "colspec" x || named "col" x

852852 let colspecs = case filterChild (named "colgroup") e' of

@@ -868,12 +868,12 @@ parseBlock (Elem e) =

868868 Just "right" -> AlignRight

869869 Just "center" -> AlignCenter

870870 _ -> AlignDefault

871− let toWidth c = case findAttr (unqual "colwidth") c of

872− Just w -> fromMaybe 0

873− $ safeRead $ "0" <> T.filter (\x ->

871+ let toWidth c = do

872+ w <- findAttr (unqual "colwidth") c

873+ n <- safeRead $ "0" <> T.filter (\x ->

874874 (x >= '0' && x <= '9')

875875 || x == '.') (T.pack w)

876− Nothing -> 0 :: Double

876+ if n > 0 then Just n else Nothing

877877 let numrows = case bodyrows of

878878 [] -> 0

879879 xs -> maximum $ map length xs

@@ -881,16 +881,16 @@ parseBlock (Elem e) =

881881 [] -> replicate numrows AlignDefault

882882 cs -> map toAlignment cs

883883 let widths = case colspecs of

884− [] -> replicate numrows 0

885− cs -> let ws = map toWidth cs

886− tot = sum ws

887− in if all (> 0) ws

888− then map (/ tot) ws

889− else replicate numrows 0

884+ [] -> replicate numrows Nothing

885+ cs -> let ws = map toWidth cs

886+ in case sequence ws of

887+ Just ws' -> let tot = sum ws'

888+ in Just . (/ tot) <$> ws'

889+ Nothing -> replicate numrows Nothing

890890 let headrows' = if null headrows

891891 then replicate numrows mempty

892892 else headrows

893− return $ table caption (zip aligns widths)

893+ return $ table capt (zip aligns widths)

894894 headrows' bodyrows

895895 isEntry x = named "entry" x || named "td" x || named "th" x

896896 parseRow = mapM (parseMixed plain . elContent) . filterChildren isEntry

src/Text/Pandoc/Readers/Docx.hs+10−10

@@ -77,7 +77,7 @@ import Text.Pandoc.MediaBag (MediaBag)

7777import Text.Pandoc.Options

7878import Text.Pandoc.Readers.Docx.Combine

7979import Text.Pandoc.Readers.Docx.Lists

80−import Text.Pandoc.Readers.Docx.Parse

80+import Text.Pandoc.Readers.Docx.Parse as Docx

8181import Text.Pandoc.Shared

8282import Text.Pandoc.Walk

8383import Text.TeXMath (writeTeX)

@@ -494,13 +494,13 @@ singleParaToPlain blks

494494 singleton $ Plain ils

495495singleParaToPlain blks = blks

496496

497−cellToBlocks :: PandocMonad m => Cell -> DocxContext m Blocks

498−cellToBlocks (Cell bps) = do

497+cellToBlocks :: PandocMonad m => Docx.Cell -> DocxContext m Blocks

498+cellToBlocks (Docx.Cell bps) = do

499499 blks <- smushBlocks <$> mapM bodyPartToBlocks bps

500500 return $ fromList $ blocksToDefinitions $ blocksToBullets $ toList blks

501501

502−rowToBlocksList :: PandocMonad m => Row -> DocxContext m [Blocks]

503−rowToBlocksList (Row cells) = do

502+rowToBlocksList :: PandocMonad m => Docx.Row -> DocxContext m [Blocks]

503+rowToBlocksList (Docx.Row cells) = do

504504 blksList <- mapM cellToBlocks cells

505505 return $ map singleParaToPlain blksList

506506

@@ -645,7 +645,7 @@ bodyPartToBlocks (ListItem pPr _ _ _ parparts) =

645645bodyPartToBlocks (Tbl _ _ _ []) =

646646 return $ para mempty

647647bodyPartToBlocks (Tbl cap _ look parts@(r:rs)) = do

648− let caption = text cap

648+ let cap' = text cap

649649 (hdr, rows) = case firstRowFormatting look of

650650 True | null rs -> (Nothing, [r])

651651 | otherwise -> (Just r, rs)

@@ -659,8 +659,8 @@ bodyPartToBlocks (Tbl cap _ look parts@(r:rs)) = do

659659 -- https://github.com/jgm/pandoc/pull/4361#issuecomment-365416155

660660 nonEmpty [] = Nothing

661661 nonEmpty l = Just l

662− rowLength :: Row -> Int

663− rowLength (Row c) = length c

662+ rowLength :: Docx.Row -> Int

663+ rowLength (Docx.Row c) = length c

664664

665665 -- pad cells. New Text.Pandoc.Builder will do that for us,

666666 -- so this is for compatibility while we switch over.

@@ -676,9 +676,9 @@ bodyPartToBlocks (Tbl cap _ look parts@(r:rs)) = do

676676 -- so should be possible. Alignment might be more difficult,

677677 -- since there doesn't seem to be a column entity in docx.

678678 let alignments = replicate width AlignDefault

679− widths = replicate width 0 :: [Double]

679+ widths = replicate width Nothing

680680

681− return $ table caption (zip alignments widths) hdrCells cells'

681+ return $ table cap' (zip alignments widths) hdrCells cells'

682682bodyPartToBlocks (OMathPara e) =

683683 return $ para $ displayMath (writeTeX e)

684684

src/Text/Pandoc/Readers/DokuWiki.hs+1−1

@@ -470,7 +470,7 @@ table = do

470470 let (headerRow, body) = if firstSeparator == '^'

471471 then (head rows, tail rows)

472472 else ([], rows)

473− let attrs = (AlignDefault, 0.0) <$ transpose rows

473+ let attrs = (AlignDefault, Nothing) <$ transpose rows

474474 pure $ B.table mempty attrs headerRow body

475475

476476tableRows :: PandocMonad m => DWParser m [[B.Blocks]]

src/Text/Pandoc/Readers/HTML.hs+8−8

@@ -61,7 +61,7 @@ import Text.Pandoc.Options (

6161import Text.Pandoc.Parsing hiding ((<|>))

6262import Text.Pandoc.Shared (addMetaField, blocksToInlines', crFilter, escapeURI,

6363 extractSpaces, htmlSpanLikeElements, elemText, splitTextBy,

64− onlySimpleTableCells, safeRead, underlineSpan, tshow)

64+ onlySimpleCellBodies, safeRead, underlineSpan, tshow)

6565import Text.Pandoc.Walk

6666import Text.Parsec.Error

6767import Text.TeXMath (readMathML, writeTeX)

@@ -499,7 +499,7 @@ pTable = try $ do

499499 let rows''' = map (map snd) rows''

500500 -- fail on empty table

501501 guard $ not $ null head' && null rows'''

502− let isSimple = onlySimpleTableCells $ fmap B.toList <$> head':rows'''

502+ let isSimple = onlySimpleCellBodies $ fmap B.toList <$> head':rows'''

503503 let cols = if null head'

504504 then maximum (map length rows''')

505505 else length head'

@@ -513,12 +513,12 @@ pTable = try $ do

513513 _ -> replicate cols AlignDefault

514514 let widths = if null widths'

515515 then if isSimple

516− then replicate cols 0

517− else replicate cols (1.0 / fromIntegral cols)

516+ then replicate cols Nothing

517+ else replicate cols (Just (1.0 / fromIntegral cols))

518518 else widths'

519519 return $ B.table caption (zip aligns widths) head' rows

520520

521−pCol :: PandocMonad m => TagParser m Double

521+pCol :: PandocMonad m => TagParser m (Maybe Double)

522522pCol = try $ do

523523 TagOpen _ attribs' <- pSatisfy (matchTagOpen "col" [])

524524 let attribs = toStringAttr attribs'

@@ -535,10 +535,10 @@ pCol = try $ do

535535 fromMaybe 0.0 $ safeRead xs

536536 _ -> 0.0

537537 if width > 0.0

538− then return $ width / 100.0

539− else return 0.0

538+ then return $ Just $ width / 100.0

539+ else return Nothing

540540

541−pColgroup :: PandocMonad m => TagParser m [Double]

541+pColgroup :: PandocMonad m => TagParser m [Maybe Double]

542542pColgroup = try $ do

543543 pSatisfy (matchTagOpen "colgroup" [])

544544 skipMany pBlank

src/Text/Pandoc/Readers/Haddock.hs+1−1

@@ -91,7 +91,7 @@ docHToBlocks d' =

9191 else (toCells (head headerRows),

9292 map toCells (tail headerRows ++ bodyRows))

9393 colspecs = replicate (maximum (map length body))

94− (AlignDefault, 0.0)

94+ (AlignDefault, Nothing)

9595 in B.table mempty colspecs header body

9696

9797 where inlineFallback = B.plain $ docHToInlines False d'

src/Text/Pandoc/Readers/Ipynb.hs+1−1

@@ -69,7 +69,7 @@ notebookToPandoc opts notebook = do

6969 return $ Pandoc (Meta $ M.insert "jupyter" (MetaMap m) mempty) blocks

7070

7171cellToBlocks :: PandocMonad m

72− => ReaderOptions -> Text -> Cell a -> m B.Blocks

72+ => ReaderOptions -> Text -> Ipynb.Cell a -> m B.Blocks

7373cellToBlocks opts lang c = do

7474 let Source ts = cellSource c

7575 let source = mconcat ts

src/Text/Pandoc/Readers/JATS.hs+24−25

@@ -134,14 +134,14 @@ getGraphic :: PandocMonad m

134134 => Maybe (Inlines, Text) -> Element -> JATS m Inlines

135135getGraphic mbfigdata e = do

136136 let atVal a = attrValue a e

137− (ident, title, caption) =

137+ (ident, title, capt) =

138138 case mbfigdata of

139− Just (capt, i) -> (i, "fig:" <> atVal "title", capt)

139+ Just (capt', i) -> (i, "fig:" <> atVal "title", capt')

140140 Nothing -> (atVal "id", atVal "title",

141141 text (atVal "alt-text"))

142142 attr = (ident, T.words $ atVal "role", [])

143143 imageUrl = atVal "href"

144− return $ imageWith attr imageUrl title caption

144+ return $ imageWith attr imageUrl title capt

145145

146146getBlocks :: PandocMonad m => Element -> JATS m Blocks

147147getBlocks e = mconcat <$>

@@ -230,20 +230,20 @@ parseBlock (Elem e) =

230230 -- implicit figure. otherwise, we emit a div with the contents

231231 case filterChildren (named "graphic") e of

232232 [g] -> do

233− caption <- case filterChild (named "caption") e of

234− Just t -> mconcat .

235− intersperse linebreak <$>

236− mapM getInlines

237− (filterChildren (const True) t)

238− Nothing -> return mempty

239− img <- getGraphic (Just (caption, attrValue "id" e)) g

233+ capt <- case filterChild (named "caption") e of

234+ Just t -> mconcat .

235+ intersperse linebreak <$>

236+ mapM getInlines

237+ (filterChildren (const True) t)

238+ Nothing -> return mempty

239+ img <- getGraphic (Just (capt, attrValue "id" e)) g

240240 return $ para img

241241 _ -> divWith (attrValue "id" e, ["fig"], []) <$> getBlocks e

242242 parseTable = do

243243 let isCaption x = named "title" x || named "caption" x

244− caption <- case filterChild isCaption e of

245− Just t -> getInlines t

246− Nothing -> return mempty

244+ capt <- case filterChild isCaption e of

245+ Just t -> getInlines t

246+ Nothing -> return mempty

247247 let e' = fromMaybe e $ filterChild (named "tgroup") e

248248 let isColspec x = named "colspec" x || named "col" x

249249 let colspecs = case filterChild (named "colgroup") e' of

@@ -265,26 +265,25 @@ parseBlock (Elem e) =

265265 Just "right" -> AlignRight

266266 Just "center" -> AlignCenter

267267 _ -> AlignDefault

268− let toWidth c = case findAttrText (unqual "colwidth") c of

269− Just w -> fromMaybe 0

270− $ safeRead $ "0" <> T.filter (\x ->

271− isDigit x || x == '.') w

272− Nothing -> 0 :: Double

268+ let toWidth c = do

269+ w <- findAttrText (unqual "colwidth") c

270+ n <- safeRead $ "0" <> T.filter (\x -> isDigit x || x == '.') w

271+ if n > 0 then Just n else Nothing

273272 let numrows = foldl' max 0 $ map length bodyrows

274273 let aligns = case colspecs of

275274 [] -> replicate numrows AlignDefault

276275 cs -> map toAlignment cs

277276 let widths = case colspecs of

278− [] -> replicate numrows 0

279− cs -> let ws = map toWidth cs

280− tot = sum ws

281− in if all (> 0) ws

282− then map (/ tot) ws

283− else replicate numrows 0

277+ [] -> replicate numrows Nothing

278+ cs -> let ws = map toWidth cs

279+ in case sequence ws of

280+ Just ws' -> let tot = sum ws'

281+ in Just . (/ tot) <$> ws'

282+ Nothing -> replicate numrows Nothing

284283 let headrows' = if null headrows

285284 then replicate numrows mempty

286285 else headrows

287− return $ table caption (zip aligns widths)

286+ return $ table capt (zip aligns widths)

288287 headrows' bodyrows

289288 isEntry x = named "entry" x || named "td" x || named "th" x

290289 parseRow = mapM (parseMixed plain . elContent) . filterChildren isEntry

src/Text/Pandoc/Readers/LaTeX.hs+13−12

@@ -2268,7 +2268,7 @@ splitWordTok = do

22682268 setInput $ map (Tok spos Symbol . T.singleton) (T.unpack t) <> rest

22692269 _ -> return ()

22702270

2271−parseAligns :: PandocMonad m => LP m [(Alignment, Double, ([Tok], [Tok]))]

2271+parseAligns :: PandocMonad m => LP m [(Alignment, Maybe Double, ([Tok], [Tok]))]

22722272parseAligns = try $ do

22732273 let maybeBar = skipMany

22742274 (try $ sp *> (() <$ symbol '|' <|> () <$ (symbol '@' >> braced)))

@@ -2289,17 +2289,15 @@ parseAligns = try $ do

22892289 ds <- trim . untokenize <$> manyTill anyTok (controlSeq "linewidth")

22902290 spaces

22912291 symbol '}'

2292− case safeRead ds of

2293− Just w -> return w

2294− Nothing -> return 0.0

2292+ return $ safeRead ds

22952293 let alignSpec = do

22962294 pref <- option [] alignPrefix

22972295 spaces

22982296 al <- alignChar

2299− width <- colWidth <|> option 0.0 (do s <- untokenize <$> braced

2300− pos <- getPosition

2301− report $ SkippedContent s pos

2302− return 0.0)

2297+ width <- colWidth <|> option Nothing (do s <- untokenize <$> braced

2298+ pos <- getPosition

2299+ report $ SkippedContent s pos

2300+ return Nothing)

23032301 spaces

23042302 suff <- option [] alignSuffix

23052303 return (al, width, (pref, suff))

@@ -2399,11 +2397,11 @@ simpTable envname hasWidthParameter = try $ do

23992397

24002398addTableCaption :: PandocMonad m => Blocks -> LP m Blocks

24012399addTableCaption = walkM go

2402− where go (Table c als ws hs rs) = do

2400+ where go (Table attr c spec rhs th tb tf) = do

24032401 st <- getState

24042402 let mblabel = sLastLabel st

24052403 capt <- case (sCaption st, mblabel) of

2406− (Just ils, Nothing) -> return $ toList ils

2404+ (Just ils, Nothing) -> return $ Caption Nothing (mcap ils)

24072405 (Just ils, Just lab) -> do

24082406 num <- getNextNumber sLastTableNum

24092407 setState

@@ -2411,11 +2409,14 @@ addTableCaption = walkM go

24112409 , sLabels = M.insert lab

24122410 [Str (renderDottedNum num)]

24132411 (sLabels st) }

2414− return $ toList ils -- add number??

2412+ return $ Caption Nothing (mcap ils) -- add number??

24152413 (Nothing, _) -> return c

24162414 return $ maybe id (\ident -> Div (ident, [], []) . (:[])) mblabel $

2417− Table capt als ws hs rs

2415+ Table attr capt spec rhs th tb tf

24182416 go x = return x

2417+ mcap ils

2418+ | isNull ils = []

2419+ | otherwise = [Para $ toList ils]

24192420

24202421

24212422block :: PandocMonad m => LP m Blocks

src/Text/Pandoc/Readers/Man.hs+3−4

@@ -107,9 +107,9 @@ parseTable = do

107107 bodyRows <- mapM (mapM parseTableCell . snd) bodyRows'

108108 isPlainTable <- tableCellsPlain <$> getState

109109 let widths = if isPlainTable

110− then repeat 0.0

111− else repeat ((1.0 / fromIntegral (length alignments))

112− :: Double)

110+ then repeat Nothing

111+ else repeat (Just (1.0 / fromIntegral (length alignments))

112+ :: Maybe Double)

113113 return $ B.table mempty (zip alignments widths)

114114 headerRow bodyRows) <|> fallback pos

115115 [] -> fallback pos

@@ -160,7 +160,6 @@ parseTable = do

160160 'r' -> Just AlignRight

161161 _ -> Nothing

162162

163−

164163parseNewParagraph :: PandocMonad m => ManParser m Blocks

165164parseNewParagraph = do

166165 mmacro "P" <|> mmacro "PP" <|> mmacro "LP" <|> memptyLine

src/Text/Pandoc/Readers/Markdown.hs+4−1

@@ -1417,11 +1417,14 @@ table = try $ do

14171417 let widths' = if totalWidth < 1

14181418 then widths

14191419 else map (/ totalWidth) widths

1420+ let strictPos w

1421+ | w > 0 = Just w

1422+ | otherwise = Nothing

14201423 return $ do

14211424 caption' <- caption

14221425 heads' <- heads

14231426 lns' <- lns

1424− return $ B.table caption' (zip aligns widths') heads' lns'

1427+ return $ B.table caption' (zip aligns (strictPos <$> widths')) heads' lns'

14251428

14261429--

14271430-- inline

src/Text/Pandoc/Readers/MediaWiki.hs+3−3

@@ -221,9 +221,9 @@ table = do

221221 let restwidth = tableWidth - sum widths

222222 let zerocols = length $ filter (==0.0) widths

223223 let defaultwidth = if zerocols == 0 || zerocols == length widths

224− then 0.0

225− else restwidth / fromIntegral zerocols

226− let widths' = map (\w -> if w == 0 then defaultwidth else w) widths

224+ then Nothing

225+ else Just $ restwidth / fromIntegral zerocols

226+ let widths' = map (\w -> if w == 0 then defaultwidth else Just w) widths

227227 let cellspecs = zip (map fst cellspecs') widths'

228228 rows' <- many $ try $ rowsep *> (map snd <$> tableRow)

229229 optional blanklines

src/Text/Pandoc/Readers/Muse.hs+2−2

@@ -646,7 +646,7 @@ data MuseTableElement = MuseHeaderRow [Blocks]

646646museToPandocTable :: MuseTable -> Blocks

647647museToPandocTable (MuseTable caption headers body footers) =

648648 B.table caption attrs headRow (rows ++ body ++ footers)

649− where attrs = (AlignDefault, 0.0) <$ transpose (headers ++ body ++ footers)

649+ where attrs = (AlignDefault, Nothing) <$ transpose (headers ++ body ++ footers)

650650 (headRow, rows) = fromMaybe ([], []) $ uncons headers

651651

652652museAppendElement :: MuseTableElement

@@ -694,7 +694,7 @@ museGridTable = try $ do

694694 indices <- museGridTableHeader

695695 fmap rowsToTable . sequence <$> many1 (museGridTableRow indent indices)

696696 where rowsToTable rows = B.table mempty attrs [] rows

697− where attrs = (AlignDefault, 0.0) <$ transpose rows

697+ where attrs = (AlignDefault, Nothing) <$ transpose rows

698698

699699-- | Parse a table.

700700table :: PandocMonad m => MuseParser m (F Blocks)

src/Text/Pandoc/Readers/Odt/ContentReader.hs+2−2

@@ -921,8 +921,8 @@ post_process (Pandoc m blocks) =

921921 Pandoc m (post_process' blocks)

922922

923923post_process' :: [Block] -> [Block]

924−post_process' (Table _ a w h r : Div ("", ["caption"], _) [Para inlines] : xs) =

925− Table inlines a w h r : post_process' xs

924+post_process' (Table attr _ specs rhs th tb tf : Div ("", ["caption"], _) blks : xs)

925+ = Table attr (Caption Nothing blks) specs rhs th tb tf : post_process' xs

926926post_process' bs = bs

927927

928928read_body :: OdtReader _x (Pandoc, MediaBag)

src/Text/Pandoc/Readers/Org/Blocks.hs+7−7

@@ -629,13 +629,13 @@ orgToPandocTable (OrgTable colProps heads lns) caption =

629629 else Nothing

630630 in B.table caption (map (convertColProp totalWidth) colProps) heads lns

631631 where

632− convertColProp :: Maybe Int -> ColumnProperty -> (Alignment, Double)

632+ convertColProp :: Maybe Int -> ColumnProperty -> (Alignment, Maybe Double)

633633 convertColProp totalWidth colProp =

634634 let

635635 align' = fromMaybe AlignDefault $ columnAlignment colProp

636− width' = fromMaybe 0 $ (\w t -> (fromIntegral w / fromIntegral t))

637− <$> columnRelWidth colProp

638− <*> totalWidth

636+ width' = (\w t -> (fromIntegral w / fromIntegral t))

637+ <$> columnRelWidth colProp

638+ <*> totalWidth

639639 in (align', width')

640640

641641tableRows :: PandocMonad m => OrgParser m [OrgTableRow]

@@ -658,16 +658,16 @@ tableAlignRow = try $ do

658658 return $ OrgAlignRow colProps

659659

660660columnPropertyCell :: Monad m => OrgParser m ColumnProperty

661−columnPropertyCell = emptyCell <|> propCell <?> "alignment info"

661+columnPropertyCell = emptyOrgCell <|> propCell <?> "alignment info"

662662 where

663− emptyCell = ColumnProperty Nothing Nothing <$ try (skipSpaces *> endOfCell)

663+ emptyOrgCell = ColumnProperty Nothing Nothing <$ try (skipSpaces *> endOfCell)

664664 propCell = try $ ColumnProperty

665665 <$> (skipSpaces

666666 *> char '<'

667667 *> optionMaybe tableAlignFromChar)

668668 <*> (optionMaybe (many1Char digit >>= safeRead)

669669 <* char '>'

670− <* emptyCell)

670+ <* emptyOrgCell)

671671

672672tableAlignFromChar :: Monad m => OrgParser m Alignment

673673tableAlignFromChar = try $

src/Text/Pandoc/Readers/RST.hs+35−15

@@ -770,24 +770,37 @@ tableDirective :: PandocMonad m

770770tableDirective top fields body = do

771771 bs <- parseFromString' parseBlocks body

772772 case B.toList bs of

773− [Table _ aligns' widths' header' rows'] -> do

773+ [Table attr _ tspecs' rhs thead tbody tfoot] -> do

774+ let (aligns', widths') = unzip tspecs'

774775 title <- parseFromString' (trimInlines . mconcat <$> many inline) top

775776 columns <- getOption readerColumns

776− let numOfCols = length header'

777+ let numOfCols = case thead of

778+ [] -> 0

779+ (r:_) -> rowLength r

777780 let normWidths ws =

778− map (/ max 1.0 (fromIntegral (columns - numOfCols))) ws

781+ strictPos . (/ max 1.0 (fromIntegral (columns - numOfCols))) <$> ws

779782 let widths = case trim <$> lookup "widths" fields of

780− Just "auto" -> replicate numOfCols 0.0

783+ Just "auto" -> replicate numOfCols Nothing

781784 Just "grid" -> widths'

782785 Just specs -> normWidths

783786 $ map (fromMaybe (0 :: Double) . safeRead)

784787 $ splitTextBy (`elem` (" ," :: String)) specs

785788 Nothing -> widths'

786789 -- align is not applicable since we can't represent whole table align

787− return $ B.singleton $ Table (B.toList title)

788− aligns' widths header' rows'

790+ let tspecs = zip aligns' widths

791+ return $ B.singleton $ Table attr (Caption Nothing (mpara title))

792+ tspecs rhs thead tbody tfoot

789793 _ -> return mempty

790−

794+ where

795+ -- only valid on the very first row of a table section

796+ rowLength (Row _ rb) = sum $ cellLength <$> rb

797+ cellLength (Cell _ _ _ w _) = if w < 0 then 0 else w

798+ strictPos w

799+ | w > 0 = Just w

800+ | otherwise = Nothing

801+ mpara t

802+ | B.isNull t = []

803+ | otherwise = [Para $ B.toList t]

791804

792805-- TODO: :stub-columns:.

793806-- Only the first row becomes the header even if header-rows: > 1,

@@ -808,10 +821,10 @@ listTableDirective top fields body = do

808821 else ([], rows, length x)

809822 _ -> ([],[],0)

810823 widths = case trim <$> lookup "widths" fields of

811− Just "auto" -> replicate numOfCols 0

824+ Just "auto" -> replicate numOfCols Nothing

812825 Just specs -> normWidths $ map (fromMaybe (0 :: Double) . safeRead) $

813826 splitTextBy (`elem` (" ," :: String)) specs

814− _ -> replicate numOfCols 0

827+ _ -> replicate numOfCols Nothing

815828 return $ B.table title

816829 (zip (replicate numOfCols AlignDefault) widths)

817830 headerRow

@@ -820,7 +833,10 @@ listTableDirective top fields body = do

820833 takeRows _ = []

821834 takeCells [BulletList cells] = map B.fromList cells

822835 takeCells _ = []

823− normWidths ws = map (/ max 1 (sum ws)) ws

836+ normWidths ws = strictPos . (/ max 1 (sum ws)) <$> ws

837+ strictPos w

838+ | w > 0 = Just w

839+ | otherwise = Nothing

824840

825841csvTableDirective :: PandocMonad m

826842 => Text -> [(Text, Text)] -> Text

@@ -873,14 +889,17 @@ csvTableDirective top fields rawcsv = do

873889 else ([], rows, length x)

874890 _ -> ([],[],0)

875891 title <- parseFromString' (trimInlines . mconcat <$> many inline) top

876− let normWidths ws = map (/ max 1 (sum ws)) ws

892+ let strictPos w

893+ | w > 0 = Just w

894+ | otherwise = Nothing

895+ let normWidths ws = strictPos . (/ max 1 (sum ws)) <$> ws

877896 let widths =

878897 case trim <$> lookup "widths" fields of

879− Just "auto" -> replicate numOfCols 0

898+ Just "auto" -> replicate numOfCols Nothing

880899 Just specs -> normWidths

881900 $ map (fromMaybe (0 :: Double) . safeRead)

882901 $ splitTextBy (`elem` (" ," :: String)) specs

883− _ -> replicate numOfCols 0

902+ _ -> replicate numOfCols Nothing

884903 return $ B.table title

885904 (zip (replicate numOfCols AlignDefault) widths)

886905 headerRow

@@ -1293,13 +1312,14 @@ simpleTable headless = do

12931312 sep simpleTableFooter

12941313 -- Simple tables get 0s for relative column widths (i.e., use default)

12951314 case B.toList tbl of

1296− [Table c a _w h l] -> return $ B.singleton $

1297− Table c a (replicate (length a) 0) h l

1315+ [Table attr cap spec rhs th tb tf] -> return $ B.singleton $

1316+ Table attr cap (rewidth spec) rhs th tb tf

12981317 _ ->

12991318 throwError $ PandocShouldNeverHappenError

13001319 "tableWith returned something unexpected"

13011320 where

13021321 sep = return () -- optional (simpleTableSep '-')

1322+ rewidth = fmap $ fmap $ const Nothing

13031323

13041324gridTable :: PandocMonad m

13051325 => Bool -- ^ Headerless table

src/Text/Pandoc/Readers/TWiki.hs+5−5

@@ -229,11 +229,11 @@ table = try $ do

229229 where

230230 buildTable caption rows (aligns, heads)

231231 = B.table caption aligns heads rows

232− align rows = replicate (columCount rows) (AlignDefault, 0)

232+ align rows = replicate (columCount rows) (AlignDefault, Nothing)

233233 columns rows = replicate (columCount rows) mempty

234234 columCount rows = length $ head rows

235235

236−tableParseHeader :: PandocMonad m => TWParser m ((Alignment, Double), B.Blocks)

236+tableParseHeader :: PandocMonad m => TWParser m ((Alignment, Maybe Double), B.Blocks)

237237tableParseHeader = try $ do

238238 char '|'

239239 leftSpaces <- length <$> many spaceChar

@@ -245,9 +245,9 @@ tableParseHeader = try $ do

245245 return (tableAlign leftSpaces rightSpaces, content)

246246 where

247247 tableAlign left right

248− | left >= 2 && left == right = (AlignCenter, 0)

249− | left > right = (AlignRight, 0)

250− | otherwise = (AlignLeft, 0)

248+ | left >= 2 && left == right = (AlignCenter, Nothing)

249+ | left > right = (AlignRight, Nothing)

250+ | otherwise = (AlignLeft, Nothing)

251251

252252tableParseRow :: PandocMonad m => TWParser m [B.Blocks]

253253tableParseRow = many1Till tableParseColumn newline

src/Text/Pandoc/Readers/Textile.hs+1−1

@@ -378,7 +378,7 @@ table = try $ do

378378 let nbOfCols = maximum $ map length (headers:rows)

379379 let aligns = map minimum $ transpose $ map (map (snd . fst)) (headers:rows)

380380 return $ B.table caption

381− (zip aligns (replicate nbOfCols 0.0))

381+ (zip aligns (replicate nbOfCols Nothing))

382382 (map snd headers)

383383 (map (map snd) rows)

384384

src/Text/Pandoc/Readers/Txt2Tags.hs+1−1

@@ -268,7 +268,7 @@ table = try $ do

268268 let rowsPadded = map (pad size) rows'

269269 let headerPadded = if null tableHeader then mempty else pad size tableHeader

270270 return $ B.table mempty

271− (zip aligns (replicate ncolumns 0.0))

271+ (zip aligns (replicate ncolumns Nothing))

272272 headerPadded rowsPadded

273273

274274pad :: (Monoid a) => Int -> [a] -> [a]

src/Text/Pandoc/Shared.hs+43−5

@@ -67,6 +67,7 @@ module Text.Pandoc.Shared (

6767 headerShift,

6868 stripEmptyParagraphs,

6969 onlySimpleTableCells,

70+ onlySimpleCellBodies,

7071 isTightList,

7172 taskListItemFromAscii,

7273 taskListItemToAscii,

@@ -77,6 +78,7 @@ module Text.Pandoc.Shared (

7778 htmlSpanLikeElements,

7879 splitSentences,

7980 filterIpynbOutput,

81+ toLegacyTable,

8082 -- * TagSoup HTML handling

8183 renderTags',

8284 -- * File handling

@@ -667,8 +669,18 @@ stripEmptyParagraphs = walk go

667669

668670-- | Detect if table rows contain only cells consisting of a single

669671-- paragraph that has no @LineBreak@.

670−onlySimpleTableCells :: [[TableCell]] -> Bool

671−onlySimpleTableCells = all isSimpleCell . concat

672+

673+-- TODO: should this become aware of cell dimensions?

674+onlySimpleTableCells :: [Row] -> Bool

675+onlySimpleTableCells = onlySimpleCellBodies . map unRow

676+ where

677+ unRow (Row _ body) = map unCell body

678+ unCell (Cell _ _ _ _ body) = body

679+

680+-- | Detect if unwrapped table rows contain only cells consisting of a

681+-- single paragraph that has no @LineBreak@.

682+onlySimpleCellBodies :: [[[Block]]] -> Bool

683+onlySimpleCellBodies = all isSimpleCell . concat

672684 where

673685 isSimpleCell [Plain ils] = not (hasLineBreak ils)

674686 isSimpleCell [Para ils ] = not (hasLineBreak ils)

@@ -992,9 +1004,12 @@ blockToInlines (DefinitionList pairslst) =

9921004 mconcat (map blocksToInlines' blkslst)

9931005blockToInlines (Header _ _ ils) = B.fromList ils

9941006blockToInlines HorizontalRule = mempty

995−blockToInlines (Table _ _ _ headers rows) =

1007+blockToInlines (Table _ _ _ _ headers rows feet) =

9961008 mconcat $ intersperse B.linebreak $

997− map (mconcat . map blocksToInlines') (headers:rows)

1009+ map (mconcat . map blocksToInlines') (plainRowBody <$> headers <> rows <> feet)

1010+ where

1011+ plainRowBody (Row _ body) = cellBody <$> body

1012+ cellBody (Cell _ _ _ _ body) = body

9981013blockToInlines (Div _ blks) = blocksToInlines' blks

9991014blockToInlines Null = mempty

10001015

@@ -1008,6 +1023,30 @@ blocksToInlines' = blocksToInlinesWithSep defaultBlocksSeparator

10081023blocksToInlines :: [Block] -> [Inline]

10091024blocksToInlines = B.toList . blocksToInlines'

10101025

1026+-- | Convert the relevant components of a new-style table (with block

1027+-- caption, row headers, row and column spans, and so on) to those of

1028+-- an old-style table (inline caption, table head with one row, no

1029+-- foot, and so on).

1030+toLegacyTable :: Caption

1031+ -> [ColSpec]

1032+ -> TableHead

1033+ -> TableBody

1034+ -> TableFoot

1035+ -> ([Inline], [Alignment], [Double], [[Block]], [[[Block]]])

1036+toLegacyTable (Caption _ cbody) specs th tb tf = (cbody', aligns, widths, th', tb')

1037+ where

1038+ numcols = length specs

1039+ (aligns, mwidths) = unzip specs

1040+ widths = map (fromMaybe 0) mwidths

1041+ unRow (Row _ x) = map unCell x

1042+ unCell (Cell _ _ _ _ x) = x

1043+ cbody' = blocksToInlines cbody

1044+ sanitise = pad mempty numcols . unRow

1045+ pad element upTo list = take upTo (list ++ repeat element)

1046+ (th', tb') = case th of

1047+ (r:rs) -> (sanitise r, map sanitise $ rs <> tb <> tf)

1048+ [] -> ([], map sanitise $ tb <> tf)

1049+

10111050-- | Inline elements used to separate blocks when squashing blocks into

10121051-- inlines.

10131052defaultBlocksSeparator :: Inlines

@@ -1016,7 +1055,6 @@ defaultBlocksSeparator =

10161055 -- there should be updated if this is changed.

10171056 B.space <> B.str "¶" <> B.space

10181057

1019−

10201058--

10211059-- Safe read

10221060--

src/Text/Pandoc/Writers/AsciiDoc.hs+2−1

@@ -191,7 +191,8 @@ blockToAsciiDoc opts (BlockQuote blocks) = do

191191 else contents

192192 let bar = text "____"

193193 return $ bar $$ chomp contents' $$ bar <> blankline

194−blockToAsciiDoc opts (Table caption aligns widths headers rows) = do

194+blockToAsciiDoc opts (Table _ blkCapt specs _ thead tbody tfoot) = do

195+ let (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

195196 caption' <- inlineListToAsciiDoc opts caption

196197 let caption'' = if null caption

197198 then empty

src/Text/Pandoc/Writers/CommonMark.hs+67−66

@@ -27,7 +27,7 @@ import Text.Pandoc.Class.PandocMonad (PandocMonad)

2727import Text.Pandoc.Definition

2828import Text.Pandoc.Options

2929import Text.Pandoc.Shared (capitalize, isTightList,

30− linesToPara, onlySimpleTableCells, taskListItemToAscii, tshow)

30+ linesToPara, onlySimpleTableCells, taskListItemToAscii, tshow, toLegacyTable)

3131import Text.Pandoc.Templates (renderTemplate)

3232import Text.Pandoc.Walk (walk, walkM)

3333import Text.Pandoc.Writers.HTML (writeHtml5String, tagWithAttributes)

@@ -154,71 +154,72 @@ blockToNodes opts (DefinitionList items) ns =

154154 Plain (term ++ [LineBreak] ++ xs) : ys ++ concat zs

155155 dlToBullet (term, xs) =

156156 Para term : concat xs

157−blockToNodes opts t@(Table capt aligns _widths headers rows) ns =

158− if isEnabled Ext_pipe_tables opts && onlySimpleTableCells (headers:rows)

159− then do

160− -- We construct a table manually as a CUSTOM_BLOCK, for

161− -- two reasons: (1) cmark-gfm currently doesn't support

162− -- rendering TABLE nodes; (2) we can align the column sides;

163− -- (3) we can render the caption as a regular paragraph.

164− let capt' = node PARAGRAPH (inlinesToNodes opts capt)

165− -- backslash | in code and raw:

166− let fixPipe (Code attr xs) =

167− Code attr (T.replace "|" "\\|" xs)

168− fixPipe (RawInline format xs) =

169− RawInline format (T.replace "|" "\\|" xs)

170− fixPipe x = x

171− let toCell [Plain ils] = T.strip

172− $ nodeToCommonmark [] Nothing

173− $ node (CUSTOM_INLINE mempty mempty)

174− $ inlinesToNodes opts

175− $ walk (fixPipe . softBreakToSpace) ils

176− toCell [Para ils] = T.strip

177− $ nodeToCommonmark [] Nothing

178− $ node (CUSTOM_INLINE mempty mempty)

179− $ inlinesToNodes opts

180− $ walk (fixPipe . softBreakToSpace) ils

181− toCell [] = ""

182− toCell xs = error $ "toCell encountered " ++ show xs

183− let separator = " | "

184− let starter = "| "

185− let ender = " |"

186− let rawheaders = map toCell headers

187− let rawrows = map (map toCell) rows

188− let maximum' [] = 0

189− maximum' xs = maximum xs

190− let colwidths = map (maximum' . map T.length) $

191− transpose (rawheaders:rawrows)

192− let toHeaderLine len AlignDefault = T.replicate len "-"

193− toHeaderLine len AlignLeft = ":" <>

194− T.replicate (max (len - 1) 1) "-"

195− toHeaderLine len AlignRight =

196− T.replicate (max (len - 1) 1) "-" <> ":"

197− toHeaderLine len AlignCenter = ":" <>

198− T.replicate (max (len - 2) 1) (T.pack "-") <> ":"

199− let rawheaderlines = zipWith toHeaderLine colwidths aligns

200− let headerlines = starter <> T.intercalate separator rawheaderlines <>

201− ender

202− let padContent (align, w) t' =

203− let padding = w - T.length t'

204− halfpadding = padding `div` 2

205− in case align of

206− AlignRight -> T.replicate padding " " <> t'

207− AlignCenter -> T.replicate halfpadding " " <> t' <>

208− T.replicate (padding - halfpadding) " "

209− _ -> t' <> T.replicate padding " "

210− let toRow xs = starter <> T.intercalate separator

211− (zipWith padContent (zip aligns colwidths) xs) <>

212− ender

213− let table' = toRow rawheaders <> "\n" <> headerlines <> "\n" <>

214− T.intercalate "\n" (map toRow rawrows)

215− return (node (CUSTOM_BLOCK table' mempty) [] :

216− if null capt

217− then ns

218− else capt' : ns)

219− else do -- fall back to raw HTML

220− s <- writeHtml5String def $! Pandoc nullMeta [t]

221− return (node (HTML_BLOCK s) [] : ns)

157+blockToNodes opts t@(Table _ blkCapt specs _ thead tbody tfoot) ns =

158+ let (capt, aligns, _widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

159+ in if isEnabled Ext_pipe_tables opts && onlySimpleTableCells (thead <> tbody <> tfoot)

160+ then do

161+ -- We construct a table manually as a CUSTOM_BLOCK, for

162+ -- two reasons: (1) cmark-gfm currently doesn't support

163+ -- rendering TABLE nodes; (2) we can align the column sides;

164+ -- (3) we can render the caption as a regular paragraph.

165+ let capt' = node PARAGRAPH (inlinesToNodes opts capt)

166+ -- backslash | in code and raw:

167+ let fixPipe (Code attr xs) =

168+ Code attr (T.replace "|" "\\|" xs)

169+ fixPipe (RawInline format xs) =

170+ RawInline format (T.replace "|" "\\|" xs)

171+ fixPipe x = x

172+ let toCell [Plain ils] = T.strip

173+ $ nodeToCommonmark [] Nothing

174+ $ node (CUSTOM_INLINE mempty mempty)

175+ $ inlinesToNodes opts

176+ $ walk (fixPipe . softBreakToSpace) ils

177+ toCell [Para ils] = T.strip

178+ $ nodeToCommonmark [] Nothing

179+ $ node (CUSTOM_INLINE mempty mempty)

180+ $ inlinesToNodes opts

181+ $ walk (fixPipe . softBreakToSpace) ils

182+ toCell [] = ""

183+ toCell xs = error $ "toCell encountered " ++ show xs

184+ let separator = " | "

185+ let starter = "| "

186+ let ender = " |"

187+ let rawheaders = map toCell headers

188+ let rawrows = map (map toCell) rows

189+ let maximum' [] = 0

190+ maximum' xs = maximum xs

191+ let colwidths = map (maximum' . map T.length) $

192+ transpose (rawheaders:rawrows)

193+ let toHeaderLine len AlignDefault = T.replicate len "-"

194+ toHeaderLine len AlignLeft = ":" <>

195+ T.replicate (max (len - 1) 1) "-"

196+ toHeaderLine len AlignRight =

197+ T.replicate (max (len - 1) 1) "-" <> ":"

198+ toHeaderLine len AlignCenter = ":" <>

199+ T.replicate (max (len - 2) 1) (T.pack "-") <> ":"

200+ let rawheaderlines = zipWith toHeaderLine colwidths aligns

201+ let headerlines = starter <> T.intercalate separator rawheaderlines <>

202+ ender

203+ let padContent (align, w) t' =

204+ let padding = w - T.length t'

205+ halfpadding = padding `div` 2

206+ in case align of

207+ AlignRight -> T.replicate padding " " <> t'

208+ AlignCenter -> T.replicate halfpadding " " <> t' <>

209+ T.replicate (padding - halfpadding) " "

210+ _ -> t' <> T.replicate padding " "

211+ let toRow xs = starter <> T.intercalate separator

212+ (zipWith padContent (zip aligns colwidths) xs) <>

213+ ender

214+ let table' = toRow rawheaders <> "\n" <> headerlines <> "\n" <>

215+ T.intercalate "\n" (map toRow rawrows)

216+ return (node (CUSTOM_BLOCK table' mempty) [] :

217+ if null capt

218+ then ns

219+ else capt' : ns)

220+ else do -- fall back to raw HTML

221+ s <- writeHtml5String def $! Pandoc nullMeta [t]

222+ return (node (HTML_BLOCK s) [] : ns)

222223blockToNodes _ Null ns = return ns

223224

224225inlinesToNodes :: WriterOptions -> [Inline] -> [Node]

src/Text/Pandoc/Writers/ConTeXt.hs+2−1

@@ -255,7 +255,8 @@ blockToConTeXt (DefinitionList lst) =

255255blockToConTeXt HorizontalRule = return $ "\\thinrule" <> blankline

256256-- If this is ever executed, provide a default for the reference identifier.

257257blockToConTeXt (Header level attr lst) = sectionHeader attr level lst

258−blockToConTeXt (Table caption aligns widths heads rows) = do

258+blockToConTeXt (Table _ blkCapt specs _ thead tbody tfoot) = do

259+ let (caption, aligns, widths, heads, rows) = toLegacyTable blkCapt specs thead tbody tfoot

259260 opts <- gets stOptions

260261 let tabl = if isEnabled Ext_ntb opts

261262 then Ntb

src/Text/Pandoc/Writers/Custom.hs+4−2

@@ -29,6 +29,7 @@ import Text.Pandoc.Lua (Global (..), LuaException (LuaException),

2929 runLua, setGlobals)

3030import Text.Pandoc.Lua.Util (addField, dofileWithTraceback)

3131import Text.Pandoc.Options

32+import Text.Pandoc.Shared (toLegacyTable)

3233import Text.Pandoc.Templates (renderTemplate)

3334import qualified Text.Pandoc.UTF8 as UTF8

3435import Text.Pandoc.Writers.Shared

@@ -149,8 +150,9 @@ blockToCustom (CodeBlock attr str) =

149150blockToCustom (BlockQuote blocks) =

150151 Lua.callFunc "BlockQuote" (Stringify blocks)

151152

152−blockToCustom (Table capt aligns widths headers rows) =

153− let aligns' = map show aligns

153+blockToCustom (Table _ blkCapt specs _ thead tbody tfoot) =

154+ let (capt, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

155+ aligns' = map show aligns

154156 capt' = Stringify capt

155157 headers' = map Stringify headers

156158 rows' = map (map Stringify) rows

src/Text/Pandoc/Writers/Docbook.hs+2−1

@@ -263,7 +263,8 @@ blockToDocbook _ b@(RawBlock f str)

263263 report $ BlockNotRendered b

264264 return empty

265265blockToDocbook _ HorizontalRule = return empty -- not semantic

266−blockToDocbook opts (Table caption aligns widths headers rows) = do

266+blockToDocbook opts (Table _ blkCapt specs _ thead tbody tfoot) = do

267+ let (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

267268 captionDoc <- if null caption

268269 then return empty

269270 else inTagsIndented "title" <$>

src/Text/Pandoc/Writers/Docx.hs+4−3

@@ -970,7 +970,8 @@ blockToOpenXML' _ HorizontalRule = do

970970 $ mknode "v:rect" [("style","width:0;height:1.5pt"),

971971 ("o:hralign","center"),

972972 ("o:hrstd","t"),("o:hr","t")] () ]

973−blockToOpenXML' opts (Table caption aligns widths headers rows) = do

973+blockToOpenXML' opts (Table _ blkCapt specs _ thead tbody tfoot) = do

974+ let (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

974975 setFirstPara

975976 modify $ \s -> s { stInTable = True }

976977 let captionStr = stringify caption

@@ -993,11 +994,11 @@ blockToOpenXML' opts (Table caption aligns widths headers rows) = do

993994 $ mknode "w:bottom" [("w:val","single")] ()

994995 , mknode "w:vAlign" [("w:val","bottom")] () ]

995996 compactStyle <- pStyleM "Compact"

996− let emptyCell = [mknode "w:p" [] [mknode "w:pPr" [] [compactStyle]]]

997+ let emptyCell' = [mknode "w:p" [] [mknode "w:pPr" [] [compactStyle]]]

997998 let mkcell border contents = mknode "w:tc" []

998999 $ [ borderProps | border ] ++

9991000 if null contents

1000− then emptyCell

1001+ then emptyCell'

10011002 else contents

10021003 let mkrow border cells = mknode "w:tr" [] $

10031004 [mknode "w:trPr" [] [

src/Text/Pandoc/Writers/DokuWiki.hs+3−2

@@ -35,7 +35,7 @@ import Text.Pandoc.ImageSize

3535import Text.Pandoc.Logging

3636import Text.Pandoc.Options (WrapOption (..), WriterOptions (writerTableOfContents, writerTemplate, writerWrapText))

3737import Text.Pandoc.Shared (camelCaseToHyphenated, escapeURI, isURI, linesToPara,

38− removeFormatting, trimr, tshow)

38+ removeFormatting, trimr, tshow, toLegacyTable)

3939import Text.Pandoc.Templates (renderTemplate)

4040import Text.DocLayout (render, literal)

4141import Text.Pandoc.Writers.Shared (defField, metaToContext)

@@ -166,7 +166,8 @@ blockToDokuWiki opts (BlockQuote blocks) = do

166166 then return $ T.unlines $ map ("> " <>) $ T.lines contents

167167 else return $ "<HTML><blockquote>\n" <> contents <> "</blockquote></HTML>"

168168

169−blockToDokuWiki opts (Table capt aligns _ headers rows) = do

169+blockToDokuWiki opts (Table _ blkCapt specs _ thead tbody tfoot) = do

170+ let (capt, aligns, _, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

170171 captionDoc <- if null capt

171172 then return ""

172173 else do

src/Text/Pandoc/Writers/FB2.hs+5−4

@@ -40,7 +40,7 @@ import Text.Pandoc.Definition

4040import Text.Pandoc.Logging

4141import Text.Pandoc.Options (HTMLMathMethod (..), WriterOptions (..), def)

4242import Text.Pandoc.Shared (capitalize, isURI, orderedListMarkers,

43− makeSections, tshow)

43+ makeSections, tshow, toLegacyTable)

4444import Text.Pandoc.Writers.Shared (lookupMetaString)

4545

4646-- | Data to be written at the end of the document:

@@ -334,17 +334,18 @@ blockToXml h@Header{} = do

334334 report $ BlockNotRendered h

335335 return []

336336blockToXml HorizontalRule = return [ el "empty-line" () ]

337−blockToXml (Table caption aligns _ headers rows) = do

337+blockToXml (Table _ blkCapt specs _ thead tbody tfoot) = do

338+ let (caption, aligns, _, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

338339 hd <- mkrow "th" headers aligns

339340 bd <- mapM (\r -> mkrow "td" r aligns) rows

340341 c <- el "emphasis" <$> cMapM toXml caption

341342 return [el "table" (hd : bd), el "p" c]

342343 where

343− mkrow :: PandocMonad m => String -> [TableCell] -> [Alignment] -> FBM m Content

344+ mkrow :: PandocMonad m => String -> [[Block]] -> [Alignment] -> FBM m Content

344345 mkrow tag cells aligns' =

345346 el "tr" <$> mapM (mkcell tag) (zip cells aligns')

346347 --

347− mkcell :: PandocMonad m => String -> (TableCell, Alignment) -> FBM m Content

348+ mkcell :: PandocMonad m => String -> ([Block], Alignment) -> FBM m Content

348349 mkcell tag (cell, align) = do

349350 cblocks <- cMapM blockToXml cell

350351 return $ el tag ([align_attr align], cblocks)

src/Text/Pandoc/Writers/HTML.hs+2−1

@@ -885,7 +885,8 @@ blockToHtml opts (DefinitionList lst) = do

885885 return $ mconcat $ nl opts : term' : nl opts :

886886 intersperse (nl opts) defs') lst

887887 defList opts contents

888−blockToHtml opts (Table capt aligns widths headers rows') = do

888+blockToHtml opts (Table _ blkCapt specs _ thead tbody tfoot) = do

889+ let (capt, aligns, widths, headers, rows') = toLegacyTable blkCapt specs thead tbody tfoot

889890 captionDoc <- if null capt

890891 then return mempty

891892 else do

src/Text/Pandoc/Writers/Haddock.hs+2−1

@@ -115,7 +115,8 @@ blockToHaddock _ (CodeBlock (_,_,_) str) =

115115-- Nothing in haddock corresponds to block quotes:

116116blockToHaddock opts (BlockQuote blocks) =

117117 blockListToHaddock opts blocks

118−blockToHaddock opts (Table caption aligns widths headers rows) = do

118+blockToHaddock opts (Table _ blkCapt specs _ thead tbody tfoot) = do

119+ let (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

119120 caption' <- inlineListToHaddock opts caption

120121 let caption'' = if null caption

121122 then empty

src/Text/Pandoc/Writers/ICML.hs+3−2

@@ -321,8 +321,9 @@ blockToICML opts style (Header lvl (_, cls, _) lst) =

321321 else ""

322322 in parStyle opts stl lst

323323blockToICML _ _ HorizontalRule = return empty -- we could insert a page break instead

324−blockToICML opts style (Table caption aligns widths headers rows) =

325− let style' = tableName : style

324+blockToICML opts style (Table _ blkCapt specs _ thead tbody tfoot) =

325+ let (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

326+ style' = tableName : style

326327 noHeader = all null headers

327328 nrHeaders = if noHeader

328329 then "0"

src/Text/Pandoc/Writers/Ipynb.hs+5−5

@@ -97,7 +97,7 @@ addAttachment (Image attr lab (src,tit))

9797 return $ Image attr lab ("attachment:" <> src, tit)

9898addAttachment x = return x

9999

100−extractCells :: PandocMonad m => WriterOptions -> [Block] -> m [Cell a]

100+extractCells :: PandocMonad m => WriterOptions -> [Block] -> m [Ipynb.Cell a]

101101extractCells _ [] = return []

102102extractCells opts (Div (_id,classes,kvs) xs : bs)

103103 | "cell" `elem` classes

@@ -106,7 +106,7 @@ extractCells opts (Div (_id,classes,kvs) xs : bs)

106106 (newdoc, attachments) <-

107107 runStateT (walkM addAttachment (Pandoc nullMeta xs)) mempty

108108 source <- writeMarkdown opts{ writerTemplate = Nothing } newdoc

109− (Cell{

109+ (Ipynb.Cell{

110110 cellType = Markdown

111111 , cellSource = Source $ breakLines $ T.stripEnd source

112112 , cellMetadata = meta

@@ -123,7 +123,7 @@ extractCells opts (Div (_id,classes,kvs) xs : bs)

123123 let meta = pairsToJSONMeta kvs

124124 outputs <- catMaybes <$> mapM blockToOutput rest

125125 let exeCount = lookup "execution_count" kvs >>= safeRead

126− (Cell{

126+ (Ipynb.Cell{

127127 cellType = Ipynb.Code {

128128 codeExecutionCount = exeCount

129129 , codeOutputs = outputs

@@ -143,7 +143,7 @@ extractCells opts (Div (_id,classes,kvs) xs : bs)

143143 "markdown" -> "text/markdown"

144144 "rst" -> "text/x-rst"

145145 _ -> f

146− (Cell{

146+ (Ipynb.Cell{

147147 cellType = Raw

148148 , cellSource = Source $ breakLines raw

149149 , cellMetadata = if format' == "ipynb" -- means no format given

@@ -156,7 +156,7 @@ extractCells opts (CodeBlock (_id,classes,kvs) raw : bs)

156156 | "code" `elem` classes = do

157157 let meta = pairsToJSONMeta kvs

158158 let exeCount = lookup "execution_count" kvs >>= safeRead

159− (Cell{

159+ (Ipynb.Cell{

160160 cellType = Ipynb.Code {

161161 codeExecutionCount = exeCount

162162 , codeOutputs = []

src/Text/Pandoc/Writers/JATS.hs+19−15

@@ -356,21 +356,25 @@ blockToJATS _ b@(RawBlock f str)

356356 report $ BlockNotRendered b

357357 return empty

358358blockToJATS _ HorizontalRule = return empty -- not semantic

359−blockToJATS opts (Table [] aligns widths headers rows) = do

360− let percent w = tshow (truncate (100*w) :: Integer) <> "*"

361− let coltags = vcat $ zipWith (\w al -> selfClosingTag "col"

362− ([("width", percent w) | w > 0] ++

363− [("align", alignmentToText al)])) widths aligns

364− thead <- if all null headers

365− then return empty

366− else inTagsIndented "thead" <$> tableRowToJATS opts True headers

367− tbody <- (inTagsIndented "tbody" . vcat) <$>

368− mapM (tableRowToJATS opts False) rows

369− return $ inTags True "table" [] $ coltags $$ thead $$ tbody

370−blockToJATS opts (Table caption aligns widths headers rows) = do

371− captionDoc <- inTagsIndented "caption" <$> blockToJATS opts (Para caption)

372− tbl <- blockToJATS opts (Table [] aligns widths headers rows)

373− return $ inTags True "table-wrap" [] $ captionDoc $$ tbl

359+blockToJATS opts (Table _ blkCapt specs _ th tb tf) =

360+ case toLegacyTable blkCapt specs th tb tf of

361+ ([], aligns, widths, headers, rows) -> captionlessTable aligns widths headers rows

362+ (caption, aligns, widths, headers, rows) -> do

363+ captionDoc <- inTagsIndented "caption" <$> blockToJATS opts (Para caption)

364+ tbl <- captionlessTable aligns widths headers rows

365+ return $ inTags True "table-wrap" [] $ captionDoc $$ tbl

366+ where

367+ captionlessTable aligns widths headers rows = do

368+ let percent w = tshow (truncate (100*w) :: Integer) <> "*"

369+ let coltags = vcat $ zipWith (\w al -> selfClosingTag "col"

370+ ([("width", percent w) | w > 0] ++

371+ [("align", alignmentToText al)])) widths aligns

372+ thead <- if all null headers

373+ then return empty

374+ else inTagsIndented "thead" <$> tableRowToJATS opts True headers

375+ tbody <- (inTagsIndented "tbody" . vcat) <$>

376+ mapM (tableRowToJATS opts False) rows

377+ return $ inTags True "table" [] $ coltags $$ thead $$ tbody

374378

375379alignmentToText :: Alignment -> Text

376380alignmentToText alignment = case alignment of

src/Text/Pandoc/Writers/Jira.hs+4−3

@@ -26,7 +26,7 @@ import Text.Pandoc.Class.PandocMonad (PandocMonad)

2626import Text.Pandoc.Definition

2727import Text.Pandoc.Options (WriterOptions (writerTemplate, writerWrapText),

2828 WrapOption (..))

29−import Text.Pandoc.Shared (linesToPara, stringify)

29+import Text.Pandoc.Shared (linesToPara, stringify, toLegacyTable)

3030import Text.Pandoc.Templates (renderTemplate)

3131import Text.Pandoc.Writers.Math (texMathToInlines)

3232import Text.Pandoc.Writers.Shared (defField, metaToContext)

@@ -98,7 +98,8 @@ toJiraBlocks blocks = do

9898 Plain xs -> singleton . Jira.Para <$> toJiraInlines xs

9999 RawBlock fmt cs -> rawBlockToJira fmt cs

100100 Null -> return mempty

101− Table _ _ _ hd body -> singleton <$> do

101+ Table _ blkCapt specs _ thead tbody tfoot -> singleton <$> do

102+ let (_, _, _, hd, body) = toLegacyTable blkCapt specs thead tbody tfoot

102103 headerRow <- if all null hd

103104 then pure Nothing

104105 else Just <$> toRow Jira.HeaderCell hd

@@ -112,7 +113,7 @@ toJiraBlocks blocks = do

112113

113114toRow :: PandocMonad m

114115 => ([Jira.Block] -> Jira.Cell)

115− -> [TableCell]

116+ -> [[Block]]

116117 -> JiraConverter m Jira.Row

117118toRow mkCell cells = Jira.Row <$>

118119 mapM (fmap mkCell . toJiraBlocks) cells

src/Text/Pandoc/Writers/LaTeX.hs+2−1

@@ -759,7 +759,8 @@ blockToLaTeX (Header level (id',classes,_) lst) = do

759759 hdr <- sectionHeader classes id' level lst

760760 modify $ \s -> s{stInHeading = False}

761761 return hdr

762−blockToLaTeX (Table caption aligns widths heads rows) = do

762+blockToLaTeX (Table _ blkCapt specs _ thead tbody tfoot) = do

763+ let (caption, aligns, widths, heads, rows) = toLegacyTable blkCapt specs thead tbody tfoot

763764 (captionText, captForLof, captNotes) <- getCaption False caption

764765 let toHeaders hs = do contents <- tableRowToLaTeX True aligns widths hs

765766 return ("\\toprule" $$ contents $$ "\\midrule")

src/Text/Pandoc/Writers/Man.hs+3−2

@@ -139,8 +139,9 @@ blockToMan opts (CodeBlock _ str) = return $

139139blockToMan opts (BlockQuote blocks) = do

140140 contents <- blockListToMan opts blocks

141141 return $ literal ".RS" $$ contents $$ literal ".RE"

142−blockToMan opts (Table caption alignments widths headers rows) =

143− let aligncode AlignLeft = "l"

142+blockToMan opts (Table _ blkCapt specs _ thead tbody tfoot) =

143+ let (caption, alignments, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

144+ aligncode AlignLeft = "l"

144145 aligncode AlignRight = "r"

145146 aligncode AlignCenter = "c"

146147 aligncode AlignDefault = "l"

src/Text/Pandoc/Writers/Markdown.hs+3−2

@@ -574,14 +574,15 @@ blockToMarkdown' opts (BlockQuote blocks) = do

574574 else if plain then " " else "> "

575575 contents <- blockListToMarkdown opts blocks

576576 return $ (prefixed leader contents) <> blankline

577−blockToMarkdown' opts t@(Table caption aligns widths headers rows) = do

577+blockToMarkdown' opts t@(Table _ blkCapt specs _ thead tbody tfoot) = do

578+ let (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

578579 let numcols = maximum (length aligns : length widths :

579580 map length (headers:rows))

580581 caption' <- inlineListToMarkdown opts caption

581582 let caption'' = if null caption || not (isEnabled Ext_table_captions opts)

582583 then blankline

583584 else blankline $$ (": " <> caption') $$ blankline

584− let hasSimpleCells = onlySimpleTableCells $ headers:rows

585+ let hasSimpleCells = onlySimpleTableCells $ thead <> tbody <> tfoot

585586 let isSimple = hasSimpleCells && all (==0) widths

586587 let isPlainBlock (Plain _) = True

587588 isPlainBlock _ = False

src/Text/Pandoc/Writers/MediaWiki.hs+2−1

@@ -150,7 +150,8 @@ blockToMediaWiki (BlockQuote blocks) = do

150150 contents <- blockListToMediaWiki blocks

151151 return $ "<blockquote>" <> contents <> "</blockquote>"

152152

153−blockToMediaWiki (Table capt aligns widths headers rows') = do

153+blockToMediaWiki (Table _ blkCapt specs _ thead tbody tfoot) = do

154+ let (capt, aligns, widths, headers, rows') = toLegacyTable blkCapt specs thead tbody tfoot

154155 caption <- if null capt

155156 then return ""

156157 else do

src/Text/Pandoc/Writers/Ms.hs+3−2

@@ -215,8 +215,9 @@ blockToMs opts (BlockQuote blocks) = do

215215 contents <- blockListToMs opts blocks

216216 setFirstPara

217217 return $ literal ".QS" $$ contents $$ literal ".QE"

218−blockToMs opts (Table caption alignments widths headers rows) =

219− let aligncode AlignLeft = "l"

218+blockToMs opts (Table _ blkCapt specs _ thead tbody tfoot) =

219+ let (caption, alignments, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

220+ aligncode AlignLeft = "l"

220221 aligncode AlignRight = "r"

221222 aligncode AlignCenter = "c"

222223 aligncode AlignDefault = "l"

src/Text/Pandoc/Writers/Muse.hs+5−4

@@ -150,8 +150,8 @@ flatBlockListToMuse [] = return mempty

150150

151151simpleTable :: PandocMonad m

152152 => [Inline]

153− -> [TableCell]

154− -> [[TableCell]]

153+ -> [[Block]]

154+ -> [[[Block]]]

155155 -> Muse m (Doc Text)

156156simpleTable caption headers rows = do

157157 topLevel <- asks envTopLevel

@@ -259,17 +259,18 @@ blockToMuse (Header level (ident,_,_) inlines) = do

259259 return $ blankline <> attr' $$ nowrap (header' <> contents) <> blankline

260260-- https://www.gnu.org/software/emacs-muse/manual/muse.html#Horizontal-Rules-and-Anchors

261261blockToMuse HorizontalRule = return $ blankline $$ "----" $$ blankline

262−blockToMuse (Table caption aligns widths headers rows) =

262+blockToMuse (Table _ blkCapt specs _ thead tbody tfoot) =

263263 if isSimple && numcols > 1

264264 then simpleTable caption headers rows

265265 else do

266266 opts <- asks envOptions

267267 gridTable opts blocksToDoc True (map (const AlignDefault) aligns) widths headers rows

268268 where

269+ (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

269270 blocksToDoc opts blocks =

270271 local (\env -> env { envOptions = opts }) $ blockListToMuse blocks

271272 numcols = maximum (length aligns : length widths : map length (headers:rows))

272− isSimple = onlySimpleTableCells (headers:rows) && all (== 0) widths

273+ isSimple = onlySimpleTableCells (thead <> tbody <> tfoot) && all (== 0) widths

273274blockToMuse (Div _ bs) = flatBlockListToMuse bs

274275blockToMuse Null = return empty

275276

src/Text/Pandoc/Writers/Native.hs+27−6

@@ -40,12 +40,33 @@ prettyBlock (DefinitionList items) = "DefinitionList" $$

4040 prettyList (map deflistitem items)

4141 where deflistitem (term, defs) = "(" <> text (show term) <> "," <> cr <>

4242 nest 1 (prettyList $ map (prettyList . map prettyBlock) defs) <> ")"

43−prettyBlock (Table caption aligns widths header rows) =

44− "Table " <> text (show caption) <> " " <> text (show aligns) <> " " <>

45− text (show widths) $$

46− prettyRow header $$

47− prettyList (map prettyRow rows)

48− where prettyRow cols = prettyList (map (prettyList . map prettyBlock) cols)

43+prettyBlock (Table attr blkCapt specs rhs thead tbody tfoot) =

44+ mconcat [ "Table "

45+ , text (show attr)

46+ , " "

47+ , prettyCaption blkCapt

48+ , " "

49+ , text (show specs)

50+ , " "

51+ , text (show rhs) ] $$

52+ prettyRows thead $$

53+ prettyRows tbody $$

54+ prettyRows tfoot

55+ where prettyRows = prettyList . map prettyRow

56+ prettyRow (Row a body) =

57+ text ("Row " <> show a) $$ prettyList (map prettyCell body)

58+ prettyCell (Cell a ma h w b) =

59+ mconcat [ "Cell "

60+ , text (show a)

61+ , " "

62+ , text (showsPrec 11 ma "")

63+ , " "

64+ , text (show h)

65+ , " "

66+ , text (show w) ] $$

67+ prettyList (map prettyBlock b)

68+ prettyCaption (Caption mshort body) =

69+ "(Caption " <> text (showsPrec 11 mshort "") $$ prettyList (map prettyBlock body) <> ")"

4970prettyBlock (Div attr blocks) =

5071 text ("Div " <> show attr) $$ prettyList (map prettyBlock blocks)

5172prettyBlock block = text $ show block

src/Text/Pandoc/Writers/OpenDocument.hs+4−2

@@ -31,7 +31,7 @@ import Text.Pandoc.Definition

3131import Text.Pandoc.Logging

3232import Text.Pandoc.Options

3333import Text.DocLayout

34−import Text.Pandoc.Shared (linesToPara, tshow)

34+import Text.Pandoc.Shared (linesToPara, tshow, toLegacyTable)

3535import Text.Pandoc.Templates (renderTemplate)

3636import qualified Text.Pandoc.Translations as Term (Term(Figure, Table))

3737import Text.Pandoc.Writers.Math

@@ -359,7 +359,9 @@ blockToOpenDocument o bs

359359 | BulletList b <- bs = setFirstPara >> bulletListToOpenDocument o b

360360 | OrderedList a b <- bs = setFirstPara >> orderedList a b

361361 | CodeBlock _ s <- bs = setFirstPara >> preformatted s

362− | Table c a w h r <- bs = setFirstPara >> table c a w h r

362+ | Table _ bc s _ th tb tf

363+ <- bs = let (c, a, w, h, r) = toLegacyTable bc s th tb tf

364+ in setFirstPara >> table c a w h r

363365 | HorizontalRule <- bs = setFirstPara >> return (selfClosingTag "text:p"

364366 [ ("text:style-name", "Horizontal_20_Line") ])

365367 | RawBlock f s <- bs = if f == Format "opendocument"

src/Text/Pandoc/Writers/Org.hs+2−1

@@ -183,7 +183,8 @@ blockToOrg (BlockQuote blocks) = do

183183 contents <- blockListToOrg blocks

184184 return $ blankline $$ "#+BEGIN_QUOTE" $$

185185 nest 2 contents $$ "#+END_QUOTE" $$ blankline

186−blockToOrg (Table caption' _ _ headers rows) = do

186+blockToOrg (Table _ blkCapt specs _ thead tbody tfoot) = do

187+ let (caption', _, _, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

187188 caption'' <- inlineListToOrg caption'

188189 let caption = if null caption'

189190 then empty

src/Text/Pandoc/Writers/Powerpoint/Output.hs+2−2

@@ -977,10 +977,10 @@ graphicToElement tableWidth (Tbl tblPr hdrCells rows) = do

977977 headers' <- mapM cellToOpenXML hdrCells

978978 rows' <- mapM (mapM cellToOpenXML) rows

979979 let borderProps = mknode "a:tcPr" [] ()

980− let emptyCell = [mknode "a:p" [] [mknode "a:pPr" [] ()]]

980+ let emptyCell' = [mknode "a:p" [] [mknode "a:pPr" [] ()]]

981981 let mkcell border contents = mknode "a:tc" []

982982 $ (if null contents

983− then emptyCell

983+ then emptyCell'

984984 else contents) <> [ borderProps | border ]

985985 let mkrow border cells = mknode "a:tr" [("h", "0")] $ map (mkcell border) cells

986986

src/Text/Pandoc/Writers/Powerpoint/Presentation.hs+11−6

@@ -54,7 +54,7 @@ import Text.Pandoc.Logging

5454import Text.Pandoc.Walk

5555import Data.Time (UTCTime)

5656import qualified Text.Pandoc.Shared as Shared -- so we don't overlap "Element"

57−import Text.Pandoc.Shared (tshow)

57+import Text.Pandoc.Shared (tshow, toLegacyTable)

5858import Text.Pandoc.Writers.Shared (lookupMetaInlines, lookupMetaBlocks

5959 , lookupMetaString, toTableOfContents)

6060import qualified Data.Map as M

@@ -201,13 +201,17 @@ data Shape = Pic PicProps FilePath [ParaElem]

201201 | RawOOXMLShape T.Text

202202 deriving (Show, Eq)

203203

204−type Cell = [Paragraph]

204+type TableCell = [Paragraph]

205+

206+-- TODO: remove when better handling of new

207+-- tables is implemented

208+type SimpleCell = [Block]

205209

206210data TableProps = TableProps { tblPrFirstRow :: Bool

207211 , tblPrBandRow :: Bool

208212 } deriving (Show, Eq)

209213

210−data Graphic = Tbl TableProps [Cell] [[Cell]]

214+data Graphic = Tbl TableProps [TableCell] [[TableCell]]

211215 deriving (Show, Eq)

212216

213217

@@ -503,7 +507,7 @@ multiParBullet (b:bs) = do

503507 concatMapM blockToParagraphs bs

504508 return $ p ++ ps

505509

506−cellToParagraphs :: Alignment -> TableCell -> Pres [Paragraph]

510+cellToParagraphs :: Alignment -> SimpleCell -> Pres [Paragraph]

507511cellToParagraphs algn tblCell = do

508512 paras <- mapM blockToParagraphs tblCell

509513 let alignment = case algn of

@@ -514,7 +518,7 @@ cellToParagraphs algn tblCell = do

514518 paras' = map (map (\p -> p{paraProps = (paraProps p){pPropAlign = alignment}})) paras

515519 return $ concat paras'

516520

517−rowToParagraphs :: [Alignment] -> [TableCell] -> Pres [[Paragraph]]

521+rowToParagraphs :: [Alignment] -> [SimpleCell] -> Pres [[Paragraph]]

518522rowToParagraphs algns tblCells = do

519523 -- We have to make sure we have the right number of alignments

520524 let pairs = zip (algns ++ repeat AlignDefault) tblCells

@@ -537,7 +541,8 @@ blockToShape (Para (il:_)) | Link _ (il':_) target <- il

537541 , Image attr ils (url, _) <- il' =

538542 (withAttr attr . Pic def{picPropLink = Just $ ExternalTarget target} (T.unpack url))

539543 <$> inlinesToParElems ils

540−blockToShape (Table caption algn _ hdrCells rows) = do

544+blockToShape (Table _ blkCapt specs _ thead tbody tfoot) = do

545+ let (caption, algn, _, hdrCells, rows) = toLegacyTable blkCapt specs thead tbody tfoot

541546 caption' <- inlinesToParElems caption

542547 hdrCells' <- rowToParagraphs algn hdrCells

543548 rows' <- mapM (rowToParagraphs algn) rows

src/Text/Pandoc/Writers/RST.hs+2−1

@@ -284,7 +284,8 @@ blockToRST (CodeBlock (_,classes,kvs) str) = do

284284blockToRST (BlockQuote blocks) = do

285285 contents <- blockListToRST blocks

286286 return $ nest 3 contents <> blankline

287−blockToRST (Table caption aligns widths headers rows) = do

287+blockToRST (Table _ blkCapt specs _ thead tbody tfoot) = do

288+ let (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

288289 caption' <- inlineListToRST caption

289290 let blocksToDoc opts bs = do

290291 oldOpts <- gets stOptions

src/Text/Pandoc/Writers/RTF.hs+2−1

@@ -254,7 +254,8 @@ blockToRTF indent alignment (Header level _ lst) = do

254254 contents <- inlinesToRTF lst

255255 return $ rtfPar indent 0 alignment $

256256 "\\b \\fs" <> tshow (40 - (level * 4)) <> " " <> contents

257−blockToRTF indent alignment (Table caption aligns sizes headers rows) = do

257+blockToRTF indent alignment (Table _ blkCapt specs _ thead tbody tfoot) = do

258+ let (caption, aligns, sizes, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

258259 caption' <- inlinesToRTF caption

259260 header' <- if all null headers

260261 then return ""

src/Text/Pandoc/Writers/TEI.hs+2−1

@@ -194,7 +194,8 @@ blockToTEI _ HorizontalRule = return $

194194-- | TEI Tables

195195-- TEI Simple's tables are composed of cells and rows; other

196196-- table info in the AST is here lossily discard.

197−blockToTEI opts (Table _ _ _ headers rows) = do

197+blockToTEI opts (Table _ blkCapt specs _ thead tbody tfoot) = do

198+ let (_, _, _, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

198199 headers' <- tableHeadersToTEI opts headers

199200 rows' <- mapM (tableRowToTEI opts) rows

200201 return $ inTags True "table" [] $ headers' $$ vcat rows'

src/Text/Pandoc/Writers/Texinfo.hs+2−1

@@ -228,7 +228,8 @@ blockToTexinfo (Header level (ident,_,_) lst)

228228 seccmd 4 = return "@subsubsection "

229229 seccmd _ = throwError $ PandocSomeError "illegal seccmd level"

230230

231−blockToTexinfo (Table caption aligns widths heads rows) = do

231+blockToTexinfo (Table _ blkCapt specs _ thead tbody tfoot) = do

232+ let (caption, aligns, widths, heads, rows) = toLegacyTable blkCapt specs thead tbody tfoot

232233 headers <- if all null heads

233234 then return empty

234235 else tableHeadToTexinfo aligns heads

src/Text/Pandoc/Writers/Textile.hs+38−38

@@ -168,44 +168,44 @@ blockToTextile opts (BlockQuote blocks) = do

168168 contents <- blockListToTextile opts blocks

169169 return $ "<blockquote>\n\n" <> contents <> "\n</blockquote>\n"

170170

171−blockToTextile opts (Table [] aligns widths headers rows') |

172− all (==0) widths = do

173− hs <- mapM (liftM (("_. " <>) . stripTrailingNewlines) . blockListToTextile opts) headers

174− let cellsToRow cells = "|" <> T.intercalate "|" cells <> "|"

175− let header = if all null headers then "" else cellsToRow hs <> "\n"

176− let blocksToCell (align, bs) = do

177− contents <- stripTrailingNewlines <$> blockListToTextile opts bs

178− let alignMarker = case align of

179− AlignLeft -> "<. "

180− AlignRight -> ">. "

181− AlignCenter -> "=. "

182− AlignDefault -> ""

183− return $ alignMarker <> contents

184− let rowToCells = mapM blocksToCell . zip aligns

185− bs <- mapM rowToCells rows'

186− let body = T.unlines $ map cellsToRow bs

187− return $ header <> body

188−

189−blockToTextile opts (Table capt aligns widths headers rows') = do

190− let alignStrings = map alignmentToText aligns

191− captionDoc <- if null capt

192− then return ""

193− else do

194− c <- inlineListToTextile opts capt

195− return $ "<caption>" <> c <> "</caption>\n"

196− let percent w = tshow (truncate (100*w) :: Integer) <> "%"

197− let coltags = if all (== 0.0) widths

198− then ""

199− else T.unlines $ map

200− (\w -> "<col width=\"" <> percent w <> "\" />") widths

201− head' <- if all null headers

202− then return ""

203− else do

204− hs <- tableRowToTextile opts alignStrings 0 headers

205− return $ "<thead>\n" <> hs <> "\n</thead>\n"

206− body' <- zipWithM (tableRowToTextile opts alignStrings) [1..] rows'

207− return $ "<table>\n" <> captionDoc <> coltags <> head' <>

208− "<tbody>\n" <> T.unlines body' <> "</tbody>\n</table>\n"

171+blockToTextile opts (Table _ blkCapt specs _ thead tbody tfoot)

172+ = case toLegacyTable blkCapt specs thead tbody tfoot of

173+ ([], aligns, widths, headers, rows') | all (==0) widths -> do

174+ hs <- mapM (liftM (("_. " <>) . stripTrailingNewlines) . blockListToTextile opts) headers

175+ let cellsToRow cells = "|" <> T.intercalate "|" cells <> "|"

176+ let header = if all null headers then "" else cellsToRow hs <> "\n"

177+ let blocksToCell (align, bs) = do

178+ contents <- stripTrailingNewlines <$> blockListToTextile opts bs

179+ let alignMarker = case align of

180+ AlignLeft -> "<. "

181+ AlignRight -> ">. "

182+ AlignCenter -> "=. "

183+ AlignDefault -> ""

184+ return $ alignMarker <> contents

185+ let rowToCells = mapM blocksToCell . zip aligns

186+ bs <- mapM rowToCells rows'

187+ let body = T.unlines $ map cellsToRow bs

188+ return $ header <> body

189+ (capt, aligns, widths, headers, rows') -> do

190+ let alignStrings = map alignmentToText aligns

191+ captionDoc <- if null capt

192+ then return ""

193+ else do

194+ c <- inlineListToTextile opts capt

195+ return $ "<caption>" <> c <> "</caption>\n"

196+ let percent w = tshow (truncate (100*w) :: Integer) <> "%"

197+ let coltags = if all (== 0.0) widths

198+ then ""

199+ else T.unlines $ map

200+ (\w -> "<col width=\"" <> percent w <> "\" />") widths

201+ head' <- if all null headers

202+ then return ""

203+ else do

204+ hs <- tableRowToTextile opts alignStrings 0 headers

205+ return $ "<thead>\n" <> hs <> "\n</thead>\n"

206+ body' <- zipWithM (tableRowToTextile opts alignStrings) [1..] rows'

207+ return $ "<table>\n" <> captionDoc <> coltags <> head' <>

208+ "<tbody>\n" <> T.unlines body' <> "</tbody>\n</table>\n"

209209

210210blockToTextile opts x@(BulletList items) = do

211211 oldUseTags <- gets stUseTags

src/Text/Pandoc/Writers/XWiki.hs+2−1

@@ -122,7 +122,8 @@ blockToXWiki (DefinitionList items) = do

122122 return $ vcat contents <> if Text.null lev then "\n" else ""

123123

124124-- TODO: support more features

125−blockToXWiki (Table _ _ _ headers rows') = do

125+blockToXWiki (Table _ blkCapt specs _ thead tbody tfoot) = do

126+ let (_, _, _, headers, rows') = toLegacyTable blkCapt specs thead tbody tfoot

126127 headers' <- mapM (tableCellXWiki True) headers

127128 otherRows <- mapM formRow rows'

128129 return $ Text.unlines (Text.unwords headers':otherRows)

src/Text/Pandoc/Writers/ZimWiki.hs+3−2

@@ -32,7 +32,7 @@ import Text.Pandoc.Logging

3232import Text.Pandoc.Options (WrapOption (..),

3333 WriterOptions (writerTableOfContents, writerTemplate,

3434 writerWrapText))

35−import Text.Pandoc.Shared (escapeURI, isURI, linesToPara, removeFormatting, trimr)

35+import Text.Pandoc.Shared (escapeURI, isURI, linesToPara, removeFormatting, trimr, toLegacyTable)

3636import Text.Pandoc.Templates (renderTemplate)

3737import Text.Pandoc.Writers.Shared (defField, metaToContext)

3838

@@ -132,7 +132,8 @@ blockToZimWiki opts (BlockQuote blocks) = do

132132 contents <- blockListToZimWiki opts blocks

133133 return $ T.unlines $ map ("> " <>) $ T.lines contents

134134

135−blockToZimWiki opts (Table capt aligns _ headers rows) = do

135+blockToZimWiki opts (Table _ blkCapt specs _ thead tbody tfoot) = do

136+ let (capt, aligns, _, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

136137 captionDoc <- if null capt

137138 then return ""

138139 else do

stack.yaml+4−1

@@ -12,7 +12,10 @@ flags:

1212packages:

1313- '.'

1414extra-deps:

15−- pandoc-types-1.20

15+# - pandoc-types-1.20

16+# better-tables

17+- git: git@github.com:despresc/pandoc-types

18+ commit: 5fef630269d29a818cde834c4cea50f129c7e2b8

1619- texmath-0.12.0.1

1720- haddock-library-1.8.0

1821- skylighting-0.8.3.2

test/Tests/Readers/DokuWiki.hs+3−3

@@ -296,7 +296,7 @@ tests = [ testGroup "inlines"

296296 T.unlines [ "| foo | bar |"

297297 , "| bat | baz |"

298298 ] =?>

299− table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]

299+ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)]

300300 []

301301 [[plain "foo", plain "bar"]

302302 ,[plain "bat", plain "baz"]]

@@ -304,7 +304,7 @@ tests = [ testGroup "inlines"

304304 T.unlines [ "^ foo ^ bar ^"

305305 , "| bat | baz |"

306306 ] =?>

307− table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]

307+ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)]

308308 [plain "foo", plain "bar"]

309309 [[plain "bat", plain "baz"]]

310310 , "Table with colspan" =:

@@ -312,7 +312,7 @@ tests = [ testGroup "inlines"

312312 , "| 1,0 | 1,1 ||"

313313 , "| 2,0 | 2,1 | 2,2 |"

314314 ] =?>

315− table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0), (AlignDefault, 0.0)]

315+ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing), (AlignDefault, Nothing)]

316316 [plain "0,0", plain "0,1", plain "0,2"]

317317 [[plain "1,0", plain "1,1", mempty]

318318 ,[plain "2,0", plain "2,1", plain "2,2"]

test/Tests/Readers/LaTeX.hs+1−1

@@ -36,7 +36,7 @@ infix 4 =:

3636(=:) = test latex

3737

3838simpleTable' :: [Alignment] -> [[Blocks]] -> Blocks

39−simpleTable' aligns = table "" (zip aligns (repeat 0.0))

39+simpleTable' aligns = table "" (zip aligns (repeat Nothing))

4040 (map (const mempty) aligns)

4141

4242tokUntokRt :: String -> Bool

test/Tests/Readers/Man.hs+2−2

@@ -122,12 +122,12 @@ tests = [

122122 testGroup "Tables" [

123123 "t1" =:

124124 ".TS\nallbox;\nl l l.\na\tb\tc\nd\te\tf\n.TE"

125− =?> table mempty (replicate 3 (AlignLeft, 0.0)) [] [

125+ =?> table mempty (replicate 3 (AlignLeft, Nothing)) [] [

126126 map (plain . str ) ["a", "b", "c"],

127127 map (plain . str ) ["d", "e", "f"]

128128 ],

129129 "longcell" =:

130130 ".TS\n;\nr.\nT{\na\nb\nc d\nT}\nf\n.TE"

131− =?> table mempty [(AlignRight, 0.0)] [] [[plain $ text "a b c d"], [plain $ str "f"]]

131+ =?> table mempty [(AlignRight, Nothing)] [] [[plain $ text "a b c d"], [plain $ str "f"]]

132132 ]

133133 ]

test/Tests/Readers/Muse.hs+50−28

@@ -15,6 +15,7 @@ module Tests.Readers.Muse (tests) where

1515

1616import Prelude

1717import Data.List (intersperse)

18+import Data.Maybe (isNothing)

1819import Data.Monoid (Any (..))

1920import Data.Text (Text)

2021import qualified Data.Text as T

@@ -25,7 +26,7 @@ import Tests.Helpers

2526import Text.Pandoc

2627import Text.Pandoc.Arbitrary ()

2728import Text.Pandoc.Builder

28−import Text.Pandoc.Shared (underlineSpan)

29+import Text.Pandoc.Shared (underlineSpan, toLegacyTable)

2930import Text.Pandoc.Walk

3031

3132amuse :: Text -> Pandoc

@@ -45,20 +46,41 @@ spcSep = mconcat . intersperse space

4546-- Tables don't round-trip yet

4647--

4748makeRoundTrip :: Block -> Block

48−makeRoundTrip t@(Table _caption aligns widths headers rows) =

49+makeRoundTrip t@(Table tattr blkCapt specs rhs thead tbody tfoot) =

4950 if isSimple && numcols > 1

5051 then t

5152 else Para [Str "table was here"]

52− where numcols = maximum (length aligns : length widths : map length (headers:rows))

53− hasSimpleCells = all isSimpleCell (concat (headers:rows))

53+ where (_, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot

54+ numcols = maximum (length aligns : length widths : map length (headers:rows))

55+ hasSimpleCells = all isSimpleRow (thead <> tbody <> tfoot)

5456 isLineBreak LineBreak = Any True

5557 isLineBreak _ = Any False

5658 hasLineBreak = getAny . query isLineBreak

57− isSimple = hasSimpleCells && all (== 0) widths

58− isSimpleCell [Plain ils] = not (hasLineBreak ils)

59− isSimpleCell [Para ils ] = not (hasLineBreak ils)

60− isSimpleCell [] = True

61− isSimpleCell _ = False

59+ isSimple = and [ hasSimpleCells

60+ , all (== 0) widths

61+ , null tfoot

62+ , length thead == 1

63+ , isNullAttr tattr

64+ , rhs == 0

65+ , simpleCapt ]

66+ isNullAttr ("", [], []) = True

67+ isNullAttr _ = False

68+ isSimpleRow (Row attr body) = isNullAttr attr && all isSimpleCell body

69+ isSimpleCell (Cell attr ali h w body)

70+ = and [ h == 1

71+ , w == 1

72+ , isNullAttr attr

73+ , isNothing ali

74+ , isSimpleCellBody body ]

75+ isSimpleCellBody [Plain ils] = not (hasLineBreak ils)

76+ isSimpleCellBody [Para ils ] = not (hasLineBreak ils)

77+ isSimpleCellBody [] = True

78+ isSimpleCellBody _ = False

79+ simpleCapt = case blkCapt of

80+ Caption Nothing [Para _] -> True

81+ Caption Nothing [Plain _] -> True

82+ _ -> False

83+

6284makeRoundTrip (OrderedList (start, LowerAlpha, _) items) = OrderedList (start, Decimal, Period) items

6385makeRoundTrip (OrderedList (start, UpperAlpha, _) items) = OrderedList (start, Decimal, Period) items

6486makeRoundTrip x = x

@@ -950,12 +972,12 @@ tests =

950972 , testGroup "Tables"

951973 [ "Two cell table" =:

952974 "One | Two" =?>

953− table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]

975+ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)]

954976 []

955977 [[plain "One", plain "Two"]]

956978 , "Table with multiple words" =:

957979 "One two | three four" =?>

958− table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]

980+ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)]

959981 []

960982 [[plain "One two", plain "three four"]]

961983 , "Not a table" =:

@@ -969,7 +991,7 @@ tests =

969991 [ "One | Two"

970992 , "Three | Four"

971993 ] =?>

972− table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]

994+ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)]

973995 []

974996 [[plain "One", plain "Two"],

975997 [plain "Three", plain "Four"]]

@@ -978,7 +1000,7 @@ tests =

9781000 [ "First || Second"

9791001 , "Third | Fourth"

9801002 ] =?>

981− table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]

1003+ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)]

9821004 [plain "First", plain "Second"]

9831005 [[plain "Third", plain "Fourth"]]

9841006 , "Table with two headers" =:

@@ -987,7 +1009,7 @@ tests =

9871009 , "Second || header"

9881010 , "Foo | bar"

9891011 ] =?>

990− table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]

1012+ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)]

9911013 [plain "First", plain "header"]

9921014 [[plain "Second", plain "header"],

9931015 [plain "Foo", plain "bar"]]

@@ -997,7 +1019,7 @@ tests =

9971019 , "Baz || foo"

9981020 , "Bar | baz"

9991021 ] =?>

1000− table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]

1022+ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)]

10011023 [plain "Baz", plain "foo"]

10021024 [[plain "Bar", plain "baz"],

10031025 [plain "Foo", plain "bar"]]

@@ -1008,7 +1030,7 @@ tests =

10081030 , "Second | row | there"

10091031 , "|+ Table caption +|"

10101032 ] =?>

1011− table (text "Table caption") (replicate 3 (AlignDefault, 0.0))

1033+ table (text "Table caption") (replicate 3 (AlignDefault, Nothing))

10121034 [plain "Foo", plain "bar", plain "baz"]

10131035 [[plain "First", plain "row", plain "here"],

10141036 [plain "Second", plain "row", plain "there"]]

@@ -1017,7 +1039,7 @@ tests =

10171039 [ "Foo | bar"

10181040 , "|+ Table + caption +|"

10191041 ] =?>

1020− table (text "Table + caption") (replicate 2 (AlignDefault, 0.0))

1042+ table (text "Table + caption") (replicate 2 (AlignDefault, Nothing))

10211043 []

10221044 [[plain "Foo", plain "bar"]]

10231045 , "Caption without table" =:

@@ -1029,7 +1051,7 @@ tests =

10291051 , " Baz | foo"

10301052 , " Bar | baz"

10311053 ] =?>

1032− table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]

1054+ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)]

10331055 []

10341056 [[plain "Foo", plain "bar"],

10351057 [plain "Baz", plain "foo"],

@@ -1041,7 +1063,7 @@ tests =

10411063 , " bar |"

10421064 , " || baz"

10431065 ] =?>

1044− table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]

1066+ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)]

10451067 [plain "", plain "baz"]

10461068 [[plain "", plain "Foo"],

10471069 [plain "", plain ""],

@@ -1052,7 +1074,7 @@ tests =

10521074 , " 4 | | 6"

10531075 , " 7 | 8 | 9"

10541076 ] =?>

1055− table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0), (AlignDefault, 0.0)]

1077+ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing), (AlignDefault, Nothing)]

10561078 []

10571079 [[plain "1", plain "2", plain "3"],

10581080 [plain "4", mempty, plain "6"],

@@ -1063,7 +1085,7 @@ tests =

10631085 , "| foo | bar |"

10641086 , "+-----+-----+"

10651087 ] =?>

1066− table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]

1088+ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)]

10671089 []

10681090 [[para "foo", para "bar"]]

10691091 , "Grid table inside list" =:

@@ -1072,7 +1094,7 @@ tests =

10721094 , " | foo | bar |"

10731095 , " +-----+-----+"

10741096 ] =?>

1075− bulletList [table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]

1097+ bulletList [table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)]

10761098 []

10771099 [[para "foo", para "bar"]]]

10781100 , "Grid table with two rows" =:

@@ -1083,7 +1105,7 @@ tests =

10831105 , "| bat | baz |"

10841106 , "+-----+-----+"

10851107 ] =?>

1086− table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]

1108+ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)]

10871109 []

10881110 [[para "foo", para "bar"]

10891111 ,[para "bat", para "baz"]]

@@ -1095,9 +1117,9 @@ tests =

10951117 , "|+---+|"

10961118 , "+-----+"

10971119 ] =?>

1098− table mempty [(AlignDefault, 0.0)]

1120+ table mempty [(AlignDefault, Nothing)]

10991121 []

1100− [[table mempty [(AlignDefault, 0.0)]

1122+ [[table mempty [(AlignDefault, Nothing)]

11011123 []

11021124 [[para "foo"]]]]

11031125 , "Grid table with example" =:

@@ -1108,7 +1130,7 @@ tests =

11081130 , "| </example> |"

11091131 , "+------------+"

11101132 ] =?>

1111− table mempty [(AlignDefault, 0.0)]

1133+ table mempty [(AlignDefault, Nothing)]

11121134 []

11131135 [[codeBlock "foo"]]

11141136 ]

@@ -1479,13 +1501,13 @@ tests =

14791501 ]

14801502 , "Definition list with table" =:

14811503 " foo :: bar | baz" =?>

1482− definitionList [ ("foo", [ table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]

1504+ definitionList [ ("foo", [ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)]

14831505 []

14841506 [[plain "bar", plain "baz"]]

14851507 ])]

14861508 , "Definition list with table inside bullet list" =:

14871509 " - foo :: bar | baz" =?>

1488− bulletList [definitionList [ ("foo", [ table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]

1510+ bulletList [definitionList [ ("foo", [ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)]

14891511 []

14901512 [[plain "bar", plain "baz"]]

14911513 ])]]

test/Tests/Readers/Org/Block/Table.hs+4−4

@@ -24,7 +24,7 @@ simpleTable' :: Int

2424 -> [Blocks]

2525 -> [[Blocks]]

2626 -> Blocks

27−simpleTable' n = table "" (replicate n (AlignDefault, 0.0))

27+simpleTable' n = table "" (replicate n (AlignDefault, Nothing))

2828

2929tests :: [TestTree]

3030tests =

@@ -121,7 +121,7 @@ tests =

121121 , "| 1 | One | foo |"

122122 , "| 2 | Two | bar |"

123123 ] =?>

124− table "" (zip [AlignCenter, AlignRight, AlignDefault] [0, 0, 0])

124+ table "" (zip [AlignCenter, AlignRight, AlignDefault] [Nothing, Nothing, Nothing])

125125 []

126126 [ [ plain "Numbers", plain "Text", plain "More" ]

127127 , [ plain "1" , plain "One" , plain "foo" ]

@@ -143,7 +143,7 @@ tests =

143143 , "| 1 | One | foo |"

144144 , "| 2"

145145 ] =?>

146− table "" (zip [AlignCenter, AlignRight] [0, 0])

146+ table "" (zip [AlignCenter, AlignRight] [Nothing, Nothing])

147147 [ plain "Numbers", plain "Text" ]

148148 [ [ plain "1" , plain "One" , plain "foo" ]

149149 , [ plain "2" ]

@@ -155,7 +155,7 @@ tests =

155155 , "| 9 | 42 |"

156156 ] =?>

157157 table "Hitchhiker's Multiplication Table"

158− [(AlignDefault, 0), (AlignDefault, 0)]

158+ [(AlignDefault, Nothing), (AlignDefault, Nothing)]

159159 []

160160 [ [ plain "x", plain "6" ]

161161 , [ plain "9", plain "42" ]

test/Tests/Readers/Txt2Tags.hs+3−3

@@ -44,7 +44,7 @@ simpleTable' :: Int

4444 -> [Blocks]

4545 -> [[Blocks]]

4646 -> Blocks

47−simpleTable' n = table "" (replicate n (AlignCenter, 0.0))

47+simpleTable' n = table "" (replicate n (AlignCenter, Nothing))

4848

4949tests :: [TestTree]

5050tests =

@@ -398,7 +398,7 @@ tests =

398398 , "| 1 | One | foo |"

399399 , "| 2 | Two | bar |"

400400 ] =?>

401− table "" (zip [AlignCenter, AlignRight, AlignDefault] [0, 0, 0])

401+ table "" (zip [AlignCenter, AlignRight, AlignDefault] [Nothing, Nothing, Nothing])

402402 []

403403 [ [ plain "Numbers", plain "Text", plain "More" ]

404404 , [ plain "1" , plain "One" , plain "foo" ]

@@ -415,7 +415,7 @@ tests =

415415 , "| 1 | One | foo |"

416416 , "| 2 "

417417 ] =?>

418− table "" (zip [AlignCenter, AlignLeft, AlignLeft] [0, 0, 0])

418+ table "" (zip [AlignCenter, AlignLeft, AlignLeft] [Nothing, Nothing, Nothing])

419419 [ plain "Numbers", plain "Text" , plain mempty ]

420420 [ [ plain "1" , plain "One" , plain "foo" ]

421421 , [ plain "2" , plain mempty , plain mempty ]

test/Tests/Writers/ConTeXt.hs+3−3

@@ -98,8 +98,8 @@ tests = [ testGroup "inline code"

9898 ]

9999 , testGroup "natural tables"

100100 [ test contextNtb "table with header and caption" $

101− let caption = text "Table 1"

102− aligns = [(AlignRight, 0.0), (AlignLeft, 0.0), (AlignCenter, 0.0), (AlignDefault, 0.0)]

101+ let capt = text "Table 1"

102+ aligns = [(AlignRight, Nothing), (AlignLeft, Nothing), (AlignCenter, Nothing), (AlignDefault, Nothing)]

103103 headers = [plain $ text "Right",

104104 plain $ text "Left",

105105 plain $ text "Center",

@@ -116,7 +116,7 @@ tests = [ testGroup "inline code"

116116 plain $ text "3.2",

117117 plain $ text "3.3",

118118 plain $ text "3.4"]]

119− in table caption aligns headers rows

119+ in table capt aligns headers rows

120120 =?> unlines [ "\\startplacetable[title={Table 1}]"

121121 , "\\startTABLE"

122122 , "\\startTABLEhead"

test/Tests/Writers/Muse.hs+3−3

@@ -372,7 +372,7 @@ tests = [ testGroup "block elements"

372372 [ "table without header" =:

373373 let rows = [[para "Para 1.1", para "Para 1.2"]

374374 ,[para "Para 2.1", para "Para 2.2"]]

375− in table mempty [(AlignDefault,0.0),(AlignDefault,0.0)]

375+ in table mempty [(AlignDefault,Nothing),(AlignDefault,Nothing)]

376376 [mempty, mempty] rows

377377 =?>

378378 unlines [ " Para 1.1 | Para 1.2"

@@ -389,11 +389,11 @@ tests = [ testGroup "block elements"

389389 , " Para 2.1 | Para 2.2"

390390 ]

391391 , "table with header and caption" =:

392− let caption = "Table 1"

392+ let capt = "Table 1"

393393 headers = [plain "header 1", plain "header 2"]

394394 rows = [[para "Para 1.1", para "Para 1.2"]

395395 ,[para "Para 2.1", para "Para 2.2"]]

396− in table caption [(AlignDefault,0.0),(AlignDefault,0.0)]

396+ in table capt [(AlignDefault,Nothing),(AlignDefault,Nothing)]

397397 headers rows

398398 =?> unlines [ " header 1 || header 2"

399399 , " Para 1.1 | Para 1.2"

test/command/1881.md+42−18

@@ -20,15 +20,27 @@

2020</tbody>

2121</table>

2222^D

23−[Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0]

24− [[Plain [Str "Right"]]

25− ,[Plain [Str "Left"]]

26− ,[Plain [Str "Center"]]

27− ,[Plain [Str "Default"]]]

28− [[[Plain [Str "12"]]

29− ,[Plain [Str "12"]]

30− ,[Plain [Str "12"]]

31− ,[Plain [Str "12"]]]]]

23+[Table ("",[],[]) (Caption Nothing

24+ [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignDefault,Nothing)] 0

25+ [Row ("",[],[])

26+ [Cell ("",[],[]) Nothing 1 1

27+ [Plain [Str "Right"]]

28+ ,Cell ("",[],[]) Nothing 1 1

29+ [Plain [Str "Left"]]

30+ ,Cell ("",[],[]) Nothing 1 1

31+ [Plain [Str "Center"]]

32+ ,Cell ("",[],[]) Nothing 1 1

33+ [Plain [Str "Default"]]]]

34+ [Row ("",[],[])

35+ [Cell ("",[],[]) Nothing 1 1

36+ [Plain [Str "12"]]

37+ ,Cell ("",[],[]) Nothing 1 1

38+ [Plain [Str "12"]]

39+ ,Cell ("",[],[]) Nothing 1 1

40+ [Plain [Str "12"]]

41+ ,Cell ("",[],[]) Nothing 1 1

42+ [Plain [Str "12"]]]]

43+ []]

3244```

3345

3446```

@@ -42,14 +54,26 @@

4254</tr>

4355</table>

4456^D

45−[Table [] [AlignRight,AlignLeft,AlignCenter,AlignRight] [0.0,0.0,0.0,0.0]

46− [[]

47− ,[]

48− ,[]

49− ,[]]

50− [[[Plain [Str "12"]]

51− ,[Plain [Str "12"]]

52− ,[Plain [Str "12"]]

53− ,[Plain [Str "12"]]]]]

57+[Table ("",[],[]) (Caption Nothing

58+ []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0

59+ [Row ("",[],[])

60+ [Cell ("",[],[]) Nothing 1 1

61+ []

62+ ,Cell ("",[],[]) Nothing 1 1

63+ []

64+ ,Cell ("",[],[]) Nothing 1 1

65+ []

66+ ,Cell ("",[],[]) Nothing 1 1

67+ []]]

68+ [Row ("",[],[])

69+ [Cell ("",[],[]) Nothing 1 1

70+ [Plain [Str "12"]]

71+ ,Cell ("",[],[]) Nothing 1 1

72+ [Plain [Str "12"]]

73+ ,Cell ("",[],[]) Nothing 1 1

74+ [Plain [Str "12"]]

75+ ,Cell ("",[],[]) Nothing 1 1

76+ [Plain [Str "12"]]]]

77+ []]

5478```

5579

test/command/3348.md+18−7

@@ -7,11 +7,22 @@

77 line of text

88 ----- ------------------------------------------------

99^D

10−[Table [] [AlignRight,AlignLeft] [8.333333333333333e-2,0.6805555555555556]

11− [[]

12− ,[]]

13− [[[Plain [Str "foo"]]

14− ,[Plain [Str "bar"]]]

15− ,[[Plain [Str "foo"]]

16− ,[Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "long",SoftBreak,Str "line",Space,Str "of",Space,Str "text"]]]]]

10+[Table ("",[],[]) (Caption Nothing

11+ []) [(AlignRight,Just 8.333333333333333e-2),(AlignLeft,Just 0.6805555555555556)] 0

12+ [Row ("",[],[])

13+ [Cell ("",[],[]) Nothing 1 1

14+ []

15+ ,Cell ("",[],[]) Nothing 1 1

16+ []]]

17+ [Row ("",[],[])

18+ [Cell ("",[],[]) Nothing 1 1

19+ [Plain [Str "foo"]]

20+ ,Cell ("",[],[]) Nothing 1 1

21+ [Plain [Str "bar"]]]

22+ ,Row ("",[],[])

23+ [Cell ("",[],[]) Nothing 1 1

24+ [Plain [Str "foo"]]

25+ ,Cell ("",[],[]) Nothing 1 1

26+ [Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "long",SoftBreak,Str "line",Space,Str "of",Space,Str "text"]]]]

27+ []]

1728```

test/command/3516.md+36−14

@@ -24,24 +24,46 @@ on Windows builds.

2424| | |

2525+---+---+

2626^D

27−[Table [] [AlignDefault,AlignDefault] [5.555555555555555e-2,5.555555555555555e-2]

28− [[]

29− ,[]]

30− [[[Plain [Str "1"]]

31− ,[Plain [Str "2"]]]

32− ,[[]

33− ,[]]]]

27+[Table ("",[],[]) (Caption Nothing

28+ []) [(AlignDefault,Just 5.555555555555555e-2),(AlignDefault,Just 5.555555555555555e-2)] 0

29+ [Row ("",[],[])

30+ [Cell ("",[],[]) Nothing 1 1

31+ []

32+ ,Cell ("",[],[]) Nothing 1 1

33+ []]]

34+ [Row ("",[],[])

35+ [Cell ("",[],[]) Nothing 1 1

36+ [Plain [Str "1"]]

37+ ,Cell ("",[],[]) Nothing 1 1

38+ [Plain [Str "2"]]]

39+ ,Row ("",[],[])

40+ [Cell ("",[],[]) Nothing 1 1

41+ []

42+ ,Cell ("",[],[]) Nothing 1 1

43+ []]]

44+ []]

3445```

3546

3647```

3748% pandoc -f native -t rst

38−[Table [] [AlignDefault,AlignDefault] [5.555555555555555e-2,5.555555555555555e-2]

39− [[]

40− ,[]]

41− [[[Para [Str "1"]]

42− ,[Para [Str "2"]]]

43− ,[[]

44− ,[]]]]

49+[Table ("",[],[]) (Caption Nothing

50+ []) [(AlignDefault,Just 5.555555555555555e-2),(AlignDefault,Just 5.555555555555555e-2)] 0

51+ [Row ("",[],[])

52+ [Cell ("",[],[]) Nothing 1 1

53+ []

54+ ,Cell ("",[],[]) Nothing 1 1

55+ []]]

56+ [Row ("",[],[])

57+ [Cell ("",[],[]) Nothing 1 1

58+ [Para [Str "1"]]

59+ ,Cell ("",[],[]) Nothing 1 1

60+ [Para [Str "2"]]]

61+ ,Row ("",[],[])

62+ [Cell ("",[],[]) Nothing 1 1

63+ []

64+ ,Cell ("",[],[]) Nothing 1 1

65+ []]]

66+ []]

4567^D

4668+---+---+

4769| 1 | 2 |

test/command/3533-rst-csv-tables.md+61−25

@@ -5,16 +5,30 @@

55 :header: Flavor,Price,Slogan

66 :file: command/3533-rst-csv-tables.csv

77^D

8−[Table [Str "Test"] [AlignDefault,AlignDefault,AlignDefault] [0.4,0.2,0.4]

9− [[Plain [Str "Flavor"]]

10− ,[Plain [Str "Price"]]

11− ,[Plain [Str "Slogan"]]]

12− [[[Plain [Str "Albatross"]]

13− ,[Plain [Str "2.99"]]

14− ,[Plain [Str "On",Space,Str "a",Space,Str "stick!"]]]

15− ,[[Plain [Str "Crunchy",Space,Str "Frog"]]

16− ,[Plain [Str "1.49"]]

17− ,[Plain [Str "If",Space,Str "we",Space,Str "took",Space,Str "the",Space,Str "bones",Space,Str "out,",Space,Str "it",Space,Str "wouldn't",Space,Str "be",SoftBreak,Str "crunchy,",Space,Str "now",Space,Str "would",Space,Str "it?"]]]]]

8+[Table ("",[],[]) (Caption Nothing

9+ [Para [Str "Test"]]) [(AlignDefault,Just 0.4),(AlignDefault,Just 0.2),(AlignDefault,Just 0.4)] 0

10+ [Row ("",[],[])

11+ [Cell ("",[],[]) Nothing 1 1

12+ [Plain [Str "Flavor"]]

13+ ,Cell ("",[],[]) Nothing 1 1

14+ [Plain [Str "Price"]]

15+ ,Cell ("",[],[]) Nothing 1 1

16+ [Plain [Str "Slogan"]]]]

17+ [Row ("",[],[])

18+ [Cell ("",[],[]) Nothing 1 1

19+ [Plain [Str "Albatross"]]

20+ ,Cell ("",[],[]) Nothing 1 1

21+ [Plain [Str "2.99"]]

22+ ,Cell ("",[],[]) Nothing 1 1

23+ [Plain [Str "On",Space,Str "a",Space,Str "stick!"]]]

24+ ,Row ("",[],[])

25+ [Cell ("",[],[]) Nothing 1 1

26+ [Plain [Str "Crunchy",Space,Str "Frog"]]

27+ ,Cell ("",[],[]) Nothing 1 1

28+ [Plain [Str "1.49"]]

29+ ,Cell ("",[],[]) Nothing 1 1

30+ [Plain [Str "If",Space,Str "we",Space,Str "took",Space,Str "the",Space,Str "bones",Space,Str "out,",Space,Str "it",Space,Str "wouldn't",Space,Str "be",SoftBreak,Str "crunchy,",Space,Str "now",Space,Str "would",Space,Str "it?"]]]]

31+ []]

1832```

1933

2034```

@@ -28,16 +42,30 @@

2842 'cat''s' 3 4

2943 'dog''s' 2 3

3044^D

31−[Table [Str "Test"] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

32− [[]

33− ,[Plain [Str "a"]]

34− ,[Plain [Str "b"]]]

35− [[[Plain [Str "cat's"]]

36− ,[Plain [Str "3"]]

37− ,[Plain [Str "4"]]]

38− ,[[Plain [Str "dog's"]]

39− ,[Plain [Str "2"]]

40− ,[Plain [Str "3"]]]]]

45+[Table ("",[],[]) (Caption Nothing

46+ [Para [Str "Test"]]) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

47+ [Row ("",[],[])

48+ [Cell ("",[],[]) Nothing 1 1

49+ []

50+ ,Cell ("",[],[]) Nothing 1 1

51+ [Plain [Str "a"]]

52+ ,Cell ("",[],[]) Nothing 1 1

53+ [Plain [Str "b"]]]]

54+ [Row ("",[],[])

55+ [Cell ("",[],[]) Nothing 1 1

56+ [Plain [Str "cat's"]]

57+ ,Cell ("",[],[]) Nothing 1 1

58+ [Plain [Str "3"]]

59+ ,Cell ("",[],[]) Nothing 1 1

60+ [Plain [Str "4"]]]

61+ ,Row ("",[],[])

62+ [Cell ("",[],[]) Nothing 1 1

63+ [Plain [Str "dog's"]]

64+ ,Cell ("",[],[]) Nothing 1 1

65+ [Plain [Str "2"]]

66+ ,Cell ("",[],[]) Nothing 1 1

67+ [Plain [Str "3"]]]]

68+ []]

4169```

4270

4371```

@@ -47,10 +75,18 @@

4775

4876 "1","\""

4977^D

50−[Table [Str "Test"] [AlignDefault,AlignDefault] [0.0,0.0]

51− [[]

52− ,[]]

53− [[[Plain [Str "1"]]

54− ,[Plain [Str "\""]]]]]

78+[Table ("",[],[]) (Caption Nothing

79+ [Para [Str "Test"]]) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

80+ [Row ("",[],[])

81+ [Cell ("",[],[]) Nothing 1 1

82+ []

83+ ,Cell ("",[],[]) Nothing 1 1

84+ []]]

85+ [Row ("",[],[])

86+ [Cell ("",[],[]) Nothing 1 1

87+ [Plain [Str "1"]]

88+ ,Cell ("",[],[]) Nothing 1 1

89+ [Plain [Str "\""]]]]

90+ []]

5591```

5692

test/command/3706.md+23−9

@@ -16,15 +16,29 @@ pandoc -f org -t native

1616| 3 | La |

1717^D

1818[Div ("tab",[],[])

19− [Table [Str "Lalelu."] [AlignDefault,AlignDefault] [0.0,0.0]

20− [[Plain [Str "Id"]]

21− ,[Plain [Str "Desc"]]]

22− [[[Plain [Str "1"]]

23− ,[Plain [Str "La"]]]

24− ,[[Plain [Str "2"]]

25− ,[Plain [Str "La"]]]

26− ,[[Plain [Str "3"]]

27− ,[Plain [Str "La"]]]]]]

19+ [Table ("",[],[]) (Caption Nothing

20+ [Para [Str "Lalelu."]]) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

21+ [Row ("",[],[])

22+ [Cell ("",[],[]) Nothing 1 1

23+ [Plain [Str "Id"]]

24+ ,Cell ("",[],[]) Nothing 1 1

25+ [Plain [Str "Desc"]]]]

26+ [Row ("",[],[])

27+ [Cell ("",[],[]) Nothing 1 1

28+ [Plain [Str "1"]]

29+ ,Cell ("",[],[]) Nothing 1 1

30+ [Plain [Str "La"]]]

31+ ,Row ("",[],[])

32+ [Cell ("",[],[]) Nothing 1 1

33+ [Plain [Str "2"]]

34+ ,Cell ("",[],[]) Nothing 1 1

35+ [Plain [Str "La"]]]

36+ ,Row ("",[],[])

37+ [Cell ("",[],[]) Nothing 1 1

38+ [Plain [Str "3"]]

39+ ,Cell ("",[],[]) Nothing 1 1

40+ [Plain [Str "La"]]]]

41+ []]]

2842```

2943

3044```

test/command/3708.md+18−7

@@ -5,11 +5,22 @@

55 C & D

66\end{tabular}

77^D

8−[Table [] [AlignCenter,AlignCenter] [0.0,0.0]

9− [[]

10− ,[]]

11− [[[Plain [Str "A"]]

12− ,[Plain [Str "B&1"]]]

13− ,[[Plain [Str "C"]]

14− ,[Plain [Str "D"]]]]]

8+[Table ("",[],[]) (Caption Nothing

9+ []) [(AlignCenter,Nothing),(AlignCenter,Nothing)] 0

10+ [Row ("",[],[])

11+ [Cell ("",[],[]) Nothing 1 1

12+ []

13+ ,Cell ("",[],[]) Nothing 1 1

14+ []]]

15+ [Row ("",[],[])

16+ [Cell ("",[],[]) Nothing 1 1

17+ [Plain [Str "A"]]

18+ ,Cell ("",[],[]) Nothing 1 1

19+ [Plain [Str "B&1"]]]

20+ ,Row ("",[],[])

21+ [Cell ("",[],[]) Nothing 1 1

22+ [Plain [Str "C"]]

23+ ,Cell ("",[],[]) Nothing 1 1

24+ [Plain [Str "D"]]]]

25+ []]

1526```

test/command/4056.md+17−7

@@ -14,11 +14,21 @@

1414Blah & Foo & Bar \\

1515\end{tabular}

1616^D

17−[Table [] [AlignLeft,AlignRight,AlignRight] [0.0,0.0,0.0]

18− [[]

19− ,[]

20− ,[]]

21− [[[Plain [Str "Blah"]]

22− ,[Plain [Str "Foo"]]

23− ,[Plain [Str "Bar"]]]]]

17+[Table ("",[],[]) (Caption Nothing

18+ []) [(AlignLeft,Nothing),(AlignRight,Nothing),(AlignRight,Nothing)] 0

19+ [Row ("",[],[])

20+ [Cell ("",[],[]) Nothing 1 1

21+ []

22+ ,Cell ("",[],[]) Nothing 1 1

23+ []

24+ ,Cell ("",[],[]) Nothing 1 1

25+ []]]

26+ [Row ("",[],[])

27+ [Cell ("",[],[]) Nothing 1 1

28+ [Plain [Str "Blah"]]

29+ ,Cell ("",[],[]) Nothing 1 1

30+ [Plain [Str "Foo"]]

31+ ,Cell ("",[],[]) Nothing 1 1

32+ [Plain [Str "Bar"]]]]

33+ []]

2434```

test/command/4119.md+13−5

@@ -8,11 +8,19 @@ pandoc -t native

88not a caption!

99::::::::::::::::

1010^D

11−[Table [] [AlignDefault,AlignDefault] [0.0,0.0]

12− [[Plain [Str "col1"]]

13− ,[Plain [Str "col2"]]]

14− [[[Plain [Str "1"]]

15− ,[Plain [Str "2"]]]]

11+[Table ("",[],[]) (Caption Nothing

12+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

13+ [Row ("",[],[])

14+ [Cell ("",[],[]) Nothing 1 1

15+ [Plain [Str "col1"]]

16+ ,Cell ("",[],[]) Nothing 1 1

17+ [Plain [Str "col2"]]]]

18+ [Row ("",[],[])

19+ [Cell ("",[],[]) Nothing 1 1

20+ [Plain [Str "1"]]

21+ ,Cell ("",[],[]) Nothing 1 1

22+ [Plain [Str "2"]]]]

23+ []

1624,Div ("",["notes"],[])

1725 [Para [Str "not",Space,Str "a",Space,Str "caption!"]]]

1826```

test/command/4320.md+14−6

@@ -1,11 +1,19 @@

11```

22% pandoc -f native -t rst --wrap=none

3−[Table [] [AlignDefault,AlignDefault] [0.3,0.3]

4− [[Plain [Str "one"]]

5− ,[Plain [Str "two"]]]

6− [[[Plain [Str "ports"]]

7− ,[BlockQuote

8− [Para [Strong [Str "thisIsGoingToBeTooLongAnyway"]]]]]]]

3+[Table ("",[],[]) (Caption Nothing

4+ []) [(AlignDefault,Just 0.3),(AlignDefault,Just 0.3)] 0

5+ [Row ("",[],[])

6+ [Cell ("",[],[]) Nothing 1 1

7+ [Plain [Str "one"]]

8+ ,Cell ("",[],[]) Nothing 1 1

9+ [Plain [Str "two"]]]]

10+ [Row ("",[],[])

11+ [Cell ("",[],[]) Nothing 1 1

12+ [Plain [Str "ports"]]

13+ ,Cell ("",[],[]) Nothing 1 1

14+ [BlockQuote

15+ [Para [Strong [Str "thisIsGoingToBeTooLongAnyway"]]]]]]

16+ []]

917^D

1018+--------------------+-------------------------------------+

1119| one | two |

test/command/4513.md+8−3

@@ -2,8 +2,13 @@

22% pandoc -f textile -t native

33|_. heading 1 |_. heading 2|

44^D

5−[Table [] [AlignDefault,AlignDefault] [0.0,0.0]

6− [[Plain [Str "heading",Space,Str "1"]]

7− ,[Plain [Str "heading",Space,Str "2"]]]

5+[Table ("",[],[]) (Caption Nothing

6+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

7+ [Row ("",[],[])

8+ [Cell ("",[],[]) Nothing 1 1

9+ [Plain [Str "heading",Space,Str "1"]]

10+ ,Cell ("",[],[]) Nothing 1 1

11+ [Plain [Str "heading",Space,Str "2"]]]]

12+ []

813 []]

914```

test/command/4579.md+13−5

@@ -8,9 +8,17 @@

88 * - spam

99 - ham

1010^D

11−[Table [] [AlignDefault,AlignDefault] [0.0,0.0]

12− [[Plain [Str "Foo"]]

13− ,[Plain [Str "Bar"]]]

14− [[[Plain [Str "spam"]]

15− ,[Plain [Str "ham"]]]]]

11+[Table ("",[],[]) (Caption Nothing

12+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

13+ [Row ("",[],[])

14+ [Cell ("",[],[]) Nothing 1 1

15+ [Plain [Str "Foo"]]

16+ ,Cell ("",[],[]) Nothing 1 1

17+ [Plain [Str "Bar"]]]]

18+ [Row ("",[],[])

19+ [Cell ("",[],[]) Nothing 1 1

20+ [Plain [Str "spam"]]

21+ ,Cell ("",[],[]) Nothing 1 1

22+ [Plain [Str "ham"]]]]

23+ []]

1624```

test/command/5014.md+9−3

@@ -13,7 +13,13 @@

1313 </tbody>

1414</table>

1515^D

16−[Table [] [AlignDefault] [0.0]

17− [[Plain [Str "Name"]]]

18− [[[Plain [Str "Accounts"]]]]]

16+[Table ("",[],[]) (Caption Nothing

17+ []) [(AlignDefault,Nothing)] 0

18+ [Row ("",[],[])

19+ [Cell ("",[],[]) Nothing 1 1

20+ [Plain [Str "Name"]]]]

21+ [Row ("",[],[])

22+ [Cell ("",[],[]) Nothing 1 1

23+ [Plain [Str "Accounts"]]]]

24+ []]

1925```

test/command/5079.md+9−3

@@ -10,7 +10,13 @@

1010</tbody>

1111</table>

1212^D

13−[Table [] [AlignDefault] [0.0]

14− [[]]

15− [[[Plain [Str "Cell"]]]]]

13+[Table ("",[],[]) (Caption Nothing

14+ []) [(AlignDefault,Nothing)] 0

15+ [Row ("",[],[])

16+ [Cell ("",[],[]) Nothing 1 1

17+ []]]

18+ [Row ("",[],[])

19+ [Cell ("",[],[]) Nothing 1 1

20+ [Plain [Str "Cell"]]]]

21+ []]

1622```

test/command/5708.md+13−5

@@ -4,9 +4,17 @@

44| 123456 | :math:`a + b` |

55+--------+----------------+

66^D

7−[Table [] [AlignDefault,AlignDefault] [0.125,0.2361111111111111]

8− [[]

9− ,[]]

10− [[[Plain [Str "123456"]]

11− ,[Plain [Math InlineMath "a + b"]]]]]

7+[Table ("",[],[]) (Caption Nothing

8+ []) [(AlignDefault,Just 0.125),(AlignDefault,Just 0.2361111111111111)] 0

9+ [Row ("",[],[])

10+ [Cell ("",[],[]) Nothing 1 1

11+ []

12+ ,Cell ("",[],[]) Nothing 1 1

13+ []]]

14+ [Row ("",[],[])

15+ [Cell ("",[],[]) Nothing 1 1

16+ [Plain [Str "123456"]]

17+ ,Cell ("",[],[]) Nothing 1 1

18+ [Plain [Math InlineMath "a + b"]]]]

19+ []]

1220```

test/command/5711.md+9−3

@@ -7,7 +7,13 @@

77\end{tabular}

88\end{document}

99^D

10−[Table [] [AlignCenter] [0.0]

11− [[]]

12− [[[Plain [Str "d",LineBreak,Str "e"]]]]]

10+[Table ("",[],[]) (Caption Nothing

11+ []) [(AlignCenter,Nothing)] 0

12+ [Row ("",[],[])

13+ [Cell ("",[],[]) Nothing 1 1

14+ []]]

15+ [Row ("",[],[])

16+ [Cell ("",[],[]) Nothing 1 1

17+ [Plain [Str "d",LineBreak,Str "e"]]]]

18+ []]

1319```

test/command/6137.md+24−10

@@ -17,16 +17,30 @@ This reference to Figure \ref{fig:label} works fine.

1717^D

1818[Para [Str "This",Space,Str "reference",Space,Str "to",Space,Str "Table",Space,Link ("",[],[("reference-type","ref"),("reference","tbl:label")]) [Str "1"] ("#tbl:label",""),Space,Str "doesn\8217t",Space,Str "work."]

1919,Div ("tbl:label",[],[])

20− [Table [Str "This",Space,Str "caption",Space,Str "has",Space,Str "no",Space,Str "number."] [AlignLeft,AlignCenter,AlignRight] [0.0,0.0,0.0]

21− [[]

22− ,[]

23− ,[]]

24− [[[Plain [Str "\8212\8212\8211"]]

25− ,[Plain [Str "\8212\8212\8211"]]

26− ,[Plain [Str "\8212\8212\8211"]]]

27− ,[[Plain [Str "\8212\8212\8211"]]

28− ,[Plain [Str "\8212\8212\8211"]]

29− ,[Plain [Str "\8212\8212\8211"]]]]]

20+ [Table ("",[],[]) (Caption Nothing

21+ [Para [Str "This",Space,Str "caption",Space,Str "has",Space,Str "no",Space,Str "number."]]) [(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0

22+ [Row ("",[],[])

23+ [Cell ("",[],[]) Nothing 1 1

24+ []

25+ ,Cell ("",[],[]) Nothing 1 1

26+ []

27+ ,Cell ("",[],[]) Nothing 1 1

28+ []]]

29+ [Row ("",[],[])

30+ [Cell ("",[],[]) Nothing 1 1

31+ [Plain [Str "\8212\8212\8211"]]

32+ ,Cell ("",[],[]) Nothing 1 1

33+ [Plain [Str "\8212\8212\8211"]]

34+ ,Cell ("",[],[]) Nothing 1 1

35+ [Plain [Str "\8212\8212\8211"]]]

36+ ,Row ("",[],[])

37+ [Cell ("",[],[]) Nothing 1 1

38+ [Plain [Str "\8212\8212\8211"]]

39+ ,Cell ("",[],[]) Nothing 1 1

40+ [Plain [Str "\8212\8212\8211"]]

41+ ,Cell ("",[],[]) Nothing 1 1

42+ [Plain [Str "\8212\8212\8211"]]]]

43+ []]

3044,Para [Str "This",Space,Str "reference",Space,Str "to",Space,Str "Figure",Space,Link ("",[],[("reference-type","ref"),("reference","fig:label")]) [Str "1"] ("#fig:label",""),Space,Str "works",Space,Str "fine."]

3145,Para [Image ("fig:label",[],[("width","\\textwidth")]) [Str "A",Space,Str "numbered",Space,Str "caption,",Space,Str "if",Space,Str "I",Space,Str "use",Space,Str "pandoc-crossref."] ("example.png","fig:")]]

3246```

test/command/csv.md+31−13

@@ -5,17 +5,35 @@ Apple,25 cents,33

55"""Navel"" Orange","35 cents",22

66,,45

77^D

8−[Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

9− [[Plain [Str "Fruit"]]

10− ,[Plain [Str "Price"]]

11− ,[Plain [Str "Quantity"]]]

12− [[[Plain [Str "Apple"]]

13− ,[Plain [Str "25",Space,Str "cents"]]

14− ,[Plain [Str "33"]]]

15− ,[[Plain [Str "\"Navel\"",Space,Str "Orange"]]

16− ,[Plain [Str "35",Space,Str "cents"]]

17− ,[Plain [Str "22"]]]

18− ,[[]

19− ,[]

20− ,[Plain [Str "45"]]]]]

8+[Table ("",[],[]) (Caption Nothing

9+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

10+ [Row ("",[],[])

11+ [Cell ("",[],[]) Nothing 1 1

12+ [Plain [Str "Fruit"]]

13+ ,Cell ("",[],[]) Nothing 1 1

14+ [Plain [Str "Price"]]

15+ ,Cell ("",[],[]) Nothing 1 1

16+ [Plain [Str "Quantity"]]]]

17+ [Row ("",[],[])

18+ [Cell ("",[],[]) Nothing 1 1

19+ [Plain [Str "Apple"]]

20+ ,Cell ("",[],[]) Nothing 1 1

21+ [Plain [Str "25",Space,Str "cents"]]

22+ ,Cell ("",[],[]) Nothing 1 1

23+ [Plain [Str "33"]]]

24+ ,Row ("",[],[])

25+ [Cell ("",[],[]) Nothing 1 1

26+ [Plain [Str "\"Navel\"",Space,Str "Orange"]]

27+ ,Cell ("",[],[]) Nothing 1 1

28+ [Plain [Str "35",Space,Str "cents"]]

29+ ,Cell ("",[],[]) Nothing 1 1

30+ [Plain [Str "22"]]]

31+ ,Row ("",[],[])

32+ [Cell ("",[],[]) Nothing 1 1

33+ []

34+ ,Cell ("",[],[]) Nothing 1 1

35+ []

36+ ,Cell ("",[],[]) Nothing 1 1

37+ [Plain [Str "45"]]]]

38+ []]

2139```

test/command/gfm.md+36−14

@@ -7,13 +7,24 @@ gfm tests:

77| apple | 0.13 |

88| orange|1.12|

99^D

10−[Table [] [AlignDefault,AlignRight] [0.0,0.0]

11− [[Plain [Str "Fruit"]]

12− ,[Plain [Str "Price"]]]

13− [[[Plain [Str "apple"]]

14− ,[Plain [Str "0.13"]]]

15− ,[[Plain [Str "orange"]]

16− ,[Plain [Str "1.12"]]]]]

10+[Table ("",[],[]) (Caption Nothing

11+ []) [(AlignDefault,Nothing),(AlignRight,Nothing)] 0

12+ [Row ("",[],[])

13+ [Cell ("",[],[]) Nothing 1 1

14+ [Plain [Str "Fruit"]]

15+ ,Cell ("",[],[]) Nothing 1 1

16+ [Plain [Str "Price"]]]]

17+ [Row ("",[],[])

18+ [Cell ("",[],[]) Nothing 1 1

19+ [Plain [Str "apple"]]

20+ ,Cell ("",[],[]) Nothing 1 1

21+ [Plain [Str "0.13"]]]

22+ ,Row ("",[],[])

23+ [Cell ("",[],[]) Nothing 1 1

24+ [Plain [Str "orange"]]

25+ ,Cell ("",[],[]) Nothing 1 1

26+ [Plain [Str "1.12"]]]]

27+ []]

1728```

1829

1930```

@@ -57,13 +68,24 @@ My:thumbsup:emoji:heart:

5768

5869```

5970% pandoc -t gfm -f native

60−[Table [Str "The",Space,Str "caption."] [AlignDefault,AlignRight] [0.0,0.0]

61− [[Plain [Str "Fruit"]]

62− ,[Plain [Str "Price"]]]

63− [[[Plain [Str "apple"]]

64− ,[Plain [Str "0.13"]]]

65− ,[[Plain [Str "orange"]]

66− ,[Plain [Str "1.12"]]]]]

71+[Table ("",[],[]) (Caption Nothing

72+ [Para [Str "The",Space,Str "caption."]]) [(AlignDefault,Nothing),(AlignRight,Nothing)] 0

73+ [Row ("",[],[])

74+ [Cell ("",[],[]) Nothing 1 1

75+ [Plain [Str "Fruit"]]

76+ ,Cell ("",[],[]) Nothing 1 1

77+ [Plain [Str "Price"]]]]

78+ [Row ("",[],[])

79+ [Cell ("",[],[]) Nothing 1 1

80+ [Plain [Str "apple"]]

81+ ,Cell ("",[],[]) Nothing 1 1

82+ [Plain [Str "0.13"]]]

83+ ,Row ("",[],[])

84+ [Cell ("",[],[]) Nothing 1 1

85+ [Plain [Str "orange"]]

86+ ,Cell ("",[],[]) Nothing 1 1

87+ [Plain [Str "1.12"]]]]

88+ []]

6789^D

6890| Fruit | Price |

6991| ------ | ----: |

test/command/latex-tabular-column-specs.md+24−10

@@ -11,14 +11,28 @@ f & 0.5 & 5,5 \\

1111\bottomrule

1212\end{tabular}

1313^D

14−[Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]

15− [[Plain [Math InlineMath ""]]

16− ,[Plain [Math InlineMath "f1"]]

17− ,[Plain [Math InlineMath "f2"]]]

18− [[[Plain [Math InlineMath "e"]]

19− ,[Plain [Math InlineMath "0.5"]]

20− ,[Plain [Math InlineMath "4"]]]

21− ,[[Plain [Math InlineMath "f"]]

22− ,[Plain [Math InlineMath "0.5"]]

23− ,[Plain [Math InlineMath "5,5"]]]]]

14+[Table ("",[],[]) (Caption Nothing

15+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

16+ [Row ("",[],[])

17+ [Cell ("",[],[]) Nothing 1 1

18+ [Plain [Math InlineMath ""]]

19+ ,Cell ("",[],[]) Nothing 1 1

20+ [Plain [Math InlineMath "f1"]]

21+ ,Cell ("",[],[]) Nothing 1 1

22+ [Plain [Math InlineMath "f2"]]]]

23+ [Row ("",[],[])

24+ [Cell ("",[],[]) Nothing 1 1

25+ [Plain [Math InlineMath "e"]]

26+ ,Cell ("",[],[]) Nothing 1 1

27+ [Plain [Math InlineMath "0.5"]]

28+ ,Cell ("",[],[]) Nothing 1 1

29+ [Plain [Math InlineMath "4"]]]

30+ ,Row ("",[],[])

31+ [Cell ("",[],[]) Nothing 1 1

32+ [Plain [Math InlineMath "f"]]

33+ ,Cell ("",[],[]) Nothing 1 1

34+ [Plain [Math InlineMath "0.5"]]

35+ ,Cell ("",[],[]) Nothing 1 1

36+ [Plain [Math InlineMath "5,5"]]]]

37+ []]

2438```

test/command/tabularx.md+102−48

@@ -6,33 +6,51 @@

66 & Column Heading 2

77 & Column Heading 3 \\

88\hline

9− Cell 1.1

9+ Cell 1.1

1010 & Cell 1.2

1111 & Cell 1.3 \\

1212\hline

13− Cell 2.1

13+ Cell 2.1

1414 & Cell 2.2

1515 & Cell 2.3 \\

1616\hline

17− Cell 3.1

17+ Cell 3.1

1818 & Cell 3.2

1919 & Cell 3.3 \\

2020\hline

2121\end{tabularx}

2222^D

23−[Table [] [AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0]

24− [[Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]

25− ,[Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]

26− ,[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]

27− [[[Plain [Str "Cell",Space,Str "1.1"]]

28− ,[Plain [Str "Cell",Space,Str "1.2"]]

29− ,[Plain [Str "Cell",Space,Str "1.3"]]]

30− ,[[Plain [Str "Cell",Space,Str "2.1"]]

31− ,[Plain [Str "Cell",Space,Str "2.2"]]

32− ,[Plain [Str "Cell",Space,Str "2.3"]]]

33− ,[[Plain [Str "Cell",Space,Str "3.1"]]

34− ,[Plain [Str "Cell",Space,Str "3.2"]]

35− ,[Plain [Str "Cell",Space,Str "3.3"]]]]]

23+[Table ("",[],[]) (Caption Nothing

24+ []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0

25+ [Row ("",[],[])

26+ [Cell ("",[],[]) Nothing 1 1

27+ [Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]

28+ ,Cell ("",[],[]) Nothing 1 1

29+ [Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]

30+ ,Cell ("",[],[]) Nothing 1 1

31+ [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]

32+ [Row ("",[],[])

33+ [Cell ("",[],[]) Nothing 1 1

34+ [Plain [Str "Cell",Space,Str "1.1"]]

35+ ,Cell ("",[],[]) Nothing 1 1

36+ [Plain [Str "Cell",Space,Str "1.2"]]

37+ ,Cell ("",[],[]) Nothing 1 1

38+ [Plain [Str "Cell",Space,Str "1.3"]]]

39+ ,Row ("",[],[])

40+ [Cell ("",[],[]) Nothing 1 1

41+ [Plain [Str "Cell",Space,Str "2.1"]]

42+ ,Cell ("",[],[]) Nothing 1 1

43+ [Plain [Str "Cell",Space,Str "2.2"]]

44+ ,Cell ("",[],[]) Nothing 1 1

45+ [Plain [Str "Cell",Space,Str "2.3"]]]

46+ ,Row ("",[],[])

47+ [Cell ("",[],[]) Nothing 1 1

48+ [Plain [Str "Cell",Space,Str "3.1"]]

49+ ,Cell ("",[],[]) Nothing 1 1

50+ [Plain [Str "Cell",Space,Str "3.2"]]

51+ ,Cell ("",[],[]) Nothing 1 1

52+ [Plain [Str "Cell",Space,Str "3.3"]]]]

53+ []]

3654```

3755

3856```

@@ -43,33 +61,51 @@

4361 & Column Heading 2

4462 & Column Heading 3 \\

4563\hline

46− Cell 1.1

64+ Cell 1.1

4765 & Cell 1.2

4866 & Cell 1.3 \\

4967\hline

50− Cell 2.1

68+ Cell 2.1

5169 & Cell 2.2

5270 & Cell 2.3 \\

5371\hline

54− Cell 3.1

72+ Cell 3.1

5573 & Cell 3.2

5674 & Cell 3.3 \\

5775\hline

5876\end{tabularx}

5977^D

60−[Table [] [AlignLeft,AlignCenter,AlignLeft] [0.0,0.0,0.25]

61− [[Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]

62− ,[Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]

63− ,[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]

64− [[[Plain [Str "Cell",Space,Str "1.1"]]

65− ,[Plain [Str "Cell",Space,Str "1.2"]]

66− ,[Plain [Str "Cell",Space,Str "1.3"]]]

67− ,[[Plain [Str "Cell",Space,Str "2.1"]]

68− ,[Plain [Str "Cell",Space,Str "2.2"]]

69− ,[Plain [Str "Cell",Space,Str "2.3"]]]

70− ,[[Plain [Str "Cell",Space,Str "3.1"]]

71− ,[Plain [Str "Cell",Space,Str "3.2"]]

72− ,[Plain [Str "Cell",Space,Str "3.3"]]]]]

78+[Table ("",[],[]) (Caption Nothing

79+ []) [(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Just 0.25)] 0

80+ [Row ("",[],[])

81+ [Cell ("",[],[]) Nothing 1 1

82+ [Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]

83+ ,Cell ("",[],[]) Nothing 1 1

84+ [Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]

85+ ,Cell ("",[],[]) Nothing 1 1

86+ [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]

87+ [Row ("",[],[])

88+ [Cell ("",[],[]) Nothing 1 1

89+ [Plain [Str "Cell",Space,Str "1.1"]]

90+ ,Cell ("",[],[]) Nothing 1 1

91+ [Plain [Str "Cell",Space,Str "1.2"]]

92+ ,Cell ("",[],[]) Nothing 1 1

93+ [Plain [Str "Cell",Space,Str "1.3"]]]

94+ ,Row ("",[],[])

95+ [Cell ("",[],[]) Nothing 1 1

96+ [Plain [Str "Cell",Space,Str "2.1"]]

97+ ,Cell ("",[],[]) Nothing 1 1

98+ [Plain [Str "Cell",Space,Str "2.2"]]

99+ ,Cell ("",[],[]) Nothing 1 1

100+ [Plain [Str "Cell",Space,Str "2.3"]]]

101+ ,Row ("",[],[])

102+ [Cell ("",[],[]) Nothing 1 1

103+ [Plain [Str "Cell",Space,Str "3.1"]]

104+ ,Cell ("",[],[]) Nothing 1 1

105+ [Plain [Str "Cell",Space,Str "3.2"]]

106+ ,Cell ("",[],[]) Nothing 1 1

107+ [Plain [Str "Cell",Space,Str "3.3"]]]]

108+ []]

73109```

74110

75111```

@@ -80,31 +116,49 @@

80116 & Column Heading 2

81117 & Column Heading 3 \\

82118\hline

83− Cell 1.1

119+ Cell 1.1

84120 & Cell 1.2

85121 & Cell 1.3 \\

86122\hline

87− Cell 2.1

123+ Cell 2.1

88124 & Cell 2.2

89125 & Cell 2.3 \\

90126\hline

91− Cell 3.1

127+ Cell 3.1

92128 & Cell 3.2

93129 & Cell 3.3 \\

94130\hline

95131\end{tabularx}

96132^D

97−[Table [] [AlignLeft,AlignCenter,AlignLeft] [0.25,0.0,0.25]

98− [[Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]

99− ,[Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]

100− ,[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]

101− [[[Plain [Str "Cell",Space,Str "1.1"]]

102− ,[Plain [Str "Cell",Space,Str "1.2"]]

103− ,[Plain [Str "Cell",Space,Str "1.3"]]]

104− ,[[Plain [Str "Cell",Space,Str "2.1"]]

105− ,[Plain [Str "Cell",Space,Str "2.2"]]

106− ,[Plain [Str "Cell",Space,Str "2.3"]]]

107− ,[[Plain [Str "Cell",Space,Str "3.1"]]

108− ,[Plain [Str "Cell",Space,Str "3.2"]]

109− ,[Plain [Str "Cell",Space,Str "3.3"]]]]]

133+[Table ("",[],[]) (Caption Nothing

134+ []) [(AlignLeft,Just 0.25),(AlignCenter,Nothing),(AlignLeft,Just 0.25)] 0

135+ [Row ("",[],[])

136+ [Cell ("",[],[]) Nothing 1 1

137+ [Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]

138+ ,Cell ("",[],[]) Nothing 1 1

139+ [Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]

140+ ,Cell ("",[],[]) Nothing 1 1

141+ [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]

142+ [Row ("",[],[])

143+ [Cell ("",[],[]) Nothing 1 1

144+ [Plain [Str "Cell",Space,Str "1.1"]]

145+ ,Cell ("",[],[]) Nothing 1 1

146+ [Plain [Str "Cell",Space,Str "1.2"]]

147+ ,Cell ("",[],[]) Nothing 1 1

148+ [Plain [Str "Cell",Space,Str "1.3"]]]

149+ ,Row ("",[],[])

150+ [Cell ("",[],[]) Nothing 1 1

151+ [Plain [Str "Cell",Space,Str "2.1"]]

152+ ,Cell ("",[],[]) Nothing 1 1

153+ [Plain [Str "Cell",Space,Str "2.2"]]

154+ ,Cell ("",[],[]) Nothing 1 1

155+ [Plain [Str "Cell",Space,Str "2.3"]]]

156+ ,Row ("",[],[])

157+ [Cell ("",[],[]) Nothing 1 1

158+ [Plain [Str "Cell",Space,Str "3.1"]]

159+ ,Cell ("",[],[]) Nothing 1 1

160+ [Plain [Str "Cell",Space,Str "3.2"]]

161+ ,Cell ("",[],[]) Nothing 1 1

162+ [Plain [Str "Cell",Space,Str "3.3"]]]]

163+ []]

110164```

test/creole-reader.native+41−16

@@ -69,25 +69,50 @@ Pandoc (Meta {unMeta = fromList []})

6969,Para [Image ("",[],[]) [Str "here is a red flower"] ("Red-Flower.jpg","")]

7070,Header 3 ("",[],[]) [Str "Creole 0.4"]

7171,Para [Str "Tables",Space,Str "are",Space,Str "done",Space,Str "like",Space,Str "this:"]

72−,Table [] [AlignDefault,AlignDefault] [0.0,0.0]

73− [[Plain [Str "header",Space,Str "col1"]]

74− ,[Plain [Str "header",Space,Str "col2"]]]

75− [[[Plain [Str "col1"]]

76− ,[Plain [Str "col2"]]]

77− ,[[Plain [Str "you"]]

78− ,[Plain [Str "can"]]]

79− ,[[Plain [Str "also"]]

80− ,[Plain [Str "align",LineBreak,Str "it."]]]]

72+,Table ("",[],[]) (Caption Nothing

73+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

74+ [Row ("",[],[])

75+ [Cell ("",[],[]) Nothing 1 1

76+ [Plain [Str "header",Space,Str "col1"]]

77+ ,Cell ("",[],[]) Nothing 1 1

78+ [Plain [Str "header",Space,Str "col2"]]]]

79+ [Row ("",[],[])

80+ [Cell ("",[],[]) Nothing 1 1

81+ [Plain [Str "col1"]]

82+ ,Cell ("",[],[]) Nothing 1 1

83+ [Plain [Str "col2"]]]

84+ ,Row ("",[],[])

85+ [Cell ("",[],[]) Nothing 1 1

86+ [Plain [Str "you"]]

87+ ,Cell ("",[],[]) Nothing 1 1

88+ [Plain [Str "can"]]]

89+ ,Row ("",[],[])

90+ [Cell ("",[],[]) Nothing 1 1

91+ [Plain [Str "also"]]

92+ ,Cell ("",[],[]) Nothing 1 1

93+ [Plain [Str "align",LineBreak,Str "it."]]]]

94+ []

8195,Para [Str "You",Space,Str "can",Space,Str "format",Space,Str "an",Space,Str "address",Space,Str "by",Space,Str "simply",Space,Str "forcing",Space,Str "linebreaks:"]

8296,Para [Str "My",Space,Str "contact",Space,Str "dates:",LineBreak,Str "Pone:",Space,Str "xyz",LineBreak,Str "Fax:",Space,Str "+45",LineBreak,Str "Mobile:",Space,Str "abc"]

8397,Header 3 ("",[],[]) [Str "Creole 0.5"]

84−,Table [] [AlignDefault,AlignDefault] [0.0,0.0]

85− [[Plain [Str "Header",Space,Str "title"]]

86− ,[Plain [Str "Another",Space,Str "header",Space,Str "title"]]]

87− [[[Plain [Code ("",[],[]) " //not italic text// "]]

88− ,[Plain [Code ("",[],[]) " **not bold text** "]]]

89− ,[[Plain [Emph [Str "italic",Space,Str "text"]]]

90− ,[Plain [Strong [Space,Str "bold",Space,Str "text",Space]]]]]

98+,Table ("",[],[]) (Caption Nothing

99+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

100+ [Row ("",[],[])

101+ [Cell ("",[],[]) Nothing 1 1

102+ [Plain [Str "Header",Space,Str "title"]]

103+ ,Cell ("",[],[]) Nothing 1 1

104+ [Plain [Str "Another",Space,Str "header",Space,Str "title"]]]]

105+ [Row ("",[],[])

106+ [Cell ("",[],[]) Nothing 1 1

107+ [Plain [Code ("",[],[]) " //not italic text// "]]

108+ ,Cell ("",[],[]) Nothing 1 1

109+ [Plain [Code ("",[],[]) " **not bold text** "]]]

110+ ,Row ("",[],[])

111+ [Cell ("",[],[]) Nothing 1 1

112+ [Plain [Emph [Str "italic",Space,Str "text"]]]

113+ ,Cell ("",[],[]) Nothing 1 1

114+ [Plain [Strong [Space,Str "bold",Space,Str "text",Space]]]]]

115+ []

91116,Header 3 ("",[],[]) [Str "Creole 1.0"]

92117,Para [Str "If",Space,Str "interwiki",Space,Str "links",Space,Str "are",Space,Str "setup",Space,Str "in",Space,Str "your",Space,Str "wiki,",Space,Str "this",Space,Str "links",Space,Str "to",Space,Str "the",Space,Str "WikiCreole",Space,Str "page",Space,Str "about",Space,Str "Creole",Space,Str "1.0",Space,Str "test",Space,Str "cases:",Space,Link ("",[],[]) [Str "WikiCreole:Creole1.0TestCases"] ("WikiCreole:Creole1.0TestCases",""),Str "."]

93118,HorizontalRule

test/docbook-reader.native+246−107

@@ -282,116 +282,255 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Sof

282282,Para [Str "This",Space,Str "paragraph",Space,Str "should",Space,Str "not",Space,Str "be",Space,Str "part",Space,Str "of",Space,Str "the",Space,Str "note,",Space,Str "as",Space,Str "it",Space,Str "is",Space,Str "not",Space,Str "indented."]

283283,Header 1 ("tables",[],[]) [Str "Tables"]

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

285−,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignRight,AlignLeft,AlignCenter,AlignLeft] [0.0,0.0,0.0,0.0]

286− [[Plain [Str "Right"]]

287− ,[Plain [Str "Left"]]

288− ,[Plain [Str "Center"]]

289− ,[Plain [Str "Default"]]]

290− [[[Plain [Str "12"]]

291− ,[Plain [Str "12"]]

292− ,[Plain [Str "12"]]

293− ,[Plain [Str "12"]]]

294− ,[[Plain [Str "123"]]

295− ,[Plain [Str "123"]]

296− ,[Plain [Str "123"]]

297− ,[Plain [Str "123"]]]

298− ,[[Plain [Str "1"]]

299− ,[Plain [Str "1"]]

300− ,[Plain [Str "1"]]

301− ,[Plain [Str "1"]]]]

285+,Table ("",[],[]) (Caption Nothing

286+ [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Nothing)] 0

287+ [Row ("",[],[])

288+ [Cell ("",[],[]) Nothing 1 1

289+ [Plain [Str "Right"]]

290+ ,Cell ("",[],[]) Nothing 1 1

291+ [Plain [Str "Left"]]

292+ ,Cell ("",[],[]) Nothing 1 1

293+ [Plain [Str "Center"]]

294+ ,Cell ("",[],[]) Nothing 1 1

295+ [Plain [Str "Default"]]]]

296+ [Row ("",[],[])

297+ [Cell ("",[],[]) Nothing 1 1

298+ [Plain [Str "12"]]

299+ ,Cell ("",[],[]) Nothing 1 1

300+ [Plain [Str "12"]]

301+ ,Cell ("",[],[]) Nothing 1 1

302+ [Plain [Str "12"]]

303+ ,Cell ("",[],[]) Nothing 1 1

304+ [Plain [Str "12"]]]

305+ ,Row ("",[],[])

306+ [Cell ("",[],[]) Nothing 1 1

307+ [Plain [Str "123"]]

308+ ,Cell ("",[],[]) Nothing 1 1

309+ [Plain [Str "123"]]

310+ ,Cell ("",[],[]) Nothing 1 1

311+ [Plain [Str "123"]]

312+ ,Cell ("",[],[]) Nothing 1 1

313+ [Plain [Str "123"]]]

314+ ,Row ("",[],[])

315+ [Cell ("",[],[]) Nothing 1 1

316+ [Plain [Str "1"]]

317+ ,Cell ("",[],[]) Nothing 1 1

318+ [Plain [Str "1"]]

319+ ,Cell ("",[],[]) Nothing 1 1

320+ [Plain [Str "1"]]

321+ ,Cell ("",[],[]) Nothing 1 1

322+ [Plain [Str "1"]]]]

323+ []

302324,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"]

303−,Table [] [AlignRight,AlignLeft,AlignCenter,AlignLeft] [0.0,0.0,0.0,0.0]

304− [[Plain [Str "Right"]]

305− ,[Plain [Str "Left"]]

306− ,[Plain [Str "Center"]]

307− ,[Plain [Str "Default"]]]

308− [[[Plain [Str "12"]]

309− ,[Plain [Str "12"]]

310− ,[Plain [Str "12"]]

311− ,[Plain [Str "12"]]]

312− ,[[Plain [Str "123"]]

313− ,[Plain [Str "123"]]

314− ,[Plain [Str "123"]]

315− ,[Plain [Str "123"]]]

316− ,[[Plain [Str "1"]]

317− ,[Plain [Str "1"]]

318− ,[Plain [Str "1"]]

319− ,[Plain [Str "1"]]]]

325+,Table ("",[],[]) (Caption Nothing

326+ []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Nothing)] 0

327+ [Row ("",[],[])

328+ [Cell ("",[],[]) Nothing 1 1

329+ [Plain [Str "Right"]]

330+ ,Cell ("",[],[]) Nothing 1 1

331+ [Plain [Str "Left"]]

332+ ,Cell ("",[],[]) Nothing 1 1

333+ [Plain [Str "Center"]]

334+ ,Cell ("",[],[]) Nothing 1 1

335+ [Plain [Str "Default"]]]]

336+ [Row ("",[],[])

337+ [Cell ("",[],[]) Nothing 1 1

338+ [Plain [Str "12"]]

339+ ,Cell ("",[],[]) Nothing 1 1

340+ [Plain [Str "12"]]

341+ ,Cell ("",[],[]) Nothing 1 1

342+ [Plain [Str "12"]]

343+ ,Cell ("",[],[]) Nothing 1 1

344+ [Plain [Str "12"]]]

345+ ,Row ("",[],[])

346+ [Cell ("",[],[]) Nothing 1 1

347+ [Plain [Str "123"]]

348+ ,Cell ("",[],[]) Nothing 1 1

349+ [Plain [Str "123"]]

350+ ,Cell ("",[],[]) Nothing 1 1

351+ [Plain [Str "123"]]

352+ ,Cell ("",[],[]) Nothing 1 1

353+ [Plain [Str "123"]]]

354+ ,Row ("",[],[])

355+ [Cell ("",[],[]) Nothing 1 1

356+ [Plain [Str "1"]]

357+ ,Cell ("",[],[]) Nothing 1 1

358+ [Plain [Str "1"]]

359+ ,Cell ("",[],[]) Nothing 1 1

360+ [Plain [Str "1"]]

361+ ,Cell ("",[],[]) Nothing 1 1

362+ [Plain [Str "1"]]]]

363+ []

320364,Para [Str "Simple",Space,Str "table",Space,Str "indented",Space,Str "two",Space,Str "spaces:"]

321−,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignRight,AlignLeft,AlignCenter,AlignLeft] [0.0,0.0,0.0,0.0]

322− [[Plain [Str "Right"]]

323− ,[Plain [Str "Left"]]

324− ,[Plain [Str "Center"]]

325− ,[Plain [Str "Default"]]]

326− [[[Plain [Str "12"]]

327− ,[Plain [Str "12"]]

328− ,[Plain [Str "12"]]

329− ,[Plain [Str "12"]]]

330− ,[[Plain [Str "123"]]

331− ,[Plain [Str "123"]]

332− ,[Plain [Str "123"]]

333− ,[Plain [Str "123"]]]

334− ,[[Plain [Str "1"]]

335− ,[Plain [Str "1"]]

336− ,[Plain [Str "1"]]

337− ,[Plain [Str "1"]]]]

365+,Table ("",[],[]) (Caption Nothing

366+ [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Nothing)] 0

367+ [Row ("",[],[])

368+ [Cell ("",[],[]) Nothing 1 1

369+ [Plain [Str "Right"]]

370+ ,Cell ("",[],[]) Nothing 1 1

371+ [Plain [Str "Left"]]

372+ ,Cell ("",[],[]) Nothing 1 1

373+ [Plain [Str "Center"]]

374+ ,Cell ("",[],[]) Nothing 1 1

375+ [Plain [Str "Default"]]]]

376+ [Row ("",[],[])

377+ [Cell ("",[],[]) Nothing 1 1

378+ [Plain [Str "12"]]

379+ ,Cell ("",[],[]) Nothing 1 1

380+ [Plain [Str "12"]]

381+ ,Cell ("",[],[]) Nothing 1 1

382+ [Plain [Str "12"]]

383+ ,Cell ("",[],[]) Nothing 1 1

384+ [Plain [Str "12"]]]

385+ ,Row ("",[],[])

386+ [Cell ("",[],[]) Nothing 1 1

387+ [Plain [Str "123"]]

388+ ,Cell ("",[],[]) Nothing 1 1

389+ [Plain [Str "123"]]

390+ ,Cell ("",[],[]) Nothing 1 1

391+ [Plain [Str "123"]]

392+ ,Cell ("",[],[]) Nothing 1 1

393+ [Plain [Str "123"]]]

394+ ,Row ("",[],[])

395+ [Cell ("",[],[]) Nothing 1 1

396+ [Plain [Str "1"]]

397+ ,Cell ("",[],[]) Nothing 1 1

398+ [Plain [Str "1"]]

399+ ,Cell ("",[],[]) Nothing 1 1

400+ [Plain [Str "1"]]

401+ ,Cell ("",[],[]) Nothing 1 1

402+ [Plain [Str "1"]]]]

403+ []

338404,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"]

339−,Table [Str "Here's",Space,Str "the",Space,Str "caption.",Space,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.2,0.2,0.3,0.3]

340− [[Plain [Str "Centered",Space,Str "Header"]]

341− ,[Plain [Str "Left",Space,Str "Aligned"]]

342− ,[Plain [Str "Right",Space,Str "Aligned"]]

343− ,[Plain [Str "Default",Space,Str "aligned"]]]

344− [[[Plain [Str "First"]]

345− ,[Plain [Str "row"]]

346− ,[Plain [Str "12.0"]]

347− ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]]

348− ,[[Plain [Str "Second"]]

349− ,[Plain [Str "row"]]

350− ,[Plain [Str "5.0"]]

351− ,[Plain [Str "Here's",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]

405+,Table ("",[],[]) (Caption Nothing

406+ [Para [Str "Here's",Space,Str "the",Space,Str "caption.",Space,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."]]) [(AlignCenter,Just 0.2),(AlignLeft,Just 0.2),(AlignRight,Just 0.3),(AlignLeft,Just 0.3)] 0

407+ [Row ("",[],[])

408+ [Cell ("",[],[]) Nothing 1 1

409+ [Plain [Str "Centered",Space,Str "Header"]]

410+ ,Cell ("",[],[]) Nothing 1 1

411+ [Plain [Str "Left",Space,Str "Aligned"]]

412+ ,Cell ("",[],[]) Nothing 1 1

413+ [Plain [Str "Right",Space,Str "Aligned"]]

414+ ,Cell ("",[],[]) Nothing 1 1

415+ [Plain [Str "Default",Space,Str "aligned"]]]]

416+ [Row ("",[],[])

417+ [Cell ("",[],[]) Nothing 1 1

418+ [Plain [Str "First"]]

419+ ,Cell ("",[],[]) Nothing 1 1

420+ [Plain [Str "row"]]

421+ ,Cell ("",[],[]) Nothing 1 1

422+ [Plain [Str "12.0"]]

423+ ,Cell ("",[],[]) Nothing 1 1

424+ [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]]

425+ ,Row ("",[],[])

426+ [Cell ("",[],[]) Nothing 1 1

427+ [Plain [Str "Second"]]

428+ ,Cell ("",[],[]) Nothing 1 1

429+ [Plain [Str "row"]]

430+ ,Cell ("",[],[]) Nothing 1 1

431+ [Plain [Str "5.0"]]

432+ ,Cell ("",[],[]) Nothing 1 1

433+ [Plain [Str "Here's",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]

434+ []

352435,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"]

353−,Table [] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.1,0.2,0.3,0.4]

354− [[Plain [Str "Centered",Space,Str "Header"]]

355− ,[Plain [Str "Left",Space,Str "Aligned"]]

356− ,[Plain [Str "Right",Space,Str "Aligned"]]

357− ,[Plain [Str "Default",Space,Str "aligned"]]]

358− [[[Plain [Str "First"]]

359− ,[Plain [Str "row"]]

360− ,[Plain [Str "12.0"]]

361− ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]]

362− ,[[Plain [Str "Second"]]

363− ,[Plain [Str "row"]]

364− ,[Plain [Str "5.0"]]

365− ,[Plain [Str "Here's",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]

436+,Table ("",[],[]) (Caption Nothing

437+ []) [(AlignCenter,Just 0.1),(AlignLeft,Just 0.2),(AlignRight,Just 0.3),(AlignLeft,Just 0.4)] 0

438+ [Row ("",[],[])

439+ [Cell ("",[],[]) Nothing 1 1

440+ [Plain [Str "Centered",Space,Str "Header"]]

441+ ,Cell ("",[],[]) Nothing 1 1

442+ [Plain [Str "Left",Space,Str "Aligned"]]

443+ ,Cell ("",[],[]) Nothing 1 1

444+ [Plain [Str "Right",Space,Str "Aligned"]]

445+ ,Cell ("",[],[]) Nothing 1 1

446+ [Plain [Str "Default",Space,Str "aligned"]]]]

447+ [Row ("",[],[])

448+ [Cell ("",[],[]) Nothing 1 1

449+ [Plain [Str "First"]]

450+ ,Cell ("",[],[]) Nothing 1 1

451+ [Plain [Str "row"]]

452+ ,Cell ("",[],[]) Nothing 1 1

453+ [Plain [Str "12.0"]]

454+ ,Cell ("",[],[]) Nothing 1 1

455+ [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]]

456+ ,Row ("",[],[])

457+ [Cell ("",[],[]) Nothing 1 1

458+ [Plain [Str "Second"]]

459+ ,Cell ("",[],[]) Nothing 1 1

460+ [Plain [Str "row"]]

461+ ,Cell ("",[],[]) Nothing 1 1

462+ [Plain [Str "5.0"]]

463+ ,Cell ("",[],[]) Nothing 1 1

464+ [Plain [Str "Here's",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]

465+ []

366466,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"]

367−,Table [] [AlignRight,AlignLeft,AlignCenter,AlignRight] [0.0,0.0,0.0,0.0]

368− [[]

369− ,[]

370− ,[]

371− ,[]]

372− [[[Plain [Str "12"]]

373− ,[Plain [Str "12"]]

374− ,[Plain [Str "12"]]

375− ,[Plain [Str "12"]]]

376− ,[[Plain [Str "123"]]

377− ,[Plain [Str "123"]]

378− ,[Plain [Str "123"]]

379− ,[Plain [Str "123"]]]

380− ,[[Plain [Str "1"]]

381− ,[Plain [Str "1"]]

382− ,[Plain [Str "1"]]

383− ,[Plain [Str "1"]]]]

467+,Table ("",[],[]) (Caption Nothing

468+ []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0

469+ [Row ("",[],[])

470+ [Cell ("",[],[]) Nothing 1 1

471+ []

472+ ,Cell ("",[],[]) Nothing 1 1

473+ []

474+ ,Cell ("",[],[]) Nothing 1 1

475+ []

476+ ,Cell ("",[],[]) Nothing 1 1

477+ []]]

478+ [Row ("",[],[])

479+ [Cell ("",[],[]) Nothing 1 1

480+ [Plain [Str "12"]]

481+ ,Cell ("",[],[]) Nothing 1 1

482+ [Plain [Str "12"]]

483+ ,Cell ("",[],[]) Nothing 1 1

484+ [Plain [Str "12"]]

485+ ,Cell ("",[],[]) Nothing 1 1

486+ [Plain [Str "12"]]]

487+ ,Row ("",[],[])

488+ [Cell ("",[],[]) Nothing 1 1

489+ [Plain [Str "123"]]

490+ ,Cell ("",[],[]) Nothing 1 1

491+ [Plain [Str "123"]]

492+ ,Cell ("",[],[]) Nothing 1 1

493+ [Plain [Str "123"]]

494+ ,Cell ("",[],[]) Nothing 1 1

495+ [Plain [Str "123"]]]

496+ ,Row ("",[],[])

497+ [Cell ("",[],[]) Nothing 1 1

498+ [Plain [Str "1"]]

499+ ,Cell ("",[],[]) Nothing 1 1

500+ [Plain [Str "1"]]

501+ ,Cell ("",[],[]) Nothing 1 1

502+ [Plain [Str "1"]]

503+ ,Cell ("",[],[]) Nothing 1 1

504+ [Plain [Str "1"]]]]

505+ []

384506,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"]

385−,Table [] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.25,0.25,0.25,0.25]

386− [[]

387− ,[]

388− ,[]

389− ,[]]

390− [[[Plain [Str "First"]]

391− ,[Plain [Str "row"]]

392− ,[Plain [Str "12.0"]]

393− ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]]

394− ,[[Plain [Str "Second"]]

395− ,[Plain [Str "row"]]

396− ,[Plain [Str "5.0"]]

397− ,[Plain [Str "Here's",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]]

507+,Table ("",[],[]) (Caption Nothing

508+ []) [(AlignCenter,Just 0.25),(AlignLeft,Just 0.25),(AlignRight,Just 0.25),(AlignLeft,Just 0.25)] 0

509+ [Row ("",[],[])

510+ [Cell ("",[],[]) Nothing 1 1

511+ []

512+ ,Cell ("",[],[]) Nothing 1 1

513+ []

514+ ,Cell ("",[],[]) Nothing 1 1

515+ []

516+ ,Cell ("",[],[]) Nothing 1 1

517+ []]]

518+ [Row ("",[],[])

519+ [Cell ("",[],[]) Nothing 1 1

520+ [Plain [Str "First"]]

521+ ,Cell ("",[],[]) Nothing 1 1

522+ [Plain [Str "row"]]

523+ ,Cell ("",[],[]) Nothing 1 1

524+ [Plain [Str "12.0"]]

525+ ,Cell ("",[],[]) Nothing 1 1

526+ [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]]

527+ ,Row ("",[],[])

528+ [Cell ("",[],[]) Nothing 1 1

529+ [Plain [Str "Second"]]

530+ ,Cell ("",[],[]) Nothing 1 1

531+ [Plain [Str "row"]]

532+ ,Cell ("",[],[]) Nothing 1 1

533+ [Plain [Str "5.0"]]

534+ ,Cell ("",[],[]) Nothing 1 1

535+ [Plain [Str "Here's",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]

536+ []]

test/docx/0_level_headers.native+36−12

@@ -1,15 +1,39 @@

1−[Table [] [AlignDefault] [0.0]

2− [[]]

3− [[[]]

4− ,[[Plain [Str "User\8217s",Space,Str "Guide"]]]

5− ,[[]]

6− ,[[]]

7− ,[[]]

8− ,[[Plain [Str "11",Space,Str "August",Space,Str "2017"]]]

9− ,[[]]

10− ,[[]]

11− ,[[]]

12− ,[[]]]

1+[Table ("",[],[]) (Caption Nothing

2+ []) [(AlignDefault,Nothing)] 0

3+ [Row ("",[],[])

4+ [Cell ("",[],[]) Nothing 1 1

5+ []]]

6+ [Row ("",[],[])

7+ [Cell ("",[],[]) Nothing 1 1

8+ []]

9+ ,Row ("",[],[])

10+ [Cell ("",[],[]) Nothing 1 1

11+ [Plain [Str "User\8217s",Space,Str "Guide"]]]

12+ ,Row ("",[],[])

13+ [Cell ("",[],[]) Nothing 1 1

14+ []]

15+ ,Row ("",[],[])

16+ [Cell ("",[],[]) Nothing 1 1

17+ []]

18+ ,Row ("",[],[])

19+ [Cell ("",[],[]) Nothing 1 1

20+ []]

21+ ,Row ("",[],[])

22+ [Cell ("",[],[]) Nothing 1 1

23+ [Plain [Str "11",Space,Str "August",Space,Str "2017"]]]

24+ ,Row ("",[],[])

25+ [Cell ("",[],[]) Nothing 1 1

26+ []]

27+ ,Row ("",[],[])

28+ [Cell ("",[],[]) Nothing 1 1

29+ []]

30+ ,Row ("",[],[])

31+ [Cell ("",[],[]) Nothing 1 1

32+ []]

33+ ,Row ("",[],[])

34+ [Cell ("",[],[]) Nothing 1 1

35+ []]]

36+ []

1337,Para [Str "CONTENTS"]

1438,Para [Strong [Str "Section",Space,Str "Page"]]

1539,Para [Str "FIGURES",Space,Str "iv"]

test/docx/sdt_elements.native+24−10

@@ -1,10 +1,24 @@

1−[Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

2− [[]

3− ,[]

4− ,[]]

5− [[[Plain [Strong [Str "col1Header"]]]

6− ,[Plain [Strong [Str "col2Header"]]]

7− ,[Plain [Strong [Str "col3Header"]]]]

8− ,[[Plain [Str "col1",Space,Str "content"]]

9− ,[Plain [Str "Body",Space,Str "copy"]]

10− ,[Plain [Str "col3",Space,Str "content"]]]]]

1+[Table ("",[],[]) (Caption Nothing

2+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

3+ [Row ("",[],[])

4+ [Cell ("",[],[]) Nothing 1 1

5+ []

6+ ,Cell ("",[],[]) Nothing 1 1

7+ []

8+ ,Cell ("",[],[]) Nothing 1 1

9+ []]]

10+ [Row ("",[],[])

11+ [Cell ("",[],[]) Nothing 1 1

12+ [Plain [Strong [Str "col1Header"]]]

13+ ,Cell ("",[],[]) Nothing 1 1

14+ [Plain [Strong [Str "col2Header"]]]

15+ ,Cell ("",[],[]) Nothing 1 1

16+ [Plain [Strong [Str "col3Header"]]]]

17+ ,Row ("",[],[])

18+ [Cell ("",[],[]) Nothing 1 1

19+ [Plain [Str "col1",Space,Str "content"]]

20+ ,Cell ("",[],[]) Nothing 1 1

21+ [Plain [Str "Body",Space,Str "copy"]]

22+ ,Cell ("",[],[]) Nothing 1 1

23+ [Plain [Str "col3",Space,Str "content"]]]]

24+ []]

test/docx/table_one_row.native+17−7

@@ -1,7 +1,17 @@

1−[Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

2− [[]

3− ,[]

4− ,[]]

5− [[[Plain [Str "One"]]

6− ,[Plain [Str "Row"]]

7− ,[Plain [Str "Table"]]]]]

1+[Table ("",[],[]) (Caption Nothing

2+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

3+ [Row ("",[],[])

4+ [Cell ("",[],[]) Nothing 1 1

5+ []

6+ ,Cell ("",[],[]) Nothing 1 1

7+ []

8+ ,Cell ("",[],[]) Nothing 1 1

9+ []]]

10+ [Row ("",[],[])

11+ [Cell ("",[],[]) Nothing 1 1

12+ [Plain [Str "One"]]

13+ ,Cell ("",[],[]) Nothing 1 1

14+ [Plain [Str "Row"]]

15+ ,Cell ("",[],[]) Nothing 1 1

16+ [Plain [Str "Table"]]]]

17+ []]

test/docx/table_variable_width.native+37−16

@@ -1,16 +1,37 @@

1−[Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0,0.0,0.0]

2− [[]

3− ,[]

4− ,[Plain [Str "h3"]]

5− ,[Plain [Str "h4"]]

6− ,[Plain [Str "h5"]]]

7− [[[Plain [Str "c11"]]

8− ,[]

9− ,[]

10− ,[]

11− ,[]]

12− ,[[]

13− ,[Plain [Str "c22"]]

14− ,[Plain [Str "c23"]]

15− ,[]

16− ,[]]]]

2+[Table ("",[],[]) (Caption Nothing

3+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

4+ [Row ("",[],[])

5+ [Cell ("",[],[]) Nothing 1 1

6+ []

7+ ,Cell ("",[],[]) Nothing 1 1

8+ []

9+ ,Cell ("",[],[]) Nothing 1 1

10+ [Plain [Str "h3"]]

11+ ,Cell ("",[],[]) Nothing 1 1

12+ [Plain [Str "h4"]]

13+ ,Cell ("",[],[]) Nothing 1 1

14+ [Plain [Str "h5"]]]]

15+ [Row ("",[],[])

16+ [Cell ("",[],[]) Nothing 1 1

17+ [Plain [Str "c11"]]

18+ ,Cell ("",[],[]) Nothing 1 1

19+ []

20+ ,Cell ("",[],[]) Nothing 1 1

21+ []

22+ ,Cell ("",[],[]) Nothing 1 1

23+ []

24+ ,Cell ("",[],[]) Nothing 1 1

25+ []]

26+ ,Row ("",[],[])

27+ [Cell ("",[],[]) Nothing 1 1

28+ []

29+ ,Cell ("",[],[]) Nothing 1 1

30+ [Plain [Str "c22"]]

31+ ,Cell ("",[],[]) Nothing 1 1

32+ [Plain [Str "c23"]]

33+ ,Cell ("",[],[]) Nothing 1 1

34+ []

35+ ,Cell ("",[],[]) Nothing 1 1

36+ []]]

37+ []]

test/docx/table_with_list_cell.native+14−6

@@ -1,11 +1,19 @@

1−[Table [] [AlignDefault,AlignDefault] [0.0,0.0]

2− [[Plain [Str "Cell",Space,Str "with",Space,Str "text"]]

3− ,[Plain [Str "Cell",Space,Str "with",Space,Str "text"]]]

4− [[[BulletList

1+[Table ("",[],[]) (Caption Nothing

2+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

3+ [Row ("",[],[])

4+ [Cell ("",[],[]) Nothing 1 1

5+ [Plain [Str "Cell",Space,Str "with",Space,Str "text"]]

6+ ,Cell ("",[],[]) Nothing 1 1

7+ [Plain [Str "Cell",Space,Str "with",Space,Str "text"]]]]

8+ [Row ("",[],[])

9+ [Cell ("",[],[]) Nothing 1 1

10+ [BulletList

511 [[Para [Str "Cell",Space,Str "with"]]

612 ,[Para [Str "A"]]

713 ,[Para [Str "Bullet",Space,Str "list"]]]]

8− ,[OrderedList (1,Decimal,Period)

14+ ,Cell ("",[],[]) Nothing 1 1

15+ [OrderedList (1,Decimal,Period)

916 [[Para [Str "Cell",Space,Str "with"]]

1017 ,[Para [Str "A"]]

11− ,[Para [Str "Numbered",Space,Str "list."]]]]]]]

18+ ,[Para [Str "Numbered",Space,Str "list."]]]]]]

19+ []]

test/docx/tables.native+76−32

@@ -1,36 +1,80 @@

11[Header 2 ("a-table-with-and-without-a-header-row",[],[]) [Str "A",Space,Str "table,",Space,Str "with",Space,Str "and",Space,Str "without",Space,Str "a",Space,Str "header",Space,Str "row"]

2−,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0,0.0]

3− [[Plain [Str "Name"]]

4− ,[Plain [Str "Game"]]

5− ,[Plain [Str "Fame"]]

6− ,[Plain [Str "Blame"]]]

7− [[[Plain [Str "Lebron",Space,Str "James"]]

8− ,[Plain [Str "Basketball"]]

9− ,[Plain [Str "Very",Space,Str "High"]]

10− ,[Plain [Str "Leaving",Space,Str "Cleveland"]]]

11− ,[[Plain [Str "Ryan",Space,Str "Braun"]]

12− ,[Plain [Str "Baseball"]]

13− ,[Plain [Str "Moderate"]]

14− ,[Plain [Str "Steroids"]]]

15− ,[[Plain [Str "Russell",Space,Str "Wilson"]]

16− ,[Plain [Str "Football"]]

17− ,[Plain [Str "High"]]

18− ,[Plain [Str "Tacky",Space,Str "uniform"]]]]

19−,Table [] [AlignDefault,AlignDefault] [0.0,0.0]

20− [[]

21− ,[]]

22− [[[Plain [Str "Sinple"]]

23− ,[Plain [Str "Table"]]]

24− ,[[Plain [Str "Without"]]

25− ,[Plain [Str "Header"]]]]

26−,Table [] [AlignDefault,AlignDefault] [0.0,0.0]

27− [[]

28− ,[]]

29− [[[Para [Str "Simple"]

2+,Table ("",[],[]) (Caption Nothing

3+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

4+ [Row ("",[],[])

5+ [Cell ("",[],[]) Nothing 1 1

6+ [Plain [Str "Name"]]

7+ ,Cell ("",[],[]) Nothing 1 1

8+ [Plain [Str "Game"]]

9+ ,Cell ("",[],[]) Nothing 1 1

10+ [Plain [Str "Fame"]]

11+ ,Cell ("",[],[]) Nothing 1 1

12+ [Plain [Str "Blame"]]]]

13+ [Row ("",[],[])

14+ [Cell ("",[],[]) Nothing 1 1

15+ [Plain [Str "Lebron",Space,Str "James"]]

16+ ,Cell ("",[],[]) Nothing 1 1

17+ [Plain [Str "Basketball"]]

18+ ,Cell ("",[],[]) Nothing 1 1

19+ [Plain [Str "Very",Space,Str "High"]]

20+ ,Cell ("",[],[]) Nothing 1 1

21+ [Plain [Str "Leaving",Space,Str "Cleveland"]]]

22+ ,Row ("",[],[])

23+ [Cell ("",[],[]) Nothing 1 1

24+ [Plain [Str "Ryan",Space,Str "Braun"]]

25+ ,Cell ("",[],[]) Nothing 1 1

26+ [Plain [Str "Baseball"]]

27+ ,Cell ("",[],[]) Nothing 1 1

28+ [Plain [Str "Moderate"]]

29+ ,Cell ("",[],[]) Nothing 1 1

30+ [Plain [Str "Steroids"]]]

31+ ,Row ("",[],[])

32+ [Cell ("",[],[]) Nothing 1 1

33+ [Plain [Str "Russell",Space,Str "Wilson"]]

34+ ,Cell ("",[],[]) Nothing 1 1

35+ [Plain [Str "Football"]]

36+ ,Cell ("",[],[]) Nothing 1 1

37+ [Plain [Str "High"]]

38+ ,Cell ("",[],[]) Nothing 1 1

39+ [Plain [Str "Tacky",Space,Str "uniform"]]]]

40+ []

41+,Table ("",[],[]) (Caption Nothing

42+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

43+ [Row ("",[],[])

44+ [Cell ("",[],[]) Nothing 1 1

45+ []

46+ ,Cell ("",[],[]) Nothing 1 1

47+ []]]

48+ [Row ("",[],[])

49+ [Cell ("",[],[]) Nothing 1 1

50+ [Plain [Str "Sinple"]]

51+ ,Cell ("",[],[]) Nothing 1 1

52+ [Plain [Str "Table"]]]

53+ ,Row ("",[],[])

54+ [Cell ("",[],[]) Nothing 1 1

55+ [Plain [Str "Without"]]

56+ ,Cell ("",[],[]) Nothing 1 1

57+ [Plain [Str "Header"]]]]

58+ []

59+,Table ("",[],[]) (Caption Nothing

60+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

61+ [Row ("",[],[])

62+ [Cell ("",[],[]) Nothing 1 1

63+ []

64+ ,Cell ("",[],[]) Nothing 1 1

65+ []]]

66+ [Row ("",[],[])

67+ [Cell ("",[],[]) Nothing 1 1

68+ [Para [Str "Simple"]

3069 ,Para [Str "Multiparagraph"]]

31− ,[Para [Str "Table"]

70+ ,Cell ("",[],[]) Nothing 1 1

71+ [Para [Str "Table"]

3272 ,Para [Str "Full"]]]

33− ,[[Para [Str "Of"]

73+ ,Row ("",[],[])

74+ [Cell ("",[],[]) Nothing 1 1

75+ [Para [Str "Of"]

3476 ,Para [Str "Paragraphs"]]

35− ,[Para [Str "In",Space,Str "each"]

36− ,Para [Str "Cell."]]]]]

77+ ,Cell ("",[],[]) Nothing 1 1

78+ [Para [Str "In",Space,Str "each"]

79+ ,Para [Str "Cell."]]]]

80+ []]

test/dokuwiki_multiblock_table.native+31−15

@@ -1,18 +1,34 @@

1−[Table [Str "Sample",Space,Str "grid",Space,Str "table."] [AlignDefault,AlignDefault,AlignDefault] [0.2222222222222222,0.2222222222222222,0.2916666666666667]

2− [[Plain [Str "Fruit"]]

3− ,[Plain [Str "Price"]]

4− ,[Plain [Str "Advantages"]]]

5− [[[Para [Str "Bananas"]]

6− ,[Para [Str "$1.34"]]

7− ,[Para [Str "built-in",Space,Str "wrapper"]

1+[Table ("",[],[]) (Caption Nothing

2+ [Para [Str "Sample",Space,Str "grid",Space,Str "table."]]) [(AlignDefault,Just 0.2222222222222222),(AlignDefault,Just 0.2222222222222222),(AlignDefault,Just 0.2916666666666667)] 0

3+ [Row ("",[],[])

4+ [Cell ("",[],[]) Nothing 1 1

5+ [Plain [Str "Fruit"]]

6+ ,Cell ("",[],[]) Nothing 1 1

7+ [Plain [Str "Price"]]

8+ ,Cell ("",[],[]) Nothing 1 1

9+ [Plain [Str "Advantages"]]]]

10+ [Row ("",[],[])

11+ [Cell ("",[],[]) Nothing 1 1

12+ [Para [Str "Bananas"]]

13+ ,Cell ("",[],[]) Nothing 1 1

14+ [Para [Str "$1.34"]]

15+ ,Cell ("",[],[]) Nothing 1 1

16+ [Para [Str "built-in",Space,Str "wrapper"]

817 ,Para [Str "potassium"]]]

9− ,[[Para [Str "Oranges"]]

10− ,[Para [Str "$2.10"]]

11− ,[BulletList

18+ ,Row ("",[],[])

19+ [Cell ("",[],[]) Nothing 1 1

20+ [Para [Str "Oranges"]]

21+ ,Cell ("",[],[]) Nothing 1 1

22+ [Para [Str "$2.10"]]

23+ ,Cell ("",[],[]) Nothing 1 1

24+ [BulletList

1225 [[Plain [Str "cures",Space,Str "scurvy"]]

1326 ,[Plain [Str "tasty"]]]]]

14− ,[[Para [Str "Apples"]]

15− ,[Para [Str "$1.10"]]

16− ,[Para [Str "Some",Space,Str "text",LineBreak,LineBreak,Str "after",Space,Str "two",Space,Str "linebreaks"]

17− ]]

18− ]]

27+ ,Row ("",[],[])

28+ [Cell ("",[],[]) Nothing 1 1

29+ [Para [Str "Apples"]]

30+ ,Cell ("",[],[]) Nothing 1 1

31+ [Para [Str "$1.10"]]

32+ ,Cell ("",[],[]) Nothing 1 1

33+ [Para [Str "Some",Space,Str "text",LineBreak,LineBreak,Str "after",Space,Str "two",Space,Str "linebreaks"]]]]

34+ []]

test/html-reader.native+312−130

@@ -331,147 +331,329 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl

331331,Para [Emph [Str "Trailing",Space,Str "spaces"],Space,Str "text"]

332332,Header 1 ("tables",[],[]) [Str "Tables"]

333333,Header 2 ("tables-with-headers",[],[]) [Str "Tables",Space,Str "with",Space,Str "Headers"]

334−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

335− [[Plain [Str "X"]]

336− ,[Plain [Str "Y"]]

337− ,[Plain [Str "Z"]]]

338− [[[Plain [Str "1"]]

339− ,[Plain [Str "2"]]

340− ,[Plain [Str "3"]]]

341− ,[[Plain [Str "4"]]

342− ,[Plain [Str "5"]]

343− ,[Plain [Str "6"]]]]

334+,Table ("",[],[]) (Caption Nothing

335+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

336+ [Row ("",[],[])

337+ [Cell ("",[],[]) Nothing 1 1

338+ [Plain [Str "X"]]

339+ ,Cell ("",[],[]) Nothing 1 1

340+ [Plain [Str "Y"]]

341+ ,Cell ("",[],[]) Nothing 1 1

342+ [Plain [Str "Z"]]]]

343+ [Row ("",[],[])

344+ [Cell ("",[],[]) Nothing 1 1

345+ [Plain [Str "1"]]

346+ ,Cell ("",[],[]) Nothing 1 1

347+ [Plain [Str "2"]]

348+ ,Cell ("",[],[]) Nothing 1 1

349+ [Plain [Str "3"]]]

350+ ,Row ("",[],[])

351+ [Cell ("",[],[]) Nothing 1 1

352+ [Plain [Str "4"]]

353+ ,Cell ("",[],[]) Nothing 1 1

354+ [Plain [Str "5"]]

355+ ,Cell ("",[],[]) Nothing 1 1

356+ [Plain [Str "6"]]]]

357+ []

344358,HorizontalRule

345−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

346− [[Plain [Str "X"]]

347− ,[Plain [Str "Y"]]

348− ,[Plain [Str "Z"]]]

349− [[[Plain [Str "1"]]

350− ,[Plain [Str "2"]]

351− ,[Plain [Str "3"]]]

352− ,[[Plain [Str "4"]]

353− ,[Plain [Str "5"]]

354− ,[Plain [Str "6"]]]]

359+,Table ("",[],[]) (Caption Nothing

360+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

361+ [Row ("",[],[])

362+ [Cell ("",[],[]) Nothing 1 1

363+ [Plain [Str "X"]]

364+ ,Cell ("",[],[]) Nothing 1 1

365+ [Plain [Str "Y"]]

366+ ,Cell ("",[],[]) Nothing 1 1

367+ [Plain [Str "Z"]]]]

368+ [Row ("",[],[])

369+ [Cell ("",[],[]) Nothing 1 1

370+ [Plain [Str "1"]]

371+ ,Cell ("",[],[]) Nothing 1 1

372+ [Plain [Str "2"]]

373+ ,Cell ("",[],[]) Nothing 1 1

374+ [Plain [Str "3"]]]

375+ ,Row ("",[],[])

376+ [Cell ("",[],[]) Nothing 1 1

377+ [Plain [Str "4"]]

378+ ,Cell ("",[],[]) Nothing 1 1

379+ [Plain [Str "5"]]

380+ ,Cell ("",[],[]) Nothing 1 1

381+ [Plain [Str "6"]]]]

382+ []

355383,HorizontalRule

356−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

357− [[Plain [Str "X"]]

358− ,[Plain [Str "Y"]]

359− ,[Plain [Str "Z"]]]

360− [[[Plain [Str "1"]]

361− ,[Plain [Str "2"]]

362− ,[Plain [Str "3"]]]

363− ,[[Plain [Str "4"]]

364− ,[Plain [Str "5"]]

365− ,[Plain [Str "6"]]]]

384+,Table ("",[],[]) (Caption Nothing

385+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

386+ [Row ("",[],[])

387+ [Cell ("",[],[]) Nothing 1 1

388+ [Plain [Str "X"]]

389+ ,Cell ("",[],[]) Nothing 1 1

390+ [Plain [Str "Y"]]

391+ ,Cell ("",[],[]) Nothing 1 1

392+ [Plain [Str "Z"]]]]

393+ [Row ("",[],[])

394+ [Cell ("",[],[]) Nothing 1 1

395+ [Plain [Str "1"]]

396+ ,Cell ("",[],[]) Nothing 1 1

397+ [Plain [Str "2"]]

398+ ,Cell ("",[],[]) Nothing 1 1

399+ [Plain [Str "3"]]]

400+ ,Row ("",[],[])

401+ [Cell ("",[],[]) Nothing 1 1

402+ [Plain [Str "4"]]

403+ ,Cell ("",[],[]) Nothing 1 1

404+ [Plain [Str "5"]]

405+ ,Cell ("",[],[]) Nothing 1 1

406+ [Plain [Str "6"]]]]

407+ []

366408,HorizontalRule

367−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

368− [[Plain [Str "X"]]

369− ,[Plain [Str "Y"]]

370− ,[Plain [Str "Z"]]]

371− [[[Plain [Str "1"]]

372− ,[Plain [Str "2"]]

373− ,[Plain [Str "3"]]]

374− ,[[Plain [Str "4"]]

375− ,[Plain [Str "5"]]

376− ,[Plain [Str "6"]]]]

409+,Table ("",[],[]) (Caption Nothing

410+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

411+ [Row ("",[],[])

412+ [Cell ("",[],[]) Nothing 1 1

413+ [Plain [Str "X"]]

414+ ,Cell ("",[],[]) Nothing 1 1

415+ [Plain [Str "Y"]]

416+ ,Cell ("",[],[]) Nothing 1 1

417+ [Plain [Str "Z"]]]]

418+ [Row ("",[],[])

419+ [Cell ("",[],[]) Nothing 1 1

420+ [Plain [Str "1"]]

421+ ,Cell ("",[],[]) Nothing 1 1

422+ [Plain [Str "2"]]

423+ ,Cell ("",[],[]) Nothing 1 1

424+ [Plain [Str "3"]]]

425+ ,Row ("",[],[])

426+ [Cell ("",[],[]) Nothing 1 1

427+ [Plain [Str "4"]]

428+ ,Cell ("",[],[]) Nothing 1 1

429+ [Plain [Str "5"]]

430+ ,Cell ("",[],[]) Nothing 1 1

431+ [Plain [Str "6"]]]]

432+ []

377433,HorizontalRule

378−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

379− [[Plain [Str "X"]]

380− ,[Plain [Str "Y"]]

381− ,[Plain [Str "Z"]]]

382− [[[Plain [Str "1"]]

383− ,[Plain [Str "2"]]

384− ,[Plain [Str "3"]]]

385− ,[[Plain [Str "4"]]

386− ,[Plain [Str "5"]]

387− ,[Plain [Str "6"]]]]

434+,Table ("",[],[]) (Caption Nothing

435+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

436+ [Row ("",[],[])

437+ [Cell ("",[],[]) Nothing 1 1

438+ [Plain [Str "X"]]

439+ ,Cell ("",[],[]) Nothing 1 1

440+ [Plain [Str "Y"]]

441+ ,Cell ("",[],[]) Nothing 1 1

442+ [Plain [Str "Z"]]]]

443+ [Row ("",[],[])

444+ [Cell ("",[],[]) Nothing 1 1

445+ [Plain [Str "1"]]

446+ ,Cell ("",[],[]) Nothing 1 1

447+ [Plain [Str "2"]]

448+ ,Cell ("",[],[]) Nothing 1 1

449+ [Plain [Str "3"]]]

450+ ,Row ("",[],[])

451+ [Cell ("",[],[]) Nothing 1 1

452+ [Plain [Str "4"]]

453+ ,Cell ("",[],[]) Nothing 1 1

454+ [Plain [Str "5"]]

455+ ,Cell ("",[],[]) Nothing 1 1

456+ [Plain [Str "6"]]]]

457+ []

388458,HorizontalRule

389−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

390− [[Plain [Str "X"]]

391− ,[Plain [Str "Y"]]

392− ,[Plain [Str "Z"]]]

393− [[[Plain [Str "1"]]

394− ,[Plain [Str "2"]]

395− ,[Plain [Str "3"]]]

396− ,[[Plain [Str "4"]]

397− ,[Plain [Str "5"]]

398− ,[Plain [Str "6"]]]]

459+,Table ("",[],[]) (Caption Nothing

460+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

461+ [Row ("",[],[])

462+ [Cell ("",[],[]) Nothing 1 1

463+ [Plain [Str "X"]]

464+ ,Cell ("",[],[]) Nothing 1 1

465+ [Plain [Str "Y"]]

466+ ,Cell ("",[],[]) Nothing 1 1

467+ [Plain [Str "Z"]]]]

468+ [Row ("",[],[])

469+ [Cell ("",[],[]) Nothing 1 1

470+ [Plain [Str "1"]]

471+ ,Cell ("",[],[]) Nothing 1 1

472+ [Plain [Str "2"]]

473+ ,Cell ("",[],[]) Nothing 1 1

474+ [Plain [Str "3"]]]

475+ ,Row ("",[],[])

476+ [Cell ("",[],[]) Nothing 1 1

477+ [Plain [Str "4"]]

478+ ,Cell ("",[],[]) Nothing 1 1

479+ [Plain [Str "5"]]

480+ ,Cell ("",[],[]) Nothing 1 1

481+ [Plain [Str "6"]]]]

482+ []

399483,HorizontalRule

400−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

401− [[Plain [Str "X"]]

402− ,[Plain [Str "Y"]]

403− ,[Plain [Str "Z"]]]

404− [[[Plain [Str "1"]]

405− ,[Plain [Str "2"]]

406− ,[Plain [Str "3"]]]

407− ,[[Plain [Str "4"]]

408− ,[Plain [Str "5"]]

409− ,[Plain [Str "6"]]]]

484+,Table ("",[],[]) (Caption Nothing

485+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

486+ [Row ("",[],[])

487+ [Cell ("",[],[]) Nothing 1 1

488+ [Plain [Str "X"]]

489+ ,Cell ("",[],[]) Nothing 1 1

490+ [Plain [Str "Y"]]

491+ ,Cell ("",[],[]) Nothing 1 1

492+ [Plain [Str "Z"]]]]

493+ [Row ("",[],[])

494+ [Cell ("",[],[]) Nothing 1 1

495+ [Plain [Str "1"]]

496+ ,Cell ("",[],[]) Nothing 1 1

497+ [Plain [Str "2"]]

498+ ,Cell ("",[],[]) Nothing 1 1

499+ [Plain [Str "3"]]]

500+ ,Row ("",[],[])

501+ [Cell ("",[],[]) Nothing 1 1

502+ [Plain [Str "4"]]

503+ ,Cell ("",[],[]) Nothing 1 1

504+ [Plain [Str "5"]]

505+ ,Cell ("",[],[]) Nothing 1 1

506+ [Plain [Str "6"]]]]

507+ []

410508,HorizontalRule

411−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

412− [[Plain [Str "X"]]

413− ,[Plain [Str "Y"]]

414− ,[Plain [Str "Z"]]]

415− [[[Plain [Str "1"]]

416− ,[Plain [Str "2"]]

417− ,[Plain [Str "3"]]]

418− ,[[Plain [Str "4"]]

419− ,[Plain [Str "5"]]

420− ,[Plain [Str "6"]]]]

509+,Table ("",[],[]) (Caption Nothing

510+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

511+ [Row ("",[],[])

512+ [Cell ("",[],[]) Nothing 1 1

513+ [Plain [Str "X"]]

514+ ,Cell ("",[],[]) Nothing 1 1

515+ [Plain [Str "Y"]]

516+ ,Cell ("",[],[]) Nothing 1 1

517+ [Plain [Str "Z"]]]]

518+ [Row ("",[],[])

519+ [Cell ("",[],[]) Nothing 1 1

520+ [Plain [Str "1"]]

521+ ,Cell ("",[],[]) Nothing 1 1

522+ [Plain [Str "2"]]

523+ ,Cell ("",[],[]) Nothing 1 1

524+ [Plain [Str "3"]]]

525+ ,Row ("",[],[])

526+ [Cell ("",[],[]) Nothing 1 1

527+ [Plain [Str "4"]]

528+ ,Cell ("",[],[]) Nothing 1 1

529+ [Plain [Str "5"]]

530+ ,Cell ("",[],[]) Nothing 1 1

531+ [Plain [Str "6"]]]]

532+ []

421533,HorizontalRule

422−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

423− [[Plain [Str "X"]]

424− ,[Plain [Str "Y"]]

425− ,[Plain [Str "Z"]]]

426− [[[Plain [Str "1"]]

427− ,[Para [Str "2"]]

428− ,[Plain [Str "3"]]]

429− ,[[Plain [Str "4"]]

430− ,[Plain [Str "5"]]

431− ,[Plain [Str "6"]]]]

534+,Table ("",[],[]) (Caption Nothing

535+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

536+ [Row ("",[],[])

537+ [Cell ("",[],[]) Nothing 1 1

538+ [Plain [Str "X"]]

539+ ,Cell ("",[],[]) Nothing 1 1

540+ [Plain [Str "Y"]]

541+ ,Cell ("",[],[]) Nothing 1 1

542+ [Plain [Str "Z"]]]]

543+ [Row ("",[],[])

544+ [Cell ("",[],[]) Nothing 1 1

545+ [Plain [Str "1"]]

546+ ,Cell ("",[],[]) Nothing 1 1

547+ [Para [Str "2"]]

548+ ,Cell ("",[],[]) Nothing 1 1

549+ [Plain [Str "3"]]]

550+ ,Row ("",[],[])

551+ [Cell ("",[],[]) Nothing 1 1

552+ [Plain [Str "4"]]

553+ ,Cell ("",[],[]) Nothing 1 1

554+ [Plain [Str "5"]]

555+ ,Cell ("",[],[]) Nothing 1 1

556+ [Plain [Str "6"]]]]

557+ []

432558,Header 2 ("tables-without-headers",[],[]) [Str "Tables",Space,Str "without",Space,Str "Headers"]

433−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

434− [[]

435− ,[]

436− ,[]]

437− [[[Plain [Str "1"]]

438− ,[Plain [Str "2"]]

439− ,[Plain [Str "3"]]]

440− ,[[Plain [Str "4"]]

441− ,[Plain [Str "5"]]

442− ,[Plain [Str "6"]]]]

559+,Table ("",[],[]) (Caption Nothing

560+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

561+ [Row ("",[],[])

562+ [Cell ("",[],[]) Nothing 1 1

563+ []

564+ ,Cell ("",[],[]) Nothing 1 1

565+ []

566+ ,Cell ("",[],[]) Nothing 1 1

567+ []]]

568+ [Row ("",[],[])

569+ [Cell ("",[],[]) Nothing 1 1

570+ [Plain [Str "1"]]

571+ ,Cell ("",[],[]) Nothing 1 1

572+ [Plain [Str "2"]]

573+ ,Cell ("",[],[]) Nothing 1 1

574+ [Plain [Str "3"]]]

575+ ,Row ("",[],[])

576+ [Cell ("",[],[]) Nothing 1 1

577+ [Plain [Str "4"]]

578+ ,Cell ("",[],[]) Nothing 1 1

579+ [Plain [Str "5"]]

580+ ,Cell ("",[],[]) Nothing 1 1

581+ [Plain [Str "6"]]]]

582+ []

443583,HorizontalRule

444−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

445− [[]

446− ,[]

447− ,[]]

448− [[[Plain [Str "1"]]

449− ,[Plain [Str "2"]]

450− ,[Plain [Str "3"]]]

451− ,[[Plain [Str "4"]]

452− ,[Plain [Str "5"]]

453− ,[Plain [Str "6"]]]]

584+,Table ("",[],[]) (Caption Nothing

585+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

586+ [Row ("",[],[])

587+ [Cell ("",[],[]) Nothing 1 1

588+ []

589+ ,Cell ("",[],[]) Nothing 1 1

590+ []

591+ ,Cell ("",[],[]) Nothing 1 1

592+ []]]

593+ [Row ("",[],[])

594+ [Cell ("",[],[]) Nothing 1 1

595+ [Plain [Str "1"]]

596+ ,Cell ("",[],[]) Nothing 1 1

597+ [Plain [Str "2"]]

598+ ,Cell ("",[],[]) Nothing 1 1

599+ [Plain [Str "3"]]]

600+ ,Row ("",[],[])

601+ [Cell ("",[],[]) Nothing 1 1

602+ [Plain [Str "4"]]

603+ ,Cell ("",[],[]) Nothing 1 1

604+ [Plain [Str "5"]]

605+ ,Cell ("",[],[]) Nothing 1 1

606+ [Plain [Str "6"]]]]

607+ []

454608,HorizontalRule

455−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

456− [[]

457− ,[]

458− ,[]]

459− [[[Plain [Str "1"]]

460− ,[Plain [Str "2"]]

461− ,[Plain [Str "3"]]]

462− ,[[Plain [Str "4"]]

463− ,[Plain [Str "5"]]

464− ,[Plain [Str "6"]]]]

609+,Table ("",[],[]) (Caption Nothing

610+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

611+ [Row ("",[],[])

612+ [Cell ("",[],[]) Nothing 1 1

613+ []

614+ ,Cell ("",[],[]) Nothing 1 1

615+ []

616+ ,Cell ("",[],[]) Nothing 1 1

617+ []]]

618+ [Row ("",[],[])

619+ [Cell ("",[],[]) Nothing 1 1

620+ [Plain [Str "1"]]

621+ ,Cell ("",[],[]) Nothing 1 1

622+ [Plain [Str "2"]]

623+ ,Cell ("",[],[]) Nothing 1 1

624+ [Plain [Str "3"]]]

625+ ,Row ("",[],[])

626+ [Cell ("",[],[]) Nothing 1 1

627+ [Plain [Str "4"]]

628+ ,Cell ("",[],[]) Nothing 1 1

629+ [Plain [Str "5"]]

630+ ,Cell ("",[],[]) Nothing 1 1

631+ [Plain [Str "6"]]]]

632+ []

465633,HorizontalRule

466−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

467− [[]

468− ,[]

469− ,[]]

470− [[[Plain [Str "1"]]

471− ,[Plain [Str "2"]]

472− ,[Plain [Str "3"]]]

473− ,[[Plain [Str "4"]]

474− ,[Plain [Str "5"]]

475− ,[Plain [Str "6"]]]]

634+,Table ("",[],[]) (Caption Nothing

635+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

636+ [Row ("",[],[])

637+ [Cell ("",[],[]) Nothing 1 1

638+ []

639+ ,Cell ("",[],[]) Nothing 1 1

640+ []

641+ ,Cell ("",[],[]) Nothing 1 1

642+ []]]

643+ [Row ("",[],[])

644+ [Cell ("",[],[]) Nothing 1 1

645+ [Plain [Str "1"]]

646+ ,Cell ("",[],[]) Nothing 1 1

647+ [Plain [Str "2"]]

648+ ,Cell ("",[],[]) Nothing 1 1

649+ [Plain [Str "3"]]]

650+ ,Row ("",[],[])

651+ [Cell ("",[],[]) Nothing 1 1

652+ [Plain [Str "4"]]

653+ ,Cell ("",[],[]) Nothing 1 1

654+ [Plain [Str "5"]]

655+ ,Cell ("",[],[]) Nothing 1 1

656+ [Plain [Str "6"]]]]

657+ []

476658,Header 2 ("empty-tables",[],[]) [Str "Empty",Space,Str "Tables"]

477659,Para [Str "This",Space,Str "section",Space,Str "should",Space,Str "be",Space,Str "empty."]]

test/jats-reader.native+312−130

@@ -287,136 +287,318 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Spa

287287,Para [Emph [Str "Trailing",Space,Str "spaces"],Space,Str "text"]

288288,Header 1 ("tables",[],[]) [Str "Tables"]

289289,Header 2 ("tables-with-headers",[],[]) [Str "Tables",Space,Str "with",Space,Str "Headers"]

290−,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]

291− [[Para [Str "X"]]

292− ,[Para [Str "Y"]]

293− ,[Para [Str "Z"]]]

294− [[[Para [Str "1"]]

295− ,[Para [Str "2"]]

296− ,[Para [Str "3"]]]

297− ,[[Para [Str "4"]]

298− ,[Para [Str "5"]]

299− ,[Para [Str "6"]]]]

300−,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]

301− [[Para [Str "X"]]

302− ,[Para [Str "Y"]]

303− ,[Para [Str "Z"]]]

304− [[[Para [Str "1"]]

305− ,[Para [Str "2"]]

306− ,[Para [Str "3"]]]

307− ,[[Para [Str "4"]]

308− ,[Para [Str "5"]]

309− ,[Para [Str "6"]]]]

310−,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]

311− [[Para [Str "X"]]

312− ,[Para [Str "Y"]]

313− ,[Para [Str "Z"]]]

314− [[[Para [Str "1"]]

315− ,[Para [Str "2"]]

316− ,[Para [Str "3"]]]

317− ,[[Para [Str "4"]]

318− ,[Para [Str "5"]]

319− ,[Para [Str "6"]]]]

320−,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]

321− [[Para [Str "X"]]

322− ,[Para [Str "Y"]]

323− ,[Para [Str "Z"]]]

324− [[[Para [Str "1"]]

325− ,[Para [Str "2"]]

326− ,[Para [Str "3"]]]

327− ,[[Para [Str "4"]]

328− ,[Para [Str "5"]]

329− ,[Para [Str "6"]]]]

330−,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]

331− [[Para [Str "X"]]

332− ,[Para [Str "Y"]]

333− ,[Para [Str "Z"]]]

334− [[[Para [Str "1"]]

335− ,[Para [Str "2"]]

336− ,[Para [Str "3"]]]

337− ,[[Para [Str "4"]]

338− ,[Para [Str "5"]]

339− ,[Para [Str "6"]]]]

340−,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]

341− [[Para [Str "X"]]

342− ,[Para [Str "Y"]]

343− ,[Para [Str "Z"]]]

344− [[[Para [Str "1"]]

345− ,[Para [Str "2"]]

346− ,[Para [Str "3"]]]

347− ,[[Para [Str "4"]]

348− ,[Para [Str "5"]]

349− ,[Para [Str "6"]]]]

350−,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]

351− [[Para [Str "X"]]

352− ,[Para [Str "Y"]]

353− ,[Para [Str "Z"]]]

354− [[[Para [Str "1"]]

355− ,[Para [Str "2"]]

356− ,[Para [Str "3"]]]

357− ,[[Para [Str "4"]]

358− ,[Para [Str "5"]]

359− ,[Para [Str "6"]]]]

360−,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]

361− [[Para [Str "X"]]

362− ,[Para [Str "Y"]]

363− ,[Para [Str "Z"]]]

364− [[[Para [Str "1"]]

365− ,[Para [Str "2"]]

366− ,[Para [Str "3"]]]

367− ,[[Para [Str "4"]]

368− ,[Para [Str "5"]]

369− ,[Para [Str "6"]]]]

370−,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]

371− [[Para [Str "X"]]

372− ,[Para [Str "Y"]]

373− ,[Para [Str "Z"]]]

374− [[[Para [Str "1"]]

375− ,[Para [Str "2"]]

376− ,[Para [Str "3"]]]

377− ,[[Para [Str "4"]]

378− ,[Para [Str "5"]]

379− ,[Para [Str "6"]]]]

290+,Table ("",[],[]) (Caption Nothing

291+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

292+ [Row ("",[],[])

293+ [Cell ("",[],[]) Nothing 1 1

294+ [Para [Str "X"]]

295+ ,Cell ("",[],[]) Nothing 1 1

296+ [Para [Str "Y"]]

297+ ,Cell ("",[],[]) Nothing 1 1

298+ [Para [Str "Z"]]]]

299+ [Row ("",[],[])

300+ [Cell ("",[],[]) Nothing 1 1

301+ [Para [Str "1"]]

302+ ,Cell ("",[],[]) Nothing 1 1

303+ [Para [Str "2"]]

304+ ,Cell ("",[],[]) Nothing 1 1

305+ [Para [Str "3"]]]

306+ ,Row ("",[],[])

307+ [Cell ("",[],[]) Nothing 1 1

308+ [Para [Str "4"]]

309+ ,Cell ("",[],[]) Nothing 1 1

310+ [Para [Str "5"]]

311+ ,Cell ("",[],[]) Nothing 1 1

312+ [Para [Str "6"]]]]

313+ []

314+,Table ("",[],[]) (Caption Nothing

315+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

316+ [Row ("",[],[])

317+ [Cell ("",[],[]) Nothing 1 1

318+ [Para [Str "X"]]

319+ ,Cell ("",[],[]) Nothing 1 1

320+ [Para [Str "Y"]]

321+ ,Cell ("",[],[]) Nothing 1 1

322+ [Para [Str "Z"]]]]

323+ [Row ("",[],[])

324+ [Cell ("",[],[]) Nothing 1 1

325+ [Para [Str "1"]]

326+ ,Cell ("",[],[]) Nothing 1 1

327+ [Para [Str "2"]]

328+ ,Cell ("",[],[]) Nothing 1 1

329+ [Para [Str "3"]]]

330+ ,Row ("",[],[])

331+ [Cell ("",[],[]) Nothing 1 1

332+ [Para [Str "4"]]

333+ ,Cell ("",[],[]) Nothing 1 1

334+ [Para [Str "5"]]

335+ ,Cell ("",[],[]) Nothing 1 1

336+ [Para [Str "6"]]]]

337+ []

338+,Table ("",[],[]) (Caption Nothing

339+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

340+ [Row ("",[],[])

341+ [Cell ("",[],[]) Nothing 1 1

342+ [Para [Str "X"]]

343+ ,Cell ("",[],[]) Nothing 1 1

344+ [Para [Str "Y"]]

345+ ,Cell ("",[],[]) Nothing 1 1

346+ [Para [Str "Z"]]]]

347+ [Row ("",[],[])

348+ [Cell ("",[],[]) Nothing 1 1

349+ [Para [Str "1"]]

350+ ,Cell ("",[],[]) Nothing 1 1

351+ [Para [Str "2"]]

352+ ,Cell ("",[],[]) Nothing 1 1

353+ [Para [Str "3"]]]

354+ ,Row ("",[],[])

355+ [Cell ("",[],[]) Nothing 1 1

356+ [Para [Str "4"]]

357+ ,Cell ("",[],[]) Nothing 1 1

358+ [Para [Str "5"]]

359+ ,Cell ("",[],[]) Nothing 1 1

360+ [Para [Str "6"]]]]

361+ []

362+,Table ("",[],[]) (Caption Nothing

363+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

364+ [Row ("",[],[])

365+ [Cell ("",[],[]) Nothing 1 1

366+ [Para [Str "X"]]

367+ ,Cell ("",[],[]) Nothing 1 1

368+ [Para [Str "Y"]]

369+ ,Cell ("",[],[]) Nothing 1 1

370+ [Para [Str "Z"]]]]

371+ [Row ("",[],[])

372+ [Cell ("",[],[]) Nothing 1 1

373+ [Para [Str "1"]]

374+ ,Cell ("",[],[]) Nothing 1 1

375+ [Para [Str "2"]]

376+ ,Cell ("",[],[]) Nothing 1 1

377+ [Para [Str "3"]]]

378+ ,Row ("",[],[])

379+ [Cell ("",[],[]) Nothing 1 1

380+ [Para [Str "4"]]

381+ ,Cell ("",[],[]) Nothing 1 1

382+ [Para [Str "5"]]

383+ ,Cell ("",[],[]) Nothing 1 1

384+ [Para [Str "6"]]]]

385+ []

386+,Table ("",[],[]) (Caption Nothing

387+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

388+ [Row ("",[],[])

389+ [Cell ("",[],[]) Nothing 1 1

390+ [Para [Str "X"]]

391+ ,Cell ("",[],[]) Nothing 1 1

392+ [Para [Str "Y"]]

393+ ,Cell ("",[],[]) Nothing 1 1

394+ [Para [Str "Z"]]]]

395+ [Row ("",[],[])

396+ [Cell ("",[],[]) Nothing 1 1

397+ [Para [Str "1"]]

398+ ,Cell ("",[],[]) Nothing 1 1

399+ [Para [Str "2"]]

400+ ,Cell ("",[],[]) Nothing 1 1

401+ [Para [Str "3"]]]

402+ ,Row ("",[],[])

403+ [Cell ("",[],[]) Nothing 1 1

404+ [Para [Str "4"]]

405+ ,Cell ("",[],[]) Nothing 1 1

406+ [Para [Str "5"]]

407+ ,Cell ("",[],[]) Nothing 1 1

408+ [Para [Str "6"]]]]

409+ []

410+,Table ("",[],[]) (Caption Nothing

411+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

412+ [Row ("",[],[])

413+ [Cell ("",[],[]) Nothing 1 1

414+ [Para [Str "X"]]

415+ ,Cell ("",[],[]) Nothing 1 1

416+ [Para [Str "Y"]]

417+ ,Cell ("",[],[]) Nothing 1 1

418+ [Para [Str "Z"]]]]

419+ [Row ("",[],[])

420+ [Cell ("",[],[]) Nothing 1 1

421+ [Para [Str "1"]]

422+ ,Cell ("",[],[]) Nothing 1 1

423+ [Para [Str "2"]]

424+ ,Cell ("",[],[]) Nothing 1 1

425+ [Para [Str "3"]]]

426+ ,Row ("",[],[])

427+ [Cell ("",[],[]) Nothing 1 1

428+ [Para [Str "4"]]

429+ ,Cell ("",[],[]) Nothing 1 1

430+ [Para [Str "5"]]

431+ ,Cell ("",[],[]) Nothing 1 1

432+ [Para [Str "6"]]]]

433+ []

434+,Table ("",[],[]) (Caption Nothing

435+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

436+ [Row ("",[],[])

437+ [Cell ("",[],[]) Nothing 1 1

438+ [Para [Str "X"]]

439+ ,Cell ("",[],[]) Nothing 1 1

440+ [Para [Str "Y"]]

441+ ,Cell ("",[],[]) Nothing 1 1

442+ [Para [Str "Z"]]]]

443+ [Row ("",[],[])

444+ [Cell ("",[],[]) Nothing 1 1

445+ [Para [Str "1"]]

446+ ,Cell ("",[],[]) Nothing 1 1

447+ [Para [Str "2"]]

448+ ,Cell ("",[],[]) Nothing 1 1

449+ [Para [Str "3"]]]

450+ ,Row ("",[],[])

451+ [Cell ("",[],[]) Nothing 1 1

452+ [Para [Str "4"]]

453+ ,Cell ("",[],[]) Nothing 1 1

454+ [Para [Str "5"]]

455+ ,Cell ("",[],[]) Nothing 1 1

456+ [Para [Str "6"]]]]

457+ []

458+,Table ("",[],[]) (Caption Nothing

459+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

460+ [Row ("",[],[])

461+ [Cell ("",[],[]) Nothing 1 1

462+ [Para [Str "X"]]

463+ ,Cell ("",[],[]) Nothing 1 1

464+ [Para [Str "Y"]]

465+ ,Cell ("",[],[]) Nothing 1 1

466+ [Para [Str "Z"]]]]

467+ [Row ("",[],[])

468+ [Cell ("",[],[]) Nothing 1 1

469+ [Para [Str "1"]]

470+ ,Cell ("",[],[]) Nothing 1 1

471+ [Para [Str "2"]]

472+ ,Cell ("",[],[]) Nothing 1 1

473+ [Para [Str "3"]]]

474+ ,Row ("",[],[])

475+ [Cell ("",[],[]) Nothing 1 1

476+ [Para [Str "4"]]

477+ ,Cell ("",[],[]) Nothing 1 1

478+ [Para [Str "5"]]

479+ ,Cell ("",[],[]) Nothing 1 1

480+ [Para [Str "6"]]]]

481+ []

482+,Table ("",[],[]) (Caption Nothing

483+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

484+ [Row ("",[],[])

485+ [Cell ("",[],[]) Nothing 1 1

486+ [Para [Str "X"]]

487+ ,Cell ("",[],[]) Nothing 1 1

488+ [Para [Str "Y"]]

489+ ,Cell ("",[],[]) Nothing 1 1

490+ [Para [Str "Z"]]]]

491+ [Row ("",[],[])

492+ [Cell ("",[],[]) Nothing 1 1

493+ [Para [Str "1"]]

494+ ,Cell ("",[],[]) Nothing 1 1

495+ [Para [Str "2"]]

496+ ,Cell ("",[],[]) Nothing 1 1

497+ [Para [Str "3"]]]

498+ ,Row ("",[],[])

499+ [Cell ("",[],[]) Nothing 1 1

500+ [Para [Str "4"]]

501+ ,Cell ("",[],[]) Nothing 1 1

502+ [Para [Str "5"]]

503+ ,Cell ("",[],[]) Nothing 1 1

504+ [Para [Str "6"]]]]

505+ []

380506,Header 2 ("tables-without-headers",[],[]) [Str "Tables",Space,Str "without",Space,Str "Headers"]

381−,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]

382− [[]

383− ,[]

384− ,[]]

385− [[[Para [Str "1"]]

386− ,[Para [Str "2"]]

387− ,[Para [Str "3"]]]

388− ,[[Para [Str "4"]]

389− ,[Para [Str "5"]]

390− ,[Para [Str "6"]]]]

391−,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]

392− [[]

393− ,[]

394− ,[]]

395− [[[Para [Str "1"]]

396− ,[Para [Str "2"]]

397− ,[Para [Str "3"]]]

398− ,[[Para [Str "4"]]

399− ,[Para [Str "5"]]

400− ,[Para [Str "6"]]]]

401−,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]

402− [[]

403− ,[]

404− ,[]]

405− [[[Para [Str "1"]]

406− ,[Para [Str "2"]]

407− ,[Para [Str "3"]]]

408− ,[[Para [Str "4"]]

409− ,[Para [Str "5"]]

410− ,[Para [Str "6"]]]]

411−,Table [] [AlignLeft,AlignLeft,AlignLeft] [0.0,0.0,0.0]

412− [[]

413− ,[]

414− ,[]]

415− [[[Para [Str "1"]]

416− ,[Para [Str "2"]]

417− ,[Para [Str "3"]]]

418− ,[[Para [Str "4"]]

419− ,[Para [Str "5"]]

420− ,[Para [Str "6"]]]]

507+,Table ("",[],[]) (Caption Nothing

508+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

509+ [Row ("",[],[])

510+ [Cell ("",[],[]) Nothing 1 1

511+ []

512+ ,Cell ("",[],[]) Nothing 1 1

513+ []

514+ ,Cell ("",[],[]) Nothing 1 1

515+ []]]

516+ [Row ("",[],[])

517+ [Cell ("",[],[]) Nothing 1 1

518+ [Para [Str "1"]]

519+ ,Cell ("",[],[]) Nothing 1 1

520+ [Para [Str "2"]]

521+ ,Cell ("",[],[]) Nothing 1 1

522+ [Para [Str "3"]]]

523+ ,Row ("",[],[])

524+ [Cell ("",[],[]) Nothing 1 1

525+ [Para [Str "4"]]

526+ ,Cell ("",[],[]) Nothing 1 1

527+ [Para [Str "5"]]

528+ ,Cell ("",[],[]) Nothing 1 1

529+ [Para [Str "6"]]]]

530+ []

531+,Table ("",[],[]) (Caption Nothing

532+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

533+ [Row ("",[],[])

534+ [Cell ("",[],[]) Nothing 1 1

535+ []

536+ ,Cell ("",[],[]) Nothing 1 1

537+ []

538+ ,Cell ("",[],[]) Nothing 1 1

539+ []]]

540+ [Row ("",[],[])

541+ [Cell ("",[],[]) Nothing 1 1

542+ [Para [Str "1"]]

543+ ,Cell ("",[],[]) Nothing 1 1

544+ [Para [Str "2"]]

545+ ,Cell ("",[],[]) Nothing 1 1

546+ [Para [Str "3"]]]

547+ ,Row ("",[],[])

548+ [Cell ("",[],[]) Nothing 1 1

549+ [Para [Str "4"]]

550+ ,Cell ("",[],[]) Nothing 1 1

551+ [Para [Str "5"]]

552+ ,Cell ("",[],[]) Nothing 1 1

553+ [Para [Str "6"]]]]

554+ []

555+,Table ("",[],[]) (Caption Nothing

556+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

557+ [Row ("",[],[])

558+ [Cell ("",[],[]) Nothing 1 1

559+ []

560+ ,Cell ("",[],[]) Nothing 1 1

561+ []

562+ ,Cell ("",[],[]) Nothing 1 1

563+ []]]

564+ [Row ("",[],[])

565+ [Cell ("",[],[]) Nothing 1 1

566+ [Para [Str "1"]]

567+ ,Cell ("",[],[]) Nothing 1 1

568+ [Para [Str "2"]]

569+ ,Cell ("",[],[]) Nothing 1 1

570+ [Para [Str "3"]]]

571+ ,Row ("",[],[])

572+ [Cell ("",[],[]) Nothing 1 1

573+ [Para [Str "4"]]

574+ ,Cell ("",[],[]) Nothing 1 1

575+ [Para [Str "5"]]

576+ ,Cell ("",[],[]) Nothing 1 1

577+ [Para [Str "6"]]]]

578+ []

579+,Table ("",[],[]) (Caption Nothing

580+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

581+ [Row ("",[],[])

582+ [Cell ("",[],[]) Nothing 1 1

583+ []

584+ ,Cell ("",[],[]) Nothing 1 1

585+ []

586+ ,Cell ("",[],[]) Nothing 1 1

587+ []]]

588+ [Row ("",[],[])

589+ [Cell ("",[],[]) Nothing 1 1

590+ [Para [Str "1"]]

591+ ,Cell ("",[],[]) Nothing 1 1

592+ [Para [Str "2"]]

593+ ,Cell ("",[],[]) Nothing 1 1

594+ [Para [Str "3"]]]

595+ ,Row ("",[],[])

596+ [Cell ("",[],[]) Nothing 1 1

597+ [Para [Str "4"]]

598+ ,Cell ("",[],[]) Nothing 1 1

599+ [Para [Str "5"]]

600+ ,Cell ("",[],[]) Nothing 1 1

601+ [Para [Str "6"]]]]

602+ []

421603,Header 2 ("empty-tables",[],[]) [Str "Empty",Space,Str "Tables"]

422604,Para [Str "This",Space,Str "section",Space,Str "should",Space,Str "be",Space,Str "empty."]]

test/latex-reader.native+30−11

@@ -275,18 +275,37 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Spa

275275 ,[Para [Str "$22,000",Space,Str "is",Space,Str "a",Space,Emph [Str "lot"],Space,Str "of",Space,Str "money.",Space,Str "So",Space,Str "is",Space,Str "$34,000.",Space,Str "(It",Space,Str "worked",Space,Str "if",SoftBreak,Quoted DoubleQuote [Str "lot"],Space,Str "is",Space,Str "emphasized.)"]]

276276 ,[Para [Str "Escaped",Space,Code ("",[],[]) "$",Str ":",Space,Str "$73",Space,Emph [Str "this",Space,Str "should",Space,Str "be",Space,Str "emphasized"],Space,Str "23$."]]]

277277,Para [Str "Here\8217s",Space,Str "a",Space,Str "LaTeX",Space,Str "table:"]

278−,Table [] [AlignLeft,AlignLeft] [0.0,0.0]

279− [[Plain [Str "Animal"]]

280− ,[Plain [Str "Number"]]]

281− [[[Plain [Str "Dog"]]

282− ,[Plain [Str "2"]]]

283− ,[[Plain [Str "Cat"]]

284− ,[Plain [Str "1"]]]]

278+,Table ("",[],[]) (Caption Nothing

279+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

280+ [Row ("",[],[])

281+ [Cell ("",[],[]) Nothing 1 1

282+ [Plain [Str "Animal"]]

283+ ,Cell ("",[],[]) Nothing 1 1

284+ [Plain [Str "Number"]]]]

285+ [Row ("",[],[])

286+ [Cell ("",[],[]) Nothing 1 1

287+ [Plain [Str "Dog"]]

288+ ,Cell ("",[],[]) Nothing 1 1

289+ [Plain [Str "2"]]]

290+ ,Row ("",[],[])

291+ [Cell ("",[],[]) Nothing 1 1

292+ [Plain [Str "Cat"]]

293+ ,Cell ("",[],[]) Nothing 1 1

294+ [Plain [Str "1"]]]]

295+ []

285296,Para [Str "A",Space,Str "table",Space,Str "with",Space,Str "one",Space,Str "column:"]

286−,Table [] [AlignCenter] [0.0]

287− [[]]

288− [[[Plain [Str "Animal"]]]

289− ,[[Plain [Str "Vegetable"]]]]

297+,Table ("",[],[]) (Caption Nothing

298+ []) [(AlignCenter,Nothing)] 0

299+ [Row ("",[],[])

300+ [Cell ("",[],[]) Nothing 1 1

301+ []]]

302+ [Row ("",[],[])

303+ [Cell ("",[],[]) Nothing 1 1

304+ [Plain [Str "Animal"]]]

305+ ,Row ("",[],[])

306+ [Cell ("",[],[]) Nothing 1 1

307+ [Plain [Str "Vegetable"]]]]

308+ []

290309,HorizontalRule

291310,Header 1 ("special-characters",[],[]) [Str "Special",Space,Str "Characters"]

292311,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "unicode:"]

test/man-reader.native+165−71

@@ -105,76 +105,170 @@ Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "Oct",Space,Str "17,",

105105,Header 1 ("",[],[]) [Str "Macros"]

106106,Para [Strong [Str "Me",Space,Str "Myself"],Space,Str "and",Space,Str "I.",Space,Emph [Str "The",Space,Str "author",Space,Str "is",Space,Str "John",Space,Str "Jones."],Space,Str "It's",Space,Str "The",Space,Strong [Str "Author"],Str "."]

107107,Header 1 ("",[],[]) [Str "Tables"]

108−,Table [] [AlignRight,AlignLeft,AlignCenter,AlignLeft] [0.0,0.0,0.0,0.0]

109− [[Plain [Str "Right"]]

110− ,[Plain [Str "Left"]]

111− ,[Plain [Str "Center"]]

112− ,[Plain [Str "Default"]]]

113− [[[Plain [Str "12"]]

114− ,[Plain [Str "12"]]

115− ,[Plain [Str "12"]]

116− ,[Plain [Str "12"]]]

117− ,[[Plain [Str "123"]]

118− ,[Plain [Str "123"]]

119− ,[Plain [Str "123"]]

120− ,[Plain [Str "123"]]]

121− ,[[Plain [Str "1"]]

122− ,[Plain [Str "1"]]

123− ,[Plain [Str "1"]]

124− ,[Plain [Str "1"]]]]

125−,Table [] [AlignRight,AlignLeft,AlignCenter,AlignLeft] [0.0,0.0,0.0,0.0]

126− [[Plain [Str "Right"]]

127− ,[Plain [Str "Left"]]

128− ,[Plain [Str "Center"]]

129− ,[Plain [Str "Left",Space,Emph [Str "more"]]]]

130− [[[Plain [Str "12"]]

131− ,[Plain [Str "12"]]

132− ,[Plain [Str "12"]]

133− ,[Plain [Str "12"]]]

134− ,[[Plain [Str "123"]]

135− ,[Plain [Str "123"]]

136− ,[Plain [Str "123"]]

137− ,[Plain [Str "123"]]]

138− ,[[Plain [Str "1"]]

139− ,[Plain [Str "1"]]

140− ,[Plain [Str "1"]]

141− ,[Plain [Str "1"]]]]

142−,Table [] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.0,0.0,0.0,0.0]

143− [[Plain [Str "Centered",Space,Str "Header"]]

144− ,[Plain [Str "Left",Space,Str "Aligned"]]

145− ,[Plain [Str "Right",Space,Str "Aligned"]]

146− ,[Plain [Str "Default",Space,Str "aligned"]]]

147− [[[Plain [Str "First"]]

148− ,[Plain [Str "row"]]

149− ,[Plain [Str "12.0"]]

150− ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]]

151− ,[[Plain [Str "Second"]]

152− ,[Plain [Str "row"]]

153− ,[Plain [Str "5.0"]]

154− ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]

108+,Table ("",[],[]) (Caption Nothing

109+ []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Nothing)] 0

110+ [Row ("",[],[])

111+ [Cell ("",[],[]) Nothing 1 1

112+ [Plain [Str "Right"]]

113+ ,Cell ("",[],[]) Nothing 1 1

114+ [Plain [Str "Left"]]

115+ ,Cell ("",[],[]) Nothing 1 1

116+ [Plain [Str "Center"]]

117+ ,Cell ("",[],[]) Nothing 1 1

118+ [Plain [Str "Default"]]]]

119+ [Row ("",[],[])

120+ [Cell ("",[],[]) Nothing 1 1

121+ [Plain [Str "12"]]

122+ ,Cell ("",[],[]) Nothing 1 1

123+ [Plain [Str "12"]]

124+ ,Cell ("",[],[]) Nothing 1 1

125+ [Plain [Str "12"]]

126+ ,Cell ("",[],[]) Nothing 1 1

127+ [Plain [Str "12"]]]

128+ ,Row ("",[],[])

129+ [Cell ("",[],[]) Nothing 1 1

130+ [Plain [Str "123"]]

131+ ,Cell ("",[],[]) Nothing 1 1

132+ [Plain [Str "123"]]

133+ ,Cell ("",[],[]) Nothing 1 1

134+ [Plain [Str "123"]]

135+ ,Cell ("",[],[]) Nothing 1 1

136+ [Plain [Str "123"]]]

137+ ,Row ("",[],[])

138+ [Cell ("",[],[]) Nothing 1 1

139+ [Plain [Str "1"]]

140+ ,Cell ("",[],[]) Nothing 1 1

141+ [Plain [Str "1"]]

142+ ,Cell ("",[],[]) Nothing 1 1

143+ [Plain [Str "1"]]

144+ ,Cell ("",[],[]) Nothing 1 1

145+ [Plain [Str "1"]]]]

146+ []

147+,Table ("",[],[]) (Caption Nothing

148+ []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Nothing)] 0

149+ [Row ("",[],[])

150+ [Cell ("",[],[]) Nothing 1 1

151+ [Plain [Str "Right"]]

152+ ,Cell ("",[],[]) Nothing 1 1

153+ [Plain [Str "Left"]]

154+ ,Cell ("",[],[]) Nothing 1 1

155+ [Plain [Str "Center"]]

156+ ,Cell ("",[],[]) Nothing 1 1

157+ [Plain [Str "Left",Space,Emph [Str "more"]]]]]

158+ [Row ("",[],[])

159+ [Cell ("",[],[]) Nothing 1 1

160+ [Plain [Str "12"]]

161+ ,Cell ("",[],[]) Nothing 1 1

162+ [Plain [Str "12"]]

163+ ,Cell ("",[],[]) Nothing 1 1

164+ [Plain [Str "12"]]

165+ ,Cell ("",[],[]) Nothing 1 1

166+ [Plain [Str "12"]]]

167+ ,Row ("",[],[])

168+ [Cell ("",[],[]) Nothing 1 1

169+ [Plain [Str "123"]]

170+ ,Cell ("",[],[]) Nothing 1 1

171+ [Plain [Str "123"]]

172+ ,Cell ("",[],[]) Nothing 1 1

173+ [Plain [Str "123"]]

174+ ,Cell ("",[],[]) Nothing 1 1

175+ [Plain [Str "123"]]]

176+ ,Row ("",[],[])

177+ [Cell ("",[],[]) Nothing 1 1

178+ [Plain [Str "1"]]

179+ ,Cell ("",[],[]) Nothing 1 1

180+ [Plain [Str "1"]]

181+ ,Cell ("",[],[]) Nothing 1 1

182+ [Plain [Str "1"]]

183+ ,Cell ("",[],[]) Nothing 1 1

184+ [Plain [Str "1"]]]]

185+ []

186+,Table ("",[],[]) (Caption Nothing

187+ []) [(AlignCenter,Nothing),(AlignLeft,Nothing),(AlignRight,Nothing),(AlignLeft,Nothing)] 0

188+ [Row ("",[],[])

189+ [Cell ("",[],[]) Nothing 1 1

190+ [Plain [Str "Centered",Space,Str "Header"]]

191+ ,Cell ("",[],[]) Nothing 1 1

192+ [Plain [Str "Left",Space,Str "Aligned"]]

193+ ,Cell ("",[],[]) Nothing 1 1

194+ [Plain [Str "Right",Space,Str "Aligned"]]

195+ ,Cell ("",[],[]) Nothing 1 1

196+ [Plain [Str "Default",Space,Str "aligned"]]]]

197+ [Row ("",[],[])

198+ [Cell ("",[],[]) Nothing 1 1

199+ [Plain [Str "First"]]

200+ ,Cell ("",[],[]) Nothing 1 1

201+ [Plain [Str "row"]]

202+ ,Cell ("",[],[]) Nothing 1 1

203+ [Plain [Str "12.0"]]

204+ ,Cell ("",[],[]) Nothing 1 1

205+ [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]]

206+ ,Row ("",[],[])

207+ [Cell ("",[],[]) Nothing 1 1

208+ [Plain [Str "Second"]]

209+ ,Cell ("",[],[]) Nothing 1 1

210+ [Plain [Str "row"]]

211+ ,Cell ("",[],[]) Nothing 1 1

212+ [Plain [Str "5.0"]]

213+ ,Cell ("",[],[]) Nothing 1 1

214+ [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",Space,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]

215+ []

155216,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"]

156−,Table [] [AlignRight,AlignLeft,AlignCenter,AlignRight] [0.0,0.0,0.0,0.0]

157− [[]

158− ,[]

159− ,[]

160− ,[]]

161− [[[Plain [Str "12"]]

162− ,[Plain [Str "12"]]

163− ,[Plain [Str "12"]]

164− ,[Plain [Str "12"]]]

165− ,[[Plain [Str "123"]]

166− ,[Plain [Str "123"]]

167− ,[Plain [Str "123"]]

168− ,[Plain [Str "123"]]]

169− ,[[Plain [Str "1"]]

170− ,[Plain [Str "1"]]

171− ,[Plain [Str "1"]]

172− ,[Plain [Str "1"]]]]

173−,Table [] [AlignRight,AlignLeft] [0.5,0.5]

174− [[]

175− ,[]]

176− [[[Plain [Str "a"]]

177− ,[Plain [Str "b"]]]

178− ,[[Para [Str "one"]

217+,Table ("",[],[]) (Caption Nothing

218+ []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0

219+ [Row ("",[],[])

220+ [Cell ("",[],[]) Nothing 1 1

221+ []

222+ ,Cell ("",[],[]) Nothing 1 1

223+ []

224+ ,Cell ("",[],[]) Nothing 1 1

225+ []

226+ ,Cell ("",[],[]) Nothing 1 1

227+ []]]

228+ [Row ("",[],[])

229+ [Cell ("",[],[]) Nothing 1 1

230+ [Plain [Str "12"]]

231+ ,Cell ("",[],[]) Nothing 1 1

232+ [Plain [Str "12"]]

233+ ,Cell ("",[],[]) Nothing 1 1

234+ [Plain [Str "12"]]

235+ ,Cell ("",[],[]) Nothing 1 1

236+ [Plain [Str "12"]]]

237+ ,Row ("",[],[])

238+ [Cell ("",[],[]) Nothing 1 1

239+ [Plain [Str "123"]]

240+ ,Cell ("",[],[]) Nothing 1 1

241+ [Plain [Str "123"]]

242+ ,Cell ("",[],[]) Nothing 1 1

243+ [Plain [Str "123"]]

244+ ,Cell ("",[],[]) Nothing 1 1

245+ [Plain [Str "123"]]]

246+ ,Row ("",[],[])

247+ [Cell ("",[],[]) Nothing 1 1

248+ [Plain [Str "1"]]

249+ ,Cell ("",[],[]) Nothing 1 1

250+ [Plain [Str "1"]]

251+ ,Cell ("",[],[]) Nothing 1 1

252+ [Plain [Str "1"]]

253+ ,Cell ("",[],[]) Nothing 1 1

254+ [Plain [Str "1"]]]]

255+ []

256+,Table ("",[],[]) (Caption Nothing

257+ []) [(AlignRight,Just 0.5),(AlignLeft,Just 0.5)] 0

258+ [Row ("",[],[])

259+ [Cell ("",[],[]) Nothing 1 1

260+ []

261+ ,Cell ("",[],[]) Nothing 1 1

262+ []]]

263+ [Row ("",[],[])

264+ [Cell ("",[],[]) Nothing 1 1

265+ [Plain [Str "a"]]

266+ ,Cell ("",[],[]) Nothing 1 1

267+ [Plain [Str "b"]]]

268+ ,Row ("",[],[])

269+ [Cell ("",[],[]) Nothing 1 1

270+ [Para [Str "one"]

179271 ,Para [Str "two"]]

180− ,[CodeBlock ("",[],[]) "some\n code"]]]]

272+ ,Cell ("",[],[]) Nothing 1 1

273+ [CodeBlock ("",[],[]) "some\n code"]]]

274+ []]

test/markdown-reader-more.native+157−65

@@ -96,84 +96,176 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "Author",S

9696 ,[Str "Continuation",Space,Str "line"]

9797 ,[Str "\160\160and",Space,Str "another"]]

9898,Header 2 ("grid-tables",[],[]) [Str "Grid",Space,Str "Tables"]

99−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2638888888888889,0.16666666666666666,0.18055555555555555]

100− [[Plain [Str "col",Space,Str "1"]]

101− ,[Plain [Str "col",Space,Str "2"]]

102− ,[Plain [Str "col",Space,Str "3"]]]

103− [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]

104− ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]

105− ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]

106− ,[[Plain [Str "r2",Space,Str "d"]]

107− ,[Plain [Str "e"]]

108− ,[Plain [Str "f"]]]]

99+,Table ("",[],[]) (Caption Nothing

100+ []) [(AlignDefault,Just 0.2638888888888889),(AlignDefault,Just 0.16666666666666666),(AlignDefault,Just 0.18055555555555555)] 0

101+ [Row ("",[],[])

102+ [Cell ("",[],[]) Nothing 1 1

103+ [Plain [Str "col",Space,Str "1"]]

104+ ,Cell ("",[],[]) Nothing 1 1

105+ [Plain [Str "col",Space,Str "2"]]

106+ ,Cell ("",[],[]) Nothing 1 1

107+ [Plain [Str "col",Space,Str "3"]]]]

108+ [Row ("",[],[])

109+ [Cell ("",[],[]) Nothing 1 1

110+ [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]

111+ ,Cell ("",[],[]) Nothing 1 1

112+ [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]

113+ ,Cell ("",[],[]) Nothing 1 1

114+ [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]

115+ ,Row ("",[],[])

116+ [Cell ("",[],[]) Nothing 1 1

117+ [Plain [Str "r2",Space,Str "d"]]

118+ ,Cell ("",[],[]) Nothing 1 1

119+ [Plain [Str "e"]]

120+ ,Cell ("",[],[]) Nothing 1 1

121+ [Plain [Str "f"]]]]

122+ []

109123,Para [Str "Headless"]

110−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2638888888888889,0.16666666666666666,0.18055555555555555]

111− [[]

112− ,[]

113− ,[]]

114− [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]

115− ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]

116− ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]

117− ,[[Plain [Str "r2",Space,Str "d"]]

118− ,[Plain [Str "e"]]

119− ,[Plain [Str "f"]]]]

124+,Table ("",[],[]) (Caption Nothing

125+ []) [(AlignDefault,Just 0.2638888888888889),(AlignDefault,Just 0.16666666666666666),(AlignDefault,Just 0.18055555555555555)] 0

126+ [Row ("",[],[])

127+ [Cell ("",[],[]) Nothing 1 1

128+ []

129+ ,Cell ("",[],[]) Nothing 1 1

130+ []

131+ ,Cell ("",[],[]) Nothing 1 1

132+ []]]

133+ [Row ("",[],[])

134+ [Cell ("",[],[]) Nothing 1 1

135+ [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]

136+ ,Cell ("",[],[]) Nothing 1 1

137+ [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]

138+ ,Cell ("",[],[]) Nothing 1 1

139+ [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]

140+ ,Row ("",[],[])

141+ [Cell ("",[],[]) Nothing 1 1

142+ [Plain [Str "r2",Space,Str "d"]]

143+ ,Cell ("",[],[]) Nothing 1 1

144+ [Plain [Str "e"]]

145+ ,Cell ("",[],[]) Nothing 1 1

146+ [Plain [Str "f"]]]]

147+ []

120148,Para [Str "With",Space,Str "alignments"]

121−,Table [] [AlignRight,AlignLeft,AlignCenter] [0.2638888888888889,0.16666666666666666,0.18055555555555555]

122− [[Plain [Str "col",Space,Str "1"]]

123− ,[Plain [Str "col",Space,Str "2"]]

124− ,[Plain [Str "col",Space,Str "3"]]]

125− [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]

126− ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]

127− ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]

128− ,[[Plain [Str "r2",Space,Str "d"]]

129− ,[Plain [Str "e"]]

130− ,[Plain [Str "f"]]]]

149+,Table ("",[],[]) (Caption Nothing

150+ []) [(AlignRight,Just 0.2638888888888889),(AlignLeft,Just 0.16666666666666666),(AlignCenter,Just 0.18055555555555555)] 0

151+ [Row ("",[],[])

152+ [Cell ("",[],[]) Nothing 1 1

153+ [Plain [Str "col",Space,Str "1"]]

154+ ,Cell ("",[],[]) Nothing 1 1

155+ [Plain [Str "col",Space,Str "2"]]

156+ ,Cell ("",[],[]) Nothing 1 1

157+ [Plain [Str "col",Space,Str "3"]]]]

158+ [Row ("",[],[])

159+ [Cell ("",[],[]) Nothing 1 1

160+ [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]

161+ ,Cell ("",[],[]) Nothing 1 1

162+ [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]

163+ ,Cell ("",[],[]) Nothing 1 1

164+ [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]

165+ ,Row ("",[],[])

166+ [Cell ("",[],[]) Nothing 1 1

167+ [Plain [Str "r2",Space,Str "d"]]

168+ ,Cell ("",[],[]) Nothing 1 1

169+ [Plain [Str "e"]]

170+ ,Cell ("",[],[]) Nothing 1 1

171+ [Plain [Str "f"]]]]

172+ []

131173,Para [Str "Headless",Space,Str "with",Space,Str "alignments"]

132−,Table [] [AlignRight,AlignLeft,AlignCenter] [0.2638888888888889,0.16666666666666666,0.18055555555555555]

133− [[]

134− ,[]

135− ,[]]

136− [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]

137− ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]

138− ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]

139− ,[[Plain [Str "r2",Space,Str "d"]]

140− ,[Plain [Str "e"]]

141− ,[Plain [Str "f"]]]]

174+,Table ("",[],[]) (Caption Nothing

175+ []) [(AlignRight,Just 0.2638888888888889),(AlignLeft,Just 0.16666666666666666),(AlignCenter,Just 0.18055555555555555)] 0

176+ [Row ("",[],[])

177+ [Cell ("",[],[]) Nothing 1 1

178+ []

179+ ,Cell ("",[],[]) Nothing 1 1

180+ []

181+ ,Cell ("",[],[]) Nothing 1 1

182+ []]]

183+ [Row ("",[],[])

184+ [Cell ("",[],[]) Nothing 1 1

185+ [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]

186+ ,Cell ("",[],[]) Nothing 1 1

187+ [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]

188+ ,Cell ("",[],[]) Nothing 1 1

189+ [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]

190+ ,Row ("",[],[])

191+ [Cell ("",[],[]) Nothing 1 1

192+ [Plain [Str "r2",Space,Str "d"]]

193+ ,Cell ("",[],[]) Nothing 1 1

194+ [Plain [Str "e"]]

195+ ,Cell ("",[],[]) Nothing 1 1

196+ [Plain [Str "f"]]]]

197+ []

142198,Para [Str "Spaces",Space,Str "at",Space,Str "ends",Space,Str "of",Space,Str "lines"]

143−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2638888888888889,0.16666666666666666,0.18055555555555555]

144− [[]

145− ,[]

146− ,[]]

147− [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]

148− ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]

149− ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]

150− ,[[Plain [Str "r2",Space,Str "d"]]

151− ,[Plain [Str "e"]]

152− ,[Plain [Str "f"]]]]

199+,Table ("",[],[]) (Caption Nothing

200+ []) [(AlignDefault,Just 0.2638888888888889),(AlignDefault,Just 0.16666666666666666),(AlignDefault,Just 0.18055555555555555)] 0

201+ [Row ("",[],[])

202+ [Cell ("",[],[]) Nothing 1 1

203+ []

204+ ,Cell ("",[],[]) Nothing 1 1

205+ []

206+ ,Cell ("",[],[]) Nothing 1 1

207+ []]]

208+ [Row ("",[],[])

209+ [Cell ("",[],[]) Nothing 1 1

210+ [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]

211+ ,Cell ("",[],[]) Nothing 1 1

212+ [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]

213+ ,Cell ("",[],[]) Nothing 1 1

214+ [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]

215+ ,Row ("",[],[])

216+ [Cell ("",[],[]) Nothing 1 1

217+ [Plain [Str "r2",Space,Str "d"]]

218+ ,Cell ("",[],[]) Nothing 1 1

219+ [Plain [Str "e"]]

220+ ,Cell ("",[],[]) Nothing 1 1

221+ [Plain [Str "f"]]]]

222+ []

153223,Para [Str "Multiple",Space,Str "blocks",Space,Str "in",Space,Str "a",Space,Str "cell"]

154−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2638888888888889,0.16666666666666666,0.18055555555555555]

155− [[]

156− ,[]

157− ,[]]

158− [[[Header 1 ("col-1",[],[]) [Str "col",Space,Str "1"]

224+,Table ("",[],[]) (Caption Nothing

225+ []) [(AlignDefault,Just 0.2638888888888889),(AlignDefault,Just 0.16666666666666666),(AlignDefault,Just 0.18055555555555555)] 0

226+ [Row ("",[],[])

227+ [Cell ("",[],[]) Nothing 1 1

228+ []

229+ ,Cell ("",[],[]) Nothing 1 1

230+ []

231+ ,Cell ("",[],[]) Nothing 1 1

232+ []]]

233+ [Row ("",[],[])

234+ [Cell ("",[],[]) Nothing 1 1

235+ [Header 1 ("col-1",[],[]) [Str "col",Space,Str "1"]

159236 ,Plain [Str "col",Space,Str "1"]]

160− ,[Header 1 ("col-2",[],[]) [Str "col",Space,Str "2"]

237+ ,Cell ("",[],[]) Nothing 1 1

238+ [Header 1 ("col-2",[],[]) [Str "col",Space,Str "2"]

161239 ,Plain [Str "col",Space,Str "2"]]

162− ,[Header 1 ("col-3",[],[]) [Str "col",Space,Str "3"]

240+ ,Cell ("",[],[]) Nothing 1 1

241+ [Header 1 ("col-3",[],[]) [Str "col",Space,Str "3"]

163242 ,Plain [Str "col",Space,Str "3"]]]

164− ,[[Para [Str "r1",Space,Str "a"]

243+ ,Row ("",[],[])

244+ [Cell ("",[],[]) Nothing 1 1

245+ [Para [Str "r1",Space,Str "a"]

165246 ,Para [Str "r1",Space,Str "bis"]]

166− ,[BulletList

247+ ,Cell ("",[],[]) Nothing 1 1

248+ [BulletList

167249 [[Plain [Str "b"]]

168250 ,[Plain [Str "b",Space,Str "2"]]

169251 ,[Plain [Str "b",Space,Str "2"]]]]

170− ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2",SoftBreak,Str "c",Space,Str "2"]]]]

252+ ,Cell ("",[],[]) Nothing 1 1

253+ [Plain [Str "c",SoftBreak,Str "c",Space,Str "2",SoftBreak,Str "c",Space,Str "2"]]]]

254+ []

171255,Para [Str "Empty",Space,Str "cells"]

172−,Table [] [AlignDefault,AlignDefault] [5.555555555555555e-2,5.555555555555555e-2]

173− [[]

174− ,[]]

175− [[[]

176− ,[]]]

256+,Table ("",[],[]) (Caption Nothing

257+ []) [(AlignDefault,Just 5.555555555555555e-2),(AlignDefault,Just 5.555555555555555e-2)] 0

258+ [Row ("",[],[])

259+ [Cell ("",[],[]) Nothing 1 1

260+ []

261+ ,Cell ("",[],[]) Nothing 1 1

262+ []]]

263+ [Row ("",[],[])

264+ [Cell ("",[],[]) Nothing 1 1

265+ []

266+ ,Cell ("",[],[]) Nothing 1 1

267+ []]]

268+ []

177269,Header 2 ("entities-in-links-and-titles",[],[]) [Str "Entities",Space,Str "in",Space,Str "links",Space,Str "and",Space,Str "titles"]

178270,Para [Link ("",[],[]) [Str "link"] ("/\252rl","\246\246!")]

179271,Para [Link ("",["uri"],[]) [Str "http://g\246\246gle.com"] ("http://g\246\246gle.com","")]

test/mediawiki-reader.native+166−65

@@ -187,76 +187,177 @@ Pandoc (Meta {unMeta = fromList []})

187187,RawBlock (Format "mediawiki") "{{Thankyou|all your effort|Me}}"

188188,Para [Str "Written",Space,RawInline (Format "mediawiki") "{{{date}}}",Space,Str "by",Space,RawInline (Format "mediawiki") "{{{name}}}",Str "."]

189189,Header 2 ("tables",[],[]) [Str "tables"]

190−,Table [] [AlignDefault,AlignDefault] [0.0,0.0]

191− [[]

192− ,[]]

193− [[[Para [Str "Orange"]]

194− ,[Para [Str "Apple"]]]

195− ,[[Para [Str "Bread"]]

196− ,[Para [Str "Pie"]]]

197− ,[[Para [Str "Butter"]]

198− ,[Para [Str "Ice",Space,Str "cream"]]]]

199−,Table [Str "Food",Space,Str "complements"] [AlignDefault,AlignDefault] [0.0,0.0]

200− [[Para [Str "Orange"]]

201− ,[Para [Str "Apple"]]]

202− [[[Para [Str "Bread"]]

203− ,[Para [Str "Pie"]]]

204− ,[[Para [Str "Butter"]]

205− ,[Para [Str "Ice",Space,Str "cream"]]]]

206−,Table [Str "Food",Space,Str "complements"] [AlignDefault,AlignDefault] [0.0,0.0]

207− [[Para [Str "Orange"]]

208− ,[Para [Str "Apple"]]]

209− [[[Para [Str "Bread"]

190+,Table ("",[],[]) (Caption Nothing

191+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

192+ [Row ("",[],[])

193+ [Cell ("",[],[]) Nothing 1 1

194+ []

195+ ,Cell ("",[],[]) Nothing 1 1

196+ []]]

197+ [Row ("",[],[])

198+ [Cell ("",[],[]) Nothing 1 1

199+ [Para [Str "Orange"]]

200+ ,Cell ("",[],[]) Nothing 1 1

201+ [Para [Str "Apple"]]]

202+ ,Row ("",[],[])

203+ [Cell ("",[],[]) Nothing 1 1

204+ [Para [Str "Bread"]]

205+ ,Cell ("",[],[]) Nothing 1 1

206+ [Para [Str "Pie"]]]

207+ ,Row ("",[],[])

208+ [Cell ("",[],[]) Nothing 1 1

209+ [Para [Str "Butter"]]

210+ ,Cell ("",[],[]) Nothing 1 1

211+ [Para [Str "Ice",Space,Str "cream"]]]]

212+ []

213+,Table ("",[],[]) (Caption Nothing

214+ [Para [Str "Food",Space,Str "complements"]]) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

215+ [Row ("",[],[])

216+ [Cell ("",[],[]) Nothing 1 1

217+ [Para [Str "Orange"]]

218+ ,Cell ("",[],[]) Nothing 1 1

219+ [Para [Str "Apple"]]]]

220+ [Row ("",[],[])

221+ [Cell ("",[],[]) Nothing 1 1

222+ [Para [Str "Bread"]]

223+ ,Cell ("",[],[]) Nothing 1 1

224+ [Para [Str "Pie"]]]

225+ ,Row ("",[],[])

226+ [Cell ("",[],[]) Nothing 1 1

227+ [Para [Str "Butter"]]

228+ ,Cell ("",[],[]) Nothing 1 1

229+ [Para [Str "Ice",Space,Str "cream"]]]]

230+ []

231+,Table ("",[],[]) (Caption Nothing

232+ [Para [Str "Food",Space,Str "complements"]]) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

233+ [Row ("",[],[])

234+ [Cell ("",[],[]) Nothing 1 1

235+ [Para [Str "Orange"]]

236+ ,Cell ("",[],[]) Nothing 1 1

237+ [Para [Str "Apple"]]]]

238+ [Row ("",[],[])

239+ [Cell ("",[],[]) Nothing 1 1

240+ [Para [Str "Bread"]

210241 ,Para [Str "and",Space,Str "cheese"]]

211− ,[Para [Str "Pie"]

242+ ,Cell ("",[],[]) Nothing 1 1

243+ [Para [Str "Pie"]

212244 ,OrderedList (1,DefaultStyle,DefaultDelim)

213245 [[Plain [Str "apple"]]

214246 ,[Plain [Str "carrot"]]]]]]

215−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

216− [[]

217− ,[]

218− ,[]]

219− [[[Para [Str "Orange"]]

220− ,[Para [Str "Apple"]]

221− ,[Para [Str "more"]]]

222− ,[[Para [Str "Bread"]]

223− ,[Para [Str "Pie"]]

224− ,[Para [Str "more"]]]

225− ,[[Para [Str "Butter"]]

226− ,[Para [Str "Ice",Space,Str "cream"]]

227− ,[Para [Str "and",Space,Str "more"]]]]

228−,Table [] [AlignLeft,AlignRight,AlignCenter] [0.25,0.125,0.125]

229− [[Para [Str "Left"]]

230− ,[Para [Str "Right"]]

231− ,[Para [Str "Center"]]]

232− [[[Para [Str "left"]]

233− ,[Para [Str "15.00"]]

234− ,[Para [Str "centered"]]]

235− ,[[Para [Str "more"]]

236− ,[Para [Str "2.0"]]

237− ,[Para [Str "more"]]]]

238−,Table [] [AlignDefault,AlignDefault] [0.0,0.0]

239− [[]

240− ,[]]

241− [[[Para [Str "Orange"]]

242− ,[Para [Str "Apple"]]]

243− ,[[Para [Str "Bread"]]

244− ,[Table [] [AlignDefault,AlignDefault] [0.0,0.0]

245− [[Para [Str "fruit"]]

246− ,[Para [Str "topping"]]]

247− [[[Para [Str "apple"]]

248− ,[Para [Str "ice",Space,Str "cream"]]]]]]

249− ,[[Para [Str "Butter"]]

250− ,[Para [Str "Ice",Space,Str "cream"]]]]

251−,Table [] [AlignDefault] [0.0]

252− [[]]

253− [[[Para [Str "Orange"]]]]

247+ []

248+,Table ("",[],[]) (Caption Nothing

249+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

250+ [Row ("",[],[])

251+ [Cell ("",[],[]) Nothing 1 1

252+ []

253+ ,Cell ("",[],[]) Nothing 1 1

254+ []

255+ ,Cell ("",[],[]) Nothing 1 1

256+ []]]

257+ [Row ("",[],[])

258+ [Cell ("",[],[]) Nothing 1 1

259+ [Para [Str "Orange"]]

260+ ,Cell ("",[],[]) Nothing 1 1

261+ [Para [Str "Apple"]]

262+ ,Cell ("",[],[]) Nothing 1 1

263+ [Para [Str "more"]]]

264+ ,Row ("",[],[])

265+ [Cell ("",[],[]) Nothing 1 1

266+ [Para [Str "Bread"]]

267+ ,Cell ("",[],[]) Nothing 1 1

268+ [Para [Str "Pie"]]

269+ ,Cell ("",[],[]) Nothing 1 1

270+ [Para [Str "more"]]]

271+ ,Row ("",[],[])

272+ [Cell ("",[],[]) Nothing 1 1

273+ [Para [Str "Butter"]]

274+ ,Cell ("",[],[]) Nothing 1 1

275+ [Para [Str "Ice",Space,Str "cream"]]

276+ ,Cell ("",[],[]) Nothing 1 1

277+ [Para [Str "and",Space,Str "more"]]]]

278+ []

279+,Table ("",[],[]) (Caption Nothing

280+ []) [(AlignLeft,Just 0.25),(AlignRight,Just 0.125),(AlignCenter,Just 0.125)] 0

281+ [Row ("",[],[])

282+ [Cell ("",[],[]) Nothing 1 1

283+ [Para [Str "Left"]]

284+ ,Cell ("",[],[]) Nothing 1 1

285+ [Para [Str "Right"]]

286+ ,Cell ("",[],[]) Nothing 1 1

287+ [Para [Str "Center"]]]]

288+ [Row ("",[],[])

289+ [Cell ("",[],[]) Nothing 1 1

290+ [Para [Str "left"]]

291+ ,Cell ("",[],[]) Nothing 1 1

292+ [Para [Str "15.00"]]

293+ ,Cell ("",[],[]) Nothing 1 1

294+ [Para [Str "centered"]]]

295+ ,Row ("",[],[])

296+ [Cell ("",[],[]) Nothing 1 1

297+ [Para [Str "more"]]

298+ ,Cell ("",[],[]) Nothing 1 1

299+ [Para [Str "2.0"]]

300+ ,Cell ("",[],[]) Nothing 1 1

301+ [Para [Str "more"]]]]

302+ []

303+,Table ("",[],[]) (Caption Nothing

304+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

305+ [Row ("",[],[])

306+ [Cell ("",[],[]) Nothing 1 1

307+ []

308+ ,Cell ("",[],[]) Nothing 1 1

309+ []]]

310+ [Row ("",[],[])

311+ [Cell ("",[],[]) Nothing 1 1

312+ [Para [Str "Orange"]]

313+ ,Cell ("",[],[]) Nothing 1 1

314+ [Para [Str "Apple"]]]

315+ ,Row ("",[],[])

316+ [Cell ("",[],[]) Nothing 1 1

317+ [Para [Str "Bread"]]

318+ ,Cell ("",[],[]) Nothing 1 1

319+ [Table ("",[],[]) (Caption Nothing

320+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

321+ [Row ("",[],[])

322+ [Cell ("",[],[]) Nothing 1 1

323+ [Para [Str "fruit"]]

324+ ,Cell ("",[],[]) Nothing 1 1

325+ [Para [Str "topping"]]]]

326+ [Row ("",[],[])

327+ [Cell ("",[],[]) Nothing 1 1

328+ [Para [Str "apple"]]

329+ ,Cell ("",[],[]) Nothing 1 1

330+ [Para [Str "ice",Space,Str "cream"]]]]

331+ []]]

332+ ,Row ("",[],[])

333+ [Cell ("",[],[]) Nothing 1 1

334+ [Para [Str "Butter"]]

335+ ,Cell ("",[],[]) Nothing 1 1

336+ [Para [Str "Ice",Space,Str "cream"]]]]

337+ []

338+,Table ("",[],[]) (Caption Nothing

339+ []) [(AlignDefault,Nothing)] 0

340+ [Row ("",[],[])

341+ [Cell ("",[],[]) Nothing 1 1

342+ []]]

343+ [Row ("",[],[])

344+ [Cell ("",[],[]) Nothing 1 1

345+ [Para [Str "Orange"]]]]

346+ []

254347,Para [Str "Paragraph",Space,Str "after",Space,Str "the",Space,Str "table."]

255−,Table [] [AlignDefault,AlignDefault] [0.0,0.0]

256− [[Para [Str "fruit"]]

257− ,[Para [Str "topping"]]]

258− [[[Para [Str "apple"]]

259− ,[Para [Str "ice",Space,Str "cream"]]]]

348+,Table ("",[],[]) (Caption Nothing

349+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

350+ [Row ("",[],[])

351+ [Cell ("",[],[]) Nothing 1 1

352+ [Para [Str "fruit"]]

353+ ,Cell ("",[],[]) Nothing 1 1

354+ [Para [Str "topping"]]]]

355+ [Row ("",[],[])

356+ [Cell ("",[],[]) Nothing 1 1

357+ [Para [Str "apple"]]

358+ ,Cell ("",[],[]) Nothing 1 1

359+ [Para [Str "ice",Space,Str "cream"]]]]

360+ []

260361,Header 2 ("notes",[],[]) [Str "notes"]

261362,Para [Str "My",Space,Str "note!",Note [Plain [Str "This."]]]

262363,Para [Str "URL",Space,Str "note.",Note [Plain [Link ("",[],[]) [Str "http://docs.python.org/library/functions.html#range"] ("http://docs.python.org/library/functions.html#range","")]]]]

test/odt/native/simpleTable.native+1−1

@@ -1 +1 @@

1−[Table [] [AlignDefault,AlignDefault] [0.0,0.0] [[],[]] [[[Plain [Str "Content"]],[Plain [Str "More",Space,Str "content"]]]],Para []]

1+[Table ("",[],[]) (Caption Nothing []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 [Row ("",[],[]) [Cell ("",[],[]) Nothing 1 1 [],Cell ("",[],[]) Nothing 1 1 []]] [Row ("",[],[]) [Cell ("",[],[]) Nothing 1 1 [Plain [Str "Content"]],Cell ("",[],[]) Nothing 1 1 [Plain [Str "More",Space,Str "content"]]]] [],Para []]

test/odt/native/simpleTableWithCaption.native+1−1

@@ -1 +1 @@

1−[Table [Str "Table",Space,Str "1:",Space,Str "Some",Space,Str "caption",Space,Str "for",Space,Str "a",Space,Str "table"] [AlignDefault,AlignDefault] [0.0,0.0] [[],[]] [[[Plain [Str "Content"]],[Plain [Str "More",Space,Str "content"]]]],Para []]

1+[Table ("",[],[]) (Caption Nothing [Para [Str "Table",Space,Str "1:",Space,Str "Some",Space,Str "caption",Space,Str "for",Space,Str "a",Space,Str "table"]]) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 [Row ("",[],[]) [Cell ("",[],[]) Nothing 1 1 [],Cell ("",[],[]) Nothing 1 1 []]] [Row ("",[],[]) [Cell ("",[],[]) Nothing 1 1 [Plain [Str "Content"]],Cell ("",[],[]) Nothing 1 1 [Plain [Str "More",Space,Str "content"]]]] [],Para []]

test/odt/native/tableWithContents.native+1−1

@@ -1 +1 @@

1−[Table [] [AlignDefault,AlignDefault] [0.0,0.0] [[],[]] [[[Plain [Str "A"]],[Plain [Str "B"]]],[[Plain [Str "C"]],[Plain [Str "D"]]]],Para []]

1+[Table ("",[],[]) (Caption Nothing []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 [Row ("",[],[]) [Cell ("",[],[]) Nothing 1 1 [],Cell ("",[],[]) Nothing 1 1 []]] [Row ("",[],[]) [Cell ("",[],[]) Nothing 1 1 [Plain [Str "A"]],Cell ("",[],[]) Nothing 1 1 [Plain [Str "B"]]],Row ("",[],[]) [Cell ("",[],[]) Nothing 1 1 [Plain [Str "C"]],Cell ("",[],[]) Nothing 1 1 [Plain [Str "D"]]]] [],Para []]

test/pipe-tables.native+252−103

@@ -1,115 +1,264 @@

11[Para [Str "Simplest",Space,Str "table",Space,Str "without",Space,Str "caption:"]

2−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

3− [[Plain [Str "Default1"]]

4− ,[Plain [Str "Default2"]]

5− ,[Plain [Str "Default3"]]]

6− [[[Plain [Str "12"]]

7− ,[Plain [Str "12"]]

8− ,[Plain [Str "12"]]]

9− ,[[Plain [Str "123"]]

10− ,[Plain [Str "123"]]

11− ,[Plain [Str "123"]]]

12− ,[[Plain [Str "1"]]

13− ,[Plain [Str "1"]]

14− ,[Plain [Str "1"]]]]

2+,Table ("",[],[]) (Caption Nothing

3+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

4+ [Row ("",[],[])

5+ [Cell ("",[],[]) Nothing 1 1

6+ [Plain [Str "Default1"]]

7+ ,Cell ("",[],[]) Nothing 1 1

8+ [Plain [Str "Default2"]]

9+ ,Cell ("",[],[]) Nothing 1 1

10+ [Plain [Str "Default3"]]]]

11+ [Row ("",[],[])

12+ [Cell ("",[],[]) Nothing 1 1

13+ [Plain [Str "12"]]

14+ ,Cell ("",[],[]) Nothing 1 1

15+ [Plain [Str "12"]]

16+ ,Cell ("",[],[]) Nothing 1 1

17+ [Plain [Str "12"]]]

18+ ,Row ("",[],[])

19+ [Cell ("",[],[]) Nothing 1 1

20+ [Plain [Str "123"]]

21+ ,Cell ("",[],[]) Nothing 1 1

22+ [Plain [Str "123"]]

23+ ,Cell ("",[],[]) Nothing 1 1

24+ [Plain [Str "123"]]]

25+ ,Row ("",[],[])

26+ [Cell ("",[],[]) Nothing 1 1

27+ [Plain [Str "1"]]

28+ ,Cell ("",[],[]) Nothing 1 1

29+ [Plain [Str "1"]]

30+ ,Cell ("",[],[]) Nothing 1 1

31+ [Plain [Str "1"]]]]

32+ []

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

16−,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignRight,AlignLeft,AlignDefault,AlignCenter] [0.0,0.0,0.0,0.0]

17− [[Plain [Str "Right"]]

18− ,[Plain [Str "Left"]]

19− ,[Plain [Str "Default"]]

20− ,[Plain [Str "Center"]]]

21− [[[Plain [Str "12"]]

22− ,[Plain [Str "12"]]

23− ,[Plain [Str "12"]]

24− ,[Plain [Str "12"]]]

25− ,[[Plain [Str "123"]]

26− ,[Plain [Str "123"]]

27− ,[Plain [Str "123"]]

28− ,[Plain [Str "123"]]]

29− ,[[Plain [Str "1"]]

30− ,[Plain [Str "1"]]

31− ,[Plain [Str "1"]]

32− ,[Plain [Str "1"]]]]

34+,Table ("",[],[]) (Caption Nothing

35+ [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignDefault,Nothing),(AlignCenter,Nothing)] 0

36+ [Row ("",[],[])

37+ [Cell ("",[],[]) Nothing 1 1

38+ [Plain [Str "Right"]]

39+ ,Cell ("",[],[]) Nothing 1 1

40+ [Plain [Str "Left"]]

41+ ,Cell ("",[],[]) Nothing 1 1

42+ [Plain [Str "Default"]]

43+ ,Cell ("",[],[]) Nothing 1 1

44+ [Plain [Str "Center"]]]]

45+ [Row ("",[],[])

46+ [Cell ("",[],[]) Nothing 1 1

47+ [Plain [Str "12"]]

48+ ,Cell ("",[],[]) Nothing 1 1

49+ [Plain [Str "12"]]

50+ ,Cell ("",[],[]) Nothing 1 1

51+ [Plain [Str "12"]]

52+ ,Cell ("",[],[]) Nothing 1 1

53+ [Plain [Str "12"]]]

54+ ,Row ("",[],[])

55+ [Cell ("",[],[]) Nothing 1 1

56+ [Plain [Str "123"]]

57+ ,Cell ("",[],[]) Nothing 1 1

58+ [Plain [Str "123"]]

59+ ,Cell ("",[],[]) Nothing 1 1

60+ [Plain [Str "123"]]

61+ ,Cell ("",[],[]) Nothing 1 1

62+ [Plain [Str "123"]]]

63+ ,Row ("",[],[])

64+ [Cell ("",[],[]) Nothing 1 1

65+ [Plain [Str "1"]]

66+ ,Cell ("",[],[]) Nothing 1 1

67+ [Plain [Str "1"]]

68+ ,Cell ("",[],[]) Nothing 1 1

69+ [Plain [Str "1"]]

70+ ,Cell ("",[],[]) Nothing 1 1

71+ [Plain [Str "1"]]]]

72+ []

3373,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"]

34−,Table [] [AlignRight,AlignLeft,AlignCenter] [0.0,0.0,0.0]

35− [[Plain [Str "Right"]]

36− ,[Plain [Str "Left"]]

37− ,[Plain [Str "Center"]]]

38− [[[Plain [Str "12"]]

39− ,[Plain [Str "12"]]

40− ,[Plain [Str "12"]]]

41− ,[[Plain [Str "123"]]

42− ,[Plain [Str "123"]]

43− ,[Plain [Str "123"]]]

44− ,[[Plain [Str "1"]]

45− ,[Plain [Str "1"]]

46− ,[Plain [Str "1"]]]]

74+,Table ("",[],[]) (Caption Nothing

75+ []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing)] 0

76+ [Row ("",[],[])

77+ [Cell ("",[],[]) Nothing 1 1

78+ [Plain [Str "Right"]]

79+ ,Cell ("",[],[]) Nothing 1 1

80+ [Plain [Str "Left"]]

81+ ,Cell ("",[],[]) Nothing 1 1

82+ [Plain [Str "Center"]]]]

83+ [Row ("",[],[])

84+ [Cell ("",[],[]) Nothing 1 1

85+ [Plain [Str "12"]]

86+ ,Cell ("",[],[]) Nothing 1 1

87+ [Plain [Str "12"]]

88+ ,Cell ("",[],[]) Nothing 1 1

89+ [Plain [Str "12"]]]

90+ ,Row ("",[],[])

91+ [Cell ("",[],[]) Nothing 1 1

92+ [Plain [Str "123"]]

93+ ,Cell ("",[],[]) Nothing 1 1

94+ [Plain [Str "123"]]

95+ ,Cell ("",[],[]) Nothing 1 1

96+ [Plain [Str "123"]]]

97+ ,Row ("",[],[])

98+ [Cell ("",[],[]) Nothing 1 1

99+ [Plain [Str "1"]]

100+ ,Cell ("",[],[]) Nothing 1 1

101+ [Plain [Str "1"]]

102+ ,Cell ("",[],[]) Nothing 1 1

103+ [Plain [Str "1"]]]]

104+ []

47105,Para [Str "Headerless",Space,Str "table",Space,Str "without",Space,Str "caption:"]

48−,Table [] [AlignRight,AlignLeft,AlignCenter] [0.0,0.0,0.0]

49− [[]

50− ,[]

51− ,[]]

52− [[[Plain [Str "12"]]

53− ,[Plain [Str "12"]]

54− ,[Plain [Str "12"]]]

55− ,[[Plain [Str "123"]]

56− ,[Plain [Str "123"]]

57− ,[Plain [Str "123"]]]

58− ,[[Plain [Str "1"]]

59− ,[Plain [Str "1"]]

60− ,[Plain [Str "1"]]]]

106+,Table ("",[],[]) (Caption Nothing

107+ []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing)] 0

108+ [Row ("",[],[])

109+ [Cell ("",[],[]) Nothing 1 1

110+ []

111+ ,Cell ("",[],[]) Nothing 1 1

112+ []

113+ ,Cell ("",[],[]) Nothing 1 1

114+ []]]

115+ [Row ("",[],[])

116+ [Cell ("",[],[]) Nothing 1 1

117+ [Plain [Str "12"]]

118+ ,Cell ("",[],[]) Nothing 1 1

119+ [Plain [Str "12"]]

120+ ,Cell ("",[],[]) Nothing 1 1

121+ [Plain [Str "12"]]]

122+ ,Row ("",[],[])

123+ [Cell ("",[],[]) Nothing 1 1

124+ [Plain [Str "123"]]

125+ ,Cell ("",[],[]) Nothing 1 1

126+ [Plain [Str "123"]]

127+ ,Cell ("",[],[]) Nothing 1 1

128+ [Plain [Str "123"]]]

129+ ,Row ("",[],[])

130+ [Cell ("",[],[]) Nothing 1 1

131+ [Plain [Str "1"]]

132+ ,Cell ("",[],[]) Nothing 1 1

133+ [Plain [Str "1"]]

134+ ,Cell ("",[],[]) Nothing 1 1

135+ [Plain [Str "1"]]]]

136+ []

61137,Para [Str "Table",Space,Str "without",Space,Str "sides:"]

62−,Table [] [AlignDefault,AlignRight] [0.0,0.0]

63− [[Plain [Str "Fruit"]]

64− ,[Plain [Str "Quantity"]]]

65− [[[Plain [Str "apple"]]

66− ,[Plain [Str "5"]]]

67− ,[[Plain [Str "orange"]]

68− ,[Plain [Str "17"]]]

69− ,[[Plain [Str "pear"]]

70− ,[Plain [Str "302"]]]]

138+,Table ("",[],[]) (Caption Nothing

139+ []) [(AlignDefault,Nothing),(AlignRight,Nothing)] 0

140+ [Row ("",[],[])

141+ [Cell ("",[],[]) Nothing 1 1

142+ [Plain [Str "Fruit"]]

143+ ,Cell ("",[],[]) Nothing 1 1

144+ [Plain [Str "Quantity"]]]]

145+ [Row ("",[],[])

146+ [Cell ("",[],[]) Nothing 1 1

147+ [Plain [Str "apple"]]

148+ ,Cell ("",[],[]) Nothing 1 1

149+ [Plain [Str "5"]]]

150+ ,Row ("",[],[])

151+ [Cell ("",[],[]) Nothing 1 1

152+ [Plain [Str "orange"]]

153+ ,Cell ("",[],[]) Nothing 1 1

154+ [Plain [Str "17"]]]

155+ ,Row ("",[],[])

156+ [Cell ("",[],[]) Nothing 1 1

157+ [Plain [Str "pear"]]

158+ ,Cell ("",[],[]) Nothing 1 1

159+ [Plain [Str "302"]]]]

160+ []

71161,Para [Str "One-column:"]

72−,Table [] [AlignDefault] [0.0]

73− [[Plain [Str "hi"]]]

74− [[[Plain [Str "lo"]]]]

162+,Table ("",[],[]) (Caption Nothing

163+ []) [(AlignDefault,Nothing)] 0

164+ [Row ("",[],[])

165+ [Cell ("",[],[]) Nothing 1 1

166+ [Plain [Str "hi"]]]]

167+ [Row ("",[],[])

168+ [Cell ("",[],[]) Nothing 1 1

169+ [Plain [Str "lo"]]]]

170+ []

75171,Para [Str "Header-less",Space,Str "one-column:"]

76−,Table [] [AlignCenter] [0.0]

77− [[]]

78− [[[Plain [Str "hi"]]]]

172+,Table ("",[],[]) (Caption Nothing

173+ []) [(AlignCenter,Nothing)] 0

174+ [Row ("",[],[])

175+ [Cell ("",[],[]) Nothing 1 1

176+ []]]

177+ [Row ("",[],[])

178+ [Cell ("",[],[]) Nothing 1 1

179+ [Plain [Str "hi"]]]]

180+ []

79181,Para [Str "Indented",Space,Str "left",Space,Str "column:"]

80−,Table [] [AlignRight,AlignLeft] [0.0,0.0]

81− [[Plain [Str "Number",Space,Str "of",Space,Str "siblings"]]

82− ,[Plain [Str "Salary"]]]

83− [[[Plain [Str "3"]]

84− ,[Plain [Str "33"]]]

85− ,[[Plain [Str "4"]]

86− ,[Plain [Str "44"]]]]

182+,Table ("",[],[]) (Caption Nothing

183+ []) [(AlignRight,Nothing),(AlignLeft,Nothing)] 0

184+ [Row ("",[],[])

185+ [Cell ("",[],[]) Nothing 1 1

186+ [Plain [Str "Number",Space,Str "of",Space,Str "siblings"]]

187+ ,Cell ("",[],[]) Nothing 1 1

188+ [Plain [Str "Salary"]]]]

189+ [Row ("",[],[])

190+ [Cell ("",[],[]) Nothing 1 1

191+ [Plain [Str "3"]]

192+ ,Cell ("",[],[]) Nothing 1 1

193+ [Plain [Str "33"]]]

194+ ,Row ("",[],[])

195+ [Cell ("",[],[]) Nothing 1 1

196+ [Plain [Str "4"]]

197+ ,Cell ("",[],[]) Nothing 1 1

198+ [Plain [Str "44"]]]]

199+ []

87200,Para [Str "Long",Space,Str "pipe",Space,Str "table",Space,Str "with",Space,Str "relative",Space,Str "widths:"]

88−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.15517241379310345,0.1724137931034483,0.6724137931034483]

89− [[Plain [Str "Default1"]]

90− ,[Plain [Str "Default2"]]

91− ,[Plain [Str "Default3"]]]

92− [[[Plain [Str "123"]]

93− ,[Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "table",Space,Str "cell"]]

94− ,[Plain [Str "and",Space,Str "this",Space,Str "is",Space,Str "a",Space,Str "really",Space,Str "long",Space,Str "table",Space,Str "cell",Space,Str "that",Space,Str "will",Space,Str "probably",Space,Str "need",Space,Str "wrapping"]]]

95− ,[[Plain [Str "123"]]

96− ,[Plain [Str "123"]]

97− ,[Plain [Str "123"]]]]

201+,Table ("",[],[]) (Caption Nothing

202+ []) [(AlignDefault,Just 0.15517241379310345),(AlignDefault,Just 0.1724137931034483),(AlignDefault,Just 0.6724137931034483)] 0

203+ [Row ("",[],[])

204+ [Cell ("",[],[]) Nothing 1 1

205+ [Plain [Str "Default1"]]

206+ ,Cell ("",[],[]) Nothing 1 1

207+ [Plain [Str "Default2"]]

208+ ,Cell ("",[],[]) Nothing 1 1

209+ [Plain [Str "Default3"]]]]

210+ [Row ("",[],[])

211+ [Cell ("",[],[]) Nothing 1 1

212+ [Plain [Str "123"]]

213+ ,Cell ("",[],[]) Nothing 1 1

214+ [Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "table",Space,Str "cell"]]

215+ ,Cell ("",[],[]) Nothing 1 1

216+ [Plain [Str "and",Space,Str "this",Space,Str "is",Space,Str "a",Space,Str "really",Space,Str "long",Space,Str "table",Space,Str "cell",Space,Str "that",Space,Str "will",Space,Str "probably",Space,Str "need",Space,Str "wrapping"]]]

217+ ,Row ("",[],[])

218+ [Cell ("",[],[]) Nothing 1 1

219+ [Plain [Str "123"]]

220+ ,Cell ("",[],[]) Nothing 1 1

221+ [Plain [Str "123"]]

222+ ,Cell ("",[],[]) Nothing 1 1

223+ [Plain [Str "123"]]]]

224+ []

98225,Para [Str "Pipe",Space,Str "table",Space,Str "with",Space,Str "no",Space,Str "body:"]

99−,Table [] [AlignDefault] [0.0]

100− [[Plain [Str "Header"]]]

226+,Table ("",[],[]) (Caption Nothing

227+ []) [(AlignDefault,Nothing)] 0

228+ [Row ("",[],[])

229+ [Cell ("",[],[]) Nothing 1 1

230+ [Plain [Str "Header"]]]]

231+ []

101232 []

102233,Para [Str "Pipe",Space,Str "table",Space,Str "with",Space,Str "tricky",Space,Str "cell",Space,Str "contents",Space,Str "(see",Space,Str "#2765):"]

103−,Table [] [AlignLeft,AlignRight,AlignRight] [0.0,0.0,0.0]

104− [[]

105− ,[Plain [Str "IP_gene8-_1st"]]

106− ,[Plain [Str "IP_gene8+_1st"]]]

107− [[[Plain [Str "IP_gene8-_1st"]]

108− ,[Plain [Str "1.0000000"]]

109− ,[Plain [Str "0.4357325"]]]

110− ,[[Plain [Str "IP_gene8+_1st"]]

111− ,[Plain [Str "0.4357325"]]

112− ,[Plain [Str "1.0000000"]]]

113− ,[[Plain [Str "foo",Code ("",[],[]) "bar|baz"]]

114− ,[Plain [Str "and|escaped"]]

115− ,[Plain [Str "3.0000000"]]]]]

234+,Table ("",[],[]) (Caption Nothing

235+ []) [(AlignLeft,Nothing),(AlignRight,Nothing),(AlignRight,Nothing)] 0

236+ [Row ("",[],[])

237+ [Cell ("",[],[]) Nothing 1 1

238+ []

239+ ,Cell ("",[],[]) Nothing 1 1

240+ [Plain [Str "IP_gene8-_1st"]]

241+ ,Cell ("",[],[]) Nothing 1 1

242+ [Plain [Str "IP_gene8+_1st"]]]]

243+ [Row ("",[],[])

244+ [Cell ("",[],[]) Nothing 1 1

245+ [Plain [Str "IP_gene8-_1st"]]

246+ ,Cell ("",[],[]) Nothing 1 1

247+ [Plain [Str "1.0000000"]]

248+ ,Cell ("",[],[]) Nothing 1 1

249+ [Plain [Str "0.4357325"]]]

250+ ,Row ("",[],[])

251+ [Cell ("",[],[]) Nothing 1 1

252+ [Plain [Str "IP_gene8+_1st"]]

253+ ,Cell ("",[],[]) Nothing 1 1

254+ [Plain [Str "0.4357325"]]

255+ ,Cell ("",[],[]) Nothing 1 1

256+ [Plain [Str "1.0000000"]]]

257+ ,Row ("",[],[])

258+ [Cell ("",[],[]) Nothing 1 1

259+ [Plain [Str "foo",Code ("",[],[]) "bar|baz"]]

260+ ,Cell ("",[],[]) Nothing 1 1

261+ [Plain [Str "and|escaped"]]

262+ ,Cell ("",[],[]) Nothing 1 1

263+ [Plain [Str "3.0000000"]]]]

264+ []]

test/pptx/speaker_notes_afterseps.native+39−17

@@ -1,23 +1,45 @@

11[Para [Image ("",[],[]) [Str "The",Space,Str "moon"] ("lalune.jpg","fig:")]

22,Div ("",["notes"],[])

33 [Para [Str "chicken",Space,Str "and",Space,Str "dumplings"]]

4−,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax,",Space,Str "with",Space,Str "alignment"] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0]

5− [[Plain [Str "Right"]]

6− ,[Plain [Str "Left"]]

7− ,[Plain [Str "Center"]]

8− ,[Plain [Str "Default"]]]

9− [[[Plain [Str "12"]]

10− ,[Plain [Str "12"]]

11− ,[Plain [Str "12"]]

12− ,[Plain [Str "12"]]]

13− ,[[Plain [Str "123"]]

14− ,[Plain [Str "123"]]

15− ,[Plain [Str "123"]]

16− ,[Plain [Str "123"]]]

17− ,[[Plain [Str "1"]]

18− ,[Plain [Str "1"]]

19− ,[Plain [Str "1"]]

20− ,[Plain [Str "1"]]]]

4+,Table ("",[],[]) (Caption Nothing

5+ [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax,",Space,Str "with",Space,Str "alignment"]]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignDefault,Nothing)] 0

6+ [Row ("",[],[])

7+ [Cell ("",[],[]) Nothing 1 1

8+ [Plain [Str "Right"]]

9+ ,Cell ("",[],[]) Nothing 1 1

10+ [Plain [Str "Left"]]

11+ ,Cell ("",[],[]) Nothing 1 1

12+ [Plain [Str "Center"]]

13+ ,Cell ("",[],[]) Nothing 1 1

14+ [Plain [Str "Default"]]]]

15+ [Row ("",[],[])

16+ [Cell ("",[],[]) Nothing 1 1

17+ [Plain [Str "12"]]

18+ ,Cell ("",[],[]) Nothing 1 1

19+ [Plain [Str "12"]]

20+ ,Cell ("",[],[]) Nothing 1 1

21+ [Plain [Str "12"]]

22+ ,Cell ("",[],[]) Nothing 1 1

23+ [Plain [Str "12"]]]

24+ ,Row ("",[],[])

25+ [Cell ("",[],[]) Nothing 1 1

26+ [Plain [Str "123"]]

27+ ,Cell ("",[],[]) Nothing 1 1

28+ [Plain [Str "123"]]

29+ ,Cell ("",[],[]) Nothing 1 1

30+ [Plain [Str "123"]]

31+ ,Cell ("",[],[]) Nothing 1 1

32+ [Plain [Str "123"]]]

33+ ,Row ("",[],[])

34+ [Cell ("",[],[]) Nothing 1 1

35+ [Plain [Str "1"]]

36+ ,Cell ("",[],[]) Nothing 1 1

37+ [Plain [Str "1"]]

38+ ,Cell ("",[],[]) Nothing 1 1

39+ [Plain [Str "1"]]

40+ ,Cell ("",[],[]) Nothing 1 1

41+ [Plain [Str "1"]]]]

42+ []

2143,Div ("",["notes"],[])

2244 [Para [Str "foo",Space,Str "bar"]]

2345,Div ("",["columns"],[])

test/pptx/tables.native+78−34

@@ -1,35 +1,79 @@

11[Header 2 ("a-table-with-a-caption",[],[]) [Str "A",Space,Str "Table,",Space,Str "with",Space,Str "a",Space,Str "caption"]

2−,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax,",Space,Str "with",Space,Str "alignment"] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0]

3− [[Plain [Str "Right"]]

4− ,[Plain [Str "Left"]]

5− ,[Plain [Str "Center"]]

6− ,[Plain [Str "Default"]]]

7− [[[Plain [Str "12"]]

8− ,[Plain [Str "12"]]

9− ,[Plain [Str "12"]]

10− ,[Plain [Str "12"]]]

11− ,[[Plain [Str "123"]]

12− ,[Plain [Str "123"]]

13− ,[Plain [Str "123"]]

14− ,[Plain [Str "123"]]]

15− ,[[Plain [Str "1"]]

16− ,[Plain [Str "1"]]

17− ,[Plain [Str "1"]]

18− ,[Plain [Str "1"]]]]

19−,Table [] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0]

20− [[Plain [Str "Right"]]

21− ,[Plain [Str "Left"]]

22− ,[Plain [Str "Center"]]

23− ,[Plain [Str "Default"]]]

24− [[[Plain [Str "12"]]

25− ,[Plain [Str "12"]]

26− ,[Plain [Str "12"]]

27− ,[Plain [Str "12"]]]

28− ,[[Plain [Str "123"]]

29− ,[Plain [Str "123"]]

30− ,[Plain [Str "123"]]

31− ,[Plain [Str "123"]]]

32− ,[[Plain [Str "1"]]

33− ,[Plain [Str "1"]]

34− ,[Plain [Str "1"]]

35− ,[Plain [Str "1"]]]]]

2+,Table ("",[],[]) (Caption Nothing

3+ [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax,",Space,Str "with",Space,Str "alignment"]]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignDefault,Nothing)] 0

4+ [Row ("",[],[])

5+ [Cell ("",[],[]) Nothing 1 1

6+ [Plain [Str "Right"]]

7+ ,Cell ("",[],[]) Nothing 1 1

8+ [Plain [Str "Left"]]

9+ ,Cell ("",[],[]) Nothing 1 1

10+ [Plain [Str "Center"]]

11+ ,Cell ("",[],[]) Nothing 1 1

12+ [Plain [Str "Default"]]]]

13+ [Row ("",[],[])

14+ [Cell ("",[],[]) Nothing 1 1

15+ [Plain [Str "12"]]

16+ ,Cell ("",[],[]) Nothing 1 1

17+ [Plain [Str "12"]]

18+ ,Cell ("",[],[]) Nothing 1 1

19+ [Plain [Str "12"]]

20+ ,Cell ("",[],[]) Nothing 1 1

21+ [Plain [Str "12"]]]

22+ ,Row ("",[],[])

23+ [Cell ("",[],[]) Nothing 1 1

24+ [Plain [Str "123"]]

25+ ,Cell ("",[],[]) Nothing 1 1

26+ [Plain [Str "123"]]

27+ ,Cell ("",[],[]) Nothing 1 1

28+ [Plain [Str "123"]]

29+ ,Cell ("",[],[]) Nothing 1 1

30+ [Plain [Str "123"]]]

31+ ,Row ("",[],[])

32+ [Cell ("",[],[]) Nothing 1 1

33+ [Plain [Str "1"]]

34+ ,Cell ("",[],[]) Nothing 1 1

35+ [Plain [Str "1"]]

36+ ,Cell ("",[],[]) Nothing 1 1

37+ [Plain [Str "1"]]

38+ ,Cell ("",[],[]) Nothing 1 1

39+ [Plain [Str "1"]]]]

40+ []

41+,Table ("",[],[]) (Caption Nothing

42+ []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignDefault,Nothing)] 0

43+ [Row ("",[],[])

44+ [Cell ("",[],[]) Nothing 1 1

45+ [Plain [Str "Right"]]

46+ ,Cell ("",[],[]) Nothing 1 1

47+ [Plain [Str "Left"]]

48+ ,Cell ("",[],[]) Nothing 1 1

49+ [Plain [Str "Center"]]

50+ ,Cell ("",[],[]) Nothing 1 1

51+ [Plain [Str "Default"]]]]

52+ [Row ("",[],[])

53+ [Cell ("",[],[]) Nothing 1 1

54+ [Plain [Str "12"]]

55+ ,Cell ("",[],[]) Nothing 1 1

56+ [Plain [Str "12"]]

57+ ,Cell ("",[],[]) Nothing 1 1

58+ [Plain [Str "12"]]

59+ ,Cell ("",[],[]) Nothing 1 1

60+ [Plain [Str "12"]]]

61+ ,Row ("",[],[])

62+ [Cell ("",[],[]) Nothing 1 1

63+ [Plain [Str "123"]]

64+ ,Cell ("",[],[]) Nothing 1 1

65+ [Plain [Str "123"]]

66+ ,Cell ("",[],[]) Nothing 1 1

67+ [Plain [Str "123"]]

68+ ,Cell ("",[],[]) Nothing 1 1

69+ [Plain [Str "123"]]]

70+ ,Row ("",[],[])

71+ [Cell ("",[],[]) Nothing 1 1

72+ [Plain [Str "1"]]

73+ ,Cell ("",[],[]) Nothing 1 1

74+ [Plain [Str "1"]]

75+ ,Cell ("",[],[]) Nothing 1 1

76+ [Plain [Str "1"]]

77+ ,Cell ("",[],[]) Nothing 1 1

78+ [Plain [Str "1"]]]]

79+ []]

test/rst-reader.native+137−57

@@ -244,72 +244,152 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Spa

244244 ,[Str "Continuation",Space,Str "line"]

245245 ,[Str "\160\160and",Space,Str "another"]]

246246,Header 1 ("simple-tables",[],[]) [Str "Simple",Space,Str "Tables"]

247−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

248− [[Plain [Str "col",Space,Str "1"]]

249− ,[Plain [Str "col",Space,Str "2"]]

250− ,[Plain [Str "col",Space,Str "3"]]]

251− [[[Plain [Str "r1",Space,Str "a"]]

252− ,[Plain [Str "b"]]

253− ,[Plain [Str "c"]]]

254− ,[[Plain [Str "r2",Space,Str "d"]]

255− ,[Plain [Str "e"]]

256− ,[Plain [Str "f"]]]]

247+,Table ("",[],[]) (Caption Nothing

248+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

249+ [Row ("",[],[])

250+ [Cell ("",[],[]) Nothing 1 1

251+ [Plain [Str "col",Space,Str "1"]]

252+ ,Cell ("",[],[]) Nothing 1 1

253+ [Plain [Str "col",Space,Str "2"]]

254+ ,Cell ("",[],[]) Nothing 1 1

255+ [Plain [Str "col",Space,Str "3"]]]]

256+ [Row ("",[],[])

257+ [Cell ("",[],[]) Nothing 1 1

258+ [Plain [Str "r1",Space,Str "a"]]

259+ ,Cell ("",[],[]) Nothing 1 1

260+ [Plain [Str "b"]]

261+ ,Cell ("",[],[]) Nothing 1 1

262+ [Plain [Str "c"]]]

263+ ,Row ("",[],[])

264+ [Cell ("",[],[]) Nothing 1 1

265+ [Plain [Str "r2",Space,Str "d"]]

266+ ,Cell ("",[],[]) Nothing 1 1

267+ [Plain [Str "e"]]

268+ ,Cell ("",[],[]) Nothing 1 1

269+ [Plain [Str "f"]]]]

270+ []

257271,Para [Str "Headless"]

258−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

259− [[]

260− ,[]

261− ,[]]

262− [[[Plain [Str "r1",Space,Str "a"]]

263− ,[Plain [Str "b"]]

264− ,[Plain [Str "c"]]]

265− ,[[Plain [Str "r2",Space,Str "d"]]

266− ,[Plain [Str "e"]]

267− ,[Plain [Str "f"]]]]

272+,Table ("",[],[]) (Caption Nothing

273+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

274+ [Row ("",[],[])

275+ [Cell ("",[],[]) Nothing 1 1

276+ []

277+ ,Cell ("",[],[]) Nothing 1 1

278+ []

279+ ,Cell ("",[],[]) Nothing 1 1

280+ []]]

281+ [Row ("",[],[])

282+ [Cell ("",[],[]) Nothing 1 1

283+ [Plain [Str "r1",Space,Str "a"]]

284+ ,Cell ("",[],[]) Nothing 1 1

285+ [Plain [Str "b"]]

286+ ,Cell ("",[],[]) Nothing 1 1

287+ [Plain [Str "c"]]]

288+ ,Row ("",[],[])

289+ [Cell ("",[],[]) Nothing 1 1

290+ [Plain [Str "r2",Space,Str "d"]]

291+ ,Cell ("",[],[]) Nothing 1 1

292+ [Plain [Str "e"]]

293+ ,Cell ("",[],[]) Nothing 1 1

294+ [Plain [Str "f"]]]]

295+ []

268296,Header 1 ("grid-tables",[],[]) [Str "Grid",Space,Str "Tables"]

269−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2375,0.15,0.1625]

270− [[Plain [Str "col",Space,Str "1"]]

271− ,[Plain [Str "col",Space,Str "2"]]

272− ,[Plain [Str "col",Space,Str "3"]]]

273− [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]

274− ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]

275− ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]

276− ,[[Plain [Str "r2",Space,Str "d"]]

277− ,[Plain [Str "e"]]

278− ,[Plain [Str "f"]]]]

297+,Table ("",[],[]) (Caption Nothing

298+ []) [(AlignDefault,Just 0.2375),(AlignDefault,Just 0.15),(AlignDefault,Just 0.1625)] 0

299+ [Row ("",[],[])

300+ [Cell ("",[],[]) Nothing 1 1

301+ [Plain [Str "col",Space,Str "1"]]

302+ ,Cell ("",[],[]) Nothing 1 1

303+ [Plain [Str "col",Space,Str "2"]]

304+ ,Cell ("",[],[]) Nothing 1 1

305+ [Plain [Str "col",Space,Str "3"]]]]

306+ [Row ("",[],[])

307+ [Cell ("",[],[]) Nothing 1 1

308+ [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]

309+ ,Cell ("",[],[]) Nothing 1 1

310+ [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]

311+ ,Cell ("",[],[]) Nothing 1 1

312+ [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]

313+ ,Row ("",[],[])

314+ [Cell ("",[],[]) Nothing 1 1

315+ [Plain [Str "r2",Space,Str "d"]]

316+ ,Cell ("",[],[]) Nothing 1 1

317+ [Plain [Str "e"]]

318+ ,Cell ("",[],[]) Nothing 1 1

319+ [Plain [Str "f"]]]]

320+ []

279321,Para [Str "Headless"]

280−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2375,0.15,0.1625]

281− [[]

282− ,[]

283− ,[]]

284− [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]

285− ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]

286− ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]

287− ,[[Plain [Str "r2",Space,Str "d"]]

288− ,[Plain [Str "e"]]

289− ,[Plain [Str "f"]]]]

322+,Table ("",[],[]) (Caption Nothing

323+ []) [(AlignDefault,Just 0.2375),(AlignDefault,Just 0.15),(AlignDefault,Just 0.1625)] 0

324+ [Row ("",[],[])

325+ [Cell ("",[],[]) Nothing 1 1

326+ []

327+ ,Cell ("",[],[]) Nothing 1 1

328+ []

329+ ,Cell ("",[],[]) Nothing 1 1

330+ []]]

331+ [Row ("",[],[])

332+ [Cell ("",[],[]) Nothing 1 1

333+ [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]

334+ ,Cell ("",[],[]) Nothing 1 1

335+ [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]

336+ ,Cell ("",[],[]) Nothing 1 1

337+ [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]

338+ ,Row ("",[],[])

339+ [Cell ("",[],[]) Nothing 1 1

340+ [Plain [Str "r2",Space,Str "d"]]

341+ ,Cell ("",[],[]) Nothing 1 1

342+ [Plain [Str "e"]]

343+ ,Cell ("",[],[]) Nothing 1 1

344+ [Plain [Str "f"]]]]

345+ []

290346,Para [Str "Spaces",Space,Str "at",Space,Str "ends",Space,Str "of",Space,Str "lines"]

291−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2375,0.15,0.1625]

292− [[]

293− ,[]

294− ,[]]

295− [[[Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]

296− ,[Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]

297− ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]

298− ,[[Plain [Str "r2",Space,Str "d"]]

299− ,[Plain [Str "e"]]

300− ,[Plain [Str "f"]]]]

347+,Table ("",[],[]) (Caption Nothing

348+ []) [(AlignDefault,Just 0.2375),(AlignDefault,Just 0.15),(AlignDefault,Just 0.1625)] 0

349+ [Row ("",[],[])

350+ [Cell ("",[],[]) Nothing 1 1

351+ []

352+ ,Cell ("",[],[]) Nothing 1 1

353+ []

354+ ,Cell ("",[],[]) Nothing 1 1

355+ []]]

356+ [Row ("",[],[])

357+ [Cell ("",[],[]) Nothing 1 1

358+ [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]]

359+ ,Cell ("",[],[]) Nothing 1 1

360+ [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]]

361+ ,Cell ("",[],[]) Nothing 1 1

362+ [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]]

363+ ,Row ("",[],[])

364+ [Cell ("",[],[]) Nothing 1 1

365+ [Plain [Str "r2",Space,Str "d"]]

366+ ,Cell ("",[],[]) Nothing 1 1

367+ [Plain [Str "e"]]

368+ ,Cell ("",[],[]) Nothing 1 1

369+ [Plain [Str "f"]]]]

370+ []

301371,Para [Str "Multiple",Space,Str "blocks",Space,Str "in",Space,Str "a",Space,Str "cell"]

302−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.2375,0.15,0.1625]

303− [[]

304− ,[]

305− ,[]]

306− [[[Para [Str "r1",Space,Str "a"]

372+,Table ("",[],[]) (Caption Nothing

373+ []) [(AlignDefault,Just 0.2375),(AlignDefault,Just 0.15),(AlignDefault,Just 0.1625)] 0

374+ [Row ("",[],[])

375+ [Cell ("",[],[]) Nothing 1 1

376+ []

377+ ,Cell ("",[],[]) Nothing 1 1

378+ []

379+ ,Cell ("",[],[]) Nothing 1 1

380+ []]]

381+ [Row ("",[],[])

382+ [Cell ("",[],[]) Nothing 1 1

383+ [Para [Str "r1",Space,Str "a"]

307384 ,Para [Str "r1",Space,Str "bis"]]

308− ,[BulletList

385+ ,Cell ("",[],[]) Nothing 1 1

386+ [BulletList

309387 [[Plain [Str "b"]]

310388 ,[Plain [Str "b",Space,Str "2"]]

311389 ,[Plain [Str "b",Space,Str "2"]]]]

312− ,[Plain [Str "c",SoftBreak,Str "c",Space,Str "2",SoftBreak,Str "c",Space,Str "2"]]]]

390+ ,Cell ("",[],[]) Nothing 1 1

391+ [Plain [Str "c",SoftBreak,Str "c",Space,Str "2",SoftBreak,Str "c",Space,Str "2"]]]]

392+ []

313393,Header 1 ("footnotes",[],[]) [Str "Footnotes"]

314394,Para [Note [Para [Str "Note",Space,Str "with",Space,Str "one",Space,Str "line."]]]

315395,Para [Note [Para [Str "Note",Space,Str "with",SoftBreak,Str "continuation",Space,Str "line."]]]

test/tables-rstsubset.native+246−107

@@ -1,114 +1,253 @@

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

2−,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0,0.0]

3− [[Plain [Str "Right"]]

4− ,[Plain [Str "Left"]]

5− ,[Plain [Str "Center"]]

6− ,[Plain [Str "Default"]]]

7− [[[Plain [Str "12"]]

8− ,[Plain [Str "12"]]

9− ,[Plain [Str "12"]]

10− ,[Plain [Str "12"]]]

11− ,[[Plain [Str "123"]]

12− ,[Plain [Str "123"]]

13− ,[Plain [Str "123"]]

14− ,[Plain [Str "123"]]]

15− ,[[Plain [Str "1"]]

16− ,[Plain [Str "1"]]

17− ,[Plain [Str "1"]]

18− ,[Plain [Str "1"]]]]

2+,Table ("",[],[]) (Caption Nothing

3+ [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

4+ [Row ("",[],[])

5+ [Cell ("",[],[]) Nothing 1 1

6+ [Plain [Str "Right"]]

7+ ,Cell ("",[],[]) Nothing 1 1

8+ [Plain [Str "Left"]]

9+ ,Cell ("",[],[]) Nothing 1 1

10+ [Plain [Str "Center"]]

11+ ,Cell ("",[],[]) Nothing 1 1

12+ [Plain [Str "Default"]]]]

13+ [Row ("",[],[])

14+ [Cell ("",[],[]) Nothing 1 1

15+ [Plain [Str "12"]]

16+ ,Cell ("",[],[]) Nothing 1 1

17+ [Plain [Str "12"]]

18+ ,Cell ("",[],[]) Nothing 1 1

19+ [Plain [Str "12"]]

20+ ,Cell ("",[],[]) Nothing 1 1

21+ [Plain [Str "12"]]]

22+ ,Row ("",[],[])

23+ [Cell ("",[],[]) Nothing 1 1

24+ [Plain [Str "123"]]

25+ ,Cell ("",[],[]) Nothing 1 1

26+ [Plain [Str "123"]]

27+ ,Cell ("",[],[]) Nothing 1 1

28+ [Plain [Str "123"]]

29+ ,Cell ("",[],[]) Nothing 1 1

30+ [Plain [Str "123"]]]

31+ ,Row ("",[],[])

32+ [Cell ("",[],[]) Nothing 1 1

33+ [Plain [Str "1"]]

34+ ,Cell ("",[],[]) Nothing 1 1

35+ [Plain [Str "1"]]

36+ ,Cell ("",[],[]) Nothing 1 1

37+ [Plain [Str "1"]]

38+ ,Cell ("",[],[]) Nothing 1 1

39+ [Plain [Str "1"]]]]

40+ []

1941,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"]

20−,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0,0.0]

21− [[Plain [Str "Right"]]

22− ,[Plain [Str "Left"]]

23− ,[Plain [Str "Center"]]

24− ,[Plain [Str "Default"]]]

25− [[[Plain [Str "12"]]

26− ,[Plain [Str "12"]]

27− ,[Plain [Str "12"]]

28− ,[Plain [Str "12"]]]

29− ,[[Plain [Str "123"]]

30− ,[Plain [Str "123"]]

31− ,[Plain [Str "123"]]

32− ,[Plain [Str "123"]]]

33− ,[[Plain [Str "1"]]

34− ,[Plain [Str "1"]]

35− ,[Plain [Str "1"]]

36− ,[Plain [Str "1"]]]]

42+,Table ("",[],[]) (Caption Nothing

43+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

44+ [Row ("",[],[])

45+ [Cell ("",[],[]) Nothing 1 1

46+ [Plain [Str "Right"]]

47+ ,Cell ("",[],[]) Nothing 1 1

48+ [Plain [Str "Left"]]

49+ ,Cell ("",[],[]) Nothing 1 1

50+ [Plain [Str "Center"]]

51+ ,Cell ("",[],[]) Nothing 1 1

52+ [Plain [Str "Default"]]]]

53+ [Row ("",[],[])

54+ [Cell ("",[],[]) Nothing 1 1

55+ [Plain [Str "12"]]

56+ ,Cell ("",[],[]) Nothing 1 1

57+ [Plain [Str "12"]]

58+ ,Cell ("",[],[]) Nothing 1 1

59+ [Plain [Str "12"]]

60+ ,Cell ("",[],[]) Nothing 1 1

61+ [Plain [Str "12"]]]

62+ ,Row ("",[],[])

63+ [Cell ("",[],[]) Nothing 1 1

64+ [Plain [Str "123"]]

65+ ,Cell ("",[],[]) Nothing 1 1

66+ [Plain [Str "123"]]

67+ ,Cell ("",[],[]) Nothing 1 1

68+ [Plain [Str "123"]]

69+ ,Cell ("",[],[]) Nothing 1 1

70+ [Plain [Str "123"]]]

71+ ,Row ("",[],[])

72+ [Cell ("",[],[]) Nothing 1 1

73+ [Plain [Str "1"]]

74+ ,Cell ("",[],[]) Nothing 1 1

75+ [Plain [Str "1"]]

76+ ,Cell ("",[],[]) Nothing 1 1

77+ [Plain [Str "1"]]

78+ ,Cell ("",[],[]) Nothing 1 1

79+ [Plain [Str "1"]]]]

80+ []

3781,Para [Str "Simple",Space,Str "table",Space,Str "indented",Space,Str "two",Space,Str "spaces:"]

38−,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0,0.0]

39− [[Plain [Str "Right"]]

40− ,[Plain [Str "Left"]]

41− ,[Plain [Str "Center"]]

42− ,[Plain [Str "Default"]]]

43− [[[Plain [Str "12"]]

44− ,[Plain [Str "12"]]

45− ,[Plain [Str "12"]]

46− ,[Plain [Str "12"]]]

47− ,[[Plain [Str "123"]]

48− ,[Plain [Str "123"]]

49− ,[Plain [Str "123"]]

50− ,[Plain [Str "123"]]]

51− ,[[Plain [Str "1"]]

52− ,[Plain [Str "1"]]

53− ,[Plain [Str "1"]]

54− ,[Plain [Str "1"]]]]

82+,Table ("",[],[]) (Caption Nothing

83+ [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

84+ [Row ("",[],[])

85+ [Cell ("",[],[]) Nothing 1 1

86+ [Plain [Str "Right"]]

87+ ,Cell ("",[],[]) Nothing 1 1

88+ [Plain [Str "Left"]]

89+ ,Cell ("",[],[]) Nothing 1 1

90+ [Plain [Str "Center"]]

91+ ,Cell ("",[],[]) Nothing 1 1

92+ [Plain [Str "Default"]]]]

93+ [Row ("",[],[])

94+ [Cell ("",[],[]) Nothing 1 1

95+ [Plain [Str "12"]]

96+ ,Cell ("",[],[]) Nothing 1 1

97+ [Plain [Str "12"]]

98+ ,Cell ("",[],[]) Nothing 1 1

99+ [Plain [Str "12"]]

100+ ,Cell ("",[],[]) Nothing 1 1

101+ [Plain [Str "12"]]]

102+ ,Row ("",[],[])

103+ [Cell ("",[],[]) Nothing 1 1

104+ [Plain [Str "123"]]

105+ ,Cell ("",[],[]) Nothing 1 1

106+ [Plain [Str "123"]]

107+ ,Cell ("",[],[]) Nothing 1 1

108+ [Plain [Str "123"]]

109+ ,Cell ("",[],[]) Nothing 1 1

110+ [Plain [Str "123"]]]

111+ ,Row ("",[],[])

112+ [Cell ("",[],[]) Nothing 1 1

113+ [Plain [Str "1"]]

114+ ,Cell ("",[],[]) Nothing 1 1

115+ [Plain [Str "1"]]

116+ ,Cell ("",[],[]) Nothing 1 1

117+ [Plain [Str "1"]]

118+ ,Cell ("",[],[]) Nothing 1 1

119+ [Plain [Str "1"]]]]

120+ []

55121,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"]

56−,Table [Str "Here\8217s",Space,Str "the",Space,Str "caption.",Space,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.3375]

57− [[Plain [Str "Centered",SoftBreak,Str "Header"]]

58− ,[Plain [Str "Left",SoftBreak,Str "Aligned"]]

59− ,[Plain [Str "Right",SoftBreak,Str "Aligned"]]

60− ,[Plain [Str "Default",Space,Str "aligned"]]]

61− [[[Plain [Str "First"]]

62− ,[Plain [Str "row"]]

63− ,[Plain [Str "12.0"]]

64− ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]]

65− ,[[Plain [Str "Second"]]

66− ,[Plain [Str "row"]]

67− ,[Plain [Str "5.0"]]

68− ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]]

122+,Table ("",[],[]) (Caption Nothing

123+ [Para [Str "Here\8217s",Space,Str "the",Space,Str "caption.",Space,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."]]) [(AlignDefault,Just 0.1375),(AlignDefault,Just 0.125),(AlignDefault,Just 0.15),(AlignDefault,Just 0.3375)] 0

124+ [Row ("",[],[])

125+ [Cell ("",[],[]) Nothing 1 1

126+ [Plain [Str "Centered",SoftBreak,Str "Header"]]

127+ ,Cell ("",[],[]) Nothing 1 1

128+ [Plain [Str "Left",SoftBreak,Str "Aligned"]]

129+ ,Cell ("",[],[]) Nothing 1 1

130+ [Plain [Str "Right",SoftBreak,Str "Aligned"]]

131+ ,Cell ("",[],[]) Nothing 1 1

132+ [Plain [Str "Default",Space,Str "aligned"]]]]

133+ [Row ("",[],[])

134+ [Cell ("",[],[]) Nothing 1 1

135+ [Plain [Str "First"]]

136+ ,Cell ("",[],[]) Nothing 1 1

137+ [Plain [Str "row"]]

138+ ,Cell ("",[],[]) Nothing 1 1

139+ [Plain [Str "12.0"]]

140+ ,Cell ("",[],[]) Nothing 1 1

141+ [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]]

142+ ,Row ("",[],[])

143+ [Cell ("",[],[]) Nothing 1 1

144+ [Plain [Str "Second"]]

145+ ,Cell ("",[],[]) Nothing 1 1

146+ [Plain [Str "row"]]

147+ ,Cell ("",[],[]) Nothing 1 1

148+ [Plain [Str "5.0"]]

149+ ,Cell ("",[],[]) Nothing 1 1

150+ [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]]

151+ []

69152,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"]

70−,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.3375]

71− [[Plain [Str "Centered",SoftBreak,Str "Header"]]

72− ,[Plain [Str "Left",SoftBreak,Str "Aligned"]]

73− ,[Plain [Str "Right",SoftBreak,Str "Aligned"]]

74− ,[Plain [Str "Default",Space,Str "aligned"]]]

75− [[[Plain [Str "First"]]

76− ,[Plain [Str "row"]]

77− ,[Plain [Str "12.0"]]

78− ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]]

79− ,[[Plain [Str "Second"]]

80− ,[Plain [Str "row"]]

81− ,[Plain [Str "5.0"]]

82− ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]]

153+,Table ("",[],[]) (Caption Nothing

154+ []) [(AlignDefault,Just 0.1375),(AlignDefault,Just 0.125),(AlignDefault,Just 0.15),(AlignDefault,Just 0.3375)] 0

155+ [Row ("",[],[])

156+ [Cell ("",[],[]) Nothing 1 1

157+ [Plain [Str "Centered",SoftBreak,Str "Header"]]

158+ ,Cell ("",[],[]) Nothing 1 1

159+ [Plain [Str "Left",SoftBreak,Str "Aligned"]]

160+ ,Cell ("",[],[]) Nothing 1 1

161+ [Plain [Str "Right",SoftBreak,Str "Aligned"]]

162+ ,Cell ("",[],[]) Nothing 1 1

163+ [Plain [Str "Default",Space,Str "aligned"]]]]

164+ [Row ("",[],[])

165+ [Cell ("",[],[]) Nothing 1 1

166+ [Plain [Str "First"]]

167+ ,Cell ("",[],[]) Nothing 1 1

168+ [Plain [Str "row"]]

169+ ,Cell ("",[],[]) Nothing 1 1

170+ [Plain [Str "12.0"]]

171+ ,Cell ("",[],[]) Nothing 1 1

172+ [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]]

173+ ,Row ("",[],[])

174+ [Cell ("",[],[]) Nothing 1 1

175+ [Plain [Str "Second"]]

176+ ,Cell ("",[],[]) Nothing 1 1

177+ [Plain [Str "row"]]

178+ ,Cell ("",[],[]) Nothing 1 1

179+ [Plain [Str "5.0"]]

180+ ,Cell ("",[],[]) Nothing 1 1

181+ [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]]

182+ []

83183,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"]

84−,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0,0.0]

85− [[]

86− ,[]

87− ,[]

88− ,[]]

89− [[[Plain [Str "12"]]

90− ,[Plain [Str "12"]]

91− ,[Plain [Str "12"]]

92− ,[Plain [Str "12"]]]

93− ,[[Plain [Str "123"]]

94− ,[Plain [Str "123"]]

95− ,[Plain [Str "123"]]

96− ,[Plain [Str "123"]]]

97− ,[[Plain [Str "1"]]

98− ,[Plain [Str "1"]]

99− ,[Plain [Str "1"]]

100− ,[Plain [Str "1"]]]]

184+,Table ("",[],[]) (Caption Nothing

185+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

186+ [Row ("",[],[])

187+ [Cell ("",[],[]) Nothing 1 1

188+ []

189+ ,Cell ("",[],[]) Nothing 1 1

190+ []

191+ ,Cell ("",[],[]) Nothing 1 1

192+ []

193+ ,Cell ("",[],[]) Nothing 1 1

194+ []]]

195+ [Row ("",[],[])

196+ [Cell ("",[],[]) Nothing 1 1

197+ [Plain [Str "12"]]

198+ ,Cell ("",[],[]) Nothing 1 1

199+ [Plain [Str "12"]]

200+ ,Cell ("",[],[]) Nothing 1 1

201+ [Plain [Str "12"]]

202+ ,Cell ("",[],[]) Nothing 1 1

203+ [Plain [Str "12"]]]

204+ ,Row ("",[],[])

205+ [Cell ("",[],[]) Nothing 1 1

206+ [Plain [Str "123"]]

207+ ,Cell ("",[],[]) Nothing 1 1

208+ [Plain [Str "123"]]

209+ ,Cell ("",[],[]) Nothing 1 1

210+ [Plain [Str "123"]]

211+ ,Cell ("",[],[]) Nothing 1 1

212+ [Plain [Str "123"]]]

213+ ,Row ("",[],[])

214+ [Cell ("",[],[]) Nothing 1 1

215+ [Plain [Str "1"]]

216+ ,Cell ("",[],[]) Nothing 1 1

217+ [Plain [Str "1"]]

218+ ,Cell ("",[],[]) Nothing 1 1

219+ [Plain [Str "1"]]

220+ ,Cell ("",[],[]) Nothing 1 1

221+ [Plain [Str "1"]]]]

222+ []

101223,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"]

102−,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.1375,0.125,0.15,0.3375]

103− [[]

104− ,[]

105− ,[]

106− ,[]]

107− [[[Plain [Str "First"]]

108− ,[Plain [Str "row"]]

109− ,[Plain [Str "12.0"]]

110− ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]]

111− ,[[Plain [Str "Second"]]

112− ,[Plain [Str "row"]]

113− ,[Plain [Str "5.0"]]

114− ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]]]

224+,Table ("",[],[]) (Caption Nothing

225+ []) [(AlignDefault,Just 0.1375),(AlignDefault,Just 0.125),(AlignDefault,Just 0.15),(AlignDefault,Just 0.3375)] 0

226+ [Row ("",[],[])

227+ [Cell ("",[],[]) Nothing 1 1

228+ []

229+ ,Cell ("",[],[]) Nothing 1 1

230+ []

231+ ,Cell ("",[],[]) Nothing 1 1

232+ []

233+ ,Cell ("",[],[]) Nothing 1 1

234+ []]]

235+ [Row ("",[],[])

236+ [Cell ("",[],[]) Nothing 1 1

237+ [Plain [Str "First"]]

238+ ,Cell ("",[],[]) Nothing 1 1

239+ [Plain [Str "row"]]

240+ ,Cell ("",[],[]) Nothing 1 1

241+ [Plain [Str "12.0"]]

242+ ,Cell ("",[],[]) Nothing 1 1

243+ [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]]

244+ ,Row ("",[],[])

245+ [Cell ("",[],[]) Nothing 1 1

246+ [Plain [Str "Second"]]

247+ ,Cell ("",[],[]) Nothing 1 1

248+ [Plain [Str "row"]]

249+ ,Cell ("",[],[]) Nothing 1 1

250+ [Plain [Str "5.0"]]

251+ ,Cell ("",[],[]) Nothing 1 1

252+ [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",SoftBreak,Str "rows."]]]]

253+ []]

test/tables.native+246−107

@@ -1,114 +1,253 @@

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

2−,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0]

3− [[Plain [Str "Right"]]

4− ,[Plain [Str "Left"]]

5− ,[Plain [Str "Center"]]

6− ,[Plain [Str "Default"]]]

7− [[[Plain [Str "12"]]

8− ,[Plain [Str "12"]]

9− ,[Plain [Str "12"]]

10− ,[Plain [Str "12"]]]

11− ,[[Plain [Str "123"]]

12− ,[Plain [Str "123"]]

13− ,[Plain [Str "123"]]

14− ,[Plain [Str "123"]]]

15− ,[[Plain [Str "1"]]

16− ,[Plain [Str "1"]]

17− ,[Plain [Str "1"]]

18− ,[Plain [Str "1"]]]]

2+,Table ("",[],[]) (Caption Nothing

3+ [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignDefault,Nothing)] 0

4+ [Row ("",[],[])

5+ [Cell ("",[],[]) Nothing 1 1

6+ [Plain [Str "Right"]]

7+ ,Cell ("",[],[]) Nothing 1 1

8+ [Plain [Str "Left"]]

9+ ,Cell ("",[],[]) Nothing 1 1

10+ [Plain [Str "Center"]]

11+ ,Cell ("",[],[]) Nothing 1 1

12+ [Plain [Str "Default"]]]]

13+ [Row ("",[],[])

14+ [Cell ("",[],[]) Nothing 1 1

15+ [Plain [Str "12"]]

16+ ,Cell ("",[],[]) Nothing 1 1

17+ [Plain [Str "12"]]

18+ ,Cell ("",[],[]) Nothing 1 1

19+ [Plain [Str "12"]]

20+ ,Cell ("",[],[]) Nothing 1 1

21+ [Plain [Str "12"]]]

22+ ,Row ("",[],[])

23+ [Cell ("",[],[]) Nothing 1 1

24+ [Plain [Str "123"]]

25+ ,Cell ("",[],[]) Nothing 1 1

26+ [Plain [Str "123"]]

27+ ,Cell ("",[],[]) Nothing 1 1

28+ [Plain [Str "123"]]

29+ ,Cell ("",[],[]) Nothing 1 1

30+ [Plain [Str "123"]]]

31+ ,Row ("",[],[])

32+ [Cell ("",[],[]) Nothing 1 1

33+ [Plain [Str "1"]]

34+ ,Cell ("",[],[]) Nothing 1 1

35+ [Plain [Str "1"]]

36+ ,Cell ("",[],[]) Nothing 1 1

37+ [Plain [Str "1"]]

38+ ,Cell ("",[],[]) Nothing 1 1

39+ [Plain [Str "1"]]]]

40+ []

1941,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"]

20−,Table [] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0]

21− [[Plain [Str "Right"]]

22− ,[Plain [Str "Left"]]

23− ,[Plain [Str "Center"]]

24− ,[Plain [Str "Default"]]]

25− [[[Plain [Str "12"]]

26− ,[Plain [Str "12"]]

27− ,[Plain [Str "12"]]

28− ,[Plain [Str "12"]]]

29− ,[[Plain [Str "123"]]

30− ,[Plain [Str "123"]]

31− ,[Plain [Str "123"]]

32− ,[Plain [Str "123"]]]

33− ,[[Plain [Str "1"]]

34− ,[Plain [Str "1"]]

35− ,[Plain [Str "1"]]

36− ,[Plain [Str "1"]]]]

42+,Table ("",[],[]) (Caption Nothing

43+ []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignDefault,Nothing)] 0

44+ [Row ("",[],[])

45+ [Cell ("",[],[]) Nothing 1 1

46+ [Plain [Str "Right"]]

47+ ,Cell ("",[],[]) Nothing 1 1

48+ [Plain [Str "Left"]]

49+ ,Cell ("",[],[]) Nothing 1 1

50+ [Plain [Str "Center"]]

51+ ,Cell ("",[],[]) Nothing 1 1

52+ [Plain [Str "Default"]]]]

53+ [Row ("",[],[])

54+ [Cell ("",[],[]) Nothing 1 1

55+ [Plain [Str "12"]]

56+ ,Cell ("",[],[]) Nothing 1 1

57+ [Plain [Str "12"]]

58+ ,Cell ("",[],[]) Nothing 1 1

59+ [Plain [Str "12"]]

60+ ,Cell ("",[],[]) Nothing 1 1

61+ [Plain [Str "12"]]]

62+ ,Row ("",[],[])

63+ [Cell ("",[],[]) Nothing 1 1

64+ [Plain [Str "123"]]

65+ ,Cell ("",[],[]) Nothing 1 1

66+ [Plain [Str "123"]]

67+ ,Cell ("",[],[]) Nothing 1 1

68+ [Plain [Str "123"]]

69+ ,Cell ("",[],[]) Nothing 1 1

70+ [Plain [Str "123"]]]

71+ ,Row ("",[],[])

72+ [Cell ("",[],[]) Nothing 1 1

73+ [Plain [Str "1"]]

74+ ,Cell ("",[],[]) Nothing 1 1

75+ [Plain [Str "1"]]

76+ ,Cell ("",[],[]) Nothing 1 1

77+ [Plain [Str "1"]]

78+ ,Cell ("",[],[]) Nothing 1 1

79+ [Plain [Str "1"]]]]

80+ []

3781,Para [Str "Simple",Space,Str "table",Space,Str "indented",Space,Str "two",Space,Str "spaces:"]

38−,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0]

39− [[Plain [Str "Right"]]

40− ,[Plain [Str "Left"]]

41− ,[Plain [Str "Center"]]

42− ,[Plain [Str "Default"]]]

43− [[[Plain [Str "12"]]

44− ,[Plain [Str "12"]]

45− ,[Plain [Str "12"]]

46− ,[Plain [Str "12"]]]

47− ,[[Plain [Str "123"]]

48− ,[Plain [Str "123"]]

49− ,[Plain [Str "123"]]

50− ,[Plain [Str "123"]]]

51− ,[[Plain [Str "1"]]

52− ,[Plain [Str "1"]]

53− ,[Plain [Str "1"]]

54− ,[Plain [Str "1"]]]]

82+,Table ("",[],[]) (Caption Nothing

83+ [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignDefault,Nothing)] 0

84+ [Row ("",[],[])

85+ [Cell ("",[],[]) Nothing 1 1

86+ [Plain [Str "Right"]]

87+ ,Cell ("",[],[]) Nothing 1 1

88+ [Plain [Str "Left"]]

89+ ,Cell ("",[],[]) Nothing 1 1

90+ [Plain [Str "Center"]]

91+ ,Cell ("",[],[]) Nothing 1 1

92+ [Plain [Str "Default"]]]]

93+ [Row ("",[],[])

94+ [Cell ("",[],[]) Nothing 1 1

95+ [Plain [Str "12"]]

96+ ,Cell ("",[],[]) Nothing 1 1

97+ [Plain [Str "12"]]

98+ ,Cell ("",[],[]) Nothing 1 1

99+ [Plain [Str "12"]]

100+ ,Cell ("",[],[]) Nothing 1 1

101+ [Plain [Str "12"]]]

102+ ,Row ("",[],[])

103+ [Cell ("",[],[]) Nothing 1 1

104+ [Plain [Str "123"]]

105+ ,Cell ("",[],[]) Nothing 1 1

106+ [Plain [Str "123"]]

107+ ,Cell ("",[],[]) Nothing 1 1

108+ [Plain [Str "123"]]

109+ ,Cell ("",[],[]) Nothing 1 1

110+ [Plain [Str "123"]]]

111+ ,Row ("",[],[])

112+ [Cell ("",[],[]) Nothing 1 1

113+ [Plain [Str "1"]]

114+ ,Cell ("",[],[]) Nothing 1 1

115+ [Plain [Str "1"]]

116+ ,Cell ("",[],[]) Nothing 1 1

117+ [Plain [Str "1"]]

118+ ,Cell ("",[],[]) Nothing 1 1

119+ [Plain [Str "1"]]]]

120+ []

55121,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"]

56−,Table [Str "Here\8217s",Space,Str "the",Space,Str "caption.",SoftBreak,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.15,0.1375,0.1625,0.35]

57− [[Plain [Str "Centered",SoftBreak,Str "Header"]]

58− ,[Plain [Str "Left",SoftBreak,Str "Aligned"]]

59− ,[Plain [Str "Right",SoftBreak,Str "Aligned"]]

60− ,[Plain [Str "Default",Space,Str "aligned"]]]

61− [[[Plain [Str "First"]]

62− ,[Plain [Str "row"]]

63− ,[Plain [Str "12.0"]]

64− ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]]

65− ,[[Plain [Str "Second"]]

66− ,[Plain [Str "row"]]

67− ,[Plain [Str "5.0"]]

68− ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]

122+,Table ("",[],[]) (Caption Nothing

123+ [Para [Str "Here\8217s",Space,Str "the",Space,Str "caption.",SoftBreak,Str "It",Space,Str "may",Space,Str "span",Space,Str "multiple",Space,Str "lines."]]) [(AlignCenter,Just 0.15),(AlignLeft,Just 0.1375),(AlignRight,Just 0.1625),(AlignLeft,Just 0.35)] 0

124+ [Row ("",[],[])

125+ [Cell ("",[],[]) Nothing 1 1

126+ [Plain [Str "Centered",SoftBreak,Str "Header"]]

127+ ,Cell ("",[],[]) Nothing 1 1

128+ [Plain [Str "Left",SoftBreak,Str "Aligned"]]

129+ ,Cell ("",[],[]) Nothing 1 1

130+ [Plain [Str "Right",SoftBreak,Str "Aligned"]]

131+ ,Cell ("",[],[]) Nothing 1 1

132+ [Plain [Str "Default",Space,Str "aligned"]]]]

133+ [Row ("",[],[])

134+ [Cell ("",[],[]) Nothing 1 1

135+ [Plain [Str "First"]]

136+ ,Cell ("",[],[]) Nothing 1 1

137+ [Plain [Str "row"]]

138+ ,Cell ("",[],[]) Nothing 1 1

139+ [Plain [Str "12.0"]]

140+ ,Cell ("",[],[]) Nothing 1 1

141+ [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]]

142+ ,Row ("",[],[])

143+ [Cell ("",[],[]) Nothing 1 1

144+ [Plain [Str "Second"]]

145+ ,Cell ("",[],[]) Nothing 1 1

146+ [Plain [Str "row"]]

147+ ,Cell ("",[],[]) Nothing 1 1

148+ [Plain [Str "5.0"]]

149+ ,Cell ("",[],[]) Nothing 1 1

150+ [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]

151+ []

69152,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"]

70−,Table [] [AlignCenter,AlignLeft,AlignRight,AlignLeft] [0.15,0.1375,0.1625,0.35]

71− [[Plain [Str "Centered",SoftBreak,Str "Header"]]

72− ,[Plain [Str "Left",SoftBreak,Str "Aligned"]]

73− ,[Plain [Str "Right",SoftBreak,Str "Aligned"]]

74− ,[Plain [Str "Default",Space,Str "aligned"]]]

75− [[[Plain [Str "First"]]

76− ,[Plain [Str "row"]]

77− ,[Plain [Str "12.0"]]

78− ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]]

79− ,[[Plain [Str "Second"]]

80− ,[Plain [Str "row"]]

81− ,[Plain [Str "5.0"]]

82− ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]

153+,Table ("",[],[]) (Caption Nothing

154+ []) [(AlignCenter,Just 0.15),(AlignLeft,Just 0.1375),(AlignRight,Just 0.1625),(AlignLeft,Just 0.35)] 0

155+ [Row ("",[],[])

156+ [Cell ("",[],[]) Nothing 1 1

157+ [Plain [Str "Centered",SoftBreak,Str "Header"]]

158+ ,Cell ("",[],[]) Nothing 1 1

159+ [Plain [Str "Left",SoftBreak,Str "Aligned"]]

160+ ,Cell ("",[],[]) Nothing 1 1

161+ [Plain [Str "Right",SoftBreak,Str "Aligned"]]

162+ ,Cell ("",[],[]) Nothing 1 1

163+ [Plain [Str "Default",Space,Str "aligned"]]]]

164+ [Row ("",[],[])

165+ [Cell ("",[],[]) Nothing 1 1

166+ [Plain [Str "First"]]

167+ ,Cell ("",[],[]) Nothing 1 1

168+ [Plain [Str "row"]]

169+ ,Cell ("",[],[]) Nothing 1 1

170+ [Plain [Str "12.0"]]

171+ ,Cell ("",[],[]) Nothing 1 1

172+ [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]]

173+ ,Row ("",[],[])

174+ [Cell ("",[],[]) Nothing 1 1

175+ [Plain [Str "Second"]]

176+ ,Cell ("",[],[]) Nothing 1 1

177+ [Plain [Str "row"]]

178+ ,Cell ("",[],[]) Nothing 1 1

179+ [Plain [Str "5.0"]]

180+ ,Cell ("",[],[]) Nothing 1 1

181+ [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]

182+ []

83183,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"]

84−,Table [] [AlignRight,AlignLeft,AlignCenter,AlignRight] [0.0,0.0,0.0,0.0]

85− [[]

86− ,[]

87− ,[]

88− ,[]]

89− [[[Plain [Str "12"]]

90− ,[Plain [Str "12"]]

91− ,[Plain [Str "12"]]

92− ,[Plain [Str "12"]]]

93− ,[[Plain [Str "123"]]

94− ,[Plain [Str "123"]]

95− ,[Plain [Str "123"]]

96− ,[Plain [Str "123"]]]

97− ,[[Plain [Str "1"]]

98− ,[Plain [Str "1"]]

99− ,[Plain [Str "1"]]

100− ,[Plain [Str "1"]]]]

184+,Table ("",[],[]) (Caption Nothing

185+ []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0

186+ [Row ("",[],[])

187+ [Cell ("",[],[]) Nothing 1 1

188+ []

189+ ,Cell ("",[],[]) Nothing 1 1

190+ []

191+ ,Cell ("",[],[]) Nothing 1 1

192+ []

193+ ,Cell ("",[],[]) Nothing 1 1

194+ []]]

195+ [Row ("",[],[])

196+ [Cell ("",[],[]) Nothing 1 1

197+ [Plain [Str "12"]]

198+ ,Cell ("",[],[]) Nothing 1 1

199+ [Plain [Str "12"]]

200+ ,Cell ("",[],[]) Nothing 1 1

201+ [Plain [Str "12"]]

202+ ,Cell ("",[],[]) Nothing 1 1

203+ [Plain [Str "12"]]]

204+ ,Row ("",[],[])

205+ [Cell ("",[],[]) Nothing 1 1

206+ [Plain [Str "123"]]

207+ ,Cell ("",[],[]) Nothing 1 1

208+ [Plain [Str "123"]]

209+ ,Cell ("",[],[]) Nothing 1 1

210+ [Plain [Str "123"]]

211+ ,Cell ("",[],[]) Nothing 1 1

212+ [Plain [Str "123"]]]

213+ ,Row ("",[],[])

214+ [Cell ("",[],[]) Nothing 1 1

215+ [Plain [Str "1"]]

216+ ,Cell ("",[],[]) Nothing 1 1

217+ [Plain [Str "1"]]

218+ ,Cell ("",[],[]) Nothing 1 1

219+ [Plain [Str "1"]]

220+ ,Cell ("",[],[]) Nothing 1 1

221+ [Plain [Str "1"]]]]

222+ []

101223,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"]

102−,Table [] [AlignCenter,AlignLeft,AlignRight,AlignDefault] [0.15,0.1375,0.1625,0.35]

103− [[]

104− ,[]

105− ,[]

106− ,[]]

107− [[[Plain [Str "First"]]

108− ,[Plain [Str "row"]]

109− ,[Plain [Str "12.0"]]

110− ,[Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]]

111− ,[[Plain [Str "Second"]]

112− ,[Plain [Str "row"]]

113− ,[Plain [Str "5.0"]]

114− ,[Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]]

224+,Table ("",[],[]) (Caption Nothing

225+ []) [(AlignCenter,Just 0.15),(AlignLeft,Just 0.1375),(AlignRight,Just 0.1625),(AlignDefault,Just 0.35)] 0

226+ [Row ("",[],[])

227+ [Cell ("",[],[]) Nothing 1 1

228+ []

229+ ,Cell ("",[],[]) Nothing 1 1

230+ []

231+ ,Cell ("",[],[]) Nothing 1 1

232+ []

233+ ,Cell ("",[],[]) Nothing 1 1

234+ []]]

235+ [Row ("",[],[])

236+ [Cell ("",[],[]) Nothing 1 1

237+ [Plain [Str "First"]]

238+ ,Cell ("",[],[]) Nothing 1 1

239+ [Plain [Str "row"]]

240+ ,Cell ("",[],[]) Nothing 1 1

241+ [Plain [Str "12.0"]]

242+ ,Cell ("",[],[]) Nothing 1 1

243+ [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]]

244+ ,Row ("",[],[])

245+ [Cell ("",[],[]) Nothing 1 1

246+ [Plain [Str "Second"]]

247+ ,Cell ("",[],[]) Nothing 1 1

248+ [Plain [Str "row"]]

249+ ,Cell ("",[],[]) Nothing 1 1

250+ [Plain [Str "5.0"]]

251+ ,Cell ("",[],[]) Nothing 1 1

252+ [Plain [Str "Here\8217s",Space,Str "another",Space,Str "one.",Space,Str "Note",SoftBreak,Str "the",Space,Str "blank",Space,Str "line",Space,Str "between",Space,Str "rows."]]]]

253+ []]

test/textile-reader.native+93−39

@@ -103,37 +103,77 @@ Pandoc (Meta {unMeta = fromList []})

103103,Header 1 ("tables",[],[]) [Str "Tables"]

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"]

106−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

107− [[]

108− ,[]

109− ,[]]

110− [[[Plain [Str "name"]]

111− ,[Plain [Str "age"]]

112− ,[Plain [Str "sex"]]]

113− ,[[Plain [Str "joan"]]

114− ,[Plain [Str "24"]]

115− ,[Plain [Str "f"]]]

116− ,[[Plain [Str "archie"]]

117− ,[Plain [Str "29"]]

118− ,[Plain [Str "m"]]]

119− ,[[Plain [Str "bella"]]

120− ,[Plain [Str "45"]]

121− ,[Plain [Str "f"]]]]

106+,Table ("",[],[]) (Caption Nothing

107+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

108+ [Row ("",[],[])

109+ [Cell ("",[],[]) Nothing 1 1

110+ []

111+ ,Cell ("",[],[]) Nothing 1 1

112+ []

113+ ,Cell ("",[],[]) Nothing 1 1

114+ []]]

115+ [Row ("",[],[])

116+ [Cell ("",[],[]) Nothing 1 1

117+ [Plain [Str "name"]]

118+ ,Cell ("",[],[]) Nothing 1 1

119+ [Plain [Str "age"]]

120+ ,Cell ("",[],[]) Nothing 1 1

121+ [Plain [Str "sex"]]]

122+ ,Row ("",[],[])

123+ [Cell ("",[],[]) Nothing 1 1

124+ [Plain [Str "joan"]]

125+ ,Cell ("",[],[]) Nothing 1 1

126+ [Plain [Str "24"]]

127+ ,Cell ("",[],[]) Nothing 1 1

128+ [Plain [Str "f"]]]

129+ ,Row ("",[],[])

130+ [Cell ("",[],[]) Nothing 1 1

131+ [Plain [Str "archie"]]

132+ ,Cell ("",[],[]) Nothing 1 1

133+ [Plain [Str "29"]]

134+ ,Cell ("",[],[]) Nothing 1 1

135+ [Plain [Str "m"]]]

136+ ,Row ("",[],[])

137+ [Cell ("",[],[]) Nothing 1 1

138+ [Plain [Str "bella"]]

139+ ,Cell ("",[],[]) Nothing 1 1

140+ [Plain [Str "45"]]

141+ ,Cell ("",[],[]) Nothing 1 1

142+ [Plain [Str "f"]]]]

143+ []

122144,Para [Str "and",Space,Str "some",Space,Str "text",Space,Str "following",Space,Str "\8230"]

123145,Header 2 ("with-headers",[],[]) [Str "With",Space,Str "headers"]

124−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

125− [[Plain [Str "name"]]

126− ,[Plain [Str "age"]]

127− ,[Plain [Str "sex"]]]

128− [[[Plain [Str "joan"]]

129− ,[Plain [Str "24"]]

130− ,[Plain [Str "f"]]]

131− ,[[Plain [Str "archie"]]

132− ,[Plain [Str "29"]]

133− ,[Plain [Str "m"]]]

134− ,[[Plain [Str "bella"]]

135− ,[Plain [Str "45"]]

136− ,[Plain [Str "f"]]]]

146+,Table ("",[],[]) (Caption Nothing

147+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

148+ [Row ("",[],[])

149+ [Cell ("",[],[]) Nothing 1 1

150+ [Plain [Str "name"]]

151+ ,Cell ("",[],[]) Nothing 1 1

152+ [Plain [Str "age"]]

153+ ,Cell ("",[],[]) Nothing 1 1

154+ [Plain [Str "sex"]]]]

155+ [Row ("",[],[])

156+ [Cell ("",[],[]) Nothing 1 1

157+ [Plain [Str "joan"]]

158+ ,Cell ("",[],[]) Nothing 1 1

159+ [Plain [Str "24"]]

160+ ,Cell ("",[],[]) Nothing 1 1

161+ [Plain [Str "f"]]]

162+ ,Row ("",[],[])

163+ [Cell ("",[],[]) Nothing 1 1

164+ [Plain [Str "archie"]]

165+ ,Cell ("",[],[]) Nothing 1 1

166+ [Plain [Str "29"]]

167+ ,Cell ("",[],[]) Nothing 1 1

168+ [Plain [Str "m"]]]

169+ ,Row ("",[],[])

170+ [Cell ("",[],[]) Nothing 1 1

171+ [Plain [Str "bella"]]

172+ ,Cell ("",[],[]) Nothing 1 1

173+ [Plain [Str "45"]]

174+ ,Cell ("",[],[]) Nothing 1 1

175+ [Plain [Str "f"]]]]

176+ []

137177,Header 1 ("images",[],[]) [Str "Images"]

138178,Para [Str "Textile",Space,Str "inline",Space,Str "image",Space,Str "syntax,",Space,Str "like",LineBreak,Str "here",Space,Image ("",[],[]) [Str "this is the alt text"] ("this_is_an_image.png","this is the alt text"),LineBreak,Str "and",Space,Str "here",Space,Image ("",[],[]) [Str ""] ("this_is_an_image.png",""),Str "."]

139179,Header 1 ("attributes",[],[]) [Str "Attributes"]

@@ -143,16 +183,30 @@ Pandoc (Meta {unMeta = fromList []})

143183,Header 2 ("justified",[],[("lang","en"),("style","color:blue;text-align:justify;")]) [Str "Justified"]

144184,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"]]

145185,Para [Str "and",Space,Str "paragraph",Space,Str "attributes,",Space,Str "and",Space,Str "table",Space,Str "attributes."]

146−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

147− [[]

148− ,[]

149− ,[]]

150− [[[Plain [Str "name"]]

151− ,[Plain [Str "age"]]

152− ,[Plain [Str "sex"]]]

153− ,[[Plain [Str "joan"]]

154− ,[Plain [Str "24"]]

155− ,[Plain [Str "f"]]]]

186+,Table ("",[],[]) (Caption Nothing

187+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

188+ [Row ("",[],[])

189+ [Cell ("",[],[]) Nothing 1 1

190+ []

191+ ,Cell ("",[],[]) Nothing 1 1

192+ []

193+ ,Cell ("",[],[]) Nothing 1 1

194+ []]]

195+ [Row ("",[],[])

196+ [Cell ("",[],[]) Nothing 1 1

197+ [Plain [Str "name"]]

198+ ,Cell ("",[],[]) Nothing 1 1

199+ [Plain [Str "age"]]

200+ ,Cell ("",[],[]) Nothing 1 1

201+ [Plain [Str "sex"]]]

202+ ,Row ("",[],[])

203+ [Cell ("",[],[]) Nothing 1 1

204+ [Plain [Str "joan"]]

205+ ,Cell ("",[],[]) Nothing 1 1

206+ [Plain [Str "24"]]

207+ ,Cell ("",[],[]) Nothing 1 1

208+ [Plain [Str "f"]]]]

209+ []

156210,Para [Emph [Str "(class#id)",Space,Str "emph"]]

157211,Para [Emph [Str "(no",Space,Str "class#id)",Space,Str "emph"]]

158212,Header 1 ("entities",[],[]) [Str "Entities"]

test/tikiwiki-reader.native+95−38

@@ -90,41 +90,98 @@ Pandoc (Meta {unMeta = fromList []})

9090 [[Plain [Str "five",Space,Str "sub",Space,Str "1",Space,Str "sub",Space,Str "1"]]]]

9191 ,[Plain [Str "five",Space,Str "sub",Space,Str "2"]]]]]

9292,Header 1 ("tables",[],[]) [Str "tables"]

93−,Table [] [AlignDefault,AlignDefault] [0.0,0.0]

94− [[Plain [Str ""]]

95− ,[Plain [Str ""]]]

96− [[[Plain [Str "Orange"]]

97− ,[Plain [Str "Apple"]]]

98− ,[[Plain [Str "Bread"]]

99− ,[Plain [Str "Pie"]]]

100− ,[[Plain [Str "Butter"]]

101− ,[Plain [Str "Ice",Space,Str "cream"]]]]

102−,Table [] [AlignDefault,AlignDefault] [0.0,0.0]

103− [[Plain [Str ""]]

104− ,[Plain [Str ""]]]

105− [[[Plain [Str "Orange"]]

106− ,[Plain [Str "Apple"]]]

107− ,[[Plain [Str "Bread"]]

108− ,[Plain [Str "Pie"]]]

109− ,[[Plain [Strong [Str "Butter"]]]

110− ,[Plain [Str "Ice",Space,Str "cream"]]]]

111−,Table [] [AlignDefault,AlignDefault] [0.0,0.0]

112− [[Plain [Str ""]]

113− ,[Plain [Str ""]]]

114− [[[Plain [Str "Orange"]]

115− ,[Plain [Str "Apple"]]]

116− ,[[Plain [Str "Bread",LineBreak,LineBreak,Str "and",Space,Str "cheese"]]

117− ,[Plain [Str "Pie",LineBreak,LineBreak,Strong [Str "apple"],Space,Str "and",Space,Emph [Str "carrot"],Space]]]]

118−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

119− [[Plain [Str ""]]

120− ,[Plain [Str ""]]

121− ,[Plain [Str ""]]]

122− [[[Plain [Space,Str "Orange",Space]]

123− ,[Plain [Space,Str "Apple",Space]]

124− ,[Plain [Space,Str "more"]]]

125− ,[[Plain [Space,Str "Bread",Space]]

126− ,[Plain [Space,Str "Pie",Space]]

127− ,[Plain [Space,Str "more"]]]

128− ,[[Plain [Space,Str "Butter",Space]]

129− ,[Plain [Space,Str "Ice",Space,Str "cream",Space]]

130− ,[Plain [Space,Str "and",Space,Str "more",Space]]]]]

93+,Table ("",[],[]) (Caption Nothing

94+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

95+ [Row ("",[],[])

96+ [Cell ("",[],[]) Nothing 1 1

97+ [Plain [Str ""]]

98+ ,Cell ("",[],[]) Nothing 1 1

99+ [Plain [Str ""]]]]

100+ [Row ("",[],[])

101+ [Cell ("",[],[]) Nothing 1 1

102+ [Plain [Str "Orange"]]

103+ ,Cell ("",[],[]) Nothing 1 1

104+ [Plain [Str "Apple"]]]

105+ ,Row ("",[],[])

106+ [Cell ("",[],[]) Nothing 1 1

107+ [Plain [Str "Bread"]]

108+ ,Cell ("",[],[]) Nothing 1 1

109+ [Plain [Str "Pie"]]]

110+ ,Row ("",[],[])

111+ [Cell ("",[],[]) Nothing 1 1

112+ [Plain [Str "Butter"]]

113+ ,Cell ("",[],[]) Nothing 1 1

114+ [Plain [Str "Ice",Space,Str "cream"]]]]

115+ []

116+,Table ("",[],[]) (Caption Nothing

117+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

118+ [Row ("",[],[])

119+ [Cell ("",[],[]) Nothing 1 1

120+ [Plain [Str ""]]

121+ ,Cell ("",[],[]) Nothing 1 1

122+ [Plain [Str ""]]]]

123+ [Row ("",[],[])

124+ [Cell ("",[],[]) Nothing 1 1

125+ [Plain [Str "Orange"]]

126+ ,Cell ("",[],[]) Nothing 1 1

127+ [Plain [Str "Apple"]]]

128+ ,Row ("",[],[])

129+ [Cell ("",[],[]) Nothing 1 1

130+ [Plain [Str "Bread"]]

131+ ,Cell ("",[],[]) Nothing 1 1

132+ [Plain [Str "Pie"]]]

133+ ,Row ("",[],[])

134+ [Cell ("",[],[]) Nothing 1 1

135+ [Plain [Strong [Str "Butter"]]]

136+ ,Cell ("",[],[]) Nothing 1 1

137+ [Plain [Str "Ice",Space,Str "cream"]]]]

138+ []

139+,Table ("",[],[]) (Caption Nothing

140+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

141+ [Row ("",[],[])

142+ [Cell ("",[],[]) Nothing 1 1

143+ [Plain [Str ""]]

144+ ,Cell ("",[],[]) Nothing 1 1

145+ [Plain [Str ""]]]]

146+ [Row ("",[],[])

147+ [Cell ("",[],[]) Nothing 1 1

148+ [Plain [Str "Orange"]]

149+ ,Cell ("",[],[]) Nothing 1 1

150+ [Plain [Str "Apple"]]]

151+ ,Row ("",[],[])

152+ [Cell ("",[],[]) Nothing 1 1

153+ [Plain [Str "Bread",LineBreak,LineBreak,Str "and",Space,Str "cheese"]]

154+ ,Cell ("",[],[]) Nothing 1 1

155+ [Plain [Str "Pie",LineBreak,LineBreak,Strong [Str "apple"],Space,Str "and",Space,Emph [Str "carrot"],Space]]]]

156+ []

157+,Table ("",[],[]) (Caption Nothing

158+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

159+ [Row ("",[],[])

160+ [Cell ("",[],[]) Nothing 1 1

161+ [Plain [Str ""]]

162+ ,Cell ("",[],[]) Nothing 1 1

163+ [Plain [Str ""]]

164+ ,Cell ("",[],[]) Nothing 1 1

165+ [Plain [Str ""]]]]

166+ [Row ("",[],[])

167+ [Cell ("",[],[]) Nothing 1 1

168+ [Plain [Space,Str "Orange",Space]]

169+ ,Cell ("",[],[]) Nothing 1 1

170+ [Plain [Space,Str "Apple",Space]]

171+ ,Cell ("",[],[]) Nothing 1 1

172+ [Plain [Space,Str "more"]]]

173+ ,Row ("",[],[])

174+ [Cell ("",[],[]) Nothing 1 1

175+ [Plain [Space,Str "Bread",Space]]

176+ ,Cell ("",[],[]) Nothing 1 1

177+ [Plain [Space,Str "Pie",Space]]

178+ ,Cell ("",[],[]) Nothing 1 1

179+ [Plain [Space,Str "more"]]]

180+ ,Row ("",[],[])

181+ [Cell ("",[],[]) Nothing 1 1

182+ [Plain [Space,Str "Butter",Space]]

183+ ,Cell ("",[],[]) Nothing 1 1

184+ [Plain [Space,Str "Ice",Space,Str "cream",Space]]

185+ ,Cell ("",[],[]) Nothing 1 1

186+ [Plain [Space,Str "and",Space,Str "more",Space]]]]

187+ []]

test/twiki-reader.native+85−34

@@ -127,40 +127,91 @@ Pandoc (Meta {unMeta = fromList []})

127127 ,[Plain [Str "and"]]

128128 ,[Plain [Str "supported"]]]]]

129129,Header 1 ("tables",[],[]) [Str "tables"]

130−,Table [] [AlignDefault,AlignDefault] [0.0,0.0]

131− [[]

132− ,[]]

133− [[[Plain [Str "Orange"]]

134− ,[Plain [Str "Apple"]]]

135− ,[[Plain [Str "Bread"]]

136− ,[Plain [Str "Pie"]]]

137− ,[[Plain [Str "Butter"]]

138− ,[Plain [Str "Ice",Space,Str "cream"]]]]

139−,Table [] [AlignLeft,AlignLeft] [0.0,0.0]

140− [[Plain [Str "Orange"]]

141− ,[Plain [Str "Apple"]]]

142− [[[Plain [Str "Bread"]]

143− ,[Plain [Str "Pie"]]]

144− ,[[Plain [Strong [Str "Butter"]]]

145− ,[Plain [Str "Ice",Space,Str "cream"]]]]

146−,Table [] [AlignLeft,AlignLeft] [0.0,0.0]

147− [[Plain [Str "Orange"]]

148− ,[Plain [Str "Apple"]]]

149− [[[Plain [Str "Bread",LineBreak,LineBreak,Str "and",Space,Str "cheese"]]

150− ,[Plain [Str "Pie",LineBreak,LineBreak,Strong [Str "apple"],Space,Str "and",Space,Emph [Str "carrot"]]]]]

151−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

152− [[]

153− ,[]

154− ,[]]

155− [[[Plain [Str "Orange"]]

156− ,[Plain [Str "Apple"]]

157− ,[Plain [Str "more"]]]

158− ,[[Plain [Str "Bread"]]

159− ,[Plain [Str "Pie"]]

160− ,[Plain [Str "more"]]]

161− ,[[Plain [Str "Butter"]]

162− ,[Plain [Str "Ice",Space,Str "cream"]]

163− ,[Plain [Str "and",Space,Str "more"]]]]

130+,Table ("",[],[]) (Caption Nothing

131+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

132+ [Row ("",[],[])

133+ [Cell ("",[],[]) Nothing 1 1

134+ []

135+ ,Cell ("",[],[]) Nothing 1 1

136+ []]]

137+ [Row ("",[],[])

138+ [Cell ("",[],[]) Nothing 1 1

139+ [Plain [Str "Orange"]]

140+ ,Cell ("",[],[]) Nothing 1 1

141+ [Plain [Str "Apple"]]]

142+ ,Row ("",[],[])

143+ [Cell ("",[],[]) Nothing 1 1

144+ [Plain [Str "Bread"]]

145+ ,Cell ("",[],[]) Nothing 1 1

146+ [Plain [Str "Pie"]]]

147+ ,Row ("",[],[])

148+ [Cell ("",[],[]) Nothing 1 1

149+ [Plain [Str "Butter"]]

150+ ,Cell ("",[],[]) Nothing 1 1

151+ [Plain [Str "Ice",Space,Str "cream"]]]]

152+ []

153+,Table ("",[],[]) (Caption Nothing

154+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

155+ [Row ("",[],[])

156+ [Cell ("",[],[]) Nothing 1 1

157+ [Plain [Str "Orange"]]

158+ ,Cell ("",[],[]) Nothing 1 1

159+ [Plain [Str "Apple"]]]]

160+ [Row ("",[],[])

161+ [Cell ("",[],[]) Nothing 1 1

162+ [Plain [Str "Bread"]]

163+ ,Cell ("",[],[]) Nothing 1 1

164+ [Plain [Str "Pie"]]]

165+ ,Row ("",[],[])

166+ [Cell ("",[],[]) Nothing 1 1

167+ [Plain [Strong [Str "Butter"]]]

168+ ,Cell ("",[],[]) Nothing 1 1

169+ [Plain [Str "Ice",Space,Str "cream"]]]]

170+ []

171+,Table ("",[],[]) (Caption Nothing

172+ []) [(AlignLeft,Nothing),(AlignLeft,Nothing)] 0

173+ [Row ("",[],[])

174+ [Cell ("",[],[]) Nothing 1 1

175+ [Plain [Str "Orange"]]

176+ ,Cell ("",[],[]) Nothing 1 1

177+ [Plain [Str "Apple"]]]]

178+ [Row ("",[],[])

179+ [Cell ("",[],[]) Nothing 1 1

180+ [Plain [Str "Bread",LineBreak,LineBreak,Str "and",Space,Str "cheese"]]

181+ ,Cell ("",[],[]) Nothing 1 1

182+ [Plain [Str "Pie",LineBreak,LineBreak,Strong [Str "apple"],Space,Str "and",Space,Emph [Str "carrot"]]]]]

183+ []

184+,Table ("",[],[]) (Caption Nothing

185+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

186+ [Row ("",[],[])

187+ [Cell ("",[],[]) Nothing 1 1

188+ []

189+ ,Cell ("",[],[]) Nothing 1 1

190+ []

191+ ,Cell ("",[],[]) Nothing 1 1

192+ []]]

193+ [Row ("",[],[])

194+ [Cell ("",[],[]) Nothing 1 1

195+ [Plain [Str "Orange"]]

196+ ,Cell ("",[],[]) Nothing 1 1

197+ [Plain [Str "Apple"]]

198+ ,Cell ("",[],[]) Nothing 1 1

199+ [Plain [Str "more"]]]

200+ ,Row ("",[],[])

201+ [Cell ("",[],[]) Nothing 1 1

202+ [Plain [Str "Bread"]]

203+ ,Cell ("",[],[]) Nothing 1 1

204+ [Plain [Str "Pie"]]

205+ ,Cell ("",[],[]) Nothing 1 1

206+ [Plain [Str "more"]]]

207+ ,Row ("",[],[])

208+ [Cell ("",[],[]) Nothing 1 1

209+ [Plain [Str "Butter"]]

210+ ,Cell ("",[],[]) Nothing 1 1

211+ [Plain [Str "Ice",Space,Str "cream"]]

212+ ,Cell ("",[],[]) Nothing 1 1

213+ [Plain [Str "and",Space,Str "more"]]]]

214+ []

164215,Header 1 ("macros",[],[]) [Str "macros"]

165216,Para [Span ("",["twiki-macro","TEST"],[]) []]

166217,Para [Span ("",["twiki-macro","TEST"],[]) [Str ""]]

test/txt2tags.native+669−301

@@ -301,308 +301,676 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]]

301301 ,BulletList

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"]

304−,Table [] [AlignRight] [0.0]

305− [[]]

306− [[[Plain [Str "Cell",Space,Str "1"]]]]

307−,Table [] [AlignCenter,AlignCenter,AlignRight] [0.0,0.0,0.0]

308− [[]

309− ,[]

310− ,[]]

311− [[[Plain [Str "Cell",Space,Str "1"]]

312− ,[Plain [Str "Cell",Space,Str "2"]]

313− ,[Plain [Str "Cell",Space,Str "3"]]]]

314−,Table [] [AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0]

315− [[]

316− ,[]

317− ,[]]

318− [[[Plain [Str "Cell",Space,Str "1"]]

319− ,[Plain [Str "Cell",Space,Str "2"]]

320− ,[Plain [Str "Cell",Space,Str "3"]]]]

304+,Table ("",[],[]) (Caption Nothing

305+ []) [(AlignRight,Nothing)] 0

306+ [Row ("",[],[])

307+ [Cell ("",[],[]) Nothing 1 1

308+ []]]

309+ [Row ("",[],[])

310+ [Cell ("",[],[]) Nothing 1 1

311+ [Plain [Str "Cell",Space,Str "1"]]]]

312+ []

313+,Table ("",[],[]) (Caption Nothing

314+ []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0

315+ [Row ("",[],[])

316+ [Cell ("",[],[]) Nothing 1 1

317+ []

318+ ,Cell ("",[],[]) Nothing 1 1

319+ []

320+ ,Cell ("",[],[]) Nothing 1 1

321+ []]]

322+ [Row ("",[],[])

323+ [Cell ("",[],[]) Nothing 1 1

324+ [Plain [Str "Cell",Space,Str "1"]]

325+ ,Cell ("",[],[]) Nothing 1 1

326+ [Plain [Str "Cell",Space,Str "2"]]

327+ ,Cell ("",[],[]) Nothing 1 1

328+ [Plain [Str "Cell",Space,Str "3"]]]]

329+ []

330+,Table ("",[],[]) (Caption Nothing

331+ []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0

332+ [Row ("",[],[])

333+ [Cell ("",[],[]) Nothing 1 1

334+ []

335+ ,Cell ("",[],[]) Nothing 1 1

336+ []

337+ ,Cell ("",[],[]) Nothing 1 1

338+ []]]

339+ [Row ("",[],[])

340+ [Cell ("",[],[]) Nothing 1 1

341+ [Plain [Str "Cell",Space,Str "1"]]

342+ ,Cell ("",[],[]) Nothing 1 1

343+ [Plain [Str "Cell",Space,Str "2"]]

344+ ,Cell ("",[],[]) Nothing 1 1

345+ [Plain [Str "Cell",Space,Str "3"]]]]

346+ []

321347,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 "|"]

322−,Table [] [AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0]

323− [[]

324− ,[]

325− ,[]]

326− [[[Plain [Str "Cell",Space,Str "1"]]

327− ,[Plain [Str "Cell",Space,Str "2"]]

328− ,[Plain [Str "Cell",Space,Str "3"]]]]

329−,Table [] [AlignDefault,AlignCenter,AlignDefault] [0.0,0.0,0.0]

330− [[Plain [Str "Heading"]]

331− ,[Plain [Str "Heading"]]

332− ,[Plain [Str "Heading"]]]

333− [[[Plain [Str "<-"]]

334− ,[Plain [Str "--"]]

335− ,[Plain [Str "->"]]]

336− ,[[Plain [Str "--"]]

337− ,[Plain [Str "--"]]

338− ,[Plain [Str "--"]]]

339− ,[[Plain [Str "->"]]

340− ,[Plain [Str "--"]]

341− ,[Plain [Str "<-"]]]]

342−,Table [] [AlignDefault,AlignDefault,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0]

343− [[Plain [Str "1"]]

344− ,[Plain [Str "2"]]

345− ,[Plain [Str "3+4"]]

346− ,[]]

347− [[[Plain [Str "1"]]

348− ,[Plain [Str "2"]]

349− ,[Plain [Str "3"]]

350− ,[Plain [Str "4"]]]

351− ,[[Plain [Str "1+2+3"]]

352− ,[Plain [Str "4"]]

353− ,[]

354− ,[]]

355− ,[[Plain [Str "1"]]

356− ,[Plain [Str "2+3"]]

357− ,[Plain [Str "4"]]

358− ,[]]

359− ,[[Plain [Str "1+2+3+4"]]

360− ,[]

361− ,[]

362− ,[]]]

363−,Table [] [AlignCenter,AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0]

364− [[]

365− ,[]

366− ,[]

367− ,[]]

368− [[[Plain [Str "0"]]

369− ,[Plain [Str "1"]]

370− ,[Plain [Str "2"]]

371− ,[]]

372− ,[[Plain [Str "4"]]

373− ,[Plain [Str "5"]]

374− ,[]

375− ,[Plain [Str "7"]]]

376− ,[[Plain [Str "8"]]

377− ,[]

378− ,[Plain [Str "A"]]

379− ,[Plain [Str "B"]]]

380− ,[[]

381− ,[Plain [Str "D"]]

382− ,[Plain [Str "E"]]

383− ,[Plain [Str "F"]]]]

384−,Table [] [AlignCenter,AlignCenter,AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0,0.0]

385− [[]

386− ,[]

387− ,[]

388− ,[]

389− ,[]]

390− [[[Plain [Str "1"]]

391− ,[]

392− ,[]

393− ,[]

394− ,[]]

395− ,[[Plain [Str "1"]]

396− ,[Plain [Str "2"]]

397− ,[]

398− ,[]

399− ,[]]

400− ,[[Plain [Str "1"]]

401− ,[Plain [Str "2"]]

402− ,[Plain [Str "3"]]

403− ,[]

404− ,[]]

405− ,[[Plain [Str "1"]]

406− ,[Plain [Str "2"]]

407− ,[Plain [Str "3"]]

408− ,[Plain [Str "4"]]

409− ,[]]

410− ,[[Plain [Str "1"]]

411− ,[Plain [Str "2"]]

412− ,[Plain [Str "3"]]

413− ,[Plain [Str "4"]]

414− ,[Plain [Str "5"]]]]

415−,Table [] [AlignDefault,AlignCenter,AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0,0.0]

416− [[]

417− ,[]

418− ,[]

419− ,[]

420− ,[]]

421− [[[Plain [Str "Jan"]]

422− ,[]

423− ,[]

424− ,[]

425− ,[]]

426− ,[[Plain [Str "Fev"]]

427− ,[]

428− ,[]

429− ,[]

430− ,[]]

431− ,[[Plain [Str "Mar"]]

432− ,[]

433− ,[]

434− ,[]

435− ,[]]

436− ,[[Plain [Str "Apr"]]

437− ,[]

438− ,[]

439− ,[]

440− ,[]]

441− ,[[Plain [Str "May"]]

442− ,[]

443− ,[]

444− ,[]

445− ,[]]

446− ,[[Plain [Str "20%"]]

447− ,[Plain [Str "40%"]]

448− ,[Plain [Str "60%"]]

449− ,[Plain [Str "80%"]]

450− ,[Plain [Str "100%"]]]]

451−,Table [] [AlignCenter,AlignDefault,AlignDefault,AlignCenter,AlignCenter] [0.0,0.0,0.0,0.0,0.0]

452− [[]

453− ,[]

454− ,[]

455− ,[]

456− ,[]]

457− [[[]

458− ,[]

459− ,[Plain [Str "/"]]

460− ,[]

461− ,[]]

462− ,[[]

463− ,[Plain [Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/"]]

464− ,[]

465− ,[]

466− ,[]]

467− ,[[Plain [Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/"]]

468− ,[]

469− ,[]

470− ,[]

471− ,[]]

472− ,[[]

473− ,[Plain [Str "o"]]

474− ,[]

475− ,[Plain [Str "o"]]

476− ,[]]

477− ,[[]

478− ,[]

479− ,[Plain [Str "."]]

480− ,[]

481− ,[]]

482− ,[[]

483− ,[Plain [Str "=",Space,Str "=",Space,Str "=",Space,Str "="]]

484− ,[]

485− ,[]

486− ,[]]]

487−,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]

488− [[]

489− ,[]

490− ,[]

491− ,[]

492− ,[]

493− ,[]

494− ,[]

495− ,[]]

496− [[[Plain [Str "01"]]

497− ,[Plain [Str "02"]]

498− ,[]

499− ,[]

500− ,[Plain [Str "05"]]

501− ,[]

502− ,[Plain [Str "07"]]

503− ,[]]

504− ,[[]

505− ,[]

506− ,[Plain [Str "11"]]

507− ,[]

508− ,[Plain [Str "13"]]

509− ,[]

510− ,[]

511− ,[Plain [Str "16"]]]

512− ,[[Plain [Str "17"]]

513− ,[]

514− ,[Plain [Str "19"]]

515− ,[Plain [Str "20"]]

516− ,[]

517− ,[]

518− ,[Plain [Str "23"]]

519− ,[]]

520− ,[[Plain [Str "25"]]

521− ,[Plain [Str "26"]]

522− ,[]

523− ,[]

524− ,[Plain [Str "29"]]

525− ,[Plain [Str "30"]]

526− ,[]

527− ,[Plain [Str "32"]]]

528− ,[[]

529− ,[]

530− ,[Plain [Str "35"]]

531− ,[]

532− ,[Plain [Str "37"]]

533− ,[]

534− ,[Plain [Str "39"]]

535− ,[Plain [Str "40"]]]]

536−,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]

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− ,[]]

569− [[[Plain [Str "0"]]

570− ,[Plain [Str "1"]]

571− ,[Plain [Str "2"]]

572− ,[Plain [Str "3"]]

573− ,[Plain [Str "4"]]

574− ,[Plain [Str "5"]]

575− ,[Plain [Str "6"]]

576− ,[Plain [Str "7"]]

577− ,[Plain [Str "8"]]

578− ,[Plain [Str "9"]]

579− ,[Plain [Str "A"]]

580− ,[Plain [Str "B"]]

581− ,[Plain [Str "C"]]

582− ,[Plain [Str "D"]]

583− ,[Plain [Str "E"]]

584− ,[Plain [Str "F"]]

585− ,[Plain [Str "0"]]

586− ,[Plain [Str "1"]]

587− ,[Plain [Str "2"]]

588− ,[Plain [Str "3"]]

589− ,[Plain [Str "4"]]

590− ,[Plain [Str "5"]]

591− ,[Plain [Str "6"]]

592− ,[Plain [Str "7"]]

593− ,[Plain [Str "8"]]

594− ,[Plain [Str "9"]]

595− ,[Plain [Str "A"]]

596− ,[Plain [Str "B"]]

597− ,[Plain [Str "C"]]

598− ,[Plain [Str "D"]]

599− ,[Plain [Str "E"]]

600− ,[Plain [Str "F"]]]]

601−,Table [] [AlignCenter] [0.0]

602− [[]]

603− [[[]]

604− ,[[]]

605− ,[[]]]

348+,Table ("",[],[]) (Caption Nothing

349+ []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0

350+ [Row ("",[],[])

351+ [Cell ("",[],[]) Nothing 1 1

352+ []

353+ ,Cell ("",[],[]) Nothing 1 1

354+ []

355+ ,Cell ("",[],[]) Nothing 1 1

356+ []]]

357+ [Row ("",[],[])

358+ [Cell ("",[],[]) Nothing 1 1

359+ [Plain [Str "Cell",Space,Str "1"]]

360+ ,Cell ("",[],[]) Nothing 1 1

361+ [Plain [Str "Cell",Space,Str "2"]]

362+ ,Cell ("",[],[]) Nothing 1 1

363+ [Plain [Str "Cell",Space,Str "3"]]]]

364+ []

365+,Table ("",[],[]) (Caption Nothing

366+ []) [(AlignDefault,Nothing),(AlignCenter,Nothing),(AlignDefault,Nothing)] 0

367+ [Row ("",[],[])

368+ [Cell ("",[],[]) Nothing 1 1

369+ [Plain [Str "Heading"]]

370+ ,Cell ("",[],[]) Nothing 1 1

371+ [Plain [Str "Heading"]]

372+ ,Cell ("",[],[]) Nothing 1 1

373+ [Plain [Str "Heading"]]]]

374+ [Row ("",[],[])

375+ [Cell ("",[],[]) Nothing 1 1

376+ [Plain [Str "<-"]]

377+ ,Cell ("",[],[]) Nothing 1 1

378+ [Plain [Str "--"]]

379+ ,Cell ("",[],[]) Nothing 1 1

380+ [Plain [Str "->"]]]

381+ ,Row ("",[],[])

382+ [Cell ("",[],[]) Nothing 1 1

383+ [Plain [Str "--"]]

384+ ,Cell ("",[],[]) Nothing 1 1

385+ [Plain [Str "--"]]

386+ ,Cell ("",[],[]) Nothing 1 1

387+ [Plain [Str "--"]]]

388+ ,Row ("",[],[])

389+ [Cell ("",[],[]) Nothing 1 1

390+ [Plain [Str "->"]]

391+ ,Cell ("",[],[]) Nothing 1 1

392+ [Plain [Str "--"]]

393+ ,Cell ("",[],[]) Nothing 1 1

394+ [Plain [Str "<-"]]]]

395+ []

396+,Table ("",[],[]) (Caption Nothing

397+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0

398+ [Row ("",[],[])

399+ [Cell ("",[],[]) Nothing 1 1

400+ [Plain [Str "1"]]

401+ ,Cell ("",[],[]) Nothing 1 1

402+ [Plain [Str "2"]]

403+ ,Cell ("",[],[]) Nothing 1 1

404+ [Plain [Str "3+4"]]

405+ ,Cell ("",[],[]) Nothing 1 1

406+ []]]

407+ [Row ("",[],[])

408+ [Cell ("",[],[]) Nothing 1 1

409+ [Plain [Str "1"]]

410+ ,Cell ("",[],[]) Nothing 1 1

411+ [Plain [Str "2"]]

412+ ,Cell ("",[],[]) Nothing 1 1

413+ [Plain [Str "3"]]

414+ ,Cell ("",[],[]) Nothing 1 1

415+ [Plain [Str "4"]]]

416+ ,Row ("",[],[])

417+ [Cell ("",[],[]) Nothing 1 1

418+ [Plain [Str "1+2+3"]]

419+ ,Cell ("",[],[]) Nothing 1 1

420+ [Plain [Str "4"]]

421+ ,Cell ("",[],[]) Nothing 1 1

422+ []

423+ ,Cell ("",[],[]) Nothing 1 1

424+ []]

425+ ,Row ("",[],[])

426+ [Cell ("",[],[]) Nothing 1 1

427+ [Plain [Str "1"]]

428+ ,Cell ("",[],[]) Nothing 1 1

429+ [Plain [Str "2+3"]]

430+ ,Cell ("",[],[]) Nothing 1 1

431+ [Plain [Str "4"]]

432+ ,Cell ("",[],[]) Nothing 1 1

433+ []]

434+ ,Row ("",[],[])

435+ [Cell ("",[],[]) Nothing 1 1

436+ [Plain [Str "1+2+3+4"]]

437+ ,Cell ("",[],[]) Nothing 1 1

438+ []

439+ ,Cell ("",[],[]) Nothing 1 1

440+ []

441+ ,Cell ("",[],[]) Nothing 1 1

442+ []]]

443+ []

444+,Table ("",[],[]) (Caption Nothing

445+ []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0

446+ [Row ("",[],[])

447+ [Cell ("",[],[]) Nothing 1 1

448+ []

449+ ,Cell ("",[],[]) Nothing 1 1

450+ []

451+ ,Cell ("",[],[]) Nothing 1 1

452+ []

453+ ,Cell ("",[],[]) Nothing 1 1

454+ []]]

455+ [Row ("",[],[])

456+ [Cell ("",[],[]) Nothing 1 1

457+ [Plain [Str "0"]]

458+ ,Cell ("",[],[]) Nothing 1 1

459+ [Plain [Str "1"]]

460+ ,Cell ("",[],[]) Nothing 1 1

461+ [Plain [Str "2"]]

462+ ,Cell ("",[],[]) Nothing 1 1

463+ []]

464+ ,Row ("",[],[])

465+ [Cell ("",[],[]) Nothing 1 1

466+ [Plain [Str "4"]]

467+ ,Cell ("",[],[]) Nothing 1 1

468+ [Plain [Str "5"]]

469+ ,Cell ("",[],[]) Nothing 1 1

470+ []

471+ ,Cell ("",[],[]) Nothing 1 1

472+ [Plain [Str "7"]]]

473+ ,Row ("",[],[])

474+ [Cell ("",[],[]) Nothing 1 1

475+ [Plain [Str "8"]]

476+ ,Cell ("",[],[]) Nothing 1 1

477+ []

478+ ,Cell ("",[],[]) Nothing 1 1

479+ [Plain [Str "A"]]

480+ ,Cell ("",[],[]) Nothing 1 1

481+ [Plain [Str "B"]]]

482+ ,Row ("",[],[])

483+ [Cell ("",[],[]) Nothing 1 1

484+ []

485+ ,Cell ("",[],[]) Nothing 1 1

486+ [Plain [Str "D"]]

487+ ,Cell ("",[],[]) Nothing 1 1

488+ [Plain [Str "E"]]

489+ ,Cell ("",[],[]) Nothing 1 1

490+ [Plain [Str "F"]]]]

491+ []

492+,Table ("",[],[]) (Caption Nothing

493+ []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0

494+ [Row ("",[],[])

495+ [Cell ("",[],[]) Nothing 1 1

496+ []

497+ ,Cell ("",[],[]) Nothing 1 1

498+ []

499+ ,Cell ("",[],[]) Nothing 1 1

500+ []

501+ ,Cell ("",[],[]) Nothing 1 1

502+ []

503+ ,Cell ("",[],[]) Nothing 1 1

504+ []]]

505+ [Row ("",[],[])

506+ [Cell ("",[],[]) Nothing 1 1

507+ [Plain [Str "1"]]

508+ ,Cell ("",[],[]) Nothing 1 1

509+ []

510+ ,Cell ("",[],[]) Nothing 1 1

511+ []

512+ ,Cell ("",[],[]) Nothing 1 1

513+ []

514+ ,Cell ("",[],[]) Nothing 1 1

515+ []]

516+ ,Row ("",[],[])

517+ [Cell ("",[],[]) Nothing 1 1

518+ [Plain [Str "1"]]

519+ ,Cell ("",[],[]) Nothing 1 1

520+ [Plain [Str "2"]]

521+ ,Cell ("",[],[]) Nothing 1 1

522+ []

523+ ,Cell ("",[],[]) Nothing 1 1

524+ []

525+ ,Cell ("",[],[]) Nothing 1 1

526+ []]

527+ ,Row ("",[],[])

528+ [Cell ("",[],[]) Nothing 1 1

529+ [Plain [Str "1"]]

530+ ,Cell ("",[],[]) Nothing 1 1

531+ [Plain [Str "2"]]

532+ ,Cell ("",[],[]) Nothing 1 1

533+ [Plain [Str "3"]]

534+ ,Cell ("",[],[]) Nothing 1 1

535+ []

536+ ,Cell ("",[],[]) Nothing 1 1

537+ []]

538+ ,Row ("",[],[])

539+ [Cell ("",[],[]) Nothing 1 1

540+ [Plain [Str "1"]]

541+ ,Cell ("",[],[]) Nothing 1 1

542+ [Plain [Str "2"]]

543+ ,Cell ("",[],[]) Nothing 1 1

544+ [Plain [Str "3"]]

545+ ,Cell ("",[],[]) Nothing 1 1

546+ [Plain [Str "4"]]

547+ ,Cell ("",[],[]) Nothing 1 1

548+ []]

549+ ,Row ("",[],[])

550+ [Cell ("",[],[]) Nothing 1 1

551+ [Plain [Str "1"]]

552+ ,Cell ("",[],[]) Nothing 1 1

553+ [Plain [Str "2"]]

554+ ,Cell ("",[],[]) Nothing 1 1

555+ [Plain [Str "3"]]

556+ ,Cell ("",[],[]) Nothing 1 1

557+ [Plain [Str "4"]]

558+ ,Cell ("",[],[]) Nothing 1 1

559+ [Plain [Str "5"]]]]

560+ []

561+,Table ("",[],[]) (Caption Nothing

562+ []) [(AlignDefault,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0

563+ [Row ("",[],[])

564+ [Cell ("",[],[]) Nothing 1 1

565+ []

566+ ,Cell ("",[],[]) Nothing 1 1

567+ []

568+ ,Cell ("",[],[]) Nothing 1 1

569+ []

570+ ,Cell ("",[],[]) Nothing 1 1

571+ []

572+ ,Cell ("",[],[]) Nothing 1 1

573+ []]]

574+ [Row ("",[],[])

575+ [Cell ("",[],[]) Nothing 1 1

576+ [Plain [Str "Jan"]]

577+ ,Cell ("",[],[]) Nothing 1 1

578+ []

579+ ,Cell ("",[],[]) Nothing 1 1

580+ []

581+ ,Cell ("",[],[]) Nothing 1 1

582+ []

583+ ,Cell ("",[],[]) Nothing 1 1

584+ []]

585+ ,Row ("",[],[])

586+ [Cell ("",[],[]) Nothing 1 1

587+ [Plain [Str "Fev"]]

588+ ,Cell ("",[],[]) Nothing 1 1

589+ []

590+ ,Cell ("",[],[]) Nothing 1 1

591+ []

592+ ,Cell ("",[],[]) Nothing 1 1

593+ []

594+ ,Cell ("",[],[]) Nothing 1 1

595+ []]

596+ ,Row ("",[],[])

597+ [Cell ("",[],[]) Nothing 1 1

598+ [Plain [Str "Mar"]]

599+ ,Cell ("",[],[]) Nothing 1 1

600+ []

601+ ,Cell ("",[],[]) Nothing 1 1

602+ []

603+ ,Cell ("",[],[]) Nothing 1 1

604+ []

605+ ,Cell ("",[],[]) Nothing 1 1

606+ []]

607+ ,Row ("",[],[])

608+ [Cell ("",[],[]) Nothing 1 1

609+ [Plain [Str "Apr"]]

610+ ,Cell ("",[],[]) Nothing 1 1

611+ []

612+ ,Cell ("",[],[]) Nothing 1 1

613+ []

614+ ,Cell ("",[],[]) Nothing 1 1

615+ []

616+ ,Cell ("",[],[]) Nothing 1 1

617+ []]

618+ ,Row ("",[],[])

619+ [Cell ("",[],[]) Nothing 1 1

620+ [Plain [Str "May"]]

621+ ,Cell ("",[],[]) Nothing 1 1

622+ []

623+ ,Cell ("",[],[]) Nothing 1 1

624+ []

625+ ,Cell ("",[],[]) Nothing 1 1

626+ []

627+ ,Cell ("",[],[]) Nothing 1 1

628+ []]

629+ ,Row ("",[],[])

630+ [Cell ("",[],[]) Nothing 1 1

631+ [Plain [Str "20%"]]

632+ ,Cell ("",[],[]) Nothing 1 1

633+ [Plain [Str "40%"]]

634+ ,Cell ("",[],[]) Nothing 1 1

635+ [Plain [Str "60%"]]

636+ ,Cell ("",[],[]) Nothing 1 1

637+ [Plain [Str "80%"]]

638+ ,Cell ("",[],[]) Nothing 1 1

639+ [Plain [Str "100%"]]]]

640+ []

641+,Table ("",[],[]) (Caption Nothing

642+ []) [(AlignCenter,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0

643+ [Row ("",[],[])

644+ [Cell ("",[],[]) Nothing 1 1

645+ []

646+ ,Cell ("",[],[]) Nothing 1 1

647+ []

648+ ,Cell ("",[],[]) Nothing 1 1

649+ []

650+ ,Cell ("",[],[]) Nothing 1 1

651+ []

652+ ,Cell ("",[],[]) Nothing 1 1

653+ []]]

654+ [Row ("",[],[])

655+ [Cell ("",[],[]) Nothing 1 1

656+ []

657+ ,Cell ("",[],[]) Nothing 1 1

658+ []

659+ ,Cell ("",[],[]) Nothing 1 1

660+ [Plain [Str "/"]]

661+ ,Cell ("",[],[]) Nothing 1 1

662+ []

663+ ,Cell ("",[],[]) Nothing 1 1

664+ []]

665+ ,Row ("",[],[])

666+ [Cell ("",[],[]) Nothing 1 1

667+ []

668+ ,Cell ("",[],[]) Nothing 1 1

669+ [Plain [Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/"]]

670+ ,Cell ("",[],[]) Nothing 1 1

671+ []

672+ ,Cell ("",[],[]) Nothing 1 1

673+ []

674+ ,Cell ("",[],[]) Nothing 1 1

675+ []]

676+ ,Row ("",[],[])

677+ [Cell ("",[],[]) Nothing 1 1

678+ [Plain [Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/"]]

679+ ,Cell ("",[],[]) Nothing 1 1

680+ []

681+ ,Cell ("",[],[]) Nothing 1 1

682+ []

683+ ,Cell ("",[],[]) Nothing 1 1

684+ []

685+ ,Cell ("",[],[]) Nothing 1 1

686+ []]

687+ ,Row ("",[],[])

688+ [Cell ("",[],[]) Nothing 1 1

689+ []

690+ ,Cell ("",[],[]) Nothing 1 1

691+ [Plain [Str "o"]]

692+ ,Cell ("",[],[]) Nothing 1 1

693+ []

694+ ,Cell ("",[],[]) Nothing 1 1

695+ [Plain [Str "o"]]

696+ ,Cell ("",[],[]) Nothing 1 1

697+ []]

698+ ,Row ("",[],[])

699+ [Cell ("",[],[]) Nothing 1 1

700+ []

701+ ,Cell ("",[],[]) Nothing 1 1

702+ []

703+ ,Cell ("",[],[]) Nothing 1 1

704+ [Plain [Str "."]]

705+ ,Cell ("",[],[]) Nothing 1 1

706+ []

707+ ,Cell ("",[],[]) Nothing 1 1

708+ []]

709+ ,Row ("",[],[])

710+ [Cell ("",[],[]) Nothing 1 1

711+ []

712+ ,Cell ("",[],[]) Nothing 1 1

713+ [Plain [Str "=",Space,Str "=",Space,Str "=",Space,Str "="]]

714+ ,Cell ("",[],[]) Nothing 1 1

715+ []

716+ ,Cell ("",[],[]) Nothing 1 1

717+ []

718+ ,Cell ("",[],[]) Nothing 1 1

719+ []]]

720+ []

721+,Table ("",[],[]) (Caption Nothing

722+ []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0

723+ [Row ("",[],[])

724+ [Cell ("",[],[]) Nothing 1 1

725+ []

726+ ,Cell ("",[],[]) Nothing 1 1

727+ []

728+ ,Cell ("",[],[]) Nothing 1 1

729+ []

730+ ,Cell ("",[],[]) Nothing 1 1

731+ []

732+ ,Cell ("",[],[]) Nothing 1 1

733+ []

734+ ,Cell ("",[],[]) Nothing 1 1

735+ []

736+ ,Cell ("",[],[]) Nothing 1 1

737+ []

738+ ,Cell ("",[],[]) Nothing 1 1

739+ []]]

740+ [Row ("",[],[])

741+ [Cell ("",[],[]) Nothing 1 1

742+ [Plain [Str "01"]]

743+ ,Cell ("",[],[]) Nothing 1 1

744+ [Plain [Str "02"]]

745+ ,Cell ("",[],[]) Nothing 1 1

746+ []

747+ ,Cell ("",[],[]) Nothing 1 1

748+ []

749+ ,Cell ("",[],[]) Nothing 1 1

750+ [Plain [Str "05"]]

751+ ,Cell ("",[],[]) Nothing 1 1

752+ []

753+ ,Cell ("",[],[]) Nothing 1 1

754+ [Plain [Str "07"]]

755+ ,Cell ("",[],[]) Nothing 1 1

756+ []]

757+ ,Row ("",[],[])

758+ [Cell ("",[],[]) Nothing 1 1

759+ []

760+ ,Cell ("",[],[]) Nothing 1 1

761+ []

762+ ,Cell ("",[],[]) Nothing 1 1

763+ [Plain [Str "11"]]

764+ ,Cell ("",[],[]) Nothing 1 1

765+ []

766+ ,Cell ("",[],[]) Nothing 1 1

767+ [Plain [Str "13"]]

768+ ,Cell ("",[],[]) Nothing 1 1

769+ []

770+ ,Cell ("",[],[]) Nothing 1 1

771+ []

772+ ,Cell ("",[],[]) Nothing 1 1

773+ [Plain [Str "16"]]]

774+ ,Row ("",[],[])

775+ [Cell ("",[],[]) Nothing 1 1

776+ [Plain [Str "17"]]

777+ ,Cell ("",[],[]) Nothing 1 1

778+ []

779+ ,Cell ("",[],[]) Nothing 1 1

780+ [Plain [Str "19"]]

781+ ,Cell ("",[],[]) Nothing 1 1

782+ [Plain [Str "20"]]

783+ ,Cell ("",[],[]) Nothing 1 1

784+ []

785+ ,Cell ("",[],[]) Nothing 1 1

786+ []

787+ ,Cell ("",[],[]) Nothing 1 1

788+ [Plain [Str "23"]]

789+ ,Cell ("",[],[]) Nothing 1 1

790+ []]

791+ ,Row ("",[],[])

792+ [Cell ("",[],[]) Nothing 1 1

793+ [Plain [Str "25"]]

794+ ,Cell ("",[],[]) Nothing 1 1

795+ [Plain [Str "26"]]

796+ ,Cell ("",[],[]) Nothing 1 1

797+ []

798+ ,Cell ("",[],[]) Nothing 1 1

799+ []

800+ ,Cell ("",[],[]) Nothing 1 1

801+ [Plain [Str "29"]]

802+ ,Cell ("",[],[]) Nothing 1 1

803+ [Plain [Str "30"]]

804+ ,Cell ("",[],[]) Nothing 1 1

805+ []

806+ ,Cell ("",[],[]) Nothing 1 1

807+ [Plain [Str "32"]]]

808+ ,Row ("",[],[])

809+ [Cell ("",[],[]) Nothing 1 1

810+ []

811+ ,Cell ("",[],[]) Nothing 1 1

812+ []

813+ ,Cell ("",[],[]) Nothing 1 1

814+ [Plain [Str "35"]]

815+ ,Cell ("",[],[]) Nothing 1 1

816+ []

817+ ,Cell ("",[],[]) Nothing 1 1

818+ [Plain [Str "37"]]

819+ ,Cell ("",[],[]) Nothing 1 1

820+ []

821+ ,Cell ("",[],[]) Nothing 1 1

822+ [Plain [Str "39"]]

823+ ,Cell ("",[],[]) Nothing 1 1

824+ [Plain [Str "40"]]]]

825+ []

826+,Table ("",[],[]) (Caption Nothing

827+ []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0

828+ [Row ("",[],[])

829+ [Cell ("",[],[]) Nothing 1 1

830+ []

831+ ,Cell ("",[],[]) Nothing 1 1

832+ []

833+ ,Cell ("",[],[]) Nothing 1 1

834+ []

835+ ,Cell ("",[],[]) Nothing 1 1

836+ []

837+ ,Cell ("",[],[]) Nothing 1 1

838+ []

839+ ,Cell ("",[],[]) Nothing 1 1

840+ []

841+ ,Cell ("",[],[]) Nothing 1 1

842+ []

843+ ,Cell ("",[],[]) Nothing 1 1

844+ []

845+ ,Cell ("",[],[]) Nothing 1 1

846+ []

847+ ,Cell ("",[],[]) Nothing 1 1

848+ []

849+ ,Cell ("",[],[]) Nothing 1 1

850+ []

851+ ,Cell ("",[],[]) Nothing 1 1

852+ []

853+ ,Cell ("",[],[]) Nothing 1 1

854+ []

855+ ,Cell ("",[],[]) Nothing 1 1

856+ []

857+ ,Cell ("",[],[]) Nothing 1 1

858+ []

859+ ,Cell ("",[],[]) Nothing 1 1

860+ []

861+ ,Cell ("",[],[]) Nothing 1 1

862+ []

863+ ,Cell ("",[],[]) Nothing 1 1

864+ []

865+ ,Cell ("",[],[]) Nothing 1 1

866+ []

867+ ,Cell ("",[],[]) Nothing 1 1

868+ []

869+ ,Cell ("",[],[]) Nothing 1 1

870+ []

871+ ,Cell ("",[],[]) Nothing 1 1

872+ []

873+ ,Cell ("",[],[]) Nothing 1 1

874+ []

875+ ,Cell ("",[],[]) Nothing 1 1

876+ []

877+ ,Cell ("",[],[]) Nothing 1 1

878+ []

879+ ,Cell ("",[],[]) Nothing 1 1

880+ []

881+ ,Cell ("",[],[]) Nothing 1 1

882+ []

883+ ,Cell ("",[],[]) Nothing 1 1

884+ []

885+ ,Cell ("",[],[]) Nothing 1 1

886+ []

887+ ,Cell ("",[],[]) Nothing 1 1

888+ []

889+ ,Cell ("",[],[]) Nothing 1 1

890+ []

891+ ,Cell ("",[],[]) Nothing 1 1

892+ []]]

893+ [Row ("",[],[])

894+ [Cell ("",[],[]) Nothing 1 1

895+ [Plain [Str "0"]]

896+ ,Cell ("",[],[]) Nothing 1 1

897+ [Plain [Str "1"]]

898+ ,Cell ("",[],[]) Nothing 1 1

899+ [Plain [Str "2"]]

900+ ,Cell ("",[],[]) Nothing 1 1

901+ [Plain [Str "3"]]

902+ ,Cell ("",[],[]) Nothing 1 1

903+ [Plain [Str "4"]]

904+ ,Cell ("",[],[]) Nothing 1 1

905+ [Plain [Str "5"]]

906+ ,Cell ("",[],[]) Nothing 1 1

907+ [Plain [Str "6"]]

908+ ,Cell ("",[],[]) Nothing 1 1

909+ [Plain [Str "7"]]

910+ ,Cell ("",[],[]) Nothing 1 1

911+ [Plain [Str "8"]]

912+ ,Cell ("",[],[]) Nothing 1 1

913+ [Plain [Str "9"]]

914+ ,Cell ("",[],[]) Nothing 1 1

915+ [Plain [Str "A"]]

916+ ,Cell ("",[],[]) Nothing 1 1

917+ [Plain [Str "B"]]

918+ ,Cell ("",[],[]) Nothing 1 1

919+ [Plain [Str "C"]]

920+ ,Cell ("",[],[]) Nothing 1 1

921+ [Plain [Str "D"]]

922+ ,Cell ("",[],[]) Nothing 1 1

923+ [Plain [Str "E"]]

924+ ,Cell ("",[],[]) Nothing 1 1

925+ [Plain [Str "F"]]

926+ ,Cell ("",[],[]) Nothing 1 1

927+ [Plain [Str "0"]]

928+ ,Cell ("",[],[]) Nothing 1 1

929+ [Plain [Str "1"]]

930+ ,Cell ("",[],[]) Nothing 1 1

931+ [Plain [Str "2"]]

932+ ,Cell ("",[],[]) Nothing 1 1

933+ [Plain [Str "3"]]

934+ ,Cell ("",[],[]) Nothing 1 1

935+ [Plain [Str "4"]]

936+ ,Cell ("",[],[]) Nothing 1 1

937+ [Plain [Str "5"]]

938+ ,Cell ("",[],[]) Nothing 1 1

939+ [Plain [Str "6"]]

940+ ,Cell ("",[],[]) Nothing 1 1

941+ [Plain [Str "7"]]

942+ ,Cell ("",[],[]) Nothing 1 1

943+ [Plain [Str "8"]]

944+ ,Cell ("",[],[]) Nothing 1 1

945+ [Plain [Str "9"]]

946+ ,Cell ("",[],[]) Nothing 1 1

947+ [Plain [Str "A"]]

948+ ,Cell ("",[],[]) Nothing 1 1

949+ [Plain [Str "B"]]

950+ ,Cell ("",[],[]) Nothing 1 1

951+ [Plain [Str "C"]]

952+ ,Cell ("",[],[]) Nothing 1 1

953+ [Plain [Str "D"]]

954+ ,Cell ("",[],[]) Nothing 1 1

955+ [Plain [Str "E"]]

956+ ,Cell ("",[],[]) Nothing 1 1

957+ [Plain [Str "F"]]]]

958+ []

959+,Table ("",[],[]) (Caption Nothing

960+ []) [(AlignCenter,Nothing)] 0

961+ [Row ("",[],[])

962+ [Cell ("",[],[]) Nothing 1 1

963+ []]]

964+ [Row ("",[],[])

965+ [Cell ("",[],[]) Nothing 1 1

966+ []]

967+ ,Row ("",[],[])

968+ [Cell ("",[],[]) Nothing 1 1

969+ []]

970+ ,Row ("",[],[])

971+ [Cell ("",[],[]) Nothing 1 1

972+ []]]

973+ []

606974,Para [Str "|this|is|not|a|table|"]

test/vimwiki-reader.native+165−68

@@ -88,13 +88,24 @@ Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "2017-05-01"]),("title

8888 ,Para [Math DisplayMath "a^2 + b^2 = c^2"]

8989 ,Plain [Str "and",Space,Str "some",Space,Str "preformatted",Space,Str "and",Space,Str "tables",Space,Str "belonging",Space,Str "to",Space,Str "item",Space,Str "1",Space,Str "as",Space,Str "well"]

9090 ,CodeBlock ("",[],[]) "I'm part of item 1."

91− ,Table [] [AlignDefault,AlignDefault] [0.0,0.0]

92− [[]

93− ,[]]

94− [[[Plain [Str "this",Space,Str "table"]]

95− ,[Plain [Str "is"]]]

96− ,[[Plain [Str "also",Space,Str "a",Space,Str "part"]]

97− ,[Plain [Str "of",Space,Str "item",Space,Str "1"]]]]

91+ ,Table ("",[],[]) (Caption Nothing

92+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

93+ [Row ("",[],[])

94+ [Cell ("",[],[]) Nothing 1 1

95+ []

96+ ,Cell ("",[],[]) Nothing 1 1

97+ []]]

98+ [Row ("",[],[])

99+ [Cell ("",[],[]) Nothing 1 1

100+ [Plain [Str "this",Space,Str "table"]]

101+ ,Cell ("",[],[]) Nothing 1 1

102+ [Plain [Str "is"]]]

103+ ,Row ("",[],[])

104+ [Cell ("",[],[]) Nothing 1 1

105+ [Plain [Str "also",Space,Str "a",Space,Str "part"]]

106+ ,Cell ("",[],[]) Nothing 1 1

107+ [Plain [Str "of",Space,Str "item",Space,Str "1"]]]]

108+ []

98109 ,Plain [Str "and",Space,Str "some",Space,Str "more",Space,Str "text",Space,Str "belonging",Space,Str "to",Space,Str "item",Space,Str "1."]]

99110 ,[Plain [Str "ordered",Space,Str "list",Space,Str "item",Space,Str "2"]]]

100111,BulletList

@@ -181,11 +192,19 @@ Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "2017-05-01"]),("title

181192 ,OrderedList (1,DefaultStyle,DefaultDelim)

182193 [[Plain [Span ("",["done3"],[]) [],Str "4",SoftBreak,Str "5"]]

183194 ,[Plain [Span ("",["done4"],[]) []]

184− ,Table [] [AlignDefault,AlignDefault] [0.0,0.0]

185− [[]

186− ,[]]

187− [[[Plain [Str "a"]]

188− ,[Plain [Str "b"]]]]]]]

195+ ,Table ("",[],[]) (Caption Nothing

196+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

197+ [Row ("",[],[])

198+ [Cell ("",[],[]) Nothing 1 1

199+ []

200+ ,Cell ("",[],[]) Nothing 1 1

201+ []]]

202+ [Row ("",[],[])

203+ [Cell ("",[],[]) Nothing 1 1

204+ [Plain [Str "a"]]

205+ ,Cell ("",[],[]) Nothing 1 1

206+ [Plain [Str "b"]]]]

207+ []]]]

189208 ,[Plain [Span ("",["done4"],[]) [],Str "task",Space,Str "2"]]]

190209,Header 2 ("math",[],[]) [Str "math"]

191210,Para [Math InlineMath " \\sum_i a_i^2 = 1 "]

@@ -200,34 +219,71 @@ Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "2017-05-01"]),("title

200219,Header 2 ("tags",[],[]) [Str "tags"]

201220,Para [Span ("-tag-one",[],[]) [Str ""],Span ("tag-one",["tag"],[]) [Str "tag-one"],Space,Span ("-tag-two",[],[]) [Str ""],Span ("tag-two",["tag"],[]) [Str "tag-two"]]

202221,Header 2 ("tables",[],[]) [Str "tables"]

203−,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0]

204− [[Plain [Str "Year"]]

205− ,[Plain [Str "Temperature",Space,Str "(low)"]]

206− ,[Plain [Str "Temperature",Space,Str "(high)"]]]

207− [[[Plain [Str "1900"]]

208− ,[Plain [Str "-10"]]

209− ,[Plain [Str "25"]]]

210− ,[[Plain [Str "1910"]]

211− ,[Plain [Str "-15"]]

212− ,[Plain [Str "30"]]]

213− ,[[Plain [Str "1920"]]

214− ,[Plain [Str "-10"]]

215− ,[Plain [Str "32"]]]

216− ,[[Plain [Str "1930"]]

217− ,[Plain [Emph [Str "N/A"]]]

218− ,[Plain [Emph [Str "N/A"]]]]

219− ,[[Plain [Str "1940"]]

220− ,[Plain [Str "-2"]]

221− ,[Plain [Str "40"]]]]

222+,Table ("",[],[]) (Caption Nothing

223+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

224+ [Row ("",[],[])

225+ [Cell ("",[],[]) Nothing 1 1

226+ [Plain [Str "Year"]]

227+ ,Cell ("",[],[]) Nothing 1 1

228+ [Plain [Str "Temperature",Space,Str "(low)"]]

229+ ,Cell ("",[],[]) Nothing 1 1

230+ [Plain [Str "Temperature",Space,Str "(high)"]]]]

231+ [Row ("",[],[])

232+ [Cell ("",[],[]) Nothing 1 1

233+ [Plain [Str "1900"]]

234+ ,Cell ("",[],[]) Nothing 1 1

235+ [Plain [Str "-10"]]

236+ ,Cell ("",[],[]) Nothing 1 1

237+ [Plain [Str "25"]]]

238+ ,Row ("",[],[])

239+ [Cell ("",[],[]) Nothing 1 1

240+ [Plain [Str "1910"]]

241+ ,Cell ("",[],[]) Nothing 1 1

242+ [Plain [Str "-15"]]

243+ ,Cell ("",[],[]) Nothing 1 1

244+ [Plain [Str "30"]]]

245+ ,Row ("",[],[])

246+ [Cell ("",[],[]) Nothing 1 1

247+ [Plain [Str "1920"]]

248+ ,Cell ("",[],[]) Nothing 1 1

249+ [Plain [Str "-10"]]

250+ ,Cell ("",[],[]) Nothing 1 1

251+ [Plain [Str "32"]]]

252+ ,Row ("",[],[])

253+ [Cell ("",[],[]) Nothing 1 1

254+ [Plain [Str "1930"]]

255+ ,Cell ("",[],[]) Nothing 1 1

256+ [Plain [Emph [Str "N/A"]]]

257+ ,Cell ("",[],[]) Nothing 1 1

258+ [Plain [Emph [Str "N/A"]]]]

259+ ,Row ("",[],[])

260+ [Cell ("",[],[]) Nothing 1 1

261+ [Plain [Str "1940"]]

262+ ,Cell ("",[],[]) Nothing 1 1

263+ [Plain [Str "-2"]]

264+ ,Cell ("",[],[]) Nothing 1 1

265+ [Plain [Str "40"]]]]

266+ []

222267,Header 3 ("centered headerless tables",[],[]) [Str "centered",Space,Str "headerless",Space,Str "tables"]

223268,Div ("",["center"],[])

224− [Table [] [AlignDefault,AlignDefault] [0.0,0.0]

225− [[]

226− ,[]]

227− [[[Plain [Str "a"]]

228− ,[Plain [Str "b"]]]

229− ,[[Plain [Str "c"]]

230− ,[Plain [Str "d"]]]]]

269+ [Table ("",[],[]) (Caption Nothing

270+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

271+ [Row ("",[],[])

272+ [Cell ("",[],[]) Nothing 1 1

273+ []

274+ ,Cell ("",[],[]) Nothing 1 1

275+ []]]

276+ [Row ("",[],[])

277+ [Cell ("",[],[]) Nothing 1 1

278+ [Plain [Str "a"]]

279+ ,Cell ("",[],[]) Nothing 1 1

280+ [Plain [Str "b"]]]

281+ ,Row ("",[],[])

282+ [Cell ("",[],[]) Nothing 1 1

283+ [Plain [Str "c"]]

284+ ,Cell ("",[],[]) Nothing 1 1

285+ [Plain [Str "d"]]]]

286+ []]

231287,Header 2 ("paragraphs",[],[]) [Str "paragraphs"]

232288,Para [Str "This",Space,Str "is",Space,Str "first",Space,Str "paragraph",SoftBreak,Str "with",Space,Str "two",Space,Str "lines."]

233289,Para [Str "This",Space,Str "is",Space,Str "a",Space,Str "second",Space,Str "paragraph",Space,Str "with",SoftBreak,Str "two",Space,Str "lines",Space,Str "after",Space,Str "many",Space,Str "blank",Space,Str "lines."]

@@ -277,37 +333,78 @@ Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "2017-05-01"]),("title

277333,Para [Span ("",["todo"],[]) [Str "TODO:"]]

278334,Header 1 ("not implemented yet",[],[]) [Emph [Span ("not implemented yet",[],[]) [],Strong [Str "not",Space,Str "implemented",Space,Str "yet"]]]

279335,Header 2 ("tables with spans",[],[]) [Str "tables",Space,Str "with",Space,Str "spans"]

280−,Table [] [AlignDefault,AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0,0.0]

281− [[]

282− ,[]

283− ,[]

284− ,[]]

285− [[[Plain [Str "a"]]

286− ,[Plain [Str "b"]]

287− ,[Plain [Str "c"]]

288− ,[Plain [Str "d"]]]

289− ,[[Plain [Str "\\/"]]

290− ,[Plain [Str "e"]]

291− ,[Plain [Str ">"]]

292− ,[Plain [Str "f"]]]

293− ,[[Plain [Str "\\/"]]

294− ,[Plain [Str "\\/"]]

295− ,[Plain [Str ">"]]

296− ,[Plain [Str "g"]]]

297− ,[[Plain [Str "h"]]

298− ,[Plain [Str ">"]]

299− ,[Plain [Str ">"]]

300− ,[Plain [Str ">"]]]]

336+,Table ("",[],[]) (Caption Nothing

337+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

338+ [Row ("",[],[])

339+ [Cell ("",[],[]) Nothing 1 1

340+ []

341+ ,Cell ("",[],[]) Nothing 1 1

342+ []

343+ ,Cell ("",[],[]) Nothing 1 1

344+ []

345+ ,Cell ("",[],[]) Nothing 1 1

346+ []]]

347+ [Row ("",[],[])

348+ [Cell ("",[],[]) Nothing 1 1

349+ [Plain [Str "a"]]

350+ ,Cell ("",[],[]) Nothing 1 1

351+ [Plain [Str "b"]]

352+ ,Cell ("",[],[]) Nothing 1 1

353+ [Plain [Str "c"]]

354+ ,Cell ("",[],[]) Nothing 1 1

355+ [Plain [Str "d"]]]

356+ ,Row ("",[],[])

357+ [Cell ("",[],[]) Nothing 1 1

358+ [Plain [Str "\\/"]]

359+ ,Cell ("",[],[]) Nothing 1 1

360+ [Plain [Str "e"]]

361+ ,Cell ("",[],[]) Nothing 1 1

362+ [Plain [Str ">"]]

363+ ,Cell ("",[],[]) Nothing 1 1

364+ [Plain [Str "f"]]]

365+ ,Row ("",[],[])

366+ [Cell ("",[],[]) Nothing 1 1

367+ [Plain [Str "\\/"]]

368+ ,Cell ("",[],[]) Nothing 1 1

369+ [Plain [Str "\\/"]]

370+ ,Cell ("",[],[]) Nothing 1 1

371+ [Plain [Str ">"]]

372+ ,Cell ("",[],[]) Nothing 1 1

373+ [Plain [Str "g"]]]

374+ ,Row ("",[],[])

375+ [Cell ("",[],[]) Nothing 1 1

376+ [Plain [Str "h"]]

377+ ,Cell ("",[],[]) Nothing 1 1

378+ [Plain [Str ">"]]

379+ ,Cell ("",[],[]) Nothing 1 1

380+ [Plain [Str ">"]]

381+ ,Cell ("",[],[]) Nothing 1 1

382+ [Plain [Str ">"]]]]

383+ []

301384,Header 2 ("tables with multiple lines of headers",[],[]) [Str "tables",Space,Str "with",Space,Str "multiple",Space,Str "lines",Space,Str "of",Space,Str "headers"]

302−,Table [] [AlignDefault,AlignDefault] [0.0,0.0]

303− [[]

304− ,[]]

305− [[[Plain [Str "a"]]

306− ,[Plain [Str "b"]]]

307− ,[[Plain [Str "c"]]

308− ,[Plain [Str "d"]]]

309− ,[[Plain [Str "---"]]

310− ,[Plain [Str "---"]]]]

385+,Table ("",[],[]) (Caption Nothing

386+ []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0

387+ [Row ("",[],[])

388+ [Cell ("",[],[]) Nothing 1 1

389+ []

390+ ,Cell ("",[],[]) Nothing 1 1

391+ []]]

392+ [Row ("",[],[])

393+ [Cell ("",[],[]) Nothing 1 1

394+ [Plain [Str "a"]]

395+ ,Cell ("",[],[]) Nothing 1 1

396+ [Plain [Str "b"]]]

397+ ,Row ("",[],[])

398+ [Cell ("",[],[]) Nothing 1 1

399+ [Plain [Str "c"]]

400+ ,Cell ("",[],[]) Nothing 1 1

401+ [Plain [Str "d"]]]

402+ ,Row ("",[],[])

403+ [Cell ("",[],[]) Nothing 1 1

404+ [Plain [Str "---"]]

405+ ,Cell ("",[],[]) Nothing 1 1

406+ [Plain [Str "---"]]]]

407+ []

311408,Header 2 ("some other placeholders",[],[]) [Str "some",Space,Str "other",Space,Str "placeholders"]

312409,Para [Code ("",[],[]) "template",Space,Str "placeholder",Space,Str "is",Space,Str "ignored."]

313410,Para [Code ("",[],[]) "nohtml",Space,Str "placeholder",Space,Str "is",Space,Str "ignored."]]