diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2014-07-13 16:04:29 -0700 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2014-07-13 16:04:29 -0700 |
| commit | 81088281dea1283159f7e0cf3d9c2a5082e06d8a (patch) | |
| tree | d7fdda561f43954dd68889d408e53ef2419b6549 /tests | |
| parent | 0ba2f0b8f9002a53351716991509fc7621fa8272 (diff) | |
DokuWiki writer: Use raw HTML for complex lists...
as in the mediawiki writer. The dokuwiki markup isn't able
to handle multiple block-level items within a list item, except
in a few special cases (e.g. code blocks, and these must be started
on the same line as the preceding paragraph). So we fall back to
raw HTML for these.
Perhaps there is a better solution. We can "fake" multiple
paragraphs within list items using hard line breaks (`\\`), but
we must keep everything on one line.
(#1398)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/writer.dokuwiki | 54 |
1 files changed, 35 insertions, 19 deletions
diff --git a/tests/writer.dokuwiki b/tests/writer.dokuwiki index 983db2274..e1844d62a 100644 --- a/tests/writer.dokuwiki +++ b/tests/writer.dokuwiki @@ -157,10 +157,11 @@ and using spaces: Multiple paragraphs: - - Item 1, graf one. -Item 1. graf two. The quick brown fox jumped over the lazy dog’s back. - - Item 2. - - Item 3. +<HTML><ol style="list-style-type: decimal;"></HTML> +<HTML><li></HTML><HTML><p></HTML>Item 1, graf one.<HTML></p></HTML> +<HTML><p></HTML>Item 1. graf two. The quick brown fox jumped over the lazy dog’s back.<HTML></p></HTML><HTML></li></HTML> +<HTML><li></HTML><HTML><p></HTML>Item 2.<HTML></p></HTML><HTML></li></HTML> +<HTML><li></HTML><HTML><p></HTML>Item 3.<HTML></p></HTML><HTML></li></HTML><HTML></ol></HTML> ===== Nested ===== @@ -195,20 +196,32 @@ Same thing but with paragraphs: ===== Fancy list markers ===== - - begins with 2 - - and now 3 -with a continuation - - sublist with roman numerals, starting with 4 - - more items - - a subsublist - - a subsublist +<HTML><ol start="2" style="list-style-type: decimal;"></HTML> +<HTML><li></HTML>begins with 2<HTML></li></HTML> +<HTML><li></HTML><HTML><p></HTML>and now 3<HTML></p></HTML> +<HTML><p></HTML>with a continuation<HTML></p></HTML> +<HTML><ol start="4" style="list-style-type: lower-roman;"></HTML> +<HTML><li></HTML>sublist with roman numerals, starting with 4<HTML></li></HTML> +<HTML><li></HTML>more items +<HTML><ol style="list-style-type: upper-alpha;"></HTML> +<HTML><li></HTML>a subsublist<HTML></li></HTML> +<HTML><li></HTML>a subsublist<HTML></li></HTML><HTML></ol></HTML> +<HTML></li></HTML><HTML></ol></HTML> +<HTML></li></HTML><HTML></ol></HTML> Nesting: - - Upper Alpha - - Upper Roman. - - Decimal start with 6 - - Lower alpha with paren +<HTML><ol style="list-style-type: upper-alpha;"></HTML> +<HTML><li></HTML>Upper Alpha +<HTML><ol style="list-style-type: upper-roman;"></HTML> +<HTML><li></HTML>Upper Roman. +<HTML><ol start="6" style="list-style-type: decimal;"></HTML> +<HTML><li></HTML>Decimal start with 6 +<HTML><ol start="3" style="list-style-type: lower-alpha;"></HTML> +<HTML><li></HTML>Lower alpha with paren<HTML></li></HTML><HTML></ol></HTML> +<HTML></li></HTML><HTML></ol></HTML> +<HTML></li></HTML><HTML></ol></HTML> +<HTML></li></HTML><HTML></ol></HTML> Autonumbering: @@ -247,11 +260,14 @@ Loose: Multiple blocks with italics: - * **//apple//** red fruit -contains seeds, crisp, pleasant to taste - * **//orange//** orange fruit +<HTML><dl></HTML> +<HTML><dt></HTML>//apple//<HTML></dt></HTML> +<HTML><dd></HTML><HTML><p></HTML>red fruit<HTML></p></HTML> +<HTML><p></HTML>contains seeds, crisp, pleasant to taste<HTML></p></HTML><HTML></dd></HTML> +<HTML><dt></HTML>//orange//<HTML></dt></HTML> +<HTML><dd></HTML><HTML><p></HTML>orange fruit<HTML></p></HTML> <code>{ orange code block }</code> -> orange block quote +> <HTML><p></HTML>orange block quote<HTML></p></HTML><HTML></dd></HTML><HTML></dl></HTML> Multiple definitions, tight: |