From be12ae3bca4f1c2d712e412b11a14b6473c7ab10 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Fri, 16 Mar 2018 22:38:34 -0700 Subject: Better table handling for Haddock. In the reader, we use the new Table type in Haddock. Note that tables with col/rowspans will not translate well into Pandoc. In the writer, we now render tables always as grid tables, since Haddock supports these. --- test/tables.haddock | 120 +++++++++++++++++++++++++++++----------------------- 1 file changed, 67 insertions(+), 53 deletions(-) (limited to 'test/tables.haddock') diff --git a/test/tables.haddock b/test/tables.haddock index 84a15cce8..678c5c15a 100644 --- a/test/tables.haddock +++ b/test/tables.haddock @@ -1,76 +1,90 @@ 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 | +> +-------+------+--------+---------+ > -> Demonstration of simple table syntax. +> 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 | +> +-------+------+--------+---------+ > -> Demonstration of simple table syntax. +> Demonstration of simple table syntax. Multiline table with caption: -> -------------------------------------------------------------- -> Centered Left Right Default aligned -> Header Aligned Aligned -> ----------- ---------- ------------ -------------------------- -> First row 12.0 Example of a row that -> spans multiple lines. +> +----------+---------+-----------+-------------------------+ +> | Centered | Left | Right | Default aligned | +> | Header | Aligned | Aligned | | +> +==========+=========+===========+=========================+ +> | 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. | +> +----------+---------+-----------+-------------------------+ > -> Second row 5.0 Here’s another one. Note -> the blank line between -> rows. -> -------------------------------------------------------------- -> -> Here’s the caption. It may span multiple lines. +> Here’s the caption. It may span multiple lines. Multiline table without caption: -> -------------------------------------------------------------- -> Centered Left Right Default aligned -> Header Aligned Aligned -> ----------- ---------- ------------ -------------------------- -> 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. -> -------------------------------------------------------------- +> +----------+---------+-----------+-------------------------+ +> | Centered | Left | Right | Default aligned | +> | Header | Aligned | Aligned | | +> +==========+=========+===========+=========================+ +> | 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 without column headers: -> ----- ----- ----- ----- -> 12 12 12 12 -> 123 123 123 123 -> 1 1 1 1 -> ----- ----- ----- ----- +> +-----+-----+-----+-----+ +> | 12 | 12 | 12 | 12 | +> +-----+-----+-----+-----+ +> | 123 | 123 | 123 | 123 | +> +-----+-----+-----+-----+ +> | 1 | 1 | 1 | 1 | +> +-----+-----+-----+-----+ Multiline table without column headers: -> ----------- ---------- ------------ -------------------------- -> 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. -> ----------- ---------- ------------ -------------------------- +> +----------+---------+-----------+-------------------------+ +> | 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. | +> +----------+---------+-----------+-------------------------+ -- cgit v1.2.3