diff options
| author | despresc <christian.j.j.despres@gmail.com> | 2020-04-04 16:35:42 -0400 |
|---|---|---|
| committer | despresc <christian.j.j.despres@gmail.com> | 2020-04-15 23:03:22 -0400 |
| commit | 4e34d366df31937cdc69b6b366355f10a84c16b2 (patch) | |
| tree | 844503b0f59439acaec5d2f8e2f016e2eb1d214c | |
| parent | f8ce38975b547fe7fc8c12ccee3a940b35d8b9cf (diff) | |
| download | pandoc-4e34d366df31937cdc69b6b366355f10a84c16b2.tar.gz | |
Adapt to the newest Table type, fix some previous adaptation issues
- Writers.Native is now adapted to the new Table type.
- Inline captions should now be conditionally wrapped in a Plain, not
a Para block.
- The toLegacyTable function now lives in Writers.Shared.
113 files changed, 5128 insertions, 3935 deletions
diff --git a/src/Text/Pandoc/Lua/Marshaling/AST.hs b/src/Text/Pandoc/Lua/Marshaling/AST.hs index db9f097ef..f314649f0 100644 --- a/src/Text/Pandoc/Lua/Marshaling/AST.hs +++ b/src/Text/Pandoc/Lua/Marshaling/AST.hs @@ -21,7 +21,7 @@ import Foreign.Lua (Lua, Peekable, Pushable, StackIndex) import Text.Pandoc.Definition import Text.Pandoc.Lua.Util (defineHowTo, pushViaConstructor) import Text.Pandoc.Lua.Marshaling.CommonState () -import Text.Pandoc.Shared (toLegacyTable) +import Text.Pandoc.Writers.Shared (toLegacyTable) import qualified Foreign.Lua as Lua import qualified Text.Pandoc.Lua.Util as LuaUtil @@ -168,7 +168,7 @@ pushBlock = \case Para blcks -> pushViaConstructor "Para" blcks Plain blcks -> pushViaConstructor "Plain" blcks RawBlock f cs -> pushViaConstructor "RawBlock" f cs - Table _ blkCapt specs _ thead tbody tfoot -> + Table _ blkCapt specs thead tbody tfoot -> let (capt, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot in pushViaConstructor "Table" capt aligns widths headers rows @@ -195,12 +195,11 @@ peekBlock idx = defineHowTo "get Block value" $ do "RawBlock" -> uncurry RawBlock <$> elementContent "Table" -> (\(capt, aligns, widths, headers, body) -> Table nullAttr - (Caption Nothing $ maybePara capt) + (Caption Nothing $ maybePlain capt) (zip aligns (map strictPos widths)) - 0 - [toRow headers] - (map toRow body) - []) + (TableHead nullAttr [toRow headers]) + [TableBody nullAttr 0 [] (map toRow body)] + (TableFoot nullAttr [])) <$> elementContent _ -> Lua.throwException ("Unknown block type: " <> tag) where @@ -208,10 +207,10 @@ peekBlock idx = defineHowTo "get Block value" $ do elementContent :: Peekable a => Lua a elementContent = LuaUtil.rawField idx "c" - strictPos w = if w > 0 then Just w else Nothing - maybePara [] = [] - maybePara x = [Para x] - toRow = Row nullAttr . map (\blk -> Cell nullAttr Nothing 1 1 blk) + strictPos w = if w > 0 then ColWidth w else ColWidthDefault + maybePlain [] = [] + maybePlain x = [Plain x] + toRow = Row nullAttr . map (\blk -> Cell nullAttr AlignDefault 1 1 blk) -- | Push an inline element to the top of the lua stack. pushInline :: Inline -> Lua () diff --git a/src/Text/Pandoc/Lua/Walk.hs b/src/Text/Pandoc/Lua/Walk.hs index 5b62001de..695c7b44e 100644 --- a/src/Text/Pandoc/Lua/Walk.hs +++ b/src/Text/Pandoc/Lua/Walk.hs @@ -59,6 +59,18 @@ instance Walkable (SingletonsList Inline) Row where walkM = walkRowM query = queryRow +instance Walkable (SingletonsList Inline) TableHead where + walkM = walkTableHeadM + query = queryTableHead + +instance Walkable (SingletonsList Inline) TableBody where + walkM = walkTableBodyM + query = queryTableBody + +instance Walkable (SingletonsList Inline) TableFoot where + walkM = walkTableFootM + query = queryTableFoot + instance Walkable (SingletonsList Inline) Caption where walkM = walkCaptionM query = queryCaption @@ -102,6 +114,18 @@ instance Walkable (SingletonsList Block) Row where walkM = walkRowM query = queryRow +instance Walkable (SingletonsList Block) TableHead where + walkM = walkTableHeadM + query = queryTableHead + +instance Walkable (SingletonsList Block) TableBody where + walkM = walkTableBodyM + query = queryTableBody + +instance Walkable (SingletonsList Block) TableFoot where + walkM = walkTableFootM + query = queryTableFoot + instance Walkable (SingletonsList Block) Caption where walkM = walkCaptionM query = queryCaption diff --git a/src/Text/Pandoc/Parsing.hs b/src/Text/Pandoc/Parsing.hs index aa961e814..f17a9af1d 100644 --- a/src/Text/Pandoc/Parsing.hs +++ b/src/Text/Pandoc/Parsing.hs @@ -928,8 +928,8 @@ tableWith headerParser rowParser lineParser footerParser = try $ do return $ B.table mempty (zip aligns (map fromWidth widths)) <$> heads <*> rows where fromWidth n - | n > 0 = Just n - | otherwise = Nothing + | n > 0 = ColWidth n + | otherwise = ColWidthDefault type TableComponents mf = ([Alignment], [Double], mf [Blocks], mf [[Blocks]]) diff --git a/src/Text/Pandoc/Readers/CSV.hs b/src/Text/Pandoc/Readers/CSV.hs index 8608a1a2c..a1272d47f 100644 --- a/src/Text/Pandoc/Readers/CSV.hs +++ b/src/Text/Pandoc/Readers/CSV.hs @@ -37,6 +37,6 @@ readCSV _opts s = hdrs = map toplain r rows = map (map toplain) rs aligns = replicate numcols AlignDefault - widths = replicate numcols Nothing + widths = replicate numcols ColWidthDefault Right [] -> return $ B.doc mempty Left e -> throwError $ PandocParsecError s e diff --git a/src/Text/Pandoc/Readers/CommonMark.hs b/src/Text/Pandoc/Readers/CommonMark.hs index 33afbe59f..d1f732bf1 100644 --- a/src/Text/Pandoc/Readers/CommonMark.hs +++ b/src/Text/Pandoc/Readers/CommonMark.hs @@ -111,13 +111,19 @@ addBlock opts (Node _ (LIST listAttrs) nodes) = PAREN_DELIM -> OneParen exts = readerExtensions opts addBlock opts (Node _ (TABLE alignments) nodes) = - (Table nullAttr (Caption Nothing []) (zip aligns widths) 0 headers rows [] :) + (Table + nullAttr + (Caption Nothing []) + (zip aligns widths) + (TableHead nullAttr headers) + [TableBody nullAttr 0 [] rows] + (TableFoot nullAttr []) :) where aligns = map fromTableCellAlignment alignments fromTableCellAlignment NoAlignment = AlignDefault fromTableCellAlignment LeftAligned = AlignLeft fromTableCellAlignment RightAligned = AlignRight fromTableCellAlignment CenterAligned = AlignCenter - widths = replicate numcols Nothing + widths = replicate numcols ColWidthDefault numcols = if null rows' then 0 else maximum $ map rowLength rows' @@ -136,7 +142,7 @@ addBlock opts (Node _ (TABLE alignments) nodes) = | isBlockNode n = fromSimpleCell $ addBlocks opts (n:ns) | otherwise = fromSimpleCell [Plain (addInlines opts (n:ns))] toCell (Node _ t _) = error $ "toCell encountered non-cell " ++ show t - fromSimpleCell = Cell nullAttr Nothing 1 1 + fromSimpleCell = Cell nullAttr AlignDefault 1 1 rowLength (Row _ body) = length body -- all cells are 1×1 addBlock _ (Node _ TABLE_ROW _) = id -- handled in TABLE addBlock _ (Node _ TABLE_CELL _) = id -- handled in TABLE diff --git a/src/Text/Pandoc/Readers/DocBook.hs b/src/Text/Pandoc/Readers/DocBook.hs index 6c56c1bd7..4001d647e 100644 --- a/src/Text/Pandoc/Readers/DocBook.hs +++ b/src/Text/Pandoc/Readers/DocBook.hs @@ -881,12 +881,12 @@ parseBlock (Elem e) = [] -> replicate numrows AlignDefault cs -> map toAlignment cs let widths = case colspecs of - [] -> replicate numrows Nothing + [] -> replicate numrows ColWidthDefault cs -> let ws = map toWidth cs in case sequence ws of Just ws' -> let tot = sum ws' - in Just . (/ tot) <$> ws' - Nothing -> replicate numrows Nothing + in ColWidth . (/ tot) <$> ws' + Nothing -> replicate numrows ColWidthDefault let headrows' = if null headrows then replicate numrows mempty else headrows diff --git a/src/Text/Pandoc/Readers/Docx.hs b/src/Text/Pandoc/Readers/Docx.hs index a5e8cb463..69aa18f73 100644 --- a/src/Text/Pandoc/Readers/Docx.hs +++ b/src/Text/Pandoc/Readers/Docx.hs @@ -676,7 +676,7 @@ bodyPartToBlocks (Tbl cap _ look parts@(r:rs)) = do -- so should be possible. Alignment might be more difficult, -- since there doesn't seem to be a column entity in docx. let alignments = replicate width AlignDefault - widths = replicate width Nothing + widths = replicate width ColWidthDefault return $ table cap' (zip alignments widths) hdrCells cells' bodyPartToBlocks (OMathPara e) = diff --git a/src/Text/Pandoc/Readers/DokuWiki.hs b/src/Text/Pandoc/Readers/DokuWiki.hs index 296c751a2..ee26eed84 100644 --- a/src/Text/Pandoc/Readers/DokuWiki.hs +++ b/src/Text/Pandoc/Readers/DokuWiki.hs @@ -470,7 +470,7 @@ table = do let (headerRow, body) = if firstSeparator == '^' then (head rows, tail rows) else ([], rows) - let attrs = (AlignDefault, Nothing) <$ transpose rows + let attrs = (AlignDefault, ColWidthDefault) <$ transpose rows pure $ B.table mempty attrs headerRow body tableRows :: PandocMonad m => DWParser m [[B.Blocks]] diff --git a/src/Text/Pandoc/Readers/HTML.hs b/src/Text/Pandoc/Readers/HTML.hs index 8de9ebc19..30b812913 100644 --- a/src/Text/Pandoc/Readers/HTML.hs +++ b/src/Text/Pandoc/Readers/HTML.hs @@ -513,12 +513,12 @@ pTable = try $ do _ -> replicate cols AlignDefault let widths = if null widths' then if isSimple - then replicate cols Nothing - else replicate cols (Just (1.0 / fromIntegral cols)) + then replicate cols ColWidthDefault + else replicate cols (ColWidth (1.0 / fromIntegral cols)) else widths' return $ B.table caption (zip aligns widths) head' rows -pCol :: PandocMonad m => TagParser m (Maybe Double) +pCol :: PandocMonad m => TagParser m ColWidth pCol = try $ do TagOpen _ attribs' <- pSatisfy (matchTagOpen "col" []) let attribs = toStringAttr attribs' @@ -535,10 +535,10 @@ pCol = try $ do fromMaybe 0.0 $ safeRead xs _ -> 0.0 if width > 0.0 - then return $ Just $ width / 100.0 - else return Nothing + then return $ ColWidth $ width / 100.0 + else return ColWidthDefault -pColgroup :: PandocMonad m => TagParser m [Maybe Double] +pColgroup :: PandocMonad m => TagParser m [ColWidth] pColgroup = try $ do pSatisfy (matchTagOpen "colgroup" []) skipMany pBlank diff --git a/src/Text/Pandoc/Readers/Haddock.hs b/src/Text/Pandoc/Readers/Haddock.hs index 7303f9c32..5bef6f9fd 100644 --- a/src/Text/Pandoc/Readers/Haddock.hs +++ b/src/Text/Pandoc/Readers/Haddock.hs @@ -91,7 +91,7 @@ docHToBlocks d' = else (toCells (head headerRows), map toCells (tail headerRows ++ bodyRows)) colspecs = replicate (maximum (map length body)) - (AlignDefault, Nothing) + (AlignDefault, ColWidthDefault) in B.table mempty colspecs header body where inlineFallback = B.plain $ docHToInlines False d' diff --git a/src/Text/Pandoc/Readers/JATS.hs b/src/Text/Pandoc/Readers/JATS.hs index 3dfe9161b..24d2ef4a1 100644 --- a/src/Text/Pandoc/Readers/JATS.hs +++ b/src/Text/Pandoc/Readers/JATS.hs @@ -274,12 +274,12 @@ parseBlock (Elem e) = [] -> replicate numrows AlignDefault cs -> map toAlignment cs let widths = case colspecs of - [] -> replicate numrows Nothing + [] -> replicate numrows ColWidthDefault cs -> let ws = map toWidth cs in case sequence ws of Just ws' -> let tot = sum ws' - in Just . (/ tot) <$> ws' - Nothing -> replicate numrows Nothing + in ColWidth . (/ tot) <$> ws' + Nothing -> replicate numrows ColWidthDefault let headrows' = if null headrows then replicate numrows mempty else headrows diff --git a/src/Text/Pandoc/Readers/LaTeX.hs b/src/Text/Pandoc/Readers/LaTeX.hs index 4b09f1402..ea5549543 100644 --- a/src/Text/Pandoc/Readers/LaTeX.hs +++ b/src/Text/Pandoc/Readers/LaTeX.hs @@ -2268,7 +2268,7 @@ splitWordTok = do setInput $ map (Tok spos Symbol . T.singleton) (T.unpack t) <> rest _ -> return () -parseAligns :: PandocMonad m => LP m [(Alignment, Maybe Double, ([Tok], [Tok]))] +parseAligns :: PandocMonad m => LP m [(Alignment, ColWidth, ([Tok], [Tok]))] parseAligns = try $ do let maybeBar = skipMany (try $ sp *> (() <$ symbol '|' <|> () <$ (symbol '@' >> braced))) @@ -2319,7 +2319,11 @@ parseAligns = try $ do spaces egroup spaces - return aligns' + return $ map toSpec aligns' + where + toColWidth (Just w) | w > 0 = ColWidth w + toColWidth _ = ColWidthDefault + toSpec (x, y, z) = (x, toColWidth y, z) parseTableRow :: PandocMonad m => Text -- ^ table environment name @@ -2397,11 +2401,11 @@ simpTable envname hasWidthParameter = try $ do addTableCaption :: PandocMonad m => Blocks -> LP m Blocks addTableCaption = walkM go - where go (Table attr c spec rhs th tb tf) = do + where go (Table attr c spec th tb tf) = do st <- getState let mblabel = sLastLabel st capt <- case (sCaption st, mblabel) of - (Just ils, Nothing) -> return $ Caption Nothing (mcap ils) + (Just ils, Nothing) -> return $ caption Nothing (plain ils) (Just ils, Just lab) -> do num <- getNextNumber sLastTableNum setState @@ -2409,15 +2413,11 @@ addTableCaption = walkM go , sLabels = M.insert lab [Str (renderDottedNum num)] (sLabels st) } - return $ Caption Nothing (mcap ils) -- add number?? + return $ caption Nothing (plain ils) -- add number?? (Nothing, _) -> return c return $ maybe id (\ident -> Div (ident, [], []) . (:[])) mblabel $ - Table attr capt spec rhs th tb tf + Table attr capt spec th tb tf go x = return x - mcap ils - | isNull ils = [] - | otherwise = [Para $ toList ils] - block :: PandocMonad m => LP m Blocks block = do diff --git a/src/Text/Pandoc/Readers/Man.hs b/src/Text/Pandoc/Readers/Man.hs index 50dbb5992..e175135da 100644 --- a/src/Text/Pandoc/Readers/Man.hs +++ b/src/Text/Pandoc/Readers/Man.hs @@ -107,9 +107,8 @@ parseTable = do bodyRows <- mapM (mapM parseTableCell . snd) bodyRows' isPlainTable <- tableCellsPlain <$> getState let widths = if isPlainTable - then repeat Nothing - else repeat (Just (1.0 / fromIntegral (length alignments)) - :: Maybe Double) + then repeat ColWidthDefault + else repeat $ ColWidth (1.0 / fromIntegral (length alignments)) return $ B.table mempty (zip alignments widths) headerRow bodyRows) <|> fallback pos [] -> fallback pos diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs index 54d2752c7..222c227e2 100644 --- a/src/Text/Pandoc/Readers/Markdown.hs +++ b/src/Text/Pandoc/Readers/Markdown.hs @@ -1418,8 +1418,8 @@ table = try $ do then widths else map (/ totalWidth) widths let strictPos w - | w > 0 = Just w - | otherwise = Nothing + | w > 0 = ColWidth w + | otherwise = ColWidthDefault return $ do caption' <- caption heads' <- heads diff --git a/src/Text/Pandoc/Readers/MediaWiki.hs b/src/Text/Pandoc/Readers/MediaWiki.hs index 5e9aecc49..0396c95de 100644 --- a/src/Text/Pandoc/Readers/MediaWiki.hs +++ b/src/Text/Pandoc/Readers/MediaWiki.hs @@ -221,9 +221,9 @@ table = do let restwidth = tableWidth - sum widths let zerocols = length $ filter (==0.0) widths let defaultwidth = if zerocols == 0 || zerocols == length widths - then Nothing - else Just $ restwidth / fromIntegral zerocols - let widths' = map (\w -> if w == 0 then defaultwidth else Just w) widths + then ColWidthDefault + else ColWidth $ restwidth / fromIntegral zerocols + let widths' = map (\w -> if w > 0 then ColWidth w else defaultwidth) widths let cellspecs = zip (map fst cellspecs') widths' rows' <- many $ try $ rowsep *> (map snd <$> tableRow) optional blanklines diff --git a/src/Text/Pandoc/Readers/Muse.hs b/src/Text/Pandoc/Readers/Muse.hs index 1cabfa112..34a9a7367 100644 --- a/src/Text/Pandoc/Readers/Muse.hs +++ b/src/Text/Pandoc/Readers/Muse.hs @@ -646,7 +646,7 @@ data MuseTableElement = MuseHeaderRow [Blocks] museToPandocTable :: MuseTable -> Blocks museToPandocTable (MuseTable caption headers body footers) = B.table caption attrs headRow (rows ++ body ++ footers) - where attrs = (AlignDefault, Nothing) <$ transpose (headers ++ body ++ footers) + where attrs = (AlignDefault, ColWidthDefault) <$ transpose (headers ++ body ++ footers) (headRow, rows) = fromMaybe ([], []) $ uncons headers museAppendElement :: MuseTableElement @@ -694,7 +694,7 @@ museGridTable = try $ do indices <- museGridTableHeader fmap rowsToTable . sequence <$> many1 (museGridTableRow indent indices) where rowsToTable rows = B.table mempty attrs [] rows - where attrs = (AlignDefault, Nothing) <$ transpose rows + where attrs = (AlignDefault, ColWidthDefault) <$ transpose rows -- | Parse a table. table :: PandocMonad m => MuseParser m (F Blocks) diff --git a/src/Text/Pandoc/Readers/Odt/ContentReader.hs b/src/Text/Pandoc/Readers/Odt/ContentReader.hs index 2afd8a66d..cbf7236d0 100644 --- a/src/Text/Pandoc/Readers/Odt/ContentReader.hs +++ b/src/Text/Pandoc/Readers/Odt/ContentReader.hs @@ -921,8 +921,8 @@ post_process (Pandoc m blocks) = Pandoc m (post_process' blocks) post_process' :: [Block] -> [Block] -post_process' (Table attr _ specs rhs th tb tf : Div ("", ["caption"], _) blks : xs) - = Table attr (Caption Nothing blks) specs rhs th tb tf : post_process' xs +post_process' (Table attr _ specs th tb tf : Div ("", ["caption"], _) blks : xs) + = Table attr (Caption Nothing blks) specs th tb tf : post_process' xs post_process' bs = bs read_body :: OdtReader _x (Pandoc, MediaBag) diff --git a/src/Text/Pandoc/Readers/Org/Blocks.hs b/src/Text/Pandoc/Readers/Org/Blocks.hs index aef6ae210..5dbaa2a17 100644 --- a/src/Text/Pandoc/Readers/Org/Blocks.hs +++ b/src/Text/Pandoc/Readers/Org/Blocks.hs @@ -629,14 +629,14 @@ orgToPandocTable (OrgTable colProps heads lns) caption = else Nothing in B.table caption (map (convertColProp totalWidth) colProps) heads lns where - convertColProp :: Maybe Int -> ColumnProperty -> (Alignment, Maybe Double) + convertColProp :: Maybe Int -> ColumnProperty -> (Alignment, ColWidth) convertColProp totalWidth colProp = let align' = fromMaybe AlignDefault $ columnAlignment colProp width' = (\w t -> (fromIntegral w / fromIntegral t)) <$> columnRelWidth colProp <*> totalWidth - in (align', width') + in (align', maybe ColWidthDefault ColWidth width') tableRows :: PandocMonad m => OrgParser m [OrgTableRow] tableRows = try $ many (tableAlignRow <|> tableHline <|> tableContentRow) diff --git a/src/Text/Pandoc/Readers/RST.hs b/src/Text/Pandoc/Readers/RST.hs index 5db303d4d..0dadd5120 100644 --- a/src/Text/Pandoc/Readers/RST.hs +++ b/src/Text/Pandoc/Readers/RST.hs @@ -770,17 +770,17 @@ tableDirective :: PandocMonad m tableDirective top fields body = do bs <- parseFromString' parseBlocks body case B.toList bs of - [Table attr _ tspecs' rhs thead tbody tfoot] -> do + [Table attr _ tspecs' thead@(TableHead _ thrs) tbody tfoot] -> do let (aligns', widths') = unzip tspecs' title <- parseFromString' (trimInlines . mconcat <$> many inline) top columns <- getOption readerColumns - let numOfCols = case thead of + let numOfCols = case thrs of [] -> 0 (r:_) -> rowLength r let normWidths ws = strictPos . (/ max 1.0 (fromIntegral (columns - numOfCols))) <$> ws let widths = case trim <$> lookup "widths" fields of - Just "auto" -> replicate numOfCols Nothing + Just "auto" -> replicate numOfCols ColWidthDefault Just "grid" -> widths' Just specs -> normWidths $ map (fromMaybe (0 :: Double) . safeRead) @@ -788,19 +788,16 @@ tableDirective top fields body = do Nothing -> widths' -- align is not applicable since we can't represent whole table align let tspecs = zip aligns' widths - return $ B.singleton $ Table attr (Caption Nothing (mpara title)) - tspecs rhs thead tbody tfoot + return $ B.singleton $ Table attr (B.caption Nothing (B.plain title)) + tspecs thead tbody tfoot _ -> return mempty where -- only valid on the very first row of a table section rowLength (Row _ rb) = sum $ cellLength <$> rb - cellLength (Cell _ _ _ w _) = if w < 0 then 0 else w + cellLength (Cell _ _ _ w _) = max 1 (getColSpan w) strictPos w - | w > 0 = Just w - | otherwise = Nothing - mpara t - | B.isNull t = [] - | otherwise = [Para $ B.toList t] + | w > 0 = ColWidth w + | otherwise = ColWidthDefault -- TODO: :stub-columns:. -- Only the first row becomes the header even if header-rows: > 1, @@ -821,10 +818,10 @@ listTableDirective top fields body = do else ([], rows, length x) _ -> ([],[],0) widths = case trim <$> lookup "widths" fields of - Just "auto" -> replicate numOfCols Nothing + Just "auto" -> replicate numOfCols ColWidthDefault Just specs -> normWidths $ map (fromMaybe (0 :: Double) . safeRead) $ splitTextBy (`elem` (" ," :: String)) specs - _ -> replicate numOfCols Nothing + _ -> replicate numOfCols ColWidthDefault return $ B.table title (zip (replicate numOfCols AlignDefault) widths) headerRow @@ -835,8 +832,8 @@ listTableDirective top fields body = do takeCells _ = [] normWidths ws = strictPos . (/ max 1 (sum ws)) <$> ws strictPos w - | w > 0 = Just w - | otherwise = Nothing + | w > 0 = ColWidth w + | otherwise = ColWidthDefault csvTableDirective :: PandocMonad m => Text -> [(Text, Text)] -> Text @@ -890,16 +887,16 @@ csvTableDirective top fields rawcsv = do _ -> ([],[],0) title <- parseFromString' (trimInlines . mconcat <$> many inline) top let strictPos w - | w > 0 = Just w - | otherwise = Nothing + | w > 0 = ColWidth w + | otherwise = ColWidthDefault let normWidths ws = strictPos . (/ max 1 (sum ws)) <$> ws let widths = case trim <$> lookup "widths" fields of - Just "auto" -> replicate numOfCols Nothing + Just "auto" -> replicate numOfCols ColWidthDefault Just specs -> normWidths $ map (fromMaybe (0 :: Double) . safeRead) $ splitTextBy (`elem` (" ," :: String)) specs - _ -> replicate numOfCols Nothing + _ -> replicate numOfCols ColWidthDefault return $ B.table title (zip (replicate numOfCols AlignDefault) widths) headerRow @@ -1312,14 +1309,14 @@ simpleTable headless = do sep simpleTableFooter -- Simple tables get 0s for relative column widths (i.e., use default) case B.toList tbl of - [Table attr cap spec rhs th tb tf] -> return $ B.singleton $ - Table attr cap (rewidth spec) rhs th tb tf + [Table attr cap spec th tb tf] -> return $ B.singleton $ + Table attr cap (rewidth spec) th tb tf _ -> throwError $ PandocShouldNeverHappenError "tableWith returned something unexpected" where sep = return () -- optional (simpleTableSep '-') - rewidth = fmap $ fmap $ const Nothing + rewidth = fmap $ fmap $ const ColWidthDefault gridTable :: PandocMonad m => Bool -- ^ Headerless table diff --git a/src/Text/Pandoc/Readers/TWiki.hs b/src/Text/Pandoc/Readers/TWiki.hs index f14e3f710..b39e3303e 100644 --- a/src/Text/Pandoc/Readers/TWiki.hs +++ b/src/Text/Pandoc/Readers/TWiki.hs @@ -229,11 +229,11 @@ table = try $ do where buildTable caption rows (aligns, heads) = B.table caption aligns heads rows - align rows = replicate (columCount rows) (AlignDefault, Nothing) + align rows = replicate (columCount rows) (AlignDefault, ColWidthDefault) columns rows = replicate (columCount rows) mempty columCount rows = length $ head rows -tableParseHeader :: PandocMonad m => TWParser m ((Alignment, Maybe Double), B.Blocks) +tableParseHeader :: PandocMonad m => TWParser m ((Alignment, ColWidth), B.Blocks) tableParseHeader = try $ do char '|' leftSpaces <- length <$> many spaceChar @@ -245,9 +245,9 @@ tableParseHeader = try $ do return (tableAlign leftSpaces rightSpaces, content) where tableAlign left right - | left >= 2 && left == right = (AlignCenter, Nothing) - | left > right = (AlignRight, Nothing) - | otherwise = (AlignLeft, Nothing) + | left >= 2 && left == right = (AlignCenter, ColWidthDefault) + | left > right = (AlignRight, ColWidthDefault) + | otherwise = (AlignLeft, ColWidthDefault) tableParseRow :: PandocMonad m => TWParser m [B.Blocks] tableParseRow = many1Till tableParseColumn newline diff --git a/src/Text/Pandoc/Readers/Textile.hs b/src/Text/Pandoc/Readers/Textile.hs index 3d2a962e9..a0680ac81 100644 --- a/src/Text/Pandoc/Readers/Textile.hs +++ b/src/Text/Pandoc/Readers/Textile.hs @@ -378,7 +378,7 @@ table = try $ do let nbOfCols = maximum $ map length (headers:rows) let aligns = map minimum $ transpose $ map (map (snd . fst)) (headers:rows) return $ B.table caption - (zip aligns (replicate nbOfCols Nothing)) + (zip aligns (replicate nbOfCols ColWidthDefault)) (map snd headers) (map (map snd) rows) diff --git a/src/Text/Pandoc/Readers/Txt2Tags.hs b/src/Text/Pandoc/Readers/Txt2Tags.hs index 5d2f11864..fc1c8c5cf 100644 --- a/src/Text/Pandoc/Readers/Txt2Tags.hs +++ b/src/Text/Pandoc/Readers/Txt2Tags.hs @@ -268,7 +268,7 @@ table = try $ do let rowsPadded = map (pad size) rows' let headerPadded = if null tableHeader then mempty else pad size tableHeader return $ B.table mempty - (zip aligns (replicate ncolumns Nothing)) + (zip aligns (replicate ncolumns ColWidthDefault)) headerPadded rowsPadded pad :: (Monoid a) => Int -> [a] -> [a] diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs index 0418aa6e2..4a60866af 100644 --- a/src/Text/Pandoc/Shared.hs +++ b/src/Text/Pandoc/Shared.hs @@ -77,7 +77,6 @@ module Text.Pandoc.Shared ( htmlSpanLikeElements, splitSentences, filterIpynbOutput, - toLegacyTable, -- * TagSoup HTML handling renderTags', -- * File handling @@ -993,12 +992,14 @@ blockToInlines (DefinitionList pairslst) = mconcat (map blocksToInlines' blkslst) blockToInlines (Header _ _ ils) = B.fromList ils blockToInlines HorizontalRule = mempty -blockToInlines (Table _ _ _ _ headers rows feet) = +blockToInlines (Table _ _ _ (TableHead _ hbd) bodies (TableFoot _ fbd)) = mconcat $ intersperse B.linebreak $ - map (mconcat . map blocksToInlines') (plainRowBody <$> headers <> rows <> feet) + map (mconcat . map blocksToInlines') (plainRowBody <$> hbd <> unTableBodies bodies <> fbd) where plainRowBody (Row _ body) = cellBody <$> body cellBody (Cell _ _ _ _ body) = body + unTableBody (TableBody _ _ hd bd) = hd <> bd + unTableBodies = concatMap unTableBody blockToInlines (Div _ blks) = blocksToInlines' blks blockToInlines Null = mempty @@ -1012,30 +1013,6 @@ blocksToInlines' = blocksToInlinesWithSep defaultBlocksSeparator blocksToInlines :: [Block] -> [Inline] blocksToInlines = B.toList . blocksToInlines' --- | Convert the relevant components of a new-style table (with block --- caption, row headers, row and column spans, and so on) to those of --- an old-style table (inline caption, table head with one row, no --- foot, and so on). -toLegacyTable :: Caption - -> [ColSpec] - -> TableHead - -> TableBody - -> TableFoot - -> ([Inline], [Alignment], [Double], [[Block]], [[[Block]]]) -toLegacyTable (Caption _ cbody) specs th tb tf = (cbody', aligns, widths, th', tb') - where - numcols = length specs - (aligns, mwidths) = unzip specs - widths = map (fromMaybe 0) mwidths - unRow (Row _ x) = map unCell x - unCell (Cell _ _ _ _ x) = x - cbody' = blocksToInlines cbody - sanitise = pad mempty numcols . unRow - pad element upTo list = take upTo (list ++ repeat element) - (th', tb') = case th of - (r:rs) -> (sanitise r, map sanitise $ rs <> tb <> tf) - [] -> ([], map sanitise $ tb <> tf) - -- | Inline elements used to separate blocks when squashing blocks into -- inlines. defaultBlocksSeparator :: Inlines diff --git a/src/Text/Pandoc/Writers/AsciiDoc.hs b/src/Text/Pandoc/Writers/AsciiDoc.hs index b9d93188a..e0ee830de 100644 --- a/src/Text/Pandoc/Writers/AsciiDoc.hs +++ b/src/Text/Pandoc/Writers/AsciiDoc.hs @@ -191,7 +191,7 @@ blockToAsciiDoc opts (BlockQuote blocks) = do else contents let bar = text "____" return $ bar $$ chomp contents' $$ bar <> blankline -blockToAsciiDoc opts (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToAsciiDoc opts (Table _ blkCapt specs thead tbody tfoot) = do let (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot caption' <- inlineListToAsciiDoc opts caption let caption'' = if null caption diff --git a/src/Text/Pandoc/Writers/CommonMark.hs b/src/Text/Pandoc/Writers/CommonMark.hs index bd798ee73..bab74c77c 100644 --- a/src/Text/Pandoc/Writers/CommonMark.hs +++ b/src/Text/Pandoc/Writers/CommonMark.hs @@ -27,7 +27,7 @@ import Text.Pandoc.Class.PandocMonad (PandocMonad) import Text.Pandoc.Definition import Text.Pandoc.Options import Text.Pandoc.Shared (capitalize, isTightList, - linesToPara, onlySimpleTableCells, taskListItemToAscii, tshow, toLegacyTable) + linesToPara, onlySimpleTableCells, taskListItemToAscii, tshow) import Text.Pandoc.Templates (renderTemplate) import Text.Pandoc.Walk (walk, walkM) import Text.Pandoc.Writers.HTML (writeHtml5String, tagWithAttributes) @@ -154,7 +154,7 @@ blockToNodes opts (DefinitionList items) ns = Plain (term ++ [LineBreak] ++ xs) : ys ++ concat zs dlToBullet (term, xs) = Para term : concat xs -blockToNodes opts t@(Table _ blkCapt specs _ thead tbody tfoot) ns = +blockToNodes opts t@(Table _ blkCapt specs thead tbody tfoot) ns = let (capt, aligns, _widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot in if isEnabled Ext_pipe_tables opts && onlySimpleTableCells (headers : rows) then do diff --git a/src/Text/Pandoc/Writers/ConTeXt.hs b/src/Text/Pandoc/Writers/ConTeXt.hs index f3d7219d1..6066f9bb2 100644 --- a/src/Text/Pandoc/Writers/ConTeXt.hs +++ b/src/Text/Pandoc/Writers/ConTeXt.hs @@ -255,7 +255,7 @@ blockToConTeXt (DefinitionList lst) = blockToConTeXt HorizontalRule = return $ "\\thinrule" <> blankline -- If this is ever executed, provide a default for the reference identifier. blockToConTeXt (Header level attr lst) = sectionHeader attr level lst -blockToConTeXt (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToConTeXt (Table _ blkCapt specs thead tbody tfoot) = do let (caption, aligns, widths, heads, rows) = toLegacyTable blkCapt specs thead tbody tfoot opts <- gets stOptions let tabl = if isEnabled Ext_ntb opts diff --git a/src/Text/Pandoc/Writers/Custom.hs b/src/Text/Pandoc/Writers/Custom.hs index beb2301c9..2be64d56f 100644 --- a/src/Text/Pandoc/Writers/Custom.hs +++ b/src/Text/Pandoc/Writers/Custom.hs @@ -29,7 +29,6 @@ import Text.Pandoc.Lua (Global (..), LuaException (LuaException), runLua, setGlobals) import Text.Pandoc.Lua.Util (addField, dofileWithTraceback) import Text.Pandoc.Options -import Text.Pandoc.Shared (toLegacyTable) import Text.Pandoc.Templates (renderTemplate) import qualified Text.Pandoc.UTF8 as UTF8 import Text.Pandoc.Writers.Shared @@ -150,7 +149,7 @@ blockToCustom (CodeBlock attr str) = blockToCustom (BlockQuote blocks) = Lua.callFunc "BlockQuote" (Stringify blocks) -blockToCustom (Table _ blkCapt specs _ thead tbody tfoot) = +blockToCustom (Table _ blkCapt specs thead tbody tfoot) = let (capt, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot aligns' = map show aligns capt' = Stringify capt diff --git a/src/Text/Pandoc/Writers/Docbook.hs b/src/Text/Pandoc/Writers/Docbook.hs index 7af357fb0..ba468cf4f 100644 --- a/src/Text/Pandoc/Writers/Docbook.hs +++ b/src/Text/Pandoc/Writers/Docbook.hs @@ -263,7 +263,7 @@ blockToDocbook _ b@(RawBlock f str) report $ BlockNotRendered b return empty blockToDocbook _ HorizontalRule = return empty -- not semantic -blockToDocbook opts (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToDocbook opts (Table _ blkCapt specs thead tbody tfoot) = do let (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot captionDoc <- if null caption then return empty diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs index f9e173bb2..2caba59cc 100644 --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -970,7 +970,7 @@ blockToOpenXML' _ HorizontalRule = do $ mknode "v:rect" [("style","width:0;height:1.5pt"), ("o:hralign","center"), ("o:hrstd","t"),("o:hr","t")] () ] -blockToOpenXML' opts (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToOpenXML' opts (Table _ blkCapt specs thead tbody tfoot) = do let (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot setFirstPara modify $ \s -> s { stInTable = True } diff --git a/src/Text/Pandoc/Writers/DokuWiki.hs b/src/Text/Pandoc/Writers/DokuWiki.hs index ce99aaa9d..b01d9a7bb 100644 --- a/src/Text/Pandoc/Writers/DokuWiki.hs +++ b/src/Text/Pandoc/Writers/DokuWiki.hs @@ -35,10 +35,10 @@ import Text.Pandoc.ImageSize import Text.Pandoc.Logging import Text.Pandoc.Options (WrapOption (..), WriterOptions (writerTableOfContents, writerTemplate, writerWrapText)) import Text.Pandoc.Shared (camelCaseToHyphenated, escapeURI, isURI, linesToPara, - removeFormatting, trimr, tshow, toLegacyTable) + removeFormatting, trimr, tshow) import Text.Pandoc.Templates (renderTemplate) import Text.DocLayout (render, literal) -import Text.Pandoc.Writers.Shared (defField, metaToContext) +import Text.Pandoc.Writers.Shared (defField, metaToContext, toLegacyTable) data WriterState = WriterState { } @@ -166,7 +166,7 @@ blockToDokuWiki opts (BlockQuote blocks) = do then return $ T.unlines $ map ("> " <>) $ T.lines contents else return $ "<HTML><blockquote>\n" <> contents <> "</blockquote></HTML>" -blockToDokuWiki opts (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToDokuWiki opts (Table _ blkCapt specs thead tbody tfoot) = do let (capt, aligns, _, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot captionDoc <- if null capt then return "" diff --git a/src/Text/Pandoc/Writers/FB2.hs b/src/Text/Pandoc/Writers/FB2.hs index 5b62119a3..83bcf2038 100644 --- a/src/Text/Pandoc/Writers/FB2.hs +++ b/src/Text/Pandoc/Writers/FB2.hs @@ -40,8 +40,8 @@ import Text.Pandoc.Definition import Text.Pandoc.Logging import Text.Pandoc.Options (HTMLMathMethod (..), WriterOptions (..), def) import Text.Pandoc.Shared (capitalize, isURI, orderedListMarkers, - makeSections, tshow, toLegacyTable) -import Text.Pandoc.Writers.Shared (lookupMetaString) + makeSections, tshow) +import Text.Pandoc.Writers.Shared (lookupMetaString, toLegacyTable) -- | Data to be written at the end of the document: -- (foot)notes, URLs, references, images. @@ -334,7 +334,7 @@ blockToXml h@Header{} = do report $ BlockNotRendered h return [] blockToXml HorizontalRule = return [ el "empty-line" () ] -blockToXml (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToXml (Table _ blkCapt specs thead tbody tfoot) = do let (caption, aligns, _, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot hd <- mkrow "th" headers aligns bd <- mapM (\r -> mkrow "td" r aligns) rows diff --git a/src/Text/Pandoc/Writers/HTML.hs b/src/Text/Pandoc/Writers/HTML.hs index 070631f0d..77585e920 100644 --- a/src/Text/Pandoc/Writers/HTML.hs +++ b/src/Text/Pandoc/Writers/HTML.hs @@ -885,7 +885,7 @@ blockToHtml opts (DefinitionList lst) = do return $ mconcat $ nl opts : term' : nl opts : intersperse (nl opts) defs') lst defList opts contents -blockToHtml opts (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToHtml opts (Table _ blkCapt specs thead tbody tfoot) = do let (capt, aligns, widths, headers, rows') = toLegacyTable blkCapt specs thead tbody tfoot captionDoc <- if null capt then return mempty diff --git a/src/Text/Pandoc/Writers/Haddock.hs b/src/Text/Pandoc/Writers/Haddock.hs index 57e2f0ea7..925160602 100644 --- a/src/Text/Pandoc/Writers/Haddock.hs +++ b/src/Text/Pandoc/Writers/Haddock.hs @@ -115,7 +115,7 @@ blockToHaddock _ (CodeBlock (_,_,_) str) = -- Nothing in haddock corresponds to block quotes: blockToHaddock opts (BlockQuote blocks) = blockListToHaddock opts blocks -blockToHaddock opts (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToHaddock opts (Table _ blkCapt specs thead tbody tfoot) = do let (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot caption' <- inlineListToHaddock opts caption let caption'' = if null caption diff --git a/src/Text/Pandoc/Writers/ICML.hs b/src/Text/Pandoc/Writers/ICML.hs index 5575ab2bb..57066d303 100644 --- a/src/Text/Pandoc/Writers/ICML.hs +++ b/src/Text/Pandoc/Writers/ICML.hs @@ -321,7 +321,7 @@ blockToICML opts style (Header lvl (_, cls, _) lst) = else "" in parStyle opts stl lst blockToICML _ _ HorizontalRule = return empty -- we could insert a page break instead -blockToICML opts style (Table _ blkCapt specs _ thead tbody tfoot) = +blockToICML opts style (Table _ blkCapt specs thead tbody tfoot) = let (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot style' = tableName : style noHeader = all null headers diff --git a/src/Text/Pandoc/Writers/JATS.hs b/src/Text/Pandoc/Writers/JATS.hs index f739613b6..47d8c00cf 100644 --- a/src/Text/Pandoc/Writers/JATS.hs +++ b/src/Text/Pandoc/Writers/JATS.hs @@ -356,7 +356,7 @@ blockToJATS _ b@(RawBlock f str) report $ BlockNotRendered b return empty blockToJATS _ HorizontalRule = return empty -- not semantic -blockToJATS opts (Table _ blkCapt specs _ th tb tf) = +blockToJATS opts (Table _ blkCapt specs th tb tf) = case toLegacyTable blkCapt specs th tb tf of ([], aligns, widths, headers, rows) -> captionlessTable aligns widths headers rows (caption, aligns, widths, headers, rows) -> do diff --git a/src/Text/Pandoc/Writers/Jira.hs b/src/Text/Pandoc/Writers/Jira.hs index bd22c161f..1bf14c6a0 100644 --- a/src/Text/Pandoc/Writers/Jira.hs +++ b/src/Text/Pandoc/Writers/Jira.hs @@ -26,10 +26,10 @@ import Text.Pandoc.Class.PandocMonad (PandocMonad) import Text.Pandoc.Definition import Text.Pandoc.Options (WriterOptions (writerTemplate, writerWrapText), WrapOption (..)) -import Text.Pandoc.Shared (linesToPara, stringify, toLegacyTable) +import Text.Pandoc.Shared (linesToPara, stringify) import Text.Pandoc.Templates (renderTemplate) import Text.Pandoc.Writers.Math (texMathToInlines) -import Text.Pandoc.Writers.Shared (defField, metaToContext) +import Text.Pandoc.Writers.Shared (defField, metaToContext, toLegacyTable) import Text.DocLayout (literal, render) import qualified Data.Text as T import qualified Text.Jira.Markup as Jira @@ -98,7 +98,7 @@ toJiraBlocks blocks = do Plain xs -> singleton . Jira.Para <$> toJiraInlines xs RawBlock fmt cs -> rawBlockToJira fmt cs Null -> return mempty - Table _ blkCapt specs _ thead tbody tfoot -> singleton <$> do + Table _ blkCapt specs thead tbody tfoot -> singleton <$> do let (_, _, _, hd, body) = toLegacyTable blkCapt specs thead tbody tfoot headerRow <- if all null hd then pure Nothing diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs index 274f5108a..c3a2762d2 100644 --- a/src/Text/Pandoc/Writers/LaTeX.hs +++ b/src/Text/Pandoc/Writers/LaTeX.hs @@ -759,7 +759,7 @@ blockToLaTeX (Header level (id',classes,_) lst) = do hdr <- sectionHeader classes id' level lst modify $ \s -> s{stInHeading = False} return hdr -blockToLaTeX (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToLaTeX (Table _ blkCapt specs thead tbody tfoot) = do let (caption, aligns, widths, heads, rows) = toLegacyTable blkCapt specs thead tbody tfoot (captionText, captForLof, captNotes) <- getCaption False caption let toHeaders hs = do contents <- tableRowToLaTeX True aligns widths hs diff --git a/src/Text/Pandoc/Writers/Man.hs b/src/Text/Pandoc/Writers/Man.hs index dda1e1cf1..105906138 100644 --- a/src/Text/Pandoc/Writers/Man.hs +++ b/src/Text/Pandoc/Writers/Man.hs @@ -139,7 +139,7 @@ blockToMan opts (CodeBlock _ str) = return $ blockToMan opts (BlockQuote blocks) = do contents <- blockListToMan opts blocks return $ literal ".RS" $$ contents $$ literal ".RE" -blockToMan opts (Table _ blkCapt specs _ thead tbody tfoot) = +blockToMan opts (Table _ blkCapt specs thead tbody tfoot) = let (caption, alignments, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot aligncode AlignLeft = "l" aligncode AlignRight = "r" diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs index 4d4d02028..7a11e3c16 100644 --- a/src/Text/Pandoc/Writers/Markdown.hs +++ b/src/Text/Pandoc/Writers/Markdown.hs @@ -574,7 +574,7 @@ blockToMarkdown' opts (BlockQuote blocks) = do else if plain then " " else "> " contents <- blockListToMarkdown opts blocks return $ (prefixed leader contents) <> blankline -blockToMarkdown' opts t@(Table _ blkCapt specs _ thead tbody tfoot) = do +blockToMarkdown' opts t@(Table _ blkCapt specs thead tbody tfoot) = do let (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot let numcols = maximum (length aligns : length widths : map length (headers:rows)) diff --git a/src/Text/Pandoc/Writers/MediaWiki.hs b/src/Text/Pandoc/Writers/MediaWiki.hs index fbfb7acb4..8d1745e8e 100644 --- a/src/Text/Pandoc/Writers/MediaWiki.hs +++ b/src/Text/Pandoc/Writers/MediaWiki.hs @@ -150,7 +150,7 @@ blockToMediaWiki (BlockQuote blocks) = do contents <- blockListToMediaWiki blocks return $ "<blockquote>" <> contents <> "</blockquote>" -blockToMediaWiki (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToMediaWiki (Table _ blkCapt specs thead tbody tfoot) = do let (capt, aligns, widths, headers, rows') = toLegacyTable blkCapt specs thead tbody tfoot caption <- if null capt then return "" diff --git a/src/Text/Pandoc/Writers/Ms.hs b/src/Text/Pandoc/Writers/Ms.hs index ad2a7a3fd..6c9d8a783 100644 --- a/src/Text/Pandoc/Writers/Ms.hs +++ b/src/Text/Pandoc/Writers/Ms.hs @@ -215,7 +215,7 @@ blockToMs opts (BlockQuote blocks) = do contents <- blockListToMs opts blocks setFirstPara return $ literal ".QS" $$ contents $$ literal ".QE" -blockToMs opts (Table _ blkCapt specs _ thead tbody tfoot) = +blockToMs opts (Table _ blkCapt specs thead tbody tfoot) = let (caption, alignments, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot aligncode AlignLeft = "l" aligncode AlignRight = "r" diff --git a/src/Text/Pandoc/Writers/Muse.hs b/src/Text/Pandoc/Writers/Muse.hs index f2bc91290..88b4c2ef9 100644 --- a/src/Text/Pandoc/Writers/Muse.hs +++ b/src/Text/Pandoc/Writers/Muse.hs @@ -259,7 +259,7 @@ blockToMuse (Header level (ident,_,_) inlines) = do return $ blankline <> attr' $$ nowrap (header' <> contents) <> blankline -- https://www.gnu.org/software/emacs-muse/manual/muse.html#Horizontal-Rules-and-Anchors blockToMuse HorizontalRule = return $ blankline $$ "----" $$ blankline -blockToMuse (Table _ blkCapt specs _ thead tbody tfoot) = +blockToMuse (Table _ blkCapt specs thead tbody tfoot) = if isSimple && numcols > 1 then simpleTable caption headers rows else do diff --git a/src/Text/Pandoc/Writers/Native.hs b/src/Text/Pandoc/Writers/Native.hs index a533496c1..4d4dfca15 100644 --- a/src/Text/Pandoc/Writers/Native.hs +++ b/src/Text/Pandoc/Writers/Native.hs @@ -40,18 +40,15 @@ prettyBlock (DefinitionList items) = "DefinitionList" $$ prettyList (map deflistitem items) where deflistitem (term, defs) = "(" <> text (show term) <> "," <> cr <> nest 1 (prettyList $ map (prettyList . map prettyBlock) defs) <> ")" -prettyBlock (Table attr blkCapt specs rhs thead tbody tfoot) = +prettyBlock (Table attr blkCapt specs thead tbody tfoot) = mconcat [ "Table " , text (show attr) , " " - , prettyCaption blkCapt - , " " - , text (show specs) - , " " - , text (show rhs) ] $$ - prettyRows thead $$ - prettyRows tbody $$ - prettyRows tfoot + , prettyCaption blkCapt ] $$ + prettyList (map (text . show) specs) $$ + prettyHead thead $$ + prettyBodies tbody $$ + prettyFoot tfoot where prettyRows = prettyList . map prettyRow prettyRow (Row a body) = text ("Row " <> show a) $$ prettyList (map prettyCell body) @@ -59,14 +56,26 @@ prettyBlock (Table attr blkCapt specs rhs thead tbody tfoot) = mconcat [ "Cell " , text (show a) , " " - , text (showsPrec 11 ma "") - , " " + , text (show ma) + , " (" , text (show h) - , " " - , text (show w) ] $$ + , ") (" + , text (show w) + , ")" ] $$ prettyList (map prettyBlock b) prettyCaption (Caption mshort body) = "(Caption " <> text (showsPrec 11 mshort "") $$ prettyList (map prettyBlock body) <> ")" + prettyHead (TableHead thattr body) + = "(TableHead " <> text (show thattr) $$ prettyRows body <> ")" + prettyBody (TableBody tbattr rhc hd bd) + = mconcat [ "(TableBody " + , text (show tbattr) + , " (" + , text (show rhc) + , ")" ] $$ prettyRows hd $$ prettyRows bd <> ")" + prettyBodies = prettyList . map prettyBody + prettyFoot (TableFoot tfattr body) + = "(TableFoot " <> text (show tfattr) $$ prettyRows body <> ")" prettyBlock (Div attr blocks) = text ("Div " <> show attr) $$ prettyList (map prettyBlock blocks) prettyBlock block = text $ show block diff --git a/src/Text/Pandoc/Writers/OpenDocument.hs b/src/Text/Pandoc/Writers/OpenDocument.hs index 12599772f..9c802118a 100644 --- a/src/Text/Pandoc/Writers/OpenDocument.hs +++ b/src/Text/Pandoc/Writers/OpenDocument.hs @@ -31,7 +31,7 @@ import Text.Pandoc.Definition import Text.Pandoc.Logging import Text.Pandoc.Options import Text.DocLayout -import Text.Pandoc.Shared (linesToPara, tshow, toLegacyTable) +import Text.Pandoc.Shared (linesToPara, tshow) import Text.Pandoc.Templates (renderTemplate) import qualified Text.Pandoc.Translations as Term (Term(Figure, Table)) import Text.Pandoc.Writers.Math @@ -359,7 +359,7 @@ blockToOpenDocument o bs | BulletList b <- bs = setFirstPara >> bulletListToOpenDocument o b | OrderedList a b <- bs = setFirstPara >> orderedList a b | CodeBlock _ s <- bs = setFirstPara >> preformatted s - | Table _ bc s _ th tb tf + | Table _ bc s th tb tf <- bs = let (c, a, w, h, r) = toLegacyTable bc s th tb tf in setFirstPara >> table c a w h r | HorizontalRule <- bs = setFirstPara >> return (selfClosingTag "text:p" diff --git a/src/Text/Pandoc/Writers/Org.hs b/src/Text/Pandoc/Writers/Org.hs index d8d89d2eb..8e7f4dbf1 100644 --- a/src/Text/Pandoc/Writers/Org.hs +++ b/src/Text/Pandoc/Writers/Org.hs @@ -183,7 +183,7 @@ blockToOrg (BlockQuote blocks) = do contents <- blockListToOrg blocks return $ blankline $$ "#+BEGIN_QUOTE" $$ nest 2 contents $$ "#+END_QUOTE" $$ blankline -blockToOrg (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToOrg (Table _ blkCapt specs thead tbody tfoot) = do let (caption', _, _, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot caption'' <- inlineListToOrg caption' let caption = if null caption' diff --git a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs index dbacbb3cf..68345bcd1 100644 --- a/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs +++ b/src/Text/Pandoc/Writers/Powerpoint/Presentation.hs @@ -54,9 +54,10 @@ import Text.Pandoc.Logging import Text.Pandoc.Walk import Data.Time (UTCTime) import qualified Text.Pandoc.Shared as Shared -- so we don't overlap "Element" -import Text.Pandoc.Shared (tshow, toLegacyTable) +import Text.Pandoc.Shared (tshow) import Text.Pandoc.Writers.Shared (lookupMetaInlines, lookupMetaBlocks - , lookupMetaString, toTableOfContents) + , lookupMetaString, toTableOfContents + , toLegacyTable) import qualified Data.Map as M import qualified Data.Set as S import Data.Maybe (maybeToList, fromMaybe) @@ -541,7 +542,7 @@ blockToShape (Para (il:_)) | Link _ (il':_) target <- il , Image attr ils (url, _) <- il' = (withAttr attr . Pic def{picPropLink = Just $ ExternalTarget target} (T.unpack url)) <$> inlinesToParElems ils -blockToShape (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToShape (Table _ blkCapt specs thead tbody tfoot) = do let (caption, algn, _, hdrCells, rows) = toLegacyTable blkCapt specs thead tbody tfoot caption' <- inlinesToParElems caption hdrCells' <- rowToParagraphs algn hdrCells diff --git a/src/Text/Pandoc/Writers/RST.hs b/src/Text/Pandoc/Writers/RST.hs index 85354d93f..a390cc6cf 100644 --- a/src/Text/Pandoc/Writers/RST.hs +++ b/src/Text/Pandoc/Writers/RST.hs @@ -284,7 +284,7 @@ blockToRST (CodeBlock (_,classes,kvs) str) = do blockToRST (BlockQuote blocks) = do contents <- blockListToRST blocks return $ nest 3 contents <> blankline -blockToRST (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToRST (Table _ blkCapt specs thead tbody tfoot) = do let (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot caption' <- inlineListToRST caption let blocksToDoc opts bs = do diff --git a/src/Text/Pandoc/Writers/RTF.hs b/src/Text/Pandoc/Writers/RTF.hs index e45a73f79..da24e8b71 100644 --- a/src/Text/Pandoc/Writers/RTF.hs +++ b/src/Text/Pandoc/Writers/RTF.hs @@ -254,7 +254,7 @@ blockToRTF indent alignment (Header level _ lst) = do contents <- inlinesToRTF lst return $ rtfPar indent 0 alignment $ "\\b \\fs" <> tshow (40 - (level * 4)) <> " " <> contents -blockToRTF indent alignment (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToRTF indent alignment (Table _ blkCapt specs thead tbody tfoot) = do let (caption, aligns, sizes, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot caption' <- inlinesToRTF caption header' <- if all null headers diff --git a/src/Text/Pandoc/Writers/Shared.hs b/src/Text/Pandoc/Writers/Shared.hs index 9ba6dcc8a..fb4e8eca6 100644 --- a/src/Text/Pandoc/Writers/Shared.hs +++ b/src/Text/Pandoc/Writers/Shared.hs @@ -34,6 +34,7 @@ module Text.Pandoc.Writers.Shared ( , toSuperscript , toTableOfContents , endsWithPlain + , toLegacyTable ) where import Safe (lastMay) @@ -50,7 +51,7 @@ import qualified Text.Pandoc.Builder as Builder import Text.Pandoc.Definition import Text.Pandoc.Options import Text.DocLayout -import Text.Pandoc.Shared (stringify, makeSections, deNote, deLink) +import Text.Pandoc.Shared (stringify, makeSections, deNote, deLink, blocksToInlines) import Text.Pandoc.Walk (walk) import qualified Text.Pandoc.UTF8 as UTF8 import Text.Pandoc.XML (escapeStringForXML) @@ -426,3 +427,32 @@ endsWithPlain xs = case lastMay xs of Just Plain{} -> True _ -> False + +-- | Convert the relevant components of a new-style table (with block +-- caption, row headers, row and column spans, and so on) to those of +-- an old-style table (inline caption, table head with one row, no +-- foot, and so on). +toLegacyTable :: Caption + -> [ColSpec] + -> TableHead + -> [TableBody] + -> TableFoot + -> ([Inline], [Alignment], [Double], [[Block]], [[[Block]]]) +toLegacyTable (Caption _ cbody) specs (TableHead _ th) tb (TableFoot _ tf) + = (cbody', aligns, widths, th', tb') + where + numcols = length specs + (aligns, mwidths) = unzip specs + fromWidth (ColWidth w) | w > 0 = w + fromWidth _ = 0 + widths = map fromWidth mwidths + unRow (Row _ x) = map unCell x + unCell (Cell _ _ _ _ x) = x + unBody (TableBody _ _ hd bd) = hd <> bd + unBodies = concatMap unBody + cbody' = blocksToInlines cbody + sanitise = pad mempty numcols . unRow + pad element upTo list = take upTo (list ++ repeat element) + (th', tb') = case th of + (r:rs) -> (sanitise r, map sanitise $ rs <> unBodies tb <> tf) + [] -> ([], map sanitise $ unBodies tb <> tf) diff --git a/src/Text/Pandoc/Writers/TEI.hs b/src/Text/Pandoc/Writers/TEI.hs index d1bc514c1..f7fa19b1b 100644 --- a/src/Text/Pandoc/Writers/TEI.hs +++ b/src/Text/Pandoc/Writers/TEI.hs @@ -194,7 +194,7 @@ blockToTEI _ HorizontalRule = return $ -- | TEI Tables -- TEI Simple's tables are composed of cells and rows; other -- table info in the AST is here lossily discard. -blockToTEI opts (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToTEI opts (Table _ blkCapt specs thead tbody tfoot) = do let (_, _, _, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot headers' <- tableHeadersToTEI opts headers rows' <- mapM (tableRowToTEI opts) rows diff --git a/src/Text/Pandoc/Writers/Texinfo.hs b/src/Text/Pandoc/Writers/Texinfo.hs index a4b1d3a57..ef1ee7d25 100644 --- a/src/Text/Pandoc/Writers/Texinfo.hs +++ b/src/Text/Pandoc/Writers/Texinfo.hs @@ -228,7 +228,7 @@ blockToTexinfo (Header level (ident,_,_) lst) seccmd 4 = return "@subsubsection " seccmd _ = throwError $ PandocSomeError "illegal seccmd level" -blockToTexinfo (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToTexinfo (Table _ blkCapt specs thead tbody tfoot) = do let (caption, aligns, widths, heads, rows) = toLegacyTable blkCapt specs thead tbody tfoot headers <- if all null heads then return empty diff --git a/src/Text/Pandoc/Writers/Textile.hs b/src/Text/Pandoc/Writers/Textile.hs index 2e02448e3..e68303cfe 100644 --- a/src/Text/Pandoc/Writers/Textile.hs +++ b/src/Text/Pandoc/Writers/Textile.hs @@ -168,7 +168,7 @@ blockToTextile opts (BlockQuote blocks) = do contents <- blockListToTextile opts blocks return $ "<blockquote>\n\n" <> contents <> "\n</blockquote>\n" -blockToTextile opts (Table _ blkCapt specs _ thead tbody tfoot) +blockToTextile opts (Table _ blkCapt specs thead tbody tfoot) = case toLegacyTable blkCapt specs thead tbody tfoot of ([], aligns, widths, headers, rows') | all (==0) widths -> do hs <- mapM (liftM (("_. " <>) . stripTrailingNewlines) . blockListToTextile opts) headers diff --git a/src/Text/Pandoc/Writers/XWiki.hs b/src/Text/Pandoc/Writers/XWiki.hs index 43729d0b0..bfc61c3b5 100644 --- a/src/Text/Pandoc/Writers/XWiki.hs +++ b/src/Text/Pandoc/Writers/XWiki.hs @@ -43,6 +43,7 @@ import Text.Pandoc.Logging import Text.Pandoc.Options import Text.Pandoc.Shared import Text.Pandoc.Writers.MediaWiki (highlightingLangs) +import Text.Pandoc.Writers.Shared (toLegacyTable) data WriterState = WriterState { listLevel :: Text -- String at the beginning of items @@ -122,7 +123,7 @@ blockToXWiki (DefinitionList items) = do return $ vcat contents <> if Text.null lev then "\n" else "" -- TODO: support more features -blockToXWiki (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToXWiki (Table _ blkCapt specs thead tbody tfoot) = do let (_, _, _, headers, rows') = toLegacyTable blkCapt specs thead tbody tfoot headers' <- mapM (tableCellXWiki True) headers otherRows <- mapM formRow rows' diff --git a/src/Text/Pandoc/Writers/ZimWiki.hs b/src/Text/Pandoc/Writers/ZimWiki.hs index 0709744d5..e311abe7b 100644 --- a/src/Text/Pandoc/Writers/ZimWiki.hs +++ b/src/Text/Pandoc/Writers/ZimWiki.hs @@ -32,9 +32,9 @@ import Text.Pandoc.Logging import Text.Pandoc.Options (WrapOption (..), WriterOptions (writerTableOfContents, writerTemplate, writerWrapText)) -import Text.Pandoc.Shared (escapeURI, isURI, linesToPara, removeFormatting, trimr, toLegacyTable) +import Text.Pandoc.Shared (escapeURI, isURI, linesToPara, removeFormatting, trimr) import Text.Pandoc.Templates (renderTemplate) -import Text.Pandoc.Writers.Shared (defField, metaToContext) +import Text.Pandoc.Writers.Shared (defField, metaToContext, toLegacyTable) data WriterState = WriterState { stIndent :: Text, -- Indent after the marker at the beginning of list items @@ -132,7 +132,7 @@ blockToZimWiki opts (BlockQuote blocks) = do contents <- blockListToZimWiki opts blocks return $ T.unlines $ map ("> " <>) $ T.lines contents -blockToZimWiki opts (Table _ blkCapt specs _ thead tbody tfoot) = do +blockToZimWiki opts (Table _ blkCapt specs thead tbody tfoot) = do let (capt, aligns, _, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot captionDoc <- if null capt then return "" diff --git a/stack.yaml b/stack.yaml index f121c333b..dddcd82c5 100644 --- a/stack.yaml +++ b/stack.yaml @@ -15,7 +15,7 @@ extra-deps: # - pandoc-types-1.20 # better-tables - git: git@github.com:despresc/pandoc-types - commit: 5fef630269d29a818cde834c4cea50f129c7e2b8 + commit: 5e7e0144fa3b797db30e4b0e778dd3ed9f35e80b - texmath-0.12.0.1 - haddock-library-1.8.0 - skylighting-0.8.3.2 diff --git a/test/Tests/Readers/DokuWiki.hs b/test/Tests/Readers/DokuWiki.hs index 52b4764a5..d812c215f 100644 --- a/test/Tests/Readers/DokuWiki.hs +++ b/test/Tests/Readers/DokuWiki.hs @@ -296,7 +296,7 @@ tests = [ testGroup "inlines" T.unlines [ "| foo | bar |" , "| bat | baz |" ] =?> - table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)] + table mempty [(AlignDefault, ColWidthDefault), (AlignDefault, ColWidthDefault)] [] [[plain "foo", plain "bar"] ,[plain "bat", plain "baz"]] @@ -304,7 +304,7 @@ tests = [ testGroup "inlines" T.unlines [ "^ foo ^ bar ^" , "| bat | baz |" ] =?> - table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)] + table mempty [(AlignDefault, ColWidthDefault), (AlignDefault, ColWidthDefault)] [plain "foo", plain "bar"] [[plain "bat", plain "baz"]] , "Table with colspan" =: @@ -312,11 +312,15 @@ tests = [ testGroup "inlines" , "| 1,0 | 1,1 ||" , "| 2,0 | 2,1 | 2,2 |" ] =?> - table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing), (AlignDefault, Nothing)] - [plain "0,0", plain "0,1", plain "0,2"] - [[plain "1,0", plain "1,1", mempty] - ,[plain "2,0", plain "2,1", plain "2,2"] - ] + table + mempty + [(AlignDefault, ColWidthDefault) + ,(AlignDefault, ColWidthDefault) + ,(AlignDefault, ColWidthDefault)] + [plain "0,0", plain "0,1", plain "0,2"] + [[plain "1,0", plain "1,1", mempty] + ,[plain "2,0", plain "2,1", plain "2,2"] + ] , "Indented code block" =: T.unlines [ "foo" , " bar" diff --git a/test/Tests/Readers/LaTeX.hs b/test/Tests/Readers/LaTeX.hs index 098848769..5cddab871 100644 --- a/test/Tests/Readers/LaTeX.hs +++ b/test/Tests/Readers/LaTeX.hs @@ -36,7 +36,7 @@ infix 4 =: (=:) = test latex simpleTable' :: [Alignment] -> [[Blocks]] -> Blocks -simpleTable' aligns = table "" (zip aligns (repeat Nothing)) +simpleTable' aligns = table "" (zip aligns (repeat ColWidthDefault)) (map (const mempty) aligns) tokUntokRt :: String -> Bool diff --git a/test/Tests/Readers/Man.hs b/test/Tests/Readers/Man.hs index f358630bb..7623dcb71 100644 --- a/test/Tests/Readers/Man.hs +++ b/test/Tests/Readers/Man.hs @@ -122,12 +122,16 @@ tests = [ testGroup "Tables" [ "t1" =: ".TS\nallbox;\nl l l.\na\tb\tc\nd\te\tf\n.TE" - =?> table mempty (replicate 3 (AlignLeft, Nothing)) [] [ + =?> table mempty (replicate 3 (AlignLeft, ColWidthDefault)) [] [ map (plain . str ) ["a", "b", "c"], map (plain . str ) ["d", "e", "f"] ], "longcell" =: ".TS\n;\nr.\nT{\na\nb\nc d\nT}\nf\n.TE" - =?> table mempty [(AlignRight, Nothing)] [] [[plain $ text "a b c d"], [plain $ str "f"]] + =?> table + mempty + [(AlignRight, ColWidthDefault)] + [] + [[plain $ text "a b c d"], [plain $ str "f"]] ] ] diff --git a/test/Tests/Readers/Muse.hs b/test/Tests/Readers/Muse.hs index abf9e1ced..074b2dc27 100644 --- a/test/Tests/Readers/Muse.hs +++ b/test/Tests/Readers/Muse.hs @@ -15,7 +15,6 @@ module Tests.Readers.Muse (tests) where import Prelude import Data.List (intersperse) -import Data.Maybe (isNothing) import Data.Monoid (Any (..)) import Data.Text (Text) import qualified Data.Text as T @@ -26,7 +25,8 @@ import Tests.Helpers import Text.Pandoc import Text.Pandoc.Arbitrary () import Text.Pandoc.Builder -import Text.Pandoc.Shared (underlineSpan, toLegacyTable) +import Text.Pandoc.Shared (underlineSpan) +import Text.Pandoc.Writers.Shared (toLegacyTable) import Text.Pandoc.Walk amuse :: Text -> Pandoc @@ -46,31 +46,31 @@ spcSep = mconcat . intersperse space -- Tables don't round-trip yet -- makeRoundTrip :: Block -> Block -makeRoundTrip t@(Table tattr blkCapt specs rhs thead tbody tfoot) = +makeRoundTrip t@(Table tattr blkCapt specs thead tbody tfoot) = if isSimple && numcols > 1 then t else Para [Str "table was here"] where (_, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot numcols = maximum (length aligns : length widths : map length (headers:rows)) - hasSimpleCells = all isSimpleRow (thead <> tbody <> tfoot) isLineBreak LineBreak = Any True isLineBreak _ = Any False hasLineBreak = getAny . query isLineBreak - isSimple = and [ hasSimpleCells + isSimple = and [ isSimpleHead thead + , isSimpleBodies tbody + , isSimpleFoot tfoot , all (== 0) widths - , null tfoot - , length thead == 1 , isNullAttr tattr - , rhs == 0 , simpleCapt ] isNullAttr ("", [], []) = True isNullAttr _ = False + isAlignDefault AlignDefault = True + isAlignDefault _ = False isSimpleRow (Row attr body) = isNullAttr attr && all isSimpleCell body isSimpleCell (Cell attr ali h w body) = and [ h == 1 , w == 1 , isNullAttr attr - , isNothing ali + , isAlignDefault ali , isSimpleCellBody body ] isSimpleCellBody [Plain ils] = not (hasLineBreak ils) isSimpleCellBody [Para ils ] = not (hasLineBreak ils) @@ -80,6 +80,16 @@ makeRoundTrip t@(Table tattr blkCapt specs rhs thead tbody tfoot) = Caption Nothing [Para _] -> True Caption Nothing [Plain _] -> True _ -> False + isSimpleHead (TableHead attr [r]) + = isNullAttr attr && isSimpleRow r + isSimpleHead _ = False + isSimpleBody (TableBody attr rhc hd bd) = and [ isNullAttr attr + , rhc == 0 + , null hd + , all isSimpleRow bd ] + isSimpleBodies [b] = isSimpleBody b + isSimpleBodies _ = False + isSimpleFoot (TableFoot attr rs) = isNullAttr attr && null rs makeRoundTrip (OrderedList (start, LowerAlpha, _) items) = OrderedList (start, Decimal, Period) items makeRoundTrip (OrderedList (start, UpperAlpha, _) items) = OrderedList (start, Decimal, Period) items @@ -972,12 +982,12 @@ tests = , testGroup "Tables" [ "Two cell table" =: "One | Two" =?> - table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)] + table mempty [(AlignDefault, ColWidthDefault), (AlignDefault, ColWidthDefault)] [] [[plain "One", plain "Two"]] , "Table with multiple words" =: "One two | three four" =?> - table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)] + table mempty [(AlignDefault, ColWidthDefault), (AlignDefault, ColWidthDefault)] [] [[plain "One two", plain "three four"]] , "Not a table" =: @@ -991,7 +1001,7 @@ tests = [ "One | Two" , "Three | Four" ] =?> - table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)] + table mempty [(AlignDefault, ColWidthDefault), (AlignDefault, ColWidthDefault)] [] [[plain "One", plain "Two"], [plain "Three", plain "Four"]] @@ -1000,7 +1010,7 @@ tests = [ "First || Second" , "Third | Fourth" ] =?> - table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)] + table mempty [(AlignDefault, ColWidthDefault), (AlignDefault, ColWidthDefault)] [plain "First", plain "Second"] [[plain "Third", plain "Fourth"]] , "Table with two headers" =: @@ -1009,7 +1019,7 @@ tests = , "Second || header" , "Foo | bar" ] =?> - table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)] + table mempty [(AlignDefault, ColWidthDefault), (AlignDefault, ColWidthDefault)] [plain "First", plain "header"] [[plain "Second", plain "header"], [plain "Foo", plain "bar"]] @@ -1019,7 +1029,7 @@ tests = , "Baz || foo" , "Bar | baz" ] =?> - table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)] + table mempty [(AlignDefault, ColWidthDefault), (AlignDefault, ColWidthDefault)] [plain "Baz", plain "foo"] [[plain "Bar", plain "baz"], [plain "Foo", plain "bar"]] @@ -1030,7 +1040,7 @@ tests = , "Second | row | there" , "|+ Table caption +|" ] =?> - table (text "Table caption") (replicate 3 (AlignDefault, Nothing)) + table (text "Table caption") (replicate 3 (AlignDefault, ColWidthDefault)) [plain "Foo", plain "bar", plain "baz"] [[plain "First", plain "row", plain "here"], [plain "Second", plain "row", plain "there"]] @@ -1039,7 +1049,7 @@ tests = [ "Foo | bar" , "|+ Table + caption +|" ] =?> - table (text "Table + caption") (replicate 2 (AlignDefault, Nothing)) + table (text "Table + caption") (replicate 2 (AlignDefault, ColWidthDefault)) [] [[plain "Foo", plain "bar"]] , "Caption without table" =: @@ -1051,7 +1061,7 @@ tests = , " Baz | foo" , " Bar | baz" ] =?> - table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)] + table mempty [(AlignDefault, ColWidthDefault), (AlignDefault, ColWidthDefault)] [] [[plain "Foo", plain "bar"], [plain "Baz", plain "foo"], @@ -1063,7 +1073,7 @@ tests = , " bar |" , " || baz" ] =?> - table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)] + table mempty [(AlignDefault, ColWidthDefault), (AlignDefault, ColWidthDefault)] [plain "", plain "baz"] [[plain "", plain "Foo"], [plain "", plain ""], @@ -1074,7 +1084,8 @@ tests = , " 4 | | 6" , " 7 | 8 | 9" ] =?> - table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing), (AlignDefault, Nothing)] + table mempty [ (AlignDefault, ColWidthDefault) + , (AlignDefault, ColWidthDefault), (AlignDefault, ColWidthDefault)] [] [[plain "1", plain "2", plain "3"], [plain "4", mempty, plain "6"], @@ -1085,7 +1096,7 @@ tests = , "| foo | bar |" , "+-----+-----+" ] =?> - table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)] + table mempty [(AlignDefault, ColWidthDefault), (AlignDefault, ColWidthDefault)] [] [[para "foo", para "bar"]] , "Grid table inside list" =: @@ -1094,7 +1105,8 @@ tests = , " | foo | bar |" , " +-----+-----+" ] =?> - bulletList [table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)] + bulletList [table mempty [ (AlignDefault, ColWidthDefault) + , (AlignDefault, ColWidthDefault)] [] [[para "foo", para "bar"]]] , "Grid table with two rows" =: @@ -1105,7 +1117,7 @@ tests = , "| bat | baz |" , "+-----+-----+" ] =?> - table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)] + table mempty [(AlignDefault, ColWidthDefault), (AlignDefault, ColWidthDefault)] [] [[para "foo", para "bar"] ,[para "bat", para "baz"]] @@ -1117,9 +1129,9 @@ tests = , "|+---+|" , "+-----+" ] =?> - table mempty [(AlignDefault, Nothing)] + table mempty [(AlignDefault, ColWidthDefault)] [] - [[table mempty [(AlignDefault, Nothing)] + [[table mempty [(AlignDefault, ColWidthDefault)] [] [[para "foo"]]]] , "Grid table with example" =: @@ -1130,7 +1142,7 @@ tests = , "| </example> |" , "+------------+" ] =?> - table mempty [(AlignDefault, Nothing)] + table mempty [(AlignDefault, ColWidthDefault)] [] [[codeBlock "foo"]] ] @@ -1501,15 +1513,19 @@ tests = ] , "Definition list with table" =: " foo :: bar | baz" =?> - definitionList [ ("foo", [ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)] + definitionList [ ("foo", [ table mempty [ (AlignDefault, ColWidthDefault) + , (AlignDefault, ColWidthDefault)] [] [[plain "bar", plain "baz"]] ])] , "Definition list with table inside bullet list" =: " - foo :: bar | baz" =?> - bulletList [definitionList [ ("foo", [ table mempty [(AlignDefault, Nothing), (AlignDefault, Nothing)] - [] - [[plain "bar", plain "baz"]] + bulletList [definitionList [ ("foo", [ table + mempty + [ (AlignDefault, ColWidthDefault) + , (AlignDefault, ColWidthDefault) ] + [] + [[plain "bar", plain "baz"]] ])]] , test emacsMuse "Multi-line definition lists from Emacs Muse manual" (T.unlines diff --git a/test/Tests/Readers/Org/Block/Table.hs b/test/Tests/Readers/Org/Block/Table.hs index c09abcd0d..4b76f4a58 100644 --- a/test/Tests/Readers/Org/Block/Table.hs +++ b/test/Tests/Readers/Org/Block/Table.hs @@ -24,7 +24,7 @@ simpleTable' :: Int -> [Blocks] -> [[Blocks]] -> Blocks -simpleTable' n = table "" (replicate n (AlignDefault, Nothing)) +simpleTable' n = table "" (replicate n (AlignDefault, ColWidthDefault)) tests :: [TestTree] tests = @@ -121,7 +121,9 @@ tests = , "| 1 | One | foo |" , "| 2 | Two | bar |" ] =?> - table "" (zip [AlignCenter, AlignRight, AlignDefault] [Nothing, Nothing, Nothing]) + table "" (zip + [AlignCenter, AlignRight, AlignDefault] + [ColWidthDefault, ColWidthDefault, ColWidthDefault]) [] [ [ plain "Numbers", plain "Text", plain "More" ] , [ plain "1" , plain "One" , plain "foo" ] @@ -143,7 +145,7 @@ tests = , "| 1 | One | foo |" , "| 2" ] =?> - table "" (zip [AlignCenter, AlignRight] [Nothing, Nothing]) + table "" (zip [AlignCenter, AlignRight] [ColWidthDefault, ColWidthDefault]) [ plain "Numbers", plain "Text" ] [ [ plain "1" , plain "One" , plain "foo" ] , [ plain "2" ] @@ -155,7 +157,7 @@ tests = , "| 9 | 42 |" ] =?> table "Hitchhiker's Multiplication Table" - [(AlignDefault, Nothing), (AlignDefault, Nothing)] + [(AlignDefault, ColWidthDefault), (AlignDefault, ColWidthDefault)] [] [ [ plain "x", plain "6" ] , [ plain "9", plain "42" ] diff --git a/test/Tests/Readers/Txt2Tags.hs b/test/Tests/Readers/Txt2Tags.hs index e9ee6729c..be6747bfe 100644 --- a/test/Tests/Readers/Txt2Tags.hs +++ b/test/Tests/Readers/Txt2Tags.hs @@ -44,7 +44,7 @@ simpleTable' :: Int -> [Blocks] -> [[Blocks]] -> Blocks -simpleTable' n = table "" (replicate n (AlignCenter, Nothing)) +simpleTable' n = table "" (replicate n (AlignCenter, ColWidthDefault)) tests :: [TestTree] tests = @@ -398,7 +398,9 @@ tests = , "| 1 | One | foo |" , "| 2 | Two | bar |" ] =?> - table "" (zip [AlignCenter, AlignRight, AlignDefault] [Nothing, Nothing, Nothing]) + table "" (zip + [AlignCenter, AlignRight, AlignDefault] + [ColWidthDefault, ColWidthDefault, ColWidthDefault]) [] [ [ plain "Numbers", plain "Text", plain "More" ] , [ plain "1" , plain "One" , plain "foo" ] @@ -415,7 +417,9 @@ tests = , "| 1 | One | foo |" , "| 2 " ] =?> - table "" (zip [AlignCenter, AlignLeft, AlignLeft] [Nothing, Nothing, Nothing]) + table "" (zip + [AlignCenter, AlignLeft, AlignLeft] + [ColWidthDefault, ColWidthDefault, ColWidthDefault]) [ plain "Numbers", plain "Text" , plain mempty ] [ [ plain "1" , plain "One" , plain "foo" ] , [ plain "2" , plain mempty , plain mempty ] diff --git a/test/Tests/Writers/ConTeXt.hs b/test/Tests/Writers/ConTeXt.hs index ea717b48e..cc90b95a9 100644 --- a/test/Tests/Writers/ConTeXt.hs +++ b/test/Tests/Writers/ConTeXt.hs @@ -99,7 +99,7 @@ tests = [ testGroup "inline code" , testGroup "natural tables" [ test contextNtb "table with header and caption" $ let capt = text "Table 1" - aligns = [(AlignRight, Nothing), (AlignLeft, Nothing), (AlignCenter, Nothing), (AlignDefault, Nothing)] + aligns = [(AlignRight, ColWidthDefault), (AlignLeft, ColWidthDefault), (AlignCenter, ColWidthDefault), (AlignDefault, ColWidthDefault)] headers = [plain $ text "Right", plain $ text "Left", plain $ text "Center", diff --git a/test/Tests/Writers/Muse.hs b/test/Tests/Writers/Muse.hs index ba5fdf94f..42748ad85 100644 --- a/test/Tests/Writers/Muse.hs +++ b/test/Tests/Writers/Muse.hs @@ -372,7 +372,7 @@ tests = [ testGroup "block elements" [ "table without header" =: let rows = [[para "Para 1.1", para "Para 1.2"] ,[para "Para 2.1", para "Para 2.2"]] - in table mempty [(AlignDefault,Nothing),(AlignDefault,Nothing)] + in table mempty [(AlignDefault,ColWidthDefault),(AlignDefault,ColWidthDefault)] [mempty, mempty] rows =?> unlines [ " Para 1.1 | Para 1.2" @@ -393,7 +393,7 @@ tests = [ testGroup "block elements" headers = [plain "header 1", plain "header 2"] rows = [[para "Para 1.1", para "Para 1.2"] ,[para "Para 2.1", para "Para 2.2"]] - in table capt [(AlignDefault,Nothing),(AlignDefault,Nothing)] + in table capt [(AlignDefault,ColWidthDefault),(AlignDefault,ColWidthDefault)] headers rows =?> unlines [ " header 1 || header 2" , " Para 1.1 | Para 1.2" diff --git a/test/command/1881.md b/test/command/1881.md index fabd6d94b..52f374b7d 100644 --- a/test/command/1881.md +++ b/test/command/1881.md @@ -21,26 +21,34 @@ </table> ^D [Table ("",[],[]) (Caption Nothing - [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignDefault,Nothing)] 0 + [Plain [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]]])] + (TableFoot ("",[],[]) + [])] ``` ``` @@ -55,25 +63,33 @@ </table> ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0 + []) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignRight,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]]])] + (TableFoot ("",[],[]) + [])] ``` diff --git a/test/command/3348.md b/test/command/3348.md index f21b4845d..d4a3c5676 100644 --- a/test/command/3348.md +++ b/test/command/3348.md @@ -8,21 +8,27 @@ ----- ------------------------------------------------ ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Just 8.333333333333333e-2),(AlignLeft,Just 0.6805555555555556)] 0 + []) + [(AlignRight,ColWidth 8.333333333333333e-2) + ,(AlignLeft,ColWidth 0.6805555555555556)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "foo"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "bar"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "foo"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "long",SoftBreak,Str "line",Space,Str "of",Space,Str "text"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "foo"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "bar"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "foo"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "long",SoftBreak,Str "line",Space,Str "of",Space,Str "text"]]]])] + (TableFoot ("",[],[]) + [])] ``` diff --git a/test/command/3516.md b/test/command/3516.md index 602d8442b..c3579c026 100644 --- a/test/command/3516.md +++ b/test/command/3516.md @@ -25,45 +25,57 @@ on Windows builds. +---+---+ ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 5.555555555555555e-2),(AlignDefault,Just 5.555555555555555e-2)] 0 + []) + [(AlignDefault,ColWidth 5.555555555555555e-2) + ,(AlignDefault,ColWidth 5.555555555555555e-2)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]])] + (TableFoot ("",[],[]) + [])] ``` ``` % pandoc -f native -t rst [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 5.555555555555555e-2),(AlignDefault,Just 5.555555555555555e-2)] 0 - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []]] + []) + [(AlignDefault,ColWidth 5.555555555555555e-2) + ,(AlignDefault,ColWidth 5.555555555555555e-2)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "2"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]])] + (TableFoot ("",[],[]) + [])] ^D +---+---+ | 1 | 2 | diff --git a/test/command/3533-rst-csv-tables.md b/test/command/3533-rst-csv-tables.md index 1fcf3bae9..3b0df84a7 100644 --- a/test/command/3533-rst-csv-tables.md +++ b/test/command/3533-rst-csv-tables.md @@ -6,29 +6,36 @@ :file: command/3533-rst-csv-tables.csv ^D [Table ("",[],[]) (Caption Nothing - [Para [Str "Test"]]) [(AlignDefault,Just 0.4),(AlignDefault,Just 0.2),(AlignDefault,Just 0.4)] 0 + [Plain [Str "Test"]]) + [(AlignDefault,ColWidth 0.4) + ,(AlignDefault,ColWidth 0.2) + ,(AlignDefault,ColWidth 0.4)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Flavor"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Price"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Slogan"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Albatross"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2.99"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "On",Space,Str "a",Space,Str "stick!"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Crunchy",Space,Str "Frog"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1.49"]] - ,Cell ("",[],[]) Nothing 1 1 - [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?"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Slogan"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Albatross"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2.99"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "On",Space,Str "a",Space,Str "stick!"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Crunchy",Space,Str "Frog"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1.49"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [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?"]]]])] + (TableFoot ("",[],[]) + [])] ``` ``` @@ -43,29 +50,36 @@ 'dog''s' 2 3 ^D [Table ("",[],[]) (Caption Nothing - [Para [Str "Test"]]) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + [Plain [Str "Test"]]) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "a"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "cat's"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "dog's"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "cat's"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "dog's"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]]]])] + (TableFoot ("",[],[]) + [])] ``` ``` @@ -76,17 +90,23 @@ "1","\"" ^D [Table ("",[],[]) (Caption Nothing - [Para [Str "Test"]]) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + [Plain [Str "Test"]]) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "\""]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "\""]]]])] + (TableFoot ("",[],[]) + [])] ``` diff --git a/test/command/3706.md b/test/command/3706.md index 8430a929c..0c98f39d8 100644 --- a/test/command/3706.md +++ b/test/command/3706.md @@ -17,28 +17,34 @@ pandoc -f org -t native ^D [Div ("tab",[],[]) [Table ("",[],[]) (Caption Nothing - [Para [Str "Lalelu."]]) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + [Plain [Str "Lalelu."]]) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Id"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Desc"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "La"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "La"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "La"]]]] - []]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Desc"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "La"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "La"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "La"]]]])] + (TableFoot ("",[],[]) + [])]] ``` ``` diff --git a/test/command/3708.md b/test/command/3708.md index 1eb0c256a..4efc54ba2 100644 --- a/test/command/3708.md +++ b/test/command/3708.md @@ -6,21 +6,27 @@ \end{tabular} ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Nothing),(AlignCenter,Nothing)] 0 + []) + [(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "A"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "B&1"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "C"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "D"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "A"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "B&1"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "C"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "D"]]]])] + (TableFoot ("",[],[]) + [])] ``` diff --git a/test/command/4056.md b/test/command/4056.md index bf02ec5f0..64fbfff5f 100644 --- a/test/command/4056.md +++ b/test/command/4056.md @@ -15,20 +15,27 @@ Blah & Foo & Bar \\ \end{tabular} ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignRight,Nothing),(AlignRight,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignRight,ColWidthDefault) + ,(AlignRight,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Blah"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Foo"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Bar"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Blah"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Foo"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Bar"]]]])] + (TableFoot ("",[],[]) + [])] ``` diff --git a/test/command/4119.md b/test/command/4119.md index 1df7775c8..1262cb8b2 100644 --- a/test/command/4119.md +++ b/test/command/4119.md @@ -9,18 +9,24 @@ not a caption! :::::::::::::::: ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "col1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "col2"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "col2"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]]]])] + (TableFoot ("",[],[]) + []) ,Div ("",["notes"],[]) [Para [Str "not",Space,Str "a",Space,Str "caption!"]]] ``` diff --git a/test/command/4320.md b/test/command/4320.md index dc9b076d6..16a17a75d 100644 --- a/test/command/4320.md +++ b/test/command/4320.md @@ -1,19 +1,25 @@ ``` % pandoc -f native -t rst --wrap=none [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.3),(AlignDefault,Just 0.3)] 0 + []) + [(AlignDefault,ColWidth 0.3) + ,(AlignDefault,ColWidth 0.3)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "one"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "two"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "ports"]] - ,Cell ("",[],[]) Nothing 1 1 - [BlockQuote - [Para [Strong [Str "thisIsGoingToBeTooLongAnyway"]]]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "two"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "ports"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [BlockQuote + [Para [Strong [Str "thisIsGoingToBeTooLongAnyway"]]]]]])] + (TableFoot ("",[],[]) + [])] ^D +--------------------+-------------------------------------+ | one | two | diff --git a/test/command/4513.md b/test/command/4513.md index e315d3820..ad0374f0c 100644 --- a/test/command/4513.md +++ b/test/command/4513.md @@ -3,12 +3,18 @@ |_. heading 1 |_. heading 2| ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "heading",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "heading",Space,Str "2"]]]] - [] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "heading",Space,Str "2"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [])] + (TableFoot ("",[],[]) + [])] ``` diff --git a/test/command/4579.md b/test/command/4579.md index 6c01cf734..8b3125da1 100644 --- a/test/command/4579.md +++ b/test/command/4579.md @@ -9,16 +9,22 @@ - ham ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Foo"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Bar"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "spam"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "ham"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Bar"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "spam"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "ham"]]]])] + (TableFoot ("",[],[]) + [])] ``` diff --git a/test/command/5014.md b/test/command/5014.md index 79cc99cd0..c8263e51f 100644 --- a/test/command/5014.md +++ b/test/command/5014.md @@ -14,12 +14,17 @@ </table> ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Name"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Accounts"]]]] - []] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Name"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Accounts"]]]])] + (TableFoot ("",[],[]) + [])] ``` diff --git a/test/command/5079.md b/test/command/5079.md index 1a566d6e4..7ad3dd6b7 100644 --- a/test/command/5079.md +++ b/test/command/5079.md @@ -11,12 +11,17 @@ </table> ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell"]]]] - []] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell"]]]])] + (TableFoot ("",[],[]) + [])] ``` diff --git a/test/command/5708.md b/test/command/5708.md index f104c30c3..3d437c191 100644 --- a/test/command/5708.md +++ b/test/command/5708.md @@ -5,16 +5,22 @@ +--------+----------------+ ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.125),(AlignDefault,Just 0.2361111111111111)] 0 + []) + [(AlignDefault,ColWidth 0.125) + ,(AlignDefault,ColWidth 0.2361111111111111)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123456"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Math InlineMath "a + b"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123456"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Math InlineMath "a + b"]]]])] + (TableFoot ("",[],[]) + [])] ``` diff --git a/test/command/5711.md b/test/command/5711.md index 2e45d5fa1..7c32c0a18 100644 --- a/test/command/5711.md +++ b/test/command/5711.md @@ -8,12 +8,17 @@ \end{document} ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Nothing)] 0 + []) + [(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "d",LineBreak,Str "e"]]]] - []] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "d",LineBreak,Str "e"]]]])] + (TableFoot ("",[],[]) + [])] ``` diff --git a/test/command/6137.md b/test/command/6137.md index 4dcc0fe8f..dd3f6bead 100644 --- a/test/command/6137.md +++ b/test/command/6137.md @@ -18,29 +18,36 @@ This reference to Figure \ref{fig:label} works fine. [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."] ,Div ("tbl:label",[],[]) [Table ("",[],[]) (Caption Nothing - [Para [Str "This",Space,Str "caption",Space,Str "has",Space,Str "no",Space,Str "number."]]) [(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0 + [Plain [Str "This",Space,Str "caption",Space,Str "has",Space,Str "no",Space,Str "number."]]) + [(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignRight,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "\8212\8212\8211"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "\8212\8212\8211"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "\8212\8212\8211"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "\8212\8212\8211"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "\8212\8212\8211"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "\8212\8212\8211"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "\8212\8212\8211"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "\8212\8212\8211"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "\8212\8212\8211"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "\8212\8212\8211"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "\8212\8212\8211"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "\8212\8212\8211"]]]])] + (TableFoot ("",[],[]) + [])] ,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."] ,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:")]] ``` diff --git a/test/command/csv.md b/test/command/csv.md index d633840fd..a75e275df 100644 --- a/test/command/csv.md +++ b/test/command/csv.md @@ -6,34 +6,41 @@ Apple,25 cents,33 ,,45 ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Fruit"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Price"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Quantity"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Apple"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "25",Space,Str "cents"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "33"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "\"Navel\"",Space,Str "Orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "35",Space,Str "cents"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "22"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "45"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Quantity"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Apple"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "25",Space,Str "cents"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "33"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "\"Navel\"",Space,Str "Orange"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "35",Space,Str "cents"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "22"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "45"]]]])] + (TableFoot ("",[],[]) + [])] ``` diff --git a/test/command/gfm.md b/test/command/gfm.md index 3ef3665a6..a9be295a8 100644 --- a/test/command/gfm.md +++ b/test/command/gfm.md @@ -8,23 +8,29 @@ gfm tests: | orange|1.12| ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignRight,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignRight,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Fruit"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Price"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "apple"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "0.13"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1.12"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Price"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "apple"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "0.13"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "orange"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1.12"]]]])] + (TableFoot ("",[],[]) + [])] ``` ``` @@ -69,23 +75,29 @@ My:thumbsup:emoji:heart: ``` % pandoc -t gfm -f native [Table ("",[],[]) (Caption Nothing - [Para [Str "The",Space,Str "caption."]]) [(AlignDefault,Nothing),(AlignRight,Nothing)] 0 + [Plain [Str "The",Space,Str "caption."]]) + [(AlignDefault,ColWidthDefault) + ,(AlignRight,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Fruit"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Price"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "apple"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "0.13"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1.12"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Price"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "apple"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "0.13"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "orange"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1.12"]]]])] + (TableFoot ("",[],[]) + [])] ^D | Fruit | Price | | ------ | ----: | diff --git a/test/command/latex-tabular-column-specs.md b/test/command/latex-tabular-column-specs.md index 65835019f..c4ab8eae0 100644 --- a/test/command/latex-tabular-column-specs.md +++ b/test/command/latex-tabular-column-specs.md @@ -12,27 +12,34 @@ f & 0.5 & 5,5 \\ \end{tabular} ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Math InlineMath ""]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Math InlineMath "f1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Math InlineMath "f2"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Math InlineMath "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Math InlineMath "0.5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Math InlineMath "4"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Math InlineMath "f"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Math InlineMath "0.5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Math InlineMath "5,5"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Math InlineMath "f2"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Math InlineMath "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Math InlineMath "0.5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Math InlineMath "4"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Math InlineMath "f"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Math InlineMath "0.5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Math InlineMath "5,5"]]]])] + (TableFoot ("",[],[]) + [])] ``` diff --git a/test/command/tabularx.md b/test/command/tabularx.md index 9ed991713..6ceb23a3f 100644 --- a/test/command/tabularx.md +++ b/test/command/tabularx.md @@ -21,36 +21,43 @@ \end{tabularx} ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0 + []) + [(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Column",Space,Str "Heading",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Column",Space,Str "Heading",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "1.1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "1.2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "1.3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "2.1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "2.2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "2.3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "3.1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "3.2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "3.3"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.3"]]]])] + (TableFoot ("",[],[]) + [])] ``` ``` @@ -76,36 +83,43 @@ \end{tabularx} ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Just 0.25)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignLeft,ColWidth 0.25)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Column",Space,Str "Heading",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Column",Space,Str "Heading",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "1.1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "1.2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "1.3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "2.1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "2.2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "2.3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "3.1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "3.2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "3.3"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.3"]]]])] + (TableFoot ("",[],[]) + [])] ``` ``` @@ -131,34 +145,41 @@ \end{tabularx} ^D [Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Just 0.25),(AlignCenter,Nothing),(AlignLeft,Just 0.25)] 0 + []) + [(AlignLeft,ColWidth 0.25) + ,(AlignCenter,ColWidthDefault) + ,(AlignLeft,ColWidth 0.25)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Column",Space,Str "Heading",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Column",Space,Str "Heading",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "1.1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "1.2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "1.3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "2.1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "2.2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "2.3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "3.1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "3.2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "3.3"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1.3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2.3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3.3"]]]])] + (TableFoot ("",[],[]) + [])] ``` diff --git a/test/creole-reader.native b/test/creole-reader.native index f9e0f6d28..428eda599 100644 --- a/test/creole-reader.native +++ b/test/creole-reader.native @@ -70,49 +70,61 @@ Pandoc (Meta {unMeta = fromList []}) ,Header 3 ("",[],[]) [Str "Creole 0.4"] ,Para [Str "Tables",Space,Str "are",Space,Str "done",Space,Str "like",Space,Str "this:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "header",Space,Str "col1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "header",Space,Str "col2"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "col1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "col2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "you"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "can"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "also"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "align",LineBreak,Str "it."]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "header",Space,Str "col2"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "col1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "col2"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "you"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "can"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "also"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "align",LineBreak,Str "it."]]]])] + (TableFoot ("",[],[]) + []) ,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:"] ,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"] ,Header 3 ("",[],[]) [Str "Creole 0.5"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Header",Space,Str "title"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Another",Space,Str "header",Space,Str "title"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Code ("",[],[]) " //not italic text// "]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Code ("",[],[]) " **not bold text** "]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Emph [Str "italic",Space,Str "text"]]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Strong [Space,Str "bold",Space,Str "text",Space]]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Another",Space,Str "header",Space,Str "title"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Code ("",[],[]) " //not italic text// "]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Code ("",[],[]) " **not bold text** "]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Emph [Str "italic",Space,Str "text"]]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Strong [Space,Str "bold",Space,Str "text",Space]]]]])] + (TableFoot ("",[],[]) + []) ,Header 3 ("",[],[]) [Str "Creole 1.0"] ,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 "."] ,HorizontalRule diff --git a/test/docbook-reader.native b/test/docbook-reader.native index 5ca83cf2e..b93831893 100644 --- a/test/docbook-reader.native +++ b/test/docbook-reader.native @@ -283,254 +283,310 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Sof ,Header 1 ("tables",[],[]) [Str "Tables"] ,Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"] ,Table ("",[],[]) (Caption Nothing - [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Nothing)] 0 + [Plain [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Simple",Space,Str "table",Space,Str "indented",Space,Str "two",Space,Str "spaces:"] ,Table ("",[],[]) (Caption Nothing - [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Nothing)] 0 + [Plain [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"] ,Table ("",[],[]) (Caption Nothing - [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 + [Plain [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,ColWidth 0.2) + ,(AlignLeft,ColWidth 0.2) + ,(AlignRight,ColWidth 0.3) + ,(AlignLeft,ColWidth 0.3)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Centered",Space,Str "Header"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left",Space,Str "Aligned"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right",Space,Str "Aligned"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default",Space,Str "aligned"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "First"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Second"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [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."]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default",Space,Str "aligned"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "First"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Second"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [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."]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Just 0.1),(AlignLeft,Just 0.2),(AlignRight,Just 0.3),(AlignLeft,Just 0.4)] 0 + []) + [(AlignCenter,ColWidth 0.1) + ,(AlignLeft,ColWidth 0.2) + ,(AlignRight,ColWidth 0.3) + ,(AlignLeft,ColWidth 0.4)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Centered",Space,Str "Header"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left",Space,Str "Aligned"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right",Space,Str "Aligned"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default",Space,Str "aligned"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "First"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Second"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [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."]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default",Space,Str "aligned"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "First"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Second"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [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."]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0 + []) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignRight,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Just 0.25),(AlignLeft,Just 0.25),(AlignRight,Just 0.25),(AlignLeft,Just 0.25)] 0 + []) + [(AlignCenter,ColWidth 0.25) + ,(AlignLeft,ColWidth 0.25) + ,(AlignRight,ColWidth 0.25) + ,(AlignLeft,ColWidth 0.25)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "First"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Second"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [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."]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "First"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Second"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [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."]]]])] + (TableFoot ("",[],[]) + [])] diff --git a/test/docx/0_level_headers.native b/test/docx/0_level_headers.native index 3ee60c2f4..2293c3010 100644 --- a/test/docx/0_level_headers.native +++ b/test/docx/0_level_headers.native @@ -1,39 +1,44 @@ [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "User\8217s",Space,Str "Guide"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "11",Space,Str "August",Space,Str "2017"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []]] - [] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "User\8217s",Space,Str "Guide"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "11",Space,Str "August",Space,Str "2017"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]])] + (TableFoot ("",[],[]) + []) ,Para [Str "CONTENTS"] ,Para [Strong [Str "Section",Space,Str "Page"]] ,Para [Str "FIGURES",Space,Str "iv"] @@ -46,4 +51,4 @@ ,Para [Strong [Str "Table",Space,Str "Page"]] ,Para [Strong [Str "No",Space,Str "table",Space,Str "of",Space,Str "figures",Space,Str "entries",Space,Str "found."]] ,Header 1 ("introduction",[],[]) [Str "Introduction"] -,Para [Str "Nothing",Space,Str "to",Space,Str "introduce,",Space,Str "yet."]] +,Para [Str "Nothing",Space,Str "to",Space,Str "introduce,",Space,Str "yet."]]
\ No newline at end of file diff --git a/test/docx/sdt_elements.native b/test/docx/sdt_elements.native index ad48dab5c..f0f72b6b1 100644 --- a/test/docx/sdt_elements.native +++ b/test/docx/sdt_elements.native @@ -1,24 +1,31 @@ [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Strong [Str "col1Header"]]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Strong [Str "col2Header"]]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Strong [Str "col3Header"]]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "col1",Space,Str "content"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Body",Space,Str "copy"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "col3",Space,Str "content"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Strong [Str "col1Header"]]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Strong [Str "col2Header"]]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Strong [Str "col3Header"]]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "col1",Space,Str "content"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Body",Space,Str "copy"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "col3",Space,Str "content"]]]])] + (TableFoot ("",[],[]) + [])]
\ No newline at end of file diff --git a/test/docx/table_one_row.native b/test/docx/table_one_row.native index 36073641a..b693b6e69 100644 --- a/test/docx/table_one_row.native +++ b/test/docx/table_one_row.native @@ -1,17 +1,24 @@ [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "One"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Table"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "One"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Table"]]]])] + (TableFoot ("",[],[]) + [])]
\ No newline at end of file diff --git a/test/docx/table_variable_width.native b/test/docx/table_variable_width.native index 0c6174937..5793f5ef1 100644 --- a/test/docx/table_variable_width.native +++ b/test/docx/table_variable_width.native @@ -1,37 +1,45 @@ - [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "h3"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "h4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "h5"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c11"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c22"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c23"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - []]
\ No newline at end of file + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "h5"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c11"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c22"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c23"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]])] + (TableFoot ("",[],[]) + [])]
\ No newline at end of file diff --git a/test/docx/table_with_list_cell.native b/test/docx/table_with_list_cell.native index cc7b08a5e..21e510e72 100644 --- a/test/docx/table_with_list_cell.native +++ b/test/docx/table_with_list_cell.native @@ -1,19 +1,25 @@ [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Cell",Space,Str "with",Space,Str "text"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "with",Space,Str "text"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [BulletList - [[Para [Str "Cell",Space,Str "with"]] - ,[Para [Str "A"]] - ,[Para [Str "Bullet",Space,Str "list"]]]] - ,Cell ("",[],[]) Nothing 1 1 - [OrderedList (1,Decimal,Period) - [[Para [Str "Cell",Space,Str "with"]] - ,[Para [Str "A"]] - ,[Para [Str "Numbered",Space,Str "list."]]]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "with",Space,Str "text"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [BulletList + [[Para [Str "Cell",Space,Str "with"]] + ,[Para [Str "A"]] + ,[Para [Str "Bullet",Space,Str "list"]]]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [OrderedList (1,Decimal,Period) + [[Para [Str "Cell",Space,Str "with"]] + ,[Para [Str "A"]] + ,[Para [Str "Numbered",Space,Str "list."]]]]]])] + (TableFoot ("",[],[]) + [])]
\ No newline at end of file diff --git a/test/docx/tables.native b/test/docx/tables.native index 48de6f947..fcba6ac20 100644 --- a/test/docx/tables.native +++ b/test/docx/tables.native @@ -1,80 +1,100 @@ [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"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Name"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Game"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Fame"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Blame"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Lebron",Space,Str "James"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Basketball"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Very",Space,Str "High"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Leaving",Space,Str "Cleveland"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Ryan",Space,Str "Braun"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Baseball"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Moderate"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Steroids"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Russell",Space,Str "Wilson"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Football"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "High"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Tacky",Space,Str "uniform"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Blame"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Lebron",Space,Str "James"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Basketball"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Very",Space,Str "High"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Leaving",Space,Str "Cleveland"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Ryan",Space,Str "Braun"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Baseball"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Moderate"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Steroids"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Russell",Space,Str "Wilson"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Football"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "High"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Tacky",Space,Str "uniform"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Sinple"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Table"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Without"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Header"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Sinple"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Table"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Without"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Header"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Simple"] - ,Para [Str "Multiparagraph"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Table"] - ,Para [Str "Full"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Of"] - ,Para [Str "Paragraphs"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "In",Space,Str "each"] - ,Para [Str "Cell."]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Simple"] + ,Para [Str "Multiparagraph"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Table"] + ,Para [Str "Full"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Of"] + ,Para [Str "Paragraphs"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "In",Space,Str "each"] + ,Para [Str "Cell."]]]])] + (TableFoot ("",[],[]) + [])]
\ No newline at end of file diff --git a/test/dokuwiki_multiblock_table.native b/test/dokuwiki_multiblock_table.native index 677f0bc6d..72f0af219 100644 --- a/test/dokuwiki_multiblock_table.native +++ b/test/dokuwiki_multiblock_table.native @@ -1,34 +1,41 @@ [Table ("",[],[]) (Caption Nothing - [Para [Str "Sample",Space,Str "grid",Space,Str "table."]]) [(AlignDefault,Just 0.2222222222222222),(AlignDefault,Just 0.2222222222222222),(AlignDefault,Just 0.2916666666666667)] 0 + [Para [Str "Sample",Space,Str "grid",Space,Str "table."]]) + [(AlignDefault,ColWidth 0.2222222222222222) + ,(AlignDefault,ColWidth 0.2222222222222222) + ,(AlignDefault,ColWidth 0.2916666666666667)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Fruit"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Price"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Advantages"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Bananas"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "$1.34"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "built-in",Space,Str "wrapper"] - ,Para [Str "potassium"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Oranges"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "$2.10"]] - ,Cell ("",[],[]) Nothing 1 1 - [BulletList - [[Plain [Str "cures",Space,Str "scurvy"]] - ,[Plain [Str "tasty"]]]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Apples"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "$1.10"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Some",Space,Str "text",LineBreak,LineBreak,Str "after",Space,Str "two",Space,Str "linebreaks"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Advantages"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Bananas"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "$1.34"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "built-in",Space,Str "wrapper"] + ,Para [Str "potassium"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Oranges"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "$2.10"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [BulletList + [[Plain [Str "cures",Space,Str "scurvy"]] + ,[Plain [Str "tasty"]]]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Apples"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "$1.10"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Some",Space,Str "text",LineBreak,LineBreak,Str "after",Space,Str "two",Space,Str "linebreaks"]]]])] + (TableFoot ("",[],[]) + [])]
\ No newline at end of file diff --git a/test/html-reader.native b/test/html-reader.native index fe37927f1..578916a54 100644 --- a/test/html-reader.native +++ b/test/html-reader.native @@ -332,328 +332,419 @@ Pandoc (Meta {unMeta = fromList [("generator",MetaInlines [Str "pandoc"]),("titl ,Header 1 ("tables",[],[]) [Str "Tables"] ,Header 2 ("tables-with-headers",[],[]) [Str "Tables",Space,Str "with",Space,Str "Headers"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,HorizontalRule ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,HorizontalRule ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,HorizontalRule ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,HorizontalRule ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,HorizontalRule ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,HorizontalRule ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,HorizontalRule ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,HorizontalRule ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,Header 2 ("tables-without-headers",[],[]) [Str "Tables",Space,Str "without",Space,Str "Headers"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,HorizontalRule ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,HorizontalRule ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,HorizontalRule ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,Header 2 ("empty-tables",[],[]) [Str "Empty",Space,Str "Tables"] ,Para [Str "This",Space,Str "section",Space,Str "should",Space,Str "be",Space,Str "empty."]] diff --git a/test/jats-reader.native b/test/jats-reader.native index 61dc0b483..97c1e8954 100644 --- a/test/jats-reader.native +++ b/test/jats-reader.native @@ -288,317 +288,408 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Spa ,Header 1 ("tables",[],[]) [Str "Tables"] ,Header 2 ("tables-with-headers",[],[]) [Str "Tables",Space,Str "with",Space,Str "Headers"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "X"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "Y"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Z"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Z"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,Header 2 ("tables-without-headers",[],[]) [Str "Tables",Space,Str "without",Space,Str "Headers"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "6"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "6"]]]])] + (TableFoot ("",[],[]) + []) ,Header 2 ("empty-tables",[],[]) [Str "Empty",Space,Str "Tables"] ,Para [Str "This",Space,Str "section",Space,Str "should",Space,Str "be",Space,Str "empty."]] diff --git a/test/latex-reader.native b/test/latex-reader.native index 909c7dd51..23b72020c 100644 --- a/test/latex-reader.native +++ b/test/latex-reader.native @@ -276,36 +276,47 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Spa ,[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$."]]] ,Para [Str "Here\8217s",Space,Str "a",Space,Str "LaTeX",Space,Str "table:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Animal"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Number"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Dog"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cat"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Number"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Dog"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cat"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "A",Space,Str "table",Space,Str "with",Space,Str "one",Space,Str "column:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Nothing)] 0 - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []]] + []) + [(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Animal"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Vegetable"]]]] - [] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Animal"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Vegetable"]]]])] + (TableFoot ("",[],[]) + []) ,HorizontalRule ,Header 1 ("special-characters",[],[]) [Str "Special",Space,Str "Characters"] ,Para [Str "Here",Space,Str "is",Space,Str "some",Space,Str "unicode:"] diff --git a/test/man-reader.native b/test/man-reader.native index 7b2f6f966..54751d3c3 100644 --- a/test/man-reader.native +++ b/test/man-reader.native @@ -106,169 +106,207 @@ Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "Oct",Space,Str "17,", ,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 "."] ,Header 1 ("",[],[]) [Str "Tables"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Left",Space,Emph [Str "more"]]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Left",Space,Emph [Str "more"]]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Nothing),(AlignLeft,Nothing),(AlignRight,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignCenter,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Centered",Space,Str "Header"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left",Space,Str "Aligned"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right",Space,Str "Aligned"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default",Space,Str "aligned"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "First"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Second"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [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."]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default",Space,Str "aligned"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "First"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",Space,Str "multiple",Space,Str "lines."]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Second"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [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."]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0 + []) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignRight,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Just 0.5),(AlignLeft,Just 0.5)] 0 + []) + [(AlignRight,ColWidth 0.5) + ,(AlignLeft,ColWidth 0.5)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 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 - [Para [Str "one"] - ,Para [Str "two"]] - ,Cell ("",[],[]) Nothing 1 1 - [CodeBlock ("",[],[]) "some\n code"]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "a"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "one"] + ,Para [Str "two"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [CodeBlock ("",[],[]) "some\n code"]]])] + (TableFoot ("",[],[]) + [])] diff --git a/test/markdown-reader-more.native b/test/markdown-reader-more.native index 21bd052ac..c7f490e5d 100644 --- a/test/markdown-reader-more.native +++ b/test/markdown-reader-more.native @@ -97,175 +97,223 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "Author",S ,[Str "\160\160and",Space,Str "another"]] ,Header 2 ("grid-tables",[],[]) [Str "Grid",Space,Str "Tables"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.2638888888888889),(AlignDefault,Just 0.16666666666666666),(AlignDefault,Just 0.18055555555555555)] 0 + []) + [(AlignDefault,ColWidth 0.2638888888888889) + ,(AlignDefault,ColWidth 0.16666666666666666) + ,(AlignDefault,ColWidth 0.18055555555555555)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "col",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "col",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "col",Space,Str "3"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r2",Space,Str "d"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "col",Space,Str "3"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r2",Space,Str "d"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Headless"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.2638888888888889),(AlignDefault,Just 0.16666666666666666),(AlignDefault,Just 0.18055555555555555)] 0 + []) + [(AlignDefault,ColWidth 0.2638888888888889) + ,(AlignDefault,ColWidth 0.16666666666666666) + ,(AlignDefault,ColWidth 0.18055555555555555)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r2",Space,Str "d"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r2",Space,Str "d"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "With",Space,Str "alignments"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Just 0.2638888888888889),(AlignLeft,Just 0.16666666666666666),(AlignCenter,Just 0.18055555555555555)] 0 + []) + [(AlignRight,ColWidth 0.2638888888888889) + ,(AlignLeft,ColWidth 0.16666666666666666) + ,(AlignCenter,ColWidth 0.18055555555555555)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "col",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "col",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "col",Space,Str "3"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r2",Space,Str "d"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "col",Space,Str "3"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r2",Space,Str "d"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Headless",Space,Str "with",Space,Str "alignments"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Just 0.2638888888888889),(AlignLeft,Just 0.16666666666666666),(AlignCenter,Just 0.18055555555555555)] 0 + []) + [(AlignRight,ColWidth 0.2638888888888889) + ,(AlignLeft,ColWidth 0.16666666666666666) + ,(AlignCenter,ColWidth 0.18055555555555555)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r2",Space,Str "d"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r2",Space,Str "d"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Spaces",Space,Str "at",Space,Str "ends",Space,Str "of",Space,Str "lines"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.2638888888888889),(AlignDefault,Just 0.16666666666666666),(AlignDefault,Just 0.18055555555555555)] 0 + []) + [(AlignDefault,ColWidth 0.2638888888888889) + ,(AlignDefault,ColWidth 0.16666666666666666) + ,(AlignDefault,ColWidth 0.18055555555555555)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r2",Space,Str "d"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r2",Space,Str "d"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Multiple",Space,Str "blocks",Space,Str "in",Space,Str "a",Space,Str "cell"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.2638888888888889),(AlignDefault,Just 0.16666666666666666),(AlignDefault,Just 0.18055555555555555)] 0 + []) + [(AlignDefault,ColWidth 0.2638888888888889) + ,(AlignDefault,ColWidth 0.16666666666666666) + ,(AlignDefault,ColWidth 0.18055555555555555)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Header 1 ("col-1",[],[]) [Str "col",Space,Str "1"] - ,Plain [Str "col",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Header 1 ("col-2",[],[]) [Str "col",Space,Str "2"] - ,Plain [Str "col",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Header 1 ("col-3",[],[]) [Str "col",Space,Str "3"] - ,Plain [Str "col",Space,Str "3"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "r1",Space,Str "a"] - ,Para [Str "r1",Space,Str "bis"]] - ,Cell ("",[],[]) Nothing 1 1 - [BulletList - [[Plain [Str "b"]] - ,[Plain [Str "b",Space,Str "2"]] - ,[Plain [Str "b",Space,Str "2"]]]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c",SoftBreak,Str "c",Space,Str "2",SoftBreak,Str "c",Space,Str "2"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Header 1 ("col-1",[],[]) [Str "col",Space,Str "1"] + ,Plain [Str "col",Space,Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Header 1 ("col-2",[],[]) [Str "col",Space,Str "2"] + ,Plain [Str "col",Space,Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Header 1 ("col-3",[],[]) [Str "col",Space,Str "3"] + ,Plain [Str "col",Space,Str "3"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "r1",Space,Str "a"] + ,Para [Str "r1",Space,Str "bis"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [BulletList + [[Plain [Str "b"]] + ,[Plain [Str "b",Space,Str "2"]] + ,[Plain [Str "b",Space,Str "2"]]]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c",SoftBreak,Str "c",Space,Str "2",SoftBreak,Str "c",Space,Str "2"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Empty",Space,Str "cells"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 5.555555555555555e-2),(AlignDefault,Just 5.555555555555555e-2)] 0 - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []]] + []) + [(AlignDefault,ColWidth 5.555555555555555e-2) + ,(AlignDefault,ColWidth 5.555555555555555e-2)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]])] + (TableFoot ("",[],[]) + []) ,Header 2 ("entities-in-links-and-titles",[],[]) [Str "Entities",Space,Str "in",Space,Str "links",Space,Str "and",Space,Str "titles"] ,Para [Link ("",[],[]) [Str "link"] ("/\252rl","\246\246!")] ,Para [Link ("",["uri"],[]) [Str "http://g\246\246gle.com"] ("http://g\246\246gle.com","")] diff --git a/test/mediawiki-reader.native b/test/mediawiki-reader.native index 0300419c5..a0365d43d 100644 --- a/test/mediawiki-reader.native +++ b/test/mediawiki-reader.native @@ -188,176 +188,231 @@ Pandoc (Meta {unMeta = fromList []}) ,Para [Str "Written",Space,RawInline (Format "mediawiki") "{{{date}}}",Space,Str "by",Space,RawInline (Format "mediawiki") "{{{name}}}",Str "."] ,Header 2 ("tables",[],[]) [Str "tables"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Apple"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Bread"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Pie"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Butter"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Ice",Space,Str "cream"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Orange"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Apple"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Bread"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Pie"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Butter"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Ice",Space,Str "cream"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - [Para [Str "Food",Space,Str "complements"]]) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + [Plain [Str "Food",Space,Str "complements"]]) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "Orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Apple"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Bread"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Pie"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Butter"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Ice",Space,Str "cream"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Apple"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Bread"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Pie"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Butter"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Ice",Space,Str "cream"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - [Para [Str "Food",Space,Str "complements"]]) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + [Plain [Str "Food",Space,Str "complements"]]) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "Orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Apple"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Bread"] - ,Para [Str "and",Space,Str "cheese"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Pie"] - ,OrderedList (1,DefaultStyle,DefaultDelim) - [[Plain [Str "apple"]] - ,[Plain [Str "carrot"]]]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Apple"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Bread"] + ,Para [Str "and",Space,Str "cheese"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Pie"] + ,OrderedList (1,DefaultStyle,DefaultDelim) + [[Plain [Str "apple"]] + ,[Plain [Str "carrot"]]]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Apple"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "more"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Bread"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Pie"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "more"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Butter"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Ice",Space,Str "cream"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "and",Space,Str "more"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Orange"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Apple"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "more"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Bread"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Pie"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "more"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Butter"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Ice",Space,Str "cream"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "and",Space,Str "more"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Just 0.25),(AlignRight,Just 0.125),(AlignCenter,Just 0.125)] 0 + []) + [(AlignLeft,ColWidth 0.25) + ,(AlignRight,ColWidth 0.125) + ,(AlignCenter,ColWidth 0.125)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Center"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "left"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "15.00"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "centered"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "more"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "2.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "more"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Center"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "left"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "15.00"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "centered"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "more"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "2.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "more"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Apple"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Bread"]] - ,Cell ("",[],[]) Nothing 1 1 - [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "fruit"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "topping"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "apple"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "ice",Space,Str "cream"]]]] - []]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Butter"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "Ice",Space,Str "cream"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Orange"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Apple"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Bread"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Table ("",[],[]) (Caption Nothing + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "fruit"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "topping"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "apple"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "ice",Space,Str "cream"]]]])] + (TableFoot ("",[],[]) + [])]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Butter"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Ice",Space,Str "cream"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing)] 0 - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []]] + []) + [(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "Orange"]]]] - [] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "Orange"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Paragraph",Space,Str "after",Space,Str "the",Space,Str "table."] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Para [Str "fruit"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "topping"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "apple"]] - ,Cell ("",[],[]) Nothing 1 1 - [Para [Str "ice",Space,Str "cream"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "topping"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "apple"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "ice",Space,Str "cream"]]]])] + (TableFoot ("",[],[]) + []) ,Header 2 ("notes",[],[]) [Str "notes"] ,Para [Str "My",Space,Str "note!",Note [Plain [Str "This."]]] ,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","")]]]] diff --git a/test/odt/native/simpleTable.native b/test/odt/native/simpleTable.native index 0fd7a918d..0f07036a6 100644 --- a/test/odt/native/simpleTable.native +++ b/test/odt/native/simpleTable.native @@ -1 +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 []] +[Table ("",[],[]) (Caption Nothing []) [(AlignDefault,ColWidthDefault),(AlignDefault,ColWidthDefault)] (TableHead ("",[],[]) [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [],Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) []]]) [TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) [] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Content"]],Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "More",Space,Str "content"]]]]] (TableFoot ("",[],[]) []),Para []]
\ No newline at end of file diff --git a/test/odt/native/simpleTableWithCaption.native b/test/odt/native/simpleTableWithCaption.native index 8e2b49417..4269dea56 100644 --- a/test/odt/native/simpleTableWithCaption.native +++ b/test/odt/native/simpleTableWithCaption.native @@ -1 +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 []] +[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,ColWidthDefault),(AlignDefault,ColWidthDefault)] (TableHead ("",[],[]) [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [],Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) []]]) [TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) [] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Content"]],Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "More",Space,Str "content"]]]]] (TableFoot ("",[],[]) []),Para []]
\ No newline at end of file diff --git a/test/odt/native/tableWithContents.native b/test/odt/native/tableWithContents.native index b71888516..b3dd917fd 100644 --- a/test/odt/native/tableWithContents.native +++ b/test/odt/native/tableWithContents.native @@ -1 +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 []] +[Table ("",[],[]) (Caption Nothing []) [(AlignDefault,ColWidthDefault),(AlignDefault,ColWidthDefault)] (TableHead ("",[],[]) [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [],Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) []]]) [TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) [] [Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "A"]],Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "B"]]],Row ("",[],[]) [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "C"]],Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "D"]]]]] (TableFoot ("",[],[]) []),Para []]
\ No newline at end of file diff --git a/test/pipe-tables.native b/test/pipe-tables.native index f4757756b..b9a70df9f 100644 --- a/test/pipe-tables.native +++ b/test/pipe-tables.native @@ -1,264 +1,334 @@ [Para [Str "Simplest",Space,Str "table",Space,Str "without",Space,Str "caption:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Default1"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Default2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default3"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default3"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"] ,Table ("",[],[]) (Caption Nothing - [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignDefault,Nothing),(AlignCenter,Nothing)] 0 + [Plain [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Default"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Center"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Center"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing)] 0 + []) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Center"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Center"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Headerless",Space,Str "table",Space,Str "without",Space,Str "caption:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing)] 0 + []) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Table",Space,Str "without",Space,Str "sides:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignRight,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignRight,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Fruit"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Quantity"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "apple"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "17"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "pear"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "302"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Quantity"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "apple"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "orange"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "17"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "pear"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "302"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "One-column:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing)] 0 - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "hi"]]]] + []) + [(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "lo"]]]] - [] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "hi"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "lo"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Header-less",Space,Str "one-column:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Nothing)] 0 + []) + [(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "hi"]]]] - [] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "hi"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Indented",Space,Str "left",Space,Str "column:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Number",Space,Str "of",Space,Str "siblings"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Salary"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "33"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "44"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Salary"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "33"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "44"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Long",Space,Str "pipe",Space,Str "table",Space,Str "with",Space,Str "relative",Space,Str "widths:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.15517241379310345),(AlignDefault,Just 0.1724137931034483),(AlignDefault,Just 0.6724137931034483)] 0 + []) + [(AlignDefault,ColWidth 0.15517241379310345) + ,(AlignDefault,ColWidth 0.1724137931034483) + ,(AlignDefault,ColWidth 0.6724137931034483)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Default1"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Default2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default3"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "table",Space,Str "cell"]] - ,Cell ("",[],[]) Nothing 1 1 - [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"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default3"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "this",Space,Str "is",Space,Str "a",Space,Str "table",Space,Str "cell"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [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"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Pipe",Space,Str "table",Space,Str "with",Space,Str "no",Space,Str "body:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Header"]]]] - [] - [] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Header"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [])] + (TableFoot ("",[],[]) + []) ,Para [Str "Pipe",Space,Str "table",Space,Str "with",Space,Str "tricky",Space,Str "cell",Space,Str "contents",Space,Str "(see",Space,Str "#2765):"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignRight,Nothing),(AlignRight,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignRight,ColWidthDefault) + ,(AlignRight,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "IP_gene8-_1st"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "IP_gene8+_1st"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "IP_gene8-_1st"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1.0000000"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "0.4357325"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "IP_gene8+_1st"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "0.4357325"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1.0000000"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "foo",Code ("",[],[]) "bar|baz"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "and|escaped"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3.0000000"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "IP_gene8+_1st"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "IP_gene8-_1st"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1.0000000"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "0.4357325"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "IP_gene8+_1st"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "0.4357325"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1.0000000"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "foo",Code ("",[],[]) "bar|baz"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "and|escaped"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3.0000000"]]]])] + (TableFoot ("",[],[]) + [])] diff --git a/test/pptx/speaker_notes_afterseps.native b/test/pptx/speaker_notes_afterseps.native index 1e4ac331c..a12bdff08 100644 --- a/test/pptx/speaker_notes_afterseps.native +++ b/test/pptx/speaker_notes_afterseps.native @@ -2,44 +2,52 @@ ,Div ("",["notes"],[]) [Para [Str "chicken",Space,Str "and",Space,Str "dumplings"]] ,Table ("",[],[]) (Caption Nothing - [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 + [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax,",Space,Str "with",Space,Str "alignment"]]) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Div ("",["notes"],[]) [Para [Str "foo",Space,Str "bar"]] ,Div ("",["columns"],[]) @@ -52,4 +60,4 @@ ,Div ("",["column"],[]) [Para [Str "Some",Space,Str "other",Space,Emph [Str "stuff"]]]] ,Div ("",["notes"],[]) - [Para [Str "Some",Space,Str "notes",Space,Str "outside",Space,Str "the",Space,Str "column"]]] + [Para [Str "Some",Space,Str "notes",Space,Str "outside",Space,Str "the",Space,Str "column"]]]
\ No newline at end of file diff --git a/test/pptx/tables.native b/test/pptx/tables.native index 1541e6d93..109f961dc 100644 --- a/test/pptx/tables.native +++ b/test/pptx/tables.native @@ -1,79 +1,95 @@ [Header 2 ("a-table-with-a-caption",[],[]) [Str "A",Space,Str "Table,",Space,Str "with",Space,Str "a",Space,Str "caption"] ,Table ("",[],[]) (Caption Nothing - [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 + [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax,",Space,Str "with",Space,Str "alignment"]]) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + [])]
\ No newline at end of file diff --git a/test/rst-reader.native b/test/rst-reader.native index 485d566ca..558e334ea 100644 --- a/test/rst-reader.native +++ b/test/rst-reader.native @@ -245,151 +245,193 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "John",Spa ,[Str "\160\160and",Space,Str "another"]] ,Header 1 ("simple-tables",[],[]) [Str "Simple",Space,Str "Tables"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "col",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "col",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "col",Space,Str "3"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r1",Space,Str "a"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r2",Space,Str "d"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "col",Space,Str "3"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r1",Space,Str "a"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r2",Space,Str "d"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Headless"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r1",Space,Str "a"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r2",Space,Str "d"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r1",Space,Str "a"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r2",Space,Str "d"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Header 1 ("grid-tables",[],[]) [Str "Grid",Space,Str "Tables"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.2375),(AlignDefault,Just 0.15),(AlignDefault,Just 0.1625)] 0 + []) + [(AlignDefault,ColWidth 0.2375) + ,(AlignDefault,ColWidth 0.15) + ,(AlignDefault,ColWidth 0.1625)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "col",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "col",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "col",Space,Str "3"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r2",Space,Str "d"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "col",Space,Str "3"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r2",Space,Str "d"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Headless"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.2375),(AlignDefault,Just 0.15),(AlignDefault,Just 0.1625)] 0 + []) + [(AlignDefault,ColWidth 0.2375) + ,(AlignDefault,ColWidth 0.15) + ,(AlignDefault,ColWidth 0.1625)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r2",Space,Str "d"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r2",Space,Str "d"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Spaces",Space,Str "at",Space,Str "ends",Space,Str "of",Space,Str "lines"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.2375),(AlignDefault,Just 0.15),(AlignDefault,Just 0.1625)] 0 + []) + [(AlignDefault,ColWidth 0.2375) + ,(AlignDefault,ColWidth 0.15) + ,(AlignDefault,ColWidth 0.1625)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "r2",Space,Str "d"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r1",Space,Str "a",SoftBreak,Str "r1",Space,Str "bis"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b",SoftBreak,Str "b",Space,Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c",SoftBreak,Str "c",Space,Str "2"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "r2",Space,Str "d"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Multiple",Space,Str "blocks",Space,Str "in",Space,Str "a",Space,Str "cell"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.2375),(AlignDefault,Just 0.15),(AlignDefault,Just 0.1625)] 0 + []) + [(AlignDefault,ColWidth 0.2375) + ,(AlignDefault,ColWidth 0.15) + ,(AlignDefault,ColWidth 0.1625)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Para [Str "r1",Space,Str "a"] - ,Para [Str "r1",Space,Str "bis"]] - ,Cell ("",[],[]) Nothing 1 1 - [BulletList - [[Plain [Str "b"]] - ,[Plain [Str "b",Space,Str "2"]] - ,[Plain [Str "b",Space,Str "2"]]]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c",SoftBreak,Str "c",Space,Str "2",SoftBreak,Str "c",Space,Str "2"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Para [Str "r1",Space,Str "a"] + ,Para [Str "r1",Space,Str "bis"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [BulletList + [[Plain [Str "b"]] + ,[Plain [Str "b",Space,Str "2"]] + ,[Plain [Str "b",Space,Str "2"]]]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c",SoftBreak,Str "c",Space,Str "2",SoftBreak,Str "c",Space,Str "2"]]]])] + (TableFoot ("",[],[]) + []) ,Header 1 ("footnotes",[],[]) [Str "Footnotes"] ,Para [Note [Para [Str "Note",Space,Str "with",Space,Str "one",Space,Str "line."]]] ,Para [Note [Para [Str "Note",Space,Str "with",SoftBreak,Str "continuation",Space,Str "line."]]] diff --git a/test/tables-rstsubset.native b/test/tables-rstsubset.native index bb2a99997..8902632c1 100644 --- a/test/tables-rstsubset.native +++ b/test/tables-rstsubset.native @@ -1,253 +1,309 @@ [Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"] ,Table ("",[],[]) (Caption Nothing - [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + [Plain [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Simple",Space,Str "table",Space,Str "indented",Space,Str "two",Space,Str "spaces:"] ,Table ("",[],[]) (Caption Nothing - [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + [Plain [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"] ,Table ("",[],[]) (Caption Nothing - [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 + [Plain [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,ColWidth 0.1375) + ,(AlignDefault,ColWidth 0.125) + ,(AlignDefault,ColWidth 0.15) + ,(AlignDefault,ColWidth 0.3375)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Centered",SoftBreak,Str "Header"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left",SoftBreak,Str "Aligned"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right",SoftBreak,Str "Aligned"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default",Space,Str "aligned"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "First"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Second"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [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."]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default",Space,Str "aligned"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "First"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Second"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [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."]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.1375),(AlignDefault,Just 0.125),(AlignDefault,Just 0.15),(AlignDefault,Just 0.3375)] 0 + []) + [(AlignDefault,ColWidth 0.1375) + ,(AlignDefault,ColWidth 0.125) + ,(AlignDefault,ColWidth 0.15) + ,(AlignDefault,ColWidth 0.3375)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Centered",SoftBreak,Str "Header"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left",SoftBreak,Str "Aligned"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right",SoftBreak,Str "Aligned"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default",Space,Str "aligned"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "First"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Second"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [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."]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default",Space,Str "aligned"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "First"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Second"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [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."]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Just 0.1375),(AlignDefault,Just 0.125),(AlignDefault,Just 0.15),(AlignDefault,Just 0.3375)] 0 + []) + [(AlignDefault,ColWidth 0.1375) + ,(AlignDefault,ColWidth 0.125) + ,(AlignDefault,ColWidth 0.15) + ,(AlignDefault,ColWidth 0.3375)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "First"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Second"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [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."]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "First"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",SoftBreak,Str "spans",Space,Str "multiple",Space,Str "lines."]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Second"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [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."]]]])] + (TableFoot ("",[],[]) + [])] diff --git a/test/tables.native b/test/tables.native index da3df8b47..abe7d095a 100644 --- a/test/tables.native +++ b/test/tables.native @@ -1,253 +1,309 @@ [Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"] ,Table ("",[],[]) (Caption Nothing - [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignDefault,Nothing)] 0 + [Plain [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Simple",Space,Str "table",Space,Str "indented",Space,Str "two",Space,Str "spaces:"] ,Table ("",[],[]) (Caption Nothing - [Para [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignDefault,Nothing)] 0 + [Plain [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax."]]) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Center"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Multiline",Space,Str "table",Space,Str "with",Space,Str "caption:"] ,Table ("",[],[]) (Caption Nothing - [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 + [Plain [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,ColWidth 0.15) + ,(AlignLeft,ColWidth 0.1375) + ,(AlignRight,ColWidth 0.1625) + ,(AlignLeft,ColWidth 0.35)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Centered",SoftBreak,Str "Header"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left",SoftBreak,Str "Aligned"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right",SoftBreak,Str "Aligned"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default",Space,Str "aligned"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "First"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Second"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [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."]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default",Space,Str "aligned"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "First"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Second"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [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."]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "caption:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Just 0.15),(AlignLeft,Just 0.1375),(AlignRight,Just 0.1625),(AlignLeft,Just 0.35)] 0 + []) + [(AlignCenter,ColWidth 0.15) + ,(AlignLeft,ColWidth 0.1375) + ,(AlignRight,ColWidth 0.1625) + ,(AlignLeft,ColWidth 0.35)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Centered",SoftBreak,Str "Header"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Left",SoftBreak,Str "Aligned"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Right",SoftBreak,Str "Aligned"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Default",Space,Str "aligned"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "First"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Second"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [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."]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Default",Space,Str "aligned"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "First"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Second"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [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."]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Table",Space,Str "without",Space,Str "column",Space,Str "headers:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Nothing),(AlignLeft,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0 + []) + [(AlignRight,ColWidthDefault) + ,(AlignLeft,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignRight,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "123"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "123"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "Multiline",Space,Str "table",Space,Str "without",Space,Str "column",Space,Str "headers:"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Just 0.15),(AlignLeft,Just 0.1375),(AlignRight,Just 0.1625),(AlignDefault,Just 0.35)] 0 + []) + [(AlignCenter,ColWidth 0.15) + ,(AlignLeft,ColWidth 0.1375) + ,(AlignRight,ColWidth 0.1625) + ,(AlignDefault,ColWidth 0.35)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "First"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "12.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Second"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "row"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5.0"]] - ,Cell ("",[],[]) Nothing 1 1 - [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."]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "First"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "12.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Example",Space,Str "of",Space,Str "a",Space,Str "row",Space,Str "that",Space,Str "spans",SoftBreak,Str "multiple",Space,Str "lines."]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Second"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "row"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5.0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [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."]]]])] + (TableFoot ("",[],[]) + [])] diff --git a/test/test-pandoc.hs b/test/test-pandoc.hs index 6f013a95c..ff7661094 100644 --- a/test/test-pandoc.hs +++ b/test/test-pandoc.hs @@ -89,7 +89,7 @@ tests pandocPath = testGroup "pandoc tests" , testGroup "FB2" Tests.Readers.FB2.tests , testGroup "DokuWiki" Tests.Readers.DokuWiki.tests ] - , testGroup "Lua" + , testGroup "Lua" [ testGroup "Lua filters" Tests.Lua.tests , testGroup "Lua modules" Tests.Lua.Module.tests ] diff --git a/test/textile-reader.native b/test/textile-reader.native index 2f2f58818..b2621985c 100644 --- a/test/textile-reader.native +++ b/test/textile-reader.native @@ -104,76 +104,90 @@ Pandoc (Meta {unMeta = fromList []}) ,Para [Str "Textile",Space,Str "allows",Space,Str "tables",Space,Str "with",Space,Str "and",Space,Str "without",Space,Str "headers",Space,Str ":"] ,Header 2 ("without-headers",[],[]) [Str "Without",Space,Str "headers"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "name"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "age"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "sex"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "joan"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "24"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "archie"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "29"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "m"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "bella"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "45"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "name"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "age"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "sex"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "joan"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "24"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "archie"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "29"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "m"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "bella"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "45"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "and",Space,Str "some",Space,Str "text",Space,Str "following",Space,Str "\8230"] ,Header 2 ("with-headers",[],[]) [Str "With",Space,Str "headers"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "name"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "age"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "sex"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "joan"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "24"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "archie"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "29"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "m"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "bella"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "45"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "sex"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "joan"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "24"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "archie"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "29"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "m"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "bella"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "45"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Header 1 ("images",[],[]) [Str "Images"] ,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 "."] ,Header 1 ("attributes",[],[]) [Str "Attributes"] @@ -184,29 +198,36 @@ Pandoc (Meta {unMeta = fromList []}) ,Para [Str "as",Space,Str "well",Space,Str "as",Space,Strong [Span ("",["foo"],[]) [Str "inline",Space,Str "attributes"]],Space,Str "of",Space,Span ("",[],[("style","color:red;")]) [Str "all",Space,Str "kind"]] ,Para [Str "and",Space,Str "paragraph",Space,Str "attributes,",Space,Str "and",Space,Str "table",Space,Str "attributes."] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "name"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "age"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "sex"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "joan"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "24"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "name"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "age"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "sex"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "joan"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "24"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Emph [Str "(class#id)",Space,Str "emph"]] ,Para [Emph [Str "(no",Space,Str "class#id)",Space,Str "emph"]] ,Header 1 ("entities",[],[]) [Str "Entities"] diff --git a/test/tikiwiki-reader.native b/test/tikiwiki-reader.native index f058c0815..84f19e20e 100644 --- a/test/tikiwiki-reader.native +++ b/test/tikiwiki-reader.native @@ -91,97 +91,122 @@ Pandoc (Meta {unMeta = fromList []}) ,[Plain [Str "five",Space,Str "sub",Space,Str "2"]]]]] ,Header 1 ("tables",[],[]) [Str "tables"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str ""]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str ""]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Apple"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Bread"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Pie"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Butter"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Ice",Space,Str "cream"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str ""]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Orange"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Apple"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Bread"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Pie"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Butter"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Ice",Space,Str "cream"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str ""]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str ""]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Apple"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Bread"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Pie"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Strong [Str "Butter"]]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Ice",Space,Str "cream"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str ""]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Orange"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Apple"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Bread"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Pie"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Strong [Str "Butter"]]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Ice",Space,Str "cream"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str ""]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str ""]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Apple"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Bread",LineBreak,LineBreak,Str "and",Space,Str "cheese"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Pie",LineBreak,LineBreak,Strong [Str "apple"],Space,Str "and",Space,Emph [Str "carrot"],Space]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str ""]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Orange"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Apple"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Bread",LineBreak,LineBreak,Str "and",Space,Str "cheese"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Pie",LineBreak,LineBreak,Strong [Str "apple"],Space,Str "and",Space,Emph [Str "carrot"],Space]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str ""]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str ""]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str ""]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Space,Str "Orange",Space]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Space,Str "Apple",Space]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Space,Str "more"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Space,Str "Bread",Space]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Space,Str "Pie",Space]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Space,Str "more"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Space,Str "Butter",Space]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Space,Str "Ice",Space,Str "cream",Space]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Space,Str "and",Space,Str "more",Space]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str ""]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Space,Str "Orange",Space]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Space,Str "Apple",Space]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Space,Str "more"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Space,Str "Bread",Space]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Space,Str "Pie",Space]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Space,Str "more"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Space,Str "Butter",Space]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Space,Str "Ice",Space,Str "cream",Space]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Space,Str "and",Space,Str "more",Space]]]])] + (TableFoot ("",[],[]) + [])] diff --git a/test/twiki-reader.native b/test/twiki-reader.native index d100b5cd1..2c48c5240 100644 --- a/test/twiki-reader.native +++ b/test/twiki-reader.native @@ -128,90 +128,115 @@ Pandoc (Meta {unMeta = fromList []}) ,[Plain [Str "supported"]]]]] ,Header 1 ("tables",[],[]) [Str "tables"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Apple"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Bread"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Pie"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Butter"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Ice",Space,Str "cream"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Orange"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Apple"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Bread"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Pie"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Butter"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Ice",Space,Str "cream"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Apple"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Bread"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Pie"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Strong [Str "Butter"]]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Ice",Space,Str "cream"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Apple"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Bread"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Pie"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Strong [Str "Butter"]]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Ice",Space,Str "cream"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignLeft,Nothing),(AlignLeft,Nothing)] 0 + []) + [(AlignLeft,ColWidthDefault) + ,(AlignLeft,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Apple"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Bread",LineBreak,LineBreak,Str "and",Space,Str "cheese"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Pie",LineBreak,LineBreak,Strong [Str "apple"],Space,Str "and",Space,Emph [Str "carrot"]]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Apple"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Bread",LineBreak,LineBreak,Str "and",Space,Str "cheese"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Pie",LineBreak,LineBreak,Strong [Str "apple"],Space,Str "and",Space,Emph [Str "carrot"]]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Orange"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Apple"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "more"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Bread"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Pie"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "more"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Butter"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Ice",Space,Str "cream"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "and",Space,Str "more"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Orange"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Apple"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "more"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Bread"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Pie"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "more"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Butter"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Ice",Space,Str "cream"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "and",Space,Str "more"]]]])] + (TableFoot ("",[],[]) + []) ,Header 1 ("macros",[],[]) [Str "macros"] ,Para [Span ("",["twiki-macro","TEST"],[]) []] ,Para [Span ("",["twiki-macro","TEST"],[]) [Str ""]] diff --git a/test/txt2tags.native b/test/txt2tags.native index 356f9a9d6..eeb6e23cc 100644 --- a/test/txt2tags.native +++ b/test/txt2tags.native @@ -302,675 +302,804 @@ Pandoc (Meta {unMeta = fromList [("author",MetaList [MetaInlines [Str "author"]] [[Plain [Str "just",Space,Str "like",Space,Str "when",Space,Str "using",Space,Str "the",Space,Str "two",Space,Str "blank",Space,Str "lines."]]]]]]] ,Header 1 ("table",[],[]) [Str "Table"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignRight,Nothing)] 0 + []) + [(AlignRight,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "1"]]]] - [] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignRight,Nothing)] 0 - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []]] + []) + [(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignRight,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "3"]]]] - [] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0 - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []]] + []) + [(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "3"]]]] - [] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3"]]]])] + (TableFoot ("",[],[]) + []) ,Para [Str "||",Space,Str "Cell",Space,Str "1",Space,Str "|",Space,Str "Cell",Space,Str "2",Space,Str "|",Space,Str "Cell",Space,Str "3",Space,Str "|"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0 + []) + [(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Cell",Space,Str "3"]]]] - [] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Cell",Space,Str "3"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignCenter,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Heading"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Heading"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Heading"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "<-"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "--"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "->"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "--"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "--"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "--"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "->"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "--"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "<-"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Heading"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "<-"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "--"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "->"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "--"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "--"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "--"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "->"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "--"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "<-"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "3+4"]] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1+2+3"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2+3"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1+2+3+4"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1+2+3"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2+3"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1+2+3+4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0 - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []]] + []) + [(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "0"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "7"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "8"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "A"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "B"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "D"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "E"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "F"]]]] - [] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "7"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "8"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "A"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "B"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "D"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "E"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "F"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0 - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []]] + []) + [(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]]]] - [] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0 - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []]] + []) + [(AlignDefault,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Jan"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Fev"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Mar"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Apr"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "May"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "20%"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "40%"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "60%"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "80%"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "100%"]]]] - [] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Jan"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Fev"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Mar"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Apr"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "May"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "20%"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "40%"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "60%"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "80%"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "100%"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0 - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []]] + []) + [(AlignCenter,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "/"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "o"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "o"]] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "."]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "=",Space,Str "=",Space,Str "=",Space,Str "="]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "/"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/",Space,Str "/"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "o"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "o"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "."]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "=",Space,Str "=",Space,Str "=",Space,Str "="]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing),(AlignCenter,Nothing)] 0 - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []]] + []) + [(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "01"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "02"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "05"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "07"]] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "11"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "13"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "16"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "17"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "19"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "20"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "23"]] - ,Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "25"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "26"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "29"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "30"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "32"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "35"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "37"]] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "39"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "40"]]]] - [] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "01"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "02"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "05"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "07"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "11"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "13"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "16"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "17"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "19"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "20"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "23"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "25"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "26"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "29"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "30"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "32"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "35"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "37"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "39"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "40"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption 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),(AlignCenter,Nothing)] 0 + []) + [(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault) + ,(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "0"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "6"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "7"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "8"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "9"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "A"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "B"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "C"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "D"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "E"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "F"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "0"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "3"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "4"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "5"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "6"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "7"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "8"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "9"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "A"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "B"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "C"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "D"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "E"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "F"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "6"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "7"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "8"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "9"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "A"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "B"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "C"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "D"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "E"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "F"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "0"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "3"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "4"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "5"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "6"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "7"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "8"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "9"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "A"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "B"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "C"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "D"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "E"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "F"]]]])] + (TableFoot ("",[],[]) + []) ,Table ("",[],[]) (Caption Nothing - []) [(AlignCenter,Nothing)] 0 - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []]] + []) + [(AlignCenter,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - []]] - [] + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]])] + (TableFoot ("",[],[]) + []) ,Para [Str "|this|is|not|a|table|"] ,Para [Str "|this|",Space,Str "is|",Space,Str "not|",Space,Str "a|",Space,Str "table|"] ,Para [Str "|this",Space,Str "|is",Space,Str "|not",Space,Str "|a",Space,Str "|table",Space,Str "|"] diff --git a/test/vimwiki-reader.native b/test/vimwiki-reader.native index 5be4a8d5c..f630ffea3 100644 --- a/test/vimwiki-reader.native +++ b/test/vimwiki-reader.native @@ -89,23 +89,29 @@ Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "2017-05-01"]),("title ,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"] ,CodeBlock ("",[],[]) "I'm part of item 1." ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "this",Space,Str "table"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "is"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "also",Space,Str "a",Space,Str "part"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "of",Space,Str "item",Space,Str "1"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "this",Space,Str "table"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "is"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "also",Space,Str "a",Space,Str "part"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "of",Space,Str "item",Space,Str "1"]]]])] + (TableFoot ("",[],[]) + []) ,Plain [Str "and",Space,Str "some",Space,Str "more",Space,Str "text",Space,Str "belonging",Space,Str "to",Space,Str "item",Space,Str "1."]] ,[Plain [Str "ordered",Space,Str "list",Space,Str "item",Space,Str "2"]]] ,BulletList @@ -193,18 +199,24 @@ Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "2017-05-01"]),("title [[Plain [Span ("",["done3"],[]) [],Str "4",SoftBreak,Str "5"]] ,[Plain [Span ("",["done4"],[]) []] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "a"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b"]]]] - []]]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "a"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b"]]]])] + (TableFoot ("",[],[]) + [])]]] ,[Plain [Span ("",["done4"],[]) [],Str "task",Space,Str "2"]]] ,Header 2 ("math",[],[]) [Str "math"] ,Para [Math InlineMath " \\sum_i a_i^2 = 1 "] @@ -220,70 +232,83 @@ Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "2017-05-01"]),("title ,Para [Span ("-tag-one",[],[]) [Str ""],Span ("tag-one",["tag"],[]) [Str "tag-one"],Space,Span ("-tag-two",[],[]) [Str ""],Span ("tag-two",["tag"],[]) [Str "tag-two"]] ,Header 2 ("tables",[],[]) [Str "tables"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Year"]] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [Plain [Str "Temperature",Space,Str "(low)"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "Temperature",Space,Str "(high)"]]]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1900"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "-10"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "25"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1910"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "-15"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "30"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1920"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "-10"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "32"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1930"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Emph [Str "N/A"]]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Emph [Str "N/A"]]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "1940"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "-2"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "40"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "Temperature",Space,Str "(high)"]]]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1900"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "-10"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "25"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1910"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "-15"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "30"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1920"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "-10"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "32"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1930"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Emph [Str "N/A"]]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Emph [Str "N/A"]]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "1940"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "-2"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "40"]]]])] + (TableFoot ("",[],[]) + []) ,Header 3 ("centered headerless tables",[],[]) [Str "centered",Space,Str "headerless",Space,Str "tables"] ,Div ("",["center"],[]) [Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 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"]]]] - []] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "a"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "d"]]]])] + (TableFoot ("",[],[]) + [])] ,Header 2 ("paragraphs",[],[]) [Str "paragraphs"] ,Para [Str "This",Space,Str "is",Space,Str "first",Space,Str "paragraph",SoftBreak,Str "with",Space,Str "two",Space,Str "lines."] ,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."] @@ -334,77 +359,91 @@ Pandoc (Meta {unMeta = fromList [("date",MetaInlines [Str "2017-05-01"]),("title ,Header 1 ("not implemented yet",[],[]) [Emph [Span ("not implemented yet",[],[]) [],Strong [Str "not",Space,Str "implemented",Space,Str "yet"]]] ,Header 2 ("tables with spans",[],[]) [Str "tables",Space,Str "with",Space,Str "spans"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) [] - ,Cell ("",[],[]) Nothing 1 1 - []]] - [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "a"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "b"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "c"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "d"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "\\/"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "e"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str ">"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "f"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "\\/"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "\\/"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str ">"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "g"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "h"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str ">"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str ">"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str ">"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "a"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "d"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "\\/"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "e"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str ">"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "f"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "\\/"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "\\/"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str ">"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "g"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "h"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str ">"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str ">"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str ">"]]]])] + (TableFoot ("",[],[]) + []) ,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"] ,Table ("",[],[]) (Caption Nothing - []) [(AlignDefault,Nothing),(AlignDefault,Nothing)] 0 + []) + [(AlignDefault,ColWidthDefault) + ,(AlignDefault,ColWidthDefault)] + (TableHead ("",[],[]) [Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 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"]]] - ,Row ("",[],[]) - [Cell ("",[],[]) Nothing 1 1 - [Plain [Str "---"]] - ,Cell ("",[],[]) Nothing 1 1 - [Plain [Str "---"]]]] - [] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + []]]) + [(TableBody ("",[],[]) (RowHeadColumns {getRowHeadColumns = 0}) + [] + [Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "a"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "b"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "c"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "d"]]] + ,Row ("",[],[]) + [Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "---"]] + ,Cell ("",[],[]) AlignDefault (RowSpan {getRowSpan = 1}) (ColSpan {getColSpan = 1}) + [Plain [Str "---"]]]])] + (TableFoot ("",[],[]) + []) ,Header 2 ("some other placeholders",[],[]) [Str "some",Space,Str "other",Space,Str "placeholders"] ,Para [Code ("",[],[]) "template",Space,Str "placeholder",Space,Str "is",Space,Str "ignored."] ,Para [Code ("",[],[]) "nohtml",Space,Str "placeholder",Space,Str "is",Space,Str "ignored."]] |