git.iko.soy/typeable/pandoc
on master help sign in
Little restructuralization.
0bda602Matej Kollar
src/Text/Pandoc/Writers/MediaWiki.hs+6−9
compare with master
unifiedsplit
@@ -162,38 +162,35 @@ blockToMediaWiki (Table capt aligns widths headers rows') = do
162 return $ "{|\n" ++ caption ++ tableBody ++ "|}\n"
162 return $ "{|\n" ++ caption ++ tableBody ++ "|}\n"
163
163
164blockToMediaWiki x@(BulletList items) = do
164blockToMediaWiki 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
168 if useTags
166 if useTags
169 then do
167 then do
170 contents <- local (\ s -> s { stUseTags = True }) $ mapM listItemToMediaWiki items
168 contents <- local (\ s -> s { stUseTags = True }) $ mapM listItemToMediaWiki items
171 return $ "<ul>\n" ++ vcat contents ++ "</ul>\n"
169 return $ "<ul>\n" ++ vcat contents ++ "</ul>\n"
172 else do
170 else do
171+ listLevel <- asks stListLevel
173 contents <- local (\s -> s { stListLevel = stListLevel s ++ "*" }) $ mapM listItemToMediaWiki items
172 contents <- local (\s -> s { stListLevel = stListLevel s ++ "*" }) $ mapM listItemToMediaWiki items
174 return $ vcat contents ++ if null listLevel then "\n" else ""
173 return $ vcat contents ++ if null listLevel then "\n" else ""
175
174
176blockToMediaWiki x@(OrderedList attribs items) = do
175blockToMediaWiki 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
180 if useTags
177 if useTags
181 then do
178 then do
182 contents <- local (\s -> s { stUseTags = True }) $ mapM listItemToMediaWiki items
179 contents <- local (\s -> s { stUseTags = True }) $ mapM listItemToMediaWiki items
183 return $ "<ol" ++ listAttribsToString attribs ++ ">\n" ++ vcat contents ++ "</ol>\n"
180 return $ "<ol" ++ listAttribsToString attribs ++ ">\n" ++ vcat contents ++ "</ol>\n"
184 else do
181 else do
182+ listLevel <- asks stListLevel
185 contents <- local (\s -> s { stListLevel = stListLevel s ++ "#" }) $ mapM listItemToMediaWiki items
183 contents <- local (\s -> s { stListLevel = stListLevel s ++ "#" }) $ mapM listItemToMediaWiki items
186 return $ vcat contents ++ if null listLevel then "\n" else ""
184 return $ vcat contents ++ if null listLevel then "\n" else ""
187
185
188blockToMediaWiki x@(DefinitionList items) = do
186blockToMediaWiki 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
192 if useTags
188 if useTags
193 then do
189 then do
194 contents <- local (\s -> s { stUseTags = True }) $ mapM definitionListItemToMediaWiki items
190 contents <- local (\s -> s { stUseTags = True }) $ mapM definitionListItemToMediaWiki items
195 return $ "<dl>\n" ++ vcat contents ++ "</dl>\n"
191 return $ "<dl>\n" ++ vcat contents ++ "</dl>\n"
196 else do
192 else do
193+ listLevel <- asks stListLevel
197 contents <- local (\s -> s { stListLevel = stListLevel s ++ ";" }) $ mapM definitionListItemToMediaWiki items
194 contents <- local (\s -> s { stListLevel = stListLevel s ++ ";" }) $ mapM definitionListItemToMediaWiki items
198 return $ vcat contents ++ if null listLevel then "\n" else ""
195 return $ vcat contents ++ if null listLevel then "\n" else ""
199
196