Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Bullet and ordered lists now always simple in dokuwiki writer (#386)

Browse source
This commit is contained in:
claremacrae 2013-08-19 20:45:31 +01:00
parent 883f119c87
commit 6cc284cc8e
2 changed files with 17 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Text/Pandoc/Writers/DokuWiki.hs
View file

@ -275,9 +275,8 @@ definitionListItemToDokuWiki opts (label, items) = do
isSimpleList :: Block -> Bool isSimpleList :: Block -> Bool
isSimpleList x = isSimpleList x =
case x of case x of
BulletList items -> all isSimpleListItem items BulletList items -> True
OrderedList (num, sty, _) items -> all isSimpleListItem items && OrderedList (num, sty, _) items -> True
num == 1 && sty `elem` [DefaultStyle, Decimal]
DefinitionList items -> all isSimpleListItem $ concatMap snd items DefinitionList items -> all isSimpleListItem $ concatMap snd items
_ -> False _ -> False

43
tests/writer.dokuwiki
View file

@ -157,11 +157,10 @@ and using spaces:
Multiple paragraphs: Multiple paragraphs:
<ol style="list-style-type: decimal;"> - Item 1, graf one.
<li><p>Item 1, graf one.</p> Item 1. graf two. The quick brown fox jumped over the lazy dog’s back.
<p>Item 1. graf two. The quick brown fox jumped over the lazy dog’s back.</p></li> - Item 2.
<li><p>Item 2.</p></li> - Item 3.
<li><p>Item 3.</p></li></ol>
===== Nested ===== ===== Nested =====
@ -196,32 +195,20 @@ Same thing but with paragraphs:
===== Fancy list markers ===== ===== Fancy list markers =====
<ol start="2" style="list-style-type: decimal;"> - begins with 2
<li>begins with 2</li> - and now 3
<li><p>and now 3</p> with a continuation
<p>with a continuation</p> - sublist with roman numerals, starting with 4
<ol start="4" style="list-style-type: lower-roman;"> - more items
<li>sublist with roman numerals, starting with 4</li> - a subsublist
<li>more items - a subsublist
<ol style="list-style-type: upper-alpha;">
<li>a subsublist</li>
<li>a subsublist</li></ol>
</li></ol>
</li></ol>
Nesting: Nesting:
<ol style="list-style-type: upper-alpha;"> - Upper Alpha
<li>Upper Alpha - Upper Roman.
<ol style="list-style-type: upper-roman;"> - Decimal start with 6
<li>Upper Roman. - Lower alpha with paren
<ol start="6" style="list-style-type: decimal;">
<li>Decimal start with 6
<ol start="3" style="list-style-type: lower-alpha;">
<li>Lower alpha with paren</li></ol>
</li></ol>
</li></ol>
</li></ol>
Autonumbering: Autonumbering: