gridTable: fix (3.7) regression with missing cell alignments.

Closes #10853.

Author: jgm

src/Text/Pandoc/Writers/Shared.hs

@@ -438,9 +438,11 @@ gridRows (x:xs) =
   rowAndBottom thisRow nextRow =
     let isLastRow = null nextRow
         border1 = render Nothing (formatBorder cellBottomBorder False thisRow)
-        border2 = render Nothing (formatBorder cellTopBorder False nextRow)
+        border2 = render Nothing (formatBorder cellTopBorder True nextRow)
         go '+' _ = '+'
         go _ '+' = '+'
+        go ':' _ = ':'
+        go _ ':' = ':'
         go '|' '-' = '+'
         go '-' '|' = '+'
         go '|' '=' = '+'
@@ -454,7 +456,7 @@ gridRows (x:xs) =
                             else literal $ T.zipWith go border1 border2
     in formatRow thisRow $$ combinedBorder
 
-formatBorder :: (RenderedCell a -> LineStyle) -> Bool -> [RenderedCell a]
+formatBorder :: Show a => (RenderedCell a -> LineStyle) -> Bool -> [RenderedCell a]
              -> Doc Text
 formatBorder borderStyle alignMarkers cs =
   borderParts <> if lastBorderStyle == NoLine
@@ -476,7 +478,8 @@ formatBorder borderStyle alignMarkers cs =
                      DoubleLine -> '='
        (leftalign, rightalign) =
            case cellAlign c of
-             _ | not alignMarkers -> (lineChar,lineChar)
+             _ | not alignMarkers || borderStyle c /= DoubleLine
+                       -> (lineChar,lineChar)
              AlignLeft -> (':',lineChar)
              AlignCenter -> (':',':')
              AlignRight -> (lineChar,':')

test/tables-rstsubset.native

@@ -462,10 +462,10 @@
            , Str "lines."
            ]
        ])
-    [ ( AlignDefault , ColWidth 0.15 )
-    , ( AlignDefault , ColWidth 0.1375 )
-    , ( AlignDefault , ColWidth 0.1625 )
-    , ( AlignDefault , ColWidth 0.35 )
+    [ ( AlignCenter , ColWidth 0.15 )
+    , ( AlignLeft , ColWidth 0.1375 )
+    , ( AlignRight , ColWidth 0.1625 )
+    , ( AlignLeft , ColWidth 0.35 )
     ]
     (TableHead
        ( "" , [] , [] )
@@ -606,10 +606,10 @@
 , Table
     ( "" , [] , [] )
     (Caption Nothing [])
-    [ ( AlignDefault , ColWidth 0.15 )
-    , ( AlignDefault , ColWidth 0.1375 )
-    , ( AlignDefault , ColWidth 0.1625 )
-    , ( AlignDefault , ColWidth 0.35 )
+    [ ( AlignCenter , ColWidth 0.15 )
+    , ( AlignLeft , ColWidth 0.1375 )
+    , ( AlignRight , ColWidth 0.1625 )
+    , ( AlignLeft , ColWidth 0.35 )
     ]
     (TableHead
        ( "" , [] , [] )

test/tables.haddock

@@ -2,7 +2,7 @@ Simple table with caption:
 
 +-------+------+--------+---------+
 | Right | Left | Center | Default |
-+=======+======+========+=========+
++======:+:=====+:======:+=========+
 | 12    | 12   | 12     | 12      |
 +-------+------+--------+---------+
 | 123   | 123  | 123    | 123     |
@@ -16,7 +16,7 @@ Simple table without caption:
 
 +-------+------+--------+---------+
 | Right | Left | Center | Default |
-+=======+======+========+=========+
++======:+:=====+:======:+=========+
 | 12    | 12   | 12     | 12      |
 +-------+------+--------+---------+
 | 123   | 123  | 123    | 123     |
@@ -28,7 +28,7 @@ Simple table indented two spaces:
 
 +-------+------+--------+---------+
 | Right | Left | Center | Default |
-+=======+======+========+=========+
++======:+:=====+:======:+=========+
 | 12    | 12   | 12     | 12      |
 +-------+------+--------+---------+
 | 123   | 123  | 123    | 123     |
@@ -43,7 +43,7 @@ Multiline table with caption:
 +-----------+----------+------------+---------------------------+
 | Centered  | Left     | Right      | Default aligned           |
 | Header    | Aligned  | Aligned    |                           |
-+===========+==========+============+===========================+
++:=========:+:=========+===========:+:==========================+
 | First     | row      | 12.0       | Example of a row that     |
 |           |          |            | spans multiple lines.     |
 +-----------+----------+------------+---------------------------+
@@ -59,7 +59,7 @@ Multiline table without caption:
 +-----------+----------+------------+---------------------------+
 | Centered  | Left     | Right      | Default aligned           |
 | Header    | Aligned  | Aligned    |                           |
-+===========+==========+============+===========================+
++:=========:+:=========+===========:+:==========================+
 | First     | row      | 12.0       | Example of a row that     |
 |           |          |            | spans multiple lines.     |
 +-----------+----------+------------+---------------------------+

test/tables.rst

@@ -39,7 +39,7 @@ Multiline table with caption:
    +-----------+----------+------------+---------------------------+
    | Centered  | Left     | Right      | Default aligned           |
    | Header    | Aligned  | Aligned    |                           |
-   +===========+==========+============+===========================+
+   +:=========:+:=========+===========:+:==========================+
    | First     | row      | 12.0       | Example of a row that     |
    |           |          |            | spans multiple lines.     |
    +-----------+----------+------------+---------------------------+
@@ -53,7 +53,7 @@ Multiline table without caption:
 +-----------+----------+------------+---------------------------+
 | Centered  | Left     | Right      | Default aligned           |
 | Header    | Aligned  | Aligned    |                           |
-+===========+==========+============+===========================+
++:=========:+:=========+===========:+:==========================+
 | First     | row      | 12.0       | Example of a row that     |
 |           |          |            | spans multiple lines.     |
 +-----------+----------+------------+---------------------------+

test/tables/planets.markdown

@@ -2,7 +2,7 @@
 |                  | Name    | Mass       | Diameter | Density   | Gravity  | Length  | Distance  | Mean        | Number | Notes        |
 |                  |         | (10\^24kg) | (km)     | (kg/m\^3) | (m/s\^2) | of day  | from Sun  | temperature | of     |              |
 |                  |         |            |          |           |          | (hours) | (10\^6km) | (C)         | moons  |              |
-+==================+=========+============+==========+===========+==========+=========+===========+=============+========+==============+
++:================:+=========+===========:+=========:+==========:+=========:+========:+==========:+============:+=======:+==============+
 | Terrestrial      | Mercury | 0.330      | 4,879    | 5427      | 3.7      | 4222.6  | 57.9      | 167         | 0      | Closest to   |
 | planets          |         |            |          |           |          |         |           |             |        | the Sun      |
 |                  +---------+------------+----------+-----------+----------+---------+-----------+-------------+--------+--------------+

test/tables/students.markdown

@@ -1,6 +1,6 @@
 +-----------------------------------------+-----------------------------------------+
 | Student ID                              | Name                                    |
-+=========================================+=========================================+
++:========================================+=========================================+
 | Computer Science                                                                  |
 +-----------------------------------------+-----------------------------------------+
 | 3741255                                 | Jones, Martha                           |