From 1ad7a047d58a629ab7d29ea74dcb752d82d3dc11 Mon Sep 17 00:00:00 2001
From: Nils Carlson <nils@nilscarlson.se>
Date: Fri, 25 Sep 2020 00:43:43 +0000
Subject: DocBook reader: Implement table cell alignment (#6698)

---
 test/command/table-with-cell-align.md  | 37 ++++++++++++++++
 test/command/table-with-column-span.md | 80 +++++++++++++++++-----------------
 2 files changed, 77 insertions(+), 40 deletions(-)
 create mode 100644 test/command/table-with-cell-align.md

(limited to 'test')

diff --git a/test/command/table-with-cell-align.md b/test/command/table-with-cell-align.md
new file mode 100644
index 000000000..d4ee72975
--- /dev/null
+++ b/test/command/table-with-cell-align.md
@@ -0,0 +1,37 @@
+```
+% pandoc -f docbook -t native --quiet
+<informaltable frame="all" rowsep="1" colsep="1">
+<tgroup cols="16">
+<tbody>
+<row>
+<entry align="center" valign="top"><simpara>1</simpara></entry>
+<entry align="left" valign="top"><simpara>2</simpara></entry>
+<entry align="right" valign="top"><simpara>3</simpara></entry>
+<entry align="justify" valign="top"><simpara>4</simpara></entry>
+</row>
+</tbody>
+</tgroup>
+</informaltable>
+^D
+[Table ("",[],[]) (Caption Nothing
+ [])
+ [(AlignDefault,ColWidthDefault)
+ ,(AlignDefault,ColWidthDefault)
+ ,(AlignDefault,ColWidthDefault)
+ ,(AlignDefault,ColWidthDefault)]
+ (TableHead ("",[],[])
+ [])
+ [(TableBody ("",[],[]) (RowHeadColumns 0)
+  []
+  [Row ("",[],[])
+   [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
+    [Para [Str "1"]]
+   ,Cell ("",[],[]) AlignLeft (RowSpan 1) (ColSpan 1)
+    [Para [Str "2"]]
+   ,Cell ("",[],[]) AlignRight (RowSpan 1) (ColSpan 1)
+    [Para [Str "3"]]
+   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+    [Para [Str "4"]]]])]
+ (TableFoot ("",[],[])
+ [])]
+```
diff --git a/test/command/table-with-column-span.md b/test/command/table-with-column-span.md
index a0824b5a1..f12319452 100644
--- a/test/command/table-with-column-span.md
+++ b/test/command/table-with-column-span.md
@@ -72,47 +72,47 @@
  [(TableBody ("",[],[]) (RowHeadColumns 0)
   []
   [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
+   [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8)
     [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "1"]]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8)
     [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "2"]]]]
   ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "16"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "15"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "14"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "13"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "11"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "10"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "9"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "8"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "7"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "6"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "5"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "4"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "3"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "1"]]]
   ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
+   [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8)
     [Para [Str "Code",Space,Str "A"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8)
     [Para [Str "Code",Space,Str "B"]]]])]
  (TableFoot ("",[],[])
  [])]
@@ -142,47 +142,47 @@
  [(TableBody ("",[],[]) (RowHeadColumns 0)
   []
   [Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
+   [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8)
     [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "1"]]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8)
     [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "2"]]]]
   ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "16"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "15"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "14"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "13"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "12"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "11"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "10"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "9"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "8"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "7"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "6"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "5"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "4"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "3"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "2"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
     [Para [Str "1"]]]
   ,Row ("",[],[])
-   [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
+   [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8)
     [Para [Str "Code",Space,Str "A"]]
-   ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
+   ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8)
     [Para [Str "Code",Space,Str "B"]]]])]
  (TableFoot ("",[],[])
  [])]
-- 
cgit v1.2.3