d7fbc40 · typeable/pandoc

git.iko.soy/typeable/pandoc

RTF writer: Fixed tables cells containing paragraphs.

This moves \intbl after \pard.

commitd7fbc40dff9771181f26d7d9cb3129c9884a5f01 authorJohn MacFarlane <jgm@berkeley.edu> dateMon 24 Mar 2014, 15:07 (13 years ago) parentb9cc29e

2 files changed+93−93

compare with master

unifiedsplit

src/Text/Pandoc/Writers/RTF.hs+1−1 tests/tables.rtf+92−92

src/Text/Pandoc/Writers/RTF.hs+1−1

@@ -259,7 +259,7 @@ tableRowToRTF header indent aligns sizes' cols =

259259tableItemToRTF :: Int -> Alignment -> [Block] -> String

260260tableItemToRTF indent alignment item =

261261 let contents = concatMap (blockToRTF indent alignment) item

262− in "{\\intbl " ++ contents ++ "\\cell}\n"

262+ in "{" ++ substitute "\\pard" "\\pard\\intbl" contents ++ "\\cell}\n"

263263

264264-- | Ensure that there's the same amount of space after compact

265265-- lists as after regular lists.

tests/tables.rtf+92−92

@@ -4,13 +4,13 @@

44\clbrdrb\brdrs\cellx2160\clbrdrb\brdrs\cellx4320\clbrdrb\brdrs\cellx6480\clbrdrb\brdrs\cellx8640

55\trkeep\intbl

66{

7−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 Right\par}

7+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 Right\par}

88\cell}

9−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Left\par}

9+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Left\par}

1010\cell}

11−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 Center\par}

11+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Center\par}

1212\cell}

13−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Default\par}

13+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Default\par}

1414\cell}

1515}

1616\intbl\row}

@@ -19,13 +19,13 @@

1919\cellx2160\cellx4320\cellx6480\cellx8640

2020\trkeep\intbl

2121{

22−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12\par}

22+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 12\par}

2323\cell}

24−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 12\par}

24+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 12\par}

2525\cell}

26−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 12\par}

26+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 12\par}

2727\cell}

28−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 12\par}

28+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 12\par}

2929\cell}

3030}

3131\intbl\row}

@@ -34,13 +34,13 @@

3434\cellx2160\cellx4320\cellx6480\cellx8640

3535\trkeep\intbl

3636{

37−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 123\par}

37+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 123\par}

3838\cell}

39−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 123\par}

39+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 123\par}

4040\cell}

41−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 123\par}

41+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 123\par}

4242\cell}

43−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 123\par}

43+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 123\par}

4444\cell}

4545}

4646\intbl\row}

@@ -49,13 +49,13 @@

4949\cellx2160\cellx4320\cellx6480\cellx8640

5050\trkeep\intbl

5151{

52−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 1\par}

52+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 1\par}

5353\cell}

54−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 1\par}

54+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 1\par}

5555\cell}

56−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 1\par}

56+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 1\par}

5757\cell}

58−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 1\par}

58+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 1\par}

5959\cell}

6060}

6161\intbl\row}

@@ -66,13 +66,13 @@

6666\clbrdrb\brdrs\cellx2160\clbrdrb\brdrs\cellx4320\clbrdrb\brdrs\cellx6480\clbrdrb\brdrs\cellx8640

6767\trkeep\intbl

6868{

69−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 Right\par}

69+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 Right\par}

7070\cell}

71−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Left\par}

71+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Left\par}

7272\cell}

73−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 Center\par}

73+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Center\par}

7474\cell}

75−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Default\par}

75+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Default\par}

7676\cell}

7777}

7878\intbl\row}

@@ -81,13 +81,13 @@

8181\cellx2160\cellx4320\cellx6480\cellx8640

8282\trkeep\intbl

8383{

84−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12\par}

84+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 12\par}

8585\cell}

86−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 12\par}

86+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 12\par}

8787\cell}

88−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 12\par}

88+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 12\par}

8989\cell}

90−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 12\par}

90+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 12\par}

9191\cell}

9292}

9393\intbl\row}

@@ -96,13 +96,13 @@

9696\cellx2160\cellx4320\cellx6480\cellx8640

9797\trkeep\intbl

9898{

99−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 123\par}

99+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 123\par}

100100\cell}

101−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 123\par}

101+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 123\par}

102102\cell}

103−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 123\par}

103+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 123\par}

104104\cell}

105−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 123\par}

105+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 123\par}

106106\cell}

107107}

108108\intbl\row}

@@ -111,13 +111,13 @@

111111\cellx2160\cellx4320\cellx6480\cellx8640

112112\trkeep\intbl

113113{

114−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 1\par}

114+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 1\par}

115115\cell}

116−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 1\par}

116+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 1\par}

117117\cell}

118−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 1\par}

118+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 1\par}

119119\cell}

120−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 1\par}

120+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 1\par}

121121\cell}

122122}

123123\intbl\row}

@@ -128,13 +128,13 @@

128128\clbrdrb\brdrs\cellx2160\clbrdrb\brdrs\cellx4320\clbrdrb\brdrs\cellx6480\clbrdrb\brdrs\cellx8640

129129\trkeep\intbl

130130{

131−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 Right\par}

131+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 Right\par}

132132\cell}

133−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Left\par}

133+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Left\par}

134134\cell}

135−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 Center\par}

135+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Center\par}

136136\cell}

137−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Default\par}

137+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Default\par}

138138\cell}

139139}

140140\intbl\row}

@@ -143,13 +143,13 @@

143143\cellx2160\cellx4320\cellx6480\cellx8640

144144\trkeep\intbl

145145{

146−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12\par}

146+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 12\par}

147147\cell}

148−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 12\par}

148+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 12\par}

149149\cell}

150−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 12\par}

150+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 12\par}

151151\cell}

152−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 12\par}

152+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 12\par}

153153\cell}

154154}

155155\intbl\row}

@@ -158,13 +158,13 @@

158158\cellx2160\cellx4320\cellx6480\cellx8640

159159\trkeep\intbl

160160{

161−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 123\par}

161+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 123\par}

162162\cell}

163−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 123\par}

163+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 123\par}

164164\cell}

165−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 123\par}

165+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 123\par}

166166\cell}

167−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 123\par}

167+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 123\par}

168168\cell}

169169}

170170\intbl\row}

@@ -173,13 +173,13 @@

173173\cellx2160\cellx4320\cellx6480\cellx8640

174174\trkeep\intbl

175175{

176−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 1\par}

176+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 1\par}

177177\cell}

178−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 1\par}

178+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 1\par}

179179\cell}

180−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 1\par}

180+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 1\par}

181181\cell}

182−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 1\par}

182+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 1\par}

183183\cell}

184184}

185185\intbl\row}

@@ -190,13 +190,13 @@

190190\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2484\clbrdrb\brdrs\cellx3888\clbrdrb\brdrs\cellx6804

191191\trkeep\intbl

192192{

193−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 Centered Header\par}

193+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Centered Header\par}

194194\cell}

195−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Left Aligned\par}

195+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Left Aligned\par}

196196\cell}

197−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 Right Aligned\par}

197+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 Right Aligned\par}

198198\cell}

199−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Default aligned\par}

199+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Default aligned\par}

200200\cell}

201201}

202202\intbl\row}

@@ -205,13 +205,13 @@

205205\cellx1296\cellx2484\cellx3888\cellx6804

206206\trkeep\intbl

207207{

208−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 First\par}

208+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 First\par}

209209\cell}

210−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 row\par}

210+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 row\par}

211211\cell}

212−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12.0\par}

212+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 12.0\par}

213213\cell}

214−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Example of a row that spans multiple lines.\par}

214+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Example of a row that spans multiple lines.\par}

215215\cell}

216216}

217217\intbl\row}

@@ -220,13 +220,13 @@

220220\cellx1296\cellx2484\cellx3888\cellx6804

221221\trkeep\intbl

222222{

223−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 Second\par}

223+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Second\par}

224224\cell}

225−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 row\par}

225+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 row\par}

226226\cell}

227−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 5.0\par}

227+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 5.0\par}

228228\cell}

229−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Here's another one. Note the blank line between rows.\par}

229+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Here's another one. Note the blank line between rows.\par}

230230\cell}

231231}

232232\intbl\row}

@@ -237,13 +237,13 @@

237237\clbrdrb\brdrs\cellx1296\clbrdrb\brdrs\cellx2484\clbrdrb\brdrs\cellx3888\clbrdrb\brdrs\cellx6804

238238\trkeep\intbl

239239{

240−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 Centered Header\par}

240+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Centered Header\par}

241241\cell}

242−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Left Aligned\par}

242+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Left Aligned\par}

243243\cell}

244−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 Right Aligned\par}

244+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 Right Aligned\par}

245245\cell}

246−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Default aligned\par}

246+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Default aligned\par}

247247\cell}

248248}

249249\intbl\row}

@@ -252,13 +252,13 @@

252252\cellx1296\cellx2484\cellx3888\cellx6804

253253\trkeep\intbl

254254{

255−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 First\par}

255+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 First\par}

256256\cell}

257−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 row\par}

257+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 row\par}

258258\cell}

259−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12.0\par}

259+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 12.0\par}

260260\cell}

261−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Example of a row that spans multiple lines.\par}

261+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Example of a row that spans multiple lines.\par}

262262\cell}

263263}

264264\intbl\row}

@@ -267,13 +267,13 @@

267267\cellx1296\cellx2484\cellx3888\cellx6804

268268\trkeep\intbl

269269{

270−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 Second\par}

270+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Second\par}

271271\cell}

272−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 row\par}

272+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 row\par}

273273\cell}

274−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 5.0\par}

274+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 5.0\par}

275275\cell}

276−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Here's another one. Note the blank line between rows.\par}

276+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Here's another one. Note the blank line between rows.\par}

277277\cell}

278278}

279279\intbl\row}

@@ -284,13 +284,13 @@

284284\cellx2160\cellx4320\cellx6480\cellx8640

285285\trkeep\intbl

286286{

287−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12\par}

287+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 12\par}

288288\cell}

289−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 12\par}

289+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 12\par}

290290\cell}

291−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 12\par}

291+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 12\par}

292292\cell}

293−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12\par}

293+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 12\par}

294294\cell}

295295}

296296\intbl\row}

@@ -299,13 +299,13 @@

299299\cellx2160\cellx4320\cellx6480\cellx8640

300300\trkeep\intbl

301301{

302−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 123\par}

302+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 123\par}

303303\cell}

304−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 123\par}

304+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 123\par}

305305\cell}

306−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 123\par}

306+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 123\par}

307307\cell}

308−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 123\par}

308+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 123\par}

309309\cell}

310310}

311311\intbl\row}

@@ -314,13 +314,13 @@

314314\cellx2160\cellx4320\cellx6480\cellx8640

315315\trkeep\intbl

316316{

317−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 1\par}

317+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 1\par}

318318\cell}

319−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 1\par}

319+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 1\par}

320320\cell}

321−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 1\par}

321+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 1\par}

322322\cell}

323−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 1\par}

323+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 1\par}

324324\cell}

325325}

326326\intbl\row}

@@ -331,13 +331,13 @@

331331\cellx1296\cellx2484\cellx3888\cellx6804

332332\trkeep\intbl

333333{

334−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 First\par}

334+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 First\par}

335335\cell}

336−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 row\par}

336+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 row\par}

337337\cell}

338−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 12.0\par}

338+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 12.0\par}

339339\cell}

340−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Example of a row that spans multiple lines.\par}

340+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Example of a row that spans multiple lines.\par}

341341\cell}

342342}

343343\intbl\row}

@@ -346,13 +346,13 @@

346346\cellx1296\cellx2484\cellx3888\cellx6804

347347\trkeep\intbl

348348{

349−{\intbl {\pard \qc \f0 \sa0 \li0 \fi0 Second\par}

349+{{\pard\intbl \qc \f0 \sa0 \li0 \fi0 Second\par}

350350\cell}

351−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 row\par}

351+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 row\par}

352352\cell}

353−{\intbl {\pard \qr \f0 \sa0 \li0 \fi0 5.0\par}

353+{{\pard\intbl \qr \f0 \sa0 \li0 \fi0 5.0\par}

354354\cell}

355−{\intbl {\pard \ql \f0 \sa0 \li0 \fi0 Here's another one. Note the blank line between rows.\par}

355+{{\pard\intbl \ql \f0 \sa0 \li0 \fi0 Here's another one. Note the blank line between rows.\par}

356356\cell}

357357}

358358\intbl\row}