diff options
| -rw-r--r-- | src/Tests/Old.hs | 2 | ||||
| -rw-r--r-- | src/Text/Pandoc/Parsing.hs | 98 | ||||
| -rw-r--r-- | src/Text/Pandoc/Readers/Markdown.hs | 5 | ||||
| -rw-r--r-- | tests/markdown-tables.native | 60 | ||||
| -rw-r--r-- | tests/markdown-tables.txt | 34 |
5 files changed, 198 insertions, 1 deletions
diff --git a/src/Tests/Old.hs b/src/Tests/Old.hs index 30537c6ff..3315bb74e 100644 --- a/src/Tests/Old.hs +++ b/src/Tests/Old.hs @@ -56,6 +56,8 @@ tests = [ testGroup "markdown" "testsuite.txt" "testsuite.native" , test "tables" ["-r", "markdown", "-w", "native", "--columns=80"] "tables.txt" "tables.native" + , test "extratables" ["-r", "markdown", "-w", "native", "--columns=80"] + "markdown-tables.txt" "markdown-tables.native" , test "more" ["-r", "markdown", "-w", "native", "-S"] "markdown-reader-more.txt" "markdown-reader-more.native" , lhsReaderTest "markdown+lhs" diff --git a/src/Text/Pandoc/Parsing.hs b/src/Text/Pandoc/Parsing.hs index bea38e633..61c47b730 100644 --- a/src/Text/Pandoc/Parsing.hs +++ b/src/Text/Pandoc/Parsing.hs @@ -57,6 +57,7 @@ module Text.Pandoc.Parsing ( (>>~), orderedListMarker, charRef, tableWith, + extraTableWith, gridTableWith, readWith, testStringWith, @@ -542,7 +543,9 @@ tableWith headerParser rowParser lineParser footerParser captionParser = try $ d else return caption' state <- getState let numColumns = stateColumns state - let widths = widthsFromIndices numColumns indices + let widths = if (indices == []) + then replicate (length aligns) 0.0 + else widthsFromIndices numColumns indices return $ Table caption aligns widths heads lines' -- Calculate relative widths of table columns, based on indices @@ -570,6 +573,99 @@ widthsFromIndices numColumns' indices = fracs = map (\l -> (fromIntegral l) / quotient) lengths in tail fracs + +-- Parse an extra table (php-markdown): each line starts and ends with '|', +-- with a mandatory line of '--' to separate the (optionnal) headers from content. +extraTableWith :: GenParser Char ParserState Block -- ^ Block parser + -> GenParser Char ParserState [Inline] -- ^ Caption parser + -> Bool -- ^ Headerless table + -> GenParser Char ParserState Block +extraTableWith block tableCaption headless = + tableWith (extraTableHeader headless block) (extraTableRow block) (extraTableSep '-') extraTableFooter tableCaption + +-- | Parse header for an extra table. +extraTableHeader :: Bool -- ^ Headerless table + -> GenParser Char ParserState Block + -> GenParser Char ParserState ([[Block]], [Alignment], [Int]) +extraTableHeader headless block = try $ do + optional blanklines + rawContent <- if headless + then return $ repeat "" + else many1 + (notFollowedBy (extraTableHeaderSep) >> char '|' >> + many1Till anyChar newline) + aligns <- extraTableHeaderDashedLine + let indices = [] + let rawHeads = if headless + then replicate (length aligns) "" + else map (intercalate " ") $ transpose + $ map (extraTableSplitLine ) + $ map (trimOnceBy '|') rawContent + heads <- mapM (parseFromString $ many block) $ + map removeLeadingTrailingSpace rawHeads + return (heads, aligns, indices) + +extraTableHeaderPart :: GenParser Char st Alignment +extraTableHeaderPart = do + left <- optionMaybe (char ':') + many1 (char '-') + right <- optionMaybe (char ':') + char '|' + return $ + case (left,right) of + (Nothing,Nothing) -> AlignDefault + (Just _,Nothing) -> AlignLeft + (Nothing,Just _) -> AlignRight + (Just _,Just _) -> AlignCenter + +extraTableHeaderDashedLine :: GenParser Char st [Alignment] +extraTableHeaderDashedLine = try $ char '|' >> many1 (extraTableHeaderPart) >>~ blankline + +extraTableHeaderSep :: GenParser Char ParserState Char +extraTableHeaderSep = try $ extraTableHeaderDashedLine >> return '\n' + +-- | Split a header or data line in an extra table. +-- | The line must contain only *inside* separators. +extraTableSplitLine :: String -> [String] +extraTableSplitLine line = map removeLeadingSpace $ + splitBy (== '|') $ removeTrailingSpace line + +-- Remove, if present, a character from both ends of a string +trimOnceBy :: Char -> String -> String +trimOnceBy ch s = + if (head s == ch) && (last s == ch) + then init $ tail s + else s +trimEndOnceBy :: Char -> String -> String +trimEndOnceBy ch s = + if (last s == ch) + then init s + else s + +-- | Parse row of an extra table. +extraTableRow :: GenParser Char ParserState Block + -> [Int] + -> GenParser Char ParserState [[Block]] +extraTableRow block indices = do + cols <- extraTableRawLine + mapM (liftM compactifyCell . parseFromString (many block)) cols + +extraTableRawLine :: GenParser Char ParserState [String] +extraTableRawLine = do + char '|' + line <- many1Till anyChar newline + return (extraTableSplitLine $ trimEndOnceBy '|' line) + +-- | Separator between rows of an extra table. +extraTableSep :: Char -> GenParser Char ParserState Char +extraTableSep ch = do return '\n' + +-- | Parse footer for an extra table. +extraTableFooter :: GenParser Char ParserState [Char] +extraTableFooter = blanklines + +--- + -- Parse a grid table: starts with row of '-' on top, then header -- (which may be grid), then the rows, -- which may be grid, separated by blank lines, and diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs index faa1e3145..34a6cf7ce 100644 --- a/src/Text/Pandoc/Readers/Markdown.hs +++ b/src/Text/Pandoc/Readers/Markdown.hs @@ -901,6 +901,10 @@ alignType strLst len = (True, True) -> AlignCenter (False, False) -> AlignDefault +extraTable :: Bool -- ^ Headerless table + -> GenParser Char ParserState Block +extraTable = extraTableWith block tableCaption + gridTable :: Bool -- ^ Headerless table -> Parser [Char] ParserState Block gridTable = gridTableWith block tableCaption @@ -908,6 +912,7 @@ gridTable = gridTableWith block tableCaption table :: Parser [Char] ParserState Block table = multilineTable False <|> simpleTable True <|> simpleTable False <|> multilineTable True <|> + extraTable False <|> extraTable True <|> gridTable False <|> gridTable True <?> "table" -- diff --git a/tests/markdown-tables.native b/tests/markdown-tables.native new file mode 100644 index 000000000..f9580a8cb --- /dev/null +++ b/tests/markdown-tables.native @@ -0,0 +1,60 @@ +[Para [Str "Simplest",Space,Str "table",Space,Str "without",Space,Str "caption",Str ":"] +,Table [] [AlignDefault,AlignDefault,AlignDefault] [0.0,0.0,0.0] + [[Plain [Str "Default1"]] + ,[Plain [Str "Default2"]] + ,[Plain [Str "Default3"]]] + [[[Plain [Str "12"]] + ,[Plain [Str "12"]] + ,[Plain [Str "12"]]] + ,[[Plain [Str "123"]] + ,[Plain [Str "123"]] + ,[Plain [Str "123"]]] + ,[[Plain [Str "1"]] + ,[Plain [Str "1"]] + ,[Plain [Str "1"]]]] +,Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption",Str ":"] +,Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax",Str "."] [AlignRight,AlignLeft,AlignDefault,AlignCenter] [0.0,0.0,0.0,0.0] + [[Plain [Str "Right"]] + ,[Plain [Str "Left"]] + ,[Plain [Str "Default"]] + ,[Plain [Str "Center"]]] + [[[Plain [Str "12"]] + ,[Plain [Str "12"]] + ,[Plain [Str "12"]] + ,[Plain [Str "12"]]] + ,[[Plain [Str "123"]] + ,[Plain [Str "123"]] + ,[Plain [Str "123"]] + ,[Plain [Str "123"]]] + ,[[Plain [Str "1"]] + ,[Plain [Str "1"]] + ,[Plain [Str "1"]] + ,[Plain [Str "1"]]]] +,Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption",Str ":"] +,Table [] [AlignRight,AlignLeft,AlignCenter] [0.0,0.0,0.0] + [[Plain [Str "Right"]] + ,[Plain [Str "Left"]] + ,[Plain [Str "Center"]]] + [[[Plain [Str "12"]] + ,[Plain [Str "12"]] + ,[Plain [Str "12"]]] + ,[[Plain [Str "123"]] + ,[Plain [Str "123"]] + ,[Plain [Str "123"]]] + ,[[Plain [Str "1"]] + ,[Plain [Str "1"]] + ,[Plain [Str "1"]]]] +,Para [Str "Headerless",Space,Str "table",Space,Str "without",Space,Str "caption",Str ":"] +,Table [] [AlignRight,AlignLeft,AlignCenter] [0.0,0.0,0.0] + [[] + ,[] + ,[]] + [[[Plain [Str "12"]] + ,[Plain [Str "12"]] + ,[Plain [Str "12"]]] + ,[[Plain [Str "123"]] + ,[Plain [Str "123"]] + ,[Plain [Str "123"]]] + ,[[Plain [Str "1"]] + ,[Plain [Str "1"]] + ,[Plain [Str "1"]]]]] diff --git a/tests/markdown-tables.txt b/tests/markdown-tables.txt new file mode 100644 index 000000000..69a18113b --- /dev/null +++ b/tests/markdown-tables.txt @@ -0,0 +1,34 @@ +Simplest table without caption: + +| Default1 | Default2 | Default3 | +|----------|----------|----------| +|12|12|12| +|123|123|123| +|1|1|1| + +Simple table with caption: + +| Right | Left | Default | Center | +|------:|:-----|---------|:------:| +| 12 | 12 | 12 | 12 | +| 123 | 123 | 123 | 123 | +| 1 | 1 | 1 | 1 | + + : Demonstration of simple table syntax. + +Simple table without caption: + +| Right | Left | Center | +|------:|:-----|:------:| +|12|12|12| +|123|123|123| +|1|1|1| + + +Headerless table without caption: + +|------:|:-----|:------:| +|12|12|12| +|123|123|123| +|1|1|1| + |