git.iko.soy/typeable/pandoc
on master help sign in
LaTeX reader: allow non-empty colsep in tables
12bf0ffMathias Schenner
src/Text/Pandoc/Readers/LaTeX.hs+1−1
compare with master
unifiedsplit
@@ -1275,7 +1275,7 @@ complexNatbibCitation mode = try $ do
1275parseAligns :: LP [Alignment]
1275parseAligns :: LP [Alignment]
1276parseAligns = try $ do
1276parseAligns = try $ do
1277 char '{'
1277 char '{'
1278− let maybeBar = skipMany $ sp <|> () <$ char '|' <|> () <$ try (string "@{}")
1278+ let maybeBar = skipMany $ sp <|> () <$ char '|' <|> () <$ (char '@' >> braced)
1279 maybeBar
1279 maybeBar
1280 let cAlign = AlignCenter <$ char 'c'
1280 let cAlign = AlignCenter <$ char 'c'
1281 let lAlign = AlignLeft <$ char 'l'
1281 let lAlign = AlignLeft <$ char 'l'
tests/Tests/Readers/LaTeX.hs+5
@@ -91,6 +91,11 @@ tests = [ testGroup "basic"
91 , "Table with empty column separators" =:
91 , "Table with empty column separators" =:
92 "\\begin{tabular}{@{}r@{}l}One & Two\\\\ \\end{tabular}" =?>
92 "\\begin{tabular}{@{}r@{}l}One & Two\\\\ \\end{tabular}" =?>
93 simpleTable' [AlignRight,AlignLeft] [[plain "One", plain "Two"]]
93 simpleTable' [AlignRight,AlignLeft] [[plain "One", plain "Two"]]
94+ , "Table with custom column separators" =:
95+ unlines [ "\\begin{tabular}{@{($\\to$)}r@{\\hspace{2cm}}l}"
96+ , "One&Two\\\\"
97+ , "\\end{tabular}" ] =?>
98+ simpleTable' [AlignRight,AlignLeft] [[plain "One", plain "Two"]]
94 , "Table with vertical alignment argument" =:
99 , "Table with vertical alignment argument" =:
95 "\\begin{tabular}[t]{r|r}One & Two\\\\ \\end{tabular}" =?>
100 "\\begin{tabular}[t]{r|r}One & Two\\\\ \\end{tabular}" =?>
96 simpleTable' [AlignRight,AlignRight] [[plain "One", plain "Two"]]
101 simpleTable' [AlignRight,AlignRight] [[plain "One", plain "Two"]]