ff93a8e · typeable/pandoc

git.iko.soy/typeable/pandoc

Fixed table parsing with wide or combining characters.

Closes #348. Closes #108.

commitff93a8e7891d8537c713d6d1b0fd4409c5e43ebe authorJohn MacFarlane <fiddlosopher@gmail.com> dateFri 27 Jan 2012, 00:39 (15 years ago) parent4321e27

2 files changed+5−5

compare with master

unifiedsplit

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

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

@@ -502,7 +502,7 @@ gridTableWith block tableCaption headless =

502502

503503gridTableSplitLine :: [Int] -> String -> [String]

504504gridTableSplitLine indices line = map removeFinalBar $ tail $

505− splitByIndices (init indices) $ removeTrailingSpace line

505+ splitStringByIndices (init indices) $ removeTrailingSpace line

506506

507507gridPart :: Char -> GenParser Char st (Int, Int)

508508gridPart ch = do

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

@@ -773,7 +773,7 @@ simpleTableHeader headless = try $ do

773773 let (lengths, lines') = unzip dashes

774774 let indices = scanl (+) (length initSp) lines'

775775 -- If no header, calculate alignment on basis of first row of text

776− rawHeads <- liftM (tail . splitByIndices (init indices)) $

776+ rawHeads <- liftM (tail . splitStringByIndices (init indices)) $

777777 if headless

778778 then lookAhead anyLine

779779 else return rawContent

@@ -800,7 +800,7 @@ rawTableLine indices = do

800800 notFollowedBy' (blanklines <|> tableFooter)

801801 line <- many1Till anyChar newline

802802 return $ map removeLeadingTrailingSpace $ tail $

803− splitByIndices (init indices) line

803+ splitStringByIndices (init indices) line

804804

805805-- Parse a table line and return a list of lists of blocks (columns).

806806tableLine :: [Int]

@@ -862,9 +862,9 @@ multilineTableHeader headless = try $ do

862862 let indices = scanl (+) (length initSp) lines'

863863 rawHeadsList <- if headless

864864 then liftM (map (:[]) . tail .

865− splitByIndices (init indices)) $ lookAhead anyLine

865+ splitStringByIndices (init indices)) $ lookAhead anyLine

866866 else return $ transpose $ map

867− (\ln -> tail $ splitByIndices (init indices) ln)

867+ (\ln -> tail $ splitStringByIndices (init indices) ln)

868868 rawContent

869869 let aligns = zipWith alignType rawHeadsList lengths

870870 let rawHeads = if headless