df9d79c · typeable/pandoc

git.iko.soy/typeable/pandoc

RTF writer: fixed headerless tables.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1877 788f1e2b-df1e-0410-8736-df70ead52e1b

commitdf9d79cb81cd600f9b155d542c605abda4827310 authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> dateThu 11 Mar 2010, 03:01 (17 years ago) parent3b9e7f3

2 files changed+82−1

compare with master

unifiedsplit

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

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

@@ -173,7 +173,9 @@ blockToRTF indent _ HorizontalRule =

173173blockToRTF indent alignment (Header level lst) = rtfPar indent 0 alignment $

174174 "\\b \\fs" ++ (show (40 - (level * 4))) ++ " " ++ inlineListToRTF lst

175175blockToRTF indent alignment (Table caption aligns sizes headers rows) =

176− tableRowToRTF True indent aligns sizes headers ++

176+ (if all null headers

177+ then ""

178+ else tableRowToRTF True indent aligns sizes headers) ++

177179 concatMap (tableRowToRTF False indent aligns sizes) rows ++

178180 rtfPar indent 0 alignment (inlineListToRTF caption)

179181

tests/tables.rtf+79

@@ -278,4 +278,83 @@

278278}

279279\intbl\row}

280280{\pard \ql \f0 \sa180 \li0 \fi0 \par}

281+{\pard \ql \f0 \sa180 \li0 \fi0 Table without column headers:\par}

282+{

283+\trowd \trgaph120

284+\cellx2160\cellx4320\cellx6480\cellx8640

285+\trkeep\intbl

286+{

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

288+\cell}

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

290+\cell}

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

292+\cell}

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

294+\cell}

295+}

296+\intbl\row}

297+{

298+\trowd \trgaph120

299+\cellx2160\cellx4320\cellx6480\cellx8640

300+\trkeep\intbl

301+{

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

303+\cell}

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

305+\cell}

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

307+\cell}

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

309+\cell}

310+}

311+\intbl\row}

312+{

313+\trowd \trgaph120

314+\cellx2160\cellx4320\cellx6480\cellx8640

315+\trkeep\intbl

316+{

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

318+\cell}

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

320+\cell}

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

322+\cell}

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

324+\cell}

325+}

326+\intbl\row}

327+{\pard \ql \f0 \sa180 \li0 \fi0 \par}

328+{\pard \ql \f0 \sa180 \li0 \fi0 Multiline table without column headers:\par}

329+{

330+\trowd \trgaph120

331+\cellx1296\cellx2484\cellx3888\cellx6804

332+\trkeep\intbl

333+{

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

335+\cell}

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

337+\cell}

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

339+\cell}

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

341+\cell}

342+}

343+\intbl\row}

344+{

345+\trowd \trgaph120

346+\cellx1296\cellx2484\cellx3888\cellx6804

347+\trkeep\intbl

348+{

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

350+\cell}

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

352+\cell}

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

354+\cell}

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

356+\cell}

357+}

358+\intbl\row}

359+{\pard \ql \f0 \sa180 \li0 \fi0 \par}

281360