Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

LaTeX reader: Add support for tabularx environment (#3632)

Browse source
This commit is contained in:
schrieveslaach 2017-05-03 12:16:48 +02:00 • committed by John MacFarlane
parent e02cfcdeac
commit 6e55e6837a
2 changed files with 116 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Text/Pandoc/Readers/LaTeX.hs
View file

@ -1156,6 +1156,7 @@ environments = M.fromList
, ("table", env "table" $
resetCaption *> skipopts *> blocks >>= addTableCaption)
, ("tabular*", env "tabular" $ simpTable True)
, ("tabularx", env "tabularx" $ simpTable True)
, ("tabular", env "tabular" $ simpTable False)
, ("quote", blockQuote <$> env "quote" blocks)
, ("quotation", blockQuote <$> env "quotation" blocks)
@ -1414,7 +1415,11 @@ parseAligns = try $ do
let lAlign = AlignLeft <$ char 'l'
let rAlign = AlignRight <$ char 'r'
let parAlign = AlignLeft <$ (char 'p' >> braced)
let alignChar = cAlign <|> lAlign <|> rAlign <|> parAlign
-- algins from tabularx
let xAlign = AlignLeft <$ char 'X'
let mAlign = AlignLeft <$ (char 'm' >> braced)
let bAlign = AlignLeft <$ (char 'b' >> braced)
let alignChar = cAlign <|> lAlign <|> rAlign <|> parAlign <|> xAlign <|> mAlign <|> bAlign
let alignPrefix = char '>' >> braced
let alignSuffix = char '<' >> braced
let alignSpec = do

110
test/command/tabularx.md Normal file
View file

@ -0,0 +1,110 @@
```
% pandoc -f latex -t native
\begin{tabularx}{\linewidth}{|c|c|c|}
\hline
Column Heading 1
& Column Heading 2
& Column Heading 3 \\
\hline
Cell 1.1
& Cell 1.2
& Cell 1.3 \\
\hline
Cell 2.1
& Cell 2.2
& Cell 2.3 \\
\hline
Cell 3.1
& Cell 3.2
& Cell 3.3 \\
\hline
\end{tabularx}
^D
[Table [] [AlignCenter,AlignCenter,AlignCenter] [0.0,0.0,0.0]
[[Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]
,[Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]
,[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]
[[[Plain [Str "Cell",Space,Str "1.1"]]
,[Plain [Str "Cell",Space,Str "1.2"]]
,[Plain [Str "Cell",Space,Str "1.3"]]]
,[[Plain [Str "Cell",Space,Str "2.1"]]
,[Plain [Str "Cell",Space,Str "2.2"]]
,[Plain [Str "Cell",Space,Str "2.3"]]]
,[[Plain [Str "Cell",Space,Str "3.1"]]
,[Plain [Str "Cell",Space,Str "3.2"]]
,[Plain [Str "Cell",Space,Str "3.3"]]]]]
```
```
% pandoc -f latex -t native
\begin{tabularx}{\linewidth}{|X|c|p{0.25\linewidth}|}
\hline
Column Heading 1
& Column Heading 2
& Column Heading 3 \\
\hline
Cell 1.1
& Cell 1.2
& Cell 1.3 \\
\hline
Cell 2.1
& Cell 2.2
& Cell 2.3 \\
\hline
Cell 3.1
& Cell 3.2
& Cell 3.3 \\
\hline
\end{tabularx}
^D
[Table [] [AlignLeft,AlignCenter,AlignLeft] [0.0,0.0,0.0]
[[Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]
,[Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]
,[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]
[[[Plain [Str "Cell",Space,Str "1.1"]]
,[Plain [Str "Cell",Space,Str "1.2"]]
,[Plain [Str "Cell",Space,Str "1.3"]]]
,[[Plain [Str "Cell",Space,Str "2.1"]]
,[Plain [Str "Cell",Space,Str "2.2"]]
,[Plain [Str "Cell",Space,Str "2.3"]]]
,[[Plain [Str "Cell",Space,Str "3.1"]]
,[Plain [Str "Cell",Space,Str "3.2"]]
,[Plain [Str "Cell",Space,Str "3.3"]]]]]
```
```
% pandoc -f latex -t native
\begin{tabularx}{\linewidth}{|b{0.25\linewidth}|c|m{0.25\linewidth}|}
\hline
Column Heading 1
& Column Heading 2
& Column Heading 3 \\
\hline
Cell 1.1
& Cell 1.2
& Cell 1.3 \\
\hline
Cell 2.1
& Cell 2.2
& Cell 2.3 \\
\hline
Cell 3.1
& Cell 3.2
& Cell 3.3 \\
\hline
\end{tabularx}
^D
[Table [] [AlignLeft,AlignCenter,AlignLeft] [0.0,0.0,0.0]
[[Plain [Str "Column",Space,Str "Heading",Space,Str "1"]]
,[Plain [Str "Column",Space,Str "Heading",Space,Str "2"]]
,[Plain [Str "Column",Space,Str "Heading",Space,Str "3"]]]
[[[Plain [Str "Cell",Space,Str "1.1"]]
,[Plain [Str "Cell",Space,Str "1.2"]]
,[Plain [Str "Cell",Space,Str "1.3"]]]
,[[Plain [Str "Cell",Space,Str "2.1"]]
,[Plain [Str "Cell",Space,Str "2.2"]]
,[Plain [Str "Cell",Space,Str "2.3"]]]
,[[Plain [Str "Cell",Space,Str "3.1"]]
,[Plain [Str "Cell",Space,Str "3.2"]]
,[Plain [Str "Cell",Space,Str "3.3"]]]]]
```