From 6cc284cc8eadf6a1d9099b7f1e2b68b3d1ac4561 Mon Sep 17 00:00:00 2001
From: claremacrae <github@cfmacrae.fastmail.co.uk>
Date: Mon, 19 Aug 2013 20:45:31 +0100
Subject: Bullet and ordered lists now always simple in dokuwiki writer (#386)

---
 src/Text/Pandoc/Writers/DokuWiki.hs |  5 ++---
 tests/writer.dokuwiki               | 43 +++++++++++++------------------------
 2 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/src/Text/Pandoc/Writers/DokuWiki.hs b/src/Text/Pandoc/Writers/DokuWiki.hs
index 523c4d180..0f62e98c3 100644
--- a/src/Text/Pandoc/Writers/DokuWiki.hs
+++ b/src/Text/Pandoc/Writers/DokuWiki.hs
@@ -275,9 +275,8 @@ definitionListItemToDokuWiki opts (label, items) = do
 isSimpleList :: Block -> Bool
 isSimpleList x =
   case x of
-       BulletList items                 -> all isSimpleListItem items
-       OrderedList (num, sty, _) items  -> all isSimpleListItem items &&
-                                            num == 1 && sty `elem` [DefaultStyle, Decimal]
+       BulletList items                 -> True
+       OrderedList (num, sty, _) items  -> True
        DefinitionList items             -> all isSimpleListItem $ concatMap snd items
        _                                -> False
 
diff --git a/tests/writer.dokuwiki b/tests/writer.dokuwiki
index 4b9d459c8..e881f3510 100644
--- a/tests/writer.dokuwiki
+++ b/tests/writer.dokuwiki
@@ -157,11 +157,10 @@ and using spaces:
 
 Multiple paragraphs:
 
-<ol style="list-style-type: decimal;">
-<li><p>Item 1, graf one.</p>
-<p>Item 1. graf two. The quick brown fox jumped over the lazy dog’s back.</p></li>
-<li><p>Item 2.</p></li>
-<li><p>Item 3.</p></li></ol>
+  - Item 1, graf one.
+Item 1. graf two. The quick brown fox jumped over the lazy dog’s back.
+  - Item 2.
+  - Item 3.
 
 ===== Nested =====
 
@@ -196,32 +195,20 @@ Same thing but with paragraphs:
 
 ===== Fancy list markers =====
 
-<ol start="2" style="list-style-type: decimal;">
-<li>begins with 2</li>
-<li><p>and now 3</p>
-<p>with a continuation</p>
-<ol start="4" style="list-style-type: lower-roman;">
-<li>sublist with roman numerals, starting with 4</li>
-<li>more items
-<ol style="list-style-type: upper-alpha;">
-<li>a subsublist</li>
-<li>a subsublist</li></ol>
-</li></ol>
-</li></ol>
+  - begins with 2
+  - and now 3
+with a continuation
+    - sublist with roman numerals, starting with 4
+    - more items
+      - a subsublist
+      - a subsublist
 
 Nesting:
 
-<ol style="list-style-type: upper-alpha;">
-<li>Upper Alpha
-<ol style="list-style-type: upper-roman;">
-<li>Upper Roman.
-<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>
+  - Upper Alpha
+    - Upper Roman.
+      - Decimal start with 6
+        - Lower alpha with paren
 
 Autonumbering:
 
-- 
cgit v1.2.3