@@ -48,8 +48,8 @@ data WriterState = WriterState {
4848
4949data WriterReader = WriterReader {
5050 options :: WriterOptions -- Writer options
51− , stListLevel :: String -- String at beginning of list items, e.g. "**"
52− , stUseTags :: Bool -- True if we should use HTML tags because we're in a complex list
51+ , listLevel :: String -- String at beginning of list items, e.g. "**"
52+ , useTags :: Bool -- True if we should use HTML tags because we're in a complex list
5353 }
5454
5555type MediaWikiWriter = ReaderT WriterReader (State WriterState)
@@ -58,7 +58,7 @@ type MediaWikiWriter = ReaderT WriterReader (State WriterState)
5858writeMediaWiki :: WriterOptions -> Pandoc -> String
5959writeMediaWiki opts document =
6060 let initialState = WriterState { stNotes = False }
61− env = WriterReader { options = opts, stListLevel = [], stUseTags = False }
61+ env = WriterReader { options = opts, listLevel = [], useTags = False }
6262 in evalState (runReaderT (pandocToMediaWiki document) env) initialState
6363
6464-- | Return MediaWiki representation of document.
@@ -110,12 +110,12 @@ blockToMediaWiki (Para [Image txt (src,'f':'i':'g':':':tit)]) = do
110110 return $ "[[Image:" ++ src ++ "|frame|none" ++ opt ++ "]]\n"
111111
112112blockToMediaWiki (Para inlines) = do
113− useTags <- asks stUseTags
114− listLevel <- asks stListLevel
113+ tags <- asks useTags
114+ lev <- asks listLevel
115115 contents <- inlineListToMediaWiki inlines
116− return $ if useTags
116+ return $ if tags
117117 then "<p>" ++ contents ++ "</p>"
118− else contents ++ if null listLevel then "\n" else ""
118+ else contents ++ if null lev then "\n" else ""
119119
120120blockToMediaWiki (RawBlock f str)
121121 | f == Format "mediawiki" = return str
@@ -162,37 +162,37 @@ blockToMediaWiki (Table capt aligns widths headers rows') = do
162162 return $ "{|\n" ++ caption ++ tableBody ++ "|}\n"
163163
164164blockToMediaWiki x@(BulletList items) = do
165− useTags <- fmap (|| not (isSimpleList x)) $ asks stUseTags
166− if useTags
165+ tags <- fmap (|| not (isSimpleList x)) $ asks useTags
166+ if tags
167167 then do
168− contents <- local (\ s -> s { stUseTags = True }) $ mapM listItemToMediaWiki items
168+ contents <- local (\ s -> s { useTags = True }) $ mapM listItemToMediaWiki items
169169 return $ "<ul>\n" ++ vcat contents ++ "</ul>\n"
170170 else do
171− listLevel <- asks stListLevel
172− contents <- local (\s -> s { stListLevel = stListLevel s ++ "*" }) $ mapM listItemToMediaWiki items
173− return $ vcat contents ++ if null listLevel then "\n" else ""
171+ lev <- asks listLevel
172+ contents <- local (\s -> s { listLevel = listLevel s ++ "*" }) $ mapM listItemToMediaWiki items
173+ return $ vcat contents ++ if null lev then "\n" else ""
174174
175175blockToMediaWiki x@(OrderedList attribs items) = do
176− useTags <- fmap (|| not (isSimpleList x)) $ asks stUseTags
177− if useTags
176+ tags <- fmap (|| not (isSimpleList x)) $ asks useTags
177+ if tags
178178 then do
179− contents <- local (\s -> s { stUseTags = True }) $ mapM listItemToMediaWiki items
179+ contents <- local (\s -> s { useTags = True }) $ mapM listItemToMediaWiki items
180180 return $ "<ol" ++ listAttribsToString attribs ++ ">\n" ++ vcat contents ++ "</ol>\n"
181181 else do
182− listLevel <- asks stListLevel
183− contents <- local (\s -> s { stListLevel = stListLevel s ++ "#" }) $ mapM listItemToMediaWiki items
184− return $ vcat contents ++ if null listLevel then "\n" else ""
182+ lev <- asks listLevel
183+ contents <- local (\s -> s { listLevel = listLevel s ++ "#" }) $ mapM listItemToMediaWiki items
184+ return $ vcat contents ++ if null lev then "\n" else ""
185185
186186blockToMediaWiki x@(DefinitionList items) = do
187− useTags <- fmap (|| not (isSimpleList x)) $ asks stUseTags
188− if useTags
187+ tags <- fmap (|| not (isSimpleList x)) $ asks useTags
188+ if tags
189189 then do
190− contents <- local (\s -> s { stUseTags = True }) $ mapM definitionListItemToMediaWiki items
190+ contents <- local (\s -> s { useTags = True }) $ mapM definitionListItemToMediaWiki items
191191 return $ "<dl>\n" ++ vcat contents ++ "</dl>\n"
192192 else do
193− listLevel <- asks stListLevel
194− contents <- local (\s -> s { stListLevel = stListLevel s ++ ";" }) $ mapM definitionListItemToMediaWiki items
195− return $ vcat contents ++ if null listLevel then "\n" else ""
193+ lev <- asks listLevel
194+ contents <- local (\s -> s { listLevel = listLevel s ++ ";" }) $ mapM definitionListItemToMediaWiki items
195+ return $ vcat contents ++ if null lev then "\n" else ""
196196
197197-- Auxiliary functions for lists:
198198
@@ -211,11 +211,11 @@ listAttribsToString (startnum, numstyle, _) =
211211listItemToMediaWiki :: [Block] -> MediaWikiWriter String
212212listItemToMediaWiki items = do
213213 contents <- blockListToMediaWiki items
214− useTags <- asks stUseTags
215− if useTags
214+ tags <- asks useTags
215+ if tags
216216 then return $ "<li>" ++ contents ++ "</li>"
217217 else do
218− marker <- asks stListLevel
218+ marker <- asks listLevel
219219 return $ marker ++ " " ++ contents
220220
221221-- | Convert definition list item (label, list of blocks) to MediaWiki.
@@ -224,12 +224,12 @@ definitionListItemToMediaWiki :: ([Inline],[[Block]])
224224definitionListItemToMediaWiki (label, items) = do
225225 labelText <- inlineListToMediaWiki label
226226 contents <- mapM blockListToMediaWiki items
227− useTags <- asks stUseTags
228− if useTags
227+ tags <- asks useTags
228+ if tags
229229 then return $ "<dt>" ++ labelText ++ "</dt>\n" ++
230230 intercalate "\n" (map (\d -> "<dd>" ++ d ++ "</dd>") contents)
231231 else do
232− marker <- asks stListLevel
232+ marker <- asks listLevel
233233 return $ marker ++ " " ++ labelText ++ "\n" ++
234234 intercalate "\n" (map (\d -> init marker ++ ": " ++ d) contents)
235235