lee/pandoc
1
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-09-21 15:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use compactifyTable for tables produced by all readers.

Browse Source 
Remove old ad hoc `paraToPlain` at the table cell level.

This should ensure that we don't get tables that mix
Plain and Para. Such tables tend to look funny when
rendered in docx and other formats.

Closes #11864.
This commit is contained in:
John MacFarlane
2026-09-12 20:02:41 -07:00
parent d4cddb5539
commit 7cf4d41fe5
33 changed files with 447 additions and 460 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Text/Pandoc/Parsing/GridTable.hs
+1 -7
View File
@@ -39,7 +39,6 @@ import Text.Pandoc.Parsing.Capabilities
import Text.Pandoc.Parsing.General
import Text.Pandoc.Sources
import Text.Parsec (Stream (..), ParsecT, optional, sepEndBy1, try)
import Data.Maybe (mapMaybe)
import qualified Data.Text as T
import qualified Text.GridTable as GT
@@ -145,7 +144,7 @@ gridTableWith' normalization blocks = do
tbl
let rows = GT.rows blkTbl
let toPandocCell (GT.Cell c (GT.RowSpan rs) (GT.ColSpan cs)) =
fmap (B.cell AlignDefault (B.RowSpan rs) (B.ColSpan cs) . plainify) <$> c
fmap (B.cell AlignDefault (B.RowSpan rs) (B.ColSpan cs)) <$> c
rows' <- mapM (mapM toPandocCell) rows
columns <- getOption readerColumns
let colspecs = zipWith (\cs w -> (convAlign $ fst cs, B.ColWidth w))
@@ -187,11 +186,6 @@ removeOneLeadingSpace xs =
Nothing -> True
Just (c, _) -> c == ' '
plainify :: B.Blocks -> B.Blocks
plainify blks = case B.toList blks of
[Para x] -> B.fromList [Plain x]
_ -> blks
convAlign :: GT.Alignment -> B.Alignment
convAlign GT.AlignLeft = B.AlignLeft
convAlign GT.AlignRight = B.AlignRight
src/Text/Pandoc/Readers/AsciiDoc.hs
+5 -3
View File
@@ -25,7 +25,7 @@ import Text.Pandoc.Options
import Text.Pandoc.Definition
import Text.Pandoc.Walk
import Text.Pandoc.Shared (addPandocAttributes, blocksToInlines, safeRead,
tshow)
tshow, compactifyTable)
import qualified Text.Pandoc.UTF8 as UTF8
import qualified AsciiDoc as A
import Text.Pandoc.Error
@@ -184,7 +184,8 @@ addBlockTitle tit' bs =
let tit = B.toList tit'
in case B.toList bs of
[B.Table attr _ colspecs thead tbody tfoot] ->
B.singleton $ B.Table attr (B.Caption Nothing [B.Plain tit])
B.singleton $ compactifyTable
$ B.Table attr (B.Caption Nothing [B.Plain tit])
colspecs thead tbody tfoot
[B.Figure attr _ bs'] ->
B.singleton $ B.Figure attr (B.Caption Nothing [B.Plain tit]) bs'
@@ -281,7 +282,8 @@ doBlock (A.Block attr@(A.Attr ps kvs) mbtitle bt) = do
fromIntegral x / fromIntegral totalWidth))
(A.colWidth spec))
let colspecs = map toColSpec specs
pure $ B.table (B.Caption Nothing mempty) -- added by addBlockTitle
pure $ compactifyTable
$ B.table (B.Caption Nothing mempty) -- added by addBlockTitle
colspecs thead [tbody] tfoot
A.BlockImage target mbalt mbw mbh -> do
img' <- doInline (A.Inline mempty (A.InlineImage target mbalt mbw mbh))
src/Text/Pandoc/Readers/Djot.hs
+3 -2
View File
@@ -25,7 +25,7 @@ import Text.Pandoc.Sources
import Text.Parsec.Pos (newPos)
import Text.Pandoc.Options
import Text.Pandoc.Definition
import Text.Pandoc.Shared (addPandocAttributes, tshow)
import Text.Pandoc.Shared (addPandocAttributes, tshow, compactifyTable)
import qualified Text.Pandoc.UTF8 as UTF8
import Djot (ParseOptions(..), SourcePosOption(..), parseDoc, Pos(..))
import qualified Djot.AST as D
@@ -151,7 +151,8 @@ convertBlock (D.Node pos attr bl) = addAttrToBlock pos attr <$>
mapM toRow hs <*> mapM toRow rs
tbodies <- mapM toTableBody bodies
let tfoot = TableFoot mempty []
pure $ singleton $ Table mempty capt colspecs thead tbodies tfoot
pure $ singleton $ compactifyTable
$ Table mempty capt colspecs thead tbodies tfoot
D.RawBlock (D.Format fmt) bs -> pure $
rawBlock (UTF8.toText fmt) (UTF8.toText bs)
src/Text/Pandoc/Readers/Docx.hs
+3 -11
View File
@@ -80,7 +80,6 @@ import Data.Char (isSpace)
import qualified Data.Map as M
import qualified Data.Text as T
import Data.Maybe (isJust, fromMaybe, mapMaybe)
import Data.Sequence (ViewL (..), viewl)
import qualified Data.Sequence as Seq
import qualified Data.Set as Set
import Citeproc (ItemId(..), Val(TextVal,FancyVal), Reference(..), CitationItem(..))
@@ -605,18 +604,10 @@ makeHeaderAnchor' (Header n (ident, classes, kvs) ils) =
return $ Header n (newIdent, classes, kvs) ils
makeHeaderAnchor' blk = return blk
-- Rewrite a standalone paragraph block as a plain
singleParaToPlain :: Blocks -> Blocks
singleParaToPlain blks
| (Para ils :< seeq) <- viewl $ unMany blks
, Seq.null seeq =
singleton $ Plain ils
singleParaToPlain blks = blks
cellToCell :: PandocMonad m => RowSpan -> Docx.Cell -> DocxContext m Pandoc.Cell
cellToCell rowSpan (Docx.Cell align gridSpan _ bps) = do
blks <- smushBlocks <$> mapM bodyPartToBlocks bps
let blks' = singleParaToPlain $ fromList $ blocksToDefinitions $ blocksToBullets $ toList blks
let blks' = fromList $ blocksToDefinitions $ blocksToBullets $ toList blks
return (cell (convertAlign align)
rowSpan (ColSpan (fromIntegral gridSpan)) blks')
@@ -860,7 +851,8 @@ bodyPartToBlocks (Tbl mbsty cap grid look parts) = do
let attr = case mbsty of
Just sty | extStylesEnabled -> ("", [], [("custom-style", sty)])
_ -> nullAttr
return $ tableWith attr cap'
return $ compactifyTable
$ tableWith attr cap'
(zip alignments widths)
(TableHead nullAttr headerCells)
[TableBody nullAttr 0 [] bodyCells]
src/Text/Pandoc/Readers/DokuWiki.hs
+3 -2
View File
@@ -28,7 +28,7 @@ import Text.Pandoc.Class.PandocMonad (PandocMonad (..))
import Text.Pandoc.Definition
import Text.Pandoc.Options
import Text.Pandoc.Parsing hiding (enclosed)
import Text.Pandoc.Shared (trim, stringifyInlines, tshow)
import Text.Pandoc.Shared (trim, stringifyInlines, tshow, compactifyTable)
import Data.List (isPrefixOf, isSuffixOf, groupBy)
import qualified Safe
@@ -517,7 +517,8 @@ table = do
let attrs = map (\(a, _) -> (a, ColWidthDefault)) firstRow
let toRow = Row nullAttr . map B.simpleCell
toHeaderRow l = [toRow l | not (null l)]
pure $ B.table B.emptyCaption
pure $ compactifyTable
$ B.table B.emptyCaption
attrs
(TableHead nullAttr $ toHeaderRow (map snd headerRow))
[TableBody nullAttr 0 [] $ map (toRow . (map snd)) body]
src/Text/Pandoc/Readers/LaTeX/Table.hs
+6 -10
View File
@@ -15,7 +15,7 @@ import Data.Maybe (fromMaybe)
import qualified Data.Text as T
import Control.Applicative ((<|>), optional, many)
import Control.Monad (when, void)
import Text.Pandoc.Shared (safeRead, trim)
import Text.Pandoc.Shared (safeRead, trim, compactifyTable)
import Text.Pandoc.Logging (LogMessage(SkippedContent))
import Text.Pandoc.Walk (walkM)
import Text.Pandoc.Parsing hiding (blankline, many, mathDisplay, mathInline,
@@ -190,7 +190,7 @@ parseTableCell block = do
-- The parsing of empty cells is important in LaTeX, especially when dealing
-- with multirow/multicolumn. See #6603.
parseEmptyCell = spaces $> emptyCell
parseSimpleCell = simpleCell <$> (plainify . mconcat <$> many block)
parseSimpleCell = simpleCell . mconcat <$> many block
cellAlignment :: PandocMonad m => LP m Alignment
@@ -205,11 +205,6 @@ cellAlignment = skipMany (symbol '|') *> alignment <* skipMany (symbol '|')
"*" -> AlignDefault
_ -> AlignDefault
plainify :: Blocks -> Blocks
plainify bs = case toList bs of
[Para ils] -> plain (fromList ils)
_ -> bs
multirowCell :: PandocMonad m => LP m Blocks -> LP m Cell
multirowCell block = controlSeq "multirow" >> do
-- Full prototype for \multirow macro is:
@@ -221,7 +216,7 @@ multirowCell block = controlSeq "multirow" >> do
_ <- optional $ symbol '[' *> manyTill anyTok (symbol ']') -- bigstrut-related
_ <- symbol '{' *> manyTill anyTok (symbol '}') -- Cell width
_ <- optional $ symbol '[' *> manyTill anyTok (symbol ']') -- Length used for fine-tuning
content <- symbol '{' *> (plainify . mconcat <$> many block) <* symbol '}'
content <- symbol '{' *> (mconcat <$> many block) <* symbol '}'
return $ cell AlignDefault (RowSpan nrows) (ColSpan 1) content
multicolumnCell :: PandocMonad m => LP m Blocks -> LP m Cell
@@ -230,7 +225,7 @@ multicolumnCell block = controlSeq "multicolumn" >> do
alignment <- symbol '{' *> cellAlignment <* symbol '}'
let singleCell = do
content <- plainify . mconcat <$> many block
content <- mconcat <$> many block
return $ cell alignment (RowSpan 1) (ColSpan span') content
-- Two possible contents: either a \multirow cell, or content.
@@ -357,7 +352,8 @@ simpTable block inline envname hasWidthParameter = try $ do
let th = fixTableHead $ TableHead nullAttr header'
let tbs = [fixTableBody $ TableBody nullAttr 0 [] rows]
let tf = TableFoot nullAttr []
return $ table emptyCaption (zip aligns widths) th tbs tf
return $ compactifyTable
$ table emptyCaption (zip aligns widths) th tbs tf
addTableCaption :: PandocMonad m => Blocks -> LP m Blocks
addTableCaption = walkM go
src/Text/Pandoc/Readers/Man.hs
+3 -2
View File
@@ -33,7 +33,7 @@ import Text.Pandoc.Readers.Roff -- TODO explicit imports
import qualified Text.Pandoc.Parsing as P
import qualified Data.Foldable as Foldable
import qualified Data.Set as Set
import Text.Pandoc.Shared (extractSpaces)
import Text.Pandoc.Shared (extractSpaces, compactifyTable)
data ManState = ManState { readerOptions :: ReaderOptions
, manLogMessages :: []LogMessage
@@ -129,7 +129,8 @@ parseTable = do
let widths = if isPlainTable
then repeat ColWidthDefault
else repeat $ ColWidth (1.0 / fromIntegral (length alignments))
return $ B.table B.emptyCaption (zip alignments widths)
return $ compactifyTable
$ B.table B.emptyCaption (zip alignments widths)
(TableHead nullAttr $ toHeaderRow headerRow)
[TableBody nullAttr 0 [] $ map toRow bodyRows]
(TableFoot nullAttr [])) <|> fallback pos
src/Text/Pandoc/Readers/Markdown.hs
+1 -1
View File
@@ -1534,7 +1534,7 @@ table = try $ do
return $ do
caption' <- caption
(TableComponents _attr _capt colspecs th tb tf) <- tableComponents
return $ B.tableWith attr
return $ compactifyTable $ B.tableWith attr
(B.simpleCaption $ B.plain caption') colspecs th tb tf
--
src/Text/Pandoc/Readers/MediaWiki.hs
+3 -2
View File
@@ -38,7 +38,7 @@ import Text.Pandoc.Options
import Text.Pandoc.Parsing hiding (tableCaption)
import Text.Pandoc.Readers.HTML (htmlTag, isCommentTag, toAttr)
import Text.Pandoc.Shared (formatCode, safeRead, splitTextBy, stringifyInlines,
stripTrailingNewlines, trim, tshow)
stripTrailingNewlines, trim, tshow, compactifyTable)
import Text.Pandoc.XML (fromEntities)
-- | Read mediawiki from an input string and return a Pandoc document.
@@ -299,7 +299,8 @@ table = do
else ([], hdr:rows')
let toRow = Row nullAttr
toHeaderRow l = [toRow l | not (null l)]
return $ B.table (B.simpleCaption $ B.plain caption)
return $ compactifyTable
$ B.table (B.simpleCaption $ B.plain caption)
cellspecs
(TableHead nullAttr $ toHeaderRow headers)
[TableBody nullAttr 0 [] $ map toRow rows]
src/Text/Pandoc/Readers/Muse.hs
+2 -1
View File
@@ -36,7 +36,7 @@ import Text.Pandoc.Definition
import Text.Pandoc.Logging
import Text.Pandoc.Options
import Text.Pandoc.Parsing
import Text.Pandoc.Shared (trimr, tshow)
import Text.Pandoc.Shared (trimr, tshow, compactifyTable)
-- | Read Muse from an input string and return a Pandoc document.
readMuse :: (PandocMonad m, ToSources a)
@@ -645,6 +645,7 @@ data MuseTableElement = MuseHeaderRow [Blocks]
museToPandocTable :: MuseTable -> Blocks
museToPandocTable (MuseTable caption headers body footers) =
compactifyTable $
B.table (B.simpleCaption $ B.plain caption)
attrs
(TableHead nullAttr $ toHeaderRow headRow)
src/Text/Pandoc/Readers/ODT/ContentReader.hs
+2 -2
View File
@@ -731,8 +731,8 @@ read_table = matchingElement NsTable "table"
-- | A table without a caption.
table' :: ([[Cell]], [[Cell]]) -> Blocks
table' (headers, rows) =
table emptyCaption (replicate numcols defaults) th [tb] tf
table' (headers, rows) = compactifyTable $
table emptyCaption (replicate numcols defaults) th [tb] tf
where
defaults = (AlignDefault, ColWidthDefault)
numcols = maximum $ map length $ headers ++ rows
src/Text/Pandoc/Readers/Org/Blocks.hs
+5 -4
View File
@@ -31,7 +31,7 @@ import Text.Pandoc.Builder (Blocks, Inlines, Many(..))
import Text.Pandoc.Class.PandocMonad (PandocMonad)
import Text.Pandoc.Definition
import Text.Pandoc.Options
import Text.Pandoc.Shared (compactify, compactifyDL, safeRead)
import Text.Pandoc.Shared (compactify, compactifyDL, safeRead, compactifyTable)
import Control.Monad (foldM, guard, mzero, void)
import Data.Bifunctor (bimap)
@@ -701,8 +701,8 @@ table = try $ do
pure $ B.simpleCaption . B.plain $ ils'
let attr = (fromMaybe mempty identMb, [],
blockAttrKeyValues blockAttrs)
pure $ B.tableWith attr capt cs th tb tf
_ -> tbl -- should not happen
pure $ compactifyTable $ B.tableWith attr capt cs th tb tf
_ -> compactifyTable <$> tbl -- should not happen
else mempty
-- | A normal org table
@@ -718,7 +718,8 @@ orgToPandocTable (OrgTable colProps heads lns) =
let totalWidth = if any (isJust . columnRelWidth) colProps
then Just . sum $ map (fromMaybe 1 . columnRelWidth) colProps
else Nothing
in B.tableWith nullAttr (Caption Nothing mempty)
in compactifyTable $
B.tableWith nullAttr (Caption Nothing mempty)
(map (convertColProp totalWidth) colProps)
(TableHead nullAttr $ toHeaderRow heads)
[TableBody nullAttr 0 [] $ map toRow lns]
src/Text/Pandoc/Readers/RST.hs
+5 -11
View File
@@ -1046,22 +1046,15 @@ csvTableDirective top fields rawcsv = do
_ -> replicate numOfCols ColWidthDefault
let toRow = Row nullAttr . map B.simpleCell
toHeaderRow l = [toRow l | not (null l)]
return $ B.table (B.simpleCaption $ B.plain title)
return $ compactifyTable
$ B.table (B.simpleCaption $ B.plain title)
(zip (replicate numOfCols AlignDefault) widths)
(TableHead nullAttr $ toHeaderRow headerRow)
[TableBody nullAttr 0 [] $ map toRow bodyRows]
(TableFoot nullAttr [])
singleParaToPlain :: Blocks -> Blocks
singleParaToPlain bs =
case B.toList bs of
[Para ils] -> B.fromList [Plain ils]
_ -> bs
parseCell :: PandocMonad m => Text -> RSTParser m Blocks
parseCell t = singleParaToPlain
<$> parseFromString' parseBlocks (trim t <> "\n\n")
parseCell t = parseFromString' parseBlocks (trim t <> "\n\n")
-- TODO:
-- - Only supports :format: fields with a single format for :raw: roles,
@@ -1516,7 +1509,8 @@ gridTable = runIdentity <$>
gridTableWith (Identity <$> parseBlocks)
table :: PandocMonad m => RSTParser m Blocks
table = gridTable <|> simpleTable False <|> simpleTable True <?> "table"
table = compactifyTable <$>
(gridTable <|> simpleTable False <|> simpleTable True <?> "table")
--
-- inline
src/Text/Pandoc/Readers/TWiki.hs
+3 -2
View File
@@ -28,7 +28,7 @@ import Text.Pandoc.Definition
import Text.Pandoc.Options
import Text.Pandoc.Parsing hiding (enclosed)
import Text.Pandoc.Readers.HTML (htmlTag, isCommentTag)
import Text.Pandoc.Shared (tshow)
import Text.Pandoc.Shared (tshow, compactifyTable)
import Text.Pandoc.XML (fromEntities)
-- | Read twiki from an input string and return a Pandoc document.
@@ -217,7 +217,8 @@ table = try $ do
return $ buildTable mempty rows $ fromMaybe (align rows, columns rows) thead
where
buildTable caption rows (aligns, heads)
= B.table (B.simpleCaption $ B.plain caption)
= compactifyTable $ B.table
(B.simpleCaption $ B.plain caption)
aligns
(TableHead nullAttr $ toHeaderRow heads)
[TableBody nullAttr 0 [] $ map toRow rows]
src/Text/Pandoc/Readers/Textile.hs
+3 -2
View File
@@ -56,7 +56,7 @@ import Text.Pandoc.Options
import Text.Pandoc.Parsing
import Text.Pandoc.Readers.HTML (htmlTag, isBlockTag, isInlineTag)
import Text.Pandoc.Readers.LaTeX (rawLaTeXBlock, rawLaTeXInline)
import Text.Pandoc.Shared (trim, tshow)
import Text.Pandoc.Shared (trim, tshow, compactifyTable)
import Text.Read (readMaybe)
-- | Parse a Textile text and return a Pandoc document.
@@ -452,7 +452,8 @@ table = try $ do
transpose $ map (map (snd . fst)) (headers:rows)
let toRow = Row nullAttr . map B.simpleCell
toHeaderRow l = [toRow l | not (null l)]
return $ B.table (B.simpleCaption $ B.plain caption)
return $ compactifyTable
$ B.table (B.simpleCaption $ B.plain caption)
(zip aligns (replicate nbOfCols ColWidthDefault))
(TableHead nullAttr $ toHeaderRow $ map snd headers)
[TableBody nullAttr 0 [] $ map (toRow . map snd) rows]
src/Text/Pandoc/Readers/Txt2Tags.hs
+3 -2
View File
@@ -33,7 +33,7 @@ import Data.Time (defaultTimeLocale)
import Text.Pandoc.Definition
import Text.Pandoc.Options
import Text.Pandoc.Parsing hiding (space, spaces, uri)
import Text.Pandoc.Shared (compactify, compactifyDL)
import Text.Pandoc.Shared (compactify, compactifyDL, compactifyTable)
import Text.Pandoc.URI (escapeURI)
type T2T = ParsecT Sources ParserState (Reader T2TMeta)
@@ -274,7 +274,8 @@ table = try $ do
let headerPadded = if null tableHeader then mempty else pad size tableHeader
let toRow = Row nullAttr . map B.simpleCell
toHeaderRow l = [toRow l | not (null l)]
return $ B.table B.emptyCaption
return $ compactifyTable
$ B.table B.emptyCaption
(zip aligns (replicate ncolumns ColWidthDefault))
(TableHead nullAttr $ toHeaderRow headerPadded)
[TableBody nullAttr 0 [] $ map toRow rowsPadded]
src/Text/Pandoc/Readers/Typst.hs
+9 -9
View File
@@ -1,6 +1,7 @@
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE BangPatterns #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE UndecidableInstances #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE LambdaCase #-}
@@ -30,7 +31,7 @@ import Text.Pandoc.Definition
import Typst ( parseTypst, evaluateTypst )
import Text.Pandoc.Error (PandocError(..))
import Text.Pandoc.Translations (Term(References), translateTerm)
import Text.Pandoc.Shared (tshow, blocksToInlines)
import Text.Pandoc.Shared (tshow, blocksToInlines, compactifyTable)
import Text.Pandoc.Parsing (registerHeader, reportLogMessages)
import Control.Monad.Except (throwError)
import Control.Monad (MonadPlus (mplus), void, guard, foldM)
@@ -763,14 +764,13 @@ parseTable mbident fields = do
let headRows = getRows THeader tableData
let bodyRows = getRows TBody tableData
let footRows = getRows TFooter tableData
pure $
B.tableWith
(fromMaybe "" mbident, [], [])
(B.Caption mempty mempty)
colspecs
(B.TableHead B.nullAttr headRows)
[B.TableBody B.nullAttr 0 [] bodyRows]
(B.TableFoot B.nullAttr footRows)
pure $ compactifyTable $ B.tableWith
(fromMaybe "" mbident, [], [])
(B.Caption mempty mempty)
colspecs
(B.TableHead B.nullAttr headRows)
[B.TableBody B.nullAttr 0 [] bodyRows]
(B.TableFoot B.nullAttr footRows)
data TableSection = THeader | TBody | TFooter
deriving (Show, Ord, Eq)
test/asciidoc-reader.native
+87 -87
View File
@@ -1837,7 +1837,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "This"
, Space
, Str "content"
@@ -1866,7 +1866,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "This"
, Space
, Str "line"
@@ -1911,7 +1911,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "When"
, Space
, Str "the"
@@ -1988,7 +1988,7 @@ Pandoc
AlignRight
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Strong
[ Str "This"
, Space
@@ -2021,7 +2021,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "The"
, Space
, Str "cell"
@@ -2085,7 +2085,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "1,"
@@ -2100,7 +2100,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "2,"
@@ -2123,7 +2123,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2142,7 +2142,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2164,7 +2164,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2183,7 +2183,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2224,7 +2224,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "1,"
@@ -2239,7 +2239,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "2,"
@@ -2262,7 +2262,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2281,7 +2281,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2303,7 +2303,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2322,7 +2322,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2393,7 +2393,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2412,7 +2412,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2434,7 +2434,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2453,7 +2453,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2498,13 +2498,13 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Cell" , Space , Str "A1" ] ]
[ Plain [ Str "Cell" , Space , Str "A1" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Cell" , Space , Str "B1" ] ]
[ Plain [ Str "Cell" , Space , Str "B1" ] ]
]
, Row
( "" , [] , [] )
@@ -2513,13 +2513,13 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Cell" , Space , Str "A2" ] ]
[ Plain [ Str "Cell" , Space , Str "A2" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Cell" , Space , Str "B2" ] ]
[ Plain [ Str "Cell" , Space , Str "B2" ] ]
]
, Row
( "" , [] , [] )
@@ -2528,13 +2528,13 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Cell" , Space , Str "A3" ] ]
[ Plain [ Str "Cell" , Space , Str "A3" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Cell" , Space , Str "B3" ] ]
[ Plain [ Str "Cell" , Space , Str "B3" ] ]
]
]
]
@@ -2559,7 +2559,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "1,"
@@ -2574,7 +2574,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "2,"
@@ -2589,7 +2589,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "3,"
@@ -2607,7 +2607,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2626,7 +2626,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2645,7 +2645,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2667,7 +2667,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "1,"
@@ -2682,7 +2682,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "2,"
@@ -2697,7 +2697,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "3,"
@@ -2730,7 +2730,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "1,"
@@ -2745,7 +2745,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "2,"
@@ -2763,7 +2763,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2782,7 +2782,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2804,7 +2804,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2823,7 +2823,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -2849,7 +2849,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "1,"
@@ -2864,7 +2864,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "2,"
@@ -2895,13 +2895,13 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Column" , Space , Str "Name" ] ]
[ Plain [ Str "Column" , Space , Str "Name" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Column" , Space , Str "Name" ] ]
[ Plain [ Str "Column" , Space , Str "Name" ] ]
]
, Row
( "" , [] , [] )
@@ -2910,7 +2910,7 @@ Pandoc
AlignCenter
(RowSpan 1)
(ColSpan 2)
[ Para
[ Plain
[ Str "This"
, Space
, Str "cell"
@@ -2958,7 +2958,7 @@ Pandoc
AlignCenter
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "This"
, Space
, Str "content"
@@ -3007,7 +3007,7 @@ Pandoc
AlignCenter
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "This"
, Space
, Str "content"
@@ -3345,13 +3345,13 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Code ( "" , [] , [] ) "monospace" ] ]
[ Plain [ Code ( "" , [] , [] ) "monospace" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Code ( "" , [] , [] ) "mono" ] ]
[ Plain [ Code ( "" , [] , [] ) "mono" ] ]
]
, Row
( "" , [] , [] )
@@ -3360,13 +3360,13 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "default" ] ]
[ Plain [ Str "default" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Code ( "" , [] , [] ) "mono" ] ]
[ Plain [ Code ( "" , [] , [] ) "mono" ] ]
]
]
]
@@ -3697,7 +3697,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "1,"
@@ -3712,7 +3712,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "2,"
@@ -3727,7 +3727,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Column"
, Space
, Str "3,"
@@ -3745,7 +3745,7 @@ Pandoc
AlignDefault
(RowSpan 2)
(ColSpan 2)
[ Para
[ Plain
[ Str "This"
, Space
, Str "cell"
@@ -3768,7 +3768,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -3790,7 +3790,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -3812,7 +3812,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 3)
[ Para
[ Plain
[ Str "Cell"
, Space
, Str "in"
@@ -3850,19 +3850,19 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Artist" ] ]
[ Plain [ Str "Artist" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Track" ] ]
[ Plain [ Str "Track" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Genre" ] ]
[ Plain [ Str "Genre" ] ]
]
])
[ TableBody
@@ -3876,19 +3876,19 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Baauer" ] ]
[ Plain [ Str "Baauer" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Harlem" , Space , Str "Shake" ] ]
[ Plain [ Str "Harlem" , Space , Str "Shake" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Hip" , Space , Str "Hop" ] ]
[ Plain [ Str "Hip" , Space , Str "Hop" ] ]
]
, Row
( "" , [] , [] )
@@ -3897,19 +3897,19 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "The" , Space , Str "Lumineers" ] ]
[ Plain [ Str "The" , Space , Str "Lumineers" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Ho" , Space , Str "Hey" ] ]
[ Plain [ Str "Ho" , Space , Str "Hey" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Folk" , Space , Str "Rock" ] ]
[ Plain [ Str "Folk" , Space , Str "Rock" ] ]
]
]
]
@@ -3934,19 +3934,19 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Artist" ] ]
[ Plain [ Str "Artist" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Track" ] ]
[ Plain [ Str "Track" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Genre" ] ]
[ Plain [ Str "Genre" ] ]
]
, Row
( "" , [] , [] )
@@ -3955,19 +3955,19 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Baauer" ] ]
[ Plain [ Str "Baauer" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Harlem" , Space , Str "Shake" ] ]
[ Plain [ Str "Harlem" , Space , Str "Shake" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Hip" , Space , Str "Hop" ] ]
[ Plain [ Str "Hip" , Space , Str "Hop" ] ]
]
]
]
@@ -3995,19 +3995,19 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "a" ] ]
[ Plain [ Str "a" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "b" ] ]
[ Plain [ Str "b" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "c" ] ]
[ Plain [ Str "c" ] ]
]
, Row
( "" , [] , [] )
@@ -4016,19 +4016,19 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "d" ] ]
[ Plain [ Str "d" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "e" ] ]
[ Plain [ Str "e" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "f" ] ]
[ Plain [ Str "f" ] ]
]
]
]
@@ -4053,19 +4053,19 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Artist" ] ]
[ Plain [ Str "Artist" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Track" ] ]
[ Plain [ Str "Track" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Genre" ] ]
[ Plain [ Str "Genre" ] ]
]
, Row
( "" , [] , [] )
@@ -4074,19 +4074,19 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Robyn" ] ]
[ Plain [ Str "Robyn" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Indestructible" ] ]
[ Plain [ Str "Indestructible" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Dance" ] ]
[ Plain [ Str "Dance" ] ]
]
]
]
test/command/10390.md
+2 -2
View File
@@ -11,12 +11,12 @@
<caption>Overview of basic table markup</caption>
<thead>
<tr>
<th><p>Key</p></th>
<th>Key</th>
</tr>
</thead>
<tbody>
<tr>
<td><p>Value</p></td>
<td>Value</td>
</tr>
</tbody>
</table>
test/command/10490.md
+16 -16
View File
@@ -18,31 +18,31 @@
<table>
<thead>
<tr>
<th style=""><p>Witness program version</p></th>
<th colspan="4" style=""><p>Hash size</p></th>
<th style="">Witness program version</th>
<th colspan="4" style="">Hash size</th>
</tr>
</thead>
<tbody>
<tr>
<td><p>Mainnet</p></td>
<td><p>Testnet</p></td>
<td><p>Mainnet</p></td>
<td><p>Testnet</p></td>
<td>Mainnet</td>
<td>Testnet</td>
<td>Mainnet</td>
<td>Testnet</td>
<td></td>
</tr>
<tr>
<td><p>0</p></td>
<td><p>p2</p></td>
<td><p>QW</p></td>
<td><p>7Xh</p></td>
<td><p>T7n</p></td>
<td>0</td>
<td>p2</td>
<td>QW</td>
<td>7Xh</td>
<td>T7n</td>
</tr>
<tr>
<td><p>1</p></td>
<td><p>p4</p></td>
<td><p>QY</p></td>
<td><p>7Xq</p></td>
<td><p>T7w</p></td>
<td>1</td>
<td>p4</td>
<td>QY</td>
<td>7Xq</td>
<td>T7w</td>
</tr>
</tbody>
</table>
test/command/1166.md
+6 -6
View File
@@ -24,15 +24,15 @@ col 1 col 2
</thead>
<tbody>
<tr>
<td>1</td>
<td>Second column of row 1.</td>
<td><p>1</p></td>
<td><p>Second column of row 1.</p></td>
</tr>
<tr>
<td>2</td>
<td>Second column of row 2. Second line of paragraph.</td>
<td><p>2</p></td>
<td><p>Second column of row 2. Second line of paragraph.</p></td>
</tr>
<tr>
<td>3</td>
<td><p>3</p></td>
<td><ul>
<li>Second column of row 3.</li>
<li>Second item in bullet list (row 3, column 2).</li>
@@ -40,7 +40,7 @@ col 1 col 2
</tr>
<tr>
<td></td>
<td>Row 4; column 1 will be empty.</td>
<td><p>Row 4; column 1 will be empty.</p></td>
</tr>
</tbody>
</table>
test/command/2606.md
+2 -2
View File
@@ -7,7 +7,7 @@
<table>
<tbody>
<tr>
<td><p>* hello</p></td>
<td>* hello</td>
</tr>
</tbody>
</table>
@@ -41,7 +41,7 @@
<table>
<tbody>
<tr>
<td><p><code>* hello</code></p></td>
<td><code>* hello</code></td>
</tr>
</tbody>
</table>
test/command/2649.md
+15 -15
View File
@@ -32,27 +32,27 @@
<table>
<tbody>
<tr>
<td><p>peildatum Simbase</p></td>
<td><p>november 2005</p></td>
<td colspan="2"><p><strong>uitslagen Flohrgambiet</strong></p></td>
<td>peildatum Simbase</td>
<td>november 2005</td>
<td colspan="2"><strong>uitslagen Flohrgambiet</strong></td>
</tr>
<tr>
<td><p>totaal aantal partijen Simbase</p></td>
<td><p>7.316.773</p></td>
<td><p>wit wint</p></td>
<td><p>53%</p></td>
<td>totaal aantal partijen Simbase</td>
<td>7.316.773</td>
<td>wit wint</td>
<td>53%</td>
</tr>
<tr>
<td><p>percentage (en partijen) Flohrgambiet</p></td>
<td><p>0.023 % (1.699)</p></td>
<td><p>zwart wint</p></td>
<td><p>27%</p></td>
<td>percentage (en partijen) Flohrgambiet</td>
<td>0.023 % (1.699)</td>
<td>zwart wint</td>
<td>27%</td>
</tr>
<tr>
<td><p>percentage Flohrgambiet in aug 2003</p></td>
<td><p>0.035 %</p></td>
<td><p>remise</p></td>
<td><p>20%</p></td>
<td>percentage Flohrgambiet in aug 2003</td>
<td>0.035 %</td>
<td>remise</td>
<td>20%</td>
</tr>
</tbody>
</table>
test/command/6549.md
+3 -3
View File
@@ -9,13 +9,13 @@
<caption>Test table</caption>
<thead>
<tr>
<th>Column1</th>
<th>Column2</th>
<th><p>Column1</p></th>
<th><p>Column2</p></th>
</tr>
</thead>
<tbody>
<tr>
<td>Data1</td>
<td><p>Data1</p></td>
<td><ul>
<li>data1</li>
<li>data2</li>
test/command/6992.md
+5 -5
View File
@@ -23,7 +23,7 @@
AlignDefault
(RowSpan 1)
(ColSpan 4)
[ Para [ Str "template" , Space , Str "request" ] ]
[ Plain [ Str "template" , Space , Str "request" ] ]
]
])
[ TableBody
@@ -37,25 +37,25 @@
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "mode" ] ]
[ Plain [ Str "mode" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "No" ] ]
[ Plain [ Str "No" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "String" ] ]
[ Plain [ Str "String" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "MUST"
, Space
, Str "be"
test/command/8110.md
+9 -9
View File
@@ -19,21 +19,21 @@
<table>
<thead>
<tr>
<th><p>Header text</p></th>
<th><p>Header text</p></th>
<th><p>Header text</p></th>
<th>Header text</th>
<th>Header text</th>
<th>Header text</th>
</tr>
</thead>
<tbody>
<tr>
<td><p>Example</p></td>
<td><p>Example</p></td>
<td><p>Example</p></td>
<td>Example</td>
<td>Example</td>
<td>Example</td>
</tr>
<tr>
<td><p>Example</p></td>
<td><p>Example</p></td>
<td><p>Example</p></td>
<td>Example</td>
<td>Example</td>
<td>Example</td>
</tr>
</tbody>
</table>
test/command/8659.md
+4 -4
View File
@@ -44,10 +44,10 @@ The misaligned pipe in the first row is treated as an empty table.
</thead>
<tbody>
<tr>
<td style="text-align: left;">a</td>
<td>b</td>
<td style="text-align: right;">c</td>
<td style="text-align: right;">d</td>
<td style="text-align: left;"><p>a</p></td>
<td><p>b</p></td>
<td style="text-align: right;"><p>c</p></td>
<td style="text-align: right;"><p>d</p></td>
</tr>
</tbody>
</table>
test/docx/golden/table_with_list_cell.docx
BIN
View File
Binary file not shown.
test/docx/table_with_list_cell.native
+2 -2
View File
@@ -13,7 +13,7 @@
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Plain
[ Para
[ Str "Cell"
, Space
, Str "with"
@@ -26,7 +26,7 @@
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Plain
[ Para
[ Str "Cell"
, Space
, Str "with"
test/markdown-reader-more.native
+1 -1
View File
@@ -1069,7 +1069,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Plain
[ Para
[ Str "c"
, SoftBreak
, Str "c"
test/mediawiki-reader.native
+39 -39
View File
@@ -864,13 +864,13 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Orange" ] ]
[ Plain [ Str "Orange" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Apple" ] ]
[ Plain [ Str "Apple" ] ]
]
, Row
( "" , [] , [] )
@@ -879,13 +879,13 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Bread" ] ]
[ Plain [ Str "Bread" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Pie" ] ]
[ Plain [ Str "Pie" ] ]
]
, Row
( "" , [] , [] )
@@ -894,13 +894,13 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Butter" ] ]
[ Plain [ Str "Butter" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Ice" , Space , Str "cream" ] ]
[ Plain [ Str "Ice" , Space , Str "cream" ] ]
]
]
]
@@ -922,13 +922,13 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Orange" ] ]
[ Plain [ Str "Orange" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Apple" ] ]
[ Plain [ Str "Apple" ] ]
]
])
[ TableBody
@@ -942,13 +942,13 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Bread" ] ]
[ Plain [ Str "Bread" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Pie" ] ]
[ Plain [ Str "Pie" ] ]
]
, Row
( "" , [] , [] )
@@ -957,13 +957,13 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Butter" ] ]
[ Plain [ Str "Butter" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Ice" , Space , Str "cream" ] ]
[ Plain [ Str "Ice" , Space , Str "cream" ] ]
]
]
]
@@ -1043,19 +1043,19 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Orange" ] ]
[ Plain [ Str "Orange" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Apple" ] ]
[ Plain [ Str "Apple" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "more" ] ]
[ Plain [ Str "more" ] ]
]
, Row
( "" , [] , [] )
@@ -1064,19 +1064,19 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Bread" ] ]
[ Plain [ Str "Bread" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Pie" ] ]
[ Plain [ Str "Pie" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "more" ] ]
[ Plain [ Str "more" ] ]
]
, Row
( "" , [] , [] )
@@ -1085,19 +1085,19 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Butter" ] ]
[ Plain [ Str "Butter" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Ice" , Space , Str "cream" ] ]
[ Plain [ Str "Ice" , Space , Str "cream" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "and" , Space , Str "more" ] ]
[ Plain [ Str "and" , Space , Str "more" ] ]
]
]
]
@@ -1118,19 +1118,19 @@ Pandoc
AlignLeft
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Left" ] ]
[ Plain [ Str "Left" ] ]
, Cell
( "" , [] , [] )
AlignRight
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Right" ] ]
[ Plain [ Str "Right" ] ]
, Cell
( "" , [] , [] )
AlignCenter
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Center" ] ]
[ Plain [ Str "Center" ] ]
]
])
[ TableBody
@@ -1144,19 +1144,19 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "left" ] ]
[ Plain [ Str "left" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "15.00" ] ]
[ Plain [ Str "15.00" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "centered" ] ]
[ Plain [ Str "centered" ] ]
]
, Row
( "" , [] , [] )
@@ -1165,19 +1165,19 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "more" ] ]
[ Plain [ Str "more" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "2.0" ] ]
[ Plain [ Str "2.0" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "more" ] ]
[ Plain [ Str "more" ] ]
]
]
]
@@ -1236,13 +1236,13 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "fruit" ] ]
[ Plain [ Str "fruit" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "topping" ] ]
[ Plain [ Str "topping" ] ]
]
])
[ TableBody
@@ -1256,13 +1256,13 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "apple" ] ]
[ Plain [ Str "apple" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para
[ Plain
[ Str "ice"
, Space
, Str "cream"
@@ -1308,7 +1308,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "Orange" ] ]
[ Plain [ Str "Orange" ] ]
]
]
]
@@ -1337,13 +1337,13 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "fruit" ] ]
[ Plain [ Str "fruit" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "topping" ] ]
[ Plain [ Str "topping" ] ]
]
])
[ TableBody
@@ -1357,13 +1357,13 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "apple" ] ]
[ Plain [ Str "apple" ] ]
, Cell
( "" , [] , [] )
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Para [ Str "ice" , Space , Str "cream" ] ]
[ Plain [ Str "ice" , Space , Str "cream" ] ]
]
]
]
test/rst-reader.native
+1 -1
View File
@@ -1458,7 +1458,7 @@ Pandoc
AlignDefault
(RowSpan 1)
(ColSpan 1)
[ Plain
[ Para
[ Str "c"
, SoftBreak
, Str "c"
test/typst-reader.native
+195 -195
View File
File diff suppressed because it is too large Load Diff