@@ -162,38 +162,35 @@ blockToMediaWiki (Table capt aligns widths headers rows') = do
162162 return $ "{|\n" ++ caption ++ tableBody ++ "|}\n"
163163
164164blockToMediaWiki x@(BulletList items) = do
165− oldUseTags <- asks stUseTags
166− listLevel <- asks stListLevel
167− let useTags = oldUseTags || not (isSimpleList x)
165+ useTags <- fmap (|| not (isSimpleList x)) $ asks stUseTags
168166 if useTags
169167 then do
170168 contents <- local (\ s -> s { stUseTags = True }) $ mapM listItemToMediaWiki items
171169 return $ "<ul>\n" ++ vcat contents ++ "</ul>\n"
172170 else do
171+ listLevel <- asks stListLevel
173172 contents <- local (\s -> s { stListLevel = stListLevel s ++ "*" }) $ mapM listItemToMediaWiki items
174173 return $ vcat contents ++ if null listLevel then "\n" else ""
175174
176175blockToMediaWiki x@(OrderedList attribs items) = do
177− oldUseTags <- asks stUseTags
178− listLevel <- asks stListLevel
179− let useTags = oldUseTags || not (isSimpleList x)
176+ useTags <- fmap (|| not (isSimpleList x)) $ asks stUseTags
180177 if useTags
181178 then do
182179 contents <- local (\s -> s { stUseTags = True }) $ mapM listItemToMediaWiki items
183180 return $ "<ol" ++ listAttribsToString attribs ++ ">\n" ++ vcat contents ++ "</ol>\n"
184181 else do
182+ listLevel <- asks stListLevel
185183 contents <- local (\s -> s { stListLevel = stListLevel s ++ "#" }) $ mapM listItemToMediaWiki items
186184 return $ vcat contents ++ if null listLevel then "\n" else ""
187185
188186blockToMediaWiki x@(DefinitionList items) = do
189− oldUseTags <- asks stUseTags
190− listLevel <- asks stListLevel
191− let useTags = oldUseTags || not (isSimpleList x)
187+ useTags <- fmap (|| not (isSimpleList x)) $ asks stUseTags
192188 if useTags
193189 then do
194190 contents <- local (\s -> s { stUseTags = True }) $ mapM definitionListItemToMediaWiki items
195191 return $ "<dl>\n" ++ vcat contents ++ "</dl>\n"
196192 else do
193+ listLevel <- asks stListLevel
197194 contents <- local (\s -> s { stListLevel = stListLevel s ++ ";" }) $ mapM definitionListItemToMediaWiki items
198195 return $ vcat contents ++ if null listLevel then "\n" else ""
199196