git.iko.soy/typeable/pandoc
on master help sign in
DocBook reader: Implement table cell alignment (#6698)
1ad7a04Nils Carlson
src/Text/Pandoc/Readers/DocBook.hs+11−6
compare with master
unifiedsplit
@@ -943,11 +943,6 @@ parseBlock (Elem e) =
943 $ filterChildren isRow b
943 $ filterChildren isRow b
944 Nothing -> mapM (parseRow colnames)
944 Nothing -> mapM (parseRow colnames)
945 $ filterChildren isRow e'
945 $ filterChildren isRow e'
946− let toAlignment c = case findAttr (unqual "align") c of
947− Just "left" -> AlignLeft
948− Just "right" -> AlignRight
949− Just "center" -> AlignCenter
950− _ -> AlignDefault
951 let toWidth c = do
946 let toWidth c = do
952 w <- findAttr (unqual "colwidth") c
947 w <- findAttr (unqual "colwidth") c
953 n <- safeRead $ "0" <> T.filter (\x ->
948 n <- safeRead $ "0" <> T.filter (\x ->
@@ -1005,6 +1000,14 @@ parseBlock (Elem e) =
1005 -- we also attach the label as a class, so it can be styled properly
1000 -- we also attach the label as a class, so it can be styled properly
1006 return $ divWith (attrValue "id" e,[label],[]) (title <> b)
1001 return $ divWith (attrValue "id" e,[label],[]) (title <> b)
1007
1002
1003+toAlignment :: Element -> Alignment
1004+toAlignment c = case findAttr (unqual "align") c of
1005+ Just "left" -> AlignLeft
1006+ Just "right" -> AlignRight
1007+ Just "center" -> AlignCenter
1008+ _ -> AlignDefault
1009+
1010+
1008parseMixed :: PandocMonad m => (Inlines -> Blocks) -> [Content] -> DB m Blocks
1011parseMixed :: PandocMonad m => (Inlines -> Blocks) -> [Content] -> DB m Blocks
1009parseMixed container conts = do
1012parseMixed container conts = do
1010 let (ils,rest) = break isBlockElement conts
1013 let (ils,rest) = break isBlockElement conts
@@ -1036,7 +1039,9 @@ parseEntry cn el = do
1036 case (mStrt, mEnd) of
1039 case (mStrt, mEnd) of
1037 (Just start, Just end) -> colDistance start end
1040 (Just start, Just end) -> colDistance start end
1038 _ -> 1
1041 _ -> 1
1042+ let colSpan = toColSpan el
1043+ let align = toAlignment el
1039− (fmap (cell AlignDefault 1 (toColSpan el)) . parseMixed plain . elContent) el
1044+ (fmap (cell align 1 colSpan) . (parseMixed plain) . elContent) el
1040
1045
1041getInlines :: PandocMonad m => Element -> DB m Inlines
1046getInlines :: PandocMonad m => Element -> DB m Inlines
1042getInlines e' = trimInlines . mconcat <$>
1047getInlines e' = trimInlines . mconcat <$>
test/command/table-with-cell-align.mdnew file+37
@@ -0,0 +1,37 @@
1+```
2+% pandoc -f docbook -t native --quiet
3+<informaltable frame="all" rowsep="1" colsep="1">
4+<tgroup cols="16">
5+<tbody>
6+<row>
7+<entry align="center" valign="top"><simpara>1</simpara></entry>
8+<entry align="left" valign="top"><simpara>2</simpara></entry>
9+<entry align="right" valign="top"><simpara>3</simpara></entry>
10+<entry align="justify" valign="top"><simpara>4</simpara></entry>
11+</row>
12+</tbody>
13+</tgroup>
14+</informaltable>
15+^D
16+[Table ("",[],[]) (Caption Nothing
17+ [])
18+ [(AlignDefault,ColWidthDefault)
19+ ,(AlignDefault,ColWidthDefault)
20+ ,(AlignDefault,ColWidthDefault)
21+ ,(AlignDefault,ColWidthDefault)]
22+ (TableHead ("",[],[])
23+ [])
24+ [(TableBody ("",[],[]) (RowHeadColumns 0)
25+ []
26+ [Row ("",[],[])
27+ [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
28+ [Para [Str "1"]]
29+ ,Cell ("",[],[]) AlignLeft (RowSpan 1) (ColSpan 1)
30+ [Para [Str "2"]]
31+ ,Cell ("",[],[]) AlignRight (RowSpan 1) (ColSpan 1)
32+ [Para [Str "3"]]
33+ ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
34+ [Para [Str "4"]]]])]
35+ (TableFoot ("",[],[])
36+ [])]
37+```
test/command/table-with-column-span.md+40−40
@@ -72,47 +72,47 @@
72 [(TableBody ("",[],[]) (RowHeadColumns 0)
72 [(TableBody ("",[],[]) (RowHeadColumns 0)
73 []
73 []
74 [Row ("",[],[])
74 [Row ("",[],[])
75− [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
75+ [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8)
76 [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "1"]]]
76 [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "1"]]]
77− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
77+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8)
78 [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "2"]]]]
78 [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "2"]]]]
79 ,Row ("",[],[])
79 ,Row ("",[],[])
80− [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
80+ [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
81 [Para [Str "16"]]
81 [Para [Str "16"]]
82− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
82+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
83 [Para [Str "15"]]
83 [Para [Str "15"]]
84− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
84+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
85 [Para [Str "14"]]
85 [Para [Str "14"]]
86− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
86+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
87 [Para [Str "13"]]
87 [Para [Str "13"]]
88− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
88+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
89 [Para [Str "12"]]
89 [Para [Str "12"]]
90− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
90+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
91 [Para [Str "11"]]
91 [Para [Str "11"]]
92− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
92+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
93 [Para [Str "10"]]
93 [Para [Str "10"]]
94− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
94+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
95 [Para [Str "9"]]
95 [Para [Str "9"]]
96− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
96+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
97 [Para [Str "8"]]
97 [Para [Str "8"]]
98− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
98+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
99 [Para [Str "7"]]
99 [Para [Str "7"]]
100− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
100+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
101 [Para [Str "6"]]
101 [Para [Str "6"]]
102− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
102+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
103 [Para [Str "5"]]
103 [Para [Str "5"]]
104− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
104+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
105 [Para [Str "4"]]
105 [Para [Str "4"]]
106− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
106+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
107 [Para [Str "3"]]
107 [Para [Str "3"]]
108− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
108+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
109 [Para [Str "2"]]
109 [Para [Str "2"]]
110− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
110+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
111 [Para [Str "1"]]]
111 [Para [Str "1"]]]
112 ,Row ("",[],[])
112 ,Row ("",[],[])
113− [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
113+ [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8)
114 [Para [Str "Code",Space,Str "A"]]
114 [Para [Str "Code",Space,Str "A"]]
115− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
115+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8)
116 [Para [Str "Code",Space,Str "B"]]]])]
116 [Para [Str "Code",Space,Str "B"]]]])]
117 (TableFoot ("",[],[])
117 (TableFoot ("",[],[])
118 [])]
118 [])]
@@ -142,47 +142,47 @@
142 [(TableBody ("",[],[]) (RowHeadColumns 0)
142 [(TableBody ("",[],[]) (RowHeadColumns 0)
143 []
143 []
144 [Row ("",[],[])
144 [Row ("",[],[])
145− [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
145+ [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8)
146 [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "1"]]]
146 [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "1"]]]
147− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
147+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8)
148 [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "2"]]]]
148 [Para [Strong [Str "Octet",Space,Str "no.",Space,Str "2"]]]]
149 ,Row ("",[],[])
149 ,Row ("",[],[])
150− [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
150+ [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
151 [Para [Str "16"]]
151 [Para [Str "16"]]
152− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
152+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
153 [Para [Str "15"]]
153 [Para [Str "15"]]
154− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
154+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
155 [Para [Str "14"]]
155 [Para [Str "14"]]
156− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
156+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
157 [Para [Str "13"]]
157 [Para [Str "13"]]
158− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
158+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
159 [Para [Str "12"]]
159 [Para [Str "12"]]
160− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
160+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
161 [Para [Str "11"]]
161 [Para [Str "11"]]
162− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
162+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
163 [Para [Str "10"]]
163 [Para [Str "10"]]
164− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
164+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
165 [Para [Str "9"]]
165 [Para [Str "9"]]
166− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
166+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
167 [Para [Str "8"]]
167 [Para [Str "8"]]
168− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
168+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
169 [Para [Str "7"]]
169 [Para [Str "7"]]
170− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
170+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
171 [Para [Str "6"]]
171 [Para [Str "6"]]
172− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
172+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
173 [Para [Str "5"]]
173 [Para [Str "5"]]
174− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
174+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
175 [Para [Str "4"]]
175 [Para [Str "4"]]
176− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
176+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
177 [Para [Str "3"]]
177 [Para [Str "3"]]
178− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
178+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
179 [Para [Str "2"]]
179 [Para [Str "2"]]
180− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 1)
180+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 1)
181 [Para [Str "1"]]]
181 [Para [Str "1"]]]
182 ,Row ("",[],[])
182 ,Row ("",[],[])
183− [Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
183+ [Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8)
184 [Para [Str "Code",Space,Str "A"]]
184 [Para [Str "Code",Space,Str "A"]]
185− ,Cell ("",[],[]) AlignDefault (RowSpan 1) (ColSpan 8)
185+ ,Cell ("",[],[]) AlignCenter (RowSpan 1) (ColSpan 8)
186 [Para [Str "Code",Space,Str "B"]]]])]
186 [Para [Str "Code",Space,Str "B"]]]])]
187 (TableFoot ("",[],[])
187 (TableFoot ("",[],[])
188 [])]
188 [])]