comparison tests/test-minirst.py.out @ 15261:e2df5b866d22

minirst: add basic HTML formatting support
author Matt Mackall <mpm@selenic.com>
date Sat, 15 Oct 2011 00:39:01 -0500
parents bdc595059108
children e8076af14498
comparison
equal deleted inserted replaced
15260:be2c67a8bf88 15261:e2df5b866d22
4 4
5 A small indented paragraph. It is followed by some lines 5 A small indented paragraph. It is followed by some lines
6 containing random whitespace. 6 containing random whitespace.
7 7
8 The third and final paragraph. 8 The third and final paragraph.
9
10 ----------------------------------------------------------------------
11 <p>
12 This is some text in the first paragraph.
13 </p>
14 <p>
15 A small indented paragraph.
16 It is followed by some lines
17 containing random whitespace.
18 </p>
19 <p>
20 The third and final paragraph.
21 </p>
9 22
10 ---------------------------------------------------------------------- 23 ----------------------------------------------------------------------
11 24
12 paragraphs formatted to fit within 30 characters: 25 paragraphs formatted to fit within 30 characters:
13 ---------------------------------------------------------------------- 26 ----------------------------------------------------------------------
20 whitespace. 33 whitespace.
21 34
22 The third and final paragraph. 35 The third and final paragraph.
23 36
24 ---------------------------------------------------------------------- 37 ----------------------------------------------------------------------
38 <p>
39 This is some text in the first paragraph.
40 </p>
41 <p>
42 A small indented paragraph.
43 It is followed by some lines
44 containing random whitespace.
45 </p>
46 <p>
47 The third and final paragraph.
48 </p>
49
50 ----------------------------------------------------------------------
25 51
26 definitions formatted to fit within 60 characters: 52 definitions formatted to fit within 60 characters:
27 ---------------------------------------------------------------------- 53 ----------------------------------------------------------------------
28 A Term 54 A Term
29 Definition. The indented lines make up the definition. 55 Definition. The indented lines make up the definition.
33 determines the indentation, so this will be indented 59 determines the indentation, so this will be indented
34 with four spaces. 60 with four spaces.
35 61
36 A Nested/Indented Term 62 A Nested/Indented Term
37 Definition. 63 Definition.
64
65 ----------------------------------------------------------------------
66 <dl>
67 <dt>A Term
68 <dd>Definition. The indented lines make up the definition.
69 <dt>Another Term
70 <dd>Another definition. The final line in the definition determines the indentation, so this will be indented with four spaces.
71 <dt>A Nested/Indented Term
72 <dd>Definition.
73 </dl>
38 74
39 ---------------------------------------------------------------------- 75 ----------------------------------------------------------------------
40 76
41 definitions formatted to fit within 30 characters: 77 definitions formatted to fit within 30 characters:
42 ---------------------------------------------------------------------- 78 ----------------------------------------------------------------------
55 91
56 A Nested/Indented Term 92 A Nested/Indented Term
57 Definition. 93 Definition.
58 94
59 ---------------------------------------------------------------------- 95 ----------------------------------------------------------------------
96 <dl>
97 <dt>A Term
98 <dd>Definition. The indented lines make up the definition.
99 <dt>Another Term
100 <dd>Another definition. The final line in the definition determines the indentation, so this will be indented with four spaces.
101 <dt>A Nested/Indented Term
102 <dd>Definition.
103 </dl>
104
105 ----------------------------------------------------------------------
60 106
61 literals formatted to fit within 60 characters: 107 literals formatted to fit within 60 characters:
62 ---------------------------------------------------------------------- 108 ----------------------------------------------------------------------
63 The fully minimized form is the most convenient form: 109 The fully minimized form is the most convenient form:
64 110
76 This literal block is started with '::', 122 This literal block is started with '::',
77 the so-called expanded form. The paragraph 123 the so-called expanded form. The paragraph
78 with '::' disappears in the final output. 124 with '::' disappears in the final output.
79 125
80 ---------------------------------------------------------------------- 126 ----------------------------------------------------------------------
127 <p>
128 The fully minimized form is the most
129 convenient form:
130 </p>
131 <pre>
132 Hello
133 literal
134 world
135 </pre>
136 <p>
137 In the partially minimized form a paragraph
138 simply ends with space-double-colon.
139 </p>
140 <pre>
141 ////////////////////////////////////////
142 long un-wrapped line in a literal block
143 \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
144 </pre>
145 <pre>
146 This literal block is started with '::',
147 the so-called expanded form. The paragraph
148 with '::' disappears in the final output.
149 </pre>
150
151 ----------------------------------------------------------------------
81 152
82 literals formatted to fit within 30 characters: 153 literals formatted to fit within 30 characters:
83 ---------------------------------------------------------------------- 154 ----------------------------------------------------------------------
84 The fully minimized form is 155 The fully minimized form is
85 the most convenient form: 156 the most convenient form:
97 \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ 168 \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
98 169
99 This literal block is started with '::', 170 This literal block is started with '::',
100 the so-called expanded form. The paragraph 171 the so-called expanded form. The paragraph
101 with '::' disappears in the final output. 172 with '::' disappears in the final output.
173
174 ----------------------------------------------------------------------
175 <p>
176 The fully minimized form is the most
177 convenient form:
178 </p>
179 <pre>
180 Hello
181 literal
182 world
183 </pre>
184 <p>
185 In the partially minimized form a paragraph
186 simply ends with space-double-colon.
187 </p>
188 <pre>
189 ////////////////////////////////////////
190 long un-wrapped line in a literal block
191 \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
192 </pre>
193 <pre>
194 This literal block is started with '::',
195 the so-called expanded form. The paragraph
196 with '::' disappears in the final output.
197 </pre>
102 198
103 ---------------------------------------------------------------------- 199 ----------------------------------------------------------------------
104 200
105 lists formatted to fit within 60 characters: 201 lists formatted to fit within 60 characters:
106 ---------------------------------------------------------------------- 202 ----------------------------------------------------------------------
133 229
134 Line blocks are also a form of list: 230 Line blocks are also a form of list:
135 231
136 This is the first line. The line continues here. 232 This is the first line. The line continues here.
137 This is the second line. 233 This is the second line.
234
235 ----------------------------------------------------------------------
236 <ul>
237 <li> This is the first list item.
238 <p>
239 Second paragraph in the first list item.
240 </p>
241 <li> List items need not be separated by a blank line.
242 <li> And will be rendered without one in any case.
243 </ul>
244 <p>
245 We can have indented lists:
246 </p>
247 <ul>
248 <li> This is an indented list item
249 <li> Another indented list item:
250 <pre>
251 - A literal block in the middle
252 of an indented list.
253 </pre>
254 <pre>
255 (The above is not a list item since we are in the literal block.)
256 </pre>
257 </ul>
258 <pre>
259 Literal block with no indentation (apart from
260 the two spaces added to all literal blocks).
261 </pre>
262 <ol>
263 <li> This is an enumerated list (first item).
264 <li> Continuing with the second item.
265 <li> foo
266 <li> bar
267 <li> Another
268 <li> List
269 </ol>
270 <p>
271 Line blocks are also a form of list:
272 </p>
273 <ol>
274 <li> This is the first line. The line continues here.
275 <li> This is the second line.
276 </ol>
138 277
139 ---------------------------------------------------------------------- 278 ----------------------------------------------------------------------
140 279
141 lists formatted to fit within 30 characters: 280 lists formatted to fit within 30 characters:
142 ---------------------------------------------------------------------- 281 ----------------------------------------------------------------------
178 list: 317 list:
179 318
180 This is the first line. The 319 This is the first line. The
181 line continues here. 320 line continues here.
182 This is the second line. 321 This is the second line.
322
323 ----------------------------------------------------------------------
324 <ul>
325 <li> This is the first list item.
326 <p>
327 Second paragraph in the first list item.
328 </p>
329 <li> List items need not be separated by a blank line.
330 <li> And will be rendered without one in any case.
331 </ul>
332 <p>
333 We can have indented lists:
334 </p>
335 <ul>
336 <li> This is an indented list item
337 <li> Another indented list item:
338 <pre>
339 - A literal block in the middle
340 of an indented list.
341 </pre>
342 <pre>
343 (The above is not a list item since we are in the literal block.)
344 </pre>
345 </ul>
346 <pre>
347 Literal block with no indentation (apart from
348 the two spaces added to all literal blocks).
349 </pre>
350 <ol>
351 <li> This is an enumerated list (first item).
352 <li> Continuing with the second item.
353 <li> foo
354 <li> bar
355 <li> Another
356 <li> List
357 </ol>
358 <p>
359 Line blocks are also a form of list:
360 </p>
361 <ol>
362 <li> This is the first line. The line continues here.
363 <li> This is the second line.
364 </ol>
183 365
184 ---------------------------------------------------------------------- 366 ----------------------------------------------------------------------
185 367
186 options formatted to fit within 60 characters: 368 options formatted to fit within 60 characters:
187 ---------------------------------------------------------------------- 369 ----------------------------------------------------------------------
206 The next paragraph looks like an option list, but lacks the 388 The next paragraph looks like an option list, but lacks the
207 two-space marker after the option. It is treated as a normal 389 two-space marker after the option. It is treated as a normal
208 paragraph: 390 paragraph:
209 391
210 --foo bar baz 392 --foo bar baz
393
394 ----------------------------------------------------------------------
395 <p>
396 There is support for simple option lists,
397 but only with long options:
398 </p>
399 <dl>
400 <dt>-X --exclude filter
401 <dd>an option with a short and long option with an argument
402 <dt>-I --include
403 <dd>an option with both a short option and a long option
404 <dt> --all
405 <dd>Output all.
406 <dt> --both
407 <dd>Output both (this description is quite long).
408 <dt> --long
409 <dd>Output all day long.
410 <dt> --par
411 <dd>This option has two paragraphs in its description. This is the first.
412 <p>
413 This is the second. Blank lines may be omitted between
414 options (as above) or left in (as here).
415 </p>
416 </dl>
417 <p>
418 The next paragraph looks like an option list, but lacks the two-space
419 marker after the option. It is treated as a normal paragraph:
420 </p>
421 <p>
422 --foo bar baz
423 </p>
211 424
212 ---------------------------------------------------------------------- 425 ----------------------------------------------------------------------
213 426
214 options formatted to fit within 30 characters: 427 options formatted to fit within 30 characters:
215 ---------------------------------------------------------------------- 428 ----------------------------------------------------------------------
281 normal paragraph: 494 normal paragraph:
282 495
283 --foo bar baz 496 --foo bar baz
284 497
285 ---------------------------------------------------------------------- 498 ----------------------------------------------------------------------
499 <p>
500 There is support for simple option lists,
501 but only with long options:
502 </p>
503 <dl>
504 <dt>-X --exclude filter
505 <dd>an option with a short and long option with an argument
506 <dt>-I --include
507 <dd>an option with both a short option and a long option
508 <dt> --all
509 <dd>Output all.
510 <dt> --both
511 <dd>Output both (this description is quite long).
512 <dt> --long
513 <dd>Output all day long.
514 <dt> --par
515 <dd>This option has two paragraphs in its description. This is the first.
516 <p>
517 This is the second. Blank lines may be omitted between
518 options (as above) or left in (as here).
519 </p>
520 </dl>
521 <p>
522 The next paragraph looks like an option list, but lacks the two-space
523 marker after the option. It is treated as a normal paragraph:
524 </p>
525 <p>
526 --foo bar baz
527 </p>
528
529 ----------------------------------------------------------------------
286 530
287 fields formatted to fit within 60 characters: 531 fields formatted to fit within 60 characters:
288 ---------------------------------------------------------------------- 532 ----------------------------------------------------------------------
289 a First item. 533 a First item.
290 ab Second item. Indentation and wrapping is handled 534 ab Second item. Indentation and wrapping is handled
294 538
295 small The larger key below triggers full indentation 539 small The larger key below triggers full indentation
296 here. 540 here.
297 much too large 541 much too large
298 This key is big enough to get its own line. 542 This key is big enough to get its own line.
543
544 ----------------------------------------------------------------------
545 <dl>
546 <dt>a
547 <dd>First item.
548 <dt>ab
549 <dd>Second item. Indentation and wrapping is handled automatically.
550 </dl>
551 <p>
552 Next list:
553 </p>
554 <dl>
555 <dt>small
556 <dd>The larger key below triggers full indentation here.
557 <dt>much too large
558 <dd>This key is big enough to get its own line.
559 </dl>
299 560
300 ---------------------------------------------------------------------- 561 ----------------------------------------------------------------------
301 562
302 fields formatted to fit within 30 characters: 563 fields formatted to fit within 30 characters:
303 ---------------------------------------------------------------------- 564 ----------------------------------------------------------------------
316 This key is big 577 This key is big
317 enough to get its 578 enough to get its
318 own line. 579 own line.
319 580
320 ---------------------------------------------------------------------- 581 ----------------------------------------------------------------------
582 <dl>
583 <dt>a
584 <dd>First item.
585 <dt>ab
586 <dd>Second item. Indentation and wrapping is handled automatically.
587 </dl>
588 <p>
589 Next list:
590 </p>
591 <dl>
592 <dt>small
593 <dd>The larger key below triggers full indentation here.
594 <dt>much too large
595 <dd>This key is big enough to get its own line.
596 </dl>
597
598 ----------------------------------------------------------------------
321 599
322 containers (normal) formatted to fit within 60 characters: 600 containers (normal) formatted to fit within 60 characters:
323 ---------------------------------------------------------------------- 601 ----------------------------------------------------------------------
324 Normal output. 602 Normal output.
325 603
326 ---------------------------------------------------------------------- 604 ----------------------------------------------------------------------
605 <p>
606 Normal output.
607 </p>
608
609 ----------------------------------------------------------------------
327 610
328 containers (verbose) formatted to fit within 60 characters: 611 containers (verbose) formatted to fit within 60 characters:
329 ---------------------------------------------------------------------- 612 ----------------------------------------------------------------------
330 Normal output. 613 Normal output.
331 614
332 Verbose output. 615 Verbose output.
333 616
334 ---------------------------------------------------------------------- 617 ----------------------------------------------------------------------
335 ['debug', 'debug'] 618 ['debug', 'debug']
336 ---------------------------------------------------------------------- 619 ----------------------------------------------------------------------
620 <p>
621 Normal output.
622 </p>
623 <p>
624 Verbose output.
625 </p>
626
627 ----------------------------------------------------------------------
337 628
338 containers (debug) formatted to fit within 60 characters: 629 containers (debug) formatted to fit within 60 characters:
339 ---------------------------------------------------------------------- 630 ----------------------------------------------------------------------
340 Normal output. 631 Normal output.
341 632
342 Initial debug output. 633 Initial debug output.
343 634
344 ---------------------------------------------------------------------- 635 ----------------------------------------------------------------------
345 ['verbose'] 636 ['verbose']
346 ---------------------------------------------------------------------- 637 ----------------------------------------------------------------------
638 <p>
639 Normal output.
640 </p>
641 <p>
642 Initial debug output.
643 </p>
644
645 ----------------------------------------------------------------------
347 646
348 containers (verbose debug) formatted to fit within 60 characters: 647 containers (verbose debug) formatted to fit within 60 characters:
349 ---------------------------------------------------------------------- 648 ----------------------------------------------------------------------
350 Normal output. 649 Normal output.
351 650
356 Debug output. 655 Debug output.
357 656
358 ---------------------------------------------------------------------- 657 ----------------------------------------------------------------------
359 [] 658 []
360 ---------------------------------------------------------------------- 659 ----------------------------------------------------------------------
660 <p>
661 Normal output.
662 </p>
663 <p>
664 Initial debug output.
665 </p>
666 <p>
667 Verbose output.
668 </p>
669 <p>
670 Debug output.
671 </p>
672
673 ----------------------------------------------------------------------
361 674
362 roles formatted to fit within 60 characters: 675 roles formatted to fit within 60 characters:
363 ---------------------------------------------------------------------- 676 ----------------------------------------------------------------------
364 Please see "hg add". 677 Please see "hg add".
678
679 ----------------------------------------------------------------------
680 <p>
681 Please see "hg add".
682 </p>
365 683
366 ---------------------------------------------------------------------- 684 ----------------------------------------------------------------------
367 685
368 sections formatted to fit within 20 characters: 686 sections formatted to fit within 20 characters:
369 ---------------------------------------------------------------------- 687 ----------------------------------------------------------------------
376 Subsection 694 Subsection
377 '''''''''' 695 ''''''''''
378 696
379 Markup: "foo" and "hg help" 697 Markup: "foo" and "hg help"
380 --------------------------- 698 ---------------------------
699
700 ----------------------------------------------------------------------
701 <h1>Title</h1>
702 <h2>Section</h2>
703 <h3>Subsection</h3>
704 <h2>Markup: "foo" and "hg help"</h2>
381 705
382 ---------------------------------------------------------------------- 706 ----------------------------------------------------------------------
383 707
384 admonitions formatted to fit within 30 characters: 708 admonitions formatted to fit within 30 characters:
385 ---------------------------------------------------------------------- 709 ----------------------------------------------------------------------
395 719
396 !Danger! 720 !Danger!
397 This is danger 721 This is danger
398 722
399 ---------------------------------------------------------------------- 723 ----------------------------------------------------------------------
724 <p>
725 <b>Note:</b> This is a note
726 </p>
727 <ul>
728 <li> Bullet 1
729 <li> Bullet 2
730 </ul>
731 <p>
732 <b>Warning!</b> This is a warning Second input line of warning
733 </p>
734 <p>
735 <b>!Danger!</b> This is danger
736 </p>
737
738 ----------------------------------------------------------------------
400 739
401 comments formatted to fit within 30 characters: 740 comments formatted to fit within 30 characters:
402 ---------------------------------------------------------------------- 741 ----------------------------------------------------------------------
403 Some text. 742 Some text.
404 743
405 Some indented text. 744 Some indented text.
406 745
407 Empty comment above 746 Empty comment above
747
748 ----------------------------------------------------------------------
749 <p>
750 Some text.
751 </p>
752 <p>
753 Some indented text.
754 </p>
755 <p>
756 Empty comment above
757 </p>
408 758
409 ---------------------------------------------------------------------- 759 ----------------------------------------------------------------------
410 760
411 === === ======================================== 761 === === ========================================
412 a b c 762 a b c
423 foo bar baz this list is 773 foo bar baz this list is
424 very very very long 774 very very very long
425 man 775 man
426 776
427 ---------------------------------------------------------------------- 777 ----------------------------------------------------------------------
428 778 <table>
779 <tr><th>a</th><th>b</th><th>c</th></tr>
780 <tr><td>1</td><td>2</td><td>3</td></tr>
781 <tr><td>foo</td><td>bar</td><td>baz this list is very very very long man</td></tr>
782 </table>
783
784 ----------------------------------------------------------------------
785