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

Better looking simple tables. Resolves Issue #180.

Browse source 
* Markdown reader: simple tables are now given column widths of 0.

* Column width of 0 is interpreted as meaning: use default column width.

* Writers now include explicit column width information only
  for multiline tables.  (Exception:  RTF writer, which requires
  column widths.  In this case, columns are given equal widths,
  adding up to the text width.)

* Simple tables should now look better in most output formats.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1631 788f1e2b-df1e-0410-8736-df70ead52e1b
This commit is contained in:
fiddlosopher 2009-11-28 03:22:33 +00:00
parent 7c6467a115
commit 98ff6b2fd0
23 changed files with 214 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
README
View file

@ -664,11 +664,11 @@ a fixed-width font, such as Courier.
Simple tables look like this:
Right Left Center Default
------- ------ ---------- -------
12 12 12 12
123 123 123 123
1 1 1 1
Right Left Center Default
------- ------ ---------- -------
12 12 12 12
123 123 123 123
1 1 1 1
Table: Demonstration of simple table syntax.
@ -692,11 +692,6 @@ The table must end with a blank line. Optionally, a caption may be
provided (as illustrated in the example above). A caption is a paragraph
beginning with the string `Table:`, which will be stripped off.
The table parser pays attention to the widths of the columns, and
the writers try to reproduce these relative widths in the output.
So, if you find that one of the columns is too narrow in the output,
try widening it in the markdown source.
Multiline tables allow headers and table rows to span multiple lines
of text. Here is an example:
@ -706,12 +701,12 @@ of text. Here is an example:
----------- ------- --------------- -------------------------
First row 12.0 Example of a row that
spans multiple lines.
Second row 5.0 Here's another one. Note
the blank line between
rows.
-------------------------------------------------------------
Table: Here's the caption. It, too, may span
multiple lines.
@ -719,7 +714,12 @@ These work like simple tables, but with the following differences:
- They must begin with a row of dashes, before the header text.
- They must end with a row of dashes, then a blank line.
- The rows must be separated by blank lines.
- The rows must be separated by blank lines.
In multiline tables, the table parser pays attention to the widths of
the columns, and the writers try to reproduce these relative widths in
the output. So, if you find that one of the columns is too narrow in the
output, try widening it in the markdown source.
Delimited Code blocks
---------------------

6
src/Text/Pandoc/Definition.hs
View file

@ -86,9 +86,9 @@ data Block
| HorizontalRule -- ^ Horizontal rule
| Table [Inline] [Alignment] [Double] [[Block]] [[[Block]]] -- ^ Table,
-- with caption, column alignments,
-- relative column widths, column headers
-- (each a list of blocks), and rows
-- (each a list of lists of blocks)
-- relative column widths (0 = default),
-- column headers (each a list of blocks), and
-- rows (each a list of lists of blocks)
| Null -- ^ Nothing
deriving (Eq, Read, Show, Typeable, Data)

5
src/Text/Pandoc/Readers/Markdown.hs
View file

@ -761,7 +761,10 @@ tableWith headerParser lineParser footerParser = try $ do
-- Parse a simple table with '---' header and one line per row.
simpleTable :: GenParser Char ParserState Block
simpleTable = tableWith simpleTableHeader tableLine blanklines
simpleTable = do
Table c a _w h l <- tableWith simpleTableHeader tableLine blanklines
-- Simple tables get 0s for relative column widths (i.e., use default)
return $ Table c a (replicate (length a) 0) h l
-- Parse a multiline table: starts with row of '-' on top, then header
-- (which may be multiline), then the rows,

10
src/Text/Pandoc/Writers/ConTeXt.hs
View file

@ -192,15 +192,16 @@ blockToConTeXt (Header level lst) = do
text base <> char '{' <> contents <> char '}'
else contents
blockToConTeXt (Table caption aligns widths heads rows) = do
let colWidths = map printDecimal widths
let colDescriptor colWidth alignment = (case alignment of
AlignLeft -> 'l'
AlignRight -> 'r'
AlignCenter -> 'c'
AlignDefault -> 'l'):
"p(" ++ colWidth ++ "\\textwidth)|"
if colWidth == 0
then "|"
else ("p(" ++ printf "%.2f" colWidth ++ "\\textwidth)|")
let colDescriptors = "|" ++ (concat $
zipWith colDescriptor colWidths aligns)
zipWith colDescriptor widths aligns)
headers <- tableRowToConTeXt heads
captionText <- inlineListToConTeXt caption
let captionText' = if null caption then text "none" else captionText
@ -210,9 +211,6 @@ blockToConTeXt (Table caption aligns widths heads rows) = do
text "\\HL" $$ headers $$ text "\\HL" $$
vcat rows' $$ text "\\HL\n\\stoptable"
printDecimal :: Double -> String
printDecimal = printf "%.2f"
tableRowToConTeXt :: [[Block]] -> State WriterState Doc
tableRowToConTeXt cols = do
cols' <- mapM blockListToConTeXt cols

28
src/Text/Pandoc/Writers/LaTeX.hs
View file

@ -197,17 +197,7 @@ blockToLaTeX (Table caption aligns widths heads rows) = do
headers <- tableRowToLaTeX heads
captionText <- inlineListToLaTeX caption
rows' <- mapM tableRowToLaTeX rows
let colWidths = map (printf "%.2f") widths
let colDescriptors = concat $ zipWith
(\width align -> ">{\\PBS" ++
(case align of
AlignLeft -> "\\raggedright"
AlignRight -> "\\raggedleft"
AlignCenter -> "\\centering"
AlignDefault -> "\\raggedright") ++
"\\hspace{0pt}}p{" ++ width ++
"\\columnwidth}")
colWidths aligns
let colDescriptors = concat $ zipWith toColDescriptor widths aligns
let tableBody = text ("\\begin{tabular}{" ++ colDescriptors ++ "}") $$
headers $$ text "\\hline" $$ vcat rows' $$
text "\\end{tabular}"
@ -221,6 +211,22 @@ blockToLaTeX (Table caption aligns widths heads rows) = do
else text "\\begin{table}[h]" $$ centered tableBody $$
inCmd "caption" captionText $$ text "\\end{table}\n"
toColDescriptor :: Double -> Alignment -> String
toColDescriptor 0 align =
case align of
AlignLeft -> "l"
AlignRight -> "r"
AlignCenter -> "c"
AlignDefault -> "l"
toColDescriptor width align = ">{\\PBS" ++
(case align of
AlignLeft -> "\\raggedright"
AlignRight -> "\\raggedleft"
AlignCenter -> "\\centering"
AlignDefault -> "\\raggedright") ++
"\\hspace{0pt}}p{" ++ printf "%.2f" width ++
"\\columnwidth}"
blockListToLaTeX :: [Block] -> State WriterState Doc
blockListToLaTeX lst = mapM blockToLaTeX lst >>= return . vcat

4
src/Text/Pandoc/Writers/Man.hs
View file

@ -171,7 +171,9 @@ blockToMan opts (Table caption alignments widths headers rows) =
in do
caption' <- inlineListToMan opts caption
modify (\(notes, preprocessors) -> (notes, "t":preprocessors))
let iwidths = map (printf "w(%0.2fn)" . (70 *)) widths
let iwidths = if all (== 0) widths
then repeat ""
else map (printf "w(%0.2fn)" . (70 *)) widths
-- 78n default width - 8n indent = 70n
let coldescriptions = text $ intercalate " "
(zipWith (\align width -> aligncode align ++ width)

18
src/Text/Pandoc/Writers/Markdown.hs
View file

@ -34,7 +34,7 @@ import Text.Pandoc.Definition
import Text.Pandoc.Shared
import Text.Pandoc.Blocks
import Text.ParserCombinators.Parsec ( parse, GenParser )
import Data.List ( group, isPrefixOf, drop, find, intersperse, intercalate )
import Data.List ( group, isPrefixOf, drop, find, intersperse, intercalate, transpose )
import Text.PrettyPrint.HughesPJ hiding ( Str )
import Control.Monad.State
@ -218,25 +218,29 @@ blockToMarkdown opts (Table caption aligns widths headers rows) = do
then empty
else text "" $+$ (text "Table: " <> caption')
headers' <- mapM (blockListToMarkdown opts) headers
let widthsInChars = map (floor . (78 *)) widths
let alignHeader alignment = case alignment of
AlignLeft -> leftAlignBlock
AlignCenter -> centerAlignBlock
AlignRight -> rightAlignBlock
AlignDefault -> leftAlignBlock
rawRows <- mapM (mapM (blockListToMarkdown opts)) rows
let isSimple = all (==0) widths
let numChars = maximum . map (length . render)
let widthsInChars =
if isSimple
then map ((+2) . numChars) $ transpose (headers' : rawRows)
else map (floor . (78 *)) widths
let makeRow = hsepBlocks . (zipWith alignHeader aligns) .
(zipWith docToBlock widthsInChars)
let head' = makeRow headers'
rows' <- mapM (\row -> do cols <- mapM (blockListToMarkdown opts) row
return $ makeRow cols) rows
let rows' = map makeRow rawRows
let maxRowHeight = maximum $ map heightOfBlock (head':rows')
let isMultilineTable = maxRowHeight > 1
let underline = hsep $
map (\width -> text $ replicate width '-') widthsInChars
let border = if isMultilineTable
let border = if maxRowHeight > 1
then text $ replicate (sum widthsInChars + (length widthsInChars - 1)) '-'
else empty
let spacer = if isMultilineTable
let spacer = if maxRowHeight > 1
then text ""
else empty
let body = vcat $ intersperse spacer $ map blockToDoc rows'

8
src/Text/Pandoc/Writers/OpenDocument.hs
View file

@ -467,13 +467,15 @@ tableStyle num wcs =
table = inTags True "style:style"
[("style:name", tableId)] $
selfClosingTag "style:table-properties"
[ ("style:rel-width", "100%" )
, ("table:align" , "center")]
[("table:align" , "center")]
colStyle (c,0) = selfClosingTag "style:style"
[ ("style:name" , tableId ++ "." ++ [c])
, ("style:family", "table-column" )]
colStyle (c,w) = inTags True "style:style"
[ ("style:name" , tableId ++ "." ++ [c])
, ("style:family", "table-column" )] $
selfClosingTag "style:table-column-properties"
[("style:column-width", printf "%.2f" (7 * w) ++ "in")]
[("style:rel-column-width", printf "%d*" $ (floor $ w * 65535 :: Integer))]
cellStyle = inTags True "style:style"
[ ("style:name" , tableId ++ ".A1")
, ("style:family", "table-cell" )] $

10
src/Text/Pandoc/Writers/RST.hs
View file

@ -33,7 +33,7 @@ module Text.Pandoc.Writers.RST ( writeRST) where
import Text.Pandoc.Definition
import Text.Pandoc.Shared
import Text.Pandoc.Blocks
import Data.List ( isPrefixOf, isSuffixOf, drop, intersperse )
import Data.List ( isPrefixOf, isSuffixOf, drop, intersperse, transpose )
import Text.PrettyPrint.HughesPJ hiding ( Str )
import Control.Monad.State
import Control.Applicative ( (<$>) )
@ -198,7 +198,13 @@ blockToRST (Table caption _ widths headers rows) = do
then empty
else text "" $+$ (text "Table: " <> caption')
headers' <- mapM blockListToRST headers
let widthsInChars = map (floor . (78 *)) widths
rawRows <- mapM (mapM blockListToRST) rows
let isSimple = all (==0) widths && all (all (\bs -> length bs == 1)) rows
let numChars = maximum . map (length . render)
let widthsInChars =
if isSimple
then map ((+2) . numChars) $ transpose (headers' : rawRows)
else map (floor . (78 *)) widths
let hpipeBlocks blocks = hcatBlocks [beg, middle, end]
where height = maximum (map heightOfBlock blocks)
sep' = TextBlock 3 height (replicate height " | ")

9
src/Text/Pandoc/Writers/RTF.hs
View file

@ -191,9 +191,12 @@ blockToRTF indent alignment (Table caption aligns sizes headers rows) =
rtfPar indent 0 alignment (inlineListToRTF caption)
tableRowToRTF :: Bool -> Int -> [Alignment] -> [Double] -> [[Block]] -> String
tableRowToRTF header indent aligns sizes cols =
let columns = concat $ zipWith (tableItemToRTF indent) aligns cols
totalTwips = 6 * 1440 -- 6 inches
tableRowToRTF header indent aligns sizes' cols =
let totalTwips = 6 * 1440 -- 6 inches
sizes = if all (== 0) sizes'
then take (length cols) $ repeat (1.0 / fromIntegral (length cols))
else sizes'
columns = concat $ zipWith (tableItemToRTF indent) aligns cols
rightEdges = tail $ scanl (\sofar new -> sofar + floor (new * totalTwips))
(0 :: Integer) sizes
cellDefs = map (\edge -> (if header

14
src/Text/Pandoc/Writers/Texinfo.hs
View file

@ -32,7 +32,8 @@ import Text.Pandoc.Definition
import Text.Pandoc.Shared
import Text.Pandoc.Readers.TeXMath
import Text.Printf ( printf )
import Data.List ( isSuffixOf )
import Data.List ( isSuffixOf, transpose, maximumBy )
import Data.Ord ( comparing )
import Data.Char ( chr, ord )
import qualified Data.Set as S
import Control.Monad.State
@ -225,9 +226,14 @@ blockToTexinfo (Table caption aligns widths heads rows) = do
headers <- tableHeadToTexinfo aligns heads
captionText <- inlineListToTexinfo caption
rowsText <- mapM (tableRowToTexinfo aligns) rows
let colWidths = map (printf "%.2f ") widths
let colDescriptors = concat colWidths
let tableBody = text ("@multitable @columnfractions " ++ colDescriptors) $$
colDescriptors <-
if all (== 0) widths
then do -- use longest entry instead of column widths
cols <- mapM (mapM (liftM (render . hcat) . mapM blockToTexinfo)) $
transpose $ heads : rows
return $ concatMap ((\x -> "{"++x++"} ") . maximumBy (comparing length)) cols
else return $ "@columnfractions " ++ concatMap (printf "%.2f ") widths
let tableBody = text ("@multitable " ++ colDescriptors) $$
headers $$
vcat rowsText $$
text "@end multitable"

6
tests/tables.context
View file

@ -1,7 +1,7 @@
Simple table with caption:
\placetable[here]{Demonstration of simple table syntax.}
\starttable[|rp(0.15\textwidth)|lp(0.09\textwidth)|cp(0.16\textwidth)|lp(0.13\textwidth)|]
\starttable[|r|l|c|l|]
\HL
\NC Right
\NC Left
@ -30,7 +30,7 @@ Simple table with caption:
Simple table without caption:
\placetable[here]{none}
\starttable[|rp(0.15\textwidth)|lp(0.09\textwidth)|cp(0.16\textwidth)|lp(0.13\textwidth)|]
\starttable[|r|l|c|l|]
\HL
\NC Right
\NC Left
@ -59,7 +59,7 @@ Simple table without caption:
Simple table indented two spaces:
\placetable[here]{Demonstration of simple table syntax.}
\starttable[|rp(0.15\textwidth)|lp(0.09\textwidth)|cp(0.16\textwidth)|lp(0.13\textwidth)|]
\starttable[|r|l|c|l|]
\HL
\NC Right
\NC Left

24
tests/tables.docbook
View file

@ -6,16 +6,16 @@
Demonstration of simple table syntax.
</caption>
<tr>
<th align="right" style="{width: 15%;}">
<th align="right">
Right
</th>
<th align="left" style="{width: 8%;}">
<th align="left">
Left
</th>
<th align="center" style="{width: 16%;}">
<th align="center">
Center
</th>
<th align="left" style="{width: 12%;}">
<th align="left">
Default
</th>
</tr>
@ -67,16 +67,16 @@
</para>
<informaltable>
<tr>
<th align="right" style="{width: 15%;}">
<th align="right">
Right
</th>
<th align="left" style="{width: 8%;}">
<th align="left">
Left
</th>
<th align="center" style="{width: 16%;}">
<th align="center">
Center
</th>
<th align="left" style="{width: 12%;}">
<th align="left">
Default
</th>
</tr>
@ -131,16 +131,16 @@
Demonstration of simple table syntax.
</caption>
<tr>
<th align="right" style="{width: 15%;}">
<th align="right">
Right
</th>
<th align="left" style="{width: 8%;}">
<th align="left">
Left
</th>
<th align="center" style="{width: 16%;}">
<th align="center">
Center
</th>
<th align="left" style="{width: 12%;}">
<th align="left">
Default
</th>
</tr>

24
tests/tables.html
View file

@ -4,13 +4,13 @@
><caption
>Demonstration of simple table syntax.</caption
><tr class="header"
><th align="right" style="width: 15%;"
><th align="right"
>Right</th
><th align="left" style="width: 8%;"
><th align="left"
>Left</th
><th align="center" style="width: 16%;"
><th align="center"
>Center</th
><th align="left" style="width: 12%;"
><th align="left"
>Default</th
></tr
><tr class="odd"
@ -48,13 +48,13 @@
>Simple table without caption:</p
><table
><tr class="header"
><th align="right" style="width: 15%;"
><th align="right"
>Right</th
><th align="left" style="width: 8%;"
><th align="left"
>Left</th
><th align="center" style="width: 16%;"
><th align="center"
>Center</th
><th align="left" style="width: 12%;"
><th align="left"
>Default</th
></tr
><tr class="odd"
@ -94,13 +94,13 @@
><caption
>Demonstration of simple table syntax.</caption
><tr class="header"
><th align="right" style="width: 15%;"
><th align="right"
>Right</th
><th align="left" style="width: 8%;"
><th align="left"
>Left</th
><th align="center" style="width: 16%;"
><th align="center"
>Center</th
><th align="left" style="width: 12%;"
><th align="left"
>Default</th
></tr
><tr class="odd"

6
tests/tables.latex
View file

@ -2,7 +2,7 @@ Simple table with caption:
\begin{table}[h]
\begin{center}
\begin{tabular}{>{\PBS\raggedleft\hspace{0pt}}p{0.15\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.09\columnwidth}>{\PBS\centering\hspace{0pt}}p{0.16\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.13\columnwidth}}
\begin{tabular}{rlcl}
Right
& Left
& Center
@ -32,7 +32,7 @@ Right
Simple table without caption:
\begin{center}
\begin{tabular}{>{\PBS\raggedleft\hspace{0pt}}p{0.15\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.09\columnwidth}>{\PBS\centering\hspace{0pt}}p{0.16\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.13\columnwidth}}
\begin{tabular}{rlcl}
Right
& Left
& Center
@ -61,7 +61,7 @@ Simple table indented two spaces:
\begin{table}[h]
\begin{center}
\begin{tabular}{>{\PBS\raggedleft\hspace{0pt}}p{0.15\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.09\columnwidth}>{\PBS\centering\hspace{0pt}}p{0.16\columnwidth}>{\PBS\raggedright\hspace{0pt}}p{0.13\columnwidth}}
\begin{tabular}{rlcl}
Right
& Left
& Center

6
tests/tables.man
View file

@ -4,7 +4,7 @@ Simple table with caption:
Demonstration of simple table syntax.
.TS
tab(@);
rw(10.50n) lw(6.13n) cw(11.38n) lw(8.75n).
r l c l.
T{
Right
T}@T{
@ -48,7 +48,7 @@ Simple table without caption:
.PP
.TS
tab(@);
rw(10.50n) lw(6.13n) cw(11.38n) lw(8.75n).
r l c l.
T{
Right
T}@T{
@ -93,7 +93,7 @@ Simple table indented two spaces:
Demonstration of simple table syntax.
.TS
tab(@);
rw(10.50n) lw(6.13n) cw(11.38n) lw(8.75n).
r l c l.
T{
Right
T}@T{

30
tests/tables.markdown
View file

@ -1,28 +1,28 @@
Simple table with caption:
Right Left Center Default
----------- ------ ------------ ---------
12 12 12 12
123 123 123 123
1 1 1 1
Right Left Center Default
------- ------ -------- ---------
12 12 12 12
123 123 123 123
1 1 1 1
Table: Demonstration of simple table syntax.
Simple table without caption:
Right Left Center Default
----------- ------ ------------ ---------
12 12 12 12
123 123 123 123
1 1 1 1
Right Left Center Default
------- ------ -------- ---------
12 12 12 12
123 123 123 123
1 1 1 1
Simple table indented two spaces:
Right Left Center Default
----------- ------ ------------ ---------
12 12 12 12
123 123 123 123
1 1 1 1
Right Left Center Default
------- ------ -------- ---------
12 12 12 12
123 123 123 123
1 1 1 1
Table: Demonstration of simple table syntax.

24
tests/tables.mediawiki
View file

@ -2,10 +2,10 @@ Simple table with caption:
<table>
<caption>Demonstration of simple table syntax.</caption><tr>
<th align="right" style="width: 15%;">Right</th>
<th align="left" style="width: 8%;">Left</th>
<th align="center" style="width: 16%;">Center</th>
<th align="left" style="width: 12%;">Default</th>
<th align="right">Right</th>
<th align="left">Left</th>
<th align="center">Center</th>
<th align="left">Default</th>
</tr><tr>
<td align="right">12</td>
<td align="left">12</td>
@ -29,10 +29,10 @@ Simple table without caption:
<table>
<tr>
<th align="right" style="width: 15%;">Right</th>
<th align="left" style="width: 8%;">Left</th>
<th align="center" style="width: 16%;">Center</th>
<th align="left" style="width: 12%;">Default</th>
<th align="right">Right</th>
<th align="left">Left</th>
<th align="center">Center</th>
<th align="left">Default</th>
</tr><tr>
<td align="right">12</td>
<td align="left">12</td>
@ -56,10 +56,10 @@ Simple table indented two spaces:
<table>
<caption>Demonstration of simple table syntax.</caption><tr>
<th align="right" style="width: 15%;">Right</th>
<th align="left" style="width: 8%;">Left</th>
<th align="center" style="width: 16%;">Center</th>
<th align="left" style="width: 12%;">Default</th>
<th align="right">Right</th>
<th align="left">Left</th>
<th align="center">Center</th>
<th align="left">Default</th>
</tr><tr>
<td align="right">12</td>
<td align="left">12</td>

6
tests/tables.native
View file

@ -1,6 +1,6 @@
Pandoc (Meta [] [] "")
[ Para [Str "Simple",Space,Str "table",Space,Str "with",Space,Str "caption:"]
, Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax",Str "."] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.15,8.75e-2,0.1625,0.125]
, Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax",Str "."] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0]
[ [ Plain [Str "Right"] ]
, [ Plain [Str "Left"] ]
, [ Plain [Str "Center"] ]
@ -18,7 +18,7 @@ Pandoc (Meta [] [] "")
, [ Plain [Str "1"] ]
, [ Plain [Str "1"] ] ] ]
, Para [Str "Simple",Space,Str "table",Space,Str "without",Space,Str "caption:"]
, Table [] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.15,8.75e-2,0.1625,0.125]
, Table [] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0]
[ [ Plain [Str "Right"] ]
, [ Plain [Str "Left"] ]
, [ Plain [Str "Center"] ]
@ -36,7 +36,7 @@ Pandoc (Meta [] [] "")
, [ Plain [Str "1"] ]
, [ Plain [Str "1"] ] ] ]
, Para [Str "Simple",Space,Str "table",Space,Str "indented",Space,Str "two",Space,Str "spaces:"]
, Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax",Str "."] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.15,8.75e-2,0.1625,0.125]
, Table [Str "Demonstration",Space,Str "of",Space,Str "simple",Space,Str "table",Space,Str "syntax",Str "."] [AlignRight,AlignLeft,AlignCenter,AlignDefault] [0.0,0.0,0.0,0.0]
[ [ Plain [Str "Right"] ]
, [ Plain [Str "Left"] ]
, [ Plain [Str "Center"] ]

74
tests/tables.opendocument
View file

@ -67,91 +67,67 @@
<style:paragraph-properties fo:text-align="end" style:justify-single-word="false" />
</style:style>
<style:style style:name="Table1">
<style:table-properties style:rel-width="100%" table:align="center" />
</style:style>
<style:style style:name="Table1.A" style:family="table-column">
<style:table-column-properties style:column-width="1.05in" />
</style:style>
<style:style style:name="Table1.B" style:family="table-column">
<style:table-column-properties style:column-width="0.61in" />
</style:style>
<style:style style:name="Table1.C" style:family="table-column">
<style:table-column-properties style:column-width="1.14in" />
</style:style>
<style:style style:name="Table1.D" style:family="table-column">
<style:table-column-properties style:column-width="0.88in" />
<style:table-properties table:align="center" />
</style:style>
<style:style style:name="Table1.A" style:family="table-column" />
<style:style style:name="Table1.B" style:family="table-column" />
<style:style style:name="Table1.C" style:family="table-column" />
<style:style style:name="Table1.D" style:family="table-column" />
<style:style style:name="Table1.A1" style:family="table-cell">
<style:table-cell-properties fo:border="none" />
</style:style>
<style:style style:name="Table2">
<style:table-properties style:rel-width="100%" table:align="center" />
</style:style>
<style:style style:name="Table2.A" style:family="table-column">
<style:table-column-properties style:column-width="1.05in" />
</style:style>
<style:style style:name="Table2.B" style:family="table-column">
<style:table-column-properties style:column-width="0.61in" />
</style:style>
<style:style style:name="Table2.C" style:family="table-column">
<style:table-column-properties style:column-width="1.14in" />
</style:style>
<style:style style:name="Table2.D" style:family="table-column">
<style:table-column-properties style:column-width="0.88in" />
<style:table-properties table:align="center" />
</style:style>
<style:style style:name="Table2.A" style:family="table-column" />
<style:style style:name="Table2.B" style:family="table-column" />
<style:style style:name="Table2.C" style:family="table-column" />
<style:style style:name="Table2.D" style:family="table-column" />
<style:style style:name="Table2.A1" style:family="table-cell">
<style:table-cell-properties fo:border="none" />
</style:style>
<style:style style:name="Table3">
<style:table-properties style:rel-width="100%" table:align="center" />
</style:style>
<style:style style:name="Table3.A" style:family="table-column">
<style:table-column-properties style:column-width="1.05in" />
</style:style>
<style:style style:name="Table3.B" style:family="table-column">
<style:table-column-properties style:column-width="0.61in" />
</style:style>
<style:style style:name="Table3.C" style:family="table-column">
<style:table-column-properties style:column-width="1.14in" />
</style:style>
<style:style style:name="Table3.D" style:family="table-column">
<style:table-column-properties style:column-width="0.88in" />
<style:table-properties table:align="center" />
</style:style>
<style:style style:name="Table3.A" style:family="table-column" />
<style:style style:name="Table3.B" style:family="table-column" />
<style:style style:name="Table3.C" style:family="table-column" />
<style:style style:name="Table3.D" style:family="table-column" />
<style:style style:name="Table3.A1" style:family="table-cell">
<style:table-cell-properties fo:border="none" />
</style:style>
<style:style style:name="Table4">
<style:table-properties style:rel-width="100%" table:align="center" />
<style:table-properties table:align="center" />
</style:style>
<style:style style:name="Table4.A" style:family="table-column">
<style:table-column-properties style:column-width="1.05in" />
<style:table-column-properties style:rel-column-width="9830*" />
</style:style>
<style:style style:name="Table4.B" style:family="table-column">
<style:table-column-properties style:column-width="0.96in" />
<style:table-column-properties style:rel-column-width="9011*" />
</style:style>
<style:style style:name="Table4.C" style:family="table-column">
<style:table-column-properties style:column-width="1.14in" />
<style:table-column-properties style:rel-column-width="10649*" />
</style:style>
<style:style style:name="Table4.D" style:family="table-column">
<style:table-column-properties style:column-width="2.36in" />
<style:table-column-properties style:rel-column-width="22118*" />
</style:style>
<style:style style:name="Table4.A1" style:family="table-cell">
<style:table-cell-properties fo:border="none" />
</style:style>
<style:style style:name="Table5">
<style:table-properties style:rel-width="100%" table:align="center" />
<style:table-properties table:align="center" />
</style:style>
<style:style style:name="Table5.A" style:family="table-column">
<style:table-column-properties style:column-width="1.05in" />
<style:table-column-properties style:rel-column-width="9830*" />
</style:style>
<style:style style:name="Table5.B" style:family="table-column">
<style:table-column-properties style:column-width="0.96in" />
<style:table-column-properties style:rel-column-width="9011*" />
</style:style>
<style:style style:name="Table5.C" style:family="table-column">
<style:table-column-properties style:column-width="1.14in" />
<style:table-column-properties style:rel-column-width="10649*" />
</style:style>
<style:style style:name="Table5.D" style:family="table-column">
<style:table-column-properties style:column-width="2.36in" />
<style:table-column-properties style:rel-column-width="22118*" />
</style:style>
<style:style style:name="Table5.A1" style:family="table-cell">
<style:table-cell-properties fo:border="none" />

54
tests/tables.rst
View file

@ -1,40 +1,40 @@
Simple table with caption:
+-------------+--------+--------------+-----------+
| Right | Left | Center | Default |
+=============+========+==============+===========+
| 12 | 12 | 12 | 12 |
+-------------+--------+--------------+-----------+
| 123 | 123 | 123 | 123 |
+-------------+--------+--------------+-----------+
| 1 | 1 | 1 | 1 |
+-------------+--------+--------------+-----------+
+---------+--------+----------+-----------+
| Right | Left | Center | Default |
+=========+========+==========+===========+
| 12 | 12 | 12 | 12 |
+---------+--------+----------+-----------+
| 123 | 123 | 123 | 123 |
+---------+--------+----------+-----------+
| 1 | 1 | 1 | 1 |
+---------+--------+----------+-----------+
Table: Demonstration of simple table syntax.
Simple table without caption:
+-------------+--------+--------------+-----------+
| Right | Left | Center | Default |
+=============+========+==============+===========+
| 12 | 12 | 12 | 12 |
+-------------+--------+--------------+-----------+
| 123 | 123 | 123 | 123 |
+-------------+--------+--------------+-----------+
| 1 | 1 | 1 | 1 |
+-------------+--------+--------------+-----------+
+---------+--------+----------+-----------+
| Right | Left | Center | Default |
+=========+========+==========+===========+
| 12 | 12 | 12 | 12 |
+---------+--------+----------+-----------+
| 123 | 123 | 123 | 123 |
+---------+--------+----------+-----------+
| 1 | 1 | 1 | 1 |
+---------+--------+----------+-----------+
Simple table indented two spaces:
+-------------+--------+--------------+-----------+
| Right | Left | Center | Default |
+=============+========+==============+===========+
| 12 | 12 | 12 | 12 |
+-------------+--------+--------------+-----------+
| 123 | 123 | 123 | 123 |
+-------------+--------+--------------+-----------+
| 1 | 1 | 1 | 1 |
+-------------+--------+--------------+-----------+
+---------+--------+----------+-----------+
| Right | Left | Center | Default |
+=========+========+==========+===========+
| 12 | 12 | 12 | 12 |
+---------+--------+----------+-----------+
| 123 | 123 | 123 | 123 |
+---------+--------+----------+-----------+
| 1 | 1 | 1 | 1 |
+---------+--------+----------+-----------+
Table: Demonstration of simple table syntax.

24
tests/tables.rtf
View file

@ -1,7 +1,7 @@
{\pard \ql \f0 \sa180 \li0 \fi0 Simple table with caption:\par}
{
\trowd \trgaph120
\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2052\clbrdrb\brdrs\cellx3456\clbrdrb\brdrs\cellx4536
\clbrdrb\brdrs\cellx2160\clbrdrb\brdrs\cellx4320\clbrdrb\brdrs\cellx6480\clbrdrb\brdrs\cellx8640
\trkeep\intbl
{
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 Right\par}
@ -16,7 +16,7 @@
\intbl\row}
{
\trowd \trgaph120
\cellx1296\cellx2052\cellx3456\cellx4536
\cellx2160\cellx4320\cellx6480\cellx8640
\trkeep\intbl
{
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12\par}
@ -31,7 +31,7 @@
\intbl\row}
{
\trowd \trgaph120
\cellx1296\cellx2052\cellx3456\cellx4536
\cellx2160\cellx4320\cellx6480\cellx8640
\trkeep\intbl
{
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 123\par}
@ -46,7 +46,7 @@
\intbl\row}
{
\trowd \trgaph120
\cellx1296\cellx2052\cellx3456\cellx4536
\cellx2160\cellx4320\cellx6480\cellx8640
\trkeep\intbl
{
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 1\par}
@ -63,7 +63,7 @@
{\pard \ql \f0 \sa180 \li0 \fi0 Simple table without caption:\par}
{
\trowd \trgaph120
\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2052\clbrdrb\brdrs\cellx3456\clbrdrb\brdrs\cellx4536
\clbrdrb\brdrs\cellx2160\clbrdrb\brdrs\cellx4320\clbrdrb\brdrs\cellx6480\clbrdrb\brdrs\cellx8640
\trkeep\intbl
{
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 Right\par}
@ -78,7 +78,7 @@
\intbl\row}
{
\trowd \trgaph120
\cellx1296\cellx2052\cellx3456\cellx4536
\cellx2160\cellx4320\cellx6480\cellx8640
\trkeep\intbl
{
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12\par}
@ -93,7 +93,7 @@
\intbl\row}
{
\trowd \trgaph120
\cellx1296\cellx2052\cellx3456\cellx4536
\cellx2160\cellx4320\cellx6480\cellx8640
\trkeep\intbl
{
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 123\par}
@ -108,7 +108,7 @@
\intbl\row}
{
\trowd \trgaph120
\cellx1296\cellx2052\cellx3456\cellx4536
\cellx2160\cellx4320\cellx6480\cellx8640
\trkeep\intbl
{
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 1\par}
@ -125,7 +125,7 @@
{\pard \ql \f0 \sa180 \li0 \fi0 Simple table indented two spaces:\par}
{
\trowd \trgaph120
\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2052\clbrdrb\brdrs\cellx3456\clbrdrb\brdrs\cellx4536
\clbrdrb\brdrs\cellx2160\clbrdrb\brdrs\cellx4320\clbrdrb\brdrs\cellx6480\clbrdrb\brdrs\cellx8640
\trkeep\intbl
{
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 Right\par}
@ -140,7 +140,7 @@
\intbl\row}
{
\trowd \trgaph120
\cellx1296\cellx2052\cellx3456\cellx4536
\cellx2160\cellx4320\cellx6480\cellx8640
\trkeep\intbl
{
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12\par}
@ -155,7 +155,7 @@
\intbl\row}
{
\trowd \trgaph120
\cellx1296\cellx2052\cellx3456\cellx4536
\cellx2160\cellx4320\cellx6480\cellx8640
\trkeep\intbl
{
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 123\par}
@ -170,7 +170,7 @@
\intbl\row}
{
\trowd \trgaph120
\cellx1296\cellx2052\cellx3456\cellx4536
\cellx2160\cellx4320\cellx6480\cellx8640
\trkeep\intbl
{
{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 1\par}

6
tests/tables.texinfo
View file

@ -4,7 +4,7 @@
Simple table with caption:
@float
@multitable @columnfractions 0.15 0.09 0.16 0.13
@multitable {Right} {Left} {Center} {Default}
@headitem
Right
@tab Left
@ -30,7 +30,7 @@ Right
@end float
Simple table without caption:
@multitable @columnfractions 0.15 0.09 0.16 0.13
@multitable {Right} {Left} {Center} {Default}
@headitem
Right
@tab Left
@ -56,7 +56,7 @@ Right
Simple table indented two spaces:
@float
@multitable @columnfractions 0.15 0.09 0.16 0.13
@multitable {Right} {Left} {Center} {Default}
@headitem
Right
@tab Left