5a1796e · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

LaTeX reader: improved parsing of tables.

5a1796eJohn MacFarlane10 years ago

src/Text/Pandoc/Readers/LaTeX.hs+13−5

compare with master

unifiedsplit

@@ -1088,7 +1088,7 @@ environments = M.fromList

1088 resetCaption *> skipopts *> blocks >>= addImageCaption)

1089 , ("center", env "center" blocks)

1090 , ("longtable", env "longtable" $

1091− resetCaption *> skipopts *> blocks >>= addTableCaption)

1091+ resetCaption *> simpTable False >>= addTableCaption)

1092 , ("table", env "table" $

1093 resetCaption *> skipopts *> blocks >>= addTableCaption)

1094 , ("tabular*", env "tabular" $ simpTable True)

@@ -1374,7 +1374,9 @@ hline = try $ do

1374 return ()

1375

1376lbreak :: LP ()

1377−lbreak = () <$ try (spaces' *> controlSeq "\\" <* spaces')

1377+lbreak = () <$ try (spaces' *>

1378+ (controlSeq "\\" <|> controlSeq "tabularnewline") <*

1379+ spaces')

1378

1380

1379amp :: LP ()

1381amp :: LP ()

1380amp = () <$ try (spaces' *> char '&')

1382amp = () <$ try (spaces' *> char '&')

@@ -1402,9 +1404,15 @@ simpTable hasWidthParameter = try $ do

1402 skipopts

1404 skipopts

1403 aligns <- parseAligns

1405 aligns <- parseAligns

1404 let cols = length aligns

1406 let cols = length aligns

1405− optional hline

1407+ optional $ controlSeq "caption" *> skipopts *> setCaption

1408+ optional lbreak

1409+ spaces'

1410+ skipMany hline

1406− header' <- option [] $ try (parseTableRow cols <* lbreak <* hline)

1411+ header' <- option [] $ try (parseTableRow cols <* lbreak <* many1 hline)

1407− rows <- sepEndBy (parseTableRow cols) (lbreak <* optional hline)

1412+ rows <- sepEndBy (parseTableRow cols) (lbreak <* optional (skipMany hline))

1413+ spaces'

1414+ optional $ controlSeq "caption" *> skipopts *> setCaption

1415+ optional lbreak

1408 spaces'

1416 spaces'

1409 let header'' = if null header'

1417 let header'' = if null header'

1410 then replicate cols mempty

1418 then replicate cols mempty