@@ -167,7 +167,7 @@ blockToDokuWiki opts x@(BulletList items) = do
167167 modify $ \s -> s { stUseTags = oldUseTags }
168168 return $ "<ul>\n" ++ vcat contents ++ "</ul>\n"
169169 else do
170− modify $ \s -> s { stListLevel = stListLevel s ++ "*" }
170+ modify $ \s -> s { stListLevel = stListLevel s ++ " " }
171171 contents <- mapM (listItemToDokuWiki opts) items
172172 modify $ \s -> s { stListLevel = init (stListLevel s) }
173173 return $ vcat contents ++ if null listLevel then "\n" else ""
@@ -179,15 +179,18 @@ blockToDokuWiki opts x@(OrderedList attribs items) = do
179179 if useTags
180180 then do
181181 modify $ \s -> s { stUseTags = True }
182− contents <- mapM (listItemToDokuWiki opts) items
182+ contents <- mapM (orderedListItemToDokuWiki opts) items
183183 modify $ \s -> s { stUseTags = oldUseTags }
184184 return $ "<ol" ++ listAttribsToString attribs ++ ">\n" ++ vcat contents ++ "</ol>\n"
185185 else do
186− modify $ \s -> s { stListLevel = stListLevel s ++ "#" }
187− contents <- mapM (listItemToDokuWiki opts) items
186+ modify $ \s -> s { stListLevel = stListLevel s ++ " " }
187+ contents <- mapM (orderedListItemToDokuWiki opts) items
188188 modify $ \s -> s { stListLevel = init (stListLevel s) }
189189 return $ vcat contents ++ if null listLevel then "\n" else ""
190190
191+-- TODO Need to decide how to make definition lists work on dokuwiki - I don't think there
192+-- is a specific representation of them.
193+-- TODO This creates double '; ; ' if there is a bullet or ordered list inside a definition list
191194blockToDokuWiki opts x@(DefinitionList items) = do
192195 oldUseTags <- get >>= return . stUseTags
193196 listLevel <- get >>= return . stListLevel
@@ -217,7 +220,7 @@ listAttribsToString (startnum, numstyle, _) =
217220 then " style=\"list-style-type: " ++ numstyle' ++ ";\""
218221 else "")
219222
220−-- | Convert bullet or ordered list item (list of blocks) to DokuWiki.
223+-- | Convert bullet list item (list of blocks) to DokuWiki.
221224listItemToDokuWiki :: WriterOptions -> [Block] -> State WriterState String
222225listItemToDokuWiki opts items = do
223226 contents <- blockListToDokuWiki opts items
@@ -226,7 +229,23 @@ listItemToDokuWiki opts items = do
226229 then return $ "<li>" ++ contents ++ "</li>"
227230 else do
228231 marker <- get >>= return . stListLevel
229− return $ marker ++ " " ++ contents
232+ -- This marker ++ marker is an awful hack to write 2 spaces per indentation level.
233+ -- I couldn't find a cleaner way of doing it.
234+ return $ marker ++ marker ++ "* " ++ contents
235+
236+-- | Convert ordered list item (list of blocks) to DokuWiki.
237+-- | TODO Emiminate dreadful duplication of text from listItemToDokuWiki
238+orderedListItemToDokuWiki :: WriterOptions -> [Block] -> State WriterState String
239+orderedListItemToDokuWiki opts items = do
240+ contents <- blockListToDokuWiki opts items
241+ useTags <- get >>= return . stUseTags
242+ if useTags
243+ then return $ "<li>" ++ contents ++ "</li>"
244+ else do
245+ marker <- get >>= return . stListLevel
246+ -- This marker ++ marker is an awful hack to write 2 spaces per indentation level.
247+ -- I couldn't find a cleaner way of doing it.
248+ return $ marker ++ marker ++ "- " ++ contents
230249
231250-- | Convert definition list item (label, list of blocks) to DokuWiki.
232251definitionListItemToDokuWiki :: WriterOptions