git.iko.soy/typeable/pandoc
on master help sign in
Muse reader: add grid tables support
commitc61b67410ac9f30786dd8e5c73cf2a7bbdbcd02c authorAlexander Krotov <ilabdsf@gmail.com> dateFri 9 Nov 2018, 14:19 (8 years ago) parent195b3af
2 files changed+74−2
src/Text/Pandoc/Readers/Muse.hs+31−2 test/Tests/Readers/Muse.hs+43
src/Text/Pandoc/Readers/Muse.hs+31−2
@@ -32,8 +32,6 @@ Conversion of Muse text to 'Pandoc' document.
3232-}
3333{-
3434TODO:
35−- Org tables
36−- table.el tables
3735- <cite> tag
3836-}
3937module Text.Pandoc.Readers.Muse (readMuse) where
@@ -335,6 +333,7 @@ blockElements = (mempty <$ blankline)
335333 <|> playTag
336334 <|> verseTag
337335 <|> lineBlock
336+ <|> museGridTable
338337 <|> table
339338 <|> commentTag
340339
@@ -681,6 +680,36 @@ elementsToTable :: [MuseTableElement] -> MuseTable
681680elementsToTable = foldr museAppendElement emptyTable
682681 where emptyTable = MuseTable mempty mempty mempty mempty
683682
683+museGridPart :: PandocMonad m => MuseParser m Int
684+museGridPart = try $ length <$> many1 (char '-') <* char '+'
685+
686+museGridTableHeader :: PandocMonad m => MuseParser m [Int]
687+museGridTableHeader = try $ char '+' *> many1 museGridPart <* manyTill spaceChar eol
688+
689+museGridTableRow :: PandocMonad m
690+ => Int
691+ -> [Int]
692+ -> MuseParser m (F [Blocks])
693+museGridTableRow indent indices = try $ do
694+ lns <- many1 $ try (indentWith indent *> museGridTableRawLine indices)
695+ let cols = map unlines $ transpose lns
696+ indentWith indent *> museGridTableHeader
697+ sequence <$> mapM (parseFromString parseBlocks) cols
698+
699+museGridTableRawLine :: PandocMonad m
700+ => [Int]
701+ -> MuseParser m [String]
702+museGridTableRawLine indices =
703+ char '|' *> forM indices (\n -> count n anyChar <* char '|') <* manyTill spaceChar eol
704+
705+museGridTable :: PandocMonad m => MuseParser m (F Blocks)
706+museGridTable = try $ do
707+ indent <- getIndent
708+ indices <- museGridTableHeader
709+ fmap rowsToTable . sequence <$> many1 (museGridTableRow indent indices)
710+ where rowsToTable rows = B.table mempty attrs [] rows
711+ where attrs = const (AlignDefault, 0.0) <$> transpose rows
712+
684713-- | Parse a table.
685714table :: PandocMonad m => MuseParser m (F Blocks)
686715table = try $ fmap (museToPandocTable . elementsToTable) <$> tableElements
test/Tests/Readers/Muse.hs+43
@@ -976,6 +976,49 @@ tests =
976976 [[plain "1", plain "2", plain "3"],
977977 [plain "4", mempty, plain "6"],
978978 [plain "7", plain "8", plain "9"]]
979+ , "Grid table" =:
980+ T.unlines
981+ [ "+-----+-----+"
982+ , "| foo | bar |"
983+ , "+-----+-----+"
984+ ] =?>
985+ table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]
986+ []
987+ [[para "foo", para "bar"]]
988+ , "Grid table inside list" =:
989+ T.unlines
990+ [ " - +-----+-----+"
991+ , " | foo | bar |"
992+ , " +-----+-----+"
993+ ] =?>
994+ bulletList [table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]
995+ []
996+ [[para "foo", para "bar"]]]
997+ , "Grid table with two rows" =:
998+ T.unlines
999+ [ "+-----+-----+"
1000+ , "| foo | bar |"
1001+ , "+-----+-----+"
1002+ , "| bat | baz |"
1003+ , "+-----+-----+"
1004+ ] =?>
1005+ table mempty [(AlignDefault, 0.0), (AlignDefault, 0.0)]
1006+ []
1007+ [[para "foo", para "bar"]
1008+ ,[para "bat", para "baz"]]
1009+ , "Grid table inside grid table" =:
1010+ T.unlines
1011+ [ "+-----+"
1012+ , "|+---+|"
1013+ , "||foo||"
1014+ , "|+---+|"
1015+ , "+-----+"
1016+ ] =?>
1017+ table mempty [(AlignDefault, 0.0)]
1018+ []
1019+ [[table mempty [(AlignDefault, 0.0)]
1020+ []
1021+ [[para "foo"]]]]
9791022 ]
9801023 , testGroup "Lists"
9811024 [ "Bullet list" =: