git.iko.soy/typeable/pandoc
on master help sign in
MediaWiki writer: fix spacing issues.

+ Start cell on new line unless it's a single Para or Plain. + For single Para or Plain, insert a space after the `|` to avoid problems when the text begins with a character like `-`. Closes #2604, closes #2606.

commita68e072bac980394509930e0e6338b42f9fe0df5 authorJohn MacFarlane <jgm@berkeley.edu> dateSat 2 Jan 2016, 12:14 (11 years ago) parent6ed41cb
2 files changed+113−109
compare with master
unifiedsplit
src/Text/Pandoc/Writers/MediaWiki.hs+5−1 tests/tables.mediawiki+108−108
src/Text/Pandoc/Writers/MediaWiki.hs+5−1
@@ -306,7 +306,11 @@ tableCellToMediaWiki headless rownum (alignment, width, bs) = do
306306 let attr = if null attrs
307307 then ""
308308 else unwords attrs ++ "|"
309− return $ marker ++ attr ++ trimr contents
309+ let sep = case bs of
310+ [Plain _] -> " "
311+ [Para _] -> " "
312+ _ -> "\n"
313+ return $ marker ++ attr ++ sep ++ trimr contents
310314
311315alignmentToString :: Alignment -> String
312316alignmentToString alignment = case alignment of
tests/tables.mediawiki+108−108
@@ -2,145 +2,145 @@ Simple table with caption:
22
33{|
44|+ Demonstration of simple table syntax.
5−!align="right"|Right
6−!Left
7−!align="center"|Center
8−!Default
9−|-
10−|align="right"|12
11−|12
12−|align="center"|12
13−|12
14−|-
15−|align="right"|123
16−|123
17−|align="center"|123
18−|123
19−|-
20−|align="right"|1
21−|1
22−|align="center"|1
23−|1
5+!align="right"| Right
6+! Left
7+!align="center"| Center
8+! Default
9+|-
10+|align="right"| 12
11+| 12
12+|align="center"| 12
13+| 12
14+|-
15+|align="right"| 123
16+| 123
17+|align="center"| 123
18+| 123
19+|-
20+|align="right"| 1
21+| 1
22+|align="center"| 1
23+| 1
2424|}
2525
2626Simple table without caption:
2727
2828{|
29−!align="right"|Right
30−!Left
31−!align="center"|Center
32−!Default
33−|-
34−|align="right"|12
35−|12
36−|align="center"|12
37−|12
38−|-
39−|align="right"|123
40−|123
41−|align="center"|123
42−|123
43−|-
44−|align="right"|1
45−|1
46−|align="center"|1
47−|1
29+!align="right"| Right
30+! Left
31+!align="center"| Center
32+! Default
33+|-
34+|align="right"| 12
35+| 12
36+|align="center"| 12
37+| 12
38+|-
39+|align="right"| 123
40+| 123
41+|align="center"| 123
42+| 123
43+|-
44+|align="right"| 1
45+| 1
46+|align="center"| 1
47+| 1
4848|}
4949
5050Simple table indented two spaces:
5151
5252{|
5353|+ Demonstration of simple table syntax.
54−!align="right"|Right
55−!Left
56−!align="center"|Center
57−!Default
58−|-
59−|align="right"|12
60−|12
61−|align="center"|12
62−|12
63−|-
64−|align="right"|123
65−|123
66−|align="center"|123
67−|123
68−|-
69−|align="right"|1
70−|1
71−|align="center"|1
72−|1
54+!align="right"| Right
55+! Left
56+!align="center"| Center
57+! Default
58+|-
59+|align="right"| 12
60+| 12
61+|align="center"| 12
62+| 12
63+|-
64+|align="right"| 123
65+| 123
66+|align="center"| 123
67+| 123
68+|-
69+|align="right"| 1
70+| 1
71+|align="center"| 1
72+| 1
7373|}
7474
7575Multiline table with caption:
7676
7777{|
7878|+ Here's the caption. It may span multiple lines.
79−!align="center" width="15%"|Centered Header
80−!width="13%"|Left Aligned
81−!align="right" width="16%"|Right Aligned
82−!width="33%"|Default aligned
83−|-
84−|align="center"|First
85−|row
86−|align="right"|12.0
87−|Example of a row that spans multiple lines.
88−|-
89−|align="center"|Second
90−|row
91−|align="right"|5.0
92−|Here's another one. Note the blank line between rows.
79+!align="center" width="15%"| Centered Header
80+!width="13%"| Left Aligned
81+!align="right" width="16%"| Right Aligned
82+!width="33%"| Default aligned
83+|-
84+|align="center"| First
85+| row
86+|align="right"| 12.0
87+| Example of a row that spans multiple lines.
88+|-
89+|align="center"| Second
90+| row
91+|align="right"| 5.0
92+| Here's another one. Note the blank line between rows.
9393|}
9494
9595Multiline table without caption:
9696
9797{|
98−!align="center" width="15%"|Centered Header
99−!width="13%"|Left Aligned
100−!align="right" width="16%"|Right Aligned
101−!width="33%"|Default aligned
102−|-
103−|align="center"|First
104−|row
105−|align="right"|12.0
106−|Example of a row that spans multiple lines.
107−|-
108−|align="center"|Second
109−|row
110−|align="right"|5.0
111−|Here's another one. Note the blank line between rows.
98+!align="center" width="15%"| Centered Header
99+!width="13%"| Left Aligned
100+!align="right" width="16%"| Right Aligned
101+!width="33%"| Default aligned
102+|-
103+|align="center"| First
104+| row
105+|align="right"| 12.0
106+| Example of a row that spans multiple lines.
107+|-
108+|align="center"| Second
109+| row
110+|align="right"| 5.0
111+| Here's another one. Note the blank line between rows.
112112|}
113113
114114Table without column headers:
115115
116116{|
117−|align="right"|12
118−|12
119−|align="center"|12
120−|align="right"|12
121−|-
122−|align="right"|123
123−|123
124−|align="center"|123
125−|align="right"|123
126−|-
127−|align="right"|1
128−|1
129−|align="center"|1
130−|align="right"|1
117+|align="right"| 12
118+| 12
119+|align="center"| 12
120+|align="right"| 12
121+|-
122+|align="right"| 123
123+| 123
124+|align="center"| 123
125+|align="right"| 123
126+|-
127+|align="right"| 1
128+| 1
129+|align="center"| 1
130+|align="right"| 1
131131|}
132132
133133Multiline table without column headers:
134134
135135{|
136−|align="center" width="15%"|First
137−|width="13%"|row
138−|align="right" width="16%"|12.0
139−|width="33%"|Example of a row that spans multiple lines.
140−|-
141−|align="center"|Second
142−|row
143−|align="right"|5.0
144−|Here's another one. Note the blank line between rows.
136+|align="center" width="15%"| First
137+|width="13%"| row
138+|align="right" width="16%"| 12.0
139+|width="33%"| Example of a row that spans multiple lines.
140+|-
141+|align="center"| Second
142+| row
143+|align="right"| 5.0
144+| Here's another one. Note the blank line between rows.
145145|}
146146