ffd6993 · typeable/pandoc

git.iko.soy/typeable/pandoc

Ms writer: improved definition lists.

Use standard .IP macro. Also properly escape ".

commitffd699385a9ea040e6859b7b882b4190597a7f0c authorJohn MacFarlane <jgm@berkeley.edu> dateThu 23 Mar 2017, 17:29 (10 years ago) parent6c07e43

2 files changed+39−54

compare with master

unifiedsplit

src/Text/Pandoc/Writers/Ms.hs+3−1 test/writer.ms+36−53

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

@@ -37,7 +37,6 @@ TODO:

3737[ ] tight/loose list distinction

3838[ ] internal hyperlinks (this seems to be possible since

3939 they exist in the groff manual PDF version)

40−[ ] use a custom macro for defn lists so they're configurable

4140[ ] better handling of accented characters and other non-ascii

4241 characters (e.g. curly quotes).

4342 Note: recent versions of groff (more recent than standard

@@ -53,6 +52,8 @@ TODO:

5352 A big advantage of gropdf: it supports the tag

5453 \X'pdf: pdfpic file alignment width height line-length'

5554 and also seems to support bookmarks.

55+ See also the pdfroff shell script that comes with more

56+ recent versions of groff.

5657[ ] add via groff option to PDF module

5758[ ] better handling of images, perhaps converting to eps when

5859 going to PDF?

@@ -151,6 +152,7 @@ manEscapes = Map.fromList $

151152 [ ('\160', "\\ ")

152153 , ('\'', "\\[aq]")

153154 , ('’', "'")

155+ , ('"', "\\\"")

154156 , ('\x2014', "\\[em]")

155157 , ('\x2013', "\\[en]")

156158 , ('\x2026', "\\&...")

test/writer.ms+36−53

@@ -88,7 +88,7 @@ Code in a block quote:

8888.nf

8989\f[C]

9090sub\ status\ {

91−\ \ \ \ print\ "working";

91+\ \ \ \ print\ \"working\";

9292}

9393\f[]

9494.fi

@@ -126,7 +126,7 @@ Code:

126126\-\-\-\-\ (should\ be\ four\ hyphens)

127127

128128sub\ status\ {

129−\ \ \ \ print\ "working";

129+\ \ \ \ print\ \"working\";

130130}

131131

132132this\ code\ block\ is\ indented\ by\ one\ tab

@@ -365,68 +365,57 @@ Williams

365365Definition Lists

366366.LP

367367Tight using spaces:

368−.XP

369−.B "apple"

370−\~\~red fruit

368+.IP "apple"

369+red fruit

371370.RS

372371.RE

373−.XP

374−.B "orange"

375−\~\~orange fruit

372+.IP "orange"

373+orange fruit

376374.RS

377375.RE

378−.XP

379−.B "banana"

380−\~\~yellow fruit

376+.IP "banana"

377+yellow fruit

381378.RS

382379.RE

383380.LP

384381Tight using tabs:

385−.XP

386−.B "apple"

387−\~\~red fruit

382+.IP "apple"

383+red fruit

388384.RS

389385.RE

390−.XP

391−.B "orange"

392−\~\~orange fruit

386+.IP "orange"

387+orange fruit

393388.RS

394389.RE

395−.XP

396−.B "banana"

397−\~\~yellow fruit

390+.IP "banana"

391+yellow fruit

398392.RS

399393.RE

400394.LP

401395Loose:

402−.XP

403−.B "apple"

404−\~\~red fruit

396+.IP "apple"

397+red fruit

405398.RS

406399.RE

407−.XP

408−.B "orange"

409−\~\~orange fruit

400+.IP "orange"

401+orange fruit

410402.RS

411403.RE

412−.XP

413−.B "banana"

414−\~\~yellow fruit

404+.IP "banana"

405+yellow fruit

415406.RS

416407.RE

417408.LP

418409Multiple blocks with italics:

419−.XP

420−.B "\f[I]apple\f[]"

421−\~\~red fruit

410+.IP "\f[I]apple\f[]"

411+red fruit

422412.RS

423413.LP

424414contains seeds,

425415crisp, pleasant to taste

426416.RE

427−.XP

428−.B "\f[I]orange\f[]"

429−\~\~orange fruit

417+.IP "\f[I]orange\f[]"

418+orange fruit

430419.RS

431420.IP

432421.nf

@@ -441,17 +430,15 @@ orange block quote

441430.RE

442431.LP

443432Multiple definitions, tight:

444−.XP

445−.B "apple"

446−\~\~red fruit

433+.IP "apple"

434+red fruit

447435.RS

448436.RE

449437computer

450438.RS

451439.RE

452−.XP

453−.B "orange"

454−\~\~orange fruit

440+.IP "orange"

441+orange fruit

455442.RS

456443.RE

457444bank

@@ -459,17 +446,15 @@ bank

459446.RE

460447.LP

461448Multiple definitions, loose:

462−.XP

463−.B "apple"

464−\~\~red fruit

449+.IP "apple"

450+red fruit

465451.RS

466452.RE

467453computer

468454.RS

469455.RE

470−.XP

471−.B "orange"

472−\~\~orange fruit

456+.IP "orange"

457+orange fruit

473458.RS

474459.RE

475460bank

@@ -477,17 +462,15 @@ bank

477462.RE

478463.LP

479464Blank line after term, indented marker, alternate markers:

480−.XP

481−.B "apple"

482−\~\~red fruit

465+.IP "apple"

466+red fruit

483467.RS

484468.RE

485469computer

486470.RS

487471.RE

488−.XP

489−.B "orange"

490−\~\~orange fruit

472+.IP "orange"

473+orange fruit

491474.RS

492475.IP "1." 3

493476sublist